-

Author: codenamecpp

src/CarnageGame.cpp

@@ -9,6 +9,7 @@
 #include "MemoryManager.h"
 
 static const char* InputsConfigPath = "config/inputs.json";
+static const char* GTA1MapFileExtension = ".CMP";
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -23,11 +24,45 @@ bool CarnageGame::Initialize()
     SetInputActionsFromConfig();
 
     gGameRules.LoadDefaults();
+
+    // scan all gta1 maps
+    std::vector<std::string> gtaMapNames;
+    for (const std::string& currSearchPlace: gFiles.mSearchPlaces)
+    {
+        cxx::enum_files(currSearchPlace, [&gtaMapNames](const std::string& curr)
+        {
+            if (cxx::get_file_extension(curr) == GTA1MapFileExtension)
+            {
+                gtaMapNames.push_back(curr);  
+            }
+        });
+    }
+
+    if (gtaMapNames.size())
+    {
+        gConsole.LogMessage(eLogMessage_Info, "Found GTA1 maps:");
+        for (const std::string& currMapname: gtaMapNames)
+        {
+            gConsole.LogMessage(eLogMessage_Info, " - %s", currMapname.c_str());
+        }
+    }
+    else
+    {
+        gConsole.LogMessage(eLogMessage_Warning, "No GTA1 maps found within search places");
+    }
+
     if (gSystem.mStartupParams.mDebugMapName.empty())
     {
-        gSystem.mStartupParams.mDebugMapName.set_content("NYC.CMP");
+        // try load first found map
+        if (gtaMapNames.size())
+        {
+            gSystem.mStartupParams.mDebugMapName = gtaMapNames[0].c_str();
+        }
     }
 
+    if (gSystem.mStartupParams.mDebugMapName.empty())
+        return false;
+
     gGameMap.LoadFromFile(gSystem.mStartupParams.mDebugMapName.c_str());
     gSpriteManager.Cleanup();
     gRenderManager.mMapRenderer.BuildMapMesh();

src/GameMapManager.cpp

@@ -66,6 +66,8 @@ bool GameMapManager::LoadFromFile(const char* filename)
 {
     Cleanup();
 
+    gConsole.LogMessage(eLogMessage_Info, "Loading map '%s'", filename);
+
     std::ifstream file;
     if (!gFiles.OpenBinaryFile(filename, file))
     {

src/GraphicsDevice.cpp

@@ -1132,8 +1132,8 @@ void GraphicsDevice::QueryGraphicsDeviceCaps()
     glCheckError();
 
     gConsole.LogMessage(eLogMessage_Info, "Graphics Device caps:");
-    gConsole.LogMessage(eLogMessage_Info, "- max array texture layers: %d", mCaps.mMaxArrayTextureLayers);
-    gConsole.LogMessage(eLogMessage_Info, "- max texture buffer size: %d bytes", mCaps.mMaxTextureBufferSize);
+    gConsole.LogMessage(eLogMessage_Info, " - max array texture layers: %d", mCaps.mMaxArrayTextureLayers);
+    gConsole.LogMessage(eLogMessage_Info, " - max texture buffer size: %d bytes", mCaps.mMaxTextureBufferSize);
 }
 
 void GraphicsDevice::ActivateTextureUnit(eTextureUnit textureUnit)

src/path_utils.cpp

@@ -80,4 +80,34 @@ bool ensure_path_exists(std::string pathto)
     return filesystem::create_directories(sourcePath);
 }
 
+void enum_files(std::string pathto, enum_files_proc enumproc)
+{
+    filesystem::path sourcePath {pathto};
+    if (!filesystem::exists(sourcePath))
+        return;
+
+    filesystem::directory_iterator iter_directory_end;
+    for (filesystem::directory_iterator iter_directory(sourcePath); 
+        iter_directory != iter_directory_end; ++iter_directory)
+    {
+        const filesystem::path& currentFile = iter_directory->path();
+        enumproc(currentFile.filename().generic_string());
+    }
+}
+
+void enum_files_recursive(std::string pathto, enum_files_proc enumproc)
+{
+    filesystem::path sourcePath {pathto};
+    if (!filesystem::exists(sourcePath))
+        return;
+
+    filesystem::recursive_directory_iterator iter_directory_end;
+    for (filesystem::recursive_directory_iterator iter_directory(sourcePath); 
+        iter_directory != iter_directory_end; ++iter_directory)
+    {
+        const filesystem::path& currentFile = iter_directory->path();
+        enumproc(currentFile.filename().generic_string());
+    }
+}
+
 } // namespace cxx

src/path_utils.h

@@ -2,6 +2,8 @@
 
 namespace cxx
 {
+    using enum_files_proc = std::function<void (const std::string&)>;
+
     // extract parent directory for element
     // @param sourcePath: Path
     std::string get_parent_directory(std::string pathto);
@@ -36,4 +38,10 @@ namespace cxx
     // create directories in path
     bool ensure_path_exists(std::string pathto);
 
+    // enumerate files and directories at specific location
+    // @param pathto: Location
+    // @param enumproc: Enumeration callback
+    void enum_files(std::string pathto, enum_files_proc enumproc);
+    void enum_files_recursive(std::string pathto, enum_files_proc enumproc);
+
 } // namespace cxx