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

Add an accessibility option to toggle the fake loading screen (#63)

Browse source
This commit is contained in:
Info Teddy 2020-01-12 17:45:44 -08:00 committed by Ethan Lee
parent bc64d027d2
commit c2ac1dc7d2
5 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
desktop_version/src/Game.cpp
View file

@ -393,6 +393,8 @@ Game::Game(void):
state = 1;
statedelay = 0;
//updatestate(dwgfx, map, obj, help, music);
skipfakeload = false;
}
Game::~Game(void)
@ -4336,6 +4338,11 @@ void Game::loadstats( mapclass& map, Graphics& dwgfx )
}
}
if (pKey == "skipfakeload")
{
skipfakeload = atoi(pText);
}
if (pKey == "flipButton")
{
SDL_GameControllerButton newButton;
@ -4541,6 +4548,10 @@ void Game::savestats( mapclass& _map, Graphics& _dwgfx )
msg->LinkEndChild( new TiXmlText( tu.String(usingmmmmmm).c_str()));
dataNode->LinkEndChild( msg );
msg = new TiXmlElement("skipfakeload");
msg->LinkEndChild(new TiXmlText(tu.String((int) skipfakeload).c_str()));
dataNode->LinkEndChild(msg);
for (size_t i = 0; i < controllerButton_flip.size(); i += 1)
{
msg = new TiXmlElement("flipButton");
@ -6923,9 +6934,11 @@ void Game::createmenu( std::string t )
menuoptionsactive[2] = true;
menuoptions[3] = "slowdown";
menuoptionsactive[3] = true;
menuoptions[4] = "return";
menuoptions[4] = "load screen";
menuoptionsactive[4] = true;
nummenuoptions = 5;
menuoptions[5] = "return";
menuoptionsactive[5] = true;
nummenuoptions = 6;
menuxoff = -40;
menuyoff = 16;
}

1
desktop_version/src/Game.h
View file

@ -354,6 +354,7 @@ public:
std::vector<SDL_GameControllerButton> controllerButton_flip;
std::vector<SDL_GameControllerButton> controllerButton_esc;
bool skipfakeload;
};
#endif /* GAME_H */

6
desktop_version/src/Input.cpp
View file

@ -734,6 +734,12 @@ SDL_assert(0 && "Remove open level dir");
music.playef(11, 10);
}
else if (game.currentmenuoption == 4)
{
// toggle fake load screen
game.skipfakeload = !game.skipfakeload;
music.playef(11, 10);
}
else if (game.currentmenuoption == 5)
{
//back
music.playef(11, 10);

2
desktop_version/src/main.cpp
View file

@ -164,6 +164,8 @@ int main(int argc, char *argv[])
//Moved screensetting init here from main menu V2.1
game.loadstats(map, graphics);
if (game.skipfakeload)
game.gamestate = TITLEMODE;
if(game.usingmmmmmm==0) music.usingmmmmmm=false;
if(game.usingmmmmmm==1) music.usingmmmmmm=true;
if (game.slowdown == 0) game.slowdown = 30;

8
desktop_version/src/titlerender.cpp
View file

@ -531,6 +531,14 @@ void titlerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, U
dwgfx.Print( -1, 105, "Game speed is at 40%", tr, tg, tb, true);
}
}
else if (game.currentmenuoption == 4)
{
dwgfx.bigprint(-1, 30, "Fake Load Screen", tr, tg, tb, true);
if (game.skipfakeload)
dwgfx.Print(-1, 75, "Fake loading screen is OFF", tr/2, tg/2, tb/2, true);
else
dwgfx.Print(-1, 75, "Fake loading screen is ON", tr, tg, tb, true);
}
}
else if (game.currentmenuname == "playint1" || game.currentmenuname == "playint2")
{