diff options
| author | Paul Gilbert | 2013-09-19 19:45:56 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-09-19 19:45:56 -0400 |
| commit | 05b877d617ed9aa1267b57772cb0a85e61088c2d (patch) | |
| tree | 38f89153ce7483e441aa89622d6054c457f8e7fe | |
| parent | 5ea8e28d281f44d4f35edd7fbc4bc33a4ee7be90 (diff) | |
| download | scummvm-rg350-05b877d617ed9aa1267b57772cb0a85e61088c2d.tar.gz scummvm-rg350-05b877d617ed9aa1267b57772cb0a85e61088c2d.tar.bz2 scummvm-rg350-05b877d617ed9aa1267b57772cb0a85e61088c2d.zip | |
TSAGE: Further bugfixes and renaming for R2R shaft bottom
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 12 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index f17310ec7b..559e56f36e 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -13373,7 +13373,7 @@ void Scene1945::ExitUp::changeScene() { } } -void Scene1945::Exit2::changeScene() { +void Scene1945::CorridorExit::changeScene() { Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene; _moving = false; @@ -13404,12 +13404,12 @@ void Scene1945::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player._characterIndex = R2_SEEKER; _exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1945); - _exit2.setDetails(Rect(238, 144, 274, 167), EXITCURSOR_E, 1945); + _corridorExit.setDetails(Rect(238, 144, 274, 167), EXITCURSOR_E, 1945); _ladder.setDetails(Rect(141, 3, 167, 126), 1945, 9, -1, -1, 1, NULL); if (!R2_GLOBALS.getFlag(43)) { - _exit2._enabled = false; + _corridorExit._enabled = false; _gunpowder.postInit(); _gunpowder.setup(1945, 4, 1); _gunpowder.setPosition(Common::Point(253, 169)); @@ -13429,7 +13429,7 @@ void Scene1945::postInit(SceneObjectList *OwnerList) { _actor2.setup(1945, 3, 1); _actor2.hide(); } else { - _exit2._enabled = true; + _corridorExit._enabled = true; } switch (R2_GLOBALS._sceneManager._previousScene) { @@ -13525,10 +13525,10 @@ void Scene1945::signal() { return; case 1948: R2_GLOBALS._sound1.play(220); - _exit2._enabled = true; + _corridorExit._enabled = true; R2_GLOBALS._sceneItems.remove(&_gunpowder); R2_GLOBALS.clearFlag(42); - R2_GLOBALS.clearFlag(43); + R2_GLOBALS.setFlag(43); _nextSceneMode1 = 1940; // No break on purpose case 1949: diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h index 1dcc5ded56..a2d5d75dfd 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.h +++ b/engines/tsage/ringworld2/ringworld2_scenes1.h @@ -1078,7 +1078,7 @@ class Scene1945 : public SceneExt { public: virtual void changeScene(); }; - class Exit2 : public SceneExit { + class CorridorExit : public SceneExit { public: virtual void changeScene(); }; @@ -1091,7 +1091,7 @@ public: SceneActor _actor2; Gunpowder _gunpowder; ExitUp _exitUp; - Exit2 _exit2; + CorridorExit _corridorExit; SequenceManager _sequenceManager1; SequenceManager _sequenceManager2; |