Merge branch 'terencehill/menu_fixes' into 'master'

[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 fa68533f4afcb594a6d727389fc65e4d23c78482..6a844261379a971e3d76da1a371008aac2c3f63a 100644 (file)
--- a/qcsrc/common/triggers/subs.qh
+++ b/qcsrc/common/triggers/subs.qh
@@ -29,13 +29,14 @@
 .vector move_origin;
 
        void SUB_SETORIGIN(entity s, vector v)
-       {SELFPARAM();
+       {
                s.move_origin = v;
                _Movetype_LinkEdict(s, true);
        }
 
 #endif
 
+
 void SUB_SetFade (entity ent, float when, float fading_time);
 void SUB_VanishOrRemove (entity ent);
 
@@ -47,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;
@@ -64,7 +56,7 @@ void SUB_VanishOrRemove (entity ent);
 .string  platmovetype;
 .float platmovetype_start, platmovetype_end;
 
-entity activator;
+//entity activator;
 
 .string killtarget;