aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2008-06-19 16:27:49 +0000
committerSven Hesse2008-06-19 16:27:49 +0000
commitf1b0e379d1977df831bfd3659d73fa57588a0279 (patch)
treeb85397d67f983a1431964beee48d7bdf1d126568
parent07bcb5179ccad90d18a9e5a8f3c86d9d7ee3f910 (diff)
downloadscummvm-rg350-f1b0e379d1977df831bfd3659d73fa57588a0279.tar.gz
scummvm-rg350-f1b0e379d1977df831bfd3659d73fa57588a0279.tar.bz2
scummvm-rg350-f1b0e379d1977df831bfd3659d73fa57588a0279.zip
Only try playing object videos when the game version supports that (only Woodruff, for now)
svn-id: r32737
-rw-r--r--engines/gob/scenery.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp
index 6b52cdbbd6..33e540ace4 100644
--- a/engines/gob/scenery.cpp
+++ b/engines/gob/scenery.cpp
@@ -595,7 +595,7 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags,
int16 destX;
int16 destY;
- if (animation < 0) {
+ if ((_vm->getGameType() == kGameTypeWoodruff) && (animation < 0)) {
// Object video
if (flags & 1) { // Do capture
@@ -736,6 +736,8 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags,
return;
}
+ if ((animation < 0) || (animation >= 10))
+ return;
if ((_animPictCount[animation] == 0) || (layer < 0))
return;
if (layer >= _animations[animation].layersCount)