Merge branch 'fix-orbit-shield' into v1.2-frankeinstein
This commit is contained in:
commit
7cd3221be8
1 file changed
+1
-1
+1
-1
@@ -732,7 +732,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
||||
if (tmthing->z + tmthing->height < thing->z)
|
||||
return true; // underneath
|
||||
|
||||
if (((tmthing->target == thing) || (tmthing->target == thing->target)) && (tmthing->threshold > 0 || (thing->type != MT_PLAYER && thing->threshold > 0)))
|
||||
if (((tmthing->target == thing) || (tmthing->target == thing->target)) && ((tmthing->threshold > 0 && thing->type == MT_PLAYER) || (thing->type != MT_PLAYER && thing->threshold > 0)))
|
||||
return true;
|
||||
|
||||
if (tmthing->health <= 0 || thing->health <= 0)
|
||||
|
||||
Reference in new issue
Block a user