mirror of
https://github.com/JezuzLizard/BO2-Reimagined.git
synced 2025-06-11 07:37:56 -05:00
Fix several runtime errors
This commit is contained in:
@ -545,6 +545,8 @@ round_timer_hud()
|
|||||||
|
|
||||||
set_time_frozen_on_end_game(hud)
|
set_time_frozen_on_end_game(hud)
|
||||||
{
|
{
|
||||||
|
level endon("intermission");
|
||||||
|
|
||||||
level waittill("end_game");
|
level waittill("end_game");
|
||||||
|
|
||||||
if(!isDefined(hud.end_time))
|
if(!isDefined(hud.end_time))
|
||||||
@ -1665,7 +1667,7 @@ bleedout_bar_hud()
|
|||||||
}
|
}
|
||||||
|
|
||||||
bleedout_bar = self createbar((1, 0, 0), level.secondaryprogressbarwidth * 2, level.secondaryprogressbarheight);
|
bleedout_bar = self createbar((1, 0, 0), level.secondaryprogressbarwidth * 2, level.secondaryprogressbarheight);
|
||||||
bleedout_bar setpoint(undefined, "CENTER", level.secondaryprogressbarx, -1 * level.secondaryprogressbary);
|
bleedout_bar setpoint("CENTER", undefined, level.secondaryprogressbarx, -1 * level.secondaryprogressbary);
|
||||||
bleedout_bar.hidewheninmenu = 1;
|
bleedout_bar.hidewheninmenu = 1;
|
||||||
bleedout_bar.bar.hidewheninmenu = 1;
|
bleedout_bar.bar.hidewheninmenu = 1;
|
||||||
bleedout_bar.barframe.hidewheninmenu = 1;
|
bleedout_bar.barframe.hidewheninmenu = 1;
|
||||||
@ -2077,8 +2079,6 @@ disable_bank_teller()
|
|||||||
|
|
||||||
disable_carpenter()
|
disable_carpenter()
|
||||||
{
|
{
|
||||||
arrayremoveindex(level.zombie_include_powerups, "carpenter");
|
|
||||||
arrayremoveindex(level.zombie_powerups, "carpenter");
|
|
||||||
arrayremovevalue(level.zombie_powerup_array, "carpenter");
|
arrayremovevalue(level.zombie_powerup_array, "carpenter");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4212,6 +4212,11 @@ additionalprimaryweapon_indicator()
|
|||||||
{
|
{
|
||||||
self endon("disconnect");
|
self endon("disconnect");
|
||||||
|
|
||||||
|
if(!is_true(level.zombiemode_using_additionalprimaryweapon_perk))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
additionalprimaryweapon_indicator_hud = newClientHudElem(self);
|
additionalprimaryweapon_indicator_hud = newClientHudElem(self);
|
||||||
additionalprimaryweapon_indicator_hud.alignx = "right";
|
additionalprimaryweapon_indicator_hud.alignx = "right";
|
||||||
additionalprimaryweapon_indicator_hud.aligny = "bottom";
|
additionalprimaryweapon_indicator_hud.aligny = "bottom";
|
||||||
@ -4506,7 +4511,7 @@ destroy_on_intermission()
|
|||||||
|
|
||||||
level waittill("intermission");
|
level waittill("intermission");
|
||||||
|
|
||||||
if(self.elemtype == "bar")
|
if(isDefined(self.elemtype) && self.elemtype == "bar")
|
||||||
{
|
{
|
||||||
self.bar destroy();
|
self.bar destroy();
|
||||||
self.barframe destroy();
|
self.barframe destroy();
|
||||||
|
@ -1051,7 +1051,7 @@ wait_and_revive()
|
|||||||
if ( !isDefined( self.beingrevivedprogressbar ) )
|
if ( !isDefined( self.beingrevivedprogressbar ) )
|
||||||
{
|
{
|
||||||
self.beingrevivedprogressbar = self createprimaryprogressbar();
|
self.beingrevivedprogressbar = self createprimaryprogressbar();
|
||||||
self.beingrevivedprogressbar setpoint(undefined, "CENTER", level.primaryprogressbarx, -1 * level.primaryprogressbary);
|
self.beingrevivedprogressbar setpoint("CENTER", undefined, level.primaryprogressbarx, -1 * level.primaryprogressbary);
|
||||||
self.beingrevivedprogressbar.bar.color = (0.5, 0.5, 1);
|
self.beingrevivedprogressbar.bar.color = (0.5, 0.5, 1);
|
||||||
self.beingrevivedprogressbar.hidewheninmenu = 1;
|
self.beingrevivedprogressbar.hidewheninmenu = 1;
|
||||||
self.beingrevivedprogressbar.bar.hidewheninmenu = 1;
|
self.beingrevivedprogressbar.bar.hidewheninmenu = 1;
|
||||||
|
@ -28,7 +28,7 @@ revive_do_revive( playerbeingrevived, revivergun )
|
|||||||
if ( !isDefined( playerbeingrevived.beingrevivedprogressbar ) )
|
if ( !isDefined( playerbeingrevived.beingrevivedprogressbar ) )
|
||||||
{
|
{
|
||||||
playerbeingrevived.beingrevivedprogressbar = playerbeingrevived createprimaryprogressbar();
|
playerbeingrevived.beingrevivedprogressbar = playerbeingrevived createprimaryprogressbar();
|
||||||
playerbeingrevived.beingrevivedprogressbar setpoint(undefined, "CENTER", level.primaryprogressbarx, -1 * level.primaryprogressbary);
|
playerbeingrevived.beingrevivedprogressbar setpoint("CENTER", undefined, level.primaryprogressbarx, -1 * level.primaryprogressbary);
|
||||||
playerbeingrevived.beingrevivedprogressbar.bar.color = (0.5, 0.5, 1);
|
playerbeingrevived.beingrevivedprogressbar.bar.color = (0.5, 0.5, 1);
|
||||||
playerbeingrevived.beingrevivedprogressbar.hidewheninmenu = 1;
|
playerbeingrevived.beingrevivedprogressbar.hidewheninmenu = 1;
|
||||||
playerbeingrevived.beingrevivedprogressbar.bar.hidewheninmenu = 1;
|
playerbeingrevived.beingrevivedprogressbar.bar.hidewheninmenu = 1;
|
||||||
|
@ -141,16 +141,19 @@ zombie_damage( mod, hit_location, hit_origin, player, amount, team )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( isDefined( self.a.gib_ref ) || self.a.gib_ref == "right_arm" && self.a.gib_ref == "left_arm" )
|
else if ( isDefined( self.a.gib_ref ) )
|
||||||
{
|
{
|
||||||
if ( self.has_legs && isalive( self ) )
|
if ( self.a.gib_ref == "right_arm" || self.a.gib_ref == "left_arm" )
|
||||||
{
|
{
|
||||||
if ( isDefined( player ) )
|
if ( self.has_legs && isalive( self ) )
|
||||||
{
|
{
|
||||||
rand = randomintrange( 0, 100 );
|
if ( isDefined( player ) )
|
||||||
if ( rand < 7 )
|
|
||||||
{
|
{
|
||||||
player maps/mp/zombies/_zm_audio::create_and_play_dialog( "general", "shoot_arm" );
|
rand = randomintrange( 0, 100 );
|
||||||
|
if ( rand < 7 )
|
||||||
|
{
|
||||||
|
player maps/mp/zombies/_zm_audio::create_and_play_dialog( "general", "shoot_arm" );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -171,8 +171,6 @@ register_map_initial_spawnpoint( origin, angles, team_num )
|
|||||||
|
|
||||||
wallbuy( weapon_name, target, targetname, origin, angles )
|
wallbuy( weapon_name, target, targetname, origin, angles )
|
||||||
{
|
{
|
||||||
precachemodel( getweaponmodel( weapon_name ) );
|
|
||||||
|
|
||||||
unitrigger_stub = spawnstruct();
|
unitrigger_stub = spawnstruct();
|
||||||
unitrigger_stub.origin = origin;
|
unitrigger_stub.origin = origin;
|
||||||
unitrigger_stub.angles = angles;
|
unitrigger_stub.angles = angles;
|
||||||
@ -314,7 +312,6 @@ barrier( model, origin, angles, not_solid )
|
|||||||
level.survival_barriers[ level.survival_barriers_index ] = spawn( "script_model", origin );
|
level.survival_barriers[ level.survival_barriers_index ] = spawn( "script_model", origin );
|
||||||
level.survival_barriers[ level.survival_barriers_index ] setModel( model );
|
level.survival_barriers[ level.survival_barriers_index ] setModel( model );
|
||||||
level.survival_barriers[ level.survival_barriers_index ] rotateTo( angles, 0.1 );
|
level.survival_barriers[ level.survival_barriers_index ] rotateTo( angles, 0.1 );
|
||||||
level.survival_barriers[ level.survival_barriers_index ] disconnectPaths();
|
|
||||||
if ( is_true( not_solid ) )
|
if ( is_true( not_solid ) )
|
||||||
{
|
{
|
||||||
level.survival_barriers[ level.survival_barriers_index ] notSolid();
|
level.survival_barriers[ level.survival_barriers_index ] notSolid();
|
||||||
|
@ -936,6 +936,8 @@ headstomp_watcher()
|
|||||||
level endon("end_game");
|
level endon("end_game");
|
||||||
self endon("disconnect");
|
self endon("disconnect");
|
||||||
|
|
||||||
|
flag_wait( "initial_blackscreen_passed" );
|
||||||
|
|
||||||
while(1)
|
while(1)
|
||||||
{
|
{
|
||||||
if(self.sessionstate != "playing")
|
if(self.sessionstate != "playing")
|
||||||
@ -1141,7 +1143,6 @@ round_start_countdown_hud(time)
|
|||||||
round_start_countdown_hud_hide()
|
round_start_countdown_hud_hide()
|
||||||
{
|
{
|
||||||
self.countdown_text.alpha = 0;
|
self.countdown_text.alpha = 0;
|
||||||
self.countdown_text2.alpha = 0;
|
|
||||||
self.alpha = 0;
|
self.alpha = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1345,6 +1346,8 @@ wait_and_award_grenades()
|
|||||||
|
|
||||||
grief_intro_text()
|
grief_intro_text()
|
||||||
{
|
{
|
||||||
|
self endon("disconnect");
|
||||||
|
|
||||||
// player spawns for a frame when hotjoining
|
// player spawns for a frame when hotjoining
|
||||||
if(is_true(self.is_hotjoining))
|
if(is_true(self.is_hotjoining))
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user