From 784493d6dafedf832a849479860874b40e36278c Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 12 Feb 2011 16:37:43 +0100 Subject: [PATCH] Remove an empty line from Player Setup window to make visible the last item (this window is really overloaded!) Also disable crosshair_color_per_weapon checkbox if crosshair_color_by_health is enabled And remove useless TDempty --- qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index fe47fe50f6..8a804f91f1 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -137,12 +137,13 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair color:")); me.TD(me, 1, 0.9, e = makeXonoticCheckBox(0, "crosshair_color_per_weapon", _("Per weapon"))); + setDependent(e, "crosshair_color_by_health", 0, 0); me.TD(me, 1, 0.9, e = makeXonoticCheckBox(0, "crosshair_color_by_health", _("By health"))); - setDependent(e, "crosshair_color_per_weapon", 0, 0); + setDependent(e, "crosshair_color_per_weapon", 0, 0); me.TR(me); me.TDempty(me, 0.4); me.TD(me, 2, 2.6, e = makeXonoticColorpickerString("crosshair_color", "crosshair_color")); - setDependentAND(e, "crosshair_color_per_weapon", 0, 0, "crosshair_color_by_health", 0, 0); + setDependentAND(e, "crosshair_color_per_weapon", 0, 0, "crosshair_color_by_health", 0, 0); me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "crosshair_dot", _("Enable center dot"))); @@ -164,14 +165,11 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TD(me, 1, 2.2, e = makeXonoticButton(_("Waypoints setup..."), '0 0 0')); e.onClick = DialogOpenButton_Click; e.onClickEntity = main.waypointDialog; - me.TDempty(me, 0.5); me.TR(me); me.TDempty(me, 0.4); me.TD(me, 1, 2.2, e = makeXonoticButton(_("Enter HUD editor"), '0 0 0')); e.onClick = HUDSetup_Join_Click; e.onClickEntity = me; - me.TDempty(me, 0.5); - me.TR(me); me.TR(me); #ifdef ALLOW_FORCEMODELS me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Force models:"))); -- 2.39.2