Skip to content

Commit

Permalink
TSAGE: Add workaround in order to fix crash in scene 5100 when Quinn …
Browse files Browse the repository at this point in the history
…forgets the Stasis Box

Also present in the original!
  • Loading branch information
Strangerke committed Jun 1, 2011
1 parent 333be9c commit c720f46
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions engines/tsage/ringworld_scenes6.cpp
Expand Up @@ -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++) {
Expand Down Expand Up @@ -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++) {
Expand Down Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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));
Expand Down

0 comments on commit c720f46

Please sign in to comment.