diff options
author | Paul Gilbert | 2016-06-28 21:18:13 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:25:44 -0400 |
commit | 5c2a39e74ac1cf8b67e17fe25e00bcca487c9f99 (patch) | |
tree | f23fbf77704d499bc071763367b71229cebfa3f2 /engines/titanic/npcs/true_talk_npc.cpp | |
parent | 0715be79269a0830136f76e78da2e893ce2e2ed4 (diff) | |
download | scummvm-rg350-5c2a39e74ac1cf8b67e17fe25e00bcca487c9f99.tar.gz scummvm-rg350-5c2a39e74ac1cf8b67e17fe25e00bcca487c9f99.tar.bz2 scummvm-rg350-5c2a39e74ac1cf8b67e17fe25e00bcca487c9f99.zip |
TITANIC: Set up empty message targets for classes without messages
Diffstat (limited to 'engines/titanic/npcs/true_talk_npc.cpp')
-rw-r--r-- | engines/titanic/npcs/true_talk_npc.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp index c989aa3bd7..0eaf21359e 100644 --- a/engines/titanic/npcs/true_talk_npc.cpp +++ b/engines/titanic/npcs/true_talk_npc.cpp @@ -22,6 +22,7 @@ #include "titanic/npcs/true_talk_npc.h" #include "titanic/core/view_item.h" +#include "titanic/pet_control/pet_control.h" #include "titanic/titanic.h" namespace Titanic { @@ -221,5 +222,16 @@ void CTrueTalkNPC::startTalker(CViewItem *view) { gameManager->getTalkManager()->start4(this, view); } +void CTrueTalkNPC::performAction(bool startTalking, CViewItem *view) { + CPetControl *pet = getPetControl(); + if (pet) + pet->resetActiveNPC(); + + if (startTalking) + startTalker(view); + + if (pet) + pet->convResetNPC(); +} } // End of namespace Titanic |