[Scummvm-cvs-logs] scummvm master -> 595728c8cae665fff075bd215a8794d0ad9a9275
Strangerke
arnaud.boutonne at gmail.com
Sat May 28 02:09:18 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:
595728c8ca TSAGE: Fix several bugs in scene 5300
Commit: 595728c8cae665fff075bd215a8794d0ad9a9275
https://github.com/scummvm/scummvm/commit/595728c8cae665fff075bd215a8794d0ad9a9275
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-27T17:08:19-07:00
Commit Message:
TSAGE: Fix several bugs in scene 5300
Changed paths:
engines/tsage/ringworld_scenes6.cpp
diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index b99ff71..bab9b16 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -1883,11 +1883,17 @@ void Scene5300::Hotspot2::doAction(int action) {
_globals->_player.disableControl();
if (RING_INVENTORY._stasisBox._sceneNumber != 1) {
+ scene->_sceneMode = 5316;
scene->setAction(&scene->_sequenceManager, scene, 5316, NULL);
} else {
_globals->setFlag(60);
- scene->_sceneMode = _globals->getFlag(67) ? 5315 : 5347;
- scene->setAction(&scene->_sequenceManager, scene, 5315, this);
+ if (_globals->getFlag(67)) {
+ scene->_sceneMode = 5315;
+ scene->setAction(&scene->_sequenceManager, scene, 5315, this, NULL);
+ } else {
+ scene->_sceneMode = 5347;
+ scene->setAction(&scene->_sequenceManager, scene, 5347, NULL);
+ }
}
}
break;
More information about the Scummvm-git-logs
mailing list