Fix FL_WEAPON flag overlapping FL_JUMPRELEASED. This unintentional change was introdu...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / anim / animhost.qc

diff --git a/qcsrc/menu/anim/animhost.qc b/qcsrc/menu/anim/animhost.qc
index 7826a47b79523f3de5ac730be832bf1fbe6b7423..3009ab4eaf8b00f47fd4efdf362b3c0ba42b67b0 100644 (file)
--- a/qcsrc/menu/anim/animhost.qc
+++ b/qcsrc/menu/anim/animhost.qc
@@ -1,27 +1,10 @@
+#include "animhost.qh"
+
 #include "../menu.qh"
 
-#ifndef ANIM_ANIMHOST_H
-       #define ANIM_ANIMHOST_H
-       CLASS(AnimHost, Object)
-               METHOD(AnimHost, addAnim, void(entity, entity));
-               METHOD(AnimHost, removeAnim, void(entity, entity));
-               METHOD(AnimHost, removeAllAnim, void(entity));
-               METHOD(AnimHost, removeObjAnim, void(entity, entity));
-               METHOD(AnimHost, stopAllAnim, void(entity));
-               METHOD(AnimHost, stopObjAnim, void(entity, entity));
-               METHOD(AnimHost, resumeAllAnim, void(entity));
-               METHOD(AnimHost, resumeObjAnim, void(entity, entity));
-               METHOD(AnimHost, finishAllAnim, void(entity));
-               METHOD(AnimHost, finishObjAnim, void(entity, entity));
-               METHOD(AnimHost, tickAll, void(entity));
-               ATTRIB(AnimHost, firstChild, entity, NULL)
-               ATTRIB(AnimHost, lastChild, entity, NULL)
-       ENDCLASS(AnimHost)
-       .entity nextSibling;
-       .entity prevSibling;
-#endif
-
-#ifdef IMPLEMENTATION
+#include "animation.qh"
+
+    .entity parent;
        METHOD(AnimHost, addAnim, void(entity this, entity other))
        {
                if (other.parent) error("Can't add already added anim!");
@@ -54,7 +37,7 @@
 
                if (n) n.prevSibling = p;
                else this.lastChild = p;
-               remove(other);
+               delete(other);
        }
 
        METHOD(AnimHost, removeAllAnim, void(entity this))
@@ -140,4 +123,3 @@
                        }
                }
        }
-#endif