Skip to content

Y
ygopro
Commit 4acfabac authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'resize' into test

parents 6277eda1 8a75cf11
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
gframe/game.cpp
View file @ 4acfabac
...@@ -1081,7 +1081,7 @@ void Game::LoadConfig() { ...@@ -1081,7 +1081,7 @@ void Game::LoadConfig() {
gameConf.window_maximized = false; gameConf.window_maximized = false;
gameConf.window_width = 1024; gameConf.window_width = 1024;
gameConf.window_height = 640; gameConf.window_height = 640;
gameConf.resize_popup_menu = true; gameConf.resize_popup_menu = false;
gameConf.enable_sound = true; gameConf.enable_sound = true;
gameConf.sound_volume = 0.5; gameConf.sound_volume = 0.5;
gameConf.enable_music = true; gameConf.enable_music = true;
...@@ -1230,6 +1230,7 @@ void Game::SaveConfig() { ...@@ -1230,6 +1230,7 @@ void Game::SaveConfig() {
fprintf(fp, "window_maximized = %d\n", (gameConf.window_maximized ? 1 : 0)); fprintf(fp, "window_maximized = %d\n", (gameConf.window_maximized ? 1 : 0));
fprintf(fp, "window_width = %d\n", gameConf.window_width); fprintf(fp, "window_width = %d\n", gameConf.window_width);
fprintf(fp, "window_height = %d\n", gameConf.window_height); fprintf(fp, "window_height = %d\n", gameConf.window_height);
fprintf(fp, "resize_popup_menu = %d\n", gameConf.resize_popup_menu ? 1 : 0);
fprintf(fp, "enable_sound = %d\n", (chkEnableSound->isChecked() ? 1 : 0)); fprintf(fp, "enable_sound = %d\n", (chkEnableSound->isChecked() ? 1 : 0));
fprintf(fp, "enable_music = %d\n", (chkEnableMusic->isChecked() ? 1 : 0)); fprintf(fp, "enable_music = %d\n", (chkEnableMusic->isChecked() ? 1 : 0));
fprintf(fp, "#Volume of sound and music, between 0 and 100\n"); fprintf(fp, "#Volume of sound and music, between 0 and 100\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment