Properly support team field on trigger_multiple

[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 281c4c37581d195500a8d628b874f9f47a77bad9..2b8274f4b890aa473b5432de2415bb1719e925a1 100644 (file)
--- a/qcsrc/common/triggers/triggers.qh
+++ b/qcsrc/common/triggers/triggers.qh
@@ -1,3 +1,5 @@
+#pragma once
+

 const float SF_TRIGGER_INIT = 1;
 const float SF_TRIGGER_UPDATE = 2;
 const float SF_TRIGGER_RESET = 4;
 const float SF_TRIGGER_INIT = 1;
 const float SF_TRIGGER_UPDATE = 2;
 const float SF_TRIGGER_RESET = 4;


@@ -5,34 +7,49 @@ const float SF_TRIGGER_RESET = 4;
 const float    SPAWNFLAG_NOMESSAGE = 1;
 const float    SPAWNFLAG_NOTOUCH = 1;
 
 const float    SPAWNFLAG_NOMESSAGE = 1;
 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;

 
 

-.string bgmscript;
-.float bgmscriptattack;
-.float bgmscriptdecay;
-.float bgmscriptsustain;
-.float bgmscriptrelease;
+.float nottargeted;
+#define IFTARGETED if(!this.nottargeted && this.targetname != "")
+
+.float lip;

 
 // used elsewhere (will fix)
 #ifdef SVQC
 
 // used elsewhere (will fix)
 #ifdef SVQC

-void spawnfunc_trigger_once();
+void trigger_common_write(entity this, bool withtarget);
+

 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);
 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
 
 #endif
 

+.float sub_target_used;
+

 .float volume, atten;
 
 .vector dest;
 
 .float volume, atten;
 
 .vector dest;
 

+void FixSize(entity e);
+

 #ifdef CSQC
 #ifdef CSQC

+void trigger_common_read(entity this, bool withtarget);
+void trigger_remove_generic(entity this);
+

 .float active;
 .string target;
 .string targetname;
 .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