thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-22 10:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

P_KillPlayer: Use death frames from SF_IRONMAN skin, not those of the randomised skin

Browse source 
Currently invisible for Heavy Magician, but a lot about her is nonfinal.
This commit is contained in:
toaster 2023-01-15 16:08:28 +00:00
parent 1ae8a6dec5
commit 3c79e32516
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/p_inter.c
View file

@ -1926,6 +1926,21 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
break;
}
if (player->spectator == false)
{
UINT32 skinflags = (demo.playback)
? demo.skinlist[demo.currentskinid[(player-players)]].flags
: skins[player->skin].flags;
if (skinflags & SF_IRONMAN)
{
player->mo->skin = &skins[player->skin];
K_SpawnMagicianParticles(player->mo, 5);
}
player->mo->renderflags &= ~RF_DONTDRAW;
}
K_DropEmeraldsFromPlayer(player, player->emeralds);
K_SetHitLagForObjects(player->mo, inflictor, MAXHITLAGTICS, true);
@ -1935,11 +1950,6 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
P_ResetPlayer(player);
if (player->spectator == false)
{
player->mo->renderflags &= ~RF_DONTDRAW;
}
P_SetPlayerMobjState(player->mo, player->mo->info->deathstate);
if (type == DMG_TIMEOVER)