[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.152.2.1,1.152.2.2 input.cpp,2.39.2.6,2.39.2.7 saveload.cpp,1.239.2.6,1.239.2.7 script.cpp,1.232.2.1,1.232.2.2 script_v7he.cpp,2.166.2.1,2.166.2.2 scumm-md5.h,2.107.2.5,2.107.2.6 scumm.cpp,1.603.2.19,1.603.2.20 vars.cpp,1.150.2.2,1.150.2.3
kirben
kirben at users.sourceforge.net
Thu Nov 17 02:48:01 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28919/scumm
Modified Files:
Tag: branch-0-8-0
dialogs.cpp input.cpp saveload.cpp script.cpp script_v7he.cpp
scumm-md5.h scumm.cpp vars.cpp
Log Message:
Back port md5 updates.
back port subtitle fixes for HE games.
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.152.2.1
retrieving revision 1.152.2.2
diff -u -d -r1.152.2.1 -r1.152.2.2
--- dialogs.cpp 18 Oct 2005 02:11:21 -0000 1.152.2.1
+++ dialogs.cpp 17 Nov 2005 10:46:53 -0000 1.152.2.2
@@ -711,7 +711,7 @@
else
_vm->_voiceMode = ConfMan.getBool("subtitles");
- if (_vm->_version >= 7)
+ if (_vm->VAR_VOICE_MODE != 0xFF)
_vm->VAR(_vm->VAR_VOICE_MODE) = _vm->_voiceMode;
}
Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.39.2.6
retrieving revision 2.39.2.7
diff -u -d -r2.39.2.6 -r2.39.2.7
--- input.cpp 26 Oct 2005 07:14:22 -0000 2.39.2.6
+++ input.cpp 17 Nov 2005 10:46:53 -0000 2.39.2.7
@@ -363,7 +363,7 @@
break;
}
- if (_version >= 7)
+ if (VAR_VOICE_MODE != 0xFF)
VAR(VAR_VOICE_MODE) = _voiceMode;
GUI::TimedMessageDialog dialog(buf, 1500);
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.239.2.6
retrieving revision 1.239.2.7
diff -u -d -r1.239.2.6 -r1.239.2.7
--- saveload.cpp 7 Nov 2005 22:57:33 -0000 1.239.2.6
+++ saveload.cpp 17 Nov 2005 10:46:53 -0000 1.239.2.7
@@ -396,7 +396,7 @@
VAR(VAR_ROOM_FLAG) = 1;
// Sync with current config setting
- if (_version >= 7)
+ if (VAR_VOICE_MODE != 0xFF)
VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
CHECK_HEAP
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.232.2.1
retrieving revision 1.232.2.2
diff -u -d -r1.232.2.1 -r1.232.2.2
--- script.cpp 18 Oct 2005 02:11:21 -0000 1.232.2.1
+++ script.cpp 17 Nov 2005 10:46:53 -0000 1.232.2.2
@@ -583,12 +583,15 @@
checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
if (VAR_SUBTITLES != 0xFF && var == VAR_SUBTITLES) {
+ // Ignore default setting in HE72-73 games
+ if (_heversion <= 73 && vm.slot[_currentScript].number == 1)
+ return;
assert(value == 0 || value == 1);
ConfMan.set("subtitles", value);
}
if (VAR_NOSUBTITLES != 0xFF && var == VAR_NOSUBTITLES) {
- // Ignore default setting in HE60/61 games
- if ((_heversion >= 60 && _heversion <= 61) && vm.slot[_currentScript].number == 1)
+ // Ignore default setting in HE60-71 games
+ if (_heversion >= 60 && vm.slot[_currentScript].number == 1)
return;
assert(value == 0 || value == 1);
ConfMan.set("subtitles", !value);
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.166.2.1
retrieving revision 2.166.2.2
diff -u -d -r2.166.2.1 -r2.166.2.2
--- script_v7he.cpp 18 Oct 2005 02:11:21 -0000 2.166.2.1
+++ script_v7he.cpp 17 Nov 2005 10:46:53 -0000 2.166.2.2
@@ -922,10 +922,13 @@
type = pop();
switch (type) {
case 1: // number
- if (!strcmp((char *)option, "NoPrinting"))
+ if (!strcmp((char *)option, "NoPrinting")) {
push(1);
- else
+ } else if (!strcmp((char *)option, "TextOn")) {
+ push(ConfMan.getBool("subtitles"));
+ } else {
push(ConfMan.getInt((char *)option));
+ }
break;
case 2: // string
entry = (ConfMan.get((char *)option).c_str());
Index: scumm-md5.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm-md5.h,v
retrieving revision 2.107.2.5
retrieving revision 2.107.2.6
diff -u -d -r2.107.2.5 -r2.107.2.6
--- scumm-md5.h 28 Oct 2005 07:49:25 -0000 2.107.2.5
+++ scumm-md5.h 17 Nov 2005 10:46:53 -0000 2.107.2.6
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Fri Oct 28 07:43:19 2005
+ This file was generated by the md5table tool on Wed Nov 16 05:02:50 2005
DO NOT EDIT MANUALLY!
*/
@@ -46,6 +46,7 @@
{ "132bff65e6367c09cc69318ce1b59333", "monkey2", Common::EN_USA, Common::kPlatformAmiga },
{ "145bd3373574feb668cc2eea2ec6cf86", "balloon", Common::RU_RUS, Common::kPlatformWindows },
{ "14d48c95b43ddeb983254cf6c43851f1", "freddi4", Common::NL_NLD, Common::kPlatformWindows },
+ { "151071053a1d0021198216713939521d", "freddi2", Common::EN_USA, Common::kPlatformWindows },
{ "15240c59d3681ed53f714f8d925cb2d6", "maniac", Common::ES_ESP, Common::kPlatformAtariST },
{ "157367c3c21e0d03a0cba44361b4cf65", "indy3", Common::EN_USA, Common::kPlatformAtariST },
{ "15e03ffbfeddb9c2aebc13dcb2a4a8f4", "monkey", Common::EN_USA, Common::kPlatformPC },
@@ -120,6 +121,7 @@
{ "3a0c35f3c147b98a2bdf8d400cfc4ab5", "indy3", Common::JA_JPN, Common::kPlatformFMTowns },
{ "3b301b7892f883ce42ab4be6a274fea6", "samnmax", Common::EN_USA, Common::kPlatformPC },
{ "3cce1913a3bc586b51a75c3892ff18dd", "indy3", Common::RU_RUS, Common::kPlatformPC },
+ { "3d219e7546039543307b55a91282bf18", "funpack", Common::EN_USA, Common::kPlatformPC },
{ "3de99ef0523f8ca7958faa3afccd035a", "spyfox", Common::EN_USA, Common::kPlatformUnknown },
{ "3df6ead57930488bc61e6e41901d0e97", "fbear", Common::EN_USA, Common::kPlatformMacintosh },
{ "3e48298920fab9b7aec5a971e1bd1fab", "pajama3", Common::EN_USA, Common::kPlatformWindows },
@@ -182,6 +184,8 @@
{ "624cdb93654667c869d204a64af7e57f", "maniac", Common::EN_USA, Common::kPlatformPC },
{ "6271130f440066830eca9056c1d7926f", "water", Common::RU_RUS, Common::kPlatformWindows },
{ "62b8c16b6db226ba95aaa8be73f9885c", "indy3", Common::ES_ESP, Common::kPlatformAmiga },
+ { "63fdcdc95cdeea00060883aed38e5504", "PuttTime", Common::EN_USA, Common::kPlatformWindows },
+ { "6508fd55530e6915507e1cc37f7f045d", "indy3", Common::EN_USA, Common::kPlatformPC },
{ "66236cd1aec24e1d4aff4c4cc93b7e18", "indy3", Common::FR_FRA, Common::kPlatformPC },
{ "66fd5ff9a810dfeb6d6bdada18221140", "monkey", Common::IT_ITA, Common::kPlatformPC },
{ "672dec94b82f7f0877ebb5b5cf7f4bc1", "pajama", Common::EN_USA, Common::kPlatformUnknown },
@@ -236,6 +240,8 @@
{ "81bbfa181184cb494e7a81dcfa94fbd9", "maniac", Common::FR_FRA, Common::kPlatformNES },
{ "8299d9b8a1b0e7b881bae7a9971dc5e2", "zak", Common::EN_USA, Common::kPlatformAtariST },
{ "8368f552b1e3eba559f8d559bcc4cadb", "freddi3", Common::UNK_LANG, Common::kPlatformUnknown },
+ { "83cedbe26aa8b58988e984e3d34cac8e", "freddi3", Common::DE_DEU, Common::kPlatformWindows },
+ { "84e3c23a49ded8a6f9197735c8eb3de7", "PuttTime", Common::DE_DEU, Common::kPlatformWindows },
{ "861e59ed72a1cd0e6d454f7ee7e2bf3d", "comi", Common::RU_RUS, Common::kPlatformUnknown },
{ "86be8ada36371d4fdc35659d0e912a26", "indy3", Common::ES_ESP, Common::kPlatformPC },
{ "86c9902b7bec1a17926d4dae85beaa45", "airport", Common::EN_USA, Common::kPlatformWindows },
@@ -278,7 +284,7 @@
{ "9c143c5905055d5df7a0f014ab379aee", "puttmoon", Common::EN_USA, Common::kPlatformWindows },
{ "9c92eeaf517a31b7221ec2546ab669fd", "puttmoon", Common::EN_USA, Common::kPlatformWindows },
{ "9cdd327c1034c046cb595d251c44da2f", "chase", Common::RU_RUS, Common::kPlatformWindows },
- { "9d4ab3e0e1d1ebc6ba8a6a4c470ed184", "spyfox", Common::EN_USA, Common::kPlatformWindows },
+ { "9d4ab3e0e1d1ebc6ba8a6a4c470ed184", "spyfox", Common::EN_USA, Common::kPlatformUnknown },
{ "9d7b67be003fea60be4dcbd193611936", "ft", Common::EN_USA, Common::kPlatformMacintosh },
{ "9dc02577bf50d4cfaf3de3fbac06fbe2", "puttmoon", Common::EN_USA, Common::kPlatformMacintosh },
{ "9e5e0fb43bd22f4628719b7501adb717", "monkey", Common::FR_FRA, Common::kPlatformAtariST },
@@ -308,6 +314,7 @@
{ "b23f7cd7c304d7dff08e92a96120d5b4", "zak", Common::EN_USA, Common::kPlatformPC },
{ "b250d0f9cc83f80ced56fe11a4fb057c", "maniac", Common::EN_USA, Common::kPlatformPC },
{ "b289a2a8cbedbf45786e0b4ad2f510f1", "samnmax", Common::IT_ITA, Common::kPlatformPC },
+ { "b5298a5c15ffbe8b381d51ea4e26d35c", "freddi4", Common::DE_DEU, Common::kPlatformWindows },
{ "b597e0403cc0002f69170e6caba7edd9", "indy3", Common::EN_USA, Common::kPlatformPC },
{ "b628506f7def772e40de0aa5440fb8e1", "activity", Common::EN_USA, Common::kPlatformWindows },
{ "b886b0a5d909c7158a914e1d7c1c6c65", "loom", Common::FR_FRA, Common::kPlatformPC },
@@ -348,6 +355,7 @@
{ "ce7fd0c382389a6791fc3e199c117ef4", "indy3", Common::ES_ESP, Common::kPlatformPC },
{ "cea91e3dd47f2518ea418e41611aa77f", "spyfox2", Common::RU_RUS, Common::kPlatformUnknown },
{ "cf8d13446ec6cb6222287a925fd47c1d", "baseball", Common::EN_USA, Common::kPlatformWindows },
+ { "cf8ef3a1fb483c5c4b1c584d1167b2c4", "freddi", Common::DE_DEU, Common::kPlatformWindows },
{ "cf90b4db5486ef798db78fe6fbf897e5", "pajama3", Common::EN_USA, Common::kPlatformWindows },
{ "d06fbe28818fef7bfc45c2cdf0c0849d", "zak", Common::DE_DEU, Common::kPlatformPC },
{ "d0b531227a27c6662018d2bd05aac52a", "monkey", Common::DE_DEU, Common::kPlatformPC },
@@ -355,13 +363,14 @@
{ "d43352a805d78b5f4936c6d7779bf575", "samnmax", Common::RU_RUS, Common::kPlatformPC },
{ "d4aac997e2f4e15341f0bfbf905419bd", "PuttTime", Common::EN_USA, Common::kPlatformWindows },
{ "d4b8ee426b1afd3e53bc0cf020418cf6", "dog", Common::EN_USA, Common::kPlatformWindows },
- { "d4cccb5af88f3e77f370896e9ba8c5f9", "freddi", Common::RU_RUS, Common::kPlatformWindows },
+ { "d4cccb5af88f3e77f370896e9ba8c5f9", "freddi", Common::UNK_LANG, Common::kPlatformWindows },
{ "d4e79c3d8645b8266cd78c325bc35154", "pajama2", Common::EN_USA, Common::kPlatformUnknown },
{ "d55eff37c2100f5065cde9de428621fa", "zak", Common::EN_USA, Common::kPlatformAtariST },
{ "d62047a6729349ab36f7ee065bf26509", "dig", Common::RU_RUS, Common::kPlatformUnknown },
{ "d62d248c3df6ec177405e2cb23d923b2", "indy3", Common::IT_ITA, Common::kPlatformPC },
{ "d6dd0646404768a63e963891a96daadd", "atlantis", Common::EN_USA, Common::kPlatformMacintosh },
{ "d7ab7cd6105546016e6a0d46fb36b964", "pajama", Common::EN_USA, Common::kPlatformUnknown },
+ { "d7b247c26bf1f01f8f7daf142be84de3", "balloon", Common::EN_USA, Common::kPlatformWindows },
{ "d831f7c048574dd9d5d85db2a1468099", "maniac", Common::EN_USA, Common::kPlatformC64 },
{ "d8323015ecb8b10bf53474f6e6b0ae33", "dig", Common::UNK_LANG, Common::kPlatformUnknown },
{ "d8d07efcb88f396bee0b402b10c3b1c9", "maniac", Common::EN_USA, Common::kPlatformNES },
@@ -390,6 +399,7 @@
{ "e72bb4c2b613db2cf50f89ff6350e70a", "ft", Common::ES_ESP, Common::kPlatformUnknown },
{ "e781230da44a44e2f0770edb2b3b3633", "maniac", Common::EN_USA, Common::kPlatformAmiga },
{ "e94c7cc3686fce406d3c91b5eae5a72d", "zak", Common::EN_USA, Common::kPlatformAmiga },
+ { "e98b982ceaf9d253d730bde8903233d6", "monkey", Common::DE_DEU, Common::kPlatformPC },
{ "eae95b2b3546d8ba86ae1d397c383253", "dog", Common::EN_USA, Common::kPlatformUnknown },
{ "ebd0b2c8a387f18887282afe6cad894a", "spyozon", Common::EN_USA, Common::kPlatformUnknown },
{ "ebd324dcf06a4c49e1ba5c231eee1060", "freddi4", Common::EN_USA, Common::kPlatformUnknown },
@@ -415,6 +425,7 @@
{ "fc6b6148e80d67939d9a18697c0f626a", "monkey", Common::DE_DEU, Common::kPlatformPC },
{ "fc8d197a22146e74766e9cb0cfcaf1da", "freddi2", Common::EN_USA, Common::kPlatformUnknown },
{ "fcb78ebecab2757264c590890c319cc5", "PuttTime", Common::NL_NLD, Common::kPlatformWindows },
+ { "fce4b8010704b103acfeea9413788f32", "freddi2", Common::DE_DEU, Common::kPlatformWindows },
{ "fe381e45117878b1e942cb876b050fd6", "ft", Common::EN_USA, Common::kPlatformMacintosh },
{ "fe60d6b5ff51b0553ac59963123b5777", "comi", Common::UNK_LANG, Common::kPlatformUnknown },
{ "ff05c07990061d97647f059c48c1d05a", "zak", Common::DE_DEU, Common::kPlatformAtariST },
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.19
retrieving revision 1.603.2.20
diff -u -d -r1.603.2.19 -r1.603.2.20
--- scumm.cpp 7 Nov 2005 23:55:27 -0000 1.603.2.19
+++ scumm.cpp 17 Nov 2005 10:46:53 -0000 1.603.2.20
@@ -568,6 +568,8 @@
{"0ab19be9e2a3f6938226638b2a3744fe", "Putt-Putt Travels Through Time (Updated Demo)", GID_HEGAME, 6, 100, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+ {"d7b247c26bf1f01f8f7daf142be84de3", "Putt-Putt and Pep's Balloon-O-Rama (Updated)", GID_HEGAME, 6, 99, MDT_NONE,
+ GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
{"8e3241ddd6c8dadf64305e8740d45e13", "Putt-Putt and Pep's Balloon-O-Rama (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
@@ -1262,7 +1264,6 @@
VAR_V6_EMSSPACE = 0xFF;
VAR_CAMERA_POS_Y = 0xFF;
-
VAR_CAMERA_MIN_Y = 0xFF;
VAR_CAMERA_MAX_Y = 0xFF;
VAR_CAMERA_THRESHOLD_X = 0xFF;
@@ -1271,11 +1272,8 @@
VAR_CAMERA_SPEED_Y = 0xFF;
VAR_CAMERA_ACCEL_X = 0xFF;
VAR_CAMERA_ACCEL_Y = 0xFF;
-
VAR_CAMERA_DEST_X = 0xFF;
-
VAR_CAMERA_DEST_Y = 0xFF;
-
VAR_CAMERA_FOLLOWED_ACTOR = 0xFF;
VAR_LEFTBTN_DOWN = 0xFF;
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.150.2.2
retrieving revision 1.150.2.3
diff -u -d -r1.150.2.2 -r1.150.2.3
--- vars.cpp 27 Oct 2005 06:56:46 -0000 1.150.2.2
+++ vars.cpp 17 Nov 2005 10:46:53 -0000 1.150.2.3
@@ -183,20 +183,17 @@
VAR_ROOM_WIDTH = 41;
VAR_ROOM_HEIGHT = 54;
- if (_heversion >= 60 && _heversion <= 61) {
+ if (_heversion >= 60) {
VAR_NOSUBTITLES = 60;
} else {
- VAR_SUBTITLES = 60;
+ VAR_VOICE_MODE = 60; // 0 is voice, 1 is voice+text, 2 is text only
+ VAR_SAVELOAD_SCRIPT = 61;
+ VAR_SAVELOAD_SCRIPT2 = 62;
}
VAR_LEFTBTN_HOLD = 74;
VAR_RIGHTBTN_HOLD = 75;
- if (_heversion == 0) {
- VAR_SAVELOAD_SCRIPT = 61;
- VAR_SAVELOAD_SCRIPT2 = 62;
- }
-
VAR_V6_EMSSPACE = 76;
VAR_RANDOM_NR = 118;
More information about the Scummvm-git-logs
mailing list