From eaaf708381c15753f655982edaa485f6e6c64d6c Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 2 Apr 2018 06:43:03 -0400 Subject: [PATCH] This little thing slipped by the merge --- src/d_player.h | 2 +- src/p_user.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index 5c901f24..5ab83e55 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -292,7 +292,7 @@ typedef enum k_boostcharge, // Charge-up for boosting at the start of the race, or when Lakitu drops you k_jmp, // In Mario Kart, letting go of the jump button stops the drift k_offroad, // In Super Mario Kart, going offroad has lee-way of about 1 second before you start losing speed - k_pogospring, // Pogo spring effect + k_pogospring, // Pogo spring bounce effect k_itemroulette, // Used for the roulette when deciding what item to give you (was "pw_kartitem") diff --git a/src/p_user.c b/src/p_user.c index fad03b87..3ac1a9d8 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -8858,7 +8858,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall && thiscam->z < thiscam->subsector->sector->floorheight + 256*FRACUNIT && FixedMul(z - thiscam->z, camspeed) < 0) #if 0 - || player->kartstuff[k_feather] & 2 // SRB2Kart: don't follow while bouncing, experimental + || player->kartstuff[k_pogospring] // SRB2Kart: don't follow while bouncing, experimental #endif ) thiscam->momz = 0; // Don't go down a death pit