aboutsummaryrefslogtreecommitdiff
path: root/saga/scene.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-02-24 08:03:47 +0000
committerTorbjörn Andersson2005-02-24 08:03:47 +0000
commit4f01f5e6e9c1b0891b5206cb1c39d98638139344 (patch)
tree966151a36f71167d2dcf707b5587b46c16b3c73d /saga/scene.cpp
parent350ed76947bf378b40c814dabf0667465e383b65 (diff)
downloadscummvm-rg350-4f01f5e6e9c1b0891b5206cb1c39d98638139344.tar.gz
scummvm-rg350-4f01f5e6e9c1b0891b5206cb1c39d98638139344.tar.bz2
scummvm-rg350-4f01f5e6e9c1b0891b5206cb1c39d98638139344.zip
I'm not quite sure if this is the correct fix, but by not calling
updateActorsScene() when _sceneNumber is -1 we avoid followers going into that scene and being drawn (as garbage) early during the ITE intro. (Look in the upper left corner -- that's where the garbage appeared for me.) svn-id: r16895
Diffstat (limited to 'saga/scene.cpp')
-rw-r--r--saga/scene.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/saga/scene.cpp b/saga/scene.cpp
index 51b264b107..7c2162d46b 100644
--- a/saga/scene.cpp
+++ b/saga/scene.cpp
@@ -672,8 +672,11 @@ int Scene::loadScene(int scene_num, int load_flag, SCENE_PROC scene_proc, SceneD
getInfo(&scene_info);
_sceneProc(SCENE_BEGIN, &scene_info, this);
-
- _vm->_actor->updateActorsScene(actorsEntrance);
+
+ // We probably don't want "followers" to go into scene -1. At the very
+ // least we don't want garbage to be drawn that early in the ITE intro.
+ if (_sceneNumber != -1)
+ _vm->_actor->updateActorsScene(actorsEntrance);
if (_desc.flags & kSceneFlagShowCursor)
_vm->_interface->activate();