Merge branch 'master' into terencehill/hud_fixes

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

diff --git a/qcsrc/menu/xonotic/textlabel.qc b/qcsrc/menu/xonotic/textlabel.qc
index cb54da19e21b81f901cea7d1e5c697ecfdbfe5d1..9af676ecf6e7ec894daff1a410d2a15b9614767e 100644 (file)
--- a/qcsrc/menu/xonotic/textlabel.qc
+++ b/qcsrc/menu/xonotic/textlabel.qc
@@ -1,19 +1,9 @@
-#ifdef INTERFACE
-CLASS(XonoticTextLabel) EXTENDS(Label)
-       METHOD(XonoticTextLabel, configureXonoticTextLabel, void(entity, float, string))
-       METHOD(XonoticTextLabel, draw, void(entity))
-       ATTRIB(XonoticTextLabel, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticTextLabel, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticTextLabel, disabledAlpha, float, SKINALPHA_DISABLED)
-ENDCLASS(XonoticTextLabel)
-entity makeXonoticTextLabel(float theAlign, string theText);
-#endif
+#include "textlabel.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticTextLabel(float theAlign, string theText)
 {
        entity me;
-       me = spawnXonoticTextLabel();
+       me = NEW(XonoticTextLabel);
        me.configureXonoticTextLabel(me, theAlign, theText);
        return me;
 }
@@ -34,4 +24,3 @@ void XonoticTextLabel_draw(entity me)
 {
        SUPER(XonoticTextLabel).draw(me);
 }
-#endif