Merge branch 'develop' into x64_new

This commit is contained in:
Lwmte 2023-05-20 15:38:05 +02:00
commit 6bce930a91

View file

@ -512,7 +512,10 @@ void HandleWeapon(ItemInfo& laraItem)
{
if (player.Control.Weapon.GunType == LaraWeaponType::Flare)
{
if (!player.LeftArm.FrameNumber)
// NOTE: Original engines for some reason do this check, but it introduces a bug when player
// can't drop a flare underwater after it was dropped and picked up again once. -- Lwmte, 20/05/23
//if (!player.LeftArm.FrameNumber)
{
player.Control.HandStatus = HandStatus::WeaponUndraw;
}