Merge branch 'terencehill/menu_optimization' into 'master'

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

diff --git a/qcsrc/common/triggers/triggers.qh b/qcsrc/common/triggers/triggers.qh
index 9416f7a16fa93014370006119ea53cc8512ecb27..69d53fba41d9d6707a91d9aba7b1801bdca1c5c2 100644 (file)
--- a/qcsrc/common/triggers/triggers.qh
+++ b/qcsrc/common/triggers/triggers.qh
@@ -10,24 +10,21 @@ const float SPAWNFLAG_NOTOUCH = 1;
 
 .void() trigger_touch;
 
+.bool pushable;
+
+.float antiwall_flag; // Variable to define what to do with func_clientwall
+// 0 == do nothing, 1 == deactivate, 2 == activate
+
 .float height;
 
 .float nottargeted;
 #define IFTARGETED if(!self.nottargeted && self.targetname != "")
 
-.string bgmscript;
-.float bgmscriptattack;
-.float bgmscriptdecay;
-.float bgmscriptsustain;
-.float bgmscriptrelease;
-
 .float lip;
 
-void trigger_setnextthink(entity e, float dtime);
-
 // used elsewhere (will fix)
 #ifdef SVQC
-void trigger_common_write(bool withtarget);
+void trigger_common_write(entity this, bool withtarget);
 
 string trigger_magicear_processmessage_forallears(entity source, float teamsay, entity privatesay, string msgin);
 
@@ -39,12 +36,11 @@ void target_voicescript_clear(entity pl);
 
 .vector dest;
 
+void FixSize(entity e);
+
 #ifdef CSQC
 void trigger_common_read(bool withtarget);
-void trigger_remove_generic();
-
-float WarpZoneLib_ExactTrigger_Touch();
-#define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return
+void trigger_remove_generic(entity this);
 
 .float active;
 .string target;