Merge branch 'master' into terencehill/bot_fixes

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

diff --git a/qcsrc/menu/xonotic/slider_sbfadetime.qc b/qcsrc/menu/xonotic/slider_sbfadetime.qc
index 39f91f933cf734ccdbee07587f8f9757e94c1f19..d64a990d23475360fae077c0ad7adb608e21ee12 100644 (file)
--- a/qcsrc/menu/xonotic/slider_sbfadetime.qc
+++ b/qcsrc/menu/xonotic/slider_sbfadetime.qc
@@ -1,8 +1,10 @@
-#ifdef INTERFACE
-CLASS(XonoticScoreboardFadeTimeSlider) EXTENDS(XonoticTextSlider)
-       METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity))
-       METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity))
-       METHOD(XonoticScoreboardFadeTimeSlider, saveCvars, void(entity))
+#ifndef SLIDER_SBFADETIME_H
+#define SLIDER_SBFADETIME_H
+#include "textslider.qc"
+CLASS(XonoticScoreboardFadeTimeSlider, XonoticTextSlider)
+       METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity));
+       METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity));
+       METHOD(XonoticScoreboardFadeTimeSlider, saveCvars, void(entity));
 ENDCLASS(XonoticScoreboardFadeTimeSlider)
 entity makeXonoticScoreboardFadeTimeSlider();
 #endif
@@ -11,7 +13,7 @@ entity makeXonoticScoreboardFadeTimeSlider();
 entity makeXonoticScoreboardFadeTimeSlider()
 {
        entity me;
-       me = spawnXonoticScoreboardFadeTimeSlider();
+       me = NEW(XonoticScoreboardFadeTimeSlider);
        me.configureXonoticScoreboardFadeTimeSlider(me);
        return me;
 }