Fixing content pack images, added portuguese button.

NPBruce · Jun 3, 2017 · ba73859 · ba73859
1 parent 3e1aaa8
commit ba73859
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/unity/Assets/Scripts/Content/ContentData.cs b/unity/Assets/Scripts/Content/ContentData.cs
@@ -137,7 +137,14 @@ public void PopulatePackList(string path)
             pack.id = d.Get("ContentPack", "id");
 
             // If this is invalid we will just handle it later, not fatal
-            pack.image = path + "/" + d.Get("ContentPack", "image");
+            if (d.Get("ContentPack", "image").IndexOf("{import}") == 0)
+            {
+                pack.image = ContentData.ImportPath() + d.Get("ContentPack", "image").Substring(8);
+            }
+            else
+            {
+                pack.image = path + "/" + d.Get("ContentPack", "image");
+            }
 
             // Black description isn't fatal
             pack.description = d.Get("ContentPack", "description");

diff --git a/unity/Assets/Scripts/UI/Screens/OptionsScreen.cs b/unity/Assets/Scripts/UI/Screens/OptionsScreen.cs
@@ -194,7 +194,7 @@ private void CreateLanguageElements()
 
             string[] langs = DictionaryI18n.FFG_LANGS.Split(',');
             // For now, English and Spanish languages available.
-            HashSet<string> enabled_langs = new HashSet<string> ("English,Spanish,French,Italian,German".Split(','));
+            HashSet<string> enabled_langs = new HashSet<string> ("English,Spanish,French,Italian,German,Portuguese".Split(','));
 
             //The first button in the list of buttons should start in this vertical coordinate
             float verticalStart = UIScaler.GetVCenter(-1f) - ((langs.Length - 1) * 1f);