[GEN][ZH] Remove or repurpose RTS_INTERNAL specific code (#1231)

xezon · xezon · commit fd60314e13bb · 2025-07-05T14:37:08.000+02:00
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp
@@ -1409,7 +1409,7 @@ VertexFormatXYZUV1 *StreakRendererClass::getVertexBuffer(unsigned int number)
 		m_vertexBufferSize = numberToAlloc;
 	}
 
-#ifdef RTS_INTERNAL
+#ifdef RTS_DEBUG
 	for (unsigned i = 0; i < number; ++i)
 	{
 	  m_vertexBuffer[i].x = m_vertexBuffer[i].y = m_vertexBuffer[i].z = m_vertexBuffer[i].u1 = m_vertexBuffer[i].v1 = (float)0xdeadbeef;
diff --git a/Core/Libraries/Source/debug/debug.h b/Core/Libraries/Source/debug/debug.h
@@ -83,10 +83,6 @@
   - Release: XXX.lib
 */
 
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only either RTS_DEBUG or RTS_INTERNAL should ever be defined"
-#endif
-
 // Define which libraries to use. 
 #if defined(RTS_DEBUG) || defined(RTS_PROFILE)
 #  define HAS_ASSERTS
diff --git a/Core/Libraries/Source/debug/debug_debug.cpp b/Core/Libraries/Source/debug/debug_debug.cpp
@@ -1437,9 +1437,7 @@ void Debug::WriteBuildInfo(void)
     (*this) << " " << m_version;
   if (*m_intVersion)
     (*this) << " internal " << m_intVersion;
-  #if defined(RTS_INTERNAL)
-    operator<<(" internal");
-  #elif defined(RTS_DEBUG)
+  #if defined(RTS_DEBUG)
     operator<<(" debug");
   #elif defined(RTS_PROFILE)
     operator<<(" profile");
diff --git a/Core/Libraries/Source/profile/profile.h b/Core/Libraries/Source/profile/profile.h
@@ -32,10 +32,6 @@
 #ifndef PROFILE_H // Include guard
 #define PROFILE_H
 
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only either RTS_DEBUG or RTS_INTERNAL should ever be defined"
-#endif
-
 // include all our public header files (use double quotes here)
 #include "profile_doc.h"
 #include "profile_highlevel.h"
diff --git a/Generals/Code/GameEngine/Include/Common/Debug.h b/Generals/Code/GameEngine/Include/Common/Debug.h
@@ -50,10 +50,6 @@
 
 class AsciiString;
 
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only one at a time of these should ever be defined"
-#endif
-
 // These are stolen from the WW3D Debug file. REALLY useful. :-)
 #define STRING_IT(a) #a																				  
 #define TOKEN_IT(a) STRING_IT(,##a)
@@ -120,8 +116,8 @@ class AsciiString;
 		DEBUG_FLAG_LOG_TO_FILE = 0x01,	
 		DEBUG_FLAG_LOG_TO_CONSOLE = 0x02,
 		DEBUG_FLAG_PREPEND_TIME = 0x04,
-#ifdef RTS_INTERNAL
-		// by default, RTS_INTERNAL builds log to file, but not to console, in the interest
+#ifdef RTS_PROFILE
+		// by default, RTS_PROFILE builds log to file, but not to console, in the interest
 		// of speed. want console output? just change this line:
 		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE)
 #else
diff --git a/Generals/Code/GameEngine/Include/Common/StateMachine.h b/Generals/Code/GameEngine/Include/Common/StateMachine.h
@@ -51,9 +51,6 @@ class Object;
 #if defined(RTS_DEBUG)
 	#define STATE_MACHINE_DEBUG
 #endif
-#if defined(RTS_INTERNAL)
-	#define STATE_MACHINE_DEBUG	//uncomment to debug state machines in internal.  jba.
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h
@@ -50,7 +50,7 @@ class Player;
 class PolygonTrigger;
 class ObjectTypes;
 
-#ifdef RTS_INTERNAL
+#ifdef RTS_PROFILE
 #define SPECIAL_SCRIPT_PROFILING
 #endif
 
diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp
@@ -257,8 +257,6 @@ void GameEngine::init()
 #ifdef DEBUG_LOGGING
 	#if defined RTS_DEBUG
 			const char *buildType = "Debug";
-	#elif defined RTS_INTERNAL
-			const char *buildType = "Internal";
 	#else
 			const char *buildType = "Release";
 	#endif
diff --git a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp b/Generals/Code/GameEngine/Source/Common/System/Debug.cpp
@@ -83,10 +83,7 @@ extern const char *gAppPrefix; /// So WB can have a different log file name.
 
 #ifdef DEBUG_LOGGING
 
-#if defined(RTS_INTERNAL)
-	#define DEBUG_FILE_NAME				"DebugLogFileI"
-	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrevI"
-#elif defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 	#define DEBUG_FILE_NAME				"DebugLogFileD"
 	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrevD"
 #else
