Merge branch '1upsound' into 'master'
Play the 1-up sound when 1upsound is set to sound See merge request STJr/SRB2!926
This commit is contained in:
commit
4437c27bcf
11
src/p_user.c
11
src/p_user.c
|
@ -395,7 +395,7 @@ void P_GiveFinishFlags(player_t *player)
|
||||||
mobj_t* flag = P_SpawnMobjFromMobj(player->mo, xoffs, yoffs, 0, MT_FINISHFLAG);
|
mobj_t* flag = P_SpawnMobjFromMobj(player->mo, xoffs, yoffs, 0, MT_FINISHFLAG);
|
||||||
flag->angle = angle;
|
flag->angle = angle;
|
||||||
angle += FixedAngle(120*FRACUNIT);
|
angle += FixedAngle(120*FRACUNIT);
|
||||||
|
|
||||||
P_SetTarget(&flag->target, player->mo);
|
P_SetTarget(&flag->target, player->mo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1492,17 +1492,10 @@ void P_PlayLivesJingle(player_t *player)
|
||||||
if (player && !P_IsLocalPlayer(player))
|
if (player && !P_IsLocalPlayer(player))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (use1upSound)
|
if (use1upSound || cv_1upsound.value)
|
||||||
S_StartSound(NULL, sfx_oneup);
|
S_StartSound(NULL, sfx_oneup);
|
||||||
else if (mariomode)
|
else if (mariomode)
|
||||||
S_StartSound(NULL, sfx_marioa);
|
S_StartSound(NULL, sfx_marioa);
|
||||||
else if (cv_1upsound.value)
|
|
||||||
{
|
|
||||||
if (S_sfx[sfx_oneup].lumpnum != LUMPERROR)
|
|
||||||
S_StartSound(NULL, sfx_oneup);
|
|
||||||
else
|
|
||||||
S_StartSound(NULL, sfx_chchng);/* at least play something! */
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
P_PlayJingle(player, JT_1UP);
|
P_PlayJingle(player, JT_1UP);
|
||||||
|
|
Loading…
Reference in New Issue