libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Fix setting up timer action strings

Browse Source
This commit is contained in:
Paul Gilbert 2016-10-27 21:09:18 -04:00
parent 8ba899b46b
commit 9b1a2555f9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/titanic/npcs/true_talk_npc.cpp
View File

@ -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);

4
engines/titanic/support/time_event_info.cpp
View File

@ -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++;
}