[Scummvm-cvs-logs] scummvm master -> 8e95310889f7a9c653f5297b9c856377efaa37ea
Strangerke
arnaud.boutonne at gmail.com
Thu Apr 28 08:17:54 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8e95310889 TSAGE: Suppress the 2 workarounds previously added, use of a proper fix
Commit: 8e95310889f7a9c653f5297b9c856377efaa37ea
https://github.com/scummvm/scummvm/commit/8e95310889f7a9c653f5297b9c856377efaa37ea
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-04-27T23:17:10-07:00
Commit Message:
TSAGE: Suppress the 2 workarounds previously added, use of a proper fix
Changed paths:
engines/tsage/ringworld_scenes6.cpp
diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index 2e20151..9581b1f 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -912,6 +912,7 @@ void Scene5100::HotspotGroup2::doAction(int action) {
}
void Scene5100::Hotspot9::doAction(int action) {
+ // Rope
Scene5100 *scene = (Scene5100 *)_globals->_sceneManager._scene;
switch (action) {
@@ -1354,8 +1355,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;
+ // No break on purpose
case 5117:
_globals->_player.enableControl();
break;
@@ -1412,8 +1412,9 @@ void Scene5100::dispatch() {
_globals->_player._canWalk = false;
_globals->_player.addMover(NULL);
+ Common::Point pt(20, 25);
PlayerMover2 *mover = new PlayerMover2();
- _hotspot3.addMover(mover, 20, 25, &_globals->_player);
+ _hotspot3.addMover(mover, &pt, &_globals->_player);
setAction(&_action4);
}
@@ -1937,6 +1938,7 @@ void Scene5300::Hotspot5::doAction(int action) {
}
void Scene5300::Hotspot6::doAction(int action) {
+ // Left Hole
Scene5300 *scene = (Scene5300 *)_globals->_sceneManager._scene;
switch (action) {
@@ -2117,6 +2119,9 @@ void Scene5300::signal() {
_globals->_stripNum = 5300;
_globals->_sceneManager.changeScene(5100);
break;
+ case 5307:
+ _soundHandler.proc1(NULL);
+ // No break on purpose
case 5302:
case 5308:
case 5316:
@@ -2153,10 +2158,6 @@ void Scene5300::signal() {
_stripManager.start(5302, this);
_sceneMode = 5302;
break;
- case 5307:
- _soundHandler.proc1(NULL);
- _globals->_player.enableControl(); // TODO: verify that this is supposed to occur here
- break;
case 5309:
_hotspot5.remove();
_globals->_player.enableControl();
More information about the Scummvm-git-logs
mailing list