BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-06-17 14:12:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix invalid include, reformat TConsole

Browse Source
This commit is contained in:
Lion Kortlepel
2022-10-26 14:25:46 +02:00
parent c717037895
commit 96273e1d06
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TConsole.cpp
+8 -10
View File
@@ -7,13 +7,12 @@
#include "LuaAPI.h" #include "LuaAPI.h"
#include "TLuaEngine.h" #include "TLuaEngine.h"
#include <boost/asio/ip/address.hpp>
#include <boost/spirit/home/qi/directive/lexeme.hpp> #include <boost/spirit/home/qi/directive/lexeme.hpp>
#include <boost/spirit/home/qi/parse.hpp> #include <boost/spirit/home/qi/parse.hpp>
#include <bits/chrono.h>
#include <boost/asio/ip/address.hpp>
#include <fmt/chrono.h>
#include <chrono> #include <chrono>
#include <ctime> #include <ctime>
#include <fmt/chrono.h>
#include <sstream> #include <sstream>
#include <boost/phoenix.hpp> #include <boost/phoenix.hpp>
@@ -312,9 +311,9 @@ void TConsole::Command_Debug(const std::string&, const std::vector<std::string>&
auto Now = std::chrono::high_resolution_clock::now(); auto Now = std::chrono::high_resolution_clock::now();
auto Seconds = std::chrono::duration_cast<std::chrono::seconds>(Now - Locked->ConnectionTime); auto Seconds = std::chrono::duration_cast<std::chrono::seconds>(Now - Locked->ConnectionTime);
std::string ConnectedSince = fmt::format("{:%Y/%m/%d %H:%M:%S}, {:%H:%M:%S} ago ({} seconds)", 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)), fmt::localtime(std::chrono::high_resolution_clock::to_time_t(Locked->ConnectionTime)),
Seconds, Seconds,
Seconds.count()); Seconds.count());
Application::Console().WriteRaw(fmt::format( Application::Console().WriteRaw(fmt::format(
R"( {} ('{}'): R"( {} ('{}'):
Roles: {} Roles: {}
@@ -496,16 +495,15 @@ void TConsole::Command_Settings(const std::string&, const std::vector<std::strin
Application::SettingValue Value; Application::SettingValue Value;
qi::rule<std::string::iterator, std::string()> StringRule; qi::rule<std::string::iterator, std::string()> StringRule;
StringRule StringRule
%= qi::lexeme['"' >> *(qi::char_ - '"') >> '"' ] %= qi::lexeme['"' >> *(qi::char_ - '"') >> '"']
| +(qi::char_ - '"') | +(qi::char_ - '"');
;
qi::rule<std::string::iterator, Application::SettingValue()> ValueRule qi::rule<std::string::iterator, Application::SettingValue()> ValueRule
= qi::bool_ = qi::bool_
| qi::int_ | qi::int_
| StringRule; | StringRule;
auto It = ValueString.begin(); auto It = ValueString.begin();
if (qi::phrase_parse(It, ValueString.end(), ValueRule[boost::phoenix::ref(Value) = _1], ascii::space) 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::SetSetting(args.at(1), Value);
Application::Console().WriteRaw(fmt::format("{} := {}", args.at(1), Application::SettingToString(Application::mSettings.at(args.at(1))))); Application::Console().WriteRaw(fmt::format("{} := {}", args.at(1), Application::SettingToString(Application::mSettings.at(args.at(1)))));
} else { } else {