Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc
index d1f9e550be69764a2bf29aee3d220de98c70aa7d..40a526d56ae863e25e25de98ea47fa27b78e994f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticGameViewSettingsTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_SETTINGS_GAME_VIEW_H
+#define DIALOG_SETTINGS_GAME_VIEW_H
+#include "tab.qc"
+CLASS(XonoticGameViewSettingsTab, XonoticTab)

        METHOD(XonoticGameViewSettingsTab, fill, void(entity))
        METHOD(XonoticGameViewSettingsTab, showNotify, void(entity))
        ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9)
        METHOD(XonoticGameViewSettingsTab, fill, void(entity))
        METHOD(XonoticGameViewSettingsTab, showNotify, void(entity))
        ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9)


@@ -17,7 +19,7 @@ void XonoticGameViewSettingsTab_showNotify(entity me)
 entity makeXonoticGameViewSettingsTab()
 {
        entity me;
 entity makeXonoticGameViewSettingsTab()
 {
        entity me;

-       me = spawnXonoticGameViewSettingsTab();
+       me = NEW(XonoticGameViewSettingsTab);

        me.configureDialog(me);
        return me;
 }
        me.configureDialog(me);
        return me;
 }