Merge branch 'master' into terencehill/translated_keys

[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 03a5bc5fe74adad0ac8be1501b5711717f535e0b..9c5bcce8df58ab0026fcfa050d5e2158d7368bad 100644 (file)
--- a/qcsrc/menu/xonotic/tab.qc
+++ b/qcsrc/menu/xonotic/tab.qc
@@ -1,31 +1,7 @@
-#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));
+#include "tab.qh"
 
-       ATTRIB(XonoticTab, marginTop, float, 0) // pixels
-       ATTRIB(XonoticTab, marginBottom, float, 0) // pixels
-       ATTRIB(XonoticTab, marginLeft, float, 0) // pixels
-       ATTRIB(XonoticTab, marginRight, float, 0) // pixels
-       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, backgroundImage, string, string_null)
-ENDCLASS(XonoticTab)
-#endif
-
-#ifdef IMPLEMENTATION
 void XonoticTab_showNotify(entity me)
 {
        loadAllCvars(me);
        SUPER(XonoticTab).showNotify(me);
 }
-#endif