diff options
Diffstat (limited to 'engines')
| -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; } |