pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consolidate 'LogType' Normal logs over to 'LogCategory'

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

2
zone/bot.cpp
View File

@ -7028,7 +7028,7 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel
return 0; return 0;
break; break;
default: default:
Log.Log(EQEmuLogSys::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]);
} }
break; break;

4
zone/client.cpp
View File

@ -1911,7 +1911,7 @@ void Client::ReadBook(BookRequest_Struct *book) {
if (booktxt2[0] != '\0') { if (booktxt2[0] != '\0') {
#if EQDEBUG >= 6 #if EQDEBUG >= 6
Log.Log(EQEmuLogSys::Normal, "Client::ReadBook() textfile:%s Text:%s", txtfile, booktxt2.c_str()); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Client::ReadBook() textfile:%s Text:%s", txtfile, booktxt2.c_str());
#endif #endif
EQApplicationPacket* outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct)); EQApplicationPacket* outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct));
@ -2364,7 +2364,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(SkillUseTypes skillid, uint16
Save(); Save();
Log.Log(EQEmuLogSys::Normal, "Reset %s's caster specialization skills to 1. " Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Reset %s's caster specialization skills to 1. "
"Too many specializations skills were above 50.", GetCleanName()); "Too many specializations skills were above 50.", GetCleanName());
} }

34
zone/command.cpp
View File