diff --git a/Generals/Code/GameEngine/Source/Common/version.cpp b/Generals/Code/GameEngine/Source/Common/version.cpp
@@ -101,10 +101,6 @@ UnicodeString Version::getUnicodeVersion( void )
 	version.concat(UnicodeString(L" Debug"));
 #endif
 
-#ifdef RTS_INTERNAL
-	version.concat(UnicodeString(L" Internal"));
-#endif
-
 	return version;
 }
 
@@ -122,10 +118,6 @@ UnicodeString Version::getFullUnicodeVersion( void )
 	version.concat(UnicodeString(L" Debug"));
 #endif
 
-#ifdef RTS_INTERNAL
-	version.concat(UnicodeString(L" Internal"));
-#endif
-
 	return version;
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
@@ -1414,9 +1414,6 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 #if defined RTS_DEBUG
 				if(_spawnl(_P_NOWAIT,"WorldBuilderD.exe","WorldBuilderD.exe", NULL) < 0)
 					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
-#elif defined  RTS_INTERNAL
-				if(_spawnl(_P_NOWAIT,"WorldBuilderI.exe","WorldBuilderI.exe", NULL) < 0)
-					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
 #else
 				if(_spawnl(_P_NOWAIT,"WorldBuilder.exe","WorldBuilder.exe", NULL) < 0)
 					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
@@ -99,7 +99,7 @@ Bool st_particleSystemNeedsStopping = FALSE; ///< Set along with st_particleSyst
 #define FORMAT_STRING_LEADING_STRING		"%s%.2f"
 // That's it for particle editor
 
-#if defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	#define DO_VTUNE_STUFF
 #endif
 
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -677,7 +677,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg)
 
 void ConnectionManager::processFile(NetFileCommandMsg *msg) 
 {
-#ifdef RTS_INTERNAL
+#ifdef DEBUG_LOGGING
 	UnicodeString log;
 	log.format(L"Saw file transfer: '%hs' of %d bytes from %d", msg->getPortableFilename().str(), msg->getFileLength(), msg->getPlayerID());
 	DEBUG_LOG(("%ls\n", log.str()));
diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
@@ -277,9 +277,6 @@ BOOL CWorldBuilderApp::InitInstance()
 	// start the log
 	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
 	DEBUG_LOG(("starting Worldbuilder.\n"));
-#ifdef RTS_INTERNAL
-	DEBUG_LOG(("RTS_INTERNAL defined.\n"));
-#endif
 #ifdef RTS_DEBUG
 	DEBUG_LOG(("RTS_DEBUG defined.\n"));
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Debug.h b/GeneralsMD/Code/GameEngine/Include/Common/Debug.h
@@ -50,10 +50,6 @@
 
 class AsciiString;
 
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only one at a time of these should ever be defined"
-#endif
-
 #define NO_RELEASE_DEBUG_LOGGING
 
 #ifdef RELEASE_DEBUG_LOGGING  ///< Creates a DebugLogFile.txt (No I or D) with all the debug log goodness.  Good for startup problems.
@@ -126,8 +122,8 @@ class AsciiString;
 		DEBUG_FLAG_LOG_TO_FILE = 0x01,	
 		DEBUG_FLAG_LOG_TO_CONSOLE = 0x02,
 		DEBUG_FLAG_PREPEND_TIME = 0x04,
-#ifdef RTS_INTERNAL
-		// by default, RTS_INTERNAL builds log to file, but not to console, in the interest
+#ifdef RTS_PROFILE
+		// by default, RTS_PROFILE builds log to file, but not to console, in the interest
 		// of speed. want console output? just change this line:
 		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE)
 #else
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
@@ -51,9 +51,6 @@ class Object;
 #if defined(RTS_DEBUG)
 	#define STATE_MACHINE_DEBUG
 #endif
-#if defined(RTS_INTERNAL)
-	#define STATE_MACHINE_DEBUG	//uncomment to debug state machines in internal.  jba.
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h
@@ -50,7 +50,7 @@ class Player;
 class PolygonTrigger;
 class ObjectTypes;
 
-#ifdef RTS_INTERNAL
+#ifdef RTS_PROFILE
 #define SPECIAL_SCRIPT_PROFILING
 #endif
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
@@ -258,8 +258,6 @@ void GameEngine::init()
 			DEBUG_LOG(("================================================================================\n"));
 	#if defined RTS_DEBUG
 			const char *buildType = "Debug";
-	#elif defined RTS_INTERNAL
-			const char *buildType = "Internal";
 	#else
 			const char *buildType = "Release";
 	#endif
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp
@@ -84,10 +84,7 @@ extern const char *gAppPrefix; /// So WB can have a different log file name.
 
 #ifdef DEBUG_LOGGING
 
-#if defined(RTS_INTERNAL)
-	#define DEBUG_FILE_NAME				"DebugLogFileI"
-	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrevI"
-#elif defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 	#define DEBUG_FILE_NAME				"DebugLogFileD"
 	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrevD"
 #else
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/version.cpp b/GeneralsMD/Code/GameEngine/Source/Common/version.cpp
@@ -101,10 +101,6 @@ UnicodeString Version::getUnicodeVersion( void )
 	version.concat(UnicodeString(L" Debug"));
 #endif
 
