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 Input.cpp

Browse source 
There is a lot to be had for this one.
This commit is contained in:
Misa 2020-04-02 14:06:56 -07:00 committed by Ethan Lee
parent e56b0d9f39
commit dd8cf0f200
1 changed files with 444 additions and 444 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
desktop_version/src/Input.cpp
View file

@ -231,7 +231,7 @@ void titleinput()
if (game.currentmenuname == "mainmenu") if (game.currentmenuname == "mainmenu")
{ {
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
//Bring you to the normal playmenu //Bring you to the normal playmenu
@ -270,7 +270,7 @@ void titleinput()
graphics.fademode = 2; graphics.fademode = 2;
} }
} }
#elif !defined(MAKEANDPLAY) #elif !defined(MAKEANDPLAY)
#if defined(NO_CUSTOM_LEVELS) #if defined(NO_CUSTOM_LEVELS)
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
@ -390,8 +390,8 @@ void titleinput()
} }
#endif #endif
} }
#endif #endif
#if !defined(NO_CUSTOM_LEVELS) #if !defined(NO_CUSTOM_LEVELS)
else if(game.currentmenuname=="levellist") else if(game.currentmenuname=="levellist")
{ {
if(game.currentmenuoption==game.nummenuoptions-1){ if(game.currentmenuoption==game.nummenuoptions-1){
@ -429,7 +429,7 @@ void titleinput()
} }
} }
} }
#endif #endif
else if(game.currentmenuname=="quickloadlevel") else if(game.currentmenuname=="quickloadlevel")
{ {
if(game.currentmenuoption==0){//continue save if(game.currentmenuoption==0){//continue save
@ -445,7 +445,7 @@ void titleinput()
map.nexttowercolour(); map.nexttowercolour();
} }
} }
#if !defined(NO_CUSTOM_LEVELS) #if !defined(NO_CUSTOM_LEVELS)
else if(game.currentmenuname=="playerworlds") else if(game.currentmenuname=="playerworlds")
{ {
#if !defined(NO_EDITOR) #if !defined(NO_EDITOR)
@ -471,7 +471,7 @@ void titleinput()
//This code should: //This code should:
// - Minimise the game // - Minimise the game
// - Open the levels folder for whatever operating system we're on // - Open the levels folder for whatever operating system we're on
SDL_assert(0 && "Remove open level dir"); SDL_assert(0 && "Remove open level dir");
}*/else if(game.currentmenuoption==2){ }*/else if(game.currentmenuoption==2){
//back //back
@ -495,7 +495,7 @@ SDL_assert(0 && "Remove open level dir");
} }
#endif #endif
} }
#endif #endif
else if(game.currentmenuname=="errornostart"){ else if(game.currentmenuname=="errornostart"){
music.playef(11); music.playef(11);
game.createmenu("mainmenu"); game.createmenu("mainmenu");
@ -843,19 +843,19 @@ SDL_assert(0 && "Remove open level dir");
//Add extra menu for mmmmmm mod //Add extra menu for mmmmmm mod
if(music.mmmmmm){ if(music.mmmmmm){
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
game.menuoptions[3] = "soundtrack"; game.menuoptions[3] = "soundtrack";
game.menuoptionsactive[3] = true; game.menuoptionsactive[3] = true;
game.menuoptions[4] = "return"; game.menuoptions[4] = "return";
game.menuoptionsactive[4] = true; game.menuoptionsactive[4] = true;
game.nummenuoptions = 5; game.nummenuoptions = 5;
#elif !defined(MAKEANDPLAY) #elif !defined(MAKEANDPLAY)
game.menuoptions[4] = "soundtrack"; game.menuoptions[4] = "soundtrack";
game.menuoptionsactive[4] = true; game.menuoptionsactive[4] = true;
game.menuoptions[5] = "return"; game.menuoptions[5] = "return";
game.menuoptionsactive[5] = true; game.menuoptionsactive[5] = true;
game.nummenuoptions = 6; game.nummenuoptions = 6;
#endif #endif
} }
map.nexttowercolour(); map.nexttowercolour();
@ -869,7 +869,7 @@ SDL_assert(0 && "Remove open level dir");
else if (game.currentmenuname == "options") else if (game.currentmenuname == "options")
{ {
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
//accessibility options //accessibility options
@ -926,7 +926,7 @@ SDL_assert(0 && "Remove open level dir");
} }
} }
#elif !defined(MAKEANDPLAY) #elif !defined(MAKEANDPLAY)
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
//accessibility options //accessibility options
@ -988,7 +988,7 @@ SDL_assert(0 && "Remove open level dir");
map.nexttowercolour(); map.nexttowercolour();
} }
} }
#endif #endif
} }
else if (game.currentmenuname == "unlockmenutrials") else if (game.currentmenuname == "unlockmenutrials")
{ {
@ -1431,19 +1431,19 @@ SDL_assert(0 && "Remove open level dir");
//Add extra menu for mmmmmm mod //Add extra menu for mmmmmm mod
if(music.mmmmmm){ if(music.mmmmmm){
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
game.menuoptions[3] = "soundtrack"; game.menuoptions[3] = "soundtrack";
game.menuoptionsactive[3] = true; game.menuoptionsactive[3] = true;
game.menuoptions[4] = "return"; game.menuoptions[4] = "return";
game.menuoptionsactive[4] = true; game.menuoptionsactive[4] = true;
game.nummenuoptions = 5; game.nummenuoptions = 5;
#elif !defined(MAKEANDPLAY) #elif !defined(MAKEANDPLAY)
game.menuoptions[4] = "soundtrack"; game.menuoptions[4] = "soundtrack";
game.menuoptionsactive[4] = true; game.menuoptionsactive[4] = true;
game.menuoptions[5] = "return"; game.menuoptions[5] = "return";
game.menuoptionsactive[5] = true; game.menuoptionsactive[5] = true;
game.nummenuoptions = 6; game.nummenuoptions = 6;
#endif #endif
} }
} }
} }
@ -1457,19 +1457,19 @@ SDL_assert(0 && "Remove open level dir");
//Add extra menu for mmmmmm mod //Add extra menu for mmmmmm mod
if(music.mmmmmm){ if(music.mmmmmm){
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
game.menuoptions[3] = "soundtrack"; game.menuoptions[3] = "soundtrack";
game.menuoptionsactive[3] = true; game.menuoptionsactive[3] = true;
game.menuoptions[4] = "return"; game.menuoptions[4] = "return";
game.menuoptionsactive[4] = true; game.menuoptionsactive[4] = true;
game.nummenuoptions = 5; game.nummenuoptions = 5;
#elif !defined(MAKEANDPLAY) #elif !defined(MAKEANDPLAY)
game.menuoptions[4] = "soundtrack"; game.menuoptions[4] = "soundtrack";
game.menuoptionsactive[4] = true; game.menuoptionsactive[4] = true;
game.menuoptions[5] = "return"; game.menuoptions[5] = "return";
game.menuoptionsactive[5] = true; game.menuoptionsactive[5] = true;
game.nummenuoptions = 6; game.nummenuoptions = 6;
#endif #endif
} }
map.nexttowercolour(); map.nexttowercolour();
} }
@ -2400,13 +2400,13 @@ void mapinput()
if (game.roomx >= 102 && game.roomx <= 104 && game.roomy >= 110 && game.roomy <= 111) game.savearea = "The Ship"; if (game.roomx >= 102 && game.roomx <= 104 && game.roomy >= 110 && game.roomy <= 111) game.savearea = "The Ship";
#if !defined(NO_CUSTOM_LEVELS) #if !defined(NO_CUSTOM_LEVELS)
if(map.custommodeforreal) if(map.custommodeforreal)
{ {
game.customsavequick(ed.ListOfMetaData[game.playcustomlevel].filename); game.customsavequick(ed.ListOfMetaData[game.playcustomlevel].filename);
} }
else else
#endif #endif
{ {
game.savequick(); game.savequick();
} }