From 8247c22ff07e5e66ac6666018cf24b7ad041935f Mon Sep 17 00:00:00 2001
From: linshier <linshier@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Sun, 15 Aug 2010 11:57:31 +0000
Subject: [PATCH] Fixed loading/option-saving slowdown brought in by Chinese
 support to other languages.

---
 projects/mtg/src/GameApp.cpp          | 13 ++++++++-----
 projects/mtg/src/WResourceManager.cpp | 23 +++++++++--------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp
index e98ccc260..be841f089 100644
--- a/projects/mtg/src/GameApp.cpp
+++ b/projects/mtg/src/GameApp.cpp
@@ -146,11 +146,14 @@ void GameApp::Create()
   jq->SetHotSpot(16,16);
 
   LOG("--Loading fonts");
-  resources.LoadWFBFont("simon",12);
-  resources.LoadWFBFont("f3",16);
-  resources.LoadWFBFont("magic",16);
-  resources.LoadWFBFont("smallface",12);
-
+  string lang = options[Options::LANG].str;
+  std::transform(lang.begin(), lang.end(), lang.begin(), ::tolower);
+  if (lang.compare("cn") == 0) {
+    resources.LoadWFBFont("simon",12);
+    resources.LoadWFBFont("f3",16);
+    resources.LoadWFBFont("magic",16);
+    resources.LoadWFBFont("smallface",12);
+  }
   resources.LoadWLBFont("simon",11);
   resources.GetWFont("simon")->SetTracking(-1);
   resources.LoadWLBFont("f3",16);
diff --git a/projects/mtg/src/WResourceManager.cpp b/projects/mtg/src/WResourceManager.cpp
index 61a0d3844..e3851df6c 100644
--- a/projects/mtg/src/WResourceManager.cpp
+++ b/projects/mtg/src/WResourceManager.cpp
@@ -809,22 +809,17 @@ int WResourceManager::reloadWLBFonts(){
 }
 
 int WResourceManager::reloadWFonts(){
-  //TODO: LoadWFont().
-#if 0
-  vector<string> fontNames;
-  vector<float> fontSizes;
+  string lang = options[Options::LANG].str;
+  std::transform(lang.begin(), lang.end(), lang.begin(), ::tolower);
 
-  fontNames.resize(mWFontList.size());
-  fontSizes.resize(mWFontList.size());
-  for ( map<string, int>::iterator itr = mWFontMap.begin(); itr != mWFontMap.end(); ++itr){
-    fontNames[itr->second] = itr->first;
-    fontSizes[itr->second] = mWFontList[itr->second]->GetHeight();
+  if (lang.compare("cn") != 0) 
+    RemoveWFonts();
+  else if (mWFontList.size() == 0){
+    resources.LoadWFBFont("simon",12);
+    resources.LoadWFBFont("f3",16);
+    resources.LoadWFBFont("magic",16);
+    resources.LoadWFBFont("smallface",12);
   }
-  RemoveWFonts();
-  for(size_t i = 0; i < fontNames.size(); ++i){
-    LoadWFont(fontNames[i],fontSizes[i]);
-  }
-#endif
 
   return 1;
 }