mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-03 15:39:46 +01:00
Code Issues Releases Wiki Activity

Fix whitespace from eee98b0e07

Browse source 
eee98b0e07 introduced mixed indentation
and one trailing whitespace, which I've cleaned up.
This commit is contained in:
Misa 2021-04-09 08:53:55 -07:00 committed by Ethan Lee
parent 9e560e31cf
commit 8e4b904f57
4 changed files with 491 additions and 491 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
desktop_version/src/Game.cpp
View file

@ -5947,21 +5947,21 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option("ok"); option("ok");
menuyoff = -20; menuyoff = -20;
break; break;
case Menu::gameplayoptions: case Menu::gameplayoptions:
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)
if (ingame_titlemode && unlock[18]) if (ingame_titlemode && unlock[18])
#endif #endif
{ {
option("flip mode"); option("flip mode");
} }
option("toggle fps"); option("toggle fps");
option("speedrun options"); option("speedrun options");
option("advanced options"); option("advanced options");
option("clear data"); option("clear data");
option("return"); option("return");
menuyoff = -10; menuyoff = -10;
maxspacing = 15; maxspacing = 15;
break; break;
case Menu::graphicoptions: case Menu::graphicoptions:
option("toggle fullscreen"); option("toggle fullscreen");
option("scaling mode"); option("scaling mode");
@ -5971,7 +5971,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option("toggle vsync"); option("toggle vsync");
option("return"); option("return");
menuyoff = -10; menuyoff = -10;
maxspacing = 15; maxspacing = 15;
break; break;
case Menu::ed_settings: case Menu::ed_settings:
option("change description"); option("change description");
@ -6011,9 +6011,9 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
maxspacing = 15; maxspacing = 15;
break; break;
case Menu::options: case Menu::options:
option("gameplay"); option("gameplay");
option("graphics"); option("graphics");
option("game pad"); option("game pad");
option("accessibility"); option("accessibility");
//Add extra menu for mmmmmm mod //Add extra menu for mmmmmm mod
if(music.mmmmmm){ if(music.mmmmmm){
@ -6022,36 +6022,36 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option("return"); option("return");
menuyoff = 0; menuyoff = 0;
maxspacing = 15; maxspacing = 15;
break;
case Menu::speedrunneroptions:
option("glitchrunner mode");
option("input delay");
option("fake load screen");
option("return");
menuyoff = 0;
maxspacing = 15;
break; break;
case Menu::speedrunneroptions:
option("glitchrunner mode");
option("input delay");
option("fake load screen");
option("return");
menuyoff = 0;
maxspacing = 15;
break;
case Menu::advancedoptions: case Menu::advancedoptions:
option("toggle mouse"); option("toggle mouse");
option("unfocus pause"); option("unfocus pause");
option("room name background"); option("room name background");
option("return"); option("return");
menuyoff = 0; menuyoff = 0;
maxspacing = 15; maxspacing = 15;
break; break;
case Menu::accessibility: case Menu::accessibility:
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)
option("unlock play modes"); option("unlock play modes");
#endif #endif
option("invincibility", !ingame_titlemode || (!insecretlab && !intimetrial && !nodeathmode)); option("invincibility", !ingame_titlemode || (!insecretlab && !intimetrial && !nodeathmode));
option("slowdown", !ingame_titlemode || (!insecretlab && !intimetrial && !nodeathmode)); option("slowdown", !ingame_titlemode || (!insecretlab && !intimetrial && !nodeathmode));
option("animated backgrounds"); option("animated backgrounds");
option("screen effects"); option("screen effects");
option("text outline"); option("text outline");
option("return"); option("return");
menuyoff = 0; menuyoff = 0;
maxspacing = 15; maxspacing = 15;
break; break;
case Menu::controller: case Menu::controller:
option("analog stick sensitivity"); option("analog stick sensitivity");
@ -6061,7 +6061,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option("bind restart"); option("bind restart");
option("return"); option("return");
menuyoff = 0; menuyoff = 0;
maxspacing = 10; maxspacing = 10;
break; break;
case Menu::cleardatamenu: case Menu::cleardatamenu:
option("no! don't delete"); option("no! don't delete");

4
desktop_version/src/Game.h
View file

@ -41,8 +41,8 @@ namespace Menu
ed_music, ed_music,
ed_quit, ed_quit,
options, options,
gameplayoptions, gameplayoptions,
speedrunneroptions, speedrunneroptions,
advancedoptions, advancedoptions,
accessibility, accessibility,
controller, controller,

506
desktop_version/src/Input.cpp
View file

@ -255,11 +255,11 @@ static void menuactionpress(void)
break; break;
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)
case OFFSET+3: case OFFSET+3:
//Credits //Credits
music.playef(11); music.playef(11);
game.createmenu(Menu::credits); game.createmenu(Menu::credits);
map.nexttowercolour(); map.nexttowercolour();
break; break;
#else #else
#undef MPOFFSET #undef MPOFFSET
#define MPOFFSET -2 #define MPOFFSET -2
@ -525,35 +525,35 @@ static void menuactionpress(void)
break; break;
} }
break; break;
case Menu::speedrunneroptions: case Menu::speedrunneroptions:
switch (game.currentmenuoption) switch (game.currentmenuoption)
{ {
case 0: case 0:
// Glitchrunner mode // Glitchrunner mode
music.playef(11); music.playef(11);
game.glitchrunnermode = !game.glitchrunnermode; game.glitchrunnermode = !game.glitchrunnermode;
game.savestatsandsettings_menu(); game.savestatsandsettings_menu();
break; break;
case 1: case 1:
/* Input delay */ /* Input delay */
music.playef(11); music.playef(11);
game.inputdelay = !game.inputdelay; game.inputdelay = !game.inputdelay;
game.savestatsandsettings_menu(); game.savestatsandsettings_menu();
break; break;
case 2: case 2:
// toggle fake load screen // toggle fake load screen
game.skipfakeload = !game.skipfakeload; game.skipfakeload = !game.skipfakeload;
game.savestatsandsettings_menu(); game.savestatsandsettings_menu();
music.playef(11); music.playef(11);
break; break;
default: default:
//back //back
music.playef(11); music.playef(11);
game.returnmenu(); game.returnmenu();
map.nexttowercolour(); map.nexttowercolour();
break; break;
} }
break; break;
case Menu::advancedoptions: case Menu::advancedoptions:
switch (game.currentmenuoption) switch (game.currentmenuoption)
{ {
@ -591,163 +591,163 @@ static void menuactionpress(void)
} }
break; break;
case Menu::accessibility: case Menu::accessibility:
{ {
int accessibilityoffset = 0; int accessibilityoffset = 0;
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)
accessibilityoffset = 1; accessibilityoffset = 1;
if (game.currentmenuoption == 0) { if (game.currentmenuoption == 0) {
//unlock play options //unlock play options
music.playef(11); music.playef(11);
game.createmenu(Menu::unlockmenu); game.createmenu(Menu::unlockmenu);
map.nexttowercolour(); map.nexttowercolour();
} }
#endif #endif
if (game.currentmenuoption == accessibilityoffset + 0) { if (game.currentmenuoption == accessibilityoffset + 0) {
//invincibility //invincibility
if (!game.ingame_titlemode || (!game.insecretlab && !game.intimetrial && !game.nodeathmode)) if (!game.ingame_titlemode || (!game.insecretlab && !game.intimetrial && !game.nodeathmode))
{ {
if (!map.invincibility) if (!map.invincibility)
{ {
game.createmenu(Menu::setinvincibility); game.createmenu(Menu::setinvincibility);
map.nexttowercolour(); map.nexttowercolour();
} }
else else
{ {
map.invincibility = !map.invincibility; map.invincibility = !map.invincibility;
game.savestatsandsettings_menu(); game.savestatsandsettings_menu();
} }
music.playef(11); music.playef(11);
} }
else else
{ {
music.playef(2); music.playef(2);
map.invincibility = false; map.invincibility = false;
} }
} }
else if (game.currentmenuoption == accessibilityoffset + 1) { else if (game.currentmenuoption == accessibilityoffset + 1) {
//change game speed //change game speed
if (!game.ingame_titlemode || (!game.insecretlab && !game.intimetrial && !game.nodeathmode)) if (!game.ingame_titlemode || (!game.insecretlab && !game.intimetrial && !game.nodeathmode))
{ {
game.createmenu(Menu::setslowdown); game.createmenu(Menu::setslowdown);
map.nexttowercolour(); map.nexttowercolour();
music.playef(11); music.playef(11);
} }
else else
{ {
music.playef(2); music.playef(2);
game.slowdown = 30; game.slowdown = 30;
} }
} }
else if (game.currentmenuoption == accessibilityoffset + 2) { else if (game.currentmenuoption == accessibilityoffset + 2) {
//disable animated backgrounds //disable animated backgrounds
game.colourblindmode = !game.colourblindmode; game.colourblindmode = !game.colourblindmode;
game.savestatsandsettings_menu(); game.savestatsandsettings_menu();
graphics.towerbg.tdrawback = true; graphics.towerbg.tdrawback = true;
graphics.titlebg.tdrawback = true; graphics.titlebg.tdrawback = true;
music.playef(11); music.playef(11);
} }
else if (game.currentmenuoption == accessibilityoffset + 3) { else if (game.currentmenuoption == accessibilityoffset + 3) {
//disable screeneffects //disable screeneffects
game.noflashingmode = !game.noflashingmode; game.noflashingmode = !game.noflashingmode;
game.savestatsandsettings_menu(); game.savestatsandsettings_menu();
if (!game.noflashingmode) if (!game.noflashingmode)
{ {
music.playef(18); music.playef(18);
game.screenshake = 10; game.screenshake = 10;
game.flashlight = 5; game.flashlight = 5;
} }
else { else {
music.playef(11); music.playef(11);
} }
} }
else if (game.currentmenuoption == accessibilityoffset + 4) { else if (game.currentmenuoption == accessibilityoffset + 4) {
//disable text outline //disable text outline
graphics.notextoutline = !graphics.notextoutline; graphics.notextoutline = !graphics.notextoutline;
game.savestatsandsettings_menu(); game.savestatsandsettings_menu();
music.playef(11); music.playef(11);
} }
else if (game.currentmenuoption == accessibilityoffset + 5) { else if (game.currentmenuoption == accessibilityoffset + 5) {
//back //back
music.playef(11); music.playef(11);
game.returnmenu(); game.returnmenu();
map.nexttowercolour(); map.nexttowercolour();
} }
break; break;
} }
case Menu::gameplayoptions: case Menu::gameplayoptions:
{ {
int gameplayoptionsoffset = 0; int gameplayoptionsoffset = 0;
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)
if (game.ingame_titlemode && game.unlock[18]) if (game.ingame_titlemode && game.unlock[18])
#endif #endif
{ {
gameplayoptionsoffset = 1; gameplayoptionsoffset = 1;
if (game.currentmenuoption == 0) { if (game.currentmenuoption == 0) {
toggleflipmode(); toggleflipmode();
// Fix wrong area music in Tower (Positive Force vs. ecroF evitisoP) // Fix wrong area music in Tower (Positive Force vs. ecroF evitisoP)
if (map.custommode) if (map.custommode)
{ {
break; break;
} }
int area = map.area(game.roomx, game.roomy); int area = map.area(game.roomx, game.roomy);
if (area == 3 || area == 11) if (area == 3 || area == 11)
{ {
if (graphics.setflipmode) if (graphics.setflipmode)
{ {
music.play(9); // ecroF evitisoP music.play(9); // ecroF evitisoP
} }
else else
{ {
music.play(2); // Positive Force music.play(2); // Positive Force
} }
} }
} }
} }
if (game.currentmenuoption == gameplayoptionsoffset + 0) if (game.currentmenuoption == gameplayoptionsoffset + 0)
{ {
//Toggle 30+ FPS //Toggle 30+ FPS
music.playef(11); music.playef(11);
game.over30mode = !game.over30mode; game.over30mode = !game.over30mode;
game.savestatsandsettings_menu(); game.savestatsandsettings_menu();
} }
else if (game.currentmenuoption == gameplayoptionsoffset + 1) else if (game.currentmenuoption == gameplayoptionsoffset + 1)
{ {
//Speedrunner options //Speedrunner options
music.playef(11); music.playef(11);
game.createmenu(Menu::speedrunneroptions); game.createmenu(Menu::speedrunneroptions);
map.nexttowercolour(); map.nexttowercolour();
} }
else if (game.currentmenuoption == gameplayoptionsoffset + 2) else if (game.currentmenuoption == gameplayoptionsoffset + 2)
{ {
//Advanced options //Advanced options
music.playef(11); music.playef(11);
game.createmenu(Menu::advancedoptions); game.createmenu(Menu::advancedoptions);
map.nexttowercolour(); map.nexttowercolour();
} }
else if (game.currentmenuoption == gameplayoptionsoffset + 3) else if (game.currentmenuoption == gameplayoptionsoffset + 3)
{ {
//Clear Data //Clear Data
music.playef(11); music.playef(11);
game.createmenu(Menu::cleardatamenu); game.createmenu(Menu::cleardatamenu);
map.nexttowercolour(); map.nexttowercolour();
} }
else if (game.currentmenuoption == gameplayoptionsoffset + 4) { else if (game.currentmenuoption == gameplayoptionsoffset + 4) {
//return to previous menu //return to previous menu
music.playef(11); music.playef(11);
if (game.ingame_titlemode) if (game.ingame_titlemode)
{ {
game.returntoingame(); game.returntoingame();
} }
else else
{ {
game.returnmenu(); game.returnmenu();
map.nexttowercolour(); map.nexttowercolour();
} }
} }
break; break;
} }
case Menu::options: case Menu::options:
{ {
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
@ -766,60 +766,60 @@ static void menuactionpress(void)
int offset = 0; int offset = 0;
switch (game.currentmenuoption) switch (game.currentmenuoption)
{ {
case 0: case 0:
//gameplay options //gameplay options
music.playef(11); music.playef(11);
game.createmenu(Menu::gameplayoptions); game.createmenu(Menu::gameplayoptions);
map.nexttowercolour(); map.nexttowercolour();
break; break;
case 1: case 1:
//graphic options //graphic options
music.playef(11); music.playef(11);
game.createmenu(Menu::graphicoptions); game.createmenu(Menu::graphicoptions);
map.nexttowercolour(); map.nexttowercolour();
break; break;
case 2: case 2:
//gamepad options //gamepad options
music.playef(11); music.playef(11);
game.createmenu(Menu::controller); game.createmenu(Menu::controller);
map.nexttowercolour(); map.nexttowercolour();
break; break;
case 3: case 3:
//accessibility options //accessibility options
music.playef(11); music.playef(11);
game.createmenu(Menu::accessibility); game.createmenu(Menu::accessibility);
map.nexttowercolour(); map.nexttowercolour();
break; break;
} }
if (game.currentmenuoption == 4 && music.mmmmmm) if (game.currentmenuoption == 4 && music.mmmmmm)
{ {
//**** TOGGLE MMMMMM //**** TOGGLE MMMMMM
music.usingmmmmmm = !music.usingmmmmmm; music.usingmmmmmm = !music.usingmmmmmm;
music.playef(11); music.playef(11);
if (music.currentsong > -1) if (music.currentsong > -1)
{ {
music.play(music.currentsong); music.play(music.currentsong);
} }
game.savestatsandsettings_menu(); game.savestatsandsettings_menu();
} }
if (game.currentmenuoption == 4 + (music.mmmmmm?1:0)) if (game.currentmenuoption == 4 + (music.mmmmmm?1:0))
{ {
//Last option here is "return" //Last option here is "return"
music.playef(11); music.playef(11);
if (game.ingame_titlemode) if (game.ingame_titlemode)
{ {
game.returntoingame(); game.returntoingame();
} }
else else
{ {
game.returnmenu(); game.returnmenu();
map.nexttowercolour(); map.nexttowercolour();
} }
} }
break; break;
} }
@ -2353,24 +2353,24 @@ static void mapmenuactionpress(void)
graphics.resumegamemode = true; graphics.resumegamemode = true;
break; break;
case 31: case 31:
// Graphic options and game options // Graphic options and game options
music.playef(11); music.playef(11);
game.gamestate = TITLEMODE; game.gamestate = TITLEMODE;
graphics.flipmode = false; graphics.flipmode = false;
game.ingame_titlemode = true; game.ingame_titlemode = true;
graphics.ingame_fademode = graphics.fademode; graphics.ingame_fademode = graphics.fademode;
graphics.fademode = 0; graphics.fademode = 0;
// Set this before we create the menu // Set this before we create the menu
game.kludge_ingametemp = game.currentmenuname; game.kludge_ingametemp = game.currentmenuname;
game.createmenu(Menu::options); game.createmenu(Menu::options);
map.nexttowercolour(); map.nexttowercolour();
break; break;
case 32: case 32:
// Go to quit prompt // Go to quit prompt
music.playef(11); music.playef(11);
game.menupage = 10; game.menupage = 10;
break; break;
} }
} }

406
desktop_version/src/Render.cpp
View file

@ -98,122 +98,122 @@ static void menurender(void)
} }
#endif #endif
case Menu::errornostart: case Menu::errornostart:
graphics.Print( -1, 65, "ERROR: This level has", tr, tg, tb, true); graphics.Print( -1, 65, "ERROR: This level has", tr, tg, tb, true);
graphics.Print( -1, 75, "no start point!", tr, tg, tb, true); graphics.Print( -1, 75, "no start point!", tr, tg, tb, true);
break; break;
case Menu::gameplayoptions: case Menu::gameplayoptions:
{ {
int gameplayoptionsoffset = 0; int gameplayoptionsoffset = 0;
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)
if (game.ingame_titlemode && game.unlock[18]) if (game.ingame_titlemode && game.unlock[18])
#endif #endif
{ {
gameplayoptionsoffset = 1; gameplayoptionsoffset = 1;
if (game.currentmenuoption == 0) { if (game.currentmenuoption == 0) {
graphics.bigprint(-1, 30, "Flip Mode", tr, tg, tb, true); graphics.bigprint(-1, 30, "Flip Mode", tr, tg, tb, true);
graphics.Print(-1, 65, "Flip the entire game vertically.", tr, tg, tb, true); graphics.Print(-1, 65, "Flip the entire game vertically.", tr, tg, tb, true);
if (graphics.setflipmode) if (graphics.setflipmode)
{ {
graphics.Print(-1, 85, "Currently ENABLED!", tr, tg, tb, true); graphics.Print(-1, 85, "Currently ENABLED!", tr, tg, tb, true);
} }
else else
{ {
graphics.Print(-1, 85, "Currently Disabled.", tr / 2, tg / 2, tb / 2, true); graphics.Print(-1, 85, "Currently Disabled.", tr / 2, tg / 2, tb / 2, true);
} }
} }
} }
if (game.currentmenuoption == gameplayoptionsoffset + 0) if (game.currentmenuoption == gameplayoptionsoffset + 0)
{ {
//Toggle FPS //Toggle FPS
graphics.bigprint(-1, 30, "Toggle 30+ FPS", tr, tg, tb, true); graphics.bigprint(-1, 30, "Toggle 30+ FPS", tr, tg, tb, true);
graphics.Print(-1, 65, "Change whether the game", tr, tg, tb, true); graphics.Print(-1, 65, "Change whether the game", tr, tg, tb, true);
graphics.Print(-1, 75, "runs at 30 or over 30 FPS.", tr, tg, tb, true); graphics.Print(-1, 75, "runs at 30 or over 30 FPS.", tr, tg, tb, true);
if (!game.over30mode) if (!game.over30mode)
{ {
graphics.Print(-1, 95, "Current mode: 30 FPS", tr / 2, tg / 2, tb / 2, true); graphics.Print(-1, 95, "Current mode: 30 FPS", tr / 2, tg / 2, tb / 2, true);
} }
else else
{ {
graphics.Print(-1, 95, "Current mode: Over 30 FPS", tr, tg, tb, true); graphics.Print(-1, 95, "Current mode: Over 30 FPS", tr, tg, tb, true);
} }
break; break;
} }
else if (game.currentmenuoption == gameplayoptionsoffset + 1) else if (game.currentmenuoption == gameplayoptionsoffset + 1)
{ {
//Speedrunner options //Speedrunner options
graphics.bigprint(-1, 30, "Speedrunner Options", tr, tg, tb, true); graphics.bigprint(-1, 30, "Speedrunner Options", tr, tg, tb, true);
graphics.Print(-1, 65, "Access some advanced settings that", tr, tg, tb, true); graphics.Print(-1, 65, "Access some advanced settings that", tr, tg, tb, true);
graphics.Print(-1, 75, "might be of interest to speedrunners", tr, tg, tb, true); graphics.Print(-1, 75, "might be of interest to speedrunners", tr, tg, tb, true);
} }
else if (game.currentmenuoption == gameplayoptionsoffset + 2) else if (game.currentmenuoption == gameplayoptionsoffset + 2)
{ {
//Advanced options //Advanced options
graphics.bigprint(-1, 30, "Advanced Options", tr, tg, tb, true); graphics.bigprint(-1, 30, "Advanced Options", tr, tg, tb, true);
graphics.Print(-1, 65, "All other settings", tr, tg, tb, true); graphics.Print(-1, 65, "All other settings", tr, tg, tb, true);
} }
else if (game.currentmenuoption == gameplayoptionsoffset + 3) else if (game.currentmenuoption == gameplayoptionsoffset + 3)
{ {
//Clear Data //Clear Data
graphics.bigprint(-1, 30, "Clear Data", tr, tg, tb, true); graphics.bigprint(-1, 30, "Clear Data", tr, tg, tb, true);
graphics.Print(-1, 65, "Delete your save data", tr, tg, tb, true); graphics.Print(-1, 65, "Delete your save data", tr, tg, tb, true);
graphics.Print(-1, 75, "and unlocked play modes", tr, tg, tb, true); graphics.Print(-1, 75, "and unlocked play modes", tr, tg, tb, true);
} }
break; break;
} }
case Menu::options: case Menu::options:
{ {
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
int flipmode_offset = 0; int flipmode_offset = 0;
#else #else
int flipmode_offset = game.ingame_titlemode && game.unlock[18] ? 0 : -1; int flipmode_offset = game.ingame_titlemode && game.unlock[18] ? 0 : -1;
#endif #endif
#if defined(MAKEANDPLAY) #if defined(MAKEANDPLAY)
int unlockmode_offset = -1; int unlockmode_offset = -1;
#else #else
int unlockmode_offset = 0; int unlockmode_offset = 0;
#endif #endif
int offset = 0; int offset = 0;
switch (game.currentmenuoption) switch (game.currentmenuoption)
{ {
case 0: case 0:
graphics.bigprint(-1, 30, "Gameplay Options", tr, tg, tb, true); graphics.bigprint(-1, 30, "Gameplay Options", tr, tg, tb, true);
graphics.Print(-1, 65, "Adjust various gameplay options", tr, tg, tb, true); graphics.Print(-1, 65, "Adjust various gameplay options", tr, tg, tb, true);
break; break;
case 1: case 1:
graphics.bigprint(-1, 30, "Graphics Options", tr, tg, tb, true); graphics.bigprint(-1, 30, "Graphics Options", tr, tg, tb, true);
graphics.Print(-1, 65, "Adjust screen settings", tr, tg, tb, true); graphics.Print(-1, 65, "Adjust screen settings", tr, tg, tb, true);
break; break;
case 2: case 2:
graphics.bigprint(-1, 30, "Game Pad Options", tr, tg, tb, true); graphics.bigprint(-1, 30, "Game Pad Options", tr, tg, tb, true);
graphics.Print(-1, 65, "Rebind your controller's buttons", tr, tg, tb, true); graphics.Print(-1, 65, "Rebind your controller's buttons", tr, tg, tb, true);
graphics.Print(-1, 75, "and adjust sensitivity", tr, tg, tb, true); graphics.Print(-1, 75, "and adjust sensitivity", tr, tg, tb, true);
break; break;
case 3: case 3:
graphics.bigprint(-1, 30, "Accessibility", tr, tg, tb, true); graphics.bigprint(-1, 30, "Accessibility", tr, tg, tb, true);
graphics.Print(-1, 65, "Disable screen effects, enable", tr, tg, tb, true); graphics.Print(-1, 65, "Disable screen effects, enable", tr, tg, tb, true);
graphics.Print(-1, 75, "slowdown modes or invincibility", tr, tg, tb, true); graphics.Print(-1, 75, "slowdown modes or invincibility", tr, tg, tb, true);
break; break;
} }
if (game.currentmenuoption == 4 && music.mmmmmm) if (game.currentmenuoption == 4 && music.mmmmmm)
{ {
graphics.bigprint(-1, 30, "Soundtrack", tr, tg, tb, true); graphics.bigprint(-1, 30, "Soundtrack", tr, tg, tb, true);
graphics.Print(-1, 65, "Toggle between MMMMMM and PPPPPP", tr, tg, tb, true); graphics.Print(-1, 65, "Toggle between MMMMMM and PPPPPP", tr, tg, tb, true);
if (music.usingmmmmmm) { if (music.usingmmmmmm) {
graphics.Print(-1, 85, "Current soundtrack: MMMMMM", tr, tg, tb, true); graphics.Print(-1, 85, "Current soundtrack: MMMMMM", tr, tg, tb, true);
} }
else { else {
graphics.Print(-1, 85, "Current soundtrack: PPPPPP", tr, tg, tb, true); graphics.Print(-1, 85, "Current soundtrack: PPPPPP", tr, tg, tb, true);
} }
} }
break; break;
} }
case Menu::graphicoptions: case Menu::graphicoptions:
switch (game.currentmenuoption) switch (game.currentmenuoption)
{ {
@ -475,44 +475,44 @@ static void menurender(void)
break; break;
case Menu::speedrunneroptions: case Menu::speedrunneroptions:
switch (game.currentmenuoption) switch (game.currentmenuoption)
{ {
case 0: case 0:
graphics.bigprint(-1, 30, "Glitchrunner Mode", tr, tg, tb, true); graphics.bigprint(-1, 30, "Glitchrunner Mode", tr, tg, tb, true);
graphics.Print(-1, 65, "Re-enable glitches that existed", tr, tg, tb, true); graphics.Print(-1, 65, "Re-enable glitches that existed", tr, tg, tb, true);
graphics.Print(-1, 75, "in previous versions of the game.", tr, tg, tb, true); graphics.Print(-1, 75, "in previous versions of the game.", tr, tg, tb, true);
if (game.glitchrunnermode) if (game.glitchrunnermode)
{ {
graphics.Print(-1, 95, "Glitchrunner mode is ON", tr, tg, tb, true); graphics.Print(-1, 95, "Glitchrunner mode is ON", tr, tg, tb, true);
} }
else else
{ {
graphics.Print(-1, 95, "Glitchrunner mode is OFF", tr / 2, tg / 2, tb / 2, true); graphics.Print(-1, 95, "Glitchrunner mode is OFF", tr / 2, tg / 2, tb / 2, true);
} }
break; break;
case 1: case 1:
graphics.bigprint(-1, 30, "Input Delay", tr, tg, tb, true); graphics.bigprint(-1, 30, "Input Delay", tr, tg, tb, true);
graphics.Print(-1, 65, "Re-enable the 1-frame input delay", tr, tg, tb, true); graphics.Print(-1, 65, "Re-enable the 1-frame input delay", tr, tg, tb, true);
graphics.Print(-1, 75, "from previous versions of the game.", tr, tg, tb, true); graphics.Print(-1, 75, "from previous versions of the game.", tr, tg, tb, true);
if (game.inputdelay) if (game.inputdelay)
{ {
graphics.Print(-1, 95, "Input delay is ON", tr, tg, tb, true); graphics.Print(-1, 95, "Input delay is ON", tr, tg, tb, true);
} }
else else
{ {
graphics.Print(-1, 95, "Input delay is OFF", tr / 2, tg / 2, tb / 2, true); graphics.Print(-1, 95, "Input delay is OFF", tr / 2, tg / 2, tb / 2, true);
} }
break; break;
case 2: case 2:
graphics.bigprint(-1, 30, "Fake Load Screen", tr, tg, tb, true); graphics.bigprint(-1, 30, "Fake Load Screen", tr, tg, tb, true);
if (game.skipfakeload) if (game.skipfakeload)
graphics.Print(-1, 65, "Fake loading screen is OFF", tr / 2, tg / 2, tb / 2, true); graphics.Print(-1, 65, "Fake loading screen is OFF", tr / 2, tg / 2, tb / 2, true);
else else
graphics.Print(-1, 65, "Fake loading screen is ON", tr, tg, tb, true); graphics.Print(-1, 65, "Fake loading screen is ON", tr, tg, tb, true);
break; break;
} }
break; break;
case Menu::advancedoptions: case Menu::advancedoptions:
switch (game.currentmenuoption) switch (game.currentmenuoption)
{ {
@ -552,71 +552,71 @@ static void menurender(void)
} }
break; break;
case Menu::accessibility: case Menu::accessibility:
{ {
int accessibilityoffset = 0; int accessibilityoffset = 0;
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)
accessibilityoffset = 1; accessibilityoffset = 1;
if (game.currentmenuoption == 0) { if (game.currentmenuoption == 0) {
graphics.bigprint(-1, 30, "Unlock Play Modes", tr, tg, tb, true); graphics.bigprint(-1, 30, "Unlock Play Modes", tr, tg, tb, true);
graphics.Print(-1, 65, "Unlock parts of the game normally", tr, tg, tb, true); graphics.Print(-1, 65, "Unlock parts of the game normally", tr, tg, tb, true);
graphics.Print(-1, 75, "unlocked as you progress", tr, tg, tb, true); graphics.Print(-1, 75, "unlocked as you progress", tr, tg, tb, true);
} }
#endif #endif
if (game.currentmenuoption == accessibilityoffset + 0) { if (game.currentmenuoption == accessibilityoffset + 0) {
graphics.bigprint(-1, 40, "Invincibility", tr, tg, tb, true); graphics.bigprint(-1, 40, "Invincibility", tr, tg, tb, true);
graphics.Print(-1, 75, "Explore the game freely without", tr, tg, tb, true); graphics.Print(-1, 75, "Explore the game freely without", tr, tg, tb, true);
graphics.Print(-1, 85, "dying. (Can cause glitches.)", tr, tg, tb, true); graphics.Print(-1, 85, "dying. (Can cause glitches.)", tr, tg, tb, true);
if (map.invincibility) if (map.invincibility)
{ {
graphics.Print(-1, 105, "Invincibility is ON.", tr, tg, tb, true); graphics.Print(-1, 105, "Invincibility is ON.", tr, tg, tb, true);
} }
else else
{ {
graphics.Print(-1, 105, "Invincibility is OFF.", tr / 2, tg / 2, tb / 2, true); graphics.Print(-1, 105, "Invincibility is OFF.", tr / 2, tg / 2, tb / 2, true);
} }
}else if (game.currentmenuoption == accessibilityoffset + 1) { }else if (game.currentmenuoption == accessibilityoffset + 1) {
graphics.bigprint(-1, 40, "Slowdown", tr, tg, tb, true); graphics.bigprint(-1, 40, "Slowdown", tr, tg, tb, true);
graphics.Print(-1, 75, "Reduce the game speed.", tr, tg, tb, true); graphics.Print(-1, 75, "Reduce the game speed.", tr, tg, tb, true);
drawslowdowntext(); drawslowdowntext();
} }
else if (game.currentmenuoption == accessibilityoffset + 2) { else if (game.currentmenuoption == accessibilityoffset + 2) {
graphics.bigprint(-1, 40, "Backgrounds", tr, tg, tb, true); graphics.bigprint(-1, 40, "Backgrounds", tr, tg, tb, true);
if (!game.colourblindmode) if (!game.colourblindmode)
{ {
graphics.Print(-1, 75, "Backgrounds are ON.", tr, tg, tb, true); graphics.Print(-1, 75, "Backgrounds are ON.", tr, tg, tb, true);
} }
else else
{ {
graphics.Print(-1, 75, "Backgrounds are OFF.", tr / 2, tg / 2, tb / 2, true); graphics.Print(-1, 75, "Backgrounds are OFF.", tr / 2, tg / 2, tb / 2, true);
} }
} }
else if (game.currentmenuoption == accessibilityoffset + 3) { else if (game.currentmenuoption == accessibilityoffset + 3) {
graphics.bigprint(-1, 40, "Screen Effects", tr, tg, tb, true); graphics.bigprint(-1, 40, "Screen Effects", tr, tg, tb, true);
graphics.Print(-1, 75, "Disables screen shakes and flashes.", tr, tg, tb, true); graphics.Print(-1, 75, "Disables screen shakes and flashes.", tr, tg, tb, true);
if (!game.noflashingmode) if (!game.noflashingmode)
{ {
graphics.Print(-1, 85, "Screen Effects are ON.", tr, tg, tb, true); graphics.Print(-1, 85, "Screen Effects are ON.", tr, tg, tb, true);
} }
else else
{ {
graphics.Print(-1, 85, "Screen Effects are OFF.", tr / 2, tg / 2, tb / 2, true); graphics.Print(-1, 85, "Screen Effects are OFF.", tr / 2, tg / 2, tb / 2, true);
} }
} }
else if (game.currentmenuoption == accessibilityoffset + 4) { else if (game.currentmenuoption == accessibilityoffset + 4) {
graphics.bigprint(-1, 40, "Text Outline", tr, tg, tb, true); graphics.bigprint(-1, 40, "Text Outline", tr, tg, tb, true);
graphics.Print(-1, 75, "Disables outline on game text.", tr, tg, tb, true); graphics.Print(-1, 75, "Disables outline on game text.", tr, tg, tb, true);
// FIXME: Maybe do an outlined print instead? -flibit // FIXME: Maybe do an outlined print instead? -flibit
if (!graphics.notextoutline) if (!graphics.notextoutline)
{ {
graphics.Print(-1, 85, "Text outlines are ON.", tr, tg, tb, true); graphics.Print(-1, 85, "Text outlines are ON.", tr, tg, tb, true);
} }
else else
{ {
graphics.Print(-1, 85, "Text outlines are OFF.", tr / 2, tg / 2, tb / 2, true); graphics.Print(-1, 85, "Text outlines are OFF.", tr / 2, tg / 2, tb / 2, true);
} }
} }
break; break;
} }
case Menu::playint1: case Menu::playint1:
case Menu::playint2: case Menu::playint2:
graphics.Print( -1, 65, "Who do you want to play", tr, tg, tb, true); graphics.Print( -1, 65, "Who do you want to play", tr, tg, tb, true);
@ -1830,8 +1830,8 @@ void maprender(void)
{ {
#define OPTION(opt, text) graphics.map_option(opt, 4, text, game.menupage - 30 == opt) #define OPTION(opt, text) graphics.map_option(opt, 4, text, game.menupage - 30 == opt)
OPTION(0, "return to game"); OPTION(0, "return to game");
OPTION(1, "options"); OPTION(1, "options");
OPTION(2, "quit to menu"); OPTION(2, "quit to menu");
#undef OPTION #undef OPTION
} }