cleanup old cruft

cmake/sourcelist.cmake

@@ -117,7 +117,6 @@ set(sources ${sources}
 	include/RE/H/hkpBroadPhase.cpp
 	include/RE/H/hkpCdBody.cpp
 	include/RE/H/hkpCharacterProxyListener.cpp
-	include/RE/H/hkpCollidable.cpp
 	include/RE/H/hkpMaterial.cpp
 	include/RE/H/hkpWorldObject.cpp
 	include/RE/H/hkReferencedObject.cpp

include/RE/A/Array.cpp

@@ -162,17 +162,17 @@ namespace RE
 
 		[[nodiscard]] TypeInfo::RawType Array::type() const
 		{
-			const auto typeID = _elementType.GetRawType();
-			switch (typeID) {
+			const stl::enumeration typeID = _elementType.GetRawType();
+			switch (*typeID) {
 			case TypeInfo::RawType::kNone:
 			case TypeInfo::RawType::kObject:
 			case TypeInfo::RawType::kString:
 			case TypeInfo::RawType::kInt:
 			case TypeInfo::RawType::kFloat:
 			case TypeInfo::RawType::kBool:
-				return typeID + TypeInfo::RawType::kNoneArray;
+				return *(typeID + TypeInfo::RawType::kNoneArray);
 			default:
-				return typeID + TypeInfo::RawType::kObject;
+				return *(typeID + TypeInfo::RawType::kObject);
 			}
 		}
 	}

include/RE/B/BGSDefaultObjectManager.h

@@ -435,17 +435,17 @@ namespace RE
 			return func();
 		}
 
-		[[nodiscard]] TESForm* GetObject(DefaultObject a_object) const noexcept { return GetObject(to_underlying(a_object)); }
+		[[nodiscard]] TESForm* GetObject(DefaultObject a_object) const noexcept { return GetObject(stl::to_underlying(a_object)); }
 
 		template <class T>
 		[[nodiscard]] T* GetObject(DefaultObject a_object) const noexcept
 		{
-			return GetObject<T>(to_underlying(a_object));
+			return GetObject<T>(stl::to_underlying(a_object));
 		}
 
 		[[nodiscard]] TESForm* GetObject(std::size_t a_idx) const noexcept
 		{
-			assert(a_idx < to_underlying(DefaultObject::kTotal));
+			assert(a_idx < stl::to_underlying(DefaultObject::kTotal));
 			return objectInit[a_idx] ? objects[a_idx] : nullptr;
 		}
 

include/RE/B/BSAtomic.cpp

@@ -49,14 +49,14 @@ namespace RE
 	BSSemaphoreBase::BSSemaphoreBase() :
 		semaphore()
 	{
-		memzero(&semaphore);
+		stl::memzero(&semaphore);
 		semaphore = ::CreateSemaphoreA(nullptr, 0, 40, nullptr);
 	}
 
 	BSSemaphoreBase::~BSSemaphoreBase()
 	{
 		::CloseHandle(semaphore);
-		memzero(&semaphore);
+		stl::memzero(&semaphore);
 	}
 
 	BSSpinLock::BSSpinLock() :

include/RE/B/BSInputDeviceManager.cpp

@@ -22,22 +22,22 @@ namespace RE
 
 	BSPCGamepadDeviceHandler* BSInputDeviceManager::GetGamepadHandler()
 	{
-		return static_cast<BSPCGamepadDeviceHandler*>(devices[to_underlying(INPUT_DEVICE::kGamepad)]);
+		return static_cast<BSPCGamepadDeviceHandler*>(devices[stl::to_underlying(INPUT_DEVICE::kGamepad)]);
 	}
 
 	BSWin32KeyboardDevice* BSInputDeviceManager::GetKeyboard()
 	{
-		return static_cast<BSWin32KeyboardDevice*>(devices[to_underlying(INPUT_DEVICE::kKeyboard)]);
+		return static_cast<BSWin32KeyboardDevice*>(devices[stl::to_underlying(INPUT_DEVICE::kKeyboard)]);
 	}
 
 	BSWin32MouseDevice* BSInputDeviceManager::GetMouse()
 	{
-		return static_cast<BSWin32MouseDevice*>(devices[to_underlying(INPUT_DEVICE::kMouse)]);
+		return static_cast<BSWin32MouseDevice*>(devices[stl::to_underlying(INPUT_DEVICE::kMouse)]);
 	}
 
 	BSWin32VirtualKeyboardDevice* BSInputDeviceManager::GetVirtualKeyboard()
 	{
-		return static_cast<BSWin32VirtualKeyboardDevice*>(devices[to_underlying(INPUT_DEVICE::kVirtualKeyboard)]);
+		return static_cast<BSWin32VirtualKeyboardDevice*>(devices[stl::to_underlying(INPUT_DEVICE::kVirtualKeyboard)]);
 	}
 
 	bool BSInputDeviceManager::IsGamepadConnected()

