From: Severin Meyer Date: Wed, 21 Jan 2015 20:33:09 +0000 (+0100) Subject: Add cvar hud_panel_weapons_label_scale X-Git-Tag: xonotic-v0.8.1~149^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b28d93a4701cfb1718e92a86e9e2860dd1a0138a;p=xonotic%2Fxonotic-data.pk3dir.git Add cvar hud_panel_weapons_label_scale --- diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index 7d8b0ccf9..a47884ef0 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -58,6 +58,7 @@ seta hud_panel_weapons_timeout_fadefgmin "" "minimum alpha of the panel foregrou seta hud_panel_weapons_timeout_speed_in "" "speed that fading/moving onto the screen occurs" seta hud_panel_weapons_timeout_speed_out "" "speed that fading/moving off of the screen occurs" seta hud_panel_weapons_label "" "1 = show number of weapon, 2 = show bound key of weapon, 3 = show name of weapon" +seta hud_panel_weapons_label_scale "" "scale of the weapon text label" seta hud_panel_weapons_accuracy "" "show accuracy color as the weapon icon background; colors can be configured with accuracy_color* cvars" seta hud_panel_weapons_ammo "" "show ammo as a status bar" seta hud_panel_weapons_onlyowned "" "show only owned weapons" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index a37447783..34db2beb6 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border "" seta hud_panel_weapons_bg_padding "4" seta hud_panel_weapons_accuracy "1" seta hud_panel_weapons_label "1" +seta hud_panel_weapons_label_scale "0.5" seta hud_panel_weapons_complainbubble "1" seta hud_panel_weapons_complainbubble_padding "-1" seta hud_panel_weapons_complainbubble_time "0" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 3128aff4f..39a6fd2ed 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border "" seta hud_panel_weapons_bg_padding "" seta hud_panel_weapons_accuracy "1" seta hud_panel_weapons_label "1" +seta hud_panel_weapons_label_scale "0.5" seta hud_panel_weapons_complainbubble "1" seta hud_panel_weapons_complainbubble_padding "-1" seta hud_panel_weapons_complainbubble_time "0" diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index 0f424c6f0..4b6b7e4a7 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border "" seta hud_panel_weapons_bg_padding "" seta hud_panel_weapons_accuracy "1" seta hud_panel_weapons_label "1" +seta hud_panel_weapons_label_scale "0.5" seta hud_panel_weapons_complainbubble "1" seta hud_panel_weapons_complainbubble_padding "-1" seta hud_panel_weapons_complainbubble_time "0" diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index 3ee6b9277..20650899e 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border "" seta hud_panel_weapons_bg_padding "" seta hud_panel_weapons_accuracy "1" seta hud_panel_weapons_label "1" +seta hud_panel_weapons_label_scale "0.5" seta hud_panel_weapons_complainbubble "1" seta hud_panel_weapons_complainbubble_padding "-1" seta hud_panel_weapons_complainbubble_time "0" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index c4aebab73..2d86881f5 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border "" seta hud_panel_weapons_bg_padding "-5" seta hud_panel_weapons_accuracy "1" seta hud_panel_weapons_label "1" +seta hud_panel_weapons_label_scale "0.5" seta hud_panel_weapons_complainbubble "1" seta hud_panel_weapons_complainbubble_padding "-1" seta hud_panel_weapons_complainbubble_time "0" diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 8215b9faf..1355bafe7 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -347,6 +347,7 @@ float autocvar_hud_panel_weapons_complainbubble_fadetime; float autocvar_hud_panel_weapons_complainbubble_padding; float autocvar_hud_panel_weapons_complainbubble_time; float autocvar_hud_panel_weapons_label; +float autocvar_hud_panel_weapons_label_scale = 0.5; float autocvar_hud_panel_weapons_onlyowned; float autocvar_hud_panel_weapons_timeout; float autocvar_hud_panel_weapons_timeout_effect; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index d6e88e77b..0ef988ae3 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -692,7 +692,9 @@ void HUD_Weapons(void) if(autocvar_hud_panel_weapons_accuracy) Accuracy_LoadColors(); + // draw items row = column = 0; + vector label_size = '1 1 0' * min(weapon_size_x, weapon_size_y) * bound(0, autocvar_hud_panel_weapons_label_scale, 1); for(i = 0; i <= WEP_LAST-WEP_FIRST; ++i) { // retrieve information about the current weapon to be drawn @@ -737,15 +739,15 @@ void HUD_Weapons(void) switch(autocvar_hud_panel_weapons_label) { case 1: // weapon number - drawstring(weapon_pos, ftos(weapon_id), '1 1 0' * 0.5 * weapon_size_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring(weapon_pos, ftos(weapon_id), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); break; case 2: // bind - drawstring(weapon_pos, getcommandkey(ftos(weapon_id), strcat("weapon_group_", ftos(weapon_id))), '1 1 0' * 0.5 * weapon_size_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring(weapon_pos, getcommandkey(ftos(weapon_id), strcat("weapon_group_", ftos(weapon_id))), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); break; case 3: // weapon name - drawstring(weapon_pos, strtolower(self.message), '1 1 0' * 0.5 * weapon_size_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring(weapon_pos, strtolower(self.message), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); break; default: // nothing diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc index 78f16f88d..4ae8f9f61 100644 --- a/qcsrc/client/hud_config.qc +++ b/qcsrc/client/hud_config.qc @@ -67,6 +67,7 @@ void HUD_Panel_ExportCfg(string cfgname) case HUD_PANEL_WEAPONS: HUD_Write_PanelCvar_q("_accuracy"); HUD_Write_PanelCvar_q("_label"); + HUD_Write_PanelCvar_q("_label_scale"); HUD_Write_PanelCvar_q("_complainbubble"); HUD_Write_PanelCvar_q("_complainbubble_padding"); HUD_Write_PanelCvar_q("_complainbubble_time"); diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c index 07026be69..64c9cf43a 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c @@ -4,7 +4,7 @@ CLASS(XonoticHUDWeaponsDialog) EXTENDS(XonoticRootDialog) ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel")) ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDWeaponsDialog, intendedWidth, float, 0.4) - ATTRIB(XonoticHUDWeaponsDialog, rows, float, 18) + ATTRIB(XonoticHUDWeaponsDialog, rows, float, 19) ATTRIB(XonoticHUDWeaponsDialog, columns, float, 4) ATTRIB(XonoticHUDWeaponsDialog, name, string, "HUDweapons") ATTRIB(XonoticHUDWeaponsDialog, requiresConnection, float, TRUE) @@ -50,20 +50,25 @@ void XonoticHUDWeaponsDialog_fill(entity me) me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "0", ZCTX(_("SHOWAS^None")))); me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "1", _("Number"))); me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "2", _("Bind"))); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Weapon ID scale:"))); + 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); me.TDempty(me, 0.2); me.TD(me, 1, 3.8/2, e = makeXonoticCheckBox(0, "hud_panel_weapons_accuracy", _("Show Accuracy"))); me.TD(me, 1, 3.8/2, e = makeXonoticCheckBox(0, "hud_panel_weapons_ammo", _("Show Ammo"))); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Ammo bar color:"))); - me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_panel_weapons_ammo_color", "hud_panel_weapons_ammo_color")); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Ammo bar alpha:"))); + 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.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Ammo bar alpha:"))); - me.TD(me, 1, 2.4, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_weapons_ammo_alpha")); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Ammo bar color:"))); + 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