diff --git a/src/client/progs.src b/src/client/progs.src index dfe6a39..fb554c0 100644 --- a/src/client/progs.src +++ b/src/client/progs.src @@ -24,7 +24,6 @@ ../../../base/src/client/draw.qc init.qc ../../../valve/src/client/flashlight.qc -../../../valve/src/client/player.qc ../../../valve/src/client/entities.qc ../../../valve/src/client/cmds.qc ../../../valve/src/client/game_event.qc diff --git a/src/shared/player.qc b/src/shared/player.qc index 3a84334..474b558 100644 --- a/src/shared/player.qc +++ b/src/shared/player.qc @@ -30,57 +30,54 @@ enumflags class player:NSClientPlayer { /* animation */ - PREDICTED_INT(anim_top); - PREDICTED_FLOAT(anim_top_time); - PREDICTED_FLOAT(anim_top_delay); - PREDICTED_INT(anim_bottom); - PREDICTED_FLOAT(anim_bottom_time); + PREDICTED_INT(anim_top) + PREDICTED_FLOAT(anim_top_time) + PREDICTED_FLOAT(anim_top_delay) + PREDICTED_INT(anim_bottom) + PREDICTED_FLOAT(anim_bottom_time) /* ammo 1 */ - PREDICTED_INT(glock_mag); - PREDICTED_INT(mp5_mag); - PREDICTED_INT(python_mag); - PREDICTED_INT(shotgun_mag); - PREDICTED_INT(crossbow_mag); - PREDICTED_INT(rpg_mag); - PREDICTED_INT(satchel_chg); + PREDICTED_INT(glock_mag) + PREDICTED_INT(mp5_mag) + PREDICTED_INT(python_mag) + PREDICTED_INT(shotgun_mag) + PREDICTED_INT(crossbow_mag) + PREDICTED_INT(rpg_mag) + PREDICTED_INT(satchel_chg) /* ammo 2 */ - PREDICTED_INT(ammo_9mm); - PREDICTED_INT(ammo_357); - PREDICTED_INT(ammo_buckshot); - PREDICTED_INT(ammo_bolt); - PREDICTED_INT(ammo_rocket); - PREDICTED_INT(ammo_uranium); - PREDICTED_INT(ammo_handgrenade); - PREDICTED_INT(ammo_satchel); - PREDICTED_INT(ammo_tripmine); - PREDICTED_INT(ammo_snark); - PREDICTED_INT(ammo_hornet); + PREDICTED_INT(ammo_9mm) + PREDICTED_INT(ammo_357) + PREDICTED_INT(ammo_buckshot) + PREDICTED_INT(ammo_bolt) + PREDICTED_INT(ammo_rocket) + PREDICTED_INT(ammo_uranium) + PREDICTED_INT(ammo_handgrenade) + PREDICTED_INT(ammo_satchel) + PREDICTED_INT(ammo_tripmine) + PREDICTED_INT(ammo_snark) + PREDICTED_INT(ammo_hornet) /* ammo 3 */ - PREDICTED_INT(ammo_m203_grenade); - PREDICTED_INT(ammo_gauss_volume); - PREDICTED_INT(ammo_rpg_state); - PREDICTED_INT(mode_tempstate); + PREDICTED_INT(ammo_m203_grenade) + PREDICTED_INT(ammo_gauss_volume) + PREDICTED_INT(ammo_rpg_state) + PREDICTED_INT(mode_tempstate) /* hunger */ - PREDICTED_INT(sniper_mag); - PREDICTED_INT(chaingun_mag); - PREDICTED_INT(ap9_mag); - PREDICTED_INT(taurus_mag); + PREDICTED_INT(sniper_mag) + PREDICTED_INT(chaingun_mag) + PREDICTED_INT(ap9_mag) + PREDICTED_INT(taurus_mag) - PREDICTED_INT(ammo_ap9); - PREDICTED_INT(ammo_taurus); - PREDICTED_INT(ammo_sniper); - PREDICTED_INT(ammo_gas); - PREDICTED_INT(ammo_medkit); - PREDICTED_INT(mode_silencer); + PREDICTED_INT(ammo_ap9) + PREDICTED_INT(ammo_taurus) + PREDICTED_INT(ammo_sniper) + PREDICTED_INT(ammo_gas) + PREDICTED_INT(ammo_medkit) + PREDICTED_INT(mode_silencer) #ifdef CLIENT - virtual void(void) draw; - virtual float() predraw; - virtual void(void) postdraw; virtual void(float,float) ReceiveEntity; virtual void(void) PredictPreFrame; virtual void(void) PredictPostFrame;