[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.124,2.125 string.cpp,1.184,1.185 vars.cpp,1.63,1.64

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv22708

Modified Files:
	intern.h string.cpp vars.cpp 
Log Message:
Fix for bug #873688

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.124
retrieving revision 2.125
diff -u -d -r2.124 -r2.125
--- intern.h	6 Jan 2004 12:45:30 -0000	2.124
+++ intern.h	9 Jan 2004 13:14:58 -0000	2.125
@@ -48,6 +48,8 @@
 	virtual void executeOpcode(byte i);
 	virtual const char *getOpcodeDesc(byte i);
 
+	virtual void setupScummVars();
+
 	virtual void decodeParseString();
 	int getWordVararg(int *ptr);
 	void saveVars();

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- string.cpp	8 Jan 2004 21:21:40 -0000	1.184
+++ string.cpp	9 Jan 2004 13:14:59 -0000	1.185
@@ -460,7 +460,7 @@
 				// Note #2: If triggered "accidentaly", this code could also
 				// cause code to be left printed when it shouldn't...
 				if (_string[a].no_talk_anim == false) {
-warning("Would have set _charset->_blitAlso = true (wanted to print '%c' = %d\n", c, c);
+warning("Would have set _charset->_blitAlso = true (wanted to print '%c' = %d)", c, c);
 //					_charset->_blitAlso = true;
 				}
 			}

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- vars.cpp	6 Jan 2004 12:45:31 -0000	1.63
+++ vars.cpp	9 Jan 2004 13:14:59 -0000	1.64
@@ -37,7 +37,6 @@
 	VAR_MACHINE_SPEED = 6;
 	VAR_ME = 7;
 	VAR_NUM_ACTOR = 8;
-	VAR_CURRENT_LIGHTS = 9;
 	VAR_CURRENTDRIVE = 10;
 	VAR_TMR_1 = 11;
 	VAR_TMR_2 = 12;
@@ -138,8 +137,15 @@
 	VAR_TALK_ACTOR = 41;
 }
 
+void ScummEngine_v5::setupScummVars() {
+	// Many vars are the same as in V5 & V6 games, so just call the inherited method first
+	ScummEngine::setupScummVars();
+
+	VAR_CURRENT_LIGHTS = 9;
+}
+
 void ScummEngine_v6::setupScummVars() {
-	// Many vars are the same as in V5 games, so just call the inherited method first
+	// Many vars are the same as in V5 & V6 games, so just call the inherited method first
 	ScummEngine::setupScummVars();
 
 	VAR_V6_SCREEN_WIDTH = 41;