X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fsubs.qh;h=aebda5d0a33b5a9ac3709b157f2e21a22d69b893;hb=3cfb64730d883ae9ccf0315f365da19345270890;hp=98491820f215da9636d2ce8cd72e7bbffc2e7aaa;hpb=eeec5ec4584c71acbb89db6eea843b48d6ca4c26;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/triggers/subs.qh
index 98491820f..aebda5d0a 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,15 +26,16 @@
 	#define SUB_LTIME		move_ltime
 	#define SUB_FLAGS		move_flags
 
+.vector move_origin;
+
 	void SUB_SETORIGIN(entity s, vector v)
-	{SELFPARAM();
+	{
 		s.move_origin = v;
-		WITH(entity, self, s, _Movetype_LinkEdict(true));
+		_Movetype_LinkEdict(s, true);
 	}
 
 #endif
 
-void SUB_Remove();
 void SUB_SetFade (entity ent, float when, float fading_time);
 void SUB_VanishOrRemove (entity ent);
 
@@ -46,15 +47,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;