X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftriggers.qh;h=2b8274f4b890aa473b5432de2415bb1719e925a1;hp=915e048666b5d2033122abf0d118e1132097e748;hb=c039d054a46888048d214000273ccfc63e4611b6;hpb=47ac01ac700f05fceef988e8051282f0d41ddf6c diff --git a/qcsrc/common/triggers/triggers.qh b/qcsrc/common/triggers/triggers.qh index 915e04866..2b8274f4b 100644 --- a/qcsrc/common/triggers/triggers.qh +++ b/qcsrc/common/triggers/triggers.qh @@ -1,5 +1,4 @@ -#ifndef TRIGGERS_H -#define TRIGGERS_H +#pragma once const float SF_TRIGGER_INIT = 1; const float SF_TRIGGER_UPDATE = 2; @@ -8,8 +7,6 @@ const float SF_TRIGGER_RESET = 4; 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 @@ -18,7 +15,7 @@ const float SPAWNFLAG_NOTOUCH = 1; .float height; .float nottargeted; -#define IFTARGETED if(!self.nottargeted && self.targetname != "") +#define IFTARGETED if(!this.nottargeted && this.targetname != "") .float lip; @@ -30,8 +27,12 @@ string trigger_magicear_processmessage_forallears(entity source, float teamsay, 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; @@ -52,5 +53,3 @@ const int ACTIVE_IDLE = 2; const int ACTIVE_BUSY = 2; const int ACTIVE_TOGGLE = 3; #endif - -#endif