aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/blue_force
diff options
context:
space:
mode:
authorPaul Gilbert2011-10-18 22:25:49 +1100
committerPaul Gilbert2011-10-18 22:26:39 +1100
commite767a4c1847fdf030ca707dfdd0e1dbf071c1d3a (patch)
tree5f00eff38f243d202ef65ed81f84c483bc60c347 /engines/tsage/blue_force
parent74b571710c62193f2a1c9424c6f507a78115c3a9 (diff)
downloadscummvm-rg350-e767a4c1847fdf030ca707dfdd0e1dbf071c1d3a.tar.gz
scummvm-rg350-e767a4c1847fdf030ca707dfdd0e1dbf071c1d3a.tar.bz2
scummvm-rg350-e767a4c1847fdf030ca707dfdd0e1dbf071c1d3a.zip
TSAGE: Bugfix and cleanup for boarding rental boat
Diffstat (limited to 'engines/tsage/blue_force')
-rw-r--r--engines/tsage/blue_force/blueforce_scenes8.cpp16
-rw-r--r--engines/tsage/blue_force/blueforce_scenes8.h4
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index 3da1a0ff55..04998389bd 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -1547,7 +1547,7 @@ bool Scene830::Door::startAction(CursorType action, Event &event) {
return NamedObject::startAction(action, event);
}
-bool Scene830::Object4::startAction(CursorType action, Event &event) {
+bool Scene830::RentalBoat::startAction(CursorType action, Event &event) {
Scene830 *scene = (Scene830 *)BF_GLOBALS._sceneManager._scene;
if (action == INV_RENTAL_KEYS) {
@@ -1557,7 +1557,7 @@ bool Scene830::Object4::startAction(CursorType action, Event &event) {
scene->setAction(&scene->_sequenceManager, scene, 8300, &BF_GLOBALS._player, &scene->_lyle, NULL);
} else {
scene->_sceneMode = 834;
- scene->setAction(&scene->_sequenceManager, scene, 8300, &BF_GLOBALS._player, &scene->_object4, NULL);
+ scene->setAction(&scene->_sequenceManager, scene, 834, &BF_GLOBALS._player, &scene->_rentalBoat, NULL);
}
return true;
} else {
@@ -1655,12 +1655,12 @@ void Scene830::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player.disableControl();
if (_field18A8) {
- _object4.postInit();
- _object4.setVisage(830);
- _object4.setStrip(1);
- _object4.setPosition(Common::Point(271, 146));
- _object4.fixPriority(90);
- _object4.setDetails(830, 0, 1, 2, 1, NULL);
+ _rentalBoat.postInit();
+ _rentalBoat.setVisage(830);
+ _rentalBoat.setStrip(1);
+ _rentalBoat.setPosition(Common::Point(271, 146));
+ _rentalBoat.fixPriority(90);
+ _rentalBoat.setDetails(830, 0, 1, 2, 1, NULL);
}
_door.postInit();
diff --git a/engines/tsage/blue_force/blueforce_scenes8.h b/engines/tsage/blue_force/blueforce_scenes8.h
index eb15bd3200..ef5ef81563 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.h
+++ b/engines/tsage/blue_force/blueforce_scenes8.h
@@ -290,7 +290,7 @@ class Scene830: public PalettedScene {
public:
virtual bool startAction(CursorType action, Event &event);
};
- class Object4: public NamedObject {
+ class RentalBoat: public NamedObject {
public:
virtual bool startAction(CursorType action, Event &event);
};
@@ -306,7 +306,7 @@ public:
SpeakerLyleHat _lyleHatSpeaker;
NamedObject _object1, _lyle, _object6;
Door _door;
- Object4 _object4;
+ RentalBoat _rentalBoat;
Object5 _object5;
SouthEastExit _seExit;
NoteBoard _noteBoard;