X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_hudpanel_weapons.qc;h=61339b6b938cc54800e1326bba256b00d08488a4;hb=e2897355e6cd1ca18e9ab1547e188eab316ce79d;hp=a78effc6ed1e421dc50ae36ca185dbce5084470a;hpb=ae2c1407ec9a05e4f501a6604a7cce8e1030df9f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc
index a78effc6e..61339b6b9 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc
@@ -1,19 +1,12 @@
-#ifndef DIALOG_HUDPANEL_WEAPONS_H
-#define DIALOG_HUDPANEL_WEAPONS_H
-#include "rootdialog.qc"
-CLASS(XonoticHUDWeaponsDialog, XonoticRootDialog)
-	METHOD(XonoticHUDWeaponsDialog, fill, void(entity))
-	ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel"))
-	ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-	ATTRIB(XonoticHUDWeaponsDialog, intendedWidth, float, 0.4)
-	ATTRIB(XonoticHUDWeaponsDialog, rows, float, 21)
-	ATTRIB(XonoticHUDWeaponsDialog, columns, float, 4)
-	ATTRIB(XonoticHUDWeaponsDialog, name, string, "HUDweapons")
-	ATTRIB(XonoticHUDWeaponsDialog, requiresConnection, float, true)
-ENDCLASS(XonoticHUDWeaponsDialog)
-#endif
+#include "dialog_hudpanel_weapons.qh"
+
+#include "checkbox.qh"
+#include "textlabel.qh"
+#include "textslider.qh"
+#include "slider.qh"
+#include "radiobutton.qh"
+#include "colorpicker_string.qh"
 
-#ifdef IMPLEMENTATION
 void XonoticHUDWeaponsDialog_fill(entity me)
 {
 	entity e;
@@ -63,6 +56,7 @@ void XonoticHUDWeaponsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Weapon ID scale:")));
+			setDependent(e, "hud_panel_weapons_label", 1, 2);
 			me.TD(me, 1, 2.4, e = makeXonoticSlider(0.1, 1, 0.05, "hud_panel_weapons_label_scale"));
 			setDependent(e, "hud_panel_weapons_label", 1, 2);
 	me.TR(me);
@@ -72,13 +66,14 @@ void XonoticHUDWeaponsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Ammo bar alpha:")));
+			setDependent(e, "hud_panel_weapons_ammo", 1, 1);
 			me.TD(me, 1, 2.4, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_weapons_ammo_alpha"));
 			setDependent(e, "hud_panel_weapons_ammo", 1, 1);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Ammo bar color:")));
+			setDependent(e, "hud_panel_weapons_ammo", 1, 1);
 		me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_panel_weapons_ammo_color", "hud_panel_weapons_ammo_color"));
 			setDependent(e, "hud_panel_weapons_ammo", 1, 1);
 		me.TR(me);
 }
-#endif