General fixes (#1251)

src/gta/fidevice.cpp

@@ -1,6 +1,7 @@
 #include "fidevice.hpp"
-#include "pointers.hpp"
+
 #include "hooking.hpp"
+#include "pointers.hpp"
 
 namespace rage
 {
@@ -264,4 +265,9 @@ namespace rage
 	{
 		return big::g_hooking->get_original<big::hooks::fipackfile_mount>()(this, mount_point);
 	}
+
+	void fiDevice::Unmount(const char* rootPath)
+	{
+		big::g_pointers->m_gta.m_fipackfile_unmount(rootPath);
+	}
 }

src/gta/pools.hpp

@@ -0,0 +1,121 @@
+#pragma once
+#include "natives.hpp"
+#include "pointers.hpp"
+
+// everything pasted from https://github.com/gta-chaos-mod/ChaosModV/blob/master/ChaosMod/Util/EntityIterator.h
+// Thanks to menyoo for most of these!!
+
+// Pool Interator class to iterate over pools. Has just enough operators defined to be able to be used in a for loop, not suitable for any other iterating.
+
+template<typename T>
+class pool_iterator
+{
+public:
+	T* pool        = nullptr;
+	uint32_t index = 0;
+
+	explicit pool_iterator(T* pool, int32_t index = 0)
+	{
+		this->pool  = pool;
+		this->index = index;
+	}
+
+	pool_iterator& operator++()
+	{
+		for (index++; index < pool->m_size; index++)
+		{
+			if (pool->is_valid(index))
+			{
+				return *this;
+			}
+		}
+
+		index = pool->m_size;
+		return *this;
+	}
+
+	rage::CEntity* operator*()
+	{
+		auto addr = pool->get_address(index);
+		return (rage::CEntity*)addr;
+	}
+
+	bool operator!=(const pool_iterator& other) const
+	{
+		return this->index != other.index;
+	}
+};
+
+// Common functions for VehiclePool and GenericPool
+template<typename T>
+class PoolUtils
+{
+public:
+	inline auto to_array()
+	{
+		std::vector<Entity> arr;
+		for (auto entity : *static_cast<T*>(this))
+		{
+			arr.push_back(big::g_pointers->m_gta.m_ptr_to_handle(entity));
+		}
+
+		return arr;
+	}
+
+	auto begin()
+	{
+		return ++pool_iterator<T>(static_cast<T*>(this), -1);
+	}
+
+	auto end()
+	{
+		return ++pool_iterator<T>(static_cast<T*>(this), static_cast<T*>(this)->m_size);
+	}
+};
+
+class VehiclePool : public PoolUtils<VehiclePool>
+{
+public:
+	UINT64* m_pool_address;
+	UINT32 m_size;
+	char _Padding2[36];
+	UINT32* m_bit_array;
+	char _Padding3[40];
+	UINT32 m_item_count;
+
+	inline bool is_valid(UINT32 i)
+	{
+		return (m_bit_array[i >> 5] >> (i & 0x1F)) & 1;
+	}
+
+	inline UINT64 get_address(UINT32 i)
+	{
+		return m_pool_address[i];
+	}
+};
+
+class GenericPool : public PoolUtils<GenericPool>
+{
+public:
+	UINT64 m_pool_address;
+	BYTE* m_bit_array;
+	UINT32 m_size;
+	UINT32 m_item_size;
+
+	inline bool is_valid(UINT32 i)
+	{
+		return mask(i) != 0;
+	}
+
+	inline UINT64 get_address(UINT32 i)
+	{
+		return mask(i) & (m_pool_address + i * m_item_size);
+	}
+
+private:
+	inline long long mask(UINT32 i)
+	{
+		long long num1 = m_bit_array[i] & 0x80;
+		return ~((num1 | -num1) >> 63);
+	}
+};

src/gta/replay.hpp

@@ -1,10 +1,10 @@
 #pragma once
-#pragma pack(push, 4)
 
+#include "base/CObject.hpp"
 #include "common.hpp"
 #include "fwddec.hpp"
-#include "base/CObject.hpp"
 
+#pragma pack(push, 4)
 namespace rage
 {
 	template<typename T = CDynamicEntity>