thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-18 05:52:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'stumble-repair' into 'master'

Browse source 
Stumble damage type repair

Closes #425 and #424

See merge request KartKrew/Kart!909
This commit is contained in:
toaster 2023-02-06 22:18:07 +00:00
commit 45e02b67be
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_inter.c
View file

@ -2337,13 +2337,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
break; break;
} }
if (type != DMG_STING && type != DMG_STUMBLE) if (type != DMG_STUMBLE)
{ {
player->flashing = K_GetKartFlashing(player); if (type != DMG_STING)
} player->flashing = K_GetKartFlashing(player);
if (ringburst > 0)
{
P_PlayRinglossSound(target); P_PlayRinglossSound(target);
P_PlayerRingBurst(player, ringburst); P_PlayerRingBurst(player, ringburst);
} }
@ -2356,7 +2354,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
} }
else else
{ {
K_DropHnextList(player, false); K_DropHnextList(player, (type != DMG_STUMBLE));
} }
if (type != DMG_STUMBLE) if (type != DMG_STUMBLE)

4
src/p_setup.c
View file

@ -6017,7 +6017,9 @@ static void P_ConvertBinarySectorTypes(void)
case 8: //Instakill case 8: //Instakill
sectors[i].damagetype = SD_INSTAKILL; sectors[i].damagetype = SD_INSTAKILL;
break; break;
case 9: // Stumble //case 9: -- Ring Drainer (Floor Touch)
//case 10: -- Ring Drainer (No Floor Touch)
case 11: // Stumble
sectors[i].damagetype = SD_STUMBLE; sectors[i].damagetype = SD_STUMBLE;
break; break;
case 12: //Wall sector case 12: //Wall sector