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/game/announce.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/game/announce.cpp')
| -rw-r--r-- | engines/titanic/game/announce.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/titanic/game/announce.cpp b/engines/titanic/game/announce.cpp index 3b7dbe28cb..74c126476f 100644 --- a/engines/titanic/game/announce.cpp +++ b/engines/titanic/game/announce.cpp @@ -21,7 +21,6 @@ */ #include "titanic/game/announce.h" -#include "titanic/titanic.h" namespace Titanic { @@ -76,7 +75,7 @@ bool CAnnounce::TimerMsg(CTimerMsg *msg) { "", "", "", "", "", "", "" }; - int randVal = _nameIndex ? g_vm->getRandomNumber(2) : 0; + int randVal = _nameIndex ? getRandomNumber(2) : 0; switch (randVal) { case 0: case 1: @@ -85,21 +84,21 @@ bool CAnnounce::TimerMsg(CTimerMsg *msg) { queueSound(waveNames1[_nameIndex], _soundHandle); ++_nameIndex; } else { - queueSound(waveNames1[1 + g_vm->getRandomNumber(17)], _soundHandle); + queueSound(waveNames1[1 + getRandomNumber(17)], _soundHandle); } break; case 2: _soundHandle = playSound("z#189.wav"); - queueSound(waveNames2[1 + g_vm->getRandomNumber(35)], _soundHandle); + queueSound(waveNames2[1 + getRandomNumber(35)], _soundHandle); break; default: break; } - addTimer(1, 300000 + g_vm->getRandomNumber(30000), 0); - if (g_vm->getRandomNumber(3) == 0) + addTimer(1, 300000 + getRandomNumber(30000), 0); + if (getRandomNumber(3) == 0) addTimer(2, 4000, 0); } else if (msg->_timerCtr == 2) { |