[Scummvm-cvs-logs] SF.net SVN: scummvm: [24265] scummvm/trunk/engines/agos

kirben at users.sourceforge.net kirben at users.sourceforge.net
Tue Oct 10 15:08:33 CEST 2006


Revision: 24265
          http://svn.sourceforge.net/scummvm/?rev=24265&view=rev
Author:   kirben
Date:     2006-10-10 06:08:27 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
Ooops, remove debug left overs

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/icons.cpp
    scummvm/trunk/engines/agos/vga.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-10-10 12:33:59 UTC (rev 24264)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-10-10 13:08:27 UTC (rev 24265)
@@ -719,8 +719,6 @@
 		} else {
 			_videoWindows[i] = initialVideoWindows_Common[i];
 		}
-
-		printf("initialVideoWindows_Common[%d] %d\n", i, _videoWindows[i]);
 	}
 }
 

Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp	2006-10-10 12:33:59 UTC (rev 24264)
+++ scummvm/trunk/engines/agos/icons.cpp	2006-10-10 13:08:27 UTC (rev 24265)
@@ -164,15 +164,26 @@
 }
 
 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 @@
 			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;

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2006-10-10 12:33:59 UTC (rev 24264)
+++ scummvm/trunk/engines/agos/vga.cpp	2006-10-10 13:08:27 UTC (rev 24265)
@@ -1249,9 +1249,6 @@
 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 @@
 		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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list