From efbaab3440ba0d32ed22a8361c11d2e3565a9f6f Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Wed, 2 Jan 2013 02:26:22 +0000
Subject: [PATCH] - Never set the player actor's scale to the skin's directly.
 Only do it indirectly through   P_CheckPlayerSprite().

SVN r4005 (trunk)
---
 src/d_netinfo.cpp | 2 --
 src/p_mobj.cpp    | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp
index 9d0d63f813..ed6a4f7fc7 100644
--- a/src/d_netinfo.cpp
+++ b/src/d_netinfo.cpp
@@ -770,8 +770,6 @@ void D_ReadUserInfoStrings (int i, BYTE **stream, bool update)
 						GetDefaultByType (players[i].cls)->SpawnState->sprite)
 					{ // Only change the sprite if the player is using a standard one
 						players[i].mo->sprite = skins[info->skin].sprite;
-						players[i].mo->scaleX = skins[info->skin].ScaleX;
-						players[i].mo->scaleY = skins[info->skin].ScaleY;
 					}
 				}
 				// Rebuild translation in case the new skin uses a different range
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 4198069b68..de97f89ee0 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -328,8 +328,6 @@ void AActor::Serialize (FArchive &arc)
 				state->sprite == GetDefaultByType (player->cls)->SpawnState->sprite)
 			{ // Give player back the skin
 				sprite = skins[player->userinfo.skin].sprite;
-				scaleX = skins[player->userinfo.skin].ScaleX;
-				scaleY = skins[player->userinfo.skin].ScaleY;
 			}
 			if (Speed == 0)
 			{
@@ -4272,8 +4270,6 @@ APlayerPawn *P_SpawnPlayer (FPlayerStart *mthing, int playernum, bool tempplayer
 	if (!(mobj->flags4 & MF4_NOSKIN))
 	{
 		mobj->sprite = skins[p->userinfo.skin].sprite;
-		mobj->scaleX = skins[p->userinfo.skin].ScaleX;
-		mobj->scaleY = skins[p->userinfo.skin].ScaleY;
 	}
 
 	p->DesiredFOV = p->FOV = 90.f;