Merge branch 'master' into Lyberta/TeamplayOverhaul2

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 3aed06ee41a22b66d9cb69e1357628e91c90d480..58111fb12bcfea9482a8d89b6d0dbceaf31ab42e 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -219,9 +219,6 @@ bool some_spawn_has_been_used;
 int have_team_spawns; // 0 = no team spawns requested, -1 = team spawns requested but none found, 1 = team spawns requested and found
 int have_team_spawns_forteams; // if Xth bit is 1 then team X has spawns else it has no spawns; team 0 is the "no-team"
 
-// set when showing a kill countdown
-.entity killindicator;
-
 .bool canteamdamage;
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force);
@@ -354,8 +351,6 @@ const int ACTIVE_TOGGLE     = 3;
 
 //float serverflags;
 
-.int team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator
-
 .bool player_blocked;
 
 .float revival_time; // time at which player was last revived
@@ -367,8 +362,6 @@ const int ACTIVE_TOGGLE     = 3;
 .entity muzzle_flash;
 .float misc_bulletcounter;     // replaces uzi & hlac bullet counter.
 
-.int killindicator_teamchange;
-
 void PlayerUseKey(entity this);
 
 USING(spawn_evalfunc_t, vector(entity this, entity player, entity spot, vector current));