Merge branch 'loud-character-select' into 'master'

Play character sounds + follower horns on charsel

See merge request KartKrew/Kart!2360
This commit is contained in:
AJ Martinez 2024-05-04 11:23:48 +00:00
commit e787988177

View file

@ -777,6 +777,8 @@ static void M_HandleBeginningFollowers(setup_player_t *p)
static void M_HandleBeginningColorsOrFollowers(setup_player_t *p)
{
if (p->skin != -1)
S_StartSound(NULL, skins[p->skin].soundsid[S_sfx[sfx_kattk1].skinsound]);
if (M_HandleBeginningColors(p))
S_StartSound(NULL, sfx_s3k63);
else
@ -1173,6 +1175,8 @@ static void M_HandleFollowerRotate(setup_player_t *p, UINT8 num)
p->mdepth = CSSTEP_FOLLOWERCOLORS;
M_NewPlayerColors(p);
S_StartSound(NULL, sfx_s3k63);
if (p->followern != -1)
S_StartSound(NULL, followers[p->followern].hornsound);
}
else
{