[Scummvm-git-logs] scummvm master -> 0d5d6638090b819faa1a620fe71cb89b9fec0895

dreammaster dreammaster at scummvm.org
Sat Jun 24 23:57:29 CEST 2017


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:
0d5d663809 TITANIC: Remove warning for unknown NPC in getNpcScript


Commit: 0d5d6638090b819faa1a620fe71cb89b9fec0895
    https://github.com/scummvm/scummvm/commit/0d5d6638090b819faa1a620fe71cb89b9fec0895
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-24T17:55:40-04:00

Commit Message:
TITANIC: Remove warning for unknown NPC in getNpcScript

Turns out the origional explicitly renames NPCs in some cases when
they don't want the NPC to be responsive. Such as the MaitreD name
being set to MaitreLoop03 when he's viewed from behind

Changed paths:
    engines/titanic/true_talk/true_talk_manager.cpp


diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index f8efe91..a713688 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -271,7 +271,6 @@ TTnpcScript *CTrueTalkManager::getNpcScript(CTrueTalkNPC *npc) const {
 
 	if (!script) {
 		// Fall back on the default NPC script
-		warning("Could not find NPC script for %s, using fallback", npc->getName().c_str());
 		script = _scripts.getNpcScript(101);
 	}
 





More information about the Scummvm-git-logs mailing list