mirror of
https://github.com/BeamMP/BeamMP-Server.git
synced 2026-10-26 22:10:06 +00:00
Potential fix for compiler issues on Ubuntu
Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
This commit is contained in:
1 file changed
+6
-6
+6
-6
@@ -404,7 +404,7 @@ void TConsole::Command_Settings(const std::string&, const std::vector<std::strin
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(ComposedKey(args.at(1), args.at(2)));
|
Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(ComposedKey{args.at(1), args.at(2)});
|
||||||
Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
|
Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
|
||||||
|
|
||||||
std::visit(
|
std::visit(
|
||||||
@@ -436,26 +436,26 @@ void TConsole::Command_Settings(const std::string&, const std::vector<std::strin
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(ComposedKey(args.at(1), args.at(2)));
|
Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(ComposedKey{args.at(1), args.at(2)});
|
||||||
Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
|
Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
|
||||||
|
|
||||||
std::visit(
|
std::visit(
|
||||||
overloaded {
|
overloaded {
|
||||||
[&args](std::string keyValue) {
|
[&args](std::string keyValue) {
|
||||||
Application::Settings.setConsoleInputAccessMapping(ComposedKey(args.at(1), args.at(2)), std::string(args.at(3)));
|
Application::Settings.setConsoleInputAccessMapping(ComposedKey{args.at(1), args.at(2)}, std::string(args.at(3)));
|
||||||
Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), std::string(args.at(3))));
|
Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), std::string(args.at(3))));
|
||||||
},
|
},
|
||||||
[&args](int keyValue) {
|
[&args](int keyValue) {
|
||||||
Application::Settings.setConsoleInputAccessMapping(ComposedKey(args.at(1), args.at(2)), std::stoi(args.at(3)));
|
Application::Settings.setConsoleInputAccessMapping(ComposedKey{args.at(1), args.at(2)}, std::stoi(args.at(3)));
|
||||||
Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), std::stoi(args.at(3))));
|
Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), std::stoi(args.at(3))));
|
||||||
},
|
},
|
||||||
[&args](bool keyValue) {
|
[&args](bool keyValue) {
|
||||||
// todo: implement other way to convert from string to bool
|
// todo: implement other way to convert from string to bool
|
||||||
if (args.at(3) == "true") {
|
if (args.at(3) == "true") {
|
||||||
Application::Settings.setConsoleInputAccessMapping(ComposedKey(args.at(1), args.at(2)), true);
|
Application::Settings.setConsoleInputAccessMapping(ComposedKey{args.at(1), args.at(2)}, true);
|
||||||
Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), "true"));
|
Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), "true"));
|
||||||
} else if (args.at(3) == "false") {
|
} else if (args.at(3) == "false") {
|
||||||
Application::Settings.setConsoleInputAccessMapping(ComposedKey(args.at(1), args.at(2)), false);
|
Application::Settings.setConsoleInputAccessMapping(ComposedKey{args.at(1), args.at(2)}, false);
|
||||||
Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), "false"));
|
Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), "false"));
|
||||||
} else {
|
} else {
|
||||||
beammp_errorf("Error when setting key: {}::{} : Unknown literal, use either 'true', or 'false' to set boolean values.", args.at(1), args.at(2));
|
beammp_errorf("Error when setting key: {}::{} : Unknown literal, use either 'true', or 'false' to set boolean values.", args.at(1), args.at(2));
|
||||||
|
|||||||
Reference in new issue
Block a user