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
}

‎src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp

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

227227
CHECK_OR_EXIT (
228228
!FAILED(_hr),
229-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
229+
"Your video card doesn't meet game requirements.\n\nTry to lower game settings."
230230
);
231231

232232
return _vs;
@@ -316,7 +316,7 @@ SPS* CResourceManager::_CreatePS (LPCSTR _name)
316316

317317
CHECK_OR_EXIT(
318318
!FAILED(_hr),
319-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
319+
"Your video card doesn't meet game requirements.\n\nTry to lower game settings."
320320
);
321321

322322
return _ps;
@@ -389,7 +389,7 @@ SGS* CResourceManager::_CreateGS (LPCSTR name)
389389

390390
CHECK_OR_EXIT (
391391
!FAILED(_hr),
392-
make_string("Your video card doesn't meet game requirements.\n\nTry to lower game settings.")
392+
"Your video card doesn't meet game requirements.\n\nTry to lower game settings."
393393
);
394394

395395
return _gs;

‎src/Layers/xrRenderPC_R4/CSCompiler.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,5 @@ void CSCompiler::compile(const char* name)
203203

204204
VERIFY(SUCCEEDED(_hr));
205205

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

‎src/editors/ShaderEditor/GameMtlLib_Editor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#pragma hdrstop
44

55
#include "xrEngine/GameMtlLib.h"
6-
#include "xr_trims.h"
6+
#include "xrCore/xr_trims.h"
77
#include "xrServerEntities/PropertiesListTypes.h"
88
#include "xrServerEntities/PropertiesListHelper.h"
99
#include "editors/xrEProps/FolderLib.h"

