Fix and remove duplicate opcode for Elvira 1

svn-id: r24262

5 files changed, 13 insertions, 14 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 50f955d456..920cb6f40a 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -714,10 +714,13 @@ void AGOSEngine::setupGame() {
 	_stringIdLocalMin = 1;
 
 	for (int i = 0; i < 20; i++) {
-		if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2)
+		if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
 			_videoWindows[i] = initialVideoWindows_Simon[i];
-		else
+		} else {
 			_videoWindows[i] = initialVideoWindows_Common[i];
+		}
+
+		printf("initialVideoWindows_Common[%d] %d\n", i, _videoWindows[i]);
 	}
 }
 
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 9070357a55..41e00d6884 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1094,7 +1094,6 @@ public:
 	void oe1_printMonsterDamage();
 	void oe1_printPlayerHit();
 	void oe1_printMonsterHit();
-	void oe1_setStore();
 
 	// Opcodes, Elvira 2 only
 	void oe2_moveDirn();
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index f2471e26ff..fdd041d6a7 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -164,6 +164,8 @@ static void decompressIcon(byte *dst, byte *src, uint w, uint h_org, byte base,
 }
 
 void AGOSEngine::draw_icon_c(WindowBlock *window, uint icon, uint x, uint y) {
+	return;
+
 	byte *dst;
 	byte *src;
 
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index cc2a69f3f4..bb69e836cf 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.cpp
@@ -338,7 +338,7 @@ void AGOSEngine::setupElvira1Opcodes(OpcodeProc *op) {
 	op[279] = &AGOSEngine::o_freezeZones;
 	op[280] = &AGOSEngine::o_placeNoIcons;
 	op[281] = &AGOSEngine::o_clearTimers;
-	op[282] = &AGOSEngine::oe1_setStore;
+	op[282] = &AGOSEngine::o_setDollar;
 	op[283] = &AGOSEngine::o_isBox;
 }
 
@@ -2135,16 +2135,6 @@ void AGOSEngine::oe1_printMonsterHit() {
 	printStats();
 }
 
-void AGOSEngine::oe1_setStore() {
-	// 282: set store
-	Item *item = getNextItemPtr();
-
-	if (getVarOrWord() == 1)
-		_subjectItem = item;
-	else
-		_objectItem = item;
-}
-
 // -----------------------------------------------------------------------
 // Elvira 2 Opcodes
 // -----------------------------------------------------------------------
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index ed4a970d28..5ce9a55f30 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -1249,6 +1249,9 @@ void AGOSEngine::drawImages_Feeble(VC10_state *state) {
 void AGOSEngine::drawImages(VC10_state *state) {
 	const uint16 *vlut = &_videoWindows[_windowNum * 4];
 
+	printf("_windowNum %d vlut[0] %d vlut[1] %d\n", _windowNum, vlut[0], vlut[1]);
+
+
 	if (drawImages_clip(state) == 0)
 		return;
 
@@ -1292,6 +1295,8 @@ void AGOSEngine::drawImages(VC10_state *state) {
 		offs2 = (vlut[1] - _videoWindows[17] + state->y);
 	}
 
+	printf("offs %d offs2 %d\n", offs, offs2);
+
 	state->surf2_addr += offs + offs2 * state->surf2_pitch;
 	state->surf_addr += offs + offs2 * state->surf_pitch;