commit ede1d46c

sago007 · 2018-06-30 11:18
ede1d46c0f8c3bfa4f1158195df1206efb164f73 patch · browse files
parent 68f32f61d4eead6da901016a306807dc22a1a419

Window size is now restored (based on the vertical size)

Changed files

M	source/code/main.cpp before

diff --git a/source/code/main.cpp b/source/code/main.cpp index 92fdb12..aa8deb5 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -995,6 +995,7 @@ int main(int argc, char* argv[]) {

Config* configSettings = Config::getInstance();

//configSettings->setString("aNumber"," A string");

//configSettings->save();

+ int screenHeight = 768;

if (configSettings->exists("fullscreen")) { //Test if an configFile exists

globalData.bFullscreen = (bool)configSettings->getInt("fullscreen");

globalData.MusicEnabled = (bool)configSettings->getInt("musicenabled");

@@ -1049,6 +1050,9 @@ int main(int argc, char* argv[]) {

if (configSettings->exists("ysize")) {

globalData.ysize = configSettings->getInt("ysize");

}

+ if (configSettings->exists("screenHeight")) {

+ screenHeight = configSettings->getInt("screenHeight");

+ }

if (globalData.verboseLevel) {

cout << "Data loaded from config file" << "\n";

}

@@ -1069,7 +1073,7 @@ int main(int argc, char* argv[]) {

sdlWindow = SDL_CreateWindow("Block Attack - Rise of the Blocks " VERSION_NUMBER,

SDL_WINDOWPOS_UNDEFINED,

- globalData.xsize, globalData.ysize,

+ (screenHeight)*4/3, screenHeight,

createWindowParams );

dieOnNullptr(sdlWindow, "Unable to create window");

int rendererFlags = 0;

@@ -1158,10 +1162,11 @@ int main(int argc, char* argv[]) {

configSettings->setString("player1name", globalData.player1name);

configSettings->setString("player2name", globalData.player2name);

- if (!config.autoScale) {

- //autoScale is always equal the logical size, so it makes no sense to save it

- configSettings->setInt("xsize", globalData.xsize);

- configSettings->setInt("ysize", globalData.ysize);

+ {

+ //Store physical height of window

+ int height = 0;

+ SDL_GetWindowSize(sdlWindow, nullptr, &height);

+ configSettings->setInt("screenHeight", height);

}

configSettings->save();

}