diff options
| author | Paul Gilbert | 2011-12-08 14:47:46 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-12-08 14:47:46 +1100 |
| commit | 46ee76b1b44ecd2f9a3ba55096f19f51f9e151e2 (patch) | |
| tree | 6874b0ed3aef4402c21e738787c8d45681d02cee | |
| parent | 481ebbf2d9636c3114d41b65f1e278acbcc1f399 (diff) | |
| download | scummvm-rg350-46ee76b1b44ecd2f9a3ba55096f19f51f9e151e2.tar.gz scummvm-rg350-46ee76b1b44ecd2f9a3ba55096f19f51f9e151e2.tar.bz2 scummvm-rg350-46ee76b1b44ecd2f9a3ba55096f19f51f9e151e2.zip | |
TSAGE: Fix objects in R2R scene 2425 to properly call base methods
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes2.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp index 46c6261413..bc431f2303 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp @@ -1300,9 +1300,9 @@ bool Scene2425::Item1::startAction(CursorType action, Event &event) { } else if (action == R2_37) { R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS); R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS); - return startAction(R2_STEPPING_DISKS, event); + return NamedHotspot::startAction(R2_STEPPING_DISKS, event); } else - return startAction(action, event); + return NamedHotspot::startAction(action, event); } bool Scene2425::Item2::startAction(CursorType action, Event &event) { @@ -1317,16 +1317,16 @@ bool Scene2425::Item2::startAction(CursorType action, Event &event) { } else if (action == R2_37) { R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS); R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS); - return startAction(R2_STEPPING_DISKS, event); + return NamedHotspot::startAction(R2_STEPPING_DISKS, event); } else - return startAction(action, event); + return NamedHotspot::startAction(action, event); } bool Scene2425::Item3::startAction(CursorType action, Event &event) { Scene2425 *scene = (Scene2425 *)R2_GLOBALS._sceneManager._scene; if (action != R2_37) - return startAction(action, event); + return NamedHotspot::startAction(action, event); else { R2_GLOBALS._player.disableControl(); if (R2_GLOBALS.getFlag(84)) { @@ -1343,11 +1343,11 @@ bool Scene2425::Item3::startAction(CursorType action, Event &event) { bool Scene2425::Item4::startAction(CursorType action, Event &event) { if (action != R2_37) - return startAction(action, event); + return NamedHotspot::startAction(action, event); else { R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS); R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS); - return startAction(R2_STEPPING_DISKS, event); + return NamedHotspot::startAction(R2_STEPPING_DISKS, event); } } @@ -1357,21 +1357,21 @@ bool Scene2425::Actor1::startAction(CursorType action, Event &event) { R2_GLOBALS._events.setCursor(R2_37); return true; } else { - return startAction(action, event); + return SceneActor::startAction(action, event); } } else if (R2_GLOBALS._events.getCursor() == R2_37) return false; else - return startAction(action, event); + return SceneActor::startAction(action, event); } bool Scene2425::Actor2::startAction(CursorType action, Event &event) { if (action != R2_37) - return startAction(action, event); + return SceneActor::startAction(action, event); else { R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS); R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS); - return startAction(R2_STEPPING_DISKS, event); + return SceneActor::startAction(R2_STEPPING_DISKS, event); } } |