zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 23:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: P_LineAttack mixed up two flags variables.

Browse source 
SVN r2627 (trunk)
This commit is contained in:
Christoph Oelckers 2010-08-28 20:25:52 +00:00
parent cbff41f481
commit a3c8e0c042
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_map.cpp
View file

@ -3502,12 +3502,12 @@ AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
// Note: The puff may not yet be spawned here so we must check the class defaults, not the actor. // Note: The puff may not yet be spawned here so we must check the class defaults, not the actor.
if (damage || (puffDefaults->flags6 & MF6_FORCEPAIN)) if (damage || (puffDefaults->flags6 & MF6_FORCEPAIN))
{ {
int flags = DMG_INFLICTOR_IS_PUFF; int dmgflags = DMG_INFLICTOR_IS_PUFF;
// Allow MF5_PIERCEARMOR on a weapon as well. // Allow MF5_PIERCEARMOR on a weapon as well.
if (t1->player != NULL && t1->player->ReadyWeapon != NULL && if (t1->player != NULL && t1->player->ReadyWeapon != NULL &&
t1->player->ReadyWeapon->flags5 & MF5_PIERCEARMOR) t1->player->ReadyWeapon->flags5 & MF5_PIERCEARMOR)
{ {
flags |= DMG_NO_ARMOR; dmgflags |= DMG_NO_ARMOR;
} }
if (puff == NULL) if (puff == NULL)
@ -3517,7 +3517,7 @@ AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
puff = P_SpawnPuff (t1, pufftype, hitx, hity, hitz, angle - ANG180, 2, flags|PF_HITTHING|PF_TEMPORARY); puff = P_SpawnPuff (t1, pufftype, hitx, hity, hitz, angle - ANG180, 2, flags|PF_HITTHING|PF_TEMPORARY);
killPuff = true; killPuff = true;
} }
P_DamageMobj (trace.Actor, puff ? puff : t1, t1, damage, damageType, flags); P_DamageMobj (trace.Actor, puff ? puff : t1, t1, damage, damageType, dmgflags);
} }
if (victim != NULL) if (victim != NULL)
{ {