Commit: 8aa7be4719790f1c082916d27a0b935123f156ea - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• Revision: 8aa7be4719790f1c082916d27a0b935123f156ea (tree)
• Time: 2022-01-20 08:21:15
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed: changing cl_skin also changed a player's scale even though P_CheckPlayerSprite already handled the skin's scaling automatically every tick.

Change Summary

• modified: src/r_data/sprites.cpp

Incremental Difference

diff -r b6e82bbaf62f -r 8aa7be471979 src/r_data/sprites.cpp
--- a/src/r_data/sprites.cpp	Fri Jan 21 13:01:07 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;