Anim: cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / subs.qh

diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/triggers/subs.qh
index ea8ef3057425b28b9e260785a314da659bfbad7a..5e3f543fa5441bcc757891fad5083df4f8a930c1 100644 (file)
--- a/qcsrc/common/triggers/subs.qh
+++ b/qcsrc/common/triggers/subs.qh
@@ -26,13 +26,12 @@
        #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;
-               entity oldself = self;
-               self = s;
-               _Movetype_LinkEdict(true);
-               self = oldself;
+               WITH(entity, self, s, _Movetype_LinkEdict(true));
        }
 
 #endif
@@ -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;