diff options
| author | Paul Gilbert | 2013-10-02 21:51:15 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-10-02 21:51:15 -0400 |
| commit | c9c0d06f1ddf49af6bbd7e67b759786bc3f20334 (patch) | |
| tree | 571096cf3787083d243d5d0b4b79cd25019e1061 /engines/tsage | |
| parent | ed3783af4c9dc548674d6631343c4c27b37b051c (diff) | |
| download | scummvm-rg350-c9c0d06f1ddf49af6bbd7e67b759786bc3f20334.tar.gz scummvm-rg350-c9c0d06f1ddf49af6bbd7e67b759786bc3f20334.tar.bz2 scummvm-rg350-c9c0d06f1ddf49af6bbd7e67b759786bc3f20334.zip | |
TSAGE: Cleanup of R2R Lift scene
Diffstat (limited to 'engines/tsage')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 20 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index dec257921f..cba17ec02e 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -2612,12 +2612,12 @@ void Scene250::postInit(SceneObjectList *OwnerList) { _currentFloor.setup(250, 1, 5); _currentFloor.setDetails(250, 13, -1, -1, 1, (SceneItem *)NULL); - _button1.setFloor(11); - _button1.setup(250, 1, 3); - _button1.setPosition(Common::Point(400, 100)); - _button1.setDetails(250, 14, -1, -1, 1, (SceneItem *)NULL); - _button1.fixPriority(190); - _button1.hide(); + _destinationFloor.setFloor(11); + _destinationFloor.setup(250, 1, 3); + _destinationFloor.setPosition(Common::Point(400, 100)); + _destinationFloor.setDetails(250, 14, -1, -1, 1, (SceneItem *)NULL); + _destinationFloor.fixPriority(190); + _destinationFloor.hide(); _floor1.setFloor(1); _floor2.setFloor(2); @@ -2629,8 +2629,8 @@ void Scene250::postInit(SceneObjectList *OwnerList) { _floor8.setFloor(8); _floor9.setFloor(9); - _item2.setDetails(Rect(0, 0, 73, SCREEN_HEIGHT), 250, 9, -1, 9, 1, NULL); - _item4.setDetails(Rect(239, 16, 283, 164), 250, 6, -1, -1, 1, NULL); + _door.setDetails(Rect(0, 0, 73, SCREEN_HEIGHT), 250, 9, -1, 9, 1, NULL); + _directionIndicator.setDetails(Rect(239, 16, 283, 164), 250, 6, -1, -1, 1, NULL); _background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 250, 0, 1, -1, 1, NULL); R2_GLOBALS._events.setCursor(CURSOR_USE); @@ -2765,8 +2765,8 @@ void Scene250::signal() { void Scene250::changeFloor(int floorNumber) { _destButtonY = (floorNumber - 1) * 12 + 43; - _button1.setPosition(Common::Point(111, _destButtonY)); - _button1.show(); + _destinationFloor.setPosition(Common::Point(111, _destButtonY)); + _destinationFloor.show(); _skippableFl = true; _sceneMode = (_currButtonY >= _destButtonY) ? 6 : 1; diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h index b735f7cc23..f5a065b642 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.h +++ b/engines/tsage/ringworld2/ringworld2_scenes0.h @@ -319,8 +319,8 @@ class Scene250: public SceneExt { public: int _currButtonY, _destButtonY, _elevatorSpeed; bool _skippingFl, _skippableFl; - NamedHotspot _background, _item2, _item3, _item4; - Button _button1, _currentFloor; + NamedHotspot _background, _door, _directionIndicator; + Button _destinationFloor, _currentFloor; Button _floor1, _floor2, _floor3, _floor4, _floor5; Button _floor6, _floor7, _floor8, _floor9; ASoundExt _sound1; |