Mono battle sounds.

2017-05-16 08:11:54 +01:00 · 2017-05-16 08:11:54 +01:00 · 53ab37f0e7
parent 9938d60f7d
commit 53ab37f0e7
18 changed files with 2 additions and 3 deletions
--- a/sound/000000_large_explosion.ogg
+++ b/sound/000000_large_explosion.ogg
--- a/sound/000000_tow-rope-attach.ogg
+++ b/sound/000000_tow-rope-attach.ogg
--- a/sound/146311jgeralynshortailenliketone2-lower.ogg
+++ b/sound/146311jgeralynshortailenliketone2-lower.ogg
--- a/sound/162265qubodupexplosive.ogg
+++ b/sound/162265qubodupexplosive.ogg
--- a/sound/207322animationisaacshort-explosion.ogg
+++ b/sound/207322animationisaacshort-explosion.ogg
--- a/sound/246420oceanictrancergame-sound-effect-menu.ogg
+++ b/sound/246420oceanictrancergame-sound-effect-menu.ogg
--- a/sound/254071tb0y298firework-explosion.ogg
+++ b/sound/254071tb0y298firework-explosion.ogg
--- a/sound/263621jamesabdulrahmanpermission-to-panic.ogg
+++ b/sound/263621jamesabdulrahmanpermission-to-panic.ogg
--- a/sound/268344julien-mattheyjm-noiz-laser-01.ogg
+++ b/sound/268344julien-mattheyjm-noiz-laser-01.ogg
--- a/sound/275151bird-mangun-shot.ogg
+++ b/sound/275151bird-mangun-shot.ogg
--- a/sound/276912pauldihortransform.ogg
+++ b/sound/276912pauldihortransform.ogg
--- a/sound/322603clippysoundsglass-break.ogg
+++ b/sound/322603clippysoundsglass-break.ogg
--- a/sound/42106marcusleelaser-wrath-4.ogg
+++ b/sound/42106marcusleelaser-wrath-4.ogg
--- a/sound/49678ejfortinenergy-short-sword-7.ogg
+++ b/sound/49678ejfortinenergy-short-sword-7.ogg
--- a/sound/56246q-klatch-04.ogg
+++ b/sound/56246q-klatch-04.ogg
--- a/sound/65787iwilldstroyulaserrocket.ogg
+++ b/sound/65787iwilldstroyulaserrocket.ogg
--- a/sound/77087supraliminallaser-short.ogg
+++ b/sound/77087supraliminallaser-short.ogg
--- a/src/system/sound.c
+++ b/src/system/sound.c
@ -78,9 +78,8 @@ void playSound(int id)

 void playBattleSound(int id, int x, int y)
 {
-	float distance;
+	float distance, bearing, vol;
 	int channel;
-	float vol;

 	if (player->alive == ALIVE_ALIVE)
 	{
@ -101,7 +100,7 @@ void playBattleSound(int id, int x, int y)

 			if (distance >= MIN_BATTLE_SOUND_DISTANCE)
 			{
-				float bearing = 360 - getAngle(x, y, lastPlayerX, lastPlayerY);
+				bearing = 360 - getAngle(x, y, lastPlayerX, lastPlayerY);
 				Mix_SetPosition(channel, (Sint16)bearing, (Uint8)distance);
 			}
 			else