Merge branch 'master' into Mario/buff_updates

[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 c50d95b89d8acca5a61b0c8d9542822a9fe7cb9b..474f797afea7ad67e1611b8c12644f836ab0af1d 100644 (file)
--- a/qcsrc/common/triggers/triggers.qh
+++ b/qcsrc/common/triggers/triggers.qh
@@ -10,17 +10,14 @@ const float SPAWNFLAG_NOTOUCH = 1;
 
 .void() trigger_touch;
 
+.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;
 
 // used elsewhere (will fix)
@@ -41,9 +38,6 @@ void target_voicescript_clear(entity pl);
 void trigger_common_read(bool withtarget);
 void trigger_remove_generic();
 
-float WarpZoneLib_ExactTrigger_Touch();
-#define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return
-
 .float active;
 .string target;
 .string targetname;