Merge branch 'master' into DefaultUser/trigger_cleanup

[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 ead4e90cddfec9afe458b638c78a3a62e2025adc..58897200283029dfc056fa4dc4a868e342667b42 100644 (file)
--- a/qcsrc/common/triggers/triggers.qh
+++ b/qcsrc/common/triggers/triggers.qh
@@ -1,51 +1,40 @@
-#ifndef TRIGGERS_H
-#define TRIGGERS_H
+#pragma once
+#include "spawnflags.qh"
 
-const float SF_TRIGGER_INIT = 1;
-const float SF_TRIGGER_UPDATE = 2;
-const float SF_TRIGGER_RESET = 4;
+.bool pushable;
 
-const float    SPAWNFLAG_NOMESSAGE = 1;
-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;
+#define IFTARGETED if(this.targetname && this.targetname != "")
 
 .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);
 
-void spawnfunc_trigger_once();
 string trigger_magicear_processmessage_forallears(entity source, float teamsay, entity privatesay, string msgin);
 
 void target_voicescript_next(entity pl);
 void target_voicescript_clear(entity pl);
+
+void SUB_UseTargets_PreventReuse(entity this, entity actor, entity trigger);
 #endif
 
+.float sub_target_used;
+
 .float volume, atten;
 
 .vector dest;
 
-#ifdef CSQC
-void trigger_common_read(bool withtarget);
-void trigger_remove_generic();
+void FixSize(entity e);
 
-float WarpZoneLib_ExactTrigger_Touch();
-#define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return
+#ifdef CSQC
+void trigger_common_read(entity this, bool withtarget);
+void trigger_remove_generic(entity this);
 
 .float active;
 .string target;
@@ -57,5 +46,3 @@ const int ACTIVE_IDLE                 = 2;
 const int ACTIVE_BUSY          = 2;
 const int ACTIVE_TOGGLE                = 3;
 #endif
-
-#endif