Merge branch 'master' into Mario/mutator_minstagib

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

diff --git a/qcsrc/server/constants.qh b/qcsrc/server/constants.qh
index 7cefb530d9f14be48ec3fb4f657fd1a07b0bbe3f..aec1e3256b020878305579b179dfeea42a18e67e 100644 (file)
--- a/qcsrc/server/constants.qh
+++ b/qcsrc/server/constants.qh
@@ -133,8 +133,6 @@ float       MSG_ENTITY                              = 5; // csqc
 //float        GAME_FULLBRIGHT_PLAYERS                 = 64; /// makes the players model fullbright
 //float        GAME_TEAMS                              = 128; /// Teams, red/green/yellow/blue
 
-float  game;   // set to "gamecfg" on spawnfunc_worldspawn
-
 
 //float        POWERUP_STRENGTH_DAMAGE                 = 2; // damage multiplier for strength powerup
 //float        POWERUP_STRENGTH_FORCE                  = 4; // force multiplier for strength powerup
@@ -144,11 +142,6 @@ float      game;   // set to "gamecfg" on spawnfunc_worldspawn
 
 float TE_BEAM                                  = 13;           // grappling hook
 
-// CTF
-float FLAG_BASE = 1;
-float FLAG_CARRY = 2;
-float FLAG_DROPPED = 3;
-
 float COLOR_TEAM1      = 5;  // red
 float COLOR_TEAM2      = 14; // blue
 float COLOR_TEAM3      = 13; // yellow