diff --git a/gamedir/ui/resource/language/bugfixedhl_english.txt b/gamedir/ui/resource/language/bugfixedhl_english.txt index 6c5c6a09..6e67ce9e 100644 Binary files a/gamedir/ui/resource/language/bugfixedhl_english.txt and b/gamedir/ui/resource/language/bugfixedhl_english.txt differ diff --git a/gamedir/ui/resource/language/bugfixedhl_russian.txt b/gamedir/ui/resource/language/bugfixedhl_russian.txt index 34b6a91e..6d8ac72d 100644 Binary files a/gamedir/ui/resource/language/bugfixedhl_russian.txt and b/gamedir/ui/resource/language/bugfixedhl_russian.txt differ diff --git a/gamedir/ui/resource/options/HudSubOptions.res b/gamedir/ui/resource/options/HudSubOptions.res index 82628bd1..05220aad 100644 --- a/gamedir/ui/resource/options/HudSubOptions.res +++ b/gamedir/ui/resource/options/HudSubOptions.res @@ -139,10 +139,10 @@ "useproportionalinsets" "0" "Default" "0" } - "ViewmodelCheckbox" + "MenuFKeys" { "ControlName" "CCvarCheckButton" - "fieldName" "ViewmodelCheckbox" + "fieldName" "MenuFKeys" "xpos" "31" "ypos" "112" "wide" "244" @@ -155,7 +155,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "#BHL_AdvOptions_HUD_Viewmodel" + "labelText" "#BHL_AdvOptions_HUD_MenuFKeys" "textAlignment" "west" "dulltext" "0" "brighttext" "0" diff --git a/gamedir/ui/resource/options/ModelSubOptions.res b/gamedir/ui/resource/options/ModelSubOptions.res index 4c40b6a7..e1dd8941 100644 --- a/gamedir/ui/resource/options/ModelSubOptions.res +++ b/gamedir/ui/resource/options/ModelSubOptions.res @@ -322,6 +322,34 @@ "useproportionalinsets" "0" "Default" "0" } + "NoViewModel" + { + "ControlName" "CCvarCheckButton" + "fieldName" "NoViewModel" + "xpos" "193" + "ypos" "262" + "wide" "256" + "tall" "24" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "#BHL_AdvOptions_Models_NoViewModel" + "textAlignment" "west" + "dulltext" "0" + "brighttext" "0" + "wrap" "0" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "autowidetocontents" "0" + "useproportionalinsets" "0" + "Default" "0" + } "EnemyModelsLabel" { "ControlName" "Label" diff --git a/src/game/client/gameui/options/options_hud.cpp b/src/game/client/gameui/options/options_hud.cpp index c5e94c47..628ba38c 100644 --- a/src/game/client/gameui/options/options_hud.cpp +++ b/src/game/client/gameui/options/options_hud.cpp @@ -25,7 +25,7 @@ CHudSubOptions::CHudSubOptions(vgui2::Panel *parent) m_pRenderCheckbox = new CCvarCheckButton(this, "RenderCheckbox", "#BHL_AdvOptions_HUD_Render", "hud_client_renderer"); m_pDimCheckbox = new CCvarCheckButton(this, "DimCheckbox", "#BHL_AdvOptions_HUD_Dim", "hud_dim"); - m_pViewmodelCheckbox = new CCvarCheckButton(this, "ViewmodelCheckbox", "#BHL_AdvOptions_HUD_Viewmodel", "r_drawviewmodel", true); + m_pMenuFKeys = new CCvarCheckButton(this, "MenuFKeys", "#BHL_AdvOptions_HUD_MenuFKeys", "hud_menu_fkeys"); m_pWeaponSpriteCheckbox = new CCvarCheckButton(this, "WeaponSpriteCheckbox", "#BHL_AdvOptions_HUD_WeapSprite", "hud_weapon"); m_pCenterIdCvar = new CCvarCheckButton(this, "CenterIdCvar", "#BHL_AdvOptions_HUD_CenterId", "hud_centerid"); m_pRainbowCvar = new CCvarCheckButton(this, "RainbowCvar", "#BHL_AdvOptions_HUD_Rainbow", "hud_rainbow"); @@ -79,7 +79,7 @@ void CHudSubOptions::OnResetData() m_pOpacityValue->ResetData(); m_pDimCheckbox->ResetData(); - m_pViewmodelCheckbox->ResetData(); + m_pMenuFKeys->ResetData(); m_pWeaponSpriteCheckbox->ResetData(); m_pCenterIdCvar->ResetData(); m_pRainbowCvar->ResetData(); @@ -104,7 +104,7 @@ void CHudSubOptions::OnApplyChanges() m_pOpacityValue->ApplyChanges(); m_pDimCheckbox->ApplyChanges(); - m_pViewmodelCheckbox->ApplyChanges(); + m_pMenuFKeys->ApplyChanges(); m_pWeaponSpriteCheckbox->ApplyChanges(); m_pCenterIdCvar->ApplyChanges(); m_pRainbowCvar->ApplyChanges(); diff --git a/src/game/client/gameui/options/options_hud.h b/src/game/client/gameui/options/options_hud.h index 0e67a770..7b3cc5e4 100644 --- a/src/game/client/gameui/options/options_hud.h +++ b/src/game/client/gameui/options/options_hud.h @@ -30,7 +30,7 @@ class CHudSubOptions : public vgui2::PropertyPage CCvarCheckButton *m_pRenderCheckbox = nullptr; CCvarCheckButton *m_pDimCheckbox = nullptr; CCvarCheckButton *m_pWeaponSpriteCheckbox = nullptr; - CCvarCheckButton *m_pViewmodelCheckbox = nullptr; + CCvarCheckButton *m_pMenuFKeys = nullptr; CCvarCheckButton *m_pCenterIdCvar = nullptr; CCvarCheckButton *m_pRainbowCvar = nullptr; diff --git a/src/game/client/gameui/options/options_models.cpp b/src/game/client/gameui/options/options_models.cpp index 9c452878..70300921 100644 --- a/src/game/client/gameui/options/options_models.cpp +++ b/src/game/client/gameui/options/options_models.cpp @@ -35,6 +35,7 @@ CModelSubOptions::CModelSubOptions(vgui2::Panel *parent) m_pLeftHand = new CCvarCheckButton(this, "LeftHand", "#BHL_AdvOptions_Models_LeftHand", "cl_righthand"); m_pAngledBob = new CCvarCheckButton(this, "AngledBob", "#BHL_AdvOptions_Models_AngledBob", "cl_bob_angled"); m_pNoShells = new CCvarCheckButton(this, "NoShells", "#BHL_AdvOptions_Models_NoShells", "cl_noshells"); + m_pNoViewModel = new CCvarCheckButton(this, "NoViewModel", "#BHL_AdvOptions_Models_NoViewmodel", "r_drawviewmodel", true); LoadControlSettings(VGUI2_ROOT_DIR "resource/options/ModelSubOptions.res"); } @@ -98,6 +99,7 @@ void CModelSubOptions::OnResetData() m_pLeftHand->ResetData(); m_pAngledBob->ResetData(); m_pNoShells->ResetData(); + m_pNoViewModel->ResetData(); } void CModelSubOptions::OnApplyChanges() @@ -110,6 +112,7 @@ void CModelSubOptions::OnApplyChanges() m_pLeftHand->ApplyChanges(); m_pAngledBob->ApplyChanges(); m_pNoShells->ApplyChanges(); + m_pNoViewModel->ApplyChanges(); } void CModelSubOptions::ParseEnemyModels() diff --git a/src/game/client/gameui/options/options_models.h b/src/game/client/gameui/options/options_models.h index 32d96b69..1e8eaa7e 100644 --- a/src/game/client/gameui/options/options_models.h +++ b/src/game/client/gameui/options/options_models.h @@ -37,6 +37,7 @@ class CModelSubOptions : public vgui2::PropertyPage CCvarCheckButton *m_pLeftHand = nullptr; CCvarCheckButton *m_pAngledBob = nullptr; CCvarCheckButton *m_pNoShells = nullptr; + CCvarCheckButton *m_pNoViewModel = nullptr; int m_iNewItemIdx = 0;