[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.379.2.5,1.379.2.6 script_v7he.cpp,2.166.2.3,2.166.2.4 scumm-md5.h,2.107.2.6,2.107.2.7 scumm.cpp,1.603.2.20,1.603.2.21
kirben
kirben at users.sourceforge.net
Fri Nov 18 15:50:01 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31332/scumm
Modified Files:
Tag: branch-0-8-0
actor.cpp script_v7he.cpp scumm-md5.h scumm.cpp
Log Message:
Match original games, caused assert in early versions of freddi.
Update md5 details.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.379.2.5
retrieving revision 1.379.2.6
diff -u -d -r1.379.2.5 -r1.379.2.6
--- actor.cpp 29 Oct 2005 01:04:29 -0000 1.379.2.5
+++ actor.cpp 18 Nov 2005 23:49:06 -0000 1.379.2.6
@@ -2039,8 +2039,7 @@
if (!_skipProcessActors) {
for (int i = 0; i < _auxBlocksNum; ++i) {
AuxBlock *ab = &_auxBlocks[i];
- if (ab->visible) {
- assert(ab->r.top <= ab->r.bottom);
+ if (ab->r.top <= ab->r.bottom) {
gdi.copyVirtScreenBuffers(ab->r);
}
}
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.166.2.3
retrieving revision 2.166.2.4
diff -u -d -r2.166.2.3 -r2.166.2.4
--- script_v7he.cpp 18 Nov 2005 23:23:11 -0000 2.166.2.3
+++ script_v7he.cpp 18 Nov 2005 23:49:07 -0000 2.166.2.4
@@ -815,7 +815,7 @@
a->_auxBlock.r.left = 0;
a->_auxBlock.r.top = 0;
a->_auxBlock.r.right = -1;
- a->_auxBlock.r.bottom = -1;
+ a->_auxBlock.r.bottom = -2;
break;
case 30:
a = derefActor(args[1], "o70_kernelSetFunctions: 30");
Index: scumm-md5.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm-md5.h,v
retrieving revision 2.107.2.6
retrieving revision 2.107.2.7
diff -u -d -r2.107.2.6 -r2.107.2.7
--- scumm-md5.h 17 Nov 2005 10:46:53 -0000 2.107.2.6
+++ scumm-md5.h 18 Nov 2005 23:49:07 -0000 2.107.2.7
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Wed Nov 16 05:02:50 2005
+ This file was generated by the md5table tool on Thu Nov 17 23:17:13 2005
DO NOT EDIT MANUALLY!
*/
@@ -52,6 +52,7 @@
{ "15e03ffbfeddb9c2aebc13dcb2a4a8f4", "monkey", Common::EN_USA, Common::kPlatformPC },
{ "15f588e887e857e8c56fe6ade4956168", "atlantis", Common::ES_ESP, Common::kPlatformAmiga },
{ "16542a7342a918bfe4ba512007d36c47", "FreddisFunShop", Common::EN_USA, Common::kPlatformUnknown },
+ { "166553538ff320c69edafeee29525419", "samnmax", Common::EN_USA, Common::kPlatformMacintosh },
{ "16effd200aa6b8abe9c569c3e578814d", "freddi4", Common::NL_NLD, Common::kPlatformWindows },
{ "179879b6e35c1ead0d93aab26db0951b", "fbear", Common::EN_USA, Common::kPlatformWindows },
{ "17b5d5e6af4ae89d62631641d66d5a05", "indy3", Common::IT_ITA, Common::kPlatformPC },
@@ -91,6 +92,7 @@
{ "2d1e891fe52df707c30185e52c50cd92", "monkey", Common::EN_USA, Common::kPlatformPC },
{ "2d388339d6050d8ccaa757b64633954e", "zak", Common::EN_USA, Common::kPlatformFMTowns },
{ "2d4536a56e01da4b02eb021e7770afa2", "zak", Common::EN_USA, Common::kPlatformFMTowns },
+ { "2d9d46f23cb07bbc90b8ad464d3e4ff8", "atlantis", Common::EN_USA, Common::kPlatformMacintosh },
{ "2e85f7aa054930c692a5b1bed1dfc295", "football", Common::EN_USA, Common::kPlatformUnknown },
{ "2fe369ad70f52a8cf7ad6077ee64f81a", "loom", Common::DE_DEU, Common::kPlatformAmiga },
{ "305d3dd57c96c65b017bc70c8c7cfb5e", "monkey", Common::DE_DEU, Common::kPlatformPC },
@@ -277,6 +279,7 @@
{ "98744fe66ff730e8c2b3b1f58803ab0b", "atlantis", Common::EN_USA, Common::kPlatformPC },
{ "99a3699f80b8f776efae592b44b9b991", "maniac", Common::FR_FRA, Common::kPlatformPC },
{ "99b6f822b0b2612415407865438697d6", "atlantis", Common::EN_USA, Common::kPlatformPC },
+ { "9b7452b5cd6d3ffb2b2f5118010af84f", "ft", Common::EN_USA, Common::kPlatformMacintosh },
{ "9bc548e179cdb0767009401c094d0895", "maniac", Common::DE_DEU, Common::kPlatformAmiga },
{ "9bd2a8f72613e715c199246dd511e10f", "atlantis", Common::ES_ESP, Common::kPlatformPC },
{ "9bda5fee51d2fda5253d02c642016bf4", "spyfox", Common::NL_NLD, Common::kPlatformWindows },
@@ -346,6 +349,7 @@
{ "c83079157ec765a28de445aec9768d60", "tentacle", Common::EN_USA, Common::kPlatformUnknown },
{ "c8aac5e3e701874e2fa4117896f9e1b1", "freddi", Common::EN_USA, Common::kPlatformMacintosh },
{ "cb1559e8405d17a5a278a6b5ad9338d1", "freddi3", Common::EN_USA, Common::kPlatformUnknown },
+ { "cc04a076779379524ed4d9c5ee3c6fb1", "tentacle", Common::EN_USA, Common::kPlatformMacintosh },
{ "cc8ba2b0df2f9c450bcf055fe2711979", "samnmax", Common::DE_DEU, Common::kPlatformPC },
{ "cd9c05e755d7bf8e9b9590ad1ebe273e", "dig", Common::EN_USA, Common::kPlatformMacintosh },
{ "cdd760228cf1010c2903f37e788ea31c", "zak", Common::DE_DEU, Common::kPlatformPC },
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.20
retrieving revision 1.603.2.21
diff -u -d -r1.603.2.20 -r1.603.2.21
--- scumm.cpp 17 Nov 2005 10:46:53 -0000 1.603.2.20
+++ scumm.cpp 18 Nov 2005 23:49:07 -0000 1.603.2.21
@@ -690,6 +690,7 @@
{ "01.LFL", "maniac2.d64", kGenAsIs }, // swap
{ "00.LFL", "zak1.d64", kGenAsIs }, // these
{ "01.LFL", "zak2.d64", kGenAsIs }, // lines
+ { "atlantis.000", "Fate of Atlantis Data", kGenAsIs },
{ "atlantis", "fate", kGenPC },
{ "atlantis", "playfate", kGenPC },
{ "atlantis", "indy4", kGenPC },
@@ -711,7 +712,6 @@
#ifndef DISABLE_SCUMM_7_8
{ "dig.la0", "The Dig Data", kGenAsIs },
{ "dig.la0", "The Dig Demo Data", kGenAsIs },
- { "dig", "digdemo", kGenPC },
{ "ft.la0", "Full Throttle Data", kGenAsIs },
{ "ft.la0", "Full Throttle Demo Data", kGenAsIs },
{ "ft.la0", "Vollgas Data", kGenAsIs },
@@ -971,14 +971,15 @@
} else
_fileHandle = new ScummFile();
- // The mac versions of Sam&Max, DOTT, FT and The Dig used a special meta
- // (container) file format to store the actual SCUMM data files. The
- // rescumm utility used to be used to extract those files. While that is
- // still possible, we now support reading those files directly.
- // The first step is to check whether one of them is present (we do that
- // here); the rest is handled by the ScummFile class and code in
- // openResourceFile() (and in the Sound class, for MONSTER.SOU handling).
- if (_version >= 6 && _heversion == 0 && _substResFileNameIndex &&
+ // The mac versions of Indy4, Sam&Max, DOTT, FT and The Dig used a
+ // special meta (container) file format to store the actual SCUMM data
+ // files. The rescumm utility used to be used to extract those files.
+ // While that is still possible, we now support reading those files
+ // directly. The first step is to check whether one of them is present
+ // (we do that here); the rest is handled by the ScummFile class and
+ // code in openResourceFile() (and in the Sound class, for MONSTER.SOU
+ // handling).
+ if (_version >= 5 && _heversion == 0 && _substResFileNameIndex &&
_platform == Common::kPlatformMacintosh &&
substResFileNameTable[_substResFileNameIndex].genMethod == kGenAsIs) {
if (_fileHandle->open(substResFileNameTable[_substResFileNameIndex].macName)) {
More information about the Scummvm-git-logs
mailing list