From 2b6fb8dc20fb135aba97d2d6e5018c7ced0005e5 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 6 Nov 2013 01:54:25 +0100 Subject: [PATCH] TSAGE: R2R - Renaming in scene 2750 --- engines/tsage/ringworld2/ringworld2_scenes2.cpp | 8 ++++---- engines/tsage/ringworld2/ringworld2_scenes2.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp index 5719b13911d..f9e5b096c67 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp @@ -3797,7 +3797,7 @@ void Scene2750::Action7::signal() { scene->_folliage7.animate(ANIM_MODE_8, 1, NULL); } -void Scene2750::Area1::process(Event &event) { +void Scene2750::WestExit::process(Event &event) { SceneArea::process(event); if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos))) { Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene; @@ -3828,7 +3828,7 @@ void Scene2750::Area1::process(Event &event) { } } -void Scene2750::Area2::process(Event &event) { +void Scene2750::EastExit::process(Event &event) { SceneArea::process(event); if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos))) { Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene; @@ -3863,8 +3863,8 @@ void Scene2750::postInit(SceneObjectList *OwnerList) { loadScene(2750); R2_GLOBALS._sound2.stop(); SceneExt::postInit(); - _area1.setDetails(Rect(0, 90, 20, 135), EXITCURSOR_W); - _area2.setDetails(Rect(300, 90, 320, 135), EXITCURSOR_E); + _westExit.setDetails(Rect(0, 90, 20, 135), EXITCURSOR_W); + _eastExit.setDetails(Rect(300, 90, 320, 135), EXITCURSOR_E); _walkRect1.set(30, 127, 155, 147); _walkRect2.set(130, 142, 210, 167); diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h index bf8024e01c0..d474297d795 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.h +++ b/engines/tsage/ringworld2/ringworld2_scenes2.h @@ -578,11 +578,11 @@ class Scene2750 : public SceneExt { void signal(); }; - class Area1: public SceneArea { + class WestExit: public SceneArea { public: void process(Event &event); }; - class Area2: public SceneArea { + class EastExit: public SceneArea { public: void process(Event &event); }; @@ -612,8 +612,8 @@ public: Action5 _action5; Action6 _action6; Action7 _action7; - Area1 _area1; - Area2 _area2; + WestExit _westExit; + EastExit _eastExit; Rect _walkRect1, _walkRect2, _walkRect3; SequenceManager _sequenceManager; int _areaMode, _moveMode, _stripNumber;