thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAGA: Fix potential crash when talking to Sist (bug #10365)

Browse source 
When Rif puts on the rat disguise, he is swapped out for a
different actor. When he takes off the disguise, after reaching
Sist's office, the old actor is swapped back in again.

At that point, original Rif's actor will have a _lastZone pointer
which not only is for the wrong room, it was deleted when Rif in
disguise left the room.

To fix this, we also swap the actors's _lastZone pointers.
This commit is contained in:
Torbjörn Andersson 2019-01-31 19:14:40 +01:00 • committed by Filippos Karapetis
parent 90f6d119cf
commit 66400e7422
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/saga/sfuncs.cpp
View file

@ -735,6 +735,7 @@ void Script::sfSwapActors(SCRIPTFUNC_PARAMS) {
ActorData *actor2 = _vm->_actor->getActor(actorId2); ActorData *actor2 = _vm->_actor->getActor(actorId2);
SWAP(actor1->_location, actor2->_location); SWAP(actor1->_location, actor2->_location);
SWAP(actor1->_lastZone, actor2->_lastZone);
if (actor1->_flags & kProtagonist) { if (actor1->_flags & kProtagonist) {
actor1->_flags &= ~kProtagonist; actor1->_flags &= ~kProtagonist;