X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftriggers.qh;h=c8e593f9cb53666eb6418b2d18033b7dac31783b;hb=201f6309c92217b63dc34daf004fbb7424096eca;hp=68eaf1a472d0a6dab930b924847a819efd61345a;hpb=1ea8f9fcf058858a9e69f739943a52a5735a8c20;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/triggers.qh b/qcsrc/common/triggers/triggers.qh
index 68eaf1a47..c8e593f9c 100644
--- a/qcsrc/common/triggers/triggers.qh
+++ b/qcsrc/common/triggers/triggers.qh
@@ -1,3 +1,6 @@
+#ifndef TRIGGERS_H
+#define TRIGGERS_H
+
 const float SF_TRIGGER_INIT = 1;
 const float SF_TRIGGER_UPDATE = 2;
 const float SF_TRIGGER_RESET = 4;
@@ -7,20 +10,20 @@ 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)
 #ifdef SVQC
-void spawnfunc_trigger_once();
+void trigger_common_write(bool withtarget);
+
 string trigger_magicear_processmessage_forallears(entity source, float teamsay, entity privatesay, string msgin);
 
 void target_voicescript_next(entity pl);
@@ -31,13 +34,21 @@ 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 active;
 .string target;
 .string targetname;
-#define ACTIVE_NOT 		0
-#define ACTIVE_ACTIVE 	1
-#define ACTIVE_IDLE 	2
-#define ACTIVE_BUSY 	2
-#define ACTIVE_TOGGLE	3
+
+const int ACTIVE_NOT 		= 0;
+const int ACTIVE_ACTIVE 	= 1;
+const int ACTIVE_IDLE 		= 2;
+const int ACTIVE_BUSY 		= 2;
+const int ACTIVE_TOGGLE		= 3;
+#endif
+
 #endif