X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fsubs.qh;h=1ce3ea2e9e842864e7315270fab82622a784af81;hp=ea8ef3057425b28b9e260785a314da659bfbad7a;hb=3220cab5a7b69ced4a641504a6a5f4eccf2d3bfc;hpb=d9b16a719396d1afe1a767dd35e8cc5de779a22d

diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/triggers/subs.qh
index ea8ef3057..1ce3ea2e9 100644
--- a/qcsrc/common/triggers/subs.qh
+++ b/qcsrc/common/triggers/subs.qh
@@ -9,55 +9,47 @@
 	#define SUB_ORIGIN			origin
 	#define SUB_SETORIGIN(s,v)	setorigin((s), (v))
 	#define SUB_NEXTTHINK		nextthink
-	#define SUB_THINK			think
+	#define SUB_THINK(e, f)     setthink(e, f)
+	#define SUB_THUNK(e)        getthink(e)
 	#define SUB_LTIME			ltime
 	#define SUB_FLAGS			flags
 
 #elif defined(CSQC)
 
-	void _Movetype_LinkEdict(float touch_triggers);
+	void _Movetype_LinkEdict(entity this, float touch_triggers);
 
 	#define SUB_ANGLES(s)	(s).move_angles
 	#define SUB_VELOCITY	move_velocity
 	#define SUB_AVELOCITY	move_avelocity
 	#define SUB_ORIGIN		move_origin
 	#define SUB_NEXTTHINK	move_nextthink
-	#define SUB_THINK		move_think
+	#define SUB_THINK(e, f) ((e).move_think = (f))
+	#define SUB_THUNK(e)    ((e).move_think)
 	#define SUB_LTIME		move_ltime
 	#define SUB_FLAGS		move_flags
 
+.vector move_origin;
+
 	void SUB_SETORIGIN(entity s, vector v)
 	{
 		s.move_origin = v;
-		entity oldself = self;
-		self = s;
-		_Movetype_LinkEdict(true);
-		self = oldself;
+		_Movetype_LinkEdict(s, true);
 	}
 
 #endif
 
-void SUB_Remove();
+
 void SUB_SetFade (entity ent, float when, float fading_time);
 void SUB_VanishOrRemove (entity ent);
 
 .vector		finaldest, finalangle; 		//plat.qc stuff
-.void()		think1;
+.void(entity this) think1;
 .float state;
 .float		t_length, t_width;
 
 .vector destvec;
 .vector destvec2;
 
-// player animation state
-.float animstate_startframe;
-.float animstate_numframes;
-.float animstate_framerate;
-.float animstate_starttime;
-.float animstate_endtime;
-.float animstate_override;
-.float animstate_looping;
-
 .float	delay;
 .float	wait;
 .float	lip;
@@ -66,7 +58,7 @@ void SUB_VanishOrRemove (entity ent);
 .string  platmovetype;
 .float platmovetype_start, platmovetype_end;
 
-entity activator;
+//entity activator;
 
 .string killtarget;