diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 7ffff1b8..39856f93 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -40,7 +40,7 @@ menuitem "Select player skin.." [showmenu (at [CLA RVSF] (curteam))] menuitem "Select weapon.." "showmenu weapons" menuitem "Select crosshair.." "showmenu Crosshairs" menuitem "" "" -menuitem "First-run settings.." [ showmenu "quick setup" ] +menuitem "QUICK setup.." [ showmenu "QUICK setup" ] menuitem "Keyboard/mouse controls.." "showmenu controls" menuitem "Video settings.." "showmenu video" menuitem "Sound settings.." "showmenu sound" @@ -51,7 +51,7 @@ menuitem "Delete and reset all settings.." [ showmenu " menuitem "" menuitem " [ OK ] " [ team (at [CLA RVSF] $newteam) ] -newmenu "quick setup" +newmenu "QUICK setup" menuitemtextinput "Nickname:" "" "name $arg1" menuitemtextinput "Resolution (Width): " "$scr_w" "scr_w $arg1" @@ -269,6 +269,7 @@ menuitemcheckbox "Show icons: " "(= $hidehudequipment 0)" "hidehudequipment (= $ menuitemcheckbox "Show console: " "(= $hideconsole 0)" "hideconsole (= $arg1 0)" menuitemcheckbox "Show spectate info: " "(= $hidespecthud 0)" "hidespecthud (= $arg1 0)" menuitemcheckbox "Show quick messages: " "(= $hidehudmsgs 0)" "hidehudmsgs (= $arg1 0)" +menuitemcheckbox "Show damage indicator: " "(= $hidedamageindicator 0)" "hidedamageindicator (= $arg1 0)" menuitemcheckbox "Show crosshair team-sign: " "$crosshairteamsign" "crosshairteamsign $arg1" menuitem "Select crosshair.. " "showmenu Crosshairs" diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index 88f7a3dc..1173cd35 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -147,6 +147,7 @@ void drawcrosshair(bool showteamwarning) glEnd(); } +VARP(hidedamageindicator, 0, 0, 1); VARP(damageindicatorsize, 0, 200, 10000); VARP(damageindicatordist, 0, 500, 10000); VARP(damageindicatortime, 1, 1000, 10000); @@ -155,7 +156,7 @@ int damagedirections[4] = {0}; void updatedmgindicator(vec &attack) { - if(!damageindicatorsize) return; + if(hidedamageindicator || !damageindicatorsize) return; float bestdist = 0.0f; int bestdir = -1; loopi(4)