mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
Merge branch 'preventmonitorpits' into 'master'
Prevent battle monitors getting stuck in pits See merge request KartKrew/RingRacers!124
This commit is contained in:
commit
928a1ed4ad
1 changed files with 8 additions and 0 deletions
|
|
@ -2309,6 +2309,14 @@ boolean P_ZMovement(mobj_t *mo)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case MT_MONITOR:
|
||||||
|
// Prevent battle monitors getting stuck in pits
|
||||||
|
if (P_CheckDeathPitCollide(mo))
|
||||||
|
{
|
||||||
|
P_RemoveMobj(mo);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
// SRB2kart stuff that should die in pits
|
// SRB2kart stuff that should die in pits
|
||||||
// Shouldn't stop moving along the Z if there's no speed though!
|
// Shouldn't stop moving along the Z if there's no speed though!
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue