[Scummvm-cvs-logs] scummvm master -> c720f463e444c2835cea4e9fadb256378eaaab36
Strangerke
Strangerke at scummvm.org
Thu Jun 2 00:54:52 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:
c720f463e4 TSAGE: Add workaround in order to fix crash in scene 5100 when Quinn forgets the Stasis Box
Commit: c720f463e444c2835cea4e9fadb256378eaaab36
https://github.com/scummvm/scummvm/commit/c720f463e444c2835cea4e9fadb256378eaaab36
Author: Arnaud Boutonne (strangerke at scummvm.org)
Date: 2011-06-01T15:53:19-07:00
Commit Message:
TSAGE: Add workaround in order to fix crash in scene 5100 when Quinn forgets the Stasis Box
Also present in the original!
Changed paths:
engines/tsage/ringworld_scenes6.cpp
diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index 6c4b62c..9e5766d 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -614,6 +614,7 @@ void Scene5000::dispatch() {
*--------------------------------------------------------------------------*/
void Scene5100::Action1::signal() {
+ // Quinn enters the cave for the first time
Scene5100 *scene = (Scene5100 *)_globals->_sceneManager._scene;
switch (_actionIndex++) {
@@ -663,6 +664,7 @@ void Scene5100::Action1::signal() {
}
void Scene5100::Action2::signal() {
+ // Quinn and Seeker exit the cave
Scene5100 *scene = (Scene5100 *)_globals->_sceneManager._scene;
switch (_actionIndex++) {
@@ -824,7 +826,7 @@ void Scene5100::Action5::signal() {
break;
case 3:
scene->_sceneMode = 5106;
- scene->setAction(&scene->_sequenceManager, scene, 5106, &_globals->_player, NULL);
+ scene->setAction(&scene->_sequenceManager, scene, 5106, &_globals->_player, &scene->_hotspot14, NULL);
break;
}
}
@@ -1086,7 +1088,7 @@ void Scene5100::postInit(SceneObjectList *OwnerList) {
_globals->_player.animate(ANIM_MODE_1, NULL);
_globals->_player.disableControl();
- if (!_globals->getFlag(66)) {
+ if ((!_globals->getFlag(66)) || (RING_INVENTORY._stasisBox._sceneNumber != 1)) {
_hotspot14.postInit();
_hotspot14.setVisage(5101);
_hotspot14.setPosition(Common::Point(498, 147));
More information about the Scummvm-git-logs
mailing list