zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-02-07 13:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Extended MF3_SKYEXPLODE to apply to horizon walls as well.

Browse source 
SVN r2034 (trunk)
This commit is contained in:
Randy Heit 2009-12-20 05:11:30 +00:00
parent bdd1203aca
commit 00447b8f44
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,3 +1,6 @@
December 19, 2009
- Extended MF3_SKYEXPLODE to apply to horizon walls as well.
December 19, 2009 (Changes by Graf Zahl) December 19, 2009 (Changes by Graf Zahl)
- Fixed: It was not possible to set the ammo type of a weapon explicitly to - Fixed: It was not possible to set the ammo type of a weapon explicitly to
'none'. 'none'.

8
src/p_mobj.cpp
View file

@ -1190,7 +1190,7 @@ void P_ExplodeMissile (AActor *mo, line_t *line, AActor *target)
return; return;
} }
if (line != NULL && line->special == Line_Horizon) if (line != NULL && line->special == Line_Horizon && !(mo->flags3 & MF3_SKYEXPLODE))
{ {
// [RH] Don't explode missiles on horizon lines. // [RH] Don't explode missiles on horizon lines.
mo->Destroy (); mo->Destroy ();
@ -1901,11 +1901,12 @@ fixed_t P_XYMovement (AActor *mo, fixed_t scrollx, fixed_t scrolly)
} }
explode: explode:
// explode a missile // explode a missile
if (!(mo->flags3 & MF3_SKYEXPLODE))
{
if (tm.ceilingline && if (tm.ceilingline &&
tm.ceilingline->backsector && tm.ceilingline->backsector &&
tm.ceilingline->backsector->GetTexture(sector_t::ceiling) == skyflatnum && tm.ceilingline->backsector->GetTexture(sector_t::ceiling) == skyflatnum &&
mo->z >= tm.ceilingline->backsector->ceilingplane.ZatPoint (mo->x, mo->y) && //killough mo->z >= tm.ceilingline->backsector->ceilingplane.ZatPoint (mo->x, mo->y))
!(mo->flags3 & MF3_SKYEXPLODE))
{ {
// Hack to prevent missiles exploding against the sky. // Hack to prevent missiles exploding against the sky.
// Does not handle sky floors. // Does not handle sky floors.
@ -1918,6 +1919,7 @@ explode:
mo->Destroy (); mo->Destroy ();
return oldfloorz; return oldfloorz;
} }
}
P_ExplodeMissile (mo, mo->BlockingLine, BlockingMobj); P_ExplodeMissile (mo, mo->BlockingLine, BlockingMobj);
return oldfloorz; return oldfloorz;
} }