summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenix3 <kenixwhisperwind@gmail.com>2022-08-05 01:03:11 -0400
committerGitHub <noreply@github.com>2022-08-05 01:03:11 -0400
commitc38d912f3a14ee7ad923305401995a5c44103cb3 (patch)
treeeb5638d836bcd8ec591cfa20eca116f301e3a538
parentcd33f07a1bddf26c61e6f75bf9ebba2562fe11f0 (diff)
LUS Cleanup: Removes GameSettings class. Moves code to Imgui. (#1036)
* LUS Cleanup: Removes GameSettings class. Moves code to Imgui. * Fixes more strdup problems and finalized removal of GameSetting. * Reverts changes to Directory.h * Update Directory.h * Fixes PR. * Update Directory.h * Update rando_main.cpp
-rw-r--r--ZAPDUtils/Utils/Directory.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/ZAPDUtils/Utils/Directory.h b/ZAPDUtils/Utils/Directory.h
index 1ced139..ea792d8 100644
--- a/ZAPDUtils/Utils/Directory.h
+++ b/ZAPDUtils/Utils/Directory.h
@@ -1,8 +1,9 @@
#pragma once
-#include <iostream>
#include <string>
#include <vector>
+#include "StringHelper.h"
+#include <iostream>
#if __has_include(<filesystem>)
#include <filesystem>
@@ -12,8 +13,6 @@ namespace fs = std::filesystem;
namespace fs = std::experimental::filesystem;
#endif
-#include "StringHelper.h"
-
#undef GetCurrentDirectory
#undef CreateDirectory
@@ -21,7 +20,7 @@ class Directory
{
public:
#ifndef PATH_HACK
- static std::string GetCurrentDirectory() { return fs::current_path().u8string().c_str(); }
+ static std::string GetCurrentDirectory() { return fs::current_path().string(); }
#endif
static bool Exists(const fs::path& path) { return fs::exists(path); }