include/RE/B/BSIntrusiveRefCounted.h

@@ -26,7 +26,7 @@ namespace RE
 
 	protected:
 		// members
-		volatile std::uint32_t _refCount{ 0 };  // 0
+		mutable volatile std::uint32_t _refCount{ 0 };  // 0
 	};
 	static_assert(sizeof(BSIntrusiveRefCounted) == 0x4);
 }

include/RE/B/BSScaleformManager.cpp

@@ -45,7 +45,8 @@ namespace RE
 			return false;
 		}
 
-		const auto def = loader->CreateMovie(filePath->c_str(), LoadConstants::kLoadKeepBindData | LoadConstants::kLoadWaitFrame1);
+		const stl::enumeration loadFlags{ LoadConstants::kLoadKeepBindData, LoadConstants::kLoadWaitFrame1 };
+		const auto             def = loader->CreateMovie(filePath->c_str(), *loadFlags);
 		if (!def) {
 			return false;
 		}
@@ -104,7 +105,8 @@ namespace RE
 			return false;
 		}
 
-		const auto def = loader->CreateMovie(filePath->c_str(), LoadConstants::kLoadKeepBindData | LoadConstants::kLoadWaitFrame1);
+		const stl::enumeration loadFlags{ LoadConstants::kLoadKeepBindData, LoadConstants::kLoadWaitFrame1 };
+		const auto             def = loader->CreateMovie(filePath->c_str(), *loadFlags);
 		if (!def) {
 			return false;
 		}

include/RE/B/BSTArray.cpp

@@ -9,7 +9,7 @@ namespace RE
 		if (_data) {
 			deallocate(_data);
 		}
-		memzero(this);
+		stl::memzero(this);
 	}
 
 	void* BSScrapArrayAllocator::allocate(std::size_t a_size)

include/RE/B/BSTList.h

@@ -75,7 +75,7 @@ namespace RE
 
 			// members
 			value_type      item;  // 00
-			observer<Node*> next;  // ??
+			stl::observer<Node*> next;  // ??
 		};
 
 		template <class U>
@@ -164,7 +164,7 @@ namespace RE
 			}
 
 		private:
-			observer<Node*> _cur;
+			stl::observer<Node*> _cur;
 		};
 
 		using iterator = iterator_base<value_type>;

include/RE/B/BSXFlags.cpp

@@ -10,6 +10,6 @@ namespace RE
 
 	void BSXFlags::SetFlags(Flag a_flags)
 	{
-		value = to_underlying(a_flags);
+		value = stl::to_underlying(a_flags);
 	}
 }

include/RE/B/BipedAnim.cpp

@@ -7,7 +7,7 @@ namespace RE
 	BipedAnim::~BipedAnim()
 	{
 		Dtor();
-		memzero(this);
+		stl::memzero(this);
 	}
 
 	void BipedAnim::RemoveAllParts()

include/RE/G/GFxResource.cpp

@@ -56,16 +56,21 @@ namespace RE
 
 	GFxResource::ResourceType GFxResource::GetResourceType() const
 	{
-		return (static_cast<ResourceType>(GetResourceTypeCode()) & ResourceType::kTypeCode_Mask) >> ResourceType::kTypeCode_Shift;
+		return static_cast<GFxResource::ResourceType>(
+			stl::to_underlying(GetResourceUse()) >>
+			stl::to_underlying(ResourceType::kTypeCode_Shift));
 	}
 
 	GFxResource::ResourceUse GFxResource::GetResourceUse() const
 	{
-		return static_cast<ResourceUse>(GetResourceTypeCode()) & ResourceUse::kTypeCode_Mask;
+		return static_cast<ResourceUse>(
+			GetResourceTypeCode() &
+			stl::to_underlying(ResourceUse::kTypeCode_Mask));
 	}
 
 	std::uint32_t GFxResource::MakeTypeCode(ResourceType a_resourceType, ResourceUse a_resourceUse)
 	{
-		return to_underlying(static_cast<ResourceUse>(a_resourceType << ResourceType::kTypeCode_Shift) | a_resourceUse);
+		return (stl::to_underlying(a_resourceType) << stl::to_underlying(ResourceType::kTypeCode_Shift)) |
+		       stl::to_underlying(a_resourceUse);
 	}
 }

include/RE/G/GFxTranslator.cpp

