Skip to content

Y
YGOMobile
Commit 66a582f6 authored by fallenstardust's avatar fallenstardust
Browse files
Options

默认prefer_expansion_script=1

parent 5aae994d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
Classes/gframe/event_handler.cpp
View file @ 66a582f6
...@@ -2034,11 +2034,12 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -2034,11 +2034,12 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
return true; return true;
break; break;
} }
/*
case CHECKBOX_PREFER_EXPANSION: { case CHECKBOX_PREFER_EXPANSION: {
mainGame->gameConf.prefer_expansion_script = mainGame->chkPreferExpansionScript->isChecked() ? 1 : 0; mainGame->gameConf.prefer_expansion_script = mainGame->chkPreferExpansionScript->isChecked() ? 1 : 0;
return true; return true;
break; break;
} }*/
case CHECKBOX_LFLIST: { case CHECKBOX_LFLIST: {
mainGame->gameConf.use_lflist = mainGame->chkLFlist->isChecked() ? 1 : 0; mainGame->gameConf.use_lflist = mainGame->chkLFlist->isChecked() ? 1 : 0;
mainGame->cbLFlist->setEnabled(mainGame->gameConf.use_lflist); mainGame->cbLFlist->setEnabled(mainGame->gameConf.use_lflist);
......
Classes/gframe/game.cpp
View file @ 66a582f6
...@@ -624,9 +624,6 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) { ...@@ -624,9 +624,6 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
posY += 40 * yScale; posY += 40 * yScale;
chkAutoSaveReplay = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), wSettings, -1, dataManager.GetSysString(1366)); chkAutoSaveReplay = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), wSettings, -1, dataManager.GetSysString(1366));
chkAutoSaveReplay->setChecked(gameConf.auto_save_replay != 0); chkAutoSaveReplay->setChecked(gameConf.auto_save_replay != 0);
posY += 40 * yScale;
chkPreferExpansionScript = env->addCheckBox(false, rect<s32>(posX, posY, posX + 280 * xScale, posY + 30 * yScale), wSettings, CHECKBOX_PREFER_EXPANSION, dataManager.GetSysString(1379));
chkPreferExpansionScript->setChecked(gameConf.prefer_expansion_script != 0);
posY += 40 * yScale; posY += 40 * yScale;
chkMusicMode = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), wSettings, -1, dataManager.GetSysString(1281)); chkMusicMode = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), wSettings, -1, dataManager.GetSysString(1281));
chkMusicMode->setChecked(gameConf.music_mode != 0); chkMusicMode->setChecked(gameConf.music_mode != 0);
...@@ -1773,7 +1770,6 @@ void Game::LoadConfig() { ...@@ -1773,7 +1770,6 @@ void Game::LoadConfig() {
gameConf.auto_save_replay = android::getIntSetting(appMain, "auto_save_replay", 0); gameConf.auto_save_replay = android::getIntSetting(appMain, "auto_save_replay", 0);
gameConf.quick_animation = android::getIntSetting(appMain, "quick_animation", 0); gameConf.quick_animation = android::getIntSetting(appMain, "quick_animation", 0);
gameConf.draw_single_chain = android::getIntSetting(appMain, "draw_single_chain", 0); gameConf.draw_single_chain = android::getIntSetting(appMain, "draw_single_chain", 0);
gameConf.prefer_expansion_script = android::getIntSetting(appMain, "prefer_expansion_script", 0);
gameConf.enable_sound = android::getIntSetting(appMain, "enable_sound", 1); gameConf.enable_sound = android::getIntSetting(appMain, "enable_sound", 1);
gameConf.sound_volume = android::getIntSetting(appMain, "sound_volume", 50); gameConf.sound_volume = android::getIntSetting(appMain, "sound_volume", 50);
gameConf.enable_music = android::getIntSetting(appMain, "enable_music", 1); gameConf.enable_music = android::getIntSetting(appMain, "enable_music", 1);
...@@ -1824,8 +1820,6 @@ void Game::SaveConfig() { ...@@ -1824,8 +1820,6 @@ void Game::SaveConfig() {
android::saveIntSetting(appMain, "quick_animation", gameConf.quick_animation); android::saveIntSetting(appMain, "quick_animation", gameConf.quick_animation);
gameConf.draw_single_chain = chkDrawSingleChain->isChecked() ? 1 : 0; gameConf.draw_single_chain = chkDrawSingleChain->isChecked() ? 1 : 0;
android::saveIntSetting(appMain, "draw_single_chain", gameConf.draw_single_chain); android::saveIntSetting(appMain, "draw_single_chain", gameConf.draw_single_chain);
gameConf.prefer_expansion_script = chkPreferExpansionScript->isChecked() ? 1 : 0;
android::saveIntSetting(appMain, "prefer_expansion_script", gameConf.prefer_expansion_script);
gameConf.enable_sound = chkEnableSound->isChecked() ? 1 : 0; gameConf.enable_sound = chkEnableSound->isChecked() ? 1 : 0;
android::saveIntSetting(appMain, "enable_sound", gameConf.enable_sound); android::saveIntSetting(appMain, "enable_sound", gameConf.enable_sound);
gameConf.enable_music = chkEnableMusic->isChecked() ? 1 : 0; gameConf.enable_music = chkEnableMusic->isChecked() ? 1 : 0;
......
Classes/gframe/game.h
View file @ 66a582f6
...@@ -64,7 +64,7 @@ struct Config { ...@@ -64,7 +64,7 @@ struct Config {
int auto_save_replay{ 0 }; int auto_save_replay{ 0 };
int draw_single_chain{ 0 }; int draw_single_chain{ 0 };
int hide_player_name{ 0 }; int hide_player_name{ 0 };
int prefer_expansion_script{ 0 }; int prefer_expansion_script{ 1 };
//sound //sound
bool enable_sound{ true }; bool enable_sound{ true };
bool enable_music{ true }; bool enable_music{ true };
...@@ -913,7 +913,7 @@ extern Game* mainGame; ...@@ -913,7 +913,7 @@ extern Game* mainGame;
#define BUTTON_CHATTING 370 #define BUTTON_CHATTING 370
#define SCROLL_SETTINGS 371 #define SCROLL_SETTINGS 371
#define CHECKBOX_MULTI_KEYWORDS 372 #define CHECKBOX_MULTI_KEYWORDS 372
#define CHECKBOX_PREFER_EXPANSION 373 //#define CHECKBOX_PREFER_EXPANSION 373
#define CHECKBOX_DRAW_SINGLE_CHAIN 374 #define CHECKBOX_DRAW_SINGLE_CHAIN 374
#define CHECKBOX_LFLIST 375 #define CHECKBOX_LFLIST 375
#define CHECKBOX_HIDE_PLAYER_NAME 376 #define CHECKBOX_HIDE_PLAYER_NAME 376
......
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