[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.96,1.97 vars.cpp,1.90,1.91

[Travis Howell]

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

Modified Files:
	scumm.cpp vars.cpp 
Log Message:

VAR not used in scumm3.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- scumm.cpp	22 Jul 2004 04:13:46 -0000	1.96
+++ scumm.cpp	22 Jul 2004 04:28:31 -0000	1.97
@@ -1284,7 +1284,7 @@
 		return;
 	}
 
-	if (_version < 6)
+	if (_version >= 4 && _version <= 6)
 		VAR(VAR_V5_TALK_STRING_Y) = -0x50;
 
 	if (_version == 8) {	// Fixme: How do we deal with non-cd installs?

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- vars.cpp	22 Jul 2004 04:13:46 -0000	1.90
+++ vars.cpp	22 Jul 2004 04:28:31 -0000	1.91
@@ -73,6 +73,7 @@
 	VAR_TMR_4 = 47;
 	VAR_SOUNDCARD = 48;
 	VAR_VIDEOMODE = 49;
+
 	if (_version >= 4) {
 		VAR_SCROLL_SCRIPT = 27;
 		VAR_DEBUGMODE = 39;
@@ -141,7 +142,9 @@
 	ScummEngine::setupScummVars();
 
 	VAR_CURRENT_LIGHTS = 9;
-	VAR_V5_TALK_STRING_Y = 54;
+
+	if (_version >= 4)
+		VAR_V5_TALK_STRING_Y = 54;
 }
 
 void ScummEngine_v6::setupScummVars() {