From 514cd0794bab3cc8491bcabbedbb0f9f498c1a36 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 14 Nov 2018 14:48:16 -0500 Subject: [PATCH] This effect assumed that it was spawned at base scale anyway... --- src/k_kart.c | 1 + src/p_mobj.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index bdd66c7f..6394af4c 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1395,6 +1395,7 @@ void K_RespawnChecker(player_t *player) P_SetTarget(&mo->target, player->mo); mo->angle = newangle+ANGLE_90; mo->momz = (8*FRACUNIT)*P_MobjFlip(player->mo); + P_SetScale(mo, (mo->destscale = FRACUNIT)); } } } diff --git a/src/p_mobj.c b/src/p_mobj.c index b73cd430..3ae46760 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -11095,7 +11095,7 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing) if (mthing->options >> ZSHIFT) z -= ((mthing->options >> ZSHIFT) << FRACBITS); if (p->kartstuff[k_respawn]) - z -= 128*FRACUNIT; + z -= 128*FRACUNIT; // Too late for v1, but for later: 128*mapheaderinfo[gamemap-1]->mobj_scale; } else { @@ -11103,7 +11103,7 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing) if (mthing->options >> ZSHIFT) z += ((mthing->options >> ZSHIFT) << FRACBITS); if (p->kartstuff[k_respawn]) - z += 128*FRACUNIT; + z += 128*FRACUNIT; // Too late for v1, but for later: 128*mapheaderinfo[gamemap-1]->mobj_scale; } if (mthing->options & MTF_OBJECTFLIP) // flip the player!