Replicate in Generals

Author: xezon

Generals/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);
 

Generals/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);
@@ -140,7 +136,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); }

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

@@ -234,7 +234,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

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

@@ -116,6 +116,7 @@ friend class ImageCollection;
 //-------------------------------------------------------------------------------------------------
 class ImageCollection : public SubsystemInterface
 {
+	typedef std::map<NameKeyType, Image *> ImageMap;
 
 public:
 
@@ -128,22 +129,22 @@ 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);
 
   /// enumerates the list of existing images
   Image *Enum(unsigned index)
   {
-    for (std::map<unsigned,Image *>::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
+    for (ImageMap::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
       if (!index--)
         return i->second;
     return NULL;
   }
 
 protected:
-  std::map<unsigned,Image *> m_imageMap;  ///< maps named keys to images
+  ImageMap m_imageMap;  ///< maps named keys to images
 };
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////

Generals/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
 	{

Generals/Code/GameEngine/Include/GameLogic/Weapon.h

@@ -814,7 +814,7 @@ class WeaponStore : public SubsystemInterface
 	/**
 		Find the WeaponTemplate with the given name. If no such WeaponTemplate exists, return null.
 	*/
-	const WeaponTemplate *findWeaponTemplate(AsciiString name) const;
+	const WeaponTemplate *findWeaponTemplate(const char* name) const;
 	const WeaponTemplate *findWeaponTemplateByNameKey( NameKeyType key ) const { return findWeaponTemplatePrivate( key ); }
 
 	// this dynamically allocates a new Weapon, which is owned (and must be freed!) by the caller.

Generals/Code/GameEngine/Source/Common/DamageFX.cpp

@@ -274,7 +274,7 @@ DamageFXStore::~DamageFXStore()
 }
 
 //-------------------------------------------------------------------------------------------------
-const DamageFX *DamageFXStore::findDamageFX(AsciiString name) const
+const DamageFX *DamageFXStore::findDamageFX(const char* name) const
 {
 	NameKeyType namekey = TheNameKeyGenerator->nameToKey(name);
   DamageFXMap::const_iterator it = m_dfxmap.find(namekey);

Generals/Code/GameEngine/Source/Common/INI/INI.cpp

@@ -872,7 +872,7 @@ void INI::parseMappedImage( INI *ini, void * /*instance*/, void *store, const vo
 	if( TheMappedImageCollection )
 	{
 		typedef const Image* ConstImagePtr;
-		*(ConstImagePtr*)store = TheMappedImageCollection->findImageByName( AsciiString( token ) );
+		*(ConstImagePtr*)store = TheMappedImageCollection->findImageByName( token );
 	}
 
 	//KM: If we are in the worldbuilder, we want to parse commandbuttons for informational purposes,
@@ -1377,7 +1377,7 @@ void INI::parseUpgradeTemplate( INI* ini, void * /*instance*/, void *store, cons
 		throw ERROR_BUG;
 	}
 
-	const UpgradeTemplate *uu = TheUpgradeCenter->findUpgrade( AsciiString( token ) );
+	const UpgradeTemplate *uu = TheUpgradeCenter->findUpgrade( token );
 	DEBUG_ASSERTCRASH( uu || stricmp( token, "None" ) == 0, ("Upgrade %s not found!",token) );
 
 	typedef const UpgradeTemplate* ConstUpgradeTemplatePtr;

Generals/Code/GameEngine/Source/Common/INI/INIMappedImage.cpp

@@ -42,11 +42,8 @@
 //-------------------------------------------------------------------------------------------------
 void INI::parseMappedImageDefinition( INI* ini )
 {
-	AsciiString name;
-
 	// read the name
-	const char* c = ini->getNextToken();
-	name.set( c );
+	const char* name = ini->getNextToken();
 
 	//
 	// find existing item if present, note that we do not support overrides
@@ -66,11 +63,10 @@ void INI::parseMappedImageDefinition( INI* ini )
 	{
 
 		// image not found, create a new one
-  	image = newInstance(Image);
+		image = newInstance(Image);
 		image->setName( name );
 		TheMappedImageCollection->addImage(image);
-		DEBUG_ASSERTCRASH( image, ("parseMappedImage: unable to allocate image for '%s'",
-															name.str()) );
+		DEBUG_ASSERTCRASH( image, ("parseMappedImage: unable to allocate image for '%s'", name) );
 
 	}
 

Generals/Code/GameEngine/Source/Common/RTS/Handicap.cpp

@@ -99,7 +99,7 @@ void Handicap::readFromDict(const Dict* d)
 			c.concat(htNames[i]);
 			c.concat("_");
 			c.concat(ttNames[j]);
-			NameKeyType k = TheNameKeyGenerator->nameToKey(c);
+			NameKeyType k = TheNameKeyGenerator->nameToKey(c.str());
 			Bool exists;
 			Real r = d->getReal(k, &exists);
 			if (exists)