aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk
diff options
context:
space:
mode:
authorBastien Bouclet2017-07-01 22:46:35 +0200
committerEugene Sandulenko2017-07-03 08:50:10 +0200
commit2f7a04ae95e8f3a555022a071d08a33667175e19 (patch)
tree067813af2789c5da56ca932aacdd73b6094ef4cb /engines/mohawk
parent0f79e423d8b425a45b7cda8e5099723d3564d931 (diff)
downloadscummvm-rg350-2f7a04ae95e8f3a555022a071d08a33667175e19.tar.gz
scummvm-rg350-2f7a04ae95e8f3a555022a071d08a33667175e19.tar.bz2
scummvm-rg350-2f7a04ae95e8f3a555022a071d08a33667175e19.zip
MOHAWK: Check the Rebel island external commands against the original
Diffstat (limited to 'engines/mohawk')
-rw-r--r--engines/mohawk/riven_stacks/rspit.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/engines/mohawk/riven_stacks/rspit.cpp b/engines/mohawk/riven_stacks/rspit.cpp
index f99b7f4f39..cb029124a6 100644
--- a/engines/mohawk/riven_stacks/rspit.cpp
+++ b/engines/mohawk/riven_stacks/rspit.cpp
@@ -34,10 +34,10 @@ namespace RivenStacks {
RSpit::RSpit(MohawkEngine_Riven *vm) :
RivenStack(vm, kStackRspit) {
-// REGISTER_COMMAND(RSpit, xrshowinventory);
-// REGISTER_COMMAND(RSpit, xrhideinventory);
-// REGISTER_COMMAND(RSpit, xrcredittime);
-// REGISTER_COMMAND(RSpit, xrwindowsetup);
+ REGISTER_COMMAND(RSpit, xrshowinventory);
+ REGISTER_COMMAND(RSpit, xrhideinventory);
+ REGISTER_COMMAND(RSpit, xrcredittime);
+ REGISTER_COMMAND(RSpit, xrwindowsetup);
}
void RSpit::xrcredittime(uint16 argc, uint16 *argv) {
@@ -52,14 +52,9 @@ void RSpit::xrcredittime(uint16 argc, uint16 *argv) {
}
void RSpit::xrshowinventory(uint16 argc, uint16 *argv) {
- // Give the trap book and Catherine's journal to the player
- _vm->_vars["atrapbook"] = 1;
- _vm->_vars["acathbook"] = 1;
- _vm->_inventory->show();
}
void RSpit::xrhideinventory(uint16 argc, uint16 *argv) {
- _vm->_inventory->hide();
}
void RSpit::rebelPrisonWindowTimer() {
@@ -67,10 +62,10 @@ void RSpit::rebelPrisonWindowTimer() {
uint16 movie = _vm->_rnd->getRandomNumberRng(2, 13);
_vm->getCard()->playMovie(movie);
RivenVideo *video = _vm->_video->openSlot(movie);
- video->play();
+ video->playBlocking();
// Ensure the next video starts after this one ends
- uint32 timeUntilNextVideo = video->getDuration() + _vm->_rnd->getRandomNumberRng(38, 58) * 1000;
+ uint32 timeUntilNextVideo = _vm->_rnd->getRandomNumberRng(38, 58) * 1000;
// Save the time in case we leave the card and return
_vm->_vars["rvillagetime"] = timeUntilNextVideo + _vm->getTotalPlayTime();
@@ -112,6 +107,5 @@ void RSpit::xrwindowsetup(uint16 argc, uint16 *argv) {
installTimer(TIMER(RSpit, rebelPrisonWindowTimer), timeUntilNextVideo);
}
-
} // End of namespace RivenStacks
} // End of namespace Mohawk