zedtest3 #3

Merged
dkanus merged 15 commits from :zedtest3 into master 2022-01-21 11:56:43 +03:00
Showing only changes of commit 410515b99d - Show all commits

View File

@ -23,12 +23,19 @@ simulated function Tick(float DeltaTime) {
} }
} }
} }
function Touch(Actor Other) {
function Touch(Actor Other)
{
if (Other == none)
return;
super.Touch(Other); super.Touch(Other);
if (Other.IsA('ShotgunBullet')) { if (Other.IsA('ShotgunBullet'))
{
ShotgunBullet(Other).Damage = 0; ShotgunBullet(Other).Damage = 0;
} }
} }
function RangedAttack(Actor A) { function RangedAttack(Actor A) {
local int LastFireTime; local int LastFireTime;
if ( bShotAnim ) if ( bShotAnim )