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

Author: xezon

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;

Core/Libraries/Source/debug/debug.h

@@ -35,8 +35,7 @@
 /** 
   \page lib_var Library variants
 
-  Generally speaking there are four different library variants:
-  - Internal: all asserts/checks/logs, full optimizations (RTS_INTERNAL macro defined)
+  Generally speaking there are three different library variants:
   - %Debug: all asserts/checks/logs, no optimizations (RTS_DEBUG macro defined)
   - Profile: all asserts/checks/logs, full optimizations, profiling active (RTS_PROFILE macro defined)
   - Release: no asserts/checks/logs, full optimizations
@@ -84,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

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");

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"

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,13 +116,7 @@ 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
-		// of speed. want console output? just change this line:
-		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE)
-#else
-		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE | DEBUG_FLAG_LOG_TO_CONSOLE)
-#endif
+		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE | DEBUG_FLAG_LOG_TO_CONSOLE),
 	};
 
 	DEBUG_EXTERN_C void DebugInit(int flags);

Generals/Code/GameEngine/Include/Common/GlobalData.h

@@ -465,10 +465,12 @@ class GlobalData : public SubsystemInterface
   Int					m_playStats;									///< Int whether we want to log play stats or not, if <= 0 then we don't log
 
   Bool m_TiVOFastMode;            ///< When true, the client speeds up the framerate... set by HOTKEY!
-  
 
+#if defined(RTS_PROFILE)
+	Bool m_vTune;
+#endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Bool m_wireframe;
 	Bool m_stateMachineDebug;
 	Bool m_useCameraConstraints;
@@ -483,7 +485,6 @@ class GlobalData : public SubsystemInterface
 	Bool m_disableMilitaryCaption;					///< if true, military briefings go fast
 	Int m_benchmarkTimer;										///< how long to play the game in benchmark mode?
 	Bool m_checkForLeaks;
-	Bool m_vTune;
 	Bool m_debugCamera;						///< Used to display Camera debug information
 	Bool m_debugVisibility;						///< Should we actively debug the visibility
 	Int m_debugVisibilityTileCount;		///< How many tiles we should show when debugging visibility

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
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

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
 

Generals/Code/GameEngine/Source/Common/CommandLine.cpp

@@ -697,6 +697,10 @@ Int parseLogAssets( char *args[], int num )
 	return 1;
 }
 
+#endif // defined(RTS_DEBUG)
+
+#if defined(RTS_PROFILE)
+
 /// begin stuff for VTUNE
 Int parseVTune ( char *args[], int num )
 {
@@ -706,7 +710,7 @@ Int parseVTune ( char *args[], int num )
 }
 /// end stuff for VTUNE
 
-#endif // defined(RTS_DEBUG)
+#endif // defined(RTS_PROFILE)
 
 //=============================================================================
 //=============================================================================
@@ -1274,7 +1278,6 @@ static CommandLineParam paramsForEngineInit[] =
 	{ "-DemoLoadScreen", parseDemoLoadScreen },
 	{ "-cameraDebug", parseCameraDebug },
 	{ "-logToCon", parseLogToConsole },
-	{ "-vTune", parseVTune },
 	{ "-selectTheUnselectable", parseSelectAll },
 	{ "-RunAhead", parseRunAhead },
 	{ "-noshroud", parseNoShroud },
@@ -1299,6 +1302,10 @@ static CommandLineParam paramsForEngineInit[] =
 
 #endif
 
+#if defined(RTS_PROFILE)
+	{ "-vTune", parseVTune },
+#endif
+
 #ifdef DEBUG_LOGGING
 	{ "-setDebugLevel", parseSetDebugLevel },
 	{ "-clearDebugLevel", parseClearDebugLevel },

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