thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 03:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Duel Bomb tumble not scaling

Browse source
This commit is contained in:
Sally Coolatta 2022-10-01 22:28:33 -04:00
parent 4404d0c098
commit bf6439731c
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/objects/duel-bomb.c
View file

@ -77,18 +77,17 @@ void Obj_DuelBombTouch(mobj_t *bomb, mobj_t *toucher)
boom->color = SKINCOLOR_KETCHUP; boom->color = SKINCOLOR_KETCHUP;
S_StartSound(boom, bomb->info->attacksound); S_StartSound(boom, bomb->info->attacksound);
// Kill bomb
P_KillMobj(bomb, toucher, toucher, DMG_NORMAL);
if (player->invincibilitytimer > 0 if (player->invincibilitytimer > 0
|| K_IsBigger(toucher, bomb) == true || K_IsBigger(toucher, bomb) == true
|| player->flamedash > 0) || player->flamedash > 0)
{ {
// Kill without damaging. // Kill without damaging.
P_KillMobj(bomb, toucher, toucher, DMG_NORMAL);
return; return;
} }
P_DamageMobj(toucher, bomb, bomb, 1, DMG_TUMBLE); P_DamageMobj(toucher, bomb, bomb, 1, DMG_TUMBLE);
P_KillMobj(bomb, toucher, toucher, DMG_NORMAL);
} }
void Obj_DuelBombInit(mobj_t *bomb) void Obj_DuelBombInit(mobj_t *bomb)