diff options
| author | Martin Ridgers <[email protected]> | 2021-11-29 09:28:18 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-29 09:34:01 +0100 |
| commit | e7a3e803e499912b8ec686172f7da83bc951dad6 (patch) | |
| tree | 63bfc34e761bb00276986ee1f058dc3e745796d1 /zenserver/config.cpp | |
| parent | Merged main (diff) | |
| download | zen-e7a3e803e499912b8ec686172f7da83bc951dad6.tar.xz zen-e7a3e803e499912b8ec686172f7da83bc951dad6.zip | |
Post-merge fixes
Diffstat (limited to 'zenserver/config.cpp')
| -rw-r--r-- | zenserver/config.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/zenserver/config.cpp b/zenserver/config.cpp index a5a747150..84eb4ae75 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -159,14 +159,14 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions) "", "tracehost", "Hostname to send the trace to", - cxxopts::value<std::string>(GlobalOptions.TraceHost)->default_value(""), + cxxopts::value<std::string>(ServerOptions.TraceHost)->default_value(""), ""); options.add_option("ue-trace", "", "tracefile", "Path to write a trace to", - cxxopts::value<std::string>(GlobalOptions.TraceFile)->default_value(""), + cxxopts::value<std::string>(ServerOptions.TraceFile)->default_value(""), ""); #endif // ZEN_WITH_TRACE @@ -336,15 +336,7 @@ ParseConfigFile(const std::filesystem::path& Path, ZenServerOptions& ServerOptio { using namespace fmt::literals; -<<<<<<< HEAD - std::filesystem::path ConfigScript = DataRoot / "zen_cfg.lua"; - zen::IoBuffer LuaScript = zen::IoBufferBuilder::MakeFromFile(ConfigScript); -||||||| b2cc49b - std::filesystem::path ConfigScript = DataRoot / "zen_cfg.lua"; - zen::IoBuffer LuaScript = zen::IoBufferBuilder::MakeFromFile(ConfigScript.native().c_str()); -======= - zen::IoBuffer LuaScript = zen::IoBufferBuilder::MakeFromFile(Path.native().c_str()); ->>>>>>> origin/main + zen::IoBuffer LuaScript = zen::IoBufferBuilder::MakeFromFile(Path); if (LuaScript) { |