fix(log): Fix missing debug log arguments (#1325)

Stubbjax · web-flow · commit c01d6960be75 · 2025-07-27T10:09:31.000+02:00
diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp
@@ -1042,7 +1042,7 @@ Bool AudioManager::shouldPlayLocally(const AudioEventRTS *audioEvent)
 	Player *owningPlayer = ThePlayerList->getNthPlayer(audioEvent->getPlayerIndex());
 
 	if (BitIsSet(ei->m_type, ST_PLAYER) && BitIsSet(ei->m_type, ST_UI) && owningPlayer == NULL) {
-		DEBUG_ASSERTCRASH(!TheGameLogic->isInGameLogicUpdate(), ("Playing %s sound -- player-based UI sound without specifying a player."));
+		DEBUG_ASSERTCRASH(!TheGameLogic->isInGameLogicUpdate(), ("Playing %s sound -- player-based UI sound without specifying a player.", ei->m_audioName.str()));
 		return TRUE;
 	}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
@@ -862,7 +862,7 @@ static void refreshGameList( Bool forceRefresh )
 			//DEBUG_LOG(("-"));
 		}
 	} else {
-		//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d"));
+		//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));
 	}
 }
 //-------------------------------------------------------------------------------------------------
@@ -1301,7 +1301,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 				//DEBUG_LOG(("-"));
 			}
 		} else {
-			//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d"));
+			//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));
 		}
 #else
 	refreshGameList();
diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -4188,7 +4188,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 			case ACTIONTYPE_MAKE_DEFECTOR:
 			case ACTIONTYPE_SET_RALLY_POINT:
 			default:
-				DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?") );
+				DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?", action) );
 				return ATTACKRESULT_INVALID_SHOT;
 
 		}
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
@@ -353,7 +353,7 @@ static const char * findGameMessageNameByType(GameMessage::Type type)
 		if (metaNames->value == (Int)type)
 			return metaNames->name;
 
-	DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?"));
+	DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?", (Int)type));
 	return "???";
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -850,7 +850,7 @@ void ConnectionManager::processAckStage1(NetCommandMsg *msg) {
 			ref = m_connections[playerID]->processAck(msg);
 		}
 	} else {
-		DEBUG_ASSERTCRASH((playerID >= 0) && (playerID < NUM_CONNECTIONS), ("ConnectionManager::processAck - %d is an invalid player number"));
+		DEBUG_ASSERTCRASH((playerID >= 0) && (playerID < NUM_CONNECTIONS), ("ConnectionManager::processAck - %d is an invalid player number", playerID));
 	}
 
 	if (ref != NULL) {
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/Generals/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp
@@ -291,7 +291,7 @@ UnsignedShort FirewallHelperClass::getNextTemporarySourcePort(Int skip)
 			closeSpareSocket(return_port);
 			return(return_port);
 		} else {
-			DEBUG_LOG(("FirewallHelperClass::getNextTemporarySourcePort - failed to open socket on port %d"));
+			DEBUG_LOG(("FirewallHelperClass::getNextTemporarySourcePort - failed to open socket on port %d", return_port));
 		}
 	}
 
@@ -998,7 +998,7 @@ Bool FirewallHelperClass::detectionTest3WaitForResponsesUpdate() {
 			*/
 			m_sourcePortAllocationDelta = m_lastSourcePortAllocationDelta;
 		}
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get enough responses, using %d as the source port allocation delta, finished test"));
+		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get enough responses, using %d as the source port allocation delta, finished test", m_sourcePortAllocationDelta));
 		m_currentState = DETECTIONSTATE_DONE;
 		return TRUE;
 	}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
@@ -671,7 +671,7 @@ void W3DGhostObject::xfer( Xfer *xfer )
 		if( snapshotCount == 0 && m_parentSnapshots[ i ] != NULL )
 		{
 
-			DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty" ));
+			DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty", i ));
 			throw INI_INVALID_DATA;
 
 		}  // end if
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
@@ -880,7 +880,7 @@ static void refreshGameList( Bool forceRefresh )
 			//DEBUG_LOG(("-"));
 		}
 	} else {
-		//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d"));
+		//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));
 	}
 }
 //-------------------------------------------------------------------------------------------------
@@ -1320,7 +1320,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 				//DEBUG_LOG(("-"));
 			}
 		} else {
-			//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d"));
+			//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));
 		}
 #else
 	refreshGameList();
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -4348,7 +4348,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 			case ACTIONTYPE_MAKE_DEFECTOR:
 			case ACTIONTYPE_SET_RALLY_POINT:
 			default:
-				DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?") );
+				DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?", action) );
 				return ATTACKRESULT_INVALID_SHOT;
 
 		}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
