remove EntityUIDPointer

spelunky-fyi · Mar 27, 2024 · 930934f · 930934f
1 parent 108dfc0
commit 930934f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -98,7 +98,6 @@ namespace S2Plugin
         LevelGen,
         EntityDB,
         EntityPointer,
-        EntityUIDPointer, // TODO: remove
         EntityDBPointer,
         EntityDBID,
         EntityUID,

diff --git a/resources/Spelunky2.json b/resources/Spelunky2.json
@@ -9046,9 +9046,9 @@
       { "field": "unknown4", "type": "UnsignedDword" }
     ],
     "UnknownPointerGroup": [
-      { "field": "unknown_uid1", "type": "EntityUIDPointer" },
-      { "field": "unknown_uid2", "type": "EntityUIDPointer" },
-      { "field": "unknown_uid3", "type": "EntityUIDPointer" }
+      { "field": "unknown_uid1", "type": "EntityUID", "pointer": true },
+      { "field": "unknown_uid2", "type": "EntityUID", "pointer": true },
+      { "field": "unknown_uid3", "type": "EntityUID", "pointer": true }
     ],
     "SoundInfoPointer": [
       {

diff --git a/src/Configuration.cpp b/src/Configuration.cpp
@@ -124,7 +124,6 @@ namespace S2Plugin
         {MemoryFieldType::Online, "Online", "", "Online", 0, false},
         // Special Types
         {MemoryFieldType::EntityPointer, "Entity pointer", "Entity*", "EntityPointer", 8, true},
-        {MemoryFieldType::EntityUIDPointer, "Entity UID pointer", "uint32_t*", "EntityUIDPointer", 8, true},
         {MemoryFieldType::EntityDBPointer, "EntityDB pointer", "EntityDB*", "EntityDBPointer", 8, true},
         {MemoryFieldType::EntityDBID, "EntityDB ID", "uint32_t", "EntityDBID", 4, false},
         {MemoryFieldType::EntityUID, "Entity UID", "int32_t", "EntityUID", 4, false},

diff --git a/src/QtHelpers/TreeViewMemoryFields.cpp b/src/QtHelpers/TreeViewMemoryFields.cpp
@@ -171,7 +171,6 @@ QStandardItem* S2Plugin::TreeViewMemoryFields::addMemoryField(const MemoryField&
         case MemoryFieldType::EntityDBID:
         case MemoryFieldType::EntityUID:
         case MemoryFieldType::EntityPointer:
-        case MemoryFieldType::EntityUIDPointer:
         case MemoryFieldType::EntityDBPointer:
         case MemoryFieldType::TextureDBPointer:
         case MemoryFieldType::TextureDBID:
@@ -1385,11 +1384,6 @@ void S2Plugin::TreeViewMemoryFields::updateRow(int row, std::optional<uintptr_t>
             }
             break;
         }
-        case MemoryFieldType::EntityUIDPointer:
-        {
-            // TODO pending deletion
-            break;
-        }
         case MemoryFieldType::EntityPointer:
         {
             if (valueMemoryOffset == 0) // nullptr or bad ptr
@@ -2022,7 +2016,6 @@ void S2Plugin::TreeViewMemoryFields::cellClicked(const QModelIndex& index)
                     break;
                 }
                 case MemoryFieldType::EntityUID:
-                case MemoryFieldType::EntityUIDPointer:
                 {
                     auto offset = clickedItem->data(gsRoleEntityOffset).toULongLong();
                     if (offset != 0)