diff --git a/examples/function_registration/Main.cpp b/examples/function_registration/Main.cpp index a1451c179..fdb75215f 100644 --- a/examples/function_registration/Main.cpp +++ b/examples/function_registration/Main.cpp @@ -16,7 +16,7 @@ * You have to take care of the type conversion from stack variables, stack management, etc.. */ -void MyGlobalFunc(RED4ext::IScriptable* aContext, RED4ext::CStackFrame* aFrame, RED4ext::CString* aOut, int64_t a4) +void MyGlobalFunc(RED4ext::IScriptable* aContext, RED4ext::CStackFrame* aFrame, RED4ext::String* aOut, int64_t a4) { RED4EXT_UNUSED_PARAMETER(aContext); RED4EXT_UNUSED_PARAMETER(aFrame); @@ -30,7 +30,7 @@ void MyGlobalFunc(RED4ext::IScriptable* aContext, RED4ext::CStackFrame* aFrame, if (aOut) { - RED4ext::CString result("Returned from MyGlobalFunc"); + RED4ext::String result("Returned from MyGlobalFunc"); *aOut = result; } } diff --git a/include/RED4ext/CNamePool-inl.hpp b/include/RED4ext/CNamePool-inl.hpp index 2069eefe7..1cf38082c 100644 --- a/include/RED4ext/CNamePool-inl.hpp +++ b/include/RED4ext/CNamePool-inl.hpp @@ -17,11 +17,11 @@ RED4EXT_INLINE RED4ext::CName RED4ext::CNamePool::Add(const char* aText) return result; } -RED4EXT_INLINE RED4ext::CName RED4ext::CNamePool::Add(const CString& aText) +RED4EXT_INLINE RED4ext::CName RED4ext::CNamePool::Add(const String& aText) { CName result; - static UniversalRelocFunc func(Detail::AddressHashes::CNamePool_AddCString); + static UniversalRelocFunc func(Detail::AddressHashes::CNamePool_AddCString); func(result, aText); return result; } @@ -32,9 +32,9 @@ RED4EXT_INLINE void RED4ext::CNamePool::Add(const CName& aName, const char* aTex func(aName, aText); } -RED4EXT_INLINE void RED4ext::CNamePool::Add(const CName& aName, const CString& aText) +RED4EXT_INLINE void RED4ext::CNamePool::Add(const CName& aName, const String& aText) { - Add(aName, aText.c_str()); + Add(aName, aText.AsChar()); } RED4EXT_INLINE const char* RED4ext::CNamePool::Get(const CName& aName) diff --git a/include/RED4ext/CNamePool.hpp b/include/RED4ext/CNamePool.hpp index 207508114..b62e1bc9c 100644 --- a/include/RED4ext/CNamePool.hpp +++ b/include/RED4ext/CNamePool.hpp @@ -1,14 +1,14 @@ #pragma once #include -#include +#include namespace RED4ext { struct CNamePool { static CName Add(const char* aText); - static CName Add(const CString& aText); + static CName Add(const String& aText); /** * @brief Add a hash and text pair. @@ -22,7 +22,7 @@ struct CNamePool * @param aName The hash for \p aText * @param aText The text. */ - static void Add(const CName& aName, const CString& aText); + static void Add(const CName& aName, const String& aText); static const char* Get(const CName& aName); }; diff --git a/include/RED4ext/CString-inl.hpp b/include/RED4ext/CString-inl.hpp deleted file mode 100644 index fdd71c3bf..000000000 --- a/include/RED4ext/CString-inl.hpp +++ /dev/null @@ -1,144 +0,0 @@ -#pragma once - -#ifdef RED4EXT_STATIC_LIB -#include -#endif - -#include - -#include -#include - -RED4EXT_INLINE RED4ext::CString::CString(Memory::IAllocator* aAllocator) - : text{} - , length(0) - , allocator(aAllocator ? *reinterpret_cast(aAllocator) : nullptr) -{ -} - -RED4EXT_INLINE RED4ext::CString::CString(const char* aText, Memory::IAllocator* aAllocator) - : CString(aAllocator) -{ - static UniversalRelocFunc func(Detail::AddressHashes::CString_ctor_str); - func(this, aText); -} - -RED4EXT_INLINE RED4ext::CString::CString(const char* aText, uint32_t aLength, Memory::IAllocator* aAllocator) - : CString(aAllocator) -{ - static UniversalRelocFunc func( - Detail::AddressHashes::CString_ctor_span); - func(this, aText, aLength); -} - -RED4EXT_INLINE RED4ext::CString::CString(const std::string& aText, Memory::IAllocator* aAllocator) - : CString(aAllocator) -{ - static UniversalRelocFunc func(Detail::AddressHashes::CString_ctor_str); - func(this, aText.data()); -} - -RED4EXT_INLINE RED4ext::CString::CString(const std::string_view& aText, Memory::IAllocator* aAllocator) - : CString(aAllocator) -{ - static UniversalRelocFunc func( - Detail::AddressHashes::CString_ctor_span); - func(this, aText.data(), static_cast(aText.size())); -} - -RED4EXT_INLINE RED4ext::CString::CString(const CString& aOther) - : CString() -{ - static UniversalRelocFunc func(Detail::AddressHashes::CString_copy); - func(this, aOther); -} - -RED4EXT_INLINE RED4ext::CString::~CString() -{ - static UniversalRelocFunc func(Detail::AddressHashes::CString_dtor); - func(this); -} - -RED4EXT_INLINE RED4ext::CString::CString(CString&& aOther) noexcept - : length(aOther.length) - , allocator(aOther.allocator) -{ - std::memmove(&text, &aOther.text, sizeof(text)); - - std::memset(&aOther.text, 0, sizeof(aOther.text)); - aOther.length = 0; - aOther.allocator = nullptr; -} - -RED4EXT_INLINE RED4ext::CString& RED4ext::CString::operator=(const CString& aRhs) -{ - static UniversalRelocFunc func(Detail::AddressHashes::CString_copy); - func(this, aRhs); - return *this; -} - -RED4EXT_INLINE RED4ext::CString& RED4ext::CString::operator=(CString&& aRhs) noexcept -{ - std::memmove(&text, &aRhs.text, sizeof(text)); - - length = aRhs.length; - allocator = aRhs.allocator; - - std::memset(&aRhs.text, 0, sizeof(aRhs.text)); - aRhs.length = 0; - aRhs.allocator = nullptr; - - return *this; -} - -RED4EXT_INLINE bool RED4ext::CString::operator==(const char* aRhs) const noexcept -{ - auto lhsText = c_str(); - if (!lhsText || !aRhs) - { - return false; - } - - return strcmp(lhsText, aRhs) == 0; -} - -RED4EXT_INLINE bool RED4ext::CString::operator==(const CString& aRhs) const noexcept -{ - auto lhsText = c_str(); - if (!lhsText) - { - return false; - } - auto rhsText = aRhs.c_str(); - if (!rhsText) - { - return false; - } - - if (Length() != aRhs.Length()) - { - return false; - } - - return strcmp(lhsText, rhsText) == 0; -} - -RED4EXT_INLINE bool RED4ext::CString::IsInline() const noexcept -{ - return length < 0x40000000; -} - -RED4EXT_INLINE const char* RED4ext::CString::c_str() const noexcept -{ - if (IsInline()) - { - return text.inline_str; - } - - return text.str.ptr; -} - -RED4EXT_INLINE uint32_t RED4ext::CString::Length() const noexcept -{ - return length & 0x3FFFFFFF; -} diff --git a/include/RED4ext/CString.hpp b/include/RED4ext/CString.hpp index 03ca07d99..03a77e038 100644 --- a/include/RED4ext/CString.hpp +++ b/include/RED4ext/CString.hpp @@ -1,106 +1,12 @@ #pragma once +#pragma message("WARNING: 'RED4ext/CString.hpp' is deprecated. Please use 'RED4ext/String.hpp' instead.") -#include -#include -#include -#include -#include +#include namespace RED4ext { -namespace Memory +struct [[deprecated("Use 'String' instead.")]] CString : String { -struct IAllocator; -} - -struct CString -{ - CString(Memory::IAllocator* aAllocator = nullptr); - CString(const char* aText, Memory::IAllocator* aAllocator = nullptr); - CString(const char* aText, uint32_t aLength, Memory::IAllocator* aAllocator = nullptr); - CString(const std::string& aText, Memory::IAllocator* aAllocator = nullptr); - CString(const std::string_view& aText, Memory::IAllocator* aAllocator = nullptr); - - CString(const CString& aOther); - CString(CString&& aOther) noexcept; - - ~CString(); - - CString& operator=(const CString& aRhs); - CString& operator=(CString&& aRhs) noexcept; - - bool operator==(const char* aRhs) const noexcept; - bool operator==(const CString& aRhs) const noexcept; - - inline bool operator!=(const char* aRhs) const noexcept - { - return !(*this == aRhs); - } - - inline bool operator!=(const CString& aRhs) const noexcept - { - return !(*this == aRhs); - } - - inline const char& operator[](size_t aIndex) const - { - return c_str()[aIndex]; - } - - [[nodiscard]] bool IsInline() const noexcept; - - [[nodiscard]] const char* c_str() const noexcept; - [[nodiscard]] uint32_t Length() const noexcept; - - [[nodiscard]] const char* begin() const - { - return c_str(); - } - - [[nodiscard]] const char* end() const - { - return c_str() + Length(); - } - -#pragma pack(push, 4) - union - { - char inline_str[0x14]; - struct - { - char* ptr; - int8_t unk[8]; - int32_t capacity; - } str; - } text; // 00 -#pragma pack(pop) - - uint32_t length; // 14 - Memory::IAllocator* allocator; // 18 }; -RED4EXT_ASSERT_SIZE(CString, 0x20); -RED4EXT_ASSERT_OFFSET(CString, text, 0x00); -RED4EXT_ASSERT_OFFSET(CString, length, 0x14); -RED4EXT_ASSERT_OFFSET(CString, allocator, 0x18); -template -struct HashMapHash>> -{ - uint32_t operator()(const T& aKey) const noexcept - { - // I believe the game uses this implementation for StringView and String? - std::uint32_t hash{}; - - for (const auto i : aKey) - { - hash = static_cast(i) + 31u * hash; - } - - return hash; - } -}; } // namespace RED4ext - -#ifdef RED4EXT_HEADER_ONLY -#include -#endif diff --git a/include/RED4ext/Detail/AddressHashes.hpp b/include/RED4ext/Detail/AddressHashes.hpp index ac04e1f45..6ec7d1621 100644 --- a/include/RED4ext/Detail/AddressHashes.hpp +++ b/include/RED4ext/Detail/AddressHashes.hpp @@ -102,11 +102,8 @@ constexpr std::uint32_t CRTTISystem_Get = 0x4A610F64; constexpr std::uint32_t CStack_vtbl = 0x349A0EE1; #pragma endregion -#pragma region CString -constexpr std::uint32_t CString_ctor_str = 0xC81F0AAB; -constexpr std::uint32_t CString_ctor_span = 0x7B210877; -constexpr std::uint32_t CString_copy = 0xE8B40B51; -constexpr std::uint32_t CString_dtor = 0x5405072C; +#pragma region String +constexpr std::uint32_t String_SetCapacity = 1744572317UL; #pragma endregion #pragma region DeviceData diff --git a/include/RED4ext/Dump/Reflection-inl.hpp b/include/RED4ext/Dump/Reflection-inl.hpp index 00fea7804..ea8e82150 100644 --- a/include/RED4ext/Dump/Reflection-inl.hpp +++ b/include/RED4ext/Dump/Reflection-inl.hpp @@ -888,10 +888,9 @@ RED4EXT_INLINE std::string TypeToString(const RED4ext::CBaseRTTIType* aType, Nam { // Handle some simple type conversions and fundamentals static std::unordered_map s_typeMap = { - {"Int8", "int8_t"}, {"Int16", "int16_t"}, {"Int32", "int32_t"}, {"Int64", "int64_t"}, - {"Uint8", "uint8_t"}, {"Uint16", "uint16_t"}, {"Uint32", "uint32_t"}, {"Uint64", "uint64_t"}, - {"Float", "float"}, {"Bool", "bool"}, {"String", "CString"}, {"gameItemID", "ItemID"}, - {"Double", "double"}}; + {"Int8", "int8_t"}, {"Int16", "int16_t"}, {"Int32", "int32_t"}, {"Int64", "int64_t"}, + {"Uint8", "uint8_t"}, {"Uint16", "uint16_t"}, {"Uint32", "uint32_t"}, {"Uint64", "uint64_t"}, + {"Float", "float"}, {"Bool", "bool"}, {"gameItemID", "ItemID"}, {"Double", "double"}}; std::string typeName; @@ -1002,7 +1001,7 @@ RED4EXT_INLINE std::string TypeToString(const RED4ext::CBaseRTTIType* aType, Nam // We don't have this type supported yet but we can put some bytes in as placeholder as we know its size typeName = "std::array/* UNHANDLED: " + trueName.ToString() + " (" + - tName.c_str() + ") */"; + tName.AsChar() + ") */"; } if (aVerbose) diff --git a/include/RED4ext/GameApplication.hpp b/include/RED4ext/GameApplication.hpp index 4f7aa8485..f5f1adfbf 100644 --- a/include/RED4ext/GameApplication.hpp +++ b/include/RED4ext/GameApplication.hpp @@ -29,8 +29,8 @@ struct CGameOptions uint32_t watchdogTimeout; // 10 int8_t scriptVersion; // 14 int16_t scriptProfiling; // 16 - CString scriptsBlobPath; // 18 - CString tweakdbBlobPath; // 38 + String scriptsBlobPath; // 18 + String tweakdbBlobPath; // 38 uint8_t unattended58; // 58 uint8_t unattended59; // 59 uint8_t unattended5A; // 5A @@ -41,8 +41,8 @@ struct CGameOptions uint8_t unk5F; // 5F uint8_t unattended60; // 60 int64_t unk68; // 68 - CString automator; // 70 - CString windowCaption; // 90 + String automator; // 70 + String windowCaption; // 90 bool isBackendGameEngine; // B0 uint8_t unkB1; // B1 bool nochroma; // B2 diff --git a/include/RED4ext/GameEngine.hpp b/include/RED4ext/GameEngine.hpp index eeb32e54f..4a61cba53 100644 --- a/include/RED4ext/GameEngine.hpp +++ b/include/RED4ext/GameEngine.hpp @@ -2,13 +2,13 @@ #include -#include #include #include #include #include #include #include +#include namespace RED4ext { @@ -125,74 +125,74 @@ struct CBaseEngine virtual void sub_F8() = 0; // F8 virtual void sub_100() = 0; // 100 - double unk8; // 08 - float unk10; // 10 - float unk14; // 14 - float unk18; // 18 - float unk1C; // 1C - float unk20; // 20 - int64_t unk28; // 28 - int32_t unk30; // 30 - int8_t unk34; // 34 - uint64_t scriptsTimestamp; // 38 - int8_t unk40; // 40 - SharedSpinLock terminationLock; // 41 - int32_t unk44; // 44 - int8_t terminating; // 48 - int8_t unk49; // 49 - int8_t unk4A; // 4A - int8_t unk4B; // 4B - int32_t exitStatus; // 4C - int32_t unk50; // 50 - bool scriptsLoaded; // 54 - bool scriptsSilentCompilation; // 55 - bool scriptsSilentValidation; // 56 - int8_t unk57; // 57 - int8_t unk58; // 58 - int16_t unk5A; // 5A - int32_t interopStartingPort; // 5C - int64_t unk60; // 60 - int64_t unk68; // 68 - CString scriptsCompilationErrors; // 70 - DynArray scriptsValidationErrors; // 90 - int64_t unkA0; // A0 - int64_t unkA8; // A8 - int64_t unkB0; // B0 - int64_t unkB8; // B8 - uint8_t padC0[0x10]; // C0 - UnkD0* unkD0; // D0 - double unkD8; // D8 - double unkE0; // E0 - int32_t unkE8; // E8 - int64_t unkF0; // F0 - int64_t unkF8; // F8 - int64_t unk100; // 100 - volatile EEngineState engineState; // 108 - int32_t unk10C; // 10C - int32_t unk110; // 110 - Unk108* unk118; // 118 - Unk110 unk120; // 120 - CString buildString; // 130 - CString scriptsBlobPath; // 150 - int32_t unk170; // 170 - int8_t unk174; // 174 - int64_t unk178; // 178 - int64_t unk180; // 180 - int64_t unk188; // 188 - int64_t unk190; // 190 - int8_t unk198[178]; // 198 - int32_t unk24C; // 24C - int8_t unk250[64]; // 250 - DynArray unk290; // 290 - DynArray unk2A0; // 2A0 - int64_t unk2B0; // 2B0 - int64_t unk2B8; // 2B8 - int64_t unk2C0; // 2C0 - int64_t unk2C8; // 2C8 - int32_t unk2D0; // 2D0 - bool isEP1; // 2D4 - IsEP1() - int64_t unk2D8; // 2D8 - int64_t unk2E0; // 2E0 + double unk8; // 08 + float unk10; // 10 + float unk14; // 14 + float unk18; // 18 + float unk1C; // 1C + float unk20; // 20 + int64_t unk28; // 28 + int32_t unk30; // 30 + int8_t unk34; // 34 + uint64_t scriptsTimestamp; // 38 + int8_t unk40; // 40 + SharedSpinLock terminationLock; // 41 + int32_t unk44; // 44 + int8_t terminating; // 48 + int8_t unk49; // 49 + int8_t unk4A; // 4A + int8_t unk4B; // 4B + int32_t exitStatus; // 4C + int32_t unk50; // 50 + bool scriptsLoaded; // 54 + bool scriptsSilentCompilation; // 55 + bool scriptsSilentValidation; // 56 + int8_t unk57; // 57 + int8_t unk58; // 58 + int16_t unk5A; // 5A + int32_t interopStartingPort; // 5C + int64_t unk60; // 60 + int64_t unk68; // 68 + String scriptsCompilationErrors; // 70 + DynArray scriptsValidationErrors; // 90 + int64_t unkA0; // A0 + int64_t unkA8; // A8 + int64_t unkB0; // B0 + int64_t unkB8; // B8 + uint8_t padC0[0x10]; // C0 + UnkD0* unkD0; // D0 + double unkD8; // D8 + double unkE0; // E0 + int32_t unkE8; // E8 + int64_t unkF0; // F0 + int64_t unkF8; // F8 + int64_t unk100; // 100 + volatile EEngineState engineState; // 108 + int32_t unk10C; // 10C + int32_t unk110; // 110 + Unk108* unk118; // 118 + Unk110 unk120; // 120 + String buildString; // 130 + String scriptsBlobPath; // 150 + int32_t unk170; // 170 + int8_t unk174; // 174 + int64_t unk178; // 178 + int64_t unk180; // 180 + int64_t unk188; // 188 + int64_t unk190; // 190 + int8_t unk198[178]; // 198 + int32_t unk24C; // 24C + int8_t unk250[64]; // 250 + DynArray unk290; // 290 + DynArray unk2A0; // 2A0 + int64_t unk2B0; // 2B0 + int64_t unk2B8; // 2B8 + int64_t unk2C0; // 2C0 + int64_t unk2C8; // 2C8 + int32_t unk2D0; // 2D0 + bool isEP1; // 2D4 - IsEP1() + int64_t unk2D8; // 2D8 + int64_t unk2E0; // 2E0 }; RED4EXT_ASSERT_SIZE(CBaseEngine, 0x2E8); RED4EXT_ASSERT_OFFSET(CBaseEngine, scriptsLoaded, 0x54); diff --git a/include/RED4ext/GpuApi/CommandListContext.hpp b/include/RED4ext/GpuApi/CommandListContext.hpp index 018622041..f8d2c3ecc 100644 --- a/include/RED4ext/GpuApi/CommandListContext.hpp +++ b/include/RED4ext/GpuApi/CommandListContext.hpp @@ -1,9 +1,9 @@ #pragma once -#include #include #include #include +#include #include #include @@ -33,7 +33,7 @@ struct CommandListContext void Close(); void FlushPendingBarriers(); - CString debugName; // 000 + String debugName; // 000 uint64_t hash; // 020 Microsoft::WRL::ComPtr commandAllocator; // 028 Microsoft::WRL::ComPtr commandList; // 030 diff --git a/include/RED4ext/ISerializable-inl.hpp b/include/RED4ext/ISerializable-inl.hpp index 35444c24b..2e75183f1 100644 --- a/include/RED4ext/ISerializable-inl.hpp +++ b/include/RED4ext/ISerializable-inl.hpp @@ -2,11 +2,11 @@ #include #endif -#include #include #include #include #include +#include RED4EXT_INLINE RED4ext::ISerializable::ISerializable() { @@ -129,7 +129,7 @@ RED4EXT_INLINE void RED4ext::ISerializable::sub_B0(void* a1) std::memset(a1, 0, 0x20); } -RED4EXT_INLINE RED4ext::CString RED4ext::ISerializable::sub_B8() +RED4EXT_INLINE RED4ext::String RED4ext::ISerializable::sub_B8() { auto type = GetType(); auto name = type->GetName(); diff --git a/include/RED4ext/ISerializable.hpp b/include/RED4ext/ISerializable.hpp index 8f1a1bf65..150776193 100644 --- a/include/RED4ext/ISerializable.hpp +++ b/include/RED4ext/ISerializable.hpp @@ -14,7 +14,7 @@ struct IAllocator; struct CClass; struct BaseStream; -struct CString; +class String; struct PostLoadParams { @@ -50,7 +50,7 @@ struct ISerializable virtual void* sub_A0(); // A0 virtual CClass* sub_A8(); // A8 virtual void sub_B0(void* a1); // B0 - virtual CString sub_B8(); // B8 + virtual String sub_B8(); // B8 virtual void* sub_C0(void* a1); // C0 virtual void* sub_C8(void* a1); // C8 virtual bool CanBeDestructed(); // D0 diff --git a/include/RED4ext/InstanceType.hpp b/include/RED4ext/InstanceType.hpp index 1b8ddf86c..d08dde637 100644 --- a/include/RED4ext/InstanceType.hpp +++ b/include/RED4ext/InstanceType.hpp @@ -8,7 +8,7 @@ namespace RED4ext { -struct CString; +class String; struct ISerializable; struct IScriptable; struct TweakDBID; @@ -25,7 +25,7 @@ union ScriptInstanceUnion RED4EXT_DECLARE_TYPE(int32_t, i32); RED4EXT_DECLARE_TYPE(uint64_t, u64); RED4EXT_DECLARE_TYPE(int64_t, i64); - RED4EXT_DECLARE_TYPE(CString, str); + RED4EXT_DECLARE_TYPE(String, str); RED4EXT_DECLARE_TYPE(TweakDBID, tdbid); RED4EXT_DECLARE_TYPE(ItemID, itemid); RED4EXT_DECLARE_TYPE(ISerializable, serializable); diff --git a/include/RED4ext/LaunchParameters-inl.hpp b/include/RED4ext/LaunchParameters-inl.hpp index f55536dfb..230e90829 100644 --- a/include/RED4ext/LaunchParameters-inl.hpp +++ b/include/RED4ext/LaunchParameters-inl.hpp @@ -7,11 +7,11 @@ #include #include -RED4EXT_INLINE const RED4ext::HashMap>& RED4ext:: +RED4EXT_INLINE const RED4ext::HashMap>& RED4ext:: GetLaunchParameters() noexcept { static const auto& params = - *UniversalRelocPtr>>(Detail::AddressHashes::LaunchParameters).GetAddr(); + *UniversalRelocPtr>>(Detail::AddressHashes::LaunchParameters).GetAddr(); return params; } diff --git a/include/RED4ext/LaunchParameters.hpp b/include/RED4ext/LaunchParameters.hpp index f1d34a75c..5e2f608e4 100644 --- a/include/RED4ext/LaunchParameters.hpp +++ b/include/RED4ext/LaunchParameters.hpp @@ -1,9 +1,9 @@ #pragma once -#include #include #include #include +#include namespace RED4ext { @@ -14,7 +14,7 @@ namespace RED4ext * * @return A const reference to a hash map of the game's launch parameters. */ -const HashMap>& GetLaunchParameters() noexcept; +const HashMap>& GetLaunchParameters() noexcept; } // namespace RED4ext #ifdef RED4EXT_HEADER_ONLY diff --git a/include/RED4ext/NativeTypes.hpp b/include/RED4ext/NativeTypes.hpp index e7461cdd4..80a0bc952 100644 --- a/include/RED4ext/NativeTypes.hpp +++ b/include/RED4ext/NativeTypes.hpp @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -16,6 +15,7 @@ #include #include #include +#include namespace RED4ext { @@ -193,7 +193,7 @@ RED4EXT_ASSERT_SIZE(gamedataLocKeyWrapper, 0x8); struct LocalizationString { int64_t unk00; // 00 - CString unk08; // 08 + String unk08; // 08 }; RED4EXT_ASSERT_SIZE(LocalizationString, 0x28); diff --git a/include/RED4ext/RED4ext.hpp b/include/RED4ext/RED4ext.hpp index 00603d11c..6b919df32 100644 --- a/include/RED4ext/RED4ext.hpp +++ b/include/RED4ext/RED4ext.hpp @@ -5,7 +5,6 @@ #include #include -#include #include #include #include @@ -18,6 +17,7 @@ #include #include #include +#include #include diff --git a/include/RED4ext/RTTISystem.hpp b/include/RED4ext/RTTISystem.hpp index 227118602..ad2a95358 100644 --- a/include/RED4ext/RTTISystem.hpp +++ b/include/RED4ext/RTTISystem.hpp @@ -62,8 +62,8 @@ struct IRTTISystem virtual CEnum* GetEnumByScriptName(CName aName) = 0; // 110 virtual CName ConvertNativeToScriptName(CName aName) = 0; // 118 virtual CName ConvertScriptToNativeName(CName aName) = 0; // 120 - virtual CString* GetStringConst(uint32_t aIndex) = 0; // 128 - Used by StringConst opcode (0x10) - virtual void SetStringTable(DynArray& aStrings) = 0; // 130 - Called by script loader + virtual String* GetStringConst(uint32_t aIndex) = 0; // 128 - Used by StringConst opcode (0x10) + virtual void SetStringTable(DynArray& aStrings) = 0; // 130 - Called by script loader virtual ~IRTTISystem() = 0; // 138 }; @@ -87,7 +87,7 @@ struct CRTTISystem : IRTTISystem DynArray unk140; // 140 HashMap scriptToNative; // 150 HashMap nativeToScript; // 180 - DynArray strings; // 1B0 - Used by StringConst opcode (0x10) + DynArray strings; // 1B0 - Used by StringConst opcode (0x10) DynArray unk1C0; // 1C0 DynArray unk1D0; // 1D0 Mutex unk1E0; // 1E0 diff --git a/include/RED4ext/RTTITypes-inl.hpp b/include/RED4ext/RTTITypes-inl.hpp index c10cee838..b298387bd 100644 --- a/include/RED4ext/RTTITypes-inl.hpp +++ b/include/RED4ext/RTTITypes-inl.hpp @@ -15,7 +15,7 @@ RED4EXT_INLINE RED4ext::CBaseRTTIType::CBaseRTTIType() { } -RED4EXT_INLINE RED4ext::CString RED4ext::CBaseRTTIType::GetTypeName() const +RED4EXT_INLINE RED4ext::String RED4ext::CBaseRTTIType::GetTypeName() const { switch (GetType()) { @@ -108,7 +108,7 @@ RED4EXT_INLINE void RED4ext::CBaseRTTIType::Move(ScriptInstance aLhs, ScriptInst Assign(aLhs, aRhs); } -RED4EXT_INLINE bool RED4ext::CBaseRTTIType::ToString(const ScriptInstance aInstance, CString& aOut) const +RED4EXT_INLINE bool RED4ext::CBaseRTTIType::ToString(const ScriptInstance aInstance, String& aOut) const { RED4EXT_UNUSED_PARAMETER(aInstance); RED4EXT_UNUSED_PARAMETER(aOut); @@ -116,7 +116,7 @@ RED4EXT_INLINE bool RED4ext::CBaseRTTIType::ToString(const ScriptInstance aInsta return false; } -RED4EXT_INLINE bool RED4ext::CBaseRTTIType::FromString(ScriptInstance aInstance, const CString& aString) const +RED4EXT_INLINE bool RED4ext::CBaseRTTIType::FromString(ScriptInstance aInstance, const String& aString) const { RED4EXT_UNUSED_PARAMETER(aInstance); RED4EXT_UNUSED_PARAMETER(aString); @@ -143,24 +143,24 @@ RED4EXT_INLINE bool RED4ext::CBaseRTTIType::sub_88(int64_t a1, ScriptInstance aI return func(this, a1, aInstance); } -RED4EXT_INLINE bool RED4ext::CBaseRTTIType::sub_90(int64_t a1, ScriptInstance aInstance, CString& a3, int64_t a4) +RED4EXT_INLINE bool RED4ext::CBaseRTTIType::sub_90(int64_t a1, ScriptInstance aInstance, String& a3, int64_t a4) { - using func_t = bool (*)(CBaseRTTIType*, int64_t, ScriptInstance, CString&, int64_t); + using func_t = bool (*)(CBaseRTTIType*, int64_t, ScriptInstance, String&, int64_t); static UniversalRelocFunc func(Detail::AddressHashes::CBaseRTTIType_sub_90); return func(this, a1, aInstance, a3, a4); } -RED4EXT_INLINE bool RED4ext::CBaseRTTIType::sub_98(int64_t a1, ScriptInstance aInstance, CString& a3, int64_t a4, +RED4EXT_INLINE bool RED4ext::CBaseRTTIType::sub_98(int64_t a1, ScriptInstance aInstance, String& a3, int64_t a4, bool a5) { - using func_t = bool (*)(CBaseRTTIType*, int64_t, ScriptInstance, CString&, int64_t, bool); + using func_t = bool (*)(CBaseRTTIType*, int64_t, ScriptInstance, String&, int64_t, bool); static UniversalRelocFunc func(Detail::AddressHashes::CBaseRTTIType_sub_98); return func(this, a1, aInstance, a3, a4, a5); } -RED4EXT_INLINE bool RED4ext::CBaseRTTIType::sub_A0(int64_t a1, CString& a2, bool a3) +RED4EXT_INLINE bool RED4ext::CBaseRTTIType::sub_A0(int64_t a1, String& a2, bool a3) { - using func_t = bool (*)(CBaseRTTIType*, int64_t, CString&, bool); + using func_t = bool (*)(CBaseRTTIType*, int64_t, String&, bool); static UniversalRelocFunc func(Detail::AddressHashes::CBaseRTTIType_sub_A0); return func(this, a1, a2, a3); } @@ -254,9 +254,9 @@ RED4EXT_INLINE bool RED4ext::CClass::Unserialize(BaseStream* aStream, ScriptInst return func(this, aStream, aInstance, a3); } -RED4EXT_INLINE bool RED4ext::CClass::ToString(const ScriptInstance aInstance, CString& aOut) const +RED4EXT_INLINE bool RED4ext::CClass::ToString(const ScriptInstance aInstance, String& aOut) const { - using func_t = bool (*)(const CClass*, ScriptInstance, CString&); + using func_t = bool (*)(const CClass*, ScriptInstance, String&); static UniversalRelocFunc func(Detail::AddressHashes::CClass_ToString); return func(this, aInstance, aOut); } @@ -275,25 +275,25 @@ RED4EXT_INLINE bool RED4ext::CClass::sub_88(int64_t a1, ScriptInstance aInstance return func(this, a1, aInstance); } -RED4EXT_INLINE bool RED4ext::CClass::sub_90(int64_t a1, ScriptInstance aInstance, CString& a3, int64_t a4) +RED4EXT_INLINE bool RED4ext::CClass::sub_90(int64_t a1, ScriptInstance aInstance, String& a3, int64_t a4) { - using func_t = bool (*)(const CClass*, int64_t, ScriptInstance, CString&, int64_t); + using func_t = bool (*)(const CClass*, int64_t, ScriptInstance, String&, int64_t); static UniversalRelocFunc func(Detail::AddressHashes::CClass_sub_90); return func(this, a1, aInstance, a3, a4); } -RED4EXT_INLINE bool RED4ext::CClass::sub_98(int64_t a1, ScriptInstance aInstance, CString& a3, int64_t a4, bool a5) +RED4EXT_INLINE bool RED4ext::CClass::sub_98(int64_t a1, ScriptInstance aInstance, String& a3, int64_t a4, bool a5) { RED4EXT_UNUSED_PARAMETER(a5); - using func_t = bool (*)(const CClass*, int64_t, ScriptInstance, CString&, int64_t); + using func_t = bool (*)(const CClass*, int64_t, ScriptInstance, String&, int64_t); static UniversalRelocFunc func(Detail::AddressHashes::CClass_sub_90); return func(this, a1, aInstance, a3, a4); } -RED4EXT_INLINE bool RED4ext::CClass::sub_A0(int64_t a1, CString& a2, bool a3) +RED4EXT_INLINE bool RED4ext::CClass::sub_A0(int64_t a1, String& a2, bool a3) { - using func_t = bool (*)(const CClass*, int64_t, CString&, bool); + using func_t = bool (*)(const CClass*, int64_t, String&, bool); static UniversalRelocFunc func(Detail::AddressHashes::CClass_sub_A0); return func(this, a1, a2, a3); } @@ -529,16 +529,16 @@ RED4EXT_INLINE bool RED4ext::CEnum::Unserialize(BaseStream* aStream, ScriptInsta return func(this, aStream, aInstance, a3); } -RED4EXT_INLINE bool RED4ext::CEnum::ToString(const ScriptInstance aInstance, CString& aOut) const +RED4EXT_INLINE bool RED4ext::CEnum::ToString(const ScriptInstance aInstance, String& aOut) const { - using func_t = bool (*)(const CEnum*, const ScriptInstance, CString&); + using func_t = bool (*)(const CEnum*, const ScriptInstance, String&); static UniversalRelocFunc func(Detail::AddressHashes::CEnum_ToString); return func(this, aInstance, aOut); } -RED4EXT_INLINE bool RED4ext::CEnum::FromString(ScriptInstance aInstance, const CString& aString) const +RED4EXT_INLINE bool RED4ext::CEnum::FromString(ScriptInstance aInstance, const String& aString) const { - using func_t = bool (*)(const CEnum*, ScriptInstance, const CString&); + using func_t = bool (*)(const CEnum*, ScriptInstance, const String&); static UniversalRelocFunc func(Detail::AddressHashes::CEnum_FromString); return func(this, aInstance, aString); } @@ -649,16 +649,16 @@ RED4EXT_INLINE bool RED4ext::CBitfield::Unserialize(BaseStream* aStream, ScriptI return func(this, aStream, aInstance, a3); } -RED4EXT_INLINE bool RED4ext::CBitfield::ToString(const ScriptInstance aInstance, CString& aOut) const +RED4EXT_INLINE bool RED4ext::CBitfield::ToString(const ScriptInstance aInstance, String& aOut) const { - using func_t = bool (*)(const CBitfield*, ScriptInstance, CString&); + using func_t = bool (*)(const CBitfield*, ScriptInstance, String&); static UniversalRelocFunc func(Detail::AddressHashes::CBitfield_ToString); return func(this, aInstance, aOut); } -RED4EXT_INLINE bool RED4ext::CBitfield::FromString(ScriptInstance aInstance, const CString& aString) const +RED4EXT_INLINE bool RED4ext::CBitfield::FromString(ScriptInstance aInstance, const String& aString) const { - using func_t = bool (*)(const CBitfield*, ScriptInstance, const CString&); + using func_t = bool (*)(const CBitfield*, ScriptInstance, const String&); static UniversalRelocFunc func(Detail::AddressHashes::CBitfield_FromString); return func(this, aInstance, aString); } diff --git a/include/RED4ext/RTTITypes.hpp b/include/RED4ext/RTTITypes.hpp index 1ad1dc806..a47f33847 100644 --- a/include/RED4ext/RTTITypes.hpp +++ b/include/RED4ext/RTTITypes.hpp @@ -3,12 +3,12 @@ #include #include -#include #include #include #include #include #include +#include #include namespace RED4ext @@ -49,7 +49,7 @@ struct CBaseRTTIType virtual uint32_t GetSize() const = 0; // 10 virtual uint32_t GetAlignment() const = 0; // 18 virtual ERTTIType GetType() const = 0; // 20 - virtual CString GetTypeName() const; // 28 + virtual String GetTypeName() const; // 28 virtual CName GetComputedName() const; // 30 virtual void Construct(ScriptInstance aMemory) const = 0; // 38 virtual void Destruct(ScriptInstance aMemory) const = 0; // 40 @@ -59,14 +59,14 @@ struct CBaseRTTIType virtual void Assign(ScriptInstance aLhs, const ScriptInstance aRhs) const = 0; // 50 virtual void Move(ScriptInstance aLhs, ScriptInstance aRhs) const; // 58 virtual bool Unserialize(BaseStream* aStream, ScriptInstance aInstance, int64_t a3) const = 0; // 60 - virtual bool ToString(const ScriptInstance aInstance, CString& aOut) const; // 68 - virtual bool FromString(ScriptInstance aInstance, const CString& aString) const; // 70 + virtual bool ToString(const ScriptInstance aInstance, String& aOut) const; // 68 + virtual bool FromString(ScriptInstance aInstance, const String& aString) const; // 70 virtual bool sub_78(); // 78 virtual bool sub_80(int64_t a1, ScriptInstance aInstance); // 80 virtual bool sub_88(int64_t a1, ScriptInstance aInstance); // 88 - virtual bool sub_90(int64_t a1, ScriptInstance aInstance, CString& a3, int64_t a4); // 90 - virtual bool sub_98(int64_t a1, ScriptInstance aInstance, CString& a3, int64_t a4, bool a5); // 98 - virtual bool sub_A0(int64_t a1, CString& a2, bool a3); // A0 + virtual bool sub_90(int64_t a1, ScriptInstance aInstance, String& a3, int64_t a4); // 90 + virtual bool sub_98(int64_t a1, ScriptInstance aInstance, String& a3, int64_t a4, bool a5); // 98 + virtual bool sub_A0(int64_t a1, String& a2, bool a3); // A0 virtual bool sub_A8(); // A8 virtual void sub_B0(int64_t a1, int64_t a2); // B0 virtual Memory::IAllocator* GetAllocator() const; // B8 @@ -107,21 +107,21 @@ struct CClass : CBaseRTTIType CClass(CName aName, uint32_t aSize, Flags aFlags); - CName GetName() const final; // 08 - uint32_t GetSize() const final; // 10 - uint32_t GetAlignment() const final; // 18 - ERTTIType GetType() const final; // 20 - CName GetComputedName() const final; // 30 - void Construct(ScriptInstance aMemory) const final; // 38 - void Destruct(ScriptInstance aMemory) const final; // 40 - bool Unserialize(BaseStream* aStream, ScriptInstance aInstance, int64_t a3) const final; // 60 - bool ToString(const ScriptInstance aInstance, CString& aOut) const final; // 68 - bool sub_80(int64_t a1, ScriptInstance aInstance) final; // 80 - bool sub_88(int64_t a1, ScriptInstance aInstance) final; // 88 - bool sub_90(int64_t a1, ScriptInstance aInstance, CString& a3, int64_t a4) final; // 90 - bool sub_98(int64_t a1, ScriptInstance aInstance, CString& a3, int64_t a4, bool a5) final; // 98 - bool sub_A0(int64_t a1, CString& a2, bool a3) final; // A0 - void sub_B0(int64_t a1, int64_t a2) final; // B0 + CName GetName() const final; // 08 + uint32_t GetSize() const final; // 10 + uint32_t GetAlignment() const final; // 18 + ERTTIType GetType() const final; // 20 + CName GetComputedName() const final; // 30 + void Construct(ScriptInstance aMemory) const final; // 38 + void Destruct(ScriptInstance aMemory) const final; // 40 + bool Unserialize(BaseStream* aStream, ScriptInstance aInstance, int64_t a3) const final; // 60 + bool ToString(const ScriptInstance aInstance, String& aOut) const final; // 68 + bool sub_80(int64_t a1, ScriptInstance aInstance) final; // 80 + bool sub_88(int64_t a1, ScriptInstance aInstance) final; // 88 + bool sub_90(int64_t a1, ScriptInstance aInstance, String& a3, int64_t a4) final; // 90 + bool sub_98(int64_t a1, ScriptInstance aInstance, String& a3, int64_t a4, bool a5) final; // 98 + bool sub_A0(int64_t a1, String& a2, bool a3) final; // A0 + void sub_B0(int64_t a1, int64_t a2) final; // B0 virtual void sub_C0(); // C0 virtual uint32_t GetMaxAlignment() const; // C8 @@ -256,8 +256,8 @@ struct CEnum : CBaseRTTIType const bool IsEqual(const ScriptInstance aLhs, const ScriptInstance aRhs, uint32_t a3 = 0) final; // 48 void Assign(ScriptInstance aLhs, const ScriptInstance aRhs) const final; // 50 bool Unserialize(BaseStream* aStream, ScriptInstance aInstance, int64_t a3) const final; // 60 - bool ToString(const ScriptInstance aInstance, CString& aOut) const final; // 68 - bool FromString(ScriptInstance aInstance, const CString& aString) const final; // 70 + bool ToString(const ScriptInstance aInstance, String& aOut) const final; // 68 + bool FromString(ScriptInstance aInstance, const String& aString) const final; // 70 CName name; // 10 CName computedName; // 18 @@ -299,8 +299,8 @@ struct CBitfield : CBaseRTTIType const bool IsEqual(const ScriptInstance aLhs, const ScriptInstance aRhs, uint32_t a3 = 0) final; // 48 void Assign(ScriptInstance aLhs, const ScriptInstance aRhs) const final; // 50 bool Unserialize(BaseStream* aStream, ScriptInstance aInstance, int64_t a3) const final; // 60 - bool ToString(const ScriptInstance aInstance, CString& aOut) const final; // 68 - bool FromString(ScriptInstance aInstance, const CString& aString) const final; // 70 + bool ToString(const ScriptInstance aInstance, String& aOut) const final; // 68 + bool FromString(ScriptInstance aInstance, const String& aString) const final; // 70 CName name; // 10 CName computedName; // 18 diff --git a/include/RED4ext/ResourceDepot.hpp b/include/RED4ext/ResourceDepot.hpp index 0968d555f..82a48078b 100644 --- a/include/RED4ext/ResourceDepot.hpp +++ b/include/RED4ext/ResourceDepot.hpp @@ -2,10 +2,10 @@ #include -#include #include #include #include +#include namespace RED4ext { @@ -13,7 +13,7 @@ struct Archive { void* instance; // 00 int32_t asyncHandle; // 08 - CString path; // 10 + String path; // 10 uint8_t unk30[0x20]; // 30 - Used by LoadEntireArchiveIntoMemory() }; RED4EXT_ASSERT_SIZE(Archive, 0x50); @@ -31,7 +31,7 @@ enum class ArchiveScope : uint32_t struct ArchiveGroup { DynArray archives; // 00 - CString basePath; // 10 + String basePath; // 10 ArchiveScope scope; // 30 }; RED4EXT_ASSERT_SIZE(ArchiveGroup, 0x38); @@ -50,7 +50,7 @@ struct ResourceDepot uint64_t unk08; // 08 DynArray groups; // 10 DynArray unk20; // 20 - CString rootPath; // 30 + String rootPath; // 30 bool hasModArchives; // 50 }; RED4EXT_ASSERT_SIZE(ResourceDepot, 0x58); diff --git a/include/RED4ext/Scripting/Natives/Generated/AI/CTreeNodeDebugLogDefinition.hpp b/include/RED4ext/Scripting/Natives/Generated/AI/CTreeNodeDebugLogDefinition.hpp index 817356b65..760ded87d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/AI/CTreeNodeDebugLogDefinition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/AI/CTreeNodeDebugLogDefinition.hpp @@ -18,7 +18,7 @@ struct CTreeNodeDebugLogDefinition : AI::CTreeExtendableNodeDefinition static constexpr const char* NAME = "AICTreeNodeDebugLogDefinition"; static constexpr const char* ALIAS = NAME; - CString text; // 48 + String text; // 48 float timeOnScreen; // 68 bool useVisualDebug; // 6C uint8_t unk6D[0x70 - 0x6D]; // 6D diff --git a/include/RED4ext/Scripting/Natives/Generated/AI/behavior/AgentInfoDebuggerCommand.hpp b/include/RED4ext/Scripting/Natives/Generated/AI/behavior/AgentInfoDebuggerCommand.hpp index 88776e58f..5c4d468ca 100644 --- a/include/RED4ext/Scripting/Natives/Generated/AI/behavior/AgentInfoDebuggerCommand.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/AI/behavior/AgentInfoDebuggerCommand.hpp @@ -22,7 +22,7 @@ struct AgentInfoDebuggerCommand : AI::behavior::IDebuggerCommand static constexpr const char* ALIAS = NAME; ent::EntityID entityId; // 30 - CString agentName; // 38 + String agentName; // 38 bool isSelected; // 58 uint8_t unk59[0x60 - 0x59]; // 59 DynArray entries; // 60 diff --git a/include/RED4ext/Scripting/Natives/Generated/AI/behavior/AgentInfoDebuggerCommandEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/AI/behavior/AgentInfoDebuggerCommandEntry.hpp index b2a8e86b4..714efb7ad 100644 --- a/include/RED4ext/Scripting/Natives/Generated/AI/behavior/AgentInfoDebuggerCommandEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/AI/behavior/AgentInfoDebuggerCommandEntry.hpp @@ -19,7 +19,7 @@ struct AgentInfoDebuggerCommandEntry static constexpr const char* ALIAS = NAME; AI::behavior::BehaviorInstanceCallStack callStack; // 00 - CString behaviorResourcePath; // 18 + String behaviorResourcePath; // 18 }; RED4EXT_ASSERT_SIZE(AgentInfoDebuggerCommandEntry, 0x38); } // namespace AI::behavior diff --git a/include/RED4ext/Scripting/Natives/Generated/AI/behavior/BehaviorIncludedDebuggerCommandEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/AI/behavior/BehaviorIncludedDebuggerCommandEntry.hpp index e5204923b..332fe4004 100644 --- a/include/RED4ext/Scripting/Natives/Generated/AI/behavior/BehaviorIncludedDebuggerCommandEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/AI/behavior/BehaviorIncludedDebuggerCommandEntry.hpp @@ -18,7 +18,7 @@ struct BehaviorIncludedDebuggerCommandEntry static constexpr const char* ALIAS = NAME; CGUID nodeId; // 00 - CString includedBehaviorResourcePath; // 10 + String includedBehaviorResourcePath; // 10 }; RED4EXT_ASSERT_SIZE(BehaviorIncludedDebuggerCommandEntry, 0x30); } // namespace AI::behavior diff --git a/include/RED4ext/Scripting/Natives/Generated/AI/behavior/DebugInfoBase.hpp b/include/RED4ext/Scripting/Natives/Generated/AI/behavior/DebugInfoBase.hpp index 2c917fbcc..3025e6eee 100644 --- a/include/RED4ext/Scripting/Natives/Generated/AI/behavior/DebugInfoBase.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/AI/behavior/DebugInfoBase.hpp @@ -18,7 +18,7 @@ struct DebugInfoBase : ISerializable static constexpr const char* NAME = "AIbehaviorDebugInfoBase"; static constexpr const char* ALIAS = NAME; - CString caption; // 30 + String caption; // 30 }; RED4EXT_ASSERT_SIZE(DebugInfoBase, 0x50); } // namespace AI::behavior diff --git a/include/RED4ext/Scripting/Natives/Generated/AbsolutePathSerializable.hpp b/include/RED4ext/Scripting/Natives/Generated/AbsolutePathSerializable.hpp index 08c4307f2..769d12d3e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/AbsolutePathSerializable.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/AbsolutePathSerializable.hpp @@ -15,7 +15,7 @@ struct AbsolutePathSerializable static constexpr const char* NAME = "AbsolutePathSerializable"; static constexpr const char* ALIAS = NAME; - CString Path; // 00 + String Path; // 00 }; RED4EXT_ASSERT_SIZE(AbsolutePathSerializable, 0x20); } // namespace RED4ext diff --git a/include/RED4ext/Scripting/Natives/Generated/C2dArray.hpp b/include/RED4ext/Scripting/Natives/Generated/C2dArray.hpp index ac0cabb74..34e4568c8 100644 --- a/include/RED4ext/Scripting/Natives/Generated/C2dArray.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/C2dArray.hpp @@ -17,8 +17,8 @@ struct C2dArray : CResource static constexpr const char* NAME = "C2dArray"; static constexpr const char* ALIAS = NAME; - DynArray headers; // 40 - DynArray> data; // 50 + DynArray headers; // 40 + DynArray> data; // 50 }; RED4EXT_ASSERT_SIZE(C2dArray, 0x60); } // namespace RED4ext diff --git a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryPoolRuntimeData.hpp b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryPoolRuntimeData.hpp index be8f4dfce..b328d7d1e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryPoolRuntimeData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryPoolRuntimeData.hpp @@ -17,7 +17,7 @@ struct FunctionalTestsDataMemoryPoolRuntimeData : ISerializable static constexpr const char* ALIAS = NAME; uint8_t unk30[0x38 - 0x30]; // 30 - CString poolName; // 38 + String poolName; // 38 int64_t bytesAllocated; // 58 int64_t allocationCount; // 60 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryPoolStaticData.hpp b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryPoolStaticData.hpp index ae24e7ef1..5bababc85 100644 --- a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryPoolStaticData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryPoolStaticData.hpp @@ -18,11 +18,11 @@ struct FunctionalTestsDataMemoryPoolStaticData : ISerializable static constexpr const char* ALIAS = NAME; uint8_t unk30[0x38 - 0x30]; // 30 - CString poolName; // 38 + String poolName; // 38 int64_t budget; // 58 int64_t childrenBudget; // 60 - DynArray children; // 68 - CString parent; // 78 + DynArray children; // 68 + String parent; // 78 uint8_t unk98[0xA0 - 0x98]; // 98 }; RED4EXT_ASSERT_SIZE(FunctionalTestsDataMemoryPoolStaticData, 0xA0); diff --git a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryStatsData.hpp b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryStatsData.hpp index 357165cb5..b1aec7165 100644 --- a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryStatsData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataMemoryStatsData.hpp @@ -35,8 +35,8 @@ struct FunctionalTestsDataMemoryStatsData : ISerializable uint8_t unk8C[0x90 - 0x8C]; // 8C double engineTime; // 90 uint64_t rawLocalTime; // 98 - CString playerPosition; // A0 - CString playerOrientation; // C0 + String playerPosition; // A0 + String playerOrientation; // C0 DynArray poolsRuntimeInfo; // E0 DynArray poolsCurrentInfo; // F0 uint8_t unk100[0x140 - 0x100]; // 100 diff --git a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataRenderingStatsData.hpp b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataRenderingStatsData.hpp index c83a11d79..9a60bfcca 100644 --- a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataRenderingStatsData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataRenderingStatsData.hpp @@ -19,8 +19,8 @@ struct FunctionalTestsDataRenderingStatsData : ISerializable uint8_t unk30[0x38 - 0x30]; // 30 uint64_t engineTick; // 38 uint64_t rawLocalTime; // 40 - CString playerPosition; // 48 - CString playerOrientation; // 68 + String playerPosition; // 48 + String playerOrientation; // 68 uint32_t meshChunkCount; // 88 uint32_t cameraTriangleCount; // 8C uint32_t shadowTriangleCount; // 90 diff --git a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataTimeStatsData.hpp b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataTimeStatsData.hpp index 158901da8..363ca3711 100644 --- a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataTimeStatsData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsDataTimeStatsData.hpp @@ -26,8 +26,8 @@ struct FunctionalTestsDataTimeStatsData : ISerializable float cpuTime; // 58 float gpuTime; // 5C uint64_t rawLocalTime; // 60 - CString playerPosition; // 68 - CString playerOrientation; // 88 + String playerPosition; // 68 + String playerOrientation; // 88 uint8_t unkA8[0xE8 - 0xA8]; // A8 }; RED4EXT_ASSERT_SIZE(FunctionalTestsDataTimeStatsData, 0xE8); diff --git a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsResult.hpp b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsResult.hpp index b6d5fa487..d21c8a6ee 100644 --- a/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsResult.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/FunctionalTestsResult.hpp @@ -18,7 +18,7 @@ struct FunctionalTestsResult FunctionalTestsResultCode code; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString msg; // 08 + String msg; // 08 }; RED4EXT_ASSERT_SIZE(FunctionalTestsResult, 0x28); using FTResult = FunctionalTestsResult; diff --git a/include/RED4ext/Scripting/Natives/Generated/GameplayFunctionalTestReturnValue.hpp b/include/RED4ext/Scripting/Natives/Generated/GameplayFunctionalTestReturnValue.hpp index 838d5e3da..928025af0 100644 --- a/include/RED4ext/Scripting/Natives/Generated/GameplayFunctionalTestReturnValue.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/GameplayFunctionalTestReturnValue.hpp @@ -15,8 +15,8 @@ struct GameplayFunctionalTestReturnValue static constexpr const char* NAME = "GameplayFunctionalTestReturnValue"; static constexpr const char* ALIAS = NAME; - CString value; // 00 - CString errorInfo; // 20 + String value; // 00 + String errorInfo; // 20 }; RED4EXT_ASSERT_SIZE(GameplayFunctionalTestReturnValue, 0x40); } // namespace RED4ext diff --git a/include/RED4ext/Scripting/Natives/Generated/IParticleModule.hpp b/include/RED4ext/Scripting/Natives/Generated/IParticleModule.hpp index b391c5529..0ca69dd27 100644 --- a/include/RED4ext/Scripting/Natives/Generated/IParticleModule.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/IParticleModule.hpp @@ -16,8 +16,8 @@ struct IParticleModule : ISerializable static constexpr const char* NAME = "IParticleModule"; static constexpr const char* ALIAS = NAME; - CString editorName; // 30 - CString editorGroup; // 50 + String editorName; // 30 + String editorGroup; // 50 uint8_t unk70[0x74 - 0x70]; // 70 bool isEnabled; // 74 uint8_t unk75[0x78 - 0x75]; // 75 diff --git a/include/RED4ext/Scripting/Natives/Generated/ParamData.hpp b/include/RED4ext/Scripting/Natives/Generated/ParamData.hpp index 1386df349..02bb946cf 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ParamData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ParamData.hpp @@ -15,8 +15,8 @@ struct ParamData static constexpr const char* NAME = "ParamData"; static constexpr const char* ALIAS = NAME; - CString name; // 00 - CString type; // 20 + String name; // 00 + String type; // 20 Variant defaultValue; // 40 }; RED4EXT_ASSERT_SIZE(ParamData, 0x58); diff --git a/include/RED4ext/Scripting/Natives/Generated/SampleMapArrayElement.hpp b/include/RED4ext/Scripting/Natives/Generated/SampleMapArrayElement.hpp index 6ce9b98b9..6a78a9b96 100644 --- a/include/RED4ext/Scripting/Natives/Generated/SampleMapArrayElement.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/SampleMapArrayElement.hpp @@ -18,8 +18,8 @@ struct SampleMapArrayElement uint32_t myKey; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString someStringProperty; // 08 - DynArray someArrayProperty; // 28 + String someStringProperty; // 08 + DynArray someArrayProperty; // 28 }; RED4EXT_ASSERT_SIZE(SampleMapArrayElement, 0x38); } // namespace RED4ext diff --git a/include/RED4ext/Scripting/Natives/Generated/Sample_All_Supported_Replicated_Types.hpp b/include/RED4ext/Scripting/Natives/Generated/Sample_All_Supported_Replicated_Types.hpp index cbe8bab6a..c531a1336 100644 --- a/include/RED4ext/Scripting/Natives/Generated/Sample_All_Supported_Replicated_Types.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/Sample_All_Supported_Replicated_Types.hpp @@ -36,7 +36,7 @@ struct Sample_All_Supported_Replicated_Types uint8_t unk24[0x28 - 0x24]; // 24 double double; // 28 CName name; // 30 - CString string; // 38 + String string; // 38 Sample_Replicated_Enum enum; // 58 Sample_Replicated_Struct struct; // 5C DynArray dynamicArray; // 60 diff --git a/include/RED4ext/Scripting/Natives/Generated/Sample_Replicated_Dynamic_Array_Property.hpp b/include/RED4ext/Scripting/Natives/Generated/Sample_Replicated_Dynamic_Array_Property.hpp index 821dc20e3..edc914178 100644 --- a/include/RED4ext/Scripting/Natives/Generated/Sample_Replicated_Dynamic_Array_Property.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/Sample_Replicated_Dynamic_Array_Property.hpp @@ -16,7 +16,7 @@ struct Sample_Replicated_Dynamic_Array_Property static constexpr const char* NAME = "Sample_Replicated_Dynamic_Array_Property"; static constexpr const char* ALIAS = NAME; - DynArray property; // 00 + DynArray property; // 00 }; RED4EXT_ASSERT_SIZE(Sample_Replicated_Dynamic_Array_Property, 0x10); } // namespace RED4ext diff --git a/include/RED4ext/Scripting/Natives/Generated/Sample_Replicated_String_Property.hpp b/include/RED4ext/Scripting/Natives/Generated/Sample_Replicated_String_Property.hpp index 912784cc9..061d49fe5 100644 --- a/include/RED4ext/Scripting/Natives/Generated/Sample_Replicated_String_Property.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/Sample_Replicated_String_Property.hpp @@ -15,7 +15,7 @@ struct Sample_Replicated_String_Property static constexpr const char* NAME = "Sample_Replicated_String_Property"; static constexpr const char* ALIAS = NAME; - CString property; // 00 + String property; // 00 }; RED4EXT_ASSERT_SIZE(Sample_Replicated_String_Property, 0x20); } // namespace RED4ext diff --git a/include/RED4ext/Scripting/Natives/Generated/ShaderDefine.hpp b/include/RED4ext/Scripting/Natives/Generated/ShaderDefine.hpp index e11d9a64d..454e5f949 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ShaderDefine.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ShaderDefine.hpp @@ -15,8 +15,8 @@ struct ShaderDefine static constexpr const char* NAME = "ShaderDefine"; static constexpr const char* ALIAS = NAME; - CString name; // 00 - CString value; // 20 + String name; // 00 + String value; // 20 }; RED4EXT_ASSERT_SIZE(ShaderDefine, 0x40); } // namespace RED4ext diff --git a/include/RED4ext/Scripting/Natives/Generated/TestStep.hpp b/include/RED4ext/Scripting/Natives/Generated/TestStep.hpp index 1e52f0b1f..77dabe1a3 100644 --- a/include/RED4ext/Scripting/Natives/Generated/TestStep.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/TestStep.hpp @@ -22,7 +22,7 @@ struct TestStep : IScriptable uint8_t unk48[0x4A - 0x48]; // 48 uint16_t scriptId; // 4A uint8_t unk4C[0x50 - 0x4C]; // 4C - CString reproStep; // 50 + String reproStep; // 50 DynArray args; // 70 uint8_t unk80[0xA8 - 0x80]; // 80 float stepTimeout; // A8 diff --git a/include/RED4ext/Scripting/Natives/Generated/XmlResource.hpp b/include/RED4ext/Scripting/Natives/Generated/XmlResource.hpp index 98cdb1dd0..7115562b2 100644 --- a/include/RED4ext/Scripting/Natives/Generated/XmlResource.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/XmlResource.hpp @@ -16,7 +16,7 @@ struct XmlResource : CResource static constexpr const char* NAME = "XmlResource"; static constexpr const char* ALIAS = NAME; - CString data; // 40 + String data; // 40 uint8_t unk60[0x68 - 0x60]; // 60 }; RED4EXT_ASSERT_SIZE(XmlResource, 0x68); diff --git a/include/RED4ext/Scripting/Natives/Generated/at_ui/UserData.hpp b/include/RED4ext/Scripting/Natives/Generated/at_ui/UserData.hpp index c6f583ed3..4618f3b61 100644 --- a/include/RED4ext/Scripting/Natives/Generated/at_ui/UserData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/at_ui/UserData.hpp @@ -18,7 +18,7 @@ struct UserData : ink::UserData static constexpr const char* NAME = "at_uiUserData"; static constexpr const char* ALIAS = NAME; - CString atid; // 40 + String atid; // 40 }; RED4EXT_ASSERT_SIZE(UserData, 0x60); } // namespace at_ui diff --git a/include/RED4ext/Scripting/Natives/Generated/attr/Choice.hpp b/include/RED4ext/Scripting/Natives/Generated/attr/Choice.hpp index 039891d19..03d3321dc 100644 --- a/include/RED4ext/Scripting/Natives/Generated/attr/Choice.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/attr/Choice.hpp @@ -19,7 +19,7 @@ struct Choice : attr::Attribute static constexpr const char* NAME = "attrChoice"; static constexpr const char* ALIAS = NAME; - DynArray tions; // 30 + DynArray tions; // 30 }; RED4EXT_ASSERT_SIZE(Choice, 0x40); } // namespace attr diff --git a/include/RED4ext/Scripting/Natives/Generated/attr/Icon.hpp b/include/RED4ext/Scripting/Natives/Generated/attr/Icon.hpp index 5411806ac..fb2e054cf 100644 --- a/include/RED4ext/Scripting/Natives/Generated/attr/Icon.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/attr/Icon.hpp @@ -18,7 +18,7 @@ struct Icon : attr::Attribute static constexpr const char* NAME = "attrIcon"; static constexpr const char* ALIAS = NAME; - CString onName; // 30 + String onName; // 30 }; RED4EXT_ASSERT_SIZE(Icon, 0x50); } // namespace attr diff --git a/include/RED4ext/Scripting/Natives/Generated/attr/Label.hpp b/include/RED4ext/Scripting/Natives/Generated/attr/Label.hpp index 2a20f60a8..92a0b6c22 100644 --- a/include/RED4ext/Scripting/Natives/Generated/attr/Label.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/attr/Label.hpp @@ -18,7 +18,7 @@ struct Label : attr::Attribute static constexpr const char* NAME = "attrLabel"; static constexpr const char* ALIAS = NAME; - CString xt; // 30 + String xt; // 30 }; RED4EXT_ASSERT_SIZE(Label, 0x50); } // namespace attr diff --git a/include/RED4ext/Scripting/Natives/Generated/attr/ToggleBtn.hpp b/include/RED4ext/Scripting/Natives/Generated/attr/ToggleBtn.hpp index 6018b5bb3..f294a2982 100644 --- a/include/RED4ext/Scripting/Natives/Generated/attr/ToggleBtn.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/attr/ToggleBtn.hpp @@ -18,7 +18,7 @@ struct ToggleBtn : attr::Attribute static constexpr const char* NAME = "attrToggleBtn"; static constexpr const char* ALIAS = NAME; - CString nLabel; // 30 + String nLabel; // 30 }; RED4EXT_ASSERT_SIZE(ToggleBtn, 0x50); } // namespace attr diff --git a/include/RED4ext/Scripting/Natives/Generated/attr/Tooltip.hpp b/include/RED4ext/Scripting/Natives/Generated/attr/Tooltip.hpp index 85d81759e..67b4300a0 100644 --- a/include/RED4ext/Scripting/Natives/Generated/attr/Tooltip.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/attr/Tooltip.hpp @@ -18,7 +18,7 @@ struct Tooltip : attr::Attribute static constexpr const char* NAME = "attrTooltip"; static constexpr const char* ALIAS = NAME; - CString xt; // 30 + String xt; // 30 }; RED4EXT_ASSERT_SIZE(Tooltip, 0x50); } // namespace attr diff --git a/include/RED4ext/Scripting/Natives/Generated/audio/Language.hpp b/include/RED4ext/Scripting/Natives/Generated/audio/Language.hpp index 98c7235b6..148527e86 100644 --- a/include/RED4ext/Scripting/Natives/Generated/audio/Language.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/audio/Language.hpp @@ -17,8 +17,8 @@ struct Language static constexpr const char* NAME = "audioLanguage"; static constexpr const char* ALIAS = NAME; - CString longName; // 00 - CString codeName; // 20 + String longName; // 00 + String codeName; // 20 bool hasVO; // 40 uint8_t unk41[0x48 - 0x41]; // 41 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/audio/PoliceDispatcherMetadata.hpp b/include/RED4ext/Scripting/Natives/Generated/audio/PoliceDispatcherMetadata.hpp index 0c0795c21..2c8c4b5ae 100644 --- a/include/RED4ext/Scripting/Natives/Generated/audio/PoliceDispatcherMetadata.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/audio/PoliceDispatcherMetadata.hpp @@ -26,7 +26,7 @@ struct PoliceDispatcherMetadata : audio::AudioMetadata DynArray playerChaseEndInputs; // 68 float dispatcherTimeInterval; // 78 uint8_t unk7C[0x80 - 0x7C]; // 7C - CString sceneFilePath; // 80 + String sceneFilePath; // 80 uint8_t unkA0[0xA8 - 0xA0]; // A0 }; RED4EXT_ASSERT_SIZE(PoliceDispatcherMetadata, 0xA8); diff --git a/include/RED4ext/Scripting/Natives/Generated/ent/Debug_MeshComponent.hpp b/include/RED4ext/Scripting/Natives/Generated/ent/Debug_MeshComponent.hpp index 8df207d1f..808c9f91d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ent/Debug_MeshComponent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ent/Debug_MeshComponent.hpp @@ -18,7 +18,7 @@ struct __declspec(align(0x10)) Debug_MeshComponent : ent::MeshComponent static constexpr const char* NAME = "entDebug_MeshComponent"; static constexpr const char* ALIAS = NAME; - CString filterName; // 1E0 + String filterName; // 1E0 uint8_t unk200[0x430 - 0x200]; // 200 }; RED4EXT_ASSERT_SIZE(Debug_MeshComponent, 0x430); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/AvailableAnimset.hpp b/include/RED4ext/Scripting/Natives/Generated/game/AvailableAnimset.hpp index bf7b29a20..b3e842d8b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/AvailableAnimset.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/AvailableAnimset.hpp @@ -18,7 +18,7 @@ struct AvailableAnimset static constexpr const char* ALIAS = NAME; uint64_t hash; // 00 - CString resourcePath; // 08 + String resourcePath; // 08 }; RED4EXT_ASSERT_SIZE(AvailableAnimset, 0x28); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/BinkVideoEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/game/BinkVideoEvent.hpp index aed37e1e5..1d845ef62 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/BinkVideoEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/BinkVideoEvent.hpp @@ -19,7 +19,7 @@ struct BinkVideoEvent : red::Event static constexpr const char* NAME = "gameBinkVideoEvent"; static constexpr const char* ALIAS = NAME; - CString videoPath; // 40 + String videoPath; // 40 game::BinkVideoAction action; // 60 uint8_t unk61[0x68 - 0x61]; // 61 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/DebugPath.hpp b/include/RED4ext/Scripting/Natives/Generated/game/DebugPath.hpp index ed3290334..df0f48122 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/DebugPath.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/DebugPath.hpp @@ -17,7 +17,7 @@ struct DebugPath static constexpr const char* NAME = "gameDebugPath"; static constexpr const char* ALIAS = NAME; - CString str; // 00 + String str; // 00 uint8_t unk20[0x28 - 0x20]; // 20 }; RED4EXT_ASSERT_SIZE(DebugPath, 0x28); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/EffectInfoEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/game/EffectInfoEvent.hpp index e81dbeb8c..169b28cfb 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/EffectInfoEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/EffectInfoEvent.hpp @@ -18,7 +18,7 @@ struct EffectInfoEvent : red::Event static constexpr const char* NAME = "gameEffectInfoEvent"; static constexpr const char* ALIAS = "EffectInfoEvent"; - CString tag; // 40 + String tag; // 40 uint32_t entitiesGathered; // 60 uint32_t entitiesFiltered; // 64 uint32_t entitiesProcessed; // 68 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/EffectParameter_StringEvaluator_Value.hpp b/include/RED4ext/Scripting/Natives/Generated/game/EffectParameter_StringEvaluator_Value.hpp index dd461d165..12c64610a 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/EffectParameter_StringEvaluator_Value.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/EffectParameter_StringEvaluator_Value.hpp @@ -18,7 +18,7 @@ struct EffectParameter_StringEvaluator_Value : game::IEffectParameter_StringEval static constexpr const char* NAME = "gameEffectParameter_StringEvaluator_Value"; static constexpr const char* ALIAS = NAME; - CString value; // 30 + String value; // 30 }; RED4EXT_ASSERT_SIZE(EffectParameter_StringEvaluator_Value, 0x50); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/EffectParameter_StringEvaluator_ValueOrBlackboard.hpp b/include/RED4ext/Scripting/Natives/Generated/game/EffectParameter_StringEvaluator_ValueOrBlackboard.hpp index 72911c7d7..43112cb79 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/EffectParameter_StringEvaluator_ValueOrBlackboard.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/EffectParameter_StringEvaluator_ValueOrBlackboard.hpp @@ -20,7 +20,7 @@ struct EffectParameter_StringEvaluator_ValueOrBlackboard : game::IEffectParamete static constexpr const char* ALIAS = NAME; game::BlackboardPropertyBindingDefinition blackboardProperty; // 30 - CString value; // 68 + String value; // 68 }; RED4EXT_ASSERT_SIZE(EffectParameter_StringEvaluator_ValueOrBlackboard, 0x88); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/EntityToAppearancesAndColorVariantsMapEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/game/EntityToAppearancesAndColorVariantsMapEntry.hpp index aacafed9d..eb029b999 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/EntityToAppearancesAndColorVariantsMapEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/EntityToAppearancesAndColorVariantsMapEntry.hpp @@ -21,7 +21,7 @@ struct EntityToAppearancesAndColorVariantsMapEntry : ISerializable static constexpr const char* ALIAS = NAME; uint64_t entityPathHash; // 30 - CString debugEntityPath; // 38 + String debugEntityPath; // 38 DynArray appearancesAndTheirColorVariants; // 58 }; RED4EXT_ASSERT_SIZE(EntityToAppearancesAndColorVariantsMapEntry, 0x68); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemAbility.hpp b/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemAbility.hpp index 9ed627994..1ce5afcd5 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemAbility.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemAbility.hpp @@ -22,8 +22,8 @@ struct InventoryItemAbility static constexpr const char* ALIAS = "InventoryItemAbility"; CName IconPath; // 00 - CString Title; // 08 - CString Description; // 28 + String Title; // 08 + String Description; // 28 Handle LocalizationDataPackage; // 48 }; RED4EXT_ASSERT_SIZE(InventoryItemAbility, 0x58); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemAttachments.hpp b/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemAttachments.hpp index a9ce29be4..08b48f320 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemAttachments.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemAttachments.hpp @@ -22,7 +22,7 @@ struct InventoryItemAttachments : IScriptable TweakDBID SlotID; // 40 game::InventoryItemData ItemData; // 48 - CString SlotName; // 2A8 + String SlotName; // 2A8 game::InventoryItemAttachmentType SlotType; // 2C8 uint8_t unk2CC[0x2D0 - 0x2CC]; // 2CC }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemData.hpp index 609bdfa19..d59f28eb5 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemData.hpp @@ -36,7 +36,7 @@ struct InventoryItemData ItemID ID; // 00 TweakDBID SlotID; // 10 - CString Name; // 18 + String Name; // 18 CName Quality; // 38 float QualityF; // 40 int32_t Quantity; // 44 @@ -44,14 +44,14 @@ struct InventoryItemData game::InventoryItemShape Shape; // 4C game::InventoryItemShape ItemShape; // 4D uint8_t unk4E[0x50 - 0x4E]; // 4E - CString IconPath; // 50 - CString CategoryName; // 70 + String IconPath; // 50 + String CategoryName; // 70 game::data::ItemType ItemType; // 90 uint8_t unk94[0x98 - 0x94]; // 94 - CString LocalizedItemType; // 98 - CString Description; // B8 - CString AdditionalDescription; // D8 - CString GameplayDescription; // F8 + String LocalizedItemType; // 98 + String Description; // B8 + String AdditionalDescription; // D8 + String GameplayDescription; // F8 float Price; // 118 float BuyPrice; // 11C float UnlockProgress; // 120 @@ -96,7 +96,7 @@ struct InventoryItemData game::InventoryItemSortData SortData; // 1F0 bool IsPerkRequired; // 230 uint8_t unk231[0x238 - 0x231]; // 231 - CString PerkRequiredName; // 238 + String PerkRequiredName; // 238 bool IsCrafted; // 258 bool IsIconic; // 259 uint8_t unk25A[0x260 - 0x25A]; // 25A diff --git a/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemSortData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemSortData.hpp index 55c59ee76..40929dbe1 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemSortData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/InventoryItemSortData.hpp @@ -17,7 +17,7 @@ struct InventoryItemSortData static constexpr const char* NAME = "gameInventoryItemSortData"; static constexpr const char* ALIAS = "InventoryItemSortData"; - CString Name; // 00 + String Name; // 00 int32_t Quality; // 20 int32_t Price; // 24 float Weight; // 28 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ItemViewData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ItemViewData.hpp index 0a5cd5925..a059fa610 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ItemViewData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ItemViewData.hpp @@ -21,10 +21,10 @@ struct ItemViewData static constexpr const char* ALIAS = "ItemViewData"; ItemID id; // 00 - CString itemName; // 10 - CString categoryName; // 30 - CString description; // 50 - CString quality; // 70 + String itemName; // 10 + String categoryName; // 30 + String description; // 50 + String quality; // 70 float price; // 90 bool isBroken; // 94 uint8_t unk95[0x98 - 0x95]; // 95 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalDescriptorResource.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalDescriptorResource.hpp index 2734abc9e..17d160579 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalDescriptorResource.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalDescriptorResource.hpp @@ -19,7 +19,7 @@ struct JournalDescriptorResource : game::JournalBaseResource static constexpr const char* NAME = "gameJournalDescriptorResource"; static constexpr const char* ALIAS = NAME; - DynArray entriesActivatedAtStart; // 40 + DynArray entriesActivatedAtStart; // 40 }; RED4EXT_ASSERT_SIZE(JournalDescriptorResource, 0x50); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalEntry.hpp index 37108d91e..884ca595e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalEntry.hpp @@ -20,7 +20,7 @@ struct JournalEntry : IScriptable static constexpr const char* NAME = "gameJournalEntry"; static constexpr const char* ALIAS = "JournalEntry"; - CString id; // 40 + String id; // 40 DynArray journalEntryOverrideDataList; // 60 }; RED4EXT_ASSERT_SIZE(JournalEntry, 0x70); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalEntryStateChangeData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalEntryStateChangeData.hpp index 4c5b6d599..1168d6ff7 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalEntryStateChangeData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalEntryStateChangeData.hpp @@ -25,7 +25,7 @@ struct JournalEntryStateChangeData static constexpr const char* ALIAS = NAME; Handle entryPath; // 00 - CString entryName; // 10 + String entryName; // 10 CName entryType; // 30 bool isEntryTracked; // 38 bool isQuestEntryTracked; // 39 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalFile.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalFile.hpp index f4115280d..c186499c0 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalFile.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalFile.hpp @@ -23,7 +23,7 @@ struct JournalFile : game::JournalEntry LocalizationString title; // 70 LocalizationString content; // 98 RaRef videoResource; // C0 - CString PictureFilename_legacy_; // C8 -- PictureFilename(legacy) + String PictureFilename_legacy_; // C8 -- PictureFilename(legacy) TweakDBID pictureTweak; // E8 }; RED4EXT_ASSERT_SIZE(JournalFile, 0xF0); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalInternetBase.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalInternetBase.hpp index 8dc17ac10..281c1bffb 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalInternetBase.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalInternetBase.hpp @@ -21,7 +21,7 @@ struct JournalInternetBase : IScriptable static constexpr const char* ALIAS = "JournalInternetBase"; CName name; // 40 - CString linkAddress; // 48 + String linkAddress; // 48 Color tintColor; // 68 Color hoverTintColor; // 6C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalInternetPage.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalInternetPage.hpp index c1fa715fb..2b16bb072 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalInternetPage.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalInternetPage.hpp @@ -28,7 +28,7 @@ struct JournalInternetPage : game::JournalEntry static constexpr const char* NAME = "gameJournalInternetPage"; static constexpr const char* ALIAS = "JournalInternetPage"; - CString address; // 70 + String address; // 70 DynArray factsToSet; // 90 RaRef widgetFile; // A0 float scale; // A8 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalMetaQuestScriptedData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalMetaQuestScriptedData.hpp index b794b094f..5fa5ea1d8 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalMetaQuestScriptedData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalMetaQuestScriptedData.hpp @@ -20,7 +20,7 @@ struct JournalMetaQuestScriptedData bool hidden; // 00 uint8_t unk01[0x4 - 0x1]; // 1 uint32_t percent; // 04 - CString text; // 08 + String text; // 08 }; RED4EXT_ASSERT_SIZE(JournalMetaQuestScriptedData, 0x28); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalPath.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalPath.hpp index c36309fe1..9f0da16fa 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalPath.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalPath.hpp @@ -19,7 +19,7 @@ struct JournalPath : IScriptable static constexpr const char* NAME = "gameJournalPath"; static constexpr const char* ALIAS = NAME; - CString realPath; // 40 + String realPath; // 40 uint8_t unk60[0x80 - 0x60]; // 60 CName className; // 80 int32_t fileEntryIndex; // 88 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalQuest.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalQuest.hpp index 56ffffa56..fd30bf9ed 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalQuest.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalQuest.hpp @@ -23,7 +23,7 @@ struct JournalQuest : game::JournalFileEntry game::JournalQuestType type; // C8 TweakDBID recommendedLevelID; // CC uint8_t unkD4[0xD8 - 0xD4]; // D4 - CString districtID; // D8 + String districtID; // D8 }; RED4EXT_ASSERT_SIZE(JournalQuest, 0xF8); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/JournalQuestObjectiveBase.hpp b/include/RED4ext/Scripting/Natives/Generated/game/JournalQuestObjectiveBase.hpp index e28ea48fa..cfa69c2a2 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/JournalQuestObjectiveBase.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/JournalQuestObjectiveBase.hpp @@ -23,7 +23,7 @@ struct JournalQuestObjectiveBase : game::JournalContainerEntry bool optional; // B4 uint8_t unkB5[0xB8 - 0xB5]; // B5 NodeRef locationPrefabRef; // B8 - CString districtID; // C0 + String districtID; // C0 TweakDBID itemID; // E0 }; RED4EXT_ASSERT_SIZE(JournalQuestObjectiveBase, 0xE8); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/MeleeAttackData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/MeleeAttackData.hpp index 6de550bee..0248f2f43 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/MeleeAttackData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/MeleeAttackData.hpp @@ -21,7 +21,7 @@ struct __declspec(align(0x10)) MeleeAttackData : IScriptable static constexpr const char* NAME = "gameMeleeAttackData"; static constexpr const char* ALIAS = "MeleeAttackData"; - CString trailAttackSide; // 40 + String trailAttackSide; // 40 bool isThrust; // 60 bool useMiddlePosition; // 61 uint8_t unk62[0x70 - 0x62]; // 62 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/MuppetComparisonReportItem.hpp b/include/RED4ext/Scripting/Natives/Generated/game/MuppetComparisonReportItem.hpp index f7ed8a44f..6b9e6a0ee 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/MuppetComparisonReportItem.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/MuppetComparisonReportItem.hpp @@ -20,9 +20,9 @@ struct MuppetComparisonReportItem game::MuppetComparisonReportItemType type; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString propertyName; // 08 - CString serverValue; // 28 - CString clientValue; // 48 + String propertyName; // 08 + String serverValue; // 28 + String clientValue; // 48 }; RED4EXT_ASSERT_SIZE(MuppetComparisonReportItem, 0x68); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/OverrideMissShotOffset.hpp b/include/RED4ext/Scripting/Natives/Generated/game/OverrideMissShotOffset.hpp index f1db6070d..5a8c638c8 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/OverrideMissShotOffset.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/OverrideMissShotOffset.hpp @@ -18,7 +18,7 @@ struct OverrideMissShotOffset : red::Event static constexpr const char* NAME = "gameOverrideMissShotOffset"; static constexpr const char* ALIAS = "OverrideMissShotOffset"; - CString overrideRecord; // 40 + String overrideRecord; // 40 }; RED4EXT_ASSERT_SIZE(OverrideMissShotOffset, 0x60); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/Player.hpp b/include/RED4ext/Scripting/Natives/Generated/game/Player.hpp index 48e40a168..fdd9b9f08 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/Player.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/Player.hpp @@ -21,7 +21,7 @@ struct Player uint8_t unk00[0x50 - 0x0]; // 0 net::PeerID peerID; // 50 uint8_t unk51[0x58 - 0x51]; // 51 - CString nickname; // 58 + String nickname; // 58 }; RED4EXT_ASSERT_SIZE(Player, 0x78); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/PlayerSpawnParams.hpp b/include/RED4ext/Scripting/Natives/Generated/game/PlayerSpawnParams.hpp index 38da7929e..50bbc32eb 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/PlayerSpawnParams.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/PlayerSpawnParams.hpp @@ -27,7 +27,7 @@ struct __declspec(align(0x10)) PlayerSpawnParams bool useSpecifiedStartPoint; // 40 bool isSpectator; // 41 uint8_t unk42[0x48 - 0x42]; // 42 - CString nickname; // 48 + String nickname; // 48 uint8_t unk68[0x70 - 0x68]; // 68 }; RED4EXT_ASSERT_SIZE(PlayerSpawnParams, 0x70); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/PopupData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/PopupData.hpp index a6bce1f0e..31fea2377 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/PopupData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/PopupData.hpp @@ -23,8 +23,8 @@ struct PopupData static constexpr const char* NAME = "gamePopupData"; static constexpr const char* ALIAS = "PopupData"; - CString title; // 00 - CString message; // 20 + String title; // 00 + String message; // 20 DynArray> messageOverrideDataList; // 40 TweakDBID iconID; // 50 bool isModal; // 58 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/PrereqCheckData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/PrereqCheckData.hpp index 1da83ae56..9ee50a780 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/PrereqCheckData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/PrereqCheckData.hpp @@ -21,7 +21,7 @@ struct PrereqCheckData game::EPrerequisiteType prereqType; // 00 EComparisonType comparisonType; // 04 - CString contextObject; // 08 + String contextObject; // 08 float valueToCompare; // 28 uint8_t unk2C[0x30 - 0x2C]; // 2C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/PreventionSystemDebugData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/PreventionSystemDebugData.hpp index be2a95ff1..06a8c7648 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/PreventionSystemDebugData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/PreventionSystemDebugData.hpp @@ -45,10 +45,10 @@ struct __declspec(align(0x10)) PreventionSystemDebugData uint32_t awaitedAVSpawnPointsRequestID; // 60 uint8_t unk64[0x70 - 0x64]; // 64 Vector4 lastKnownPosition; // 70 - CString heatChangeReason; // 80 + String heatChangeReason; // 80 bool systemEnabled; // A0 uint8_t unkA1[0xA8 - 0xA1]; // A1 - DynArray systemLockEventSources; // A8 + DynArray systemLockEventSources; // A8 uint8_t unkB8[0xC0 - 0xB8]; // B8 }; RED4EXT_ASSERT_SIZE(PreventionSystemDebugData, 0xC0); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/RewardPack.hpp b/include/RED4ext/Scripting/Natives/Generated/game/RewardPack.hpp index 2ee648b16..0958b7088 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/RewardPack.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/RewardPack.hpp @@ -19,9 +19,9 @@ struct RewardPack static constexpr const char* NAME = "gameRewardPack"; static constexpr const char* ALIAS = "GOGRewardPack"; - CString id; // 00 - CString title; // 20 - CString reason; // 40 + String id; // 00 + String title; // 20 + String reason; // 40 CName iconSlot; // 60 CName group; // 68 CName slotType; // 70 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/SceneTierData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/SceneTierData.hpp index 93c14da31..42fbf17c4 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/SceneTierData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/SceneTierData.hpp @@ -22,7 +22,7 @@ struct SceneTierData : IScriptable GameplayTier tier; // 40 bool emptyHands; // 44 uint8_t unk45[0x48 - 0x45]; // 45 - CString userDebugInfo; // 48 + String userDebugInfo; // 48 }; RED4EXT_ASSERT_SIZE(SceneTierData, 0x68); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/SendAutoDriveNotificationRequest.hpp b/include/RED4ext/Scripting/Natives/Generated/game/SendAutoDriveNotificationRequest.hpp index bc0a4c25f..94b769cf8 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/SendAutoDriveNotificationRequest.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/SendAutoDriveNotificationRequest.hpp @@ -18,7 +18,7 @@ struct SendAutoDriveNotificationRequest : game::ScriptableSystemRequest static constexpr const char* NAME = "gameSendAutoDriveNotificationRequest"; static constexpr const char* ALIAS = "SendAutoDriveNotificationRequest"; - CString locKey; // 48 + String locKey; // 48 bool isDelamain; // 68 uint8_t unk69[0x70 - 0x69]; // 69 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/SimpleScreenMessage.hpp b/include/RED4ext/Scripting/Natives/Generated/game/SimpleScreenMessage.hpp index 43af5771d..988d5c214 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/SimpleScreenMessage.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/SimpleScreenMessage.hpp @@ -21,7 +21,7 @@ struct SimpleScreenMessage bool isShown; // 00 uint8_t unk01[0x4 - 0x1]; // 1 float duration; // 04 - CString message; // 08 + String message; // 08 bool isInstant; // 28 uint8_t unk29[0x2C - 0x29]; // 29 game::SimpleMessageType type; // 2C diff --git a/include/RED4ext/Scripting/Natives/Generated/game/StatViewData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/StatViewData.hpp index 339ac5ab3..07717bc17 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/StatViewData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/StatViewData.hpp @@ -20,7 +20,7 @@ struct StatViewData game::data::StatType type; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString statName; // 08 + String statName; // 08 int32_t value; // 28 int32_t diffValue; // 2C bool isMaxValue; // 30 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/StopAutoDriveRequest.hpp b/include/RED4ext/Scripting/Natives/Generated/game/StopAutoDriveRequest.hpp index 9b08f83d3..841f5871d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/StopAutoDriveRequest.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/StopAutoDriveRequest.hpp @@ -18,7 +18,7 @@ struct StopAutoDriveRequest : game::ScriptableSystemRequest static constexpr const char* NAME = "gameStopAutoDriveRequest"; static constexpr const char* ALIAS = "StopAutoDriveRequest"; - CString locKey; // 48 + String locKey; // 48 bool isDelamain; // 68 uint8_t unk69[0x70 - 0x69]; // 69 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryEnemy.hpp b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryEnemy.hpp index 1d927b7b5..b5fbba418 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryEnemy.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryEnemy.hpp @@ -23,7 +23,7 @@ struct TelemetryEnemy static constexpr const char* ALIAS = "TelemetryEnemy"; TweakDBID characterRecord; // 00 - CString enemyAffiliation; // 08 + String enemyAffiliation; // 08 WeakHandle enemy; // 28 ent::EntityID enemyEntityID; // 38 game::data::ArchetypeType archetype; // 40 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryInventoryItem.hpp b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryInventoryItem.hpp index 2526fddb5..df4eee73f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryInventoryItem.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryInventoryItem.hpp @@ -19,8 +19,8 @@ struct TelemetryInventoryItem static constexpr const char* NAME = "gameTelemetryInventoryItem"; static constexpr const char* ALIAS = "TelemetryInventoryItem"; - CString friendlyName; // 00 - CString localizedName; // 20 + String friendlyName; // 00 + String localizedName; // 20 ItemID itemID; // 40 game::data::Quality quality; // 50 game::data::ItemType itemType; // 54 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryPostMortem.hpp b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryPostMortem.hpp index 58e796f5c..ea6c3e713 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryPostMortem.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryPostMortem.hpp @@ -19,13 +19,13 @@ struct TelemetryPostMortem static constexpr const char* NAME = "gameTelemetryPostMortem"; static constexpr const char* ALIAS = NAME; - CString crashVisitId; // 00 - CString playthroughId; // 20 - CString crashVersion; // 40 - CString crashPatch; // 60 - CString timeCrash; // 80 - CString district; // A0 - CString zoneType; // C0 + String crashVisitId; // 00 + String playthroughId; // 20 + String crashVersion; // 40 + String crashPatch; // 60 + String timeCrash; // 80 + String district; // A0 + String zoneType; // C0 game::TelemetryTrackedQuest trackedQuest; // E0 Vector3 location; // 188 float sessionLength; // 194 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryQuickHack.hpp b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryQuickHack.hpp index 3c7be5752..a1c8525fd 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryQuickHack.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryQuickHack.hpp @@ -20,8 +20,8 @@ struct TelemetryQuickHack static constexpr const char* ALIAS = "TelemetryQuickHack"; CName actionName; // 00 - CString titleLocKey; // 08 - CString targetType; // 28 + String titleLocKey; // 08 + String targetType; // 28 TweakDBID quickHackRecordID; // 48 game::data::Quality quality; // 50 uint8_t unk54[0x58 - 0x54]; // 54 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/TelemetrySourceEntity.hpp b/include/RED4ext/Scripting/Natives/Generated/game/TelemetrySourceEntity.hpp index 6d15e1efd..157021007 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/TelemetrySourceEntity.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/TelemetrySourceEntity.hpp @@ -17,7 +17,7 @@ struct TelemetrySourceEntity static constexpr const char* NAME = "gameTelemetrySourceEntity"; static constexpr const char* ALIAS = "TelemetrySourceEntity"; - CString className; // 00 + String className; // 00 TweakDBID sourceEntityRecord; // 20 }; RED4EXT_ASSERT_SIZE(TelemetrySourceEntity, 0x28); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryTrackedQuest.hpp b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryTrackedQuest.hpp index 62234f11f..2045fea5c 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/TelemetryTrackedQuest.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/TelemetryTrackedQuest.hpp @@ -17,13 +17,13 @@ struct TelemetryTrackedQuest static constexpr const char* NAME = "gameTelemetryTrackedQuest"; static constexpr const char* ALIAS = NAME; - CString name; // 00 - CString objectiveName; // 20 - CString type; // 40 + String name; // 00 + String objectiveName; // 20 + String type; // 40 float distance; // 60 uint8_t unk64[0x68 - 0x64]; // 64 - CString questName; // 68 - CString questType; // 88 + String questName; // 68 + String questType; // 88 }; RED4EXT_ASSERT_SIZE(TelemetryTrackedQuest, 0xA8); } // namespace game diff --git a/include/RED4ext/Scripting/Natives/Generated/game/VendorData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/VendorData.hpp index ecb46bb78..3f837fa0d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/VendorData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/VendorData.hpp @@ -18,7 +18,7 @@ struct VendorData static constexpr const char* NAME = "gameVendorData"; static constexpr const char* ALIAS = "VendorData"; - CString vendorId; // 00 + String vendorId; // 00 ent::EntityID entityID; // 20 bool isActive; // 28 uint8_t unk29[0x30 - 0x29]; // 29 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/data/ComplexValueNode.hpp b/include/RED4ext/Scripting/Natives/Generated/game/data/ComplexValueNode.hpp index 91ec3a380..f7836e1d0 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/data/ComplexValueNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/data/ComplexValueNode.hpp @@ -19,7 +19,7 @@ struct ComplexValueNode : game::data::ValueDataNode static constexpr const char* NAME = "gamedataComplexValueNode"; static constexpr const char* ALIAS = NAME; - DynArray data; // 98 + DynArray data; // 98 }; RED4EXT_ASSERT_SIZE(ComplexValueNode, 0xA8); } // namespace game::data diff --git a/include/RED4ext/Scripting/Natives/Generated/game/data/DataNode.hpp b/include/RED4ext/Scripting/Natives/Generated/game/data/DataNode.hpp index fa2acbc1d..7005c949e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/data/DataNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/data/DataNode.hpp @@ -23,7 +23,7 @@ struct DataNode : ISerializable game::data::DataNodeType nodeType; // 30 uint8_t unk34[0x38 - 0x34]; // 34 - CString fileName; // 38 + String fileName; // 38 WeakHandle parent; // 58 uint8_t unk68[0x98 - 0x68]; // 68 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/data/FileNode.hpp b/include/RED4ext/Scripting/Natives/Generated/game/data/FileNode.hpp index a5de62aff..955b1d195 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/data/FileNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/data/FileNode.hpp @@ -24,7 +24,7 @@ struct FileNode : game::data::DataNode static constexpr const char* NAME = "gamedataFileNode"; static constexpr const char* ALIAS = NAME; - CString packageName; // 98 + String packageName; // 98 uint8_t unkB8[0x2C0 - 0xB8]; // B8 #pragma warning(suppress : 4324) alignas(8) StaticArray, 16> packageDependencies; // 2C0 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/data/GroupNode.hpp b/include/RED4ext/Scripting/Natives/Generated/game/data/GroupNode.hpp index 2f5c52451..ec3a97b0b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/data/GroupNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/data/GroupNode.hpp @@ -26,9 +26,9 @@ struct GroupNode : game::data::DataNode static constexpr const char* NAME = "gamedataGroupNode"; static constexpr const char* ALIAS = NAME; - CString name; // 98 - CString base; // B8 - CString schema; // D8 + String name; // 98 + String base; // B8 + String schema; // D8 bool isInline; // F8 uint8_t unkF9[0x130 - 0xF9]; // F9 WeakHandle baseGroup; // 130 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/data/PackageNode.hpp b/include/RED4ext/Scripting/Natives/Generated/game/data/PackageNode.hpp index ef8b2a92e..35700ff44 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/data/PackageNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/data/PackageNode.hpp @@ -24,7 +24,7 @@ struct PackageNode : ISerializable static constexpr const char* NAME = "gamedataPackageNode"; static constexpr const char* ALIAS = NAME; - CString name; // 30 + String name; // 30 uint8_t unk50[0xA0 - 0x50]; // 50 DynArray> files; // A0 DynArray> serializedVariables; // B0 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/data/SimpleValueNode.hpp b/include/RED4ext/Scripting/Natives/Generated/game/data/SimpleValueNode.hpp index 233f967e0..ec9a13db2 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/data/SimpleValueNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/data/SimpleValueNode.hpp @@ -21,7 +21,7 @@ struct SimpleValueNode : game::data::ValueDataNode game::data::SimpleValueNodeValueType type; // 98 uint8_t unk9C[0xA0 - 0x9C]; // 9C - CString data; // A0 + String data; // A0 uint8_t unkC0[0xD0 - 0xC0]; // C0 }; RED4EXT_ASSERT_SIZE(SimpleValueNode, 0xD0); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/data/VariableNode.hpp b/include/RED4ext/Scripting/Natives/Generated/game/data/VariableNode.hpp index 6600403a6..b15b6a990 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/data/VariableNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/data/VariableNode.hpp @@ -23,8 +23,8 @@ struct VariableNode : game::data::DataNode static constexpr const char* ALIAS = NAME; CName hashedName; // 98 - CString type; // A0 - CString name; // C0 + String type; // A0 + String name; // C0 bool isForeignKey; // E0 bool isArray; // E1 bool hasArrayValues; // E2 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/debug/Failure.hpp b/include/RED4ext/Scripting/Natives/Generated/game/debug/Failure.hpp index b28d942aa..e5a96f5f5 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/debug/Failure.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/debug/Failure.hpp @@ -25,7 +25,7 @@ struct Failure : ISerializable game::debug::FailureId id; // 30 float time; // 38 uint8_t unk3C[0x48 - 0x3C]; // 3C - CString message; // 48 + String message; // 48 game::DebugPath path; // 68 Handle previous; // 90 Handle cause; // A0 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/device/Action.hpp b/include/RED4ext/Scripting/Natives/Generated/game/device/Action.hpp index 01431e9d5..b2758680f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/device/Action.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/device/Action.hpp @@ -23,7 +23,7 @@ struct Action : red::Event CName actionName; // 58 int32_t clearanceLevel; // 60 uint8_t unk64[0x68 - 0x64]; // 64 - CString localizedObjectName; // 68 + String localizedObjectName; // 68 int32_t paymentQuantity; // 88 uint8_t unk8C[0x90 - 0x8C]; // 8C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/device/DataElement.hpp b/include/RED4ext/Scripting/Natives/Generated/game/device/DataElement.hpp index 654ba26e4..b962378a7 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/device/DataElement.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/device/DataElement.hpp @@ -25,10 +25,10 @@ struct DataElement Handle journalPath; // 00 CName documentName; // 10 - CString owner; // 18 - CString date; // 38 - CString title; // 58 - CString content; // 78 + String owner; // 18 + String date; // 38 + String title; // 58 + String content; // 78 red::ResourceReferenceScriptToken videoPath; // 98 game::device::QuestInfo questInfo; // A0 bool isEncrypted; // B0 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/device/GenericDataContent.hpp b/include/RED4ext/Scripting/Natives/Generated/game/device/GenericDataContent.hpp index f8dd54576..952b0cd28 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/device/GenericDataContent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/device/GenericDataContent.hpp @@ -19,7 +19,7 @@ struct GenericDataContent static constexpr const char* NAME = "gamedeviceGenericDataContent"; static constexpr const char* ALIAS = "GenericDataContent"; - CString name; // 00 + String name; // 00 DynArray content; // 20 }; RED4EXT_ASSERT_SIZE(GenericDataContent, 0x30); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/input/ActionDisplayData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/input/ActionDisplayData.hpp index aff4458df..fc197db43 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/input/ActionDisplayData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/input/ActionDisplayData.hpp @@ -21,8 +21,8 @@ struct ActionDisplayData CName name; // 00 bool isHold; // 08 uint8_t unk09[0x10 - 0x9]; // 9 - CString inputDisplayPad; // 10 - CString inputDisplayKeyboard; // 30 + String inputDisplayPad; // 10 + String inputDisplayKeyboard; // 30 }; RED4EXT_ASSERT_SIZE(ActionDisplayData, 0x50); } // namespace game::input diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/CSharedDataDefinition.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/CSharedDataDefinition.hpp index 003e7f9fc..610942308 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/CSharedDataDefinition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/CSharedDataDefinition.hpp @@ -21,7 +21,7 @@ struct CSharedDataDefinition static constexpr const char* NAME = "gameinteractionsCSharedDataDefinition"; static constexpr const char* ALIAS = NAME; - DynArray defaultChoices; // 00 + DynArray defaultChoices; // 00 Handle visualizer; // 10 }; RED4EXT_ASSERT_SIZE(CSharedDataDefinition, 0x20); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/Choice.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/Choice.hpp index 4d65ba465..5b75f1b02 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/Choice.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/Choice.hpp @@ -21,7 +21,7 @@ struct Choice static constexpr const char* NAME = "gameinteractionsChoice"; static constexpr const char* ALIAS = "InteractionChoice"; - CString caption; // 00 + String caption; // 00 game::interactions::ChoiceCaption captionParts; // 20 DynArray data; // 30 game::interactions::ChoiceMetaData choiceMetaData; // 40 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/ChoiceCaptionStringPart.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/ChoiceCaptionStringPart.hpp index 8de868abf..1d45c2738 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/ChoiceCaptionStringPart.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/ChoiceCaptionStringPart.hpp @@ -19,7 +19,7 @@ struct ChoiceCaptionStringPart : game::interactions::ChoiceCaptionPart static constexpr const char* ALIAS = "InteractionChoiceCaptionStringPart"; uint8_t unk40[0x48 - 0x40]; // 40 - CString content; // 48 + String content; // 48 }; RED4EXT_ASSERT_SIZE(ChoiceCaptionStringPart, 0x68); } // namespace game::interactions diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/ChoiceMetaData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/ChoiceMetaData.hpp index 9cb2142bc..10f3de6b9 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/ChoiceMetaData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/ChoiceMetaData.hpp @@ -18,7 +18,7 @@ struct ChoiceMetaData static constexpr const char* NAME = "gameinteractionsChoiceMetaData"; static constexpr const char* ALIAS = "InteractionChoiceMetaData"; - CString tweakDBName; // 00 + String tweakDBName; // 00 TweakDBID tweakDBID; // 20 game::interactions::ChoiceTypeWrapper type; // 28 uint8_t unk2C[0x30 - 0x2C]; // 2C diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/DeviceVisualizerDefinition.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/DeviceVisualizerDefinition.hpp index fe266b53d..2e962bf43 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/DeviceVisualizerDefinition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/DeviceVisualizerDefinition.hpp @@ -24,7 +24,7 @@ struct DeviceVisualizerDefinition : game::interactions::vis::IVisualizerDefiniti game::interactions::vis::InteractionType interactionType; // 48 uint8_t unk49[0x50 - 0x49]; // 49 - CString displayNameOverride; // 50 + String displayNameOverride; // 50 bool isDynamic; // 70 bool useDefaultActionMapping; // 71 bool createMappin; // 72 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/DialogVisualizerDefinition.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/DialogVisualizerDefinition.hpp index d3c541521..28738965d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/DialogVisualizerDefinition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/DialogVisualizerDefinition.hpp @@ -21,7 +21,7 @@ struct DialogVisualizerDefinition : game::interactions::vis::IVisualizerDefiniti static constexpr const char* NAME = "gameinteractionsvisDialogVisualizerDefinition"; static constexpr const char* ALIAS = NAME; - CString displayNameOverride; // 48 + String displayNameOverride; // 48 bool useLookAt; // 68 uint8_t unk69[0x6C - 0x69]; // 69 bool disableAfterSelectingChoice; // 6C diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionChoiceData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionChoiceData.hpp index a873e04c5..83c9f13f4 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionChoiceData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionChoiceData.hpp @@ -26,7 +26,7 @@ struct InteractionChoiceData EInputKey rawInputKey; // 08 bool isHoldAction; // 0C uint8_t unk0D[0x10 - 0xD]; // D - CString localizedName; // 10 + String localizedName; // 10 game::interactions::ChoiceTypeWrapper type; // 30 uint8_t unk34[0x38 - 0x34]; // 34 DynArray data; // 38 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionChoiceHubData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionChoiceHubData.hpp index 1f3a8240f..5a0992b96 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionChoiceHubData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionChoiceHubData.hpp @@ -27,7 +27,7 @@ struct InteractionChoiceHubData game::interactions::vis::EVisualizerDefinitionFlags flags; // 04 bool active; // 06 uint8_t unk07[0x8 - 0x7]; // 7 - CString title; // 08 + String title; // 08 DynArray choices; // 28 WeakHandle timeProvider; // 38 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionDisplayData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionDisplayData.hpp index f0a82c906..bf882926d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionDisplayData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/InteractionDisplayData.hpp @@ -25,7 +25,7 @@ struct InteractionDisplayData EInputKey wInputKey; // 08 bool HoldAction; // 0C uint8_t unk0D[0x10 - 0xD]; // D - CString calizedName; // 10 + String calizedName; // 10 game::interactions::ChoiceTypeWrapper pe; // 30 uint8_t unk34[0x38 - 0x34]; // 34 game::interactions::Choice oice; // 38 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/ListChoiceData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/ListChoiceData.hpp index 0450e87c0..7a098e645 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/ListChoiceData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/ListChoiceData.hpp @@ -23,7 +23,7 @@ struct ListChoiceData static constexpr const char* NAME = "gameinteractionsvisListChoiceData"; static constexpr const char* ALIAS = "ListChoiceData"; - CString localizedName; // 00 + String localizedName; // 00 game::interactions::ChoiceTypeWrapper type; // 20 uint8_t unk24[0x28 - 0x24]; // 24 CName inputActionName; // 28 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/ListChoiceHubData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/ListChoiceHubData.hpp index 3ecaa24c0..67419e532 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/ListChoiceHubData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/ListChoiceHubData.hpp @@ -29,7 +29,7 @@ struct ListChoiceHubData game::interactions::vis::EVisualizerDefinitionFlags flags; // 08 bool isPhoneLockActive; // 0A uint8_t unk0B[0x10 - 0xB]; // B - CString title; // 10 + String title; // 10 DynArray choices; // 30 WeakHandle timeProvider; // 40 uint8_t hubPriority; // 50 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/LootData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/LootData.hpp index 3e5e4ca3f..1dc49da6e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/LootData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/interactions/vis/LootData.hpp @@ -27,7 +27,7 @@ struct LootData uint8_t unk07[0x8 - 0x7]; // 7 int32_t currentIndex; // 08 uint8_t unk0C[0x10 - 0xC]; // C - CString title; // 10 + String title; // 10 ent::EntityID ownerId; // 30 bool isLocked; // 38 uint8_t unk39[0x40 - 0x39]; // 39 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/mappins/MappinData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/mappins/MappinData.hpp index 0cb4ccd59..f24355f32 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/mappins/MappinData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/mappins/MappinData.hpp @@ -25,7 +25,7 @@ struct MappinData : game::mappins::IMappinData TweakDBID mappinType; // 08 game::data::MappinVariant variant; // 10 uint8_t unk14[0x18 - 0x14]; // 14 - CString debugCaption; // 18 + String debugCaption; // 18 LocalizationString localizedCaption; // 38 bool active; // 60 bool visibleThroughWalls; // 61 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/state/MachineComponent.hpp b/include/RED4ext/Scripting/Natives/Generated/game/state/MachineComponent.hpp index 6b5ab9f91..fd2b5b54d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/state/MachineComponent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/state/MachineComponent.hpp @@ -19,7 +19,7 @@ struct __declspec(align(0x10)) MachineComponent : game::PlayerControlledComponen static constexpr const char* ALIAS = NAME; uint8_t unk98[0x1ACE0 - 0x98]; // 98 - CString packageName; // 1ACE0 + String packageName; // 1ACE0 uint8_t unk1AD00[0x1AD30 - 0x1AD00]; // 1AD00 }; RED4EXT_ASSERT_SIZE(MachineComponent, 0x1AD30); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/state/MachineResultString.hpp b/include/RED4ext/Scripting/Natives/Generated/game/state/MachineResultString.hpp index 216da3503..ddf0754f3 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/state/MachineResultString.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/state/MachineResultString.hpp @@ -19,7 +19,7 @@ struct MachineResultString bool valid; // 00 uint8_t unk01[0x8 - 0x1]; // 1 - CString value; // 08 + String value; // 08 }; RED4EXT_ASSERT_SIZE(MachineResultString, 0x28); } // namespace game::state diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/CharacterCustomizationAction.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/CharacterCustomizationAction.hpp index 2e55cbc1f..2af3aa447 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/CharacterCustomizationAction.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/CharacterCustomizationAction.hpp @@ -20,7 +20,7 @@ struct CharacterCustomizationAction game::ui::CharacterCustomizationActionType type; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString params; // 08 + String params; // 08 bool applyImmediately; // 28 bool applyToUISlot; // 29 uint8_t unk2A[0x30 - 0x2A]; // 2A diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/CharacterCustomizationInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/CharacterCustomizationInfo.hpp index fad8b0aff..4e3be1a05 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/CharacterCustomizationInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/CharacterCustomizationInfo.hpp @@ -27,7 +27,7 @@ struct CharacterCustomizationInfo : IScriptable CName name; // 40 CName uiSlot; // 48 - CString localizedName; // 50 + String localizedName; // 50 int32_t defaultIndex; // 70 int32_t index; // 74 bool hidden; // 78 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/ChatBoxText.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/ChatBoxText.hpp index 6e0e55a54..74cff1f2e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/ChatBoxText.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/ChatBoxText.hpp @@ -18,7 +18,7 @@ struct ChatBoxText static constexpr const char* NAME = "gameuiChatBoxText"; static constexpr const char* ALIAS = "ChatBoxText"; - CString text; // 00 + String text; // 00 int32_t id; // 20 Color color; // 24 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/CyberspaceUIObject.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/CyberspaceUIObject.hpp index c2ac7cf44..830eb30f0 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/CyberspaceUIObject.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/CyberspaceUIObject.hpp @@ -21,7 +21,7 @@ struct CyberspaceUIObject : game::Object static constexpr const char* ALIAS = NAME; CName slotName; // 240 - CString caption; // 248 + String caption; // 248 game::ui::CyberspaceElementType mappinType; // 268 uint8_t unk26C[0x280 - 0x26C]; // 26C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/GenericNotificationViewData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/GenericNotificationViewData.hpp index a7ce261b8..13a42328d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/GenericNotificationViewData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/GenericNotificationViewData.hpp @@ -19,8 +19,8 @@ struct GenericNotificationViewData : IScriptable static constexpr const char* NAME = "gameuiGenericNotificationViewData"; static constexpr const char* ALIAS = "GenericNotificationViewData"; - CString title; // 40 - CString text; // 60 + String title; // 40 + String text; // 60 CName soundEvent; // 80 CName soundAction; // 88 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/HackingMinigameLogicController.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/HackingMinigameLogicController.hpp index 04f7b2de6..1d3400fe2 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/HackingMinigameLogicController.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/HackingMinigameLogicController.hpp @@ -79,7 +79,7 @@ struct HackingMinigameLogicController : ink::WidgetLogicController CName mainHiglightBarStateName; // 358 CName secondaryHiglightBarStateName; // 360 CName inactiveHiglightBarStateName; // 368 - CString gridCellDisabledSymbol; // 370 + String gridCellDisabledSymbol; // 370 CName programSucceedStateName; // 390 CName programCellReadyStateName; // 398 CName programCellHighlightStateName; // 3A0 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/IndexedAppearanceDefinition.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/IndexedAppearanceDefinition.hpp index 2bac4a72e..60a788537 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/IndexedAppearanceDefinition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/IndexedAppearanceDefinition.hpp @@ -27,7 +27,7 @@ struct IndexedAppearanceDefinition Color color; // 04 TweakDBID icon; // 08 CName name; // 10 - CString localizedName; // 18 + String localizedName; // 18 DynArray actions; // 38 red::TagList tags; // 48 game::ui::CharacterRandomizationInfo randomizationInfo; // 58 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/IndexedMorphName.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/IndexedMorphName.hpp index 9adad2b90..fa7e67287 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/IndexedMorphName.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/IndexedMorphName.hpp @@ -23,7 +23,7 @@ struct IndexedMorphName int32_t index; // 00 uint8_t unk04[0x8 - 0x4]; // 4 CName morphName; // 08 - CString localizedName; // 10 + String localizedName; // 10 red::TagList tags; // 30 game::ui::CharacterRandomizationInfo randomizationInfo; // 40 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/InputHintData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/InputHintData.hpp index 39c83d3e0..0db658cc9 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/InputHintData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/InputHintData.hpp @@ -24,7 +24,7 @@ struct InputHintData CName source; // 08 CName groupId; // 10 CName tutorialAction; // 18 - CString localizedLabel; // 20 + String localizedLabel; // 20 int32_t queuePriority; // 40 int32_t sortingPriority; // 44 int32_t tutorialActionCount; // 48 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/InputHintGroupData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/InputHintGroupData.hpp index cc40c240f..fa391c352 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/InputHintGroupData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/InputHintGroupData.hpp @@ -18,8 +18,8 @@ struct InputHintGroupData static constexpr const char* ALIAS = "InputHintGroupData"; TweakDBID iconReference; // 00 - CString localizedTitle; // 08 - CString localizedDescription; // 28 + String localizedTitle; // 08 + String localizedDescription; // 28 int32_t sortingPriority; // 48 uint8_t unk4C[0x50 - 0x4C]; // 4C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/LevelUpNotificationViewData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/LevelUpNotificationViewData.hpp index 137582ba0..ec79f2730 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/LevelUpNotificationViewData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/LevelUpNotificationViewData.hpp @@ -27,7 +27,7 @@ struct LevelUpNotificationViewData : game::ui::GenericNotificationViewData quest::LevelUpData levelupdata; // 94 uint8_t unkAC[0xB0 - 0xAC]; // AC Handle proficiencyRecord; // B0 - CString profString; // C0 + String profString; // C0 }; RED4EXT_ASSERT_SIZE(LevelUpNotificationViewData, 0xE0); } // namespace game::ui diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/NPCNextToTheCrosshair.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/NPCNextToTheCrosshair.hpp index 3f890fe06..6e222bea2 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/NPCNextToTheCrosshair.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/NPCNextToTheCrosshair.hpp @@ -24,7 +24,7 @@ struct NPCNextToTheCrosshair static constexpr const char* ALIAS = "NPCNextToTheCrosshair"; WeakHandle npc; // 00 - CString name; // 10 + String name; // 10 int32_t currentHealth; // 30 int32_t maximumHealth; // 34 int32_t currentCyberwarePct; // 38 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/NarrationEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/NarrationEvent.hpp index c91692134..faa485a83 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/NarrationEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/NarrationEvent.hpp @@ -18,7 +18,7 @@ struct NarrationEvent static constexpr const char* NAME = "gameuiNarrationEvent"; static constexpr const char* ALIAS = "NarrationEvent"; - CString text; // 00 + String text; // 00 float durationSec; // 20 Color color; // 24 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/NarrativePlateData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/NarrativePlateData.hpp index 52fe3f0a7..12509b02d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/NarrativePlateData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/NarrativePlateData.hpp @@ -20,8 +20,8 @@ struct NarrativePlateData static constexpr const char* NAME = "gameuiNarrativePlateData"; static constexpr const char* ALIAS = "NarrativePlateData"; - CString text; // 00 - CString caption; // 20 + String text; // 00 + String caption; // 20 WeakHandle entity; // 40 }; RED4EXT_ASSERT_SIZE(NarrativePlateData, 0x50); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/PanzerScoreRecordData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/PanzerScoreRecordData.hpp index fc56ef1dc..1bae9972d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/PanzerScoreRecordData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/PanzerScoreRecordData.hpp @@ -17,7 +17,7 @@ struct PanzerScoreRecordData static constexpr const char* NAME = "gameuiPanzerScoreRecordData"; static constexpr const char* ALIAS = "PanzerScoreRecordData"; - CString name; // 00 + String name; // 00 uint32_t score; // 20 uint8_t unk24[0x28 - 0x24]; // 24 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/PhotoModeOptionSelectorData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/PhotoModeOptionSelectorData.hpp index 643be0d14..55cd3fa31 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/PhotoModeOptionSelectorData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/PhotoModeOptionSelectorData.hpp @@ -17,7 +17,7 @@ struct PhotoModeOptionSelectorData static constexpr const char* NAME = "gameuiPhotoModeOptionSelectorData"; static constexpr const char* ALIAS = "PhotoModeOptionSelectorData"; - CString optionText; // 00 + String optionText; // 00 int32_t optionData; // 20 uint8_t unk24[0x28 - 0x24]; // 24 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/PinInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/PinInfo.hpp index 2939b5996..3ee353c20 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/PinInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/PinInfo.hpp @@ -24,7 +24,7 @@ struct PinInfo int32_t iconType; // 04 float offset; // 08 uint8_t unk0C[0x10 - 0xC]; // C - CString displayText; // 10 + String displayText; // 10 }; RED4EXT_ASSERT_SIZE(PinInfo, 0x30); } // namespace game::ui diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/QuestUpdateNotificationViewData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/QuestUpdateNotificationViewData.hpp index a01be419a..827db7c2b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/QuestUpdateNotificationViewData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/QuestUpdateNotificationViewData.hpp @@ -19,12 +19,12 @@ struct QuestUpdateNotificationViewData : game::ui::GenericNotificationViewData static constexpr const char* NAME = "gameuiQuestUpdateNotificationViewData"; static constexpr const char* ALIAS = "QuestUpdateNotificationViewData"; - CString questEntryId; // 90 + String questEntryId; // 90 bool canBeMerged; // B0 uint8_t unkB1[0xB8 - 0xB1]; // B1 CName animation; // B8 - CString SMSText; // C0 - CString SMSLocKey; // E0 + String SMSText; // C0 + String SMSLocKey; // E0 }; RED4EXT_ASSERT_SIZE(QuestUpdateNotificationViewData, 0x100); } // namespace game::ui diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/RefreshGOGState.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/RefreshGOGState.hpp index 94f9d0d18..4fe162e62 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/RefreshGOGState.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/RefreshGOGState.hpp @@ -23,7 +23,7 @@ struct RefreshGOGState : red::Event game::OnlineSystemStatus status; // 40 game::OnlineSystemErrors error; // 44 - CString registerURL; // 48 + String registerURL; // 48 DynArray qrCodePNGBlob; // 68 }; RED4EXT_ASSERT_SIZE(RefreshGOGState, 0x78); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/SetupOptionButtonForAttributeEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/SetupOptionButtonForAttributeEvent.hpp index 9ae5322f0..8e0c677ee 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/SetupOptionButtonForAttributeEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/SetupOptionButtonForAttributeEvent.hpp @@ -20,7 +20,7 @@ struct SetupOptionButtonForAttributeEvent : red::Event uint32_t attribute; // 40 uint8_t unk44[0x48 - 0x44]; // 44 - CString value; // 48 + String value; // 48 }; RED4EXT_ASSERT_SIZE(SetupOptionButtonForAttributeEvent, 0x68); } // namespace game::ui diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/ShowCustomTooltipEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/ShowCustomTooltipEvent.hpp index 08bd7b489..2d7728818 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/ShowCustomTooltipEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/ShowCustomTooltipEvent.hpp @@ -18,8 +18,8 @@ struct ShowCustomTooltipEvent : red::Event static constexpr const char* NAME = "gameuiShowCustomTooltipEvent"; static constexpr const char* ALIAS = "ShowCustomTooltipEvent"; - CString text; // 40 - CString inputAction; // 60 + String text; // 40 + String inputAction; // 60 }; RED4EXT_ASSERT_SIZE(ShowCustomTooltipEvent, 0x80); } // namespace game::ui diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/SwitcherOption.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/SwitcherOption.hpp index 6c4981484..8f85662b5 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/SwitcherOption.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/SwitcherOption.hpp @@ -25,7 +25,7 @@ struct SwitcherOption int32_t index; // 00 uint8_t unk04[0x8 - 0x4]; // 4 DynArray names; // 08 - CString localizedName; // 18 + String localizedName; // 18 DynArray actions; // 38 red::TagList tags; // 48 game::ui::CharacterRandomizationInfo randomizationInfo; // 58 diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/TarotCardAddedNotificationViewData.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/TarotCardAddedNotificationViewData.hpp index c5a4febd2..8a1e27281 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/TarotCardAddedNotificationViewData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/TarotCardAddedNotificationViewData.hpp @@ -20,7 +20,7 @@ struct TarotCardAddedNotificationViewData : game::ui::GenericNotificationViewDat static constexpr const char* ALIAS = "TarotCardAddedNotificationViewData"; CName imagePart; // 90 - CString cardName; // 98 + String cardName; // 98 CName animation; // B8 }; RED4EXT_ASSERT_SIZE(TarotCardAddedNotificationViewData, 0xC0); diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/VOWithDelay.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/VOWithDelay.hpp index abae568e3..5cb6a4361 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/VOWithDelay.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/VOWithDelay.hpp @@ -19,7 +19,7 @@ struct VOWithDelay float playDelay; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString voHexID; // 08 + String voHexID; // 08 }; RED4EXT_ASSERT_SIZE(VOWithDelay, 0x28); } // namespace game::ui diff --git a/include/RED4ext/Scripting/Natives/Generated/game/ui/arcade/ShooterSpawnController.hpp b/include/RED4ext/Scripting/Natives/Generated/game/ui/arcade/ShooterSpawnController.hpp index 653318670..81495d721 100644 --- a/include/RED4ext/Scripting/Natives/Generated/game/ui/arcade/ShooterSpawnController.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/game/ui/arcade/ShooterSpawnController.hpp @@ -23,7 +23,7 @@ struct ShooterSpawnController : ink::WidgetLogicController uint8_t unk78[0xB8 - 0x78]; // 78 game::ui::arcade::ShooterAIType enemyType; // B8 game::ui::arcade::ShooterSpawnerCondition spawnCondition; // BC - CString enemyParameter; // C0 + String enemyParameter; // C0 uint32_t spawnCount; // E0 float skipOffset; // E4 uint8_t unkE8[0xEC - 0xE8]; // E8 diff --git a/include/RED4ext/Scripting/Natives/Generated/gen/LevelRandomizerEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/gen/LevelRandomizerEntry.hpp index fe955a561..98d3b8ed0 100644 --- a/include/RED4ext/Scripting/Natives/Generated/gen/LevelRandomizerEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/gen/LevelRandomizerEntry.hpp @@ -18,7 +18,7 @@ struct LevelRandomizerEntry static constexpr const char* NAME = "genLevelRandomizerEntry"; static constexpr const char* ALIAS = NAME; - CString id; // 00 + String id; // 00 CName templateName; // 20 NodeRef spawnPos; // 28 float probability; // 30 diff --git a/include/RED4ext/Scripting/Natives/Generated/gen/RandomizationDataEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/gen/RandomizationDataEntry.hpp index 5e71770a1..b9baf8f60 100644 --- a/include/RED4ext/Scripting/Natives/Generated/gen/RandomizationDataEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/gen/RandomizationDataEntry.hpp @@ -19,7 +19,7 @@ struct __declspec(align(0x10)) RandomizationDataEntry static constexpr const char* NAME = "genRandomizationDataEntry"; static constexpr const char* ALIAS = "RandomizationDataEntry"; - CString id; // 00 + String id; // 00 CName templateName; // 20 float probability; // 28 uint8_t unk2C[0x30 - 0x2C]; // 2C diff --git a/include/RED4ext/Scripting/Natives/Generated/gen/RandomizerMarker.hpp b/include/RED4ext/Scripting/Natives/Generated/gen/RandomizerMarker.hpp index fe1658710..f0dc1ff3d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/gen/RandomizerMarker.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/gen/RandomizerMarker.hpp @@ -19,7 +19,7 @@ struct RandomizerMarker : world::IMarker static constexpr const char* NAME = "genRandomizerMarker"; static constexpr const char* ALIAS = NAME; - CString id; // 30 + String id; // 30 CName templateName; // 50 float probability; // 58 uint8_t unk5C[0x60 - 0x5C]; // 5C diff --git a/include/RED4ext/Scripting/Natives/Generated/grs/HeistPlayerGameInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/grs/HeistPlayerGameInfo.hpp index c69704d64..68c67ba04 100644 --- a/include/RED4ext/Scripting/Natives/Generated/grs/HeistPlayerGameInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/grs/HeistPlayerGameInfo.hpp @@ -28,7 +28,7 @@ struct __declspec(align(0x10)) HeistPlayerGameInfo net::Time spawnTime; // 08 uint32_t killCount; // 10 uint32_t deathCount; // 14 - CString characterRecord; // 18 + String characterRecord; // 18 uint8_t unk38[0x70 - 0x38]; // 38 }; RED4EXT_ASSERT_SIZE(HeistPlayerGameInfo, 0x70); diff --git a/include/RED4ext/Scripting/Natives/Generated/gsm/GameDefinition.hpp b/include/RED4ext/Scripting/Natives/Generated/gsm/GameDefinition.hpp index 3df1b4a89..0fa3f7d3e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/gsm/GameDefinition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/gsm/GameDefinition.hpp @@ -28,7 +28,7 @@ struct GameDefinition : CResource DynArray> mainQuests; // 40 RaRef world; // 50 RaRef streamingWorld; // 58 - CString worldName; // 60 + String worldName; // 60 red::TagList spawnPointTags; // 80 }; RED4EXT_ASSERT_SIZE(GameDefinition, 0x90); diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/CallbackData.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/CallbackData.hpp index 3b233e37a..e43777416 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/CallbackData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/CallbackData.hpp @@ -25,7 +25,7 @@ struct CallbackData : IScriptable ink::IconResult loadResult; // 40 uint8_t unk44[0x48 - 0x44]; // 44 WeakHandle targetWidget; // 48 - CString errorMsg; // 58 + String errorMsg; // 58 TweakDBID iconSrc; // 78 }; RED4EXT_ASSERT_SIZE(CallbackData, 0x80); diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/CreditsSectionEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/CreditsSectionEntry.hpp index a17611927..0b000a75a 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/CreditsSectionEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/CreditsSectionEntry.hpp @@ -21,8 +21,8 @@ struct CreditsSectionEntry ink::DisplayMode displayMode; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString sectionTitle; // 08 - DynArray names; // 28 + String sectionTitle; // 08 + DynArray names; // 28 }; RED4EXT_ASSERT_SIZE(CreditsSectionEntry, 0x38); } // namespace ink diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/GameScreenshotInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/GameScreenshotInfo.hpp index 68630bc38..f17ff1c02 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/GameScreenshotInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/GameScreenshotInfo.hpp @@ -17,7 +17,7 @@ struct GameScreenshotInfo static constexpr const char* NAME = "inkGameScreenshotInfo"; static constexpr const char* ALIAS = "GameScreenshotInfo"; - CString path; // 00 + String path; // 00 uint64_t creationDate; // 20 uint32_t aspectRatioType; // 28 uint32_t pathHash; // 2C diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/LatestSaveMetadataInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/LatestSaveMetadataInfo.hpp index 873a1189b..fa2bb1dac 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/LatestSaveMetadataInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/LatestSaveMetadataInfo.hpp @@ -21,9 +21,9 @@ struct LatestSaveMetadataInfo : IScriptable static constexpr const char* NAME = "inkLatestSaveMetadataInfo"; static constexpr const char* ALIAS = "LatestSaveMetadataInfo"; - CString locationName; // 40 - CString trackedQuest; // 60 - CString gameVersion; // 80 + String locationName; // 40 + String trackedQuest; // 60 + String gameVersion; // 80 ink::LifePath lifePath; // A0 uint8_t unkA1[0xA8 - 0xA1]; // A1 double playTime; // A8 diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/SaveMetadataInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/SaveMetadataInfo.hpp index 9ee39c60a..f5dee9e2c 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/SaveMetadataInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/SaveMetadataInfo.hpp @@ -25,10 +25,10 @@ struct SaveMetadataInfo : IScriptable int32_t saveIndex; // 40 uint32_t saveID; // 44 - CString internalName; // 48 - CString locationName; // 68 - CString trackedQuest; // 88 - CString gameVersion; // A8 + String internalName; // 48 + String locationName; // 68 + String trackedQuest; // 88 + String gameVersion; // A8 ink::LifePath lifePath; // C8 ink::SaveType saveType; // C9 ink::SaveStatus saveStatus; // CA @@ -41,7 +41,7 @@ struct SaveMetadataInfo : IScriptable bool isValid; // F8 bool isModded; // F9 uint8_t unkFA[0x100 - 0xFA]; // FA - CString platform; // 100 + String platform; // 100 DynArray additionalContentIds; // 120 }; RED4EXT_ASSERT_SIZE(SaveMetadataInfo, 0x130); diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/SelectorController.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/SelectorController.hpp index 3126b9b84..5097a8861 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/SelectorController.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/SelectorController.hpp @@ -24,7 +24,7 @@ struct SelectorController : ink::WidgetLogicController int32_t index; // B0 bool cycledNavigation; // B4 uint8_t unkB5[0xB8 - 0xB5]; // B5 - DynArray values; // B8 + DynArray values; // B8 }; RED4EXT_ASSERT_SIZE(SelectorController, 0xC8); } // namespace ink diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/ServerInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/ServerInfo.hpp index c691a76bd..e0eb1e41f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/ServerInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/ServerInfo.hpp @@ -20,10 +20,10 @@ struct ServerInfo : IScriptable int32_t number; // 40 uint8_t unk44[0x48 - 0x44]; // 44 - CString kind; // 48 - CString hostname; // 68 - CString address; // 88 - CString worldDescription; // A8 + String kind; // 48 + String hostname; // 68 + String address; // 88 + String worldDescription; // A8 }; RED4EXT_ASSERT_SIZE(ServerInfo, 0xC8); } // namespace ink diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/StepperData.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/StepperData.hpp index 9f183f75c..f8a88d203 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/StepperData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/StepperData.hpp @@ -21,7 +21,7 @@ struct StepperData static constexpr const char* ALIAS = NAME; uint8_t unk00[0x30 - 0x0]; // 0 - CString label; // 30 + String label; // 30 WeakHandle data; // 50 }; RED4EXT_ASSERT_SIZE(StepperData, 0x60); diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/TextKiroshiAnimationController.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/TextKiroshiAnimationController.hpp index 87241f2d0..1a34e40da 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/TextKiroshiAnimationController.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/TextKiroshiAnimationController.hpp @@ -21,7 +21,7 @@ struct TextKiroshiAnimationController : ink::TextAnimationController static constexpr const char* ALIAS = "inkTextKiroshiAnimController"; uint8_t unkF0[0x150 - 0xF0]; // F0 - CString nativeText; // 150 + String nativeText; // 150 ink::TextWidgetReference preTranslatedTextWidget; // 170 ink::TextWidgetReference postTranslatedTextWidget; // 188 ink::RichTextBoxWidgetReference nativeTextWidget; // 1A0 diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/TextReplaceAnimationController.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/TextReplaceAnimationController.hpp index 5139588a6..c2dcadd9b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/TextReplaceAnimationController.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/TextReplaceAnimationController.hpp @@ -21,7 +21,7 @@ struct TextReplaceAnimationController : ink::TextAnimationController ink::TextReplaceAnimationControllerWidgetTextUsage widgetTextUsage; // F0 uint8_t unkF1[0x118 - 0xF1]; // F1 - CString targetText; // 118 + String targetText; // 118 LocalizationString baseTextLocalized; // 138 LocalizationString targetTextLocalized; // 160 uint8_t unk188[0x1CC - 0x188]; // 188 diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/TextValueProgressAnimationController.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/TextValueProgressAnimationController.hpp index 5231f4548..a548b5dff 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/TextValueProgressAnimationController.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/TextValueProgressAnimationController.hpp @@ -23,7 +23,7 @@ struct TextValueProgressAnimationController : ink::TextAnimationController int32_t numbersAfterDot; // F8 float stepValue; // FC uint8_t unk100[0x128 - 0x100]; // 100 - CString suffix; // 128 + String suffix; // 128 }; RED4EXT_ASSERT_SIZE(TextValueProgressAnimationController, 0x148); } // namespace ink diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/TextWidget.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/TextWidget.hpp index 7c56b1b97..574ef0216 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/TextWidget.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/TextWidget.hpp @@ -32,7 +32,7 @@ struct __declspec(align(0x10)) TextWidget : ink::LeafWidget static constexpr const char* ALIAS = "inkText"; uint8_t unk200[0x228 - 0x200]; // 200 - CString text; // 228 + String text; // 228 CName textIdKey; // 248 RaRef fontFamily; // 250 CName fontStyle; // 258 diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/anim/ExecuteControllerFunctionEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/anim/ExecuteControllerFunctionEvent.hpp index 06a8679a0..842f615c1 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/anim/ExecuteControllerFunctionEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/anim/ExecuteControllerFunctionEvent.hpp @@ -21,7 +21,7 @@ struct ExecuteControllerFunctionEvent : ink::anim::Event CName controllerType; // 48 CName eventName; // 50 - CString params; // 58 + String params; // 58 }; RED4EXT_ASSERT_SIZE(ExecuteControllerFunctionEvent, 0x78); } // namespace ink::anim diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/anim/PlayVOEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/anim/PlayVOEvent.hpp index 3868602f9..54d7a0c00 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/anim/PlayVOEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/anim/PlayVOEvent.hpp @@ -18,8 +18,8 @@ struct PlayVOEvent : ink::anim::Event static constexpr const char* NAME = "inkanimPlayVOEvent"; static constexpr const char* ALIAS = NAME; - CString VOLine; // 48 - CString speakerName; // 68 + String VOLine; // 48 + String speakerName; // 68 }; RED4EXT_ASSERT_SIZE(PlayVOEvent, 0x88); } // namespace ink::anim diff --git a/include/RED4ext/Scripting/Natives/Generated/ink/anim/SetTextEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/ink/anim/SetTextEvent.hpp index a31a2cbe6..a87a1578a 100644 --- a/include/RED4ext/Scripting/Natives/Generated/ink/anim/SetTextEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/ink/anim/SetTextEvent.hpp @@ -18,7 +18,7 @@ struct SetTextEvent : ink::anim::Event static constexpr const char* NAME = "inkanimSetTextEvent"; static constexpr const char* ALIAS = NAME; - CString localizationString; // 48 + String localizationString; // 48 }; RED4EXT_ASSERT_SIZE(SetTextEvent, 0x68); } // namespace ink::anim diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/EntityEffectSpawnerSyncData.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/EntityEffectSpawnerSyncData.hpp index ddb97167c..b64b0e7a5 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/EntityEffectSpawnerSyncData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/EntityEffectSpawnerSyncData.hpp @@ -25,7 +25,7 @@ struct EntityEffectSpawnerSyncData EditorObjectID componentParentID; // 20 CName componentName; // 40 DynArray effects; // 48 - CString templatePath; // 58 + String templatePath; // 58 Color templateColor; // 78 bool included; // 7C uint8_t unk7D[0x80 - 0x7D]; // 7D diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/GlobalNodeIDInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/GlobalNodeIDInfo.hpp index c62a1b69d..5d4101d31 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/GlobalNodeIDInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/GlobalNodeIDInfo.hpp @@ -17,8 +17,8 @@ struct GlobalNodeIDInfo static constexpr const char* NAME = "interopGlobalNodeIDInfo"; static constexpr const char* ALIAS = NAME; - CString globalName; // 00 - CString globalNodeIDPath; // 20 + String globalName; // 00 + String globalNodeIDPath; // 20 uint64_t globalNodeIDHash; // 40 bool globalNameIsAutoGenerated; // 48 uint8_t unk49[0x50 - 0x49]; // 49 diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/GlobalNodeIDResult.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/GlobalNodeIDResult.hpp index ea76d7bbf..8c5122830 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/GlobalNodeIDResult.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/GlobalNodeIDResult.hpp @@ -17,8 +17,8 @@ struct GlobalNodeIDResult static constexpr const char* NAME = "interopGlobalNodeIDResult"; static constexpr const char* ALIAS = NAME; - CString errorMessage; // 00 - CString result; // 20 + String errorMessage; // 00 + String result; // 20 bool isValid; // 40 uint8_t unk41[0x48 - 0x41]; // 41 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/GraphConnectionCreationData.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/GraphConnectionCreationData.hpp index 5abe3d3b9..80ae7720b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/GraphConnectionCreationData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/GraphConnectionCreationData.hpp @@ -18,8 +18,8 @@ struct GraphConnectionCreationData static constexpr const char* NAME = "interopGraphConnectionCreationData"; static constexpr const char* ALIAS = NAME; - CString data; // 00 - DynArray extraData; // 20 + String data; // 00 + DynArray extraData; // 20 }; RED4EXT_ASSERT_SIZE(GraphConnectionCreationData, 0x30); } // namespace interop diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/MaterialListDescriptor.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/MaterialListDescriptor.hpp index 19e08828a..3aa026dbc 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/MaterialListDescriptor.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/MaterialListDescriptor.hpp @@ -18,16 +18,16 @@ struct MaterialListDescriptor static constexpr const char* NAME = "interopMaterialListDescriptor"; static constexpr const char* ALIAS = NAME; - CString chunksInfo; // 00 - CString chunksLODInfo; // 20 + String chunksInfo; // 00 + String chunksLODInfo; // 20 uint32_t numLayers; // 40 bool isForward; // 44 bool isMultilayer; // 45 bool isLocalInstance; // 46 bool isTemplate; // 47 - CString materialName; // 48 - CString appearanceName; // 68 - DynArray availableMaterials; // 88 + String materialName; // 48 + String appearanceName; // 68 + DynArray availableMaterials; // 88 uint32_t itemMaterialIndex; // 98 uint8_t unk9C[0xA0 - 0x9C]; // 9C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/OpaqueData.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/OpaqueData.hpp index f6535493a..64fbdde07 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/OpaqueData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/OpaqueData.hpp @@ -17,8 +17,8 @@ struct OpaqueData static constexpr const char* NAME = "interopOpaqueData"; static constexpr const char* ALIAS = NAME; - CString description; // 00 - CString payload; // 20 + String description; // 00 + String payload; // 20 int32_t version; // 40 uint8_t unk44[0x48 - 0x44]; // 44 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/RTTIClassDump.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/RTTIClassDump.hpp index bf83ea1b0..d2781a653 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/RTTIClassDump.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/RTTIClassDump.hpp @@ -20,8 +20,8 @@ struct RTTIClassDump static constexpr const char* NAME = "interopRTTIClassDump"; static constexpr const char* ALIAS = NAME; - DynArray classNames; // 00 - DynArray descriptiveNames; // 10 + DynArray classNames; // 00 + DynArray descriptiveNames; // 10 DynArray resourceInfos; // 20 DynArray entries; // 30 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/RTTIResourceDumpInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/RTTIResourceDumpInfo.hpp index d75e338e9..eb6eb62ac 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/RTTIResourceDumpInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/RTTIResourceDumpInfo.hpp @@ -17,9 +17,9 @@ struct RTTIResourceDumpInfo static constexpr const char* NAME = "interopRTTIResourceDumpInfo"; static constexpr const char* ALIAS = NAME; - CString extension; // 00 - CString deprecatedExtension; // 20 - CString friendlyDescription; // 40 + String extension; // 00 + String deprecatedExtension; // 20 + String friendlyDescription; // 40 }; RED4EXT_ASSERT_SIZE(RTTIResourceDumpInfo, 0x60); } // namespace interop diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/ReExportOptions.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/ReExportOptions.hpp index cca97ff57..a39a0c877 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/ReExportOptions.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/ReExportOptions.hpp @@ -25,24 +25,24 @@ struct __declspec(align(0x10)) ReExportOptions DynArray occlusionExportOptNames; // 00 DynArray occlusionExportOptValues; // 10 DynArray typeExportOptions; // 20 - CString filePath; // 30 - DynArray files; // 50 - CString depotPath; // 60 + String filePath; // 30 + DynArray files; // 50 + String depotPath; // 60 AbsolutePathSerializable maskDumpFilePath; // 80 AbsolutePathSerializable jsonFile; // A0 bool runDispatcher; // C0 uint8_t unkC1[0xC8 - 0xC1]; // C1 - CString hjobToken; // C8 - CString hjobParams; // E8 - CString hjobParamsOutput; // 108 - CString assetName; // 128 - CString rigs; // 148 - CString hjobTemplate; // 168 - CString bodyType; // 188 + String hjobToken; // C8 + String hjobParams; // E8 + String hjobParamsOutput; // 108 + String assetName; // 128 + String rigs; // 148 + String hjobTemplate; // 168 + String bodyType; // 188 uint8_t unk1A8[0x1CB - 0x1A8]; // 1A8 bool generatePlayerBlockingCollision; // 1CB uint8_t unk1CC[0x1D0 - 0x1CC]; // 1CC - CString baseType; // 1D0 + String baseType; // 1D0 uint8_t unk1F0[0x210 - 0x1F0]; // 1F0 Box exportBounds; // 210 double minBBoxDiag; // 230 @@ -55,7 +55,7 @@ struct __declspec(align(0x10)) ReExportOptions Vector3 referencePoint; // 254 uint8_t unk260[0x2B4 - 0x260]; // 260 float preferSmallProxiesTreshold; // 2B4 - DynArray assetPaths; // 2B8 + DynArray assetPaths; // 2B8 uint8_t prefabType; // 2C8 bool onlyProxy; // 2C9 bool proxyFromProxy; // 2CA diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/StringUint64Pair.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/StringUint64Pair.hpp index c6cd45abf..0afdfd51e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/StringUint64Pair.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/StringUint64Pair.hpp @@ -17,7 +17,7 @@ struct StringUint64Pair static constexpr const char* NAME = "interopStringUint64Pair"; static constexpr const char* ALIAS = NAME; - CString string; // 00 + String string; // 00 uint64_t number; // 20 }; RED4EXT_ASSERT_SIZE(StringUint64Pair, 0x28); diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/StringWithID.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/StringWithID.hpp index 359c26d99..508347f15 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/StringWithID.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/StringWithID.hpp @@ -17,7 +17,7 @@ struct StringWithID static constexpr const char* NAME = "interopStringWithID"; static constexpr const char* ALIAS = NAME; - CString text; // 00 + String text; // 00 uint64_t id; // 20 }; RED4EXT_ASSERT_SIZE(StringWithID, 0x28); diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/TerrainEditToolInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/TerrainEditToolInfo.hpp index 688cce2cf..db3f2d825 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/TerrainEditToolInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/TerrainEditToolInfo.hpp @@ -25,10 +25,10 @@ struct TerrainEditToolInfo float defaultEmptyHeightmapMaskFalloff; // 0C float defaultEmptyHeightmapMaskRoundness; // 10 uint32_t defaultEmptyHeightmapZeroMaskMargin; // 14 - CString defaultHeightmap1; // 18 - CString defaultHeightmap2; // 38 - CString defaultColormap1; // 58 - CString defaultColormap2; // 78 + String defaultHeightmap1; // 18 + String defaultHeightmap2; // 38 + String defaultColormap1; // 58 + String defaultColormap2; // 78 DynArray creationSlots; // 98 }; RED4EXT_ASSERT_SIZE(TerrainEditToolInfo, 0xA8); diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/TerrainImportParams.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/TerrainImportParams.hpp index 56250e912..ad9e37917 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/TerrainImportParams.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/TerrainImportParams.hpp @@ -32,9 +32,9 @@ struct TerrainImportParams bool importColorMaps; // 35 bool importControlMaps; // 36 bool overwriteTransformsOfExistingNodes; // 37 - CString nodesNamingPattern; // 38 - CString prefabsNamingPattern; // 58 - CString prefabsDestinationPath; // 78 + String nodesNamingPattern; // 38 + String prefabsNamingPattern; // 58 + String prefabsDestinationPath; // 78 tools::EditorObjectIDPath dstPrefabNodePath; // 98 }; RED4EXT_ASSERT_SIZE(TerrainImportParams, 0xA8); diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/TerrainImportedTile.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/TerrainImportedTile.hpp index abcdea287..0e966f80f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/TerrainImportedTile.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/TerrainImportedTile.hpp @@ -18,9 +18,9 @@ struct TerrainImportedTile static constexpr const char* NAME = "interopTerrainImportedTile"; static constexpr const char* ALIAS = NAME; - CString heightMapAbsolutePath; // 00 - CString controlMapAbsolutePath; // 20 - CString colorMapAbsolutePath; // 40 + String heightMapAbsolutePath; // 00 + String controlMapAbsolutePath; // 20 + String colorMapAbsolutePath; // 40 Point position; // 60 }; RED4EXT_ASSERT_SIZE(TerrainImportedTile, 0x68); diff --git a/include/RED4ext/Scripting/Natives/Generated/interop/TerrainNodeInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/interop/TerrainNodeInfo.hpp index 9c8b77da1..5d824d5b2 100644 --- a/include/RED4ext/Scripting/Natives/Generated/interop/TerrainNodeInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/interop/TerrainNodeInfo.hpp @@ -32,7 +32,7 @@ struct __declspec(align(0x10)) TerrainNodeInfo uint8_t unk0F[0x10 - 0xF]; // F uint16_t terrainSysID; // 10 uint8_t unk12[0x18 - 0x12]; // 12 - CString nodeName; // 18 + String nodeName; // 18 Vector3 nodeScale; // 38 uint8_t unk44[0x50 - 0x44]; // 44 Transform nodeTransform; // 50 diff --git a/include/RED4ext/Scripting/Natives/Generated/loc/VoiceTag.hpp b/include/RED4ext/Scripting/Natives/Generated/loc/VoiceTag.hpp index c9e98e4a6..fe5ef38f5 100644 --- a/include/RED4ext/Scripting/Natives/Generated/loc/VoiceTag.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/loc/VoiceTag.hpp @@ -21,7 +21,7 @@ struct VoiceTag CName voiceTag; // 00 bool isApuc; // 08 uint8_t unk09[0x10 - 0x9]; // 9 - CString voicesetScenePath; // 10 + String voicesetScenePath; // 10 CRUID id; // 30 uint8_t unk38[0x40 - 0x38]; // 38 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceCLNumberDateContainer.hpp b/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceCLNumberDateContainer.hpp index e46774a66..000e2512f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceCLNumberDateContainer.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceCLNumberDateContainer.hpp @@ -22,7 +22,7 @@ struct PersistenceCLNumberDateContainer : ISerializable CName clNumber; // 30 CName clTimestamp; // 38 - DynArray clGeneratedIds; // 40 + DynArray clGeneratedIds; // 40 }; RED4EXT_ASSERT_SIZE(PersistenceCLNumberDateContainer, 0x50); } // namespace localization diff --git a/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceOnScreenEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceOnScreenEntry.hpp index f5851ed55..b21752fed 100644 --- a/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceOnScreenEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceOnScreenEntry.hpp @@ -18,9 +18,9 @@ struct PersistenceOnScreenEntry static constexpr const char* ALIAS = NAME; uint64_t primaryKey; // 00 - CString secondaryKey; // 08 - CString femaleVariant; // 28 - CString maleVariant; // 48 + String secondaryKey; // 08 + String femaleVariant; // 28 + String maleVariant; // 48 }; RED4EXT_ASSERT_SIZE(PersistenceOnScreenEntry, 0x68); } // namespace localization diff --git a/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceSubtitleEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceSubtitleEntry.hpp index 8dc25fb09..2bb423084 100644 --- a/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceSubtitleEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/localization/PersistenceSubtitleEntry.hpp @@ -18,8 +18,8 @@ struct PersistenceSubtitleEntry static constexpr const char* ALIAS = NAME; CRUID stringId; // 00 - CString femaleVariant; // 08 - CString maleVariant; // 28 + String femaleVariant; // 08 + String maleVariant; // 28 }; RED4EXT_ASSERT_SIZE(PersistenceSubtitleEntry, 0x48); } // namespace localization diff --git a/include/RED4ext/Scripting/Natives/Generated/mesh/MeshParamBendedRoad.hpp b/include/RED4ext/Scripting/Natives/Generated/mesh/MeshParamBendedRoad.hpp index 8a48bc0e0..6749bcb39 100644 --- a/include/RED4ext/Scripting/Natives/Generated/mesh/MeshParamBendedRoad.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/mesh/MeshParamBendedRoad.hpp @@ -29,11 +29,11 @@ struct MeshParamBendedRoad : mesh::MeshParameter DynArray> collInds; // 70 DynArray> collVerts; // 80 DynArray> collFaceMatInds; // 90 - DynArray> collFaceMaterialNames; // A0 + DynArray> collFaceMaterialNames; // A0 DynArray> collSkinWeights; // B0 DynArray> collSkinInds; // C0 - DynArray collMaterialName; // D0 - DynArray collFilterPresetName; // E0 + DynArray collMaterialName; // D0 + DynArray collFilterPresetName; // E0 }; RED4EXT_ASSERT_SIZE(MeshParamBendedRoad, 0xF0); } // namespace mesh diff --git a/include/RED4ext/Scripting/Natives/Generated/mesh/MeshParamDestructionStepData.hpp b/include/RED4ext/Scripting/Natives/Generated/mesh/MeshParamDestructionStepData.hpp index 49cf1c23f..e6a4f1927 100644 --- a/include/RED4ext/Scripting/Natives/Generated/mesh/MeshParamDestructionStepData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/mesh/MeshParamDestructionStepData.hpp @@ -21,7 +21,7 @@ struct MeshParamDestructionStepData : mesh::MeshParameter static constexpr const char* ALIAS = NAME; DynArray offsets; // 30 - CString isInstantRemovable; // 40 + String isInstantRemovable; // 40 }; RED4EXT_ASSERT_SIZE(MeshParamDestructionStepData, 0x60); } // namespace mesh diff --git a/include/RED4ext/Scripting/Natives/Generated/oauth/AuthenticationToken.hpp b/include/RED4ext/Scripting/Natives/Generated/oauth/AuthenticationToken.hpp index 0f140c23a..a561c93c6 100644 --- a/include/RED4ext/Scripting/Natives/Generated/oauth/AuthenticationToken.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/oauth/AuthenticationToken.hpp @@ -17,9 +17,9 @@ struct AuthenticationToken static constexpr const char* NAME = "oauthAuthenticationToken"; static constexpr const char* ALIAS = NAME; - CString token; // 00 - CString secret; // 20 - CString sessionHandle; // 40 + String token; // 00 + String secret; // 20 + String sessionHandle; // 40 uint64_t tokenExpiresIn; // 60 uint64_t authorizationExpiresIn; // 68 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/physics/CollisionPresetDefinition.hpp b/include/RED4ext/Scripting/Natives/Generated/physics/CollisionPresetDefinition.hpp index 1801f8965..7015ff555 100644 --- a/include/RED4ext/Scripting/Natives/Generated/physics/CollisionPresetDefinition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/physics/CollisionPresetDefinition.hpp @@ -21,7 +21,7 @@ struct CollisionPresetDefinition : ISerializable static constexpr const char* ALIAS = NAME; CName Name; // 30 - CString Description; // 38 + String Description; // 38 bool ForceEnableCollisionCallbacks; // 58 uint8_t unk59[0x60 - 0x59]; // 59 DynArray CollisionType; // 60 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/AICommandNodeFunction.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/AICommandNodeFunction.hpp index d29ddc78c..296c6d9a7 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/AICommandNodeFunction.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/AICommandNodeFunction.hpp @@ -23,7 +23,7 @@ struct AICommandNodeFunction uint8_t unk04[0x8 - 0x4]; // 4 CName nodeType; // 08 CName commandCategory; // 10 - CString friendlyName; // 18 + String friendlyName; // 18 CName paramsType; // 38 Color nodeColor; // 40 uint8_t unk44[0x48 - 0x44]; // 44 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/AddCombatLogMessage_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/AddCombatLogMessage_NodeType.hpp index 0a3e65516..788beff07 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/AddCombatLogMessage_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/AddCombatLogMessage_NodeType.hpp @@ -18,7 +18,7 @@ struct AddCombatLogMessage_NodeType : quest::IUIManagerNodeType static constexpr const char* NAME = "questAddCombatLogMessage_NodeType"; static constexpr const char* ALIAS = NAME; - CString message; // 38 + String message; // 38 LocalizationString localizedMessage; // 58 }; RED4EXT_ASSERT_SIZE(AddCombatLogMessage_NodeType, 0x80); diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/AudioMusicSyncNodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/AudioMusicSyncNodeType.hpp index 67f35f9c7..95692211b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/AudioMusicSyncNodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/AudioMusicSyncNodeType.hpp @@ -24,7 +24,7 @@ struct AudioMusicSyncNodeType : quest::IAudioNodeType uint8_t unk44[0x48 - 0x44]; // 44 CName syncTrack; // 48 CName userCue; // 50 - CString description; // 58 + String description; // 58 }; RED4EXT_ASSERT_SIZE(AudioMusicSyncNodeType, 0x78); } // namespace quest diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/CharacterEquippedWeapon_ConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/CharacterEquippedWeapon_ConditionType.hpp index 980504e7b..511ccb2d4 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/CharacterEquippedWeapon_ConditionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/CharacterEquippedWeapon_ConditionType.hpp @@ -21,7 +21,7 @@ struct CharacterEquippedWeapon_ConditionType : quest::ICharacterConditionType bool anyWeaponEquipped; // 78 uint8_t unk79[0x80 - 0x79]; // 79 - CString weaponID; // 80 + String weaponID; // 80 CName weaponTag; // A0 bool inverted; // A8 uint8_t unkA9[0xB0 - 0xA9]; // A9 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/CharacterMount_ConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/CharacterMount_ConditionType.hpp index 2f5791b06..a66db7bcd 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/CharacterMount_ConditionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/CharacterMount_ConditionType.hpp @@ -33,7 +33,7 @@ struct CharacterMount_ConditionType : quest::ICharacterConditionType quest::MountVehicleOrigin vehicleOrigin; // BC game::data::Affiliation vehicleAfiliation; // C0 uint8_t unkC4[0xC8 - 0xC4]; // C4 - CString playerVehicleName; // C8 + String playerVehicleName; // C8 bool usePlayersVehicle; // E8 bool anyParent; // E9 bool anyChild; // EA diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/CharacterStatusEffect_CondtionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/CharacterStatusEffect_CondtionType.hpp index 9db4992b0..ada1072ce 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/CharacterStatusEffect_CondtionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/CharacterStatusEffect_CondtionType.hpp @@ -18,7 +18,7 @@ struct CharacterStatusEffect_CondtionType : quest::ICharacterConditionType static constexpr const char* NAME = "questCharacterStatusEffect_CondtionType"; static constexpr const char* ALIAS = NAME; - CString statusEffectID; // 78 + String statusEffectID; // 78 bool inverted; // 98 uint8_t unk99[0xA0 - 0x99]; // 99 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/CheckpointNodeDefinition.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/CheckpointNodeDefinition.hpp index 4c077a1a9..585a71709 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/CheckpointNodeDefinition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/CheckpointNodeDefinition.hpp @@ -26,7 +26,7 @@ struct CheckpointNodeDefinition : quest::SignalStoppingNodeDefinition bool retryOnFailure; // 4C uint8_t unk4D[0x50 - 0x4D]; // 4D DynArray additionalEndGameRewardsTweak; // 50 - CString debugString; // 60 + String debugString; // 60 }; RED4EXT_ASSERT_SIZE(CheckpointNodeDefinition, 0x80); } // namespace quest diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/CustomQuestNotificationData.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/CustomQuestNotificationData.hpp index e23710728..e091707df 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/CustomQuestNotificationData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/CustomQuestNotificationData.hpp @@ -18,10 +18,10 @@ struct CustomQuestNotificationData static constexpr const char* NAME = "questCustomQuestNotificationData"; static constexpr const char* ALIAS = "CustomQuestNotificationData"; - CString header; // 00 - CString desc; // 20 + String header; // 00 + String desc; // 20 CName icon; // 40 - CString fluffHeader; // 48 + String fluffHeader; // 48 }; RED4EXT_ASSERT_SIZE(CustomQuestNotificationData, 0x68); } // namespace quest diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/DisplayMessageBox_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/DisplayMessageBox_NodeType.hpp index 791480ebd..1ea19d018 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/DisplayMessageBox_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/DisplayMessageBox_NodeType.hpp @@ -18,9 +18,9 @@ struct DisplayMessageBox_NodeType : quest::IUIManagerNodeType static constexpr const char* NAME = "questDisplayMessageBox_NodeType"; static constexpr const char* ALIAS = NAME; - CString title; // 38 + String title; // 38 LocalizationString localizedTitle; // 58 - CString message; // 80 + String message; // 80 LocalizationString localizedMessage; // A0 }; RED4EXT_ASSERT_SIZE(DisplayMessageBox_NodeType, 0xC8); diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/EnablePlayerVehicle_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/EnablePlayerVehicle_NodeType.hpp index e24f0a9ae..a6ce686a7 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/EnablePlayerVehicle_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/EnablePlayerVehicle_NodeType.hpp @@ -18,7 +18,7 @@ struct EnablePlayerVehicle_NodeType : quest::IVehicleManagerNodeType static constexpr const char* NAME = "questEnablePlayerVehicle_NodeType"; static constexpr const char* ALIAS = NAME; - CString vehicle; // 30 + String vehicle; // 30 bool enable; // 50 bool despawn; // 51 bool makePlayerActiveVehicle; // 52 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/EntityManagerManageBinkComponent_NodeTypeParams.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/EntityManagerManageBinkComponent_NodeTypeParams.hpp index dc40c46f2..f404553f9 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/EntityManagerManageBinkComponent_NodeTypeParams.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/EntityManagerManageBinkComponent_NodeTypeParams.hpp @@ -20,7 +20,7 @@ struct EntityManagerManageBinkComponent_NodeTypeParams static constexpr const char* ALIAS = NAME; game::EntityReference objectRef; // 00 - CString videoPath; // 38 + String videoPath; // 38 game::BinkVideoAction action; // 58 uint8_t unk59[0x60 - 0x59]; // 59 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/EventManagerNodeDefinition.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/EventManagerNodeDefinition.hpp index d980422e4..13f7a016c 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/EventManagerNodeDefinition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/EventManagerNodeDefinition.hpp @@ -24,7 +24,7 @@ struct EventManagerNodeDefinition : quest::DisableableNodeDefinition static constexpr const char* ALIAS = NAME; game::EntityReference objectRef; // 48 - CString managerName; // 80 + String managerName; // 80 CName PSClassName; // A0 CName componentName; // A8 Handle event; // B0 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/FinalBoardsOpenSpeakerScreen_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/FinalBoardsOpenSpeakerScreen_NodeType.hpp index 2b9b0211f..c7ecb0ef4 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/FinalBoardsOpenSpeakerScreen_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/FinalBoardsOpenSpeakerScreen_NodeType.hpp @@ -20,7 +20,7 @@ struct FinalBoardsOpenSpeakerScreen_NodeType : quest::IUIManagerNodeType bool openSpeakerScreen; // 38 uint8_t unk39[0x40 - 0x39]; // 39 - CString speakerName; // 40 + String speakerName; // 40 }; RED4EXT_ASSERT_SIZE(FinalBoardsOpenSpeakerScreen_NodeType, 0x60); } // namespace quest diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/ForceModule_NodeTypeParams.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/ForceModule_NodeTypeParams.hpp index f38e2a163..e6c18c386 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/ForceModule_NodeTypeParams.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/ForceModule_NodeTypeParams.hpp @@ -20,7 +20,7 @@ struct ForceModule_NodeTypeParams static constexpr const char* ALIAS = NAME; NodeRef objectRef; // 00 - CString module; // 08 + String module; // 08 DynArray components; // 28 }; RED4EXT_ASSERT_SIZE(ForceModule_NodeTypeParams, 0x38); diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/ForceVMModule_NodeTypeParams.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/ForceVMModule_NodeTypeParams.hpp index 7c4bf2b83..cf35d32e7 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/ForceVMModule_NodeTypeParams.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/ForceVMModule_NodeTypeParams.hpp @@ -21,7 +21,7 @@ struct ForceVMModule_NodeTypeParams static constexpr const char* ALIAS = NAME; game::EntityReference reference; // 00 - CString module; // 38 + String module; // 38 DynArray components; // 58 }; RED4EXT_ASSERT_SIZE(ForceVMModule_NodeTypeParams, 0x68); diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/InputHintGroup_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/InputHintGroup_NodeType.hpp index 0e92caf7c..c2dc276a2 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/InputHintGroup_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/InputHintGroup_NodeType.hpp @@ -21,8 +21,8 @@ struct InputHintGroup_NodeType : quest::IUIManagerNodeType TweakDBID iconID; // 38 CName groupId; // 40 - CString localizedTitle; // 48 - CString localizedDescription; // 68 + String localizedTitle; // 48 + String localizedDescription; // 68 bool show; // 88 uint8_t unk89[0x90 - 0x89]; // 89 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/InputHint_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/InputHint_NodeType.hpp index db7ae64f2..652adcd85 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/InputHint_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/InputHint_NodeType.hpp @@ -22,7 +22,7 @@ struct InputHint_NodeType : quest::IUIManagerNodeType CName action; // 38 CName groupId; // 40 CName source; // 48 - CString localizedLabel; // 50 + String localizedLabel; // 50 bool show; // 70 uint8_t unk71[0x74 - 0x71]; // 71 int32_t queuePriority; // 74 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/Inspect_ConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/Inspect_ConditionType.hpp index 800c1d5fb..d2e2e7726 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/Inspect_ConditionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/Inspect_ConditionType.hpp @@ -18,7 +18,7 @@ struct Inspect_ConditionType : quest::IObjectConditionType static constexpr const char* NAME = "questInspect_ConditionType"; static constexpr const char* ALIAS = NAME; - CString objectID; // 38 + String objectID; // 38 bool inverted; // 58 uint8_t unk59[0x60 - 0x59]; // 59 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/Language_ConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/Language_ConditionType.hpp index ef8d15275..2f864ddec 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/Language_ConditionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/Language_ConditionType.hpp @@ -21,7 +21,7 @@ struct Language_ConditionType : quest::ISystemConditionType quest::LanguageMode mode; // 38 uint8_t unk3C[0x40 - 0x3C]; // 3C - CString languageCode; // 40 + String languageCode; // 40 bool inverted; // 60 uint8_t unk61[0x68 - 0x61]; // 61 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/MultiplayerAIDirectorParams.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/MultiplayerAIDirectorParams.hpp index 9f11ee8d9..07f531dd2 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/MultiplayerAIDirectorParams.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/MultiplayerAIDirectorParams.hpp @@ -23,8 +23,8 @@ struct MultiplayerAIDirectorParams : ISerializable quest::MultiplayerAIDirectorFunction function; // 30 quest::MultiplayerAIDirectorStatus status; // 34 NodeRef pathRef; // 38 - CString scheduleEntryName; // 40 - CString scheduleName; // 60 + String scheduleEntryName; // 40 + String scheduleName; // 60 }; RED4EXT_ASSERT_SIZE(MultiplayerAIDirectorParams, 0x80); } // namespace quest diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/OpenPhotoMode_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/OpenPhotoMode_NodeType.hpp index 18c24682c..85cbab72f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/OpenPhotoMode_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/OpenPhotoMode_NodeType.hpp @@ -18,7 +18,7 @@ struct OpenPhotoMode_NodeType : quest::IUIManagerNodeType static constexpr const char* NAME = "questOpenPhotoMode_NodeType"; static constexpr const char* ALIAS = NAME; - CString factName; // 38 + String factName; // 38 bool forceFppMode; // 58 bool alwaysAllowTPP; // 59 bool lockExitUntilScreenshot; // 5A diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/OverrideLoadingScreen_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/OverrideLoadingScreen_NodeType.hpp index 61727b7e5..a42f54de8 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/OverrideLoadingScreen_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/OverrideLoadingScreen_NodeType.hpp @@ -23,7 +23,7 @@ struct OverrideLoadingScreen_NodeType : quest::IUIManagerNodeType RaRef video; // 38 DynArray> videos; // 40 - DynArray tooltips; // 50 + DynArray tooltips; // 50 float tooltipDuration; // 60 bool forceVideoFrameRate; // 64 uint8_t unk65[0x68 - 0x65]; // 65 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/SceneTalking_ConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/SceneTalking_ConditionType.hpp index 323c28ae2..5ee02e98f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/SceneTalking_ConditionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/SceneTalking_ConditionType.hpp @@ -28,7 +28,7 @@ struct SceneTalking_ConditionType : quest::ISceneConditionType scn::SceneVersionCheck SceneVersion; // 78 uint8_t unk79[0x80 - 0x79]; // 79 CName SectionName; // 80 - CString ActorName; // 88 + String ActorName; // 88 bool isInverted; // A8 uint8_t unkA9[0xB0 - 0xA9]; // A9 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/SetInspectMode_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/SetInspectMode_NodeType.hpp index 0702a7262..80afc9d6d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/SetInspectMode_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/SetInspectMode_NodeType.hpp @@ -18,7 +18,7 @@ struct SetInspectMode_NodeType : quest::IInteractiveObjectManagerNodeType static constexpr const char* NAME = "questSetInspectMode_NodeType"; static constexpr const char* ALIAS = NAME; - CString objectID; // 30 + String objectID; // 30 float startingOffset; // 50 float zoomOffset; // 54 float timeInterval; // 58 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/SetLocationName_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/SetLocationName_NodeType.hpp index 957071f88..1c0e2931f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/SetLocationName_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/SetLocationName_NodeType.hpp @@ -19,7 +19,7 @@ struct SetLocationName_NodeType : quest::IUIManagerNodeType static constexpr const char* NAME = "questSetLocationName_NodeType"; static constexpr const char* ALIAS = NAME; - CString locationName; // 38 + String locationName; // 38 quest::LocationAction action; // 58 TweakDBID districtID; // 5C bool isNewLocation; // 64 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/SetProgress_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/SetProgress_NodeType.hpp index fcaa8cb65..9c392843f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/SetProgress_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/SetProgress_NodeType.hpp @@ -19,7 +19,7 @@ struct SetProgress_NodeType : quest::IAchievementManagerNodeType static constexpr const char* ALIAS = NAME; TweakDBID achievement; // 30 - CString factName; // 38 + String factName; // 38 uint32_t maxValue; // 58 uint32_t currentValue; // 5C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/SetVar_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/SetVar_NodeType.hpp index d7a1b11d9..289c70f17 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/SetVar_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/SetVar_NodeType.hpp @@ -18,7 +18,7 @@ struct SetVar_NodeType : quest::IFactsDBManagerNodeType static constexpr const char* NAME = "questSetVar_NodeType"; static constexpr const char* ALIAS = NAME; - CString factName; // 30 + String factName; // 30 int32_t value; // 50 bool setExactValue; // 54 uint8_t unk55[0x58 - 0x55]; // 55 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/ShowCustomTooltip_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/ShowCustomTooltip_NodeType.hpp index 9da5b03ad..cdc408a18 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/ShowCustomTooltip_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/ShowCustomTooltip_NodeType.hpp @@ -22,7 +22,7 @@ struct ShowCustomTooltip_NodeType : quest::IUIManagerNodeType bool setTooltip; // 38 uint8_t unk39[0x40 - 0x39]; // 39 LocalizationString text; // 40 - CString inputAction; // 68 + String inputAction; // 68 ink::InputHintHoldIndicationType holdIndicationType; // 88 uint8_t unk89[0x8C - 0x89]; // 89 int32_t queuePriority; // 8C diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/ShowNarrativeEvent_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/ShowNarrativeEvent_NodeType.hpp index e29a0fb77..0df956721 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/ShowNarrativeEvent_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/ShowNarrativeEvent_NodeType.hpp @@ -19,7 +19,7 @@ struct ShowNarrativeEvent_NodeType : quest::IUIManagerNodeType static constexpr const char* NAME = "questShowNarrativeEvent_NodeType"; static constexpr const char* ALIAS = NAME; - CString eventText; // 38 + String eventText; // 38 Color textColor; // 58 float durationSec; // 5C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/ShowOnscreen_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/ShowOnscreen_NodeType.hpp index 2a04ba532..78d3ddc0a 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/ShowOnscreen_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/ShowOnscreen_NodeType.hpp @@ -18,7 +18,7 @@ struct ShowOnscreen_NodeType : quest::IUIManagerNodeType static constexpr const char* NAME = "questShowOnscreen_NodeType"; static constexpr const char* ALIAS = NAME; - CString message; // 38 + String message; // 38 LocalizationString localizedMessage; // 58 float duration; // 80 bool show; // 84 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/SpawnPlayerVehicle_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/SpawnPlayerVehicle_NodeType.hpp index 3272fdf37..7ecbf16cc 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/SpawnPlayerVehicle_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/SpawnPlayerVehicle_NodeType.hpp @@ -29,7 +29,7 @@ struct SpawnPlayerVehicle_NodeType : quest::IVehicleManagerNodeType Vector3 offset; // 48 bool driveIn; // 54 uint8_t unk55[0x58 - 0x55]; // 55 - CString vehicle; // 58 + String vehicle; // 58 CName vehicleGlobalName; // 78 bool despawnAllEnabledVehicles; // 80 bool retryUntilStubCreated; // 81 diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/StartRecording_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/StartRecording_NodeType.hpp index 72c6cf129..2766d5474 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/StartRecording_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/StartRecording_NodeType.hpp @@ -20,7 +20,7 @@ struct StartRecording_NodeType : quest::IRecordingNodeType bool enabled; // 30 uint8_t unk31[0x38 - 0x31]; // 31 - CString sectionName; // 38 + String sectionName; // 38 }; RED4EXT_ASSERT_SIZE(StartRecording_NodeType, 0x58); } // namespace quest diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/VarComparison_ConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/VarComparison_ConditionType.hpp index b89ab7e26..aa587052e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/VarComparison_ConditionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/VarComparison_ConditionType.hpp @@ -19,7 +19,7 @@ struct VarComparison_ConditionType : quest::IFactsDBConditionType static constexpr const char* NAME = "questVarComparison_ConditionType"; static constexpr const char* ALIAS = NAME; - CString factName; // 38 + String factName; // 38 int32_t value; // 58 EComparisonType comparisonType; // 5C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/VarVsVarComparison_ConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/VarVsVarComparison_ConditionType.hpp index 2c324b81d..94267bc16 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/VarVsVarComparison_ConditionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/VarVsVarComparison_ConditionType.hpp @@ -19,8 +19,8 @@ struct VarVsVarComparison_ConditionType : quest::IFactsDBConditionType static constexpr const char* NAME = "questVarVsVarComparison_ConditionType"; static constexpr const char* ALIAS = NAME; - CString factName1; // 38 - CString factName2; // 58 + String factName1; // 38 + String factName2; // 58 EComparisonType comparisonType; // 78 uint8_t unk7C[0x80 - 0x7C]; // 7C }; diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/VehicleAvailable_ConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/VehicleAvailable_ConditionType.hpp index 7ea3bfd26..ab24a3e97 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/VehicleAvailable_ConditionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/VehicleAvailable_ConditionType.hpp @@ -21,7 +21,7 @@ struct VehicleAvailable_ConditionType : quest::IVehicleConditionType quest::AvailableVehicleType vehicleType; // 38 uint8_t unk3C[0x40 - 0x3C]; // 3C - CString vehicleName; // 40 + String vehicleName; // 40 }; RED4EXT_ASSERT_SIZE(VehicleAvailable_ConditionType, 0x60); } // namespace quest diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/VehicleSpawned_ConditionType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/VehicleSpawned_ConditionType.hpp index 796b54eff..6a2bcd961 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/VehicleSpawned_ConditionType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/VehicleSpawned_ConditionType.hpp @@ -27,7 +27,7 @@ struct VehicleSpawned_ConditionType : quest::IVehicleConditionType uint32_t count; // 74 quest::SpawnedVehicleType vehicleType; // 78 uint8_t unk7C[0x80 - 0x7C]; // 7C - CString vehicleName; // 80 + String vehicleName; // 80 CName vehicleGlobalName; // A0 }; RED4EXT_ASSERT_SIZE(VehicleSpawned_ConditionType, 0xA8); diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/VendorPanelData.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/VendorPanelData.hpp index 18def93a6..56ae5cc5d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/VendorPanelData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/VendorPanelData.hpp @@ -21,7 +21,7 @@ struct VendorPanelData : IScriptable static constexpr const char* ALIAS = "VendorPanelData"; game::VendorData data; // 40 - CString assetsLibrary; // 70 + String assetsLibrary; // 70 CName rootItemName; // 90 }; RED4EXT_ASSERT_SIZE(VendorPanelData, 0x98); diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/VendorPanel_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/VendorPanel_NodeType.hpp index a3d8cd9d9..c4b635f20 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/VendorPanel_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/VendorPanel_NodeType.hpp @@ -22,10 +22,10 @@ struct VendorPanel_NodeType : quest::IUIManagerNodeType bool openVendorPanel; // 38 uint8_t unk39[0x40 - 0x39]; // 39 - CString vendorId; // 40 + String vendorId; // 40 game::EntityReference objectRef; // 60 CName scenarioName; // 98 - CString assetsLibrary; // A0 + String assetsLibrary; // A0 CName rootItemName; // C0 }; RED4EXT_ASSERT_SIZE(VendorPanel_NodeType, 0xC8); diff --git a/include/RED4ext/Scripting/Natives/Generated/quest/WarningMessage_NodeType.hpp b/include/RED4ext/Scripting/Natives/Generated/quest/WarningMessage_NodeType.hpp index 9b99ed968..c696677d8 100644 --- a/include/RED4ext/Scripting/Natives/Generated/quest/WarningMessage_NodeType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/quest/WarningMessage_NodeType.hpp @@ -19,7 +19,7 @@ struct WarningMessage_NodeType : quest::IUIManagerNodeType static constexpr const char* NAME = "questWarningMessage_NodeType"; static constexpr const char* ALIAS = NAME; - CString message; // 38 + String message; // 38 LocalizationString localizedMessage; // 58 float duration; // 80 bool show; // 84 diff --git a/include/RED4ext/Scripting/Natives/Generated/red/ErrorResult.hpp b/include/RED4ext/Scripting/Natives/Generated/red/ErrorResult.hpp index 34034ce7e..4354a2f5f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/red/ErrorResult.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/red/ErrorResult.hpp @@ -17,7 +17,7 @@ struct ErrorResult static constexpr const char* NAME = "redErrorResult"; static constexpr const char* ALIAS = NAME; - CString message; // 00 + String message; // 00 Variant userData; // 20 }; RED4EXT_ASSERT_SIZE(ErrorResult, 0x38); diff --git a/include/RED4ext/Scripting/Natives/Generated/red/ResourceListResource.hpp b/include/RED4ext/Scripting/Natives/Generated/red/ResourceListResource.hpp index c6011fad6..a6d0c63eb 100644 --- a/include/RED4ext/Scripting/Natives/Generated/red/ResourceListResource.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/red/ResourceListResource.hpp @@ -22,7 +22,7 @@ struct ResourceListResource : CResource static constexpr const char* ALIAS = NAME; DynArray> resources; // 40 - DynArray descriptions; // 50 + DynArray descriptions; // 50 }; RED4EXT_ASSERT_SIZE(ResourceListResource, 0x60); } // namespace red diff --git a/include/RED4ext/Scripting/Natives/Generated/red/StageMessage.hpp b/include/RED4ext/Scripting/Natives/Generated/red/StageMessage.hpp index d3b8c44ec..073524e76 100644 --- a/include/RED4ext/Scripting/Natives/Generated/red/StageMessage.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/red/StageMessage.hpp @@ -22,7 +22,7 @@ struct StageMessage bool reset; // 04 uint8_t unk05[0x8 - 0x5]; // 5 DynArray ids; // 08 - DynArray names; // 18 + DynArray names; // 18 }; RED4EXT_ASSERT_SIZE(StageMessage, 0x28); } // namespace red diff --git a/include/RED4ext/Scripting/Natives/Generated/red/TaskNameMessage.hpp b/include/RED4ext/Scripting/Natives/Generated/red/TaskNameMessage.hpp index 3b1ba3edc..78cf296a6 100644 --- a/include/RED4ext/Scripting/Natives/Generated/red/TaskNameMessage.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/red/TaskNameMessage.hpp @@ -20,7 +20,7 @@ struct TaskNameMessage uint32_t id; // 00 uint32_t parent; // 04 - CString title; // 08 + String title; // 08 CName uniqueName; // 28 }; RED4EXT_ASSERT_SIZE(TaskNameMessage, 0x30); diff --git a/include/RED4ext/Scripting/Natives/Generated/red/TaskTextMessage.hpp b/include/RED4ext/Scripting/Natives/Generated/red/TaskTextMessage.hpp index e6b84aa21..f2ea9aeac 100644 --- a/include/RED4ext/Scripting/Natives/Generated/red/TaskTextMessage.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/red/TaskTextMessage.hpp @@ -22,7 +22,7 @@ struct TaskTextMessage uint8_t unk04[0x8 - 0x4]; // 4 uint32_t parent; // 08 uint8_t unk0C[0x10 - 0xC]; // C - CString text; // 10 + String text; // 10 red::TaskTextMessageType type; // 30 uint8_t unk34[0x38 - 0x34]; // 34 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/rend/CaptureParameters.hpp b/include/RED4ext/Scripting/Natives/Generated/rend/CaptureParameters.hpp index 70f76cea6..010d90a85 100644 --- a/include/RED4ext/Scripting/Natives/Generated/rend/CaptureParameters.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/rend/CaptureParameters.hpp @@ -27,8 +27,8 @@ struct CaptureParameters rend::ScreenshotMode mode; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString outputDirectoryName; // 08 - CString outputDirectoryNameSuffix; // 28 + String outputDirectoryName; // 08 + String outputDirectoryNameSuffix; // 28 uint32_t initialFrameNumber; // 48 uint32_t outputDirectoryIndex; // 4C uint32_t recordingFPS; // 50 diff --git a/include/RED4ext/Scripting/Natives/Generated/save/GameMetadata.hpp b/include/RED4ext/Scripting/Natives/Generated/save/GameMetadata.hpp index 14d31effc..2ad89edcb 100644 --- a/include/RED4ext/Scripting/Natives/Generated/save/GameMetadata.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/save/GameMetadata.hpp @@ -22,20 +22,20 @@ struct GameMetadata static constexpr const char* ALIAS = NAME; uint8_t unk00[0x8 - 0x0]; // 0 - CString gameDefinition; // 08 - CString activeQuests; // 28 - CString trackedQuestEntry; // 48 - CString trackedQuest; // 68 - CString mainQuest; // 88 - CString locationName; // A8 - CString debugString; // C8 - CString initialBuildID; // E8 - CString finishedQuests; // 108 - CString playthroughID; // 128 - CString pointOfNoReturnId; // 148 - CString visitID; // 168 - CString buildSKU; // 188 - CString buildPatch; // 1A8 + String gameDefinition; // 08 + String activeQuests; // 28 + String trackedQuestEntry; // 48 + String trackedQuest; // 68 + String mainQuest; // 88 + String locationName; // A8 + String debugString; // C8 + String initialBuildID; // E8 + String finishedQuests; // 108 + String playthroughID; // 128 + String pointOfNoReturnId; // 148 + String visitID; // 168 + String buildSKU; // 188 + String buildPatch; // 1A8 Vector3 playerPosition; // 1C8 uint8_t unk1D4[0x1D8 - 0x1D4]; // 1D4 double playTime; // 1D8 @@ -44,11 +44,11 @@ struct GameMetadata uint32_t nextNonSavableEntityID; // 1EC game::data::LifePath lifePath; // 1F0 uint8_t unk1F4[0x1F8 - 0x1F4]; // 1F4 - CString bodyGender; // 1F8 - CString brainGender; // 218 + String bodyGender; // 1F8 + String brainGender; // 218 game::Difficulty difficulty; // 238 uint8_t unk23C[0x240 - 0x23C]; // 23C - DynArray facts; // 240 + DynArray facts; // 240 float level; // 250 float streetCred; // 254 float gunslinger; // 258 diff --git a/include/RED4ext/Scripting/Natives/Generated/save/Metadata.hpp b/include/RED4ext/Scripting/Natives/Generated/save/Metadata.hpp index fd578b1db..364610070 100644 --- a/include/RED4ext/Scripting/Natives/Generated/save/Metadata.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/save/Metadata.hpp @@ -23,14 +23,14 @@ struct Metadata : save::GameMetadata uint32_t saveVersion; // 298 uint32_t gameVersion; // 29C uint8_t unk2A0[0x2A8 - 0x2A0]; // 2A0 - CString timestampString; // 2A8 - CString name; // 2C8 + String timestampString; // 2A8 + String name; // 2C8 uint8_t unk2E8[0x308 - 0x2E8]; // 2E8 - CString userName; // 308 - CString buildID; // 328 - CString platform; // 348 - CString censorFlags; // 368 - CString buildConfiguration; // 388 + String userName; // 308 + String buildID; // 328 + String platform; // 348 + String censorFlags; // 368 + String buildConfiguration; // 388 uint32_t fileSize; // 3A8 bool isForced; // 3AC bool isCheckpoint; // 3AD diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/ActorDef.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/ActorDef.hpp index 12cf1b2bd..f33e7ad02 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/ActorDef.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/ActorDef.hpp @@ -59,7 +59,7 @@ struct __declspec(align(0x10)) ActorDef RaRef holocallInitScn; // 1A0 scn::LipsyncAnimSetSRRefId lipsyncAnimSet; // 1A8 uint8_t unk1AC[0x1B0 - 0x1AC]; // 1AC - CString actorName; // 1B0 + String actorName; // 1B0 TweakDBID specCharacterRecordId; // 1D0 CName specAppearance; // 1D8 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/ChoiceNode.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/ChoiceNode.hpp index ed4602df5..8e3aa0ccc 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/ChoiceNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/ChoiceNode.hpp @@ -42,7 +42,7 @@ struct __declspec(align(0x10)) ChoiceNode : scn::SceneGraphNode static constexpr const char* NAME = "scnChoiceNode"; static constexpr const char* ALIAS = NAME; - CString displayNameOverride; // 48 + String displayNameOverride; // 48 LocalizationString localizedDisplayNameOverride; // 68 DynArray options; // 90 scn::ChoiceNodeNsOperationMode mode; // A0 diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/DialogDisplayString.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/DialogDisplayString.hpp index c49f1587e..e21ce4907 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/DialogDisplayString.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/DialogDisplayString.hpp @@ -18,10 +18,10 @@ struct DialogDisplayString static constexpr const char* NAME = "scnDialogDisplayString"; static constexpr const char* ALIAS = NAME; - CString text; // 00 - CString translation; // 20 - CString preTranslatedText; // 40 - CString postTranslatedText; // 60 + String text; // 00 + String translation; // 20 + String preTranslatedText; // 40 + String postTranslatedText; // 60 scn::DialogLineLanguage language; // 80 uint8_t unk84[0x88 - 0x84]; // 84 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/DialogLineData.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/DialogLineData.hpp index 6ab384b99..f77ce0c77 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/DialogLineData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/DialogLineData.hpp @@ -22,11 +22,11 @@ struct DialogLineData static constexpr const char* ALIAS = NAME; CRUID id; // 00 - CString text; // 08 + String text; // 08 scn::DialogLineType type; // 28 uint8_t unk2C[0x30 - 0x2C]; // 2C WeakHandle speaker; // 30 - CString speakerName; // 40 + String speakerName; // 40 float duration; // 60 bool isPersistent; // 64 uint8_t unk65[0x68 - 0x65]; // 65 diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/PlayVideoEvent.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/PlayVideoEvent.hpp index bd0b1ffdf..396da03b6 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/PlayVideoEvent.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/PlayVideoEvent.hpp @@ -18,7 +18,7 @@ struct PlayVideoEvent : scn::SceneEvent static constexpr const char* NAME = "scnPlayVideoEvent"; static constexpr const char* ALIAS = NAME; - CString videoPath; // 58 + String videoPath; // 58 bool isPhoneCall; // 78 bool forceFrameRate; // 79 uint8_t unk7A[0x80 - 0x7A]; // 7A diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/PlayerActorDef.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/PlayerActorDef.hpp index 2e2526638..0d0666be4 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/PlayerActorDef.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/PlayerActorDef.hpp @@ -50,7 +50,7 @@ struct PlayerActorDef scn::FindEntityInContextParams findActorInContextParams; // B0 scn::LipsyncAnimSetSRRefId lipsyncAnimSet; // D8 uint8_t unkDC[0xE0 - 0xDC]; // DC - CString playerName; // E0 + String playerName; // E0 }; RED4EXT_ASSERT_SIZE(PlayerActorDef, 0x100); } // namespace scn diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/PropDef.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/PropDef.hpp index 1a9c423f2..29bc90f75 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/PropDef.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/PropDef.hpp @@ -41,7 +41,7 @@ struct __declspec(align(0x10)) PropDef scn::FindEntityInWorldParams findEntityInWorldParams; // E0 scn::PropId propId; // 120 uint8_t unk124[0x128 - 0x124]; // 124 - CString propName; // 128 + String propName; // 128 TweakDBID specPropRecordId; // 148 DynArray animSets; // 150 DynArray cinematicAnimSets; // 160 diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/dev/Event.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/dev/Event.hpp index 42f73c5fc..4a9dd29cb 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/dev/Event.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/dev/Event.hpp @@ -21,7 +21,7 @@ struct Event scn::dev::EventType type; // 00 scn::NodeId nodeId; // 04 - CString message; // 08 + String message; // 08 }; RED4EXT_ASSERT_SIZE(Event, 0x28); } // namespace scn::dev diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/loc/LocStoreEmbeddedVariantPayloadEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/loc/LocStoreEmbeddedVariantPayloadEntry.hpp index 4e2cb6de0..9b7936f4d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/loc/LocStoreEmbeddedVariantPayloadEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/loc/LocStoreEmbeddedVariantPayloadEntry.hpp @@ -19,7 +19,7 @@ struct LocStoreEmbeddedVariantPayloadEntry static constexpr const char* ALIAS = NAME; scn::loc::VariantId variantId; // 00 - CString content; // 08 + String content; // 08 }; RED4EXT_ASSERT_SIZE(LocStoreEmbeddedVariantPayloadEntry, 0x28); } // namespace scn::loc diff --git a/include/RED4ext/Scripting/Natives/Generated/scn/screenplay/StandaloneComment.hpp b/include/RED4ext/Scripting/Natives/Generated/scn/screenplay/StandaloneComment.hpp index fb66f4897..79d4b5183 100644 --- a/include/RED4ext/Scripting/Natives/Generated/scn/screenplay/StandaloneComment.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/scn/screenplay/StandaloneComment.hpp @@ -20,7 +20,7 @@ struct StandaloneComment scn::screenplay::ItemId itemId; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString comment; // 08 + String comment; // 08 }; RED4EXT_ASSERT_SIZE(StandaloneComment, 0x28); } // namespace scn::screenplay diff --git a/include/RED4ext/Scripting/Natives/Generated/shared/MenuItem.hpp b/include/RED4ext/Scripting/Natives/Generated/shared/MenuItem.hpp index 103b648e3..1ae5de325 100644 --- a/include/RED4ext/Scripting/Natives/Generated/shared/MenuItem.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/shared/MenuItem.hpp @@ -22,12 +22,12 @@ struct MenuItem static constexpr const char* ALIAS = NAME; uint8_t unk00[0x8 - 0x0]; // 0 - CString displayName; // 08 + String displayName; // 08 shared::MenuItemType type; // 28 bool isEnabled; // 29 uint8_t unk2A[0x30 - 0x2A]; // 2A - CString tooltip; // 30 - CString checkGroup; // 50 + String tooltip; // 30 + String checkGroup; // 50 bool isChecked; // 70 uint8_t unk71[0x78 - 0x71]; // 71 CName id; // 78 diff --git a/include/RED4ext/Scripting/Natives/Generated/shared/ResourceCommandOutcome.hpp b/include/RED4ext/Scripting/Natives/Generated/shared/ResourceCommandOutcome.hpp index 7cff89299..1b0a61cb8 100644 --- a/include/RED4ext/Scripting/Natives/Generated/shared/ResourceCommandOutcome.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/shared/ResourceCommandOutcome.hpp @@ -21,8 +21,8 @@ struct ResourceCommandOutcome shared::CommandResult result; // 00 uint8_t unk04[0x8 - 0x4]; // 4 - CString message; // 08 - DynArray modifiedFiles; // 28 + String message; // 08 + DynArray modifiedFiles; // 28 }; RED4EXT_ASSERT_SIZE(ResourceCommandOutcome, 0x38); } // namespace shared diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraAttachment.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraAttachment.hpp index 1a663d1f9..4ab1de20b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraAttachment.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraAttachment.hpp @@ -17,10 +17,10 @@ struct JiraAttachment static constexpr const char* NAME = "toolsJiraAttachment"; static constexpr const char* ALIAS = NAME; - CString id; // 00 - CString filename; // 20 - CString content; // 40 - CString thumbnail; // 60 + String id; // 00 + String filename; // 20 + String content; // 40 + String thumbnail; // 60 }; RED4EXT_ASSERT_SIZE(JiraAttachment, 0x80); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCommentIssueBody.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCommentIssueBody.hpp index 443c30cb9..6f3c4fc6a 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCommentIssueBody.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCommentIssueBody.hpp @@ -18,7 +18,7 @@ struct JiraCommentIssueBody : ISerializable static constexpr const char* NAME = "toolsJiraCommentIssueBody"; static constexpr const char* ALIAS = NAME; - CString body; // 30 + String body; // 30 }; RED4EXT_ASSERT_SIZE(JiraCommentIssueBody, 0x50); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCommentIssueResult.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCommentIssueResult.hpp index 2dfccc517..c2096178f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCommentIssueResult.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCommentIssueResult.hpp @@ -19,7 +19,7 @@ struct JiraCommentIssueResult : ISerializable static constexpr const char* NAME = "toolsJiraCommentIssueResult"; static constexpr const char* ALIAS = NAME; - DynArray errorMessages; // 30 + DynArray errorMessages; // 30 }; RED4EXT_ASSERT_SIZE(JiraCommentIssueResult, 0x40); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCreateIssueResult.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCreateIssueResult.hpp index 2b02bdf4c..0b5b0b901 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCreateIssueResult.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCreateIssueResult.hpp @@ -20,9 +20,9 @@ struct JiraCreateIssueResult : ISerializable static constexpr const char* NAME = "toolsJiraCreateIssueResult"; static constexpr const char* ALIAS = NAME; - CString id; // 30 - CString key; // 50 - DynArray errorMessages; // 70 + String id; // 30 + String key; // 50 + DynArray errorMessages; // 70 tools::JiraIssueFieldsResult errors; // 80 }; RED4EXT_ASSERT_SIZE(JiraCreateIssueResult, 0x4D0); diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCurrentUserInfo.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCurrentUserInfo.hpp index 38168774a..936b52972 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCurrentUserInfo.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCurrentUserInfo.hpp @@ -18,7 +18,7 @@ struct JiraCurrentUserInfo : ISerializable static constexpr const char* NAME = "toolsJiraCurrentUserInfo"; static constexpr const char* ALIAS = NAME; - CString name; // 30 + String name; // 30 }; RED4EXT_ASSERT_SIZE(JiraCurrentUserInfo, 0x50); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldId.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldId.hpp index badcc42de..9edb1874b 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldId.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldId.hpp @@ -17,7 +17,7 @@ struct JiraCustomFieldId static constexpr const char* NAME = "toolsJiraCustomFieldId"; static constexpr const char* ALIAS = NAME; - CString id; // 00 + String id; // 00 }; RED4EXT_ASSERT_SIZE(JiraCustomFieldId, 0x20); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldName.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldName.hpp index 20f24b05e..117070ae7 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldName.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldName.hpp @@ -17,7 +17,7 @@ struct JiraCustomFieldName static constexpr const char* NAME = "toolsJiraCustomFieldName"; static constexpr const char* ALIAS = NAME; - CString name; // 00 + String name; // 00 }; RED4EXT_ASSERT_SIZE(JiraCustomFieldName, 0x20); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldValue.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldValue.hpp index d557db70a..a69397585 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldValue.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraCustomFieldValue.hpp @@ -17,7 +17,7 @@ struct JiraCustomFieldValue static constexpr const char* NAME = "toolsJiraCustomFieldValue"; static constexpr const char* ALIAS = NAME; - CString value; // 00 + String value; // 00 }; RED4EXT_ASSERT_SIZE(JiraCustomFieldValue, 0x20); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraEditIssueResult.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraEditIssueResult.hpp index bc1e2b14a..4ef1e3871 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraEditIssueResult.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraEditIssueResult.hpp @@ -20,7 +20,7 @@ struct JiraEditIssueResult : ISerializable static constexpr const char* NAME = "toolsJiraEditIssueResult"; static constexpr const char* ALIAS = NAME; - DynArray errorMessages; // 30 + DynArray errorMessages; // 30 tools::JiraIssueFieldsResult errors; // 40 }; RED4EXT_ASSERT_SIZE(JiraEditIssueResult, 0x490); diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraFixVersion.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraFixVersion.hpp index ae6320251..1211535d2 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraFixVersion.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraFixVersion.hpp @@ -17,7 +17,7 @@ struct JiraFixVersion static constexpr const char* NAME = "toolsJiraFixVersion"; static constexpr const char* ALIAS = NAME; - CString id; // 00 + String id; // 00 }; RED4EXT_ASSERT_SIZE(JiraFixVersion, 0x20); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssue.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssue.hpp index d667f105b..21a6e325f 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssue.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssue.hpp @@ -18,9 +18,9 @@ struct JiraIssue static constexpr const char* NAME = "toolsJiraIssue"; static constexpr const char* ALIAS = NAME; - CString id; // 00 - CString key; // 20 - CString self; // 40 + String id; // 00 + String key; // 20 + String self; // 40 tools::JiraIssueFields fields; // 60 }; RED4EXT_ASSERT_SIZE(JiraIssue, 0x4B8); diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueFields.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueFields.hpp index 46d08afce..86a4f4e52 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueFields.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueFields.hpp @@ -28,36 +28,36 @@ struct JiraIssueFields static constexpr const char* NAME = "toolsJiraIssueFields"; static constexpr const char* ALIAS = NAME; - CString summary; // 00 - CString description; // 20 + String summary; // 00 + String description; // 20 tools::JiraProject project; // 40 tools::JiraStatus status; // 80 tools::JiraResolution resolution; // C0 tools::JiraIssueType issuetype; // 100 tools::JiraPriority priority; // 120 - CString flagPosition; // 140 - CString customfield_10013; // 160 - CString customfield_18373; // 180 - CString customfield_13009; // 1A0 + String flagPosition; // 140 + String customfield_10013; // 160 + String customfield_18373; // 180 + String customfield_13009; // 1A0 tools::JiraCustomFieldValue customfield_10505; // 1C0 tools::JiraCustomFieldValue customfield_29900; // 1E0 - CString customfield_18006; // 200 + String customfield_18006; // 200 tools::JiraCustomFieldName assignee; // 220 - CString customfield_10006; // 240 - CString customfield_31700; // 260 + String customfield_10006; // 240 + String customfield_31700; // 260 tools::JiraCustomFieldValue customfield_25500; // 280 - DynArray labels; // 2A0 + DynArray labels; // 2A0 DynArray attachment; // 2B0 DynArray customfield_15306; // 2C0 DynArray fixVersions; // 2D0 DynArray versions; // 2E0 uint8_t unk2F0[0x2F8 - 0x2F0]; // 2F0 - CString customfield_10005; // 2F8 - CString customfield_24700; // 318 - CString customfield_10606; // 338 - CString customfield_33701; // 358 - CString customfield_10503; // 378 - CString customfield_10502; // 398 + String customfield_10005; // 2F8 + String customfield_24700; // 318 + String customfield_10606; // 338 + String customfield_33701; // 358 + String customfield_10503; // 378 + String customfield_10502; // 398 tools::JiraCustomFieldValue customfield_34100; // 3B8 tools::JiraCustomFieldId customfield_17400; // 3D8 DynArray customfield_15808; // 3F8 diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueFieldsResult.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueFieldsResult.hpp index 7ffb1c3c9..0594ecaee 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueFieldsResult.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueFieldsResult.hpp @@ -19,41 +19,41 @@ struct JiraIssueFieldsResult static constexpr const char* NAME = "toolsJiraIssueFieldsResult"; static constexpr const char* ALIAS = NAME; - CString summary; // 00 - CString description; // 20 - CString project; // 40 - CString issuetype; // 60 - CString priority; // 80 - CString flagPosition; // A0 - CString customfield_10013; // C0 - CString customfield_18373; // E0 - CString customfield_13009; // 100 - CString customfield_10505; // 120 - CString customfield_29900; // 140 - CString customfield_18006; // 160 - CString assignee; // 180 - CString customfield_10006; // 1A0 - CString customfield_25500; // 1C0 - CString labels; // 1E0 + String summary; // 00 + String description; // 20 + String project; // 40 + String issuetype; // 60 + String priority; // 80 + String flagPosition; // A0 + String customfield_10013; // C0 + String customfield_18373; // E0 + String customfield_13009; // 100 + String customfield_10505; // 120 + String customfield_29900; // 140 + String customfield_18006; // 160 + String assignee; // 180 + String customfield_10006; // 1A0 + String customfield_25500; // 1C0 + String labels; // 1E0 DynArray attachments; // 200 - CString customfield_15306; // 210 - CString fixVersions; // 230 - CString versions; // 250 - CString customfield_10002; // 270 - CString customfield_10005; // 290 - CString customfield_24700; // 2B0 - CString customfield_10606; // 2D0 - CString customfield_33701; // 2F0 - CString customfield_10503; // 310 - CString customfield_10502; // 330 - CString customfield_34100; // 350 - CString customfield_17400; // 370 - CString customfield_15808; // 390 - CString customfield_34718; // 3B0 - CString customfield_34706; // 3D0 - CString customfield_10603; // 3F0 - CString customfield_36106; // 410 - CString components; // 430 + String customfield_15306; // 210 + String fixVersions; // 230 + String versions; // 250 + String customfield_10002; // 270 + String customfield_10005; // 290 + String customfield_24700; // 2B0 + String customfield_10606; // 2D0 + String customfield_33701; // 2F0 + String customfield_10503; // 310 + String customfield_10502; // 330 + String customfield_34100; // 350 + String customfield_17400; // 370 + String customfield_15808; // 390 + String customfield_34718; // 3B0 + String customfield_34706; // 3D0 + String customfield_10603; // 3F0 + String customfield_36106; // 410 + String components; // 430 }; RED4EXT_ASSERT_SIZE(JiraIssueFieldsResult, 0x450); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueTransition.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueTransition.hpp index a86bf3bd1..9e1fa67a4 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueTransition.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueTransition.hpp @@ -17,7 +17,7 @@ struct JiraIssueTransition static constexpr const char* NAME = "toolsJiraIssueTransition"; static constexpr const char* ALIAS = NAME; - CString id; // 00 + String id; // 00 }; RED4EXT_ASSERT_SIZE(JiraIssueTransition, 0x20); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueType.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueType.hpp index 9e7d317e7..034b5b76e 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueType.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraIssueType.hpp @@ -17,7 +17,7 @@ struct JiraIssueType static constexpr const char* NAME = "toolsJiraIssueType"; static constexpr const char* ALIAS = NAME; - CString name; // 00 + String name; // 00 }; RED4EXT_ASSERT_SIZE(JiraIssueType, 0x20); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraPerson.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraPerson.hpp index d50c45a4f..1377830be 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraPerson.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraPerson.hpp @@ -17,9 +17,9 @@ struct JiraPerson static constexpr const char* NAME = "toolsJiraPerson"; static constexpr const char* ALIAS = NAME; - CString name; // 00 - CString key; // 20 - CString displayName; // 40 + String name; // 00 + String key; // 20 + String displayName; // 40 }; RED4EXT_ASSERT_SIZE(JiraPerson, 0x60); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraPriority.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraPriority.hpp index 4b80a64c6..ac71fac42 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraPriority.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraPriority.hpp @@ -17,7 +17,7 @@ struct JiraPriority static constexpr const char* NAME = "toolsJiraPriority"; static constexpr const char* ALIAS = NAME; - CString name; // 00 + String name; // 00 }; RED4EXT_ASSERT_SIZE(JiraPriority, 0x20); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraProject.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraProject.hpp index 45efa3a79..35b8eb3ce 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraProject.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraProject.hpp @@ -17,8 +17,8 @@ struct JiraProject static constexpr const char* NAME = "toolsJiraProject"; static constexpr const char* ALIAS = NAME; - CString key; // 00 - CString name; // 20 + String key; // 00 + String name; // 20 }; RED4EXT_ASSERT_SIZE(JiraProject, 0x40); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraResolution.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraResolution.hpp index a72493bab..028e69498 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraResolution.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraResolution.hpp @@ -17,8 +17,8 @@ struct JiraResolution static constexpr const char* NAME = "toolsJiraResolution"; static constexpr const char* ALIAS = NAME; - CString name; // 00 - CString id; // 20 + String name; // 00 + String id; // 20 }; RED4EXT_ASSERT_SIZE(JiraResolution, 0x40); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraSearchIssuesResult.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraSearchIssuesResult.hpp index d4c196abb..5766dc415 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraSearchIssuesResult.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraSearchIssuesResult.hpp @@ -25,8 +25,8 @@ struct JiraSearchIssuesResult : ISerializable uint32_t total; // 38 uint8_t unk3C[0x40 - 0x3C]; // 3C DynArray issues; // 40 - DynArray errorMessages; // 50 - DynArray warningMessages; // 60 + DynArray errorMessages; // 50 + DynArray warningMessages; // 60 }; RED4EXT_ASSERT_SIZE(JiraSearchIssuesResult, 0x70); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/JiraStatus.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/JiraStatus.hpp index 0b0b00e1b..75840e3c3 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/JiraStatus.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/JiraStatus.hpp @@ -17,8 +17,8 @@ struct JiraStatus static constexpr const char* NAME = "toolsJiraStatus"; static constexpr const char* ALIAS = NAME; - CString name; // 00 - CString id; // 20 + String name; // 00 + String id; // 20 }; RED4EXT_ASSERT_SIZE(JiraStatus, 0x40); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/LastNodeSelection.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/LastNodeSelection.hpp index 0e1bb72e4..47ac67521 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/LastNodeSelection.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/LastNodeSelection.hpp @@ -18,7 +18,7 @@ struct LastNodeSelection static constexpr const char* NAME = "toolsLastNodeSelection"; static constexpr const char* ALIAS = NAME; - CString editorName; // 00 + String editorName; // 00 tools::EditorObjectIDPath selectedNodeIDPath; // 20 }; RED4EXT_ASSERT_SIZE(LastNodeSelection, 0x30); diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/MessageLocation_Webpage.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/MessageLocation_Webpage.hpp index c8b71054b..b0059180d 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/MessageLocation_Webpage.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/MessageLocation_Webpage.hpp @@ -19,8 +19,8 @@ struct MessageLocation_Webpage : tools::IMessageLocation static constexpr const char* ALIAS = NAME; uint8_t unk30[0x38 - 0x30]; // 30 - CString link; // 38 - CString text; // 58 + String link; // 38 + String text; // 58 }; RED4EXT_ASSERT_SIZE(MessageLocation_Webpage, 0x78); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/tools/MessageToken_Text.hpp b/include/RED4ext/Scripting/Natives/Generated/tools/MessageToken_Text.hpp index 133c2d7a5..1f73dd021 100644 --- a/include/RED4ext/Scripting/Natives/Generated/tools/MessageToken_Text.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/tools/MessageToken_Text.hpp @@ -18,7 +18,7 @@ struct MessageToken_Text : tools::IMessageToken static constexpr const char* NAME = "toolsMessageToken_Text"; static constexpr const char* ALIAS = NAME; - CString text; // 30 + String text; // 30 }; RED4EXT_ASSERT_SIZE(MessageToken_Text, 0x50); } // namespace tools diff --git a/include/RED4ext/Scripting/Natives/Generated/vehicle/CinematicCameraShot.hpp b/include/RED4ext/Scripting/Natives/Generated/vehicle/CinematicCameraShot.hpp index 96ae54738..709d9aac8 100644 --- a/include/RED4ext/Scripting/Natives/Generated/vehicle/CinematicCameraShot.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/vehicle/CinematicCameraShot.hpp @@ -24,7 +24,7 @@ struct __declspec(align(0x10)) CinematicCameraShot : IScriptable static constexpr const char* NAME = "vehicleCinematicCameraShot"; static constexpr const char* ALIAS = NAME; - CString name; // 40 + String name; // 40 bool enabled; // 60 uint8_t unk61[0x64 - 0x61]; // 61 int32_t probability; // 64 diff --git a/include/RED4ext/Scripting/Natives/Generated/vehicle/CinematicCameraShotGroup.hpp b/include/RED4ext/Scripting/Natives/Generated/vehicle/CinematicCameraShotGroup.hpp index 0f5e98e6c..a6f484142 100644 --- a/include/RED4ext/Scripting/Natives/Generated/vehicle/CinematicCameraShotGroup.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/vehicle/CinematicCameraShotGroup.hpp @@ -23,7 +23,7 @@ struct CinematicCameraShotGroup : IScriptable static constexpr const char* NAME = "vehicleCinematicCameraShotGroup"; static constexpr const char* ALIAS = NAME; - CString name; // 40 + String name; // 40 DynArray shots; // 60 DynArray> conditions; // 70 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/vg/VectorGraphicShape_Text.hpp b/include/RED4ext/Scripting/Natives/Generated/vg/VectorGraphicShape_Text.hpp index cc517cee7..00cc04614 100644 --- a/include/RED4ext/Scripting/Natives/Generated/vg/VectorGraphicShape_Text.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/vg/VectorGraphicShape_Text.hpp @@ -18,7 +18,7 @@ struct __declspec(align(0x10)) VectorGraphicShape_Text : vg::BaseVectorGraphicSh static constexpr const char* NAME = "vgVectorGraphicShape_Text"; static constexpr const char* ALIAS = NAME; - CString xt; // C0 + String xt; // C0 }; RED4EXT_ASSERT_SIZE(VectorGraphicShape_Text, 0xE0); } // namespace vg diff --git a/include/RED4ext/Scripting/Natives/Generated/world/BenchmarkSummary.hpp b/include/RED4ext/Scripting/Natives/Generated/world/BenchmarkSummary.hpp index 21b4cd443..ee81b3691 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/BenchmarkSummary.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/BenchmarkSummary.hpp @@ -19,16 +19,16 @@ struct BenchmarkSummary : IScriptable static constexpr const char* NAME = "worldBenchmarkSummary"; static constexpr const char* ALIAS = NAME; - CString gameVersion; // 40 - CString benchmarkName; // 60 - CString gpuName; // 80 + String gameVersion; // 40 + String benchmarkName; // 60 + String gpuName; // 80 uint64_t gpuMemory; // A0 - CString gpuDriverVersion; // A8 - CString cpuName; // C8 + String gpuDriverVersion; // A8 + String cpuName; // C8 uint64_t systemMemory; // E8 - CString osName; // F0 - CString osVersion; // 110 - CString presetName; // 130 + String osName; // F0 + String osVersion; // 110 + String presetName; // 130 CName presetLocalizedName; // 150 CName textureQualityPresetLocalizedName; // 158 uint32_t renderWidth; // 160 diff --git a/include/RED4ext/Scripting/Natives/Generated/world/BlockoutArea.hpp b/include/RED4ext/Scripting/Natives/Generated/world/BlockoutArea.hpp index 43790da8b..cbb2148cd 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/BlockoutArea.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/BlockoutArea.hpp @@ -23,7 +23,7 @@ struct BlockoutArea : ISerializable static constexpr const char* NAME = "worldBlockoutArea"; static constexpr const char* ALIAS = NAME; - CString name; // 30 + String name; // 30 Color color; // 50 uint32_t parent; // 54 DynArray children; // 58 diff --git a/include/RED4ext/Scripting/Natives/Generated/world/DebugFilterSetting_MeshResource.hpp b/include/RED4ext/Scripting/Natives/Generated/world/DebugFilterSetting_MeshResource.hpp index 8ed0ab071..e001ec061 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/DebugFilterSetting_MeshResource.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/DebugFilterSetting_MeshResource.hpp @@ -19,7 +19,7 @@ struct DebugFilterSetting_MeshResource : world::EditorDebugFilterSettings static constexpr const char* NAME = "worldDebugFilterSetting_MeshResource"; static constexpr const char* ALIAS = NAME; - DynArray resourcePaths; // 30 + DynArray resourcePaths; // 30 uint8_t unk40[0x78 - 0x40]; // 40 }; RED4EXT_ASSERT_SIZE(DebugFilterSetting_MeshResource, 0x78); diff --git a/include/RED4ext/Scripting/Natives/Generated/world/HeatmapLayer.hpp b/include/RED4ext/Scripting/Natives/Generated/world/HeatmapLayer.hpp index 8ba1adaac..d24782eed 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/HeatmapLayer.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/HeatmapLayer.hpp @@ -21,8 +21,8 @@ struct HeatmapLayer : CResource uint8_t unk40[0x50 - 0x40]; // 40 uint32_t minValue; // 50 uint32_t maxValue; // 54 - CString name; // 58 - CString units; // 78 + String name; // 58 + String units; // 78 bool invert; // 98 uint8_t unk99[0xA0 - 0x99]; // 99 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/world/HeatmapResource.hpp b/include/RED4ext/Scripting/Natives/Generated/world/HeatmapResource.hpp index 53d768598..4d7afe0f1 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/HeatmapResource.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/HeatmapResource.hpp @@ -23,8 +23,8 @@ struct __declspec(align(0x10)) HeatmapResource : CResource static constexpr const char* ALIAS = NAME; world::HeatmapSetup setup; // 40 - CString name; // 70 - DynArray layerNames; // 90 + String name; // 70 + DynArray layerNames; // 90 DynArray> layers; // A0 }; RED4EXT_ASSERT_SIZE(HeatmapResource, 0xB0); diff --git a/include/RED4ext/Scripting/Natives/Generated/world/LocationAreaNode.hpp b/include/RED4ext/Scripting/Natives/Generated/world/LocationAreaNode.hpp index 493f459b9..e5c9e0088 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/LocationAreaNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/LocationAreaNode.hpp @@ -18,7 +18,7 @@ struct LocationAreaNode : world::TriggerAreaNode static constexpr const char* NAME = "worldLocationAreaNode"; static constexpr const char* ALIAS = NAME; - CString locationName; // 70 + String locationName; // 70 uint8_t unk90[0x98 - 0x90]; // 90 }; RED4EXT_ASSERT_SIZE(LocationAreaNode, 0x98); diff --git a/include/RED4ext/Scripting/Natives/Generated/world/NameColorPair.hpp b/include/RED4ext/Scripting/Natives/Generated/world/NameColorPair.hpp index e23e4d409..dda0589ec 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/NameColorPair.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/NameColorPair.hpp @@ -18,7 +18,7 @@ struct NameColorPair static constexpr const char* NAME = "worldNameColorPair"; static constexpr const char* ALIAS = NAME; - CString name; // 00 + String name; // 00 Color color; // 20 uint8_t unk24[0x28 - 0x24]; // 24 }; diff --git a/include/RED4ext/Scripting/Natives/Generated/world/NodeEditorData.hpp b/include/RED4ext/Scripting/Natives/Generated/world/NodeEditorData.hpp index b2e9a407b..0172aa468 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/NodeEditorData.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/NodeEditorData.hpp @@ -26,12 +26,12 @@ struct __declspec(align(0x10)) NodeEditorData : ISerializable uint64_t id; // 40 CName name; // 48 uint8_t unk50[0x58 - 0x50]; // 50 - CString globalName; // 58 - CString alternativeGlobalName; // 78 + String globalName; // 58 + String alternativeGlobalName; // 78 bool isGlobalNameLocked; // 98 bool isAlternativeGlobalNameLocked; // 99 uint8_t unk9A[0xA0 - 0x9A]; // 9A - CString initialGlobalNameHash; // A0 + String initialGlobalNameHash; // A0 world::NodeTransform transform; // C0 Transform pivotTransform; // F0 uint8_t unk110[0x120 - 0x110]; // 110 diff --git a/include/RED4ext/Scripting/Natives/Generated/world/RelativeNodePathElement.hpp b/include/RED4ext/Scripting/Natives/Generated/world/RelativeNodePathElement.hpp index d557bb405..0557323b7 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/RelativeNodePathElement.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/RelativeNodePathElement.hpp @@ -17,7 +17,7 @@ struct RelativeNodePathElement static constexpr const char* NAME = "worldRelativeNodePathElement"; static constexpr const char* ALIAS = NAME; - CString prefab; // 00 + String prefab; // 00 uint8_t unk20[0x28 - 0x20]; // 20 uint64_t nodeID; // 28 uint8_t unk30[0x38 - 0x30]; // 30 diff --git a/include/RED4ext/Scripting/Natives/Generated/world/StaticQuestMarkerNode.hpp b/include/RED4ext/Scripting/Natives/Generated/world/StaticQuestMarkerNode.hpp index a9497063a..d4905efc9 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/StaticQuestMarkerNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/StaticQuestMarkerNode.hpp @@ -23,7 +23,7 @@ struct StaticQuestMarkerNode : world::Node uint8_t unk38[0x48 - 0x38]; // 38 world::QuestType questType; // 48 uint8_t unk49[0x50 - 0x49]; // 49 - CString questLabel; // 50 + String questLabel; // 50 float questMarkerHeight; // 70 uint8_t unk74[0x78 - 0x74]; // 74 CName mapFilteringTag; // 78 diff --git a/include/RED4ext/Scripting/Natives/Generated/world/StaticStickerNode.hpp b/include/RED4ext/Scripting/Natives/Generated/world/StaticStickerNode.hpp index f2d9e1110..39be8ca86 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/StaticStickerNode.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/StaticStickerNode.hpp @@ -22,7 +22,7 @@ struct StaticStickerNode : world::Node static constexpr const char* NAME = "worldStaticStickerNode"; static constexpr const char* ALIAS = NAME; - DynArray labels; // 38 + DynArray labels; // 38 DynArray> sprites; // 48 uint8_t unk58[0x78 - 0x58]; // 58 Color textColor; // 78 diff --git a/include/RED4ext/Scripting/Natives/Generated/world/StreamingTestSummary.hpp b/include/RED4ext/Scripting/Natives/Generated/world/StreamingTestSummary.hpp index fdf59e0d1..154790e47 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/StreamingTestSummary.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/StreamingTestSummary.hpp @@ -18,7 +18,7 @@ struct StreamingTestSummary : ISerializable static constexpr const char* NAME = "worldStreamingTestSummary"; static constexpr const char* ALIAS = NAME; - CString gameDefinition; // 30 + String gameDefinition; // 30 bool noCrowds; // 50 uint8_t unk51[0x54 - 0x51]; // 51 float testDurationSeconds; // 54 diff --git a/include/RED4ext/Scripting/Natives/Generated/world/WorldListResourceEntry.hpp b/include/RED4ext/Scripting/Natives/Generated/world/WorldListResourceEntry.hpp index 936e7956b..208b763ab 100644 --- a/include/RED4ext/Scripting/Natives/Generated/world/WorldListResourceEntry.hpp +++ b/include/RED4ext/Scripting/Natives/Generated/world/WorldListResourceEntry.hpp @@ -21,7 +21,7 @@ struct WorldListResourceEntry RaRef world; // 00 RaRef streamingWorld; // 08 - CString worldName; // 10 + String worldName; // 10 }; RED4EXT_ASSERT_SIZE(WorldListResourceEntry, 0x30); } // namespace world diff --git a/include/RED4ext/Scripting/Natives/gameGameSessionDesc.hpp b/include/RED4ext/Scripting/Natives/gameGameSessionDesc.hpp index aef33f4cd..12bf06345 100644 --- a/include/RED4ext/Scripting/Natives/gameGameSessionDesc.hpp +++ b/include/RED4ext/Scripting/Natives/gameGameSessionDesc.hpp @@ -43,9 +43,9 @@ struct GameSessionDesc uint64_t unk60; // 60 int32_t unk68; // 68 - CString saveName; // 70 - QuickSave-1 - CString unk90; // 90 - CString unkB0; // B0 + String saveName; // 70 - QuickSave-1 + String unk90; // 90 + String unkB0; // B0 uint64_t unkD0; // D0 uint64_t unkD8; // D8 @@ -71,7 +71,7 @@ struct GameSessionDesc bool unk1AA; // 1AA bool unk1AB; // 1AB - CString saveMetadataRelativePath; // 1B0 - QuickSave-1/metadata.9.json + String saveMetadataRelativePath; // 1B0 - QuickSave-1/metadata.9.json GameSessionDesc() : unk38(true) diff --git a/include/RED4ext/Scripting/Natives/gameSaveLock.hpp b/include/RED4ext/Scripting/Natives/gameSaveLock.hpp index bfe07cbd3..aff9bead1 100644 --- a/include/RED4ext/Scripting/Natives/gameSaveLock.hpp +++ b/include/RED4ext/Scripting/Natives/gameSaveLock.hpp @@ -1,8 +1,8 @@ #pragma once -#include #include #include +#include namespace RED4ext::game { @@ -12,7 +12,7 @@ struct SaveLock static constexpr const char* ALIAS = NAME; SaveLockReason reason; // 00 - CString description; // 04 + String description; // 04 }; RED4EXT_ASSERT_SIZE(SaveLock, 0x28); } // namespace RED4ext::game diff --git a/include/RED4ext/Scripting/Natives/worldWorldID.hpp b/include/RED4ext/Scripting/Natives/worldWorldID.hpp index db120d8ff..54211e2b5 100644 --- a/include/RED4ext/Scripting/Natives/worldWorldID.hpp +++ b/include/RED4ext/Scripting/Natives/worldWorldID.hpp @@ -1,8 +1,8 @@ #pragma once -#include #include #include +#include #include namespace RED4ext @@ -16,7 +16,7 @@ struct WorldID ResourcePath worldPath; // 00 ResourcePath streamingWorldPath; // 08 - CString worldName; // 10 + String worldName; // 10 std::uint64_t unk30; // 30 }; RED4EXT_ASSERT_SIZE(WorldID, 0x38); diff --git a/include/RED4ext/Scripting/ScriptReport-inl.hpp b/include/RED4ext/Scripting/ScriptReport-inl.hpp index e59658367..72e0ab8b6 100644 --- a/include/RED4ext/Scripting/ScriptReport-inl.hpp +++ b/include/RED4ext/Scripting/ScriptReport-inl.hpp @@ -13,7 +13,7 @@ RED4EXT_INLINE RED4ext::ScriptReport::ScriptReport() noexcept { } -RED4EXT_INLINE RED4ext::ScriptReport::ScriptReport(RED4ext::DynArray& aErrors, +RED4EXT_INLINE RED4ext::ScriptReport::ScriptReport(RED4ext::DynArray& aErrors, uint32_t aMaxErrors) noexcept : errors(&aErrors) , maxErrors(aMaxErrors) @@ -48,7 +48,7 @@ RED4EXT_INLINE bool RED4ext::ScriptReport::HasErrors() const noexcept return errors && errors->size > 0; } -RED4EXT_INLINE RED4ext::CString RED4ext::ScriptReport::ToString() const noexcept +RED4EXT_INLINE RED4ext::String RED4ext::ScriptReport::ToString() const noexcept { if (!errors || errors->size == 0) { @@ -65,14 +65,14 @@ RED4EXT_INLINE RED4ext::CString RED4ext::ScriptReport::ToString() const noexcept str.append("\n"); } - str.append(error.c_str()); + str.append(error.AsChar()); eol = true; } return str.c_str(); } -RED4EXT_INLINE RED4ext::CString RED4ext::ScriptReport::Format(const char* aFormat, std::va_list aArgs) +RED4EXT_INLINE RED4ext::String RED4ext::ScriptReport::Format(const char* aFormat, std::va_list aArgs) { char buffer[4096]; vsnprintf(buffer, sizeof(buffer), aFormat, aArgs); diff --git a/include/RED4ext/Scripting/ScriptReport.hpp b/include/RED4ext/Scripting/ScriptReport.hpp index 344713c09..247fdae0c 100644 --- a/include/RED4ext/Scripting/ScriptReport.hpp +++ b/include/RED4ext/Scripting/ScriptReport.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include namespace RED4ext @@ -10,7 +10,7 @@ struct ScriptReport { ScriptReport() noexcept; - ScriptReport(DynArray& aErrors, uint32_t aMaxErrors = 0) noexcept; + ScriptReport(DynArray& aErrors, uint32_t aMaxErrors = 0) noexcept; virtual ~ScriptReport() = default; @@ -20,14 +20,14 @@ struct ScriptReport [[nodiscard]] bool HasErrors() const noexcept; - [[nodiscard]] CString ToString() const noexcept; + [[nodiscard]] String ToString() const noexcept; - static CString Format(const char* aFormat, std::va_list aArgs); + static String Format(const char* aFormat, std::va_list aArgs); - bool fillErrors; // 08 - Usually equals to CBaseEngine::scriptsSilentValidation - DynArray unk10; // 10 - Seems to be unused by the game - DynArray* errors; // 20 - Usually points to CBaseEngine::scriptsValidationErrors - uint32_t maxErrors; // 28 + bool fillErrors; // 08 - Usually equals to CBaseEngine::scriptsSilentValidation + DynArray unk10; // 10 - Seems to be unused by the game + DynArray* errors; // 20 - Usually points to CBaseEngine::scriptsValidationErrors + uint32_t maxErrors; // 28 }; RED4EXT_ASSERT_SIZE(ScriptReport, 0x30); RED4EXT_ASSERT_OFFSET(ScriptReport, fillErrors, 0x08); diff --git a/include/RED4ext/String-inl.hpp b/include/RED4ext/String-inl.hpp new file mode 100644 index 000000000..f8c9bba87 --- /dev/null +++ b/include/RED4ext/String-inl.hpp @@ -0,0 +1,463 @@ +#ifdef RED4EXT_STATIC_LIB +#include +#endif + +#include + +RED4ext::String::String(SizeType aCapacity) +{ + Reserve(aCapacity); +} + +RED4ext::String::String(StringView aView, Memory::IAllocator* aAllocator) + : m_allocator(aAllocator) +{ + Assign(aView); +} + +RED4ext::String::String(ConstPointer aStr, Memory::IAllocator* aAllocator) + : String(StringView(aStr), aAllocator) +{ +} + +RED4ext::String::String(const String& aOther) + : m_allocator(aOther.m_allocator ? aOther.m_allocator : nullptr) +{ + Assign(aOther); +} + +RED4ext::String::String(String&& aOther) noexcept +{ + Swap(aOther); +} + +RED4ext::String::String(const std::string& aStr, Memory::IAllocator* aAllocator) + : m_allocator(aAllocator) +{ + Assign(StringView{aStr.c_str(), static_cast(aStr.size())}); +} + +RED4ext::String::String(std::string_view aView, Memory::IAllocator* aAllocator) + : m_allocator(aAllocator) +{ + Assign(StringView{aView}); +} + +RED4ext::String::~String() +{ + if (m_mode != EStringMode::Scratch) + { + SetCapacity(0); + TerminateAt(0); + } +} + +RED4ext::String& RED4ext::String::operator=(const String& aOther) +{ + if (this != std::addressof(aOther)) + { + Assign(aOther); + } + return *this; +} + +RED4ext::String& RED4ext::String::operator=(String&& aOther) noexcept +{ + String temp(std::move(aOther)); + Swap(temp); + return *this; +} + +RED4ext::String& RED4ext::String::operator=(StringView aView) +{ + return Assign(aView); +} + +RED4ext::String& RED4ext::String::operator+=(const String& aOther) +{ + return Append(aOther); +} + +RED4ext::String& RED4ext::String::operator+=(StringView aView) +{ + return Append(aView); +} + +bool RED4ext::String::operator==(const String& aOther) const noexcept +{ + return Compare(aOther); +} + +bool RED4ext::String::operator==(StringView aView) const noexcept +{ + return Compare(aView); +} + +bool RED4ext::String::operator!=(const String& aOther) const noexcept +{ + return !Compare(aOther); +} + +bool RED4ext::String::operator!=(StringView aView) const noexcept +{ + return !Compare(aView); +} + +RED4ext::String::Reference RED4ext::String::operator[](SizeType aIndex) noexcept +{ + return Data()[aIndex]; +} + +RED4ext::String::ConstReference RED4ext::String::operator[](SizeType aIndex) const noexcept +{ + return Data()[aIndex]; +} + +RED4ext::String& RED4ext::String::Assign(StringView aView) +{ + if ((aView.IsEmpty() && m_mode != EStringMode::Inline) || !Resize(aView.Size())) + { + return *this; + } + + if (aView.Data() && !aView.IsEmpty()) + { + TraitsType::copy(AsChar(), aView.Data(), aView.Size()); + } + TerminateAt(aView.Size()); + return *this; +} + +RED4ext::String& RED4ext::String::Assign(const String& aOther) +{ + if (m_mode == EStringMode::Inline && aOther.m_mode == EStringMode::Inline) + { + m_storage = aOther.m_storage; + m_size = aOther.m_size; + return *this; + } + return Assign(aOther); +} + +RED4ext::String::Reference RED4ext::String::At(SizeType aIndex) +{ + if (aIndex >= m_size) + { + throw std::out_of_range("String::At: Position out of range"); + } + + return AsChar()[aIndex]; +} + +RED4ext::String::ConstReference RED4ext::String::At(SizeType aIndex) const +{ + if (aIndex >= m_size) + { + throw std::out_of_range("String::At: Position out of range"); + } + + return AsChar()[aIndex]; +} + +void RED4ext::String::Swap(String& aOther) noexcept +{ + std::swap(m_storage, aOther.m_storage); + SizeType tempSize = m_size; + auto tempMode = m_mode; + m_size = aOther.m_size; + m_mode = aOther.m_mode; + aOther.m_size = tempSize; + aOther.m_mode = tempMode; + std::swap(m_allocator, aOther.m_allocator); +} + +RED4ext::String& RED4ext::String::Append(StringView aView) +{ + if (aView.IsEmpty() || !aView.Data()) + { + return *this; + } + + if (!Data()) + { + Assign(aView); + return *this; + } + + SizeType currSize = m_size; + SizeType newSize = currSize + aView.Size(); + if (Reserve(newSize)) + { + TraitsType::copy(AsChar() + currSize, aView.Data(), aView.Size()); + m_size = newSize; + TerminateAt(newSize); + } + return *this; +} + +RED4ext::String& RED4ext::String::Append(ValueType aChar) +{ + return Append(StringView{&aChar, 1}); +} + +bool RED4ext::String::Insert(SizeType aIndex, StringView aView) +{ + SizeType currSize = m_size; + if (aIndex > currSize || aView.IsEmpty() || !aView.Data()) + { + return false; + } + + if (!Resize(currSize + aView.Size())) + { + return false; + } + + Pointer ptr = AsChar(); + if (aIndex < currSize) + { + TraitsType::copy(ptr + aIndex + aView.Size(), ptr + aIndex, currSize - aIndex); + } + TraitsType::copy(ptr + aIndex, aView.Data(), aView.Size()); + return true; +} + +bool RED4ext::String::Insert(SizeType aIndex, ValueType aChar) +{ + return Insert(aIndex, StringView{&aChar, 1}); +} + +bool RED4ext::String::Insert(SizeType aIndex, const String& aOther) +{ + return Insert(aIndex, StringView{aOther}); +} + +bool RED4ext::String::Resize(SizeType aSize) +{ + if (!aSize) + { + SetCapacity(0); + Clear(); + return true; + } + + if (Capacity() < aSize) + { + SetCapacity(aSize); + } + + if (Capacity() < aSize) + { + return false; + } + + m_size = aSize; + TerminateAt(aSize); + return true; +} + +bool RED4ext::String::Erase(Iterator aPos) +{ + if (aPos < Begin() || aPos >= End()) + return false; + + TraitsType::copy(aPos, aPos + 1, End() - aPos); + m_size -= 1; + + TerminateAt(m_size); + if (IsEmpty()) + { + SetCapacity(0); + } + return true; +} + +bool RED4ext::String::Erase(Iterator aStart, Iterator aEnd) +{ + if (aStart < Begin() || aEnd > End() || aStart >= aEnd) + { + return false; + } + + TraitsType::copy(aStart, aEnd, End() - aEnd + 1); + m_size -= static_cast(std::distance(aStart, aEnd)); + + TerminateAt(m_size); + if (IsEmpty()) + { + SetCapacity(0); + } + return true; +} + +bool RED4ext::String::Erase(SizeType aStartIndex, SizeType aEndIndex) +{ + return Erase(Begin() + aStartIndex, Begin() + aEndIndex); +} + +void RED4ext::String::Clear() noexcept +{ + m_size = 0; + TerminateAt(0); +} + +bool RED4ext::String::Reserve(SizeType aCapacity) +{ + if (Capacity() < aCapacity) + { + SetCapacity(aCapacity); + } + return aCapacity <= Capacity(); +} + +void RED4ext::String::ShrinkToFit() +{ + if (Capacity() > m_size) + { + SetCapacity(m_size); + } +} + +bool RED4ext::String::Compare(StringView aView) const noexcept +{ + if (IsEmpty() && aView.IsEmpty()) + { + return true; + } + + if (m_size != aView.Size()) + { + return false; + } + + return TraitsType::compare(Data(), aView.Data(), m_size) == 0; +} + +RED4ext::String::Pointer RED4ext::String::AsChar() noexcept +{ + return m_mode == EStringMode::Inline ? m_storage.internal.Data() : m_storage.external.Data(); +} + +RED4ext::String::ConstPointer RED4ext::String::AsChar() const noexcept +{ + return m_mode == EStringMode::Inline ? m_storage.internal.Data() : m_storage.external.Data(); +} + +const RED4ext::Memory::IAllocator* RED4ext::String::GetAllocator() const noexcept +{ + return m_allocator; +} + +RED4ext::String::Reference RED4ext::String::Front() noexcept +{ + assert(!IsEmpty()); + return Data()[0]; +} + +RED4ext::String::ConstReference RED4ext::String::Front() const noexcept +{ + assert(!IsEmpty()); + return Data()[0]; +} + +RED4ext::String::Reference RED4ext::String::Back() noexcept +{ + assert(!IsEmpty()); + return Data()[m_size - 1]; +} + +RED4ext::String::ConstReference RED4ext::String::Back() const noexcept +{ + assert(!IsEmpty()); + return Data()[m_size - 1]; +} + +RED4ext::String::Iterator RED4ext::String::Begin() noexcept +{ + return Data(); +} + +RED4ext::String::ConstIterator RED4ext::String::Begin() const noexcept +{ + return Data(); +} + +RED4ext::String::Iterator RED4ext::String::End() noexcept +{ + return Data() + m_size; +} + +RED4ext::String::ConstIterator RED4ext::String::End() const noexcept +{ + return Data() + m_size; +} + +RED4ext::String::ReverseIterator RED4ext::String::RBegin() noexcept +{ + return ReverseIterator(Begin()); +} + +RED4ext::String::ConstReverseIterator RED4ext::String::RBegin() const noexcept +{ + return ConstReverseIterator(Begin()); +} + +RED4ext::String::ReverseIterator RED4ext::String::REnd() noexcept +{ + return ReverseIterator(End()); +} + +RED4ext::String::ConstReverseIterator RED4ext::String::REnd() const noexcept +{ + return ConstReverseIterator(End()); +} + +bool RED4ext::String::IsEmpty() const noexcept +{ + return m_size == 0; +} + +RED4ext::String::Pointer RED4ext::String::Data() noexcept +{ + return AsChar(); +} + +RED4ext::String::ConstPointer RED4ext::String::Data() const noexcept +{ + return AsChar(); +} + +constexpr RED4ext::String::SizeType RED4ext::String::MaxSize() const noexcept +{ + return (std::numeric_limits::max)() >> 2; +} + +RED4ext::String::SizeType RED4ext::String::Size() const noexcept +{ + return m_size; +} + +RED4ext::String::SizeType RED4ext::String::Length() const noexcept +{ + return m_size; +} + +RED4ext::String::SizeType RED4ext::String::Capacity() const noexcept +{ + return m_mode == EStringMode::Inline ? m_storage.internal.Capacity() : m_storage.external.Capacity(); +} + +void RED4ext::String::SetCapacity(SizeType aNewCapacity) +{ + using func_t = void (*)(String*, uint32_t); + static UniversalRelocFunc func(Detail::AddressHashes::String_SetCapacity); + func(this, aNewCapacity); +} + +void RED4ext::String::TerminateAt(SizeType aPos) noexcept +{ + if (char* ptr = AsChar()) + { + ptr[aPos] = '\0'; + } +} diff --git a/include/RED4ext/String.hpp b/include/RED4ext/String.hpp new file mode 100644 index 000000000..b0250eeb2 --- /dev/null +++ b/include/RED4ext/String.hpp @@ -0,0 +1,226 @@ +#pragma once + +#include +#include + +#include +#include +#include +#include + +namespace RED4ext +{ +namespace Memory +{ +struct IAllocator; +} + +class StringView; + +enum class EStringMode : uint32_t +{ + Inline = 0, + Dynamic = 1, + Scratch = 2 +}; + +union StringStorage +{ + struct Internal + { + static constexpr uint8_t BUFFER_SIZE = 20; + + [[nodiscard]] char* Data() noexcept + { + return data; + } + + [[nodiscard]] const char* Data() const noexcept + { + return data; + } + + [[nodiscard]] constexpr uint8_t Capacity() const noexcept + { + return BUFFER_SIZE - 1; + } + + char data[BUFFER_SIZE]{}; + }; +#pragma pack(push, 4) + struct External + { + [[nodiscard]] char* Data() noexcept + { + return data; + } + + [[nodiscard]] const char* Data() const noexcept + { + return data; + } + + [[nodiscard]] int32_t Capacity() const noexcept + { + return capacity; + } + + char* data{nullptr}; + int8_t unk[8]{}; + int32_t capacity{0}; + }; +#pragma pack(pop) + + Internal internal{}; + External external; +}; + +class String +{ +public: + using ValueType = char; + using Reference = ValueType&; + using ConstReference = const ValueType&; + using Pointer = ValueType*; + using ConstPointer = const ValueType*; + + using SizeType = std::uint32_t; + using DifferenceType = std::ptrdiff_t; + + using Iterator = Pointer; + using ConstIterator = ConstPointer; + using ReverseIterator = std::reverse_iterator; + using ConstReverseIterator = std::reverse_iterator; + + using TraitsType = std::char_traits; + + String() = default; + String(SizeType aCapacity); + String(StringView aView, Memory::IAllocator* aAllocator = nullptr); + String(ConstPointer aStr, Memory::IAllocator* aAllocator = nullptr); + String(const String& aOther); + String(String&& aOther) noexcept; + String(const std::string& aStr, Memory::IAllocator* aAllocator = nullptr); + String(const std::string_view aView, Memory::IAllocator* aAllocator = nullptr); + + ~String(); + + String& operator=(const String& aOther); + String& operator=(String&& aOther) noexcept; + String& operator=(StringView aView); + + String& operator+=(const String& aOther); + String& operator+=(StringView aView); + + bool operator==(const String& aOther) const noexcept; + bool operator==(StringView aView) const noexcept; + + bool operator!=(const String& aOther) const noexcept; + bool operator!=(StringView aView) const noexcept; + + Reference operator[](SizeType aIndex) noexcept; + ConstReference operator[](SizeType aIndex) const noexcept; + + String& Assign(StringView aView); + String& Assign(const String& aOther); + + [[nodiscard]] Reference At(SizeType aIndex); + [[nodiscard]] ConstReference At(SizeType aIndex) const; + + void Swap(String& aOther) noexcept; + + String& Append(StringView aView); + String& Append(ValueType aChar); + + bool Insert(SizeType aIndex, StringView aView); + bool Insert(SizeType aIndex, ValueType aChar); + bool Insert(SizeType aIndex, const String& aOther); + + bool Resize(SizeType aSize); + + bool Erase(Iterator aPos); + bool Erase(Iterator aStart, Iterator aEnd); + bool Erase(SizeType aStartIndex, SizeType aEndIndex); + + void Clear() noexcept; + + bool Reserve(SizeType aCapacity); + + void ShrinkToFit(); + + [[nodiscard]] bool Compare(StringView aView) const noexcept; + + [[nodiscard]] Pointer AsChar() noexcept; + [[nodiscard]] ConstPointer AsChar() const noexcept; + + [[nodiscard]] const Memory::IAllocator* GetAllocator() const noexcept; + + [[nodiscard]] Reference Front() noexcept; + [[nodiscard]] ConstReference Front() const noexcept; + [[nodiscard]] Reference Back() noexcept; + [[nodiscard]] ConstReference Back() const noexcept; + + [[nodiscard]] Iterator Begin() noexcept; + [[nodiscard]] ConstIterator Begin() const noexcept; + [[nodiscard]] Iterator End() noexcept; + [[nodiscard]] ConstIterator End() const noexcept; + [[nodiscard]] ReverseIterator RBegin() noexcept; + [[nodiscard]] ConstReverseIterator RBegin() const noexcept; + [[nodiscard]] ReverseIterator REnd() noexcept; + [[nodiscard]] ConstReverseIterator REnd() const noexcept; + + [[nodiscard]] bool IsEmpty() const noexcept; + + [[nodiscard]] Pointer Data() noexcept; + [[nodiscard]] ConstPointer Data() const noexcept; + [[nodiscard]] constexpr SizeType MaxSize() const noexcept; + [[nodiscard]] SizeType Size() const noexcept; + [[nodiscard]] SizeType Length() const noexcept; + [[nodiscard]] SizeType Capacity() const noexcept; +#pragma region STL + [[nodiscard]] Iterator begin() noexcept + { + return Begin(); + } + + [[nodiscard]] ConstIterator begin() const noexcept + { + return Begin(); + } + + [[nodiscard]] Iterator end() noexcept + { + return End(); + } + + [[nodiscard]] ConstIterator end() const noexcept + { + return End(); + } +#pragma endregion + +private: + void SetCapacity(SizeType aNewCapacity); + + void TerminateAt(SizeType aPos) noexcept; + + StringStorage m_storage{}; // 00 + uint32_t m_size : 30 {0}; // 14 + EStringMode m_mode : 2 {EStringMode::Inline}; + Memory::IAllocator* m_allocator{nullptr}; // 18 +}; +RED4EXT_ASSERT_SIZE(String, 0x20); + +template +struct HashMapHash>> +{ + uint32_t operator()(const T& aKey) const noexcept + { + return aKey.CalcHash(); + } +}; +} // namespace RED4ext + +#ifdef RED4EXT_HEADER_ONLY +#include +#endif diff --git a/include/RED4ext/StringView-inl.hpp b/include/RED4ext/StringView-inl.hpp index 468c26eaa..d486019d9 100644 --- a/include/RED4ext/StringView-inl.hpp +++ b/include/RED4ext/StringView-inl.hpp @@ -4,103 +4,20 @@ #include #endif -#include +#include -RED4EXT_INLINE constexpr RED4ext::StringView::StringView() noexcept - : ptr(nullptr) - , length(0u) +RED4EXT_INLINE RED4ext::StringView::StringView(const String& aStr) noexcept + : m_ptr(aStr.Data()) + , m_size(aStr.Size()) { } -RED4EXT_INLINE constexpr RED4ext::StringView::StringView(const char* aStr) noexcept - : ptr(aStr) - , length(static_cast(std::char_traits::length(aStr))) +RED4EXT_INLINE bool RED4ext::StringView::operator==(const String& aRhs) const noexcept { + return Compare(aRhs); } -RED4EXT_INLINE constexpr RED4ext::StringView::StringView(std::string_view aView) noexcept - : ptr(aView.data()) - , length(static_cast(aView.length())) +RED4EXT_INLINE bool RED4ext::StringView::operator!=(const String& aRhs) const noexcept { -} - -RED4EXT_INLINE RED4ext::StringView::StringView(const RED4ext::CString& aStr) noexcept - : ptr(aStr.c_str()) - , length(aStr.Length()) -{ -} - -RED4EXT_INLINE constexpr bool RED4ext::StringView::IsEmpty() const noexcept -{ - return !ptr || length == 0u; -} - -RED4EXT_INLINE constexpr RED4ext::StringView::operator bool() const noexcept -{ - return !IsEmpty(); -} - -RED4EXT_INLINE constexpr bool RED4ext::StringView::operator==(const StringView& aRhs) const noexcept -{ - return Length() == aRhs.Length() && std::char_traits::compare(Data(), aRhs.Data(), Length()) == 0; -} - -RED4EXT_INLINE constexpr bool RED4ext::StringView::operator!=(const StringView& aRhs) const noexcept -{ - return !(*this == aRhs); -} - -RED4EXT_INLINE constexpr bool RED4ext::StringView::operator==(const char* aRhs) const noexcept -{ - return *this == StringView{aRhs}; -} - -RED4EXT_INLINE constexpr bool RED4ext::StringView::operator!=(const char* aRhs) const noexcept -{ - return *this != StringView{aRhs}; -} - -RED4EXT_INLINE constexpr bool RED4ext::StringView::operator==(std::string_view aRhs) const noexcept -{ - return *this == StringView{aRhs}; -} - -RED4EXT_INLINE constexpr bool RED4ext::StringView::operator!=(std::string_view aRhs) const noexcept -{ - return *this != StringView{aRhs}; -} - -RED4EXT_INLINE bool RED4ext::StringView::operator==(const RED4ext::CString& aRhs) const noexcept -{ - return *this == StringView{aRhs}; -} - -RED4EXT_INLINE bool RED4ext::StringView::operator!=(const RED4ext::CString& aRhs) const noexcept -{ - return *this != StringView{aRhs}; -} - -RED4EXT_INLINE constexpr char RED4ext::StringView::operator[](std::size_t aIndex) const noexcept -{ - return Data()[aIndex]; -} - -RED4EXT_INLINE constexpr const char* RED4ext::StringView::Data() const noexcept -{ - return ptr; -} - -RED4EXT_INLINE constexpr std::uint32_t RED4ext::StringView::Length() const noexcept -{ - return length; -} - -RED4EXT_INLINE constexpr const char* RED4ext::StringView::begin() const noexcept -{ - return Data(); -} - -RED4EXT_INLINE constexpr const char* RED4ext::StringView::end() const noexcept -{ - return Data() + Length(); + return !Compare(aRhs); } diff --git a/include/RED4ext/StringView.hpp b/include/RED4ext/StringView.hpp index 4c3b7578b..9de3ae082 100644 --- a/include/RED4ext/StringView.hpp +++ b/include/RED4ext/StringView.hpp @@ -2,48 +2,216 @@ #include +#include +#include #include namespace RED4ext { -struct CString; +class String; #pragma pack(push, 4) -struct StringView +class StringView { - constexpr StringView() noexcept; - constexpr StringView(const char* aStr) noexcept; - constexpr StringView(std::string_view aView) noexcept; - StringView(const RED4ext::CString& aStr) noexcept; +public: + using ValueType = char; + using Reference = ValueType&; + using ConstReference = const ValueType&; + using Pointer = ValueType*; + using ConstPointer = const ValueType*; - constexpr bool IsEmpty() const noexcept; - constexpr operator bool() const noexcept; + using SizeType = std::uint32_t; + using DifferenceType = std::ptrdiff_t; - constexpr bool operator==(const StringView& aRhs) const noexcept; - constexpr bool operator!=(const StringView& aRhs) const noexcept; - constexpr bool operator==(const char* aRhs) const noexcept; - constexpr bool operator!=(const char* aRhs) const noexcept; - constexpr bool operator==(std::string_view aRhs) const noexcept; - constexpr bool operator!=(std::string_view aRhs) const noexcept; - bool operator==(const RED4ext::CString& aRhs) const noexcept; - bool operator!=(const RED4ext::CString& aRhs) const noexcept; + using Iterator = Pointer; + using ConstIterator = ConstPointer; + using ReverseIterator = std::reverse_iterator; + using ConstReverseIterator = std::reverse_iterator; - constexpr char operator[](std::size_t aIndex) const noexcept; + using TraitsType = std::char_traits; - constexpr const char* Data() const noexcept; - constexpr std::uint32_t Length() const noexcept; + constexpr StringView() noexcept = default; - constexpr const char* begin() const noexcept; - constexpr const char* end() const noexcept; + constexpr StringView(ConstPointer aStr) noexcept + : m_ptr(aStr) + , m_size(static_cast(TraitsType::length(aStr))) + { + } - const char* ptr; - std::uint32_t length; + constexpr StringView(ConstPointer aStr, SizeType aSize) noexcept + : m_ptr(aStr) + , m_size(aSize) + { + } + + constexpr StringView(std::string_view aView) noexcept + : m_ptr(aView.data()) + , m_size(static_cast(aView.size())) + { + } + + constexpr StringView(const StringView&) noexcept = default; + constexpr StringView(StringView&&) noexcept = default; + constexpr StringView& operator=(const StringView&) noexcept = default; + constexpr StringView& operator=(StringView&&) noexcept = default; + + StringView(const String& aStr) noexcept; + bool operator==(const String& aRhs) const noexcept; + bool operator!=(const String& aRhs) const noexcept; + + constexpr bool operator==(StringView aRhs) const noexcept + { + return Compare(aRhs); + } + + constexpr bool operator!=(StringView aRhs) const noexcept + { + return !Compare(aRhs); + } + + constexpr bool operator==(ConstPointer aRhs) const noexcept + { + return Compare(aRhs); + } + + constexpr bool operator!=(ConstPointer aRhs) const noexcept + { + return !Compare(aRhs); + } + + constexpr bool operator==(std::string_view aRhs) const noexcept + { + return Compare(aRhs); + } + + constexpr bool operator!=(std::string_view aRhs) const noexcept + { + return !Compare(aRhs); + } + + constexpr operator bool() const noexcept + { + return !IsEmpty(); + } + + constexpr ConstReference operator[](SizeType aIndex) const noexcept + { + return m_ptr[aIndex]; + } + + [[nodiscard]] constexpr bool Compare(StringView aOther) const noexcept + { + if (IsEmpty() && aOther.IsEmpty()) + { + return true; + } + + if (m_size != aOther.m_size) + { + return false; + } + return TraitsType::compare(m_ptr, aOther.m_ptr, m_size) == 0; + } + + [[nodiscard]] constexpr ConstReference At(SizeType aIndex) const + { + if (aIndex >= m_size) + { + throw std::out_of_range("StringView::At: Position out of range"); + } + return m_ptr[aIndex]; + } + + [[nodiscard]] constexpr ConstReference Front() const noexcept + { + assert(!IsEmpty()); + return m_ptr[0]; + } + + [[nodiscard]] constexpr ConstReference Back() const noexcept + { + assert(!IsEmpty()); + return m_ptr[m_size - 1]; + } + + [[nodiscard]] constexpr ConstIterator Begin() const noexcept + { + return m_ptr; + } + + [[nodiscard]] constexpr ConstIterator End() const noexcept + { + return m_ptr + m_size; + } + + [[nodiscard]] constexpr ConstReverseIterator RBegin() const noexcept + { + return ConstReverseIterator(Begin()); + } + + [[nodiscard]] constexpr ConstReverseIterator REnd() const noexcept + { + return ConstReverseIterator(End()); + } + + [[nodiscard]] constexpr bool IsEmpty() const noexcept + { + return m_size == 0u; + } + + [[nodiscard]] constexpr ConstPointer Data() const noexcept + { + return m_ptr; + } + + [[nodiscard]] constexpr SizeType Size() const noexcept + { + return m_size; + } + + [[nodiscard]] constexpr SizeType Length() const noexcept + { + return m_size; + } + +#pragma region STL + using value_type = ValueType; + using reference = Reference; + using const_reference = ConstReference; + using pointer = Pointer; + using const_pointer = ConstPointer; + + using size_type = SizeType; + using difference_type = DifferenceType; + + using iterator = Iterator; + using const_iterator = ConstIterator; + using reverse_iterator = ReverseIterator; + using const_reverse_iterator = ConstReverseIterator; + + using traits_type = TraitsType; + + [[nodiscard]] constexpr size_type size() const noexcept + { + return Size(); + } + + [[nodiscard]] constexpr const_iterator begin() const noexcept + { + return Begin(); + } + [[nodiscard]] constexpr const_iterator end() const noexcept + { + return End(); + } +#pragma endregion +private: + const char* m_ptr{nullptr}; + std::uint32_t m_size{0}; }; #pragma pack(pop) RED4EXT_ASSERT_SIZE(StringView, 0xC); -RED4EXT_ASSERT_OFFSET(StringView, ptr, 0x0); -RED4EXT_ASSERT_OFFSET(StringView, length, 0x8); } // namespace RED4ext #ifdef RED4EXT_HEADER_ONLY diff --git a/include/RED4ext/TweakDB-inl.hpp b/include/RED4ext/TweakDB-inl.hpp index 5750e8776..43bb10493 100644 --- a/include/RED4ext/TweakDB-inl.hpp +++ b/include/RED4ext/TweakDB-inl.hpp @@ -365,7 +365,7 @@ RED4EXT_INLINE bool RED4ext::TweakDB::AllocateFlatValue(void* aBuffer, const CSt RED4EXT_TDB_FLAT_CASE("raRef:CResource", ResourceAsyncReference); RED4EXT_TDB_FLAT_CASE("CName", CName); RED4EXT_TDB_FLAT_CASE("Bool", bool); - RED4EXT_TDB_FLAT_CASE("String", CString); + RED4EXT_TDB_FLAT_CASE("String", String); RED4EXT_TDB_FLAT_CASE("Float", float); RED4EXT_TDB_FLAT_CASE("Int32", int32_t); } diff --git a/include/RED4ext/TweakDB.hpp b/include/RED4ext/TweakDB.hpp index 420856ca2..d309b2bb6 100644 --- a/include/RED4ext/TweakDB.hpp +++ b/include/RED4ext/TweakDB.hpp @@ -158,7 +158,7 @@ struct TweakDB Map> queries; // B8 Map groups; // E0 HashMap defaultValues; // 108 - DynArray unk138; // 138 - empty - maybe not CString + DynArray unk138; // 138 - empty - maybe not String uintptr_t flatDataBuffer; // 148 uint32_t flatDataBufferCapacity; // 150 uintptr_t flatDataBufferEnd; // 158 diff --git a/src/CString.cpp b/src/String.cpp similarity index 73% rename from src/CString.cpp rename to src/String.cpp index 9288a4140..648e390a5 100644 --- a/src/CString.cpp +++ b/src/String.cpp @@ -2,4 +2,4 @@ #error Please define 'RED4EXT_STATIC_LIB' to compile this file. #endif -#include +#include