Move WriteDataToFile and OpenPath to FileSystem namespace

happyhavoc · Oct 12, 2023 · 2500b69 · 2500b69
1 parent 5e49642
commit 2500b69
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/FileSystem.cpp b/src/FileSystem.cpp
@@ -7,7 +7,7 @@
 
 u32 g_LastFileSize;
 
-u8 *OpenPath(char *filepath, int isExternalResource)
+u8 *FileSystem::OpenPath(char *filepath, int isExternalResource)
 {
     // char *slashPos;
     u8 *buf;
@@ -87,7 +87,7 @@ u8 *OpenPath(char *filepath, int isExternalResource)
     return buf;
 }
 
-int WriteDataToFile(char *path, void *data, size_t size)
+int FileSystem::WriteDataToFile(char *path, void *data, size_t size)
 {
     FILE *f;
 

diff --git a/src/FileSystem.hpp b/src/FileSystem.hpp
@@ -2,7 +2,10 @@
 
 #include "inttypes.hpp"
 
+namespace FileSystem
+{
 u8 *OpenPath(char *filepath, int isExternalResource);
 int WriteDataToFile(char *path, void *data, size_t size);
+} // namespace FileSystem
 
 extern u32 g_LastFileSize;
diff --git a/src/GameContext.cpp b/src/GameContext.cpp
@@ -32,7 +32,7 @@ i32 GameContext::Parse(char *path)
 
     memset(&g_GameContext.cfg, 0, sizeof(GameConfiguration));
     g_GameContext.cfg.opts = g_GameContext.cfg.opts | USE_D3D_HW_TEXTURE_BLENDING;
-    data = OpenPath(path, 1);
+    data = FileSystem::OpenPath(path, 1);
     if (data == NULL)
     {
         g_GameContext.cfg.lifeCount = 2;
@@ -145,7 +145,7 @@ i32 GameContext::Parse(char *path)
     {
         GameErrorContextLog(&g_GameErrorContext, TH_ERR_DO_NOT_USE_DIRECTINPUT);
     }
-    if (WriteDataToFile(path, &g_GameContext.cfg, sizeof(GameConfiguration)) == 0)
+    if (FileSystem::WriteDataToFile(path, &g_GameContext.cfg, sizeof(GameConfiguration)) == 0)
     {
         return 0;
     }

diff --git a/src/main.cpp b/src/main.cpp
@@ -268,7 +268,7 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
     }
     else
     {
-        WriteDataToFile(TH_CONFIG_FILE, &g_GameContext.cfg, sizeof(g_GameContext.cfg));
+        FileSystem::WriteDataToFile(TH_CONFIG_FILE, &g_GameContext.cfg, sizeof(g_GameContext.cfg));
         SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, g_ScreenSaveActive, NULL, SPIF_SENDCHANGE);
         SystemParametersInfo(SPI_SETLOWPOWERACTIVE, g_LowPowerActive, NULL, SPIF_SENDCHANGE);
         SystemParametersInfo(SPI_SETPOWEROFFACTIVE, g_PowerOffActive, NULL, SPIF_SENDCHANGE);