zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- skipped owned items in proximity test 

https://forum.zdoom.org/viewtopic.php?t=61224
This commit is contained in:
alexey.lysiuk 2018-07-11 17:26:09 +03:00 committed by Christoph Oelckers
parent ce1aa7e962
commit 23a4daac23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/p_things.cpp
View File

@ -737,6 +737,15 @@ int P_Thing_CheckProximity(AActor *self, PClass *classname, double distance, int
else if (classname != mo->GetClass()) else if (classname != mo->GetClass())
continue; continue;
if (mo->IsKindOf(RUNTIME_CLASS(AInventory)))
{
// Skip owned item because its position could remain unchanged since attachment to owner
// Most likely it is the last location of this item in the world before pick up
AInventory *const inventory = static_cast<AInventory*>(mo);
if (inventory != nullptr && inventory->Owner != nullptr)
continue;
}
// [MC]Make sure it's in range and respect the desire for Z or not. The function forces it to use // [MC]Make sure it's in range and respect the desire for Z or not. The function forces it to use
// Z later for ensuring CLOSEST and FARTHEST flags are respected perfectly. // Z later for ensuring CLOSEST and FARTHEST flags are respected perfectly.
// Ripped from sphere checking in A_RadiusGive (along with a number of things). // Ripped from sphere checking in A_RadiusGive (along with a number of things).