fix sub there ThemeInfoPointer

spelunky-fyi · May 25, 2024 · 4e74bc2 · 4e74bc2
1 parent 8fffe43
commit 4e74bc2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -111,7 +111,7 @@ namespace S2Plugin
         EntitySubclass,               // a subclass of an entity defined in json
         DefaultStructType,            // a struct defined in json
         UndeterminedThemeInfoPointer, // used to look up the theme pointer in the levelgen and show the correct theme name
-        ThemeInfoPointer,             // same as above, but does not add struct tree
+        COThemeInfoPointer,           // same as above, but does not add struct tree
         LevelGenRoomsPointer,         // used to make the level gen rooms title clickable
         LevelGenRoomsMetaPointer,     // used to make the level gen rooms title clickable
         JournalPagePointer,           // used to make journal page in vector clickable

diff --git a/resources/Spelunky2.json b/resources/Spelunky2.json
@@ -8896,7 +8896,7 @@
       { "field": "padding3?", "type": "UnsignedDword" },
       {
         "field": "sub_theme",
-        "type": "ThemeInfoPointer",
+        "type": "COThemeInfoPointer",
         "comment": "for cosmic ocean"
       },
       { "field": "unknown3", "type": "UnsignedDword" },

diff --git a/src/Configuration.cpp b/src/Configuration.cpp
@@ -134,7 +134,7 @@ namespace S2Plugin
         {MemoryFieldType::ConstCharPointer, "Const char*", "const char*", "ConstCharPointer", 8, true},
         {MemoryFieldType::ConstCharPointerPointer, "Const char**", "const char**", "ConstCharPointerPointer", 8, true},                         // there is more then just pointer to pointer?
         {MemoryFieldType::UndeterminedThemeInfoPointer, "UndeterminedThemeInfoPointer", "ThemeInfo*", "UndeterminedThemeInfoPointer", 8, true}, // display theme name and add ThemeInfo fields
-        {MemoryFieldType::ThemeInfoPointer, "ThemeInfoPointer", "ThemeInfo*", "ThemeInfoPointer", 8, true},                                     // just theme name
+        {MemoryFieldType::COThemeInfoPointer, "COThemeInfoPointer", "ThemeInfo*", "COThemeInfoPointer", 8, true},                               // just theme name
         {MemoryFieldType::LevelGenRoomsPointer, "LevelGenRoomsPointer", "LevelGenRooms*", "LevelGenRoomsPointer", 8, true},
         {MemoryFieldType::LevelGenRoomsMetaPointer, "LevelGenRoomsMetaPointer", "LevelGenRoomsMeta*", "LevelGenRoomsMetaPointer", 8, true},
         {MemoryFieldType::JournalPagePointer, "JournalPagePointer", "JournalPage*", "JournalPagePointer", 8, true},

diff --git a/src/QtHelpers/TreeViewMemoryFields.cpp b/src/QtHelpers/TreeViewMemoryFields.cpp
@@ -204,7 +204,7 @@ QStandardItem* S2Plugin::TreeViewMemoryFields::addMemoryField(const MemoryField&
         case MemoryFieldType::LevelGenRoomsPointer:
         case MemoryFieldType::LevelGenRoomsMetaPointer:
         case MemoryFieldType::JournalPagePointer:
-        case MemoryFieldType::ThemeInfoPointer:
+        case MemoryFieldType::COThemeInfoPointer:
         case MemoryFieldType::UTF16Char:
         case MemoryFieldType::IPv4Address:
         {
@@ -1692,7 +1692,7 @@ void S2Plugin::TreeViewMemoryFields::updateRow(int row, std::optional<uintptr_t>
             }
             break;
         }
-        case MemoryFieldType::ThemeInfoPointer:
+        case MemoryFieldType::COThemeInfoPointer:
         case MemoryFieldType::UndeterminedThemeInfoPointer:
         {
             if (valueMemoryOffset == 0)
@@ -2519,7 +2519,7 @@ void S2Plugin::TreeViewMemoryFields::dropEvent(QDropEvent* event)
 
                 break;
             }
-            case MemoryFieldType::ThemeInfoPointer:
+            case MemoryFieldType::COThemeInfoPointer:
             case MemoryFieldType::UndeterminedThemeInfoPointer:
             {
                 if (getThisTypeName() != "ThemeInfo")