INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 23:57:59 -05:00
Code Issues Releases Wiki Activity

Electric Trap: fix .electrap_sound_ent

Browse Source
This commit is contained in:
Jbleezy
2023-04-17 21:57:10 -07:00
parent 5bc4aee093
commit 120cddd5c0
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/zm/replaced/_zm_equip_electrictrap.gsc
View File

@ -10,7 +10,6 @@ startelectrictrapdeploy( weapon )
self thread maps\mp\zombies\_zm_equip_electrictrap::watchforcleanup(); self thread maps\mp\zombies\_zm_equip_electrictrap::watchforcleanup();
electricradius = 45; electricradius = 45;
self.weapon = weapon;
if ( !isDefined( self.electrictrap_health ) ) if ( !isDefined( self.electrictrap_health ) )
{ {
@ -28,11 +27,11 @@ startelectrictrapdeploy( weapon )
weapon waittill( "death" ); weapon waittill( "death" );
if ( isDefined( level.electrap_sound_ent ) ) if ( isDefined( weapon.electrap_sound_ent ) )
{ {
level.electrap_sound_ent playsound( "wpn_zmb_electrap_stop" ); weapon.electrap_sound_ent playsound( "wpn_zmb_electrap_stop" );
level.electrap_sound_ent delete(); weapon.electrap_sound_ent delete();
level.electrap_sound_ent = undefined; weapon.electrap_sound_ent = undefined;
} }
self notify( "etrap_cleanup" ); self notify( "etrap_cleanup" );
@ -45,13 +44,13 @@ trap_power_on( weapon )
weapon.power_on_time = getTime() - 2000; // ::electrictrapthink doesn't start until after 2 seconds weapon.power_on_time = getTime() - 2000; // ::electrictrapthink doesn't start until after 2 seconds
weapon notify( "stop_attracting_zombies" ); weapon notify( "stop_attracting_zombies" );
if ( !isDefined( level.electrap_sound_ent ) ) if ( !isDefined( weapon.electrap_sound_ent ) )
{ {
level.electrap_sound_ent = spawn( "script_origin", weapon.origin ); weapon.electrap_sound_ent = spawn( "script_origin", weapon.origin );
} }
level.electrap_sound_ent playsound( "wpn_zmb_electrap_start" ); weapon.electrap_sound_ent playsound( "wpn_zmb_electrap_start" );
level.electrap_sound_ent playloopsound( "wpn_zmb_electrap_loop", 2 ); weapon.electrap_sound_ent playloopsound( "wpn_zmb_electrap_loop", 2 );
weapon thread maps\mp\zombies\_zm_equip_electrictrap::trapfx(); weapon thread maps\mp\zombies\_zm_equip_electrictrap::trapfx();
} }
@ -91,14 +90,16 @@ cleanupoldtrap()
thread maps\mp\zombies\_zm_unitrigger::unregister_unitrigger( self.buildableelectrictrap.stub ); thread maps\mp\zombies\_zm_unitrigger::unregister_unitrigger( self.buildableelectrictrap.stub );
self.buildableelectrictrap.stub = undefined; self.buildableelectrictrap.stub = undefined;
} }
if ( isDefined( self.buildableelectrictrap.electrap_sound_ent ) )
{
self.buildableelectrictrap.electrap_sound_ent delete();
self.buildableelectrictrap.electrap_sound_ent = undefined;
}
self.buildableelectrictrap delete(); self.buildableelectrictrap delete();
self.electrictrap_health = undefined; self.electrictrap_health = undefined;
} }
if ( isDefined( level.electrap_sound_ent ) )
{
level.electrap_sound_ent delete();
level.electrap_sound_ent = undefined;
}
} }
etrap_choke() etrap_choke()