mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-23 04:22:34 +00:00
- reverted the change that makes 0-damage projectiles call P_DamageMobj.
Both Hexen and Heretic depend on such projectiles not doing it as do many mods that create snow/rain effects plus any terrain splash mod. SVN r1984 (trunk)
This commit is contained in:
parent
3a198a29dc
commit
53a717673f
2 changed files with 6 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
November 17, 2009 (Changes by Graf Zahl)
|
||||||
|
- reverted the change that makes 0-damage projectiles call P_DamageMobj.
|
||||||
|
Both Hexen and Heretic depend on such projectiles not doing it as do many
|
||||||
|
mods that create snow/rain effects plus any terrain splash mod.
|
||||||
|
|
||||||
November 15, 2009 (Changes by Graf Zahl)
|
November 15, 2009 (Changes by Graf Zahl)
|
||||||
- fixed: fullscreen images with texture scaling used the unscaled size for
|
- fixed: fullscreen images with texture scaling used the unscaled size for
|
||||||
positioning. To avoid future problems with them I added a new DTA_Fullscreen
|
positioning. To avoid future problems with them I added a new DTA_Fullscreen
|
||||||
|
|
|
@ -1091,7 +1091,7 @@ bool PIT_CheckThing (AActor *thing, FCheckPosition &tm)
|
||||||
}
|
}
|
||||||
// Do damage
|
// Do damage
|
||||||
damage = tm.thing->GetMissileDamage ((tm.thing->flags4 & MF4_STRIFEDAMAGE) ? 3 : 7, 1);
|
damage = tm.thing->GetMissileDamage ((tm.thing->flags4 & MF4_STRIFEDAMAGE) ? 3 : 7, 1);
|
||||||
if (damage >= 0)
|
if ((damage > 0) || (tm.thing->flags6 & MF6_FORCEPAIN))
|
||||||
{
|
{
|
||||||
P_DamageMobj (thing, tm.thing, tm.thing->target, damage, tm.thing->DamageType);
|
P_DamageMobj (thing, tm.thing, tm.thing->target, damage, tm.thing->DamageType);
|
||||||
if (damage > 0)
|
if (damage > 0)
|
||||||
|
|
Loading…
Reference in a new issue