From 28d58b9828fe61b032553083e2d95bde9ad882ec Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 14 Sep 2024 16:40:17 +0300 Subject: [PATCH] Don't default to sonic if skin was changed to unknown skin, use current skin instead --- src/d_netcmd.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b813d4c00..54202d6ea 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1655,8 +1655,9 @@ static void SendNameAndColor(void) cv_skin.value = R_SkinAvailable(cv_skin.string); if (cv_skin.value < 0) { - CV_StealthSet(&cv_skin, DEFAULTSKIN); - cv_skin.value = 0; + INT32 skinnum = players[consoleplayer].skin; + CV_StealthSet(&cv_skin, skins[skinnum].name); + cv_skin.value = skinnum; } // Finally write out the complete packet and send it off. @@ -1759,8 +1760,9 @@ static void SendNameAndColor2(void) cv_skin2.value = R_SkinAvailable(cv_skin2.string); if (cv_skin2.value < 0) { - CV_StealthSet(&cv_skin2, DEFAULTSKIN); - cv_skin2.value = 0; + INT32 skinnum = players[displayplayers[1]].skin; + CV_StealthSet(&cv_skin2, skins[skinnum].name); + cv_skin2.value = skinnum; } // Finally write out the complete packet and send it off. @@ -1870,8 +1872,9 @@ static void SendNameAndColor3(void) cv_skin3.value = R_SkinAvailable(cv_skin3.string); if (cv_skin3.value < 0) { - CV_StealthSet(&cv_skin3, DEFAULTSKIN); - cv_skin3.value = 0; + INT32 skinnum = players[displayplayers[2]].skin; + CV_StealthSet(&cv_skin3, skins[skinnum].name); + cv_skin3.value = skinnum; } // Finally write out the complete packet and send it off. @@ -1973,8 +1976,9 @@ static void SendNameAndColor4(void) cv_skin4.value = R_SkinAvailable(cv_skin4.string); if (cv_skin4.value < 0) { - CV_StealthSet(&cv_skin4, DEFAULTSKIN); - cv_skin4.value = 0; + INT32 skinnum = players[displayplayers[3]].skin; + CV_StealthSet(&cv_skin4, skins[skinnum].name); + cv_skin4.value = skinnum; } // Finally write out the complete packet and send it off.