Fix compile errors.

This commit is contained in:
JezuzLizard
2024-02-23 19:15:49 -08:00
parent ccf7afa193
commit efa3d8ab15
12 changed files with 219 additions and 89 deletions

View File

@ -183,7 +183,7 @@ avogadro_prespawn()
self.jetgun_drag_func = ::drag_avogadro;
self.depot_lava_pit = ::busplowkillzombie;
self.busplowkillzombie = ::busplowkillzombie;
self.region_timer = sys::gettime() + 500;
self.region_timer = gettime() + 500;
self.shield = 1;
}
@ -730,14 +730,14 @@ cloud_update_fx()
if ( !isdefined( self.sndent ) )
{
self.sndent = sys::spawn( "script_origin", ( 0, 0, 0 ) );
self.sndent playloopsound( "zmb_avogadro_thunder_overhead" );
self.sndent sys::playloopsound( "zmb_avogadro_thunder_overhead" );
}
cloud_time = sys::gettime();
cloud_time = gettime();
for ( vo_counter = 0; 1; vo_counter++ )
{
if ( sys::gettime() >= cloud_time )
if ( gettime() >= cloud_time )
{
if ( isdefined( self.current_region ) )
{
@ -763,7 +763,7 @@ cloud_update_fx()
exploder_num = level.transit_region[region_str].exploder;
exploder( exploder_num );
self.sndent moveto( level.transit_region[region_str].sndorigin, 3 );
cloud_time = sys::gettime() + 30000;
cloud_time = gettime() + 30000;
}
if ( vo_counter > 50 )
@ -823,18 +823,18 @@ cloud_update()
{
self thread avogadro_update_health();
playsoundatposition( "zmb_avogadro_spawn_3d", new_origin );
self.audio_loop_ent playloopsound( "zmb_avogadro_loop", 0.5 );
self.audio_loop_ent sys::playloopsound( "zmb_avogadro_loop", 0.5 );
self sys::unlink();
ground_pos = groundpos_ignore_water_new( new_origin + vectorscale( ( 0, 0, 1 ), 60.0 ) );
playfx( level._effect["avogadro_descend"], ground_pos );
self sys::animscripted( ground_pos, self.anchor.angles, "zm_arrival" );
maps\mp\animscripts\zm_shared::donotetracks( "arrival_anim" );
self sys::setfreecameralockonallowed( 1 );
time_to_leave = sys::gettime() + 30000;
time_to_leave = gettime() + 30000;
while ( true )
{
if ( sys::gettime() > time_to_leave )
if ( gettime() > time_to_leave )
{
/#
avogadro_print( "enemy never showed - leaving" );
@ -1092,13 +1092,13 @@ check_bolt_impact( enemy )
region_empty()
{
if ( sys::gettime() >= self.region_timer )
if ( gettime() >= self.region_timer )
{
player = self get_player_in_region();
if ( isdefined( player ) )
{
self.region_timer = sys::gettime() + 500;
self.region_timer = gettime() + 500;
return false;
}
@ -1119,12 +1119,12 @@ region_empty()
if ( dist_sq < 9000000 )
{
self.region_timer = sys::gettime() + 500;
self.region_timer = gettime() + 500;
return false;
}
}
self.region_timer = sys::gettime() + 500;
self.region_timer = gettime() + 500;
/#
avogadro_print( "no one left to kill " + debug_dist_sq );
#/
@ -1148,11 +1148,11 @@ check_phase()
return false;
#/
if ( sys::gettime() > self.phase_time )
if ( gettime() > self.phase_time )
{
if ( isdefined( self.is_traversing ) && self.is_traversing )
{
self.phase_time = sys::gettime() + 2000;
self.phase_time = gettime() + 2000;
return false;
}
@ -1203,7 +1203,7 @@ play_phase_anim()
self avogadro_reveal( 0.1 );
self sys::orientmode( "face default" );
self sys::playsound( "zmb_avogadro_warp_in" );
self.phase_time = sys::gettime() + 2000;
self.phase_time = gettime() + 2000;
self notify( "phase_anim_done" );
}
@ -1225,7 +1225,7 @@ phase_failsafe()
self avogadro_reveal( 0.1 );
self sys::orientmode( "face default" );
self sys::playsound( "zmb_avogadro_warp_in" );
self.phase_time = sys::gettime() + 2000;
self.phase_time = gettime() + 2000;
self notify( "phase_anim_done" );
}
}
@ -1291,7 +1291,7 @@ avogadro_pain( einflictor )
self sys::animscripted( origin, angles, animstate, substate );
maps\mp\animscripts\zm_shared::donotetracks( "pain_anim" );
self sys::ghost();
self.phase_time = sys::gettime() - 1;
self.phase_time = gettime() - 1;
if ( self.state == "stay_attached" )
self attach_to_bus();
@ -1405,7 +1405,7 @@ avogadro_damage_func( einflictor, eattacker, idamage, idflags, smeansofdeath, sw
if ( self.shield )
{
einflictor.avogadro_melee_time = sys::gettime();
einflictor.avogadro_melee_time = gettime();
maps\mp\_visionset_mgr::vsmgr_activate( "overlay", "zm_ai_avogadro_electrified", einflictor, 0.25, 1 );
einflictor shellshock( "electrocution", 0.25 );
einflictor notify( "avogadro_damage_taken" );

View File

@ -567,7 +567,7 @@ snddelayedmusic()
sndentorigin = self sys::gettagorigin( "J_spineupper" );
self.sndbrutusmusicent = sys::spawn( "script_origin", sndentorigin );
self.sndbrutusmusicent sys::linkto( self, "J_spineupper" );
self.sndbrutusmusicent playloopsound( "mus_event_brutus_loop" );
self.sndbrutusmusicent sys::playloopsound( "mus_event_brutus_loop" );
}
self thread sndbrutusloopwatcher( self.sndbrutusmusicent );
@ -2040,7 +2040,7 @@ blocker_smash()
melee_anim_func()
{
self.next_leap_time = sys::gettime() + 1500;
self.next_leap_time = gettime() + 1500;
}
kill_teargas_after_duration( duration )

View File

@ -705,7 +705,7 @@ dog_run_think()
maps\mp\zombies\_zm_net::network_safe_play_fx_on_tag( "dog_fx", 2, level._effect["dog_eye_glow"], self.fx_dog_eye, "tag_origin" );
assert( isdefined( self.fx_dog_trail ) );
maps\mp\zombies\_zm_net::network_safe_play_fx_on_tag( "dog_fx", 2, self.fx_dog_trail_type, self.fx_dog_trail, "tag_origin" );
self playloopsound( self.fx_dog_trail_sound );
self sys::playloopsound( self.fx_dog_trail_sound );
while ( true )
{

View File

@ -640,7 +640,7 @@ prespawn()
self.noplayermeleeblood = 1;
self.paralyzer_hit_callback = ::paralyzer_callback;
self.paralyzer_slowtime = 0;
self.paralyzer_score_time_ms = sys::gettime();
self.paralyzer_score_time_ms = gettime();
self.ignore_slowgun_anim_rates = undefined;
self.reset_anim = ::ghost_reset_anim;
self.custom_springpad_fling = ::ghost_springpad_fling;
@ -972,9 +972,9 @@ find_flesh()
else if ( isdefined( self.is_spawned_in_ghost_zone ) && self.is_spawned_in_ghost_zone )
self.find_target = 1;
self.zombie_path_timer = sys::gettime() + randomfloatrange( 1, 3 ) * 1000;
self.zombie_path_timer = gettime() + randomfloatrange( 1, 3 ) * 1000;
while ( sys::gettime() < self.zombie_path_timer )
while ( gettime() < self.zombie_path_timer )
wait 0.1;
self notify( "path_timer_done" );
@ -2019,7 +2019,7 @@ sndghostroundmus()
ent endon( "sndGhostRoundEnd" );
ent sys::playsound( "mus_ghost_round_start" );
wait 11;
ent playloopsound( "mus_ghost_round_loop", 3 );
ent sys::playloopsound( "mus_ghost_round_loop", 3 );
}
sndghostroundmus_end()
@ -2047,7 +2047,7 @@ sndghostroundready()
{
playsoundatposition( "zmb_ghost_round_srt", mansion );
ent = sys::spawn( "script_origin", mansion );
ent playloopsound( "zmb_ghost_round_lp", 3 );
ent sys::playloopsound( "zmb_ghost_round_lp", 3 );
ent thread sndghostroundready_stoplp();
break;
}
@ -2464,14 +2464,14 @@ ghost_round_presentation_think()
if ( can_start_ghost_round_presentation_stage_2() )
{
level.zombie_ghost_round_states.presentation_stage_2_started = 1;
level.sndmansionent playloopsound( "zmb_ghost_round_lp_quiet", 3 );
level.sndmansionent sys::playloopsound( "zmb_ghost_round_lp_quiet", 3 );
level setclientfield( "ghost_round_light_state", 1 );
}
if ( can_start_ghost_round_presentation_stage_3() )
{
level.zombie_ghost_round_states.presentation_stage_3_started = 1;
level.sndmansionent playloopsound( "zmb_ghost_round_lp_loud", 3 );
level.sndmansionent sys::playloopsound( "zmb_ghost_round_lp_loud", 3 );
if ( isdefined( level.ghost_round_presentation_ghost ) )
level.ghost_round_presentation_ghost thread ghost_round_presentation_sound();
@ -2605,7 +2605,7 @@ init_time_bomb_ghost_rounds()
}
}
is_sys::ghost()
is_ghost()
{
return !( isdefined( self.is_ghost ) && self.is_ghost );
}
@ -2812,7 +2812,7 @@ devgui_warp_to_mansion()
#/
}
devgui_toggle_no_sys::ghost()
devgui_toggle_no_ghost()
{
/#
level.force_no_ghost = !level.force_no_ghost;

View File

@ -180,7 +180,7 @@ leaper_init()
self thread leaper_check_zone();
self thread leaper_check_no_jump();
self thread leaper_watch_enemy();
self.combat_sys::animmode = ::leaper_combat_sys::animmode;
self.combat_animmode = ::leaper_combat_animmode;
level thread maps\mp\zombies\_zm_spawner::zombie_death_event( self );
self thread maps\mp\zombies\_zm_spawner::enemy_death_detection();
self thread leaper_elevator_failsafe();
@ -387,12 +387,12 @@ leaper_check_wall()
self endon( "death" );
if ( !isdefined( self.next_leap_time ) )
self.next_leap_time = sys::gettime() + 500;
self.next_leap_time = gettime() + 500;
if ( is_true( self.sliding_on_goo ) || is_true( self.is_leaping ) )
return;
if ( sys::gettime() > self.next_leap_time && !is_true( self.no_jump ) )
if ( gettime() > self.next_leap_time && !is_true( self.no_jump ) )
{
wall_anim = [];
@ -426,7 +426,7 @@ leaper_check_wall()
self.ignoreall = 0;
self.is_leaping = 0;
self thread maps\mp\zombies\_zm_ai_basic::find_flesh();
self.next_leap_time = sys::gettime() + 500;
self.next_leap_time = gettime() + 500;
}
}
}
@ -484,7 +484,7 @@ leaper_check_no_jump()
melee_anim_func()
{
self.next_leap_time = sys::gettime() + 1500;
self.next_leap_time = gettime() + 1500;
self sys::animmode( "gravity" );
}
@ -775,7 +775,7 @@ leaper_watch_enemy()
}
}
leaper_combat_sys::animmode()
leaper_combat_animmode()
{
self sys::animmode( "gravity", 0 );
}
@ -1034,7 +1034,7 @@ leaper_traverse_watcher()
leaper_playable_area_failsafe()
{
self endon( "death" );
self.leaper_failsafe_start_time = sys::gettime();
self.leaper_failsafe_start_time = gettime();
playable_area = sys::getentarray( "player_volume", "script_noteworthy" );
b_outside_playable_space_this_frame = 0;
self.leaper_outside_playable_space_time = -2;
@ -1043,7 +1043,7 @@ leaper_playable_area_failsafe()
{
b_outside_playable_last_check = b_outside_playable_space_this_frame;
b_outside_playable_space_this_frame = is_leaper_outside_playable_space( playable_area );
n_current_time = sys::gettime();
n_current_time = gettime();
if ( b_outside_playable_space_this_frame && !b_outside_playable_last_check )
self.leaper_outside_playable_space_time = n_current_time;

View File

@ -247,7 +247,7 @@ traversal_booster_fx_watcher()
{
self.fx_field = self.fx_field | 128;
self.sndloopent sys::playsound( "zmb_ai_mechz_rocket_start" );
self.sndloopent playloopsound( "zmb_ai_mechz_rocket_loop", 0.75 );
self.sndloopent sys::playloopsound( "zmb_ai_mechz_rocket_loop", 0.75 );
}
else if ( notetrack == "booster_off" )
{
@ -282,7 +282,7 @@ booster_fx_watcher()
{
self.fx_field = self.fx_field | 128;
self.sndloopent sys::playsound( "zmb_ai_mechz_rocket_start" );
self.sndloopent playloopsound( "zmb_ai_mechz_rocket_loop", 0.75 );
self.sndloopent sys::playloopsound( "zmb_ai_mechz_rocket_loop", 0.75 );
}
else if ( notetrack == "booster_off" )
{
@ -565,7 +565,7 @@ mechz_attach_objects()
trigger_height = 15;
self.m_claw_damage_trigger = sys::spawn( "trigger_damage", org, trigger_spawnflags, trigger_radius, trigger_height );
self.m_claw_damage_trigger.angles = ang;
self.m_claw_damage_trigger enablesys::linkto();
self.m_claw_damage_trigger enablelinkto();
self.m_claw_damage_trigger sys::linkto( self, "tag_claw" );
self thread mechz_claw_damage_trigger_thread();
self attach( "c_zom_mech_faceplate", "J_Helmet", 0 );
@ -1550,7 +1550,7 @@ damage_prone_players()
melee_anim_func()
{
self.next_leap_time = sys::gettime() + 1500;
self.next_leap_time = gettime() + 1500;
}
mechz_launch_armor_piece()

View File

@ -193,7 +193,7 @@ claw_grapple()
self sys::playsound( "zmb_ai_mechz_claw_fire" );
self.m_claw moveto( v_enemy_origin, n_time );
self.m_claw thread check_for_claw_move_complete();
self.m_claw playloopsound( "zmb_ai_mechz_claw_loop_out", 0.1 );
self.m_claw sys::playloopsound( "zmb_ai_mechz_claw_loop_out", 0.1 );
self.e_grabbed = undefined;
do
@ -235,7 +235,7 @@ claw_grapple()
{
self.e_grabbed set_clientfield_alt_toplayer( "mechz_grab", self.e_grabbed, 1 );
}
self.e_grabbed playersys::linktodelta( self.m_claw, "tag_attach_player" );
self.e_grabbed playerlinktodelta( self.m_claw, "tag_attach_player" );
self.e_grabbed setplayerangles( vectortoangles( self.origin - self.e_grabbed.origin ) );
self.e_grabbed sys::playsound( "zmb_ai_mechz_claw_grab" );
self.e_grabbed setstance( "stand" );
@ -290,7 +290,7 @@ claw_grapple()
v_claw_origin = self sys::gettagorigin( "tag_claw" );
v_claw_angles = self sys::gettagangles( "tag_claw" );
self.m_claw moveto( v_claw_origin, max( 0.05, n_time ) );
self.m_claw playloopsound( "zmb_ai_mechz_claw_loop_in", 0.1 );
self.m_claw sys::playloopsound( "zmb_ai_mechz_claw_loop_in", 0.1 );
self.m_claw waittill( "movedone" );
v_claw_origin = self sys::gettagorigin( "tag_claw" );
v_claw_angles = self sys::gettagangles( "tag_claw" );
@ -489,7 +489,7 @@ should_do_claw_attack()
return false;
}
if ( isdefined( self.last_claw_time ) && sys::gettime() - self.last_claw_time < level.mechz_claw_cooldown_time )
if ( isdefined( self.last_claw_time ) && gettime() - self.last_claw_time < level.mechz_claw_cooldown_time )
{
/#
if ( getdvarint( #"_id_E7121222" ) > 1 )
@ -565,7 +565,7 @@ mechz_do_claw_grab()
#/
assert( isdefined( self.favoriteenemy ) );
self thread mechz_kill_claw_watcher();
self.last_claw_time = sys::gettime();
self.last_claw_time = gettime();
target_pos = self.favoriteenemy.origin + vectorscale( ( 0, 0, 1 ), 30.0 );
self thread mechz_stop_basic_find_flesh();
self.ai_state = "grapple_attempt";
@ -622,7 +622,7 @@ mechz_claw_cleanup()
n_dist = distance( self.m_claw.origin, v_claw_origin );
n_time = n_dist / 1000;
self.m_claw moveto( v_claw_origin, max( 0.05, n_time ) );
self.m_claw playloopsound( "zmb_ai_mechz_claw_loop_in", 0.1 );
self.m_claw sys::playloopsound( "zmb_ai_mechz_claw_loop_in", 0.1 );
self.m_claw waittill( "movedone" );
v_claw_origin = self sys::gettagorigin( "tag_claw" );
v_claw_angles = self sys::gettagangles( "tag_claw" );

View File

@ -25,7 +25,7 @@ init_flamethrower_triggers()
assert( isdefined( level.flamethrower_trigger_array ) && level.flamethrower_trigger_array.size >= 4 );
for ( i = 0; i < level.flamethrower_trigger_array.size; i++ )
level.flamethrower_trigger_array[i] enablesys::linkto();
level.flamethrower_trigger_array[i] enablelinkto();
}
mechz_flamethrower_initial_setup()
@ -381,7 +381,7 @@ zombie_burning_fx()
zombie_burning_audio()
{
self playloopsound( "zmb_fire_loop" );
self sys::playloopsound( "zmb_fire_loop" );
self waittill_any( "death", "stop_flame_damage" );
if ( isdefined( self ) && isalive( self ) )
@ -505,7 +505,7 @@ should_do_flamethrower_attack()
return false;
}
if ( isdefined( self.last_flamethrower_time ) && sys::gettime() - self.last_flamethrower_time < level.mechz_flamethrower_cooldown_time )
if ( isdefined( self.last_flamethrower_time ) && gettime() - self.last_flamethrower_time < level.mechz_flamethrower_cooldown_time )
{
/#
if ( getdvarint( #"_id_E7121222" ) > 1 )
@ -553,7 +553,7 @@ mechz_do_flamethrower_attack( tank_sweep )
self.ai_state = "flamethrower_attack";
self sys::setgoalpos( self.origin );
self clearanim( %root, 0.2 );
self.last_flamethrower_time = sys::gettime();
self.last_flamethrower_time = gettime();
self thread mechz_kill_flamethrower_watcher();
if ( !isdefined( self.flamethrower_trigger ) && !isDefined( self.flamethrower_fx ) )

View File

@ -148,10 +148,10 @@ screecher_spawning_logic()
if ( isdefined( spawn_point ) )
playsoundatposition( "zmb_vocals_screecher_spawn", spawn_point.origin );
delay_time = sys::gettime() + 5000;
delay_time = gettime() + 5000;
now_zone = sys::getent( "screecher_spawn_now", "targetname" );
while ( sys::gettime() < delay_time )
while ( gettime() < delay_time )
{
in_zone = 0;
@ -361,9 +361,9 @@ screecher_find_flesh()
else
self thread screecher_runaway();
self.zombie_path_timer = sys::gettime() + randomfloatrange( 1, 3 ) * 1000;
self.zombie_path_timer = gettime() + randomfloatrange( 1, 3 ) * 1000;
while ( sys::gettime() < self.zombie_path_timer )
while ( gettime() < self.zombie_path_timer )
wait 0.1;
self notify( "path_timer_done" );
@ -473,7 +473,7 @@ play_screecher_breathing_audio()
self.loopsoundent sys::linkto( self, "tag_origin" );
}
self.loopsoundent playloopsound( "zmb_vocals_screecher_breath" );
self.loopsoundent sys::playloopsound( "zmb_vocals_screecher_breath" );
}
screecher_rise()
@ -499,7 +499,7 @@ screecher_zombie_think()
height_tolerance = 32;
self.state = "chase_init";
self.isattacking = 0;
self.nextspecial = sys::gettime();
self.nextspecial = gettime();
for (;;)
{
@ -597,11 +597,11 @@ screecher_fly_to_player( player )
self sys::linkto( self.anchor );
anim_id_back = self getanimfromasd( "zm_jump_land_success_fromback", 0 );
anim_id_front = self getanimfromasd( "zm_jump_land_success_fromfront", 0 );
end_time = sys::gettime() + 2500;
end_time = gettime() + 2500;
dist = undefined;
dist_update = undefined;
while ( end_time > sys::gettime() )
while ( end_time > gettime() )
{
goal_pos_back = getstartorigin( player.origin, player.angles, anim_id_back );
goal_pos_front = getstartorigin( player.origin, player.angles, anim_id_front );
@ -699,7 +699,7 @@ screecher_start_attack()
}
self.state = "attacking";
self.attack_time = sys::gettime();
self.attack_time = gettime();
if ( !getdvarint( #"scr_screecher_poison" ) )
player startpoisoning();
@ -761,7 +761,7 @@ screecher_attacking()
return;
}
if ( self.attack_time < sys::gettime() )
if ( self.attack_time < gettime() )
{
scratch_score = 5;
players = sys::getplayers();
@ -771,7 +771,7 @@ screecher_attacking()
if ( player.health > 0 && !( isdefined( killed_player ) && killed_player ) )
{
self.attack_delay = self.attack_delay_base + randomint( self.attack_delay_offset );
self.attack_time = sys::gettime() + self.attack_delay;
self.attack_time = gettime() + self.attack_delay;
self thread claw_fx( player, self.attack_delay * 0.001 );
self sys::playsound( "zmb_vocals_screecher_attack" );
player playsoundtoplayer( "zmb_screecher_scratch", player );