diff options
| author | Paul Gilbert | 2011-10-22 08:59:29 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-10-22 08:59:29 +1100 |
| commit | c2de0eb119193ebb86a05af2fd0d419090c3e877 (patch) | |
| tree | d7be88b1fbc8610d5c684631865f6c812095ddc4 | |
| parent | a2fa753e45057d0cebc167c03ad55cae5c835a1b (diff) | |
| download | scummvm-rg350-c2de0eb119193ebb86a05af2fd0d419090c3e877.tar.gz scummvm-rg350-c2de0eb119193ebb86a05af2fd0d419090c3e877.tar.bz2 scummvm-rg350-c2de0eb119193ebb86a05af2fd0d419090c3e877.zip | |
TSAGE: Minor cleanup of BF Scene 910
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes9.cpp | 10 | ||||
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes9.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp index c2eb2d359e..20df9605bc 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.cpp +++ b/engines/tsage/blue_force/blueforce_scenes9.cpp @@ -1046,7 +1046,7 @@ bool Scene910::Stuart::startAction(CursorType action, Event &event) { } } -bool Scene910::Object4::startAction(CursorType action, Event &event) { +bool Scene910::Forbes::startAction(CursorType action, Event &event) { Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene; if (action == CURSOR_TALK) { @@ -1054,7 +1054,7 @@ bool Scene910::Object4::startAction(CursorType action, Event &event) { BF_GLOBALS._walkRegions.proc2(1); BF_GLOBALS._walkRegions.proc2(16); scene->_sceneMode = 9140; - scene->setAction(&scene->_sequenceManager1, scene, 9140, &scene->_object4, &BF_GLOBALS._player, &scene->_lyle, NULL); + scene->setAction(&scene->_sequenceManager1, scene, 9140, &scene->_forbes, &BF_GLOBALS._player, &scene->_lyle, NULL); return true; } else return NamedObject::startAction(action, event); @@ -2649,10 +2649,10 @@ void Scene910::signal() { BF_INVENTORY.setObjectScene(INV_YELLOW_CORD, 0); else BF_INVENTORY.setObjectScene(INV_HALF_YELLOW_CORD, 910); - _object4.postInit(); - _object4.setDetails(910, 86, 87, 88, 4, &_item8); + _forbes.postInit(); + _forbes.setDetails(910, 86, 87, 88, 4, &_item8); _sceneMode = 9139; - setAction(&_sequenceManager1, this, 9139, &_object4, &BF_GLOBALS._player, NULL); + setAction(&_sequenceManager1, this, 9139, &_forbes, &BF_GLOBALS._player, NULL); break; case 9139: BF_GLOBALS._walkRegions.proc1(4); diff --git a/engines/tsage/blue_force/blueforce_scenes9.h b/engines/tsage/blue_force/blueforce_scenes9.h index 033cf337af..b0761713b1 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.h +++ b/engines/tsage/blue_force/blueforce_scenes9.h @@ -146,7 +146,7 @@ class Scene910: public PalettedScene { public: virtual bool startAction(CursorType action, Event &event); }; - class Object4: public NamedObject { + class Forbes: public NamedObject { public: virtual bool startAction(CursorType action, Event &event); }; @@ -269,7 +269,7 @@ public: Lyle _lyle; Nico _nico; Stuart _stuart; - Object4 _object4; + Forbes _forbes; NamedObject _object5, _vent, _object7; PowerCord _blackCord, _yellowCord; BreakerBox _breakerBox; |