Ooops, remove debug left overs

svn-id: r24265

3 files changed, 15 insertions, 22 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 920cb6f40a..5c396455ad 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -719,8 +719,6 @@ void AGOSEngine::setupGame() {
 		} else {
 			_videoWindows[i] = initialVideoWindows_Common[i];
 		}
-
-		printf("initialVideoWindows_Common[%d] %d\n", i, _videoWindows[i]);
 	}
 }
 
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index fdd041d6a7..a25f968b7b 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -164,15 +164,26 @@ 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;
 
 	_lockWord |= 0x8000;
 	dst = getFrontBuf();
 
-	if (getGameType() == GType_SIMON1) {
+	if (getGameType() == GType_SIMON2) {
+		// Simon 2
+		dst += 110;
+		dst += x;
+		dst += (y + window->y) * _dxSurfacePitch;
+
+		src = _iconFilePtr;
+		src += READ_LE_UINT16(&((uint16 *)src)[icon * 2 + 0]);
+		decompressIcon(dst, src, 20, 10, 224, _dxSurfacePitch);
+
+		src = _iconFilePtr;
+		src += READ_LE_UINT16(&((uint16 *)src)[icon * 2 + 1]);
+		decompressIcon(dst, src, 20, 10, 208, _dxSurfacePitch);
+	} else if (getGameType() == GType_SIMON1) {
 		// Simon 1
 		dst += (x + window->x) * 8;
 		dst += (y * 25 + window->y) * _dxSurfacePitch;
@@ -187,18 +198,7 @@ void AGOSEngine::draw_icon_c(WindowBlock *window, uint icon, uint x, uint y) {
 			decompressIcon(dst, src, 24, 12, 224, _dxSurfacePitch);
 		}
 	} else {
-		// Simon 2
-		dst += 110;
-		dst += x;
-		dst += (y + window->y) * _dxSurfacePitch;
-
-		src = _iconFilePtr;
-		src += READ_LE_UINT16(&((uint16 *)src)[icon * 2 + 0]);
-		decompressIcon(dst, src, 20, 10, 224, _dxSurfacePitch);
-
-		src = _iconFilePtr;
-		src += READ_LE_UINT16(&((uint16 *)src)[icon * 2 + 1]);
-		decompressIcon(dst, src, 20, 10, 208, _dxSurfacePitch);
+		// TODO
 	}
 
 	_lockWord &= ~0x8000;
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index 5ce9a55f30..ed4a970d28 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -1249,9 +1249,6 @@ 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;
 
@@ -1295,8 +1292,6 @@ 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;