diff options
author | Paul Gilbert | 2013-11-03 08:28:28 -0500 |
---|---|---|
committer | Paul Gilbert | 2013-11-03 08:28:28 -0500 |
commit | e38599970080d73792bdfe188d8db49cfb75ceae (patch) | |
tree | 0143d46a6708ad9428980b3f40b130ab1dcd4d40 /engines/tsage/ringworld2 | |
parent | 5c9d752e1d3f8e433e37d51377368fa975df567f (diff) | |
download | scummvm-rg350-e38599970080d73792bdfe188d8db49cfb75ceae.tar.gz scummvm-rg350-e38599970080d73792bdfe188d8db49cfb75ceae.tar.bz2 scummvm-rg350-e38599970080d73792bdfe188d8db49cfb75ceae.zip |
TSAGE: Renamings for R2R desert scene
Diffstat (limited to 'engines/tsage/ringworld2')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 29 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.h | 6 |
2 files changed, 18 insertions, 17 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index cfa77ef12a..be09999625 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -5203,20 +5203,21 @@ void Scene3800::enterArea() { R2_GLOBALS._player.setStrip(3); R2_GLOBALS._player.changeZoom(-1); R2_GLOBALS._player._moveDiff = Common::Point(3, 2); - _actor1.postInit(); - _actor1.fixPriority(10); - _actor1.changeZoom(-1); - _actor1.setVisage(1110); - _actor1._effect = 5; - _actor1._field9C = this->_field312; - R2_GLOBALS._player._linkedActor = &_actor1; + _balloonQuinn.postInit(); + _balloonQuinn.fixPriority(10); + _balloonQuinn.changeZoom(-1); + _balloonQuinn.setVisage(1110); + _balloonQuinn._effect = 5; + _balloonQuinn._field9C = this->_field312; + R2_GLOBALS._player._linkedActor = &_balloonQuinn; switch (R2_GLOBALS._sceneManager._previousScene) { case 2600: - _object1.postInit(); - _object2.postInit(); - _actor1.hide(); + _balloon.postInit(); + _harness.postInit(); + _balloonQuinn.hide(); _sceneMode = 3800; - setAction(&_sequenceManager1, this, 3800, &R2_GLOBALS._player, &_object1, &_object2, NULL); + setAction(&_sequenceManager1, this, 3800, &R2_GLOBALS._player, + &_balloon, &_harness, NULL); break; case 3900: _sceneMode = 15; @@ -5359,9 +5360,9 @@ void Scene3800::signal() { g_globals->_sceneManager.changeScene(3900); break; case 3800: - _actor1.show(); - _object1.remove(); - _object2.remove(); + _balloonQuinn.show(); + _balloon.remove(); + _harness.remove(); R2_GLOBALS._player.enableControl(); break; case 3805: diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h index 8067215466..40c35179bc 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.h +++ b/engines/tsage/ringworld2/ringworld2_scenes3.h @@ -784,9 +784,9 @@ class Scene3800 : public SceneExt { }; public: - SceneObject _object1; - SceneObject _object2; - SceneActor _actor1; + SceneObject _balloon; + SceneObject _harness; + SceneActor _balloonQuinn; NamedHotspot _background; NorthExit _northExit; EastExit _eastExit; |