From 066a79fa737ad96aa588510037d3c9b2f2e375f9 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sat, 30 Mar 2019 18:35:07 -0400 Subject: [PATCH 1/2] Fixes Sound --- code/game/sound.dm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/code/game/sound.dm b/code/game/sound.dm index d76c767593f..6c4e919bf32 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -19,15 +19,19 @@ listeners = listeners & hearers(maxdistance, turf_source) for(var/P in listeners) var/mob/M = P - if(!M || !M.client || M.z != turf_source.z) + if(!M || !M.client) continue + + var/turf/T = get_turf(M) + if(!T) + continue + if(T.z != turf_source.z) + continue + var/distance = get_dist(M, turf_source) if(distance <= maxdistance) - var/turf/T = get_turf(M) - - if(T && T.z == turf_source.z) - M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S) + M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S) /mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, sound/S) if(!client || !can_hear()) @@ -156,4 +160,4 @@ soundin = pick('sound/effects/bone_break_1.ogg', 'sound/effects/bone_break_2.ogg', 'sound/effects/bone_break_3.ogg', 'sound/effects/bone_break_4.ogg', 'sound/effects/bone_break_5.ogg', 'sound/effects/bone_break_6.ogg') if("honkbot_e") soundin = pick('sound/items/bikehorn.ogg', 'sound/items/AirHorn2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/items/AirHorn.ogg', 'sound/items/WEEOO1.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bcreep.ogg','sound/magic/Fireball.ogg' ,'sound/effects/pray.ogg', 'sound/voice/hiss1.ogg','sound/machines/buzz-sigh.ogg', 'sound/machines/ping.ogg', 'sound/weapons/flashbang.ogg', 'sound/weapons/bladeslice.ogg') - return soundin + return soundin \ No newline at end of file From 444d49af3d70239cd8c6c7280e9ec2b8ade2a2d2 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Mon, 1 Apr 2019 17:51:41 -0400 Subject: [PATCH 2/2] comment --- code/game/sound.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/sound.dm b/code/game/sound.dm index 6c4e919bf32..3846e2edeaa 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -22,7 +22,7 @@ if(!M || !M.client) continue - var/turf/T = get_turf(M) + var/turf/T = get_turf(M) // These checks need to be changed if z-levels are ever further refactored if(!T) continue if(T.z != turf_source.z)