From e7db7aff4db96bc36a29829009159b6047c1f94a Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Thu, 23 Nov 2006 05:37:37 +0000 Subject: Avoid compiler warnings svn-id: r24764 --- engines/agos/menus.cpp | 8 ++++---- engines/agos/vga_s1.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engines/agos/menus.cpp b/engines/agos/menus.cpp index 45aab9ee7b..33023ce437 100644 --- a/engines/agos/menus.cpp +++ b/engines/agos/menus.cpp @@ -127,10 +127,10 @@ void AGOSEngine::lightMenuStrip(int a) { 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); } } diff --git a/engines/agos/vga_s1.cpp b/engines/agos/vga_s1.cpp index c467ca7632..b878699038 100644 --- a/engines/agos/vga_s1.cpp +++ b/engines/agos/vga_s1.cpp @@ -61,7 +61,7 @@ void AGOSEngine::vc17_setPathfinderItem() { 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 @@ void AGOSEngine::vc22_setPaletteNew() { palSize = 768; palptr = _displayPalette; - } else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) { + } else { num = a == 0 ? 32 : 16; palSize = 96; -- cgit v1.2.3