refactor: Simplify unconditional asserts from DEBUG_ASSERTCRASH to DEBUG_CRASH (TheSuperHackers#2343)

Author: Caball009

Core/GameEngine/Source/Common/INI/INI.cpp

@@ -436,7 +436,7 @@ UnsignedInt INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 				}
 				else
 				{
-					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown block '%s'",
+					DEBUG_CRASH( ("[LINE: %d - FILE: '%s'] Unknown block '%s'",
 														 getLineNum(), getFilename().str(), token ) );
 					throw INI_UNKNOWN_TOKEN;
 				}
@@ -524,7 +524,7 @@ void INI::readLine( void )
 		// check for at the max
 		if ( p == m_buffer+INI_MAX_CHARS_PER_LINE )
 		{
-			DEBUG_ASSERTCRASH( 0, ("Buffer too small (%d) and was truncated, increase INI_MAX_CHARS_PER_LINE", INI_MAX_CHARS_PER_LINE) );
+			DEBUG_CRASH( ("Buffer too small (%d) and was truncated, increase INI_MAX_CHARS_PER_LINE", INI_MAX_CHARS_PER_LINE) );
 		}
 	}
 
@@ -1524,7 +1524,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 
 	if( what == nullptr )
 	{
-		DEBUG_ASSERTCRASH( 0, ("INI::initFromINI - Invalid parameters supplied!") );
+		DEBUG_CRASH( ("INI::initFromINI - Invalid parameters supplied!") );
 		throw INI_INVALID_PARAMS;
 	}
 
@@ -1578,7 +1578,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 
 				if (!found)
 				{
-					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'",
+					DEBUG_CRASH( ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'",
 														 INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) );
 				}
 
@@ -1591,7 +1591,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 		{
 
 			done = TRUE;
-			DEBUG_ASSERTCRASH( 0, ("Error parsing block '%s', in INI file '%s'.  Missing '%s' token",
+			DEBUG_CRASH( ("Error parsing block '%s', in INI file '%s'.  Missing '%s' token",
 												 m_curBlockStart, getFilename().str(), m_blockEndToken) );
 			throw INI_MISSING_END_TOKEN;
 
@@ -1667,7 +1667,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 	if( nameList == nullptr || nameList[ 0 ] == nullptr )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanIndexList, invalid name list") );
+		DEBUG_CRASH( ("INTERNAL ERROR! scanIndexList, invalid name list") );
 		throw INI_INVALID_NAME_LIST;
 
 	}
@@ -1692,7 +1692,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 {
 	if( lookupList == nullptr || lookupList[ 0 ].name == nullptr )
 	{
-		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanLookupList, invalid name list") );
+		DEBUG_CRASH( ("INTERNAL ERROR! scanLookupList, invalid name list") );
 		throw INI_INVALID_NAME_LIST;
 	}
 

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

@@ -478,7 +478,7 @@ Bool Radar::removeObject( Object *obj )
 		return TRUE;
 	else
 	{
-		DEBUG_ASSERTCRASH( 0, ("Radar: Tried to remove object '%s' which was not found",
+		DEBUG_CRASH( ("Radar: Tried to remove object '%s' which was not found",
 											 obj->getTemplate()->getName().str()) );
 		return FALSE;
 	}

Core/GameEngine/Source/GameClient/Credits.cpp

@@ -460,7 +460,7 @@ void CreditsManager::addText( AsciiString text )
 			}
 			break;
 		default:
-			DEBUG_ASSERTCRASH( FALSE, ("CreditsManager::addText we tried to add a credit text with the wrong style before it.  Style is %d", m_currentStyle) );
+			DEBUG_CRASH( ("CreditsManager::addText we tried to add a credit text with the wrong style before it.  Style is %d", m_currentStyle) );
 			delete cLine;
 	}
 

Core/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp

@@ -135,7 +135,7 @@ Transition *getTransitionForStyle( Int style )
 		return NEW ScoreScaleUpTransition;
 
 	default:
-		DEBUG_ASSERTCRASH(FALSE, ("getTransitionForStyle:: An invalid style was passed in. Style = %d", style));
+		DEBUG_CRASH(("getTransitionForStyle:: An invalid style was passed in. Style = %d", style));
 		return nullptr;
 	}
 	return nullptr;
@@ -532,7 +532,7 @@ TransitionGroup *GameWindowTransitionsHandler::getNewGroup( AsciiString name )
 	// test to see if we're trying to add an already existing group.
 	if(findGroup(name))
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("GameWindowTransitionsHandler::getNewGroup - We already have a group %s", name.str()));
+		DEBUG_CRASH(("GameWindowTransitionsHandler::getNewGroup - We already have a group %s", name.str()));
 		return nullptr;
 	}
 	TransitionGroup *g = NEW TransitionGroup;

Core/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

@@ -1472,7 +1472,7 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage)
 
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId));
+		DEBUG_CRASH(("Percentage %d was passed in for Player %d", percentage, playerId));
 		return;
 	}
 	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)", percentage, playerId, m_playerLookup[playerId]));
@@ -1831,7 +1831,7 @@ void GameSpyLoadScreen::processProgress(Int playerId, Int percentage)
 
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId));
+		DEBUG_CRASH(("Percentage %d was passed in for Player %d", percentage, playerId));
 		return;
 	}
 	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)", percentage, playerId, m_playerLookup[playerId]));
