# HG changeset patch # User Wuzzy # Date 1509162589 -7200 # Node ID abc9a99418ccbac97218d52323ce17749572d25c # Parent 28782e03b8f08ea0b44789fc0cd92101830f63ff Fix ammo menu, placement and camera movement keys not working in ammo menu diff -r 28782e03b8f0 -r abc9a99418cc ChangeLog.txt --- a/ChangeLog.txt Sat Oct 28 04:53:21 2017 +0200 +++ b/ChangeLog.txt Sat Oct 28 05:49:49 2017 +0200 @@ -70,6 +70,7 @@ * Fixed team getting infinite ammo when stockpiling >= 100 ammo (max. finite ammo is now limited to 99) * Fixed failure to collect crate across wrap world edge * Remove buggy “/finish” chat command + * Fix key controls not working in ammo menu: ammo menu, placement, camera/cursor movement keys * Various other fixes Game engine (graphics, sounds and texts): diff -r 28782e03b8f0 -r abc9a99418cc hedgewars/uInputHandler.pas --- a/hedgewars/uInputHandler.pas Sat Oct 28 04:53:21 2017 +0200 +++ b/hedgewars/uInputHandler.pas Sat Oct 28 05:49:49 2017 +0200 @@ -173,7 +173,7 @@ begin if (code < cKeyMaxIndex - 2) // means not mouse buttons and KeyDown - and (not ((CurrentBinds[code] = 'put')) or (CurrentBinds[code] = 'ammomenu') or (CurrentBinds[code] = '+cur_u') or (CurrentBinds[code] = '+cur_d') or (CurrentBinds[code] = '+cur_l') or (CurrentBinds[code] = '+cur_r')) + and (not ((CurrentBinds[code] = 'put') or (CurrentBinds[code] = 'ammomenu') or (CurrentBinds[code] = '+cur_u') or (CurrentBinds[code] = '+cur_d') or (CurrentBinds[code] = '+cur_l') or (CurrentBinds[code] = '+cur_r'))) and (CurrentTeam <> nil) and (not CurrentTeam^.ExtDriven) then bShowAmmoMenu:= false;