Change sounds, after discussing with Lach.
This commit is contained in:
parent
67a99f6334
commit
126fc44d6e
|
@ -11822,7 +11822,7 @@ void P_PlayerThink(player_t *player)
|
||||||
if (dashmode < DASHMODE_MAX)
|
if (dashmode < DASHMODE_MAX)
|
||||||
dashmode++; // Counter. Adds 1 to dash mode per tic in top speed.
|
dashmode++; // Counter. Adds 1 to dash mode per tic in top speed.
|
||||||
if (dashmode == DASHMODE_THRESHOLD) // This isn't in the ">=" equation because it'd cause the sound to play infinitely.
|
if (dashmode == DASHMODE_THRESHOLD) // This isn't in the ">=" equation because it'd cause the sound to play infinitely.
|
||||||
S_StartSound(player->mo, sfx_cdfm62); // If the player enters dashmode, play this sound on the the tic it starts.
|
S_StartSound(player->mo, (player->charflags & SF_MACHINE) ? sfx_kc4d : sfx_cdfm40); // If the player enters dashmode, play this sound on the the tic it starts.
|
||||||
}
|
}
|
||||||
else if ((!totallyradical || !floating) && !(player->pflags & PF_SPINNING))
|
else if ((!totallyradical || !floating) && !(player->pflags & PF_SPINNING))
|
||||||
{
|
{
|
||||||
|
@ -11830,7 +11830,7 @@ void P_PlayerThink(player_t *player)
|
||||||
{
|
{
|
||||||
dashmode -= 3; // Rather than lose it all, it gently counts back down!
|
dashmode -= 3; // Rather than lose it all, it gently counts back down!
|
||||||
if ((dashmode+3) >= DASHMODE_THRESHOLD && dashmode < DASHMODE_THRESHOLD)
|
if ((dashmode+3) >= DASHMODE_THRESHOLD && dashmode < DASHMODE_THRESHOLD)
|
||||||
S_StartSound(player->mo, sfx_s3k72);
|
S_StartSound(player->mo, sfx_kc65);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
dashmode = 0;
|
dashmode = 0;
|
||||||
|
@ -11862,7 +11862,7 @@ void P_PlayerThink(player_t *player)
|
||||||
{
|
{
|
||||||
player->normalspeed = skins[player->skin].normalspeed;
|
player->normalspeed = skins[player->skin].normalspeed;
|
||||||
player->jumpfactor = skins[player->skin].jumpfactor;
|
player->jumpfactor = skins[player->skin].jumpfactor;
|
||||||
S_StartSound(player->mo, sfx_s3k72);
|
S_StartSound(player->mo, sfx_kc65);
|
||||||
}
|
}
|
||||||
dashmode = 0;
|
dashmode = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -693,7 +693,7 @@ sfxinfo_t S_sfx[NUMSFX] =
|
||||||
{"cdfm37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"cdfm37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"cdfm38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"},
|
{"cdfm38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"},
|
||||||
{"cdfm39", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"cdfm39", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"cdfm40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"cdfm40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"},
|
||||||
{"cdfm41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"cdfm41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"cdfm42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"cdfm42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"cdfm43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"cdfm43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
|
@ -780,7 +780,7 @@ sfxinfo_t S_sfx[NUMSFX] =
|
||||||
{"kc4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"},
|
||||||
{"kc4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
|
@ -804,7 +804,7 @@ sfxinfo_t S_sfx[NUMSFX] =
|
||||||
{"kc62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc64", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Terrifying rumble"},
|
{"kc64", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Terrifying rumble"},
|
||||||
{"kc65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power down"},
|
||||||
{"kc66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
|
|
Loading…
Reference in New Issue