diff --git a/include/RE/H/hkpProperty.h b/include/RE/H/hkpProperty.h index afa75fb84..a4f9d539f 100644 --- a/include/RE/H/hkpProperty.h +++ b/include/RE/H/hkpProperty.h @@ -12,9 +12,9 @@ namespace RE hkpPropertyValue(float a_value); hkpPropertyValue(void* a_value); - [[nodiscard]] float GetFloat() const; - [[nodiscard]] void* GetPointer() const; - [[nodiscard]] std::int32_t GetSInt() const; + [[nodiscard]] float GetFloat() const; + [[nodiscard]] void* GetPointer() const; + [[nodiscard]] std::int32_t GetSInt() const; [[nodiscard]] std::uint32_t GetUInt() const; [[nodiscard]] std::uint64_t GetUInt64() const; @@ -28,7 +28,7 @@ namespace RE public: hkpProperty() = default; hkpProperty(std::uint32_t a_key, hkpPropertyValue a_value); - + // members std::uint32_t key; // 00 std::uint32_t alignmentPadding; // 04 diff --git a/src/RE/H/hkpProperty.cpp b/src/RE/H/hkpProperty.cpp index 78e489a33..ce7723f12 100644 --- a/src/RE/H/hkpProperty.cpp +++ b/src/RE/H/hkpProperty.cpp @@ -5,12 +5,12 @@ namespace RE hkpPropertyValue::hkpPropertyValue(std::uint64_t a_value) : data(a_value) {} - - hkpPropertyValue::hkpPropertyValue(std::int32_t a_value): + + hkpPropertyValue::hkpPropertyValue(std::int32_t a_value) : data(a_value) {} - hkpPropertyValue::hkpPropertyValue(std::uint32_t a_value): + hkpPropertyValue::hkpPropertyValue(std::uint32_t a_value) : data(static_cast(a_value)) {} @@ -26,7 +26,7 @@ namespace RE data = value.u; } - hkpPropertyValue::hkpPropertyValue(void* a_value): + hkpPropertyValue::hkpPropertyValue(void* a_value) : data(reinterpret_cast(a_value)) {} @@ -34,11 +34,11 @@ namespace RE { union { - float f; + float f; std::uint32_t u; } value{}; - - value.u = static_cast(data); + + value.u = static_cast(data); return value.f; } @@ -62,7 +62,7 @@ namespace RE return data; } - hkpProperty::hkpProperty(std::uint32_t a_key, hkpPropertyValue a_value): + hkpProperty::hkpProperty(std::uint32_t a_key, hkpPropertyValue a_value) : key(a_key), alignmentPadding(0), value(a_value) diff --git a/src/RE/H/hkpWorldObject.cpp b/src/RE/H/hkpWorldObject.cpp index 4a29d4906..61613245b 100644 --- a/src/RE/H/hkpWorldObject.cpp +++ b/src/RE/H/hkpWorldObject.cpp @@ -21,7 +21,7 @@ namespace RE return property; } } - + return std::nullopt; }