[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.165,2.166 script_v6.cpp,1.334,1.335 script_v6he.cpp,2.62,2.63

[Travis Howell]

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

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

Didn't need to split it after all.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.165
retrieving revision 2.166
diff -u -d -r2.165 -r2.166
--- intern.h	6 Jun 2004 11:10:47 -0000	2.165
+++ intern.h	20 Jun 2004 14:47:14 -0000	2.166
@@ -598,7 +598,6 @@
 	void o6_writeFile();
 	void o6_setVolume();
 	void o6_seekFilePos();
-	void o6_unknownE1();
 	void o6_localizeArray();
 	void o6_redimArray();
 	void o6_readFilePos();

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -d -r1.334 -r1.335
--- script_v6.cpp	7 Jun 2004 00:26:08 -0000	1.334
+++ script_v6.cpp	20 Jun 2004 14:47:14 -0000	1.335
@@ -3040,8 +3040,15 @@
 
 void ScummEngine_v6::o6_unknownE1() {
 	// this opcode check ground area in minigame "Asteroid Lander" in the dig
-	int y = pop();
-	int x = pop();
+	int x, y;
+
+	if (_features & GF_HUMONGOUS) {
+		x = pop();
+		y = pop();
+	} else {
+		y = pop();
+		x = pop();
+	}
 
 	if (x > _screenWidth - 1) {
 		push(-1);
@@ -3057,8 +3064,6 @@
 		return;
 	}
 	
-	// FIXME: Actually, there is only one virtscr in V7/V8 games anyway.
-	// And topline is always 0 for it.
 	VirtScreen *vs = findVirtScreen(y);
 
 	if (vs == NULL) {

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.62
retrieving revision 2.63
diff -u -d -r2.62 -r2.63
--- script_v6he.cpp	7 Jun 2004 00:26:08 -0000	2.62
+++ script_v6he.cpp	20 Jun 2004 14:47:14 -0000	2.63
@@ -1151,37 +1151,6 @@
 	}
 }
 
-void ScummEngine_v6he::o6_unknownE1() {
-	int x = pop();
-	int y = 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_localizeArray() {
 	int stringID = pop();