Assign sequential object IDs at Max export time

H-uru · Jul 15, 2023 · 5815cf1 · 5815cf1
1 parent ad38630
commit 5815cf1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp
@@ -201,6 +201,18 @@ bool plRegistryKeyList::SetKeyUnused(plKeyImp* key, LoadStatus& loadStatusChange
     return foundKey != nullptr;
 }
 
+void plRegistryKeyList::PrepForWrite()
+{
+    uint32_t objectID = 1;
+    for (auto it = fKeys.begin(); it != fKeys.end(); ++it) {
+        plKeyImp* key = *it;
+
+        if (key->ObjectIsLoaded()) {
+            key->SetObjectID(objectID++);
+        }
+    }
+}
+
 void plRegistryKeyList::Read(hsStream* s)
 {
     uint32_t keyListLen = s->ReadLE32();

diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h
@@ -97,6 +97,10 @@ class plRegistryKeyList
     void SetKeyUsed(plKeyImp* key) { ++fReffedKeys; }
     bool SetKeyUnused(plKeyImp* key, LoadStatus& loadStatusChange);
 
+    // Export time only.  Before we write to disk, assign all the static keys
+    // object ID's that they can use to do fast lookups at load time.
+    void PrepForWrite();
+
     void Read(hsStream* s);
     void Write(hsStream* s);
 };

diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp
@@ -230,6 +230,9 @@ void plRegistryPageNode::Write()
     for (it = fKeyLists.begin(); it != fKeyLists.end(); it++)
     {
         plRegistryKeyList* keyList = it->second;
+        if (fIsNewPage)
+            keyList->PrepForWrite();
+
         int ver = plVersion::GetCreatableVersion(keyList->GetClassType());
         fPageInfo.AddClassVersion(keyList->GetClassType(), ver);
     }