From abbe4021ba77e423765f1443f2e9236aa19f09aa Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 24 Dec 2023 13:57:00 +0300
Subject: [PATCH] Minor refactor

---
 src/util/platform.cpp | 18 +++---------------
 src/util/platform.h   |  3 ---
 src/voxel_engine.cpp  |  9 ++++++---
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/util/platform.cpp b/src/util/platform.cpp
index 95edbbca..e61329d0 100644
--- a/src/util/platform.cpp
+++ b/src/util/platform.cpp
@@ -6,20 +6,6 @@
 
 #include "../typedefs.h"
 
-#define SETTINGS_FILE "settings.toml"
-#define CONTROLS_FILE "controls.json"
-
-using std::filesystem::path;
-
-
-path platform::get_settings_file() {
-	return path(SETTINGS_FILE);
-}
-
-path platform::get_controls_file() {
-	return path(CONTROLS_FILE);
-}
-
 std::string platform::detect_locale() {
     // TODO: implement
     std::string name = setlocale(LC_ALL, nullptr);
@@ -37,8 +23,10 @@ void platform::configure_encoding() {
 	SetConsoleOutputCP(CP_UTF8);
     setvbuf(stdout, nullptr, _IOFBF, 1000);
 }
+
 #else
+
 void platform::configure_encoding(){
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/util/platform.h b/src/util/platform.h
index 2a320698..66b7917c 100644
--- a/src/util/platform.h
+++ b/src/util/platform.h
@@ -2,12 +2,9 @@
 #define UTIL_PLATFORM_H_
 
 #include <string>
-#include <filesystem>
 
 namespace platform {
     extern void configure_encoding();
-    extern std::filesystem::path get_settings_file();
-    extern std::filesystem::path get_controls_file();
     extern std::string detect_locale();
 }
 
diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp
index 0023b736..b49b50a4 100644
--- a/src/voxel_engine.cpp
+++ b/src/voxel_engine.cpp
@@ -14,7 +14,10 @@
 #include "files/engine_paths.h"
 #include "util/command_line.h"
 
-using std::filesystem::path;
+#define SETTINGS_FILE "settings.toml"
+#define CONTROLS_FILE "controls.json"
+
+namespace fs = std::filesystem;
 
 int main(int argc, char** argv) {
 	EnginePaths paths;
@@ -27,8 +30,8 @@ int main(int argc, char** argv) {
 	    EngineSettings settings;
 		std::unique_ptr<toml::Wrapper> wrapper (create_wrapper(settings));
 
-		path settings_file = userfiles/platform::get_settings_file();
-		path controls_file = userfiles/platform::get_controls_file();
+		fs::path settings_file = userfiles/fs::path(SETTINGS_FILE);
+		fs::path controls_file = userfiles/fs::path(CONTROLS_FILE);
 		if (std::filesystem::is_regular_file(settings_file)) {
 			std::cout << "-- loading settings" << std::endl;
 			std::string text = files::read_string(settings_file);