mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 01:59:43 +01:00
Fix mixed indentation in main.cpp
Also fix the indentation of preprocessor statements.
This commit is contained in:
parent
e73966f2b7
commit
9a3a8bf2be
1 changed files with 105 additions and 105 deletions
|
@ -32,8 +32,8 @@
|
||||||
scriptclass script;
|
scriptclass script;
|
||||||
|
|
||||||
#if !defined(NO_CUSTOM_LEVELS)
|
#if !defined(NO_CUSTOM_LEVELS)
|
||||||
std::vector<edentities> edentity;
|
std::vector<edentities> edentity;
|
||||||
editorclass ed;
|
editorclass ed;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
UtilityClass help;
|
UtilityClass help;
|
||||||
|
@ -357,7 +357,7 @@ int main(int argc, char *argv[])
|
||||||
//Render
|
//Render
|
||||||
preloaderrender();
|
preloaderrender();
|
||||||
break;
|
break;
|
||||||
#if !defined(NO_CUSTOM_LEVELS)
|
#if !defined(NO_CUSTOM_LEVELS)
|
||||||
case EDITORMODE:
|
case EDITORMODE:
|
||||||
graphics.flipmode = false;
|
graphics.flipmode = false;
|
||||||
//Input
|
//Input
|
||||||
|
@ -367,7 +367,7 @@ int main(int argc, char *argv[])
|
||||||
////Logic
|
////Logic
|
||||||
editorlogic();
|
editorlogic();
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case TITLEMODE:
|
case TITLEMODE:
|
||||||
//Input
|
//Input
|
||||||
titleinput();
|
titleinput();
|
||||||
|
@ -502,11 +502,11 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
//Mute button
|
//Mute button
|
||||||
#if !defined(NO_CUSTOM_LEVELS)
|
#if !defined(NO_CUSTOM_LEVELS)
|
||||||
bool inEditor = ed.textentry || ed.scripthelppage == 1;
|
bool inEditor = ed.textentry || ed.scripthelppage == 1;
|
||||||
#else
|
#else
|
||||||
bool inEditor = false;
|
bool inEditor = false;
|
||||||
#endif
|
#endif
|
||||||
if (key.isDown(KEYBOARD_m) && game.mutebutton<=0 && !inEditor)
|
if (key.isDown(KEYBOARD_m) && game.mutebutton<=0 && !inEditor)
|
||||||
{
|
{
|
||||||
game.mutebutton = 8;
|
game.mutebutton = 8;
|
||||||
|
|
Loading…
Reference in a new issue