diff options
| author | Paul Gilbert | 2016-08-22 20:22:41 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-22 20:22:41 -0400 |
| commit | 8b3829549a2c82a09f7475c35173238f7470d587 (patch) | |
| tree | c0965bfcae7153af1f831be1204726644d99da9e /engines/titanic/npcs/true_talk_npc.cpp | |
| parent | 65bc8cb83c01cc1e7e6c8c093b8f42080800718d (diff) | |
| download | scummvm-rg350-8b3829549a2c82a09f7475c35173238f7470d587.tar.gz scummvm-rg350-8b3829549a2c82a09f7475c35173238f7470d587.tar.bz2 scummvm-rg350-8b3829549a2c82a09f7475c35173238f7470d587.zip | |
TITANIC: Cleanup of engine references
Diffstat (limited to 'engines/titanic/npcs/true_talk_npc.cpp')
| -rw-r--r-- | engines/titanic/npcs/true_talk_npc.cpp | 8 |
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 9310f285e5..c2705bf483 100644 --- a/engines/titanic/npcs/true_talk_npc.cpp +++ b/engines/titanic/npcs/true_talk_npc.cpp @@ -23,7 +23,7 @@ #include "titanic/npcs/true_talk_npc.h" #include "titanic/core/view_item.h" #include "titanic/pet_control/pet_control.h" -#include "titanic/titanic.h" +#include "titanic/game_manager.h" namespace Titanic { @@ -103,7 +103,7 @@ bool CTrueTalkNPC::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMs stopTimer(_speechTimerId); _soundId = msg->_soundId; - _fieldF0 = g_vm->_events->getTicksCount(); + _fieldF0 = getTicksCount(); if (hasActiveMovie() || (_npcFlags & NPCFLAG_2)) { _npcFlags &= ~NPCFLAG_2; @@ -147,7 +147,7 @@ bool CTrueTalkNPC::MovieEndMsg(CMovieEndMsg *msg) { return false; } - int diff = g_vm->_events->getTicksCount() - _fieldF0; + int diff = getTicksCount() - _fieldF0; int ticks = MAX((int)_soundId - diff, 0); CNPCPlayTalkingAnimationMsg msg1(ticks, ticks > 1000 ? 2 : 1, 0); msg1.execute(this); @@ -161,7 +161,7 @@ bool CTrueTalkNPC::MovieEndMsg(CMovieEndMsg *msg) { } bool CTrueTalkNPC::NPCQueueIdleAnimMsg(CNPCQueueIdleAnimMsg *msg) { - int rndVal = g_vm->getRandomNumber(_fieldF8 - 1) - (_fieldF8 / 2); + int rndVal = getRandomNumber(_fieldF8 - 1) - (_fieldF8 / 2); _speechTimerId = startAnimTimer("NPCIdleAnim", _fieldF4 + rndVal, 0); return true; |