diff options
| author | johndoe123 | 2012-10-01 14:21:47 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:43:45 +0200 |
| commit | 1b3a686cac9e6c7afab2bec7545ddb18938f1447 (patch) | |
| tree | 8707b559f0285fef258643dcb121259d4f89a590 /engines | |
| parent | 45da15adce31f2f46d52ab8a9f81f367bcbc9e2e (diff) | |
| download | scummvm-rg350-1b3a686cac9e6c7afab2bec7545ddb18938f1447.tar.gz scummvm-rg350-1b3a686cac9e6c7afab2bec7545ddb18938f1447.tar.bz2 scummvm-rg350-1b3a686cac9e6c7afab2bec7545ddb18938f1447.zip | |
NEVERHOOD: Fix AsScene3011Symbol
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/neverhood/module1600.cpp | 2 | ||||
| -rw-r--r-- | engines/neverhood/module3000.cpp | 7 | ||||
| -rw-r--r-- | engines/neverhood/module3000.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/engines/neverhood/module1600.cpp b/engines/neverhood/module1600.cpp index 8b35942bc0..5c890e0653 100644 --- a/engines/neverhood/module1600.cpp +++ b/engines/neverhood/module1600.cpp @@ -1445,7 +1445,7 @@ uint32 Scene1609::handleMessage(int messageNum, const MessageParam ¶m, Entit if (!_flag6) { if (_flag5) _asSymbols[_index3]->change(_index1 + 12, false); - _asSymbols[_index3]->stopSound(); + _asSymbols[_index3]->stopSymbolSound(); _index3++; if (_index3 >= 12) { if (testVars()) { diff --git a/engines/neverhood/module3000.cpp b/engines/neverhood/module3000.cpp index 9ccda915c8..78ab74d61a 100644 --- a/engines/neverhood/module3000.cpp +++ b/engines/neverhood/module3000.cpp @@ -1498,12 +1498,11 @@ void AsScene3011Symbol::hide() { setVisible(false); } -void AsScene3011Symbol::stopSound() { +void AsScene3011Symbol::stopSymbolSound() { if (_flag2) { - Entity::stopSound(1); + stopSound(1); } else { - // CHECKME this is wrong - //_soundResource2.stop(); + stopSound(0); } } diff --git a/engines/neverhood/module3000.h b/engines/neverhood/module3000.h index 0c1df86dd6..2f7c21f30e 100644 --- a/engines/neverhood/module3000.h +++ b/engines/neverhood/module3000.h @@ -224,7 +224,7 @@ public: AsScene3011Symbol(NeverhoodEngine *vm, int index, bool flag); void show(bool flag); void hide(); - void stopSound(); + void stopSymbolSound(); void change(int index, bool flag); bool getFlag1() { return _flag1; } int getIndex() { return _index; } |