diff options
author | Paul Gilbert | 2011-09-24 17:52:33 +1000 |
---|---|---|
committer | Paul Gilbert | 2011-09-24 17:52:33 +1000 |
commit | d6097882b18ff174e0bc1c66f7055398acd8095d (patch) | |
tree | 0b543ec98ada5effd80b2c9f16a80103ebc98172 /engines | |
parent | 0e6e35b7c613bc35524bb31376ac090fcebd18d6 (diff) | |
download | scummvm-rg350-d6097882b18ff174e0bc1c66f7055398acd8095d.tar.gz scummvm-rg350-d6097882b18ff174e0bc1c66f7055398acd8095d.tar.bz2 scummvm-rg350-d6097882b18ff174e0bc1c66f7055398acd8095d.zip |
TSAGE: Fixed the yacht in Blue Force scene 350 to be in the background
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes3.cpp | 18 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes3.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp index 5bd62a9997..69bfb11796 100644 --- a/engines/tsage/blue_force/blueforce_scenes3.cpp +++ b/engines/tsage/blue_force/blueforce_scenes3.cpp @@ -2516,7 +2516,7 @@ bool Scene350::Yacht::startAction(CursorType action, Event &event) { if ((BF_GLOBALS._dayNumber == 1) || (BF_GLOBALS._dayNumber == 4)) { BF_GLOBALS._player.disableControl(); scene->_sceneMode = 1; - scene->setAction(&scene->_sequenceManager1, scene, 3512, &BF_GLOBALS._player, &scene->_boat, NULL); + scene->setAction(&scene->_sequenceManager1, scene, 3512, &BF_GLOBALS._player, &scene->_yachtDoor, NULL); return true; } } else { @@ -2524,7 +2524,7 @@ bool Scene350::Yacht::startAction(CursorType action, Event &event) { scene->_sceneMode = 1; BF_GLOBALS._player.disableControl(); scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(gunDrawn) ? 3504 : 3505, - &BF_GLOBALS._player, &scene->_boat, NULL); + &BF_GLOBALS._player, &scene->_yachtDoor, NULL); return true; } break; @@ -2640,14 +2640,14 @@ void Scene350::postInit(SceneObjectList *OwnerList) { if ((BF_GLOBALS._dayNumber != 1) && (BF_GLOBALS._dayNumber != 4)) { _yacht.setDetails(28, 350, 15, 16, 17, 1); } else { - _boat.postInit(); - _boat.setVisage(350); - _boat.setStrip(3); - _boat.setFrame(1); - _boat.fixPriority(72); - _boat.setPosition(Common::Point(40, 74)); + _yachtDoor.postInit(); + _yachtDoor.setVisage(350); + _yachtDoor.setStrip(3); + _yachtDoor.setFrame(1); + _yachtDoor.fixPriority(72); + _yachtDoor.setPosition(Common::Point(40, 74)); - _yachtBody.setup(350, 1, 1, 129, 142, -1); + _yachtBody.setup(350, 1, 1, 129, 142, 255); if (BF_GLOBALS.getFlag(fBackupIn350)) { _harrison.postInit(); diff --git a/engines/tsage/blue_force/blueforce_scenes3.h b/engines/tsage/blue_force/blueforce_scenes3.h index 2d3cc7a14f..e1b9c5f949 100644 --- a/engines/tsage/blue_force/blueforce_scenes3.h +++ b/engines/tsage/blue_force/blueforce_scenes3.h @@ -467,8 +467,8 @@ class Scene350: public SceneExt { public: SequenceManager _sequenceManager1, _sequenceManager2, _sequenceManager3; NamedObject _harrison; - SceneObject _boat; - SceneObject _yachtBody; + SceneObject _yachtDoor; + BackgroundSceneObject _yachtBody; Hook _hook; Object5 _object5; NamedHotspot _item1, _item2, _item3, _item4; |