Update types and address comments for patch 2.12

wopss · Feb 29, 2024 · a5ff814 · a5ff814
1 parent 49c38b8
commit a5ff814
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/include/RED4ext/Detail/AddressHashes.hpp b/include/RED4ext/Detail/AddressHashes.hpp
@@ -63,7 +63,7 @@ constexpr std::uint32_t CEnum_FromString = 0x21CA1EC1;
 #pragma endregion
 
 #pragma region CGameEngine
-constexpr std::uint32_t CGameEngine = 0x97F209D6; // TODO: Check next update, there is hash conflict.
+constexpr std::uint32_t CGameEngine = 0x97F209D6;
 #pragma endregion
 
 #pragma region CGlobalFunction
@@ -124,7 +124,7 @@ constexpr std::uint32_t ISerializable_sub_C0 = 0x80201C35;
 #pragma endregion
 
 #pragma region JobDispatcher
-constexpr std::uint32_t JobDispatcher = 0xBAD50B3D; // TODO: Check next update, there is hash conflict.
+constexpr std::uint32_t JobDispatcher = 0xBAD50B3D;
 constexpr std::uint32_t JobDispatcher_DispatchJob = 0x9C441E82;
 #pragma endregion
 

diff --git a/include/RED4ext/Relocation-inl.hpp b/include/RED4ext/Relocation-inl.hpp
@@ -57,7 +57,7 @@ uintptr_t RED4ext::UniversalRelocBase::Resolve(uint32_t aHash)
     if (address == 0)
     {
         std::stringstream stream;
-        stream << "Failed to resolve address for hash " << std::hex << aHash << ".\nProcess will now close.";
+        stream << "Failed to resolve address for hash " << std::hex << std::showbase << aHash << ".\nProcess will now close.";
 
         MessageBoxA(nullptr, stream.str().c_str(), "RED4ext.SDK", MB_ICONERROR | MB_OK);
         TerminateProcess(GetCurrentProcess(), 1);

diff --git a/include/RED4ext/Scripting/Natives/Generated/cp/PlayerSystem.hpp b/include/RED4ext/Scripting/Natives/Generated/cp/PlayerSystem.hpp
@@ -17,9 +17,9 @@ struct PlayerSystem : game::PlayerSystem
     static constexpr const char* NAME = "cpPlayerSystem";
     static constexpr const char* ALIAS = "PlayerSystem";
 
-    uint8_t unk70[0x60540 - 0x70]; // 70
+    uint8_t unk70[0x60500 - 0x70]; // 70
 };
-RED4EXT_ASSERT_SIZE(PlayerSystem, 0x60540);
+RED4EXT_ASSERT_SIZE(PlayerSystem, 0x60500);
 } // namespace cp
 using cpPlayerSystem = cp::PlayerSystem;
 using PlayerSystem = cp::PlayerSystem;

diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/ICharacterConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/ICharacterConditionType.hpp
@@ -18,7 +18,7 @@ struct ICharacterConditionType : quest::IConditionType
     static constexpr const char* NAME = "questICharacterConditionType";
     static constexpr const char* ALIAS = NAME;
 
-    game::EntityReference objectRef; // 38
+    game::EntityReference puppetRef; // 38
     bool isPlayer; // 70
     uint8_t unk71[0x78 - 0x71]; // 71
 };