mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Fix mixed indentation in Game.cpp and Game.h

Browse source 
This removes all indentation that suddenly switches in the middle of a
function. Most particularly egregious offenses are the ones made by the
person who has 2-wide tabs, but keeps tabbing up to make each
indentation level match up with the 4-wide spaces, so to them (and only
them) it will look just fine, but since by default tabstop is 8-wide,
their lines are pushed off all the way to the right.
This commit is contained in:
Misa 2020-04-02 13:01:55 -07:00 committed by Ethan Lee
parent 12d5433efc
commit 88c16cdae8
2 changed files with 278 additions and 278 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
desktop_version/src/Game.cpp
View file

@ -39,72 +39,72 @@ const char* BoolToString(bool _b)
bool GetButtonFromString(const char *pText, SDL_GameControllerButton *button) bool GetButtonFromString(const char *pText, SDL_GameControllerButton *button)
{ {
if ( *pText == '0' || if (*pText == '0' ||
*pText == 'a' || *pText == 'a' ||
*pText == 'A' ) *pText == 'A')
{ {
*button = SDL_CONTROLLER_BUTTON_A; *button = SDL_CONTROLLER_BUTTON_A;
return true; return true;
} }
if ( strcmp(pText, "1") == 0 || if (strcmp(pText, "1") == 0 ||
*pText == 'b' || *pText == 'b' ||
*pText == 'B' ) *pText == 'B')
{ {
*button = SDL_CONTROLLER_BUTTON_B; *button = SDL_CONTROLLER_BUTTON_B;
return true; return true;
} }
if ( *pText == '2' || if (*pText == '2' ||
*pText == 'x' || *pText == 'x' ||
*pText == 'X' ) *pText == 'X')
{ {
*button = SDL_CONTROLLER_BUTTON_X; *button = SDL_CONTROLLER_BUTTON_X;
return true; return true;
} }
if ( *pText == '3' || if (*pText == '3' ||
*pText == 'y' || *pText == 'y' ||
*pText == 'Y' ) *pText == 'Y')
{ {
*button = SDL_CONTROLLER_BUTTON_Y; *button = SDL_CONTROLLER_BUTTON_Y;
return true; return true;
} }
if ( *pText == '4' || if (*pText == '4' ||
strcasecmp(pText, "BACK") == 0 ) strcasecmp(pText, "BACK") == 0)
{ {
*button = SDL_CONTROLLER_BUTTON_BACK; *button = SDL_CONTROLLER_BUTTON_BACK;
return true; return true;
} }
if ( *pText == '5' || if (*pText == '5' ||
strcasecmp(pText, "GUIDE") == 0 ) strcasecmp(pText, "GUIDE") == 0)
{ {
*button = SDL_CONTROLLER_BUTTON_GUIDE; *button = SDL_CONTROLLER_BUTTON_GUIDE;
return true; return true;
} }
if ( *pText == '6' || if (*pText == '6' ||
strcasecmp(pText, "START") == 0 ) strcasecmp(pText, "START") == 0)
{ {
*button = SDL_CONTROLLER_BUTTON_START; *button = SDL_CONTROLLER_BUTTON_START;
return true; return true;
} }
if ( *pText == '7' || if (*pText == '7' ||
strcasecmp(pText, "LS") == 0 ) strcasecmp(pText, "LS") == 0)
{ {
*button = SDL_CONTROLLER_BUTTON_LEFTSTICK; *button = SDL_CONTROLLER_BUTTON_LEFTSTICK;
return true; return true;
} }
if ( *pText == '8' || if (*pText == '8' ||
strcasecmp(pText, "RS") == 0 ) strcasecmp(pText, "RS") == 0)
{ {
*button = SDL_CONTROLLER_BUTTON_RIGHTSTICK; *button = SDL_CONTROLLER_BUTTON_RIGHTSTICK;
return true; return true;
} }
if ( *pText == '9' || if (*pText == '9' ||
strcasecmp(pText, "LB") == 0 ) strcasecmp(pText, "LB") == 0)
{ {
*button = SDL_CONTROLLER_BUTTON_LEFTSHOULDER; *button = SDL_CONTROLLER_BUTTON_LEFTSHOULDER;
return true; return true;
} }
if ( strcmp(pText, "10") == 0 || if (strcmp(pText, "10") == 0 ||
strcasecmp(pText, "RB") == 0 ) strcasecmp(pText, "RB") == 0)
{ {
*button = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER; *button = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER;
return true; return true;
@ -6763,7 +6763,7 @@ void Game::createmenu( std::string t )
if (t == "mainmenu") if (t == "mainmenu")
{ {
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
menuoptions[0] = "player levels"; menuoptions[0] = "player levels";
menuoptionsactive[0] = true; menuoptionsactive[0] = true;
menuoptions[1] = "graphic options"; menuoptions[1] = "graphic options";
@ -6775,7 +6775,7 @@ void Game::createmenu( std::string t )
nummenuoptions = 4; nummenuoptions = 4;
menuxoff = -16; menuxoff = -16;
menuyoff = -10; menuyoff = -10;
#elif !defined(MAKEANDPLAY) #elif !defined(MAKEANDPLAY)
#if defined(NO_CUSTOM_LEVELS) #if defined(NO_CUSTOM_LEVELS)
menuoptions[0] = "start game"; menuoptions[0] = "start game";
menuoptionsactive[0] = true; menuoptionsactive[0] = true;
@ -6807,7 +6807,7 @@ void Game::createmenu( std::string t )
menuxoff = -16; menuxoff = -16;
menuyoff = -10; menuyoff = -10;
#endif #endif
#endif #endif
} }
#if !defined(NO_CUSTOM_LEVELS) #if !defined(NO_CUSTOM_LEVELS)
else if (t == "playerworlds") else if (t == "playerworlds")
@ -7069,7 +7069,7 @@ void Game::createmenu( std::string t )
} }
else if (t == "options") else if (t == "options")
{ {
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
menuoptions[0] = "accessibility options"; menuoptions[0] = "accessibility options";
menuoptionsactive[0] = true; menuoptionsactive[0] = true;
menuoptions[1] = "game pad options"; menuoptions[1] = "game pad options";
@ -7081,7 +7081,7 @@ void Game::createmenu( std::string t )
nummenuoptions = 4; nummenuoptions = 4;
menuxoff = -40; menuxoff = -40;
menuyoff = 0; menuyoff = 0;
#elif !defined(MAKEANDPLAY) #elif !defined(MAKEANDPLAY)
menuoptions[0] = "accessibility options"; menuoptions[0] = "accessibility options";
menuoptionsactive[0] = true; menuoptionsactive[0] = true;
menuoptions[1] = "unlock play modes"; menuoptions[1] = "unlock play modes";
@ -7096,7 +7096,7 @@ void Game::createmenu( std::string t )
nummenuoptions = 5; nummenuoptions = 5;
menuxoff = -40; menuxoff = -40;
menuyoff = 0; menuyoff = 0;
#endif #endif
} }
else if (t == "accessibility") else if (t == "accessibility")
{ {

4
desktop_version/src/Game.h
View file

@ -123,10 +123,10 @@ public:
bool infocus; bool infocus;
bool muted; bool muted;
int mutebutton; int mutebutton;
private: private:
float m_globalVol; float m_globalVol;
public: public:
int tapleft, tapright; int tapleft, tapright;