Skip to content

Commit b342328

Browse files
xezonxezon
committed
[GEN][ZH] Remove obsolete conditions for RTS_INTERNAL (#1231)
1 parent 79f8e9a commit b342328

File tree

281 files changed

+932
-932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+932
-932
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106

107107
#endif
108108

109-
#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
109+
#if defined(RTS_DEBUG)
110110
#define MSGW3DNEW(MSG) new( MSG, 0 )
111111
#define MSGW3DNEWARRAY(MSG) new( MSG, 0 )
112112
#define W3DNEW new("W3D_" __FILE__, 0)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass
7777

7878
protected:
7979

80-
#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
80+
#if defined(RTS_DEBUG)
8181
const char* Msg;
8282
#endif
8383
T * Array;
@@ -90,7 +90,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass
9090
template <class T>
9191
ShareBufferClass<T>::ShareBufferClass(int count, const char* msg) :
9292
Count(count)
93-
#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
93+
#if defined(RTS_DEBUG)
9494
, Msg(msg)
9595
#endif
9696
{
@@ -103,7 +103,7 @@ ShareBufferClass<T>::ShareBufferClass(const ShareBufferClass<T> & that) :
103103
Count(that.Count)
104104
{
105105
assert(Count > 0);
106-
#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
106+
#if defined(RTS_DEBUG)
107107
Msg = that.Msg;
108108
#endif
109109
Array = MSGW3DNEWARRAY(Msg) T[Count];

‎Core/Libraries/Source/debug/debug.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
#endif
9090

9191
// Define which libraries to use.
92-
#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) || defined(RTS_PROFILE)
92+
#if defined(RTS_DEBUG) || defined(RTS_PROFILE)
9393
# define HAS_ASSERTS
9494
# define HAS_LOGS
9595
#endif

‎Core/Libraries/Source/debug/debug_macro.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
This module defines a number of macros. Usually only these macros should be
4646
used to access any debug functionality.
4747
48-
All these macros are defined if either RTS_DEBUG or RTS_INTERNAL is defined. Otherwise
48+
All these macros are defined if RTS_DEBUG is defined. Otherwise
4949
all of them (with the exception of DCHECK and DCHECK_MSG) will be removed.
5050
*/
5151
///@{
@@ -57,7 +57,7 @@
5757
returns false. The user will then have the choice of aborting the program,
5858
continuing once or continuing with completely ignoring that specific assertion.
5959
60-
Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined.
60+
Assertions are completely removed if RTS_DEBUG is not defined.
6161
6262
\param expr expression, trigger assert window if false
6363
*/
@@ -73,7 +73,7 @@
7373
\endcode
7474
For more information see the \ref debug_stream page.
7575
76-
Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined.
76+
Assertions are completely removed if RTS_DEBUG is not defined.
7777
7878
\param expr expression, trigger assert window if false
7979
\param msg custom message stream, see \ref debug_stream
@@ -282,7 +282,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
282282

283283
///@}
284284

285-
#elif defined(RTS_DEBUG) || defined(RTS_INTERNAL)
285+
#elif defined(RTS_DEBUG)
286286

287287
#define DASSERT(expr) \
288288
((void)( Debug::SkipNext() || \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class AsciiString
8989
// add a ctor/dtor, 'cuz they won't ever be called.
9090
struct AsciiStringData
9191
{
92-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
92+
#if defined(RTS_DEBUG)
9393
const char* m_debugptr; // just makes it easier to read in the debugger
9494
#endif
9595
unsigned short m_refCount; // reference count

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class AsciiString;
6464
//#define DISABLE_DEBUG_LOGGING
6565

6666
// by default, turn on ALLOW_DEBUG_UTILS if RTS_DEBUG is turned on.
67-
#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS)
67+
#if defined(RTS_DEBUG) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS)
6868
#define ALLOW_DEBUG_UTILS 1
6969
#elif defined(DEBUG_LOGGING) || defined(DEBUG_CRASHING) || defined(DEBUG_STACKTRACE) || defined(DEBUG_PROFILE)
7070
// TheSuperHackers @tweak also turn on when any of the above options is already set.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class DrawModule : public DrawableModule
7777
virtual void releaseShadows(void) = 0; ///< frees all shadow resources used by this module - used by Options screen.
7878
virtual void allocateShadows(void) = 0; ///< create shadow resources if not already present. Used by Options screen.
7979

80-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
80+
#if defined(RTS_DEBUG)
8181
virtual void getRenderCost(RenderCost & rc) const { }; ///< estimates the render cost of this draw module
8282
#endif
8383

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class AudioManager : public SubsystemInterface
136136
public:
137137
AudioManager();
138138
virtual ~AudioManager();
139-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
139+
#if defined(RTS_DEBUG)
140140
virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = NULL ) = 0;
141141
#endif
142142

@@ -375,7 +375,7 @@ class AudioManager : public SubsystemInterface
375375
// AudioManager that does nothing. Used for Headless Mode.
376376
class AudioManagerDummy : public AudioManager
377377
{
378-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
378+
#if defined(RTS_DEBUG)
379379
virtual void audioDebugDisplay(DebugDisplayInterface* dd, void* userData, FILE* fp) {}
380380
#endif
381381
virtual void stopAudio(AudioAffect which) {}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#include "Lib/BaseType.h"
5555

5656
// ----------------------------------------------------------------------------------------------
57-
#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
57+
#if defined(RTS_DEBUG)
5858
#define NO_DUMP_PERF_STATS
5959
#else
6060
#define NO_DUMP_PERF_STATS

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
#define DISABLE_MEMORYPOOL_CHECKPOINTING 1
5454
#endif
5555

56-
#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW)
56+
#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW)
5757
#define MEMORYPOOL_DEBUG_CUSTOM_NEW
5858
#endif
5959

60-
//#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
61-
#if (defined(RTS_DEBUG)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
60+
//#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
61+
#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
6262
#define MEMORYPOOL_DEBUG
6363
#endif
6464

0 commit comments

Comments
 (0)