Merge branch 'master' into TimePath/vehicles_cleanup

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

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc
index 3449e0604a046ffa0ddac263a988770c82fad713..85abb0f02c2c8676920a2b58f27c19c43d9f45aa 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc
@@ -1,10 +1,12 @@
-#ifdef INTERFACE
-CLASS(XonoticHUDPowerupsDialog) EXTENDS(XonoticRootDialog)
-       METHOD(XonoticHUDPowerupsDialog, fill, void(entity))
+#ifndef DIALOG_HUDPANEL_POWERUPS_H
+#define DIALOG_HUDPANEL_POWERUPS_H
+#include "rootdialog.qc"
+CLASS(XonoticHUDPowerupsDialog, XonoticRootDialog)
+       METHOD(XonoticHUDPowerupsDialog, fill, void(entity));
        ATTRIB(XonoticHUDPowerupsDialog, title, string, _("Powerups Panel"))
        ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDPowerupsDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDPowerupsDialog, rows, float, 15)
+       ATTRIB(XonoticHUDPowerupsDialog, rows, float, 14)
        ATTRIB(XonoticHUDPowerupsDialog, columns, float, 4)
        ATTRIB(XonoticHUDPowerupsDialog, name, string, "HUDpowerups")
        ATTRIB(XonoticHUDPowerupsDialog, requiresConnection, float, true)
@@ -42,7 +44,5 @@ void XonoticHUDPowerupsDialog_fill(entity me)
                        me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "1", _("Right")));
                        me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "2", _("Inward")));
                        me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_panel_powerups_iconalign", "3", _("Outward")));
-       me.TR(me);
-               me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_powerups_flip", _("Flip strength and shield positions")));
 }
 #endif