Update default video settings

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

diff --git a/qcsrc/menu/anim/easing.qc b/qcsrc/menu/anim/easing.qc
index e2b02f1365e4af8134985bd0375b30f31e3a0021..3014fa80873a8aa479dcb8cb986c19bf54d9ea35 100644 (file)
--- a/qcsrc/menu/anim/easing.qc
+++ b/qcsrc/menu/anim/easing.qc
@@ -1,21 +1,8 @@
 #include "easing.qh"
-#ifndef ANIM_EASING_H
-       #define ANIM_EASING_H
-       #include "animation.qc"
-       entity makeHostedEasing(entity, void(entity, float), float(float, float, float, float), float, float, float);
-       entity makeEasing(entity, void(entity, float), float(float, float, float, float), float, float, float, float);
-       float easingLinear(float, float, float, float);
-       float easingQuadIn(float, float, float, float);
-       float easingQuadOut(float, float, float, float);
-       float easingQuadInOut(float, float, float, float);
-       CLASS(Easing, Animation)
-               METHOD(Easing, calcValue, float(entity, float, float, float, float));
-               METHOD(Easing, setMath, void(entity, float(float, float, float, float)));
-               ATTRIB(Easing, math, float(float, float, float, float), easingLinear)
-       ENDCLASS(Easing)
-#endif
 
-#ifdef IMPLEMENTATION
+#include "../menu.qh"
+#include "keyframe.qh"
+
        entity makeHostedEasing(entity obj, void(entity, float) objSetter, float(float, float, float, float) func, float animDuration, float animStartValue, float animEnd)
        {
                entity this = makeEasing(obj, objSetter, func, time, animDuration, animStartValue, animEnd);
@@ -63,5 +50,3 @@
                if (tickTime < (animDuration / 2)) return easingQuadIn(tickTime, (animDuration / 2), animStart, (animDelta / 2));
                else return easingQuadOut((tickTime - (animDuration / 2)), (animDuration / 2), (animStart + (animDelta / 2)), (animDelta / 2));
        }
-
-#endif