[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.321,2.322 script_v90he.cpp,2.115,2.116

Gregory Montoir cyx at users.sourceforge.net
Sat Nov 27 22:04:24 CET 2004


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

Modified Files:
	intern.h script_v90he.cpp 
Log Message:
correction

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.321
retrieving revision 2.322
diff -u -d -r2.321 -r2.322
--- intern.h	27 Nov 2004 17:50:22 -0000	2.321
+++ intern.h	28 Nov 2004 05:33:33 -0000	2.322
@@ -883,8 +883,8 @@
 	void o90_getWizData();
 	void o90_unknown2F();
 	void o90_mod();
-	void o90_shl4();
-	void o90_shr4();
+	void o90_shl();
+	void o90_shr();
 	void o90_findAllObjectsWithClassOf();
 	void o90_getPolygonOverlap();
 	void o90_cond();

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.115
retrieving revision 2.116
diff -u -d -r2.115 -r2.116
--- script_v90he.cpp	27 Nov 2004 17:50:22 -0000	2.115
+++ script_v90he.cpp	28 Nov 2004 05:33:33 -0000	2.116
@@ -105,8 +105,8 @@
 		OPCODE(o90_unknown2F),
 		/* 30 */
 		OPCODE(o90_mod),
-		OPCODE(o90_shl4),
-		OPCODE(o90_shr4),
+		OPCODE(o90_shl),
+		OPCODE(o90_shr),
 		OPCODE(o6_invalid),
 		/* 34 */
 		OPCODE(o90_findAllObjectsWithClassOf),
@@ -800,8 +800,6 @@
 		error("o90_unknown25: Unknown case %d", subOp);
 	}
 	push(0);
-
-
 }
 
 void ScummEngine_v90he::o90_unknown26() {
@@ -1112,13 +1110,13 @@
 	debug(1,"o90_unknown2F stub (%d)", subOp);
 }
 
-void ScummEngine_v90he::o90_shl4() {
-	int a = pop() << 2;
+void ScummEngine_v90he::o90_shl() {
+	int a = pop();
 	push(pop() << a);
 }
 
-void ScummEngine_v90he::o90_shr4() {
-	int a = pop() << 2;
+void ScummEngine_v90he::o90_shr() {
+	int a = pop();
 	push(pop() >> a);
 }
 





More information about the Scummvm-git-logs mailing list