[Scummvm-cvs-logs] CVS: scummvm/scumm vars.cpp,1.150.2.10,1.150.2.11

Max Horn fingolfin at users.sourceforge.net
Thu Jan 26 01:51:07 CET 2006


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30392

Modified Files:
      Tag: branch-0-8-0
	vars.cpp 
Log Message:
Backported some SCUMM var tweaks

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.150.2.10
retrieving revision 1.150.2.11
diff -u -d -r1.150.2.10 -r1.150.2.11
--- vars.cpp	20 Jan 2006 23:03:19 -0000	1.150.2.10
+++ vars.cpp	26 Jan 2006 09:50:28 -0000	1.150.2.11
@@ -176,10 +176,6 @@
 	// Many vars are the same as in V5 & V6 games, so just call the inherited method first
 	ScummEngine::setupScummVars();
 
-	if (_heversion == 0) {
-		VAR_V6_SOUNDMODE = 9;
-	}
-
 	VAR_ROOM_WIDTH = 41;
 	VAR_ROOM_HEIGHT = 54;
 
@@ -204,7 +200,10 @@
 	VAR_TIMEDATE_MINUTE = 126;
 
 	// Sam & Max specific
-	VAR_CHARSET_MASK = 123;
+	if (_gameId == GID_SAMNMAX) {
+		VAR_V6_SOUNDMODE = 9;
+		VAR_CHARSET_MASK = 123;
+	}
 }
 
 #ifndef DISABLE_HE
@@ -419,7 +418,9 @@
 	VAR_FADE_DELAY = 117;
 
 	// Full Throttle specific
-	VAR_CHARSET_MASK = 119;
+	if (_gameId == GID_FT) {
+		VAR_CHARSET_MASK = 119;
+	}
 
 	VAR_VIDEONAME = 123;
 
@@ -690,7 +691,7 @@
 		VAR(VAR_CURRENTDRIVE) = 0;
 
 		if (_platform == Common::kPlatformMacintosh && (_features & GF_OLD_BUNDLE)) {
-			// This is the for the Mac version of Indy3/Loom
+			// Set screen size for the Macintosh version of Indy3/Loom
 			VAR(39) = 320;
 		}
 		if (_platform == Common::kPlatformPC && _gameId == GID_LOOM) {





More information about the Scummvm-git-logs mailing list