OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Small fixes from devel branch.

Browse source
This commit is contained in:
Marisa the Magician 2019-02-08 15:18:36 +01:00
commit 17622ad3c8
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/eightball.zsc
View file

@ -313,7 +313,7 @@ Class UTRocketLauncher : UTWeapon
crosshair = 0;
return;
}
if ( LockedOn && (!LockedTarget || (LockedTarget.Health <= 0) || !LockedTarget.bIsMonster || LockedTarget.bKilled || LockedTarget.bCorpse || !LockedTarget.bShootable) )
if ( LockedOn && (!LockedTarget || (LockedTarget.Health <= 0) || !LockedTarget.bIsMonster || LockedTarget.bKilled || LockedTarget.bCorpse || !LockedTarget.bShootable || (Owner.player.ReadyWeapon != self)) )
{
LockedTarget = null;
LockedOn = false;

2
zscript/utcommon.zsc
View file

@ -1964,7 +1964,7 @@ Class UTMainHandler : EventHandler
qf.c = c;
qf.tic = gametic;
qf.cam = camera;
let hnd = UTMainHandler(StaticEventHandler.Find("UTMainHandler"));
let hnd = UTMainHandler(EventHandler.Find("UTMainHandler"));
hnd.flashes.push(qf);
}