diff options
| author | Paul Gilbert | 2016-08-02 20:04:06 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-02 20:04:06 -0400 |
| commit | 3a466a29ea91f829c542f9537b3f578e72af31f3 (patch) | |
| tree | 0ae8ac2db0c1f4a6c190afde7e04a574044f1a65 /engines/titanic/npcs/true_talk_npc.cpp | |
| parent | 99b353b9fef51eccbf88b1bfa8a69381369dfd50 (diff) | |
| download | scummvm-rg350-3a466a29ea91f829c542f9537b3f578e72af31f3.tar.gz scummvm-rg350-3a466a29ea91f829c542f9537b3f578e72af31f3.tar.bz2 scummvm-rg350-3a466a29ea91f829c542f9537b3f578e72af31f3.zip | |
TITANIC: Fix compiler warnings
Diffstat (limited to 'engines/titanic/npcs/true_talk_npc.cpp')
| -rw-r--r-- | engines/titanic/npcs/true_talk_npc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp index faadc2d565..290922f660 100644 --- a/engines/titanic/npcs/true_talk_npc.cpp +++ b/engines/titanic/npcs/true_talk_npc.cpp @@ -222,13 +222,13 @@ void CTrueTalkNPC::startTalker(CViewItem *view) { gameManager->getTalkManager()->start4(this, view); } -void CTrueTalkNPC::performAction(bool startTalking, CViewItem *view_) { +void CTrueTalkNPC::performAction(bool startTalkingFlag, CViewItem *destView) { CPetControl *pet = getPetControl(); if (pet) pet->resetActiveNPC(); - if (startTalking) - startTalker(view_); + if (startTalkingFlag) + startTalker(destView); if (pet) pet->convResetNPC(); |