Skip to content

Y
ygopro-2pick
Commit ab41fba0 authored by nanahira's avatar nanahira
Browse files
Options

fix

parent 8535e022
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
gframe/game.cpp
View file @ ab41fba0
......@@ -1202,14 +1202,7 @@ void Game::SaveConfig() {
if(vol < 0) vol = 0; else if(vol > 100) vol = 100;
fprintf(fp, "music_volume = %d\n", vol);
fprintf(fp, "music_mode = %d\n", (chkMusicMode->isChecked() ? 1 : 0));
<<<<<<< HEAD
=======
fprintf(fp, "window_maximized = %d\n", (gameConf.window_maximized ? 1 : 0));
fprintf(fp, "window_width = %d\n", gameConf.window_width);
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_pendulum_scale = %d\n", ((mainGame->chkEnablePScale->isChecked()) ? 1 : 0));
>>>>>>> 82b74157... Merge branch 'master' into another
fclose(fp);
}
void Game::ShowCardInfo(int code) {
......
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