[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.58,1.59

[James Brown]

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

Modified Files:
	object.cpp 
Log Message:
Clip strip value when removing objects


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- object.cpp	16 Jan 2003 00:40:19 -0000	1.58
+++ object.cpp	17 Jan 2003 15:23:27 -0000	1.59
@@ -763,13 +763,22 @@
 
 void Scumm::removeObjectFromRoom(int obj)
 {
-	int i, j;
+	int i, j, strip;
 
 	for (i = 1; i < _numLocalObjects; i++) {
 		if (_objs[i].obj_nr == (uint16)obj) {
 			if (_objs[i].width != 0) {
-				for (j = 0; j < _objs[i].width; j++)
-					setGfxUsageBit((_objs[i].x_pos >> 3) + j, USAGE_BIT_DIRTY);
+				for (j = 0; j < _objs[i].width; j++) {
+					strip = (_objs[i].x_pos >> 3) + j;
+
+					// Clip value
+					if (strip < _screenStartStrip)
+						continue;
+					if (strip > _screenEndStrip)
+						break;
+
+					setGfxUsageBit(strip, USAGE_BIT_DIRTY);
+				}
 			}
 			_BgNeedsRedraw = true;
 			return;