Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove game.gameframerate as duplicate of game.slowdown

Browse Source 
game.gameframerate seems to exist for converting the value of
game.slowdown into an actual timestep value, when really the timestep
value should just use game.slowdown directly with a fast lookup table.
Otherwise, there's a bunch of duplicated game.slowdown case-switches
everywhere, which adds up to a large, annoying pile should the values be
changed in the future. But now the duplicate variable has been removed,
and with it, all the copy-pasted case-switches.

Also, the game speed text rendering in Menu::accessibility and
Menu::setslowdown has been factored out to a function and de-duplicated
as well.
This commit is contained in:
Misa
2020-11-12 17:05:18 -08:00
committed by Ethan Lee
parent ee44f81d4c
commit bc9dff8c2a
5 changed files with 42 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
desktop_version/src/Render.cpp
View File

@@ -25,6 +25,25 @@ int inline FLIP(int ypos)
return ypos;
}
static inline void drawslowdowntext()
{
switch (game.slowdown)
{
case 30:
graphics.Print( -1, 105, "Game speed is normal.", tr/2, tg/2, tb/2, true);
break;
case 24:
graphics.Print( -1, 105, "Game speed is at 80%", tr, tg, tb, true);
break;
case 18:
graphics.Print( -1, 105, "Game speed is at 60%", tr, tg, tb, true);
break;
case 12:
graphics.Print( -1, 105, "Game speed is at 40%", tr, tg, tb, true);
break;
}
}
void menurender()
{
int temp = 50;
@@ -369,21 +388,7 @@ void menurender()
case Menu::setslowdown:
graphics.bigprint( -1, 40, "Game Speed", tr, tg, tb, true);
graphics.Print( -1, 75, "Select a new game speed below.", tr, tg, tb, true);
switch (game.gameframerate)
{
case 34:
graphics.Print( -1, 105, "Game speed is normal.", tr/2, tg/2, tb/2, true);
break;
case 41:
graphics.Print( -1, 105, "Game speed is at 80%", tr, tg, tb, true);
break;
case 55:
graphics.Print( -1, 105, "Game speed is at 60%", tr, tg, tb, true);
break;
case 83:
graphics.Print( -1, 105, "Game speed is at 40%", tr, tg, tb, true);
break;
}
drawslowdowntext();
break;
case Menu::newgamewarning:
graphics.Print( -1, 100, "Are you sure? This will", tr, tg, tb, true);
@@ -556,23 +561,7 @@ void menurender()
graphics.bigprint( -1, 40, "Game Speed", tr, tg, tb, true);
graphics.Print( -1, 75, "May be useful for disabled gamers", tr, tg, tb, true);
graphics.Print( -1, 85, "using one switch devices.", tr, tg, tb, true);
if (game.gameframerate==34)
{
graphics.Print( -1, 105, "Game speed is normal.", tr/2, tg/2, tb/2, true);
}
else if (game.gameframerate==41)
{
graphics.Print( -1, 105, "Game speed is at 80%", tr, tg, tb, true);
}
else if (game.gameframerate==55)
{
graphics.Print( -1, 105, "Game speed is at 60%", tr, tg, tb, true);
}
else if (game.gameframerate==83)
{
graphics.Print( -1, 105, "Game speed is at 40%", tr, tg, tb, true);
}
break;
drawslowdowntext();
}
break;
case Menu::playint1:
@@ -588,7 +577,7 @@ void menurender()
graphics.Print( -1, 65, "Replay any level in the game in", tr, tg, tb, true);
graphics.Print( -1, 75, "a competitive time trial mode.", tr, tg, tb, true);
if (game.gameframerate > 34 || map.invincibility)
if (game.slowdown < 30 || map.invincibility)
{
graphics.Print( -1, 105, "Time Trials are not available", tr, tg, tb, true);
graphics.Print( -1, 115, "with slowdown or invincibility.", tr, tg, tb, true);
@@ -609,7 +598,7 @@ void menurender()
graphics.Print( -1, 65, "Play the entire game", tr, tg, tb, true);
graphics.Print( -1, 75, "without dying once.", tr, tg, tb, true);
if (game.gameframerate > 34 || map.invincibility)
if (game.slowdown < 30 || map.invincibility)
{
graphics.Print( -1, 105, "No Death Mode is not available", tr, tg, tb, true);
graphics.Print( -1, 115, "with slowdown or invincibility.", tr, tg, tb, true);