// Globals
-float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_midair, g_minstagib, g_pinata, g_norecoil, g_bloodloss;
+float g_cloaked, g_footsteps, g_grappling_hook, g_minstagib;
float g_warmup_limit;
float g_warmup_allguns;
float g_warmup_allow_timeout;
float g_race_qualifying;
-float inWarmupStage;
+float warmup_stage;
float g_pickup_respawntime_weapon;
float g_pickup_respawntime_superweapon;
float g_pickup_respawntime_ammo;
float maxclients;
// flag set on worldspawn so that the code knows if it is dedicated or not
-float server_is_dedicated;
+float server_is_dedicated;
// Fields
//.float style;
//.float skill;
.float sounds;
-.float platmovetype;
+.string platmovetype;
+.float platmovetype_start, platmovetype_end;
.string killtarget;
.float play_time;
.float respawn_flags;
.float respawn_time;
+.float respawn_time_max;
.float death_time;
.float fade_time;
.float fade_rate;
.void() weapon_think;
//float PLAYER_WEAPONSELECTION_DELAY = );
-float PLAYER_WEAPONSELECTION_SPEED = 18;
-vector PLAYER_WEAPONSELECTION_RANGE = '0 20 -40';
+const float PLAYER_WEAPONSELECTION_SPEED = 18;
+const vector PLAYER_WEAPONSELECTION_RANGE = '0 20 -40';
// weapon states (self.weaponentity.state)
-float WS_CLEAR = 0; // no weapon selected
-float WS_RAISE = 1; // raise frame
-float WS_DROP = 2; // deselecting frame
-float WS_INUSE = 3; // fire state
-float WS_READY = 4; // idle frame
+const float WS_CLEAR = 0; // no weapon selected
+const float WS_RAISE = 1; // raise frame
+const float WS_DROP = 2; // deselecting frame
+const float WS_INUSE = 3; // fire state
+const float WS_READY = 4; // idle frame
// there is 2 weapon tics that can run in one server frame
#define W_TICSPERFRAME 2
float nJoinAllowed(entity ignore);
.float spawnshieldtime;
+.float item_spawnshieldtime;
.entity flagcarried;
void FixIntermissionClient(entity e);
void FixClientCvars(entity e);
-WEPSET_DECLARE_A(weaponsInMap);
+WepSet weaponsInMap;
.float respawn_countdown; // next number to count
.string message2;
-vector railgun_start, railgun_end; // filled by FireRailgunBullet, used by damage code for head shot
.float stat_allow_oldnexbeam;
// reset to 0 on weapon switch
.string target2;
.string target3;
.string target4;
+.string curvetarget;
.float target_random;
.float trigger_reverse;
-// Nexball
+// Nexball
.entity ballcarried; // Also used for keepaway
.float metertime;
float g_nexball_meter_period;
.float last_pickup;
-.float hit_time;
-.float typehit_time;
+.float hit_time;
+.float typehit_time;
.float stat_leadlimit;
.float spectatee_status;
.float zoomstate;
-.float bloodloss_timer;
.float restriction;
.entity clientdata;
.float player_blocked;
-.float frozen; // for freeze attacks
-.float revive_progress;
-.float revive_speed; // NOTE: multiplier (anything above 1 is instaheal)
-.entity iceblock;
+.float freezetag_frozen;
.entity muzzle_flash;
.float misc_bulletcounter; // replaces uzi & hlac bullet counter.