X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftriggers.qh;h=8a8eb566c19b2ed844035390e6236e78fd1e18b3;hp=474f797afea7ad67e1611b8c12644f836ab0af1d;hb=a8e9c14803c6ee158f8183701f8e9c8601da9983;hpb=153e558088db2813f7f7dd5367244b5470f4d425

diff --git a/qcsrc/common/triggers/triggers.qh b/qcsrc/common/triggers/triggers.qh
index 474f797af..8a8eb566c 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,7 +7,7 @@ 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
 // 0 == do nothing, 1 == deactivate, 2 == activate
@@ -16,13 +15,13 @@ 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;
 
 // used elsewhere (will fix)
 #ifdef SVQC
-void trigger_common_write(bool withtarget);
+void trigger_common_write(entity this, bool withtarget);
 
 string trigger_magicear_processmessage_forallears(entity source, float teamsay, entity privatesay, string msgin);
 
@@ -34,9 +33,11 @@ void target_voicescript_clear(entity pl);
 
 .vector dest;
 
+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;
@@ -48,5 +49,3 @@ const int ACTIVE_IDLE 		= 2;
 const int ACTIVE_BUSY 		= 2;
 const int ACTIVE_TOGGLE		= 3;
 #endif
-
-#endif