pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-02 14:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consolidate 'LogType' Quest logs over to 'LogCategory'

Browse Source
This commit is contained in:
Akkadius 2015-01-18 01:32:57 -06:00
parent ec7fd9b4e7
commit 40d0fba63f
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/embperl.cpp
View File

@ -140,12 +140,12 @@ void Embperl::DoInit() {
catch(const char *err) catch(const char *err)
{ {
//remember... lasterr() is no good if we crap out here, in construction //remember... lasterr() is no good if we crap out here, in construction
Log.Log(EQEmuLogSys::Quest, "perl error: %s", err); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "perl error: %s", err);
throw "failed to install eval_file hook"; throw "failed to install eval_file hook";
} }
#ifdef EMBPERL_IO_CAPTURE #ifdef EMBPERL_IO_CAPTURE
Log.Log(EQEmuLogSys::Quest, "Tying perl output to eqemu logs"); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "Tying perl output to eqemu logs");
//make a tieable class to capture IO and pass it into EQEMuLog //make a tieable class to capture IO and pass it into EQEMuLog
eval_pv( eval_pv(
"package EQEmuIO; " "package EQEmuIO; "
@ -170,14 +170,14 @@ void Embperl::DoInit() {
,FALSE ,FALSE
); );
Log.Log(EQEmuLogSys::Quest, "Loading perlemb plugins."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "Loading perlemb plugins.");
try try
{ {
eval_pv("main::eval_file('plugin', 'plugin.pl');", FALSE); eval_pv("main::eval_file('plugin', 'plugin.pl');", FALSE);
} }
catch(const char *err) catch(const char *err)
{ {
Log.Log(EQEmuLogSys::Quest, "Warning - plugin.pl: %s", err); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "Warning - plugin.pl: %s", err);
} }
try try
{ {
@ -195,7 +195,7 @@ void Embperl::DoInit() {
} }
catch(const char *err) catch(const char *err)
{ {
Log.Log(EQEmuLogSys::Quest, "Perl warning: %s", err); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "Perl warning: %s", err);
} }
#endif //EMBPERL_PLUGIN #endif //EMBPERL_PLUGIN
in_use = false; in_use = false;

24
zone/questmgr.cpp
View File

@ -154,7 +154,7 @@ void QuestManager::echo(int colour, const char *str) {
void QuestManager::say(const char *str) { void QuestManager::say(const char *str) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (!owner) { if (!owner) {
Log.Log(EQEmuLogSys::Quest, "QuestManager::say called with nullptr owner. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::say called with nullptr owner. Probably syntax error in quest file.");
return; return;
} }
else { else {
@ -170,7 +170,7 @@ void QuestManager::say(const char *str) {
void QuestManager::say(const char *str, uint8 language) { void QuestManager::say(const char *str, uint8 language) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (!owner) { if (!owner) {
Log.Log(EQEmuLogSys::Quest, "QuestManager::say called with nullptr owner. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::say called with nullptr owner. Probably syntax error in quest file.");
return; return;
} }
else { else {
@ -548,7 +548,7 @@ void QuestManager::stopalltimers(Mob *mob) {
void QuestManager::emote(const char *str) { void QuestManager::emote(const char *str) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (!owner) { if (!owner) {
Log.Log(EQEmuLogSys::Quest, "QuestManager::emote called with nullptr owner. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::emote called with nullptr owner. Probably syntax error in quest file.");
return; return;
} }
else { else {
@ -559,7 +559,7 @@ void QuestManager::emote(const char *str) {
void QuestManager::shout(const char *str) { void QuestManager::shout(const char *str) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (!owner) { if (!owner) {
Log.Log(EQEmuLogSys::Quest, "QuestManager::shout called with nullptr owner. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::shout called with nullptr owner. Probably syntax error in quest file.");
return; return;
} }
else { else {
@ -570,7 +570,7 @@ void QuestManager::shout(const char *str) {
void QuestManager::shout2(const char *str) { void QuestManager::shout2(const char *str) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (!owner) { if (!owner) {
Log.Log(EQEmuLogSys::Quest, "QuestManager::shout2 called with nullptr owner. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::shout2 called with nullptr owner. Probably syntax error in quest file.");
return; return;
} }
else { else {
@ -589,7 +589,7 @@ void QuestManager::gmsay(const char *str, uint32 color, bool send_to_world, uint
void QuestManager::depop(int npc_type) { void QuestManager::depop(int npc_type) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (!owner || !owner->IsNPC()) { if (!owner || !owner->IsNPC()) {
Log.Log(EQEmuLogSys::Quest, "QuestManager::depop called with nullptr owner or non-NPC owner. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::depop called with nullptr owner or non-NPC owner. Probably syntax error in quest file.");
return; return;
} }
else { else {
@ -619,7 +619,7 @@ void QuestManager::depop(int npc_type) {
void QuestManager::depop_withtimer(int npc_type) { void QuestManager::depop_withtimer(int npc_type) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (!owner || !owner->IsNPC()) { if (!owner || !owner->IsNPC()) {
Log.Log(EQEmuLogSys::Quest, "QuestManager::depop_withtimer called with nullptr owner or non-NPC owner. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::depop_withtimer called with nullptr owner or non-NPC owner. Probably syntax error in quest file.");
return; return;
} }
else { else {
@ -646,7 +646,7 @@ void QuestManager::depopall(int npc_type) {
entity_list.DepopAll(npc_type); entity_list.DepopAll(npc_type);
} }
else { else {
Log.Log(EQEmuLogSys::Quest, "QuestManager::depopall called with nullptr owner, non-NPC owner, or invalid NPC Type ID. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::depopall called with nullptr owner, non-NPC owner, or invalid NPC Type ID. Probably syntax error in quest file.");
} }
} }
@ -655,7 +655,7 @@ void QuestManager::depopzone(bool StartSpawnTimer) {
zone->Depop(StartSpawnTimer); zone->Depop(StartSpawnTimer);
} }
else { else {
Log.Log(EQEmuLogSys::Quest, "QuestManager::depopzone called with nullptr zone. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::depopzone called with nullptr zone. Probably syntax error in quest file.");
} }
} }
@ -664,7 +664,7 @@ void QuestManager::repopzone() {
zone->Repop(); zone->Repop();
} }
else { else {
Log.Log(EQEmuLogSys::Quest, "QuestManager::repopzone called with nullptr zone. Probably syntax error in quest file."); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::repopzone called with nullptr zone. Probably syntax error in quest file.");
} }
} }
@ -1652,7 +1652,7 @@ void QuestManager::showgrid(int grid) {
"ORDER BY `number`", grid, zone->GetZoneID()); "ORDER BY `number`", grid, zone->GetZoneID());
auto results = database.QueryDatabase(query); auto results = database.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
Log.Log(EQEmuLogSys::Quest, "Error loading grid %d for showgrid(): %s", grid, results.ErrorMessage().c_str()); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "Error loading grid %d for showgrid(): %s", grid, results.ErrorMessage().c_str());
return; return;
} }
@ -2809,7 +2809,7 @@ void QuestManager::voicetell(const char *str, int macronum, int racenum, int gen
safe_delete(outapp); safe_delete(outapp);
} }
else else
Log.Log(EQEmuLogSys::Quest, "QuestManager::voicetell from %s. Client %s not found.", owner->GetName(), str); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Quests, "QuestManager::voicetell from %s. Client %s not found.", owner->GetName(), str);
} }
} }