X Tutup
Skip to content

Commit 0334c6c

Browse files
Alayan-stk-2Alayan-stk-2
committed
Run the whitespace cleanup script
I noticed that some code files had tabs instead of 4 spaces. The cleanup tool also removes trailing white spaces at the end of lines, although that usually doesn't matter much.
1 parent 919f56c commit 0334c6c

File tree

300 files changed

+1816
-1816
lines changed

Some content is hidden

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

300 files changed

+1816
-1816
lines changed

‎src/achievements/achievement.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ int Achievement::computeFullfiledGoals(AchievementInfo::goalTree &progress, Achi
122122
}
123123
else if (progress.children.size() == 1 &&
124124
(progress.children[0].type == "AND" ||
125-
progress.children[0].type == "AND-AT-ONCE" ||
125+
progress.children[0].type == "AND-AT-ONCE" ||
126126
progress.children[0].type == "OR"))
127127
{
128128
return computeFullfiledGoals(progress.children[0], reference.children[0]);
@@ -202,7 +202,7 @@ int Achievement::computeGoalProgress(AchievementInfo::goalTree &progress, Achiev
202202
}
203203
else if (progress.children.size() == 1 &&
204204
(progress.children[0].type == "AND" ||
205-
progress.children[0].type == "AND-AT-ONCE" ||
205+
progress.children[0].type == "AND-AT-ONCE" ||
206206
progress.children[0].type == "OR"))
207207
{
208208
return computeGoalProgress(progress.children[0], reference.children[0]);

‎src/achievements/achievement.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Achievement
4545
bool m_achieved;
4646

4747
/* When quitting the game, the achievement info is deleted before
48-
* the achievement's status is saved. We need to store the id here
48+
* the achievement's status is saved. We need to store the id here
4949
* to prevent saving junk data.
5050
* FIXME: an achievement info should not be removed until all references
5151
* to it have been too.*/

‎src/achievements/achievement_info.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ int AchievementInfo::getRecursiveDepth(goalTree &parent)
171171
}
172172
else if (parent.children.size() == 1 &&
173173
(parent.children[0].type == "AND" ||
174-
parent.children[0].type == "AND-AT-ONCE" ||
174+
parent.children[0].type == "AND-AT-ONCE" ||
175175
parent.children[0].type == "OR"))
176176
{
177177
return getRecursiveDepth(parent.children[0]);
@@ -199,7 +199,7 @@ int AchievementInfo::recursiveGoalCount(goalTree &parent)
199199
}
200200
else if (parent.children.size() == 1 &&
201201
(parent.children[0].type == "AND" ||
202-
parent.children[0].type == "AND-AT-ONCE" ||
202+
parent.children[0].type == "AND-AT-ONCE" ||
203203
parent.children[0].type == "OR"))
204204
{
205205
return recursiveGoalCount(parent.children[0]);
@@ -226,7 +226,7 @@ int AchievementInfo::recursiveProgressCount(goalTree &parent)
226226
}
227227
else if (parent.children.size() == 1 &&
228228
(parent.children[0].type == "AND" ||
229-
parent.children[0].type == "AND-AT-ONCE" ||
229+
parent.children[0].type == "AND-AT-ONCE" ||
230230
parent.children[0].type == "OR"))
231231
{
232232
return recursiveGoalCount(parent.children[0]);

‎src/achievements/achievement_info.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class AchievementInfo
5454
std::string type;
5555
int value;
5656
operationType operation;
57-
std::vector<goalTree> children;
57+
std::vector<goalTree> children;
5858
};
5959

6060
private:

‎src/achievements/achievements_status.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void AchievementsStatus::load(const XMLNode * input)
209209
"than there should be. Discarding.");
210210
continue;
211211
}
212-
xml_achievement_data[i]->get("counter",&m_variables[i].counter);
212+
xml_achievement_data[i]->get("counter",&m_variables[i].counter);
213213
}
214214
// Load track usage data
215215
std::vector<XMLNode*> xml_achievement_tracks;

‎src/achievements/achievements_status.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public :
167167
TR_EGG_HUNT_FINISHED = 9,
168168

169169
TR_DATA_NUM = 10
170-
};
170+
};
171171

172172
private:
173173
// To keep track of track-specific data without hardcoding

‎src/addons/news_manager.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class NewsManager : public CanBeDeleted
6868
bool m_important;
6969

7070
public:
71-
NewsMessage(const core::stringw &m, int id, const std::string &date="",
71+
NewsMessage(const core::stringw &m, int id, const std::string &date="",
7272
const std::string &link="", bool important=false)
7373
{
7474
m_news = m;

‎src/audio/music_information.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ void MusicInformation::update(float dt)
286286
break;
287287
}
288288
case SOUND_NORMAL:
289-
if ( m_normal_music )
289+
if ( m_normal_music )
290290
m_normal_music->update();
291291
break;
292292
case SOUND_FAST:
293-
if ( m_fast_music )
293+
if ( m_fast_music )
294294
m_fast_music->update();
295295
break;
296296
} // switch

‎src/audio/music_information.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class MusicInformation : public NoCopy
8383
// static create function must be used.
8484
MusicInformation (const XMLNode *root, const std::string &filename);
8585

86-
// Declare the following functions private, but allow the SFXManager
86+
// Declare the following functions private, but allow the SFXManager
8787
// to access them. This makes sure that only the sfx thread calls
8888
// openal/vorbis etc, and so makes it is all thread safe.
8989
private:

‎src/audio/music_manager.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ MusicManager::MusicManager()
4949
if (UserConfigParams::m_enable_sound)
5050
{
5151
#if defined(__APPLE__) && !defined(NDEBUG)
52-
// HACK: On OSX, when OpenAL is initialized, breaking in a debugger
52+
// HACK: On OSX, when OpenAL is initialized, breaking in a debugger
5353
// causes my iTunes music to stop too, which is highly annoying ;) so in
5454
// debug mode, require a restart to enable sound
5555
if (UserConfigParams::m_sfx || UserConfigParams::m_music)
@@ -171,7 +171,7 @@ void MusicManager::startMusic()
171171
//-----------------------------------------------------------------------------
172172
/** Schedules the indicated music to be played next.
173173
* \param mi Music information of the music to be played.
174-
* \param start_right_now
174+
* \param start_right_now
175175
*/
176176
void MusicManager::startMusic(MusicInformation* mi, bool start_right_now)
177177
{
@@ -242,7 +242,7 @@ void MusicManager::switchToFastMusic()
242242
void MusicManager::setTemporaryVolume(float gain)
243243
{
244244
if (m_current_music.load() != NULL)
245-
SFXManager::get()->queue(SFXManager::SFX_MUSIC_SET_TMP_VOLUME,
245+
SFXManager::get()->queue(SFXManager::SFX_MUSIC_SET_TMP_VOLUME,
246246
m_current_music, gain);
247247
} // setTemporaryVolume
248248

0 commit comments

Comments
 (0)
X Tutup