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

[Kirben at users.sourceforge.net]

Revision: 27095
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27095&view=rev
Author:   Kirben
Date:     2007-06-04 17:36:33 -0700 (Mon, 04 Jun 2007)

Log Message:
-----------
Hopefully more reliable display of inventory arrows.

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

Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp	2007-06-04 23:10:59 UTC (rev 27094)
+++ scummvm/trunk/engines/agos/icons.cpp	2007-06-05 00:36:33 UTC (rev 27095)
@@ -703,27 +703,21 @@
 	ha->window = window;
 	ha->verb = 1;
 
-	if (getFeatures() & GF_32COLOR) {
-		_lockWord |= 0x8;
+	_lockWord |= 0x8;
 
-		VgaPointersEntry *vpe = &_vgaBufferPointers[1];
-		byte *curVgaFile2Orig = _curVgaFile2;
-		uint16 windowNumOrig = _windowNum;
+	VgaPointersEntry *vpe = &_vgaBufferPointers[1];
+	byte *curVgaFile2Orig = _curVgaFile2;
+	uint16 windowNumOrig = _windowNum;
+	uint8 palette = (getPlatform() == Common::kPlatformAmiga) ? 15 : 14;
 
+	_windowNum = 0;
+	_curVgaFile2 = vpe->vgaFile2;
+	drawImage_init(1, palette, 38, 150, 4);
 
-		_windowNum = 0;
-		_curVgaFile2 = vpe->vgaFile2;
-		drawImage_init(1, 15, 38, 150, 4);
+	_curVgaFile2 = curVgaFile2Orig;
+	_windowNum = windowNumOrig;
 
-		_curVgaFile2 = curVgaFile2Orig;
-		_windowNum = windowNumOrig;
-
-		_lockWord &= ~0x8;
-	} else {
-		stopAnimate(128);
-		uint8 palette = (getPlatform() == Common::kPlatformAmiga) ? 15 : 14;
-		animate(0, 1, 128, 0, 0, palette);
-	}
+	_lockWord &= ~0x8;
 }
 
 void AGOSEngine_Waxworks::addArrows(WindowBlock *window) {
@@ -822,13 +816,7 @@
 
 void AGOSEngine::removeArrows(WindowBlock *window, uint num) {
 	if (getGameType() == GType_SIMON1) {
-		if (getFeatures() & GF_32COLOR) {
-			restoreBlock(200, 320, 146, 304);
-		} else {
-			stopAnimate(129);
-			uint8 palette = (getPlatform() == Common::kPlatformAmiga) ? 15: 14;
-			animate(0, 1, 129, 0, 0, palette);
-		}
+		restoreBlock(200, 320, 146, 304);
 	} else if (getGameType() == GType_WW) {
 		setBitFlag(22, false);
 		setWindowImageEx(6, 103);


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