Merge remote-tracking branch 'origin/terencehill/misc_hud_fixes'

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

diff --git a/qcsrc/server/constants.qh b/qcsrc/server/constants.qh
index 7cefb530d9f14be48ec3fb4f657fd1a07b0bbe3f..522bb2ffca0dc94174ef97e50321431a9c113e62 100644 (file)
--- a/qcsrc/server/constants.qh
+++ b/qcsrc/server/constants.qh
@@ -106,6 +106,7 @@ float       TE_KNIGHTSPIKE                          = 8;
 float  TE_LIGHTNING3                           = 9;
 float  TE_LAVASPLASH                           = 10;
 float  TE_TELEPORT                             = 11;
+float TE_BEAM                                  = 13;           // grappling hook
 
 float  UPDATE_GENERAL                          = 0;
 float  UPDATE_STATIC                           = 1;
@@ -133,27 +134,12 @@ 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
 
 //float        POWERUP_INVINCIBLE_TAKEDAMAGE           = 0.2; // received damage multiplier for invincible powerup
 
-
-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
-float COLOR_TEAM4      = 10; // pink
-
 float NUM_PLAYERSKINS_TEAMPLAY = 3;
 
 float ASSAULT_VALUE_INACTIVE = 1000;