perf(namekey): Remove all superfluous AsciiString allocations for name key lookups

Author: xezon

Core/GameEngine/Source/Common/System/Xfer.cpp

@@ -791,7 +791,7 @@ void Xfer::xferUpgradeMask( UpgradeMaskType *upgradeMaskData )
 			xferAsciiString( &upgradeName );
 
 			// find this upgrade template
-			upgradeTemplate = TheUpgradeCenter->findUpgrade( upgradeName );
+			upgradeTemplate = TheUpgradeCenter->findUpgrade( upgradeName.str() );
 			if( upgradeTemplate == NULL )
 			{
 

Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp

@@ -648,7 +648,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg)
 
 	AsciiString playerName;
 	playerName.format("player%d", msg->getPlayerID());
-	const Player *player = ThePlayerList->findPlayerWithNameKey( TheNameKeyGenerator->nameToKey( playerName ) );
+	const Player *player = ThePlayerList->findPlayerWithNameKey( TheNameKeyGenerator->nameToKey( playerName.str() ) );
 	if (!player)
 	{
 		TheInGameUI->message(UnicodeString(L"%ls"), unitext.str());

Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp

@@ -604,7 +604,7 @@ AsciiString GameSpyStagingRoom::generateGameSpyGameResultsPacket( void )
 	{
 		AsciiString playerName;
 		playerName.format("player%d", i);
-		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
+		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName.str()));
 		if (p)
 		{
 			++numHumans;
@@ -650,7 +650,7 @@ AsciiString GameSpyStagingRoom::generateGameSpyGameResultsPacket( void )
 	{
 		AsciiString playerName;
 		playerName.format("player%d", i);
-		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
+		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName.str()));
 		if (p)
 		{
 			GameSpyGameSlot *slot = &(m_GameSpySlot[i]);
@@ -698,7 +698,7 @@ AsciiString GameSpyStagingRoom::generateLadderGameResultsPacket( void )
 	{
 		AsciiString playerName;
 		playerName.format("player%d", i);
-		p[i] = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
+		p[i] = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName.str()));
 		if (p[i])
 		{
 			++numPlayers;

Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp

@@ -175,7 +175,7 @@ GameMessage *NetGameCommandMsg::constructGameMessage()
 
 	AsciiString name;
 	name.format("player%d", getPlayerID());
-	retval->friend_setPlayerIndex( ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(name))->getPlayerIndex());
+	retval->friend_setPlayerIndex( ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(name.str()))->getPlayerIndex());
 
 	GameMessageArgument *arg = m_argList;
 	while (arg != NULL) {

Core/GameEngine/Source/GameNetwork/Network.cpp

@@ -665,7 +665,7 @@ void Network::processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg)
 
 	AsciiString playerName;
 	playerName.format("player%d", playerIndex);
-	Player *pPlayer = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
+	Player *pPlayer = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName.str()));
 	if (pPlayer)
 	{
 		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_SELF_DESTRUCT);

GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h

@@ -147,7 +147,7 @@ class DamageFXStore : public SubsystemInterface
 	/**
 		Find the DamageFX with the given name. If no such DamageFX exists, return null.
 	*/
-	const DamageFX *findDamageFX( AsciiString name ) const;
+	const DamageFX *findDamageFX( const char* name ) const;
 
 	static void parseDamageFXDefinition(INI* ini);
 

GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h

@@ -91,10 +91,6 @@ class NameKeyGenerator : public SubsystemInterface
 	virtual void reset();
 	virtual void update() { }
 
-	/// Given a string, convert into a unique integer key.
-	NameKeyType nameToKey(const AsciiString& name) { return nameToKey(name.str()); }
-	NameKeyType nameToLowercaseKey(const AsciiString& name) { return nameToLowercaseKey(name.str()); }
-
 	/// Given a string, convert into a unique integer key.
 	NameKeyType nameToKey(const char* name);
 	NameKeyType nameToLowercaseKey(const char *name);
@@ -138,7 +134,7 @@ class NameKeyGenerator : public SubsystemInterface
 extern NameKeyGenerator *TheNameKeyGenerator;  ///< just one namespace for now
 
 // typing "TheNameKeyGenerator->nameToKey()" is awfully wordy. Here are shorter synonyms:
-inline NameKeyType NAMEKEY(const AsciiString& name) { return TheNameKeyGenerator->nameToKey(name); }
+
 inline NameKeyType NAMEKEY(const char* name) { return TheNameKeyGenerator->nameToKey(name); }
 
 inline AsciiString KEYNAME(NameKeyType nk) { return TheNameKeyGenerator->keyToName(nk); }

GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h

@@ -237,7 +237,7 @@ class UpgradeCenter : public SubsystemInterface
 
 	UpgradeTemplate *firstUpgradeTemplate( void );	///< return the first upgrade template
 	const UpgradeTemplate *findUpgradeByKey( NameKeyType key ) const;		///< find upgrade by name key
-	const UpgradeTemplate *findUpgrade( const AsciiString& name ) const;				///< find and return upgrade by name
+	const UpgradeTemplate *findUpgrade( const char* name ) const;				///< find and return upgrade by name
 	const UpgradeTemplate *findVeterancyUpgrade(VeterancyLevel level) const;				///< find and return upgrade by name
 
 	UpgradeTemplate *newUpgrade( const AsciiString& name );				///< allocate, link, and return new upgrade

GeneralsMD/Code/GameEngine/Include/GameClient/Image.h

@@ -128,7 +128,7 @@ class ImageCollection : public SubsystemInterface
 
 	void load( Int textureSize );												 ///< load images
 
-	const Image *findImageByName( const AsciiString& name );					 ///< find image based on name
+	const Image *findImageByName( const char* name ) const;					 ///< find image based on name
 
   /// adds the given image to the collection, transfers ownership to this object
   void addImage(Image *image);

GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h

@@ -108,7 +108,7 @@ class ArmorStore : public SubsystemInterface
 	/**
 		Find the Armor with the given name. If no such Armor exists, return null.
 	*/
-	const ArmorTemplate* findArmorTemplate(AsciiString name) const;
+	const ArmorTemplate* findArmorTemplate(const char* name) const;
 
 	inline Armor makeArmor(const ArmorTemplate *tmpl) const
 	{