Merge branch 'BuddyFriendGuy/mapStringFilter' into 'master'

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc
index 2f48c2a500a34cc218c450df3cfd11b699c227f6..5b14b7bdb698669a8cd0531ed77d8dedbdafb7f0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qc
@@ -1,7 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_SETTINGS_GAME_H
+#define DIALOG_SETTINGS_GAME_H
+#include "tab.qc"
+CLASS(XonoticGameSettingsTab, XonoticTab)
        METHOD(XonoticGameSettingsTab, fill, void(entity))
-       ATTRIB(XonoticGameSettingsTab, title, string, _("Game"))
        ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticGameSettingsTab, columns, float, 6.5)
@@ -13,7 +14,7 @@ entity makeXonoticGameSettingsTab();
 entity makeXonoticGameSettingsTab()
 {
        entity me;
-       me = spawnXonoticGameSettingsTab();
+       me = NEW(XonoticGameSettingsTab);
        me.configureDialog(me);
        return me;
 }
@@ -22,7 +23,7 @@ void XonoticGameSettingsTab_fill(entity me)
 {
        entity mc;
        mc = makeXonoticTabController(me.rows - 2.5);
-       
+
        me.TR(me);
                me.TDempty(me, 0.25);
                me.TD(me, 1, 1, mc.makeTabButton(mc, _("View"),           makeXonoticGameViewSettingsTab()));
@@ -34,13 +35,13 @@ void XonoticGameSettingsTab_fill(entity me)
 
        me.gotoRC(me, 1.5, 0);
                me.TD(me, me.rows - 1.5, me.columns, mc);
-               
+
        /*
 
          makeXonoticGameViewSettingsTab()));
          makeXonoticGameGeneralSettingsTab()));
        makeXonoticGameCrosshairSettingsTab()));
-       
+
               makeXonoticGameWeaponSettingsTab()));
        l"),   makeXonoticGamePlayermodelSettingsTab()));
               makeXonoticGameHUDSettingsTab()));