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

[kirben at users.sourceforge.net]

Revision: 24764
          http://svn.sourceforge.net/scummvm/?rev=24764&view=rev
Author:   kirben
Date:     2006-11-22 21:37:37 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
Avoid compiler warnings

Modified Paths:
--------------
    scummvm/trunk/engines/agos/menus.cpp
    scummvm/trunk/engines/agos/vga_s1.cpp

Modified: scummvm/trunk/engines/agos/menus.cpp
===================================================================
--- scummvm/trunk/engines/agos/menus.cpp	2006-11-22 22:52:57 UTC (rev 24763)
+++ scummvm/trunk/engines/agos/menus.cpp	2006-11-23 05:37:37 UTC (rev 24764)
@@ -127,10 +127,10 @@
 	mouseOff();
 	unlightMenuStrip();
 
-	for (int i = 120; i != 130; i++) {
-		if (a & ((1 << i) - 120)) {
-			enableBox(i);
-			lightMenuBox(i);
+	for (int i = 0; i != 10; i++) {
+		if (a & (1 << i)) {
+			enableBox(120 + i);
+			lightMenuBox(120 + i);
 		}
 	}
 

Modified: scummvm/trunk/engines/agos/vga_s1.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_s1.cpp	2006-11-22 22:52:57 UTC (rev 24763)
+++ scummvm/trunk/engines/agos/vga_s1.cpp	2006-11-23 05:37:37 UTC (rev 24764)
@@ -61,7 +61,7 @@
 
 void AGOSEngine::vc22_setPaletteNew() {
 	byte *offs, *palptr = 0, *src;
-	uint16 a = 0, b, num = 1, palSize = 0;
+	uint16 a = 0, b, num, palSize = 0;
 
 	a = vcReadNextWord();
 	b = vcReadNextWord();
@@ -71,7 +71,7 @@
 		palSize = 768;
 
 		palptr = _displayPalette;
-	} else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
+	} else {
 		num = a == 0 ? 32 : 16;
 		palSize = 96;
 


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