Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())

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

diff --git a/qcsrc/menu/anim/keyframe.qc b/qcsrc/menu/anim/keyframe.qc
index 3bcda94e692939b733c668cf09e46b27e59364c6..3a7ec55a7f8317bee44098cbce0dd7a76c34d129 100644 (file)
--- a/qcsrc/menu/anim/keyframe.qc
+++ b/qcsrc/menu/anim/keyframe.qc
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(Keyframe) EXTENDS(Animation)
+CLASS(Keyframe, Animation)
        METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float)))
        METHOD(Keyframe, addAnim, void(entity, entity))
        METHOD(Keyframe, calcValue, float(entity, float, float, float, float))
@@ -26,7 +26,7 @@ entity makeHostedKeyframe(entity obj, void(entity, float) objSetter, float animD
 entity makeKeyframe(entity obj, void(entity, float) objSetter, float animDuration, float animStart, float animEnd)
 {
        entity me;
-       me = spawnKeyframe();
+       me = NEW(Keyframe);
        me.configureAnimation(me, obj, objSetter, time, animDuration, animStart, animEnd);
        return me;
 }