@ -1292,7 +1292,7 @@ void command_viewpetition(Client *c, const Seperator *sep)
if (!results.Success()) if (!results.Success())
return; return;
Log.Log(EQEmuLogSys::Normal, "View petition request from %s, petition number: %i", c->GetName(), atoi(sep->argplus[1]) ); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "View petition request from %s, petition number: %i", c->GetName(), atoi(sep->argplus[1]) );
if (results.RowCount() == 0) { if (results.RowCount() == 0) {
c->Message(13,"There was an error in your request: ID not found! Please check the Id and try again."); c->Message(13,"There was an error in your request: ID not found! Please check the Id and try again.");
@ -1317,7 +1317,7 @@ void command_petitioninfo(Client *c, const Seperator *sep)
if (!results.Success()) if (!results.Success())
return; return;
Log.Log(EQEmuLogSys::Normal, "Petition information request from %s, petition number:", c->GetName(), atoi(sep->argplus[1]) ); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Petition information request from %s, petition number:", c->GetName(), atoi(sep->argplus[1]) );
if (results.RowCount() == 0) { if (results.RowCount() == 0) {
c->Message(13,"There was an error in your request: ID not found! Please check the Id and try again."); c->Message(13,"There was an error in your request: ID not found! Please check the Id and try again.");
@ -1343,7 +1343,7 @@ void command_delpetition(Client *c, const Seperator *sep)
if (!results.Success()) if (!results.Success())
return; return;
Log.Log(EQEmuLogSys::Normal, "Delete petition request from %s, petition number:", c->GetName(), atoi(sep->argplus[1]) ); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Delete petition request from %s, petition number:", c->GetName(), atoi(sep->argplus[1]) );
} }
@ -1566,7 +1566,7 @@ void command_permaclass(Client *c, const Seperator *sep)
c->Message(0,"Target is not a client."); c->Message(0,"Target is not a client.");
else { else {
c->Message(0, "Setting %s's class...Sending to char select.", t->GetName()); c->Message(0, "Setting %s's class...Sending to char select.", t->GetName());
Log.Log(EQEmuLogSys::Normal, "Class change request from %s for %s, requested class:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) ); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Class change request from %s for %s, requested class:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) );
t->SetBaseClass(atoi(sep->arg[1])); t->SetBaseClass(atoi(sep->arg[1]));
t->Save(); t->Save();
t->Kick(); t->Kick();
@ -1588,7 +1588,7 @@ void command_permarace(Client *c, const Seperator *sep)
c->Message(0,"Target is not a client."); c->Message(0,"Target is not a client.");
else { else {
c->Message(0, "Setting %s's race - zone to take effect",t->GetName()); c->Message(0, "Setting %s's race - zone to take effect",t->GetName());
Log.Log(EQEmuLogSys::Normal, "Permanant race change request from %s for %s, requested race:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) ); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Permanant race change request from %s for %s, requested race:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) );
uint32 tmp = Mob::GetDefaultGender(atoi(sep->arg[1]), t->GetBaseGender()); uint32 tmp = Mob::GetDefaultGender(atoi(sep->arg[1]), t->GetBaseGender());
t->SetBaseRace(atoi(sep->arg[1])); t->SetBaseRace(atoi(sep->arg[1]));
t->SetBaseGender(tmp); t->SetBaseGender(tmp);
@ -1612,7 +1612,7 @@ void command_permagender(Client *c, const Seperator *sep)
c->Message(0,"Target is not a client."); c->Message(0,"Target is not a client.");
else { else {
c->Message(0, "Setting %s's gender - zone to take effect",t->GetName()); c->Message(0, "Setting %s's gender - zone to take effect",t->GetName());
Log.Log(EQEmuLogSys::Normal, "Permanant gender change request from %s for %s, requested gender:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) ); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Permanant gender change request from %s for %s, requested gender:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) );
t->SetBaseGender(atoi(sep->arg[1])); t->SetBaseGender(atoi(sep->arg[1]));
t->Save(); t->Save();
t->SendIllusionPacket(atoi(sep->arg[1])); t->SendIllusionPacket(atoi(sep->arg[1]));
@ -1954,7 +1954,7 @@ void command_dbspawn2(Client *c, const Seperator *sep)
{ {
if (sep->IsNumber(1) && sep->IsNumber(2) && sep->IsNumber(3)) { if (sep->IsNumber(1) && sep->IsNumber(2) && sep->IsNumber(3)) {
Log.Log(EQEmuLogSys::Normal, "Spawning database spawn"); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Spawning database spawn");
uint16 cond = 0; uint16 cond = 0;
int16 cond_min = 0; int16 cond_min = 0;
if(sep->IsNumber(4)) { if(sep->IsNumber(4)) {
@ -2274,7 +2274,7 @@ void command_setlanguage(Client *c, const Seperator *sep)
} }
else else
{ {
Log.Log(EQEmuLogSys::Normal, "Set language request from %s, target:%s lang_id:%i value:%i", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) ); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Set language request from %s, target:%s lang_id:%i value:%i", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) );
uint8 langid = (uint8)atoi(sep->arg[1]); uint8 langid = (uint8)atoi(sep->arg[1]);
uint8 value = (uint8)atoi(sep->arg[2]); uint8 value = (uint8)atoi(sep->arg[2]);
c->GetTarget()->CastToClient()->SetLanguageSkill( langid, value ); c->GetTarget()->CastToClient()->SetLanguageSkill( langid, value );
@ -2299,7 +2299,7 @@ void command_setskill(Client *c, const Seperator *sep)
c->Message(0, " x = 0 to %d", HIGHEST_CAN_SET_SKILL); c->Message(0, " x = 0 to %d", HIGHEST_CAN_SET_SKILL);
} }
else { else {
Log.Log(EQEmuLogSys::Normal, "Set skill request from %s, target:%s skill_id:%i value:%i", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) ); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Set skill request from %s, target:%s skill_id:%i value:%i", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) );
int skill_num = atoi(sep->arg[1]); int skill_num = atoi(sep->arg[1]);
uint16 skill_value = atoi(sep->arg[2]); uint16 skill_value = atoi(sep->arg[2]);
if(skill_num < HIGHEST_SKILL) if(skill_num < HIGHEST_SKILL)
@ -2319,7 +2319,7 @@ void command_setskillall(Client *c, const Seperator *sep)
} }
else { else {
if (c->Admin() >= commandSetSkillsOther || c->GetTarget()==c || c->GetTarget()==0) { if (c->Admin() >= commandSetSkillsOther || c->GetTarget()==c || c->GetTarget()==0) {
Log.Log(EQEmuLogSys::Normal, "Set ALL skill request from %s, target:%s", c->GetName(), c->GetTarget()->GetName()); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Set ALL skill request from %s, target:%s", c->GetName(), c->GetTarget()->GetName());
uint16 level = atoi(sep->arg[1]); uint16 level = atoi(sep->arg[1]);
for(SkillUseTypes skill_num=Skill1HBlunt;skill_num <= HIGHEST_SKILL;skill_num=(SkillUseTypes)(skill_num+1)) { for(SkillUseTypes skill_num=Skill1HBlunt;skill_num <= HIGHEST_SKILL;skill_num=(SkillUseTypes)(skill_num+1)) {
c->GetTarget()->CastToClient()->SetSkill(skill_num, level); c->GetTarget()->CastToClient()->SetSkill(skill_num, level);
@ -3114,7 +3114,7 @@ void command_listpetition(Client *c, const Seperator *sep)
if (!results.Success()) if (!results.Success())
return; return;
Log.Log(EQEmuLogSys::Normal, "Petition list requested by %s", c->GetName()); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Petition list requested by %s", c->GetName());
if (results.RowCount() == 0) if (results.RowCount() == 0)
return; return;
@ -3771,7 +3771,7 @@ void command_lastname(Client *c, const Seperator *sep)
if(c->GetTarget() && c->GetTarget()->IsClient()) if(c->GetTarget() && c->GetTarget()->IsClient())
t=c->GetTarget()->CastToClient(); t=c->GetTarget()->CastToClient();
Log.Log(EQEmuLogSys::Normal, "#lastname request from %s for %s", c->GetName(), t->GetName()); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "#lastname request from %s for %s", c->GetName(), t->GetName());
if(strlen(sep->arg[1]) <= 70) if(strlen(sep->arg[1]) <= 70)
t->ChangeLastName(sep->arg[1]); t->ChangeLastName(sep->arg[1]);
@ -4869,7 +4869,7 @@ void command_manaburn(Client *c, const Seperator *sep)
target->Damage(c, nukedmg, 2751, SkillAbjuration/*hackish*/); target->Damage(c, nukedmg, 2751, SkillAbjuration/*hackish*/);
c->Message(4,"You unleash an enormous blast of magical energies."); c->Message(4,"You unleash an enormous blast of magical energies.");
} }
Log.Log(EQEmuLogSys::Normal, "Manaburn request from %s, damage: %d", c->GetName(), nukedmg); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Manaburn request from %s, damage: %d", c->GetName(), nukedmg);
} }
} }
else else
@ -5221,7 +5221,7 @@ void command_scribespells(Client *c, const Seperator *sep)
t->Message(0, "Scribing spells to spellbook."); t->Message(0, "Scribing spells to spellbook.");
if(t != c) if(t != c)
c->Message(0, "Scribing spells for %s.", t->GetName()); c->Message(0, "Scribing spells for %s.", t->GetName());
Log.Log(EQEmuLogSys::Normal, "Scribe spells request for %s from %s, levels: %u -> %u", t->GetName(), c->GetName(), min_level, max_level); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Scribe spells request for %s from %s, levels: %u -> %u", t->GetName(), c->GetName(), min_level, max_level);
for(curspell = 0, book_slot = t->GetNextAvailableSpellBookSlot(), count = 0; curspell < SPDAT_RECORDS && book_slot < MAX_PP_SPELLBOOK; curspell++, book_slot = t->GetNextAvailableSpellBookSlot(book_slot)) for(curspell = 0, book_slot = t->GetNextAvailableSpellBookSlot(), count = 0; curspell < SPDAT_RECORDS && book_slot < MAX_PP_SPELLBOOK; curspell++, book_slot = t->GetNextAvailableSpellBookSlot(book_slot))
{ {
@ -5278,7 +5278,7 @@ void command_scribespell(Client *c, const Seperator *sep) {
if(t != c) if(t != c)
c->Message(0, "Scribing spell: %s (%i) for %s.", spells[spell_id].name, spell_id, t->GetName()); c->Message(0, "Scribing spell: %s (%i) for %s.", spells[spell_id].name, spell_id, t->GetName());
Log.Log(EQEmuLogSys::Normal, "Scribe spell: %s (%i) request for %s from %s.", spells[spell_id].name, spell_id, t->GetName(), c->GetName()); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Scribe spell: %s (%i) request for %s from %s.", spells[spell_id].name, spell_id, t->GetName(), c->GetName());
if (spells[spell_id].classes[WARRIOR] != 0 && spells[spell_id].skill != 52 && spells[spell_id].classes[t->GetPP().class_ - 1] > 0 && !IsDiscipline(spell_id)) { if (spells[spell_id].classes[WARRIOR] != 0 && spells[spell_id].skill != 52 && spells[spell_id].classes[t->GetPP().class_ - 1] > 0 && !IsDiscipline(spell_id)) {
book_slot = t->GetNextAvailableSpellBookSlot(); book_slot = t->GetNextAvailableSpellBookSlot();
@ -5325,7 +5325,7 @@ void command_unscribespell(Client *c, const Seperator *sep) {
if(t != c) if(t != c)
c->Message(0, "Unscribing spell: %s (%i) for %s.", spells[spell_id].name, spell_id, t->GetName()); c->Message(0, "Unscribing spell: %s (%i) for %s.", spells[spell_id].name, spell_id, t->GetName());
Log.Log(EQEmuLogSys::Normal, "Unscribe spell: %s (%i) request for %s from %s.", spells[spell_id].name, spell_id, t->GetName(), c->GetName()); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Unscribe spell: %s (%i) request for %s from %s.", spells[spell_id].name, spell_id, t->GetName(), c->GetName());
} }
else { else {
t->Message(13, "Unable to unscribe spell: %s (%i) from your spellbook. This spell is not scribed.", spells[spell_id].name, spell_id); t->Message(13, "Unable to unscribe spell: %s (%i) from your spellbook. This spell is not scribed.", spells[spell_id].name, spell_id);
@ -7862,7 +7862,7 @@ void command_traindisc(Client *c, const Seperator *sep)
t->Message(0, "Training disciplines"); t->Message(0, "Training disciplines");
if(t != c) if(t != c)
c->Message(0, "Training disciplines for %s.", t->GetName()); c->Message(0, "Training disciplines for %s.", t->GetName());
Log.Log(EQEmuLogSys::Normal, "Train disciplines request for %s from %s, levels: %u -> %u", t->GetName(), c->GetName(), min_level, max_level); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Train disciplines request for %s from %s, levels: %u -> %u", t->GetName(), c->GetName(), min_level, max_level);
for(curspell = 0, count = 0; curspell < SPDAT_RECORDS; curspell++) for(curspell = 0, count = 0; curspell < SPDAT_RECORDS; curspell++)
{ {

2
zone/exp.cpp
View File

@ -488,7 +488,7 @@ void Client::SetLevel(uint8 set_level, bool command)
safe_delete(outapp); safe_delete(outapp);
this->SendAppearancePacket(AT_WhoLevel, set_level); // who level change this->SendAppearancePacket(AT_WhoLevel, set_level); // who level change
Log.Log(EQEmuLogSys::Normal, "Setting Level for %s to %i", GetName(), set_level); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Setting Level for %s to %i", GetName(), set_level);
CalcBonuses(); CalcBonuses();

2
zone/npc.cpp
View File

@ -1672,7 +1672,7 @@ void Mob::NPCSpecialAttacks(const char* parse, int permtag, bool reset, bool rem
{ {
if(database.SetSpecialAttkFlag(this->GetNPCTypeID(), orig_parse)) if(database.SetSpecialAttkFlag(this->GetNPCTypeID(), orig_parse))
{ {
Log.Log(EQEmuLogSys::Normal, "NPCTypeID: %i flagged to '%s' for Special Attacks.\n",this->GetNPCTypeID(),orig_parse); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "NPCTypeID: %i flagged to '%s' for Special Attacks.\n",this->GetNPCTypeID(),orig_parse);
} }
} }
} }

4
zone/spell_effects.cpp
View File

@ -4817,7 +4817,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
return 0; return 0;
break; break;
default: default:
Log.Log(EQEmuLogSys::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]);
} }
break; break;
@ -5156,7 +5156,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
//this spits up a lot of garbage when calculating spell focuses //this spits up a lot of garbage when calculating spell focuses
//since they have all kinds of extra effects on them. //since they have all kinds of extra effects on them.
default: default:
Log.Log(EQEmuLogSys::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]);
#endif #endif
} }

2
zone/spells.cpp
View File

@ -5040,7 +5040,7 @@ bool Mob::FindType(uint16 type, bool bOffensive, uint16 threshold) {
spells[buffs[i].spellid].base[j], spells[buffs[i].spellid].base[j],
spells[buffs[i].spellid].max[j], spells[buffs[i].spellid].max[j],
buffs[i].casterlevel, buffs[i].spellid); buffs[i].casterlevel, buffs[i].spellid);
Log.Log(EQEmuLogSys::Normal, Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal,
"FindType: type = %d; value = %d; threshold = %d", "FindType: type = %d; value = %d; threshold = %d",
type, value, threshold); type, value, threshold);
if (value < threshold) if (value < threshold)

2
zone/tradeskills.cpp
View File

@ -1482,7 +1482,7 @@ void Client::LearnRecipe(uint32 recipeID)
} }
if (results.RowCount() != 1) { if (results.RowCount() != 1) {
Log.Log(EQEmuLogSys::Normal, "Client::LearnRecipe - RecipeID: %d had %d occurences.", recipeID, results.RowCount()); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Client::LearnRecipe - RecipeID: %d had %d occurences.", recipeID, results.RowCount());
return; return;
} }

4
zone/zone.cpp
View File

@ -144,7 +144,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
delete pack; delete pack;
} }
Log.Log(EQEmuLogSys::Normal, "---- Zone server %s, listening on port:%i ----", zonename, ZoneConfig::get()->ZonePort); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "---- Zone server %s, listening on port:%i ----", zonename, ZoneConfig::get()->ZonePort);
Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Zone Bootup: %s (%i: %i)", zonename, iZoneID, iInstanceID); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Zone Bootup: %s (%i: %i)", zonename, iZoneID, iInstanceID);
parse->Init(); parse->Init();
UpdateWindowTitle(); UpdateWindowTitle();
@ -711,7 +711,7 @@ void Zone::Shutdown(bool quite)
petition_list.ClearPetitions(); petition_list.ClearPetitions();
zone->GotCurTime(false); zone->GotCurTime(false);
if (!quite) if (!quite)
Log.Log(EQEmuLogSys::Normal, "Zone shutdown: going to sleep"); Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Normal, "Zone shutdown: going to sleep");
ZoneLoaded = false; ZoneLoaded = false;
zone->ResetAuth(); zone->ResetAuth();