From d3a2a40a3ac812b0da8de52e67f3d63569ddaebe Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Fri, 23 Mar 2012 03:37:55 +0000
Subject: [PATCH] - Fixed: Do not "Give player back the skin" when loading a
 savegame if they have MF4_NOSKIN set.

SVN r3473 (trunk)
---
 src/p_mobj.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index d3298f81e..270637815 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -363,8 +363,8 @@ void AActor::Serialize (FArchive &arc)
 		{
 			if (playeringame[player - players] && 
 				player->cls != NULL &&
-				state->sprite == 
-				GetDefaultByType (player->cls)->SpawnState->sprite)
+				!(flags4 & MF4_NOSKIN) &&
+				state->sprite == GetDefaultByType (player->cls)->SpawnState->sprite)
 			{ // Give player back the skin
 				sprite = skins[player->userinfo.skin].sprite;
 				scaleX = skins[player->userinfo.skin].ScaleX;