Merge branch 'master' into server

99cbd2d3 · nanahira · d29a170c · aa85565f · 99cbd2d3 · 38a3c3f1
Commit 99cbd2d3 authored Dec 25, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 11 deletions

gframe/event_handler.cpp gframe/event_handler.cpp +0 -10

script script +1 -1

No files found.
--- a/gframe/event_handler.cpp
+++ b/gframe/event_handler.cpp
@@ -1974,16 +1974,6 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
 			}
 			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: {
 			switch(id) {
 			case EDITBOX_CHAT: {

--- a/script @ 38a3c3f1
+++ b/script @ 38a3c3f1
-Subproject commit 2bbc51568f7c561274cf13b46c558a9f6b098690
+Subproject commit 38a3c3f1eef3d455e664c37aad8bd3fd803de6f0