aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2011-10-25 15:36:01 +0200
committerStrangerke2011-10-25 15:36:01 +0200
commit4c89891382b294eddaed2d5173df9a03e155afc7 (patch)
treecd985cc7eae38c7ee4c085233cecaaa9de7af7dc
parente3fefd16a0ee7ade5e075ff3cf2aa69e29fbd90b (diff)
downloadscummvm-rg350-4c89891382b294eddaed2d5173df9a03e155afc7.tar.gz
scummvm-rg350-4c89891382b294eddaed2d5173df9a03e155afc7.tar.bz2
scummvm-rg350-4c89891382b294eddaed2d5173df9a03e155afc7.zip
TSAGE: Blue Force - Rename a couple of variables in scene 360
-rw-r--r--engines/tsage/blue_force/blueforce_scenes3.cpp30
-rw-r--r--engines/tsage/blue_force/blueforce_scenes3.h6
2 files changed, 18 insertions, 18 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 31590f60c9..bfaab47d47 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -4281,7 +4281,7 @@ bool Scene360::BaseballCards::startAction(CursorType action, Event &event) {
}
}
-bool Scene360::Object6::startAction(CursorType action, Event &event) {
+bool Scene360::Harrison::startAction(CursorType action, Event &event) {
switch (action) {
case CURSOR_LOOK:
SceneItem::display2(360, 6);
@@ -4339,12 +4339,12 @@ void Scene360::Action1::signal() {
/*--------------------------------------------------------------------------*/
Scene360::Scene360() {
- _field380 = 0;
+ _uselessVariable = 0;
}
void Scene360::synchronize(Serializer &s) {
SceneExt::synchronize(s);
- s.syncAsSint16LE(_field380);
+ s.syncAsSint16LE(_uselessVariable);
}
void Scene360::postInit(SceneObjectList *OwnerList) {
@@ -4423,18 +4423,18 @@ void Scene360::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player.enableControl();
if ((BF_GLOBALS._sceneManager._previousScene == 355) || (BF_GLOBALS._sceneManager._previousScene != 370)) {
- _field380 = 0;
+ _uselessVariable = 0;
BF_GLOBALS._player.setPosition(Common::Point(253, 135));
BF_GLOBALS._player.setStrip(2);
if (BF_GLOBALS.getFlag(fBackupIn350)) {
- _object6.postInit();
- _object6.setVisage(BF_GLOBALS.getFlag(gunDrawn) ? 363 : 1363);
- _object6.animate(ANIM_MODE_1, NULL);
- _object6.setObjectWrapper(new SceneObjectWrapper());
- _object6.setPosition(Common::Point(235, 150));
- _object6.setStrip(2);
- BF_GLOBALS._sceneItems.push_back(&_object6);
+ _harrison.postInit();
+ _harrison.setVisage(BF_GLOBALS.getFlag(gunDrawn) ? 363 : 1363);
+ _harrison.animate(ANIM_MODE_1, NULL);
+ _harrison.setObjectWrapper(new SceneObjectWrapper());
+ _harrison.setPosition(Common::Point(235, 150));
+ _harrison.setStrip(2);
+ BF_GLOBALS._sceneItems.push_back(&_harrison);
}
_sceneMode = 3607;
@@ -4483,7 +4483,7 @@ void Scene360::signal() {
case 3604:
if (BF_GLOBALS.getFlag(fBackupIn350)) {
_sceneMode = 3603;
- setAction(&_sequenceManager1, this, _sceneMode, &_object6, NULL);
+ setAction(&_sequenceManager1, this, _sceneMode, &_harrison, NULL);
} else {
_sceneMode = 3605;
setAction(&_sequenceManager1, this, _sceneMode, &BF_GLOBALS._player, &_slidingDoor, NULL);
@@ -4501,7 +4501,7 @@ void Scene360::signal() {
break;
case 3607:
case 3609:
- _object6.setVisage(1363);
+ _harrison.setVisage(1363);
BF_GLOBALS._player.enableControl();
break;
case 3608:
@@ -4549,7 +4549,7 @@ void Scene360::process(Event &event) {
BF_GLOBALS._player.setFrame(BF_GLOBALS._player.getFrameCount());
BF_GLOBALS._player.animate(ANIM_MODE_6, this);
- _object6.setVisage(1363);
+ _harrison.setVisage(1363);
}
} else {
// Handle drawing gun
@@ -4564,7 +4564,7 @@ void Scene360::process(Event &event) {
BF_GLOBALS.setFlag(gunDrawn);
_sceneMode = 9998;
- _object6.setVisage(363);
+ _harrison.setVisage(363);
}
event.handled = true;
diff --git a/engines/tsage/blue_force/blueforce_scenes3.h b/engines/tsage/blue_force/blueforce_scenes3.h
index b61e3c3754..2026c494bc 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.h
+++ b/engines/tsage/blue_force/blueforce_scenes3.h
@@ -625,7 +625,7 @@ class Scene360: public SceneExt {
public:
virtual bool startAction(CursorType action, Event &event);
};
- class Object6: public NamedObject {
+ class Harrison: public NamedObject {
public:
virtual bool startAction(CursorType action, Event &event);
};
@@ -668,7 +668,7 @@ public:
Window _window;
Object4 _object4;
BaseballCards _baseballCards;
- Object6 _object6;
+ Harrison _harrison;
Object7 _object7;
Item1 _item1;
Item2 _item2;
@@ -676,7 +676,7 @@ public:
Barometer _barometer;
Action1 _action1;
ASound _sound1;
- int _field380;
+ int _uselessVariable;
Scene360();
virtual void synchronize(Serializer &s);