From 9b1a2555f950738fa9ef2cbe5b5fba54a500715c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 27 Oct 2016 21:09:18 -0400 Subject: TITANIC: Fix setting up timer action strings --- engines/titanic/npcs/true_talk_npc.cpp | 2 +- engines/titanic/support/time_event_info.cpp | 4 ++-- 2 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 55666a21a9..41186ac46c 100644 --- a/engines/titanic/npcs/true_talk_npc.cpp +++ b/engines/titanic/npcs/true_talk_npc.cpp @@ -130,7 +130,7 @@ bool CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *m _speechDuration = 0; if (!(_npcFlags & NPCFLAG_8)) { - CNPCPlayTalkingAnimationMsg msg1(0, 2, 0); + CNPCPlayTalkingAnimationMsg msg1(0, 2, nullptr); msg1.execute(this); CNPCQueueIdleAnimMsg msg2; msg2.execute(this); diff --git a/engines/titanic/support/time_event_info.cpp b/engines/titanic/support/time_event_info.cpp index e088a8e0c2..c61ceb29ae 100644 --- a/engines/titanic/support/time_event_info.cpp +++ b/engines/titanic/support/time_event_info.cpp @@ -100,8 +100,8 @@ CTimeEventInfo::CTimeEventInfo() : ListItem(), _lockCounter(0), CTimeEventInfo::CTimeEventInfo(uint ticks, bool repeated, uint firstDuration, uint repeatDuration, CTreeItem *target, int endVal, const CString &action) : ListItem(), _lockCounter(0), _repeated(repeated), _firstDuration(firstDuration), - _repeatDuration(repeatDuration), _target(target), _actionVal(endVal), _done(false), - _timerCtr(0), _lastTimerTicks(ticks), _relativeTicks(0), _persisent(true) { + _repeatDuration(repeatDuration), _target(target), _actionVal(endVal), _action(action), + _done(false), _timerCtr(0), _lastTimerTicks(ticks), _relativeTicks(0), _persisent(true) { _id = _nextId++; } -- cgit v1.2.3