aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/vga_s1.cpp
diff options
context:
space:
mode:
authorTravis Howell2006-11-23 05:37:37 +0000
committerTravis Howell2006-11-23 05:37:37 +0000
commite7db7aff4db96bc36a29829009159b6047c1f94a (patch)
treec83c061369dd629ba760e8aa40983ae352ef5180 /engines/agos/vga_s1.cpp
parent7d3aa0b65378ba9d8b4b7838a0986bdc7734a252 (diff)
downloadscummvm-rg350-e7db7aff4db96bc36a29829009159b6047c1f94a.tar.gz
scummvm-rg350-e7db7aff4db96bc36a29829009159b6047c1f94a.tar.bz2
scummvm-rg350-e7db7aff4db96bc36a29829009159b6047c1f94a.zip
Avoid compiler warnings
svn-id: r24764
Diffstat (limited to 'engines/agos/vga_s1.cpp')
-rw-r--r--engines/agos/vga_s1.cpp4
1 files changed, 2 insertions, 2 deletions
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;