diff options
| author | Matthew Hoops | 2012-06-16 01:37:40 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-06-16 01:43:32 -0400 |
| commit | 625f6cc71657e95e0361edefa333a38910c1aca5 (patch) | |
| tree | ae5ef8582ede4d62e56253467ea144db2341b353 /engines/dreamweb/rain.cpp | |
| parent | f02b696573fe4281e4890d71b74671804a5ebf41 (diff) | |
| parent | 5230a0d61795e2855625a43d60dc3bc2ed83fc3d (diff) | |
| download | scummvm-rg350-625f6cc71657e95e0361edefa333a38910c1aca5.tar.gz scummvm-rg350-625f6cc71657e95e0361edefa333a38910c1aca5.tar.bz2 scummvm-rg350-625f6cc71657e95e0361edefa333a38910c1aca5.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/dreamweb/rain.cpp')
| -rw-r--r-- | engines/dreamweb/rain.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/dreamweb/rain.cpp b/engines/dreamweb/rain.cpp index 7db4744cbf..8e42e0c161 100644 --- a/engines/dreamweb/rain.cpp +++ b/engines/dreamweb/rain.cpp @@ -20,6 +20,7 @@ * */ +#include "dreamweb/sound.h" #include "dreamweb/dreamweb.h" namespace DreamWeb { @@ -50,7 +51,7 @@ void DreamWebEngine::showRain() { } } - if (_channel1Playing != 255) + if (_sound->isChannel1Playing()) return; if (_realLocation == 2 && _vars._beenMugged != 1) return; @@ -61,11 +62,11 @@ void DreamWebEngine::showRain() { return; uint8 soundIndex; - if (_channel0Playing != 6) + if (_sound->getChannel0Playing() != 6) soundIndex = 4; else soundIndex = 7; - playChannel1(soundIndex); + _sound->playChannel1(soundIndex); } uint8 DreamWebEngine::getBlockOfPixel(uint8 x, uint8 y) { |