[Scummvm-cvs-logs] SF.net SVN: scummvm:[43390] scummvm/trunk/engines/sci
waltervn at users.sourceforge.net
waltervn at users.sourceforge.net
Sat Aug 15 02:28:59 CEST 2009
Revision: 43390
http://scummvm.svn.sourceforge.net/scummvm/?rev=43390&view=rev
Author: waltervn
Date: 2009-08-15 00:28:59 +0000 (Sat, 15 Aug 2009)
Log Message:
-----------
SCI: Added enum for map and volume versions. Removed res_version setting from
detection.cpp (should be detectable). Cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/sci/console.cpp
scummvm/trunk/engines/sci/detection.cpp
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/engine/script.cpp
scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
scummvm/trunk/engines/sci/resource.cpp
scummvm/trunk/engines/sci/resource.h
scummvm/trunk/engines/sci/sci.cpp
scummvm/trunk/engines/sci/sci.h
scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp
scummvm/trunk/engines/sci/vocabulary.cpp
Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/console.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -381,7 +381,7 @@
}
bool Console::cmdGetVersion(int argc, const char **argv) {
- DebugPrintf("Resource file version: %s\n", versionNames[_vm->getResMgr()->_sciVersion]);
+ DebugPrintf("Resource file version: %s\n", versionNames[_vm->getResMgr()->sciVersion()]);
DebugPrintf("Emulated interpreter version: %s\n", versionNames[_vm->getVersion()]);
return true;
Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/detection.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -108,7 +108,6 @@
{"resource.001", 0, resMd5, resSize}, \
{NULL, 0, NULL, 0}}, lang, Common::kPlatformPC, 0, GUIO_NOSPEECH}, \
0, \
- SCI_VERSION_AUTODETECT, \
ver \
}
@@ -128,7 +127,6 @@
{"resource.001", 0, "6fd05926c2199af0af6f72f90d0d7260", 126895},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -143,7 +141,6 @@
{"resource.003", 0, "d226d7d3b4f77c4a566913fc310487fc", 464348},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -158,7 +155,6 @@
{"resource.003", 0, "85e51acb5f9c539d66e3c8fe40e17da5", 493638},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -170,7 +166,6 @@
{"resource.001", 0, "2af49dbd8f2e1db4ab09f9310dc91259", 570553},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -184,7 +179,6 @@
{"resource.002", 0, "c0c29c51af66d65cb53f49e785a2d978", 1280907},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -196,7 +190,6 @@
{"resource.002", 0, "930e416bec196b9703a331d81b3d66f2", 1283812},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -208,7 +201,6 @@
{"resource.001", 0, "735be4e58957180cfc807d5e18fdffcd", 1433302},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -219,7 +211,6 @@
{"resource.001", 0, "11391434f41c834090d7a1e9488ce936", 129739},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -230,7 +221,6 @@
{"resource.001", 0, "acde93e58fca4f7a2a5a220558a94aa8", 272629},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -241,7 +231,6 @@
{"resource.001", 0, "acde93e58fca4f7a2a5a220558a94aa8", 335362},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -252,7 +241,6 @@
{"resource.000", 0, "62fb9256f8e7e6e65a6875efdb7939ac", 203396},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -269,7 +257,6 @@
{"resource.005", 0, "605b67a9ef199a9bb015745e7c004cf4", 478384},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -280,7 +267,6 @@
{"resource.001", 0, "d4b75e280d1c3a97cfef1b0bebff387c", 573647},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -296,7 +282,6 @@
{"resource.004", 0, "8613c45fc771d658e5a505b9a4a54f31", 670883},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -311,7 +296,6 @@
{"resource.004", 0, "64f342463f6f35ba71b3509ef696ae3f", 669188},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -329,7 +313,6 @@
{"resource.006", 0, "8f880a536908ab496bbc552f7f5c3738", 585255},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -340,7 +323,6 @@
{"resource.001", 0, "4930708722f34bfbaa4945fb08f55f61", 232523},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -355,7 +337,6 @@
{"resource.004", 0, "8e1a3a8c588007404b532b8dfacc1460", 729143},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -372,7 +353,6 @@
{"resource.007", 0, "8e1a3a8c588007404b532b8dfacc1460", 358182},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -390,25 +370,23 @@
{"resource.006", 0, "f9487732289a4f4966b4e34eea413325", 842817},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
// Conquests of the Longbow - English DOS
// SCI interpreter version 1.000.510
{{"longbow", "", {
- {"resource.map", 0, "36d3b81ff75b67dd4d27b7f5d3166503", 6261},
- {"resource.000", 0, "36e8fda5d0b8c49e587c8a9617959f72", 1096767},
- {"resource.001", 0, "d4c299213f8d799da1492680d12d0fb3", 1133226},
- {"resource.002", 0, "7f6ce331219d58d5087731e4475ab4f1", 1128555},
- {"resource.003", 0, "21ebe6b39b57a73fc449f67f013765aa", 972635},
- {"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1064637},
- {"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1154950},
- {"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1042966},
- {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_AUTODETECT,
- SCI_VERSION_1
+ {"resource.map", 0, "36d3b81ff75b67dd4d27b7f5d3166503", 6261},
+ {"resource.000", 0, "36e8fda5d0b8c49e587c8a9617959f72", 1096767},
+ {"resource.001", 0, "d4c299213f8d799da1492680d12d0fb3", 1133226},
+ {"resource.002", 0, "7f6ce331219d58d5087731e4475ab4f1", 1128555},
+ {"resource.003", 0, "21ebe6b39b57a73fc449f67f013765aa", 972635},
+ {"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1064637},
+ {"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1154950},
+ {"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1042966},
+ {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
+ 0,
+ SCI_VERSION_1
},
// Conquests of the Longbow - English DOS Floppy (from jvprat)
@@ -424,7 +402,6 @@
{"resource.005", 0, "21ebe6b39b57a73fc449f67f013765aa", 1284720},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -440,7 +417,6 @@
{"resource.005", 0, "21ebe6b39b57a73fc449f67f013765aa", 1284609},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -457,7 +433,6 @@
{"resource.006", 0, "8c767b3939add63d11274065e46aad04", 713158},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -468,7 +443,6 @@
{"resource.001", 0, "f05a20cc07eee85da8e999d0ac0f596b", 869916},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -485,7 +459,6 @@
{"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1123585},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -497,7 +470,6 @@
{"resource.001", 0, "baf9393a9bfa73098adb501e5bc5487b", 657518},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -508,7 +480,6 @@
{"resource.000", 0, "d908dbef56816ac6c60dd145fdeafb2b", 3536046},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -522,7 +493,6 @@
{"resource.003", 0, "f3146df0ad4297f5ce35aa8c4753bf6c", 586832},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -536,7 +506,6 @@
{"resource.003", 0, "83ac03e4bddb2c1ac2d36d2a587d0536", 1145616},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -550,7 +519,6 @@
{"resource.003", 0, "84dd11b6825255671c703aee5ceff620", 1175835},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -565,7 +533,6 @@
{"resource.003", 0, "84dd11b6825255671c703aee5ceff620", 1174993},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -579,7 +546,6 @@
{"resource.003", 0, "f8f767f9d6351432621c6e54c1b2ba8c", 1141520},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -590,7 +556,6 @@
{"resource.000", 0, "dd6f614c43c029f063e93cd243af90a4", 525992},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -601,7 +566,6 @@
{"resource.000", 0, "cc1d17e5637528dbe4a812699e1cbfc6", 4208192},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -612,7 +576,6 @@
{"resource.000", 0, "1c4093f7248240329121fdf8c0d59152", 4231946},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -623,7 +586,6 @@
{"resource.000", 0, "5ea8e7a3ea10cce6efd5c106dc62fd8c", 867724},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -634,7 +596,6 @@
{"resource.000", 0, "ee3c64ffff0ba9fb08bea2624631c598", 5490246},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -647,7 +608,6 @@
{"resource.msg", 0, "554f65315d851184f6e38211489fdd8f", -1},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -660,7 +620,6 @@
{"resource.msg", 0, "304b5a5781800affd2235152a5794fa8", -1},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -676,7 +635,6 @@
{"resource.msg", 0, "45b5bf74933ac3727e4cc844446dc052", 796156},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -689,7 +647,6 @@
{"resource.msg", 0, "45b5bf74933ac3727e4cc844446dc052", 796156},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -700,7 +657,6 @@
{"resource.000", 0, "4962a3c4dd44e36e78ea4a7a374c2220", 957382},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -711,7 +667,6 @@
{"resource.001", 0, "f1e680095424e31f7fae1255d36bacba", 40692},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -722,7 +677,6 @@
{"resource.000", 0, "eb3ed7477ca4110813fe1fcf35928561", 1718450},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -734,7 +688,6 @@
{"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 13022630},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -745,7 +698,6 @@
{"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 13022630},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -756,7 +708,6 @@
{"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13077029},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -767,7 +718,6 @@
{"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 12581736},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -778,7 +728,6 @@
{"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13400497},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -789,7 +738,6 @@
{"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13381599},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -800,7 +748,6 @@
{"resource.000", 0, "d04cfc7f04b6f74d13025378be49ec2b", 4640330},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
// Gabriel Knight 2 - English DOS (from jvprat)
@@ -820,7 +767,6 @@
{"ressci.006", 0, "8e44e03890205a7be12f45aaba9644b4", 60659424},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif // ENABLE_SCI32
@@ -834,7 +780,6 @@
{"resource.003", 0, "e0dd44069a62a463fd124974b915f10d", 328912},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -845,7 +790,6 @@
{"resource.001", 0, "e0dd44069a62a463fd124974b915f10d", 518308},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -858,7 +802,6 @@
{"resource.002", 0, "e0dd44069a62a463fd124974b915f10d", 439502},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
#endif
@@ -871,7 +814,6 @@
{"resource.002", 0, "8f2dd70abe01112eca464cda818b5eb6", 196631},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -883,7 +825,6 @@
{"resource.001", 0, "8f2dd70abe01112eca464cda818b5eb6", 222704},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -897,7 +838,6 @@
{"resource.001", 0, "143df8aef214a2db34c2d48190742012", 632273},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
#endif
@@ -910,7 +850,6 @@
{"resource.001", 0, "24db2bccda0a3c43ac4a7b5edb116c7e", 797678},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -923,7 +862,6 @@
{"resource.001", 0, "0a98a268ee99b92c233a0d7187c1f0fa", 845795},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -934,7 +872,6 @@
{"resource.000", 0, "24c10844792c54d476d272213cbac300", 675252},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -947,7 +884,6 @@
{"resource.002", 0, "b86daa3ba2784d1502da881eedb80d9b", 719747},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01_VGA_ODD,
SCI_VERSION_1
},
#endif
@@ -963,7 +899,6 @@
{"resource.004", 0, "9ae2a13708d691cd42f9129173c4b39d", 820443},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
SCI_VERSION_01
},
@@ -974,7 +909,6 @@
{"resource.001", 0, "4cfb9040db152868f7cb6a1e8151c910", 296555},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -988,7 +922,6 @@
{"resource.003", 0, "fed9e0072ffd511d248674e60dee2099", 717478},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1004,7 +937,6 @@
{"resource.004", 0, "3fac034c7d130e055d05bc43a1f8d5f8", 549993},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1015,7 +947,6 @@
{"resource.001", 0, "143e1c14f15ad0fbfc714f648a65f661", 205330},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1030,7 +961,6 @@
{"resource.004", 0, "77615c595388acf3d1df8e107bfb6b52", 479562},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1047,7 +977,6 @@
{"resource.007", 0, "851a62d00972dc4002f472cc0d84e71d", 341038},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1064,7 +993,6 @@
{"resource.007", 0, "0c8566848a76eea19a6d6220914030a7", 343882},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1083,7 +1011,6 @@
{"resource.007", 0, "b914b5901e786327213e779725d30dd1", 778772},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1102,7 +1029,6 @@
{"resource.007", 0, "56546b20db11a4836f900efa6d3a3e74", 794194},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1121,7 +1047,6 @@
{"resource.007", 0, "11cb750f5f816445ad0f4b9f50a4f59a", 794259},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1134,7 +1059,6 @@
{"resource.001", 0, "b45a581ff8751e052c7e364f58d3617f", 16800210},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1152,7 +1076,6 @@
{"resource.007", 0, "2f48faf27666b58c276dda20f91f4a93", 1240456},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- 0,
SCI_VERSION_1
},
@@ -1170,7 +1093,6 @@
{"resource.007", 0, "c07494f0cce7c05210893938786a955b", 1337361},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1189,7 +1111,6 @@
{"resource.007", 0, "7db4d0a1d8d547c0019cb7d2a6acbdd4", 1338473},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1207,7 +1128,6 @@
{"resource.007", 0, "dc10c107e0923b902326a040b9c166b9", 1337859},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1225,7 +1145,6 @@
{"resource.007", 0, "431def14ca29cdb5e6a5e84d3f38f679", 1240176},
{NULL, 0, NULL, 0}}, Common::PL_POL, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1238,7 +1157,6 @@
{"resource.msg", 0, "54d1fdc936f98c81f9e4c19e04fb1510", 8260},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1250,7 +1168,6 @@
{"resource.msg", 0, "3cf5de44de36191f109d425b8450efc8", 258590},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1262,7 +1179,6 @@
{"resource.msg", 0, "756297b2155db9e43f621c6f6fb763c3", 282822},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1274,7 +1190,6 @@
{"resource.000", 0, "233394a5f33b475ae5975e7e9a420865", 8376352},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_1_1,
SCI_VERSION_1_1
},
@@ -1287,7 +1202,6 @@
{"resource.msg", 0, "41eed2d3893e1ca6c3695deba4e9d2e8", 267102},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1299,7 +1213,6 @@
{"resource.000", 0, "eb63ea3a2c2469dc2d777d351c626404", 203882535},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -1310,7 +1223,6 @@
{"resource.000", 0, "51c1ead1163e19a2de8f121c39df7a76", 200764100},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -1321,7 +1233,6 @@
{"resource.000", 0, "eb63ea3a2c2469dc2d777d351c626404", 206626576},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -1332,7 +1243,6 @@
{"resource.000", 0, "51c1ead1163e19a2de8f121c39df7a76", 200764100},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -1343,7 +1253,6 @@
{"resource.000", 0, "d9659d2cf0c269c6a9dc776707f5bea0", 2433827},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif // ENABLE_SCI32
@@ -1361,7 +1270,6 @@
{"resource.005", 0, "bfd870d51dc97729f0914095f58e6957", 676881},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1376,7 +1284,6 @@
{"resource.004", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 683737},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAtariST, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1387,7 +1294,6 @@
{"resource.001", 0, "0c8912290af0890f8d95faeb4ddb2d68", 333031},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1401,7 +1307,6 @@
{"resource.004", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 683807},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1418,7 +1323,6 @@
{"resource.007", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 317687},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1435,7 +1339,6 @@
{"resource.007", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 317687},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1447,7 +1350,6 @@
{"resource.000", 0, "2b2b1b4f7584f9b38fd13f6ab95634d1", 781912},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1459,7 +1361,6 @@
{"resource.000", 0, "57084910bc923bff5d6d9bc1b56e9604", 5035964},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1471,7 +1372,6 @@
{"resource.000", 0, "82578b8d5a7e09c4c58891ca49fae35b", 5598672},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1483,7 +1383,6 @@
{"resource.msg", 0, "795c928cd00dfec9fbc62ebcd12e1f65", 303185},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1495,7 +1394,6 @@
{"resource.msg", 0, "71f1f0cd9f082da2e750c793a8ed9d84", 286141},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1509,7 +1407,6 @@
{"resource.003", 0, "685cd6c1e05a695ab1e0db826337ee2a", 553279},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1524,7 +1421,6 @@
{"resource.003", 0, "4a34c3367c2fe7eb380d741374da1989", 572251},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1537,7 +1433,6 @@
{"resource.002", 0, "85d6935ef77e6b0e16bc307640a0d913", 1088312},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1550,7 +1445,6 @@
{"resource.002", 0, "85b030bb66d5342b0a068f1208c431a8", 1078443},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1561,7 +1455,6 @@
{"resource.001", 0, "0c0768215c562d9dace4a5ca53696cf3", 359913},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1577,7 +1470,6 @@
{"resource.003", 0, "ac175df0ea9a2cba57f0248651856d27", 376556},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1591,7 +1483,6 @@
{"resource.002", 0, "b7409ab32bc3bee2d6cce887cd33f2b6", 1092160},
{NULL, 0, NULL, 0}}, Common::RU_RUS, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1606,7 +1497,6 @@
{"resource.004", 0, "a0d4a625311d307257da7fc43d00459d", 717844},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1618,7 +1508,6 @@
{"resource.001", 0, "9f5520f0297206928df0b0b36493cd33", 127532},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1634,7 +1523,6 @@
{"resource.006", 0, "4a24443a25e2b1492462a52809605dc2", 345683},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1650,7 +1538,6 @@
{"resource.006", 0, "96033f57accfca903750413fd09193c8", 345818},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1667,7 +1554,6 @@
{"resource.005", 0, "433911eb764089d493aed1f958a5615a", 524259},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1681,7 +1567,6 @@
{"resource.004", 0, "f18441027154292836b973c655fa3175", 513651},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1698,7 +1583,6 @@
{"resource.007", 0, "f18441027154292836b973c655fa3175", 257174},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1710,7 +1594,6 @@
{"resource.002", 0, "f773d79b93dfd4052ec8c1cc64c1e6ab", 268299},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1725,7 +1608,6 @@
{"resource.004", 0, "3827a9b17b926e12dcc336860f50612a", 691932},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1740,7 +1622,6 @@
{"resource.004", 0, "65f1bdaa20f6d0470e9d969f22473873", 690826},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -1758,7 +1639,6 @@
{"resource.006", 0, "bafc64e3144f115dc58c6aee02de98fb", 715598},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1777,7 +1657,6 @@
{"resource.007", 0, "59eba83ad465b08d763b44f86afa86f6", 683135},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1788,7 +1667,6 @@
{"resource.001", 0, "8bd8d9c0b5f455ee1269d63ce86c50dd", 531380},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1806,7 +1684,6 @@
{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 1030656},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1824,7 +1701,6 @@
{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 993408},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1843,7 +1719,6 @@
{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 958842},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1862,7 +1737,6 @@
{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 987222},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1873,7 +1747,6 @@
{"resource.000", 0, "a8989a5a89e7d4f702b26b378c7a357a", 7001981},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -1884,7 +1757,6 @@
{"resource.000", 0, "4462fe48c7452d98fddcec327a3e738d", 5789138},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1895,7 +1767,6 @@
{"resource.000", 0, "57d5fe8bb9e044158514476ea7678eb0", 5754790},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1906,7 +1777,6 @@
{"resource.000", 0, "f6cbc6da7b90ea135883e0759848ca2c", 5773160},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1917,7 +1787,6 @@
{"resource.000", 0, "f6cbc6da7b90ea135883e0759848ca2c", 5776092},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1928,7 +1797,6 @@
{"resource.000", 0, "7884a8db9253e29e6b37a2651fd90ba3", 5733116},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1939,7 +1807,6 @@
{"resource.001", 0, "3733433b517ec3d14a3331d9ab3842ae", 344830},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -1951,7 +1818,6 @@
{"resource.000", 0, "9a9f4870504444cda863dd14d077a680", 18520872},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -1962,7 +1828,6 @@
{"resource.000", 0, "bd944d2b06614a5b39f1586906f0ee88", 18534274},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -1973,7 +1838,6 @@
{"resource.000", 0, "bd944d2b06614a5b39f1586906f0ee88", 18538987},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -1984,7 +1848,6 @@
{"ressci.000", 0, "89353723488219e25589165d73ed663e", 66965678},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -1995,7 +1858,6 @@
{"ressci.000", 0, "a8c6817bb94f332ff498a71c8b47f893", 66971724},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2006,7 +1868,6 @@
{"ressci.000", 0, "dc37c3055fffbefb494ff22b145d377b", 66964472},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2017,7 +1878,6 @@
{"ressci.000", 0, "440b9fed89590abb4e4386ed6f948ee2", 67140181},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2028,7 +1888,6 @@
{"ressci.000", 0, "32792f9bc1bf3633a88b382bb3f6e40d", 67071418},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2039,7 +1898,6 @@
{"resmap.000", 0, "6a2b2811eef82e87cde91cf1de845af8", 2695},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2050,7 +1908,6 @@
{"resource.000", 0, "5d7714416b612463d750fb9c5690c859", 28952},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2061,7 +1918,6 @@
{"ressci.000", 0, "3c585827fa4a82f4c04a56a0bc52ccee", 11494351},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2074,7 +1930,6 @@
{"ressci.002", 0, "175468431a979b9f317c294ce3bc1430", 94628315},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2087,7 +1942,6 @@
{"ressci.002", 0, "3c8d627c555b0e3e4f1d9955bc0f0df4", 94631127},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif // ENABLE_SCI32
@@ -2099,7 +1953,6 @@
{"resource.001", 0, "9e33566515b18bee7915db448063bba2", 871853},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
SCI_VERSION_01
},
@@ -2114,7 +1967,6 @@
{"resource.004", 0, "f79daa70390d73746742ffcfc3dc4471", 937580},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
SCI_VERSION_01
},
@@ -2128,7 +1980,6 @@
{"resource.003", 0, "dd6cef0c592eadb7e6be9a25307c57a2", 1344719},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
SCI_VERSION_01
},
@@ -2141,7 +1992,6 @@
{"resource.002", 0, "fb552ae550ca1dac19ed8f6a3767612d", 817191},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
SCI_VERSION_01
},
@@ -2152,7 +2002,6 @@
{"resource.000", 0, "b7ecd8ae9e254e80310b5a668b276e6e", 2948975},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_01,
SCI_VERSION_01
},
@@ -2164,7 +2013,6 @@
{"resource.001", 0, "5a0ed1d745855148364de1b3be099bac", 4369438},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2175,7 +2023,6 @@
{"resource.001", 0, "5a0ed1d745855148364de1b3be099bac", 2070072},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2187,7 +2034,6 @@
{"resource.000", 0, "1926925c95d82f0999590e93b02887c5", 15150768},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif // ENABLE_SCI32
@@ -2199,7 +2045,6 @@
{"resource.001", 0, "453ea81ef66a50cbe33ce06302afe47f", 229737},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2223,7 +2068,6 @@
//{"ressci.007", 0, "3aae6559aa1df273bc542d5ac6330d75", 25859038},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2242,7 +2086,6 @@
{"ressci.005", 0, "05f9fe2bee749659acb3cd2c90252fc5", 67905112},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif // ENABLE_SCI32
@@ -2254,7 +2097,6 @@
{"resource.000", 0, "670d0c53622429f4b11275caf7f8d292", 5459574},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2265,7 +2107,6 @@
{"resource.000", 0, "118f6c31a93ec7fd9a231c61125229e3", 645494},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2276,7 +2117,6 @@
{"resource.000", 0, "e6a918a2dd7a4bcecd8fb389f43287c2", 1698164},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2287,7 +2127,6 @@
{"resource.000", 0, "e6a918a2dd7a4bcecd8fb389f43287c2", 1713544},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2298,7 +2137,6 @@
{"resource.000", 0, "e0d5ddf34eda903a38f0837e2aa7145b", 6401433},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2312,7 +2150,6 @@
{"resource.003", 0, "e008f5d6e2a7c4d4a0da0173e4fa8f8b", 553970},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2323,7 +2160,6 @@
{"resource.001", 0, "376ef6d6eaaeed66e1424bd219c4b9ab", 215398},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2339,7 +2175,6 @@
{"resource.006", 0, "77f02def3094af804fd2371db25b7100", 354991},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2352,7 +2187,6 @@
{"resource.003", 0, "77f02def3094af804fd2371db25b7100", 591851},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2365,7 +2199,6 @@
{"resource.003", 0, "77f02def3094af804fd2371db25b7100", 586857},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2381,7 +2214,6 @@
{"resource.004", 0, "7b229fbdf30d670d0728cede3e984a7e", 838663},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2398,7 +2230,6 @@
{"resource.005", 0, "6258d5dd85898d8e218eb8113ebc9059", 704485},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2414,7 +2245,6 @@
{"resource.004", 0, "1b91e891a3c60a941dac0eecdf83375b", 1143606},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2427,7 +2257,6 @@
{"resource.001", 0, "5c5a551b6c86cce2ee75becb90e0b586", 624411},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2443,7 +2272,6 @@
{"resource.004", 0, "0c3eb84b9755852d9e795e0d5c9373c7", 1171760},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2454,7 +2282,6 @@
{"resource.000", 0, "527d5684016e6816157cd15d9071b11b", 1121310},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2466,7 +2293,6 @@
{"resource.000", 0, "fd316a09b628b7032248139003369022", 18841068},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2477,7 +2303,6 @@
{"resource.000", 0, "da383857b3be1e4514daeba2524359e0", 15141432},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2488,7 +2313,6 @@
{"resource.000", 0, "6ba98bd2e436739d87ecd2a9b99cabb4", 14730155},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2499,7 +2323,6 @@
{"resource.000", 0, "d8892f1b8c56c8f7704325460f49b300", 3676175},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2516,7 +2339,6 @@
{"ressci.004", 0, "b7e619e6ecf62fe65d5116a3a422e5f0", 46223872},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif // ENABLE_SCI32
@@ -2532,7 +2354,6 @@
{"resource.004", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 641688},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2550,7 +2371,6 @@
{"resource.007", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 272747},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2563,7 +2383,6 @@
{"resource.003", 0, "a21451ef6fa8179bd4b22c4950004c44", 769897},
{NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_01
},
@@ -2576,7 +2395,6 @@
{"resource.003", 0, "a21451ef6fa8179bd4b22c4950004c44", 777575},
{NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_01
},
@@ -2593,7 +2411,6 @@
{"resource.005", 0, "5f3386ef2f2b1254e4a066f5d9027324", 609529},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2608,7 +2425,6 @@
{"resource.004", 0, "951299a82a8134ed12c5c18118d45c2f", 644443},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -2619,7 +2435,6 @@
{"resource.000", 0, "ecace1a2771846b1a8aa1afdd44111a0", 6570147},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2630,7 +2445,6 @@
{"resource.000", 0, "ec6f5cf369054dd3e5392995e9975b9e", 768218},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2649,7 +2463,6 @@
{"resource.007", 0, "4c9fc1587545879295cb9627f56a2cb8", 575056},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_01
},
@@ -2664,7 +2477,6 @@
{"resource.004", 0, "cd2de58e27665d5853530de93fae7cd6", 983617},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_01
},
@@ -2682,7 +2494,6 @@
{"resource.007", 0, "cd2de58e27665d5853530de93fae7cd6", 490794},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_01
},
@@ -2693,7 +2504,6 @@
{"resource.000", 0, "b6c69bf6c18bf177492249fe81fc6a6d", 648702},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2704,7 +2514,6 @@
{"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5868000},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2715,7 +2524,6 @@
{"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5868042},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2727,7 +2535,6 @@
{"resource.msg", 0, "a63974730d294dec0bea10057c36e506", 256014},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2738,7 +2545,6 @@
{"resource.000", 0, "41ba03f0b188b029132daa3ece0d3e14", 623154},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2750,7 +2556,6 @@
{"resource.000", 0, "f64fd6aa3977939a86ff30783dd677e1", 11004993},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2761,7 +2566,6 @@
{"resource.000", 0, "57f22cdc54eeb35fce1f26b31b5c3ee1", 11076197},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2772,7 +2576,6 @@
{"resource.000", 0, "263dce4aa34c49d3ad29bec889007b1c", 11571394},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2786,7 +2589,6 @@
{"resource.000", 0, "263dce4aa34c49d3ad29bec889007b1c", 11571394},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif
@@ -2798,7 +2600,6 @@
{"resource.000", 0, "57f22cdc54eeb35fce1f26b31b5c3ee1", 11076197},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2809,7 +2610,6 @@
{"ressci.001", 0, "259437fd75fdf51e8207fda8c01fa4fd", 2334384},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2824,7 +2624,6 @@
{"ressci.003", 0, "2a68edd064e5e4937b5e9c74b38f2082", 6860492},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2835,7 +2634,6 @@
{"resmap.001", 0, "70ba2ff04a2b7fb2c52420ba7fbd47c2", 8338},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformWindows, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2846,7 +2644,6 @@
{"ressci.000", 0, "4294c6d7510935f2e0a52e302073c951", 262654836},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2856,7 +2653,6 @@
{"ressci.000", 0, "6751b144671e2deed919eb9d284b07eb", 262390692},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2867,7 +2663,6 @@
{"ressci.000", 0, "3a93c6340b54e07e65d0e5583354d186", 10505469},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -2878,7 +2673,6 @@
{"ressci.000", 0, "7fbac0807a044c9543e8ac376d200e59", 4925003},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif // ENABLE_SCI32
@@ -2891,7 +2685,6 @@
{"resource.000", 0, "8e10d4f05c1fd9f883384fa38a898489", 377394},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -2907,7 +2700,6 @@
{"resource.005", 0, "640ffe1a9acde392cc33cc1b1a528328", 806324},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2923,7 +2715,6 @@
{"resource.004", 0, "e19ea4ad131472f9238590f2e1d40289", 1203051},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2934,7 +2725,6 @@
{"resource.001", 0, "fd99ea43f57576ded7c86036996346cf", 507642},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2951,7 +2741,6 @@
{"resource.005", 0, "7d4ebcb745c0bf8fc42e4013f52ecd49", 1101812},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -2965,7 +2754,6 @@
{"resource.004", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 761984},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0,
SCI_VERSION_0
},
@@ -2981,7 +2769,6 @@
{"resource.005", 0, "6d8f34090503ce937e7dbef6cb6cdb6a", 687507},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_0,
SCI_VERSION_0
},
@@ -2992,7 +2779,6 @@
{"resource.001", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 180245},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -3005,7 +2791,6 @@
{"resource.003", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 688367},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -3018,7 +2803,6 @@
{"resource.003", 0, "8b55c4875298f45ea5696a5ee8f6a7fe", 703370},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -3035,7 +2819,6 @@
{"resource.007", 0, "9107c2aa5398e28b5c5406df13491f85", 344287},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -3048,7 +2831,6 @@
{"resource.003", 0, "9107c2aa5398e28b5c5406df13491f85", 693573},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
},
@@ -3066,7 +2848,6 @@
{"resource.006", 0, "ade814bc4d56244c156d9e9bcfebbc11", 664085},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3083,7 +2864,6 @@
{"resource.006", 0, "67fb188b191d88efe8414af6ea297b93", 672675},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3095,7 +2875,6 @@
{"resource.000", 0, "e1f46832cd2458796028e054a0466031", 5502009},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3107,7 +2886,6 @@
{"resource.000", 0, "e1f46832cd2458796028e054a0466031", 933928},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3124,7 +2902,6 @@
{"resource.005", 0, "e33019ac19f755ae33fbf49b4fc9066c", 1053294},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3141,7 +2918,6 @@
{"resource.006", 0, "dfb023e4e2a1e7a00fa18f9ede72a91b", 924059},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3157,7 +2933,6 @@
{"resource.005", 0, "5f885abd335978e2fd4e5f886d7676c8", 1102880},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3170,7 +2945,6 @@
{"resource.002", 0, "6dc668326cc22cb9e8bd8ca9e68d2a66", 1181249},
{NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3183,7 +2957,6 @@
{"resource.002", 0, "6dc668326cc22cb9e8bd8ca9e68d2a66", 1181249},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3194,7 +2967,6 @@
{"resource.000", 0, "63247e3901ab8963d4eece73747832e0", 5157378},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -3211,7 +2983,6 @@
{"resource.005", 0, "55fae26c2a92f16ef72c1e216e827c0f", 1098328},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3226,7 +2997,6 @@
{"resource.003", 0, "42a307941edeb1a3be31daeb2e4be90b", 1088408},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3243,7 +3013,6 @@
{"resource.005", 0, "b8d6efbd3235329bfe844c794097b2c9", 1098717},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1
},
@@ -3255,7 +3024,6 @@
{"resource.msg", 0, "bb8ad78793c26bdb3f77498b1d6515a9", 125988},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -3266,7 +3034,6 @@
{"resource.000", 0, "f4a48705764544d7cc64a7bb22a610df", 6025184},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -3278,7 +3045,6 @@
{"resource.msg", 0, "7c71cfc36153cfe07b450423a51f7e68", 146282},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -3289,7 +3055,6 @@
{"resource.map", 0, "5b09168baa2f6e2e22787429b2d72f54", 6492},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -3301,7 +3066,6 @@
{"resource.000", 0, "c4259ab7355aead07773397b1052827d", 41150806},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -3312,7 +3076,6 @@
{"resource.000", 0, "c4259ab7355aead07773397b1052827d", 41150806},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -3323,7 +3086,6 @@
{"resource.000", 0, "ab12724e078dea34b624e0d2a38dcd7c", 2272050},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -3334,7 +3096,6 @@
{"resource.000", 0, "ba87ba91e5bdabb4169dd0df75777722", 40933685},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif // ENABLE_SCI32
@@ -3346,7 +3107,6 @@
{"resource.000", 0, "b3acd9b9dd7fe53c4ee133ac9a1acfab", 2103560},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -3357,7 +3117,6 @@
{"resource.000", 0, "ecc686e0034fb4d41de077ac7167b3cf", 1947866},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -3368,7 +3127,6 @@
{"resource.000", 0, "b3acd9b9dd7fe53c4ee133ac9a1acfab", 586560},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_1_1
},
@@ -3380,7 +3138,6 @@
{"ressci.000", 0, "db3e290481c35c3224e9602e71e4a1f1", 5073868},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -3391,7 +3148,6 @@
{"ressci.000", 0, "693a259d346c9360f4a0c11fdaae430a", 55973887},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -3403,7 +3159,6 @@
// TODO: depend on one of the patches?
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -3414,7 +3169,6 @@
{"ressci.000", 0, "693a259d346c9360f4a0c11fdaae430a", 55973887},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -3425,7 +3179,6 @@
{"ressci.000", 0, "693a259d346c9360f4a0c11fdaae430a", 55973887},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
@@ -3436,7 +3189,6 @@
{"ressci.000", 0, "693a259d346c9360f4a0c11fdaae430a", 55973887},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformWindows, 0, GUIO_NONE},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_32
},
#endif // ENABLE_SCI32
@@ -3467,7 +3219,7 @@
// FIXME: The vga demo does not have a resource.000/001 file.
//FANMADE_V("SCI VGA Demo", "00b1abd87bad356b90fcdfcb6132c26f", 8, "", 0, 0),
- {AD_TABLE_END_MARKER, 0, SCI_VERSION_AUTODETECT, SCI_VERSION_0}
+ {AD_TABLE_END_MARKER, 0, SCI_VERSION_0}
};
/**
@@ -3485,7 +3237,6 @@
GUIO_NONE
},
0,
- SCI_VERSION_AUTODETECT,
SCI_VERSION_0
};
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -179,7 +179,7 @@
}
int game_init_sound(EngineState *s, int sound_flags) {
- if (s->resmgr->_sciVersion >= SCI_VERSION_01)
+ if (s->resmgr->sciVersion() >= SCI_VERSION_01)
sound_flags |= SFX_STATE_FLAG_MULTIPLAY;
s->sfx_init_flags = sound_flags;
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -396,7 +396,7 @@
features = 0;
// Initialize features based on SCI version
- if (_resmgr->_sciVersion == SCI_VERSION_0) {
+ if (_resmgr->sciVersion() == SCI_VERSION_0) {
features |= kFeatureOldScriptHeader;
features |= kFeatureOldGfxFunctions;
}
@@ -419,10 +419,10 @@
if (tmp == "motionCue")
features &= ~kFeatureOldGfxFunctions;
- if (tmp == "egoMoveSpeed" && _resmgr->_sciVersion < SCI_VERSION_1_1)
+ if (tmp == "egoMoveSpeed" && _resmgr->sciVersion() < SCI_VERSION_1_1)
features |= kFeatureLofsAbsolute;
- if (tmp == "sightAngle" && _resmgr->_sciVersion == SCI_VERSION_0)
+ if (tmp == "sightAngle" && _resmgr->sciVersion() == SCI_VERSION_0)
features |= kFeatureSci0Sci1Table;
if (tmp == "setVol")
@@ -642,7 +642,7 @@
int mapped = 0;
int ignored = 0;
uint functions_nr = getKernelNamesSize();
- uint max_functions_nr = (_resmgr->_sciVersion == SCI_VERSION_0) ? 0x72 : 0x7b;
+ uint max_functions_nr = (_resmgr->sciVersion() == SCI_VERSION_0) ? 0x72 : 0x7b;
if (functions_nr < max_functions_nr) {
warning("SCI version believed to have %d kernel"
@@ -833,7 +833,7 @@
}
void Kernel::setDefaultKernelNames() {
- bool isSci0 = (_resmgr->_sciVersion == SCI_VERSION_0);
+ bool isSci0 = (_resmgr->sciVersion() == SCI_VERSION_0);
int offset = 0;
// Check if we have a SCI01 game which uses a SCI1 kernel table (e.g. the KQ1 demo
@@ -862,7 +862,7 @@
}
}
- if (_resmgr->_sciVersion == SCI_VERSION_1_1) {
+ if (_resmgr->sciVersion() == SCI_VERSION_1_1) {
// HACK: KQ6CD calls unimplemented function 0x26
_kernelNames[0x26] = "Dummy";
}
@@ -898,10 +898,9 @@
bool Kernel::loadKernelNames() {
_kernelNames.clear();
- switch (_resmgr->_sciVersion) {
+ switch (_resmgr->sciVersion()) {
case SCI_VERSION_0:
case SCI_VERSION_01:
- case SCI_VERSION_01_VGA_ODD:
case SCI_VERSION_1:
case SCI_VERSION_1_1:
setDefaultKernelNames();
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -693,7 +693,7 @@
static void reconstruct_sounds(EngineState *s) {
Song *seeker;
- SongIteratorType it_type = s->resmgr->_sciVersion >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
+ SongIteratorType it_type = s->resmgr->sciVersion() >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
seeker = s->_sound._songlib._lib;
Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/engine/script.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -93,7 +93,6 @@
case SCI_VERSION_0:
break;
case SCI_VERSION_01:
- case SCI_VERSION_01_VGA_ODD:
case SCI_VERSION_1:
case SCI_VERSION_1_1:
g_opcode_formats[op_lofsa][0] = Script_Offset;
Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -55,7 +55,7 @@
gfxr_init_static_palette();
_portBounds = Common::Rect(0, 10, 320, 200); // default value, with a titlebar of 10px
- _version = resManager->_volVersion;
+ _version = resManager->sciVersion();
// Workaround for QFG1 VGA (has SCI 1.1 view data with SCI 1 compression)
if (_version == SCI_VERSION_1 && !strcmp(((SciEngine*)g_engine)->getGameID(), "qfg1")) {
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/resource.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -428,7 +428,7 @@
readResourcePatches(source);
break;
case kSourceExtMap:
- if (_mapVersion < SCI_VERSION_1)
+ if (_mapVersion < kResVersionSci1Late)
readResourceMapSCI0(source);
else
readResourceMapSCI1(source);
@@ -453,74 +453,72 @@
_sources.clear();
}
-ResourceManager::ResourceManager(int version, int maxMemory) {
+ResourceManager::ResourceManager(int maxMemory) {
_maxMemory = maxMemory;
_memoryLocked = 0;
_memoryLRU = 0;
_LRU.clear();
_resMap.clear();
- _sciVersion = version;
_audioMapSCI1 = NULL;
addAppropriateSources();
- if (version != SCI_VERSION_AUTODETECT) {
- _mapVersion = version;
- _volVersion = version;
- } else {
- _mapVersion = detectMapVersion();
- _volVersion = detectVolVersion();
- if (_volVersion == 0 && _mapVersion > 0) {
- warning("Volume version not detected, but map version has been detected. Setting volume version to map version");
- _volVersion = _mapVersion;
- }
+ // FIXME: put this in an Init() function, so that we can error out if detection fails completely
- if (_mapVersion == 0 && _volVersion > 0) {
- warning("Map version not detected, but volume version has been detected. Setting map version to volume version");
- _mapVersion = _volVersion;
- }
+ _mapVersion = detectMapVersion();
+ _volVersion = detectVolVersion();
+ if ((_volVersion == kResVersionUnknown) && (_mapVersion != kResVersionUnknown)) {
+ warning("Volume version not detected, but map version has been detected. Setting volume version to map version");
+ _volVersion = _mapVersion;
}
- debug("Using resource map version %d %s", _mapVersion, versionNames[_mapVersion]);
- debug("Using volume version %d %s", _volVersion, versionNames[_volVersion]);
+ if ((_mapVersion == kResVersionUnknown) && (_volVersion != kResVersionUnknown)) {
+ warning("Map version not detected, but volume version has been detected. Setting map version to volume version");
+ _mapVersion = _volVersion;
+ }
+
+ debug("Resmgr: Detected resource map version %d: %s", _mapVersion, versionDescription(_mapVersion));
+ debug("Resmgr: Detected volume version %d: %s", _volVersion, versionDescription(_volVersion));
+
scanNewSources();
addInternalSources();
scanNewSources();
- if (version == SCI_VERSION_AUTODETECT)
- switch (_mapVersion) {
- case SCI_VERSION_0:
- if (testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SCI0_MAIN_VOCAB))) {
- version = guessSciVersion() ? SCI_VERSION_01 : SCI_VERSION_0;
- } else if (testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SCI1_MAIN_VOCAB))) {
- version = guessSciVersion();
- if (version != SCI_VERSION_01) {
- version = testResource(ResourceId(kResourceTypeVocab, 912)) ? SCI_VERSION_0 : SCI_VERSION_01;
- }
- } else {
- version = guessSciVersion() ? SCI_VERSION_01 : SCI_VERSION_0;
+ switch (_mapVersion) {
+ case kResVersionSci0Sci1Early:
+ if (testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SCI0_MAIN_VOCAB))) {
+ _sciVersion = guessSciVersion() ? SCI_VERSION_01 : SCI_VERSION_0;
+ } else if (testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SCI1_MAIN_VOCAB))) {
+ _sciVersion = guessSciVersion();
+ if (_sciVersion != SCI_VERSION_01) {
+ _sciVersion = testResource(ResourceId(kResourceTypeVocab, 912)) ? SCI_VERSION_0 : SCI_VERSION_01;
}
- break;
- case SCI_VERSION_01_VGA_ODD:
- version = _mapVersion;
- break;
- case SCI_VERSION_1:
- _sciVersion = version = SCI_VERSION_1;
- break;
- case SCI_VERSION_1_1:
- // No need to handle SCI 1.1 here - it was done in resource_map.cpp
- version = SCI_VERSION_1_1;
- break;
- default:
- version = SCI_VERSION_AUTODETECT;
+ } else {
+ _sciVersion = guessSciVersion() ? SCI_VERSION_01 : SCI_VERSION_0;
}
+ break;
+ case kResVersionSci1Middle:
+ _sciVersion = SCI_VERSION_01;
+ break;
+ case kResVersionSci1Late:
+ _sciVersion = SCI_VERSION_1;
+ break;
+ case kResVersionSci11:
+ _sciVersion = SCI_VERSION_1_1;
+ break;
+ case kResVersionSci32:
+ _sciVersion = SCI_VERSION_32;
+ break;
+ default:
+ _sciVersion = SCI_VERSION_AUTODETECT;
+ }
_isVGA = false;
// Determine if the game is using EGA graphics or not
- if (version == SCI_VERSION_0) {
+ if (_sciVersion == SCI_VERSION_0) {
_isVGA = false; // There is no SCI0 VGA game
- } else if (version >= SCI_VERSION_1_1) {
+ } else if (_sciVersion >= SCI_VERSION_1_1) {
_isVGA = true; // There is no SCI11 EGA game
} else {
// SCI01 or SCI1: EGA games have the second byte of their views set
@@ -538,12 +536,11 @@
}
// Workaround for QFG1 VGA (has SCI 1.1 view data with SCI 1 compression)
- if (version == SCI_VERSION_1 && !strcmp(((SciEngine*)g_engine)->getGameID(), "qfg1")) {
+ if (_sciVersion == SCI_VERSION_1 && !strcmp(((SciEngine*)g_engine)->getGameID(), "qfg1")) {
debug("Resmgr: Detected QFG1 VGA");
_isVGA = true;
}
- _sciVersion = version;
// temporary version printout - should be reworked later
switch (_sciVersion) {
case SCI_VERSION_0:
@@ -552,9 +549,6 @@
case SCI_VERSION_01:
debug("Resmgr: Detected SCI01");
break;
- case SCI_VERSION_01_VGA_ODD:
- debug("Resmgr: Detected SCI01VGA - Jones/CD or similar");
- break;
case SCI_VERSION_1:
debug("Resmgr: Detected SCI1");
break;
@@ -713,7 +707,26 @@
freeOldResources();
}
-int ResourceManager::detectMapVersion() {
+const char *ResourceManager::versionDescription(ResVersion version) const {
+ switch (version) {
+ case kResVersionUnknown:
+ return "Unknown";
+ case kResVersionSci0Sci1Early:
+ return "SCI0 / Early SCI1";
+ case kResVersionSci1Middle:
+ return "Middle SCI1";
+ case kResVersionSci1Late:
+ return "Late SCI1";
+ case kResVersionSci11:
+ return "SCI1.1";
+ case kResVersionSci32:
+ return "SCI32";
+ }
+
+ return "Version not valid";
+}
+
+ResourceManager::ResVersion ResourceManager::detectMapVersion() {
Common::File file;
byte buff[6];
ResourceSource *rsrc= 0;
@@ -728,7 +741,7 @@
}
if (file.isOpen() == false) {
error("Failed to open resource map file");
- return SCI_VERSION_AUTODETECT;
+ return kResVersionUnknown;
}
// detection
// SCI0 and SCI01 maps have last 6 bytes set to FF
@@ -739,9 +752,9 @@
file.seek(0, SEEK_SET);
while (file.read(buff, 6) == 6 && !(buff[0] == 0xFF && buff[1] == 0xFF && buff[2] == 0xFF)) {
if (getVolume(rsrc, (buff[5] & 0xFC) >> 2) == NULL)
- return SCI_VERSION_01_VGA_ODD;
+ return kResVersionSci1Middle;
}
- return SCI_VERSION_0;
+ return kResVersionSci0Sci1Early;
}
// SCI1 and SCI1.1 maps consist of a fixed 3-byte header, a directory list (3-bytes each) that has one entry
@@ -750,7 +763,7 @@
uint16 directoryOffset = 0;
uint16 lastDirectoryOffset = 0;
uint16 directorySize = 0;
- int mapDetected = 0;
+ ResVersion mapDetected = kResVersionUnknown;
file.seek(0, SEEK_SET);
while (!file.eos()) {
directoryType = file.readByte();
@@ -763,9 +776,9 @@
if (lastDirectoryOffset) {
directorySize = directoryOffset - lastDirectoryOffset;
if ((directorySize % 5) && (directorySize % 6 == 0))
- mapDetected = SCI_VERSION_1;
+ mapDetected = kResVersionSci1Late;
if ((directorySize % 5 == 0) && (directorySize % 6))
- mapDetected = SCI_VERSION_1_1;
+ mapDetected = kResVersionSci11;
}
if (directoryType==0xFF) {
// FFh entry needs to point to EOF
@@ -773,7 +786,7 @@
break;
if (mapDetected)
return mapDetected;
- return SCI_VERSION_1;
+ return kResVersionSci1Late;
}
lastDirectoryOffset = directoryOffset;
}
@@ -789,13 +802,13 @@
// last directory entry instead of the last checked directory entry.
file.seek(lastDirectoryOffset - 7, SEEK_SET);
if (file.readByte() == 0xFF && file.readUint16LE() == file.size())
- return SCI_VERSION_32; // TODO : check if there is a difference between these maps
+ return kResVersionSci32; // TODO : check if there is a difference between these maps
#endif
- return SCI_VERSION_AUTODETECT;
+ return kResVersionUnknown;
}
-int ResourceManager::detectVolVersion() {
+ResourceManager::ResVersion ResourceManager::detectVolVersion() {
Common::File file;
ResourceSource *rsrc;
for (Common::List<ResourceSource *>::iterator it = _sources.begin(); it != _sources.end(); ++it) {
@@ -808,7 +821,7 @@
}
if (file.isOpen() == false) {
error("Failed to open volume file");
- return SCI_VERSION_AUTODETECT;
+ return kResVersionUnknown;
}
// SCI0 volume format: {wResId wPacked+4 wUnpacked wCompression} = 8 bytes
// SCI1 volume format: {bResType wResNumber wPacked+4 wUnpacked wCompression} = 9 bytes
@@ -818,34 +831,34 @@
// Checking 1MB of data should be enough to determine the version
uint16 resId, wCompression;
uint32 dwPacked, dwUnpacked;
- int curVersion = SCI_VERSION_0;
+ ResVersion curVersion = kResVersionSci0Sci1Early;
bool failed = false;
// Check for SCI0, SCI1, SCI1.1 and SCI32 v2 (Gabriel Knight 1 CD) formats
while (!file.eos() && file.pos() < 0x100000) {
- if (curVersion > SCI_VERSION_0)
+ if (curVersion > kResVersionSci0Sci1Early)
file.readByte();
resId = file.readUint16LE();
- dwPacked = (curVersion < SCI_VERSION_32) ? file.readUint16LE() : file.readUint32LE();
- dwUnpacked = (curVersion < SCI_VERSION_32) ? file.readUint16LE() : file.readUint32LE();
- wCompression = (curVersion < SCI_VERSION_32) ? file.readUint16LE() : file.readUint32LE();
+ dwPacked = (curVersion < kResVersionSci32) ? file.readUint16LE() : file.readUint32LE();
+ dwUnpacked = (curVersion < kResVersionSci32) ? file.readUint16LE() : file.readUint32LE();
+ wCompression = (curVersion < kResVersionSci32) ? file.readUint16LE() : file.readUint32LE();
if (file.eos())
return curVersion;
- int chk = (curVersion == SCI_VERSION_0) ? 4 : 20;
- int offs = curVersion < SCI_VERSION_1_1 ? 4 : 0;
- if ((curVersion < SCI_VERSION_32 && wCompression > chk)
- || (curVersion == SCI_VERSION_32 && wCompression != 0 && wCompression != 32)
+ int chk = (curVersion == kResVersionSci0Sci1Early) ? 4 : 20;
+ int offs = curVersion < kResVersionSci11 ? 4 : 0;
+ if ((curVersion < kResVersionSci32 && wCompression > chk)
+ || (curVersion == kResVersionSci32 && wCompression != 0 && wCompression != 32)
|| (wCompression == 0 && dwPacked != dwUnpacked + offs)
|| (dwUnpacked < dwPacked - offs)) {
// Retry with a newer SCI version
- if (curVersion == SCI_VERSION_0) {
- curVersion = SCI_VERSION_1;
- } else if (curVersion == SCI_VERSION_1) {
- curVersion = SCI_VERSION_1_1;
- } else if (curVersion == SCI_VERSION_1_1) {
- curVersion = SCI_VERSION_32;
+ if (curVersion == kResVersionSci0Sci1Early) {
+ curVersion = kResVersionSci1Late;
+ } else if (curVersion == kResVersionSci1Late) {
+ curVersion = kResVersionSci11;
+ } else if (curVersion == kResVersionSci11) {
+ curVersion = kResVersionSci32;
} else {
// All version checks failed, exit loop
failed = true;
@@ -856,11 +869,11 @@
continue;
}
- if (curVersion < SCI_VERSION_1_1)
+ if (curVersion < kResVersionSci11)
file.seek(dwPacked - 4, SEEK_CUR);
- else if (curVersion == SCI_VERSION_1_1)
+ else if (curVersion == kResVersionSci11)
file.seek((9 + dwPacked) % 2 ? dwPacked + 1 : dwPacked, SEEK_CUR);
- else if (curVersion == SCI_VERSION_32)
+ else if (curVersion == kResVersionSci32)
file.seek(dwPacked, SEEK_CUR);//(9 + wPacked) % 2 ? wPacked + 1 : wPacked, SEEK_CUR);
}
@@ -868,7 +881,7 @@
return curVersion;
// Failed to detect volume version
- return SCI_VERSION_AUTODETECT;
+ return kResVersionUnknown;
}
// version-agnostic patch application
@@ -997,10 +1010,8 @@
file.seek(0, SEEK_SET);
- byte bMask = 0xFC;
- // FIXME: The code above seems to give correct results for Jones
- //byte bMask = _mapVersion == SCI_VERSION_01_VGA_ODD ? 0xF0 : 0xFC;
- byte bShift = _mapVersion == SCI_VERSION_01_VGA_ODD ? 28 : 26;
+ byte bMask = (_mapVersion == kResVersionSci1Middle) ? 0xF0 : 0xFC;
+ byte bShift = (_mapVersion == kResVersionSci1Middle) ? 28 : 26;
do {
id = file.readUint16LE();
@@ -1040,7 +1051,7 @@
resource_index_t resMap[32];
memset(resMap, 0, sizeof(resource_index_t) * 32);
byte type = 0, prevtype = 0;
- byte nEntrySize = _mapVersion == SCI_VERSION_1_1 ? SCI11_RESMAP_ENTRIES_SIZE : SCI1_RESMAP_ENTRIES_SIZE;
+ byte nEntrySize = _mapVersion == kResVersionSci11 ? SCI11_RESMAP_ENTRIES_SIZE : SCI1_RESMAP_ENTRIES_SIZE;
ResourceId resId;
// Read resource type and offsets to resource offsets block from .MAP file
@@ -1062,7 +1073,7 @@
for (int i = 0; i < resMap[type].wSize; i++) {
uint16 number = file.readUint16LE();
int volume_nr = 0;
- if (_mapVersion == SCI_VERSION_1_1) {
+ if (_mapVersion == kResVersionSci11) {
// offset stored in 3 bytes
off = file.readUint16LE();
off |= file.readByte() << 16;
@@ -1070,7 +1081,7 @@
} else {
// offset/volume stored in 4 bytes
off = file.readUint32LE();
- if (_mapVersion < SCI_VERSION_1_1) {
+ if (_mapVersion < kResVersionSci11) {
volume_nr = off >> 28; // most significant 4 bits
off &= 0x0FFFFFFF; // least significant 28 bits
} else {
@@ -1351,7 +1362,8 @@
ResourceType type;
switch (_volVersion) {
- case SCI_VERSION_0:
+ case kResVersionSci0Sci1Early:
+ case kResVersionSci1Middle:
w = file->readUint16LE();
type = (ResourceType)(w >> 11);
number = w & 0x7FF;
@@ -1359,14 +1371,14 @@
szUnpacked = file->readUint16LE();
wCompression = file->readUint16LE();
break;
- case SCI_VERSION_1:
+ case kResVersionSci1Late:
type = (ResourceType)(file->readByte() & 0x7F);
number = file->readUint16LE();
szPacked = file->readUint16LE() - 4;
szUnpacked = file->readUint16LE();
wCompression = file->readUint16LE();
break;
- case SCI_VERSION_1_1:
+ case kResVersionSci11:
type = (ResourceType)(file->readByte() & 0x7F);
number = file->readUint16LE();
szPacked = file->readUint16LE();
@@ -1374,7 +1386,7 @@
wCompression = file->readUint16LE();
break;
#ifdef ENABLE_SCI32
- case SCI_VERSION_32:
+ case kResVersionSci32:
type = (ResourceType)(file->readByte() &0x7F);
number = file->readUint16LE();
szPacked = file->readUint32LE();
Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/resource.h 2009-08-15 00:28:59 UTC (rev 43390)
@@ -206,13 +206,24 @@
class ResourceManager {
public:
- int _sciVersion; //!< SCI resource version to use */
- int _mapVersion; //!< RESOURCE.MAP version
- int _volVersion; //!< RESOURCE.0xx version
+ enum ResVersion {
+ kResVersionUnknown,
+ kResVersionSci0Sci1Early,
+ kResVersionSci1Middle,
+ kResVersionSci1Late,
+ kResVersionSci11,
+ kResVersionSci32
+ };
bool isVGA() const { return _isVGA; }
/**
+ * Returns the SCI version as detected by the resource manager
+ * @return SCI version
+ */
+ sci_version_t sciVersion() const { return _sciVersion; }
+
+ /**
* Creates a new SCI resource manager.
* @param version The SCI version to look for; use SCI_VERSION_AUTODETECT
* in the default case.
@@ -222,7 +233,7 @@
* for resources which are not explicitly locked. However, a warning will be
* issued whenever this limit is exceeded.
*/
- ResourceManager(int version, int maxMemory);
+ ResourceManager(int maxMemory);
~ResourceManager();
/**
@@ -272,6 +283,9 @@
ResourceMap _resMap;
Common::List<Common::File *> _volumeFiles; //!< list of opened volume files
ResourceSource *_audioMapSCI1; //!< Currently loaded audio map for SCI1
+ ResVersion _volVersion; //!< RESOURCE.0xx version
+ ResVersion _mapVersion; //!< RESOURCE.MAP version
+ sci_version_t _sciVersion; //!< Detected SCI version */
/**
* Add a path to the resource manager's list of sources.
@@ -315,6 +329,13 @@
int addInternalSources();
void freeResourceSources();
+ /**
+ * Returns a string describing a ResVersion
+ * @param version: The resource version
+ * @return: The description of version
+ */
+ const char *versionDescription(ResVersion version) const;
+
Common::File *getVolumeFile(const char *filename);
void loadResource(Resource *res);
bool loadPatch(Resource *res, Common::File &file);
@@ -328,8 +349,8 @@
void removeAudioResource(ResourceId resId);
/**--- Resource map decoding functions ---*/
- int detectMapVersion();
- int detectVolVersion();
+ ResVersion detectMapVersion();
+ ResVersion detectVolVersion();
/**
* Reads the SCI0 resource.map file from a local directory.
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/sci.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -43,11 +43,10 @@
class GfxDriver;
-const char *versionNames[7] = {
+const char *versionNames[6] = {
"Autodetected",
"SCI0",
"SCI01",
- "SCI01 VGA ODD",
"SCI1",
"SCI1.1",
"SCI32"
@@ -129,20 +128,23 @@
// FIXME/TODO: Move some of the stuff below to init()
- const sci_version_t version = getVersion();
+ sci_version_t version = getVersion();
const uint32 flags = getFlags();
- int res_version = getResourceVersion();
- _resmgr = new ResourceManager(res_version, 256 * 1024);
+ _resmgr = new ResourceManager(256 * 1024);
if (!_resmgr) {
printf("No resources found, aborting...\n");
return Common::kNoGameDataFoundError;
}
+ // When version is set to autodetect, use version as determined by resource manager
+ if (version == SCI_VERSION_AUTODETECT)
+ version = _resmgr->sciVersion();
+
_kernel = new Kernel(_resmgr);
_vocabulary = new Vocabulary(_resmgr);
- script_adjust_opcode_formats(_resmgr->_sciVersion);
+ script_adjust_opcode_formats(_resmgr->sciVersion());
#if 0
printf("Mapping instruments to General Midi\n");
@@ -209,7 +211,7 @@
// Default config ends
#endif
- if (gfxop_init(_resmgr->_sciVersion, &gfx_state, &gfx_options, _resmgr)) {
+ if (gfxop_init(_resmgr->sciVersion(), &gfx_state, &gfx_options, _resmgr)) {
warning("Graphics initialization failed. Aborting...");
return Common::kUnknownError;
}
@@ -266,10 +268,6 @@
return _gameDescription->version;
}
-int SciEngine::getResourceVersion() const {
- return _gameDescription->res_version;
-}
-
Common::Language SciEngine::getLanguage() const {
return _gameDescription->desc.language;
}
Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/sci.h 2009-08-15 00:28:59 UTC (rev 43390)
@@ -66,21 +66,19 @@
struct SciGameDescription {
ADGameDescription desc;
uint32 flags;
- int res_version;
- int version;
+ sci_version_t version;
};
enum SciGameVersions {
SCI_VERSION_AUTODETECT = 0,
SCI_VERSION_0 = 1,
SCI_VERSION_01 = 2,
- SCI_VERSION_01_VGA_ODD = 3,
- SCI_VERSION_1 = 4,
- SCI_VERSION_1_1 = 5,
- SCI_VERSION_32 = 6
+ SCI_VERSION_1 = 3,
+ SCI_VERSION_1_1 = 4,
+ SCI_VERSION_32 = 5
};
-extern const char *versionNames[7];
+extern const char *versionNames[6];
enum SciGameFlags {
// SCI0 flags
Modified: scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -641,7 +641,7 @@
static_cast<MidiDriver_Adlib *>(_driver)->loadResource(res);
- return static_cast<MidiDriver_Adlib *>(_driver)->open(resmgr->_sciVersion == SCI_VERSION_0);
+ return static_cast<MidiDriver_Adlib *>(_driver)->open(resmgr->sciVersion() == SCI_VERSION_0);
}
} // End of namespace Sci
Modified: scummvm/trunk/engines/sci/vocabulary.cpp
===================================================================
--- scummvm/trunk/engines/sci/vocabulary.cpp 2009-08-14 23:59:50 UTC (rev 43389)
+++ scummvm/trunk/engines/sci/vocabulary.cpp 2009-08-15 00:28:59 UTC (rev 43390)
@@ -91,7 +91,7 @@
debug(2, "Initializing vocabulary");
- if (_resmgr->_sciVersion <= SCI_VERSION_01 && loadParserWords()) {
+ if (_resmgr->sciVersion() <= SCI_VERSION_01 && loadParserWords()) {
loadSuffixes();
if (loadBranches())
// Now build a GNF grammar out of this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list