[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.160,1.161 script_v6.cpp,1.252,1.253 script_v8.cpp,2.221,2.222

[Max Horn]

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

Modified Files:
	object.cpp script_v6.cpp script_v8.cpp 
Log Message:
cleanup

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- object.cpp	11 Jan 2004 20:42:40 -0000	1.160
+++ object.cpp	11 Jan 2004 21:48:31 -0000	1.161
@@ -413,6 +413,7 @@
 	width = od.width / 8;
 	height = od.height &= 0xFFFFFFF8;	// Mask out last 3 bits
 
+	// Short circuit for objects which aren't visible at all.
 	if (width == 0 || xpos > _screenEndStrip || xpos + width < _screenStartStrip)
 		return;
 
@@ -809,6 +810,16 @@
 	_drawObjectQueNr = 0;
 }
 
+void ScummEngine::addObjectToDrawQue(int object) {
+	if ((unsigned int)_drawObjectQueNr >= ARRAYSIZE(_drawObjectQue))
+		error("Draw Object Que overflow");
+	_drawObjectQue[_drawObjectQueNr++] = object;
+}
+
+void ScummEngine::clearDrawObjectQueue() {
+	_drawObjectQueNr = 0;
+}
+
 void ScummEngine::clearOwnerOf(int obj) {
 	int i, j;
 	uint16 *a;
@@ -871,16 +882,6 @@
 			return;
 		}
 	}
-}
-
-void ScummEngine::addObjectToDrawQue(int object) {
-	_drawObjectQue[_drawObjectQueNr++] = object;
-	if ((unsigned int)_drawObjectQueNr > ARRAYSIZE(_drawObjectQue))
-		error("Draw Object Que overflow");
-}
-
-void ScummEngine::clearDrawObjectQueue() {
-	_drawObjectQueNr = 0;
 }
 
 const byte *ScummEngine::getObjOrActorName(int obj) {

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- script_v6.cpp	11 Jan 2004 20:42:40 -0000	1.252
+++ script_v6.cpp	11 Jan 2004 21:48:31 -0000	1.253
@@ -749,13 +749,17 @@
 }
 
 void ScummEngine_v6::o6_drawObject() {
-	int a = pop();
-	int b = pop();
+	int state = pop();
+	int obj = pop();
 
-	if (a == 0)
-		a = 1;
+	// FIXME: Why is the following here? Is it based on disassembly, or was
+	// it simply added to work around a bug (in ScummVM or scripts) ?
+	// In either case, the answer should be put into a comment (replacing this
+	// one, of course :-)
+	if (state == 0)
+		state = 1;
 
-	setObjectState(b, a, -1, -1);
+	setObjectState(obj, state, -1, -1);
 }
 
 void ScummEngine_v6::o6_drawObjectAt() {

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.221
retrieving revision 2.222
diff -u -d -r2.221 -r2.222
--- script_v8.cpp	8 Jan 2004 03:10:16 -0000	2.221
+++ script_v8.cpp	11 Jan 2004 21:48:31 -0000	2.222
@@ -1565,7 +1565,11 @@
 }
 
 void ScummEngine_v8::o8_drawObject() {
-	int state = pop(), y = pop(), x = pop(), obj = pop(), objnum = getObjectIndex(obj);
+	int state = pop();
+	int y = pop();
+	int x = pop();
+	int obj = pop();
+	int objnum = getObjectIndex(obj);
 	ObjectData *od;
 
 	if (!objnum)
@@ -1575,7 +1579,6 @@
 	if (x != 0x7FFFFFFF) {
 		od->x_pos = x;
 		od->y_pos = y;
-		debug(1, "setting position: 0x%X b 0x%X", x, y);
 	}
 
 	addObjectToDrawQue(objnum);