Split up MSFileSystem to seperate file

Author: TheIndra55

Hooking.cpp

@@ -8,6 +8,7 @@
 #include "game/d3d/d3dterrain.hpp"
 #include "game/script/script.hpp"
 #include "game/font.hpp"
+#include "game/msfilesystem.hpp"
 
 LPDIRECT3DDEVICE9 pDevice;
 HWND pHwnd;
@@ -282,7 +283,7 @@ void __cdecl Font__Flush()
 	// prints queued file requests
 	if (drawSettings.printFileRequests && g_pDiskFS)
 	{
-		auto queue = g_pDiskFS->m_queue;
+		auto queue = ((cdc::MSFileSystem*)g_pDiskFS)->m_queue;
 
 		auto y = 15.f;
 

game/README.md

@@ -0,0 +1,9 @@
+# Game
+
+* **script/** Underworld and above script stuff
+* **filesystem.hpp** FileSystem header
+* **font.hpp** Game font functions
+* **hookfilesystem.cpp** Mod loader FileSystem
+* **msfilesystem.hpp** Game Microsoft FileSystem header
+* **multifilesystem.cpp** Simplified MultiFileSystem
+* **reloc.cpp** Part of the game PE loader for the event system	

game/filesystem.hpp

@@ -20,33 +20,12 @@ namespace cdc
 		virtual bool IsSuspended() = 0;
 #endif
 	};
-
-	struct MSFileSystem
-	{
-		struct Request
-		{
-			char pad1[20];
-			char m_pFileName[128];
-			char pad2[20];
-			unsigned int m_bytesRead;
-			unsigned int m_bytesProcessed;
-			int m_readState;
-			unsigned int m_offset;
-			unsigned int m_size;
-			Request* m_next;
-		};
-
-		char pad[1099812];
-		Request* m_queue;
-		Request* m_free;
-		unsigned int m_numUsedRequests;
-	};
 }
 
 cdc::FileSystem* CreateHookFileSystem(cdc::FileSystem* pDiskFS);
 cdc::FileSystem* CreateMultiFileSystem(cdc::FileSystem* pFS, cdc::FileSystem* pDiskFS);
 
-#define g_pDiskFS VAR_U_(DISKFS, cdc::MSFileSystem*)
+#define g_pDiskFS VAR_U_(DISKFS, cdc::FileSystem*)
 #define g_pFS VAR_U_(ARCHIVEFS, cdc::FileSystem*)
 
 cdc::FileSystem* GetFS();

game/msfilesystem.hpp

@@ -0,0 +1,23 @@
+namespace cdc
+{
+	struct MSFileSystem
+	{
+		struct Request
+		{
+			char pad1[20];
+			char m_pFileName[128];
+			char pad2[20];
+			unsigned int m_bytesRead;
+			unsigned int m_bytesProcessed;
+			int m_readState;
+			unsigned int m_offset;
+			unsigned int m_size;
+			Request* m_next;
+		};
+
+		char pad[1099812];
+		Request* m_queue;
+		Request* m_free;
+		unsigned int m_numUsedRequests;
+	};
+}