X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_hudpanel_healtharmor.qc;h=ac305b83258638cd4352305a7071d338a5d85b3d;hb=861e3ffb66df50d7eb9be7c5947fd3897981082e;hp=d576e237249c65bd367fae42a58f59b1811a4759;hpb=8d10ea819c27736320d03e75134af341f8127199;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 d576e2372..ac305b832 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc
@@ -1,19 +1,9 @@
-#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;
@@ -21,6 +11,8 @@ void XonoticHUDHealthArmorDialog_fill(entity me)
 
 	DIALOG_HUDPANEL_COMMON();
 
+	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 +39,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