aboutsummaryrefslogtreecommitdiff
path: root/scumm/insane
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/insane')
-rw-r--r--scumm/insane/insane.cpp6
-rw-r--r--scumm/insane/insane.h4
-rw-r--r--scumm/insane/insane_ben.cpp78
-rw-r--r--scumm/insane/insane_enemy.cpp90
-rw-r--r--scumm/insane/insane_iact.cpp6
-rw-r--r--scumm/insane/insane_scenes.cpp32
6 files changed, 108 insertions, 108 deletions
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index 9e68f99b7e..57de420700 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -1238,7 +1238,7 @@ bool Insane::smlayer_isSoundRunning(int32 sound) {
return _vm->_sound->isSoundRunning(readArray(_numberArray, sound)) != 0;
}
-bool Insane::smlayer_startSound1(int32 sound) {
+bool Insane::smlayer_startSfx(int32 sound) {
if (smlayer_loadSound(sound, 0, 2)) {
_vm->_imuseDigital->startSfx(readArray(_numberArray, sound));
return true;
@@ -1246,9 +1246,9 @@ bool Insane::smlayer_startSound1(int32 sound) {
return false;
}
-bool Insane::smlayer_startSound2(int32 sound) {
+bool Insane::smlayer_startVoice(int32 sound) {
if (smlayer_loadSound(sound, 0, 2)) {
- _vm->_imuseDigital->startSfx(readArray(_numberArray, sound));
+ _vm->_imuseDigital->startVoice(readArray(_numberArray, sound));
return true;
} else
return false;
diff --git a/scumm/insane/insane.h b/scumm/insane/insane.h
index 47f81f3ddf..45104d87a1 100644
--- a/scumm/insane/insane.h
+++ b/scumm/insane/insane.h
@@ -381,8 +381,8 @@ class Insane {
void IMUSE_shutVolume(void);
void IMUSE_restoreVolume(void);
bool smlayer_isSoundRunning(int32 sound);
- bool smlayer_startSound1(int32 sound);
- bool smlayer_startSound2(int32 sound);
+ bool smlayer_startSfx(int32 sound);
+ bool smlayer_startVoice(int32 sound);
void smlayer_soundSetPan(int32 sound, int32 pan);
void smlayer_soundSetPriority(int32 sound, int32 priority);
void smlayer_drawSomething(byte *renderBitmap, int32 codecparam,
diff --git a/scumm/insane/insane_ben.cpp b/scumm/insane/insane_ben.cpp
index 6fbccab7bc..1c7549151f 100644
--- a/scumm/insane/insane_ben.cpp
+++ b/scumm/insane/insane_ben.cpp
@@ -166,7 +166,7 @@ int32 Insane::actionBen(void) {
}
if (!smlayer_isSoundRunning(95))
- smlayer_startSound1(95);
+ smlayer_startSfx(95);
} else {
if (smlayer_isSoundRunning(95))
smlayer_stopSound(95);
@@ -518,7 +518,7 @@ void Insane::actor02Reaction(int32 buttons) {
if (_actor[0].act[2].frame >= 9) {
_actor[0].act[2].state = 1;
_actor[0].inventory[INV_MACE] = 0;
- smlayer_startSound2(318);
+ smlayer_startVoice(318);
switchBenWeapon();
}
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
@@ -538,7 +538,7 @@ void Insane::actor02Reaction(int32 buttons) {
if (_actor[0].act[2].frame >= 5) {
_actor[0].act[2].state = 1;
_actor[0].inventory[INV_MACE] = 0;
- smlayer_startSound2(318);
+ smlayer_startVoice(318);
switchBenWeapon();
}
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
@@ -558,7 +558,7 @@ void Insane::actor02Reaction(int32 buttons) {
if (_actor[0].act[2].frame >= 5) {
_actor[0].act[2].state = 1;
_actor[0].inventory[INV_CHAIN] = 0; // Chain
- smlayer_startSound2(318);
+ smlayer_startVoice(318);
switchBenWeapon();
}
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
@@ -703,7 +703,7 @@ void Insane::actor02Reaction(int32 buttons) {
_actor[0].weaponClass = 1;
_actor[0].act[2].state = 3;
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
- smlayer_startSound1(63);
+ smlayer_startSfx(63);
break;
case 3:
smlayer_setActorLayer(0, 2, 4);
@@ -712,9 +712,9 @@ void Insane::actor02Reaction(int32 buttons) {
if (_currEnemy != EN_CAVEFISH) {
tmp = calcBenDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(60);
+ smlayer_startSfx(60);
if (tmp == 1000)
- smlayer_startSound1(62);
+ smlayer_startSfx(62);
} else {
if ((_actor[1].x - _actor[0].x <= weaponMaxRange(0)) &&
(_actor[1].x - _actor[0].x >= weaponMinRange(0)) &&
@@ -752,7 +752,7 @@ void Insane::actor02Reaction(int32 buttons) {
smlayer_setActorFacing(0, 2, 19, 180);
_actor[0].act[2].state = 11;
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
- smlayer_startSound1(75);
+ smlayer_startSfx(75);
break;
case 11:
smlayer_setActorLayer(0, 2, 4);
@@ -771,7 +771,7 @@ void Insane::actor02Reaction(int32 buttons) {
smlayer_setActorLayer(0, 2, 25);
smlayer_setActorCostume(1, 2, readArray(_numberArray, 45));
smlayer_setActorFacing(1, 2, 6, 180);
- smlayer_startSound1(101);
+ smlayer_startSfx(101);
_actor[1].act[2].state = 97;
_actor[1].lost = 1;
_actor[1].act[2].room = 1;
@@ -816,15 +816,15 @@ void Insane::actor02Reaction(int32 buttons) {
case INV_DUST:
tmp = calcBenDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(73);
+ smlayer_startSfx(73);
if (tmp == 1000)
- smlayer_startSound1(74);
+ smlayer_startSfx(74);
break;
case INV_WRENCH:
case INV_BOOT:
case INV_HAND:
if(calcBenDamage(1, 0) == 1)
- smlayer_startSound1(73);
+ smlayer_startSfx(73);
break;
}
} else {
@@ -858,7 +858,7 @@ void Insane::actor02Reaction(int32 buttons) {
smlayer_setActorFacing(0, 2, 19, 180);
_actor[0].act[2].state = 7;
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
- smlayer_startSound1(66);
+ smlayer_startSfx(66);
break;
case 7:
smlayer_setActorLayer(0, 2, 4);
@@ -878,7 +878,7 @@ void Insane::actor02Reaction(int32 buttons) {
_actor[0].kicking = 0;
if ((_actor[0].act[2].frame == 3) && (calcBenDamage(0, 0) == 1)) {
_actor[1].damage = weaponDamage(0);
- smlayer_startSound1(64);
+ smlayer_startSfx(64);
_actor[1].cursorX = 320;
}
if (_actor[0].act[2].frame >= 5) {
@@ -906,7 +906,7 @@ void Insane::actor02Reaction(int32 buttons) {
smlayer_setActorFacing(0, 2, 19, 180);
_actor[0].act[2].state = 15;
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
- smlayer_startSound1(78);
+ smlayer_startSfx(78);
break;
case 15:
smlayer_setActorLayer(0, 2, 8);
@@ -949,9 +949,9 @@ void Insane::actor02Reaction(int32 buttons) {
case INV_CHAINSAW:
tmp = calcBenDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(76);
+ smlayer_startSfx(76);
if (tmp == 1000)
- smlayer_startSound1(77);
+ smlayer_startSfx(77);
break;
case INV_BOOT:
calcBenDamage(0, 1);
@@ -959,13 +959,13 @@ void Insane::actor02Reaction(int32 buttons) {
case INV_DUST:
if ((_actor[1].x - _actor[0].x <= weaponMaxRange(0)) &&
(_actor[1].x - _actor[0].x >= weaponMinRange(0))) {
- smlayer_startSound1(76);
+ smlayer_startSfx(76);
_actor[1].damage = weaponDamage(0);
}
break;
default:
if (calcBenDamage(1, 0))
- smlayer_startSound1(76);
+ smlayer_startSfx(76);
break;
}
smlayer_setActorFacing(0, 2, 21,180);
@@ -991,7 +991,7 @@ void Insane::actor02Reaction(int32 buttons) {
smlayer_setActorFacing(0, 2, 19, 180);
_actor[0].act[2].state = 19;
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
- smlayer_startSound1(69);
+ smlayer_startSfx(69);
break;
case 19:
smlayer_setActorLayer(0, 2, 4);
@@ -1046,9 +1046,9 @@ void Insane::actor02Reaction(int32 buttons) {
case INV_BOOT:
tmp = calcBenDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(67);
+ smlayer_startSfx(67);
if (tmp == 1000)
- smlayer_startSound1(68);
+ smlayer_startSfx(68);
break;
default:
smlayer_setActorFacing(0, 2, 19, 180);
@@ -1102,7 +1102,7 @@ void Insane::actor02Reaction(int32 buttons) {
smlayer_setActorFacing(0, 2, 19, 180);
_actor[0].act[2].state = 23;
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
- smlayer_startSound1(81);
+ smlayer_startSfx(81);
break;
case 23:
smlayer_setActorLayer(0, 2, 6);
@@ -1150,14 +1150,14 @@ void Insane::actor02Reaction(int32 buttons) {
_actor[1].act[2].state = 102;
_actor[1].damage = _actor[1].maxdamage + 10;
}
- smlayer_startSound1(79);
+ smlayer_startSfx(79);
}
if (tmp == 1000)
- smlayer_startSound1(80);
+ smlayer_startSfx(80);
break;
default:
if (!calcBenDamage(1, 0))
- smlayer_startSound1(79);
+ smlayer_startSfx(79);
break;
}
smlayer_setActorFacing(0, 2, 21, 180);
@@ -1183,7 +1183,7 @@ void Insane::actor02Reaction(int32 buttons) {
smlayer_setActorFacing(0, 2, 19, 180);
_actor[0].act[2].state = 27;
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
- smlayer_startSound1(72);
+ smlayer_startSfx(72);
break;
case 27:
smlayer_setActorLayer(0, 2, 4);
@@ -1229,13 +1229,13 @@ void Insane::actor02Reaction(int32 buttons) {
case INV_DUST:
tmp = calcBenDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(70);
+ smlayer_startSfx(70);
if (tmp == 1000)
- smlayer_startSound1(71);
+ smlayer_startSfx(71);
break;
case 6:
if (!calcBenDamage(0, 1))
- smlayer_startSound1(70);
+ smlayer_startSfx(70);
break;
default:
break;
@@ -1268,7 +1268,7 @@ void Insane::actor02Reaction(int32 buttons) {
smlayer_setActorFacing(0, 2, 18, 180);
_actor[0].act[2].state = 31;
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
- smlayer_startSound1(84);
+ smlayer_startSfx(84);
break;
case 31:
smlayer_setActorLayer(0, 2, 4);
@@ -1295,9 +1295,9 @@ void Insane::actor02Reaction(int32 buttons) {
default:
tmp = calcBenDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(82);
+ smlayer_startSfx(82);
if (tmp == 1000)
- smlayer_startSound1(83);
+ smlayer_startSfx(83);
break;
}
smlayer_setActorFacing(0, 2, 21, 180);
@@ -1320,7 +1320,7 @@ void Insane::actor02Reaction(int32 buttons) {
_actor[0].kicking = 0;
smlayer_setActorCostume(0, 2, readArray(_numberArray, 18));
smlayer_setActorFacing(0, 2, 6, 180);
- smlayer_startSound1(96);
+ smlayer_startSfx(96);
switch (_currEnemy) {
case EN_ROTT1:
prepareScenePropScene(33, 0, 0);
@@ -1733,7 +1733,7 @@ void Insane::actor03Reaction(int32 buttons) {
if (_actor[0].scenePropSubIdx) {
smlayer_setActorFacing(0, 3, 4, 180);
tmp = _currScenePropIdx + _actor[0].scenePropSubIdx;
- if (!smlayer_startSound2(_sceneProp[tmp].sound))
+ if (!smlayer_startVoice(_sceneProp[tmp].sound))
_actor[0].runningSound = 0;
else
_actor[0].runningSound = _sceneProp[tmp].sound;
@@ -1962,16 +1962,16 @@ void Insane::ouchSoundBen(void) {
switch (rand() % 4) {
case 0:
- smlayer_startSound2(315);
+ smlayer_startVoice(315);
break;
case 1:
- smlayer_startSound2(316);
+ smlayer_startVoice(316);
break;
case 2:
- smlayer_startSound2(317);
+ smlayer_startVoice(317);
break;
case 3:
- smlayer_startSound2(98);
+ smlayer_startVoice(98);
break;
}
}
diff --git a/scumm/insane/insane_enemy.cpp b/scumm/insane/insane_enemy.cpp
index b723650d26..8e235bf029 100644
--- a/scumm/insane/insane_enemy.cpp
+++ b/scumm/insane/insane_enemy.cpp
@@ -1267,48 +1267,48 @@ void Insane::ouchSoundEnemy(void) {
switch (_currEnemy) {
case EN_VULTF1:
if (_actor[0].weapon == INV_DUST) {
- smlayer_startSound2(287);
+ smlayer_startVoice(287);
} else {
if (rand() % 2) {
- smlayer_startSound2(279);
+ smlayer_startVoice(279);
} else {
- smlayer_startSound2(280);
+ smlayer_startVoice(280);
}
}
break;
case EN_VULTF2:
- smlayer_startSound2(271);
+ smlayer_startVoice(271);
break;
case EN_VULTM1:
- smlayer_startSound2(162);
+ smlayer_startVoice(162);
break;
case EN_ROTT1:
tmp = rand() % 3;
if (!tmp) {
- smlayer_startSound2(216);
+ smlayer_startVoice(216);
} else if (tmp == 1) {
- smlayer_startSound2(217);
+ smlayer_startVoice(217);
} else {
- smlayer_startSound2(218);
+ smlayer_startVoice(218);
}
break;
case EN_ROTT2:
tmp = rand() % 3;
if (!tmp) {
- smlayer_startSound2(243);
+ smlayer_startVoice(243);
} else if (tmp == 1) {
- smlayer_startSound2(244);
+ smlayer_startVoice(244);
} else {
- smlayer_startSound2(245);
+ smlayer_startVoice(245);
}
break;
case EN_VULTM2:
- smlayer_startSound2(180);
+ smlayer_startVoice(180);
break;
default:
- smlayer_startSound2(99);
+ smlayer_startVoice(99);
break;
}
}
@@ -1808,7 +1808,7 @@ void Insane::actor12Reaction(int32 buttons) {
_actor[1].weaponClass = 1;
_actor[1].act[2].state = 3;
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
- smlayer_startSound1(63);
+ smlayer_startSfx(63);
break;
case 3:
smlayer_setActorLayer(1, 2, 4);
@@ -1816,9 +1816,9 @@ void Insane::actor12Reaction(int32 buttons) {
if (_actor[1].act[2].frame >= 6) {
tmp = calcEnemyDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(60);
+ smlayer_startSfx(60);
if (tmp == 1000)
- smlayer_startSound1(62);
+ smlayer_startSfx(62);
smlayer_setActorFacing(1, 2, 20, 180);
_actor[1].act[2].state = 4;
}
@@ -1848,7 +1848,7 @@ void Insane::actor12Reaction(int32 buttons) {
smlayer_setActorFacing(1, 2, 19, 180);
_actor[1].act[2].state = 11;
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
- smlayer_startSound1(75);
+ smlayer_startSfx(75);
break;
case 11:
smlayer_setActorLayer(1, 2, 4);
@@ -1880,13 +1880,13 @@ void Insane::actor12Reaction(int32 buttons) {
case INV_BOOT:
tmp = calcEnemyDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(73);
+ smlayer_startSfx(73);
if (tmp == 1000)
- smlayer_startSound1(74);
+ smlayer_startSfx(74);
break;
case INV_HAND:
if(calcEnemyDamage(1, 0))
- smlayer_startSound1(73);
+ smlayer_startSfx(73);
break;
}
smlayer_setActorFacing(1, 2, 21, 180);
@@ -1911,7 +1911,7 @@ void Insane::actor12Reaction(int32 buttons) {
smlayer_setActorFacing(1, 2, 19, 180);
_actor[1].act[2].state = 15;
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
- smlayer_startSound1(78);
+ smlayer_startSfx(78);
break;
case 15:
smlayer_setActorLayer(1, 2, 8);
@@ -1953,9 +1953,9 @@ void Insane::actor12Reaction(int32 buttons) {
case INV_DUST:
tmp = calcEnemyDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(76);
+ smlayer_startSfx(76);
if (tmp == 1000)
- smlayer_startSound1(77);
+ smlayer_startSfx(77);
break;
default:
calcEnemyDamage(1, 0);
@@ -1984,14 +1984,14 @@ void Insane::actor12Reaction(int32 buttons) {
smlayer_setActorFacing(1, 2, 19, 180);
_actor[1].act[2].state = 19;
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
- smlayer_startSound1(69);
+ smlayer_startSfx(69);
if (!_actor[1].field_54) {
tmp = rand() % 5;
if (tmp == 1) {
- smlayer_startSound1(213);
+ smlayer_startSfx(213);
} else if (tmp == 3) {
- smlayer_startSound1(215);
+ smlayer_startSfx(215);
}
}
break;
@@ -2044,9 +2044,9 @@ void Insane::actor12Reaction(int32 buttons) {
case INV_BOOT:
tmp = calcEnemyDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(67);
+ smlayer_startSfx(67);
if (tmp == 1000)
- smlayer_startSound1(68);
+ smlayer_startSfx(68);
break;
default:
calcEnemyDamage(1, 0);
@@ -2093,7 +2093,7 @@ void Insane::actor12Reaction(int32 buttons) {
smlayer_setActorFacing(1, 2, 19, 180);
_actor[1].act[2].state = 23;
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
- smlayer_startSound1(81);
+ smlayer_startSfx(81);
break;
case 23:
smlayer_setActorLayer(1, 2, 4);
@@ -2107,7 +2107,7 @@ void Insane::actor12Reaction(int32 buttons) {
_actor[1].act[2].state = 24;
if (!_actor[1].field_54)
- smlayer_startSound1(246);
+ smlayer_startSfx(246);
}
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
break;
@@ -2119,10 +2119,10 @@ void Insane::actor12Reaction(int32 buttons) {
tmp = calcEnemyDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(79);
+ smlayer_startSfx(79);
if (tmp == 1000)
- smlayer_startSound1(80);
+ smlayer_startSfx(80);
break;
smlayer_setActorFacing(1, 2, 21, 180);
@@ -2148,7 +2148,7 @@ void Insane::actor12Reaction(int32 buttons) {
smlayer_setActorFacing(1, 2, 19, 180);
_actor[1].act[2].state = 27;
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
- smlayer_startSound1(72);
+ smlayer_startSfx(72);
break;
case 27:
smlayer_setActorLayer(1, 2, 4);
@@ -2173,9 +2173,9 @@ void Insane::actor12Reaction(int32 buttons) {
if (_actor[1].act[2].frame >= 3) {
tmp = calcEnemyDamage(1, 1);
if (tmp == 1)
- smlayer_startSound1(70);
+ smlayer_startSfx(70);
if (tmp == 1000)
- smlayer_startSound1(71);
+ smlayer_startSfx(71);
smlayer_setActorFacing(1, 2, 21, 180);
_actor[1].act[2].state = 29;
@@ -2245,7 +2245,7 @@ void Insane::actor12Reaction(int32 buttons) {
else
smlayer_setActorFacing(1, 2, 12, 180);
- smlayer_startSound1(100);
+ smlayer_startSfx(100);
_actor[1].act[2].state = 90;
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
break;
@@ -2276,23 +2276,23 @@ void Insane::actor12Reaction(int32 buttons) {
smlayer_setActorCostume(1, 2, readArray(_numberArray, _enemy[_currEnemy].costumevar));
smlayer_setActorFacing(1, 2, 6, 180);
smlayer_setActorLayer(1, 2, 25);
- smlayer_startSound1(96);
+ smlayer_startSfx(96);
_actor[1].act[2].state = 37;
switch (_currEnemy) {
case EN_ROTT1:
- smlayer_startSound2(212);
+ smlayer_startVoice(212);
break;
case EN_ROTT2:
- smlayer_startSound2(259);
+ smlayer_startVoice(259);
break;
case EN_ROTT3:
- smlayer_startSound2(232);
+ smlayer_startVoice(232);
break;
case EN_VULTF1:
- smlayer_startSound2(281);
+ smlayer_startVoice(281);
break;
case EN_VULTF2:
- smlayer_startSound2(276);
+ smlayer_startVoice(276);
break;
}
case 37:
@@ -2343,7 +2343,7 @@ void Insane::actor12Reaction(int32 buttons) {
_actor[1].cursorX = 0;
_actor[1].act[2].state = 114;
_enemy[EN_VULTF2].field_10 = 1;
- smlayer_startSound2(275);
+ smlayer_startVoice(275);
break;
case 114:
smlayer_setActorLayer(1, 2, 25);
@@ -2370,7 +2370,7 @@ void Insane::actor12Reaction(int32 buttons) {
_actor[1].act[0].room = 0;
_actor[1].cursorX = 0;
_actor[1].act[2].state = 116;
- smlayer_startSound2(232);
+ smlayer_startVoice(232);
break;
case 116:
smlayer_setActorLayer(1, 2, 25);
@@ -2612,7 +2612,7 @@ void Insane::actor13Reaction(int32 buttons) {
if (_actor[1].scenePropSubIdx) {
smlayer_setActorFacing(1, 3, 4, 180);
tmp = _currScenePropIdx + _actor[1].scenePropSubIdx;
- if (!smlayer_startSound2(_sceneProp[tmp].sound))
+ if (!smlayer_startVoice(_sceneProp[tmp].sound))
_actor[1].runningSound = 0;
else
_actor[1].runningSound = _sceneProp[tmp].sound;
diff --git a/scumm/insane/insane_iact.cpp b/scumm/insane/insane_iact.cpp
index 7f026a18c3..048ac4f766 100644
--- a/scumm/insane/insane_iact.cpp
+++ b/scumm/insane/insane_iact.cpp
@@ -184,7 +184,7 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12,
smlayer_stopSound(86);
} else {
if (!smlayer_isSoundRunning(86))
- smlayer_startSound1(86);
+ smlayer_startSfx(86);
}
break;
}
@@ -575,7 +575,7 @@ void Insane::iactScene17(byte *renderBitmap, int32 codecparam, int32 setupsan12,
_iactSceneId = par4;
if (_counter1 <= 4) {
if (_counter1 == 4)
- smlayer_startSound1(94);
+ smlayer_startSfx(94);
smlayer_showStatusMsg(-1, renderBitmap, codecparam, 24, 167, 1,
2, 0, "%s", handleTrsTag(_trsFilePtr, 5000));
@@ -587,7 +587,7 @@ void Insane::iactScene17(byte *renderBitmap, int32 codecparam, int32 setupsan12,
_smush_iconsNut, 6, 0, 0);
if (_counter1 <= 4) {
if (_counter1 == 4)
- smlayer_startSound1(94);
+ smlayer_startSfx(94);
smlayer_showStatusMsg(-1, renderBitmap, codecparam, 24, 167, 1,
2, 0, "%s", handleTrsTag(_trsFilePtr, 5001));
diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp
index 1750d994de..bb9b0a552b 100644
--- a/scumm/insane/insane_scenes.cpp
+++ b/scumm/insane/insane_scenes.cpp
@@ -838,11 +838,11 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup
case 1:
postCase0(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
if(!smlayer_isSoundRunning(88))
- smlayer_startSound1(88);
+ smlayer_startSfx(88);
smlayer_soundSetPan(88, ((_actor[0].x+160)>>2)+64);
if(_tiresRustle) {
if (!smlayer_isSoundRunning(87))
- smlayer_startSound1(87);
+ smlayer_startSfx(87);
} else {
smlayer_stopSound(87);
}
@@ -854,12 +854,12 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup
smlayer_stopSound(87);
smlayer_stopSound(88);
if(!smlayer_isSoundRunning(88))
- smlayer_startSound1(88);
+ smlayer_startSfx(88);
break;
case 17:
postCase16(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
if(!smlayer_isSoundRunning(88))
- smlayer_startSound1(88);
+ smlayer_startSfx(88);
break;
case 2:
postCase1(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
@@ -868,12 +868,12 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup
postCase2(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
needMore = true;
if(!smlayer_isSoundRunning(89)) {
- smlayer_startSound1(89);
+ smlayer_startSfx(89);
smlayer_soundSetPriority(89, 100);
}
tmpSnd = _enemy[_currEnemy].sound;
if(!smlayer_isSoundRunning(tmpSnd)) {
- smlayer_startSound1(tmpSnd);
+ smlayer_startSfx(tmpSnd);
smlayer_soundSetPriority(tmpSnd, 100);
}
smlayer_soundSetPan(89, ((_actor[0].x+160)>>2)+64);
@@ -882,19 +882,19 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup
smlayer_stopSound(87);
} else {
if (!smlayer_isSoundRunning(87))
- smlayer_startSound1(87);
+ smlayer_startSfx(87);
}
break;
case 21:
postCase20(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
needMore = true;
if(!smlayer_isSoundRunning(89)) {
- smlayer_startSound1(89);
+ smlayer_startSfx(89);
smlayer_soundSetPriority(89, 100);
}
tmpSnd = _enemy[_currEnemy].sound;
if(!smlayer_isSoundRunning(tmpSnd)) {
- smlayer_startSound1(tmpSnd);
+ smlayer_startSfx(tmpSnd);
smlayer_soundSetPriority(tmpSnd, 100);
}
smlayer_soundSetPan(89, ((_actor[0].x+160)>>2)+64);
@@ -904,13 +904,13 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup
case 5:
postCase3(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
if(!smlayer_isSoundRunning(88))
- smlayer_startSound1(88);
+ smlayer_startSfx(88);
smlayer_soundSetPan(88, ((_actor[0].x+160)>>2)+64);
break;
case 6:
postCase5(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
if(!smlayer_isSoundRunning(88))
- smlayer_startSound1(88);
+ smlayer_startSfx(88);
smlayer_soundSetPan(88, ((_actor[0].x+160)>>2)+64);
break;
case 7:
@@ -933,12 +933,12 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup
postCase12(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
needMore = true;
if(!smlayer_isSoundRunning(89)) {
- smlayer_startSound1(89);
+ smlayer_startSfx(89);
smlayer_soundSetPriority(89, 100);
}
tmpSnd = _enemy[_currEnemy].sound;
if(!smlayer_isSoundRunning(tmpSnd)) {
- smlayer_startSound1(tmpSnd);
+ smlayer_startSfx(tmpSnd);
smlayer_soundSetPriority(tmpSnd, 100);
}
smlayer_soundSetPan(89, ((_actor[0].x+160)>>2)+64);
@@ -946,7 +946,7 @@ void Insane::procPostRendering(byte *renderBitmap, int32 codecparam, int32 setup
break;
case 24:
if(!smlayer_isSoundRunning(90)) {
- smlayer_startSound1(90);
+ smlayer_startSfx(90);
smlayer_soundSetPriority(90, 100);
}
postCase23(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
@@ -1136,7 +1136,7 @@ void Insane::postCase3(byte *renderBitmap, int32 codecparam, int32 setupsan12,
if (_actor[0].x >= 158 && _actor[0].x <= 168) {
if (!smlayer_isSoundRunning(86))
- smlayer_startSound1(86);
+ smlayer_startSfx(86);
} else {
if (!smlayer_isSoundRunning(86))
smlayer_stopSound(86);
@@ -1180,7 +1180,7 @@ void Insane::postCase5(byte *renderBitmap, int32 codecparam, int32 setupsan12,
if (_actor[0].x >= 158 && _actor[0].x <= 168) {
if (!smlayer_isSoundRunning(86))
- smlayer_startSound1(86);
+ smlayer_startSfx(86);
} else {
if (!smlayer_isSoundRunning(86))
smlayer_stopSound(86);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 09:08:48 +0000