aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/blue_force/blueforce_scenes9.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2011-10-18 21:26:37 +1100
committerPaul Gilbert2011-10-18 21:26:37 +1100
commitabdda3159753a2c14b375943064caba7ac183eb1 (patch)
tree7991e5cb27d04f24f29b79308add2aff96b29169 /engines/tsage/blue_force/blueforce_scenes9.cpp
parentcd14dd3e0fd3e3fa9d4d6231c8ac97d51dd137ce (diff)
downloadscummvm-rg350-abdda3159753a2c14b375943064caba7ac183eb1.tar.gz
scummvm-rg350-abdda3159753a2c14b375943064caba7ac183eb1.tar.bz2
scummvm-rg350-abdda3159753a2c14b375943064caba7ac183eb1.zip
TSAGE: Bugfix for putting down boots correctly after looking at them
Diffstat (limited to 'engines/tsage/blue_force/blueforce_scenes9.cpp')
-rw-r--r--engines/tsage/blue_force/blueforce_scenes9.cpp20
1 files changed, 19 insertions, 1 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index a7f58acc62..94682dbea8 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -3164,6 +3164,16 @@ bool Scene930::Object4::startAction(CursorType action, Event &event) {
}
}
+void Scene930::Object4::remove() {
+ Scene930 *scene = (Scene930 *)BF_GLOBALS._sceneManager._scene;
+
+ if (scene->_v141C && !BF_GLOBALS._sceneObjects->contains(&scene->_object5)) {
+ scene->_boots.setAction(&scene->_action3);
+ }
+
+ FocusObject::remove();
+}
+
bool Scene930::Object5::startAction(CursorType action, Event &event) {
Scene930 *scene = (Scene930 *)BF_GLOBALS._sceneManager._scene;
@@ -3191,6 +3201,14 @@ bool Scene930::Object5::startAction(CursorType action, Event &event) {
break;
}
}
+
+void Scene930::Object5::remove() {
+ Scene930 *scene = (Scene930 *)BF_GLOBALS._sceneManager._scene;
+ scene->_boots.setAction(&scene->_action3);
+
+ FocusObject::remove();
+}
+
/* Items */
bool Scene930::Item1::startAction(CursorType action, Event &event) {
Scene930 *scene = (Scene930 *)BF_GLOBALS._sceneManager._scene;
@@ -3440,7 +3458,7 @@ void Scene930::subF3D6F() {
_object5.postInit();
_object5.setVisage(930);
_object5.setStrip(3);
- if (BF_INVENTORY.getObjectScene(55) == 1) {
+ if (BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) {
_object5.setFrame(_object5.getFrameCount());
_object5.setDetails(930, 92, 77, -1);
} else if (_v141A == 0) {