diff options
| author | Torbjörn Andersson | 2005-09-30 09:14:21 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-09-30 09:14:21 +0000 |
| commit | 2cb741281f104e8781e172c3b2f75d1f88008797 (patch) | |
| tree | 60fbf3a2a5534eb08cba4ba0f139af3498b32da3 | |
| parent | d659246376de6c85b1a004c97d9a23906867d8b5 (diff) | |
| download | scummvm-rg350-2cb741281f104e8781e172c3b2f75d1f88008797.tar.gz scummvm-rg350-2cb741281f104e8781e172c3b2f75d1f88008797.tar.bz2 scummvm-rg350-2cb741281f104e8781e172c3b2f75d1f88008797.zip | |
Don't draw actors during cutaways. (Not that it makes any difference at
this point. :-)
svn-id: r18903
| -rw-r--r-- | saga/actor.cpp | 5 | ||||
| -rw-r--r-- | saga/animation.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp index f057630172..ffb53835cb 100644 --- a/saga/actor.cpp +++ b/saga/actor.cpp @@ -24,6 +24,7 @@ #include "saga/saga.h" #include "saga/gfx.h" +#include "saga/animation.h" #include "saga/console.h" #include "saga/script.h" #include "saga/sndres.h" @@ -1575,6 +1576,10 @@ bool Actor::getSpriteParams(CommonObjectData *commonObjectData, int &frameNumber } void Actor::drawActors() { + if (_vm->_anim->hasCutaway()) { + return; + } + if (_vm->_scene->currentSceneNumber() <= 0) { return; } diff --git a/saga/animation.h b/saga/animation.h index 2e245489c2..994ff7d512 100644 --- a/saga/animation.h +++ b/saga/animation.h @@ -127,6 +127,9 @@ public: void finish(uint16 animId); void resume(uint16 animId, int cycles); int16 getCurrentFrame(uint16 animId); + bool hasCutaway(void) { + return _cutawayActive; + } bool hasAnimation(uint16 animId) { if (animId >= MAX_ANIMATIONS) { if (animId < MAX_ANIMATIONS + ARRAYSIZE(_cutawayAnimations)) |