From 6ee0e40c1a2b50353b8e635c62c876c8aa9932d1 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sat, 4 May 2024 00:45:27 -0700 Subject: [PATCH 1/2] Play character sounds + follower horns on charsel --- src/menus/play-char-select.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/menus/play-char-select.c b/src/menus/play-char-select.c index 06c6b0090..dfba309e0 100644 --- a/src/menus/play-char-select.c +++ b/src/menus/play-char-select.c @@ -777,6 +777,7 @@ static void M_HandleBeginningFollowers(setup_player_t *p) static void M_HandleBeginningColorsOrFollowers(setup_player_t *p) { + S_StartSound(NULL, skins[p->skin].soundsid[S_sfx[sfx_kattk1].skinsound]); if (M_HandleBeginningColors(p)) S_StartSound(NULL, sfx_s3k63); else @@ -1173,6 +1174,7 @@ static void M_HandleFollowerRotate(setup_player_t *p, UINT8 num) p->mdepth = CSSTEP_FOLLOWERCOLORS; M_NewPlayerColors(p); S_StartSound(NULL, sfx_s3k63); + S_StartSound(NULL, followers[p->followern].hornsound); } else { From ce1c5d03d36dd38479a306a09255d1942764f57d Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sat, 4 May 2024 04:23:26 -0700 Subject: [PATCH 2/2] Safety check t. nosegoblins --- src/menus/play-char-select.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/menus/play-char-select.c b/src/menus/play-char-select.c index dfba309e0..ed8606ff0 100644 --- a/src/menus/play-char-select.c +++ b/src/menus/play-char-select.c @@ -777,7 +777,8 @@ static void M_HandleBeginningFollowers(setup_player_t *p) static void M_HandleBeginningColorsOrFollowers(setup_player_t *p) { - S_StartSound(NULL, skins[p->skin].soundsid[S_sfx[sfx_kattk1].skinsound]); + 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 @@ -1174,7 +1175,8 @@ static void M_HandleFollowerRotate(setup_player_t *p, UINT8 num) p->mdepth = CSSTEP_FOLLOWERCOLORS; M_NewPlayerColors(p); S_StartSound(NULL, sfx_s3k63); - S_StartSound(NULL, followers[p->followern].hornsound); + if (p->followern != -1) + S_StartSound(NULL, followers[p->followern].hornsound); } else {