@@ -100,12 +100,12 @@ namespace RE
 
 	bool GFxTranslator::CanReceiveHTML() const
 	{
-		return (GetCaps() & TranslateCap::kReceiveHTML) != TranslateCap::kNone;
+		return (stl::enumeration{ GetCaps() } & TranslateCap::kReceiveHTML) != TranslateCap::kNone;
 	}
 
 	bool GFxTranslator::NeedStripNewLines() const
 	{
-		return (GetCaps() & TranslateCap::kStripTrailingNewLines) != TranslateCap::kNone;
+		return (stl::enumeration{ GetCaps() } & TranslateCap::kStripTrailingNewLines) != TranslateCap::kNone;
 	}
 
 	bool GFxTranslator::HandlesCustomWordWrapping() const

include/RE/G/GFxWWHelper.cpp

@@ -6,7 +6,8 @@ namespace RE
 {
 	bool GFxWWHelper::FindCharWithFlags(WordWrappingType a_wwMode, wchar_t a_ch, BreakInfoFlags a_charBreakFlags)
 	{
-		if ((a_wwMode & WordWrappingType::kProhibition) == WordWrappingType::kNone) {
+		const stl::enumeration wwMode{ a_wwMode };
+		if ((wwMode & WordWrappingType::kProhibition) == WordWrappingType::kNone) {
 			return false;
 		}
 
@@ -28,7 +29,8 @@ namespace RE
 
 	bool GFxWWHelper::IsAsianChar(WordWrappingType a_wwMode, wchar_t a_ch)
 	{
-		if ((a_wwMode & WordWrappingType::kNoHangulWrap) != WordWrappingType::kNone) {
+		const stl::enumeration wwMode{ a_wwMode };
+		if ((wwMode & WordWrappingType::kNoHangulWrap) != WordWrappingType::kNone) {
 			if ((a_ch >= 0x1100 && a_ch <= 0x11FF) || (a_ch >= 0x3130 && a_ch <= 0x318F) || (a_ch >= 0xAC00 && a_ch <= 0xD7A3)) {
 				return false;
 			}
@@ -128,7 +130,9 @@ namespace RE
 	UPInt GFxWWHelper::FindWordWrapPos(WordWrappingType a_wwMode, [[maybe_unused]] UPInt a_wordWrapPos, const wchar_t* a_paraText, UPInt a_paraLen, UPInt a_lineStartPos, UPInt a_lineLen)
 	{
 		assert(a_paraText);
-		if ((a_wwMode & WordWrappingType::kAll) == WordWrappingType::kNone || a_lineLen == 0) {
+
+		const stl::enumeration wwMode{ a_wwMode };
+		if ((wwMode & WordWrappingType::kAll) == WordWrappingType::kNone || a_lineLen == 0) {
 			return UPINT_MAX;
 		}
 
@@ -147,7 +151,7 @@ namespace RE
 					pos = prev + 1;
 				}
 
-				if (IsLineBreakOpportunityAt(a_wwMode, lineText, pos)) {
+				if (IsLineBreakOpportunityAt(*wwMode, lineText, pos)) {
 					break;
 				}
 

include/RE/H/HeapBlock.cpp

@@ -4,16 +4,16 @@ namespace RE
 {
 	std::uint32_t HeapBlock::Used::GetCheckPoint() const
 	{
-		return static_cast<std::uint32_t>(pun_bits(memContext1, memContext2, memContext3, memContext4, memContext5, memContext6, memContext7, memContext8));
+		return static_cast<std::uint32_t>(stl::pun_bits(memContext1, memContext2, memContext3, memContext4, memContext5, memContext6, memContext7, memContext8));
 	}
 
 	std::uint32_t HeapBlock::Used::GetMemContext() const
 	{
-		return static_cast<std::uint32_t>(pun_bits(stackTrace1, stackTrace2, stackTrace3, stackTrace4, stackTrace5, stackTrace6, stackTrace7, stackTrace8, stackTrace9, stackTrace10, stackTrace11, stackTrace12, stackTrace13, stackTrace14, stackTrace15, stackTrace16, stackTrace17, stackTrace18, stackTrace19, stackTrace20, stackTrace21, stackTrace22));
+		return static_cast<std::uint32_t>(stl::pun_bits(stackTrace1, stackTrace2, stackTrace3, stackTrace4, stackTrace5, stackTrace6, stackTrace7, stackTrace8, stackTrace9, stackTrace10, stackTrace11, stackTrace12, stackTrace13, stackTrace14, stackTrace15, stackTrace16, stackTrace17, stackTrace18, stackTrace19, stackTrace20, stackTrace21, stackTrace22));
 	}
 
 	std::uint32_t HeapBlock::Used::GetStackTrace() const
 	{
-		return static_cast<std::uint32_t>(pun_bits(checkPoint1, checkPoint2));
+		return static_cast<std::uint32_t>(stl::pun_bits(checkPoint1, checkPoint2));
 	}
 }

include/RE/H/hkpCollidable.h

@@ -37,7 +37,11 @@ namespace RE
 		};
 		static_assert(sizeof(BoundingVolumeData) == 0x38);
 
-		void* GetOwner() const;
+		[[nodiscard]] void* GetOwner() const
+		{
+			return const_cast<void*>(stl::adjust_pointer<const void>(this, ownerOffset));
+		}
+
 		template <class T>
 		T* GetOwner() const
 		{

include/RE/I/IFormFactory.cpp

@@ -6,7 +6,7 @@ namespace RE
 	{
 		struct Factories
 		{
-			IFormFactory* data[to_underlying(FormType::Max)];
+			IFormFactory* data[stl::to_underlying(FormType::Max)];
 		};
 
 		REL::Relocation<Factories*> formFactories{ REL::ID(514355) };

include/RE/I/InventoryChanges.cpp

@@ -14,7 +14,7 @@ namespace RE
 	InventoryChanges::~InventoryChanges()
 	{
 		Dtor();
-		memzero(this);
+		stl::memzero(this);
 	}
 
 	void InventoryChanges::AddEntryData(InventoryEntryData* a_entry)

include/RE/M/MemoryPage.cpp

@@ -11,7 +11,7 @@ namespace RE
 
 		void* MemoryPage::GetTail()
 		{
-			return adjust_pointer<void>(GetHead(), pageSize);
+			return stl::adjust_pointer<void>(GetHead(), pageSize);
 		}
 
 		bool MemoryPage::IsInRange(const void* a_ptr)

include/RE/M/MiddleHighProcessData.h

@@ -181,7 +181,7 @@ namespace RE
 		BSTArray<BGSPerkEntry*>& operator[](BGSEntryPoint::ENTRY_POINT a_pos)
 		{
 			assert(a_pos < BGSEntryPoint::ENTRY_POINT::kTotal);
-			return perkEntryArrays[to_underlying(a_pos)];
+			return perkEntryArrays[stl::to_underlying(a_pos)];
 		}
 
 		// members

include/RE/N/NiTCollection.h

@@ -58,7 +58,7 @@ namespace RE
 		inline static void Deallocate(T* a_array)
 		{
 			if (a_array) {
-				auto head = adjust_pointer<std::size_t>(a_array, -ssizeof_v<std::uintptr_t>);
+				auto head = stl::adjust_pointer<std::size_t>(a_array, -stl::ssizeof_v<std::uintptr_t>);
 				for (std::size_t i = 0; i < *head; ++i) {
 					a_array[i].~T();
 				}

include/RE/O/Object.cpp

@@ -11,7 +11,7 @@ namespace RE
 		Object::~Object()
 		{
 			Dtor();
-			memzero(this);
+			stl::memzero(this);
 		}
 
 		VMHandle Object::GetHandle() const

include/RE/O/ObjectTypeInfo.cpp

@@ -44,7 +44,7 @@ namespace RE
 
 		TypeInfo::RawType ObjectTypeInfo::GetRawType() const
 		{
-			return unrestricted_cast<TypeInfo::RawType>(this);
+			return stl::unrestricted_cast<TypeInfo::RawType>(this);
 		}
 
 		auto ObjectTypeInfo::GetUnlinkedFunctionIter()

include/RE/S/ShadowSceneNode.h

@@ -50,11 +50,11 @@ namespace RE
 		std::uint64_t   unk1F0;  // 1F0
 		std::uint64_t   unk1F8;  // 1F8
 
-		owner<void*>    unk200;  // 200 - smart ptr
+		stl::owner<void*>    unk200;  // 200 - smart ptr
 		std::uint64_t   unk208;  // 208
-		owner<void*>    unk210;  // 210 - smart ptr
+		stl::owner<void*>    unk210;  // 210 - smart ptr
 		std::uint64_t   unk218;  // 218
-		owner<void*>    unk220;  // 220 - smart ptr
+		stl::owner<void*>    unk220;  // 220 - smart ptr
 		std::uint64_t   unk228;  // 228
 		BSTArray<void*> unk230;  // 230
 		std::uint64_t   unk248;  // 248

include/RE/S/Stack.cpp

@@ -10,7 +10,7 @@ namespace RE
 		Stack::~Stack()
 		{
 			Dtor();
-			memzero(this);
+			stl::memzero(this);
 		}
 
 		std::uint32_t Stack::GetPageForFrame(const StackFrame* a_frame) const