diff options
author | Paul Gilbert | 2013-09-22 22:24:08 -0400 |
---|---|---|
committer | Paul Gilbert | 2013-09-22 22:24:08 -0400 |
commit | 455c286a6093a59359007581e810c68d93bf6045 (patch) | |
tree | 3f7cd3ef98d1c3ab26fb531af7b477905c52d6a1 /engines/tsage/ringworld2/ringworld2_scenes3.cpp | |
parent | d721e12d9e27ac5695f10962fbe512854544a400 (diff) | |
download | scummvm-rg350-455c286a6093a59359007581e810c68d93bf6045.tar.gz scummvm-rg350-455c286a6093a59359007581e810c68d93bf6045.tar.bz2 scummvm-rg350-455c286a6093a59359007581e810c68d93bf6045.zip |
TSAGE: Cleanup and bugfixes for the R2R Vent Maze
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_scenes3.cpp')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index e70a67d817..a462b5c550 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -1065,6 +1065,7 @@ void Scene3240::signal() { * Scene 3245 - Cutscene : Discussions with Dr. Tomko * *--------------------------------------------------------------------------*/ + void Scene3245::postInit(SceneObjectList *OwnerList) { loadScene(3245); R2_GLOBALS._uiElements._active = false; @@ -1080,14 +1081,14 @@ void Scene3245::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); _actor2.postInit(); - if (R2_GLOBALS._v56AA1 < 4) - ++R2_GLOBALS._v56AA1; + if (R2_GLOBALS._scientistConvIndex < 4) + ++R2_GLOBALS._scientistConvIndex; - if (R2_GLOBALS._v56AA1 >= 4) { + if (R2_GLOBALS._scientistConvIndex >= 4) { SceneItem::display(1200, 7, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999); signal(); } else { - setAction(&_sequenceManager, this, 3244 + R2_GLOBALS._v56AA1, &_actor1, &_actor2, NULL); + setAction(&_sequenceManager, this, 3244 + R2_GLOBALS._scientistConvIndex, &_actor1, &_actor2, NULL); } } @@ -1099,6 +1100,7 @@ void Scene3245::signal() { * Scene 3250 - Room with large stasis field negator * *--------------------------------------------------------------------------*/ + bool Scene3250::Item::startAction(CursorType action, Event &event) { Scene3250 *scene = (Scene3250 *)R2_GLOBALS._sceneManager._scene; |