diff --git a/src/TConsole.cpp b/src/TConsole.cpp index 3b15542..92c64a9 100644 --- a/src/TConsole.cpp +++ b/src/TConsole.cpp @@ -7,13 +7,12 @@ #include "LuaAPI.h" #include "TLuaEngine.h" +#include #include #include -#include -#include -#include #include #include +#include #include #include @@ -312,9 +311,9 @@ void TConsole::Command_Debug(const std::string&, const std::vector& auto Now = std::chrono::high_resolution_clock::now(); auto Seconds = std::chrono::duration_cast(Now - Locked->ConnectionTime); std::string ConnectedSince = fmt::format("{:%Y/%m/%d %H:%M:%S}, {:%H:%M:%S} ago ({} seconds)", - fmt::localtime(std::chrono::high_resolution_clock::to_time_t(Locked->ConnectionTime)), - Seconds, - Seconds.count()); + fmt::localtime(std::chrono::high_resolution_clock::to_time_t(Locked->ConnectionTime)), + Seconds, + Seconds.count()); Application::Console().WriteRaw(fmt::format( R"( {} ('{}'): Roles: {} @@ -496,16 +495,15 @@ void TConsole::Command_Settings(const std::string&, const std::vector StringRule; StringRule - %= qi::lexeme['"' >> *(qi::char_ - '"') >> '"' ] - | +(qi::char_ - '"') - ; - qi::rule ValueRule + %= qi::lexeme['"' >> *(qi::char_ - '"') >> '"'] + | +(qi::char_ - '"'); + qi::rule ValueRule = qi::bool_ | qi::int_ | StringRule; auto It = ValueString.begin(); if (qi::phrase_parse(It, ValueString.end(), ValueRule[boost::phoenix::ref(Value) = _1], ascii::space) - && It == ValueString.end()) { + && It == ValueString.end()) { Application::SetSetting(args.at(1), Value); Application::Console().WriteRaw(fmt::format("{} := {}", args.at(1), Application::SettingToString(Application::mSettings.at(args.at(1))))); } else {