diff options
| author | Paul Gilbert | 2011-10-22 08:24:24 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-10-22 08:24:24 +1100 |
| commit | c7a0d70d34ad6b01a5ec63deb140f85a5e8e2f1d (patch) | |
| tree | 0c810bc20bba734cbfc7c4deac19c0ad1c9da8ee /engines/tsage/blue_force/blueforce_scenes9.cpp | |
| parent | 0d135faf6cfd42cabe794bf00098d61e8530607c (diff) | |
| download | scummvm-rg350-c7a0d70d34ad6b01a5ec63deb140f85a5e8e2f1d.tar.gz scummvm-rg350-c7a0d70d34ad6b01a5ec63deb140f85a5e8e2f1d.tar.bz2 scummvm-rg350-c7a0d70d34ad6b01a5ec63deb140f85a5e8e2f1d.zip | |
TSAGE: Minor cleanup and bugfix for talking to Lyle in BF Scene 910
Diffstat (limited to 'engines/tsage/blue_force/blueforce_scenes9.cpp')
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes9.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp index 368efff3c6..ad42468742 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.cpp +++ b/engines/tsage/blue_force/blueforce_scenes9.cpp @@ -783,12 +783,12 @@ void Scene910::Action2::signal() { /* Objects */ -void Scene910::Object1::synchronize(Serializer &s) { +void Scene910::Lyle::synchronize(Serializer &s) { NamedObject::synchronize(s); s.syncAsSint16LE(_field90); } -bool Scene910::Object1::startAction(CursorType action, Event &event) { +bool Scene910::Lyle::startAction(CursorType action, Event &event) { Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene; if (action == CURSOR_USE) { @@ -806,9 +806,9 @@ bool Scene910::Object1::startAction(CursorType action, Event &event) { BF_GLOBALS._player.disableControl(); scene->_sceneMode = 9130; if (BF_GLOBALS.getFlag(gunDrawn)) - setAction(&scene->_sequenceManager1, scene, 9138, &BF_GLOBALS._player, &scene->_lyle, NULL); + scene->setAction(&scene->_sequenceManager1, scene, 9138, &BF_GLOBALS._player, &scene->_lyle, NULL); else - setAction(&scene->_sequenceManager1, scene, 9130, &BF_GLOBALS._player, &scene->_lyle, NULL); + scene->setAction(&scene->_sequenceManager1, scene, 9130, &BF_GLOBALS._player, &scene->_lyle, NULL); return true; } } else { @@ -816,7 +816,7 @@ bool Scene910::Object1::startAction(CursorType action, Event &event) { } } -bool Scene910::Object2::startAction(CursorType action, Event &event) { +bool Scene910::Nico::startAction(CursorType action, Event &event) { Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene; switch (action) { @@ -944,7 +944,7 @@ bool Scene910::Object2::startAction(CursorType action, Event &event) { } } -bool Scene910::Object3::startAction(CursorType action, Event &event) { +bool Scene910::Stuart::startAction(CursorType action, Event &event) { Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene; switch (action) { |