X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_hudpanel_healtharmor.qc;h=e67f63ffcda27281ceb077c18c979baa3f097700;hb=93afc08b09294e6dea4d0c98ce5226fdee9d1c92;hp=f0482bd73efbb4dbfb9c567cf2ff9e55bc3b7043;hpb=e090603a32c8cba598f2c54e355cdb5b32b0d986;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc
index f0482bd73..e67f63ffc 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc
@@ -1,26 +1,20 @@
-#ifndef DIALOG_HUDPANEL_HEALTHARMOR_H
-#define DIALOG_HUDPANEL_HEALTHARMOR_H
-#include "rootdialog.qc"
-CLASS(XonoticHUDHealthArmorDialog, XonoticRootDialog)
-	METHOD(XonoticHUDHealthArmorDialog, fill, void(entity))
-	ATTRIB(XonoticHUDHealthArmorDialog, title, string, _("Health/Armor Panel"))
-	ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-	ATTRIB(XonoticHUDHealthArmorDialog, intendedWidth, float, 0.4)
-	ATTRIB(XonoticHUDHealthArmorDialog, rows, float, 15)
-	ATTRIB(XonoticHUDHealthArmorDialog, columns, float, 4)
-	ATTRIB(XonoticHUDHealthArmorDialog, name, string, "HUDhealtharmor")
-	ATTRIB(XonoticHUDHealthArmorDialog, requiresConnection, float, true)
-ENDCLASS(XonoticHUDHealthArmorDialog)
-#endif
+#include "dialog_hudpanel_healtharmor.qh"
+
+#include "textlabel.qh"
+#include "checkbox.qh"
+#include "radiobutton.qh"
 
-#ifdef IMPLEMENTATION
 void XonoticHUDHealthArmorDialog_fill(entity me)
 {
 	entity e;
 	string panelname = "healtharmor";
 
-	DIALOG_HUDPANEL_COMMON();
+	dialog_hudpanel_main_checkbox(me, panelname);
+
+	dialog_hudpanel_main_settings(me, panelname);
 
+	me.TR(me);
+		me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_healtharmor_combined", _("Combine health and armor")));
 	me.TR(me);
 		me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_healtharmor_progressbar", _("Enable status bar")));
 	me.TR(me);
@@ -47,4 +41,3 @@ void XonoticHUDHealthArmorDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_healtharmor_flip", _("Flip health and armor positions")));
 }
-#endif