@@ -391,7 +391,7 @@ static const char * findGameMessageNameByType(GameMessage::Type type)
 		if (metaNames->value == (Int)type)
 			return metaNames->name;
 
-	DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?"));
+	DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?", (Int)type));
 	return "???";
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -850,7 +850,7 @@ void ConnectionManager::processAckStage1(NetCommandMsg *msg) {
 			ref = m_connections[playerID]->processAck(msg);
 		}
 	} else {
-		DEBUG_ASSERTCRASH((playerID >= 0) && (playerID < NUM_CONNECTIONS), ("ConnectionManager::processAck - %d is an invalid player number"));
+		DEBUG_ASSERTCRASH((playerID >= 0) && (playerID < NUM_CONNECTIONS), ("ConnectionManager::processAck - %d is an invalid player number", playerID));
 	}
 
 	if (ref != NULL) {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp
@@ -291,7 +291,7 @@ UnsignedShort FirewallHelperClass::getNextTemporarySourcePort(Int skip)
 			closeSpareSocket(return_port);
 			return(return_port);
 		} else {
-			DEBUG_LOG(("FirewallHelperClass::getNextTemporarySourcePort - failed to open socket on port %d"));
+			DEBUG_LOG(("FirewallHelperClass::getNextTemporarySourcePort - failed to open socket on port %d", return_port));
 		}
 	}
 
@@ -997,7 +997,7 @@ Bool FirewallHelperClass::detectionTest3WaitForResponsesUpdate() {
 			*/
 			m_sourcePortAllocationDelta = m_lastSourcePortAllocationDelta;
 		}
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get enough responses, using %d as the source port allocation delta, finished test"));
+		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get enough responses, using %d as the source port allocation delta, finished test", m_sourcePortAllocationDelta));
 		m_currentState = DETECTIONSTATE_DONE;
 		return TRUE;
 	}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
@@ -675,7 +675,7 @@ void W3DGhostObject::xfer( Xfer *xfer )
 		if( snapshotCount == 0 && m_parentSnapshots[ i ] != NULL )
 		{
 
-			DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty" ));
+			DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty", i ));
 			throw INI_INVALID_DATA;
 
 		}  // end if

Original file line number	Diff line number	Diff line change
`@@ -1042,7 +1042,7 @@ Bool AudioManager::shouldPlayLocally(const AudioEventRTS *audioEvent)`
`1042`	`1042`	`Player *owningPlayer = ThePlayerList->getNthPlayer(audioEvent->getPlayerIndex());`
`1043`	`1043`
`1044`	`1044`	`if (BitIsSet(ei->m_type, ST_PLAYER) && BitIsSet(ei->m_type, ST_UI) && owningPlayer == NULL) {`
`1045`		`- DEBUG_ASSERTCRASH(!TheGameLogic->isInGameLogicUpdate(), ("Playing %s sound -- player-based UI sound without specifying a player."));`
	`1045`	`+ DEBUG_ASSERTCRASH(!TheGameLogic->isInGameLogicUpdate(), ("Playing %s sound -- player-based UI sound without specifying a player.", ei->m_audioName.str()));`
`1046`	`1046`	`return TRUE;`
`1047`	`1047`	`}`
`1048`	`1048`
Original file line number	Diff line number	Diff line change
`@@ -862,7 +862,7 @@ static void refreshGameList( Bool forceRefresh )`
`862`	`862`	`//DEBUG_LOG(("-"));`
`863`	`863`	`}`
`864`	`864`	`} else {`
`865`		`- //DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d"));`
	`865`	`+ //DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));`
`866`	`866`	`}`
`867`	`867`	`}`
`868`	`868`	`//-------------------------------------------------------------------------------------------------`
`@@ -1301,7 +1301,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)`
`1301`	`1301`	`//DEBUG_LOG(("-"));`
`1302`	`1302`	`}`
`1303`	`1303`	`} else {`
`1304`		`- //DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d"));`
	`1304`	`+ //DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));`
`1305`	`1305`	`}`
`1306`	`1306`	`#else`
`1307`	`1307`	`refreshGameList();`
Original file line number	Diff line number	Diff line change
`@@ -4188,7 +4188,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const`
`4188`	`4188`	`case ACTIONTYPE_MAKE_DEFECTOR:`
`4189`	`4189`	`case ACTIONTYPE_SET_RALLY_POINT:`
`4190`	`4190`	`default:`
`4191`		`- DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?") );`
	`4191`	`+ DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?", action) );`
