aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld2
diff options
context:
space:
mode:
authorPaul Gilbert2013-09-18 22:20:24 -0400
committerPaul Gilbert2013-09-18 22:20:24 -0400
commitf9f4f4eb17a9e5d5a9c68baf671c5666fc3c5a88 (patch)
treec32cf4c6f0a08138d803a314c2d99ecc937e7eec /engines/tsage/ringworld2
parent448063a8dfd623415b0fa943b2f1e322db1424ab (diff)
downloadscummvm-rg350-f9f4f4eb17a9e5d5a9c68baf671c5666fc3c5a88.tar.gz
scummvm-rg350-f9f4f4eb17a9e5d5a9c68baf671c5666fc3c5a88.tar.bz2
scummvm-rg350-f9f4f4eb17a9e5d5a9c68baf671c5666fc3c5a88.zip
TSAGE: Renamings for R2R elevator shaft
Diffstat (limited to 'engines/tsage/ringworld2')
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp11
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.h4
2 files changed, 8 insertions, 7 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index aab6c8ad6e..44d2bad7f3 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -12917,9 +12917,10 @@ void Scene1900::signal() {
}
/*--------------------------------------------------------------------------
- * Scene 1925 -
+ * Scene 1925 - Spill Mountains Elevator Shaft
*
*--------------------------------------------------------------------------*/
+
Scene1925::Scene1925() {
_field9B8 = 0;
for (int i = 0; i < 5; i++)
@@ -12934,7 +12935,7 @@ void Scene1925::synchronize(Serializer &s) {
s.syncAsSint16LE(_levelResNum[i]);
}
-bool Scene1925::Hotspot2::startAction(CursorType action, Event &event) {
+bool Scene1925::Button::startAction(CursorType action, Event &event) {
Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
if (action != CURSOR_USE)
@@ -13092,7 +13093,7 @@ void Scene1925::changeLevel(bool upFlag) {
break;
case 3:
loadScene(_levelResNum[4]);
- _item2.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 2, NULL);
+ _button.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 2, NULL);
_actor1.setDetails(1925, 0, 1, 2, 2, (SceneItem *) NULL);
_actor1.show();
break;
@@ -13101,7 +13102,7 @@ void Scene1925::changeLevel(bool upFlag) {
// No break on purpose
default:
loadScene(_levelResNum[(R2_GLOBALS._scene1925CurrLevel % 4)]);
- R2_GLOBALS._sceneItems.remove(&_item2);
+ R2_GLOBALS._sceneItems.remove(&_button);
R2_GLOBALS._sceneItems.remove(&_actor1);
_actor1.hide();
break;
@@ -13140,7 +13141,7 @@ void Scene1925::postInit(SceneObjectList *OwnerList) {
break;
case 3:
_actor1.setDetails(1925, 0, 1, 2, 1, (SceneItem *) NULL);
- _item2.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 1, NULL);
+ _button.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 1, NULL);
// No break on purpose
case -3:
_exit3.setDetails(Rect(83, 38, 128, 101), EXITCURSOR_W, 1925);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 82895c7ab0..fbc1f15565 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -1011,7 +1011,7 @@ public:
};
class Scene1925 : public SceneExt {
- class Hotspot2 : public NamedHotspot {
+ class Button : public NamedHotspot {
public:
virtual bool startAction(CursorType action, Event &event);
};
@@ -1038,7 +1038,7 @@ class Scene1925 : public SceneExt {
};
public:
NamedHotspot _item1;
- Hotspot2 _item2;
+ Button _button;
Hotspot3 _item3;
SceneActor _actor1;
ExitUp _exitUp;