Commit c8637dfb authored by nanahira's avatar nanahira

Merge branch 'master' of github.com:Fluorohydride/ygopro

parents 664f102d 2262dc8e
...@@ -1978,6 +1978,12 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -1978,6 +1978,12 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
return true; return true;
break; break;
} }
case COMBOBOX_LOCALE: {
myswprintf(mainGame->gameConf.locale, L"%ls", mainGame->cbLocale->getItem(mainGame->cbLocale->getSelected()));
mainGame->SaveConfig();
return true;
break;
}
} }
break; break;
} }
...@@ -2044,16 +2050,6 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -2044,16 +2050,6 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
} }
break; break;
} }
case irr::gui::EGET_COMBO_BOX_CHANGED: {
switch(id) {
case COMBOBOX_LOCALE: {
myswprintf(mainGame->gameConf.locale, L"%ls", mainGame->cbLocale->getItem(mainGame->cbLocale->getSelected()));
mainGame->SaveConfig();
break;
}
}
break;
}
case irr::gui::EGET_EDITBOX_ENTER: { case irr::gui::EGET_EDITBOX_ENTER: {
switch(id) { switch(id) {
case EDITBOX_CHAT: { case EDITBOX_CHAT: {
......
...@@ -7,6 +7,7 @@ antialias = 2 ...@@ -7,6 +7,7 @@ antialias = 2
errorlog = 3 errorlog = 3
nickname = Komeiji Koishi nickname = Komeiji Koishi
gamename = Game gamename = Game
lastcategory = 未分类卡组
lastdeck = new lastdeck = new
textfont = ./fonts/simhei.ttf 14 textfont = ./fonts/simhei.ttf 14
numfont = ./fonts/arial.ttf numfont = ./fonts/arial.ttf
...@@ -20,6 +21,8 @@ autochain = 0 ...@@ -20,6 +21,8 @@ autochain = 0
waitchain = 0 waitchain = 0
mute_opponent = 0 mute_opponent = 0
mute_spectators = 0 mute_spectators = 0
use_lflist = 1
default_lflist = 0
default_rule = 0 default_rule = 0
hide_setname = 0 hide_setname = 0
hide_hint_button = 0 hide_hint_button = 0
......
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