diff options
author | md5 | 2011-04-28 02:27:42 +0300 |
---|---|---|
committer | md5 | 2011-04-28 02:27:42 +0300 |
commit | c371d0153a519326fbaaf1281a2e6f3170344780 (patch) | |
tree | ef53741c9dd211dc9073bbfc26d840e3ef13c09d /engines/tsage/ringworld_scenes6.cpp | |
parent | a38377c226c21a7746b8427058cfc8cf57d79bba (diff) | |
download | scummvm-rg350-c371d0153a519326fbaaf1281a2e6f3170344780.tar.gz scummvm-rg350-c371d0153a519326fbaaf1281a2e6f3170344780.tar.bz2 scummvm-rg350-c371d0153a519326fbaaf1281a2e6f3170344780.zip |
TSAGE: Fixed 2 script logic bugs (scene 5100, 5300) and two typos
These fix the following issues:
- Loss of control after freeing the bat in scene 5100
- Loss of control after drinking from the bat's pheromonone bottle in
scene 5300
- Crash when the two flesheaters appear on the path in scene 5300
Diffstat (limited to 'engines/tsage/ringworld_scenes6.cpp')
-rw-r--r-- | engines/tsage/ringworld_scenes6.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp index 6bb2605de5..2e201513e8 100644 --- a/engines/tsage/ringworld_scenes6.cpp +++ b/engines/tsage/ringworld_scenes6.cpp @@ -1354,6 +1354,7 @@ void Scene5100::signal() { _globals->_player.setStrip(6); _globals->_player.setPriority2(-1); _globals->_player.animate(ANIM_MODE_1, NULL); + _globals->_player.enableControl(); // TODO: verify that this is supposed to occur here break; case 5117: _globals->_player.enableControl(); @@ -1401,9 +1402,9 @@ void Scene5100::dispatch() { _hotspot3.setStrip2(2); ObjectMover3 *mover1 = new ObjectMover3(); - _hotspot2.addMover(mover1, 20, this); + _hotspot2.addMover(mover1, &_globals->_player, 20, this); ObjectMover3 *mover2 = new ObjectMover3(); - _hotspot3.addMover(mover2, 20, this); + _hotspot3.addMover(mover2, &_globals->_player, 20, this); } if (!_action) { @@ -2154,6 +2155,7 @@ void Scene5300::signal() { break; case 5307: _soundHandler.proc1(NULL); + _globals->_player.enableControl(); // TODO: verify that this is supposed to occur here break; case 5309: _hotspot5.remove(); |