aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/tsage/blue_force/blueforce_scenes9.cpp12
-rw-r--r--engines/tsage/blue_force/blueforce_scenes9.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index 368efff3c6..ad42468742 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -783,12 +783,12 @@ void Scene910::Action2::signal() {
/* Objects */
-void Scene910::Object1::synchronize(Serializer &s) {
+void Scene910::Lyle::synchronize(Serializer &s) {
NamedObject::synchronize(s);
s.syncAsSint16LE(_field90);
}
-bool Scene910::Object1::startAction(CursorType action, Event &event) {
+bool Scene910::Lyle::startAction(CursorType action, Event &event) {
Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene;
if (action == CURSOR_USE) {
@@ -806,9 +806,9 @@ bool Scene910::Object1::startAction(CursorType action, Event &event) {
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 9130;
if (BF_GLOBALS.getFlag(gunDrawn))
- setAction(&scene->_sequenceManager1, scene, 9138, &BF_GLOBALS._player, &scene->_lyle, NULL);
+ scene->setAction(&scene->_sequenceManager1, scene, 9138, &BF_GLOBALS._player, &scene->_lyle, NULL);
else
- setAction(&scene->_sequenceManager1, scene, 9130, &BF_GLOBALS._player, &scene->_lyle, NULL);
+ scene->setAction(&scene->_sequenceManager1, scene, 9130, &BF_GLOBALS._player, &scene->_lyle, NULL);
return true;
}
} else {
@@ -816,7 +816,7 @@ bool Scene910::Object1::startAction(CursorType action, Event &event) {
}
}
-bool Scene910::Object2::startAction(CursorType action, Event &event) {
+bool Scene910::Nico::startAction(CursorType action, Event &event) {
Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene;
switch (action) {
@@ -944,7 +944,7 @@ bool Scene910::Object2::startAction(CursorType action, Event &event) {
}
}
-bool Scene910::Object3::startAction(CursorType action, Event &event) {
+bool Scene910::Stuart::startAction(CursorType action, Event &event) {
Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene;
switch (action) {
diff --git a/engines/tsage/blue_force/blueforce_scenes9.h b/engines/tsage/blue_force/blueforce_scenes9.h
index 2f704a8a00..033cf337af 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.h
+++ b/engines/tsage/blue_force/blueforce_scenes9.h
@@ -132,17 +132,17 @@ class Scene910: public PalettedScene {
virtual void signal();
};
/* Objects */
- class Object1: public NamedObject {
+ class Lyle: public NamedObject {
public:
int _field90;
virtual void synchronize(Serializer &s);
virtual bool startAction(CursorType action, Event &event);
};
- class Object2: public NamedObject {
+ class Nico: public NamedObject {
public:
virtual bool startAction(CursorType action, Event &event);
};
- class Object3: public NamedObject {
+ class Stuart: public NamedObject {
public:
virtual bool startAction(CursorType action, Event &event);
};
@@ -266,9 +266,9 @@ public:
Action1 _action1;
Action2 _action2;
Timer _timer1;
- Object1 _lyle;
- Object2 _nico;
- Object3 _stuart;
+ Lyle _lyle;
+ Nico _nico;
+ Stuart _stuart;
Object4 _object4;
NamedObject _object5, _vent, _object7;
PowerCord _blackCord, _yellowCord;