[GEN][ZH] Remove obsolete conditions for RTS_INTERNAL (#1231)

Author: xezon

Core/Libraries/Source/WWVegas/WWLib/always.h

@@ -106,7 +106,7 @@
 
 #endif
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG) 
 	#define MSGW3DNEW(MSG)					new( MSG, 0 )
 	#define MSGW3DNEWARRAY(MSG)			new( MSG, 0 )
 	#define W3DNEW									new("W3D_" __FILE__, 0)

Core/Libraries/Source/WWVegas/WWLib/sharebuf.h

@@ -77,7 +77,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass
 
 	protected:
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG) 
 		const char* Msg;
 #endif
 		T *			Array;
@@ -90,7 +90,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass
 template <class T>
 ShareBufferClass<T>::ShareBufferClass(int count, const char* msg) :
 	Count(count)
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG) 
 	, Msg(msg)
 #endif
 {
@@ -103,7 +103,7 @@ ShareBufferClass<T>::ShareBufferClass(const ShareBufferClass<T> & that) :
 	Count(that.Count)
 {
 	assert(Count > 0);
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG) 
 	Msg = that.Msg;
 #endif
 	Array = MSGW3DNEWARRAY(Msg) T[Count];

Core/Libraries/Source/debug/debug.h

@@ -89,7 +89,7 @@
 #endif
 
 // Define which libraries to use. 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) || defined(RTS_PROFILE)
+#if defined(RTS_DEBUG) || defined(RTS_PROFILE)
 #  define HAS_ASSERTS
 #  define HAS_LOGS
 #endif

Core/Libraries/Source/debug/debug_macro.h

@@ -45,7 +45,7 @@
   This module defines a number of macros. Usually only these macros should be
   used to access any debug functionality.
 
-  All these macros are defined if either RTS_DEBUG or RTS_INTERNAL is defined. Otherwise
+  All these macros are defined if RTS_DEBUG is defined. Otherwise
   all of them (with the exception of DCHECK and DCHECK_MSG) will be removed.
 */
 ///@{
@@ -57,7 +57,7 @@
     returns false. The user will then have the choice of aborting the program,
     continuing once or continuing with completely ignoring that specific assertion.
 
-    Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined.
+    Assertions are completely removed if RTS_DEBUG is not defined.
 
     \param expr expression, trigger assert window if false
   */
@@ -73,7 +73,7 @@
     \endcode
     For more information see the \ref debug_stream page.
 
-    Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined.
+    Assertions are completely removed if RTS_DEBUG is not defined.
 
     \param expr expression, trigger assert window if false
     \param msg custom message stream, see \ref debug_stream
@@ -282,7 +282,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
 
 ///@}
 
-#elif defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#elif defined(RTS_DEBUG)
 
   #define DASSERT(expr) \
     ((void)( Debug::SkipNext() || \

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

@@ -89,7 +89,7 @@ class AsciiString
 	// add a ctor/dtor, 'cuz they won't ever be called.
 	struct AsciiStringData
 	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		const char* m_debugptr;	// just makes it easier to read in the debugger
 #endif
 		unsigned short	m_refCount;						// reference count

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

@@ -64,7 +64,7 @@ class AsciiString;
 //#define DISABLE_DEBUG_LOGGING
 
 // by default, turn on ALLOW_DEBUG_UTILS if RTS_DEBUG is turned on.
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS)
+#if defined(RTS_DEBUG) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS)
 	#define ALLOW_DEBUG_UTILS 1
 #elif defined(DEBUG_LOGGING) || defined(DEBUG_CRASHING) || defined(DEBUG_STACKTRACE) || defined(DEBUG_PROFILE)
 	// TheSuperHackers @tweak also turn on when any of the above options is already set.

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

@@ -77,7 +77,7 @@ class DrawModule : public DrawableModule
 	virtual void releaseShadows(void) = 0;	///< frees all shadow resources used by this module - used by Options screen.
 	virtual void allocateShadows(void) = 0; ///< create shadow resources if not already present. Used by Options screen.
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)	
 	virtual void getRenderCost(RenderCost & rc) const { };  ///< estimates the render cost of this draw module
 #endif
 

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

@@ -136,7 +136,7 @@ class AudioManager : public SubsystemInterface
 	public:
 		AudioManager();
 		virtual ~AudioManager();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = NULL ) = 0;
 #endif
 
@@ -375,7 +375,7 @@ class AudioManager : public SubsystemInterface
 // AudioManager that does nothing. Used for Headless Mode.
 class AudioManagerDummy : public AudioManager
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void audioDebugDisplay(DebugDisplayInterface* dd, void* userData, FILE* fp) {}
 #endif
 	virtual void stopAudio(AudioAffect which) {}

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

@@ -54,7 +54,7 @@
 #include "Lib/BaseType.h"
 
 // ----------------------------------------------------------------------------------------------
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 	#define NO_DUMP_PERF_STATS
 #else
 	#define NO_DUMP_PERF_STATS

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

@@ -53,12 +53,12 @@
 	#define DISABLE_MEMORYPOOL_CHECKPOINTING 1
 #endif
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW)
+#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW)
 	#define MEMORYPOOL_DEBUG_CUSTOM_NEW
 #endif
 
-//#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
-#if (defined(RTS_DEBUG)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
+//#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
+#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
 	#define MEMORYPOOL_DEBUG
 #endif