[Scummvm-git-logs] scummvm master -> 8733dc8a61d43a0f27e815e3928be06590c6a2f0

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8733dc8a61 TITANIC: Work around loading savegame when Marcinta is active


Commit: 8733dc8a61d43a0f27e815e3928be06590c6a2f0
    https://github.com/scummvm/scummvm/commit/8733dc8a61d43a0f27e815e3928be06590c6a2f0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-02T21:00:43-04:00

Commit Message:
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.

Changed paths:
    engines/titanic/npcs/deskbot.cpp


diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp
index aa9ec7e..ee639c9 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;
 }