diff options
| author | Strangerke | 2016-04-18 07:49:27 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-10 09:54:21 +0200 |
| commit | ff7f8aa26d69918c66f6431fb7863d7205e23d81 (patch) | |
| tree | 66056ccda42fa955c6ac9cb6b51303b9eb8e2d4c | |
| parent | de17d92199c5351b29a83efb7a04ce1d8805b976 (diff) | |
| download | scummvm-rg350-ff7f8aa26d69918c66f6431fb7863d7205e23d81.tar.gz scummvm-rg350-ff7f8aa26d69918c66f6431fb7863d7205e23d81.tar.bz2 scummvm-rg350-ff7f8aa26d69918c66f6431fb7863d7205e23d81.zip | |
GNAP: Refactor getBeaverSequenceId
41 files changed, 46 insertions, 58 deletions
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp index 79cab3dc08..8e4bc90661 100644 --- a/engines/gnap/gnap.cpp +++ b/engines/gnap/gnap.cpp @@ -1908,29 +1908,17 @@ void GnapEngine::gnapUseDisguiseOnPlatypus() { setFlag(kGFPlatyPussDisguised); } -// CHECKME: The 3 parameters are always 0 -int GnapEngine::getBeaverSequenceId(int kind, int gridX, int gridY) { - int sequenceId; +int GnapEngine::getBeaverSequenceId() { + // The original had 3 parameters, all always set to 0. + // The code to handle the other values has been removed. - // TODO kind is always 0, remove that parameter - if (kind != 0) - return 0; + int sequenceId = 0x7CB; - if (gridX > 0 && gridY > 0) { - if (gridX < _platX) { - sequenceId = 0x7CC; - _beaverFacing = kDirUnk4; - } else { - sequenceId = 0x7CB; - _beaverFacing = kDirNone; - } - } else if (_beaverFacing != kDirNone) { + if (_beaverFacing != kDirNone) { sequenceId = 0x7CC; _beaverFacing = kDirUnk4; - } else { - sequenceId = 0x7CB; - _beaverFacing = kDirNone; } + return sequenceId | 0x10000; } diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h index 5318e3fa7d..9e389bcea1 100644 --- a/engines/gnap/gnap.h +++ b/engines/gnap/gnap.h @@ -581,7 +581,7 @@ public: Facing _beaverFacing; int _beaverActionStatus; int _beaverSequenceId, _beaverSequenceDatNum, _beaverId; - int getBeaverSequenceId(int kind, int gridX, int gridY); + int getBeaverSequenceId(); void playBeaverSequence(int sequenceId); void updateBeaverIdleSequence(); void beaverSub426234(); diff --git a/engines/gnap/scenes/scene01.cpp b/engines/gnap/scenes/scene01.cpp index 30e649186f..08c807d1cd 100644 --- a/engines/gnap/scenes/scene01.cpp +++ b/engines/gnap/scenes/scene01.cpp @@ -152,7 +152,7 @@ void GnapEngine::scene01_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene02.cpp b/engines/gnap/scenes/scene02.cpp index d214f3b412..3831c68b2c 100644 --- a/engines/gnap/scenes/scene02.cpp +++ b/engines/gnap/scenes/scene02.cpp @@ -180,7 +180,7 @@ void GnapEngine::scene02_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene03.cpp b/engines/gnap/scenes/scene03.cpp index 1916350c35..974b0d24a2 100644 --- a/engines/gnap/scenes/scene03.cpp +++ b/engines/gnap/scenes/scene03.cpp @@ -154,7 +154,7 @@ void GnapEngine::scene03_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene04.cpp b/engines/gnap/scenes/scene04.cpp index 27ed3ac9cd..0f86eed02c 100644 --- a/engines/gnap/scenes/scene04.cpp +++ b/engines/gnap/scenes/scene04.cpp @@ -197,7 +197,7 @@ void GnapEngine::scene04_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene05.cpp b/engines/gnap/scenes/scene05.cpp index 6ef4b357fc..4a60292808 100644 --- a/engines/gnap/scenes/scene05.cpp +++ b/engines/gnap/scenes/scene05.cpp @@ -148,7 +148,7 @@ void GnapEngine::scene05_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene06.cpp b/engines/gnap/scenes/scene06.cpp index f89bace54c..cbe4fb44e1 100644 --- a/engines/gnap/scenes/scene06.cpp +++ b/engines/gnap/scenes/scene06.cpp @@ -151,7 +151,7 @@ void GnapEngine::scene06_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene07.cpp b/engines/gnap/scenes/scene07.cpp index e2d385df63..d240378eca 100644 --- a/engines/gnap/scenes/scene07.cpp +++ b/engines/gnap/scenes/scene07.cpp @@ -123,7 +123,7 @@ void GnapEngine::scene07_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: break; diff --git a/engines/gnap/scenes/scene08.cpp b/engines/gnap/scenes/scene08.cpp index d8a1c26a08..ed67669d5d 100644 --- a/engines/gnap/scenes/scene08.cpp +++ b/engines/gnap/scenes/scene08.cpp @@ -167,7 +167,7 @@ void GnapEngine::scene08_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: break; diff --git a/engines/gnap/scenes/scene09.cpp b/engines/gnap/scenes/scene09.cpp index 368f8fea49..cf1af00ca2 100644 --- a/engines/gnap/scenes/scene09.cpp +++ b/engines/gnap/scenes/scene09.cpp @@ -115,7 +115,7 @@ void GnapEngine::scene09_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: break; diff --git a/engines/gnap/scenes/scene10.cpp b/engines/gnap/scenes/scene10.cpp index b5f9cb1577..5650dd1d16 100644 --- a/engines/gnap/scenes/scene10.cpp +++ b/engines/gnap/scenes/scene10.cpp @@ -135,7 +135,7 @@ void GnapEngine::scene10_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: break; diff --git a/engines/gnap/scenes/scene11.cpp b/engines/gnap/scenes/scene11.cpp index 3e2a75757c..68a261bf72 100644 --- a/engines/gnap/scenes/scene11.cpp +++ b/engines/gnap/scenes/scene11.cpp @@ -163,7 +163,7 @@ void GnapEngine::scene11_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: break; diff --git a/engines/gnap/scenes/scene12.cpp b/engines/gnap/scenes/scene12.cpp index df26e4d0e1..dcd62a36a6 100644 --- a/engines/gnap/scenes/scene12.cpp +++ b/engines/gnap/scenes/scene12.cpp @@ -152,7 +152,7 @@ void GnapEngine::scene12_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: break; diff --git a/engines/gnap/scenes/scene13.cpp b/engines/gnap/scenes/scene13.cpp index 58bdba1ade..cff04bba2f 100644 --- a/engines/gnap/scenes/scene13.cpp +++ b/engines/gnap/scenes/scene13.cpp @@ -153,7 +153,7 @@ void GnapEngine::scene13_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0)); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: break; diff --git a/engines/gnap/scenes/scene17.cpp b/engines/gnap/scenes/scene17.cpp index aa08255cd6..37427bd34f 100644 --- a/engines/gnap/scenes/scene17.cpp +++ b/engines/gnap/scenes/scene17.cpp @@ -317,7 +317,7 @@ void GnapEngine::scene17_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene18.cpp b/engines/gnap/scenes/scene18.cpp index a13432d8fa..d1683b6380 100644 --- a/engines/gnap/scenes/scene18.cpp +++ b/engines/gnap/scenes/scene18.cpp @@ -435,7 +435,7 @@ void GnapEngine::scene18_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene19.cpp b/engines/gnap/scenes/scene19.cpp index ddc977fb7b..fd8b421331 100644 --- a/engines/gnap/scenes/scene19.cpp +++ b/engines/gnap/scenes/scene19.cpp @@ -168,7 +168,7 @@ void GnapEngine::scene19_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene20.cpp b/engines/gnap/scenes/scene20.cpp index dd49b4c0bf..9298fc1f62 100644 --- a/engines/gnap/scenes/scene20.cpp +++ b/engines/gnap/scenes/scene20.cpp @@ -310,7 +310,7 @@ void GnapEngine::scene20_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene21.cpp b/engines/gnap/scenes/scene21.cpp index c04b7c43cf..9d2b1719a8 100644 --- a/engines/gnap/scenes/scene21.cpp +++ b/engines/gnap/scenes/scene21.cpp @@ -138,7 +138,7 @@ void GnapEngine::scene21_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene22.cpp b/engines/gnap/scenes/scene22.cpp index a01c7e4b77..3a196dacd5 100644 --- a/engines/gnap/scenes/scene22.cpp +++ b/engines/gnap/scenes/scene22.cpp @@ -150,7 +150,7 @@ void GnapEngine::scene22_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene23.cpp b/engines/gnap/scenes/scene23.cpp index 9a16ce42ff..70437eb6c7 100644 --- a/engines/gnap/scenes/scene23.cpp +++ b/engines/gnap/scenes/scene23.cpp @@ -122,7 +122,7 @@ void GnapEngine::scene23_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene24.cpp b/engines/gnap/scenes/scene24.cpp index dcfeb181ac..1c67c50de0 100644 --- a/engines/gnap/scenes/scene24.cpp +++ b/engines/gnap/scenes/scene24.cpp @@ -132,7 +132,7 @@ void GnapEngine::scene24_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene25.cpp b/engines/gnap/scenes/scene25.cpp index cf95acafb7..427536be1d 100644 --- a/engines/gnap/scenes/scene25.cpp +++ b/engines/gnap/scenes/scene25.cpp @@ -166,7 +166,7 @@ void GnapEngine::scene25_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene26.cpp b/engines/gnap/scenes/scene26.cpp index 7da339358e..f2ced59d2d 100644 --- a/engines/gnap/scenes/scene26.cpp +++ b/engines/gnap/scenes/scene26.cpp @@ -125,7 +125,7 @@ void GnapEngine::scene26_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene27.cpp b/engines/gnap/scenes/scene27.cpp index 0466940267..ad25092620 100644 --- a/engines/gnap/scenes/scene27.cpp +++ b/engines/gnap/scenes/scene27.cpp @@ -153,7 +153,7 @@ void GnapEngine::scene27_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene28.cpp b/engines/gnap/scenes/scene28.cpp index 5f4dc74bd2..86df88bd1f 100644 --- a/engines/gnap/scenes/scene28.cpp +++ b/engines/gnap/scenes/scene28.cpp @@ -149,7 +149,7 @@ void GnapEngine::scene28_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene29.cpp b/engines/gnap/scenes/scene29.cpp index e4cea83bbd..6ab5744a93 100644 --- a/engines/gnap/scenes/scene29.cpp +++ b/engines/gnap/scenes/scene29.cpp @@ -131,7 +131,7 @@ void GnapEngine::scene29_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene30.cpp b/engines/gnap/scenes/scene30.cpp index 089e50e134..b394baf7d9 100644 --- a/engines/gnap/scenes/scene30.cpp +++ b/engines/gnap/scenes/scene30.cpp @@ -112,7 +112,7 @@ void GnapEngine::scene30_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene31.cpp b/engines/gnap/scenes/scene31.cpp index 084a12733b..3adfcbd46e 100644 --- a/engines/gnap/scenes/scene31.cpp +++ b/engines/gnap/scenes/scene31.cpp @@ -124,7 +124,7 @@ void GnapEngine::scene31_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(0, 0); diff --git a/engines/gnap/scenes/scene32.cpp b/engines/gnap/scenes/scene32.cpp index 659ce0e7f5..ff526044bc 100644 --- a/engines/gnap/scenes/scene32.cpp +++ b/engines/gnap/scenes/scene32.cpp @@ -112,7 +112,7 @@ void GnapEngine::scene32_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene33.cpp b/engines/gnap/scenes/scene33.cpp index 72588329a9..bad0f88a4e 100644 --- a/engines/gnap/scenes/scene33.cpp +++ b/engines/gnap/scenes/scene33.cpp @@ -133,7 +133,7 @@ void GnapEngine::scene33_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene38.cpp b/engines/gnap/scenes/scene38.cpp index 3650c63634..b60c8327e1 100644 --- a/engines/gnap/scenes/scene38.cpp +++ b/engines/gnap/scenes/scene38.cpp @@ -135,7 +135,7 @@ void GnapEngine::scene38_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene39.cpp b/engines/gnap/scenes/scene39.cpp index 4950717d16..a89fea8f0e 100644 --- a/engines/gnap/scenes/scene39.cpp +++ b/engines/gnap/scenes/scene39.cpp @@ -116,7 +116,7 @@ void GnapEngine::scene39_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene40.cpp b/engines/gnap/scenes/scene40.cpp index cbbae71729..c2b829100a 100644 --- a/engines/gnap/scenes/scene40.cpp +++ b/engines/gnap/scenes/scene40.cpp @@ -96,7 +96,7 @@ void GnapEngine::scene40_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene41.cpp b/engines/gnap/scenes/scene41.cpp index 41480bf3ce..23ac6ca4de 100644 --- a/engines/gnap/scenes/scene41.cpp +++ b/engines/gnap/scenes/scene41.cpp @@ -236,7 +236,7 @@ void GnapEngine::scene41_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene42.cpp b/engines/gnap/scenes/scene42.cpp index 5685f5cda6..6b719d2761 100644 --- a/engines/gnap/scenes/scene42.cpp +++ b/engines/gnap/scenes/scene42.cpp @@ -214,7 +214,7 @@ void GnapEngine::scene42_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene43.cpp b/engines/gnap/scenes/scene43.cpp index 45b52a7adb..dcf03cb671 100644 --- a/engines/gnap/scenes/scene43.cpp +++ b/engines/gnap/scenes/scene43.cpp @@ -220,7 +220,7 @@ void GnapEngine::scene43_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene44.cpp b/engines/gnap/scenes/scene44.cpp index dad63016a5..3b2633bc83 100644 --- a/engines/gnap/scenes/scene44.cpp +++ b/engines/gnap/scenes/scene44.cpp @@ -231,7 +231,7 @@ void GnapEngine::scene44_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene45.cpp b/engines/gnap/scenes/scene45.cpp index 0281b7cbaa..8581e551e5 100644 --- a/engines/gnap/scenes/scene45.cpp +++ b/engines/gnap/scenes/scene45.cpp @@ -245,7 +245,7 @@ void GnapEngine::scene45_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); diff --git a/engines/gnap/scenes/scene46.cpp b/engines/gnap/scenes/scene46.cpp index d0c8965d86..4a1ba2535f 100644 --- a/engines/gnap/scenes/scene46.cpp +++ b/engines/gnap/scenes/scene46.cpp @@ -183,7 +183,7 @@ void GnapEngine::scene46_run() { break; case TALK_CURSOR: playGnapBrainPulsating(_platX, _platY); - playBeaverSequence(getBeaverSequenceId(0, 0, 0) | 0x10000); + playBeaverSequence(getBeaverSequenceId()); break; case PLAT_CURSOR: playGnapImpossible(_platX, _platY); |