-#ifdef RTS_INTERNAL
-	version.concat(UnicodeString(L" Internal"));
-#endif
-
 	return version;
 }
 
@@ -122,10 +118,6 @@ UnicodeString Version::getFullUnicodeVersion( void )
 	version.concat(UnicodeString(L" Debug"));
 #endif
 
-#ifdef RTS_INTERNAL
-	version.concat(UnicodeString(L" Internal"));
-#endif
-
 	return version;
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
@@ -1498,9 +1498,6 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 #if defined RTS_DEBUG
 				if(_spawnl(_P_NOWAIT,"WorldBuilderD.exe","WorldBuilderD.exe", NULL) < 0)
 					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
-#elif defined  RTS_INTERNAL
-				if(_spawnl(_P_NOWAIT,"WorldBuilderI.exe","WorldBuilderI.exe", NULL) < 0)
-					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
 #else
 				if(_spawnl(_P_NOWAIT,"WorldBuilder.exe","WorldBuilder.exe", NULL) < 0)
 					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
@@ -100,7 +100,7 @@ Bool st_particleSystemNeedsStopping = FALSE; ///< Set along with st_particleSyst
 #define FORMAT_STRING_LEADING_STRING		"%s%.2f"
 // That's it for particle editor
 
-#if defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	#define DO_VTUNE_STUFF
 #endif
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -677,7 +677,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg)
 
 void ConnectionManager::processFile(NetFileCommandMsg *msg) 
 {
-#ifdef RTS_INTERNAL
+#ifdef DEBUG_LOGGING
 	UnicodeString log;
 	log.format(L"Saw file transfer: '%hs' of %d bytes from %d", msg->getPortableFilename().str(), msg->getFileLength(), msg->getPlayerID());
 	DEBUG_LOG(("%ls\n", log.str()));
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
@@ -58,8 +58,8 @@ void StdBIGFileSystem::init() {
     AsciiString installPath;
     GetStringFromGeneralsRegistry("", "InstallPath", installPath );
     //@todo this will need to be ramped up to a crash for release
-#ifndef RTS_INTERNAL
-    // had to make this non-internal only, otherwise we can't autobuild
+#ifndef RTS_DEBUG
+    // had to make this non-debug only, otherwise we can't autobuild
     // GeneralsZH...
     DEBUG_ASSERTCRASH(installPath != "", ("Be 1337! Go install Generals!"));
 #endif
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
@@ -59,8 +59,8 @@ void Win32BIGFileSystem::init() {
     AsciiString installPath;
     GetStringFromGeneralsRegistry("", "InstallPath", installPath );
     //@todo this will need to be ramped up to a crash for release
-#ifndef RTS_INTERNAL
-    // had to make this non-internal only, otherwise we can't autobuild
+#ifndef RTS_DEBUG
+    // had to make this non-debug only, otherwise we can't autobuild
     // GeneralsZH...
     DEBUG_ASSERTCRASH(installPath != "", ("Be 1337! Go install Generals!"));
 #endif
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
@@ -290,9 +290,6 @@ BOOL CWorldBuilderApp::InitInstance()
 
 	DEBUG_LOG(("starting Worldbuilder.\n"));
 
-#ifdef RTS_INTERNAL
-	DEBUG_LOG(("RTS_INTERNAL defined.\n"));
-#endif
 #ifdef RTS_DEBUG
 	DEBUG_LOG(("RTS_DEBUG defined.\n"));
 #endif
@@ -355,9 +352,6 @@ BOOL CWorldBuilderApp::InitInstance()
 	TheWritableGlobalData->m_debugIgnoreAsserts = false;
 #endif
 
-#if defined(RTS_INTERNAL)
-	// leave on asserts for a while. jba. [4/15/2003] TheWritableGlobalData->m_debugIgnoreAsserts = true;
-#endif
 	DEBUG_LOG(("TheWritableGlobalData %x\n", TheWritableGlobalData));
 #if 1
 	// srj sez: put INI into our user data folder, not the ap dir

Original file line number	Diff line number	Diff line change
`@@ -1409,7 +1409,7 @@ VertexFormatXYZUV1 *StreakRendererClass::getVertexBuffer(unsigned int number)`
`1409`	`1409`	`m_vertexBufferSize = numberToAlloc;`
`1410`	`1410`	`}`
`1411`	`1411`
`1412`		`-#ifdef RTS_INTERNAL`
	`1412`	`+#ifdef RTS_DEBUG`
`1413`	`1413`	`for (unsigned i = 0; i < number; ++i)`
`1414`	`1414`	`{`
`1415`	`1415`	`m_vertexBuffer[i].x = m_vertexBuffer[i].y = m_vertexBuffer[i].z = m_vertexBuffer[i].u1 = m_vertexBuffer[i].v1 = (float)0xdeadbeef;`