Merge branch 'master' into TimePath/vehicles_cleanup

[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..13d3077abf7612f3c940c1feefd98a6816b77679 100644 (file)
--- a/qcsrc/menu/xonotic/textlabel.qc
+++ b/qcsrc/menu/xonotic/textlabel.qc
@@ -1,19 +1,22 @@
-#ifdef INTERFACE
-CLASS(XonoticTextLabel) EXTENDS(Label)
-       METHOD(XonoticTextLabel, configureXonoticTextLabel, void(entity, float, string))
-       METHOD(XonoticTextLabel, draw, void(entity))
+#ifndef TEXTLABEL_H
+#define TEXTLABEL_H
+#include "../item/label.qc"
+CLASS(XonoticTextLabel, 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);
+entity makeXonoticHeaderLabel(string theText);
 #endif
 
 #ifdef IMPLEMENTATION
 entity makeXonoticTextLabel(float theAlign, string theText)
 {
        entity me;
-       me = spawnXonoticTextLabel();
+       me = NEW(XonoticTextLabel);
        me.configureXonoticTextLabel(me, theAlign, theText);
        return me;
 }