Replicate in Generals

xezon · xezon · commit ef2b816b6d8a · 2025-12-01T21:08:34.000+01:00
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
@@ -118,7 +118,6 @@ class StructureToppleUpdateModuleData : public UpdateModuleData
 		m_toppleDoneFXList = NULL;
 		m_toppleFXList = NULL;
 		m_crushingFXList = NULL;
-		m_crushingWeaponName.set("");
 
 		for (int i = 0; i < ST_PHASE_COUNT; ++i)
 		{
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h
@@ -46,7 +46,6 @@ class UnitCrateCollideModuleData : public CrateCollideModuleData
 	UnitCrateCollideModuleData()
 	{
 		m_unitCount = 0;
-		m_unitType = "";
 	}
 
 	static void buildFieldParse(MultiIniFieldParse& p)
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIAnimation.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIAnimation.cpp
@@ -65,7 +65,7 @@ void INI::parseAnim2DDefinition( INI* ini )
 
 		// item not found, create a new one
 		animTemplate = TheAnim2DCollection->newTemplate( name );
-		DEBUG_ASSERTCRASH( animTemplate, ("INI""parseAnim2DDefinition -  unable to allocate animation template for '%s'",
+		DEBUG_ASSERTCRASH( animTemplate, ("INI::parseAnim2DDefinition -  unable to allocate animation template for '%s'",
 											 name.str()) );
 
 	}
diff --git a/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp b/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp
@@ -84,7 +84,7 @@ void LanguageFilter::filterLine(UnicodeString &line)
 	wcscpy(buf, line.str());
 
 	UnicodeString newLine(line);
-	UnicodeString token(L"");
+	UnicodeString token;
 
 	while (newLine.nextToken(&token, L" ;,.!?:=\\/><`~()&^%#\n\t")) {
 		wchar_t *pos = wcsstr(buf, token.str());
@@ -112,7 +112,7 @@ void LanguageFilter::filterLine(UnicodeString &line)
 
 void LanguageFilter::unHaxor(UnicodeString &word) {
 	Int len = word.getLength();
-	UnicodeString newWord(L"");
+	UnicodeString newWord;
 	for (Int i = 0; i < len; ++i) {
 		wchar_t c = word.getCharAt(i);
 		if ((c == L'p') || (c == L'P')) {
diff --git a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp
@@ -3354,7 +3354,7 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 
 			// ignore destroyed systems and non-saveable systems
 			if( system->isDestroyed() == TRUE || system->isSaveable() == FALSE )	{
-				AsciiString mtString = "";
+				AsciiString mtString;
 				xfer->xferAsciiString(&mtString); // write null string as key for destroyed system.
 				continue;
 			}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp
@@ -530,7 +530,7 @@ Object *SpawnBehavior::reclaimOrphanSpawn( void )
 	//
 
 	OrphanData orphanData;
-	AsciiString prevName = "";
+	AsciiString prevName;
 	for (std::vector<AsciiString>::const_iterator tempName = md->m_spawnTemplateNameData.begin();
 			tempName != md->m_spawnTemplateNameData.end();
 			++tempName)
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp
@@ -41,7 +41,6 @@
 // ------------------------------------------------------------------------------------------------
 GrantUpgradeCreateModuleData::GrantUpgradeCreateModuleData()
 {
-	m_upgradeName = "";
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp
@@ -179,7 +179,7 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )
 	// CreationChance is used for the success of this block, but this block can have any number of potential actual crates
 	Real multipleCratePick = GameLogicRandomValueReal( 0, 1 );
 	Real multipleCrateRunningTotal = 0;
-	AsciiString crateName = "";
+	AsciiString crateName;
 
 	for( crateCreationEntryConstIterator iter = currentCrateData->m_possibleCrates.begin();
 				iter != currentCrateData->m_possibleCrates.end();
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp
@@ -71,7 +71,6 @@
 void parseUpgradePair( INI *ini, void *instance, void *store, const void *userData )
 {
 	upgradePair info;
-	info.type = "";
 	info.amount = 0;
 
 	const char *token = ini->getNextToken( ini->getSepsColon() );
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
@@ -9080,7 +9080,7 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	// these were all originally << (feed-operator for streams)
 	// I might come back and re-write this later, if there are enough complaints. ;-) jkmcd
 	// in the meantime, move along...
-	std::string thisEntry = "";
+	std::string thisEntry;
 	thisEntry.append(HEADER).append(SEP_SPACE).append(templ->getName().str()).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_PRIORITY).append(EQ_WITH_SPACES).append(ParticlePriorityNames[templ->m_priority]).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_ISONESHOT).append(EQ_WITH_SPACES).append((templ->m_isOneShot ? STR_TRUE : STR_FALSE)).append(SEP_EOL);
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp
@@ -190,8 +190,6 @@ const FieldParse CrateTemplate::TheCrateTemplateFieldParseTable[] =
 
 CrateTemplate::CrateTemplate()
 {
-	m_name = "";
-
 	m_creationChance = 0;
 	CLEAR_KINDOFMASK(m_killedByTypeKindof);
 	m_veterancyLevel = LEVEL_INVALID;
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
@@ -1326,7 +1326,7 @@ void W3DDisplay::gatherDebugStats( void )
 			// Network outgoing bandwidth stats
 //			unibuffer.format(L"OUT: 0.0 bytes/sec, 0.0 packets/sec");
 //			m_displayStrings[NetOutgoing]->setText( unibuffer );
-      unibuffer.format(L"");
+			unibuffer.clear();
 //			unibuffer.format(L"Network not present");
 			m_displayStrings[NetOutgoing]->setText(unibuffer);
 			m_displayStrings[NetIncoming]->setText(unibuffer);
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
@@ -992,7 +992,7 @@ void TextureLoadTaskClass::Init(TextureBaseClass* tc,bool high_priority)
 {
 	// Make sure texture has a filename.
 	REF_PTR_SET(Texture,tc);
-	//WWASSERT(Texture->Get_Full_Path() != NULL);
+	//WWASSERT(!Texture->Get_Full_Path().Is_Empty());
 
 	Reduction=Texture->Get_Reduction();
 	HighPriorityRequested=high_priority;
diff --git a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
@@ -2183,7 +2183,7 @@ Bool WorldHeightMapEdit::selectInvalidTeam(void)
 		}
 	}
 
-	AsciiString report = "";
+	AsciiString report;
 	AsciiString line;
 
 #if 0
diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
@@ -681,7 +681,7 @@ void CWorldBuilderApp::OnFileOpen()
 #endif
 
 	CFileStatus status;
-	if (m_currentDirectory != "") try {
+	if (!m_currentDirectory.isEmpty()) try {
 		if (CFile::GetStatus(m_currentDirectory.str(), status)) {
 			if (status.m_attribute & CFile::directory) {
 				::SetCurrentDirectory(m_currentDirectory.str());
diff --git a/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp b/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp
@@ -376,7 +376,7 @@ void MapObjectProps::_DictToTeam(void)
 
 void MapObjectProps::_DictToName(void)
 {
-	AsciiString name = "";
+	AsciiString name;
 	Bool exists;
 	if (m_dictToEdit) {
 		name = m_dictToEdit->getAsciiString(TheKey_objectName, &exists);

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ class StructureToppleUpdateModuleData : public UpdateModuleData`
`118`	`118`	`m_toppleDoneFXList = NULL;`
`119`	`119`	`m_toppleFXList = NULL;`
`120`	`120`	`m_crushingFXList = NULL;`
`121`		`- m_crushingWeaponName.set("");`
`122`	`121`
`123`	`122`	`for (int i = 0; i < ST_PHASE_COUNT; ++i)`
`124`	`123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ class UnitCrateCollideModuleData : public CrateCollideModuleData`
`46`	`46`	`UnitCrateCollideModuleData()`
`47`	`47`	`{`
`48`	`48`	`m_unitCount = 0;`
`49`		`- m_unitType = "";`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`static void buildFieldParse(MultiIniFieldParse& p)`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ void INI::parseAnim2DDefinition( INI* ini )`
`65`	`65`
`66`	`66`	`// item not found, create a new one`
`67`	`67`	`animTemplate = TheAnim2DCollection->newTemplate( name );`
`68`		`- DEBUG_ASSERTCRASH( animTemplate, ("INI""parseAnim2DDefinition - unable to allocate animation template for '%s'",`
	`68`	`+ DEBUG_ASSERTCRASH( animTemplate, ("INI::parseAnim2DDefinition - unable to allocate animation template for '%s'",`
`69`	`69`	`name.str()) );`
`70`	`70`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3354,7 +3354,7 @@ void ParticleSystemManager::xfer( Xfer *xfer )`
`3354`	`3354`
`3355`	`3355`	`// ignore destroyed systems and non-saveable systems`
`3356`	`3356`	`if( system->isDestroyed() == TRUE \|\| system->isSaveable() == FALSE ) {`
`3357`		`- AsciiString mtString = "";`
	`3357`	`+ AsciiString mtString;`
`3358`	`3358`	`xfer->xferAsciiString(&mtString); // write null string as key for destroyed system.`
`3359`	`3359`	`continue;`
`3360`	`3360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@`
`41`	`41`	`// ------------------------------------------------------------------------------------------------`
`42`	`42`	`GrantUpgradeCreateModuleData::GrantUpgradeCreateModuleData()`
`43`	`43`	`{`
`44`		`- m_upgradeName = "";`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`// ------------------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@`
`71`	`71`	`void parseUpgradePair( INI ini, void instance, void store, const void userData )`
`72`	`72`	`{`
`73`	`73`	`upgradePair info;`
`74`		`- info.type = "";`
`75`	`74`	`info.amount = 0;`
`76`	`75`
`77`	`76`	`const char *token = ini->getNextToken( ini->getSepsColon() );`