Enabled language option for packing files in SubpTool

Atvaark · Jul 11, 2015 · c62793e · c62793e
1 parent 4c23ac4
commit c62793e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/FfntTool/Properties/AssemblyInfo.cs b/FfntTool/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("d9af2da5-85dd-45b2-8727-34be880d1558")]
-[assembly: AssemblyVersion("0.1.2.0")]
-[assembly: AssemblyFileVersion("0.1.2.0")]
+[assembly: AssemblyVersion("0.1.3.0")]
+[assembly: AssemblyFileVersion("0.1.3.0")]
diff --git a/LangTool/Properties/AssemblyInfo.cs b/LangTool/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("b2857b4d-a9d2-4c25-84b8-c9f9a3612852")]
-[assembly: AssemblyVersion("0.1.2.0")]
-[assembly: AssemblyFileVersion("0.1.2.0")]
+[assembly: AssemblyVersion("0.1.3.0")]
+[assembly: AssemblyFileVersion("0.1.3.0")]
diff --git a/SubpTool/Program.cs b/SubpTool/Program.cs
@@ -24,7 +24,7 @@ public static void Main(string[] args)
                 }
                 if (path.EndsWith(".xml"))
                 {
-                    PackSubp(path);
+                    PackSubp(path, encoding);
                     return;
                 }
             }
@@ -82,7 +82,7 @@ private static void UnpackSubp(string path, Encoding encoding)
             }
         }
 
-        private static void PackSubp(string path)
+        private static void PackSubp(string path, Encoding encoding)
         {
             string fileDirectory = Path.GetDirectoryName(path);
             string fileName = Path.GetFileNameWithoutExtension(path);
@@ -94,8 +94,6 @@ private static void PackSubp(string path)
             {
                 XmlSerializer serializer = new XmlSerializer(typeof (SubpFile));
                 SubpFile subpFile = serializer.Deserialize(inputStream) as SubpFile;
-                // TODO: Get the encoding from the serializer? Or just save it as an attribute in the subpfile xml.
-                Encoding encoding = Encoding.Default;
                 if (subpFile != null)
                 {
                     subpFile.Write(outputStream, encoding);

diff --git a/SubpTool/Properties/AssemblyInfo.cs b/SubpTool/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("2ab72241-1321-4bae-ba53-b12120bfc344")]
-[assembly: AssemblyVersion("0.1.2.0")]
-[assembly: AssemblyFileVersion("0.1.2.0")]
+[assembly: AssemblyVersion("0.1.3.0")]
+[assembly: AssemblyFileVersion("0.1.3.0")]