aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld_scenes8.cpp
diff options
context:
space:
mode:
authorstrangerke2011-03-29 21:14:16 +0200
committerstrangerke2011-03-29 21:14:16 +0200
commitf4e2cda89dc7d627ad6d1f6b91b3892cdacd2620 (patch)
tree7060742898e80cc56ce42c44a69620f9a924a4c6 /engines/tsage/ringworld_scenes8.cpp
parentf208c33593f29fd36df2b63c9db7ab0e377f21a1 (diff)
downloadscummvm-rg350-f4e2cda89dc7d627ad6d1f6b91b3892cdacd2620.tar.gz
scummvm-rg350-f4e2cda89dc7d627ad6d1f6b91b3892cdacd2620.tar.bz2
scummvm-rg350-f4e2cda89dc7d627ad6d1f6b91b3892cdacd2620.zip
TSAGE: Cast fmt into a SceneObject in Scene7700.
This makes the drawers useable, even if there's still a problem with _globals->_parent._field8C (the animation displayed is always a closing drawer)
Diffstat (limited to 'engines/tsage/ringworld_scenes8.cpp')
-rw-r--r--engines/tsage/ringworld_scenes8.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld_scenes8.cpp
index 8dda2a8738..dc28dc6ba7 100644
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld_scenes8.cpp
@@ -1591,25 +1591,20 @@ void Scene7600::postInit(SceneObjectList *OwnerList) {
void Scene7700::Action1::signal() {
Scene7700 *scene = (Scene7700 *)_globals->_sceneManager._scene;
- warning("TODO: Scene7700::Action1::signal - Find the SceneObject behind _fmt");
-
+ SceneObject *fmtObj = (SceneObject *) _fmt;
switch (_actionIndex++) {
case 0: {
PlayerMover *mover1 = new PlayerMover();
-// Common::Point pt = Common::Point(_fmt._position.x, _fmt._position.y + 30);
- Common::Point pt = Common::Point(scene->_object1._position.x, scene->_object1._position.y + 30);
+ Common::Point pt = Common::Point(fmtObj->_position.x, fmtObj->_position.y + 30);
_globals->_player.addMover(mover1, &pt, this);
break;
}
case 1:
-// _globals->_player.checkAngle(&_fmt);
- _globals->_player.checkAngle(&scene->_object1);
+ _globals->_player.checkAngle(fmtObj);
if (_globals->_player._field8C == 0)
-// _fmt.animate(ANIM_MODE_5, this);
- scene->_object1.animate(ANIM_MODE_5, this);
+ fmtObj->animate(ANIM_MODE_5, this);
else
-// _fmt.animate(ANIM_MODE_6, this);
- scene->_object1.animate(ANIM_MODE_6, this);
+ fmtObj->animate(ANIM_MODE_6, this);
break;
case 2:
remove();