Merge branch 'master' into terencehill/menu_optimization

[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..19ccde9dca08ec764fa86fd5a0a788e915642d36 100644 (file)
--- 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,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;
-               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 +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;