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

- skipped owned items in proximity test

Browse source 
https://forum.zdoom.org/viewtopic.php?t=61224
(cherry picked from commit 23a4daac23)
This commit is contained in:
alexey.lysiuk 2018-07-11 17:26:09 +03:00 committed by drfrag666
parent 0d9685f25c
commit d2143edb60
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

@ -745,6 +745,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).