Code review feedback

Author: slurmlord

Core/GameEngine/Include/Common/AsciiString.h

@@ -382,25 +382,19 @@ class AsciiString
 	AsciiString& operator=(const AsciiString& stringSrc);	///< the same as set()
 	AsciiString& operator=(const char* s);				///< the same as set()
 
-	struct CharProxy {
-		AsciiString& str;
-		Int index;
-
-		CharProxy(AsciiString& string, const Int index) : str(string), index(index) {};
-		void operator= (Char rhs)
-		{
-			Int length = str.getLength();
-			DEBUG_ASSERTCRASH(index >= 0 && index < length, ("bad index in CharProxy::operator="));
-			str.ensureUniqueBufferOfSize(length + 1, true, NULL, NULL);
-			str.peek()[index] = rhs;
-		}
-
-		operator Char() const { return str.getCharAt(index); }
-	};
-
-	friend struct CharProxy;
+	const Char& operator[](Int index) const
+	{
+		DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in AsciiString::operator[]"));
+		return peek()[index];
+	}
 
-	CharProxy operator[](const Int index) { return CharProxy(*this, index); }
+	Char& operator[](Int index)
+	{
+		Int length = getLength();
+		DEBUG_ASSERTCRASH(index >= 0 && index < length, ("bad index in AsciiString::operator[]"));
+		ensureUniqueBufferOfSize(length + 1, true, NULL, NULL);
+		return peek()[index];
+	}
 
 	void debugIgnoreLeaks();
 

Core/GameEngine/Include/Common/UnicodeString.h

@@ -334,24 +334,19 @@ class UnicodeString
 	UnicodeString& operator=(const UnicodeString& stringSrc);	///< the same as set()
 	UnicodeString& operator=(const WideChar* s);				///< the same as set()
 
-	struct WideCharProxy {
-		UnicodeString& str;
-		Int index;
-
-		WideCharProxy(UnicodeString& string, const Int index) : str(string), index(index) {};
-		void operator= (WideChar rhs)
-		{
-			Int length = str.getLength();
-			DEBUG_ASSERTCRASH(index >= 0 && index < length, ("bad index in WideCharProxy::operator="));
-			str.ensureUniqueBufferOfSize(length + 1, true, NULL, NULL);
-			str.peek()[index] = rhs;
-		}
-
-		operator WideChar() const { return str.getCharAt(index); }
-	};
+	const WideChar& operator[](Int index) const
+	{
+		DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in UnicodeString::operator[]"));
+		return peek()[index];
+	}
 
-	friend struct WideCharProxy;
-	WideCharProxy operator[](const Int index) { return WideCharProxy(*this, index); }
+	WideChar& operator[](Int index)
+	{
+		Int length = getLength();
+		DEBUG_ASSERTCRASH(index >= 0 && index < length, ("bad index in UnicodeString::operator[]"));
+		ensureUniqueBufferOfSize(length + 1, true, NULL, NULL);
+		return peek()[index];
+	}
 };
 
 

GeneralsMD/Code/GameEngine/Source/GameNetwork/GameInfo.cpp

@@ -998,17 +998,12 @@ static void EnsureUniqueNames(AsciiStringVec& playerNames)
 			continue;
 
 		Int charOffset = -1;
-		Int nameLength = -1;
+		Int nameLength = playerName.getLength();
 		while (uniqueNames.insert(playerName).second == false)
 		{
 			// The name already exists, so change the last char to the number index of the player in the game.
 			// If that fails to be unique, iterate through 0-9 and change the last char to ensure differentiation.
 			// Guaranteed to find a unique name as the number of slots is less than 10.
-			if (nameLength == -1)
-			{
-				nameLength = playerName.getLength();
-			}
-
 			char charToTry = '0' + static_cast<char>(charOffset == -1 ? i : charOffset);
 			playerName[nameLength - 1] = charToTry;
 			++charOffset;