thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'shrink-removed-checks' into 'next'

Browse source 
Add some P_MobjWasRemoved checks around code that shrink touches

See merge request KartKrew/Kart-Public!72
This commit is contained in:
Sal 2019-02-19 17:14:08 -05:00
commit 73fa403976
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/k_kart.c
View file

@ -1978,12 +1978,16 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
static void K_RemoveGrowShrink(player_t *player) static void K_RemoveGrowShrink(player_t *player)
{ {
player->kartstuff[k_growshrinktimer] = 0; player->kartstuff[k_growshrinktimer] = 0;
if (player->kartstuff[k_invincibilitytimer] == 0)
player->mo->color = player->skincolor; if (player->mo && !P_MobjWasRemoved(player->mo))
player->mo->scalespeed = mapobjectscale/TICRATE; {
player->mo->destscale = mapobjectscale; if (player->kartstuff[k_invincibilitytimer] == 0)
if (cv_kartdebugshrink.value && !modeattacking && !player->bot) player->mo->color = player->skincolor;
player->mo->destscale = (6*player->mo->destscale)/8; player->mo->scalespeed = mapobjectscale/TICRATE;
player->mo->destscale = mapobjectscale;
if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
player->mo->destscale = (6*player->mo->destscale)/8;
}
P_RestoreMusic(player); P_RestoreMusic(player);
} }
@ -3290,11 +3294,15 @@ static void K_DoShrink(player_t *user)
{ {
// Start shrinking! // Start shrinking!
K_DropItems(&players[i]); K_DropItems(&players[i]);
players[i].mo->scalespeed = mapobjectscale/TICRATE;
players[i].mo->destscale = (6*mapobjectscale)/8; if (!P_MobjWasRemoved(players[i].mo))
if (cv_kartdebugshrink.value && !modeattacking && !players[i].bot) {
players[i].mo->destscale = (6*players[i].mo->destscale)/8; players[i].mo->scalespeed = mapobjectscale/TICRATE;
players[i].kartstuff[k_growshrinktimer] = -(200+(40*(MAXPLAYERS-players[i].kartstuff[k_position]))); players[i].mo->destscale = (6*mapobjectscale)/8;
if (cv_kartdebugshrink.value && !modeattacking && !players[i].bot)
players[i].mo->destscale = (6*players[i].mo->destscale)/8;
players[i].kartstuff[k_growshrinktimer] = -(200+(40*(MAXPLAYERS-players[i].kartstuff[k_position])));
}
} }
// Grow should get taken away. // Grow should get taken away.
@ -3419,7 +3427,7 @@ void K_DropHnextList(player_t *player)
mobjtype_t type; mobjtype_t type;
boolean orbit, ponground, dropall = true; boolean orbit, ponground, dropall = true;
if (!work) if (!work || P_MobjWasRemoved(work))
return; return;
flip = P_MobjFlip(player->mo); flip = P_MobjFlip(player->mo);
@ -3556,7 +3564,7 @@ void K_DropItems(player_t *player)
K_DropHnextList(player); K_DropHnextList(player);
if (player->mo && player->kartstuff[k_itemamount]) if (player->mo && !P_MobjWasRemoved(player->mo) && player->kartstuff[k_itemamount])
{ {
mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM); mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
P_SetScale(drop, drop->scale>>4); P_SetScale(drop, drop->scale>>4);