aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2005-06-04 14:37:52 +0000
committerEugene Sandulenko2005-06-04 14:37:52 +0000
commit2a3227911b35733b9ef8574459be5eb6581e1c2e (patch)
treeb81a539980928b68a6d78749f98fd425653e1854
parent03d6a6dd4e80cefd895780f26fc9136539fc67be (diff)
downloadscummvm-rg350-2a3227911b35733b9ef8574459be5eb6581e1c2e.tar.gz
scummvm-rg350-2a3227911b35733b9ef8574459be5eb6581e1c2e.tar.bz2
scummvm-rg350-2a3227911b35733b9ef8574459be5eb6581e1c2e.zip
Fix bug reported by Marticus with situation when Rif left scene with
converse panel on. svn-id: r18339
-rw-r--r--saga/actor.cpp2
-rw-r--r--saga/sfuncs.cpp7
2 files changed, 8 insertions, 1 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp
index 85fae3c426..1bd3a3310f 100644
--- a/saga/actor.cpp
+++ b/saga/actor.cpp
@@ -374,7 +374,7 @@ void Actor::takeExit(uint16 actorId, const HitZone *hitZone) {
ActorData *actor;
actor = getActor(actorId);
actor->lastZone = NULL;
-
+
_vm->_scene->changeScene(hitZone->getSceneNumber(), hitZone->getActorsEntrance(), kTransitionNoFade);
_vm->_script->setNoPendingVerb();
}
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp
index 28d66f9947..cebd7fa910 100644
--- a/saga/sfuncs.cpp
+++ b/saga/sfuncs.cpp
@@ -509,6 +509,13 @@ void Script::sfScriptGotoScene(SCRIPTFUNC_PARAMS) {
return;
}
+ // It is possible to leave scene when converse panel is on,
+ // particulalrly it may happen at Moneychanger tent. This
+ // prevent this from happening.
+ if (_vm->_interface->getMode() == kPanelConverse) {
+ _vm->_interface->setMode(kPanelMain);
+ }
+
// This is used for latter demos where all places on world map except
// Tent Faire are substituted with LBM picture and short description
// TODO: implement