[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.113,1.114 object.cpp,1.158,1.159 script_v2.cpp,2.227,2.228 script_v5.cpp,1.221,1.222 script_v6.cpp,1.250,1.251 scumm.h,1.357,1.358

[Max Horn]

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

Modified Files:
	debugger.cpp object.cpp script_v2.cpp script_v5.cpp 
	script_v6.cpp scumm.h 
Log Message:
renamed removeObjectFromRoom to forceObjectRedraw

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- debugger.cpp	10 Jan 2004 11:01:46 -0000	1.113
+++ debugger.cpp	11 Jan 2004 20:15:04 -0000	1.114
@@ -486,7 +486,7 @@
 		_vm->putOwner(obj, _vm->VAR(_vm->VAR_EGO));
 		_vm->putClass(obj, kObjectClassUntouchable, 1);
 		_vm->putState(obj, 1);
-		_vm->removeObjectFromRoom(obj);
+		_vm->forceObjectRedraw(obj);
 		_vm->clearDrawObjectQueue();
 		_vm->runInventoryScript(obj);
 	} else if (!strcmp(argv[2], "state")) {

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- object.cpp	8 Jan 2004 03:24:41 -0000	1.158
+++ object.cpp	11 Jan 2004 20:15:05 -0000	1.159
@@ -850,7 +850,12 @@
 	}
 }
 
-void ScummEngine::removeObjectFromRoom(int obj) {
+/**
+ * Force a screen redraw at the location of the specifed object. This is
+ * typically called when an object was just removed from the room, or when its
+ * state changed.
+ */
+void ScummEngine::forceObjectRedraw(int obj) {
 	int i, j, strip;
 
 	for (i = 1; i < _numLocalObjects; i++) {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.227
retrieving revision 2.228
diff -u -d -r2.227 -r2.228
--- script_v2.cpp	6 Jan 2004 12:45:30 -0000	2.227
+++ script_v2.cpp	11 Jan 2004 20:15:05 -0000	2.228
@@ -468,14 +468,14 @@
 void ScummEngine_v2::o2_setState08() {
 	int obj = getVarOrDirectWord(PARAM_1);
 	putState(obj, getState(obj) | 0x08);
-	removeObjectFromRoom(obj);
+	forceObjectRedraw(obj);
 	clearDrawObjectQueue();
 }
 
 void ScummEngine_v2::o2_clearState08() {
 	int obj = getVarOrDirectWord(PARAM_1);
 	putState(obj, getState(obj) & ~0x08);
-	removeObjectFromRoom(obj);
+	forceObjectRedraw(obj);
 	clearDrawObjectQueue();
 }
 
@@ -1449,7 +1449,7 @@
 		return;											/* object twice */
 
 	addObjectToInventory(obj, _roomResource);
-	removeObjectFromRoom(obj);
+	forceObjectRedraw(obj);
 	putOwner(obj, VAR(VAR_EGO));
 	putState(obj, getState(obj) | 0xA);
 	clearDrawObjectQueue();

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- script_v5.cpp	6 Jan 2004 12:45:30 -0000	1.221
+++ script_v5.cpp	11 Jan 2004 20:15:05 -0000	1.222
@@ -1592,7 +1592,7 @@
 	putOwner(obj, VAR(VAR_EGO));
 	putClass(obj, kObjectClassUntouchable, 1);
 	putState(obj, 1);
-	removeObjectFromRoom(obj);
+	forceObjectRedraw(obj);
 	clearDrawObjectQueue();
 	runInventoryScript(1);
 }
@@ -2174,7 +2174,7 @@
 	obj = getVarOrDirectWord(PARAM_1);
 	state = getVarOrDirectByte(PARAM_2);
 	putState(obj, state);
-	removeObjectFromRoom(obj);
+	forceObjectRedraw(obj);
 	if (_BgNeedsRedraw)
 		clearDrawObjectQueue();
 }
@@ -2911,7 +2911,7 @@
 
 	// warning("adding %d from %d to inventoryOld", obj, _currentRoom);
 	addObjectToInventory(obj, _roomResource);
-	removeObjectFromRoom(obj);
+	forceObjectRedraw(obj);
 	putOwner(obj, VAR(VAR_EGO));
 	putClass(obj, kObjectClassUntouchable, 1);
 	putState(obj, 1);

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- script_v6.cpp	8 Jan 2004 21:21:40 -0000	1.250
+++ script_v6.cpp	11 Jan 2004 20:15:05 -0000	1.251
@@ -916,7 +916,7 @@
 	}
 
 	putState(obj, state);
-	removeObjectFromRoom(obj);
+	forceObjectRedraw(obj);
 	if (_BgNeedsRedraw)
 		clearDrawObjectQueue();
 }
@@ -1151,7 +1151,7 @@
 	putOwner(obj, VAR(VAR_EGO));
 	putClass(obj, kObjectClassUntouchable, 1);
 	putState(obj, 1);
-	removeObjectFromRoom(obj);
+	forceObjectRedraw(obj);
 	clearDrawObjectQueue();
 	runInventoryScript(obj);									/* Difference */
 }

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -d -r1.357 -r1.358
--- scumm.h	10 Jan 2004 11:01:47 -0000	1.357
+++ scumm.h	11 Jan 2004 20:15:05 -0000	1.358
@@ -672,7 +672,7 @@
 	byte _numObjectsInRoom;
 
 	void setupRoomObject(ObjectData *od, const byte *room, const byte *searchptr = NULL);
-	void removeObjectFromRoom(int obj);
+	void forceObjectRedraw(int obj);
 	void loadFlObject(uint object, uint room);
 	void nukeFlObjects(int min, int max);
 	int findFlObjectSlot();