Commit: 055e308e6015cb7f4a8c6c9a4ef0a1cbda59bdc4 - zandronum-macos-beta (hg)

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

Commit MetaInfo

• Revision: 055e308e6015cb7f4a8c6c9a4ef0a1cbda59bdc4 (tree)
• Time: 2022-09-15 08:36:08
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

cl_identifytarget now always prints a player's skin with their current class, if unmorphed. If cl_skins is 0, then the skin is always printed as "base" instead.

Change Summary

• modified: docs/zandronum-history.txt
• modified: src/g_shared/shared_sbar.cpp
• modified: wadsrc/static/menudef.za

Incremental Difference

diff -r e957fcea64f3 -r 055e308e6015 docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Wed Sep 14 15:33:59 2022 -0400
+++ b/docs/zandronum-history.txt	Wed Sep 14 19:36:08 2022 -0400
@@ -90,7 +90,7 @@
 !	- The "spam" medal is now only awarded if the player frags another player with a projectile or puff that awards the medal, as it should be. [Kaminsky]
 !	- Blacklisted the connect, disconnect, reconnect, and restart CCMDs from ConsoleCommand. [Kaminsky]
 !	- gl_texture is now forced to be true when sv_forcevideodefaults is true. [Kaminsky]
-!	- cl_identifytarget now prints "ally" if the target is a teammate of the player being spied on, instead of the local player. [Kaminsky]
+!	- cl_identifytarget now prints "ally" if the target is a teammate of the player being spied on, instead of the local player. Also, it now always prints a player's skin with their current class, if unmorphed. If cl_skins is 0, then the skin is always printed as "base" instead. [Kaminsky]
 
 
 3.1

diff -r e957fcea64f3 -r 055e308e6015 src/g_shared/shared_sbar.cpp
--- a/src/g_shared/shared_sbar.cpp	Wed Sep 14 15:33:59 2022 -0400
+++ b/src/g_shared/shared_sbar.cpp	Wed Sep 14 19:36:08 2022 -0400
@@ -1869,18 +1869,46 @@
 			// [AK] Print this player's class.
 			if ( cl_identifytarget >= IDENTIFY_TARGET_CLASS )
 			{
-				const char *szClassString;
+				FString classString;
 
-				// [Cata] Display in this priority: Morph Class > Class > Skin.
+				// [AK] Display the name of the class the player is current playing as.
+				// If they're supposed to be morphed, don't print the name of their skin.
 				if ( pTargetPlayer->MorphedPlayerClass )
-					szClassString = pTargetPlayer->MorphedPlayerClass->TypeName.GetChars();
-				else if ( PlayerClasses.Size() > 1 )
-					szClassString = GetPrintableDisplayName( pTargetPlayer->cls );
+				{
+					classString = pTargetPlayer->MorphedPlayerClass->TypeName.GetChars( );
+				}
 				else
-					szClassString = skins[pTargetPlayer->userinfo.GetSkin()].name;
+				{
+					FString skinString;
+
+					if ( PlayerClasses.Size( ) > 1 )
+						classString = GetPrintableDisplayName( pTargetPlayer->cls );
+
+					if ( classString.IsNotEmpty( ))
+						classString += " - ";
+
+					// [AK] Get the name of the player's current skin, if skins are enabled.
+					// Their skin should only be displayed if they're playing the class meant
+					// for it. Otherwise, print "base" instead.
+					if ( cl_skins )
+					{
+						const int skin = pTargetPlayer->userinfo.GetSkin( );
+
+						for ( unsigned int i = 0; i < PlayerClasses.Size( ); i++ )
+						{
+							if (( pTargetPlayer->cls == PlayerClasses[i].Type ) && ( PlayerClasses[i].CheckSkin( skin )))
+							{
+								skinString += skins[skin].name;
+								break;
+							}
+						}
+					}
+
+					classString += skinString.IsNotEmpty( ) ? skinString : "Base";
+				}
 
 				targetInfoMsg += '\n';
-				targetInfoMsg.AppendFormat( TEXTCOLOR_GREEN "%s", szClassString );
+				targetInfoMsg.AppendFormat( TEXTCOLOR_GREEN "%s", classString.GetChars( ));
 			}
 		}
 

diff -r e957fcea64f3 -r 055e308e6015 wadsrc/static/menudef.za
--- a/wadsrc/static/menudef.za	Wed Sep 14 15:33:59 2022 -0400
+++ b/wadsrc/static/menudef.za	Wed Sep 14 19:36:08 2022 -0400
@@ -25,7 +25,7 @@
 	1.0, "Name"
 	2.0, "Health and armor"
 	3.0, "Weapon and ammo"
-	4.0, "Class or skin"
+	4.0, "Class and skin"
 }
 
 OptionMenu ZA_MultiplayerOptions