From 62ef5dbf9cf9408cd8497c0b8eb3327f5a821f42 Mon Sep 17 00:00:00 2001 From: TomyLobo Date: Wed, 19 Sep 2018 18:42:08 +0200 Subject: [PATCH 1/2] Fix release date for v1.3.0.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5cd50da5..3d929a0f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## [v1.3.0.0](https://github.com/BSVino/DoubleAction/tree/v1.3.0.0) (2018-04-09) +## [v1.3.0.0](https://github.com/BSVino/DoubleAction/tree/v1.3.0.0) (2018-04-08) [Full Changelog](https://github.com/BSVino/DoubleAction/compare/v1.2.2.2...v1.3.0.0) **Implemented enhancements:** From 34dc7f2fa90d32dfabcf9a05acc0452d740c10a6 Mon Sep 17 00:00:00 2001 From: TomyLobo Date: Tue, 18 Sep 2018 19:35:18 +0200 Subject: [PATCH 2/2] No longer require an additional click in hud_fastswitch mode --- mp/src/game/client/sdk/hud/sdk_hud_weaponselection.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mp/src/game/client/sdk/hud/sdk_hud_weaponselection.cpp b/mp/src/game/client/sdk/hud/sdk_hud_weaponselection.cpp index c66df71c0..cc79911bd 100644 --- a/mp/src/game/client/sdk/hud/sdk_hud_weaponselection.cpp +++ b/mp/src/game/client/sdk/hud/sdk_hud_weaponselection.cpp @@ -587,10 +587,6 @@ void CHudWeaponSelection::SelectWeaponSlot( int iSlot ) if ( pPlayer->IsAllowedToSwitchWeapons() == false ) return; - if ( !IsInSelectionMode() ) - // open the weapon selection - OpenSelection(); - // do a fast switch if set if ( hud_fastswitch.GetBool() ) { @@ -598,6 +594,10 @@ void CHudWeaponSelection::SelectWeaponSlot( int iSlot ) return; } + if ( !IsInSelectionMode() ) + // open the weapon selection + OpenSelection(); + C_BaseCombatWeapon *pActiveWeapon = m_ahWeaponSlots[iSlot]; if (!pActiveWeapon) return;