@@ -1969,7 +1969,7 @@ void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiS
 
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId));
+		DEBUG_CRASH(("Percentage %d was passed in for Player %d", percentage, playerId));
 		return;
 	}
 

Core/GameEngine/Source/GameClient/GameText.cpp

@@ -1037,7 +1037,7 @@ Bool GameTextManager::parseStringFile( const char *filename )
 		{
 			if ( stricmp ( m_stringInfo[i].label.str(), m_buffer ) == 0)
 			{
-				DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' multiply defined!", m_buffer ));
+				DEBUG_CRASH ( ("String label '%s' multiply defined!", m_buffer ));
 			}
 		}
 
@@ -1055,7 +1055,7 @@ Bool GameTextManager::parseStringFile( const char *filename )
 		{
 			if (!readLine ( m_buffer, sizeof(m_buffer)-1, file ))
 			{
-				DEBUG_ASSERTCRASH (FALSE, ("Unexpected end of string file"));
+				DEBUG_CRASH (("Unexpected end of string file"));
 				ok = FALSE;
 				goto quit;
 			}
@@ -1073,7 +1073,7 @@ Bool GameTextManager::parseStringFile( const char *filename )
 				if ( readString )
 				{
 					// only one string per label allows
-						DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' has more than one string defined!", m_stringInfo[listCount].label.str()));
+						DEBUG_CRASH ( ("String label '%s' has more than one string defined!", m_stringInfo[listCount].label.str()));
 				}
 				else
 				{
@@ -1168,7 +1168,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename )
 		{
 			if ( stricmp ( m_mapStringInfo[i].label.str(), m_buffer ) == 0)
 			{
-				DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' multiply defined!", m_buffer ));
+				DEBUG_CRASH ( ("String label '%s' multiply defined!", m_buffer ));
 			}
 		}
 
@@ -1186,7 +1186,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename )
 		{
 			if (!readLine ( m_buffer, sizeof(m_buffer)-1, file ))
 			{
-				DEBUG_ASSERTCRASH (FALSE, ("Unexpected end of string file"));
+				DEBUG_CRASH (("Unexpected end of string file"));
 				ok = FALSE;
 				goto quit;
 			}
@@ -1204,7 +1204,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename )
 				if ( readString )
 				{
 					// only one string per label allowed
-						DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' has more than one string defined!", m_stringInfo[listCount].label.str()));
+						DEBUG_CRASH ( ("String label '%s' has more than one string defined!", m_stringInfo[listCount].label.str()));
 				}
 				else
 				{

Core/GameEngine/Source/GameClient/GlobalLanguage.cpp

@@ -162,7 +162,7 @@ void GlobalLanguage::init()
 		AsciiString font = *it;
 		if(AddFontResource(font.str()) == 0)
 		{
-			DEBUG_ASSERTCRASH(FALSE,("GlobalLanguage::init Failed to add font %s", font.str()));
+			DEBUG_CRASH(("GlobalLanguage::init Failed to add font %s", font.str()));
 		}
 		else
 		{

Core/GameEngine/Source/GameClient/MapUtil.cpp

@@ -1256,7 +1256,7 @@ Image *getMapPreviewImage( AsciiString mapName )
 			// Read the waypoints.
 			file.registerParser( "MapPreview", AsciiString::TheEmptyString, parseMapPreviewChunk );
 			if (!file.parse(nullptr)) {
-				DEBUG_ASSERTCRASH(false,("Unable to read MapPreview info."));
+				DEBUG_CRASH(("Unable to read MapPreview info."));
 				deleteInstance(mapPreviewImage);
 				return nullptr;
 			}

Core/GameEngine/Source/GameNetwork/GameInfo.cpp

@@ -978,7 +978,7 @@ AsciiString GameInfoToAsciiString( const GameInfo *game )
 		}
 		else
 		{
-			DEBUG_ASSERTCRASH(false, ("Bad slot type"));
+			DEBUG_CRASH(("Bad slot type"));
 			str = "X:";
 		}
 		optionsString.concat(str);

Core/GameEngine/Source/GameNetwork/LANAPI.cpp

@@ -989,7 +989,7 @@ AsciiString LANAPI::createSlotString( void )
 		}
 		else
 		{
-			DEBUG_ASSERTCRASH(false, ("Bad slot type"));
+			DEBUG_CRASH(("Bad slot type"));
 			str = "X,";
 		}
 
@@ -1153,7 +1153,7 @@ void LANAPI::removeGame( LANGameInfo *game )
 		else
 		{
 			// Odd.  We went the whole way without finding it in the list.
-			DEBUG_ASSERTCRASH(false, ("LANGameInfo wasn't in the list"));
+			DEBUG_CRASH(("LANGameInfo wasn't in the list"));
 		}
 	}
 }
@@ -1194,7 +1194,7 @@ void LANAPI::removePlayer( LANPlayer *player )
 		else
 		{
 			// Odd.  We went the whole way without finding it in the list.
-			DEBUG_ASSERTCRASH(false, ("LANPlayer wasn't in the list"));
+			DEBUG_CRASH(("LANPlayer wasn't in the list"));
 		}
 	}
 }