Merge branch 'master' into Mario/minigames_merge

[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 99ccc789681552dd1f5c96cee4244921c39d88b1..3039d85b8daff86bcc48ccac4d5a38b64f7eb864 100644 (file)
--- a/qcsrc/menu/anim/animation.qc
+++ b/qcsrc/menu/anim/animation.qc
@@ -1,5 +1,8 @@
-#ifdef INTERFACE
-CLASS(Animation) EXTENDS(Object)
+#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))
@@ -20,10 +23,9 @@ CLASS(Animation) EXTENDS(Object)
        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)
+       ATTRIB(Animation, stopped, float, false)
+       ATTRIB(Animation, finished, float, false)
 ENDCLASS(Animation)
-void setterDummy(entity, float);
 #endif
 
 #ifdef IMPLEMENTATION
@@ -89,12 +91,12 @@ float Animation_isStopped(entity me)
 
 void Animation_stopAnim(entity me)
 {
-       me.stopped = TRUE;
+       me.stopped = true;
 }
 
 void Animation_resumeAnim(entity me)
 {
-       me.stopped = FALSE;
+       me.stopped = false;
 }
 
 float Animation_isFinished(entity me)
@@ -105,7 +107,7 @@ float Animation_isFinished(entity me)
 void Animation_finishAnim(entity me)
 {
        me.value = me.delta + me.startValue;
-       me.finished = TRUE;
+       me.finished = true;
        me.setter(me.object, me.value);
 }