Merge branch 'drjaska/damagetext' into 'master'

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

diff --git a/qcsrc/common/mapobjects/triggers.qh b/qcsrc/common/mapobjects/triggers.qh
index 73113b4b51c69b004e6eaf02e6d924a481fd815e..1fac7907a57b57fa9701738373d369d70b1ce5e0 100644 (file)
--- a/qcsrc/common/mapobjects/triggers.qh
+++ b/qcsrc/common/mapobjects/triggers.qh
@@ -10,8 +10,14 @@
 
 .float lip;
 
+// handy fields used by a lot of the codebase, but more importantly used by map objects
+.float cnt;
+.float count;
+
 // used elsewhere (will fix)
 #ifdef SVQC
+.string message2;
+
 void trigger_common_write(entity this, bool withtarget);
 
 string trigger_magicear_processmessage_forallears(entity source, float teamsay, entity privatesay, string msgin);
@@ -46,7 +52,6 @@ void generic_netlinked_legacy_use(entity this, entity actor, entity trigger);
 void trigger_common_read(entity this, bool withtarget);
 void trigger_remove_generic(entity this);
 
-.float active;
 .string target;
 .string targetname;
 #endif