zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 12:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- adjusted collision detection for item pickups

Browse source 
Use vanilla condition for a thing with MF_SPECIAL flag to fix inability to grab it when item's top is at the same height as sector's floor from it can be picked up

https://forum.zdoom.org/viewtopic.php?t=60181&start=88#p1122935
This commit is contained in:
alexey.lysiuk 2019-10-31 10:37:33 +02:00 committed by Christoph Oelckers
parent 958b52d3aa
commit 4c7c1138aa
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/playsim/p_map.cpp
View file

@ -1324,8 +1324,14 @@ bool PIT_CheckThing(FMultiBlockThingsIterator &it, FMultiBlockThingsIterator::Ch
(thing->flags5 & MF5_DONTRIP) ||
((tm.thing->flags6 & MF6_NOBOSSRIP) && (thing->flags2 & MF2_BOSS)))
{
if (thing->flags & MF_SPECIAL)
{
// Vanilla condition, i.e. without equality, for item pickups
if ((tm.thing->Z() > topz) || (tm.thing->Top() < thing->Z()))
return true;
}
// Some things prefer not to overlap each other, if possible (Q: Is this even needed anymore? It was just for dealing with some deficiencies in the code below in Heretic.)
if (!(tm.thing->flags3 & thing->flags3 & MF3_DONTOVERLAP))
else if (!(tm.thing->flags3 & thing->flags3 & MF3_DONTOVERLAP))
{
if ((tm.thing->Z() >= topz) || (tm.thing->Top() <= thing->Z()))
return true;