X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fsubs.qh;h=6a844261379a971e3d76da1a371008aac2c3f63a;hb=faabb9816d6a3ec67230da0bd37dd4f59abf47c7;hp=ea8ef3057425b28b9e260785a314da659bfbad7a;hpb=86c9dc7c3696c329496b06375c1e79fb407401ce;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/triggers/subs.qh
index ea8ef3057..6a8442613 100644
--- a/qcsrc/common/triggers/subs.qh
+++ b/qcsrc/common/triggers/subs.qh
@@ -15,7 +15,7 @@
 
 #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
@@ -26,18 +26,17 @@
 	#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);
 
@@ -49,15 +48,6 @@ void SUB_VanishOrRemove (entity ent);
 .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 +56,7 @@ void SUB_VanishOrRemove (entity ent);
 .string  platmovetype;
 .float platmovetype_start, platmovetype_end;
 
-entity activator;
+//entity activator;
 
 .string killtarget;