[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.111,1.112

Max Horn fingolfin at users.sourceforge.net
Tue May 14 13:32:07 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv11679

Modified Files:
	script_v1.cpp 
Log Message:
fixed var shadowing warning

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- script_v1.cpp	14 May 2002 19:49:22 -0000	1.111
+++ script_v1.cpp	14 May 2002 20:07:08 -0000	1.112
@@ -1319,23 +1319,19 @@
 
 void Scumm::o5_getActorY()
 {
-
-	int actor;
+	int a;
 	getResultPos();
 
 	if(_gameId == GID_INDY3_256)
-
-		actor = getVarOrDirectByte(0x80);
-
+		a = getVarOrDirectByte(0x80);
 	else
+		a = getVarOrDirectWord(0x80);
 
-		actor = getVarOrDirectWord(0x80);
-	setResult(getObjY(actor));
+	setResult(getObjY(a));
 }
 
 void Scumm::o5_getAnimCounter()
 {
-
 	Actor *a;
 	getResultPos();
 
@@ -1343,9 +1339,7 @@
 
 	if(a) // FIXME
 		setResult(a->cost.animCounter1);
-
 	else
-
 		setResult(0);
 }
 





More information about the Scummvm-git-logs mailing list