[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.430,1.431 script_v7he.cpp,2.145,2.146

[kirben]

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

Modified Files:
	script_v6.cpp script_v7he.cpp 
Log Message:

Cleanup


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -d -r1.430 -r1.431
--- script_v6.cpp	6 Apr 2005 17:31:11 -0000	1.430
+++ script_v6.cpp	16 Apr 2005 10:26:49 -0000	1.431
@@ -386,7 +386,7 @@
 int ScummEngine_v6::popRoomAndObj(int *room) {
 	int obj;
 
-	if (_version >= 7 || _heversion >= 70) {
+	if (_version >= 7) {
 		obj = pop();
 		*room = getObjectRoom(obj);
 	} else {
@@ -986,7 +986,13 @@
 		break;
 	case 0x99: 		// SO_CURSOR_IMAGE Set cursor image
 		{
-			int room, obj = popRoomAndObj(&room);
+			int room, obj;
+			if (_heversion >= 70) {
+				obj = pop();
+				room = getObjectRoom(obj);
+			} else {
+				obj = popRoomAndObj(&room);
+			}
 			setCursorFromImg(obj, room, 1);
 			break;
 		}
@@ -1239,11 +1245,7 @@
 	int room, obj, x, y;
 	Actor *a;
 
-	if (_features & GF_HUMONGOUS) {
-		room = pop();
-		obj = pop();
-	} else
-		obj = popRoomAndObj(&room);
+	obj = popRoomAndObj(&room);
 
 	a = derefActor(pop(), "o6_putActorAtObject");
 	if (whereIsObject(obj) != WIO_NOT_FOUND) {
@@ -1323,11 +1325,7 @@
 	y = pop();
 	x = pop();
 
-	if (_features & GF_HUMONGOUS) {
-		room = pop();
-		obj = pop();
-	} else
-		obj = popRoomAndObj(&room);
+	obj = popRoomAndObj(&room);
 
 	a = derefActor(VAR(VAR_EGO), "o6_loadRoomWithEgo");
 	a->putActor(0, 0, room);

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.145
retrieving revision 2.146
diff -u -d -r2.145 -r2.146
--- script_v7he.cpp	13 Apr 2005 11:03:23 -0000	2.145
+++ script_v7he.cpp	16 Apr 2005 10:26:49 -0000	2.146
@@ -599,7 +599,8 @@
 		break;
 	case 119:		// SO_LOAD_OBJECT
 		{
-			int room, obj = popRoomAndObj(&room);
+			int obj = pop();
+			int room = getObjectRoom(obj);
 			loadFlObject(obj, room);
 			break;
 		}