aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/npcs/true_talk_npc.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-08-01 12:26:58 +0300
committerEugene Sandulenko2016-08-01 12:26:58 +0300
commit34cbdd8a1deddfc8d04263ec90c546a906543366 (patch)
tree31f60f37423a35f42e3d52033a5ae5f8f08a4fe6 /engines/titanic/npcs/true_talk_npc.cpp
parentbb9c755bccb4312d5e7447b5efa9bac9224aafd4 (diff)
downloadscummvm-rg350-34cbdd8a1deddfc8d04263ec90c546a906543366.tar.gz
scummvm-rg350-34cbdd8a1deddfc8d04263ec90c546a906543366.tar.bz2
scummvm-rg350-34cbdd8a1deddfc8d04263ec90c546a906543366.zip
TITANIC: Fix warnings
Diffstat (limited to 'engines/titanic/npcs/true_talk_npc.cpp')
-rw-r--r--engines/titanic/npcs/true_talk_npc.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp
index 51d7c2e003..faadc2d565 100644
--- a/engines/titanic/npcs/true_talk_npc.cpp
+++ b/engines/titanic/npcs/true_talk_npc.cpp
@@ -156,14 +156,14 @@ bool CTrueTalkNPC::MovieEndMsg(CMovieEndMsg *msg) {
CNPCPlayAnimationMsg msg2(msg1._names, msg1._value1);
msg2.execute(this);
}
-
+
return true;
}
bool CTrueTalkNPC::NPCQueueIdleAnimMsg(CNPCQueueIdleAnimMsg *msg) {
int rndVal = g_vm->getRandomNumber(_fieldF8 - 1) - (_fieldF8 / 2);
_speechTimerId = startAnimTimer("NPCIdleAnim", _fieldF4 + rndVal, 0);
-
+
return true;
}
@@ -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 startTalking, CViewItem *view_) {
CPetControl *pet = getPetControl();
if (pet)
pet->resetActiveNPC();
if (startTalking)
- startTalker(view);
+ startTalker(view_);
if (pet)
pet->convResetNPC();