aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/goblin_v2.cpp
diff options
context:
space:
mode:
authorSven Hesse2007-04-05 13:37:20 +0000
committerSven Hesse2007-04-05 13:37:20 +0000
commitec5a9eee3132c5e7ccc5338f426f0839bb9e0913 (patch)
tree0d12e8599143530241731872be276c45e8a8c7fd /engines/gob/goblin_v2.cpp
parentc5e7eaf7dbcc18f4d26532f64e6cbf3e8614fc18 (diff)
downloadscummvm-rg350-ec5a9eee3132c5e7ccc5338f426f0839bb9e0913.tar.gz
scummvm-rg350-ec5a9eee3132c5e7ccc5338f426f0839bb9e0913.tar.bz2
scummvm-rg350-ec5a9eee3132c5e7ccc5338f426f0839bb9e0913.zip
- Minor cleanup
- Added Inter_v3 (for new opcode o3_getTotTextItemPart) - Some fixes to let Gob3 start with the first screen svn-id: r26383
Diffstat (limited to 'engines/gob/goblin_v2.cpp')
-rw-r--r--engines/gob/goblin_v2.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/gob/goblin_v2.cpp b/engines/gob/goblin_v2.cpp
index ada54fbb5b..de9da6afc0 100644
--- a/engines/gob/goblin_v2.cpp
+++ b/engines/gob/goblin_v2.cpp
@@ -463,6 +463,9 @@ void Goblin_v2::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
}
if (animData->frame >= framesCount) {
+ if (animData->nextState == -1) // TODO: This should never happen
+ return;
+
state = animData->nextState;
animation = obj->goblinStates[state][0].animation;
layer = obj->goblinStates[state][0].layer;