Revert "Improve MultiFileSystem to allow more file systems"

This reverts commit 35c6166.

Author: TheIndra55

src/file/MultiFileSystem.cpp

@@ -1,110 +1,73 @@
 #include "MultiFileSystem.h"
 
-#include "Hook.h"
-#include "modules/Log.h"
-
-MultiFileSystem::MultiFileSystem() : m_fileSystems()
+MultiFileSystem::MultiFileSystem(cdc::FileSystem* pFS, cdc::FileSystem* pHookFS)
 {
+	m_pFS = pFS;
+	m_pHookFS = pHookFS;
 }
 
-void MultiFileSystem::Add(cdc::FileSystem* fileSystem)
+// Gets the best file system for a file simply by checking the hook file system first
+cdc::FileSystem* MultiFileSystem::GetBestFileSystem(const char* fileName)
 {
-	m_fileSystems.push_back(fileSystem);
-
-#ifdef _DEBUG
-	Hook::GetInstance().GetModule<Log>()->WriteLine("Mounted new file system %p, number of systems: %d", fileSystem, m_fileSystems.size());
-#endif
-}
-
-void MultiFileSystem::Remove(cdc::FileSystem* fileSystem)
-{
-}
-
-cdc::FileSystem* MultiFileSystem::GetBestFileSystem(const char* fileName) const noexcept
-{
-	for (auto fileSystem : m_fileSystems)
+	// First check the hook file system, else fall back to default filesystem
+	if (m_pHookFS->FileExists(fileName))
 	{
-		if (fileSystem->FileExists(fileName))
-		{
-			return fileSystem;
-		}
+		return m_pHookFS;
 	}
 
-	return nullptr;
+	return m_pFS;
 }
 
 cdc::FileRequest* MultiFileSystem::RequestRead(cdc::FileReceiver* receiver, const char* fileName, unsigned int startOffset)
 {
-	auto fileSystem = GetBestFileSystem(fileName);
+	auto pFS = GetBestFileSystem(fileName);
 
-	return fileSystem->RequestRead(receiver, fileName, startOffset);
+	return pFS->RequestRead(receiver, fileName, startOffset);
 }
 
 cdc::File* MultiFileSystem::OpenFile(char const* fileName)
 {
-	auto fileSystem = GetBestFileSystem(fileName);
+	auto pFS = GetBestFileSystem(fileName);
 
-	return fileSystem->OpenFile(fileName);
+	return pFS->OpenFile(fileName);
 }
 
-unsigned int MultiFileSystem::GetFileSize(char const* fileName)
+bool MultiFileSystem::FileExists(char const* fileName)
 {
-	auto fileSystem = GetBestFileSystem(fileName);
-
-	return fileSystem->GetFileSize(fileName);
+	return m_pFS->FileExists(fileName) || m_pHookFS->FileExists(fileName);
 }
 
-bool MultiFileSystem::FileExists(char const* fileName)
+unsigned int MultiFileSystem::GetFileSize(char const* fileName)
 {
-	for (auto fileSystem : m_fileSystems)
-	{
-		if (fileSystem->FileExists(fileName))
-		{
-			return true;
-		}
-	}
+	auto pFS = GetBestFileSystem(fileName);
 
-	return false;
+	return pFS->GetFileSize(fileName);
 }
 
 void MultiFileSystem::SetSpecialisationMask(unsigned int specMask)
 {
-	for (auto fileSystem : m_fileSystems)
-	{
-		fileSystem->SetSpecialisationMask(specMask);
-	}
+	m_pFS->SetSpecialisationMask(specMask);
+	m_pHookFS->SetSpecialisationMask(specMask);
 }
 
 unsigned int MultiFileSystem::GetSpecialisationMask()
 {
-	return m_fileSystems.empty() ? 0xFFFFFFFF : m_fileSystems[0]->GetSpecialisationMask();
+	return m_pFS->GetSpecialisationMask();
 }
 
+// These only need to call the default file system, both will end at the same place
+
 cdc::FileSystem::Status MultiFileSystem::GetStatus()
 {
-	for (auto fileSystem : m_fileSystems)
-	{
-		if (fileSystem->GetStatus() == BUSY)
-		{
-			return BUSY;
-		}
-	}
-
-	return IDLE;
+	return m_pFS->GetStatus();
 }
 
 void MultiFileSystem::Update()
 {
-	for (auto fileSystem : m_fileSystems)
-	{
-		fileSystem->Update();
-	}
+	m_pFS->Update();
 }
 
 void MultiFileSystem::Synchronize()
 {
-	for (auto fileSystem : m_fileSystems)
-	{
-		fileSystem->Synchronize();
-	}
+	m_pFS->Synchronize();
 }

src/file/MultiFileSystem.h

@@ -1,21 +1,21 @@
 #pragma once
 
-#include <vector>
-
 #include "cdc/file/FileSystem.h"
 
+// Simplified version for cdc::MultiFileSystem since it does not exist in Legend and Anniversary
+// The real MultiFileSystem can dynamically add and re-order systems
+// 
+// This just checks the hook file system first and else falls back to the
+// original file system
 class MultiFileSystem : public cdc::FileSystem
 {
 private:
-	std::vector<cdc::FileSystem*> m_fileSystems;
-
-	cdc::FileSystem* GetBestFileSystem(const char* fileName) const noexcept;
+	cdc::FileSystem* m_pFS;
+	cdc::FileSystem* m_pHookFS;
 
+	cdc::FileSystem* GetBestFileSystem(const char* fileName);
 public:
-	MultiFileSystem();
-
-	void Add(cdc::FileSystem* fileSystem);
-	void Remove(cdc::FileSystem* fileSystem);
+	MultiFileSystem(cdc::FileSystem* pFS, cdc::FileSystem* pHookFS);
 
 	cdc::FileRequest* RequestRead(cdc::FileReceiver* receiver, const char* fileName, unsigned int startOffset);
 	cdc::File* OpenFile(const char* fileName);
@@ -26,4 +26,12 @@ class MultiFileSystem : public cdc::FileSystem
 	Status GetStatus();
 	void Update();
 	void Synchronize();
+
+#ifdef TR8
+	void Suspend() { }
+	bool Resume() { return false; }
+	bool IsSuspended() { return false; }
+	char* GetBufferPointer(cdc::FileRequest* request, unsigned int* bytesLocked) { return nullptr; }
+	void ResetBufferPointer(int value) { }
+#endif
 };

src/modules/ModLoader.cpp

@@ -43,10 +43,7 @@ static void InitArchive()
 
 	// Create our hook file system and multi file system
 	auto fileSystem = CreateHookFileSystem();
-	auto multiFileSystem = new MultiFileSystem();
-
-	multiFileSystem->Add(fileSystem);
-	multiFileSystem->Add(GetFS());
+	auto multiFileSystem = new MultiFileSystem(GetFS(), fileSystem);
 
 	// Overwrite the original file system with ours
 	*(cdc::FileSystem**)GET_ADDRESS(0x10E58BC, 0x83888C, 0x9CE278) = multiFileSystem;