diff options
| author | Paul Gilbert | 2013-11-16 18:42:38 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-16 18:42:38 -0500 |
| commit | 7c753d3a13738e715f7001bbf965f772e64694e4 (patch) | |
| tree | 2c421e785afb2659439f2dee5a7105e5d0be5c0f /engines | |
| parent | 027e8b3367f248a20cd0fc94f07f29407267e00f (diff) | |
| download | scummvm-rg350-7c753d3a13738e715f7001bbf965f772e64694e4.tar.gz scummvm-rg350-7c753d3a13738e715f7001bbf965f772e64694e4.tar.bz2 scummvm-rg350-7c753d3a13738e715f7001bbf965f772e64694e4.zip | |
TSAGE: Cleanup and correct entrance/exits for R2R balloon launch
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes2.cpp | 16 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes2.h | 1 |
2 files changed, 3 insertions, 14 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp index f23a345653..f928f3635c 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp @@ -1061,8 +1061,9 @@ bool Scene2350::Balloon::startAction(CursorType action, Event &event) { void Scene2350::ExitUp::changeScene() { Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene; + _enabled = false; - R2_GLOBALS._player.disableControl(CURSOR_CROSSHAIRS); + R2_GLOBALS._player.disableControl(CURSOR_WALK); scene->_sceneMode = 12; if (R2_GLOBALS._player._characterIndex == R2_QUINN) scene->setAction(&scene->_sequenceManager, scene, 2350, &R2_GLOBALS._player, NULL); @@ -1139,7 +1140,7 @@ void Scene2350::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._player.disableControl(); if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) { - if (R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex] == 34) { + if (R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex] != 34) { if (R2_GLOBALS._player._characterIndex == R2_QUINN) _sceneMode = 2351; else @@ -1201,17 +1202,6 @@ void Scene2350::signal() { } } -void Scene2350::process(Event &event) { - if ((R2_GLOBALS._player._canWalk) && (event.eventType != EVENT_BUTTON_DOWN) && - (R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)){ - Common::Point pt(event.mousePos.x, 129); - PlayerMover *mover = new PlayerMover(); - R2_GLOBALS._player.addMover(mover, &pt); - event.handled = true; - } - Scene::process(event); -} - /*-------------------------------------------------------------------------- * Scene 2400 - Spill Mountains: Large empty room * diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h index d474297d79..3960d93f94 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.h +++ b/engines/tsage/ringworld2/ringworld2_scenes2.h @@ -120,7 +120,6 @@ public: virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void remove(); virtual void signal(); - virtual void process(Event &event); }; class Scene2400 : public SceneExt { |