Skip to content

Commit b6a741f

Browse files
committed
formatting
1 parent b145731 commit b6a741f

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Source/Entities/DynamicSong.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ConcreteClassInfo(DynamicSongSection, Entity, 50);
66
ConcreteClassInfo(DynamicSong, Entity, 50);
77

88
const std::unordered_map<std::string, DynamicSongSection::SoundContainerSelectionCycleMode> DynamicSongSection::c_SoundContainerSelectionCycleModeMap = {
9-
{"randomnorepeat", SoundContainerSelectionCycleMode::RANDOMNOREPEAT},
10-
{"shuffle", SoundContainerSelectionCycleMode::SHUFFLE}};
9+
{"randomnorepeat", SoundContainerSelectionCycleMode::RANDOMNOREPEAT},
10+
{"shuffle", SoundContainerSelectionCycleMode::SHUFFLE}};
1111

1212
DynamicSongSection::DynamicSongSection() {
1313
Clear();
@@ -26,11 +26,11 @@ void DynamicSongSection::Clear() {
2626
m_TransitionSoundContainers.clear();
2727
m_LastTransitionSoundContainerIndex = -1;
2828
m_TransitionShuffleUnplayedIndices.clear();
29-
29+
3030
m_SoundContainers.clear();
3131
m_LastSoundContainerIndex = -1;
3232
m_ShuffleUnplayedIndices.clear();
33-
33+
3434
m_SoundContainerSelectionCycleMode = RANDOMNOREPEAT;
3535
m_SectionType = "Default";
3636
}
@@ -44,7 +44,7 @@ int DynamicSongSection::Create(const DynamicSongSection& reference) {
4444
m_TransitionSoundContainers.push_back(soundContainer);
4545
}
4646
m_LastTransitionSoundContainerIndex = reference.m_LastTransitionSoundContainerIndex;
47-
47+
4848
for (const SoundContainer& referenceSoundContainer: reference.m_SoundContainers) {
4949
SoundContainer soundContainer;
5050
soundContainer.Create(referenceSoundContainer);
@@ -131,9 +131,9 @@ SoundContainer& DynamicSongSection::SelectTransitionSoundContainer() {
131131
if (m_TransitionSoundContainers.size() == 1) {
132132
return m_TransitionSoundContainers[0];
133133
}
134-
134+
135135
if (m_TransitionShuffleUnplayedIndices.empty()) {
136-
for(unsigned int i = 0; i < m_TransitionSoundContainers.size(); i++ ) {
136+
for (unsigned int i = 0; i < m_TransitionSoundContainers.size(); i++) {
137137
if (i != m_LastTransitionSoundContainerIndex) {
138138
m_TransitionShuffleUnplayedIndices.push_back(i);
139139
}
@@ -171,7 +171,7 @@ SoundContainer& DynamicSongSection::SelectSoundContainer() {
171171
}
172172

173173
if (m_ShuffleUnplayedIndices.empty()) {
174-
for(unsigned int i = 0; i < m_SoundContainers.size(); i++ ) {
174+
for (unsigned int i = 0; i < m_SoundContainers.size(); i++) {
175175
if (i != m_LastSoundContainerIndex) {
176176
m_ShuffleUnplayedIndices.push_back(i);
177177
}

Source/Entities/DynamicSong.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ namespace RTE {
8888
m_SoundContainerSelectionCycleMode = newSoundContainerSelectionCycleMode;
8989
m_LastTransitionSoundContainerIndex = -1;
9090
m_TransitionShuffleUnplayedIndices.clear();
91-
for(unsigned int i = 0; i < m_TransitionSoundContainers.size(); i++ ) {
91+
for (unsigned int i = 0; i < m_TransitionSoundContainers.size(); i++) {
9292
m_TransitionShuffleUnplayedIndices.push_back(i);
9393
}
9494
m_LastSoundContainerIndex = -1;
9595
m_ShuffleUnplayedIndices.clear();
96-
for(unsigned int i = 0; i < m_SoundContainers.size(); i++ ) {
96+
for (unsigned int i = 0; i < m_SoundContainers.size(); i++) {
9797
m_ShuffleUnplayedIndices.push_back(i);
9898
}
9999
}
@@ -126,7 +126,7 @@ namespace RTE {
126126
unsigned int m_LastSoundContainerIndex; //!< The last index used to select a SoundContainer.
127127
std::vector<unsigned int> m_ShuffleUnplayedIndices; //!< Indices left to play if in Shuffle mode.
128128

129-
SoundContainerSelectionCycleMode m_SoundContainerSelectionCycleMode; //!< The selection cycle mode to use when selecting the next SoundContainer.
129+
SoundContainerSelectionCycleMode m_SoundContainerSelectionCycleMode; //!< The selection cycle mode to use when selecting the next SoundContainer.
130130
std::string m_SectionType; //!< The name of the type of dynamic music this is.
131131

132132
/// Clears all the member variables of this DynamicSongSection, effectively resetting the members of this abstraction level only.

0 commit comments

Comments
 (0)