Merge branch 'multi_language_fh'

gframe/event_handler.cpp

@@ -1975,6 +1975,16 @@ 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: {

gframe/game.cpp

@@ -1383,9 +1383,36 @@ void Game::LoadConfig() {
 			}
 		}
 		fclose(fp_user);
-	} else {
+	} else
+#else // YGOPRO_COMPAT_MYCARD
+	if(!gameConf.locale || wcslen(gameConf.locale) <= 0)
+#endif
+	{
+		unsigned int lcid = 0;
 #ifdef _WIN32
-		unsigned int lcid = ((unsigned int)GetSystemDefaultLangID()) & 0xff;
+		lcid = ((unsigned int)GetSystemDefaultLangID()) & 0xff;
+#else
+		char* locale_str = getenv("LANG");
+		if(locale_str) {
+			if(strstr(locale_str, "zh"))
+				lcid = 0x04;
+			else
+			if(strstr(locale_str, "en"))
+				lcid = 0x09;
+			else
+			if(strstr(locale_str, "es"))
+				lcid = 0x0a;
+			else
+			if(strstr(locale_str, "ja"))
+				lcid = 0x11;
+			else
+			if(strstr(locale_str, "ko"))
+				lcid = 0x12;
+			else
+			if(strstr(locale_str, "pt"))
+				lcid = 0x16;
+		}
+#endif
 		switch(lcid) {
 			case 0x04: {
 				myswprintf(mainGame->gameConf.locale, L"%ls", L"zh-CN");
@@ -1408,10 +1435,7 @@ void Game::LoadConfig() {
 				break;
 			}
 		}
-#endif
-		//SaveConfig();
 	}
-#endif //YGOPRO_COMPAT_MYCARD
 }
 void Game::SaveConfig() {
 #ifdef YGOPRO_COMPAT_MYCARD

gframe/image_manager.cpp

@@ -358,6 +358,10 @@ irr::video::ITexture* ImageManager::GetTexture(int code, bool fit) {
 			sprintf(file, "pics/%d.png", code);
 			img = GetTextureFromFile(file, width, height);
 		}
+		if(img == NULL) {
+			sprintf(file, mainGame->GetLocaleDir("pics/%d.jpg"), code);
+			img = GetTextureFromFile(file, CARD_IMG_WIDTH, CARD_IMG_HEIGHT);
+		}
 		if(img == NULL) {
 			sprintf(file, "pics/%d.jpg", code);
 			img = GetTextureFromFile(file, width, height);
@@ -404,6 +408,10 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 			sprintf(file, "pics/thumbnail/%d.jpg", code);
 			img = GetTextureFromFile(file, width, height);
 		}
+		if(img == NULL) {
+			sprintf(file, mainGame->GetLocaleDir("pics/thumbnail/%d.jpg"), code);
+			img = GetTextureFromFile(file, CARD_THUMB_WIDTH, CARD_THUMB_HEIGHT);
+		}
 		if(img == NULL && mainGame->gameConf.use_image_scale) {
 			sprintf(file, "pics/%d.png", code);
 			img = GetTextureExpansions(file, width, height);
@@ -456,6 +464,14 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) {
 			sprintf(file, mainGame->GetLocaleDir("pics/field/%d.jpg"), code);
 			img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
 		}
+		if(img == NULL) {
+			sprintf(file, mainGame->GetLocaleDir("pics/field/%d.png"), code);
+			img = GetTextureFromFile(file, 512, 512);
+		}
+		if(img == NULL) {
+			sprintf(file, mainGame->GetLocaleDir("pics/field/%d.jpg"), code);
+			img = GetTextureFromFile(file, 512, 512);
+		}
 		if(img == NULL) {
 			sprintf(file, "pics/field/%d.png", code);
 			img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);