Skip to content

Commit 2b938ea

Browse files
author
nitrocaster
committed
Reformat the sources.
1 parent 3cc5410 commit 2b938ea

File tree

5,300 files changed

+197337
-175758
lines changed

Some content is hidden

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

5,300 files changed

+197337
-175758
lines changed

src/Common/Compiler.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#endif
88

99
#if defined(__GNUC__)
10-
#define XR_EXPORT __attribute__ ((visibility("default")))
11-
#define XR_IMPORT __attribute__ ((visibility("default")))
10+
#define XR_EXPORT __attribute__((visibility("default")))
11+
#define XR_IMPORT __attribute__((visibility("default")))
1212
#elif defined(_MSC_VER)
1313
#define XR_EXPORT __declspec(dllexport)
1414
#define XR_IMPORT __declspec(dllimport)

src/Common/GUID.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ class xrGUID
66
public:
77
u64 g[2];
88

9-
ICF bool operator==(const xrGUID& that) const { return g[0] == that.g[0] && g[1] == that.g[1]; }
9+
ICF bool operator==(const xrGUID& that) const
10+
{ return g[0]==that.g[0] && g[1]==that.g[1]; }
1011

11-
ICF bool operator!=(const xrGUID& that) const { return !(*this == that); }
12+
ICF bool operator!=(const xrGUID& that) const
13+
{ return !(*this==that); }
1214

1315
ICF void LoadLTX(CInifile& ini, const char* section, const char* name)
1416
{

src/Common/LevelGameDef.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ enum EWayType
2020
};
2121

2222
enum ERPpointType
23-
{ // [0..255]
23+
{ // [0..255]
2424
rptActorSpawn = 0,
2525
rptArtefactSpawn,
2626
rptItemSpawn,

src/Common/LevelStructure.hpp

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44

55
enum fsL_Chunks
66
{
7-
fsL_HEADER = 1, //*
8-
fsL_SHADERS = 2, //*
9-
fsL_VISUALS = 3, //*
10-
fsL_PORTALS = 4, //* - Portal polygons
11-
fsL_LIGHT_DYNAMIC = 6, //*
12-
fsL_GLOWS = 7, //* - All glows inside level
13-
fsL_SECTORS = 8, //* - All sectors on level
14-
fsL_VB = 9, //* - Static geometry
15-
fsL_IB = 10, //*
16-
fsL_SWIS = 11, //* - collapse info, usually for trees
7+
fsL_HEADER = 1, //*
8+
fsL_SHADERS = 2, //*
9+
fsL_VISUALS = 3, //*
10+
fsL_PORTALS = 4, //* - Portal polygons
11+
fsL_LIGHT_DYNAMIC = 6, //*
12+
fsL_GLOWS = 7, //* - All glows inside level
13+
fsL_SECTORS = 8, //* - All sectors on level
14+
fsL_VB = 9, //* - Static geometry
15+
fsL_IB = 10, //*
16+
fsL_SWIS = 11, //* - collapse info, usually for trees
1717
fsL_forcedword = 0xFFFFFFFF
1818
};
1919

2020
enum fsESectorChunks
2121
{
22-
fsP_Portals = 1, // - portal polygons
23-
fsP_Root = 2, // - geometry root
22+
fsP_Portals = 1, // - portal polygons
23+
fsP_Root = 2, // - geometry root
2424
fsP_forcedword = u32(-1)
2525
};
2626

2727
enum fsSLS_Chunks
2828
{
29-
fsSLS_Description = 1, // Name of level
29+
fsSLS_Description = 1, // Name of level
3030
fsSLS_ServerState = 2,
3131
fsSLS_forcedword = u32(-1)
3232
};
@@ -73,15 +73,12 @@ class NodePosition
7373
u8 data[5];
7474

7575
ICF void xz(u32 value) { CopyMemory(data, &value, 3); }
76-
7776
ICF void y(u16 value) { CopyMemory(data + 3, &value, 2); }
78-
7977
public:
8078
ICF u32 xz() const { return ((*((u32*)data)) & 0x00ffffff); }
8179
ICF u32 x(u32 row) const { return (xz() / row); }
8280
ICF u32 z(u32 row) const { return (xz() % row); }
8381
ICF u32 y() const { return (*((u16*)(data + 3))); }
84-
8582
friend class CLevelGraph;
8683
friend struct CNodePositionCompressor;
8784
friend struct CNodePositionConverter;
@@ -121,7 +118,6 @@ struct NodeCompressed
121118
}
122119

123120
ICF void light(u8 value) { data[10] |= value << 4; }
124-
125121
public:
126122
struct SCover
127123
{
@@ -209,7 +205,6 @@ struct NodeCompressed6
209205
}
210206

211207
ICF void light(u8 value) { data[10] |= value << 4; }
212-
213208
public:
214209
u16 cover0 : 4;
215210
u16 cover1 : 4;
@@ -234,7 +229,6 @@ struct NodeCompressed6
234229
}
235230

236231
ICF u8 light() const { return data[10] >> 4; }
237-
238232
ICF u16 cover(u8 index) const
239233
{
240234
switch (index)
@@ -253,7 +247,7 @@ struct NodeCompressed6
253247
friend class CLevelGraph;
254248
friend struct CNodeCompressed;
255249
friend class CNodeRenumberer;
256-
}; // 2+5+2+11 = 20b
250+
}; // 2+5+2+11 = 20b
257251
#endif
258252

259253
struct SNodePositionOld
@@ -270,8 +264,8 @@ typedef SNodePositionOld NodePosition;
270264

271265
const char LEVEL_GRAPH_NAME[] = "level.ai";
272266

273-
const u32 XRCL_CURRENT_VERSION = 18; // input
274-
const u32 XRCL_PRODUCTION_VERSION = 14; // output
267+
const u32 XRCL_CURRENT_VERSION = 18; // input
268+
const u32 XRCL_PRODUCTION_VERSION = 14; // output
275269
const u32 CFORM_CURRENT_VERSION = 4;
276270
const u32 MAX_NODE_BIT_COUNT = 23;
277271
const u32 XRAI_CURRENT_VERSION = 10;

0 commit comments

Comments
 (0)