aboutsummaryrefslogtreecommitdiff
path: root/engines/gnap
diff options
context:
space:
mode:
authorEugene Sandulenko2016-04-12 13:48:21 +0200
committerEugene Sandulenko2016-05-10 09:54:21 +0200
commit7762c494324075170ce3b84761bdaba31a390228 (patch)
tree45b2ab27900577c9df953ede8dbd374f13faafbf /engines/gnap
parent5c072b859e3e7ffaa45125f18cd1ff2c21aaf980 (diff)
downloadscummvm-rg350-7762c494324075170ce3b84761bdaba31a390228.tar.gz
scummvm-rg350-7762c494324075170ce3b84761bdaba31a390228.tar.bz2
scummvm-rg350-7762c494324075170ce3b84761bdaba31a390228.zip
GNAP: Fix another warning and adding a catching condition
Diffstat (limited to 'engines/gnap')
-rw-r--r--engines/gnap/gnap.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index 2dfd0b1b72..c42dc2b97f 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -2273,7 +2273,7 @@ void GnapEngine::toyUfoFlyTo(int destX, int destY, int minX, int maxX, int minY,
_toyUfoY = clippedDestY;
if (i - 1 > 0) {
- int seqId;
+ int seqId = 0;
if (isFlag(kGFUnk16))
seqId = 0x867;
else if (isFlag(kGFJointTaken))
@@ -2282,6 +2282,8 @@ void GnapEngine::toyUfoFlyTo(int destX, int destY, int minX, int maxX, int minY,
seqId = 0x85F;
else if (isFlag(kGFGroceryStoreHatTaken))
seqId = 0x857;
+ else
+ error("Unhandled flag in GnapEngine::toyUfoFlyTo(): 0x%x", _gameFlags);
v16[0].sequenceId = seqId;
v16[0].id = 0;
_gameSys->insertSequence(seqId | 0x10000, 0,