Merge branch 'master' into Mirio/balance

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc
index c830b5583a04615e72f72ffe739784ea29ae16e3..3cbd15bb41c2506cb96981a1e1b78d28979d3e12 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc
@@ -1,15 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticLanguageWarningDialog) EXTENDS(XonoticDialog)
-       METHOD(XonoticLanguageWarningDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
-       ATTRIB(XonoticLanguageWarningDialog, title, string, _("Warning"))
-       ATTRIB(XonoticLanguageWarningDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
-       ATTRIB(XonoticLanguageWarningDialog, intendedWidth, float, 0.6)
-       ATTRIB(XonoticLanguageWarningDialog, rows, float, 5)
-       ATTRIB(XonoticLanguageWarningDialog, columns, float, 4)
-ENDCLASS(XonoticLanguageWarningDialog)
-#endif
+#include "dialog_settings_user_languagewarning.qh"
+
+#include "textlabel.qh"
+#include "commandbutton.qh"
 
-#ifdef IMPLEMENTATION
 void XonoticLanguageWarningDialog_fill(entity me)
 {
        entity e;
@@ -23,4 +16,3 @@ void XonoticLanguageWarningDialog_fill(entity me)
                me.TD(me, 1, 2, e = makeXonoticCommandButton(_("Disconnect now"), '0 0 0', "disconnect", 0));
                me.TD(me, 1, 2, e = makeXonoticCommandButton(_("Switch language"), '0 0 0', "prvm_language \"$_menu_prvm_language\"; menu_restart; menu_cmd languageselect", 0));
 }
-#endif