commit 9c7fa9a1
Run astyle
Changed files
| M | source/code/DialogBox.cpp before |
| M | source/code/ScoresDisplay.cpp before |
| M | source/code/main.cpp before |
| M | source/code/menudef.cpp before |
diff --git a/source/code/DialogBox.cpp b/source/code/DialogBox.cpp
index ca13cfd..f08f348 100644
--- a/source/code/DialogBox.cpp
+++ b/source/code/DialogBox.cpp
@@ -211,7 +211,7 @@ static bool isGamePadREvent(const SDL_Event& event) {
}
-void DialogBox::virtualKeyboardWriteSelectedChar(ReadKeyboard *rk, const std::string& insertChar) const {
+void DialogBox::virtualKeyboardWriteSelectedChar(ReadKeyboard* rk, const std::string& insertChar) const {
if (insertChar == virtualKeyboard.backspace) {
rk->emulateBackspace();
}
diff --git a/source/code/ScoresDisplay.cpp b/source/code/ScoresDisplay.cpp
index 99d21e9..3de3bb7 100644
--- a/source/code/ScoresDisplay.cpp
+++ b/source/code/ScoresDisplay.cpp
@@ -70,20 +70,20 @@ void ScoresDisplay::DrawHighscores(int x, int y, bool endless, int level = 0) {
if (endless) {
std::string header;
switch (level) {
- case 1:
- header = _("Endless (Fast):");
- break;
- case 2:
- header = _("Endless (Faster):");
- break;
- case 3:
- header = _("Endless (Even faster):");
- break;
- case 4:
- header = _("Endless (Fastest):");
- break;
- default:
- header = _("Endless:");
+ case 1:
+ header = _("Endless (Fast):");
+ break;
+ case 2:
+ header = _("Endless (Faster):");
+ break;
+ case 3:
+ header = _("Endless (Even faster):");
+ break;
+ case 4:
+ header = _("Endless (Fastest):");
+ break;
+ default:
+ header = _("Endless:");
};
Write(globalData.screen, x+100,y+100, header.c_str() );
}
@@ -93,21 +93,21 @@ void ScoresDisplay::DrawHighscores(int x, int y, bool endless, int level = 0) {
for (int i =0; i<10; i++) {
record r;
if (endless) {
- switch(level) {
- case 1:
- r = theTopScoresEndless1.getScoreNumber(i);
- break;
- case 2:
- r = theTopScoresEndless2.getScoreNumber(i);
- break;
- case 3:
- r = theTopScoresEndless3.getScoreNumber(i);
- break;
- case 4:
- r = theTopScoresEndless4.getScoreNumber(i);
- break;
- default:
- r = theTopScoresEndless0.getScoreNumber(i);
+ switch (level) {
+ case 1:
+ r = theTopScoresEndless1.getScoreNumber(i);
+ break;
+ case 2:
+ r = theTopScoresEndless2.getScoreNumber(i);
+ break;
+ case 3:
+ r = theTopScoresEndless3.getScoreNumber(i);
+ break;
+ case 4:
+ r = theTopScoresEndless4.getScoreNumber(i);
+ break;
+ default:
+ r = theTopScoresEndless0.getScoreNumber(i);
}
}
else {
@@ -195,21 +195,21 @@ bool ScoresDisplay::IsActive() {
void ScoresDisplay::Draw(SDL_Renderer*) {
switch (page) {
- case 0:
- case 1:
- case 2:
- case 3:
- case 4:
- //Highscores, endless
- DrawHighscores(100,100,true, page);
- break;
- case 5:
- //Highscores, Time Trial
- DrawHighscores(100,100,false);
- break;
- case 6:
- default:
- DrawStats();
+ case 0:
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ //Highscores, endless
+ DrawHighscores(100,100,true, page);
+ break;
+ case 5:
+ //Highscores, Time Trial
+ DrawHighscores(100,100,false);
+ break;
+ case 6:
+ default:
+ DrawStats();
};
const sago::SagoDataHolder* holder = &globalData.spriteHolder->GetDataHolder();
diff --git a/source/code/main.cpp b/source/code/main.cpp
index 86176a8..5f98c5e 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -1234,7 +1234,7 @@ int main(int argc, char* argv[]) {
configSettings->setString("player1name", globalData.player1name);
configSettings->setString("player2name", globalData.player2name);
- if (!globalData.bFullscreen){
+ if (!globalData.bFullscreen) {
//Store physical height of window
int height = 0;
SDL_GetWindowSize(sdlWindow, nullptr, &height);
diff --git a/source/code/menudef.cpp b/source/code/menudef.cpp
index 68670da..fcbd634 100644
--- a/source/code/menudef.cpp
+++ b/source/code/menudef.cpp
@@ -212,8 +212,8 @@ static void runTwoPlayerVs() {
static void SetAlwaysSoftwareLabel(Button* b) {
b->setLabel(Config::getInstance()->getInt("always-software")?
- _("Always use software render: On")
- : _("Always use software render: Off"));
+ _("Always use software render: On")
+ : _("Always use software render: Off"));
}
static void SetMusicLabel (Button* b) {
@@ -449,7 +449,9 @@ void SafeModeMenu() {
bOnce.setLabel(_("Use software renderer this time"));
bAlways.setLabel(_("Always use software renderer"));
bOnce.setPopOnRun(true);
- bAlways.setAction([]() {Config::getInstance()->setInt("always-software", 1); });
+ bAlways.setAction([]() {
+ Config::getInstance()->setInt("always-software", 1);
+ });
bAlways.setPopOnRun(true);
safeMode.addButton(&bOnce);
safeMode.addButton(&bAlways);