Merge branch 'master' into mirio/balance

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

diff --git a/qcsrc/menu/xonotic/tab.qc b/qcsrc/menu/xonotic/tab.qc
index d1a867a2f88817253b5285838a772c444caf9994..03a5bc5fe74adad0ac8be1501b5711717f535e0b 100644 (file)
--- a/qcsrc/menu/xonotic/tab.qc
+++ b/qcsrc/menu/xonotic/tab.qc
@@ -1,12 +1,14 @@
-#ifdef INTERFACE
-CLASS(XonoticTab) EXTENDS(Tab)
+#ifndef TAB_H
+#define TAB_H
+#include "../item/tab.qc"
+CLASS(XonoticTab, Tab)
        // still to be customized by user
        /*
        ATTRIB(XonoticTab, intendedWidth, float, 0)
        ATTRIB(XonoticTab, rows, float, 3)
        ATTRIB(XonoticTab, columns, float, 2)
        */
-       METHOD(XonoticTab, showNotify, void(entity))
+       METHOD(XonoticTab, showNotify, void(entity));
 
        ATTRIB(XonoticTab, marginTop, float, 0) // pixels
        ATTRIB(XonoticTab, marginBottom, float, 0) // pixels
@@ -15,7 +17,6 @@ CLASS(XonoticTab) EXTENDS(Tab)
        ATTRIB(XonoticTab, columnSpacing, float, SKINMARGIN_COLUMNS) // pixels
        ATTRIB(XonoticTab, rowSpacing, float, SKINMARGIN_ROWS) // pixels
        ATTRIB(XonoticTab, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL) // pixels
-       ATTRIB(XonoticTab, titleHeight, float, SKINFONTSIZE_TITLE * SKINHEIGHT_TITLE) // pixels
 
        ATTRIB(XonoticTab, backgroundImage, string, string_null)
 ENDCLASS(XonoticTab)