[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.250,1.251 script_v6he.cpp,2.165,2.166

[kirben]

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

Modified Files:
	object.cpp script_v6he.cpp 
Log Message:

Objects were not been swapped in HE games.



Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- object.cpp	14 Sep 2005 09:37:17 -0000	1.250
+++ object.cpp	13 Oct 2005 15:02:21 -0000	1.251
@@ -394,11 +394,7 @@
 			if (_objs[i].obj_nr > 0 && (_objs[i].state & mask) && _objs[i].fl_object_index == 0)
 				drawRoomObject(i, arg);
 		}
-		// HACK: Reverse order is required to draw inventory background and items
-		// in correct order in putttime/puttzoo. Otherwise the inventory background
-		// is drawn over the items. But this doesn't match original, maybe masking
-		// issue somewhere?
-		for (i = 1; i < _numLocalObjects; i++) {
+		for (i = (_numLocalObjects-1); i > 0; i--) {
 			if (_objs[i].obj_nr > 0 && (_objs[i].state & mask) && _objs[i].fl_object_index != 0)
 				drawRoomObject(i, arg);
 		}

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.165
retrieving revision 2.166
diff -u -d -r2.165 -r2.166
--- script_v6he.cpp	14 Aug 2005 00:41:10 -0000	2.165
+++ script_v6he.cpp	13 Oct 2005 15:02:21 -0000	2.166
@@ -556,7 +556,7 @@
 void ScummEngine_v60he::swapObjects(int object1, int object2) {
 	int idx1 = -1, idx2 = -1;
 
-	for (int i = 0; i < _numObjectsInRoom; i++) {
+	for (int i = 0; i < _numLocalObjects; i++) {
 		if (_objs[i].obj_nr == object1)
 			idx1 = i;
 
@@ -564,7 +564,7 @@
 			idx2 = i;
 	}
 
-	if (idx1 == -1 || idx2 == -1 || idx1 >= idx2)
+	if (idx1 == -1 || idx2 == -1 || idx1 <= idx2)
 		return;
 
 	stopObjectScript(object1);