[Scummvm-cvs-logs] SF.net SVN: scummvm:[47622] scummvm/trunk/engines/scumm

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Thu Jan 28 01:28:13 CET 2010


Revision: 47622
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47622&view=rev
Author:   Kirben
Date:     2010-01-28 00:28:08 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
Fix regressions in Let's Explore the Jungle with Buzzy.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/palette.cpp
    scummvm/trunk/engines/scumm/script.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/sound.cpp

Modified: scummvm/trunk/engines/scumm/palette.cpp
===================================================================
--- scummvm/trunk/engines/scumm/palette.cpp	2010-01-28 00:24:02 UTC (rev 47621)
+++ scummvm/trunk/engines/scumm/palette.cpp	2010-01-28 00:28:08 UTC (rev 47622)
@@ -317,7 +317,7 @@
 
 		// Only SCUMM 5/6 games use 6/6/6 style palettes
 		if (_game.version >= 5 && _game.version <= 6) {
-			if ((_game.heversion <= 73 && i < 15) || i == 15 || r < 252 || g < 252 || b < 252) {
+			if ((_game.heversion <= 74 && i < 15) || i == 15 || r < 252 || g < 252 || b < 252) {
 				*dest++ = r;
 				*dest++ = g;
 				*dest++ = b;

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2010-01-28 00:24:02 UTC (rev 47621)
+++ scummvm/trunk/engines/scumm/script.cpp	2010-01-28 00:28:08 UTC (rev 47622)
@@ -620,8 +620,8 @@
 		assertRange(0, var, _numVariables - 1, "variable (writing)");
 
 		if (VAR_SUBTITLES != 0xFF && var == VAR_SUBTITLES) {
-			// Ignore default setting in HE72-73 games
-			if (_game.heversion <= 73 && vm.slot[_currentScript].number == 1)
+			// Ignore default setting in HE72-74 games
+			if (_game.heversion <= 74 && vm.slot[_currentScript].number == 1)
 				return;
 			assert(value == 0 || value == 1);
 			ConfMan.setBool("subtitles", (value != 0));

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2010-01-28 00:24:02 UTC (rev 47621)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2010-01-28 00:28:08 UTC (rev 47622)
@@ -742,7 +742,7 @@
 
 ScummEngine_v70he::ScummEngine_v70he(OSystem *syst, const DetectorResult &dr)
 	: ScummEngine_v60he(syst, dr) {
-	if (_game.platform == Common::kPlatformMacintosh && (_game.heversion >= 72 && _game.heversion <= 73))
+	if (_game.platform == Common::kPlatformMacintosh && (_game.heversion >= 72 && _game.heversion <= 74))
 		_resExtractor = new MacResExtractor(this);
 	else
 		_resExtractor = new Win32ResExtractor(this);

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2010-01-28 00:24:02 UTC (rev 47621)
+++ scummvm/trunk/engines/scumm/sound.cpp	2010-01-28 00:28:08 UTC (rev 47622)
@@ -962,7 +962,7 @@
 			tmp = basename[0] + "tlk";
 		}
 
-		if (file->open(tmp) && _vm->_game.heversion <= 73)
+		if (file->open(tmp) && _vm->_game.heversion <= 74)
 			file->setEnc(0x69);
 		_soundMode = kVOCMode;
 	} else {


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