diff --git a/src/d_main.cpp b/src/d_main.cpp index 816e58f42..ca60da45e 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -93,8 +93,8 @@ #define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291 #define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b #define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9 -#define ASSET_HASH_MAIN_PK3 0x0cd2e2692d625dd2 -#define ASSET_HASH_MAPPATCH_PK3 0xc6a7e41420fd8cb9 +#define ASSET_HASH_MAIN_PK3 0xc3218eb6be606660 +#define ASSET_HASH_MAPPATCH_PK3 0x1745690024efbaf8 #define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461 #ifdef USE_PATCH_FILE #define ASSET_HASH_PATCH_PK3 0x0000000000000000 diff --git a/src/k_kart.c b/src/k_kart.c index 98b3cb501..f207cb51f 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9836,13 +9836,13 @@ static void K_RecoveryDash(player_t *player) player->pflags &= ~PF_RECOVERYSPIN; if (player->recoverydashcharge >= RECOVERYDASHCHARGETIME && (player->cmd.buttons & BT_ACCELERATE)) { + K_SetTireGrease(player, 2*TICRATE); player->outrun = TICRATE/4; player->recoverydash = TICRATE; player->flashing = 0; S_StartSound(player->mo, sfx_s23c); K_SpawnDashDustRelease(player, true); } - player->tiregrease = 2*TICRATE; player->recoverydashcharge = 0; player->forcedtopspeed = 0; return; diff --git a/src/p_user.c b/src/p_user.c index 3dbf69e96..2c9044be7 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -855,7 +855,7 @@ void P_RestoreMusic(player_t *player) { if (player->growshrinktimer > 1) wantedmus = 1; - else if (player->invincibilitytimer) + else if (player->invincibilitytimer > 1) wantedmus = 2; else if (((player->smonitortimer > 1) && (!player->smonitorwarning))) wantedmus = 2;