From 4e74bc29d027d1016035fd6fd7ec33a013b6d9ae Mon Sep 17 00:00:00 2001 From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com> Date: Sat, 25 May 2024 22:38:58 +0200 Subject: [PATCH] fix sub there ThemeInfoPointer --- include/Configuration.h | 2 +- resources/Spelunky2.json | 2 +- src/Configuration.cpp | 2 +- src/QtHelpers/TreeViewMemoryFields.cpp | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/Configuration.h b/include/Configuration.h index 6cd000a..cc95dd2 100644 --- 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 index eb7d11d..b5d987a 100644 --- 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 index b21cc7d..ec1c165 100644 --- 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 index 355cdb0..6eed66b 100644 --- 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 } 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")