[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.223,1.224 script_v6.cpp,1.281,1.282

[Travis Howell]

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

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

Remove a few old warnings.



Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- actor.cpp	17 Jan 2004 10:37:34 -0000	1.223
+++ actor.cpp	22 Jan 2004 02:37:41 -0000	1.224
@@ -1643,8 +1643,6 @@
 			return;
 		}
 	}
-
-	warning("Color %d not found in actor %d", color, number);
 }
 
 void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold) {

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -d -r1.281 -r1.282
--- script_v6.cpp	19 Jan 2004 22:55:42 -0000	1.281
+++ script_v6.cpp	22 Jan 2004 02:37:41 -0000	1.282
@@ -1921,12 +1921,13 @@
 			a->drawActorCostume();
 			a->needRedraw = false;
 
-			if (a->top < top_actor) {
-				a->bottom = top_actor;
-			}
-			if (a->bottom > bottom_actor) {
+			if (a->top > top_actor)
+				a->top = top_actor;
+			if (a->bottom < bottom_actor)
 				a->bottom = bottom_actor;
-			}
+
+			//FIXME Trigger redraw
+			a->bottom = top_actor;
 		}
 		break;
 	case 227:		// SO_ACTOR_DEPTH
@@ -3191,11 +3192,9 @@
 
 // Humongous Entertainment games only
 void ScummEngine_v6::o6_findAllObjects() {
-	// FIXME verifty correctness of this opcode
 	int a = pop();
 	int i = 1;
 
-	warning("stub o6_findAllObjects(%d)", a);
 	if (a != _currentRoom)
 		warning("o6_findAllObjects: current room is not %d", a);
 	writeVar(0, 0);