Merge branch 'master' into TimePath/scoreboard_elo

[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 5c000cff16d5ce198f7cc3eb75d2107e40e51e9b..82c0916c19228c2dd6605b24a6f503d6b3c07061 100644 (file)
--- a/qcsrc/common/triggers/triggers.qh
+++ b/qcsrc/common/triggers/triggers.qh
@@ -8,8 +8,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 +16,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;
 
@@ -39,8 +37,8 @@ void target_voicescript_clear(entity pl);
 void FixSize(entity e);
 
 #ifdef CSQC
-void trigger_common_read(bool withtarget);
-void trigger_remove_generic();
+void trigger_common_read(entity this, bool withtarget);
+void trigger_remove_generic(entity this);
 
 .float active;
 .string target;