[ClientApplication|ServerApplication] New parameter '-w/--working-dir…

…' to set the working directory of the programs.
Unarelith · Mar 13, 2020 · ceafa8c · ceafa8c
1 parent 085ef78
commit ceafa8c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/client/source/core/ClientApplication.cpp b/client/source/core/ClientApplication.cpp
@@ -24,6 +24,8 @@
  *
  * =====================================================================================
  */
+#include "filesystem.hpp"
+
 #include <gk/core/input/GamePad.hpp>
 #include <gk/core/Mouse.hpp>
 #include <gk/gl/GLCheck.hpp>
@@ -37,7 +39,7 @@
 
 #include "TitleScreenState.hpp"
 
-using namespace std::literals::string_literals;
+namespace fs = ghc::filesystem;
 
 ClientApplication::ClientApplication(int argc, char **argv) : gk::CoreApplication(argc, argv) {
 }
@@ -47,9 +49,13 @@ void ClientApplication::init() {
 	m_argumentParser.addArgument("port", {"-p", "--port", true});
 	m_argumentParser.addArgument("singleplayer", {"-s", "--singleplayer", false});
 	m_argumentParser.addArgument("multiplayer", {"-m", "--multiplayer", false});
+	m_argumentParser.addArgument("working_dir", {"-w", "--working-dir", true});
 
 	gk::CoreApplication::init();
 
+	if (m_argumentParser.getArgument("working_dir").isFound)
+		fs::current_path(m_argumentParser.getArgument("working_dir").parameter);
+
 	if (m_argumentParser.getArgument("host").isFound)
 		m_host = m_argumentParser.getArgument("host").parameter;
 	if (m_argumentParser.getArgument("port").isFound)

diff --git a/server/source/core/ServerApplication.cpp b/server/source/core/ServerApplication.cpp
@@ -33,12 +33,17 @@ namespace fs = ghc::filesystem;
 
 ServerApplication::ServerApplication(int argc, char **argv) : m_argumentParser(argc, argv) {
 	std::srand(std::time(nullptr));
+}
 
+void ServerApplication::init() {
 	m_argumentParser.addArgument("port", {"-p", "--port", true});
+	m_argumentParser.addArgument("working_dir", {"-w", "--working-dir", true});
+
 	m_argumentParser.parse();
-}
 
-void ServerApplication::init() {
+	if (m_argumentParser.getArgument("working_dir").isFound)
+		fs::current_path(m_argumentParser.getArgument("working_dir").parameter);
+
 	if (m_argumentParser.getArgument("port").isFound)
 		m_port = std::stoi(m_argumentParser.getArgument("port").parameter);