aboutsummaryrefslogtreecommitdiff
path: root/src/common/Configuration/Config.h
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-04-18 20:29:42 +0200
committerNaios <naios-dev@live.de>2016-04-18 23:03:24 +0200
commit51ec8d3b8cc6d2691b4a9c0d4502fd1936d82c79 (patch)
tree61667f6e4bc15ad98e171bc224721d3f859bd0e1 /src/common/Configuration/Config.h
parent2809f11839ff0fd4eec45b2e116811b0698dd05b (diff)
Core/Scripting: Use the path of the worldserver executable to search for the scripts dir
* Fixes issues when starting the worldserver not in the bin directory or the CMAKE_INSTALL_PREFIX directory using the -c option. (cherry picked from commit 86b0fcf67aadc0d313253befb0590d00efd085bc)
Diffstat (limited to 'src/common/Configuration/Config.h')
-rw-r--r--src/common/Configuration/Config.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h
index 7f5b3c11d2d..1eccea6ee54 100644
--- a/src/common/Configuration/Config.h
+++ b/src/common/Configuration/Config.h
@@ -23,6 +23,7 @@
#include <string>
#include <list>
+#include <vector>
#include <mutex>
#include <boost/property_tree/ptree.hpp>
@@ -34,8 +35,9 @@ class TC_COMMON_API ConfigMgr
~ConfigMgr() = default;
public:
- /// Method used only for loading main configuration files
- bool LoadInitial(std::string const& file, std::string& error);
+ /// Method used only for loading main configuration files (bnetserver.conf and worldserver.conf)
+ bool LoadInitial(std::string const& file, std::vector<std::string> args,
+ std::string& error);
static ConfigMgr* instance();
@@ -47,10 +49,12 @@ public:
float GetFloatDefault(std::string const& name, float def) const;
std::string const& GetFilename();
+ std::vector<std::string> const& GetArguments() const { return _args; }
std::list<std::string> GetKeysByString(std::string const& name);
private:
std::string _filename;
+ std::vector<std::string> _args;
boost::property_tree::ptree _config;
std::mutex _configLock;