[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.318,2.319 scumm-md5.h,2.136,2.137 scumm.cpp,1.658,1.659 scumm.h,1.658,1.659
kirben
kirben at users.sourceforge.net
Fri Dec 2 16:59:02 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17244/scumm
Modified Files:
script_v72he.cpp scumm-md5.h scumm.cpp scumm.h
Log Message:
Add work around for filename difference in HE7 file of water (HE99 Mac.)
Add details for Macintosh versions of German HE demos.
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.318
retrieving revision 2.319
diff -u -d -r2.318 -r2.319
--- script_v72he.cpp 17 Nov 2005 10:49:39 -0000 2.318
+++ script_v72he.cpp 3 Dec 2005 00:58:30 -0000 2.319
@@ -1762,11 +1762,17 @@
// There are Macintosh specific versions of HE7.2 games.
if (_heversion >= 80 && _platform == Common::kPlatformMacintosh) {
- char buf1[128];
- buf1[0] = '\0';
- generateSubstResFileName((char *)filename, buf1, sizeof(buf1));
- if (buf1[0]) {
- strcpy((char *)filename, buf1);
+ // Work around for filename difference in HE7 file, needs to
+ // open 'Water (7)' instead of 'Water Worries (7)'.
+ if (_gameId == GID_WATER && _heversion == 99 && !strcmp((char *)filename, "Water.he7")) {
+ strcpy((char *)filename, "Water (7)");
+ } else {
+ char buf1[128];
+ buf1[0] = '\0';
+ generateSubstResFileName((char *)filename, buf1, sizeof(buf1));
+ if (buf1[0]) {
+ strcpy((char *)filename, buf1);
+ }
}
}
Index: scumm-md5.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm-md5.h,v
retrieving revision 2.136
retrieving revision 2.137
diff -u -d -r2.136 -r2.137
--- scumm-md5.h 3 Dec 2005 00:14:24 -0000 2.136
+++ scumm-md5.h 3 Dec 2005 00:58:30 -0000 2.137
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Sat Dec 03 00:13:08 2005
+ This file was generated by the md5table tool on Sat Dec 03 00:45:58 2005
DO NOT EDIT MANUALLY!
*/
@@ -31,7 +31,7 @@
{ "0ab19be9e2a3f6938226638b2a3744fe", "PuttTime", Common::EN_USA, Common::kPlatformUnknown },
{ "0ac41e2e3d2174e5a042a6b565328dba", "puttrace", Common::EN_USA, Common::kPlatformUnknown },
{ "0b3222aaa7efcf283eb621e0cefd26cc", "puttputt", Common::RU_RUS, Common::kPlatformPC },
- { "0c45eb4baff0c12c3d9dfa889c8070ab", "pajama3", Common::DE_DEU, Common::kPlatformWindows },
+ { "0c45eb4baff0c12c3d9dfa889c8070ab", "pajama3", Common::DE_DEU, Common::kPlatformUnknown },
{ "0cccfa5223099a60e76cfcca57a1a141", "freddi3", Common::NL_NLD, Common::kPlatformWindows },
{ "0d1b69471605201ef2fa9cec1f5f02d2", "maniac", Common::ES_ESP, Common::kPlatformPC },
{ "0e4c5d54a0ad4b26132e78b5ea76642a", "samnmax", Common::EN_USA, Common::kPlatformPC },
@@ -192,13 +192,13 @@
{ "63fdcdc95cdeea00060883aed38e5504", "PuttTime", Common::EN_USA, Common::kPlatformWindows },
{ "6508fd55530e6915507e1cc37f7f045d", "indy3", Common::EN_USA, Common::kPlatformPC },
{ "66236cd1aec24e1d4aff4c4cc93b7e18", "indy3", Common::FR_FRA, Common::kPlatformPC },
- { "663743c03ae0c007f3d665cf631c0e6b", "puttrace", Common::DE_DEU, Common::kPlatformWindows },
+ { "663743c03ae0c007f3d665cf631c0e6b", "puttrace", Common::DE_DEU, Common::kPlatformUnknown },
{ "66fd5ff9a810dfeb6d6bdada18221140", "monkey", Common::IT_ITA, Common::kPlatformPC },
{ "672dec94b82f7f0877ebb5b5cf7f4bc1", "pajama", Common::EN_USA, Common::kPlatformUnknown },
{ "675d71151e9b5a968c8ce46d9fbf4cbf", "zak", Common::EN_USA, Common::kPlatformPC },
{ "68155a6bf082221525f431c2cbdac8ab", "SamsFunShop", Common::EN_USA, Common::kPlatformUnknown },
{ "684732efb5799c0f78804c99d8de9aba", "puttputt", Common::EN_USA, Common::kPlatformMacintosh },
- { "688328c5bdc4c8ec4145688dfa077bf2", "freddi4", Common::DE_DEU, Common::kPlatformWindows },
+ { "688328c5bdc4c8ec4145688dfa077bf2", "freddi4", Common::DE_DEU, Common::kPlatformUnknown },
{ "6886e5d08cee329b1f2e743ae2e3ceed", "monkey2", Common::DE_DEU, Common::kPlatformPC },
{ "695fe0b3963333b7e15b37514db3c745", "thinkerk", Common::EN_USA, Common::kPlatformUnknown },
{ "697c9b7c55a05d8199c48b48e379d2c8", "puttmoon", Common::HB_ISR, Common::kPlatformPC },
@@ -223,7 +223,7 @@
{ "71fe97c3108678cf604f14abe342341b", "spyfox2", Common::NL_NLD, Common::kPlatformWindows },
{ "7222f260253f325c21fcfa68b5bfab67", "spyfox2", Common::EN_USA, Common::kPlatformUnknown },
{ "72ac6bc980d5101c2142189d746bd62f", "spyfox", Common::RU_RUS, Common::kPlatformWindows },
- { "732845548b1d6c2da572cb6a1bf81b07", "spyfox2", Common::DE_DEU, Common::kPlatformWindows },
+ { "732845548b1d6c2da572cb6a1bf81b07", "spyfox2", Common::DE_DEU, Common::kPlatformUnknown },
{ "73e5ab7dbb9a8061cc6d25df02dbd1e7", "loom", Common::EN_USA, Common::kPlatformPC },
{ "746e88c172a5b7a1ae89ac0ee3ee681a", "freddi", Common::RU_RUS, Common::kPlatformWindows },
{ "754feb59d3bf86b8a00840df74fd7b26", "freddi3", Common::NL_NLD, Common::kPlatformWindows },
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -d -r1.658 -r1.659
--- scumm.cpp 3 Dec 2005 00:14:24 -0000 1.658
+++ scumm.cpp 3 Dec 2005 00:58:30 -0000 1.659
@@ -266,7 +266,7 @@
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
{"socks", "Pajama Sam's Sock Works", GID_HEGAME, 6, 80, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
- {"water", "Freddi Fish and Luther's Water Worries", GID_HEGAME, 6, 80, MDT_NONE,
+ {"water", "Freddi Fish and Luther's Water Worries", GID_WATER, 6, 80, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
// Humongous Entertainment Scumm Version 9.0 ? Scummsys.90
@@ -443,7 +443,7 @@
{"4dbff3787aedcd96b0b325f2d92d7ad9", "Freddi Fish and Luther's Maze Madness (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
- {"f1b0e0d587b85052de5534a3847e68fe", "Freddi Fish and Luther's Water Worries (Updated)", GID_HEGAME, 6, 99, MDT_NONE,
+ {"f1b0e0d587b85052de5534a3847e68fe", "Freddi Fish and Luther's Water Worries (Updated)", GID_WATER, 6, 99, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
{"9d7b67be003fea60be4dcbd193611936", "Full Throttle (Mac Demo)", GID_FT, 7, 0, MDT_NONE,
@@ -779,7 +779,7 @@
{ "freddi4", "f4-demo", kGenPC },
{ "freddi4", "ff4demo", kGenPC },
{ "freddi4", "Freddi 4 Demo", kGenMac },
- { "freddi4", "ff4demo", kGenMac },
+ { "freddi4", "Ff4demo", kGenMac },
{ "freddi4", "Freddi 4", kGenMac },
{ "freddi4", "FreddiGS", kGenPC },
{ "freddi4", "FreddiHRBG", kGenPC },
@@ -812,7 +812,7 @@
{ "pajama3", "Pajama Sam 3-Demo", kGenMac },
{ "pajama3", "pj3-demo", kGenPC },
{ "pajama3", "pj3demo", kGenPC },
- { "pajama3", "pj3demo", kGenMac },
+ { "pajama3", "PJ3Demo", kGenMac },
{ "pajama3", "Pajama Sam Demo", kGenMac },
{ "pajama3", "PjSamDemo", kGenMac },
{ "pajama3", "PjSamDemo", kGenPC },
@@ -831,7 +831,6 @@
{ "puttrace", "500demo", kGenPC },
{ "puttrace", "racedemo", kGenPC },
{ "puttrace", "RaceDemo", kGenMac },
- { "puttrace", "racedemo", kGenMac },
{ "puttrace", "Rennen", kGenPC },
{ "puttrace", "Putt500 demo", kGenMac }, // NL Mac demo
{ "puttrace", "Putt Race", kGenMac },
@@ -869,6 +868,7 @@
{ "spyfox", "JR-Demo", kGenMac }, // FR Mac demo
{ "spyfox2", "sf2-demo", kGenPC },
{ "spyfox2", "sf2demo", kGenPC },
+ { "spyfox2", "Sf2demo", kGenMac },
{ "spyfox2", "Spy Fox 2 - Demo", kGenMac },
{ "spyfox2", "Spy Fox 2", kGenMac },
{ "spyfox2", "spyfoxsr", kGenPC },
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -d -r1.658 -r1.659
--- scumm.h 20 Nov 2005 08:29:17 -0000 1.658
+++ scumm.h 3 Dec 2005 00:58:32 -0000 1.659
@@ -206,10 +206,11 @@
GID_ZAK,
GID_MONKEY_SEGA,
GID_HEGAME, // Generic name for all HE games with default behaviour
+ GID_PUTTDEMO,
GID_FBEAR,
GID_FUNPACK,
GID_FREDDI2,
- GID_PUTTDEMO,
+ GID_WATER,
GID_PUTTRACE,
GID_FUNSHOP, // Used for all three funshops
GID_FOOTBALL
More information about the Scummvm-git-logs
mailing list