`4192`	`4192`	`return ATTACKRESULT_INVALID_SHOT;`
`4193`	`4193`
`4194`	`4194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ static const char * findGameMessageNameByType(GameMessage::Type type)`
`353`	`353`	`if (metaNames->value == (Int)type)`
`354`	`354`	`return metaNames->name;`
`355`	`355`
`356`		`- DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?"));`
	`356`	`+ DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?", (Int)type));`
`357`	`357`	`return "???";`
`358`	`358`	`}`
`359`	`359`
Original file line number	Diff line number	Diff line change
`@@ -850,7 +850,7 @@ void ConnectionManager::processAckStage1(NetCommandMsg *msg) {`
`850`	`850`	`ref = m_connections[playerID]->processAck(msg);`
`851`	`851`	`}`
`852`	`852`	`} else {`
`853`		`- DEBUG_ASSERTCRASH((playerID >= 0) && (playerID < NUM_CONNECTIONS), ("ConnectionManager::processAck - %d is an invalid player number"));`
	`853`	`+ DEBUG_ASSERTCRASH((playerID >= 0) && (playerID < NUM_CONNECTIONS), ("ConnectionManager::processAck - %d is an invalid player number", playerID));`
`854`	`854`	`}`
`855`	`855`
`856`	`856`	`if (ref != NULL) {`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ UnsignedShort FirewallHelperClass::getNextTemporarySourcePort(Int skip)`
`291`	`291`	`closeSpareSocket(return_port);`
`292`	`292`	`return(return_port);`
`293`	`293`	`} else {`
`294`		`- DEBUG_LOG(("FirewallHelperClass::getNextTemporarySourcePort - failed to open socket on port %d"));`
	`294`	`+ DEBUG_LOG(("FirewallHelperClass::getNextTemporarySourcePort - failed to open socket on port %d", return_port));`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`
`@@ -998,7 +998,7 @@ Bool FirewallHelperClass::detectionTest3WaitForResponsesUpdate() {`
`998`	`998`	`*/`
`999`	`999`	`m_sourcePortAllocationDelta = m_lastSourcePortAllocationDelta;`
`1000`	`1000`	`}`
`1001`		`- DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get enough responses, using %d as the source port allocation delta, finished test"));`
	`1001`	`+ DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get enough responses, using %d as the source port allocation delta, finished test", m_sourcePortAllocationDelta));`
`1002`	`1002`	`m_currentState = DETECTIONSTATE_DONE;`
`1003`	`1003`	`return TRUE;`
`1004`	`1004`	`}`
Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@ void W3DGhostObject::xfer( Xfer *xfer )`
`671`	`671`	`if( snapshotCount == 0 && m_parentSnapshots[ i ] != NULL )`
`672`	`672`	`{`
`673`	`673`
`674`		`- DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty" ));`
	`674`	`+ DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty", i ));`
`675`	`675`	`throw INI_INVALID_DATA;`
`676`	`676`
`677`	`677`	`} // end if`
Original file line number	Diff line number	Diff line change
`@@ -880,7 +880,7 @@ static void refreshGameList( Bool forceRefresh )`
`880`	`880`	`//DEBUG_LOG(("-"));`
`881`	`881`	`}`
`882`	`882`	`} else {`
`883`		`- //DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d"));`
	`883`	`+ //DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));`
`884`	`884`	`}`
`885`	`885`	`}`
`886`	`886`	`//-------------------------------------------------------------------------------------------------`
`@@ -1320,7 +1320,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)`
`1320`	`1320`	`//DEBUG_LOG(("-"));`
`1321`	`1321`	`}`
`1322`	`1322`	`} else {`
`1323`		`- //DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d"));`
	`1323`	`+ //DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));`
`1324`	`1324`	`}`
`1325`	`1325`	`#else`
`1326`	`1326`	`refreshGameList();`
Original file line number	Diff line number	Diff line change
`@@ -4348,7 +4348,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const`
`4348`	`4348`	`case ACTIONTYPE_MAKE_DEFECTOR:`
`4349`	`4349`	`case ACTIONTYPE_SET_RALLY_POINT:`
`4350`	`4350`	`default:`
`4351`		`- DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?") );`
	`4351`	`+ DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?", action) );`
`4352`	`4352`	`return ATTACKRESULT_INVALID_SHOT;`
`4353`	`4353`
`4354`	`4354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ static const char * findGameMessageNameByType(GameMessage::Type type)`
`391`	`391`	`if (metaNames->value == (Int)type)`
`392`	`392`	`return metaNames->name;`
`393`	`393`
`394`		`- DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?"));`
	`394`	`+ DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?", (Int)type));`
`395`	`395`	`return "???";`
`396`	`396`	`}`
`397`	`397`