zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 08:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

A_RadiusGive Missile check fix

Browse source 
- Don't use isMissile(). Check directly for the flag at the moment of calling and not the default. Otherwise, things changing themselves will still be ineligible for non-missile checks.
This commit is contained in:
MajorCooke 2016-02-22 11:30:44 -06:00
parent 49bfe717ce
commit c3ffeb1e9d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/thingdef/thingdef_codeptr.cpp
View file

@ -5381,13 +5381,13 @@ enum RadiusGiveFlags
static bool DoRadiusGive(AActor *self, AActor *thing, PClassActor *item, int amount, fixed_t distance, int flags, PClassActor *filter, FName species, fixed_t mindist) static bool DoRadiusGive(AActor *self, AActor *thing, PClassActor *item, int amount, fixed_t distance, int flags, PClassActor *filter, FName species, fixed_t mindist)
{ {
// [MC] We only want to make an exception for missiles here. Nothing else. // [MC] We only want to make an exception for missiles here. Nothing else.
bool missilePass = !!((flags & RGF_MISSILES) && thing->isMissile()); bool missilePass = !!((flags & RGF_MISSILES) && thing->flags & MF_MISSILE);
if (thing == self) if (thing == self)
{ {
if (!(flags & RGF_GIVESELF)) if (!(flags & RGF_GIVESELF))
return false; return false;
} }
else if (thing->isMissile()) else if (thing->flags & MF_MISSILE)
{ {
if (!missilePass) if (!missilePass)
return false; return false;