From 77013877d1bb213a8c803fdd28f6924f4c791ce5 Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Sat, 2 Jan 2016 11:27:02 -0600 Subject: [PATCH 1/2] A_WeaponReady Fix - Zoom and Reload keys triggered the other states instead of themselves (i.e. zoom keybind triggered reload states instead of zoom) --- src/p_pspr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index ed7d675d3..7cdef059c 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -83,8 +83,8 @@ static FRandom pr_gunshot ("GunShot"); static const FGenericButtons ButtonChecks[] = { - { WRF_AllowReload, WF_WEAPONZOOMOK, BT_ZOOM, NAME_Zoom }, - { WRF_AllowZoom, WF_WEAPONRELOADOK, BT_RELOAD, NAME_Reload }, + { WRF_AllowZoom, WF_WEAPONZOOMOK, BT_ZOOM, NAME_Zoom }, + { WRF_AllowReload, WF_WEAPONRELOADOK, BT_RELOAD, NAME_Reload }, { WRF_AllowUser1, WF_USER1OK, BT_USER1, NAME_User1 }, { WRF_AllowUser2, WF_USER2OK, BT_USER2, NAME_User2 }, { WRF_AllowUser3, WF_USER3OK, BT_USER3, NAME_User3 }, From a75e65a3d8df1e29f83d098ae5bf061159053c11 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 3 Jan 2016 11:32:23 +0100 Subject: [PATCH 2/2] - added BLOCKF_SOUND to flag list supported by Line_SetBlocking, --- src/p_lnspec.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index 9c93ca15c..9b38e149b 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -2587,6 +2587,7 @@ FUNC(LS_Line_SetBlocking) ML_BLOCKUSE, ML_BLOCKSIGHT, ML_BLOCKHITSCAN, + ML_SOUNDBLOCK, -1 };