[Scummvm-git-logs] scummvm master -> 39a210afacb9a627bf8a19a320f230667f8218f7
dreammaster
paulfgilbert at gmail.com
Mon Nov 18 00:02:45 CET 2019
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
397c9a0755 GLK: HUGO: Cleanup
00cff85a60 GLK: JACL: Add interpreter version
39a210afac GLK: SCOTT: Cleanup
Commit: 397c9a07555aa0ae044c131a115bd12ab7b78a87
https://github.com/scummvm/scummvm/commit/397c9a07555aa0ae044c131a115bd12ab7b78a87
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-11-17T14:46:53-08:00
Commit Message:
GLK: HUGO: Cleanup
Changed paths:
engines/glk/hugo/detection.cpp
engines/glk/hugo/detection_tables.h
engines/glk/hugo/hugo.cpp
engines/glk/hugo/hugo.h
engines/glk/hugo/stringfn.cpp
engines/glk/hugo/stringfn.h
diff --git a/engines/glk/hugo/detection.cpp b/engines/glk/hugo/detection.cpp
index bd59717..7ebf989 100644
--- a/engines/glk/hugo/detection.cpp
+++ b/engines/glk/hugo/detection.cpp
@@ -70,7 +70,7 @@ bool HugoMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga
gameFile.close();
// Check for known games
- const HugoGameDescription *p = HUGO_GAMES;
+ const GlkDetectionEntry *p = HUGO_GAMES;
while (p->_gameId && (md5 != p->_md5 || filesize != p->_filesize))
++p;
diff --git a/engines/glk/hugo/detection_tables.h b/engines/glk/hugo/detection_tables.h
index b7e9e26..ecc7579 100644
--- a/engines/glk/hugo/detection_tables.h
+++ b/engines/glk/hugo/detection_tables.h
@@ -27,17 +27,6 @@
namespace Glk {
namespace Hugo {
-/**
- * Game description
- */
-struct HugoGameDescription {
- const char *const _gameId;
- const char *const _extra;
- const char *const _md5;
- size_t _filesize;
- Common::Language _language;
-};
-
const PlainGameDescriptor HUGO_GAME_LIST[] = {
{ "hugo", "Hugo IF Game" },
@@ -84,52 +73,48 @@ const PlainGameDescriptor HUGO_GAME_LIST[] = {
{ nullptr, nullptr }
};
-#define ENTRY0(ID, MD5, FILESIZE) { ID, nullptr, MD5, FILESIZE, Common::EN_ANY }
-#define ENTRY1(ID, EXTRA, MD5, FILESIZE) { ID, EXTRA, MD5, FILESIZE, Common::EN_ANY }
-#define TABLE_END_MARKER { nullptr, nullptr, nullptr, 0, Common::EN_ANY }
-
-const HugoGameDescription HUGO_GAMES[] = {
- ENTRY1("acs", "Text Only", "37682bc8cbcc6706b8bd81d0d0b6745e", 371811),
- ENTRY0("acs", "1daad86bee94f4519681c441d4f0f2bc", 371658),
- ENTRY0("annoyotron2", "944056721054fd1c9af9d1e95e63ce52", 66762),
- ENTRY0("cb2", "232827c10abd45c98d77ceffaf9ac9fa", 155732),
- ENTRY0("hugoclock", "53a0b99011ccb14ddc45cfeb8c23d417", 120887),
- ENTRY0("adv350h", "d6735640ca21797f24e3cadb12be4ae2", 124148),
- ENTRY0("down", "4bc119c61d3cdf5d796c36b1d9a023c6", 99561),
- ENTRY0("dragonhunt", "93db9cdf1d2d2800715c93fff0d48a59", 68944),
- ENTRY0("eastofeastwood", "ebc4e37c66fca8a07b5782b57686ce07", 42445),
- ENTRY0("fallacyofdawn", "8821566e2d3b301c6dc705f2bea54eb1", 729176),
- ENTRY1("futureboy", "Demo", "cfce7ee7893bb5adc9ba4ea198f38201", 827396),
- ENTRY1("guiltybastards", "Text Only", "77efc9a102a406a3b123172bb37e87e7", 246971),
- ENTRY0("guiltybastards", "77efc9a102a406a3b123172bb37e87e7", 246971),
- ENTRY0("halloweenhorror1", "db76f8a419767ebe6d1ad304e8001cba", 68923),
- ENTRY0("halloweenhorror2", "34bb57521acd33f1f985f0898d8104a8", 55574),
- ENTRY0("hammurabi", "738739f9dc7ffa041a13445b23e77e37", 46905),
- ENTRY0("htgessay", "c3b5bce395f3f54097077f830dad70ac", 142921),
- ENTRY0("hugozork", "b525f8bc83bc735fb5c62edd1b486499", 172150),
- ENTRY0("ish", "023c9083378fcd1a08d97e60910b54da", 113958),
- ENTRY0("ndrift", "fea92564f4ae4c626841aa4c93fcb31e", 556591),
- ENTRY0("nextday", "2c5a9b95f6fb079986f8a4b178c9fcb4", 136844),
- ENTRY0("nmnl", "cee4e1ffae1fd562d507d65c143739ef", 171732),
- ENTRY0("partyarty", "62dac43addf6ea21e5759e098998773b", 86845),
- ENTRY0("paxless", "db00b1242a4a0898c2d0d2d1c77103f4", 61973),
- ENTRY0("pirateadv", "81c961f121e4465adb4592eee2bcc2d5", 53915),
- ENTRY0("pantomime", "1067b09fda08eafb09d53b51ffe73e7d", 248466),
- ENTRY1("pom", "15feb99", "ba86e162ba30e6dbe82abc96648486da", 95577),
- ENTRY0("renga", "c79032bdc349863f02a4fab30beafd35", 64373),
- ENTRY0("retronemesis", "517908b4503c653a0d9bb326d00b22ab", 101526),
- ENTRY0("scavhunt", "665dce1a0f552e95590b983a3f2106da", 129514),
- ENTRY0("spinning", "487d0a0cdcf55407a09cafdf6ca32237", 99140),
- ENTRY0("spur", "77968cf043ecc012b4938c690b81227c", 185338),
- ENTRY0("squest", "3e91849c6e8ea3072aa58e96010b6078", 36322),
- ENTRY0("teleporttest", "4cc54ad4d5b8f3628aa3925272311efb", 100723),
- ENTRY0("tetrish", "da1299e86f9fcded1f9a41979685ec02", 6464),
- ENTRY0("tradingpunches", "b31b2eed49e788429cd9c5c641a3e713", 315934),
- ENTRY0("tripkey", "f76297d8ff7658752aa5a29417bbb274", 188058),
- ENTRY0("wfte", "695233c271d6e355652bd11d0cc8da5e", 73099),
- ENTRY0("worldbuilder", "031ff1a1364cd0d42600dc1bac967255", 90382),
+const GlkDetectionEntry HUGO_GAMES[] = {
+ DT_ENTRY1("acs", "Text Only", "37682bc8cbcc6706b8bd81d0d0b6745e", 371811),
+ DT_ENTRY0("acs", "1daad86bee94f4519681c441d4f0f2bc", 371658),
+ DT_ENTRY0("annoyotron2", "944056721054fd1c9af9d1e95e63ce52", 66762),
+ DT_ENTRY0("cb2", "232827c10abd45c98d77ceffaf9ac9fa", 155732),
+ DT_ENTRY0("hugoclock", "53a0b99011ccb14ddc45cfeb8c23d417", 120887),
+ DT_ENTRY0("adv350h", "d6735640ca21797f24e3cadb12be4ae2", 124148),
+ DT_ENTRY0("down", "4bc119c61d3cdf5d796c36b1d9a023c6", 99561),
+ DT_ENTRY0("dragonhunt", "93db9cdf1d2d2800715c93fff0d48a59", 68944),
+ DT_ENTRY0("eastofeastwood", "ebc4e37c66fca8a07b5782b57686ce07", 42445),
+ DT_ENTRY0("fallacyofdawn", "8821566e2d3b301c6dc705f2bea54eb1", 729176),
+ DT_ENTRY1("futureboy", "Demo", "cfce7ee7893bb5adc9ba4ea198f38201", 827396),
+ DT_ENTRY1("guiltybastards", "Text Only", "77efc9a102a406a3b123172bb37e87e7", 246971),
+ DT_ENTRY0("guiltybastards", "77efc9a102a406a3b123172bb37e87e7", 246971),
+ DT_ENTRY0("halloweenhorror1", "db76f8a419767ebe6d1ad304e8001cba", 68923),
+ DT_ENTRY0("halloweenhorror2", "34bb57521acd33f1f985f0898d8104a8", 55574),
+ DT_ENTRY0("hammurabi", "738739f9dc7ffa041a13445b23e77e37", 46905),
+ DT_ENTRY0("htgessay", "c3b5bce395f3f54097077f830dad70ac", 142921),
+ DT_ENTRY0("hugozork", "b525f8bc83bc735fb5c62edd1b486499", 172150),
+ DT_ENTRY0("ish", "023c9083378fcd1a08d97e60910b54da", 113958),
+ DT_ENTRY0("ndrift", "fea92564f4ae4c626841aa4c93fcb31e", 556591),
+ DT_ENTRY0("nextday", "2c5a9b95f6fb079986f8a4b178c9fcb4", 136844),
+ DT_ENTRY0("nmnl", "cee4e1ffae1fd562d507d65c143739ef", 171732),
+ DT_ENTRY0("partyarty", "62dac43addf6ea21e5759e098998773b", 86845),
+ DT_ENTRY0("paxless", "db00b1242a4a0898c2d0d2d1c77103f4", 61973),
+ DT_ENTRY0("pirateadv", "81c961f121e4465adb4592eee2bcc2d5", 53915),
+ DT_ENTRY0("pantomime", "1067b09fda08eafb09d53b51ffe73e7d", 248466),
+ DT_ENTRY1("pom", "15feb99", "ba86e162ba30e6dbe82abc96648486da", 95577),
+ DT_ENTRY0("renga", "c79032bdc349863f02a4fab30beafd35", 64373),
+ DT_ENTRY0("retronemesis", "517908b4503c653a0d9bb326d00b22ab", 101526),
+ DT_ENTRY0("scavhunt", "665dce1a0f552e95590b983a3f2106da", 129514),
+ DT_ENTRY0("spinning", "487d0a0cdcf55407a09cafdf6ca32237", 99140),
+ DT_ENTRY0("spur", "77968cf043ecc012b4938c690b81227c", 185338),
+ DT_ENTRY0("squest", "3e91849c6e8ea3072aa58e96010b6078", 36322),
+ DT_ENTRY0("teleporttest", "4cc54ad4d5b8f3628aa3925272311efb", 100723),
+ DT_ENTRY0("tetrish", "da1299e86f9fcded1f9a41979685ec02", 6464),
+ DT_ENTRY0("tradingpunches", "b31b2eed49e788429cd9c5c641a3e713", 315934),
+ DT_ENTRY0("tripkey", "f76297d8ff7658752aa5a29417bbb274", 188058),
+ DT_ENTRY0("wfte", "695233c271d6e355652bd11d0cc8da5e", 73099),
+ DT_ENTRY0("worldbuilder", "031ff1a1364cd0d42600dc1bac967255", 90382),
- TABLE_END_MARKER
+ DT_END_MARKER
};
} // End of namespace Hugo
diff --git a/engines/glk/hugo/hugo.cpp b/engines/glk/hugo/hugo.cpp
index 06285a4..af98c8f 100644
--- a/engines/glk/hugo/hugo.cpp
+++ b/engines/glk/hugo/hugo.cpp
@@ -79,6 +79,8 @@ Hugo::Hugo(OSystem *syst, const GlkGameDescription &gameDesc) : GlkAPI(syst, gam
active_screen(0), step_nest(0), history_last(0)
#endif
{
+ strcpy(gamefile, "");
+
// heexpr
Common::fill(&eval[0], &eval[MAX_EVAL_ELEMENTS], 0);
Common::fill(&var[0], &var[MAXLOCALS + MAXGLOBALS], 0);
diff --git a/engines/glk/hugo/hugo.h b/engines/glk/hugo/hugo.h
index 1cd1682..dd284e3 100644
--- a/engines/glk/hugo/hugo.h
+++ b/engines/glk/hugo/hugo.h
@@ -20,6 +20,8 @@
*
*/
+/* Based on the Hugo interpreter version 3.3.0 */
+
#ifndef GLK_HUGO_HUGO
#define GLK_HUGO_HUGO
diff --git a/engines/glk/hugo/stringfn.cpp b/engines/glk/hugo/stringfn.cpp
index 0b194cf..dff653b 100644
--- a/engines/glk/hugo/stringfn.cpp
+++ b/engines/glk/hugo/stringfn.cpp
@@ -25,9 +25,6 @@
namespace Glk {
namespace Hugo {
-
-/* LEFT */
-
char *StringFunctions::Left(char a[], int l) {
static char *temp;
int i;
diff --git a/engines/glk/hugo/stringfn.h b/engines/glk/hugo/stringfn.h
index f5f29b1..62603e8 100644
--- a/engines/glk/hugo/stringfn.h
+++ b/engines/glk/hugo/stringfn.h
@@ -62,7 +62,6 @@ public:
char *strupr(char *s);
};
-
} // End of namespace Hugo
} // End of namespace Glk
Commit: 00cff85a607aff668f8d9e0ba550ce52f9f50648
https://github.com/scummvm/scummvm/commit/00cff85a607aff668f8d9e0ba550ce52f9f50648
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-11-17T14:50:39-08:00
Commit Message:
GLK: JACL: Add interpreter version
Changed paths:
engines/glk/jacl/jacl.h
diff --git a/engines/glk/jacl/jacl.h b/engines/glk/jacl/jacl.h
index 958238d..5f24dc6 100644
--- a/engines/glk/jacl/jacl.h
+++ b/engines/glk/jacl/jacl.h
@@ -20,6 +20,8 @@
*
*/
+/* Based on the JACL interpreter version 3.0.0 */
+
#ifndef JACL_JACL
#define JACL_JACL
Commit: 39a210afacb9a627bf8a19a320f230667f8218f7
https://github.com/scummvm/scummvm/commit/39a210afacb9a627bf8a19a320f230667f8218f7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-11-17T15:02:34-08:00
Commit Message:
GLK: SCOTT: Cleanup
Changed paths:
engines/glk/scott/detection.cpp
engines/glk/scott/detection_tables.h
engines/glk/scott/scott.h
diff --git a/engines/glk/scott/detection.cpp b/engines/glk/scott/detection.cpp
index f0a6e47..bc2cde3 100644
--- a/engines/glk/scott/detection.cpp
+++ b/engines/glk/scott/detection.cpp
@@ -64,7 +64,7 @@ bool ScottMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
if (!gameFile.open(*file))
continue;
Common::String md5 = Common::computeStreamMD5AsString(gameFile, 5000);
- int32 filesize = gameFile.size();
+ size_t filesize = (size_t)gameFile.size();
gameFile.seek(0);
isBlorb = Blorb::isBlorb(gameFile, ID_SAAI);
gameFile.close();
@@ -73,7 +73,7 @@ bool ScottMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
continue;
// Scan through the Scott game list for a match
- const ScottGame *p = SCOTT_GAMES;
+ const GlkDetectionEntry *p = SCOTT_GAMES;
while (p->_md5 && p->_filesize != filesize && md5 != p->_md5)
++p;
diff --git a/engines/glk/scott/detection_tables.h b/engines/glk/scott/detection_tables.h
index 3720708..2ce6479 100644
--- a/engines/glk/scott/detection_tables.h
+++ b/engines/glk/scott/detection_tables.h
@@ -27,15 +27,6 @@
namespace Glk {
namespace Scott {
-/**
- * Game descriptor for Scott Adams games
- */
-struct ScottGame {
- const char *_md5;
- const char *_gameId;
- int32 _filesize;
-};
-
const PlainGameDescriptor SCOTT_GAME_LIST[] = {
// Scott Adams games
{ "adventureland", "Adventureland" },
@@ -83,78 +74,78 @@ const PlainGameDescriptor SCOTT_GAME_LIST[] = {
{ nullptr, nullptr }
};
-const ScottGame SCOTT_GAMES[] = {
+const GlkDetectionEntry SCOTT_GAMES[] = {
// PC game versions
- { "7c6f495d757a54e73d259efc718d8024", "adventureland", 15896 },
- { "ea535fa7684508410151b4561de1f323", "pirateadventure", 16325 },
- { "379c77a9a483886366b3b5c425e56410", "missionimpossible", 15275 },
- { "a530a6857d1092eaa177eee575c94c71", "voodoocastle", 15852 },
- { "5ebb4ade985670bb2eac54f8fa202214", "thecount", 17476 },
- { "c57bb6df04dc77a2b232bc5bcab6e417", "strangeodyssey", 17489 },
- { "ce2931ac3d5cbc270a5cb7be9e614f6e", "mysteryfunhouse", 17165 },
- { "4e6127fad6b5d75eccd3f3b101f8c9c8", "pyramidofdoom", 17673 },
- { "2c08327ab06d5490bd9e367ddaeca627", "ghosttown", 17831 },
- { "8feb77f11d32e9567ce2fc7d435eaf44", "savageisland1", 19533 },
- { "20c40a349f7a214ac515fb1d63c30a87", "savageisland2", 18367 },
- { "e2a8f956ab215012d1495550c4c11ee8", "goldenvoyage", 18513 },
- { "f986d7e1ee074f65b6c1d00461c9b3c3", "claymorguesorcerer",19232 },
- { "6d98f422cc986d959a3c74351785aea3", "pirateisle", 19013 },
- { "aadcc04e6b37eb9d30a58b5bc775842e", "marveladventure", 18876 },
- { "d569a769f304dc02b3062d97458ddd01", "scottsampler", 13854 },
+ DT_ENTRY0("adventureland", "7c6f495d757a54e73d259efc718d8024", 15896),
+ DT_ENTRY0("pirateadventure", "ea535fa7684508410151b4561de1f323", 16325),
+ DT_ENTRY0("missionimpossible", "379c77a9a483886366b3b5c425e56410", 15275),
+ DT_ENTRY0("voodoocastle", "a530a6857d1092eaa177eee575c94c71", 15852),
+ DT_ENTRY0("thecount", "5ebb4ade985670bb2eac54f8fa202214", 17476),
+ DT_ENTRY0("strangeodyssey", "c57bb6df04dc77a2b232bc5bcab6e417", 17489),
+ DT_ENTRY0("mysteryfunhouse", "ce2931ac3d5cbc270a5cb7be9e614f6e", 17165),
+ DT_ENTRY0("pyramidofdoom", "4e6127fad6b5d75eccd3f3b101f8c9c8", 17673),
+ DT_ENTRY0("ghosttown", "2c08327ab06d5490bd9e367ddaeca627", 17831),
+ DT_ENTRY0("savageisland1", "8feb77f11d32e9567ce2fc7d435eaf44", 19533),
+ DT_ENTRY0("savageisland2", "20c40a349f7a214ac515fb1d63c30a87", 18367),
+ DT_ENTRY0("goldenvoyage", "e2a8f956ab215012d1495550c4c11ee8", 18513),
+ DT_ENTRY0("claymorguesorcerer","f986d7e1ee074f65b6c1d00461c9b3c3", 19232),
+ DT_ENTRY0("pirateisle", "6d98f422cc986d959a3c74351785aea3", 19013),
+ DT_ENTRY0("marveladventure", "aadcc04e6b37eb9d30a58b5bc775842e", 18876),
+ DT_ENTRY0("scottsampler", "d569a769f304dc02b3062d97458ddd01", 13854),
// PDA game versions
- { "ae541fc1085da2f7d561b72ed20a6bc1", "adventureland", 18003 },
- { "cbd47ab4fcfe00231ffd71d52378d410", "pirateadventure", 18482 },
- { "9251ab2c64e63559d8a6e9e6246760a5", "missionimpossible", 17227 },
- { "be849c5747c7fc3b201984afb4403b8e", "voodoocastle", 18140 },
- { "85b75b6079b5ee572b5259b29a0e5d21", "thecount", 19999 },
- { "c423cae841ac1927b5b2e503607b21bc", "strangeodyssey", 20115 },
- { "326b98b991d401605074e64d474ce566", "mysteryfunhouse", 19700 },
- { "8ef9010399f055da9adb15ce7745a11c", "pyramidofdoom", 20320 },
- { "fcdcca8b2acf76ba2d0006cefa3630a1", "ghosttown", 20687 },
- { "c8aaa80f07c40fa8e4b17432644919dc", "savageisland1", 22669 },
- { "2add0f28d9b236c866890cdf8d86ee60", "savageisland2", 21169 },
- { "675126bd0477e8ed9230ad3db5afc45f", "goldenvoyage", 21401 },
- { "0ef0def798d895ed766041fa99dd28a0", "claymorguesorcerer",22346 },
- { "0bf1bcc649422798332a38c88588fdff", "pirateisle", 22087 },
- { "a0a5423967287dae9cbeb9abe8324479", "buckaroobanzai", 21038 },
+ DT_ENTRY0("adventureland", "ae541fc1085da2f7d561b72ed20a6bc1", 18003),
+ DT_ENTRY0("pirateadventure", "cbd47ab4fcfe00231ffd71d52378d410", 18482),
+ DT_ENTRY0("missionimpossible", "9251ab2c64e63559d8a6e9e6246760a5", 17227),
+ DT_ENTRY0("voodoocastle", "be849c5747c7fc3b201984afb4403b8e", 18140),
+ DT_ENTRY0("thecount", "85b75b6079b5ee572b5259b29a0e5d21", 19999),
+ DT_ENTRY0("strangeodyssey", "c423cae841ac1927b5b2e503607b21bc", 20115),
+ DT_ENTRY0("mysteryfunhouse", "326b98b991d401605074e64d474ce566", 19700),
+ DT_ENTRY0("pyramidofdoom", "8ef9010399f055da9adb15ce7745a11c", 20320),
+ DT_ENTRY0("ghosttown", "fcdcca8b2acf76ba2d0006cefa3630a1", 20687),
+ DT_ENTRY0("savageisland1", "c8aaa80f07c40fa8e4b17432644919dc", 22669),
+ DT_ENTRY0("savageisland2", "2add0f28d9b236c866890cdf8d86ee60", 21169),
+ DT_ENTRY0("goldenvoyage", "675126bd0477e8ed9230ad3db5afc45f", 21401),
+ DT_ENTRY0("claymorguesorcerer","0ef0def798d895ed766041fa99dd28a0", 22346),
+ DT_ENTRY0("pirateisle", "0bf1bcc649422798332a38c88588fdff", 22087),
+ DT_ENTRY0("buckaroobanzai", "a0a5423967287dae9cbeb9abe8324479", 21038),
// 11 Mysterious Adventures
- { "2ebf7b1dd515aff34b99b40f27af00e3", "goldenbaton", 13373 },
- { "a10cde2063bb56694000013b32dc0798", "timemachine", 13742 },
- { "6f7040fe091eeb9ebdc2fd7533b94ceb", "arrowofdeath1", 13412 },
- { "c5758034b83b06258e46091a80abebde", "arrowofdeath2", 15554 },
- { "7597704b423c1ca2bea3a48263b5f4dc", "pulsar7", 17777 },
- { "93a7947e2edb7c45036446168b427546", "circus", 13621 },
- { "c8f423a79ad0e508f43ba4ce91f1e573", "feasibility", 13441 },
- { "645c089d6d66324472d939993793eb57", "akyrz", 16803 },
- { "2f5bb15b461fbdc000243acabd324c67", "perseus", 15080 },
- { "3bb85fd505b4d42bd1767c1a76347e2f", "10indians", 14215 },
- { "af134c32cc0d50329d6e7335639ded88", "waxworks11", 16068 },
- { "028303fd062c39b59b28982cde75f085", "goldenbaton", 53374 },
- { "b2ff405412d92b06373d9a5efbb048d4", "timemachine", 54062 },
- { "f11f85802eff8aed9e212aef7f26ede1", "arrowofdeath1", 68150 },
- { "8f2609b1270248c93cdf254435f9d410", "arrowofdeath2", 77544 },
- { "72e14dbfca7ced5c0aadf019b47b4024", "pulsar7", 55516 },
- { "64d44e66c4f5353150f8fbaceaa99800", "circus", 48624 },
- { "2d717aa4f0eba77b77e259f81f92fc37", "feasibility", 78456 },
- { "3467e09eb247c474ae7e8a8d503968d0", "akyrz", 65008 },
- { "4d8389c0ea3425bd4d92492538f63b19", "perseus", 56914 },
- { "72e91da7590138b78d370a3cb1448f3c", "10indians", 64660 },
- { "4d4ee8aa1f24e1745ab1aa017590dcff", "waxworks11", 54556 },
+ DT_ENTRY0("goldenbaton", "2ebf7b1dd515aff34b99b40f27af00e3", 13373),
+ DT_ENTRY0("timemachine", "a10cde2063bb56694000013b32dc0798", 13742),
+ DT_ENTRY0("arrowofdeath1", "6f7040fe091eeb9ebdc2fd7533b94ceb", 13412),
+ DT_ENTRY0("arrowofdeath2", "c5758034b83b06258e46091a80abebde", 15554),
+ DT_ENTRY0("pulsar7", "7597704b423c1ca2bea3a48263b5f4dc", 17777),
+ DT_ENTRY0("circus", "93a7947e2edb7c45036446168b427546", 13621),
+ DT_ENTRY0("feasibility", "c8f423a79ad0e508f43ba4ce91f1e573", 13441),
+ DT_ENTRY0("akyrz", "645c089d6d66324472d939993793eb57", 16803),
+ DT_ENTRY0("perseus", "2f5bb15b461fbdc000243acabd324c67", 15080),
+ DT_ENTRY0("10indians", "3bb85fd505b4d42bd1767c1a76347e2f", 14215),
+ DT_ENTRY0("waxworks11", "af134c32cc0d50329d6e7335639ded88", 16068),
+ DT_ENTRY0("goldenbaton", "028303fd062c39b59b28982cde75f085", 53374),
+ DT_ENTRY0("timemachine", "b2ff405412d92b06373d9a5efbb048d4", 54062),
+ DT_ENTRY0("arrowofdeath1", "f11f85802eff8aed9e212aef7f26ede1", 68150),
+ DT_ENTRY0("arrowofdeath2", "8f2609b1270248c93cdf254435f9d410", 77544),
+ DT_ENTRY0("pulsar7", "72e14dbfca7ced5c0aadf019b47b4024", 55516),
+ DT_ENTRY0("circus", "64d44e66c4f5353150f8fbaceaa99800", 48624),
+ DT_ENTRY0("feasibility", "2d717aa4f0eba77b77e259f81f92fc37", 78456),
+ DT_ENTRY0("akyrz", "3467e09eb247c474ae7e8a8d503968d0", 65008),
+ DT_ENTRY0("perseus", "4d8389c0ea3425bd4d92492538f63b19", 56914),
+ DT_ENTRY0("10indians", "72e91da7590138b78d370a3cb1448f3c", 64660),
+ DT_ENTRY0("waxworks11", "4d4ee8aa1f24e1745ab1aa017590dcff", 54556),
// Other games
- { "c43e19228bae08eab74bc080e17bbe16", "desert", 12287 },
- { "5c59396a2db040148a5d86beb37b2bb9", "jamesbondadv", 12405 },
- { "0072d8afcd30aa1577350dcfad269e47", "burglarsadv", 11541 },
- { "d57705f8f17f0b6044a575accf9cbfd1", "underseaconquest", 5616 },
- { "b980c44e8a49aa9d71e92f6b6bf1d136", "gammaworld", 11531 },
- { "a1ac54630a0583c19269901ec10cd0b1", "marooned", 12576 },
- { "0000d9da5a13701601fb3e7399daa128", "minersadv", 11898 },
- { "d97b5cb5ed66eb276ef9f1c1bae0b8dd", "romulanadv", 13959 },
- { "effb411e74dfe3a8d69b57b9bc3a2cef", "topsecretadv", 15575 },
+ DT_ENTRY0("desert", "c43e19228bae08eab74bc080e17bbe16", 12287),
+ DT_ENTRY0("jamesbondadv", "5c59396a2db040148a5d86beb37b2bb9", 12405),
+ DT_ENTRY0("burglarsadv", "0072d8afcd30aa1577350dcfad269e47", 11541),
+ DT_ENTRY0("underseaconquest", "d57705f8f17f0b6044a575accf9cbfd1", 5616),
+ DT_ENTRY0("gammaworld", "b980c44e8a49aa9d71e92f6b6bf1d136", 11531),
+ DT_ENTRY0("marooned", "a1ac54630a0583c19269901ec10cd0b1", 12576),
+ DT_ENTRY0("minersadv", "0000d9da5a13701601fb3e7399daa128", 11898),
+ DT_ENTRY0("romulanadv", "d97b5cb5ed66eb276ef9f1c1bae0b8dd", 13959),
+ DT_ENTRY0("topsecretadv", "effb411e74dfe3a8d69b57b9bc3a2cef", 15575),
- { nullptr, nullptr, 0 }
+ DT_END_MARKER
};
} // End of namespace Scott
diff --git a/engines/glk/scott/scott.h b/engines/glk/scott/scott.h
index 7f0e761..785ea98 100644
--- a/engines/glk/scott/scott.h
+++ b/engines/glk/scott/scott.h
@@ -20,6 +20,8 @@
*
*/
+/* Based on ScottFree interpreter version 1.14 */
+
#ifndef GLK_SCOTT
#define GLK_SCOTT
More information about the Scummvm-git-logs
mailing list