libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 17:45:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Work around loading savegame when Marcinta is active

Browse Source 
Loading a savegame directly from the launcher or Continue dialog when
Marcinta is active shows her as inactive in the original, but still
allows you to talk to her. To fix the inconsistency, now when this
occurs, it will also reset the active NPC back to none.
This commit is contained in:
Paul Gilbert 2017-10-02 21:00:43 -04:00
parent 9ef2ca7f84
commit 8733dc8a61
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/titanic/npcs/deskbot.cpp
View File

@ -102,6 +102,11 @@ bool CDeskbot::EnterViewMsg(CEnterViewMsg *msg) {
_fieldC4 = 0;
loadFrame(625);
// WORKAROUND: If loading directly from the launcher when Marcinta
// is active, reset the active NPC back to none at the same time
CPetControl *pet = getPetControl();
pet->resetActiveNPC();
return true;
}