diff --git a/.gitignore b/.gitignore index e6c996c..fdb4696 100644 --- a/.gitignore +++ b/.gitignore @@ -473,3 +473,4 @@ cmake-build-release/include/commandline/Makefile *.marks *.internal *.xml +cmake-build-debug/include/commandline/Makefile diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 3b1ed6e..4a40b5e 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -10,6 +10,7 @@ + \ No newline at end of file diff --git a/include/Common.h b/include/Common.h index 94e3f15..4600d82 100644 --- a/include/Common.h +++ b/include/Common.h @@ -76,14 +76,14 @@ static inline void luaprint(const std::string& str) { } #else // DEBUG -#define warn(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [WARN] ") + (x)) -#define info(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [INFO] ") + (x)) -#define error(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [ERROR] ") + (x)) -#define luaprint(x) Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [LUA] ") + (x)) +#define warn(x) Application::Console().Write(std::string(__func__) + ":" + std::to_string(__LINE__) + std::string(" [WARN] ") + (x)) +#define info(x) Application::Console().Write(std::string(__func__) + ":" + std::to_string(__LINE__) + std::string(" [INFO] ") + (x)) +#define error(x) Application::Console().Write(std::string(__func__) + ":" + std::to_string(__LINE__) + std::string(" [ERROR] ") + (x)) +#define luaprint(x) Application::Console().Write(std::string(__func__) + ":" + std::to_string(__LINE__) + std::string(" [LUA] ") + (x)) #define debug(x) \ do { \ if (Application::Settings.DebugModeEnabled) { \ - Application::Console().Write(std::string(__PRETTY_FUNCTION__) + ":" + std::to_string(__LINE__) + std::string(" [DEBUG] ") + (x)); \ + Application::Console().Write(std::string(__func__) + ":" + std::to_string(__LINE__) + std::string(" [DEBUG] ") + (x)); \ } \ } while (false) #endif // DEBUG diff --git a/src/TResourceManager.cpp b/src/TResourceManager.cpp index 1a1a083..de32802 100644 --- a/src/TResourceManager.cpp +++ b/src/TResourceManager.cpp @@ -8,7 +8,7 @@ namespace fs = std::filesystem; TResourceManager::TResourceManager() { std::string Path = Application::Settings.Resource + "/Client"; if (!fs::exists(Path)) - fs::create_directory(Path); + fs::create_directories(Path); for (const auto& entry : fs::directory_iterator(Path)) { auto pos = entry.path().string().find(".zip"); if (pos != std::string::npos) {