diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h index fd86c09fe76..c485d0e6545 100644 --- a/engines/director/detection_tables.h +++ b/engines/director/detection_tables.h @@ -338,6 +338,7 @@ static const PlainGameDescriptor directorGames[] = { { "myfavmonster", "My Favourite Monster" }, { "myfirstwords", "My First Reading & Spelling Words" }, { "mylk", "Mylk" }, + { "mysteriousisland", "Mysterious Island: A Race Against Time and Hot Lava" }, { "myworld", "Me & My World" }, { "necrobius", "Necrobius" }, { "necromancer", "Necromancer" }, @@ -5037,6 +5038,12 @@ static const DirectorGameDescription gameDescriptions[] = { MACDEMO1_l("mysteriousegypt", "Demo", "Egypti demo", "337c94c66b435e075a2d7f94b3cffc49", 483746, Common::FI_FIN, 404), WINDEMO1_l("mysteriousegypt", "Demo", "EGYPTI.EXE", "2e8cba31e473bd1567476f57d6aeb4d6", 5574413, Common::FI_FIN, 404), + // version comes from debug mode (hold Ctrl+Shift when clicking on New Game/Load Game) + MACGAME2("mysteriousisland", "v96.04.23", "Mysterious Island", "r:17efee018a660458fae80de4364021ac", 483518, + "INIT.DXR", "t:22a5a1e7542a1abd92c40beb1ca7b61e", 920290, 404), + WINGAME2("mysteriousisland", "v96.04.23", "ISLAND.EXE", "t:d8c7d6a10e60da366408d2cee6510f79", 697057, + "INIT.DXR", "t:22a5a1e7542a1abd92c40beb1ca7b61e", 920290, 404), + MACGAME1("myworld", "", "Me & My World", "bda8fd92e5483a1fa311e9fc68e355fe", 295773, 404), WINGAME1t("myworld", "", "MYWORLD.EXE", "c1be044a34660346d843cf51faca4604", 2138764, 404), diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp index dbff72cbb18..b89411f84dd 100644 --- a/engines/director/lingo/lingo-object.cpp +++ b/engines/director/lingo/lingo-object.cpp @@ -94,6 +94,7 @@ #include "director/lingo/xlibs/movemousexobj.h" #include "director/lingo/xlibs/movieidxxobj.h" #include "director/lingo/xlibs/movutils.h" +#include "director/lingo/xlibs/mystisle.h" #include "director/lingo/xlibs/openbleedwindowxcmd.h" #include "director/lingo/xlibs/orthoplayxobj.h" #include "director/lingo/xlibs/paco.h" @@ -276,6 +277,7 @@ static struct XLibProto { XLIBDEF(MoveMouseXObj, kXObj, 400), // D4 XLIBDEF(MovieIdxXObj, kXObj, 400), // D4 XLIBDEF(MovUtilsXObj, kXObj, 400), // D4 + XLIBDEF(MystIsleXObj, kXObj, 400), // D4 XLIBDEF(OpenBleedWindowXCMD,kXObj, 300), // D3 XLIBDEF(OrthoPlayXObj, kXObj, 400), // D4 XLIBDEF(PACoXObj, kXObj, 300), // D3 diff --git a/engines/director/lingo/xlibs/mystisle.cpp b/engines/director/lingo/xlibs/mystisle.cpp new file mode 100644 index 00000000000..a177ca17e39 --- /dev/null +++ b/engines/director/lingo/xlibs/mystisle.cpp @@ -0,0 +1,121 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include "common/system.h" + +#include "director/director.h" +#include "director/lingo/lingo.h" +#include "director/lingo/lingo-object.h" +#include "director/lingo/lingo-utils.h" +#include "director/lingo/xlibs/mystisle.h" + +/************************************************** + * + * USED IN: + * Mysterious Island: A Race Against Time and Hot Lava + * + **************************************************/ + +/* +-- MystIsle External Factory, v. 1.0 by David Jackson-Shields +--MYSTISLE +I mNew --Creates new instance +X mDispose --Disposes of XObject instance +S mName --Returns the XObject name (MystIsle) +I mGetLastError --Returns most recent error code +I mGetSysVersion --returns MS Windows version as an integer +I mGetQTVersion --returns QuickTime version as an integer +I mVerifyUnlocked --verify startup volume is writable (for Prefs) +S mGetPrefsPath --return path of Windows directory +IPP mDiagnostic, picHdl1, picHdl2 --for testing during development + */ + +namespace Director { + +const char *MystIsleXObj::xlibName = "MystIsle"; +const XlibFileDesc MystIsleXObj::fileNames[] = { + { "MYSTISLE", nullptr }, + { nullptr, nullptr }, +}; + +static MethodProto xlibMethods[] = { + { "new", MystIsleXObj::m_new, 0, 0, 400 }, + { "dispose", MystIsleXObj::m_dispose, 0, 0, 400 }, + { "name", MystIsleXObj::m_name, 0, 0, 400 }, + { "getLastError", MystIsleXObj::m_getLastError, 0, 0, 400 }, + { "getSysVersion", MystIsleXObj::m_getSysVersion, 0, 0, 400 }, + { "getQTVersion", MystIsleXObj::m_getQTVersion, 0, 0, 400 }, + { "verifyUnlocked", MystIsleXObj::m_verifyUnlocked, 0, 0, 400 }, + { "getPrefsPath", MystIsleXObj::m_getPrefsPath, 0, 0, 400 }, + { "diagnostic", MystIsleXObj::m_diagnostic, 2, 2, 400 }, + { nullptr, nullptr, 0, 0, 0 } +}; + +static BuiltinProto xlibBuiltins[] = { + + { nullptr, nullptr, 0, 0, 0, VOIDSYM } +}; + +MystIsleXObject::MystIsleXObject(ObjectType ObjectType) :Object("MystIsle") { + _objType = ObjectType; +} + +void MystIsleXObj::open(ObjectType type, const Common::Path &path) { + MystIsleXObject::initMethods(xlibMethods); + MystIsleXObject *xobj = new MystIsleXObject(type); + if (type == kXtraObj) + g_lingo->_openXtras.push_back(xlibName); + g_lingo->exposeXObject(xlibName, xobj); + g_lingo->initBuiltIns(xlibBuiltins); +} + +void MystIsleXObj::close(ObjectType type) { + MystIsleXObject::cleanupMethods(); + g_lingo->_globalvars[xlibName] = Datum(); + +} + +void MystIsleXObj::m_new(int nargs) { + g_lingo->printSTUBWithArglist("MystIsleXObj::m_new", nargs); + g_lingo->dropStack(nargs); + g_lingo->push(g_lingo->_state->me); +} + +XOBJSTUBNR(MystIsleXObj::m_dispose) +XOBJSTUB(MystIsleXObj::m_name, "MystIsle") +XOBJSTUB(MystIsleXObj::m_getLastError, 0) + +void MystIsleXObj::m_getSysVersion(int nargs) { + // Checks the installed OS version, return minimum expected version + g_lingo->dropStack(nargs); + g_lingo->push(Datum(g_director->getPlatform() == Common::kPlatformWindows ? 310 : 700)); +} + +void MystIsleXObj::m_getQTVersion(int nargs) { + // Checks the installed QuickTime version, return minimum expected version + g_lingo->dropStack(nargs); + g_lingo->push(Datum(g_director->getPlatform() == Common::kPlatformWindows ? 110 : 200)); +} + +XOBJSTUB(MystIsleXObj::m_verifyUnlocked, 0) // Check whether the drive is writable (locked) or read-only (unlocked), return unlocked +XOBJSTUB(MystIsleXObj::m_getPrefsPath, "") +XOBJSTUB(MystIsleXObj::m_diagnostic, 0) +} diff --git a/engines/director/lingo/xlibs/mystisle.h b/engines/director/lingo/xlibs/mystisle.h new file mode 100644 index 00000000000..6b9ee51d07b --- /dev/null +++ b/engines/director/lingo/xlibs/mystisle.h @@ -0,0 +1,54 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#ifndef DIRECTOR_LINGO_XLIBS_MYSTISLE_H +#define DIRECTOR_LINGO_XLIBS_MYSTISLE_H + +namespace Director { + +class MystIsleXObject : public Object { +public: + MystIsleXObject(ObjectType objType); +}; + +namespace MystIsleXObj { + +extern const char *xlibName; +extern const XlibFileDesc fileNames[]; + +void open(ObjectType type, const Common::Path &path); +void close(ObjectType type); + +void m_new(int nargs); +void m_dispose(int nargs); +void m_name(int nargs); +void m_getLastError(int nargs); +void m_getSysVersion(int nargs); +void m_getQTVersion(int nargs); +void m_verifyUnlocked(int nargs); +void m_getPrefsPath(int nargs); +void m_diagnostic(int nargs); + +} // End of namespace MystIsleXObj + +} // End of namespace Director + +#endif diff --git a/engines/director/module.mk b/engines/director/module.mk index 5c73c9fd7a9..4c58fdc97de 100644 --- a/engines/director/module.mk +++ b/engines/director/module.mk @@ -123,6 +123,7 @@ MODULE_OBJS = \ lingo/xlibs/movemousexobj.o \ lingo/xlibs/movieidxxobj.o \ lingo/xlibs/movutils.o \ + lingo/xlibs/mystisle.o \ lingo/xlibs/openbleedwindowxcmd.o \ lingo/xlibs/orthoplayxobj.o \ lingo/xlibs/paco.o \