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

Refactor startup to load config before calling Screen::init

Browse Source
This commit is contained in:
Ethan Lee
2020-07-08 14:30:57 -04:00
parent f8bb8cde32
commit d3f9a36941
5 changed files with 83 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
desktop_version/src/Game.cpp
View File

@@ -4494,7 +4494,7 @@ void Game::unlocknum( int t )
#define LOAD_ARRAY(ARRAY_NAME) LOAD_ARRAY_RENAME(ARRAY_NAME, ARRAY_NAME)
void Game::loadstats()
void Game::loadstats(int *width, int *height, bool *vsync)
{
tinyxml2::XMLDocument doc;
if (!FILESYSTEM_loadTiXml2Document("saves/unlock.vvv", doc))
@@ -4521,10 +4521,6 @@ void Game::loadstats()
hRoot=tinyxml2::XMLHandle(pElem);
}
// WINDOW DIMS, ADDED AT PATCH 22
int width = 320;
int height = 240;
for( pElem = hRoot.FirstChildElement( "Data" ).FirstChild().ToElement(); pElem; pElem=pElem->NextSiblingElement())
{
std::string pKey(pElem->Value());
@@ -4575,11 +4571,11 @@ void Game::loadstats()
if (pKey == "window_width")
{
width = atoi(pText);
*width = atoi(pText);
}
if (pKey == "window_height")
{
height = atoi(pText);
*height = atoi(pText);
}
@@ -4645,7 +4641,6 @@ void Game::loadstats()
if (pKey == "advanced_smoothing")
{
fullScreenEffect_badSignal = atoi(pText);
graphics.screenbuffer->badSignalEffect = fullScreenEffect_badSignal;
}
if (pKey == "usingmmmmmm")
@@ -4684,7 +4679,7 @@ void Game::loadstats()
if (pKey == "vsync")
{
graphics.screenbuffer->vsync = atoi(pText);
*vsync = atoi(pText);
}
if (pKey == "notextoutline")
@@ -4736,20 +4731,6 @@ void Game::loadstats()
}
if(fullscreen)
{
graphics.screenbuffer->toggleFullScreen();
}
for (int i = 0; i < stretchMode; i += 1)
{
graphics.screenbuffer->toggleStretchMode();
}
if (useLinearFilter)
{
graphics.screenbuffer->toggleLinearFilter();
}
graphics.screenbuffer->ResizeScreen(width, height);
if (graphics.showmousecursor == true)
{
SDL_ShowCursor(SDL_ENABLE);