Merge branch 'master' into tzork/ents-onoff
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / defs.qh
index 26e7075..f452e51 100644 (file)
@@ -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;