aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/npcs/barbot.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-22 20:22:41 -0400
committerPaul Gilbert2016-08-22 20:22:41 -0400
commit8b3829549a2c82a09f7475c35173238f7470d587 (patch)
treec0965bfcae7153af1f831be1204726644d99da9e /engines/titanic/npcs/barbot.cpp
parent65bc8cb83c01cc1e7e6c8c093b8f42080800718d (diff)
downloadscummvm-rg350-8b3829549a2c82a09f7475c35173238f7470d587.tar.gz
scummvm-rg350-8b3829549a2c82a09f7475c35173238f7470d587.tar.bz2
scummvm-rg350-8b3829549a2c82a09f7475c35173238f7470d587.zip
TITANIC: Cleanup of engine references
Diffstat (limited to 'engines/titanic/npcs/barbot.cpp')
-rw-r--r--engines/titanic/npcs/barbot.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp
index 0247b593bd..2524a835f8 100644
--- a/engines/titanic/npcs/barbot.cpp
+++ b/engines/titanic/npcs/barbot.cpp
@@ -380,12 +380,12 @@ bool CBarbot::LeaveViewMsg(CLeaveViewMsg *msg) {
bool CBarbot::MovieEndMsg(CMovieEndMsg *msg) {
if (msg->_endFrame == _frameNum) {
_frameNum = -1;
- _field14C = g_vm->_events->getTicksCount();
+ _field14C = getTicksCount();
}
if (msg->_endFrame == _field148) {
_field148 = -1;
- _field150 = g_vm->_events->getTicksCount();
+ _field150 = getTicksCount();
}
if (msg->_endFrame == _field13C) {
@@ -678,7 +678,7 @@ bool CBarbot::FrameMsg(CFrameMsg *msg) {
}
bool CBarbot::LoadSuccessMsg(CLoadSuccessMsg *msg) {
- _field14C = _field150 = g_vm->_events->getTicksCount();
+ _field14C = _field150 = getTicksCount();
_frameNum = -1;
_field148 = -1;
@@ -720,7 +720,7 @@ bool CBarbot::TimerMsg(CTimerMsg *msg) {
if (!_fieldC4 && compareRoomNameTo("Bar")) {
CParrotSpeakMsg speakMsg("Barbot", "AskForDrink");
speakMsg.execute("PerchedParrot");
- addTimer(10000 + g_vm->getRandomNumber(20000));
+ addTimer(10000 + getRandomNumber(20000));
}
return true;