libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: Bugfix and cleanup for boarding rental boat

Browse Source
This commit is contained in:
Paul Gilbert 2011-10-18 22:25:49 +11:00
parent 74b571710c
commit e767a4c184
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/tsage/blue_force/blueforce_scenes8.cpp
View File

@ -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();

4
engines/tsage/blue_force/blueforce_scenes8.h
View File

@ -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;