aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/tsage/core.h2
-rw-r--r--engines/tsage/ringworld2/ringworld2_logic.cpp3
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes0.cpp44
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes0.h4
4 files changed, 27 insertions, 26 deletions
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index f7a5a43b16..95eefacd2d 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -782,7 +782,7 @@ public:
/*--------------------------------------------------------------------------*/
-class SceneItemList : public SynchronizedList<SceneItem *> {
+class SceneItemList : public SynchronizedList<EventHandler *> {
public:
void addItems(SceneItem *first, ...);
};
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 64142684c9..e007081c8f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1429,6 +1429,7 @@ void SceneExit::process(Event &event) {
/*--------------------------------------------------------------------------*/
void SceneAreaObject::remove() {
+ R2_GLOBALS._sceneItems.remove(this);
_object1.remove();
SceneArea::remove();
--R2_GLOBALS._insetUp;
@@ -1473,7 +1474,7 @@ void SceneAreaObject::setDetails(int visage, int strip, int frameNumber, const C
}
void SceneAreaObject::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
- ((SceneHotspot *)(this))->setDetails(resNum, lookLineNum, talkLineNum, useLineNum,
+ _object1.setDetails(resNum, lookLineNum, talkLineNum, useLineNum,
2, (SceneItem *)NULL);
}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 7f711c3ef6..1221e73f5f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4862,7 +4862,7 @@ bool Scene500::Object2::startAction(CursorType action, Event &event) {
}
}
-bool Scene500::Object3::startAction(CursorType action, Event &event) {
+bool Scene500::Suit::startAction(CursorType action, Event &event) {
Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
switch (action) {
@@ -4886,7 +4886,7 @@ bool Scene500::Object3::startAction(CursorType action, Event &event) {
else {
R2_GLOBALS._player.disableControl();
scene->_sceneMode = 512;
- scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, &scene->_object3, NULL);
+ scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, &scene->_suit, NULL);
R2_GLOBALS.setFlag(26);
}
} else {
@@ -4902,7 +4902,7 @@ bool Scene500::Object3::startAction(CursorType action, Event &event) {
else {
R2_GLOBALS._player.disableControl();
scene->_sceneMode = 515;
- scene->setAction(&scene->_sequenceManager1, scene, 515, &R2_GLOBALS._player, &scene->_object3, NULL);
+ scene->setAction(&scene->_sequenceManager1, scene, 515, &R2_GLOBALS._player, &scene->_suit, NULL);
R2_GLOBALS.setFlag(28);
}
return true;
@@ -5158,7 +5158,7 @@ void Scene500::PanelDialog::Button::doButtonPress() {
if (R2_GLOBALS.getFlag(35)) {
scene->_sceneMode = 5;
scene->setAction(&scene->_sequenceManager1, scene, 509, &scene->_object1,
- &scene->_object3, &scene->_object8, NULL);
+ &scene->_suit, &scene->_object8, NULL);
} else {
scene->_sound1.play(127);
scene->_object1.animate(ANIM_MODE_6, scene);
@@ -5172,7 +5172,7 @@ void Scene500::PanelDialog::Button::doButtonPress() {
if (R2_GLOBALS.getFlag(35)) {
scene->_sceneMode = 6;
scene->setAction(&scene->_sequenceManager1, scene, 509, &scene->_object1,
- &scene->_object3, &scene->_object8, NULL);
+ &scene->_suit, &scene->_object8, NULL);
} else {
scene->_sound1.play(127);
scene->_object1.animate(ANIM_MODE_6, scene);
@@ -5183,16 +5183,16 @@ void Scene500::PanelDialog::Button::doButtonPress() {
if (R2_GLOBALS.getFlag(35)) {
scene->_sceneMode = 509;
scene->setAction(&scene->_sequenceManager1, scene, 509, &scene->_object1,
- &scene->_object3, &scene->_object8, NULL);
+ &scene->_suit, &scene->_object8, NULL);
} else {
- scene->_object3.postInit();
- scene->_object3.hide();
- scene->_object3._effect = 1;
- scene->_object3.setDetails(500, -1, -1, -1, 2, NULL);
- scene->_object3.setup(502, R2_GLOBALS._landerSuitNumber + 2, 1);
+ scene->_suit.postInit();
+ scene->_suit.hide();
+ scene->_suit._effect = 1;
+ scene->_suit.setDetails(500, -1, -1, -1, 2, (SceneItem *)NULL);
+ scene->_suit.setup(502, R2_GLOBALS._landerSuitNumber + 2, 1);
scene->setAction(&scene->_sequenceManager1, scene, 508,
- &R2_GLOBALS._player, &scene->_object1, &scene->_object3,
+ &R2_GLOBALS._player, &scene->_object1, &scene->_suit,
&scene->_object8, NULL);
R2_GLOBALS.setFlag(35);
}
@@ -5318,16 +5318,16 @@ void Scene500::postInit(SceneObjectList *OwnerList) {
} else {
_object8.setup(500, 8, 7);
- _object3.postInit();
- _object3._effect = 1;
- _object3.setPosition(Common::Point(247, 52));
- _object3.setDetails(500, -1, -1, -1, 2, (SceneItem *)NULL);
+ _suit.postInit();
+ _suit._effect = 1;
+ _suit.setPosition(Common::Point(247, 52));
+ _suit.setDetails(500, -1, -1, -1, 2, (SceneItem *)NULL);
if (!R2_GLOBALS.getFlag(26)) {
if (R2_GLOBALS.getFlag(28))
- _object3.setup(502, 7, 2);
+ _suit.setup(502, 7, 2);
else
- _object3.setup(502, R2_GLOBALS._landerSuitNumber + 2, 7);
+ _suit.setup(502, R2_GLOBALS._landerSuitNumber + 2, 7);
}
}
@@ -5373,7 +5373,7 @@ void Scene500::signal() {
_object1.animate(ANIM_MODE_6, this);
R2_GLOBALS.clearFlag(35);
- _object3.remove();
+ _suit.remove();
R2_GLOBALS._player.enableControl();
break;
case 6:
@@ -5382,7 +5382,7 @@ void Scene500::signal() {
_object1.animate(ANIM_MODE_5, this);
R2_GLOBALS.clearFlag(35);
- _object3.remove();
+ _suit.remove();
R2_GLOBALS._player.enableControl();
break;
case 7:
@@ -5390,7 +5390,7 @@ void Scene500::signal() {
_object8.animate(ANIM_MODE_6, this);
R2_GLOBALS.clearFlag(35);
- _object3.remove();
+ _suit.remove();
R2_GLOBALS._player.enableControl();
break;
case 500:
@@ -5438,7 +5438,7 @@ void Scene500::signal() {
break;
case 509:
R2_GLOBALS.clearFlag(35);
- _object3.remove();
+ _suit.remove();
R2_GLOBALS._player.enableControl();
break;
case 510:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index e03732d1c6..a3eaf56d16 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -559,7 +559,7 @@ class Scene500: public SceneExt {
public:
virtual bool startAction(CursorType action, Event &event);
};
- class Object3: public SceneActor {
+ class Suit: public SceneActor {
public:
virtual bool startAction(CursorType action, Event &event);
};
@@ -603,7 +603,7 @@ public:
ControlPanel _controlPanel;
SceneActor _object1;
Object2 _object2;
- Object3 _object3;
+ Suit _suit;
Doorway _doorway;
OxygenTanks _tanks1, _tanks2;
AirLock _airLock;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 15:32:31 +0000