diff --git a/src/d_main.cpp b/src/d_main.cpp index 8e29804a7..4b5aecf21 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -93,7 +93,7 @@ #define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291 #define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b #define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9 -#define ASSET_HASH_MAIN_PK3 0xbbd57453623962af +#define ASSET_HASH_MAIN_PK3 0x6ae176cd227ed0eb #define ASSET_HASH_MAPPATCH_PK3 0x6ad99efcfaafb70f #define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461 #ifdef USE_PATCH_FILE diff --git a/src/k_kart.c b/src/k_kart.c index 1631dd09b..fa742bd80 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7259,14 +7259,28 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) { if (!player->invincibilitywarning) { - S_StartSound(player->mo, sfx_cdfm79); + S_StartSound(player->mo, sfx_cdfm71); player->invincibilitywarning = 1; } } + + if (((INT16)(player->invincibilitybottleneck) > 127) && + (!S_SoundPlaying(player->mo, sfx_s3kbes))) + { + S_StartSound(player->mo, sfx_s3kbes); + } } else { player->invincibilitytimer--; + + if (S_SoundPlaying(player->mo, sfx_s3kbes) && + K_IsKartItemAlternate(KITEM_INVINCIBILITY)) + { + // Shut off the bottlenecker sound. + S_StopSoundByID(player->mo, sfx_s3kbes); + } + player->invincibilitybottleneck = 0; player->invincibilitywarning = 0; }