Merge branch 'master' into tzork/ents-onoff

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 26e7075d3c3943ca5b3033a90eeb4ea9bd5ad0e0..f452e5110678cdf184e231ae3f00421ad03e03bc 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -642,4 +642,6 @@ string deathmessage;
 #define ACTIVE_BUSY    2
 #define ACTIVE_TOGGLE  3
 .float active;
-.float (float act_state) setactive;
\ No newline at end of file
+.float (float act_state) setactive;
+=======
+.entity realowner;