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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static const char *GeometryNames[] =
6767
#endif // end DEFINE_GEOMETRY_NAMES
6868

6969
//-------------------------------------------------------------------------------------------------
70-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
70+
#if defined(RTS_DEBUG)
7171
enum ExtentModType CPP_11(: Int)
7272
{
7373
EXTENTMOD_INVALID = 0,
@@ -188,7 +188,7 @@ class GeometryInfo : public Snapshot
188188
// given an object with this geom, SET how far above the object's canonical position its max z should extend.
189189
void setMaxHeightAbovePosition(Real z);
190190

191-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
191+
#if defined(RTS_DEBUG)
192192
void tweakExtents(ExtentModType extentModType, Real extentModAmount);
193193
AsciiString getDescriptiveString() const;
194194
#endif

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ class GameMessage : public MemoryPoolObject
236236
MSG_META_CHAT_EVERYONE, ///< send chat msg to everyone (incl. observers)
237237
MSG_META_DIPLOMACY, ///< bring up diplomacy screen
238238
MSG_META_OPTIONS, ///< bring up options screen
239-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
239+
#if defined(RTS_DEBUG)
240240
MSG_META_HELP, ///< bring up help screen
241241
#endif
242242

@@ -274,7 +274,7 @@ class GameMessage : public MemoryPoolObject
274274

275275
// META items that are really for debug/demo/development use only...
276276
// They do not get built into RELEASE builds.
277-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
277+
#if defined(RTS_DEBUG)
278278
MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS, ///< Toggles showing units behind buildings or not
279279
MSG_META_DEMO_TOGGLE_LETTERBOX, ///< enable/disable letterbox mode
280280
MSG_META_DEMO_TOGGLE_MESSAGE_TEXT, ///< toggle the text from the UI messages
@@ -388,11 +388,11 @@ class GameMessage : public MemoryPoolObject
388388
MSG_META_DEBUG_WIN, ///< Instant Win
389389
MSG_META_DEMO_TOGGLE_DEBUG_STATS, ///< show/hide the debug stats
390390
/// @todo END section to REMOVE (not disable) for release
391-
#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
391+
#endif // defined(RTS_DEBUG)
392392

393-
#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
393+
#if defined(RTS_DEBUG)
394394
MSG_META_DEMO_TOGGLE_AUDIODEBUG, ///< show/hide the audio debug info
395-
#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG)
395+
#endif//defined(RTS_DEBUG)
396396
#ifdef DUMP_PERF_STATS
397397
MSG_META_DEMO_PERFORM_STATISTICAL_DUMP, ///< dump performance stats for this frame to StatisticsDump.txt
398398
#endif//DUMP_PERF_STATS
@@ -565,7 +565,7 @@ class GameMessage : public MemoryPoolObject
565565

566566
MSG_BEGIN_DEBUG_NETWORK_MESSAGES = 1900, ///< network messages that exist only in debug/internal builds. all grouped separately.
567567

568-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
568+
#if defined(RTS_DEBUG)
569569
// all debug/internal-only messages must go here.
570570
MSG_DEBUG_KILL_SELECTION,
571571
MSG_DEBUG_HURT_OBJECT,

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

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

3434
#include "Utility/intrin_compat.h"
3535

36-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
36+
#if defined(RTS_DEBUG)
3737
/*
3838
NOTE NOTE NOTE: never check this in with this enabled, since there is a nonzero time penalty
3939
for running in this mode. Only enable it for local builds for testing purposes! (srj)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ class Player : public Snapshot
307307
void onUpgradeCompleted( const UpgradeTemplate *upgradeTemplate ); ///< An upgrade just finished, do things like tell all objects to recheck UpgradeModules
308308
void onUpgradeRemoved(){} ///< An upgrade just got removed, this doesn't do anything now.
309309

310-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
310+
#if defined(RTS_DEBUG)
311311
/// Prereq disabling cheat key
312312
void toggleIgnorePrereqs(){ m_DEMO_ignorePrereqs = !m_DEMO_ignorePrereqs; }
313313
Bool ignoresPrereqs() const { return m_DEMO_ignorePrereqs; }
@@ -767,7 +767,7 @@ class Player : public Snapshot
767767
Real m_cashBountyPercent;
768768

769769
/// @todo REMOVE (not disable) these cheat keys
770-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
770+
#if defined(RTS_DEBUG)
771771
Bool m_DEMO_ignorePrereqs; ///< Can I ignore prereq checks?
772772
Bool m_DEMO_freeBuild; ///< Can I build everything for no money?
773773
Bool m_DEMO_instantBuild; ///< Can I build anything in one frame?

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class RecorderClass : public SubsystemInterface {
7878
UnsignedInt getPlaybackFrameCount() const { return m_playbackFrameCount; } ///< valid during playback only
7979
void stopPlayback(); ///< Stops playback. Its fine to call this even if not playing back a file.
8080
Bool simulateReplay(AsciiString filename);
81-
#if defined RTS_DEBUG || defined RTS_INTERNAL
81+
#if defined(RTS_DEBUG)
8282
Bool analyzeReplay( AsciiString filename );
8383
#endif
8484
Bool isPlaybackInProgress() const;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "Common/BitFlags.h"
3737
#include "Common/STLTypedefs.h"
3838

39-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
39+
#if defined(RTS_DEBUG)
4040
#define SPARSEMATCH_DEBUG
4141
#else
4242
#undef SPARSEMATCH_DEBUG

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define IG_DEBUG_STACKTRACE 1
3232
#endif
3333

34-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(IG_DEBUG_STACKTRACE)
34+
#if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE)
3535

3636
// Writes a stackdump (provide a callback : gets called per line)
3737
// If callback is NULL then will write using OuputDebugString

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ class StateMachine : public MemoryPoolObject, public Snapshot
325325
//
326326
StateReturnType internalSetState( StateID newStateID ); ///< for internal use only - change the current state of the machine
327327

328-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
328+
#if defined(RTS_DEBUG)
329329
UnsignedInt peekSleepTill() const { return m_sleepTill; }
330330
#endif
331331

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class Thing : public MemoryPoolObject
161161
// since ThingTemplates are shared between many, many Things, the Thing
162162
// should never be able to change it.
163163
OVERRIDE<ThingTemplate> m_template; ///< reference back to template database
164-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
164+
#if defined(RTS_DEBUG)
165165
AsciiString m_templateName;
166166
#endif
167167
/*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ class ModuleInfo
286286
return m_info.size();
287287
}
288288

289-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
289+
#if defined(RTS_DEBUG)
290290
Bool containsPartialName(const char* n) const
291291
{
292292
for (size_t i = 0; i < m_info.size(); i++)

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

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

‎Generals/Code/GameEngine/Include/GameClient/ControlBar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ class ControlBar : public SubsystemInterface
10071007
Int m_remainingRadarAttackGlowFrames;
10081008
GameWindow *m_radarAttackGlowWindow;
10091009

1010-
#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG )
1010+
#if defined(RTS_DEBUG)
10111011
UnsignedInt m_lastFrameMarkedDirty;
10121012
UnsignedInt m_consecutiveDirtyFrames;
10131013
#endif

‎Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class DebugDisplay : public DebugDisplayInterface
142142

143143
// displayers
144144

145-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
145+
#if defined(RTS_DEBUG)
146146
extern void AudioDebugDisplay( DebugDisplayInterface *debugDisplay, void *userData, FILE *fp );
147147
#endif
148148

‎Generals/Code/GameEngine/Include/GameClient/Display.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class Display : public SubsystemInterface
9292
virtual void setGamma(Real gamma, Real bright, Real contrast, Bool calibrate) {};
9393
virtual Bool testMinSpecRequirements(Bool *videoPassed, Bool *cpuPassed, Bool *memPassed,StaticGameLODLevel *idealVideoLevel=NULL, Real *cpuTime=NULL) {*videoPassed=*cpuPassed=*memPassed=true; return true;}
9494
virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) = 0;
95-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
95+
#if defined(RTS_DEBUG)
9696
virtual void dumpAssetUsage(const char* mapname) = 0;
9797
#endif
9898

@@ -163,7 +163,7 @@ class Display : public SubsystemInterface
163163
virtual void clearShroud() = 0; ///< empty the entire shroud
164164
virtual void setBorderShroudLevel(UnsignedByte level) = 0; ///<color that will appear in unused border terrain.
165165

166-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
166+
#if defined(RTS_DEBUG)
167167
virtual void dumpModelAssets(const char *path) = 0; ///< dump all used models/textures to a file.
168168
#endif
169169
virtual void preloadModelAssets( AsciiString model ) = 0; ///< preload model asset

‎Generals/Code/GameEngine/Include/GameClient/InGameUI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ friend class Drawable; // for selection/deselection transactions
573573
Real durationInSeconds,
574574
Real zRisePerSecond );
575575

576-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
576+
#if defined(RTS_DEBUG)
577577
virtual void DEBUG_addFloatingText(const AsciiString& text,const Coord3D * pos, Color color);
578578
#endif
579579

‎Generals/Code/GameEngine/Include/GameClient/Shadow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class Shadow
116116

117117
};
118118

119-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
119+
#if defined(RTS_DEBUG)
120120
virtual void getRenderCost(RenderCost & rc) const = 0;
121121
#endif
122122

‎Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ class PathfindLayer
409409
Bool connectsZones(PathfindZoneManager *zm, const LocomotorSet& locomotorSet,Int zone1, Int zone2);
410410
Bool isPointOnWall(ObjectID *wallPieces, Int numPieces, const Coord3D *pt);
411411

412-
#if defined RTS_DEBUG || defined RTS_INTERNAL
412+
#if defined(RTS_DEBUG)
413413
void doDebugIcons(void) ;
414414
#endif
415415
protected:
@@ -819,7 +819,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
819819

820820
void checkChangeLayers(PathfindCell *parentCell);
821821

822-
#if defined RTS_DEBUG || defined RTS_INTERNAL
822+
#if defined(RTS_DEBUG)
823823
void doDebugIcons(void) ;
824824
#endif
825825

‎Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ArmorTemplateSet
8484

8585
inline Int getConditionsYesCount() const { return 1; }
8686
inline const ArmorSetFlags& getNthConditionsYes(Int i) const { return m_types; }
87-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
87+
#if defined(RTS_DEBUG)
8888
inline AsciiString getDescription() const { return AsciiString("ArmorTemplateSet"); }
8989
#endif
9090

‎Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class DumbProjectileBehavior : public UpdateModule, public ProjectileUpdateInter
116116
WeaponBonusConditionFlags m_extraBonusFlags;
117117

118118
Bool calcFlightPath(Bool recalcNumSegments);
119-
#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
119+
#if defined(RTS_DEBUG)
120120
void displayFlightPath(); ///< Uses little debug icons in worldspace to show the path chosen when it is decided upon
121121
#endif
122122

0 commit comments

Comments
 (0)