Merge branch 'master' into TimePath/issue-1170

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / anim / keyframe.c

diff --git a/qcsrc/menu/anim/keyframe.c b/qcsrc/menu/anim/keyframe.c
index e5f27a9477c2e046370e8b36a3a8357a6f9c1760..3bcda94e692939b733c668cf09e46b27e59364c6 100644 (file)
--- a/qcsrc/menu/anim/keyframe.c
+++ b/qcsrc/menu/anim/keyframe.c
@@ -31,7 +31,7 @@ entity makeKeyframe(entity obj, void(entity, float) objSetter, float animDuratio
        return me;
 }
 
-entity addEasingKeyframe(entity me, float animDurationTime, float animEnd, float(float, float, float, float) func)
+entity Keyframe_addEasing(entity me, float animDurationTime, float animEnd, float(float, float, float, float) func)
 {
        entity other;
        other = makeEasing(me.object, me.setter, func, getNewChildStart(me), getNewChildDuration(me, animDurationTime), getNewChildValue(me), animEnd);
@@ -65,7 +65,7 @@ float getNewChildValue(entity me)
                return me.startValue;
 }
 
-void addAnimKeyframe(entity me, entity other)
+void Keyframe_addAnim(entity me, entity other)
 {
        if(other.parent)
                error("Can't add already added anim!");
@@ -75,8 +75,7 @@ void addAnimKeyframe(entity me, entity other)
 
        other.parent = me;
 
-       entity f, l;
-       f = me.firstChild;
+       entity l;
        l = me.lastChild;
 
        if(l)
@@ -92,7 +91,7 @@ void addAnimKeyframe(entity me, entity other)
        me.lastChild = other;
 }
 
-float calcValueKeyframe(entity me, float tickTime, float animDuration, float animStartValue, float animDelta)
+float Keyframe_calcValue(entity me, float tickTime, float animDuration, float animStartValue, float animDelta)
 {
        if (me.currentChild)
                if (me.currentChild.isFinished(me.currentChild))