Skip to content

Commit f44e51e

Browse files
committed
Merge branch 'development' into impact-audio-improvements
2 parents 9938f60 + b2e15e7 commit f44e51e

File tree

9 files changed

+284
-248
lines changed

9 files changed

+284
-248
lines changed

.clang-format

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ ForEachMacros:
5050
- foreach
5151
- Q_FOREACH
5252
- BOOST_FOREACH
53-
StatementMacros:
54-
- SerializableClassNameGetter
55-
- SerializableOverrideMethods
56-
- ClassInfoGetters
5753
IncludeBlocks: Preserve
5854
IndentCaseLabels: true
5955
IndentGotoLabels: true
@@ -98,6 +94,10 @@ SpaceBeforeSquareBrackets: false
9894
#InsertNewlineAtEOF: true
9995
Standard: c++17
10096
StatementMacros:
97+
- SerializableClassNameGetter
98+
- SerializableOverrideMethods
99+
- ClassInfoGetters
100+
- EntityAllocation
101101
- Q_UNUSED
102102
- QT_REQUIRE_VERSION
103103
TabWidth: 4

Source/Entities/PieMenu.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ namespace RTE {
1818

1919
public:
2020
EntityAllocation(PieMenu)
21-
SerializableOverrideMethods
22-
ClassInfoGetters
21+
SerializableOverrideMethods
22+
ClassInfoGetters
2323

2424
#pragma region Creation
25-
/// Constructor method used to instantiate a PieMenu object in system memory. Create() should be called before using the object.
26-
PieMenu();
25+
/// Constructor method used to instantiate a PieMenu object in system memory. Create() should be called before using the object.
26+
PieMenu();
2727

2828
/// Makes the PieMenu object ready for use.
2929
/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.

Source/Entities/Scene.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ namespace RTE {
195195
// Concrete allocation and cloning definitions
196196
EntityAllocation(Scene)
197197

198-
/// Constructor method used to instantiate a Scene object in system
199-
/// memory. Create() should be called before using the object.
200-
Scene();
198+
/// Constructor method used to instantiate a Scene object in system
199+
/// memory. Create() should be called before using the object.
200+
Scene();
201201

202202
/// Destructor method used to clean up a Scene object before deletion
203203
/// from system memory.

Source/Entities/TerrainFrosting.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ namespace RTE {
1111

1212
public:
1313
SerializableClassNameGetter
14-
SerializableOverrideMethods
14+
SerializableOverrideMethods
1515

1616
#pragma region Creation
17-
/// Constructor method used to instantiate a TerrainFrosting object in system memory and make it ready for use.
18-
TerrainFrosting() {
17+
/// Constructor method used to instantiate a TerrainFrosting object in system memory and make it ready for use.
18+
TerrainFrosting() {
1919
Clear();
2020
}
2121
#pragma endregion

0 commit comments

Comments
 (0)