Menus overhaul #14

Merged
dkanus merged 30 commits from :somechanges into master 2022-01-23 22:14:51 +03:00
Showing only changes of commit aba3d5ec4d - Show all commits

View File

@ -555,16 +555,21 @@ simulated function CookGrenade(){
niceWeap.ClientGrenadeState = GN_TempDown; niceWeap.ClientGrenadeState = GN_TempDown;
niceWeap.PutDown(); niceWeap.PutDown();
} }
simulated function ThrowGrenade(){ simulated function ThrowGrenade()
{
local NiceWeapon niceWeap; local NiceWeapon niceWeap;
niceWeap = NiceWeapon(Weapon); niceWeap = NiceWeapon(Weapon);
if(niceWeap != none) if(niceWeap != none)
niceWeap.ClientForceInterruptReload(CANCEL_NADE); niceWeap.ClientForceInterruptReload(CANCEL_NADE);
if(bThrowingNade || SecondaryItem != none) if(bThrowingNade || SecondaryItem != none)
return; return;
if( niceWeap == none
|| (niceWeap.bIsReloading && !niceWeap.InterruptReload())) if(niceWeap == none || (niceWeap.bIsReloading && !niceWeap.InterruptReload()))
return; {
super.ThrowGrenade();
return;
}
if(playerGrenade == none) if(playerGrenade == none)
playerGrenade = FindPlayerGrenade(); playerGrenade = FindPlayerGrenade();
if(playerGrenade != none && playerGrenade.HasAmmo()){ if(playerGrenade != none && playerGrenade.HasAmmo()){