Merge branch 'musicfixes' into 'master'
Minor musicplus-related fixes See merge request STJr/SRB2Internal!310
This commit is contained in:
commit
c6af108d8c
|
@ -4152,9 +4152,9 @@ void A_Invincibility(mobj_t *actor)
|
||||||
{
|
{
|
||||||
if (mariomode)
|
if (mariomode)
|
||||||
G_GhostAddColor(GHC_INVINCIBLE);
|
G_GhostAddColor(GHC_INVINCIBLE);
|
||||||
|
P_PlayJingle(player, (mariomode) ? JT_MINV : JT_INV);
|
||||||
strlcpy(S_sfx[sfx_None].caption, "Invincibility", 14);
|
strlcpy(S_sfx[sfx_None].caption, "Invincibility", 14);
|
||||||
S_StartCaption(sfx_None, -1, player->powers[pw_invulnerability]);
|
S_StartCaption(sfx_None, -1, player->powers[pw_invulnerability]);
|
||||||
P_PlayJingle(player, (mariomode) ? JT_MINV : JT_INV);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1431,11 +1431,11 @@ void P_PlayLivesJingle(player_t *player)
|
||||||
S_StartSound(NULL, sfx_marioa);
|
S_StartSound(NULL, sfx_marioa);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
P_PlayJingle(player, JT_1UP);
|
||||||
if (player)
|
if (player)
|
||||||
player->powers[pw_extralife] = extralifetics + 1;
|
player->powers[pw_extralife] = extralifetics + 1;
|
||||||
strlcpy(S_sfx[sfx_None].caption, "One-up", 7);
|
strlcpy(S_sfx[sfx_None].caption, "One-up", 7);
|
||||||
S_StartCaption(sfx_None, -1, extralifetics+1);
|
S_StartCaption(sfx_None, -1, extralifetics+1);
|
||||||
P_PlayJingle(player, JT_1UP);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1783,12 +1783,12 @@ static lumpnum_t S_GetMusicLumpNum(const char *mname)
|
||||||
return W_GetNumForName(va("d_%s", mname));
|
return W_GetNumForName(va("d_%s", mname));
|
||||||
else if (S_DigMusicDisabled() && S_DigExists(mname))
|
else if (S_DigMusicDisabled() && S_DigExists(mname))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, "Digital music is disabled!\n");
|
//CONS_Alert(CONS_NOTICE, "Digital music is disabled!\n");
|
||||||
return LUMPERROR;
|
return LUMPERROR;
|
||||||
}
|
}
|
||||||
else if (S_MIDIMusicDisabled() && S_MIDIExists(mname))
|
else if (S_MIDIMusicDisabled() && S_MIDIExists(mname))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, "MIDI music is disabled!\n");
|
//CONS_Alert(CONS_NOTICE, "MIDI music is disabled!\n");
|
||||||
return LUMPERROR;
|
return LUMPERROR;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue