From 54137ad468b1f8f17435bdff224275b05c9621df Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 17 Oct 2023 22:19:16 +0100 Subject: [PATCH] Eggmark fixes - Update eggmanblame on K_EggmanTransfer - Currently blames the bumper, but could blame the source's eggmanblame if we wanted to change that - Use K_FlipFromObject for correct reverse gravity placement --- src/k_kart.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 370224ccf..1b2082e2b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -8408,7 +8408,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) //player->flashing = 0; eggsexplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SPBEXPLOSION); eggsexplode->height = 2 * player->mo->height; - eggsexplode->color = player->mo->color; + K_FlipFromObject(eggsexplode, player->mo); if (player->eggmanblame >= 0 && player->eggmanblame < MAXPLAYERS @@ -12304,6 +12304,7 @@ void K_EggmanTransfer(player_t *source, player_t *victim) K_AddHitLag(victim->mo, 2, true); K_DropItems(victim); victim->eggmanexplode = 6*TICRATE; + victim->eggmanblame = (source - players); K_StopRoulette(&victim->itemRoulette); if (P_IsDisplayPlayer(victim) && !demo.freecam) @@ -12311,6 +12312,7 @@ void K_EggmanTransfer(player_t *source, player_t *victim) K_AddHitLag(source->mo, 2, true); source->eggmanexplode = 0; + source->eggmanblame = -1; K_StopRoulette(&source->itemRoulette); source->eggmanTransferDelay = 10;