nicely handle entry point issues

Author: MattFiler

CathodeLib/Scripts/CATHODE/Commands.cs

@@ -33,8 +33,40 @@ public Commands(string path) : base(path) { }
         /* Save all changes back out */
         override public bool Save()
         {
-            if (_entryPoints == null || _entryPoints[0].val == null)
-                return false;
+            //Validate entry points and composite count
+            if (_composites.Count == 0) return false;
+            if (_entryPoints == null) _entryPoints = new ShortGuid[3];
+            if (_entryPoints[0].val == null && _entryPoints[1].val == null && _entryPoints[2].val == null && _composites.Count == 0) return false;
+
+            //If we have composites but the entry points are broken, correct them first!
+            if (GetComposite(_entryPoints[2]) == null)
+            {
+                Composite pausemenu = GetComposite("PAUSEMENU");
+                if (pausemenu == null)
+                {
+                    Console.WriteLine("WARNING: PAUSEMENU composite does not exist! Creating blank placeholder.");
+                    pausemenu = AddComposite("PAUSEMENU");
+                    pausemenu.shortGUID = new ShortGuid("FE-7B-FE-B3");
+                }
+                _entryPoints[2] = pausemenu.shortGUID;
+            }
+            if (GetComposite(_entryPoints[1]) == null)
+            {
+                Composite global = GetComposite("GLOBAL");
+                if (global == null)
+                {
+                    Console.WriteLine("WARNING: GLOBAL composite does not exist! Creating blank placeholder. This may cause issues with GLOBAL references.");
+                    global = AddComposite("GLOBAL");
+                    global.shortGUID = new ShortGuid("1D-2E-CE-E5");
+                }
+                _entryPoints[1] = global.shortGUID;
+            }
+            if (GetComposite(_entryPoints[0]) == null)
+            {
+                Console.WriteLine("WARNING: Entry point was not set! Defaulting to composite at index zero.");
+                _entryPoints[0] = _composites[0].shortGUID;
+            }
+            RefreshEntryPointObjects();
 
             BinaryWriter writer = new BinaryWriter(File.OpenWrite(_filepath));
             writer.BaseStream.SetLength(0);
@@ -428,7 +460,7 @@ override public bool Save()
                                         break;
                                     case ResourceType.COLLISION_MAPPING:
                                         writer.Write(resourceReferences[p].startIndex);
-                                        writer.Write(resourceReferences[p].entityID.val);
+                                        writer.Write(resourceReferences[p].collisionID.val);
                                         break;
                                     case ResourceType.ANIMATED_MODEL:
                                     case ResourceType.DYNAMIC_PHYSICS_SYSTEM:
@@ -867,7 +899,7 @@ override protected bool Load()
                                         break;
                                     case ResourceType.COLLISION_MAPPING:
                                         resource.startIndex = reader.ReadInt32(); //COLLISION.MAP entry index?
-                                        resource.entityID = new ShortGuid(reader); //ID which maps to the entity using the resource (?) - check GetFriendlyName
+                                        resource.collisionID = new ShortGuid(reader); //ID which maps to *something*
                                         break;
                                     case ResourceType.ANIMATED_MODEL:
                                     case ResourceType.DYNAMIC_PHYSICS_SYSTEM:
@@ -1117,8 +1149,7 @@ public Composite[] EntryPoints
             {
                 if (_entryPoints == null) return null;
                 if (_entryPointObjects != null) return _entryPointObjects;
-                _entryPointObjects = new Composite[_entryPoints.Length];
-                for (int i = 0; i < _entryPoints.Length; i++) _entryPointObjects[i] = GetComposite(_entryPoints[i]);
+                RefreshEntryPointObjects();
                 return _entryPointObjects;
             }
         }
@@ -1169,6 +1200,13 @@ private List<ParameterData> PruneParameterList(List<ParameterData> parameters)
             }
             return prunedList;
         }
+
+        /* Refresh the composite pointers for our entry points */
+        private void RefreshEntryPointObjects()
+        {
+            _entryPointObjects = new Composite[_entryPoints.Length];
+            for (int i = 0; i < _entryPoints.Length; i++) _entryPointObjects[i] = GetComposite(_entryPoints[i]);
+        }
         #endregion
 
         /* -- */

CathodeLib/Scripts/CATHODE/CommandsPAK/Components/Composite.cs

@@ -18,7 +18,7 @@ public Composite(string name)
         {
             shortGUID = ShortGuidUtils.GenerateRandom();
             this.name = name;
-            unknownPair = new OffsetPair(0, 0);
+            unknownPair = new OffsetPair(5, 6); //TODO: what on earth this this?
         }
 
         public ShortGuid shortGUID;  //The id when this composite is used as an entity in another composite

CathodeLib/Scripts/CATHODE/CommandsPAK/Components/Entity.cs

@@ -9,6 +9,7 @@
 using System.Diagnostics.SymbolStore;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Xml.Linq;
 
 namespace CATHODE.Scripting.Internal
 {
@@ -56,9 +57,12 @@ public Parameter GetParameter(ShortGuid id)
 
         /* Add a data-supplying parameter to the entity */
         public Parameter AddParameter(string name, ParameterData data, ParameterVariant variant = ParameterVariant.PARAMETER)
+        {
+            return AddParameter(ShortGuidUtils.Generate(name), data, variant);
+        }
+        public Parameter AddParameter(ShortGuid id, ParameterData data, ParameterVariant variant = ParameterVariant.PARAMETER)
         {
             //TODO: we are limiting data-supplying params to ONE per entity here - is this correct? I think links are the only place where you can have multiple of the same.
-            ShortGuid id = ShortGuidUtils.Generate(name);
             Parameter param = GetParameter(id);
             if (param == null)
             {

CathodeLib/Scripts/CATHODE/CommandsPAK/Components/ResourceReference.cs

@@ -36,7 +36,7 @@ public ResourceReference(ResourceType type)
             if (x.entryType != y.entryType) return false;
             if (x.startIndex != y.startIndex) return false;
             if (x.count != y.count) return false;
-            if (x.entityID != y.entityID) return false;
+            if (x.collisionID != y.collisionID) return false;
 
             return true;
         }
@@ -59,7 +59,7 @@ public override bool Equals(object obj)
                    entryType == reference.entryType &&
                    startIndex == reference.startIndex &&
                    count == reference.count &&
-                   EqualityComparer<ShortGuid>.Default.Equals(entityID, reference.entityID);
+                   EqualityComparer<ShortGuid>.Default.Equals(collisionID, reference.collisionID);
         }
 
         public override int GetHashCode()
@@ -71,7 +71,7 @@ public override int GetHashCode()
             hashCode = hashCode * -1521134295 + entryType.GetHashCode();
             hashCode = hashCode * -1521134295 + startIndex.GetHashCode();
             hashCode = hashCode * -1521134295 + count.GetHashCode();
-            hashCode = hashCode * -1521134295 + entityID.GetHashCode();
+            hashCode = hashCode * -1521134295 + collisionID.GetHashCode();
             return hashCode;
         }
 
@@ -84,6 +84,6 @@ public override int GetHashCode()
         public int startIndex = -1;
         public int count = 1;
 
-        public ShortGuid entityID = new ShortGuid("FF-FF-FF-FF");
+        public ShortGuid collisionID = new ShortGuid("FF-FF-FF-FF");
     }
 }