mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'ballhog-dies-on-walls' into 'master'
Ballhog is destroyed on contact with walls See merge request KartKrew/Kart!2318
This commit is contained in:
commit
f0ea13109a
1 changed files with 8 additions and 1 deletions
|
|
@ -1800,8 +1800,15 @@ void P_XYMovement(mobj_t *mo)
|
||||||
S_StartSound(mo, mo->info->activesound);
|
S_StartSound(mo, mo->info->activesound);
|
||||||
|
|
||||||
//{ SRB2kart - Orbinaut, Ballhog
|
//{ SRB2kart - Orbinaut, Ballhog
|
||||||
|
// Ballhog dies on contact with walls
|
||||||
|
if (mo->type == MT_BALLHOG)
|
||||||
|
{
|
||||||
|
S_StartSound(mo, mo->info->deathsound);
|
||||||
|
P_KillMobj(mo, NULL, NULL, DMG_NORMAL);
|
||||||
|
return;
|
||||||
|
}
|
||||||
// Bump sparks
|
// Bump sparks
|
||||||
if (mo->type == MT_ORBINAUT || mo->type == MT_BALLHOG || mo->type == MT_GACHABOM)
|
else if (mo->type == MT_ORBINAUT || mo->type == MT_GACHABOM)
|
||||||
{
|
{
|
||||||
mobj_t *fx;
|
mobj_t *fx;
|
||||||
fx = P_SpawnMobj(mo->x, mo->y, mo->z, MT_BUMP);
|
fx = P_SpawnMobj(mo->x, mo->y, mo->z, MT_BUMP);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue