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

Use macros to calculate accessibility offset

Browse source 
This means the offset is calculated at compile-time, and we can use a
proper case-switch here instead of an else-if chain.
This commit is contained in:
Misa 2021-04-09 09:00:52 -07:00 committed by Ethan Lee
parent b5f1cbb2d1
commit 0f0e218cf6
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
desktop_version/src/Render.cpp
View file

@ -537,16 +537,22 @@ static void menurender(void)
break; break;
case Menu::accessibility: case Menu::accessibility:
{ {
int accessibilityoffset = 0; #ifdef MAKEANDPLAY
#define OFFSET 0
#else
#define OFFSET 1
#endif
switch (game.currentmenuoption)
{
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)
accessibilityoffset = 1; case 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);
} break;
#endif #endif
if (game.currentmenuoption == accessibilityoffset + 0) { case OFFSET+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);
@ -558,12 +564,13 @@ static void menurender(void)
{ {
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) { break;
case OFFSET+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();
} break;
else if (game.currentmenuoption == accessibilityoffset + 2) { case OFFSET+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)
{ {
@ -573,8 +580,8 @@ static void menurender(void)
{ {
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);
} }
} break;
else if (game.currentmenuoption == accessibilityoffset + 3) { case OFFSET+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)
@ -585,8 +592,8 @@ static void menurender(void)
{ {
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);
} }
} break;
else if (game.currentmenuoption == accessibilityoffset + 4) { case OFFSET+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
@ -598,8 +605,11 @@ static void menurender(void)
{ {
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; break;
#undef OFFSET
} }
case Menu::playint1: case Menu::playint1:
case Menu::playint2: case Menu::playint2: