write c-string

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tdcgexplorer/trunk/tso2mqo@1329 72ae2088-5f33-de11-a17b-0000e250a282

diff --git a/TSOWriter.cs b/TSOWriter.cs
index d392946..506da42 100644 (file)
--- a/TSOWriter.cs
+++ b/TSOWriter.cs
@@ -15,14 +15,6 @@ namespace tso2mqo
             bw.Write(0x314F5354);\r
         }\r
 \r
-        public static void Write(BinaryWriter bw, string s)\r
-        {\r
-            foreach(byte i in Encoding.Default.GetBytes(s))\r
-                bw.Write(i);\r
-\r
-            bw.Write((byte)0);\r
-        }\r
-\r
         public static void Write(BinaryWriter bw, string[] s)\r
         {\r
             int n   = s[s.Length-1] == "" ? s.Length-1 : s.Length;\r
@@ -30,7 +22,7 @@ namespace tso2mqo
             bw.Write(n);\r
 \r
             for(int i= 0; i < n; ++i)\r
-                Write(bw, s[i]);\r
+                bw.WriteCString(s[i]);\r
         }\r
 \r
         public static void Write(BinaryWriter bw, TSONode[] items)\r
@@ -51,7 +43,7 @@ namespace tso2mqo
 \r
         public static void Write(BinaryWriter bw, TSONode item)\r
         {\r
-            Write(bw, item.Name);\r
+            bw.WriteCString(item.Name);\r
         }\r
 \r
         public static void Write(BinaryWriter bw, TSOTex[] items)\r
@@ -64,8 +56,8 @@ namespace tso2mqo
 \r
         public static void Write(BinaryWriter bw, TSOTex item)\r
         {\r
-            Write(bw, item.name);\r
-            Write(bw, item.file);\r
+            bw.WriteCString(item.name);\r
+            bw.WriteCString(item.file);\r
             bw.Write(item.Width);\r
             bw.Write(item.Height);\r
             bw.Write(item.Depth);\r
@@ -82,7 +74,7 @@ namespace tso2mqo
 \r
         public static void Write(BinaryWriter bw, TSOEffect item)\r
         {\r
-            Write(bw, item.Name);\r
+            bw.WriteCString(item.Name);\r
             Write(bw, item.Code.Split('\n'));\r
         }\r
 \r
@@ -96,8 +88,8 @@ namespace tso2mqo
 \r
         public static void Write(BinaryWriter bw, TSOMaterial item)\r
         {\r
-            Write(bw, item.Name);\r
-            Write(bw, item.File);\r
+            bw.WriteCString(item.Name);\r
+            bw.WriteCString(item.File);\r
             Write(bw, item.Code.Split('\n'));\r
         }\r
 \r
@@ -111,7 +103,7 @@ namespace tso2mqo
 \r
         public static void Write(BinaryWriter bw, TSOMesh item)\r
         {\r
-            Write(bw, item.Name);\r
+            bw.WriteCString(item.Name);\r
             Matrix m = item.Matrix;\r
             bw.Write(ref m);\r
             bw.Write(1);\r