thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dashmode-ctf-monitors' into 'next'

Browse source 
Don't let Metal pop the enemy team's monitors (closes #94)

See merge request STJr/SRB2!584
This commit is contained in:
James R 2019-12-31 01:31:55 -05:00
commit 0fdf838c86
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_map.c
View file

@ -829,14 +829,14 @@ static boolean PIT_CheckThing(mobj_t *thing)
for (iter = thing->subsector->sector->thinglist; iter; iter = iter->snext) for (iter = thing->subsector->sector->thinglist; iter; iter = iter->snext)
if (iter->type == thing->type && iter->health > 0 && iter->flags & MF_SOLID && (iter == thing || P_AproxDistance(P_AproxDistance(thing->x - iter->x, thing->y - iter->y), thing->z - iter->z) < 56*thing->scale))//FixedMul(56*FRACUNIT, thing->scale)) if (iter->type == thing->type && iter->health > 0 && iter->flags & MF_SOLID && (iter == thing || P_AproxDistance(P_AproxDistance(thing->x - iter->x, thing->y - iter->y), thing->z - iter->z) < 56*thing->scale))//FixedMul(56*FRACUNIT, thing->scale))
P_KillMobj(iter, tmthing, tmthing, 0); P_KillMobj(iter, tmthing, tmthing, 0);
return true;
} }
else else
{ {
thing->health = 0; if (P_DamageMobj(thing, tmthing, tmthing, 1, 0))
P_KillMobj(thing, tmthing, tmthing, 0);
}
return true; return true;
} }
}
// vectorise metal - done in a special case as at this point neither has the right flags for touching // vectorise metal - done in a special case as at this point neither has the right flags for touching
if (thing->type == MT_METALSONIC_BATTLE if (thing->type == MT_METALSONIC_BATTLE