Merge branch 'master' into DefaultUser/func_button_relay

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

diff --git a/qcsrc/menu/anim/animation.qc b/qcsrc/menu/anim/animation.qc
index 09bf77217f142c28d62c491df1e86241af3b8e2f..c651a4ffc4fcfd277b208b46e457d675e43ba30d 100644 (file)
--- a/qcsrc/menu/anim/animation.qc
+++ b/qcsrc/menu/anim/animation.qc
@@ -1,34 +1,7 @@
-#ifndef ANIM_ANIMATION_H
-       #define ANIM_ANIMATION_H
-       CLASS(Animation, Object)
-               METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float));
-               METHOD(Animation, update, void(entity, float, float, float));
-               METHOD(Animation, setTimeStartEnd, void(entity, float, float));
-               METHOD(Animation, setTimeStartDuration, void(entity, float, float));
-               METHOD(Animation, setValueStartEnd, void(entity, float, float));
-               METHOD(Animation, setValueStartDelta, void(entity, float, float));
-               METHOD(Animation, setObjectSetter, void(entity, entity, void(entity, float)));
-               METHOD(Animation, tick, void(entity, float));
-               METHOD(Animation, calcValue, float(entity, float, float, float, float));
-               METHOD(Animation, isStopped, float(entity));
-               METHOD(Animation, stopAnim, void(entity));
-               METHOD(Animation, resumeAnim, void(entity));
-               METHOD(Animation, isFinished, float(entity));
-               METHOD(Animation, finishAnim, void(entity));
-               ATTRIB(Animation, object, entity, NULL)
-               void setterDummy(entity, float) {}
-               ATTRIB(Animation, setter, void(entity, float), setterDummy)
-               ATTRIB(Animation, value, float, 0)
-               ATTRIB(Animation, startTime, float, 0)
-               ATTRIB(Animation, duration, float, 0)
-               ATTRIB(Animation, startValue, float, 0)
-               ATTRIB(Animation, delta, float, 0)
-               ATTRIB(Animation, stopped, float, false)
-               ATTRIB(Animation, finished, float, false)
-       ENDCLASS(Animation)
-#endif
-
-#ifdef IMPLEMENTATION
+#include "animation.qh"
+
+#include "../menu.qh"
+
        METHOD(Animation, configureAnimation, void(entity this, entity obj, void(entity, float) objSetter, float animStartTime, float animDuration, float animStartValue, float animEndValue))
        {
                this.setObjectSetter(this, obj, objSetter);
@@ -60,12 +33,6 @@
                this.delta = e - s;
        }
 
-       METHOD(Animation, setValueStartDelta, void(entity this, float s, float d))
-       {
-               this.startValue = s;
-               this.delta = d;
-       }
-
        METHOD(Animation, setObjectSetter, void(entity this, entity o, void(entity, float) s))
        {
                this.object = o;
@@ -113,5 +80,3 @@
                this.finished = true;
                this.setter(this.object, this.value);
        }
-
-#endif