X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fanim%2Fanimation.qc;fp=qcsrc%2Fmenu%2Fanim%2Fanimation.qc;h=72bcc5e94ec44a294f1b9eaa86b5cad566b0a22d;hb=f532317ada52b5363cb0b74bfbdd38f5015e290c;hp=c20101d870b1e8c15753eb457b4859bf6f852cdf;hpb=e8f359ab180b5871b9c10df0cc667b90bf13b124;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/anim/animation.qc b/qcsrc/menu/anim/animation.qc
index c20101d87..72bcc5e94 100644
--- a/qcsrc/menu/anim/animation.qc
+++ b/qcsrc/menu/anim/animation.qc
@@ -1,35 +1,7 @@
 #include "animation.qh"
-#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 "../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);
@@ -114,5 +86,3 @@
 		this.finished = true;
 		this.setter(this.object, this.value);
 	}
-
-#endif