Skip to content

Commit 6393ae6

Browse files
tamlin-mikeXottab-DUTY
tamlin-mike
authored and
Xottab-DUTY
committed
More cleaning, compiler warnings etc.
Xottab_DUTY: Remove some include guards
1 parent 0c0834b commit 6393ae6

File tree

110 files changed

+313
-193
lines changed

Some content is hidden

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

110 files changed

+313
-193
lines changed

‎src/Common/object_cloner.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
////////////////////////////////////////////////////////////////////////////
88

99
#pragma once
10+
#include "xrCore/xrMemory.h" // xr_strdup
1011

1112
struct CCloner
1213
{

‎src/Common/object_comparer.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#pragma once
1010
#include "xrCore/FixedVector.h"
11+
#include "xrCore/xrstring.h"
12+
#include "xrCommon/xr_stack.h"
1113

1214
template <typename P>
1315
struct CComparer

‎src/Common/object_interfaces.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
////////////////////////////////////////////////////////////////////////////
88

99
#pragma once
10-
#include "xrCore/xrCore.h"
10+
#include "xrCore/_types.h"
11+
#include "xrCommon/inlining_macros.h"
1112

1213
class NET_Packet;
1314
class IReader;

‎src/Common/object_loader.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#pragma once
1010
#include <type_traits>
11+
#include "xrCore/xrstring.h"
12+
#include "xrCommon/xr_string.h"
1113

1214
template <class M, typename P>
1315
struct CLoader

‎src/Common/object_saver.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#pragma once
1010
#include <type_traits>
11+
#include "xrCore/xrstring.h"
12+
#include "xrCommon/xr_string.h"
1113

1214
template <class M, typename P>
1315
struct CSaver

‎src/Layers/xrRender/ModelPool.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ dxRender_Visual* CModelPool::Create(const char* name, IReader* data)
220220
string_path low_name;
221221
VERIFY(xr_strlen(name) < sizeof(low_name));
222222
xr_strcpy(low_name, name);
223-
xd_strlwr(low_name);
223+
xr_strlwr(low_name);
224224
if (strext(low_name))
225225
*strext(low_name) = 0;
226226
// Msg ("-CREATE %s",low_name);
@@ -266,7 +266,7 @@ dxRender_Visual* CModelPool::CreateChild(LPCSTR name, IReader* data)
266266
string256 low_name;
267267
VERIFY(xr_strlen(name) < 256);
268268
xr_strcpy(low_name, name);
269-
xd_strlwr(low_name);
269+
xr_strlwr(low_name);
270270
if (strext(low_name))
271271
*strext(low_name) = 0;
272272

‎src/Layers/xrRender/ResourceManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void CResourceManager::_ParseList(sh_list& dest, LPCSTR names)
121121
{
122122
// flush
123123
N.push_back(0);
124-
xd_strlwr(N.begin());
124+
xr_strlwr(N.begin());
125125

126126
fix_texture_name(N.begin());
127127
//. andy if (strext(N.begin())) *strext(N.begin())=0;
@@ -138,7 +138,7 @@ void CResourceManager::_ParseList(sh_list& dest, LPCSTR names)
138138
{
139139
// flush
140140
N.push_back(0);
141-
xd_strlwr(N.begin());
141+
xr_strlwr(N.begin());
142142

143143
fix_texture_name(N.begin());
144144
//. andy if (strext(N.begin())) *strext(N.begin())=0;

‎src/Layers/xrRender/ResourceManager_Resources.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
231231
FlushLog();
232232
}
233233

234-
CHECK_OR_EXIT(!FAILED(_hr),
235-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings."));
234+
CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
236235

237236
return _vs;
238237
}
@@ -325,8 +324,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
325324
FlushLog();
326325
}
327326

328-
CHECK_OR_EXIT(!FAILED(_hr),
329-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings."));
327+
CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
330328

331329
return _ps;
332330
}
@@ -887,8 +885,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
887885
_RELEASE(pErrorBuf);
888886
pConstants = NULL;
889887

890-
CHECK_OR_EXIT(!FAILED(_hr),
891-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings."));
888+
CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
892889

893890
return _vs;
894891
}
@@ -1016,8 +1013,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
10161013
_RELEASE(pErrorBuf);
10171014
pConstants = NULL;
10181015

1019-
CHECK_OR_EXIT(!FAILED(_hr),
1020-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings."));
1016+
CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
10211017

10221018
return _ps;
10231019
}

‎src/Layers/xrRender/ShaderResourceTraits.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ inline T* CResourceManager::CreateShader(const char* name)
128128

129129
VERIFY(SUCCEEDED(_hr));
130130

131-
CHECK_OR_EXIT(!FAILED(_hr),
132-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings."));
131+
CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
133132

134133
return sh;
135134
}

‎src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
202202

203203
VERIFY(SUCCEEDED(_hr));
204204

205-
CHECK_OR_EXIT(!FAILED(_hr),
206-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings."));
205+
CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
207206

208207
return _vs;
209208
}
@@ -337,8 +336,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR _name)
337336

338337
VERIFY(SUCCEEDED(_hr));
339338

340-
CHECK_OR_EXIT(!FAILED(_hr),
341-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings."));
339+
CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
342340

343341
return _ps;
344342
}
@@ -409,8 +407,7 @@ SGS* CResourceManager::_CreateGS(LPCSTR name)
409407

410408
FS.r_close(file);
411409

412-
CHECK_OR_EXIT(!FAILED(_hr),
413-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings."));
410+
CHECK_OR_EXIT(!FAILED(_hr), "Your video card doesn't meet game requirements.\n\nTry to lower game settings.");
414411

415412
return _gs;
416413
}

0 commit comments

Comments
 (0)