# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1642634475 18000
#      Wed Jan 19 18:21:15 2022 -0500
# Node ID d3922abd2531735fa342a68c3907d79ec12b85e3
# Parent  4739baaa2d428de6254318290b358afc9e173b75
Fixed: changing cl_skin also changed a player's scale even though P_CheckPlayerSprite already handled the skin's scaling automatically every tick.

diff -r 4739baaa2d42 -r d3922abd2531 src/r_data/sprites.cpp
--- a/src/r_data/sprites.cpp	Wed Jan 19 18:13:20 2022 -0500
+++ b/src/r_data/sprites.cpp	Wed Jan 19 18:21:15 2022 -0500
@@ -1330,14 +1330,14 @@
 				players[ulIdx].mo->flags4 &= ~MF4_NOSKIN;
 		}
 
-		// If the skin is valid, set the player's sprite to the skin's sprite, and adjust
-		// the player's scale accordingly.
+		// If the skin is valid, set the player's sprite to the skin's sprite.
 		if (( lSkin >= 0 ) && ( static_cast<unsigned> (lSkin) < skins.Size() ))
 		{
 			players[ulIdx].mo->sprite = skins[lSkin].sprite;
+/*
 			players[ulIdx].mo->scaleX = skins[lSkin].ScaleX;
 			players[ulIdx].mo->scaleY = skins[lSkin].ScaleY;
-/*
+
 			// Make sure the player doesn't change sprites when his state changes.
 			if ( lSkin == R_FindSkin( "base", players[ulIdx].CurrentPlayerClass ))
 				players[ulIdx].mo->flags4 |= MF4_NOSKIN;