pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add log aliases to make logging much easier to use (All FMT driven)

Browse Source
This commit is contained in:
Akkadius
2019-09-01 20:47:26 -05:00
parent db5e511af3
commit d3803045bc
41 changed files with 982 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+4 -4
View File
@@ -766,7 +766,7 @@ bool Client::SendAllPackets() {
if(eqs)
eqs->FastQueuePacket((EQApplicationPacket **)&cp->app, cp->ack_req);
clientpackets.pop_front();
Log(Logs::Moderate, Logs::Client_Server_Packet, "Transmitting a packet");
Log(Logs::Moderate, Logs::PacketClientServer, "Transmitting a packet");
}
return true;
}
@@ -814,7 +814,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
char message[4096];
strn0cpy(message, orig_message, sizeof(message));
Log(Logs::Detail, Logs::Zone_Server, "Client::ChannelMessageReceived() Channel:%i message:'%s'", chan_num, message);
Log(Logs::Detail, Logs::ZoneServer, "Client::ChannelMessageReceived() Channel:%i message:'%s'", chan_num, message);
if (targetname == nullptr) {
targetname = (!GetTarget()) ? "" : GetTarget()->GetName();
@@ -1636,7 +1636,7 @@ void Client::UpdateAdmin(bool iFromDB) {
if(m_pp.gm)
{
Log(Logs::Moderate, Logs::Zone_Server, "%s - %s is a GM", __FUNCTION__ , GetName());
Log(Logs::Moderate, Logs::ZoneServer, "%s - %s is a GM", __FUNCTION__ , GetName());
// no need for this, having it set in pp you already start as gm
// and it's also set in your spawn packet so other people see it too
// SendAppearancePacket(AT_GM, 1, false);
@@ -2590,7 +2590,7 @@ void Client::SetPVP(bool toggle, bool message) {
void Client::Kick(const std::string &reason) {
client_state = CLIENT_KICKED;
Log(Logs::General, Logs::Client_Login, "Client [%s] kicked, reason [%s]", GetCleanName(), reason.c_str());
Log(Logs::General, Logs::ClientLogin, "Client [%s] kicked, reason [%s]", GetCleanName(), reason.c_str());
}
void Client::WorldKick() {
zone/client_packet.cpp
+9 -9
View File
@@ -420,14 +420,14 @@ int Client::HandlePacket(const EQApplicationPacket *app)
if (LogSys.log_settings[Logs::LogCategory::Netcode].is_category_enabled == 1) {
char buffer[64];
app->build_header_dump(buffer);
Log(Logs::Detail, Logs::Client_Server_Packet, "Dispatch opcode: %s", buffer);
Log(Logs::Detail, Logs::PacketClientServer, "Dispatch opcode: %s", buffer);
}
if (LogSys.log_settings[Logs::Client_Server_Packet].is_category_enabled == 1)
Log(Logs::General, Logs::Client_Server_Packet, "[%s - 0x%04x] [Size: %u]", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size());
if (LogSys.log_settings[Logs::PacketClientServer].is_category_enabled == 1)
Log(Logs::General, Logs::PacketClientServer, "[%s - 0x%04x] [Size: %u]", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size());
if (LogSys.log_settings[Logs::Client_Server_Packet_With_Dump].is_category_enabled == 1)
Log(Logs::General, Logs::Client_Server_Packet_With_Dump, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size(), DumpPacketToString(app).c_str());
if (LogSys.log_settings[Logs::PacketClientServerWithDump].is_category_enabled == 1)
Log(Logs::General, Logs::PacketClientServerWithDump, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size(), DumpPacketToString(app).c_str());
EmuOpcode opcode = app->GetOpcode();
if (opcode == OP_AckPacket) {
@@ -475,10 +475,10 @@ int Client::HandlePacket(const EQApplicationPacket *app)
args.push_back(const_cast<EQApplicationPacket*>(app));
parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 0, &args);
if (LogSys.log_settings[Logs::Client_Server_Packet_Unhandled].is_category_enabled == 1) {
if (LogSys.log_settings[Logs::PacketClientServerUnhandled].is_category_enabled == 1) {
char buffer[64];
app->build_header_dump(buffer);
Log(Logs::General, Logs::Client_Server_Packet_Unhandled, "%s %s", buffer, DumpPacketToString(app).c_str());
Log(Logs::General, Logs::PacketClientServerUnhandled, "%s %s", buffer, DumpPacketToString(app).c_str());
}
break;
}
@@ -1169,7 +1169,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
*/
Client* client = entity_list.GetClientByName(cze->char_name);
if (!zone->GetAuth(ip, cze->char_name, &WID, &account_id, &character_id, &admin, lskey, &tellsoff)) {
Log(Logs::General, Logs::Client_Login, "%s failed zone auth check.", cze->char_name);
Log(Logs::General, Logs::ClientLogin, "%s failed zone auth check.", cze->char_name);
if (nullptr != client) {
client->Save();
client->Kick("Failed auth check");
@@ -11590,7 +11590,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
client_moved->GetRaid()->SendHPManaEndPacketsTo(client_moved);
client_moved->GetRaid()->SendHPManaEndPacketsFrom(client_moved);
Log(Logs::General, Logs::HP_Update,
Log(Logs::General, Logs::HPUpdate,
"Client::Handle_OP_RaidCommand :: %s sending and recieving HP/Mana/End updates",
client_moved->GetCleanName()
);
zone/client_process.cpp
+1 -1
View File
@@ -559,7 +559,7 @@ bool Client::Process() {
if (client_state != CLIENT_LINKDEAD && !eqs->CheckState(ESTABLISHED)) {
OnDisconnect(true);
Log(Logs::General, Logs::Zone_Server, "Client linkdead: %s", name);
Log(Logs::General, Logs::ZoneServer, "Client linkdead: %s", name);
if (Admin() > 100) {
if (GetMerc()) {
zone/command.cpp
+3 -3
View File
@@ -5819,7 +5819,7 @@ void command_time(Client *c, const Seperator *sep)
}
c->Message(Chat::Red, "Setting world time to %s:%i (Timezone: 0)...", sep->arg[1], minutes);
zone->SetTime(atoi(sep->arg[1])+1, minutes);
Log(Logs::General, Logs::Zone_Server, "%s :: Setting world time to %s:%i (Timezone: 0)...", c->GetCleanName(), sep->arg[1], minutes);
Log(Logs::General, Logs::ZoneServer, "%s :: Setting world time to %s:%i (Timezone: 0)...", c->GetCleanName(), sep->arg[1], minutes);
}
else {
c->Message(Chat::Red, "To set the Time: #time HH [MM]");
@@ -5834,7 +5834,7 @@ void command_time(Client *c, const Seperator *sep)
zone->zone_time.getEQTimeZoneMin()
);
c->Message(Chat::Red, "It is now %s.", timeMessage);
Log(Logs::General, Logs::Zone_Server, "Current Time is: %s", timeMessage);
Log(Logs::General, Logs::ZoneServer, "Current Time is: %s", timeMessage);
}
}
@@ -8523,7 +8523,7 @@ void command_ucs(Client *c, const Seperator *sep)
if (!c)
return;
Log(Logs::Detail, Logs::UCS_Server, "Character %s attempting ucs reconnect while ucs server is %savailable",
Log(Logs::Detail, Logs::UCSServer, "Character %s attempting ucs reconnect while ucs server is %savailable",
c->GetName(), (zone->IsUCSServerAvailable() ? "" : "un"));
if (zone->IsUCSServerAvailable()) {
zone/mob.cpp
+4 -4
View File
@@ -1322,7 +1322,7 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
* This is to prevent excessive packet sending under trains/fast combat
*/
if (this->CastToClient()->hp_self_update_throttle_timer.Check() || force_update_all) {
Log(Logs::General, Logs::HP_Update,
Log(Logs::General, Logs::HPUpdate,
"Mob::SendHPUpdate :: Update HP of self (%s) HP: %i last: %i skip_self: %s",
this->GetCleanName(),
current_hp,
@@ -1356,14 +1356,14 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
int8 current_hp_percent = static_cast<int8>(max_hp == 0 ? 0 : static_cast<int>(current_hp * 100 / max_hp));
Log(Logs::General,
Logs::HP_Update,
Logs::HPUpdate,
"Mob::SendHPUpdate :: SendHPUpdate %s HP is %i last %i",
this->GetCleanName(),
current_hp_percent,
last_hp_percent);
if (current_hp_percent == last_hp_percent && !force_update_all) {
Log(Logs::General, Logs::HP_Update, "Mob::SendHPUpdate :: Same HP - skipping update");
Log(Logs::General, Logs::HPUpdate, "Mob::SendHPUpdate :: Same HP - skipping update");
ResetHPUpdateTimer();
return;
}
@@ -1373,7 +1373,7 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
this->CastToClient()->SendHPUpdateMarquee();
}
Log(Logs::General, Logs::HP_Update, "Mob::SendHPUpdate :: HP Changed - Send update");
Log(Logs::General, Logs::HPUpdate, "Mob::SendHPUpdate :: HP Changed - Send update");
last_hp_percent = current_hp_percent;
}
zone/net.cpp
+33 -33
View File
@@ -145,7 +145,7 @@ int main(int argc, char** argv) {
QServ = new QueryServ;
Log(Logs::General, Logs::Zone_Server, "Loading server configuration..");
Log(Logs::General, Logs::ZoneServer, "Loading server configuration..");
if (!ZoneConfig::LoadConfig()) {
Log(Logs::General, Logs::Error, "Loading server configuration failed.");
return 1;
@@ -225,7 +225,7 @@ int main(int argc, char** argv) {
worldserver.SetLauncherName("NONE");
}
Log(Logs::General, Logs::Zone_Server, "Connecting to MySQL... ");
Log(Logs::General, Logs::ZoneServer, "Connecting to MySQL... ");
if (!database.Connect(
Config->DatabaseHost.c_str(),
Config->DatabaseUsername.c_str(),
@@ -255,7 +255,7 @@ int main(int argc, char** argv) {
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
#endif
Log(Logs::General, Logs::Zone_Server, "CURRENT_VERSION: %s", CURRENT_VERSION);
Log(Logs::General, Logs::ZoneServer, "CURRENT_VERSION: %s", CURRENT_VERSION);
/*
* Setup nice signal handlers
@@ -275,102 +275,102 @@ int main(int argc, char** argv) {
}
#endif
Log(Logs::General, Logs::Zone_Server, "Mapping Incoming Opcodes");
Log(Logs::General, Logs::ZoneServer, "Mapping Incoming Opcodes");
MapOpcodes();
Log(Logs::General, Logs::Zone_Server, "Loading Variables");
Log(Logs::General, Logs::ZoneServer, "Loading Variables");
database.LoadVariables();
std::string hotfix_name;
if (database.GetVariable("hotfix_name", hotfix_name)) {
if (!hotfix_name.empty()) {
Log(Logs::General, Logs::Zone_Server, "Current hotfix in use: '%s'", hotfix_name.c_str());
Log(Logs::General, Logs::ZoneServer, "Current hotfix in use: '%s'", hotfix_name.c_str());
}
}
Log(Logs::General, Logs::Zone_Server, "Loading zone names");
Log(Logs::General, Logs::ZoneServer, "Loading zone names");
database.LoadZoneNames();
Log(Logs::General, Logs::Zone_Server, "Loading items");
Log(Logs::General, Logs::ZoneServer, "Loading items");
if (!database.LoadItems(hotfix_name)) {
Log(Logs::General, Logs::Error, "Loading items FAILED!");
Log(Logs::General, Logs::Error, "Failed. But ignoring error and going on...");
}
Log(Logs::General, Logs::Zone_Server, "Loading npc faction lists");
Log(Logs::General, Logs::ZoneServer, "Loading npc faction lists");
if (!database.LoadNPCFactionLists(hotfix_name)) {
Log(Logs::General, Logs::Error, "Loading npcs faction lists FAILED!");
return 1;
}
Log(Logs::General, Logs::Zone_Server, "Loading loot tables");
Log(Logs::General, Logs::ZoneServer, "Loading loot tables");
if (!database.LoadLoot(hotfix_name)) {
Log(Logs::General, Logs::Error, "Loading loot FAILED!");
return 1;
}
Log(Logs::General, Logs::Zone_Server, "Loading skill caps");
Log(Logs::General, Logs::ZoneServer, "Loading skill caps");
if (!database.LoadSkillCaps(std::string(hotfix_name))) {
Log(Logs::General, Logs::Error, "Loading skill caps FAILED!");
return 1;
}
Log(Logs::General, Logs::Zone_Server, "Loading spells");
Log(Logs::General, Logs::ZoneServer, "Loading spells");
if (!database.LoadSpells(hotfix_name, &SPDAT_RECORDS, &spells)) {
Log(Logs::General, Logs::Error, "Loading spells FAILED!");
return 1;
}
Log(Logs::General, Logs::Zone_Server, "Loading base data");
Log(Logs::General, Logs::ZoneServer, "Loading base data");
if (!database.LoadBaseData(hotfix_name)) {
Log(Logs::General, Logs::Error, "Loading base data FAILED!");
return 1;
}
Log(Logs::General, Logs::Zone_Server, "Loading guilds");
Log(Logs::General, Logs::ZoneServer, "Loading guilds");
guild_mgr.LoadGuilds();
Log(Logs::General, Logs::Zone_Server, "Loading factions");
Log(Logs::General, Logs::ZoneServer, "Loading factions");
database.LoadFactionData();
Log(Logs::General, Logs::Zone_Server, "Loading titles");
Log(Logs::General, Logs::ZoneServer, "Loading titles");
title_manager.LoadTitles();
Log(Logs::General, Logs::Zone_Server, "Loading tributes");
Log(Logs::General, Logs::ZoneServer, "Loading tributes");
database.LoadTributes();
Log(Logs::General, Logs::Zone_Server, "Loading corpse timers");
Log(Logs::General, Logs::ZoneServer, "Loading corpse timers");
database.GetDecayTimes(npcCorpseDecayTimes);
Log(Logs::General, Logs::Zone_Server, "Loading profanity list");
Log(Logs::General, Logs::ZoneServer, "Loading profanity list");
if (!EQEmu::ProfanityManager::LoadProfanityList(&database))
Log(Logs::General, Logs::Error, "Loading profanity list FAILED!");
Log(Logs::General, Logs::Zone_Server, "Loading commands");
Log(Logs::General, Logs::ZoneServer, "Loading commands");
int retval = command_init();
if (retval<0)
Log(Logs::General, Logs::Error, "Command loading FAILED");
else
Log(Logs::General, Logs::Zone_Server, "%d commands loaded", retval);
Log(Logs::General, Logs::ZoneServer, "%d commands loaded", retval);
//rules:
{
std::string tmp;
if (database.GetVariable("RuleSet", tmp)) {
Log(Logs::General, Logs::Zone_Server, "Loading rule set '%s'", tmp.c_str());
Log(Logs::General, Logs::ZoneServer, "Loading rule set '%s'", tmp.c_str());
if (!RuleManager::Instance()->LoadRules(&database, tmp.c_str(), false)) {
Log(Logs::General, Logs::Error, "Failed to load ruleset '%s', falling back to defaults.", tmp.c_str());
}
}
else {
if (!RuleManager::Instance()->LoadRules(&database, "default", false)) {
Log(Logs::General, Logs::Zone_Server, "No rule set configured, using default rules");
Log(Logs::General, Logs::ZoneServer, "No rule set configured, using default rules");
}
else {
Log(Logs::General, Logs::Zone_Server, "Loaded default rule set 'default'", tmp.c_str());
Log(Logs::General, Logs::ZoneServer, "Loaded default rule set 'default'", tmp.c_str());
}
}
EQEmu::InitializeDynamicLookups();
Log(Logs::General, Logs::Zone_Server, "Initialized dynamic dictionary entries");
Log(Logs::General, Logs::ZoneServer, "Initialized dynamic dictionary entries");
}
#ifdef BOTS
@@ -407,7 +407,7 @@ int main(int argc, char** argv) {
#endif
//now we have our parser, load the quests
Log(Logs::General, Logs::Zone_Server, "Loading quests");
Log(Logs::General, Logs::ZoneServer, "Loading quests");
parse->ReloadQuests();
worldserver.Connect();
@@ -420,7 +420,7 @@ int main(int argc, char** argv) {
#endif
#endif
if (!strlen(zone_name) || !strcmp(zone_name, ".")) {
Log(Logs::General, Logs::Zone_Server, "Entering sleep mode");
Log(Logs::General, Logs::ZoneServer, "Entering sleep mode");
}
else if (!Zone::Bootup(database.GetZoneID(zone_name), instance_id, true)) {
Log(Logs::General, Logs::Error, "Zone Bootup failed :: Zone::Bootup");
@@ -464,7 +464,7 @@ int main(int argc, char** argv) {
if (!websocker_server_opened && Config->ZonePort != 0) {
Log(
Logs::General,
Logs::Zone_Server,
Logs::ZoneServer,
"Websocket Server listener started (%s:%u).",
Config->TelnetIP.c_str(),
Config->ZonePort
@@ -478,7 +478,7 @@ int main(int argc, char** argv) {
* EQStreamManager
*/
if (!eqsf_open && Config->ZonePort != 0) {
Log(Logs::General, Logs::Zone_Server, "Starting EQ Network server on port %d", Config->ZonePort);
Log(Logs::General, Logs::ZoneServer, "Starting EQ Network server on port %d", Config->ZonePort);
EQStreamManagerInterfaceOptions opts(Config->ZonePort, false, RuleB(Network, CompressZoneStream));
opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS);
@@ -491,7 +491,7 @@ int main(int argc, char** argv) {
eqsm->OnNewConnection([&stream_identifier](std::shared_ptr<EQ::Net::EQStream> stream) {
stream_identifier.AddStream(stream);
LogF(Logs::Detail, Logs::World_Server, "New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort()));
LogF(Logs::Detail, Logs::WorldServer, "New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort()));
});
}
@@ -503,7 +503,7 @@ int main(int argc, char** argv) {
//now that we know what patch they are running, start up their client object
struct in_addr in;
in.s_addr = eqsi->GetRemoteIP();
Log(Logs::Detail, Logs::World_Server, "New client from %s:%d", inet_ntoa(in), ntohs(eqsi->GetRemotePort()));
Log(Logs::Detail, Logs::WorldServer, "New client from %s:%d", inet_ntoa(in), ntohs(eqsi->GetRemotePort()));
auto client = new Client(eqsi);
entity_list.AddClient(client);
}
@@ -607,7 +607,7 @@ int main(int argc, char** argv) {
bot_command_deinit();
#endif
safe_delete(parse);
Log(Logs::General, Logs::Zone_Server, "Proper zone shutdown complete.");
Log(Logs::General, Logs::ZoneServer, "Proper zone shutdown complete.");
LogSys.CloseFileLogs();
return 0;
}
@@ -623,7 +623,7 @@ void Shutdown()
{
Zone::Shutdown(true);
RunLoops = false;
Log(Logs::General, Logs::Zone_Server, "Shutting down...");
Log(Logs::General, Logs::ZoneServer, "Shutting down...");
LogSys.CloseFileLogs();
}
zone/object.cpp
+1 -1
View File
@@ -473,7 +473,7 @@ void Object::RandomSpawn(bool send_packet) {
}
}
Log(Logs::Detail, Logs::Zone_Server, "Object::RandomSpawn(%s): %d (%.2f, %.2f, %.2f)", m_data.object_name, m_inst->GetID(), m_data.x, m_data.y, m_data.z);
Log(Logs::Detail, Logs::ZoneServer, "Object::RandomSpawn(%s): %d (%.2f, %.2f, %.2f)", m_data.object_name, m_inst->GetID(), m_data.x, m_data.y, m_data.z);
respawn_timer.Disable();
zone/quest_parser_collection.cpp
+1 -1
View File
@@ -1050,7 +1050,7 @@ int QuestParserCollection::DispatchEventSpell(QuestEventID evt, NPC* npc, Client
void QuestParserCollection::LoadPerlEventExportSettings(PerlEventExportSettings* perl_event_export_settings) {
Log(Logs::General, Logs::Zone_Server, "Loading Perl Event Export Settings...");
Log(Logs::General, Logs::ZoneServer, "Loading Perl Event Export Settings...");
/* Write Defaults First (All Enabled) */
for (int i = 0; i < _LargestEventID; i++){
zone/worldserver.cpp
+10 -10
View File
@@ -191,7 +191,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (pack->size != sizeof(ServerConnectInfo))
break;
ServerConnectInfo* sci = (ServerConnectInfo*)pack->pBuffer;
Log(Logs::Detail, Logs::Zone_Server, "World assigned Port: %d for this zone.", sci->port);
Log(Logs::Detail, Logs::ZoneServer, "World assigned Port: %d for this zone.", sci->port);
ZoneConfig::SetZonePort(sci->port);
break;
}
@@ -794,7 +794,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
}
case ServerOP_SyncWorldTime: {
if (zone != 0 && !zone->is_zone_time_localized) {
Log(Logs::Moderate, Logs::Zone_Server, "%s Received Message SyncWorldTime", __FUNCTION__);
Log(Logs::Moderate, Logs::ZoneServer, "%s Received Message SyncWorldTime", __FUNCTION__);
eqTimeOfDay* newtime = (eqTimeOfDay*)pack->pBuffer;
zone->zone_time.SetCurrentEQTimeOfDay(newtime->start_eqtime, newtime->start_realtime);
@@ -816,12 +816,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
(eq_time.hour >= 13) ? "pm" : "am"
);
Log(Logs::General, Logs::Zone_Server, "Time Broadcast Packet: %s", time_message);
Log(Logs::General, Logs::ZoneServer, "Time Broadcast Packet: %s", time_message);
zone->SetZoneHasCurrentTime(true);
}
if (zone && zone->is_zone_time_localized) {
Log(Logs::General, Logs::Zone_Server, "Received request to sync time from world, but our time is localized currently");
Log(Logs::General, Logs::ZoneServer, "Received request to sync time from world, but our time is localized currently");
}
break;
}
@@ -1942,32 +1942,32 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
case ServerOP_ChangeSharedMem:
{
std::string hotfix_name = std::string((char*)pack->pBuffer);
Log(Logs::General, Logs::Zone_Server, "Loading items");
Log(Logs::General, Logs::ZoneServer, "Loading items");
if (!database.LoadItems(hotfix_name)) {
Log(Logs::General, Logs::Error, "Loading items FAILED!");
}
Log(Logs::General, Logs::Zone_Server, "Loading npc faction lists");
Log(Logs::General, Logs::ZoneServer, "Loading npc faction lists");
if (!database.LoadNPCFactionLists(hotfix_name)) {
Log(Logs::General, Logs::Error, "Loading npcs faction lists FAILED!");
}
Log(Logs::General, Logs::Zone_Server, "Loading loot tables");
Log(Logs::General, Logs::ZoneServer, "Loading loot tables");
if (!database.LoadLoot(hotfix_name)) {
Log(Logs::General, Logs::Error, "Loading loot FAILED!");
}
Log(Logs::General, Logs::Zone_Server, "Loading skill caps");
Log(Logs::General, Logs::ZoneServer, "Loading skill caps");
if (!database.LoadSkillCaps(std::string(hotfix_name))) {
Log(Logs::General, Logs::Error, "Loading skill caps FAILED!");
}
Log(Logs::General, Logs::Zone_Server, "Loading spells");
Log(Logs::General, Logs::ZoneServer, "Loading spells");
if (!database.LoadSpells(hotfix_name, &SPDAT_RECORDS, &spells)) {
Log(Logs::General, Logs::Error, "Loading spells FAILED!");
}
Log(Logs::General, Logs::Zone_Server, "Loading base data");
Log(Logs::General, Logs::ZoneServer, "Loading base data");
if (!database.LoadBaseData(hotfix_name)) {
Log(Logs::General, Logs::Error, "Loading base data FAILED!");
}
zone/zone.cpp
+4 -4
View File
@@ -1459,10 +1459,10 @@ void Zone::StartShutdownTimer(uint32 set_time) {
set_time = static_cast<uint32>(database.getZoneShutDownDelay(GetZoneID(), GetInstanceVersion()));
}
autoshutdown_timer.SetTimer(set_time);
Log(Logs::General, Logs::Zone_Server, "Zone::StartShutdownTimer set to %u", set_time);
Log(Logs::General, Logs::ZoneServer, "Zone::StartShutdownTimer set to %u", set_time);
}
Log(Logs::Detail, Logs::Zone_Server,
Log(Logs::Detail, Logs::ZoneServer,
"Zone::StartShutdownTimer trigger - set_time: %u remaining_time: %u diff: %i",
set_time,
autoshutdown_timer.GetRemainingTime(),
@@ -1606,7 +1606,7 @@ void Zone::SetTime(uint8 hour, uint8 minute, bool update_world /*= true*/)
/* By Default we update worlds time, but we can optionally no update world which updates the rest of the zone servers */
if (update_world){
Log(Logs::General, Logs::Zone_Server, "Setting master time on world server to: %d:%d (%d)\n", hour, minute, (int)eq_time_of_day->start_realtime);
Log(Logs::General, Logs::ZoneServer, "Setting master time on world server to: %d:%d (%d)\n", hour, minute, (int)eq_time_of_day->start_realtime);
worldserver.SendPacket(pack);
/* Set Time Localization Flag */
@@ -1615,7 +1615,7 @@ void Zone::SetTime(uint8 hour, uint8 minute, bool update_world /*= true*/)
/* When we don't update world, we are localizing ourselves, we become disjointed from normal syncs and set time locally */
else{
Log(Logs::General, Logs::Zone_Server, "Setting zone localized time...");
Log(Logs::General, Logs::ZoneServer, "Setting zone localized time...");
zone->zone_time.SetCurrentEQTimeOfDay(eq_time_of_day->start_eqtime, eq_time_of_day->start_realtime);
auto outapp = new EQApplicationPacket(OP_TimeOfDay, sizeof(TimeOfDay_Struct));