Merge branch 'master' into another

9f03b89c · nanahira · 1b58e947 · dca53b30 · 9f03b89c · 40cca292
Commit 9f03b89c authored Dec 28, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

gframe/game.cpp gframe/game.cpp +4 -0

script script +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -1434,6 +1434,10 @@ void Game::LoadConfig() {
 				myswprintf(mainGame->gameConf.locale, L"%ls", L"ko-KR");
 				break;
 			}
+			case 0x16: {
+				myswprintf(mainGame->gameConf.locale, L"%ls", L"pt-BR");
+				break;
+			}
 		}
 	}
 }

--- a/script @ 40cca292
+++ b/script @ 40cca292
-Subproject commit 01b2f0a2de3101bd86c4601502cbbb3b0a0154cd
+Subproject commit 40cca292241d4dc12bf11eb6106c865c5a4b71c3