[GEN][ZH] Fix some RTS_DEBUG and RTS_INTERNAL defines (#1070)

helmutbuhler · web-flow · commit 1b60047cf082 · 2025-06-17T00:11:07.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
@@ -221,7 +221,7 @@ static void playerTooltip(GameWindow *window,
 	}
 	UnicodeString tooltip;
 	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
-#if defined(_DEBUG) || defined(_INTERNAL)
+#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
 	tooltip.concat(ip);
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
@@ -312,7 +312,7 @@ static void playerTooltip(GameWindow *window,
 	}
 	UnicodeString tooltip;
 	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
-#if defined(_DEBUG) || defined(_INTERNAL)
+#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
 	tooltip.concat(ip);
@@ -405,7 +405,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	{
 		IPSource = L"Default local IP";
 	}
-#if defined(_DEBUG) || defined(_INTERNAL)
+#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString str;
 	str.format(L"%s: %d.%d.%d.%d", IPSource, PRINTF_IP_AS_4_INTS(IP));
 	GadgetListBoxAddEntryText(listboxChatWindow, str, chatSystemColor, -1, 0);
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Connection.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Connection.cpp
@@ -411,7 +411,7 @@ void Connection::doRetryMetrics() {
 	}
 }
 
-#if defined(RTS_DEBUG) || (RTS_INTERNAL)
+#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 void Connection::debugPrintCommands() {
 	NetCommandRef *ref = m_netCommandList->getFirstMessage();
 	while (ref != NULL) {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
@@ -228,7 +228,7 @@ static void playerTooltip(GameWindow *window,
 	}
 	UnicodeString tooltip;
 	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
-#if defined(_DEBUG) || defined(_INTERNAL)
+#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
 	tooltip.concat(ip);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
@@ -354,7 +354,7 @@ static void playerTooltip(GameWindow *window,
 	}
 	UnicodeString tooltip;
 	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
-#if defined(_DEBUG) || defined(_INTERNAL)
+#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
 	tooltip.concat(ip);
@@ -447,7 +447,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	{
 		IPSource = L"Default local IP";
 	}
-#if defined(_DEBUG) || defined(_INTERNAL)
+#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString str;
 	str.format(L"%s: %d.%d.%d.%d", IPSource, PRINTF_IP_AS_4_INTS(IP));
 	GadgetListBoxAddEntryText(listboxChatWindow, str, chatSystemColor, -1, 0);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
@@ -283,7 +283,7 @@ Bool GarrisonContain::calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3
 	if( !sourcePos || !targetPos )
 		return FALSE;
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -317,7 +317,7 @@ Bool GarrisonContain::attemptBestFirePointPosition( Object *source, Weapon *weap
 		return FALSE;
 	}
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -357,7 +357,7 @@ Bool GarrisonContain::attemptBestFirePointPosition( Object *source, Weapon *weap
 	{
 		return FALSE;
 	}
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -398,7 +398,7 @@ void GarrisonContain::putObjectAtBestGarrisonPoint( Object *obj, Object *target,
 	if( obj == NULL || (target == NULL && targetPos == NULL) )
 		return;
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -433,7 +433,7 @@ void GarrisonContain::removeObjectFromGarrisonPoint( Object *obj, Int index )
   if ( ! isEnclosingContainerFor(obj) )
     return;// since I am not enclosed, I am not at a garrison point!
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -587,7 +587,7 @@ Bool GarrisonContain::isValidContainerFor(const Object* obj, Bool checkCapacity)
 // ------------------------------------------------------------------------------------------------
 void GarrisonContain::removeInvalidObjectsFromGarrisonPoints( void )
 {
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("removeinvalidobjFromGarrisonPoint... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -638,7 +638,7 @@ void GarrisonContain::addValidObjectsToGarrisonPoints( void )
 {
 
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("addvalidobjtoGarrisonPoint... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -833,7 +833,7 @@ void GarrisonContain::updateEffects( void )
 {
 
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("updateeffects... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp
@@ -411,7 +411,7 @@ void Connection::doRetryMetrics() {
 	}
 }
 
-#if defined(RTS_DEBUG) || (RTS_INTERNAL)
+#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 void Connection::debugPrintCommands() {
 	NetCommandRef *ref = m_netCommandList->getFirstMessage();
 	while (ref != NULL) {

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ static void playerTooltip(GameWindow *window,`
`221`	`221`	`}`
`222`	`222`	`UnicodeString tooltip;`
`223`	`223`	`tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());`
`224`		`-#if defined(_DEBUG) \|\| defined(_INTERNAL)`
	`224`	`+#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`225`	`225`	`UnicodeString ip;`
`226`	`226`	`ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));`
`227`	`227`	`tooltip.concat(ip);`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ static void playerTooltip(GameWindow *window,`
`312`	`312`	`}`
`313`	`313`	`UnicodeString tooltip;`
`314`	`314`	`tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());`
`315`		`-#if defined(_DEBUG) \|\| defined(_INTERNAL)`
	`315`	`+#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`316`	`316`	`UnicodeString ip;`
`317`	`317`	`ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));`
`318`	`318`	`tooltip.concat(ip);`
`@@ -405,7 +405,7 @@ void LanLobbyMenuInit( WindowLayout layout, void userData )`
`405`	`405`	`{`
`406`	`406`	`IPSource = L"Default local IP";`
`407`	`407`	`}`
`408`		`-#if defined(_DEBUG) \|\| defined(_INTERNAL)`
	`408`	`+#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`409`	`409`	`UnicodeString str;`
`410`	`410`	`str.format(L"%s: %d.%d.%d.%d", IPSource, PRINTF_IP_AS_4_INTS(IP));`
`411`	`411`	`GadgetListBoxAddEntryText(listboxChatWindow, str, chatSystemColor, -1, 0);`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ void Connection::doRetryMetrics() {`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`
`414`		`-#if defined(RTS_DEBUG) \|\| (RTS_INTERNAL)`
	`414`	`+#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`415`	`415`	`void Connection::debugPrintCommands() {`
`416`	`416`	`NetCommandRef *ref = m_netCommandList->getFirstMessage();`
`417`	`417`	`while (ref != NULL) {`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ static void playerTooltip(GameWindow *window,`
`228`	`228`	`}`
`229`	`229`	`UnicodeString tooltip;`
`230`	`230`	`tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());`
`231`		`-#if defined(_DEBUG) \|\| defined(_INTERNAL)`
	`231`	`+#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`232`	`232`	`UnicodeString ip;`
`233`	`233`	`ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));`
`234`	`234`	`tooltip.concat(ip);`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ static void playerTooltip(GameWindow *window,`
`354`	`354`	`}`
`355`	`355`	`UnicodeString tooltip;`
`356`	`356`	`tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());`
`357`		`-#if defined(_DEBUG) \|\| defined(_INTERNAL)`
	`357`	`+#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`358`	`358`	`UnicodeString ip;`
`359`	`359`	`ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));`
`360`	`360`	`tooltip.concat(ip);`
`@@ -447,7 +447,7 @@ void LanLobbyMenuInit( WindowLayout layout, void userData )`
`447`	`447`	`{`
`448`	`448`	`IPSource = L"Default local IP";`
`449`	`449`	`}`
`450`		`-#if defined(_DEBUG) \|\| defined(_INTERNAL)`
	`450`	`+#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`451`	`451`	`UnicodeString str;`
`452`	`452`	`str.format(L"%s: %d.%d.%d.%d", IPSource, PRINTF_IP_AS_4_INTS(IP));`
`453`	`453`	`GadgetListBoxAddEntryText(listboxChatWindow, str, chatSystemColor, -1, 0);`