diff options
| author | Filippos Karapetis | 2014-10-27 12:28:18 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-10-27 12:28:18 +0200 |
| commit | 2a6a79b1673e274420ca8c28f40f9855b1c6134f (patch) | |
| tree | 19145458fa31bc291370e0acb99d7e5057d59bf4 /engines/saga/sfuncs.cpp | |
| parent | b5b5417d64eacd21d441631e7a5e0c618bfadebd (diff) | |
| download | scummvm-rg350-2a6a79b1673e274420ca8c28f40f9855b1c6134f.tar.gz scummvm-rg350-2a6a79b1673e274420ca8c28f40f9855b1c6134f.tar.bz2 scummvm-rg350-2a6a79b1673e274420ca8c28f40f9855b1c6134f.zip | |
SAGA: Remove the buggy actor swapping fixup code for IHNM
This was a hack that was implemented while IHNM was being developed.
That code should no longer be needed. If this issue does occur again,
the actual cause should be investigated, instead of hiding it with
workarounds. The code was buggy anyway, as _currentProtag was not
initialized properly
Diffstat (limited to 'engines/saga/sfuncs.cpp')
| -rw-r--r-- | engines/saga/sfuncs.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp index cb963e23ac..2175d8f40a 100644 --- a/engines/saga/sfuncs.cpp +++ b/engines/saga/sfuncs.cpp @@ -748,14 +748,10 @@ void Script::sfSwapActors(SCRIPTFUNC_PARAMS) { actor1->_flags &= ~kProtagonist; actor2->_flags |= kProtagonist; _vm->_actor->_protagonist = _vm->_actor->_centerActor = actor2; - if (_vm->getGameId() == GID_IHNM) - _vm->_scene->setProtag(actorId2); } else if (actor2->_flags & kProtagonist) { actor2->_flags &= ~kProtagonist; actor1->_flags |= kProtagonist; _vm->_actor->_protagonist = _vm->_actor->_centerActor = actor1; - if (_vm->getGameId() == GID_IHNM) - _vm->_scene->setProtag(actorId1); } } |