[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.53,2.54

[Max Horn]

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

Modified Files:
	script_v2.cpp 
Log Message:
cleanup

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.53
retrieving revision 2.54
diff -u -d -r2.53 -r2.54
--- script_v2.cpp	8 May 2003 22:44:46 -0000	2.53
+++ script_v2.cpp	9 May 2003 00:57:10 -0000	2.54
@@ -495,11 +495,10 @@
 }
 
 void Scumm_v2::o2_setBitVar() {
-	byte lo = fetchScriptByte();
-	byte hi = fetchScriptByte();
+	byte var = fetchScriptWord();
 	byte a = getVarOrDirectByte(0x80);
 
-	int bit_var = (hi << 8) + lo + a;
+	int bit_var = var + a;
 	int bit_offset = bit_var & 0x0f;
 	bit_var >>= 4;
 
@@ -511,11 +510,10 @@
 
 void Scumm_v2::o2_getBitVar() {
 	getResultPos();
-	byte lo = fetchScriptByte();
-	byte hi = fetchScriptByte();
+	byte var = fetchScriptWord();
 	byte a = getVarOrDirectByte(0x80);
 
-	int bit_var = (hi << 8) + lo + a;
+	int bit_var = var + a;
 	int bit_offset = bit_var & 0x0f;
 	bit_var >>= 4;