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

Meat: remove unnecessary returns

Browse Source
This commit is contained in:
Jbleezy
2023-03-11 19:24:59 -08:00
parent 6589b97b6c
commit 6cf4c6fe7a
1 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
scripts/zm/replaced/zgrief.gsc
View File

@ -117,17 +117,10 @@ meat_bounce_override( pos, normal, ent, bounce )
meat_stink( who ) meat_stink( who )
{ {
weapons = who getweaponslist(); if (who hasWeapon("item_meat_zm"))
has_meat = 0; {
return;
foreach ( weapon in weapons ) }
{
if ( weapon == "item_meat_zm" )
has_meat = 1;
}
if ( has_meat )
return;
who.pre_meat_weapon = who getcurrentweapon(); who.pre_meat_weapon = who getcurrentweapon();
level notify( "meat_grabbed" ); level notify( "meat_grabbed" );
@ -166,6 +159,8 @@ meat_stink( who )
who thread maps\mp\gametypes_zm\zgrief::meat_stink_player_create(); who thread maps\mp\gametypes_zm\zgrief::meat_stink_player_create();
who thread meat_stink_cleanup_on_downed();
if (level.scr_zm_ui_gametype_obj == "zmeat") if (level.scr_zm_ui_gametype_obj == "zmeat")
{ {
who thread meat_powerup_drop_on_downed(); who thread meat_powerup_drop_on_downed();
@ -173,7 +168,7 @@ meat_stink( who )
} }
} }
meat_powerup_drop_on_downed() meat_stink_cleanup_on_downed()
{ {
level endon("meat_thrown"); level endon("meat_thrown");
self endon("disconnect"); self endon("disconnect");
@ -181,16 +176,6 @@ meat_powerup_drop_on_downed()
self waittill("player_downed"); self waittill("player_downed");
if (isDefined(level.item_meat))
{
return;
}
if (isDefined(level.meat_powerup))
{
return;
}
level.meat_player = undefined; level.meat_player = undefined;
self setMoveSpeedScale(1); self setMoveSpeedScale(1);
@ -205,6 +190,15 @@ meat_powerup_drop_on_downed()
player.ignoreme = 0; player.ignoreme = 0;
} }
} }
}
meat_powerup_drop_on_downed()
{
level endon("meat_thrown");
self endon("disconnect");
self endon("bled_out");
self waittill("player_downed");
valid_drop = check_point_in_enabled_zone( self.origin, undefined, undefined ); valid_drop = check_point_in_enabled_zone( self.origin, undefined, undefined );
@ -234,11 +228,6 @@ meat_powerup_reset_on_disconnect()
level.meat_player = undefined; level.meat_player = undefined;
if (isDefined(level.meat_powerup))
{
return;
}
players = get_players(); players = get_players();
foreach (player in players) foreach (player in players)
{ {