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

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qc b/qcsrc/menu/xonotic/dialog_settings_audio.qc
index cccaa2652818b5bbf91dc9bfe9c204a33f85bdcf..af8faddacecceb7a6fa9531152b26fd09a8c1bc9 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc
@@ -1,7 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_SETTINGS_AUDIO_H
+#define DIALOG_SETTINGS_AUDIO_H
+#include "tab.qc"
+CLASS(XonoticAudioSettingsTab, XonoticTab)

        METHOD(XonoticAudioSettingsTab, fill, void(entity))
        METHOD(XonoticAudioSettingsTab, fill, void(entity))

-       ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio"))

        ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space
        ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space


@@ -14,7 +15,7 @@ entity makeXonoticAudioSettingsTab();
 entity makeXonoticAudioSettingsTab()
 {
        entity me;
 entity makeXonoticAudioSettingsTab()
 {
        entity me;

-       me = spawnXonoticAudioSettingsTab();
+       me = NEW(XonoticAudioSettingsTab);

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