[GEN][ZH] Unify File System code (#1279)

Author: xezon

Generals/Code/GameEngine/Include/Common/FileSystem.h

@@ -115,9 +115,13 @@ struct FileInfo {
 	* created when FileSystem::Open() gets called.
 	*/
 //===============================
+#include <map>
 
 class FileSystem : public SubsystemInterface
 {
+  FileSystem(const FileSystem&);
+  FileSystem& operator=(const FileSystem&);
+  
 public:
 	FileSystem();
 	virtual	~FileSystem();
@@ -139,8 +143,7 @@ class FileSystem : public SubsystemInterface
 	AsciiString normalizePath(const AsciiString& path) const;	///< normalizes a file path. The path can refer to a directory. File path must be absolute, but does not need to exist. Returns an empty string on failure.
 	static Bool isPathInDirectory(const AsciiString& testPath, const AsciiString& basePath);	///< determines if a file path is within a base path. Both paths must be absolute, but do not need to exist.
 protected:
-
-
+  mutable std::map<unsigned,bool> m_fileExist;
 };
 
 extern FileSystem*	TheFileSystem;

Generals/Code/GameEngine/Source/Common/System/FileSystem.cpp

@@ -179,6 +179,11 @@ File*		FileSystem::openFile( const Char *filename, Int access )
 	if ( TheLocalFileSystem != NULL )
 	{
 		file = TheLocalFileSystem->openFile( filename, access );
+		if (file != NULL && (file->getAccess() & File::CREATE))
+		{
+			unsigned key = TheNameKeyGenerator->nameToLowercaseKey(filename);
+			m_fileExist[key] = true;
+		}
 	}
 
 	if ( (TheArchiveFileSystem != NULL) && (file == NULL) )
@@ -196,12 +201,24 @@ File*		FileSystem::openFile( const Char *filename, Int access )
 Bool FileSystem::doesFileExist(const Char *filename) const
 {
 	USE_PERF_TIMER(FileSystem)
-	if (TheLocalFileSystem->doesFileExist(filename)) {
+
+  unsigned key=TheNameKeyGenerator->nameToLowercaseKey(filename);
+  std::map<unsigned,bool>::iterator i=m_fileExist.find(key);
+  if (i!=m_fileExist.end())
+    return i->second;
+
+	if (TheLocalFileSystem->doesFileExist(filename)) 
+  {
+    m_fileExist[key]=true;
 		return TRUE;
 	}
-	if (TheArchiveFileSystem->doesFileExist(filename)) {
+	if (TheArchiveFileSystem->doesFileExist(filename)) 
+  {
+    m_fileExist[key]=true;
 		return TRUE;
 	}
+
+  m_fileExist[key]=false;
 	return FALSE;
 }
 
@@ -274,7 +291,11 @@ Bool FileSystem::areMusicFilesOnCD()
 		cdRoot = cdi->getPath();
 		if (!cdRoot.endsWith("\\"))
 			cdRoot.concat("\\");
+#if RTS_GENERALS
 		cdRoot.concat("gensec.big");
+#elif RTS_ZEROHOUR
+		cdRoot.concat("genseczh.big");
+#endif
 		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - checking for %s", cdRoot.str()));
 		File *musicBig = TheLocalFileSystem->openFile(cdRoot.str());
 		if (musicBig)

Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp

@@ -33,6 +33,11 @@
 #include "Common/GameAudio.h"
 #include "Common/GameMemory.h"
 #include "Common/LocalFileSystem.h"
+
+#if RTS_ZEROHOUR
+#include "Common/Registry.h"
+#endif
+
 #include "Win32Device/Common/Win32BIGFile.h"
 #include "Win32Device/Common/Win32BIGFileSystem.h"
 #include "Utility/endian_compat.h"
@@ -53,6 +58,16 @@ void Win32BIGFileSystem::init() {
 	}
 
 	loadBigFilesFromDirectory("", "*.big");
+
+#if RTS_ZEROHOUR
+    // load original Generals assets
+    AsciiString installPath;
+    GetStringFromGeneralsRegistry("", "InstallPath", installPath );
+    //@todo this will need to be ramped up to a crash for release
+    DEBUG_ASSERTCRASH(installPath != "", ("Be 1337! Go install Generals!"));
+    if (installPath!="")
+      loadBigFilesFromDirectory(installPath, "*.big");
+#endif
 }
 
 void Win32BIGFileSystem::reset() {

Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp

@@ -233,4 +233,4 @@ AsciiString Win32LocalFileSystem::normalizePath(const AsciiString& filePath) con
 	}
 
 	return normalizedFilePath;
-}
+}

GeneralsMD/Code/GameEngine/Source/Common/System/FileSystem.cpp

@@ -272,7 +272,7 @@ Bool FileSystem::createDirectory(AsciiString directory)
 Bool FileSystem::areMusicFilesOnCD()
 {
 #if 1
-    return TRUE;
+	return TRUE;
 #else
 	if (!TheCDManager) {
 		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - No CD Manager; returning false"));
@@ -291,7 +291,11 @@ Bool FileSystem::areMusicFilesOnCD()
 		cdRoot = cdi->getPath();
 		if (!cdRoot.endsWith("\\"))
 			cdRoot.concat("\\");
+#if RTS_GENERALS
+		cdRoot.concat("gensec.big");
+#elif RTS_ZEROHOUR
 		cdRoot.concat("genseczh.big");
+#endif
 		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - checking for %s", cdRoot.str()));
 		File *musicBig = TheLocalFileSystem->openFile(cdRoot.str());
 		if (musicBig)

GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp

@@ -33,9 +33,13 @@
 #include "Common/GameAudio.h"
 #include "Common/GameMemory.h"
 #include "Common/LocalFileSystem.h"
+
+#if RTS_ZEROHOUR
+#include "Common/Registry.h"
+#endif
+
 #include "StdDevice/Common/StdBIGFile.h"
 #include "StdDevice/Common/StdBIGFileSystem.h"
-#include "Common/Registry.h"
 #include "Utility/endian_compat.h"
 
 static const char *BIGFileIdentifier = "BIGF";
@@ -54,13 +58,15 @@ void StdBIGFileSystem::init() {
 
 	loadBigFilesFromDirectory("", "*.big");
 
+#if RTS_ZEROHOUR
     // load original Generals assets
     AsciiString installPath;
     GetStringFromGeneralsRegistry("", "InstallPath", installPath );
     //@todo this will need to be ramped up to a crash for release
     DEBUG_ASSERTCRASH(installPath != "", ("Be 1337! Go install Generals!"));
     if (installPath!="")
       loadBigFilesFromDirectory(installPath, "*.big");
+#endif
 }
 
 void StdBIGFileSystem::reset() {

GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp

@@ -33,9 +33,13 @@
 #include "Common/GameAudio.h"
 #include "Common/GameMemory.h"
 #include "Common/LocalFileSystem.h"
+
+#if RTS_ZEROHOUR
+#include "Common/Registry.h"
+#endif
+
 #include "Win32Device/Common/Win32BIGFile.h"
 #include "Win32Device/Common/Win32BIGFileSystem.h"
-#include "Common/Registry.h"
 #include "Utility/endian_compat.h"
 
 
@@ -55,13 +59,15 @@ void Win32BIGFileSystem::init() {
 
 	loadBigFilesFromDirectory("", "*.big");
 
+#if RTS_ZEROHOUR
     // load original Generals assets
     AsciiString installPath;
     GetStringFromGeneralsRegistry("", "InstallPath", installPath );
     //@todo this will need to be ramped up to a crash for release
     DEBUG_ASSERTCRASH(installPath != "", ("Be 1337! Go install Generals!"));
     if (installPath!="")
       loadBigFilesFromDirectory(installPath, "*.big");
+#endif
 }
 
 void Win32BIGFileSystem::reset() {