stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-01 14:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure the correct color is set for the player object in splitscreen

Browse source
This commit is contained in:
Lactozilla 2023-08-15 03:46:55 -03:00
parent 3377fa986a
commit 9dc2447559
1 changed files with 2 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/d_netcmd.c
View file

@ -1271,7 +1271,7 @@ static void SendNameAndColor(void)
players[consoleplayer].skincolor = cv_playercolor.value; players[consoleplayer].skincolor = cv_playercolor.value;
if (players[consoleplayer].mo && !players[consoleplayer].powers[pw_dye]) if (players[consoleplayer].mo && !players[consoleplayer].powers[pw_dye])
players[consoleplayer].mo->color = players[consoleplayer].skincolor; players[consoleplayer].mo->color = P_GetPlayerColor(&players[consoleplayer]);
if (metalrecording) if (metalrecording)
{ // Starring Metal Sonic as themselves, obviously. { // Starring Metal Sonic as themselves, obviously.
@ -1280,24 +1280,10 @@ static void SendNameAndColor(void)
} }
else if ((foundskin = R_SkinAvailable(cv_skin.string)) != -1 && R_SkinUsable(consoleplayer, foundskin)) else if ((foundskin = R_SkinAvailable(cv_skin.string)) != -1 && R_SkinUsable(consoleplayer, foundskin))
{ {
//boolean notsame;
cv_skin.value = foundskin; cv_skin.value = foundskin;
//notsame = (cv_skin.value != players[consoleplayer].skin);
SetPlayerSkin(consoleplayer, cv_skin.string); SetPlayerSkin(consoleplayer, cv_skin.string);
CV_StealthSet(&cv_skin, skins[cv_skin.value].name); CV_StealthSet(&cv_skin, skins[cv_skin.value].name);
/*if (notsame)
{
CV_StealthSetValue(&cv_playercolor, skins[cv_skin.value].prefcolor);
players[consoleplayer].skincolor = cv_playercolor.value % numskincolors;
if (players[consoleplayer].mo)
players[consoleplayer].mo->color = (UINT16)players[consoleplayer].skincolor;
}*/
} }
else else
{ {
@ -1399,7 +1385,7 @@ static void SendNameAndColor2(void)
// don't use secondarydisplayplayer: the second player must be 1 // don't use secondarydisplayplayer: the second player must be 1
players[secondplaya].skincolor = cv_playercolor2.value; players[secondplaya].skincolor = cv_playercolor2.value;
if (players[secondplaya].mo && !players[secondplaya].powers[pw_dye]) if (players[secondplaya].mo && !players[secondplaya].powers[pw_dye])
players[secondplaya].mo->color = players[secondplaya].skincolor; players[secondplaya].mo->color = P_GetPlayerColor(&players[secondplaya]);
if (cv_forceskin.value >= 0 && (netgame || multiplayer)) // Server wants everyone to use the same player if (cv_forceskin.value >= 0 && (netgame || multiplayer)) // Server wants everyone to use the same player
{ {
@ -1410,24 +1396,10 @@ static void SendNameAndColor2(void)
} }
else if ((foundskin = R_SkinAvailable(cv_skin2.string)) != -1 && R_SkinUsable(secondplaya, foundskin)) else if ((foundskin = R_SkinAvailable(cv_skin2.string)) != -1 && R_SkinUsable(secondplaya, foundskin))
{ {
//boolean notsame;
cv_skin2.value = foundskin; cv_skin2.value = foundskin;
//notsame = (cv_skin2.value != players[secondplaya].skin);
SetPlayerSkin(secondplaya, cv_skin2.string); SetPlayerSkin(secondplaya, cv_skin2.string);
CV_StealthSet(&cv_skin2, skins[cv_skin2.value].name); CV_StealthSet(&cv_skin2, skins[cv_skin2.value].name);
/*if (notsame)
{
CV_StealthSetValue(&cv_playercolor2, skins[players[secondplaya].skin].prefcolor);
players[secondplaya].skincolor = cv_playercolor2.value % numskincolors;
if (players[secondplaya].mo)
players[secondplaya].mo->color = players[secondplaya].skincolor;
}*/
} }
else else
{ {