Merge remote branch 'origin/master' into fruitiex/fruitbalance

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index f452e5110678cdf184e231ae3f00421ad03e03bc..47f514c32b07096e485bb994fc1be4b2090214f9 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -294,6 +294,7 @@ string getTimeoutText(float addOneSecond);
 .entity flagcarried;
 
 .entity lastrocket;
+.entity lastmine;
 
 .float playerid;
 float playerid_last;
@@ -643,5 +644,4 @@ string deathmessage;
 #define ACTIVE_TOGGLE  3
 .float active;
 .float (float act_state) setactive;
-=======
 .entity realowner;