Merge branch 'master' into terencehill/centerprint_stuff

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / Defs.qc

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index afdd9f31f683a2ddc6cd4e6a64fcc001e04b24dd..4ef1d04d6765a3260f0825bb2e88b875970cb968 100644 (file)
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -221,7 +221,6 @@ float nb_pb_period;
 
 // Spectating
 float spectatee_status;
-float prev_spectatee_status;
 
 // short mapname
 string shortmapname;
@@ -259,11 +258,13 @@ float w_deathtype, w_issilent, w_random;
 string w_deathtypestring;
 vector w_org, w_backoff;
 
-float sniperrifle_scope;
+float rifle_scope;
 float nex_scope;
 
 float minelayer_maxmines;
 
+float hagar_maxrockets;
+
 float bgmtime;
 
 string weaponorder_byimpulse;