From: FruitieX Date: Thu, 2 Dec 2010 22:25:56 +0000 (+0200) Subject: allow tweaking hud_damage from the menu X-Git-Tag: xonotic-v0.1.0preview~74^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5eae9f5a36bb5883674361cd99f5a2d3397a3c0;p=xonotic%2Fxonotic-data.pk3dir.git allow tweaking hud_damage from the menu --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 7cf5ee6e5..f0bcba6e6 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -723,10 +723,10 @@ void CSQC_UpdateView(float w, float h) else myhealth_gentlergb = stov(cvar_string("hud_damage_gentle_color")); - drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, myhealth_gentlergb, cvar("hud_damage_gentle_alpha_multiplier") * bound(0, myhealth_flash_temp, 1), DRAWFLAG_NORMAL); + drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, myhealth_gentlergb, cvar("hud_damage_gentle_alpha_multiplier") * bound(0, myhealth_flash_temp, 1) * cvar("hud_damage"), DRAWFLAG_NORMAL); } else - drawpic(reticle_pos, "gfx/blood", reticle_size, stov(cvar_string("hud_damage_color")), bound(0, myhealth_flash_temp, 1), DRAWFLAG_NORMAL); + drawpic(reticle_pos, "gfx/blood", reticle_size, stov(cvar_string("hud_damage_color")), bound(0, myhealth_flash_temp, 1) * cvar("hud_damage"), DRAWFLAG_NORMAL); } // Draw the mouse cursor diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index 02177fb63..562c097ce 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -86,9 +86,6 @@ void XonoticPlayerSettingsTab_fill(entity me) me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Field of view:")); me.TD(me, 1, 2, e = makeXonoticSlider(60, 130, 1, "fov")); - me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Damage kick:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 0.5, 0.05, "v_kicktime")); me.TR(me); sl = makeXonoticSlider(0.45, 0.75, 0.01, "cl_bobcycle"); me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(0, 1, sl, "View bobbing:")); @@ -158,7 +155,6 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "0", "None")); me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "1", "TrueAim")); me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "1.25", "Enemies")); - me.TR(me); me.TR(me); me.TDempty(me, 0.4); me.TD(me, 1, 2.2, e = makeXonoticButton("Waypoints setup...", '0 0 0')); @@ -172,6 +168,7 @@ void XonoticPlayerSettingsTab_fill(entity me) 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:")); me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, string_null, string_null, "None")); @@ -188,6 +185,9 @@ void XonoticPlayerSettingsTab_fill(entity me) e.addValue(e, "Lots", "0"); e.configureXonoticTextSliderValues(e); setDependent(e, "cl_gentle", 0, 0); + me.TR(me); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Damage splash:")); + me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "hud_damage")); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeXonoticCommandButton("Apply immediately", '0 0 0', "color -1 -1;name \"$_cl_name\";cl_cmd sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_shownames;sendcvar cl_forceplayermodelsfromxonotic;sendcvar cl_forceplayermodels;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY));