aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
authorStrangerke2013-06-26 23:11:34 +0200
committerStrangerke2013-06-26 23:11:34 +0200
commit6e2d567bca53b6ffee771b4105e2e73dbd73f5b4 (patch)
tree9880f0c496263ffb6928248d495ce4172dabed18 /engines/gob
parentac387835e4527c1814919093b4e4bc9798d5742d (diff)
parent6716fa39a6fb2a3925576288c256688c5aadd7e9 (diff)
downloadscummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.gz
scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.bz2
scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.zip
Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle
Conflicts: engines/engines.mk
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/anifile.cpp2
-rw-r--r--engines/gob/cmpfile.cpp5
-rw-r--r--engines/gob/detection/tables_adi2.h20
-rw-r--r--engines/gob/detection/tables_adi4.h26
-rw-r--r--engines/gob/detection/tables_adibou.h28
-rw-r--r--engines/gob/detection/tables_ajworld.h2
-rw-r--r--engines/gob/detection/tables_bargon.h10
-rw-r--r--engines/gob/detection/tables_dynasty.h12
-rw-r--r--engines/gob/detection/tables_fallback.h52
-rw-r--r--engines/gob/detection/tables_fascin.h22
-rw-r--r--engines/gob/detection/tables_geisha.h26
-rw-r--r--engines/gob/detection/tables_gob1.h44
-rw-r--r--engines/gob/detection/tables_gob2.h46
-rw-r--r--engines/gob/detection/tables_gob3.h50
-rw-r--r--engines/gob/detection/tables_inca2.h18
-rw-r--r--engines/gob/detection/tables_lit.h38
-rw-r--r--engines/gob/detection/tables_littlered.h10
-rw-r--r--engines/gob/detection/tables_onceupon.h10
-rw-r--r--engines/gob/detection/tables_playtoons.h50
-rw-r--r--engines/gob/detection/tables_urban.h16
-rw-r--r--engines/gob/detection/tables_ween.h28
-rw-r--r--engines/gob/detection/tables_woodruff.h52
-rw-r--r--engines/gob/draw.cpp2
-rw-r--r--engines/gob/expression.cpp17
-rw-r--r--engines/gob/hotspots.cpp3
-rw-r--r--engines/gob/init_v2.cpp2
-rw-r--r--engines/gob/inter.h2
-rw-r--r--engines/gob/inter_fascin.cpp2
-rw-r--r--engines/gob/inter_playtoons.cpp2
-rw-r--r--engines/gob/inter_v2.cpp2
-rw-r--r--engines/gob/inter_v7.cpp52
-rw-r--r--engines/gob/map_v1.cpp2
-rw-r--r--engines/gob/mult_v2.cpp6
-rw-r--r--engines/gob/pregob/onceupon/stork.h2
-rw-r--r--engines/gob/pregob/onceupon/title.cpp2
-rw-r--r--engines/gob/save/saveconverter.cpp1
-rw-r--r--engines/gob/save/saveload.h4
-rw-r--r--engines/gob/sound/adlib.cpp6
-rw-r--r--engines/gob/sound/sound.cpp2
-rw-r--r--engines/gob/sound/soundblaster.cpp2
-rw-r--r--engines/gob/surface.cpp124
-rw-r--r--engines/gob/surface.h32
42 files changed, 367 insertions, 467 deletions
diff --git a/engines/gob/anifile.cpp b/engines/gob/anifile.cpp
index 085ac800cd..3b6a7f61ed 100644
--- a/engines/gob/anifile.cpp
+++ b/engines/gob/anifile.cpp
@@ -159,7 +159,7 @@ void ANIFile::loadAnimation(Animation &animation, FrameArray &frames,
area.left = area.top = 0x7FFF;
area.right = area.bottom = -0x7FFF;
- for (ChunkList::const_iterator c = frame.begin(); c != frame.end(); c++) {
+ for (ChunkList::const_iterator c = frame.begin(); c != frame.end(); ++c) {
uint16 cL, cT, cR, cB;
if (!getCoordinates(c->layer, c->part, cL, cT, cR, cB))
diff --git a/engines/gob/cmpfile.cpp b/engines/gob/cmpfile.cpp
index d304958f76..0c650a917e 100644
--- a/engines/gob/cmpfile.cpp
+++ b/engines/gob/cmpfile.cpp
@@ -135,8 +135,11 @@ void CMPFile::loadCMP(Common::SeekableReadStream &cmp) {
uint32 size = cmp.size();
byte *data = new byte[size];
- if (cmp.read(data, size) != size)
+ if (cmp.read(data, size) != size) {
+ delete[] data;
+
return;
+ }
_vm->_video->drawPackedSprite(data, _surface->getWidth(), _surface->getHeight(), 0, 0, 0, *_surface);
diff --git a/engines/gob/detection/tables_adi2.h b/engines/gob/detection/tables_adi2.h
index da05a31f40..e59552a554 100644
--- a/engines/gob/detection/tables_adi2.h
+++ b/engines/gob/detection/tables_adi2.h
@@ -33,7 +33,7 @@
"Adi 2.0 for Teachers",
AD_ENTRY1s("adi2.stk", "da6f1fb68bff32260c5eecdf9286a2f5", 1533168),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -47,7 +47,7 @@
"Adi 2",
AD_ENTRY1s("adi2.stk", "23f279615c736dc38320f1348e70c36e", 10817668),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -61,7 +61,7 @@
"Adi 2",
AD_ENTRY1s("adi2.stk", "d4162c4298f9423ecc1fb04965557e90", 11531214),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -75,7 +75,7 @@
"Adi 2.5",
AD_ENTRY1s("adi2.stk", "fcac60e6627f37aee219575b60859de9", 16944268),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -89,7 +89,7 @@
"Adi 2.5",
AD_ENTRY1s("adi2.stk", "072d5e2d7826a7c055865568ebf918bb", 16934596),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -103,7 +103,7 @@
"Adi 2.6",
AD_ENTRY1s("adi2.stk", "2fb940eb8105b12871f6b88c8c4d1615", 16780058),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -120,7 +120,7 @@
"Adi 2.6",
AD_ENTRY1s("adi2.stk", "fde7d98a67dbf859423b6473796e932a", 18044780),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -134,7 +134,7 @@
"Adi 2.7.1",
AD_ENTRY1s("adi2.stk", "6fa5dffebf5c7243c6af6b8c188ee00a", 19278008),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -151,7 +151,7 @@
"Adi 2",
AD_ENTRY1s("adi2.stk", "2a40bb48ccbd4e6fb3f7f0fc2f069d80", 17720132),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -191,7 +191,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
diff --git a/engines/gob/detection/tables_adi4.h b/engines/gob/detection/tables_adi4.h
index 4b967d76d3..7147a84d7a 100644
--- a/engines/gob/detection/tables_adi4.h
+++ b/engines/gob/detection/tables_adi4.h
@@ -33,7 +33,7 @@
"Adi 4.0",
AD_ENTRY1s("intro.stk", "a3c35d19b2d28ea261d96321d208cb5a", 6021466),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -47,7 +47,7 @@
"Adi 4.0",
AD_ENTRY1s("intro.stk", "44491d85648810bc6fcf84f9b3aa47d5", 5834944),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -61,7 +61,7 @@
"Adi 4.0",
AD_ENTRY1s("intro.stk", "29374c0e3c10b17dd8463b06a55ad093", 6012072),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -75,7 +75,7 @@
"Adi 4.0 Limited Edition",
AD_ENTRY1s("intro.stk", "ebbbc5e28a4adb695535ed989c1b8d66", 5929644),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -89,7 +89,7 @@
"ADI 4.10",
AD_ENTRY1s("intro.stk", "6afc2590856433b9f5295b032f2b205d", 5923112),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -103,7 +103,7 @@
"ADI 4.11",
AD_ENTRY1s("intro.stk", "6296e4be4e0c270c24d1330881900c7f", 5921234),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -117,7 +117,7 @@
"ADI 4.21",
AD_ENTRY1s("intro.stk", "c5b9f6222c0b463f51dab47317c5b687", 5950490),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -134,7 +134,7 @@
"Addy 4 Grundschule Basis CD",
AD_ENTRY1s("intro.stk", "d2f0fb8909e396328dc85c0e29131ba8", 5847588),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -148,7 +148,7 @@
"Addy 4 Sekundarstufe Basis CD",
AD_ENTRY1s("intro.stk", "367340e59c461b4fa36651cd74e32c4e", 5847378),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -162,7 +162,7 @@
"Addy 4.21",
AD_ENTRY1s("intro.stk", "534f0b674cd4830df94a9c32c4ea7225", 6878034),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -179,7 +179,7 @@
"ADI 4.10",
AD_ENTRY1s("intro.stk", "3e3fa9656e37d802027635ace88c4cc5", 5359144),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -196,7 +196,7 @@
"Adi 4.0 Interactive Demo",
AD_ENTRY1s("intro.stk", "89ace204dbaac001425c73f394334f6f", 2413102),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -210,7 +210,7 @@
"Adi 4.0 / Adibou 2 Demo",
AD_ENTRY1s("intro.stk", "d41d8cd98f00b204e9800998ecf8427e", 0),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO1(GUIO_NOASPECT)
},
diff --git a/engines/gob/detection/tables_adibou.h b/engines/gob/detection/tables_adibou.h
index 0e652839bb..e257ffdf8f 100644
--- a/engines/gob/detection/tables_adibou.h
+++ b/engines/gob/detection/tables_adibou.h
@@ -33,7 +33,7 @@
"ADIBOU 1 Environnement 4-7 ans",
AD_ENTRY1s("intro.stk", "6db110188fcb7c5208d9721b5282682a", 4805104),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"ADIBOU 2",
AD_ENTRY1s("intro.stk", "94ae7004348dc8bf99c23a9a6ef81827", 956162),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -61,7 +61,7 @@
"Le Jardin Magique d'Adibou",
AD_ENTRY1s("intro.stk", "a8ff86f3cc40dfe5898e0a741217ef27", 956328),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -75,7 +75,7 @@
"ADIBOU Version Decouverte",
AD_ENTRY1s("intro.stk", "558c14327b79ed39214b49d567a75e33", 8737856),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -89,7 +89,7 @@
"ADIBOU 2.10 Environnement",
AD_ENTRY1s("intro.stk", "f2b797819aeedee557e904b0b5ccd82e", 8736454),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -103,7 +103,7 @@
"ADIBOU 2.11 Environnement",
AD_ENTRY1s("intro.stk", "7b1f1f6f6477f54401e95d913f75e333", 8736904),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -117,7 +117,7 @@
"ADIBOU 2.12 Environnement",
AD_ENTRY1s("intro.stk", "1e49c39a4a3ce6032a84b712539c2d63", 8738134),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -131,7 +131,7 @@
"ADIBOU 2.13s Environnement",
AD_ENTRY1s("intro.stk", "092707829555f27706920e4cacf1fada", 8737958),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -145,7 +145,7 @@
"ADIBOO 2.14 Environnement",
AD_ENTRY1s("intro.stk", "ff63637e3cb7f0a457edf79457b1c6b3", 9333874),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -162,7 +162,7 @@
"ADIBOU 2",
AD_ENTRY1s("intro.stk", "092707829555f27706920e4cacf1fada", 8737958),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -178,7 +178,7 @@
"ADIB\xD9 2",
AD_ENTRY1s("intro.stk", "092707829555f27706920e4cacf1fada", 8737958),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO0()
},
@@ -199,7 +199,7 @@
{0, 0, 0, 0}
},
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -217,7 +217,7 @@
{0, 0, 0, 0}
},
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -235,7 +235,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
diff --git a/engines/gob/detection/tables_ajworld.h b/engines/gob/detection/tables_ajworld.h
index d86bdb16be..99d61c882e 100644
--- a/engines/gob/detection/tables_ajworld.h
+++ b/engines/gob/detection/tables_ajworld.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1s("intro.stk", "e453bea7b28a67c930764d945f64d898", 3913628),
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_bargon.h b/engines/gob/detection/tables_bargon.h
index ac90355476..5f7fa2ab6f 100644
--- a/engines/gob/detection/tables_bargon.h
+++ b/engines/gob/detection/tables_bargon.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1("intro.stk", "da3c54be18ab73fbdb32db24624a9c23"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("intro.stk", "11103b304286c23945560b391fd37e7d", 3181890),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "da3c54be18ab73fbdb32db24624a9c23", 3181825),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1s("intro.stk", "00f6b4e2ee26e5c40b488e2df5adcf03", 3975580),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -89,7 +89,7 @@
"Fanmade",
AD_ENTRY1s("intro.stk", "da3c54be18ab73fbdb32db24624a9c23", 3181825),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_dynasty.h b/engines/gob/detection/tables_dynasty.h
index 147bf32075..21e4ecc89f 100644
--- a/engines/gob/detection/tables_dynasty.h
+++ b/engines/gob/detection/tables_dynasty.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1s("intro.stk", "6190e32404b672f4bbbc39cf76f41fda", 2511470),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("intro.stk", "61e4069c16e27775a6cc6d20f529fb36", 2511300),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "61e4069c16e27775a6cc6d20f529fb36", 2511300),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1s("intro.stk", "b3f8472484b7a1df94557b51e7b6fca0", 2322644),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -89,7 +89,7 @@
"",
AD_ENTRY1s("intro.stk", "bdbdac8919200a5e71ffb9fb0709f704", 2446652),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -106,7 +106,7 @@
"Demo",
AD_ENTRY1s("intro.stk", "464538a17ed39755d7f1ba9c751af1bd", 1847864),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO1(GUIO_NOASPECT)
},
diff --git a/engines/gob/detection/tables_fallback.h b/engines/gob/detection/tables_fallback.h
index 05f579c08c..69a9e4fd6b 100644
--- a/engines/gob/detection/tables_fallback.h
+++ b/engines/gob/detection/tables_fallback.h
@@ -32,7 +32,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -46,7 +46,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -60,7 +60,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -88,7 +88,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -102,7 +102,7 @@ static const GOBGameDescription fallbackDescs[] = {
"",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -116,7 +116,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -130,7 +130,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -144,7 +144,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -158,7 +158,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -186,7 +186,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -200,7 +200,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -214,7 +214,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -228,7 +228,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -242,7 +242,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -256,7 +256,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -270,7 +270,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -284,7 +284,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -298,7 +298,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -312,7 +312,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -326,7 +326,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -340,7 +340,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -382,7 +382,7 @@ static const GOBGameDescription fallbackDescs[] = {
"",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -396,7 +396,7 @@ static const GOBGameDescription fallbackDescs[] = {
"",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -410,7 +410,7 @@ static const GOBGameDescription fallbackDescs[] = {
"unknown",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
@@ -478,7 +478,7 @@ static const GOBGameDescription fallbackOnceUpon[kOnceUponATimeMAX][kOnceUponATi
"",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -522,7 +522,7 @@ static const GOBGameDescription fallbackOnceUpon[kOnceUponATimeMAX][kOnceUponATi
"",
AD_ENTRY1(0, 0),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_fascin.h b/engines/gob/detection/tables_fascin.h
index 1c9cced303..b74a057db9 100644
--- a/engines/gob/detection/tables_fascin.h
+++ b/engines/gob/detection/tables_fascin.h
@@ -33,7 +33,7 @@
"VGA",
AD_ENTRY1s("disk0.stk", "c14330d052fe4da5a441ac9d81bc5891", 1061955),
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"VGA",
AD_ENTRY1s("disk0.stk", "e8ab4f200a2304849f462dc901705599", 183337),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -64,7 +64,7 @@
"VGA 3 disks edition",
AD_ENTRY1s("disk0.stk", "ab3dfdce43917bc806812959d692fc8f", 1061929),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -78,7 +78,7 @@
"VGA 3 disks edition",
AD_ENTRY1s("disk0.stk", "a50a8495e1b2d67699fb562cb98fc3e2", 1064387),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -92,7 +92,7 @@
"Hebrew edition (censored)",
AD_ENTRY1s("intro.stk", "d6e45ce548598727e2b5587a99718eba", 1055909),
HE_ISR,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -106,7 +106,7 @@
"VGA 3 disks edition",
AD_ENTRY1s("disk0.stk", "3a24e60a035250189643c86a9ceafb97", 1062480),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -123,7 +123,7 @@
"CD Version (Censored)",
AD_ENTRY1s("intro.stk", "9c61e9c22077f72921f07153e37ccf01", 545953),
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOSUBTITLES)
},
@@ -137,7 +137,7 @@
"CD Version (Censored)",
AD_ENTRY1s("intro.stk", "9c61e9c22077f72921f07153e37ccf01", 545953),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOSUBTITLES)
},
@@ -151,7 +151,7 @@
"CD Version (Censored)",
AD_ENTRY1s("intro.stk", "9c61e9c22077f72921f07153e37ccf01", 545953),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOSUBTITLES)
},
@@ -165,7 +165,7 @@
"CD Version (Censored)",
AD_ENTRY1s("intro.stk", "9c61e9c22077f72921f07153e37ccf01", 545953),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOSUBTITLES)
},
@@ -179,7 +179,7 @@
"CD Version (Censored)",
AD_ENTRY1s("intro.stk", "9c61e9c22077f72921f07153e37ccf01", 545953),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOSUBTITLES)
},
diff --git a/engines/gob/detection/tables_geisha.h b/engines/gob/detection/tables_geisha.h
index a32d1ebf81..e9a5cfb77f 100644
--- a/engines/gob/detection/tables_geisha.h
+++ b/engines/gob/detection/tables_geisha.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1s("disk1.stk", "6eebbb98ad90cd3c44549fc2ab30f632", 212153),
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("disk1.stk", "6eebbb98ad90cd3c44549fc2ab30f632", 212153),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("disk1.stk", "0c4c16090921664f50baefdfd24d7f5d", 211889),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1s("disk1.stk", "49107ac897e7c00af6c4ecd78a74a710", 212169),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -89,7 +89,21 @@
"",
AD_ENTRY1s("disk1.stk", "49107ac897e7c00af6c4ecd78a74a710", 212169),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
+ },
+ kGameTypeGeisha,
+ kFeaturesEGA | kFeaturesAdLib,
+ "disk1.stk", "intro.tot", 0
+},
+{ // Supplied by alestedx in bug report #3610207
+ {
+ "geisha",
+ "",
+ AD_ENTRY1s("disk1.stk", "49107ac897e7c00af6c4ecd78a74a710", 212164),
+ ES_ESP,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -103,7 +117,7 @@
"",
AD_ENTRY1s("disk1.stk", "f4d4d9d20f7ad1f879fc417d47faba89", 336732),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_gob1.h b/engines/gob/detection/tables_gob1.h
index e6086e990a..8ae72abf33 100644
--- a/engines/gob/detection/tables_gob1.h
+++ b/engines/gob/detection/tables_gob1.h
@@ -33,7 +33,7 @@
"EGA",
AD_ENTRY1("intro.stk", "c65e9cc8ba23a38456242e1f2b1caad4"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"EGA",
AD_ENTRY1("intro.stk", "f9233283a0be2464248d83e14b95f09c"),
RU_RUS,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -64,7 +64,7 @@
"VGA",
AD_ENTRY1("intro.stk", "26a9118c0770fa5ac93a9626761600b2"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -78,7 +78,7 @@
"VGA",
AD_ENTRY1s("intro.stk", "e157cb59c6d330ca70d12ab0ef1dd12b", 288972),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -95,7 +95,7 @@
"Polish",
AD_ENTRY1s("intro.stk", "97d2443948b2e367cf567fe7e101f5f2", 4049267),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -109,7 +109,7 @@
"v1.000",
AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -123,7 +123,7 @@
"v1.000",
AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -137,7 +137,7 @@
"v1.000",
AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -151,7 +151,7 @@
"v1.000",
AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -165,7 +165,7 @@
"v1.000",
AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -179,7 +179,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -193,7 +193,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -207,7 +207,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -221,7 +221,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -235,7 +235,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -249,7 +249,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "40d4a53818f4fce3f5997d02c3fafe73", 4049248),
HU_HUN,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -263,7 +263,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "40d4a53818f4fce3f5997d02c3fafe73", 4049248),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -277,7 +277,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "40d4a53818f4fce3f5997d02c3fafe73", 4049248),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -291,7 +291,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "40d4a53818f4fce3f5997d02c3fafe73", 4049248),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -662,7 +662,7 @@
"Interactive Demo",
AD_ENTRY1("intro.stk", "e72bd1e3828c7dec4c8a3e58c48bdfdb"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -676,7 +676,7 @@
"Interactive Demo",
AD_ENTRY1s("intro.stk", "a796096280d5efd48cf8e7dfbe426eb5", 193595),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -690,7 +690,7 @@
"Interactive Demo",
AD_ENTRY1s("intro.stk", "35a098571af9a03c04e2303aec7c9249", 116582),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_gob2.h b/engines/gob/detection/tables_gob2.h
index 659e6df063..f2449d086d 100644
--- a/engines/gob/detection/tables_gob2.h
+++ b/engines/gob/detection/tables_gob2.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1("intro.stk", "b45b984ee8017efd6ea965b9becd4d66"),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1("intro.stk", "dedb5d31d8c8050a8cf77abedcc53dae"),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "25a99827cd59751a80bed9620fb677a0", 893302),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1s("intro.stk", "a13ecb4f6d8fd881ebbcc02e45cb5475", 837275),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -89,7 +89,7 @@
"",
AD_ENTRY1("intro.stk", "3e4e7db0d201587dd2df4003b2993ef6"),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -103,7 +103,7 @@
"",
AD_ENTRY1("intro.stk", "a13892cdf4badda85a6f6fb47603a128"),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -117,7 +117,7 @@
"",
AD_ENTRY1("intro.stk", "c47faf1d406504e6ffe63243610bb1f4"),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -131,7 +131,7 @@
"",
AD_ENTRY1("intro.stk", "cd3e1df8b273636ee32e34b7064f50e8"),
RU_RUS,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -145,7 +145,7 @@
"",
AD_ENTRY1s("intro.stk", "5f53c56e3aa2f1e76c2e4f0caa15887f", 829232),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -162,7 +162,7 @@
"v1.000",
AD_ENTRY1("intro.stk", "9de5fbb41cf97182109e5fecc9d90347"),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -176,7 +176,7 @@
"v2.01 Polish",
AD_ENTRY1s("intro.stk", "3025f05482b646c18c2c79c615a3a1df", 5011726),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -190,7 +190,7 @@
"v2.01",
AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -204,7 +204,7 @@
"v2.01",
AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -218,7 +218,7 @@
"v2.01",
AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -232,7 +232,7 @@
"v2.01",
AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -246,7 +246,7 @@
"v2.01",
AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -260,7 +260,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "5ba85a4769a1ab03a283dd694588d526", 5006236),
HU_HUN,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -274,7 +274,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "5ba85a4769a1ab03a283dd694588d526", 5006236),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -288,7 +288,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "5ba85a4769a1ab03a283dd694588d526", 5006236),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -302,7 +302,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "5ba85a4769a1ab03a283dd694588d526", 5006236),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -316,7 +316,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "5ba85a4769a1ab03a283dd694588d526", 5006236),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -587,7 +587,7 @@
"Non-Interactive Demo",
AD_ENTRY1("intro.stk", "8b1c98ff2ab2e14f47a1b891e9b92217"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -601,7 +601,7 @@
"Interactive Demo",
AD_ENTRY1("intro.stk", "cf1c95b2939bd8ff58a25c756cb6125e"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_gob3.h b/engines/gob/detection/tables_gob3.h
index 22ec69054b..29a76d2491 100644
--- a/engines/gob/detection/tables_gob3.h
+++ b/engines/gob/detection/tables_gob3.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1s("intro.stk", "32b0f57f5ae79a9ae97e8011df38af42", 157084),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("intro.stk", "904fc32032295baa3efb3a41f17db611", 178582),
HE_ISR,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "16b014bf32dbd6ab4c5163c44f56fed1", 445104),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1("intro.stk", "1e2f64ec8dfa89f42ee49936a27e66e7"),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -89,7 +89,7 @@
"",
AD_ENTRY1("intro.stk", "f6d225b25a180606fa5dbe6405c97380"),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -103,7 +103,7 @@
"",
AD_ENTRY1("intro.stk", "e42a4f2337d6549487a80864d7826972"),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -117,7 +117,7 @@
"",
AD_ENTRY1s("intro.stk", "fe8144daece35538085adb59c2d29613", 159402),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -131,7 +131,7 @@
"",
AD_ENTRY1("intro.stk", "4e3af248a48a2321364736afab868527"),
RU_RUS,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -145,7 +145,7 @@
"",
AD_ENTRY1("intro.stk", "8d28ce1591b0e9cc79bf41cad0fc4c9c"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -159,7 +159,7 @@
"",
AD_ENTRY1s("intro.stk", "d3b72938fbbc8159198088811f9e6d19", 160382),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -353,7 +353,7 @@
"v1.000",
AD_ENTRY1("intro.stk", "6f2c226c62dd7ab0ab6f850e89d3fc47"),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -367,7 +367,7 @@
"v1.02 Polish",
AD_ENTRY1s("intro.stk", "978afddcac81bb95a04757b61f78471c", 619825),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -381,7 +381,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -395,7 +395,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -409,7 +409,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -423,7 +423,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -437,7 +437,7 @@
"v1.02",
AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -451,7 +451,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "bfd7d4c6fedeb2cfcc8baa4d5ddb1f74", 616220),
HU_HUN,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -465,7 +465,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "bfd7d4c6fedeb2cfcc8baa4d5ddb1f74", 616220),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -479,7 +479,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "bfd7d4c6fedeb2cfcc8baa4d5ddb1f74", 616220),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -493,7 +493,7 @@
"v1.02",
AD_ENTRY1s("intro.stk", "bfd7d4c6fedeb2cfcc8baa4d5ddb1f74", 616220),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -510,7 +510,7 @@
"Non-interactive Demo",
AD_ENTRY1("intro.stk", "b9b898fccebe02b69c086052d5024a55"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -524,7 +524,7 @@
"Interactive Demo",
AD_ENTRY1("intro.stk", "7aebd94e49c2c5c518c9e7b74f25de9d"),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -538,7 +538,7 @@
"Interactive Demo 2",
AD_ENTRY1("intro.stk", "e5dcbc9f6658ebb1e8fe26bc4da0806d"),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -552,7 +552,7 @@
"Interactive Demo 3",
AD_ENTRY1s("intro.stk", "9e20ad7b471b01f84db526da34eaf0a2", 395561),
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_inca2.h b/engines/gob/detection/tables_inca2.h
index 26989f7d1a..8ca9463277 100644
--- a/engines/gob/detection/tables_inca2.h
+++ b/engines/gob/detection/tables_inca2.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -78,7 +78,7 @@
"",
AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -92,7 +92,7 @@
"",
AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -106,7 +106,7 @@
"",
AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -120,7 +120,7 @@
"",
AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -134,7 +134,7 @@
"",
AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -237,7 +237,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_lit.h b/engines/gob/detection/tables_lit.h
index 019d001f97..c4453312ec 100644
--- a/engines/gob/detection/tables_lit.h
+++ b/engines/gob/detection/tables_lit.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1s("intro.stk", "7b7f48490dedc8a7cb999388e2fadbe3", 3930674),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("intro.stk", "e0767783ff662ed93665446665693aef", 4371238),
HE_ISR,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "f1f78b663893b58887add182a77df151", 3944090),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1s("intro.stk", "cd322cb3c64ef2ba2f2134aa2122cfe9", 3936700),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -89,7 +89,7 @@
"",
AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -103,7 +103,7 @@
"",
AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -117,7 +117,7 @@
"",
AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -131,7 +131,7 @@
"",
AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -145,7 +145,7 @@
"",
AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -159,7 +159,7 @@
"",
AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -173,7 +173,7 @@
"",
AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -187,7 +187,7 @@
"",
AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -201,7 +201,7 @@
"",
AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -215,7 +215,7 @@
"",
AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -229,7 +229,7 @@
"",
AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -243,7 +243,7 @@
"",
AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -441,7 +441,7 @@
"Demo",
AD_ENTRY1("demo.stk", "c06f8cc20eb239d4c71f225ce3093edf"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -455,7 +455,7 @@
"Non-interactive Demo",
AD_ENTRY1("demo.stk", "2eba8abd9e3878c57307576012dd2fec"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -472,7 +472,7 @@
"",
AD_ENTRY1s("intro.stk", "3712e7527ba8ce5637d2aadf62783005", 72318),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_PIRATED,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_littlered.h b/engines/gob/detection/tables_littlered.h
index 2b41b65a71..55279f72b6 100644
--- a/engines/gob/detection/tables_littlered.h
+++ b/engines/gob/detection/tables_littlered.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1s("intro.stk", "0b72992f5d8b5e6e0330572a5753ea25", 256490),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("intro.stk", "0b72992f5d8b5e6e0330572a5753ea25", 256490),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "0b72992f5d8b5e6e0330572a5753ea25", 256490),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1s("intro.stk", "0b72992f5d8b5e6e0330572a5753ea25", 256490),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -89,7 +89,7 @@
"",
AD_ENTRY1s("intro.stk", "0b72992f5d8b5e6e0330572a5753ea25", 256490),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_onceupon.h b/engines/gob/detection/tables_onceupon.h
index 366024d43c..c516719c55 100644
--- a/engines/gob/detection/tables_onceupon.h
+++ b/engines/gob/detection/tables_onceupon.h
@@ -234,7 +234,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -253,7 +253,7 @@
{0, 0, 0, 0}
},
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -272,7 +272,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -291,7 +291,7 @@
{0, 0, 0, 0}
},
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -310,7 +310,7 @@
{0, 0, 0, 0}
},
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_playtoons.h b/engines/gob/detection/tables_playtoons.h
index 4eb5945b04..5bdc337eba 100644
--- a/engines/gob/detection/tables_playtoons.h
+++ b/engines/gob/detection/tables_playtoons.h
@@ -37,7 +37,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -55,7 +55,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -73,7 +73,7 @@
{0, 0, 0, 0}
},
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -91,7 +91,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -114,7 +114,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -132,7 +132,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -154,7 +154,7 @@
{0, 0, 0, 0}
},
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -175,7 +175,7 @@
{0, 0, 0, 0}
},
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -196,7 +196,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -214,7 +214,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -232,7 +232,7 @@
{0, 0, 0, 0}
},
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -250,7 +250,7 @@
{0, 0, 0, 0}
},
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -268,7 +268,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -289,7 +289,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -307,7 +307,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -325,7 +325,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -343,7 +343,7 @@
{0, 0, 0, 0}
},
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -361,7 +361,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -382,7 +382,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -400,7 +400,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -421,7 +421,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -442,7 +442,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -463,7 +463,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -484,7 +484,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -505,7 +505,7 @@
{0, 0, 0, 0}
},
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
diff --git a/engines/gob/detection/tables_urban.h b/engines/gob/detection/tables_urban.h
index d24f6a5011..71c34c9d89 100644
--- a/engines/gob/detection/tables_urban.h
+++ b/engines/gob/detection/tables_urban.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1s("intro.stk", "3ab2c542bd9216ae5d02cc6f45701ae1", 1252436),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("intro.stk", "6ce3d878178932053267237ec4843ce1", 1252518),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "b991ed1d31c793e560edefdb349882ef", 1276408),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1s("intro.stk", "4ec3c0864e2b54c5b4ccf9f6ad96528d", 1253328),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -89,7 +89,7 @@
"",
AD_ENTRY1s("intro.stk", "9ea647085a16dd0fb9ecd84cd8778ec9", 1253436),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -103,7 +103,7 @@
"",
AD_ENTRY1s("intro.stk", "4e4a3c017fe5475353bf94c455fe3efd", 1253448),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -117,7 +117,7 @@
"",
AD_ENTRY1s("intro.stk", "4bd31979ea3d77a58a358c09000a85ed", 1253018),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -139,7 +139,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NOASPECT)
},
diff --git a/engines/gob/detection/tables_ween.h b/engines/gob/detection/tables_ween.h
index a02b931b85..89da5ba794 100644
--- a/engines/gob/detection/tables_ween.h
+++ b/engines/gob/detection/tables_ween.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1("intro.stk", "2bb8878a8042244dd2b96ff682381baa"),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("intro.stk", "de92e5c6a8c163007ffceebef6e67f7d", 7117568),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "6d60f9205ecfbd8735da2ee7823a70dc", 7014426),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1("intro.stk", "4b10525a3782aa7ecd9d833b5c1d308b"),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -89,7 +89,7 @@
"",
AD_ENTRY1("intro.stk", "63170e71f04faba88673b3f510f9c4c8"),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -103,7 +103,7 @@
"",
AD_ENTRY1s("intro.stk", "8b57cd510da8a3bbd99e3a0297a8ebd1", 7018771),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -236,7 +236,7 @@
"",
AD_ENTRY1("intro.stk", "2bb8878a8042244dd2b96ff682381baa"),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -250,7 +250,7 @@
"",
AD_ENTRY1s("intro.stk", "de92e5c6a8c163007ffceebef6e67f7d", 7117568),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -264,7 +264,7 @@
"",
AD_ENTRY1s("intro.stk", "6d60f9205ecfbd8735da2ee7823a70dc", 7014426),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -278,7 +278,7 @@
"",
AD_ENTRY1("intro.stk", "4b10525a3782aa7ecd9d833b5c1d308b"),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -292,7 +292,7 @@
"",
AD_ENTRY1("intro.stk", "63170e71f04faba88673b3f510f9c4c8"),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -306,7 +306,7 @@
"",
AD_ENTRY1s("intro.stk", "8b57cd510da8a3bbd99e3a0297a8ebd1", 7018771),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -323,7 +323,7 @@
"Demo",
AD_ENTRY1("intro.stk", "2e9c2898f6bf206ede801e3b2e7ee428"),
UNK_LANG,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
@@ -337,7 +337,7 @@
"Demo",
AD_ENTRY1("intro.stk", "15fb91a1b9b09684b28ac75edf66e504"),
EN_USA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_DEMO,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
diff --git a/engines/gob/detection/tables_woodruff.h b/engines/gob/detection/tables_woodruff.h
index e369539984..f6675a0981 100644
--- a/engines/gob/detection/tables_woodruff.h
+++ b/engines/gob/detection/tables_woodruff.h
@@ -33,7 +33,7 @@
"",
AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -47,7 +47,7 @@
"",
AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -61,7 +61,7 @@
"",
AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -75,7 +75,7 @@
"",
AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -89,7 +89,7 @@
"",
AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -103,7 +103,7 @@
"",
AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -117,7 +117,7 @@
"",
AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -131,7 +131,7 @@
"",
AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -145,7 +145,7 @@
"",
AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -159,7 +159,7 @@
"",
AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -173,7 +173,7 @@
"",
AD_ENTRY1s("intro.stk", "5f5f4e0a72c33391e67a47674b120cc6", 20296422),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -187,7 +187,7 @@
"",
AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -201,7 +201,7 @@
"",
AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -215,7 +215,7 @@
"",
AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -229,7 +229,7 @@
"",
AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -243,7 +243,7 @@
"",
AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -257,7 +257,7 @@
"",
AD_ENTRY1s("intro.stk", "f4c344023b073782d2fddd9d8b515318", 7069736),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -271,7 +271,7 @@
"",
AD_ENTRY1s("intro.stk", "f4c344023b073782d2fddd9d8b515318", 7069736),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -285,7 +285,7 @@
"",
AD_ENTRY1s("intro.stk", "f4c344023b073782d2fddd9d8b515318", 7069736),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -299,7 +299,7 @@
"",
AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
EN_GRB,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -313,7 +313,7 @@
"",
AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
DE_DEU,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -327,7 +327,7 @@
"",
AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
FR_FRA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -341,7 +341,7 @@
"",
AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
IT_ITA,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -355,7 +355,7 @@
"",
AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736),
ES_ESP,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -369,7 +369,7 @@
"",
AD_ENTRY1s("intro.stk", "08a96bf061af1fa4f75c6a7cc56b60a4", 20734979),
PL_POL,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
},
@@ -390,7 +390,7 @@
{0, 0, 0, 0}
},
EN_ANY,
- kPlatformPC,
+ kPlatformDOS,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp
index 8c6919416d..e1322c2831 100644
--- a/engines/gob/draw.cpp
+++ b/engines/gob/draw.cpp
@@ -488,7 +488,7 @@ void Draw::oPlaytoons_sub_F_1B(uint16 id, int16 left, int16 top, int16 right, in
int16 width;
char tmpStr[128];
- strcpy(tmpStr, paramStr);
+ Common::strlcpy(tmpStr, paramStr, 128);
adjustCoords(1, &left, &top);
adjustCoords(1, &right, &bottom);
diff --git a/engines/gob/expression.cpp b/engines/gob/expression.cpp
index fdb4233444..5cea8c0485 100644
--- a/engines/gob/expression.cpp
+++ b/engines/gob/expression.cpp
@@ -21,6 +21,7 @@
*/
#include "common/endian.h"
+#include "common/str.h"
#include "gob/gob.h"
#include "gob/expression.h"
@@ -491,7 +492,7 @@ int Expression::cmpHelper(const StackFrame &stackFrame) {
cmpTemp = (int)stackFrame.values[-3] - (int)stackFrame.values[-1];
} else if (type == OP_LOAD_IMM_STR) {
if ((char *)decodePtr(stackFrame.values[-3]) != _resultStr) {
- strcpy(_resultStr, (char *)decodePtr(stackFrame.values[-3]));
+ Common::strlcpy(_resultStr, (char *)decodePtr(stackFrame.values[-3]), sizeof(_resultStr));
stackFrame.values[-3] = encodePtr((byte *)_resultStr, kResStr);
}
cmpTemp = strcmp(_resultStr, (char *)decodePtr(stackFrame.values[-1]));
@@ -795,10 +796,10 @@ void Expression::simpleArithmetic1(StackFrame &stackFrame) {
case OP_ADD:
if (stackFrame.opers[-2] == OP_LOAD_IMM_STR) {
if ((char *)decodePtr(stackFrame.values[-2]) != _resultStr) {
- strcpy(_resultStr, (char *)decodePtr(stackFrame.values[-2]));
+ Common::strlcpy(_resultStr, (char *)decodePtr(stackFrame.values[-2]), sizeof(_resultStr));
stackFrame.values[-2] = encodePtr((byte *)_resultStr, kResStr);
}
- strcat(_resultStr, (char *)decodePtr(stackFrame.values[0]));
+ Common::strlcat(_resultStr, (char *)decodePtr(stackFrame.values[0]), sizeof(_resultStr));
stackFrame.pop(2);
}
break;
@@ -871,11 +872,11 @@ bool Expression::complexArithmetic(Stack &stack, StackFrame &stackFrame, int16 b
stack.values[brackStart] += stackFrame.values[-1];
} else if (stack.opers[brackStart] == OP_LOAD_IMM_STR) {
if ((char *)decodePtr(stack.values[brackStart]) != _resultStr) {
- strcpy(_resultStr, (char *)decodePtr(stack.values[brackStart]));
+ Common::strlcpy(_resultStr, (char *)decodePtr(stack.values[brackStart]), sizeof(_resultStr));
stack.values[brackStart] =
encodePtr((byte *)_resultStr, kResStr);
}
- strcat(_resultStr, (char *)decodePtr(stackFrame.values[-1]));
+ Common::strlcat(_resultStr, (char *)decodePtr(stackFrame.values[-1]), sizeof(_resultStr));
}
stackFrame.pop(2);
break;
@@ -980,7 +981,7 @@ void Expression::getResult(byte operation, int32 value, byte *type) {
case OP_LOAD_IMM_STR:
if ((char *)decodePtr(value) != _resultStr)
- strcpy(_resultStr, (char *)decodePtr(value));
+ Common::strlcpy(_resultStr, (char *)decodePtr(value), sizeof(_resultStr));
break;
case OP_LOAD_VAR_INT32:
@@ -1109,10 +1110,10 @@ int16 Expression::parseExpr(byte stopToken, byte *type) {
stackFrame.values[-3] += stackFrame.values[-1];
} else if (stackFrame.opers[-3] == OP_LOAD_IMM_STR) {
if ((char *)decodePtr(stackFrame.values[-3]) != _resultStr) {
- strcpy(_resultStr, (char *)decodePtr(stackFrame.values[-3]));
+ Common::strlcpy(_resultStr, (char *)decodePtr(stackFrame.values[-3]), sizeof(_resultStr));
stackFrame.values[-3] = encodePtr((byte *)_resultStr, kResStr);
}
- strcat(_resultStr, (char *)decodePtr(stackFrame.values[-1]));
+ Common::strlcat(_resultStr, (char *)decodePtr(stackFrame.values[-1]), sizeof(_resultStr));
}
stackFrame.pop(2);
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index ecab9bb906..cd00cd13d7 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -1031,12 +1031,12 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig
// Delete the character to the left
_vm->_util->cutFromStr(str, pos - 1, 1);
pos--;
- continue;
} else {
if (pos < strlen(str))
// Delete the character to the right
_vm->_util->cutFromStr(str, pos, 1);
}
+ continue;
case kKeyDelete:
if (pos >= strlen(str))
@@ -1995,6 +1995,7 @@ bool Hotspots::leaveNthPlain(uint16 n, uint16 startIndex, int16 timeVal, const u
// Call the leave and time it
startTime = _vm->_util->getTimeKey();
call(spot.funcLeave);
+ _vm->_inter->animPalette();
callTime = _vm->_util->getTimeKey() - startTime;
// Remove the time it took from the time we have available
diff --git a/engines/gob/init_v2.cpp b/engines/gob/init_v2.cpp
index c204b04a40..1540ff6601 100644
--- a/engines/gob/init_v2.cpp
+++ b/engines/gob/init_v2.cpp
@@ -47,7 +47,7 @@ void Init_v2::initVideo() {
_vm->_global->_colorCount = 16;
if (!_vm->isEGA() &&
- ((_vm->getPlatform() == Common::kPlatformPC) ||
+ ((_vm->getPlatform() == Common::kPlatformDOS) ||
(_vm->getPlatform() == Common::kPlatformMacintosh) ||
(_vm->getPlatform() == Common::kPlatformWindows)) &&
((_vm->_global->_videoMode == 0x13) ||
diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 63bf3eb1c6..2aa837e777 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -693,7 +693,7 @@ protected:
void o7_zeroVar();
void o7_getINIValue();
void o7_setINIValue();
- void o7_loadLBMPalette();
+ void o7_loadIFFPalette();
void o7_opendBase();
void o7_closedBase();
void o7_getDBString();
diff --git a/engines/gob/inter_fascin.cpp b/engines/gob/inter_fascin.cpp
index 001ec06635..c3b5d98a58 100644
--- a/engines/gob/inter_fascin.cpp
+++ b/engines/gob/inter_fascin.cpp
@@ -132,7 +132,7 @@ void Inter_Fascination::oFascin_repeatUntil(OpFuncParams &params) {
// WORKAROUND: The script of the PC version of Fascination, when the protection check
// fails, writes on purpose everywhere in the memory in order to hang the computer.
// This results in a crash in Scummvm. This workaround avoids that crash.
- if (_vm->getPlatform() == Common::kPlatformPC) {
+ if (_vm->getPlatform() == Common::kPlatformDOS) {
if (((blockPos == 3533) && _vm->isCurrentTot("INTRO1.TOT")) ||
((blockPos == 3519) && _vm->isCurrentTot("INTRO2.TOT")) ||
((blockPos == 3265) && _vm->isCurrentTot("INTRO2.TOT"))) //PC Hebrew
diff --git a/engines/gob/inter_playtoons.cpp b/engines/gob/inter_playtoons.cpp
index f76ba8e97b..b0bdde07ac 100644
--- a/engines/gob/inter_playtoons.cpp
+++ b/engines/gob/inter_playtoons.cpp
@@ -301,7 +301,7 @@ void Inter_Playtoons::oPlaytoons_readData(OpFuncParams &params) {
WRITE_VAR(59, stream->readUint32LE());
// The scripts in some versions divide through 256^3 then,
// effectively doing a LE->BE conversion
- if ((_vm->getPlatform() != Common::kPlatformPC) && (VAR(59) < 256))
+ if ((_vm->getPlatform() != Common::kPlatformDOS) && (VAR(59) < 256))
WRITE_VAR(59, SWAP_BYTES_32(VAR(59)));
} else
retSize = stream->read(buf, size);
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index cb58fe86f7..6b7a4f03bd 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -1326,7 +1326,7 @@ void Inter_v2::o2_readData(OpFuncParams &params) {
WRITE_VAR(59, stream->readUint32LE());
// The scripts in some versions divide through 256^3 then,
// effectively doing a LE->BE conversion
- if ((_vm->getPlatform() != Common::kPlatformPC) && (VAR(59) < 256))
+ if ((_vm->getPlatform() != Common::kPlatformDOS) && (VAR(59) < 256))
WRITE_VAR(59, SWAP_BYTES_32(VAR(59)));
} else
retSize = stream->read(buf, size);
diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp
index 6cf69ed9df..1238c23e3b 100644
--- a/engines/gob/inter_v7.cpp
+++ b/engines/gob/inter_v7.cpp
@@ -27,6 +27,7 @@
#include "graphics/cursorman.h"
#include "graphics/wincursor.h"
+#include "graphics/decoders/iff.h"
#include "gob/gob.h"
#include "gob/global.h"
@@ -72,7 +73,7 @@ void Inter_v7::setupOpcodesDraw() {
OPCODEDRAW(0x95, o7_zeroVar);
OPCODEDRAW(0xA1, o7_getINIValue);
OPCODEDRAW(0xA2, o7_setINIValue);
- OPCODEDRAW(0xA4, o7_loadLBMPalette);
+ OPCODEDRAW(0xA4, o7_loadIFFPalette);
OPCODEDRAW(0xC4, o7_opendBase);
OPCODEDRAW(0xC5, o7_closedBase);
OPCODEDRAW(0xC6, o7_getDBString);
@@ -523,7 +524,7 @@ void Inter_v7::o7_setINIValue() {
_inis.setValue(file, section, key, value);
}
-void Inter_v7::o7_loadLBMPalette() {
+void Inter_v7::o7_loadIFFPalette() {
Common::String file = _vm->_game->_script->evalString();
if (!file.contains('.'))
file += ".LBM";
@@ -534,37 +535,46 @@ void Inter_v7::o7_loadLBMPalette() {
if (startIndex > stopIndex)
SWAP(startIndex, stopIndex);
- Common::SeekableReadStream *lbmFile = _vm->_dataIO->getFile(file);
- if (!lbmFile) {
- warning("o7_loadLBMPalette(): No such file \"%s\"", file.c_str());
+ Common::SeekableReadStream *iffFile = _vm->_dataIO->getFile(file);
+ if (!iffFile) {
+ warning("o7_loadIFFPalette(): No such file \"%s\"", file.c_str());
return;
}
- ImageType type = Surface::identifyImage(*lbmFile);
- if (type != kImageTypeLBM) {
- warning("o7_loadLBMPalette(): \"%s\" is no LBM", file.c_str());
+ ImageType type = Surface::identifyImage(*iffFile);
+ if (type != kImageTypeIFF) {
+ warning("o7_loadIFFPalette(): \"%s\" is no IFF", file.c_str());
return;
}
- byte palette[768];
-
- LBMLoader lbm(*lbmFile);
- if (!lbm.loadPalette(palette)) {
- warning("o7_loadLBMPalette(): Failed reading palette from LBM \"%s\"", file.c_str());
+ Graphics::IFFDecoder decoder;
+ decoder.loadStream(*iffFile);
+ if (!decoder.getPalette() || decoder.getPaletteColorCount() != 256) {
+ warning("o7_loadIFFPalette(): Failed reading palette from IFF \"%s\"", file.c_str());
return;
}
- memset(palette , 0x00, 3);
- memset(palette + 765, 0xFF, 3);
- for (int i = 0; i < 768; i++)
- palette[i] >>= 2;
-
- int16 count = stopIndex - startIndex + 1;
+ const byte *palette = decoder.getPalette();
startIndex *= 3;
- count *= 3;
+ stopIndex *= 3;
+
+ byte *dst = (byte *)_vm->_draw->_vgaPalette + startIndex;
+ const byte *src = palette + startIndex;
+ for (int i = startIndex; i <= stopIndex + 2; ++i) {
+ *dst++ = *src++ >> 2;
+ }
+
+ if (startIndex == 0) {
+ dst = (byte *)_vm->_draw->_vgaPalette;
+ dst[0] = dst[1] = dst[2] = 0x00 >> 2;
+ }
+
+ if (stopIndex == 765) {
+ dst = (byte *)_vm->_draw->_vgaPalette + 765;
+ dst[0] = dst[1] = dst[2] = 0xFF >> 2;
+ }
- memcpy((char *)_vm->_draw->_vgaPalette + startIndex, palette + startIndex, count);
_vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
}
diff --git a/engines/gob/map_v1.cpp b/engines/gob/map_v1.cpp
index 45499b71fe..ce3d584e7f 100644
--- a/engines/gob/map_v1.cpp
+++ b/engines/gob/map_v1.cpp
@@ -148,7 +148,7 @@ void Map_v1::loadMapObjects(const char *avjFile) {
void Map_v1::loadSounds(Common::SeekableReadStream &data) {
int16 count;
char buf[19];
- char sndNames[20][14];
+ char sndNames[20][19];
count = data.readUint16LE();
diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index 64b9d19e33..f6dddec71e 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -754,8 +754,10 @@ void Mult_v2::newCycleAnim(Mult_Object &animObj) {
case 1:
animData.frame = 0;
- *(animObj.pPosX) += animLayer->animDeltaX;
- *(animObj.pPosY) += animLayer->animDeltaY;
+ if (animLayer) {
+ *(animObj.pPosX) += animLayer->animDeltaX;
+ *(animObj.pPosY) += animLayer->animDeltaY;
+ }
break;
case 2:
diff --git a/engines/gob/pregob/onceupon/stork.h b/engines/gob/pregob/onceupon/stork.h
index 756f5258c7..ae57983000 100644
--- a/engines/gob/pregob/onceupon/stork.h
+++ b/engines/gob/pregob/onceupon/stork.h
@@ -79,8 +79,6 @@ private:
};
- GobEngine *_vm;
-
Surface *_frame;
ANIObject *_bundle;
diff --git a/engines/gob/pregob/onceupon/title.cpp b/engines/gob/pregob/onceupon/title.cpp
index 5163ff6822..a3905541a0 100644
--- a/engines/gob/pregob/onceupon/title.cpp
+++ b/engines/gob/pregob/onceupon/title.cpp
@@ -62,7 +62,7 @@ void Title::handleFrameEvent() {
void Title::playMusic() {
// Look at what platform this is and play the appropriate music type
- if (_vm->getPlatform() == Common::kPlatformPC)
+ if (_vm->getPlatform() == Common::kPlatformDOS)
playMusicDOS();
else if (_vm->getPlatform() == Common::kPlatformAmiga)
playMusicAmiga();
diff --git a/engines/gob/save/saveconverter.cpp b/engines/gob/save/saveconverter.cpp
index ec8bcbcfea..2db3379aa7 100644
--- a/engines/gob/save/saveconverter.cpp
+++ b/engines/gob/save/saveconverter.cpp
@@ -272,6 +272,7 @@ SavePartSprite *SaveConverter::readSprite(Common::SeekableReadStream &stream,
if (!sprite->readSpriteRaw(data, spriteSize)) {
delete[] data;
+ delete sprite;
return 0;
}
diff --git a/engines/gob/save/saveload.h b/engines/gob/save/saveload.h
index 834484757b..f20532dffa 100644
--- a/engines/gob/save/saveload.h
+++ b/engines/gob/save/saveload.h
@@ -247,9 +247,6 @@ protected:
static SaveFile _saveFiles[];
- NotesHandler *_notesHandler;
- TempSpriteHandler *_tempSpriteHandler;
-
SaveHandler *getHandler(const char *fileName) const;
const char *getDescription(const char *fileName) const;
@@ -809,7 +806,6 @@ protected:
uint8 _id;
int _slot;
- TempHandler *_tmp;
GameHandler *_game;
};
diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp
index d9fc362547..2bf7f266a1 100644
--- a/engines/gob/sound/adlib.cpp
+++ b/engines/gob/sound/adlib.cpp
@@ -375,8 +375,10 @@ void AdLib::setVoiceTimbre(uint8 voice, const uint16 *params) {
const int voicePerc = voice - kVoiceBaseDrum;
if (!isPercussionMode() || (voice < kVoiceBaseDrum)) {
- setOperatorParams(kVoiceMelodyOperator[0][voice], params0, waves[0]);
- setOperatorParams(kVoiceMelodyOperator[1][voice], params1, waves[1]);
+ if (voice < kMelodyVoiceCount) {
+ setOperatorParams(kVoiceMelodyOperator[0][voice], params0, waves[0]);
+ setOperatorParams(kVoiceMelodyOperator[1][voice], params1, waves[1]);
+ }
} else if (voice == kVoiceBaseDrum) {
setOperatorParams(kVoicePercussionOperator[0][voicePerc], params0, waves[0]);
setOperatorParams(kVoicePercussionOperator[1][voicePerc], params1, waves[1]);
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 63af6aeef4..a4c74642dd 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -119,7 +119,7 @@ bool Sound::sampleLoad(SoundDesc *sndDesc, SoundType type, const char *fileName)
byte *data = _vm->_dataIO->getFile(fileName, size);
if (!data || !sndDesc->load(type, data, size)) {
- delete data;
+ delete[] data;
warning("Sound::sampleLoad(): Failed to load sound \"%s\"", fileName);
return false;
diff --git a/engines/gob/sound/soundblaster.cpp b/engines/gob/sound/soundblaster.cpp
index f267eee32d..4d6f6f0bf7 100644
--- a/engines/gob/sound/soundblaster.cpp
+++ b/engines/gob/sound/soundblaster.cpp
@@ -98,7 +98,7 @@ void SoundBlaster::playComposition(const int16 *composition, int16 freqVal,
do {
i++;
_composition[i] = composition[i];
- } while ((i < 50) && (composition[i] != -1));
+ } while ((i < 49) && (composition[i] != -1));
_compositionPos = -1;
nextCompositionPos();
diff --git a/engines/gob/surface.cpp b/engines/gob/surface.cpp
index afbb7c3bae..6b65eb6ab9 100644
--- a/engines/gob/surface.cpp
+++ b/engines/gob/surface.cpp
@@ -26,112 +26,15 @@
#include "common/stream.h"
#include "common/util.h"
#include "common/frac.h"
+#include "common/textconsole.h"
#include "graphics/primitives.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
+#include "graphics/decoders/iff.h"
namespace Gob {
-LBMLoader::LBMLoader(Common::SeekableReadStream &stream) : _parser(&stream),
- _hasHeader(false), _palette(0), _image(0) {
-
-}
-
-bool LBMLoader::loadHeader(Graphics::BMHD &header) {
- if (!readHeader())
- return false;
-
- header = _decoder._header;
- return true;
-}
-
-bool LBMLoader::loadPalette(byte *palette) {
- assert(!_palette);
- assert(palette);
-
- _palette = palette;
-
- Common::Functor1Mem<Common::IFFChunk&, bool, LBMLoader> c(this, &LBMLoader::callbackPalette);
- _parser.parse(c);
-
- if (!_palette)
- return false;
-
- _palette = 0;
- return true;
-}
-
-bool LBMLoader::loadImage(byte *image) {
- assert(!_image);
- assert(image);
-
- if (!readHeader())
- return false;
-
- _image = image;
-
- Common::Functor1Mem<Common::IFFChunk&, bool, LBMLoader> c(this, &LBMLoader::callbackImage);
- _parser.parse(c);
-
- if (!_image)
- return false;
-
- _image = 0;
- return true;
-}
-
-bool LBMLoader::callbackHeader(Common::IFFChunk &chunk) {
- if (chunk._type == ID_BMHD) {
- if (chunk._size == sizeof(Graphics::BMHD)) {
- _decoder.loadHeader(chunk._stream);
- _hasHeader = true;
- }
-
- return true; // Stop the IFF parser
- }
-
- return false;
-}
-
-bool LBMLoader::callbackPalette(Common::IFFChunk &chunk) {
- assert(_palette);
-
- if (chunk._type == ID_CMAP) {
- if (chunk._size == 768) {
- if (chunk._stream->read(_palette, chunk._size) != chunk._size)
- _palette = 0;
- } else
- _palette = 0;
-
- return true; // Stop the IFF parser
- }
-
- return false;
-}
-
-bool LBMLoader::callbackImage(Common::IFFChunk &chunk) {
- assert(_image);
-
- if (chunk._type == ID_BODY) {
- _decoder.loadBitmap(Graphics::ILBMDecoder::ILBM_UNPACK_PLANES, _image, chunk._stream);
- return true;
- }
-
- return false;
-}
-
-bool LBMLoader::readHeader() {
- if (_hasHeader)
- return true;
-
- Common::Functor1Mem<Common::IFFChunk&, bool, LBMLoader> c(this, &LBMLoader::callbackHeader);
- _parser.parse(c);
-
- return _hasHeader;
-}
-
-
static void plotPixel(int x, int y, int color, void *data) {
Surface *dest = (Surface *)data;
@@ -841,8 +744,8 @@ bool Surface::loadImage(Common::SeekableReadStream &stream, ImageType type) {
switch (type) {
case kImageTypeTGA:
return loadTGA(stream);
- case kImageTypeLBM:
- return loadLBM(stream);
+ case kImageTypeIFF:
+ return loadIFF(stream);
case kImageTypeBRC:
return loadBRC(stream);
case kImageTypeBMP:
@@ -871,7 +774,7 @@ ImageType Surface::identifyImage(Common::SeekableReadStream &stream) {
stream.seek(startPos);
if (!strncmp(buffer , "FORM", 4))
- return kImageTypeLBM;
+ return kImageTypeIFF;
if (!strncmp(buffer + 6, "JFIF", 4))
return kImageTypeJPEG;
if (!strncmp(buffer , "BRC" , 3))
@@ -904,20 +807,17 @@ bool Surface::loadTGA(Common::SeekableReadStream &stream) {
return false;
}
-bool Surface::loadLBM(Common::SeekableReadStream &stream) {
+bool Surface::loadIFF(Common::SeekableReadStream &stream) {
+ Graphics::IFFDecoder decoder;
+ decoder.loadStream(stream);
- LBMLoader loader(stream);
-
- Graphics::BMHD header;
- loader.loadHeader(header);
-
- if (header.depth != 8)
- // Only 8bpp LBMs supported for now
+ if (!decoder.getSurface())
return false;
- resize(header.width, header.height);
+ resize(decoder.getSurface()->w, decoder.getSurface()->h);
+ memcpy(_vidMem, decoder.getSurface()->pixels, decoder.getSurface()->w * decoder.getSurface()->h);
- return loader.loadImage(_vidMem);
+ return true;
}
bool Surface::loadBRC(Common::SeekableReadStream &stream) {
diff --git a/engines/gob/surface.h b/engines/gob/surface.h
index 8f895a7910..8a1b502a95 100644
--- a/engines/gob/surface.h
+++ b/engines/gob/surface.h
@@ -26,9 +26,6 @@
#include "common/scummsys.h"
#include "common/ptr.h"
#include "common/rational.h"
-#include "common/iff_container.h"
-
-#include "graphics/iff.h"
namespace Common {
class SeekableReadStream;
@@ -39,37 +36,12 @@ namespace Gob {
enum ImageType {
kImageTypeNone = -1,
kImageTypeTGA = 0,
- kImageTypeLBM,
+ kImageTypeIFF,
kImageTypeBRC,
kImageTypeBMP,
kImageTypeJPEG
};
-class LBMLoader {
-public:
- LBMLoader(Common::SeekableReadStream &stream);
-
- bool loadHeader (Graphics::BMHD &header);
- bool loadPalette(byte *palette);
- bool loadImage (byte *image);
-
-private:
- Common::IFFParser _parser;
-
- bool _hasHeader;
-
- Graphics::ILBMDecoder _decoder;
-
- byte *_palette;
- byte *_image;
-
- bool callbackHeader (Common::IFFChunk &chunk);
- bool callbackPalette(Common::IFFChunk &chunk);
- bool callbackImage (Common::IFFChunk &chunk);
-
- bool readHeader();
-};
-
/** An iterator over a surface's image data, automatically handles different color depths. */
class Pixel {
public:
@@ -182,7 +154,7 @@ private:
uint16 dWidth, uint16 dHeight, uint16 sWidth, uint16 sHeight);
bool loadTGA (Common::SeekableReadStream &stream);
- bool loadLBM (Common::SeekableReadStream &stream);
+ bool loadIFF (Common::SeekableReadStream &stream);
bool loadBRC (Common::SeekableReadStream &stream);
bool loadBMP (Common::SeekableReadStream &stream);
bool loadJPEG(Common::SeekableReadStream &stream);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 14:40:27 +0000