add progressbar to combined health/armor mode and do various other tweaks to it...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_hudpanel_healtharmor.c

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
index 45f8f589bb5570932dc2e5f706a5ae240e8c6034..246fd65f5c5f130281b1edee931e0184eedd1259 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
@@ -15,19 +15,24 @@ void fillXonoticHUDHealthArmorDialog(entity me)
 {
        entity e;
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_healtharmor", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_flip", "Flip"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_mirror", "Mirror"));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Status:"));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_healtharmor"));
+                       e.addValue(e, "Disabled", "0");
+                       e.addValue(e, "Enabled", "1");
+                       e.addValue(e, "Combined h/a", "2");
+                       e.configureXonoticTextSliderValues(e);
        me.TR(me);
+
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_color_team"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
+                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_alpha"));
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_flip", "Flip"));
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_mirror", "Mirror"));
        //me.gotoRC(me, me.rows - 1, 0);
                //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
 }