‎src/utils/ETools/Intersect.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,22 @@ IC static bool clip(float fDenom, float fNumer, float& rfT0, float& rfT1, bool&
5252
return fNumer <= 0.0f;
5353
}
5454
}
55-
IC static bool clip(float fDenom, float fNumer, float& rfT0, float& rfT1, box_axis& ax0, box_axis& ax1, box_axis ax)
55+
56+
IC static bool clip(float fDenom, float fNumer, float& rfT0, float& rfT1, box_axis& ax0, box_axis& ax1, box_axis ax_)
5657
{
5758
bool b0 = false, b1 = false;
5859
if (!clip(fDenom, fNumer, rfT0, rfT1, b0, b1))
5960
return false;
6061

6162
if (b0)
62-
ax0 = ax;
63+
ax0 = ax_;
6364

6465
if (b1)
65-
ax1 = ax;
66+
ax1 = ax_;
6667

6768
return true;
6869
}
70+
6971
static bool intersect(const Fvector& start, const Fvector& dir, const Fvector& extent, float& rfT0, float& rfT1,
7072
box_axis& ax0, box_axis& ax1)
7173
{
@@ -95,7 +97,7 @@ bool intersect(const Fobb& box, const Fvector& origin, const Fvector& direction,
9597
float fT0 = 0.0f, fT1 = type_max<float>;
9698
box_axis ax0 = a_none;
9799
box_axis ax1 = a_none;
98-
box_axis ax = a_none;
100+
box_axis ax_ = a_none;
99101
if (intersect(kOrigin, kDirection, box.m_halfsize, fT0, fT1, ax0, ax1))
100102
{
101103
bool bPick = false;
@@ -105,14 +107,14 @@ bool intersect(const Fobb& box, const Fvector& origin, const Fvector& direction,
105107
if (fT0 < dist)
106108
{
107109
dist = fT0;
108-
ax = ax0;
110+
ax_ = ax0;
109111
bPick = true;
110112
}
111113

112114
if (fT1 < dist)
113115
{
114116
dist = fT1;
115-
ax = ax1;
117+
ax_ = ax1;
116118
bPick = true;
117119
}
118120
}
@@ -121,14 +123,14 @@ bool intersect(const Fobb& box, const Fvector& origin, const Fvector& direction,
121123
if (fT1 < dist)
122124
{
123125
dist = fT1;
124-
ax = ax1;
126+
ax_ = ax1;
125127
bPick = true;
126128
}
127129
}
128130

129131
if (bPick)
130132
{
131-
switch (ax)
133+
switch (ax_)
132134
{
133135
case a_px: norm.set(box.m_rotate.i); break;
134136
case a_nx: norm.invert(box.m_rotate.i); break;

‎src/utils/xrAI/xr_graph_merge.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "spawn_constructor_space.h"
1515
#include "guid_generator.h"
1616
#include "game_graph_builder.h"
17+
#include "xrServerEntities/xrMessages.h"
1718
#include <direct.h>
1819

1920
extern LPCSTR GAME_CONFIG;

‎src/utils/xrMiscMath/matrix.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#include "pch.hpp"
2+
3+
#include <limits>
4+
25
#include "xrCore/_matrix.h"
36
#include "xrCore/_quaternion.h"
47
#include "xrCore/xrDebug_macros.h"

‎src/utils/xrMiscMath/vector3d_ext.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "pch.hpp"
22
#include "xrCore/_vector3d_ext.h"
3+
#include "xrCommon/math_funcs_inline.h"
34

45
float dotproduct(const Fvector& v1, const Fvector& v2)
56
{

‎src/xrAICore/Navigation/game_graph_script.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ using namespace luabind;
1616
using namespace luabind::policy;
1717

1818
const CGameGraph* get_game_graph() { return &GEnv.AISpace->game_graph(); }
19-
const CGameGraph::CHeader* get_header(const CGameGraph* self) { return (&self->header()); }
20-
bool get_accessible1(const CGameGraph* self, const u32& vertex_id) { return (self->accessible(vertex_id)); }
21-
void get_accessible2(const CGameGraph* self, const u32& vertex_id, bool value) { self->accessible(vertex_id, value); }
19+
const CGameGraph::CHeader* get_header(const CGameGraph* self_) { return (&self_->header()); }
20+
bool get_accessible1(const CGameGraph* self_, const u32& vertex_id) { return (self_->accessible(vertex_id)); }
21+
void get_accessible2(const CGameGraph* self_, const u32& vertex_id, bool value) { self_->accessible(vertex_id, value); }
2222
Fvector CVertex__level_point(const CGameGraph::CVertex* vertex)
2323
{
2424
THROW(vertex);

‎src/xrAICore/Navigation/graph_abstract.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "xrAICore/Navigation/graph_vertex.h"
1212
#include "xrAICore/Navigation/graph_edge.h"
1313
#include "Common/object_broker.h"
14+
#include "xrCommon/xr_map.h"
1415

1516
template <typename _data_type = Loki::EmptyType, typename _edge_weight_type = float, typename _vertex_id_type = u32,
1617
typename _edge_data_type = Loki::EmptyType>

‎src/xrAICore/Navigation/graph_abstract_inline.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
// Author : Dmitriy Iassenev
66
// Description : Graph class template inline functions
77
////////////////////////////////////////////////////////////////////////////
8-
98
#pragma once
109

10+
#include "xrCore/xrDebug_macros.h"
11+
1112
#define TEMPLATE_SPECIALIZATION \
1213
template <typename _data_type, typename _edge_weight_type, typename _vertex_id_type, typename _edge_data_type\
1314
>

‎src/xrAICore/Navigation/graph_vertex.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#pragma once
1010

1111
#include "Common/object_broker.h"
12+
#include "xrCommon/xr_vector.h"
1213

1314
template <typename _data_type, typename _vertex_id_type, typename _graph_type>
1415
class CVertex

‎src/xrAICore/Navigation/graph_vertex_inline.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
// Author : Dmitriy Iassenev
66
// Description : Graph vertex base class template inline functions
77
////////////////////////////////////////////////////////////////////////////
8-
98
#pragma once
109

10+
#include "xrCore/xrDebug_macros.h"
11+
1112
#define TEMPLATE_SPECIALIZATION \
1213
template <typename _data_type, typename _vertex_id_type, typename _graph_type\
1314
>

‎src/xrCDB/xrCDB.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "xrCore/Threading/Lock.hpp" // XXX: Remove from header. Put in .cpp.
44
#include "Common/Noncopyable.hpp"
5+
#include "xrCore/math_constants.h"
56

67
// forward declarations
78
class CFrustum;

‎src/xrCore/ChooseTypes.H

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
#ifndef ChooseTypesH
2-
#define ChooseTypesH
1+
#pragma once
2+
#include "xrCore/fastdelegate.h"
3+
#include "xrCommon/xr_vector.h"
4+
5+
// fwd. decl.
6+
template <class T>
7+
struct _rect;
8+
using Irect = _rect<int>;
9+
310

411
enum EChooseMode
512
{
@@ -84,5 +91,3 @@ struct SChooseEvents
8491
};
8592

8693
#define NONE_CAPTION "<none>"
87-
88-
#endif

‎src/xrCore/FixedVector.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
2-
#ifndef FixedVectorH
3-
#define FixedVectorH
2+
#include "xrCore/_types.h"
43

54
// deprecated, use xr_array instead
65
template <class T, std::size_t dim>
@@ -114,4 +113,3 @@ class svector
114113
return true;
115114
}
116115
};
117-
#endif

0 commit comments

Comments
 (0)