diff --git a/src/info.c b/src/info.c index 4a75ac2c0..979715bf4 100644 --- a/src/info.c +++ b/src/info.c @@ -14248,30 +14248,30 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = }, { // MT_RANDOMITEM - 2000, // doomednum - S_RANDOMITEM1, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 0, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate + 2000, // doomednum + S_RANDOMITEM1, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 0, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate S_DEADRANDOMITEM, // deathstate - S_NULL, // xdeathstate - sfx_pop, // deathsound - 60*FRACUNIT, // speed - 36*FRACUNIT, // radius - 36*FRACUNIT, // height - 0, // display offset - 100, // mass + S_NULL, // xdeathstate + sfx_kc2e, // deathsound + 60*FRACUNIT, // speed + 36*FRACUNIT, // radius + 36*FRACUNIT, // height + 0, // display offset + 100, // mass MT_RANDOMITEMPOP, // damage - sfx_None, // activesound + sfx_None, // activesound MF_SLIDEME|MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags - S_NULL // raisestate + S_NULL // raisestate }, { // MT_RANDOMITEMPOP diff --git a/src/p_inter.c b/src/p_inter.c index da84a1fcb..d3587717a 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1207,7 +1207,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) { // blatant reuse of a variable that's normally unused in circuit if (!player->tossdelay) - S_StartSound(toucher, sfx_lose); + S_StartSound(toucher, sfx_s26d); player->tossdelay = 3; return; } diff --git a/src/p_spec.c b/src/p_spec.c index b069736b6..b7d3baeb5 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -4201,7 +4201,7 @@ DoneSection2: { // blatant reuse of a variable that's normally unused in circuit if (!player->tossdelay) - S_StartSound(player->mo, sfx_lose); + S_StartSound(player->mo, sfx_s26d); player->tossdelay = 3; } @@ -4221,12 +4221,13 @@ DoneSection2: } else S_ChangeMusicInternal("karok", true); - // - //HU_SetCEchoFlags(0); - //HU_SetCEchoDuration(5); - //HU_DoCEcho("FINISHED!"); } + if (player->kartstuff[k_position] == 1) + S_StartSound(NULL, sfx_s253); + else + S_StartSound(NULL, sfx_s221); + P_DoPlayerExit(player); } } diff --git a/src/s_sound.c b/src/s_sound.c index 7ea09e987..157c06eed 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -751,7 +751,7 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id) if (sound_disabled) return; - if (true) // Sounds change in Mario mode! // SRB2kart - every sound is mario. + if (mariomode) // Sounds change in Mario mode! { switch (sfx_id) { @@ -764,9 +764,9 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id) case sfx_thok: sfx_id = sfx_mario7; break; - case sfx_pop: - sfx_id = sfx_mkitem; // SRB2kart - break; +// case sfx_pop: +// sfx_id = sfx_mkitem; // SRB2kart +// break; case sfx_jump: sfx_id = sfx_mario6; break; diff --git a/src/sounds.c b/src/sounds.c index 94fdef2c4..83413c7b6 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -316,7 +316,7 @@ sfxinfo_t S_sfx[NUMSFX] = // Sonic 2 sounds {"s220", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"s221", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"s221", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Normal finish {"s222", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s223", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s224", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, @@ -392,7 +392,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"s26a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s26b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s26c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"s26d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"s26d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Missed checkpoint {"s26e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s26f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s270", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},