Merge branch 'master' into divVerent/csqcmodel

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

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 4e9530c8121093eaff46ab533e564d0b5a8224b8..55834f1a6d36bd5f84f20475a908f737c8a6a0a4 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -582,7 +582,7 @@ var vector autocvar_sv_player_viewoffset = '0 0 20';
 var vector autocvar_sv_player_crouch_maxs = '16 16 25';
 var vector autocvar_sv_player_crouch_mins = '-16 -16 -24';
 var vector autocvar_sv_player_crouch_viewoffset = '0 0 20';
-var vector autocvar_sv_player_headsize = '24 24 12';
+noref var vector autocvar_sv_player_headsize = '24 24 12';
 
 #define PL_VIEW_OFS autocvar_sv_player_viewoffset
 #define PL_MIN autocvar_sv_player_mins
@@ -601,3 +601,9 @@ var vector autocvar_sv_player_headsize = '24 24 12';
 #define PL_HEAD_x autocvar_sv_player_headsize_x
 #define PL_HEAD_y autocvar_sv_player_headsize_y
 #define PL_HEAD_z autocvar_sv_player_headsize_z
+
+// spawnpoint prios
+#define SPAWN_PRIO_NEAR_TEAMMATE_FOUND    200
+#define SPAWN_PRIO_NEAR_TEAMMATE_SAMETEAM 100
+#define SPAWN_PRIO_RACE_PREVIOUS_SPAWN     50
+#define SPAWN_PRIO_GOOD_DISTANCE           10