Speculative fix for bad merge in gltf branch

Author: Greavesy1899

Mafia2Libs/Forms/Docking/DockImportSceneTree.cs

@@ -149,7 +149,7 @@ private void ApplyImageIndex(TreeNode node)
                 return;
             }
 
-            if (node.Tag.GetType() == typeof(FrameObjectJoint))
+            if (node.Tag.GetType() == typeof(FrameObjectPoint))
                 node.SelectedImageIndex = node.ImageIndex = 7;
             else if (node.Tag.GetType() == typeof(FrameObjectSingleMesh))
                 node.SelectedImageIndex = node.ImageIndex = 6;

Mafia2Libs/Forms/Docking/DockSceneTree.cs

@@ -266,7 +266,7 @@ private void ApplyImageIndex(TreeNode node)
                 return;
             }
 
-            if (node.Tag.GetType() == typeof(FrameObjectJoint))
+            if (node.Tag.GetType() == typeof(FrameObjectPoint))
                 node.SelectedImageIndex = node.ImageIndex = 7;
             else if (node.Tag.GetType() == typeof(FrameObjectSingleMesh))
                 node.SelectedImageIndex = node.ImageIndex = 6;

Mafia2Libs/Forms/MapEditor.cs

@@ -1954,8 +1954,8 @@ private void DuplicateButton_Click(object sender, EventArgs e)
                     newEntry = new FrameObjectDeflector((FrameObjectDeflector)node.Tag);
                 else if (node.Tag.GetType() == typeof(FrameObjectFrame))
                     newEntry = new FrameObjectFrame((FrameObjectFrame)node.Tag);
-                else if (node.Tag.GetType() == typeof(FrameObjectJoint))
-                    newEntry = new FrameObjectJoint((FrameObjectJoint)node.Tag);
+                else if (node.Tag.GetType() == typeof(FrameObjectPoint))
+                    newEntry = new FrameObjectPoint((FrameObjectPoint)node.Tag);
                 else if (node.Tag.GetType() == typeof(FrameObjectLight))
                     newEntry = new FrameObjectLight((FrameObjectLight)node.Tag);
                 else if (node.Tag.GetType() == typeof(FrameObjectModel))

Mafia2Libs/ResourceTypes/FileTypes/FrameNameTable/FrameNameTable.cs

@@ -81,7 +81,7 @@ public void BuildDataFromResource(FrameResource.FrameResource resource)
                 object block = resource.FrameObjects.ElementAt(i).Value;
 
                 //possible types to save? might change in the future however.
-                if (block.GetType().BaseType == typeof(FrameObjectBase) || block.GetType().BaseType == typeof(FrameObjectJoint) || block.GetType().BaseType == typeof(FrameObjectSingleMesh))
+                if (block.GetType().BaseType == typeof(FrameObjectBase) || block.GetType().BaseType == typeof(FrameObjectPoint) || block.GetType().BaseType == typeof(FrameObjectSingleMesh))
                 {
                     if ((block as FrameObjectBase).IsOnFrameTable)
                     {

Mafia2Libs/ResourceTypes/FileTypes/FrameResource/FramePack.cs

@@ -72,10 +72,10 @@ private void SaveFrame(FrameObjectBase frame, BinaryWriter writer)
                 writer.Write((ushort)FrameResourceObjectType.Frame);
                 (frame as FrameObjectFrame).WriteToFile(writer);
             }
-            else if (frame.GetType() == typeof(FrameObjectJoint))
+            else if (frame.GetType() == typeof(FrameObjectPoint))
             {
                 writer.Write((ushort)FrameResourceObjectType.Point);
-                (frame as FrameObjectJoint).WriteToFile(writer);
+                (frame as FrameObjectPoint).WriteToFile(writer);
             }
             else if (frame.GetType() == typeof(FrameObjectLight))
             {

Mafia2Libs/ResourceTypes/FileTypes/FrameResource/FrameResource.cs

@@ -826,7 +826,7 @@ public void UpdateFrameData()
 
         public static bool IsFrameType(object entry)
         {
-            if (entry.GetType() == typeof(FrameObjectJoint) ||
+            if (entry.GetType() == typeof(FrameObjectPoint) ||
                 entry.GetType() == typeof(FrameObjectSingleMesh) ||
                 entry.GetType() == typeof(FrameObjectFrame) ||
                 entry.GetType() == typeof(FrameObjectLight) ||

Mafia2Libs/ResourceTypes/FileTypes/FrameResource/ObjectTypes/FrameObjectPoint.cs

@@ -1,11 +1,9 @@
-using System;
-using System.IO;
-using Utils.Extensions;
-
-namespace ResourceTypes.FrameResource
+namespace ResourceTypes.FrameResource
 {
     public class FrameObjectPoint : FrameObjectJoint
     {
         public FrameObjectPoint(FrameResource OwningResource) : base(OwningResource) { }
+
+        public FrameObjectPoint(FrameObjectPoint other) : base(other) { }
     }
 }