[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.134,2.135 script_v6.cpp,1.290,1.291 script_v6he.cpp,2.9,2.10

[Travis Howell]

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

Modified Files:
	intern.h script_v6.cpp script_v6he.cpp 
Log Message:

Cleanup


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.134
retrieving revision 2.135
diff -u -d -r2.134 -r2.135
--- intern.h	9 Feb 2004 14:59:55 -0000	2.134
+++ intern.h	9 Feb 2004 15:17:56 -0000	2.135
@@ -583,9 +583,7 @@
 	void o6_readFile();
 	void o6_rename();
 	void o6_writeFile();
-	void o6_findAllObjects();
 	void o6_setVolume();
-	void o6_unknownE1();
 	void o6_seekFile();
 	void o6_localizeArray();
 	void o6_unknownEE();

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- script_v6.cpp	7 Feb 2004 03:00:01 -0000	1.290
+++ script_v6.cpp	9 Feb 2004 15:17:56 -0000	1.291
@@ -1887,30 +1887,6 @@
 	case 217:		// SO_ACTOR_NEW
 		a->initActor(2);
 		break;
-	case 218:		
-		{
-			// TODO: this opcode is used in the putt-putt fun pack, in 'checkers" mini game
-			warning("o6_actorOps():218 partially unimplemented");
-
-			int top_actor = a->top;
-			int bottom_actor = a->bottom;
-			a->forceClip = 1;
-			a->needRedraw = true;
-			a->drawActorCostume();
-			a->forceClip = 0;
-			a->needRedraw = true;
-			a->drawActorCostume();
-			a->needRedraw = false;
-
-			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
 		a->layer = pop();
 		break;

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- script_v6he.cpp	9 Feb 2004 14:59:55 -0000	2.9
+++ script_v6he.cpp	9 Feb 2004 15:17:56 -0000	2.10
@@ -1064,56 +1064,6 @@
 	warning("o6_writeFile(%d, %d)", slot, resID);
 }
 
-void ScummEngine_v6he::o6_findAllObjects() {
-	int a = pop();
-	int i = 1;
-
-	if (a != _currentRoom)
-		warning("o6_findAllObjects: current room is not %d", a);
-	writeVar(0, 0);
-	defineArray(0, 5, 0, _numLocalObjects + 1);
-	writeArray(0, 0, 0, _numLocalObjects);
-	
-	while (i < _numLocalObjects) {
-		writeArray(0, 0, i, _objs[i].obj_nr);
-		i++;
-	}
-	
-	push(readVar(0));
-}
-
-void ScummEngine_v6he::o6_unknownE1() {
-	// this opcode check ground area in minigame "Asteroid Lander" in the dig
-	int y = pop();
-	int x = pop();
-
-	if (x > _screenWidth - 1) {
-		push(-1);
-		return;
-	}
-	if (x < 0) {
-		push(-1);
-		return;
-	}
-
-	if (y < 0) {
-		push(-1);
-		return;
-	}
-	
-	VirtScreen *vs = findVirtScreen(y);
-
-	if (vs == NULL) {
-		push(-1);
-		return;
-	}
-
-	int offset = (y - vs->topline) * vs->width + x + _screenLeft;
-
-	byte area = *(vs->screenPtr + offset);
-	push(area);
-}
-
 void ScummEngine_v6he::o6_setVolume() {
 	byte subOp = fetchScriptByte();
 	int soundVolumeMaster;