From a78a0071f29b55008b6990f93776fa22e44f6e78 Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Thu, 17 Sep 2020 19:00:49 +0930
Subject: [PATCH] Save changes made to the bot's skin, and display it properly
 in save select

---
 src/m_menu.c  | 2 +-
 src/r_skins.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index 49e8211d0a..932d368daf 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -8483,7 +8483,7 @@ static void M_DrawLoadGameData(void)
 				sprdef = &charbotskin->sprites[SPR2_SIGN];
 				if (!sprdef->numframes)
 					goto skipbot;
-				colormap = R_GetTranslationColormap(savegameinfo[savetodraw].botskin, charbotskin->prefcolor, 0);
+				colormap = R_GetTranslationColormap(savegameinfo[savetodraw].botskin-1, charbotskin->prefcolor, 0);
 				sprframe = &sprdef->spriteframes[0];
 				patch = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH);
 
diff --git a/src/r_skins.c b/src/r_skins.c
index a4fe1982f7..25904e95e3 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -286,6 +286,11 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
 			else if (playernum == secondarydisplayplayer)
 				CV_StealthSetValue(&cv_playercolor2, skin->prefcolor);
 			player->skincolor = newcolor = skin->prefcolor;
+			if (player->bot && botingame)
+			{
+				botskin = (UINT8)(skinnum + 1);
+				botcolor = skin->prefcolor;
+			}
 		}
 
 		if (player->followmobj)
-- 
GitLab