pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-21 23:08:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] EQEmuLogSys Global to Singleton Cleanup

Browse Source
This commit is contained in:
Chris Miles
2025-06-20 19:27:54 -05:00
parent 1be7e56b86
commit 1a662abaef
47 changed files with 503 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/logs.cpp
+9 -9
View File
@@ -76,7 +76,7 @@ void command_logs(Client *c, const Seperator *sep)
std::vector<std::string> gmsay;
for (int i = 0; i <= 2; i++) {
if (LogSys.log_settings[index].log_to_gmsay == i) {
if (EQEmuLogSys::Instance()->log_settings[index].log_to_gmsay == i) {
gmsay.emplace_back(std::to_string(i));
continue;
}
@@ -90,7 +90,7 @@ void command_logs(Client *c, const Seperator *sep)
std::vector<std::string> file;
for (int i = 0; i <= 2; i++) {
if (LogSys.log_settings[index].log_to_file == i) {
if (EQEmuLogSys::Instance()->log_settings[index].log_to_file == i) {
file.emplace_back(std::to_string(i));
continue;
}
@@ -104,7 +104,7 @@ void command_logs(Client *c, const Seperator *sep)
std::vector<std::string> console;
for (int i = 0; i <= 2; i++) {
if (LogSys.log_settings[index].log_to_console == i) {
if (EQEmuLogSys::Instance()->log_settings[index].log_to_console == i) {
console.emplace_back(std::to_string(i));
continue;
}
@@ -118,7 +118,7 @@ void command_logs(Client *c, const Seperator *sep)
std::vector<std::string> discord;
for (int i = 0; i <= 2; i++) {
if (LogSys.log_settings[index].log_to_discord == i) {
if (EQEmuLogSys::Instance()->log_settings[index].log_to_discord == i) {
discord.emplace_back(std::to_string(i));
continue;
}
@@ -206,16 +206,16 @@ void command_logs(Client *c, const Seperator *sep)
auto setting = Strings::ToUnsignedInt(sep->arg[4]);
if (is_console) {
LogSys.log_settings[category_id].log_to_console = setting;
EQEmuLogSys::Instance()->log_settings[category_id].log_to_console = setting;
}
else if (is_file) {
LogSys.log_settings[category_id].log_to_file = setting;
EQEmuLogSys::Instance()->log_settings[category_id].log_to_file = setting;
}
else if (is_gmsay) {
LogSys.log_settings[category_id].log_to_gmsay = setting;
EQEmuLogSys::Instance()->log_settings[category_id].log_to_gmsay = setting;
}
else if (is_discord) {
LogSys.log_settings[category_id].log_to_discord = setting;
EQEmuLogSys::Instance()->log_settings[category_id].log_to_discord = setting;
}
if (logs_set) {
@@ -231,7 +231,7 @@ void command_logs(Client *c, const Seperator *sep)
);
}
LogSys.log_settings[category_id].is_category_enabled = setting ? 1 : 0;
EQEmuLogSys::Instance()->log_settings[category_id].is_category_enabled = setting ? 1 : 0;
}
}
zone/gm_commands/lootsim.cpp
+4 -4
View File
@@ -14,9 +14,9 @@ void command_lootsim(Client *c, const Seperator *sep)
auto log_enabled = arguments > 3 ? Strings::ToUnsignedInt(sep->arg[4]) : false;
// temporarily disable loot logging unless set explicitly
LogSys.log_settings[Logs::Loot].log_to_console = log_enabled ? LogSys.log_settings[Logs::Loot].log_to_console : 0;
LogSys.log_settings[Logs::Loot].log_to_file = log_enabled ? LogSys.log_settings[Logs::Loot].log_to_file : 0;
LogSys.log_settings[Logs::Loot].log_to_gmsay = log_enabled ? LogSys.log_settings[Logs::Loot].log_to_gmsay : 0;
EQEmuLogSys::Instance()->log_settings[Logs::Loot].log_to_console = log_enabled ? EQEmuLogSys::Instance()->log_settings[Logs::Loot].log_to_console : 0;
EQEmuLogSys::Instance()->log_settings[Logs::Loot].log_to_file = log_enabled ? EQEmuLogSys::Instance()->log_settings[Logs::Loot].log_to_file : 0;
EQEmuLogSys::Instance()->log_settings[Logs::Loot].log_to_gmsay = log_enabled ? EQEmuLogSys::Instance()->log_settings[Logs::Loot].log_to_gmsay : 0;
auto npc_type = content_db.LoadNPCTypesData(npc_id);
if (npc_type) {
@@ -182,7 +182,7 @@ void command_lootsim(Client *c, const Seperator *sep)
);
c->SendChatLineBreak();
LogSys.LoadLogDatabaseSettings();
EQEmuLogSys::Instance()->LoadLogDatabaseSettings();
}
}
else {