Move Div_Ceil to separate function.

Author: slurmlord

Core/GameEngine/Include/Common/AsciiString.h

@@ -385,9 +385,8 @@ class AsciiString
 
 	Char& operator[](Int index)
 	{
-		Int length = getLength();
-		DEBUG_ASSERTCRASH(index >= 0 && index < length, ("bad index in AsciiString::operator[]"));
-		ensureUniqueBufferOfSize(length + 1, true, NULL, NULL);
+		DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in AsciiString::operator[]"));
+		ensureUniqueBufferOfSize(m_data->m_numCharsAllocated, true, NULL, NULL);
 		return peek()[index];
 	}
 

Core/GameEngine/Include/Common/UnicodeString.h

@@ -337,8 +337,7 @@ class UnicodeString
 
 	WideChar& operator[](Int index)
 	{
-		DEBUG_ASSERTCRASH(m_data && m_data->m_numCharsAllocated > index && index >= 0, ("bad index in UnicodeString::operator[]"));
-
+		DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in UnicodeString::operator[]"));
 		ensureUniqueBufferOfSize(m_data->m_numCharsAllocated, true, NULL, NULL);
 		return peek()[index];
 	}

Core/GameEngine/Source/GameNetwork/GameInfo.cpp

@@ -959,22 +959,20 @@ static Bool TruncatePlayerNames(AsciiStringVec& playerNames, Int truncateAmount)
 	// sort based on length in ascending order
 	std::sort(lengthIndex.begin(), lengthIndex.end());
 
-	Int truncateNameAmount = 0;
 	for (size_t i = 0; i < lengthIndex.size(); ++i)
 	{
 		const Int playerIndex = lengthIndex[i].Index;
 		const Int playerLength = lengthIndex[i].Length;
 
 		// round avg name length up, which will penalize the final entry (longest name) as it will have to account for the roundings
-		const Int avgNameLength = ((remainingNamesLength - truncateAmount) + (playerNames.size() - i - 1)) / (playerNames.size() - i);
+		const Int avgNameLength = WWMath::Div_Ceil((remainingNamesLength - truncateAmount), (playerNames.size() - i));
 		remainingNamesLength -= playerLength;
 		if (playerLength <= avgNameLength)
 		{
 			continue;
 		}
 
-		// ensure a longer name is not truncated less than a previous, shorter name
-		truncateNameAmount = std::max(truncateNameAmount, playerLength - avgNameLength);
+		Int truncateNameAmount = playerLength - avgNameLength;
 		if (i == lengthIndex.size() - 1)
 		{
 			// ensure we account for rounding errors when truncating the last, longest entry

Core/Libraries/Source/WWVegas/WWMath/wwmath.h

@@ -168,6 +168,8 @@ static WWINLINE bool			Is_Valid_Double(double x);
 
 static WWINLINE float Normalize_Angle(float angle); // Normalizes the angle to the range -PI..PI
 
+static WWINLINE int				Div_Ceil(const int num, const int den);
+
 };
 
 WWINLINE float WWMath::Sign(float val)
@@ -654,3 +656,13 @@ WWINLINE float WWMath::Normalize_Angle(float angle)
 {
 	return angle - (WWMATH_TWO_PI * Floor((angle + WWMATH_PI) / WWMATH_TWO_PI));
 }
+
+// ----------------------------------------------------------------------------
+// Ceil rounded int division
+// Rounding away from 0 for positive values, towards 0 for negative values
+// ----------------------------------------------------------------------------
+WWINLINE int WWMath::Div_Ceil(const int num, const int den)
+{
+	const div_t res = std::div(num, den);
+	return (res.rem != 0 && res.quot >= 0) ? res.quot + 1 : res.quot;
+}