diff options
author | Strangerke | 2012-01-23 09:50:18 +0100 |
---|---|---|
committer | Strangerke | 2012-01-23 09:50:18 +0100 |
commit | 2820573b43da847df00d2140bbb710ecef7cd1d1 (patch) | |
tree | 4f508d9d5ef4738438dc5622cfe69c635a5b0143 /engines | |
parent | e4d6d4780bc033a4dfad0ff13937d287c4fd0de3 (diff) | |
download | scummvm-rg350-2820573b43da847df00d2140bbb710ecef7cd1d1.tar.gz scummvm-rg350-2820573b43da847df00d2140bbb710ecef7cd1d1.tar.bz2 scummvm-rg350-2820573b43da847df00d2140bbb710ecef7cd1d1.zip |
TSAGE: R2R - Fix a couple of bugs in scenes 1925 and 1945, some renaming
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 12 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.h | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index d957599159..38aeee6def 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -6701,7 +6701,7 @@ bool Scene1925::Hotspot3::startAction(CursorType action, Event &event) { return true; } -void Scene1925::Exit1::changeScene() { +void Scene1925::ExitUp::changeScene() { Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene; _moving = false; @@ -6723,7 +6723,7 @@ void Scene1925::Exit1::changeScene() { scene->_sceneMode = 1932; } - if (scene->_sceneMode == 0) + if (scene->_sceneMode != 0) scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL); else { scene->_sceneMode = 1932; @@ -6779,7 +6779,7 @@ void Scene1925::Exit4::changeScene() { } void Scene1925::changeLevel(bool upFlag) { - if (R2_GLOBALS._scene1925CurrLevel <= 0) + if (R2_GLOBALS._scene1925CurrLevel < 0) R2_GLOBALS._scene1925CurrLevel = 3; if (upFlag) { @@ -6853,7 +6853,7 @@ void Scene1925::postInit(SceneObjectList *OwnerList) { _exit3.setDetails(Rect(83, 38, 128, 101), EXITCURSOR_W, 1925); // No break on purpose default: - _exit1.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1925); + _exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1925); _exit2.setDetails(Rect(128, 160, 190, 167), EXITCURSOR_S, 1925); _item3.setDetails(Rect(141, 11, 167, 159), 1925, 6, -1, -1, 1, NULL); break; @@ -7055,7 +7055,7 @@ bool Scene1945::Actor3::startAction(CursorType action, Event &event) { } } -void Scene1945::Exit1::changeScene() { +void Scene1945::ExitUp::changeScene() { Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene; _moving = false; @@ -7108,7 +7108,7 @@ void Scene1945::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player._characterScene[2] = 1945; R2_GLOBALS._player._characterIndex = R2_SEEKER; - _exit1.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1945); + _exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1945); _exit2.setDetails(Rect(238, 144, 274, 167), EXITCURSOR_E, 1945); _item4.setDetails(Rect(141, 3, 167, 126), 1945, 9, -1, -1, 1, NULL); diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h index 4a58609cd5..52fb3650cf 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.h +++ b/engines/tsage/ringworld2/ringworld2_scenes1.h @@ -710,7 +710,7 @@ class Scene1925 : public SceneExt { virtual bool startAction(CursorType action, Event &event); }; - class Exit1 : public SceneExit { + class ExitUp : public SceneExit { public: virtual void changeScene(); }; @@ -731,7 +731,7 @@ public: Hotspot2 _item2; Hotspot3 _item3; SceneActor _actor1; - Exit1 _exit1; + ExitUp _exitUp; Exit2 _exit2; Exit3 _exit3; Exit4 _exit4; @@ -764,7 +764,7 @@ class Scene1945 : public SceneExt { virtual bool startAction(CursorType action, Event &event); }; - class Exit1 : public SceneExit { + class ExitUp : public SceneExit { public: virtual void changeScene(); }; @@ -780,7 +780,7 @@ public: SceneActor _actor1; SceneActor _actor2; Actor3 _actor3; - Exit1 _exit1; + ExitUp _exitUp; Exit2 _exit2; SequenceManager _sequenceManager1; SequenceManager _sequenceManager2; |