Improved MoveToTeam.

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / defs.qh

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index d8bc4b027e8dd34816fdc38b822a120f4e1978aa..5befffee4558164437c881ab0194d020adf6897b 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -27,8 +27,6 @@ float bots_would_leave;
 void UpdateFrags(entity player, int f);
 .float totalfrags;
 
-float team1_score, team2_score, team3_score, team4_score;
-
 // flag set on worldspawn so that the code knows if it is dedicated or not
 float server_is_dedicated;
 
@@ -230,7 +228,8 @@ int have_team_spawns_forteams; // if Xth bit is 1 then team X has spawns else it
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force);
 
-float lockteams;
+// WEAPONTODO
+#define DMG_NOWEP (weaponentities[0])
 
 float sv_maxidle;
 float sv_maxidle_spectatorsareidle;
@@ -303,18 +302,8 @@ float servertime, serverprevtime, serverframetime;
 .float floodcontrol_voice;
 .float floodcontrol_voiceteam;
 
-.float stat_shotorg = _STAT(SHOTORG); // networked stat for trueaim HUD
-
 string matchid;
 
-.float last_pickup = _STAT(LAST_PICKUP);
-
-.float hit_time = _STAT(HIT_TIME);
-.float typehit_time = _STAT(TYPEHIT_TIME);
-.float kill_time = _STAT(KILL_TIME);
-
-.float damage_dealt_total = _STAT(DAMAGE_DEALT_TOTAL);
-
 bool radar_showennemies;
 
 #ifdef PROFILING
@@ -371,17 +360,15 @@ const float ACTIVE_TOGGLE         = 3;
 
 .float player_blocked;
 
-.float revive_progress = _STAT(REVIVE_PROGRESS);
 .float revival_time; // time at which player was last revived
 .float revive_speed; // NOTE: multiplier (anything above 1 is instaheal)
+.float freeze_time;
 .entity iceblock;
 .entity frozen_by; // for ice fields
 
 .entity muzzle_flash;
 .float misc_bulletcounter;     // replaces uzi & hlac bullet counter.
 
-.float stat_respawn_time = _STAT(RESPAWN_TIME); // shows respawn time, and is negative when awaiting respawn
-
 .int killindicator_teamchange;
 
 void PlayerUseKey(entity this);