diff options
| author | Matthew Hoops | 2011-03-21 18:33:48 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-03-21 18:33:48 -0400 |
| commit | 273ba73d5fae0dd0d3b3f7c5f15f03d02c0af1b4 (patch) | |
| tree | cfadbea6d75a8427283c046ff338b623433d46ad | |
| parent | 6b80d25f6e1eca3cca15a58aa8016c5c3fc5ee78 (diff) | |
| download | scummvm-rg350-273ba73d5fae0dd0d3b3f7c5f15f03d02c0af1b4.tar.gz scummvm-rg350-273ba73d5fae0dd0d3b3f7c5f15f03d02c0af1b4.tar.bz2 scummvm-rg350-273ba73d5fae0dd0d3b3f7c5f15f03d02c0af1b4.zip | |
MOHAWK: Minor cleanup and consistency fixes
| -rw-r--r-- | engines/mohawk/riven.cpp | 18 | ||||
| -rw-r--r-- | engines/mohawk/riven_external.cpp | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index e5d4480907..1d47d453a0 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -813,11 +813,23 @@ static void catherineIdleTimer(MohawkEngine_Riven *vm) { } void MohawkEngine_Riven::installCardTimer() { - // TODO: Handle sunners hardcoded videos - - if (getCurStack() == pspit && getCurCardRMAP() == 0x3a85) { + switch (getCurCardRMAP()) { + case 0x3a85: // Top of elevator on prison island // Handle Catherine hardcoded videos installTimer(&catherineIdleTimer, _rnd->getRandomNumberRng(1, 33) * 1000); + break; + case 0x77d6: // Sunners, top of stairs + // TODO: Background Sunner videos + break; + case 0x79bd: // Sunners, middle of stairs + // TODO: Background Sunner videos + break; + case 0x7beb: // Sunners, bottom of stairs + // TODO: Background Sunner videos + break; + case 0xb6ca: // Sunners, shoreline + // TODO: Background Sunner videos + break; } } diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp index db4428d461..2fc0c4e17b 100644 --- a/engines/mohawk/riven_external.cpp +++ b/engines/mohawk/riven_external.cpp @@ -882,7 +882,7 @@ void RivenExternal::xbsettrap(uint16 argc, uint16 *argv) { // Set the Ytram trap // We can catch the Ytram between 10 seconds and 3 minutes from now - uint32 timeUntilCatch = _vm->_rnd->getRandomNumberRng(1000 * 10, 1000 * 60 * 3); + uint32 timeUntilCatch = _vm->_rnd->getRandomNumberRng(10, 60 * 3) * 1000; *_vm->getVar("bytramtime") = timeUntilCatch + _vm->getTotalPlayTime(); // And set the timer too |