[Scummvm-git-logs] scummvm master -> 9b1a2555f950738fa9ef2cbe5b5fba54a500715c

[dreammaster]

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:
9b1a2555f9 TITANIC: Fix setting up timer action strings


Commit: 9b1a2555f950738fa9ef2cbe5b5fba54a500715c
    https://github.com/scummvm/scummvm/commit/9b1a2555f950738fa9ef2cbe5b5fba54a500715c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-27T21:09:18-04:00

Commit Message:
TITANIC: Fix setting up timer action strings

Changed paths:
    engines/titanic/npcs/true_talk_npc.cpp
    engines/titanic/support/time_event_info.cpp



diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp
index 55666a2..41186ac 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 e088a8e..c61ceb2 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++;
 }