Commit 982fadd5 authored by fallenstardust's avatar fallenstardust

移除可选隐藏字段

parent 4525849e
...@@ -460,9 +460,6 @@ bool Game::Initialize() { ...@@ -460,9 +460,6 @@ bool Game::Initialize() {
chkIgnore2 = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260, posY + 30 * yScale), tabSystem, -1, dataManager.GetSysString(1291)); chkIgnore2 = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260, posY + 30 * yScale), tabSystem, -1, dataManager.GetSysString(1291));
chkIgnore2->setChecked(gameConf.chkIgnore2 != 0); chkIgnore2->setChecked(gameConf.chkIgnore2 != 0);
posY += 60; posY += 60;
chkHideSetname = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260, posY + 30 * yScale), tabSystem, -1, dataManager.GetSysString(1354));
chkHideSetname->setChecked(gameConf.chkHideSetname != 0);
posY += 60;
chkIgnoreDeckChanges = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabSystem, -1, dataManager.GetSysString(1357)); chkIgnoreDeckChanges = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabSystem, -1, dataManager.GetSysString(1357));
chkIgnoreDeckChanges->setChecked(gameConf.chkIgnoreDeckChanges != 0); chkIgnoreDeckChanges->setChecked(gameConf.chkIgnoreDeckChanges != 0);
posY += 60; posY += 60;
...@@ -1384,13 +1381,14 @@ void Game::LoadConfig() { ...@@ -1384,13 +1381,14 @@ void Game::LoadConfig() {
//system //system
gameConf.chkIgnore1 = android::getIntSetting(appMain, "chkIgnore1", 0); gameConf.chkIgnore1 = android::getIntSetting(appMain, "chkIgnore1", 0);
gameConf.chkIgnore2 = android::getIntSetting(appMain, "chkIgnore2", 0); gameConf.chkIgnore2 = android::getIntSetting(appMain, "chkIgnore2", 0);
gameConf.chkHideSetname = android::getIntSetting(appMain, "chkHideSetname", 0);
gameConf.control_mode = android::getIntSetting(appMain, "control_mode", 0); gameConf.control_mode = android::getIntSetting(appMain, "control_mode", 0);
gameConf.draw_field_spell = android::getIntSetting(appMain, "draw_field_spell", 1); gameConf.draw_field_spell = android::getIntSetting(appMain, "draw_field_spell", 1);
gameConf.chkIgnoreDeckChanges = android::getIntSetting(appMain, "chkIgnoreDeckChanges", 0); gameConf.chkIgnoreDeckChanges = android::getIntSetting(appMain, "chkIgnoreDeckChanges", 0);
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);
//defult Setting without checked //defult Setting without checked
gameConf.hide_setname = 0;
gameConf.hide_hint_button = 0;
gameConf.separate_clear_button = 1; gameConf.separate_clear_button = 1;
gameConf.search_multiple_keywords = 1; gameConf.search_multiple_keywords = 1;
gameConf.defaultOT = 1; gameConf.defaultOT = 1;
...@@ -1417,8 +1415,6 @@ void Game::SaveConfig() { ...@@ -1417,8 +1415,6 @@ void Game::SaveConfig() {
android::saveIntSetting(appMain, "chkIgnore1", gameConf.chkIgnore1); android::saveIntSetting(appMain, "chkIgnore1", gameConf.chkIgnore1);
gameConf.chkIgnore2 = chkIgnore2->isChecked() ? 1 : 0; gameConf.chkIgnore2 = chkIgnore2->isChecked() ? 1 : 0;
android::saveIntSetting(appMain, "chkIgnore2", gameConf.chkIgnore2); android::saveIntSetting(appMain, "chkIgnore2", gameConf.chkIgnore2);
gameConf.chkHideSetname = chkHideSetname->isChecked() ? 1 : 0;
android::saveIntSetting(appMain, "chkHideSetname", gameConf.chkHideSetname);
gameConf.chkIgnoreDeckChanges = chkIgnoreDeckChanges->isChecked() ? 1 : 0; gameConf.chkIgnoreDeckChanges = chkIgnoreDeckChanges->isChecked() ? 1 : 0;
android::saveIntSetting(appMain, "chkIgnoreDeckChanges", gameConf.chkIgnoreDeckChanges); android::saveIntSetting(appMain, "chkIgnoreDeckChanges", gameConf.chkIgnoreDeckChanges);
gameConf.auto_save_replay = chkAutoSaveReplay->isChecked() ? 1 : 0; gameConf.auto_save_replay = chkAutoSaveReplay->isChecked() ? 1 : 0;
...@@ -1444,7 +1440,7 @@ void Game::ShowCardInfo(int code) { ...@@ -1444,7 +1440,7 @@ void Game::ShowCardInfo(int code) {
else myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(code), code); else myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(code), code);
stName->setText(formatBuffer); stName->setText(formatBuffer);
int offset = 0; int offset = 0;
if(!chkHideSetname->isChecked()) { if(!gameConf.hide_setname) {
unsigned long long sc = cd.setcode; unsigned long long sc = cd.setcode;
if(cd.alias) { if(cd.alias) {
auto aptr = dataManager._datas.find(cd.alias); auto aptr = dataManager._datas.find(cd.alias);
......
...@@ -35,8 +35,8 @@ struct Config { ...@@ -35,8 +35,8 @@ struct Config {
int chkWaitChain; int chkWaitChain;
int chkIgnore1; int chkIgnore1;
int chkIgnore2; int chkIgnore2;
int chkHideSetname; int hide_setname;
int chkHideHintButton; int hide_hint_button;
int control_mode; int control_mode;
int draw_field_spell; int draw_field_spell;
int separate_clear_button; int separate_clear_button;
...@@ -47,7 +47,7 @@ struct Config { ...@@ -47,7 +47,7 @@ struct Config {
int enable_bot_mode; int enable_bot_mode;
int quick_animation; int quick_animation;
int auto_save_replay; int auto_save_replay;
int chkAutoSaveReplay; int prefer_expansion_script;
}; };
struct DuelInfo { struct DuelInfo {
...@@ -248,11 +248,10 @@ public: ...@@ -248,11 +248,10 @@ public:
irr::gui::IGUICheckBox* chkDrawFieldSpell; irr::gui::IGUICheckBox* chkDrawFieldSpell;
irr::gui::IGUICheckBox* chkQuickAnimation; irr::gui::IGUICheckBox* chkQuickAnimation;
irr::gui::IGUICheckBox* chkAutoSaveReplay; irr::gui::IGUICheckBox* chkAutoSaveReplay;
irr::gui::IGUICheckBox* chkHideSetname;
irr::gui::IGUICheckBox* chkHideHintButton;
irr::gui::IGUICheckBox* chkIgnoreDeckChanges; irr::gui::IGUICheckBox* chkIgnoreDeckChanges;
irr::gui::IGUICheckBox* chkAutoSearch; irr::gui::IGUICheckBox* chkAutoSearch;
irr::gui::IGUICheckBox* chkMultiKeywords; irr::gui::IGUICheckBox* chkMultiKeywords;
irr::gui::IGUICheckBox* chkPreferExpansionScript;
//main menu //main menu
irr::gui::IGUIWindow* wMainMenu; irr::gui::IGUIWindow* wMainMenu;
irr::gui::IGUIButton* btnLanMode; irr::gui::IGUIButton* btnLanMode;
...@@ -648,6 +647,7 @@ extern Game* mainGame; ...@@ -648,6 +647,7 @@ extern Game* mainGame;
#define BUTTON_CANCEL_SINGLEPLAY 352 #define BUTTON_CANCEL_SINGLEPLAY 352
#define CHECKBOX_AUTO_SEARCH 360 #define CHECKBOX_AUTO_SEARCH 360
#define CHECKBOX_MULTI_KEYWORDS 372 #define CHECKBOX_MULTI_KEYWORDS 372
#define CHECKBOX_PREFER_EXPANSION 373
#define CHECKBOX_DISABLE_CHAT 364 #define CHECKBOX_DISABLE_CHAT 364
#define CHECKBOX_DRAW_FIELD_SPELL 368 #define CHECKBOX_DRAW_FIELD_SPELL 368
#define CHECKBOX_QUICK_ANIMATION 369 #define CHECKBOX_QUICK_ANIMATION 369
......
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