- Added MF5_PIERCEARMOR flag that allows damaging objects that aren't
affected by armor. - Added an unfreeze CCMD so that frozen players can be unfrozen for testing. - Added special death states for projectiles hitting actors. - Added ACS SetActorPitch/GetActorPitch functions. - Added cameraheight property for actors. SVN r359 (trunk)
This commit is contained in:
parent
fb5f4a132b
commit
0d5e3cf97e
17 changed files with 128 additions and 28 deletions
|
|
@ -2807,7 +2807,18 @@ void P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
|
|||
trace.Actor, srcangle, srcpitch);
|
||||
}
|
||||
}
|
||||
if (damage) P_DamageMobj (trace.Actor, puff ? puff : t1, t1, damage, damageType);
|
||||
if (damage)
|
||||
{
|
||||
int flags = 0;
|
||||
// Allow MF5_PIERCEARMOR on a weapon as well.
|
||||
if (t1->player != NULL && t1->player->ReadyWeapon != NULL &&
|
||||
t1->player->ReadyWeapon->flags5 & MF5_PIERCEARMOR)
|
||||
{
|
||||
flags |= DMG_NO_ARMOR;
|
||||
}
|
||||
|
||||
P_DamageMobj (trace.Actor, puff ? puff : t1, t1, damage, damageType, flags);
|
||||
}
|
||||
}
|
||||
if (trace.CrossedWater)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue