diff --git a/README.md b/README.md index c074cd80..c39f7e7d 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,7 @@ * No longer needs to be powered by a Turbine * Gets destroyed after being deployed for 60 seconds * No longer damages players if they have Juggernog +* Fixed a bug where the Turret sounds would continue playing after being picked up ### Subsurface Resonator * No longer needs to be powered by a Turbine diff --git a/_zm_reimagined.gsc b/_zm_reimagined.gsc index ce29aec4..e898ef52 100644 --- a/_zm_reimagined.gsc +++ b/_zm_reimagined.gsc @@ -888,6 +888,8 @@ on_equipment_placed() self thread turret_decay(weapon); self thread turret_disable_team_damage(weapon); + + self thread turret_stop_loop_sound(weapon); } else if ( IsDefined(level.electrictrap_name) && weapname == level.electrictrap_name ) { @@ -1000,6 +1002,23 @@ cleanupoldturret() self notify( "turret_cleanup" ); } +turret_stop_loop_sound( weapon ) +{ + while(isDefined(weapon)) + { + wait 0.05; + } + + if ( isDefined( self.buildableturret.sound_ent ) ) + { + self.buildableturret.sound_ent stoploopsound(); + self.buildableturret.sound_ent playsoundwithnotify( "wpn_zmb_turret_stop", "sound_done" ); + self.buildableturret.sound_ent waittill( "sound_done" ); + self.buildableturret.sound_ent delete(); + self.buildableturret.sound_ent = undefined; + } +} + electrictrap_decay( weapon ) { self endon( "death" );