Skip to content

Commit ad2caf7

Browse files
Caball009Caball009
committed
2 parents ad7f853 + 9527b54 commit ad2caf7

File tree

762 files changed

+1275
-4348
lines changed

Some content is hidden

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

762 files changed

+1275
-4348
lines changed

‎CMakePresets.json

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@
3434
"RTS_BUILD_OPTION_PROFILE": "ON"
3535
}
3636
},
37-
{
38-
"name": "vc6-internal",
39-
"displayName": "Windows 32bit VC6 Internal",
40-
"inherits": "vc6",
41-
"cacheVariables": {
42-
"RTS_BUILD_OPTION_INTERNAL": "ON"
43-
}
44-
},
4537
{
4638
"name": "vc6-debug",
4739
"displayName": "Windows 32bit VC6 Debug",
@@ -103,14 +95,6 @@
10395
"RTS_BUILD_OPTION_PROFILE": "ON"
10496
}
10597
},
106-
{
107-
"name": "win32-internal",
108-
"inherits": "win32",
109-
"displayName": "Windows 32bit Internal",
110-
"cacheVariables": {
111-
"RTS_BUILD_OPTION_INTERNAL": "ON"
112-
}
113-
},
11498
{
11599
"name": "win32-debug",
116100
"inherits": "win32",
@@ -145,14 +129,6 @@
145129
"RTS_BUILD_OPTION_PROFILE": "ON"
146130
}
147131
},
148-
{
149-
"name": "win32-vcpkg-internal",
150-
"inherits": "win32-vcpkg",
151-
"displayName": "Windows 32bit VCPKG Internal",
152-
"cacheVariables": {
153-
"RTS_BUILD_OPTION_INTERNAL": "ON"
154-
}
155-
},
156132
{
157133
"name": "win32-vcpkg-debug",
158134
"inherits": "win32-vcpkg",
@@ -175,12 +151,6 @@
175151
"displayName": "Build Windows 32bit VC6 Release",
176152
"description": "Build Windows 32bit VC6 Release"
177153
},
178-
{
179-
"name": "vc6-internal",
180-
"configurePreset": "vc6-internal",
181-
"displayName": "Build Windows 32bit VC6 Internal",
182-
"description": "Build Windows 32bit VC6 Internal"
183-
},
184154
{
185155
"name": "vc6-profile",
186156
"configurePreset": "vc6-profile",
@@ -200,13 +170,6 @@
200170
"description": "Build Windows 32bit Release",
201171
"configuration": "Release"
202172
},
203-
{
204-
"name": "win32-internal",
205-
"configurePreset": "win32-internal",
206-
"displayName": "Build Windows 32bit Internal",
207-
"description": "Build Windows 32bit Internal",
208-
"configuration": "Release"
209-
},
210173
{
211174
"name": "win32-profile",
212175
"configurePreset": "win32-profile",
@@ -228,13 +191,6 @@
228191
"description": "Build Windows 32bit VCPKG Release",
229192
"configuration": "Release"
230193
},
231-
{
232-
"name": "win32-vcpkg-internal",
233-
"configurePreset": "win32-vcpkg-internal",
234-
"displayName": "Build Windows 32bit VCPKG Internal",
235-
"description": "Build Windows 32bit VCPKG Internal",
236-
"configuration": "Release"
237-
},
238194
{
239195
"name": "win32-vcpkg-profile",
240196
"configurePreset": "win32-vcpkg-profile",
@@ -284,19 +240,6 @@
284240
}
285241
]
286242
},
287-
{
288-
"name": "vc6-internal",
289-
"steps": [
290-
{
291-
"type": "configure",
292-
"name": "vc6-internal"
293-
},
294-
{
295-
"type": "build",
296-
"name": "vc6-internal"
297-
}
298-
]
299-
},
300243
{
301244
"name": "vc6-profile",
302245
"steps": [
@@ -323,19 +266,6 @@
323266
}
324267
]
325268
},
326-
{
327-
"name": "win32-internal",
328-
"steps": [
329-
{
330-
"type": "configure",
331-
"name": "win32-internal"
332-
},
333-
{
334-
"type": "build",
335-
"name": "win32-internal"
336-
}
337-
]
338-
},
339269
{
340270
"name": "win32-profile",
341271
"steps": [
@@ -375,19 +305,6 @@
375305
}
376306
]
377307
},
378-
{
379-
"name": "win32-vcpkg-internal",
380-
"steps": [
381-
{
382-
"type": "configure",
383-
"name": "win32-vcpkg-internal"
384-
},
385-
{
386-
"type": "build",
387-
"name": "win32-vcpkg-internal"
388-
}
389-
]
390-
},
391308
{
392309
"name": "win32-vcpkg-profile",
393310
"steps": [

‎Core/GameEngine/Source/Common/System/Xfer.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@
3636
#include "Common/Xfer.h"
3737
#include "Common/BitFlagsIO.h"
3838

39-
#ifdef RTS_INTERNAL
40-
// for occasional debugging...
41-
//#pragma optimize("", off)
42-
//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
43-
#endif
4439

4540
//-------------------------------------------------------------------------------------------------
4641
//-------------------------------------------------------------------------------------------------

‎Core/Libraries/Source/Compression/CompressionManager.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
#include "EAC/huffcodex.h"
3333
#include "EAC/refcodex.h"
3434

35-
#ifdef RTS_INTERNAL
36-
// for occasional debugging...
37-
//#pragma optimize("", off)
38-
//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
39-
#endif
4035

4136
// TheSuperHackers @todo Recover debug logging in this file?
4237
#define DEBUG_LOG(x) {}

‎Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
#include "NoxCompress.h"
2727
#include "CompLibHeader/lzhl.h"
2828

29-
#ifdef RTS_INTERNAL
30-
// for occasional debugging...
31-
//#pragma optimize("", off)
32-
//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
33-
#endif
3429

3530
#define BLOCKSIZE 500000
3631
#define NoxRead fread

‎Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@
4141
#include "wwmemlog.h"
4242
#include "dx8wrapper.h"
4343

44-
#ifdef RTS_INTERNAL
45-
// for occasional debugging...
46-
//#pragma optimize("", off)
47-
//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
48-
#endif
4944

5045
////////////////////////////////////////////////////////////////////////////////////
5146
// Local constants

‎Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@
9393
#include "intersec.h"
9494

9595

96-
#ifdef RTS_INTERNAL
97-
// for occasional debugging...
98-
//#pragma optimize("", off)
99-
//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
100-
#endif
10196

10297
// Definitions of static members:
10398
const float RenderObjClass::AT_MIN_LOD = FLT_MAX;

‎Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@
6060
#define SEGLINE_CHUNK_SIZE (128)
6161
#endif
6262

63-
#ifdef RTS_INTERNAL
64-
// for occasional debugging...
65-
//#pragma optimize("", off)
66-
//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
67-
#endif
6863

6964
#define MAX_SEGLINE_POINT_BUFFER_SIZE (1 + SEGLINE_CHUNK_SIZE)
7065
// This macro depends on the assumption that each line segment is two polys.

‎Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
#include "RANDOM.H"
3636
#include "v3_rnd.h"
3737

38-
#ifdef RTS_INTERNAL
39-
// for occasional debugging...
40-
// #pragma optimize("", off)
41-
// #pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
42-
#endif
4338

4439
/* We have chunking logic which handles N segments at a time. To simplify the subdivision logic,
4540
** we will ensure that N is a power of two and that N >= 2^MAX_STREAK_SUBDIV_LEVELS, so that the
@@ -1414,7 +1409,7 @@ VertexFormatXYZUV1 *StreakRendererClass::getVertexBuffer(unsigned int number)
14141409
m_vertexBufferSize = numberToAlloc;
14151410
}
14161411

1417-
#ifdef RTS_INTERNAL
1412+
#ifdef RTS_DEBUG
14181413
for (unsigned i = 0; i < number; ++i)
14191414
{
14201415
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/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];

0 commit comments

Comments
 (0)