From c1b3db90c49de5c2925cf65dfa49889dd2941164 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 23 Nov 2014 14:56:18 +0100 Subject: [PATCH] ACCESS: Implement riverSound --- engines/access/amazon/amazon_scripts.cpp | 18 +++++++++++++++--- engines/access/amazon/amazon_scripts.h | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp index 4d354017c63b..61387687b6ad 100644 --- a/engines/access/amazon/amazon_scripts.cpp +++ b/engines/access/amazon/amazon_scripts.cpp @@ -1733,11 +1733,23 @@ void AmazonScripts::initRiver() { bool AmazonScripts::JUMPTEST() { warning("TODO: JUMPTEST();"); + return true; } -void AmazonScripts::RIVERSOUND() { - warning("TODO: RIVERSOUND();"); +void AmazonScripts::riverSound() { + if (_game->_timers[11]._flag == 0) { + ++_game->_timers[11]._flag; + _vm->_sound->playSound(2); + } + + if (_game->_timers[12]._flag == 0) { + ++_game->_timers[12]._flag; + _vm->_sound->playSound(3); + } + + if ((_xCam >= 1300) && (_xCam <= 1320)) + _vm->_sound->playSound(1); } void AmazonScripts::MOVECANOE() { @@ -1786,7 +1798,7 @@ void AmazonScripts::RIVER() { _vm->_images.clear(); _vm->_animation->animate(0); - RIVERSOUND(); + riverSound(); pan(); MOVECANOE(); diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h index 08ad23d0f663..7162bab0576e 100644 --- a/engines/access/amazon/amazon_scripts.h +++ b/engines/access/amazon/amazon_scripts.h @@ -97,7 +97,7 @@ class AmazonScripts: public Scripts { void loadBackground(int param1, int param2); void initRiver(); bool JUMPTEST(); - void RIVERSOUND(); + void riverSound(); void MOVECANOE(); void UPDATEOBSTACLES(); void SETPHYSX();