Corrected an error regarding writing UVs to a Vector2 that was still null

(Though model conversion still only seems to work for sims rather than objects)

Author: Olivercomet

MorcuTool/src/FileTypes/Package.cs

@@ -645,7 +645,6 @@ public void LoadPackage()
 
                             default:
                                 Console.WriteLine("Unknown type ID " + subfiles[i].typeID);
-                                Console.WriteLine("and this type ID appears " + GetNumOccurrencesOfTypeID(subfiles[i].typeID) + " times in total.");
                                 Console.WriteLine("index of file was " + filesprocessed);
                                 fileextension = "."+subfiles[i].typeID.ToString();
                                 break;

MorcuTool/src/FileTypes/Subfiles/DS/MSG.cs

@@ -16,8 +16,8 @@ public string MSK_DS_string_to_normal_string(byte[] input) {
             StringBuilder sb = new StringBuilder(input.Length);
 
             foreach (byte b in input) {
-                // sb.Append(Utility.CharFromMSKDSChar(b));
-                Console.WriteLine("Temporarily dummied out");
+               // sb.Append(Utility.CharFromMSKDSChar(b));
+               // temporarily dummmied out
             }
 
             return sb.ToString();        

MorcuTool/src/FileTypes/Subfiles/MsaAnimation.cs

@@ -14,21 +14,23 @@ public class Table1Entry {      //setting table 1's count to 1 turns the animati
             public uint unk1;   //start frame, possibly?
             public uint unk2;   //flags? padding? usually 0
             public uint unk3;   //u32 start of this frame's data, relative to the data section
-            public FrameData frmData;
+            public FrameData frmData1;
+            public FrameData frmData2;
 
             public Table1Entry(byte[] filebytes, int offset, MsaAnimation parent) {
                 unk1 = Utility.ReadUInt32BigEndian(filebytes, offset);
                 unk2 = Utility.ReadUInt32BigEndian(filebytes, offset + 4);
                 unk3 = Utility.ReadUInt32BigEndian(filebytes, offset + 8);
-                frmData = new FrameData(filebytes, parent.dataSectionOffset + unk3);
+                frmData1 = new FrameData(filebytes, parent.dataSectionOffset + unk1);
+                frmData2 = new FrameData(filebytes, parent.dataSectionOffset + unk3);
             }
         }
 
 
         public class FrameData {
 
         public FrameData(byte[] filebytes, uint offset) {
-
+                Console.WriteLine("FrameData type: "+Utility.ReadUInt32BigEndian(filebytes,(int)offset));
             }
         } 
 

MorcuTool/src/Forms/Form1.cs

@@ -264,6 +264,10 @@ public List<byte> ConvertSkyHeroesModel(string filename, byte[] file)
 
                         reader.BaseStream.Position += 0x10;
 
+                        if (newVertex.UVchannels[0] == null) {
+                            newVertex.UVchannels[0] = new MorcuMath.Vector2();
+                        }
+                        
                         newVertex.UVchannels[0].x = Utility.ReverseEndianSingle(reader.ReadSingle());
                         newVertex.UVchannels[0].y = Utility.ReverseEndianSingle(reader.ReadSingle()) * -1;
 
@@ -500,6 +504,8 @@ private void convertModelToolStripMenuItem_Click(object sender, EventArgs e)
                 openFileDialog2.CheckPathExists = true;
                 openFileDialog2.Multiselect = true;
 
+                bool createdAtLeastOneOBJ = false;
+
                 if (openFileDialog2.ShowDialog() == DialogResult.OK)
                 {
                     foreach (string filename in openFileDialog2.FileNames)
@@ -523,11 +529,12 @@ private void convertModelToolStripMenuItem_Click(object sender, EventArgs e)
                             if (saveFileDialog1.ShowDialog() == DialogResult.OK)
                                 {
                                 s.rmdl.GenerateObj(saveFileDialog1.FileName);
+                                createdAtLeastOneOBJ = true;
                                 }
                         }
-                        
                     }
-                }
+                MessageBox.Show("Created .OBJ model(s) in same directory as original file.");
+            }
 
         }