diff options
| author | Strangerke | 2013-08-28 00:05:36 +0200 |
|---|---|---|
| committer | Strangerke | 2013-08-28 00:06:08 +0200 |
| commit | a52cb80ae002fe7a9fc4e4db8e69c0b1c06bd2c1 (patch) | |
| tree | d9cf8ffe753abc05d1999bf20804d1b49dd71296 /engines/tsage | |
| parent | 269ec30699beee4913893750372de7c5777b3b5d (diff) | |
| download | scummvm-rg350-a52cb80ae002fe7a9fc4e4db8e69c0b1c06bd2c1.tar.gz scummvm-rg350-a52cb80ae002fe7a9fc4e4db8e69c0b1c06bd2c1.tar.bz2 scummvm-rg350-a52cb80ae002fe7a9fc4e4db8e69c0b1c06bd2c1.zip | |
TSAGE: Some renaming in Scene600
Diffstat (limited to 'engines/tsage')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 17 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.h | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 01fa695ebc..1439557d1e 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -5544,10 +5544,10 @@ bool Scene600::Item4::startAction(CursorType action, Event &event) { scene->_object1.setup2(603, 3, 1, 239, 54, 10, 0); scene->_stasisField.postInit(); - scene->_actor2.postInit(); + scene->_computer.postInit(); scene->_sceneMode = 612; - scene->setAction(&scene->_sequenceManager1, scene, 612, &scene->_stasisField, &scene->_actor2, &R2_GLOBALS._player, NULL); + scene->setAction(&scene->_sequenceManager1, scene, 612, &scene->_stasisField, &scene->_computer, &R2_GLOBALS._player, NULL); return true; } @@ -5824,11 +5824,12 @@ void Scene600::postInit(SceneObjectList *OwnerList) { if (R2_GLOBALS.getFlag(8)) { if (R2_GLOBALS.getFlag(9)) { - _actor2.postInit(); - _actor2.setup(603, 2, 1); - _actor2.setPosition(Common::Point(233, 45)); - _actor2.animate(ANIM_MODE_2, NULL); - _actor2.fixPriority(11); + // Computer is active + _computer.postInit(); + _computer.setup(603, 2, 1); + _computer.setPosition(Common::Point(233, 45)); + _computer.animate(ANIM_MODE_2, NULL); + _computer.fixPriority(11); } } else { _smoke.postInit(); @@ -5937,7 +5938,7 @@ void Scene600::signal() { R2_GLOBALS.setFlag(9); _stasisField.remove(); R2_GLOBALS._sceneItems.remove(&_item4); - _actor2.setDetails(600, 21, -1, 23, 4, &_item4); + _computer.setDetails(600, 21, -1, 23, 4, &_item4); _background.setDetails(600, 7, -1, -1, 3, (SceneItem *) NULL); R2_GLOBALS._player.enableControl(CURSOR_USE); break; diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h index fa2046364c..a2f2accaba 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.h +++ b/engines/tsage/ringworld2/ringworld2_scenes0.h @@ -673,7 +673,7 @@ public: CompartmentHotspot _item5; BackgroundSceneObject _object1; SceneActor _actor1; - SceneActor _actor2; + SceneActor _computer; SceneActor _stasisField; Smoke _smoke; Doorway _doorway; |