X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fanim%2Fanimation.qc;h=d24220fefae0ab9fe4695d8287fcc21c1a2a7bcd;hb=21307f327df5609b82d90496c1c6156d636d1c8d;hp=3039d85b8daff86bcc48ccac4d5a38b64f7eb864;hpb=9c09a961b8674e3a808889d3f34d71855018d3bc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/anim/animation.qc b/qcsrc/menu/anim/animation.qc
index 3039d85b8..d24220fef 100644
--- a/qcsrc/menu/anim/animation.qc
+++ b/qcsrc/menu/anim/animation.qc
@@ -1,21 +1,21 @@
 #ifndef ANIM_ANIMATION_H
 #define ANIM_ANIMATION_H
-#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, 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)
@@ -36,6 +36,12 @@ void Animation_configureAnimation(entity me, entity obj, void(entity, float) obj
 	me.setValueStartEnd(me, animStartValue, animEndValue);
 }
 
+void Animation_update(entity me, float animDuration, float animStartValue, float animEndValue)
+{
+	me.setTimeStartDuration(me, time, animDuration);
+	me.setValueStartEnd(me, animStartValue, animEndValue);
+}
+
 void Animation_setTimeStartEnd(entity me, float s, float e)
 {
 	me.startTime = s;