Dedicated servers have all skins unlocked for the purpose of forceskin.

Meanwhile, a sneaky sneaky for hiding hidden characters further.
This commit is contained in:
toasterbabe 2016-07-13 20:14:07 +01:00
parent a108fcce5b
commit 2ee22fc40a
2 changed files with 3 additions and 1 deletions

View file

@ -4002,7 +4002,7 @@ static void Command_Archivetest_f(void)
*/
static void ForceSkin_OnChange(void)
{
if ((server || adminplayer == consoleplayer) && (cv_forceskin.value < -1 || cv_forceskin.value >= numskins || !R_SkinUnlock(cv_forceskin.value)))
if ((server || adminplayer == consoleplayer) && (cv_forceskin.value < -1 || cv_forceskin.value >= numskins || !(dedicated || R_SkinUnlock(cv_forceskin.value)))) // Dedicated servers have everything when it comes to forceskin because they have no gamedata.
{
if (cv_forceskin.value == -2)
CV_SetValue(&cv_forceskin, numskins-1);

View file

@ -2434,6 +2434,8 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
P_SetScale(player->mo, player->mo->scale);
return;
}
else if !R_SkinUnlock(skinnum) // Sneaky sneaky.
skinnum = -1;
if (P_IsLocalPlayer(player))
CONS_Alert(CONS_WARNING, M_GetText("Skin %d not found\n"), skinnum);