mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-12-02 22:22:55 +00:00
Merge branch 'lenient_acz3' into 'master'
Make ACZ3 Boss damage while bouncing more lenient See merge request STJr/SRB2Internal!375
This commit is contained in:
commit
9f07b50098
1 changed files with 1 additions and 1 deletions
|
|
@ -428,7 +428,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
||||||
|| special->state == &states[S_FANG_BOUNCE4]
|
|| special->state == &states[S_FANG_BOUNCE4]
|
||||||
|| special->state == &states[S_FANG_PINCHBOUNCE3]
|
|| special->state == &states[S_FANG_PINCHBOUNCE3]
|
||||||
|| special->state == &states[S_FANG_PINCHBOUNCE4])
|
|| special->state == &states[S_FANG_PINCHBOUNCE4])
|
||||||
&& P_MobjFlip(special)*((special->z + special->height/2) - (toucher->z - toucher->height/2)) > -(special->height/4))
|
&& P_MobjFlip(special)*((special->z + special->height/2) - (toucher->z - toucher->height/2)) > (special->height/4))
|
||||||
{
|
{
|
||||||
P_DamageMobj(toucher, special, special, 1, 0);
|
P_DamageMobj(toucher, special, special, 1, 0);
|
||||||
P_SetTarget(&special->tracer, toucher);
|
P_SetTarget(&special->tracer, toucher);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue