diff options
| author | Paul Gilbert | 2017-10-02 21:00:43 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-10-02 21:00:43 -0400 |
| commit | 8733dc8a61d43a0f27e815e3928be06590c6a2f0 (patch) | |
| tree | 3723b64c464e87647d07fd56547002fa8e125ee5 /engines/titanic | |
| parent | 9ef2ca7f84234abf008cd820021b27c1dc83be2b (diff) | |
| download | scummvm-rg350-8733dc8a61d43a0f27e815e3928be06590c6a2f0.tar.gz scummvm-rg350-8733dc8a61d43a0f27e815e3928be06590c6a2f0.tar.bz2 scummvm-rg350-8733dc8a61d43a0f27e815e3928be06590c6a2f0.zip | |
TITANIC: Work around loading savegame when Marcinta is active
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.
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/npcs/deskbot.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp index aa9ec7e6cd..ee639c908f 100644 --- a/engines/titanic/npcs/deskbot.cpp +++ b/engines/titanic/npcs/deskbot.cpp @@ -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; } |