From ce1c5d03d36dd38479a306a09255d1942764f57d Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Sat, 4 May 2024 04:23:26 -0700
Subject: [PATCH] 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 dfba309e0b..ed8606ff02 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
{
--
GitLab