aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/actor.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2007-07-07 00:36:10 +0000
committerFilippos Karapetis2007-07-07 00:36:10 +0000
commit737216e52efbbba2955393ece5fb078a8d0783b0 (patch)
treee32e7ee6066f46b94d915962144db47ae52e3de2 /engines/saga/actor.cpp
parent8e7269a10042720997e8a0a56489d800a472168f (diff)
downloadscummvm-rg350-737216e52efbbba2955393ece5fb078a8d0783b0.tar.gz
scummvm-rg350-737216e52efbbba2955393ece5fb078a8d0783b0.tar.bz2
scummvm-rg350-737216e52efbbba2955393ece5fb078a8d0783b0.zip
When loading a scene, start showing actors only after the scene background has been shown. This prevents some cases where some actors are shown prematurely before the next scene is loaded (e.g. in IHNM, when entering a chapter, after AM finishes his speech)
svn-id: r27946
Diffstat (limited to 'engines/saga/actor.cpp')
-rw-r--r--engines/saga/actor.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp
index ecf7202725..d7882a78fd 100644
--- a/engines/saga/actor.cpp
+++ b/engines/saga/actor.cpp
@@ -268,6 +268,8 @@ Actor::Actor(SagaEngine *vm) : _vm(vm) {
_pathRect.top = _vm->getDisplayInfo().pathStartY;
_pathRect.bottom = _vm->_scene->getHeight();
+ _showActors = true;
+
// Get actor resource file context
_actorContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
if (_actorContext == NULL) {
@@ -1808,6 +1810,10 @@ void Actor::drawActors() {
return;
}
+ if (!_showActors) {
+ return;
+ }
+
CommonObjectOrderList::iterator drawOrderIterator;
CommonObjectDataPointer drawObject;
int frameNumber;