aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2016-04-30 15:46:34 +0200
committerEugene Sandulenko2016-05-10 12:14:48 +0200
commita2d45c70e9419cedb2e71a46d408cb19c720b6c2 (patch)
tree90e6b83755e6d9198284785ac5cd3963261220cd
parentf50891f9906ddcfbe91c0b506872fa03c111737e (diff)
downloadscummvm-rg350-a2d45c70e9419cedb2e71a46d408cb19c720b6c2.tar.gz
scummvm-rg350-a2d45c70e9419cedb2e71a46d408cb19c720b6c2.tar.bz2
scummvm-rg350-a2d45c70e9419cedb2e71a46d408cb19c720b6c2.zip
GNAP: For consistancy, use hex values for playSound calls
-rw-r--r--engines/gnap/scenes/arcade.cpp24
-rw-r--r--engines/gnap/scenes/group0.cpp6
-rw-r--r--engines/gnap/scenes/group1.cpp2
3 files changed, 16 insertions, 16 deletions
diff --git a/engines/gnap/scenes/arcade.cpp b/engines/gnap/scenes/arcade.cpp
index f16fc6d2a7..196d99a7f8 100644
--- a/engines/gnap/scenes/arcade.cpp
+++ b/engines/gnap/scenes/arcade.cpp
@@ -189,7 +189,7 @@ void Scene49::updateObstacle(int id) {
obstacle._currSequenceId, obstacle._currId,
kSeqSyncWait, 0, 0, -50);
obstacle._currSequenceId = obstacle._collisionSequenceId;
- _vm->playSound(224, false);
+ _vm->playSound(0xE0, false);
increaseScore(30);
} else if ((obstacle._laneNum == 1 && _truckSequenceId == 0xB0) ||
(obstacle._laneNum == 2 && (_truckSequenceId == 0xB1 || _truckSequenceId == 0xB2)) ||
@@ -211,7 +211,7 @@ void Scene49::updateObstacle(int id) {
_truckSequenceId = obstacle._collisionSequenceId;
_truckId = 256;
obstacle._currSequenceId = obstacle._passedSequenceId;
- _vm->playSound(225, false);
+ _vm->playSound(0xE1, false);
decreaseScore(30);
}
} else {
@@ -229,7 +229,7 @@ void Scene49::updateObstacle(int id) {
obstacle._currSequenceId, obstacle._currId,
kSeqSyncWait, 0, 0, -50);
obstacle._currSequenceId = obstacle._collisionSequenceId;
- _vm->playSound(224, false);
+ _vm->playSound(0xE0, false);
increaseScore(30);
}
} else if (obstacle._splashSequenceId) {
@@ -1323,7 +1323,7 @@ void Scene51::updateItemAnimation(Scene51Item *item, int index) {
} else {
_vm->_gameSys->removeSequence(item->_currSequenceId, item->_id, true);
_vm->_gameSys->setAnimation(0, 0, index + 1);
- _vm->playSound(218, false);
+ _vm->playSound(0xDA, false);
if (incCashAmount(item->_currSequenceId) == 1995) {
winMinigame();
_vm->_sceneDone = true;
@@ -1520,7 +1520,7 @@ void Scene51::playIntroAnim() {
_platypusSequenceId = _platypusNextSequenceId;
++soundCtr;
if (soundCtr % 4 == 0)
- _vm->playSound(214, false);
+ _vm->playSound(0xD6, false);
}
_platypusNextSequenceId = 0x75;
@@ -1538,7 +1538,7 @@ void Scene51::playIntroAnim() {
} else {
++soundCtr;
if (soundCtr % 4 == 0)
- _vm->playSound(214, false);
+ _vm->playSound(0xD6, false);
}
}
waitForAnim(0);
@@ -1596,7 +1596,7 @@ int Scene51::incCashAmount(int sequenceId) {
void Scene51::winMinigame() {
updateCash(1995);
- _vm->playSound(218, false);
+ _vm->playSound(0xDA, false);
// TODO delayTicksA(1, 5);
_vm->_newSceneNum = 48;
_vm->invRemove(kItemBanana);
@@ -1769,7 +1769,7 @@ void Scene51::run() {
} else {
++soundCtr;
if (soundCtr % 4 == 0)
- _vm->playSound(214, false);
+ _vm->playSound(0xD6, false);
}
}
} else {
@@ -1821,7 +1821,7 @@ void Scene51::run() {
} else {
++soundCtr;
if (soundCtr % 4 == 0)
- _vm->playSound(214, false);
+ _vm->playSound(0xD6, false);
}
}
} else {
@@ -1890,7 +1890,7 @@ void Scene52::update() {
if (_liveAlienRows == 0 && !_alienSingle) {
_alienWave = false;
- _vm->playSound(48, false);
+ _vm->playSound(0x30, false);
++_alienCounter;
if (_alienCounter != 3) {
_vm->_timers[0] = 50;
@@ -2256,7 +2256,7 @@ int Scene52::updateHitAlien() {
if (hitAlienNum != -1 && _items[rowNum][hitAlienNum] >= 0) {
_gameScore = ((_items[rowNum][hitAlienNum] - 24) % 3 + _gameScore + 1) % 1000;
_items[rowNum][hitAlienNum] = -2;
- _vm->playSound(44, false);
+ _vm->playSound(0x2C, false);
_vm->_gameSys->insertSequence(0x21, 266, 0, 0,
kSeqNone, 0, _alienLeftX + hitAlienNum * _alienWidth + _alienRowXOfs[rowNum] - 10, ya - _alienHeight);
result = 1;
@@ -2470,7 +2470,7 @@ void Scene52::shipExplode() {
if (!_aliensCount) {
_vm->_gameSys->setAnimation(0, 0, 7);
_vm->_gameSys->removeSequence(_ufoSequenceId, 256, true);
- _vm->playSound(44, false);
+ _vm->playSound(0x2C, false);
_vm->_gameSys->insertSequence(0x21, 266, 0, 0, kSeqNone, 0, _shipPosX, _arcadeScreenBottom);
_aliensCount = 1;
_vm->playSound(0x31, false);
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index 68c962b999..d7f8aecfd2 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -319,9 +319,9 @@ void Scene01::updateAnimations() {
break;
case kAS01LookPigs:
- _vm->playSound(138, false);
- _vm->playSound(139, false);
- _vm->playSound(140, false);
+ _vm->playSound(0x8A, false);
+ _vm->playSound(0x8B, false);
+ _vm->playSound(0x8C, false);
_vm->_gnapActionStatus = -1;
break;
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index 9a5542cc58..f9789e1a70 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -3964,7 +3964,7 @@ void Scene18::updateAnimations() {
gameSys.insertSequence(0x214, 39, 0x213, 39, kSeqLoop | kSeqSyncWait, 0, 0, 0);
while (gameSys.getAnimationStatus(5) != 2)
_vm->gameUpdateTick();
- _vm->playSound(555, true);
+ _vm->playSound(0x22B, true);
gameSys.insertSequence(0x20D, 39, 0, 0, kSeqNone, 0, 0, 0);
_vm->_gnapSequenceDatNum = 0;
_vm->_gnapSequenceId = 0x207;