Merge branch 'master' into terencehill/slider_anim_improvements

[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 2a954db36950fbe922dbd3f6ed9b897cf5adc583..5563b969d98bfb4751e29e661b2c97a6c5248c45 100644 (file)
--- a/qcsrc/menu/anim/animation.qc
+++ b/qcsrc/menu/anim/animation.qc
@@ -3,20 +3,20 @@
 #include "../oo/base.qh"
 void setterDummy(entity, float);
 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))
+       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)
        ATTRIB(Animation, setter, void(entity, float), setterDummy)
        ATTRIB(Animation, value, float, 0)