diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 636 |
1 files changed, 312 insertions, 324 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ea363bed03..ceae6dec88 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -396,7 +396,7 @@ void ObjectMgr::LoadCreatureLocales() AddLocaleString(fields[3].GetString(), locale, data.Title); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %lu Creature Locale strings in %u ms", (unsigned long)_creatureLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %lu Creature Locale strings in %u ms", (unsigned long)_creatureLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadGossipMenuItemsLocales() @@ -427,7 +427,7 @@ void ObjectMgr::LoadGossipMenuItemsLocales() AddLocaleString(fields[4].GetString(), locale, data.BoxText); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Gossip Menu Option Locale strings in %u ms", (uint32)_gossipMenuItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %u Gossip Menu Option Locale strings in %u ms", (uint32)_gossipMenuItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadPointOfInterestLocales() @@ -456,7 +456,7 @@ void ObjectMgr::LoadPointOfInterestLocales() AddLocaleString(fields[2].GetString(), locale, data.Name); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Points Of Interest Locale strings in %u ms", (uint32)_pointOfInterestLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %u Points Of Interest Locale strings in %u ms", (uint32)_pointOfInterestLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadCreatureTemplates() @@ -479,7 +479,7 @@ void ObjectMgr::LoadCreatureTemplates() if (!result) { - LOG_INFO("server", ">> Loaded 0 creature template definitions. DB table `creature_template` is empty."); + LOG_INFO("server.loading", ">> Loaded 0 creature template definitions. DB table `creature_template` is empty."); return; } @@ -518,8 +518,8 @@ void ObjectMgr::LoadCreatureTemplates() itr->second.InitializeQueryData(); } - LOG_INFO("server", ">> Loaded %u creature definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u creature definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadCreatureTemplate(Field* fields) @@ -709,8 +709,8 @@ void ObjectMgr::LoadCreatureTemplateAddons() if (!result) { - LOG_INFO("server", ">> Loaded 0 creature template addon definitions. DB table `creature_template_addon` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 creature template addon definitions. DB table `creature_template_addon` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -768,8 +768,8 @@ void ObjectMgr::LoadCreatureTemplateAddons() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u creature template addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u creature template addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) @@ -1121,8 +1121,8 @@ void ObjectMgr::LoadCreatureAddons() if (!result) { - LOG_INFO("server", ">> Loaded 0 creature addon definitions. DB table `creature_addon` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 creature addon definitions. DB table `creature_addon` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -1187,8 +1187,8 @@ void ObjectMgr::LoadCreatureAddons() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u creature addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u creature addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadGameObjectAddons() @@ -1200,8 +1200,8 @@ void ObjectMgr::LoadGameObjectAddons() if (!result) { - LOG_INFO("server", ">> Loaded 0 gameobject addon definitions. DB table `gameobject_addon` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 gameobject addon definitions. DB table `gameobject_addon` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -1239,8 +1239,8 @@ void ObjectMgr::LoadGameObjectAddons() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u gameobject addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u gameobject addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } GameObjectAddon const* ObjectMgr::GetGameObjectAddon(ObjectGuid::LowType lowguid) @@ -1305,8 +1305,8 @@ void ObjectMgr::LoadEquipmentTemplates() if (!result) { - LOG_INFO("server", ">> Loaded 0 creature equipment templates. DB table `creature_equip_template` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 creature equipment templates. DB table `creature_equip_template` is empty!"); + LOG_INFO("server.loading", " "); return; } @@ -1319,14 +1319,14 @@ void ObjectMgr::LoadEquipmentTemplates() if (!sObjectMgr->GetCreatureTemplate(entry)) { - LOG_ERROR("server", "Creature template (CreatureID: %u) does not exist but has a record in `creature_equip_template`", entry); + LOG_ERROR("sql.sql", "Creature template (CreatureID: %u) does not exist but has a record in `creature_equip_template`", entry); continue; } uint8 id = fields[1].GetUInt8(); if (!id) { - LOG_ERROR("server", "Creature equipment template with id 0 found for creature %u, skipped.", entry); + LOG_ERROR("sql.sql", "Creature equipment template with id 0 found for creature %u, skipped.", entry); continue; } @@ -1370,8 +1370,8 @@ void ObjectMgr::LoadEquipmentTemplates() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u equipment templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u equipment templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelId) @@ -1443,8 +1443,8 @@ void ObjectMgr::LoadCreatureModelInfo() if (!result) { - LOG_INFO("server", ">> Loaded 0 creature model definitions. DB table `creature_model_info` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 creature model definitions. DB table `creature_model_info` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -1487,8 +1487,8 @@ void ObjectMgr::LoadCreatureModelInfo() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u creature model based info in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u creature model based info in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadLinkedRespawn() @@ -1502,7 +1502,7 @@ void ObjectMgr::LoadLinkedRespawn() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 linked respawns. DB table `linked_respawn` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -1672,8 +1672,8 @@ void ObjectMgr::LoadLinkedRespawn() _linkedRespawnStore[guid] = linkedGuid; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded " UI64FMTD " linked respawns in %u ms", uint64(_linkedRespawnStore.size()), GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded " UI64FMTD " linked respawns in %u ms", uint64(_linkedRespawnStore.size()), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } bool ObjectMgr::SetCreatureLinkedRespawn(ObjectGuid::LowType guidLow, ObjectGuid::LowType linkedGuidLow) @@ -1696,7 +1696,7 @@ bool ObjectMgr::SetCreatureLinkedRespawn(ObjectGuid::LowType guidLow, ObjectGuid CreatureData const* slave = GetCreatureData(linkedGuidLow); if (!slave) { - // LOG_ERROR("server", "sql.sql", "Creature '%u' linking to non-existent creature '%u'.", guidLow, linkedGuidLow); + LOG_ERROR("sql.sql", "Creature '%u' linking to non-existent creature '%u'.", guidLow, linkedGuidLow); return false; } @@ -1732,7 +1732,7 @@ void ObjectMgr::LoadTempSummons() if (!result) { - LOG_INFO("server", ">> Loaded 0 temp summons. DB table `creature_summon_groups` is empty."); + LOG_INFO("server.loading", ">> Loaded 0 temp summons. DB table `creature_summon_groups` is empty."); return; } @@ -1750,26 +1750,26 @@ void ObjectMgr::LoadTempSummons() case SUMMONER_TYPE_CREATURE: if (!GetCreatureTemplate(summonerId)) { - LOG_ERROR("server", "Table `creature_summon_groups` has summoner with non existing entry %u for creature summoner type, skipped.", summonerId); + LOG_ERROR("sql.sql", "Table `creature_summon_groups` has summoner with non existing entry %u for creature summoner type, skipped.", summonerId); continue; } break; case SUMMONER_TYPE_GAMEOBJECT: if (!GetGameObjectTemplate(summonerId)) { - LOG_ERROR("server", "Table `creature_summon_groups` has summoner with non existing entry %u for gameobject summoner type, skipped.", summonerId); + LOG_ERROR("sql.sql", "Table `creature_summon_groups` has summoner with non existing entry %u for gameobject summoner type, skipped.", summonerId); continue; } break; case SUMMONER_TYPE_MAP: if (!sMapStore.LookupEntry(summonerId)) { - LOG_ERROR("server", "Table `creature_summon_groups` has summoner with non existing entry %u for map summoner type, skipped.", summonerId); + LOG_ERROR("sql.sql", "Table `creature_summon_groups` has summoner with non existing entry %u for map summoner type, skipped.", summonerId); continue; } break; default: - LOG_ERROR("server", "Table `creature_summon_groups` has unhandled summoner type %u for summoner %u, skipped.", summonerType, summonerId); + LOG_ERROR("sql.sql", "Table `creature_summon_groups` has unhandled summoner type %u for summoner %u, skipped.", summonerType, summonerId); continue; } @@ -1778,7 +1778,7 @@ void ObjectMgr::LoadTempSummons() if (!GetCreatureTemplate(data.entry)) { - LOG_ERROR("server", "Table `creature_summon_groups` has creature in group [Summoner ID: %u, Summoner Type: %u, Group ID: %u] with non existing creature entry %u, skipped.", summonerId, summonerType, group, data.entry); + LOG_ERROR("sql.sql", "Table `creature_summon_groups` has creature in group [Summoner ID: %u, Summoner Type: %u, Group ID: %u] with non existing creature entry %u, skipped.", summonerId, summonerType, group, data.entry); continue; } @@ -1793,7 +1793,7 @@ void ObjectMgr::LoadTempSummons() if (data.type > TEMPSUMMON_MANUAL_DESPAWN) { - LOG_ERROR("server", "Table `creature_summon_groups` has unhandled temp summon type %u in group [Summoner ID: %u, Summoner Type: %u, Group ID: %u] for creature entry %u, skipped.", data.type, summonerId, summonerType, group, data.entry); + LOG_ERROR("sql.sql", "Table `creature_summon_groups` has unhandled temp summon type %u in group [Summoner ID: %u, Summoner Type: %u, Group ID: %u] for creature entry %u, skipped.", data.type, summonerId, summonerType, group, data.entry); continue; } @@ -1805,8 +1805,8 @@ void ObjectMgr::LoadTempSummons() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u temp summons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u temp summons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadCreatures() @@ -1824,7 +1824,7 @@ void ObjectMgr::LoadCreatures() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 creatures. DB table `creature` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -1972,8 +1972,8 @@ void ObjectMgr::LoadCreatures() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u creatures in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u creatures in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::AddCreatureToGrid(ObjectGuid::LowType guid, CreatureData const* data) @@ -2044,15 +2044,13 @@ uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float GameObject* go = sObjectMgr->IsGameObjectStaticTransport(data.id) ? new StaticTransport() : new GameObject(); if (!go->LoadGameObjectFromDB(spawnId, map)) { - LOG_ERROR("server", "AddGOData: cannot add gameobject entry %u to map", entry); + LOG_ERROR("sql.sql", "AddGOData: cannot add gameobject entry %u to map", entry); delete go; return 0; } } -#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) LOG_DEBUG("maps", "AddGOData: spawnId %u entry %u map %u x %f y %f z %f o %f", spawnId, entry, mapId, x, y, z, o); -#endif return spawnId; } @@ -2101,7 +2099,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 mapId, float x, float y, float Creature* creature = new Creature(); if (!creature->LoadCreatureFromDB(spawnId, map, true, false, true)) { - LOG_ERROR("server", "AddCreature: Cannot add creature entry %u to map", entry); + LOG_ERROR("sql.sql", "AddCreature: Cannot add creature entry %u to map", entry); delete creature; return 0; } @@ -2126,7 +2124,7 @@ void ObjectMgr::LoadGameobjects() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 gameobjects. DB table `gameobject` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -2273,8 +2271,8 @@ void ObjectMgr::LoadGameobjects() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %lu gameobjects in %u ms", (unsigned long)_gameObjectDataStore.size(), GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %lu gameobjects in %u ms", (unsigned long)_gameObjectDataStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::AddGameobjectToGrid(ObjectGuid::LowType guid, GameObjectData const* data) @@ -2380,7 +2378,7 @@ void ObjectMgr::LoadItemLocales() AddLocaleString(fields[3].GetString(), locale, data.Description); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Item Locale strings in %u ms", (uint32)_itemLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %u Item Locale strings in %u ms", (uint32)_itemLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadItemTemplates() @@ -2422,8 +2420,8 @@ void ObjectMgr::LoadItemTemplates() if (!result) { - LOG_INFO("server", ">> Loaded 0 item templates. DB table `item_template` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 item templates. DB table `item_template` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -2968,8 +2966,8 @@ void ObjectMgr::LoadItemTemplates() for (std::set<uint32>::const_iterator itr = notFoundOutfit.begin(); itr != notFoundOutfit.end(); ++itr) LOG_ERROR("sql.sql", "Item (Entry: %u) does not exist in `item_template` but is referenced in `CharStartOutfit.dbc`", *itr); - LOG_INFO("server", ">> Loaded %u item templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u item templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } ItemTemplate const* ObjectMgr::GetItemTemplate(uint32 entry) @@ -3002,7 +3000,7 @@ void ObjectMgr::LoadItemSetNameLocales() AddLocaleString(fields[2].GetString(), locale, data.Name); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Item Set Name Locale strings in %u ms", uint32(_itemSetNameLocaleStore.size()), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %u Item Set Name Locale strings in %u ms", uint32(_itemSetNameLocaleStore.size()), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadItemSetNames() @@ -3030,8 +3028,8 @@ void ObjectMgr::LoadItemSetNames() if (!result) { - LOG_INFO("server", ">> Loaded 0 item set names. DB table `item_set_names` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 item set names. DB table `item_set_names` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -3085,8 +3083,8 @@ void ObjectMgr::LoadItemSetNames() } } - LOG_INFO("server", ">> Loaded %u item set names in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u item set names in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadVehicleTemplateAccessories() @@ -3103,7 +3101,7 @@ void ObjectMgr::LoadVehicleTemplateAccessories() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 vehicle template accessories. DB table `vehicle_template_accessory` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -3141,8 +3139,8 @@ void ObjectMgr::LoadVehicleTemplateAccessories() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Vehicle Template Accessories in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u Vehicle Template Accessories in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadVehicleAccessories() @@ -3158,8 +3156,8 @@ void ObjectMgr::LoadVehicleAccessories() if (!result) { - LOG_INFO("server", ">> Loaded 0 Vehicle Accessories in %u ms", GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 Vehicle Accessories in %u ms", GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); return; } @@ -3185,8 +3183,8 @@ void ObjectMgr::LoadVehicleAccessories() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Vehicle Accessories in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u Vehicle Accessories in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadPetLevelInfo() @@ -3199,7 +3197,7 @@ void ObjectMgr::LoadPetLevelInfo() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 level pet stats definitions. DB table `pet_levelstats` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -3223,9 +3221,7 @@ void ObjectMgr::LoadPetLevelInfo() LOG_ERROR("sql.sql", "Wrong (> %u) level %u in `pet_levelstats` table, ignoring.", STRONG_MAX_LEVEL, current_level); else { -#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - LOG_DEBUG("server", "Unused (> MaxPlayerLevel in worldserver.conf) level %u in `pet_levelstats` table, ignoring.", current_level); -#endif + LOG_DEBUG("sql.sql", "Unused (> MaxPlayerLevel in worldserver.conf) level %u in `pet_levelstats` table, ignoring.", current_level); ++count; // make result loading percent "expected" correct in case disabled detail mode for example. } continue; @@ -3280,8 +3276,8 @@ void ObjectMgr::LoadPetLevelInfo() } } - LOG_INFO("server", ">> Loaded %u level pet stats definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u level pet stats definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } PetLevelInfo const* ObjectMgr::GetPetLevelInfo(uint32 creature_id, uint8 level) const @@ -3306,7 +3302,7 @@ void ObjectMgr::PlayerCreateInfoAddItemHelper(uint32 race_, uint32 class_, uint3 else { if (count < -1) - LOG_ERROR("server", "Invalid count %i specified on item %u be removed from original player create info (use -1)!", count, itemId); + LOG_ERROR("sql.sql", "Invalid count %i specified on item %u be removed from original player create info (use -1)!", count, itemId); for (uint32 gender = 0; gender < GENDER_NONE; ++gender) { @@ -3324,7 +3320,7 @@ void ObjectMgr::PlayerCreateInfoAddItemHelper(uint32 race_, uint32 class_, uint3 } if (!found) - LOG_ERROR("server", "Item %u specified to be removed from original create info not found in dbc!", itemId); + LOG_ERROR("sql.sql", "Item %u specified to be removed from original create info not found in dbc!", itemId); } } } @@ -3340,7 +3336,7 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); LOG_ERROR("sql.sql", ">> Loaded 0 player create definitions. DB table `playercreateinfo` is empty."); exit(1); } @@ -3395,7 +3391,7 @@ void ObjectMgr::LoadPlayerInfo() if (sMapStore.LookupEntry(mapId)->Instanceable()) { - LOG_ERROR("server", "Home position in instanceable map for class %u race %u pair in `playercreateinfo` table, ignoring.", current_class, current_race); + LOG_ERROR("sql.sql", "Home position in instanceable map for class %u race %u pair in `playercreateinfo` table, ignoring.", current_class, current_race); continue; } @@ -3413,13 +3409,13 @@ void ObjectMgr::LoadPlayerInfo() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u player create definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u player create definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } } // Load playercreate items - LOG_INFO("server", "Loading Player Create Items Data..."); + LOG_INFO("server.loading", "Loading Player Create Items Data..."); { uint32 oldMSTime = getMSTime(); // 0 1 2 3 @@ -3427,8 +3423,8 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { - LOG_INFO("server", ">> Loaded 0 custom player create items. DB table `playercreateinfo_item` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 custom player create items. DB table `playercreateinfo_item` is empty."); + LOG_INFO("server.loading", " "); } else { @@ -3484,13 +3480,13 @@ void ObjectMgr::LoadPlayerInfo() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u custom player create items in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u custom player create items in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } } // Load playercreate spells - LOG_INFO("server", "Loading Player Create Spell Data..."); + LOG_INFO("server.loading", "Loading Player Create Spell Data..."); { uint32 oldMSTime = getMSTime(); @@ -3537,23 +3533,19 @@ void ObjectMgr::LoadPlayerInfo() info->spell.push_back(spellId); ++count; } - // We need something better here, the check is not accounting for spells used by multiple races/classes but not all of them. - // Either split the masks per class, or per race, which kind of kills the point yet. - // else if (raceMask != 0 && classMask != 0) - // LOG_ERROR("server", LOG_FILTER_SQL, "Racemask/classmask (%u/%u) combination was found containing an invalid race/class combination (%u/%u) in `playercreateinfo_spell` (Spell %u), ignoring.", raceMask, classMask, raceIndex, classIndex, spellId); } } } } } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u player create spells in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u player create spells in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } } // Load playercreate actions - LOG_INFO("server", "Loading Player Create Action Data..."); + LOG_INFO("server.loading", "Loading Player Create Action Data..."); { uint32 oldMSTime = getMSTime(); @@ -3563,7 +3555,7 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 player create actions. DB table `playercreateinfo_action` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); } else { @@ -3593,13 +3585,13 @@ void ObjectMgr::LoadPlayerInfo() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u player create actions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u player create actions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } } // Loading levels data (class only dependent) - LOG_INFO("server", "Loading Player Create Level HP/Mana Data..."); + LOG_INFO("server.loading", "Loading Player Create Level HP/Mana Data..."); { uint32 oldMSTime = getMSTime(); @@ -3608,7 +3600,7 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { - LOG_ERROR("server", ">> Loaded 0 level health/mana definitions. DB table `player_classlevelstats` is empty."); + LOG_FATAL("server.loading", ">> Loaded 0 level health/mana definitions. DB table `player_classlevelstats` is empty."); exit(1); } @@ -3621,14 +3613,14 @@ void ObjectMgr::LoadPlayerInfo() uint32 current_class = fields[0].GetUInt8(); if (current_class >= MAX_CLASSES) { - LOG_ERROR("server", "Wrong class %u in `player_classlevelstats` table, ignoring.", current_class); + LOG_ERROR("sql.sql", "Wrong class %u in `player_classlevelstats` table, ignoring.", current_class); continue; } uint8 current_level = fields[1].GetUInt8(); // Can't be > than STRONG_MAX_LEVEL (hardcoded level maximum) due to var type if (current_level > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { - LOG_INFO("server", "Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_classlevelstats` table, ignoring.", current_level); + LOG_INFO("sql.sql", "Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_classlevelstats` table, ignoring.", current_level); ++count; // make result loading percent "expected" correct in case disabled detail mode for example. continue; } @@ -3661,7 +3653,7 @@ void ObjectMgr::LoadPlayerInfo() // fatal error if no level 1 data if (!pClassInfo->levelInfo || pClassInfo->levelInfo[0].basehealth == 0) { - LOG_ERROR("server", "Class %i Level 1 does not have health/mana data!", class_); + LOG_ERROR("sql.sql", "Class %i Level 1 does not have health/mana data!", class_); exit(1); } @@ -3670,18 +3662,18 @@ void ObjectMgr::LoadPlayerInfo() { if (pClassInfo->levelInfo[level].basehealth == 0) { - LOG_ERROR("server", "Class %i Level %i does not have health/mana data. Using stats data of level %i.", class_, level + 1, level); + LOG_ERROR("sql.sql", "Class %i Level %i does not have health/mana data. Using stats data of level %i.", class_, level + 1, level); pClassInfo->levelInfo[level] = pClassInfo->levelInfo[level - 1]; } } } - LOG_INFO("server", ">> Loaded %u level health/mana definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u level health/mana definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } // Loading levels data (class/race dependent) - LOG_INFO("server", "Loading Player Create Level Stats Data..."); + LOG_INFO("server.loading", "Loading Player Create Level Stats Data..."); { uint32 oldMSTime = getMSTime(); @@ -3691,7 +3683,7 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 level stats definitions. DB table `player_levelstats` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); exit(1); } @@ -3722,9 +3714,7 @@ void ObjectMgr::LoadPlayerInfo() LOG_ERROR("sql.sql", "Wrong (> %u) level %u in `player_levelstats` table, ignoring.", STRONG_MAX_LEVEL, current_level); else { -#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - LOG_DEBUG("server", "Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_levelstats` table, ignoring.", current_level); -#endif + LOG_DEBUG("sql.sql", "Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_levelstats` table, ignoring.", current_level); ++count; // make result loading percent "expected" correct in case disabled detail mode for example. } continue; @@ -3771,7 +3761,7 @@ void ObjectMgr::LoadPlayerInfo() // fatal error if no level 1 data if (!info->levelInfo || info->levelInfo[0].stats[0] == 0) { - LOG_ERROR("server", "Race %i Class %i Level 1 does not have stats data!", race, class_); + LOG_ERROR("sql.sql", "Race %i Class %i Level 1 does not have stats data!", race, class_); exit(1); } @@ -3780,19 +3770,19 @@ void ObjectMgr::LoadPlayerInfo() { if (info->levelInfo[level].stats[0] == 0) { - LOG_ERROR("server", "Race %i Class %i Level %i does not have stats data. Using stats data of level %i.", race, class_, level + 1, level); + LOG_ERROR("sql.sql", "Race %i Class %i Level %i does not have stats data. Using stats data of level %i.", race, class_, level + 1, level); info->levelInfo[level] = info->levelInfo[level - 1]; } } } } - LOG_INFO("server", ">> Loaded %u level stats definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u level stats definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } // Loading xp per level data - LOG_INFO("server", "Loading Player Create XP Data..."); + LOG_INFO("server.loading", "Loading Player Create XP Data..."); { uint32 oldMSTime = getMSTime(); @@ -3806,7 +3796,7 @@ void ObjectMgr::LoadPlayerInfo() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 xp for level definitions. DB table `player_xp_for_level` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); exit(1); } @@ -3825,9 +3815,7 @@ void ObjectMgr::LoadPlayerInfo() LOG_ERROR("sql.sql", "Wrong (> %u) level %u in `player_xp_for_level` table, ignoring.", STRONG_MAX_LEVEL, current_level); else { -#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) - LOG_DEBUG("server", "Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_xp_for_levels` table, ignoring.", current_level); -#endif + LOG_DEBUG("sql.sql", "Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_xp_for_levels` table, ignoring.", current_level); ++count; // make result loading percent "expected" correct in case disabled detail mode for example. } continue; @@ -3847,8 +3835,8 @@ void ObjectMgr::LoadPlayerInfo() } } - LOG_INFO("server", ">> Loaded %u xp for level definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u xp for level definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } } @@ -3998,7 +3986,7 @@ void ObjectMgr::LoadQuests() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 quests definitions. DB table `quest_template` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -4039,7 +4027,7 @@ void ObjectMgr::LoadQuests() if (!result) { - LOG_ERROR("server", ">> Loaded 0 quest details. DB table `quest_details` is empty."); + LOG_INFO("server.loading", ">> Loaded 0 quest details. DB table `quest_details` is empty."); } else { @@ -4052,7 +4040,7 @@ void ObjectMgr::LoadQuests() if (itr != _questTemplates.end()) itr->second->LoadQuestDetails(fields); else - LOG_ERROR("server", "Table `quest_details` has data for quest %u but such quest does not exist", questId); + LOG_ERROR("sql.sql", "Table `quest_details` has data for quest %u but such quest does not exist", questId); } while (result->NextRow()); } @@ -4062,7 +4050,7 @@ void ObjectMgr::LoadQuests() if (!result) { - LOG_ERROR("server", ">> Loaded 0 quest request items. DB table `quest_request_items` is empty."); + LOG_ERROR("server.loading", ">> Loaded 0 quest request items. DB table `quest_request_items` is empty."); } else { @@ -4075,7 +4063,7 @@ void ObjectMgr::LoadQuests() if (itr != _questTemplates.end()) itr->second->LoadQuestRequestItems(fields); else - LOG_ERROR("server", "Table `quest_request_items` has data for quest %u but such quest does not exist", questId); + LOG_ERROR("sql.sql", "Table `quest_request_items` has data for quest %u but such quest does not exist", questId); } while (result->NextRow()); } @@ -4085,7 +4073,7 @@ void ObjectMgr::LoadQuests() if (!result) { - LOG_ERROR("server", ">> Loaded 0 quest reward emotes. DB table `quest_offer_reward` is empty."); + LOG_ERROR("server.loading", ">> Loaded 0 quest reward emotes. DB table `quest_offer_reward` is empty."); } else { @@ -4098,7 +4086,7 @@ void ObjectMgr::LoadQuests() if (itr != _questTemplates.end()) itr->second->LoadQuestOfferReward(fields); else - LOG_ERROR("server", "Table `quest_offer_reward` has data for quest %u but such quest does not exist", questId); + LOG_ERROR("sql.sql", "Table `quest_offer_reward` has data for quest %u but such quest does not exist", questId); } while (result->NextRow()); } @@ -4110,7 +4098,7 @@ void ObjectMgr::LoadQuests() if (!result) { - LOG_ERROR("server", ">> Loaded 0 quest template addons. DB table `quest_template_addon` is empty."); + LOG_ERROR("server.loading", ">> Loaded 0 quest template addons. DB table `quest_template_addon` is empty."); } else { @@ -4123,7 +4111,7 @@ void ObjectMgr::LoadQuests() if (itr != _questTemplates.end()) itr->second->LoadQuestTemplateAddon(fields); else - LOG_ERROR("server", "Table `quest_template_addon` has data for quest %u but such quest does not exist", questId); + LOG_ERROR("sql.sql", "Table `quest_template_addon` has data for quest %u but such quest does not exist", questId); } while (result->NextRow()); } @@ -4176,7 +4164,7 @@ void ObjectMgr::LoadQuests() { if (!(qinfo->SpecialFlags & QUEST_SPECIAL_FLAGS_REPEATABLE)) { - LOG_ERROR("server", "Monthly quest %u not marked as repeatable in `SpecialFlags`, added.", qinfo->GetQuestId()); + LOG_ERROR("sql.sql", "Monthly quest %u not marked as repeatable in `SpecialFlags`, added.", qinfo->GetQuestId()); qinfo->SpecialFlags |= QUEST_SPECIAL_FLAGS_REPEATABLE; } } @@ -4701,8 +4689,8 @@ void ObjectMgr::LoadQuests() } } - LOG_INFO("server", ">> Loaded %lu quests definitions in %u ms", (unsigned long)_questTemplates.size(), GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %lu quests definitions in %u ms", (unsigned long)_questTemplates.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadQuestLocales() @@ -4738,7 +4726,7 @@ void ObjectMgr::LoadQuestLocales() AddLocaleString(fields[i + 7].GetString(), locale, data.ObjectiveText[i]); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Quest Locale strings in %u ms", (uint32)_questLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %u Quest Locale strings in %u ms", (uint32)_questLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadScripts(ScriptsType type) @@ -4756,7 +4744,7 @@ void ObjectMgr::LoadScripts(ScriptsType type) if (sScriptMgr->IsScriptScheduled()) // function cannot be called when scripts are in use. return; - LOG_INFO("server", "Loading %s...", tableName.c_str()); + LOG_INFO("server.loading", "Loading %s...", tableName.c_str()); scripts->clear(); // need for reload support @@ -4766,8 +4754,8 @@ void ObjectMgr::LoadScripts(ScriptsType type) if (!result) { - LOG_INFO("server", ">> Loaded 0 script definitions. DB table `%s` is empty!", tableName.c_str()); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 script definitions. DB table `%s` is empty!", tableName.c_str()); + LOG_INFO("server.loading", " "); return; } @@ -5051,8 +5039,8 @@ void ObjectMgr::LoadScripts(ScriptsType type) ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u script definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u script definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadSpellScripts() @@ -5159,8 +5147,8 @@ void ObjectMgr::LoadSpellScriptNames() if (!result) { - LOG_INFO("server", ">> Loaded 0 spell script names. DB table `spell_script_names` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 spell script names. DB table `spell_script_names` is empty!"); + LOG_INFO("server.loading", " "); return; } @@ -5205,8 +5193,8 @@ void ObjectMgr::LoadSpellScriptNames() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u spell script names in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u spell script names in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::ValidateSpellScripts() @@ -5215,8 +5203,8 @@ void ObjectMgr::ValidateSpellScripts() if (_spellScriptsStore.empty()) { - LOG_INFO("server", ">> Validated 0 scripts."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Validated 0 scripts."); + LOG_INFO("server.loading", " "); return; } @@ -5236,7 +5224,7 @@ void ObjectMgr::ValidateSpellScripts() bool valid = true; if (!spellScript && !auraScript) { - LOG_ERROR("server", "TSCR: Functions GetSpellScript() and GetAuraScript() of script `%s` do not return objects - script skipped", GetScriptName(sitr->second->second).c_str()); + LOG_ERROR("sql.sql", "TSCR: Functions GetSpellScript() and GetAuraScript() of script `%s` do not return objects - script skipped", GetScriptName(sitr->second->second).c_str()); valid = false; } if (spellScript) @@ -5263,8 +5251,8 @@ void ObjectMgr::ValidateSpellScripts() ++count; } - LOG_INFO("server", ">> Validated %u scripts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Validated %u scripts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::InitializeSpellInfoPrecomputedData() @@ -5288,8 +5276,8 @@ void ObjectMgr::LoadPageTexts() if (!result) { - LOG_INFO("server", ">> Loaded 0 page texts. DB table `page_text` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 page texts. DB table `page_text` is empty!"); + LOG_INFO("server.loading", " "); return; } @@ -5316,8 +5304,8 @@ void ObjectMgr::LoadPageTexts() } } - LOG_INFO("server", ">> Loaded %u page texts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u page texts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } PageText const* ObjectMgr::GetPageText(uint32 pageEntry) @@ -5355,7 +5343,7 @@ void ObjectMgr::LoadPageTextLocales() AddLocaleString(fields[2].GetString(), locale, data.Text); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Page Text Locale strings in %u ms", (uint32)_pageTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %u Page Text Locale strings in %u ms", (uint32)_pageTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadInstanceTemplate() @@ -5367,8 +5355,8 @@ void ObjectMgr::LoadInstanceTemplate() if (!result) { - LOG_INFO("server", ">> Loaded 0 instance templates. DB table `page_text` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 instance templates. DB table `page_text` is empty!"); + LOG_INFO("server.loading", " "); return; } @@ -5396,8 +5384,8 @@ void ObjectMgr::LoadInstanceTemplate() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u instance templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u instance templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } InstanceTemplate const* ObjectMgr::GetInstanceTemplate(uint32 mapID) @@ -5418,7 +5406,7 @@ void ObjectMgr::LoadInstanceEncounters() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 instance encounters, table is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -5490,8 +5478,8 @@ void ObjectMgr::LoadInstanceEncounters() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u instance encounters in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u instance encounters in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } GossipText const* ObjectMgr::GetGossipText(uint32 Text_ID) const @@ -5520,7 +5508,7 @@ void ObjectMgr::LoadGossipText() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 npc texts, table is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -5574,8 +5562,8 @@ void ObjectMgr::LoadGossipText() count++; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u npc texts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u npc texts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadNpcTextLocales() @@ -5610,7 +5598,7 @@ void ObjectMgr::LoadNpcTextLocales() } } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Npc Text Locale strings in %u ms", (uint32)_npcTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %u Npc Text Locale strings in %u ms", (uint32)_npcTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) @@ -5733,8 +5721,8 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) ++deletedCount; } while (result->NextRow()); - LOG_INFO("server", ">> Processed %u expired mails: %u deleted and %u returned in %u ms", deletedCount + returnedCount, deletedCount, returnedCount, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Processed %u expired mails: %u deleted and %u returned in %u ms", deletedCount + returnedCount, deletedCount, returnedCount, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadQuestAreaTriggers() @@ -5747,8 +5735,8 @@ void ObjectMgr::LoadQuestAreaTriggers() if (!result) { - LOG_INFO("server", ">> Loaded 0 quest trigger points. DB table `areatrigger_involvedrelation` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 quest trigger points. DB table `areatrigger_involvedrelation` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -5791,8 +5779,8 @@ void ObjectMgr::LoadQuestAreaTriggers() _questAreaTriggerStore[trigger_ID] = quest_ID; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u quest trigger points in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u quest trigger points in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadQuestOfferRewardLocale() @@ -5821,7 +5809,7 @@ void ObjectMgr::LoadQuestOfferRewardLocale() AddLocaleString(fields[2].GetString(), locale, data.RewardText); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %lu Quest Offer Reward locale strings in %u ms", _questOfferRewardLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %lu Quest Offer Reward locale strings in %u ms", _questOfferRewardLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadQuestRequestItemsLocale() @@ -5850,7 +5838,7 @@ void ObjectMgr::LoadQuestRequestItemsLocale() AddLocaleString(fields[2].GetString(), locale, data.CompletionText); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %lu Quest Request Items locale strings in %u ms", _questRequestItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %lu Quest Request Items locale strings in %u ms", _questRequestItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadTavernAreaTriggers() @@ -5863,8 +5851,8 @@ void ObjectMgr::LoadTavernAreaTriggers() if (!result) { - LOG_INFO("server", ">> Loaded 0 tavern triggers. DB table `areatrigger_tavern` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 tavern triggers. DB table `areatrigger_tavern` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -5888,8 +5876,8 @@ void ObjectMgr::LoadTavernAreaTriggers() _tavernAreaTriggerStore.insert(Trigger_ID); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u tavern triggers in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u tavern triggers in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadAreaTriggerScripts() @@ -5901,8 +5889,8 @@ void ObjectMgr::LoadAreaTriggerScripts() if (!result) { - LOG_INFO("server", ">> Loaded 0 areatrigger scripts. DB table `areatrigger_scripts` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 areatrigger scripts. DB table `areatrigger_scripts` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -5926,8 +5914,8 @@ void ObjectMgr::LoadAreaTriggerScripts() _areaTriggerScriptStore[Trigger_ID] = GetScriptId(scriptName); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u areatrigger scripts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u areatrigger scripts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } uint32 ObjectMgr::GetNearestTaxiNode(float x, float y, float z, uint32 mapid, uint32 teamId) @@ -6044,8 +6032,8 @@ void ObjectMgr::LoadAreaTriggers() if (!result) { - LOG_INFO("server", ">> Loaded 0 area trigger definitions. DB table `areatrigger` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 area trigger definitions. DB table `areatrigger` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -6080,8 +6068,8 @@ void ObjectMgr::LoadAreaTriggers() _areaTriggerStore[at.entry] = at; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u area trigger definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u area trigger definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadAreaTriggerTeleports() @@ -6095,8 +6083,8 @@ void ObjectMgr::LoadAreaTriggerTeleports() if (!result) { - LOG_INFO("server", ">> Loaded 0 area trigger teleport definitions. DB table `areatrigger_teleport` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 area trigger teleport definitions. DB table `areatrigger_teleport` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -6141,8 +6129,8 @@ void ObjectMgr::LoadAreaTriggerTeleports() _areaTriggerTeleportStore[Trigger_ID] = at; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u area trigger teleport definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u area trigger teleport definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadAccessRequirements() @@ -6260,7 +6248,7 @@ void ObjectMgr::LoadAccessRequirements() ItemTemplate const* pProto = GetItemTemplate(progression_requirement->id); if (!pProto) { - LOG_ERROR("server", "Required item %u for faction %u does not exist for map %u difficulty %u, remove or fix this item requirement.", progression_requirement->id, requirement_faction, mapid, difficulty); + LOG_ERROR("sql.sql", "Required item %u for faction %u does not exist for map %u difficulty %u, remove or fix this item requirement.", progression_requirement->id, requirement_faction, mapid, difficulty); break; } @@ -6268,7 +6256,7 @@ void ObjectMgr::LoadAccessRequirements() break; } default: - LOG_ERROR("server", "requirement_type of %u is not valid for map %u difficulty %u. Please use 0 for achievements, 1 for quest, 2 for items or remove this entry from the db.", requirement_type, mapid, difficulty); + LOG_ERROR("sql.sql", "requirement_type of %u is not valid for map %u difficulty %u. Please use 0 for achievements, 1 for quest, 2 for items or remove this entry from the db.", requirement_type, mapid, difficulty); break; } @@ -6418,7 +6406,7 @@ uint32 ObjectMgr::GenerateAuctionID() { if (_auctionId >= 0xFFFFFFFE) { - LOG_ERROR("server", "Auctions ids overflow!! Can't continue, shutting down server. "); + LOG_ERROR("server.worldserver", "Auctions ids overflow!! Can't continue, shutting down server. "); World::StopNow(ERROR_EXIT_CODE); } return _auctionId++; @@ -6428,7 +6416,7 @@ uint64 ObjectMgr::GenerateEquipmentSetGuid() { if (_equipmentSetGuid >= uint64(0xFFFFFFFFFFFFFFFELL)) { - LOG_ERROR("server", "EquipmentSet guid overflow!! Can't continue, shutting down server. "); + LOG_ERROR("server.worldserver", "EquipmentSet guid overflow!! Can't continue, shutting down server. "); World::StopNow(ERROR_EXIT_CODE); } return _equipmentSetGuid++; @@ -6438,7 +6426,7 @@ uint32 ObjectMgr::GenerateMailID() { if (_mailId >= 0xFFFFFFFE) { - LOG_ERROR("server", "Mail ids overflow!! Can't continue, shutting down server. "); + LOG_ERROR("server.worldserver", "Mail ids overflow!! Can't continue, shutting down server. "); World::StopNow(ERROR_EXIT_CODE); } std::lock_guard<std::mutex> guard(_mailIdMutex); @@ -6449,7 +6437,7 @@ uint32 ObjectMgr::GenerateCreatureSpawnId() { if (_creatureSpawnId >= uint32(0xFFFFFF)) { - LOG_ERROR("server", "Creature spawn id overflow!! Can't continue, shutting down server. Search on forum for TCE00007 for more info."); + LOG_ERROR("server.worldserver", "Creature spawn id overflow!! Can't continue, shutting down server. Search on forum for TCE00007 for more info."); World::StopNow(ERROR_EXIT_CODE); } return _creatureSpawnId++; @@ -6459,7 +6447,7 @@ uint32 ObjectMgr::GenerateGameObjectSpawnId() { if (_gameObjectSpawnId >= uint32(0xFFFFFF)) { - LOG_ERROR("server", "GameObject spawn id overflow!! Can't continue, shutting down server. Search on forum for TCE00007 for more info. "); + LOG_ERROR("server.worldserver", "GameObject spawn id overflow!! Can't continue, shutting down server. Search on forum for TCE00007 for more info. "); World::StopNow(ERROR_EXIT_CODE); } return _gameObjectSpawnId++; @@ -6491,7 +6479,7 @@ void ObjectMgr::LoadGameObjectLocales() AddLocaleString(fields[3].GetString(), locale, data.CastBarCaption); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Gameobject Locale strings in %u ms", (uint32)_gameObjectLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded %u Gameobject Locale strings in %u ms", (uint32)_gameObjectLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); } inline void CheckGOLockId(GameObjectTemplate const* goInfo, uint32 dataN, uint32 N) @@ -6567,8 +6555,8 @@ void ObjectMgr::LoadGameObjectTemplate() if (!result) { - LOG_INFO("server", ">> Loaded 0 gameobject definitions. DB table `gameobject_template` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 gameobject definitions. DB table `gameobject_template` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -6734,8 +6722,8 @@ void ObjectMgr::LoadGameObjectTemplate() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u game object templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u game object templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadGameObjectTemplateAddons() @@ -6747,8 +6735,8 @@ void ObjectMgr::LoadGameObjectTemplateAddons() if (!result) { - LOG_INFO("server", ">> Loaded 0 gameobject template addon definitions. DB table `gameobject_template_addon` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 gameobject template addon definitions. DB table `gameobject_template_addon` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -6798,8 +6786,8 @@ void ObjectMgr::LoadGameObjectTemplateAddons() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u game object template addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u game object template addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadExplorationBaseXP() @@ -6811,7 +6799,7 @@ void ObjectMgr::LoadExplorationBaseXP() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 BaseXP definitions. DB table `exploration_basexp` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -6826,8 +6814,8 @@ void ObjectMgr::LoadExplorationBaseXP() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u BaseXP definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u BaseXP definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } uint32 ObjectMgr::GetBaseXP(uint8 level) @@ -6850,8 +6838,8 @@ void ObjectMgr::LoadPetNames() if (!result) { - LOG_INFO("server", ">> Loaded 0 pet name parts. DB table `pet_name_generation` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 pet name parts. DB table `pet_name_generation` is empty!"); + LOG_INFO("server.loading", " "); return; } @@ -6870,8 +6858,8 @@ void ObjectMgr::LoadPetNames() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u pet name parts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u pet name parts in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadPetNumber() @@ -6885,8 +6873,8 @@ void ObjectMgr::LoadPetNumber() _hiPetNumber = fields[0].GetUInt32() + 1; } - LOG_INFO("server", ">> Loaded the max pet number: %d in %u ms", _hiPetNumber - 1, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded the max pet number: %d in %u ms", _hiPetNumber - 1, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } std::string ObjectMgr::GeneratePetName(uint32 entry) @@ -6923,7 +6911,7 @@ void ObjectMgr::LoadReputationRewardRate() QueryResult result = WorldDatabase.Query("SELECT faction, quest_rate, quest_daily_rate, quest_weekly_rate, quest_monthly_rate, quest_repeatable_rate, creature_rate, spell_rate FROM reputation_reward_rate"); if (!result) { - LOG_ERROR("server", ">> Loaded `reputation_reward_rate`, table is empty!"); + LOG_INFO("server.loading", ">> Loaded `reputation_reward_rate`, table is empty!"); return; } @@ -6946,49 +6934,49 @@ void ObjectMgr::LoadReputationRewardRate() FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionId); if (!factionEntry) { - LOG_ERROR("server", "Faction (faction.dbc) %u does not exist but is used in `reputation_reward_rate`", factionId); + LOG_ERROR("sql.sql", "Faction (faction.dbc) %u does not exist but is used in `reputation_reward_rate`", factionId); continue; } if (repRate.questRate < 0.0f) { - LOG_ERROR("server", "Table reputation_reward_rate has quest_rate with invalid rate %f, skipping data for faction %u", repRate.questRate, factionId); + LOG_ERROR("sql.sql", "Table reputation_reward_rate has quest_rate with invalid rate %f, skipping data for faction %u", repRate.questRate, factionId); continue; } if (repRate.questDailyRate < 0.0f) { - LOG_ERROR("server", "Table reputation_reward_rate has quest_daily_rate with invalid rate %f, skipping data for faction %u", repRate.questDailyRate, factionId); + LOG_ERROR("sql.sql", "Table reputation_reward_rate has quest_daily_rate with invalid rate %f, skipping data for faction %u", repRate.questDailyRate, factionId); continue; } if (repRate.questWeeklyRate < 0.0f) { - LOG_ERROR("server", "Table reputation_reward_rate has quest_weekly_rate with invalid rate %f, skipping data for faction %u", repRate.questWeeklyRate, factionId); + LOG_ERROR("sql.sql", "Table reputation_reward_rate has quest_weekly_rate with invalid rate %f, skipping data for faction %u", repRate.questWeeklyRate, factionId); continue; } if (repRate.questMonthlyRate < 0.0f) { - LOG_ERROR("server", "Table reputation_reward_rate has quest_monthly_rate with invalid rate %f, skipping data for faction %u", repRate.questMonthlyRate, factionId); + LOG_ERROR("sql.sql", "Table reputation_reward_rate has quest_monthly_rate with invalid rate %f, skipping data for faction %u", repRate.questMonthlyRate, factionId); continue; } if (repRate.questRepeatableRate < 0.0f) { - LOG_ERROR("server", "Table reputation_reward_rate has quest_repeatable_rate with invalid rate %f, skipping data for faction %u", repRate.questRepeatableRate, factionId); + LOG_ERROR("sql.sql", "Table reputation_reward_rate has quest_repeatable_rate with invalid rate %f, skipping data for faction %u", repRate.questRepeatableRate, factionId); continue; } if (repRate.creatureRate < 0.0f) { - LOG_ERROR("server", "Table reputation_reward_rate has creature_rate with invalid rate %f, skipping data for faction %u", repRate.creatureRate, factionId); + LOG_ERROR("sql.sql", "Table reputation_reward_rate has creature_rate with invalid rate %f, skipping data for faction %u", repRate.creatureRate, factionId); continue; } if (repRate.spellRate < 0.0f) { - LOG_ERROR("server", "Table reputation_reward_rate has spell_rate with invalid rate %f, skipping data for faction %u", repRate.spellRate, factionId); + LOG_ERROR("sql.sql", "Table reputation_reward_rate has spell_rate with invalid rate %f, skipping data for faction %u", repRate.spellRate, factionId); continue; } @@ -6997,8 +6985,8 @@ void ObjectMgr::LoadReputationRewardRate() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u reputation_reward_rate in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u reputation_reward_rate in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadReputationOnKill() @@ -7019,7 +7007,7 @@ void ObjectMgr::LoadReputationOnKill() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 creature award reputation definitions. DB table `creature_onkill_reputation` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -7071,8 +7059,8 @@ void ObjectMgr::LoadReputationOnKill() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u creature award reputation definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u creature award reputation definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadReputationSpilloverTemplate() @@ -7086,8 +7074,8 @@ void ObjectMgr::LoadReputationSpilloverTemplate() if (!result) { - LOG_INFO("server", ">> Loaded `reputation_spillover_template`, table is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded `reputation_spillover_template`, table is empty."); + LOG_INFO("server.loading", " "); return; } @@ -7182,8 +7170,8 @@ void ObjectMgr::LoadReputationSpilloverTemplate() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u reputation_spillover_template in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u reputation_spillover_template in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadPointsOfInterest() @@ -7200,7 +7188,7 @@ void ObjectMgr::LoadPointsOfInterest() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 Points of Interest definitions. DB table `points_of_interest` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -7230,8 +7218,8 @@ void ObjectMgr::LoadPointsOfInterest() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Points of Interest definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u Points of Interest definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadQuestPOI() @@ -7248,7 +7236,7 @@ void ObjectMgr::LoadQuestPOI() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 quest POI definitions. DB table `quest_poi` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -7301,13 +7289,13 @@ void ObjectMgr::LoadQuestPOI() _questPOIStore[questId].push_back(POI); } else - LOG_ERROR("server", "Table quest_poi references unknown quest points for quest %u POI id %u", questId, id); + LOG_ERROR("sql.sql", "Table quest_poi references unknown quest points for quest %u POI id %u", questId, id); ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u quest POI definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u quest POI definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadNPCSpellClickSpells() @@ -7321,7 +7309,7 @@ void ObjectMgr::LoadNPCSpellClickSpells() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 spellclick spells. DB table `npc_spellclick_spells` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -7373,8 +7361,8 @@ void ObjectMgr::LoadNPCSpellClickSpells() } } - LOG_INFO("server", ">> Loaded %u spellclick definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u spellclick definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::DeleteCreatureData(ObjectGuid::LowType guid) @@ -7410,7 +7398,7 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map, std::string const& if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 quest relations from `%s`, table is empty.", table.c_str()); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -7438,8 +7426,8 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map, std::string const& ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u quest relations from %s in %u ms", count, table.c_str(), GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u quest relations from %s in %u ms", count, table.c_str(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadGameobjectQuestStarters() @@ -7508,8 +7496,8 @@ void ObjectMgr::LoadReservedPlayersNames() if (!result) { - LOG_INFO("server", ">> Loaded 0 reserved player names. DB table `reserved_name` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 reserved player names. DB table `reserved_name` is empty!"); + LOG_INFO("server.loading", " "); return; } @@ -7524,7 +7512,7 @@ void ObjectMgr::LoadReservedPlayersNames() std::wstring wstr; if (!Utf8toWStr (name, wstr)) { - LOG_ERROR("server", "Table `reserved_name` have invalid name: %s", name.c_str()); + LOG_ERROR("sql.sql", "Table `reserved_name` have invalid name: %s", name.c_str()); continue; } @@ -7534,8 +7522,8 @@ void ObjectMgr::LoadReservedPlayersNames() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u reserved player names in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u reserved player names in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } bool ObjectMgr::IsReservedName(const std::string& name) const @@ -7729,8 +7717,8 @@ void ObjectMgr::LoadGameObjectForQuests() if (sObjectMgr->GetGameObjectTemplates()->empty()) { - LOG_INFO("server", ">> Loaded 0 GameObjects for quests"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 GameObjects for quests"); + LOG_INFO("server.loading", " "); return; } @@ -7792,8 +7780,8 @@ void ObjectMgr::LoadGameObjectForQuests() } } - LOG_INFO("server", ">> Loaded %u GameObjects for quests in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u GameObjects for quests in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } bool ObjectMgr::LoadAcoreStrings() @@ -7804,8 +7792,8 @@ bool ObjectMgr::LoadAcoreStrings() QueryResult result = WorldDatabase.PQuery("SELECT entry, content_default, locale_koKR, locale_frFR, locale_deDE, locale_zhCN, locale_zhTW, locale_esES, locale_esMX, locale_ruRU FROM acore_string"); if (!result) { - LOG_INFO("server", ">> Loaded 0 acore strings. DB table `acore_strings` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 acore strings. DB table `acore_strings` is empty."); + LOG_INFO("server.loading", " "); return false; } @@ -7823,8 +7811,8 @@ bool ObjectMgr::LoadAcoreStrings() AddLocaleString(fields[i + 1].GetString(), LocaleConstant(i), data.Content); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u acore strings in %u ms", (uint32)_acoreStringStore.size(), GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u acore strings in %u ms", (uint32)_acoreStringStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); return true; } @@ -7855,7 +7843,7 @@ void ObjectMgr::LoadFishingBaseSkillLevel() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 areas for fishing base skill level. DB table `skill_fishing_base_level` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -7878,8 +7866,8 @@ void ObjectMgr::LoadFishingBaseSkillLevel() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u areas for fishing base skill level in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u areas for fishing base skill level in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::ChangeFishingBaseSkillLevel(uint32 entry, int32 skill) @@ -7893,8 +7881,8 @@ void ObjectMgr::ChangeFishingBaseSkillLevel(uint32 entry, int32 skill) _fishingBaseForAreaStore[entry] = skill; - LOG_INFO("server", ">> Fishing base skill level of area %u changed to %u", entry, skill); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Fishing base skill level of area %u changed to %u", entry, skill); + LOG_INFO("server.loading", " "); } bool ObjectMgr::CheckDeclinedNames(std::wstring w_ownname, DeclinedName const& names) @@ -8000,7 +7988,7 @@ void ObjectMgr::LoadGameTele() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 GameTeleports. DB table `game_tele` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -8040,8 +8028,8 @@ void ObjectMgr::LoadGameTele() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u GameTeleports in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u GameTeleports in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } GameTele const* ObjectMgr::GetGameTele(const std::string& name) const @@ -8140,7 +8128,7 @@ void ObjectMgr::LoadMailLevelRewards() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 level dependent mail rewards. DB table `mail_level_reward` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -8184,8 +8172,8 @@ void ObjectMgr::LoadMailLevelRewards() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u level dependent mail rewards in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u level dependent mail rewards in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::AddSpellToTrainer(uint32 entry, uint32 spell, uint32 spellCost, uint32 reqSkill, uint32 reqSkillValue, uint32 reqLevel) @@ -8280,7 +8268,7 @@ void ObjectMgr::LoadTrainerSpell() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 Trainers. DB table `npc_trainer` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -8302,8 +8290,8 @@ void ObjectMgr::LoadTrainerSpell() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %d Trainers in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %d Trainers in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } int ObjectMgr::LoadReferenceVendor(int32 vendor, int32 item, std::set<uint32>* skip_vendors) @@ -8359,7 +8347,7 @@ void ObjectMgr::LoadVendors() QueryResult result = WorldDatabase.Query("SELECT entry, item, maxcount, incrtime, ExtendedCost FROM npc_vendor ORDER BY entry, slot ASC, item, ExtendedCost"); if (!result) { - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); LOG_ERROR("sql.sql", ">> Loaded 0 Vendors. DB table `npc_vendor` is empty!"); return; } @@ -8392,8 +8380,8 @@ void ObjectMgr::LoadVendors() } } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %d Vendors in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %d Vendors in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadGossipMenu() @@ -8407,7 +8395,7 @@ void ObjectMgr::LoadGossipMenu() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 gossip_menu entries. DB table `gossip_menu` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -8429,8 +8417,8 @@ void ObjectMgr::LoadGossipMenu() _gossipMenusStore.insert(GossipMenusContainer::value_type(gMenu.MenuID, gMenu)); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u gossip_menu entries in %u ms", (uint32)_gossipMenusStore.size(), GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u gossip_menu entries in %u ms", (uint32)_gossipMenusStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadGossipMenuItems() @@ -8447,7 +8435,7 @@ void ObjectMgr::LoadGossipMenuItems() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 gossip_menu_option IDs. DB table `gossip_menu_option` is empty!"); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -8501,8 +8489,8 @@ void ObjectMgr::LoadGossipMenuItems() _gossipMenuItemsStore.insert(GossipMenuItemsContainer::value_type(gMenuItem.MenuID, gMenuItem)); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u gossip_menu_option entries in %u ms", uint32(_gossipMenuItemsStore.size()), GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u gossip_menu_option entries in %u ms", uint32(_gossipMenuItemsStore.size()), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::AddVendorItem(uint32 entry, uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedCost, bool persist /*= true*/) @@ -8658,7 +8646,7 @@ void ObjectMgr::LoadScriptNames() if (!result) { - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); LOG_ERROR("sql.sql", ">> Loaded empty set of Script Names!"); return; } @@ -8672,8 +8660,8 @@ void ObjectMgr::LoadScriptNames() } while (result->NextRow()); std::sort(_scriptNamesStore.begin(), _scriptNamesStore.end()); - LOG_INFO("server", ">> Loaded %d Script Names in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %d Script Names in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } std::string const& ObjectMgr::GetScriptName(uint32 id) const @@ -8706,8 +8694,8 @@ void ObjectMgr::LoadBroadcastTexts() QueryResult result = WorldDatabase.Query("SELECT ID, Language, MaleText, FemaleText, EmoteID0, EmoteID1, EmoteID2, EmoteDelay0, EmoteDelay1, EmoteDelay2, SoundId, Unk1, Unk2 FROM broadcast_text"); if (!result) { - LOG_INFO("server", ">> Loaded 0 broadcast texts. DB table `broadcast_text` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 broadcast texts. DB table `broadcast_text` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -8778,7 +8766,7 @@ void ObjectMgr::LoadBroadcastTexts() _broadcastTextStore[bct.Id] = bct; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded " SZFMTD " broadcast texts in %u ms", _broadcastTextStore.size(), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", ">> Loaded " SZFMTD " broadcast texts in %u ms", _broadcastTextStore.size(), GetMSTimeDiffToNow(oldMSTime)); } void ObjectMgr::LoadBroadcastTextLocales() @@ -8790,8 +8778,8 @@ void ObjectMgr::LoadBroadcastTextLocales() if (!result) { - LOG_INFO("server", ">> Loaded 0 broadcast text locales. DB table `broadcast_text_locale` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 broadcast text locales. DB table `broadcast_text_locale` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -8816,8 +8804,8 @@ void ObjectMgr::LoadBroadcastTextLocales() AddLocaleString(fields[3].GetString(), locale, bct->second.FemaleText); } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u Broadcast Text Locales in %u ms", uint32(_broadcastTextStore.size()), GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u Broadcast Text Locales in %u ms", uint32(_broadcastTextStore.size()), GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } CreatureBaseStats const* ObjectMgr::GetCreatureBaseStats(uint8 level, uint8 unitClass) @@ -8854,8 +8842,8 @@ void ObjectMgr::LoadCreatureClassLevelStats() if (!result) { - LOG_INFO("server", ">> Loaded 0 creature base stats. DB table `creature_classlevelstats` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 creature base stats. DB table `creature_classlevelstats` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -8925,8 +8913,8 @@ void ObjectMgr::LoadCreatureClassLevelStats() } } - LOG_INFO("server", ">> Loaded %u creature base stats in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u creature base stats in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadFactionChangeAchievements() @@ -8938,7 +8926,7 @@ void ObjectMgr::LoadFactionChangeAchievements() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 faction change achievement pairs. DB table `player_factionchange_achievement` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -8961,8 +8949,8 @@ void ObjectMgr::LoadFactionChangeAchievements() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u faction change achievement pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u faction change achievement pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadFactionChangeItems() @@ -8973,8 +8961,8 @@ void ObjectMgr::LoadFactionChangeItems() if (!result) { - LOG_INFO("server", ">> Loaded 0 faction change item pairs. DB table `player_factionchange_items` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded 0 faction change item pairs. DB table `player_factionchange_items` is empty."); + LOG_INFO("server.loading", " "); return; } @@ -8997,8 +8985,8 @@ void ObjectMgr::LoadFactionChangeItems() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u faction change item pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u faction change item pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadFactionChangeQuests() @@ -9010,7 +8998,7 @@ void ObjectMgr::LoadFactionChangeQuests() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 faction change quest pairs. DB table `player_factionchange_quests` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -9024,17 +9012,17 @@ void ObjectMgr::LoadFactionChangeQuests() uint32 horde = fields[1].GetUInt32(); if (!sObjectMgr->GetQuestTemplate(alliance)) - LOG_ERROR("server", "Quest %u (alliance_id) referenced in `player_factionchange_quests` does not exist, pair skipped!", alliance); + LOG_ERROR("sql.sql", "Quest %u (alliance_id) referenced in `player_factionchange_quests` does not exist, pair skipped!", alliance); else if (!sObjectMgr->GetQuestTemplate(horde)) - LOG_ERROR("server", "Quest %u (horde_id) referenced in `player_factionchange_quests` does not exist, pair skipped!", horde); + LOG_ERROR("sql.sql", "Quest %u (horde_id) referenced in `player_factionchange_quests` does not exist, pair skipped!", horde); else FactionChangeQuests[alliance] = horde; ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u faction change quest pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u faction change quest pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadFactionChangeReputations() @@ -9046,7 +9034,7 @@ void ObjectMgr::LoadFactionChangeReputations() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 faction change reputation pairs. DB table `player_factionchange_reputations` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -9060,17 +9048,17 @@ void ObjectMgr::LoadFactionChangeReputations() uint32 horde = fields[1].GetUInt32(); if (!sFactionStore.LookupEntry(alliance)) - LOG_ERROR("server", "Reputation %u (alliance_id) referenced in `player_factionchange_reputations` does not exist, pair skipped!", alliance); + LOG_ERROR("sql.sql", "Reputation %u (alliance_id) referenced in `player_factionchange_reputations` does not exist, pair skipped!", alliance); else if (!sFactionStore.LookupEntry(horde)) - LOG_ERROR("server", "Reputation %u (horde_id) referenced in `player_factionchange_reputations` does not exist, pair skipped!", horde); + LOG_ERROR("sql.sql", "Reputation %u (horde_id) referenced in `player_factionchange_reputations` does not exist, pair skipped!", horde); else FactionChangeReputation[alliance] = horde; ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u faction change reputation pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u faction change reputation pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadFactionChangeSpells() @@ -9082,7 +9070,7 @@ void ObjectMgr::LoadFactionChangeSpells() if (!result) { LOG_ERROR("sql.sql", ">> Loaded 0 faction change spell pairs. DB table `player_factionchange_spells` is empty."); - LOG_INFO("server", " "); + LOG_INFO("server.loading", " "); return; } @@ -9105,8 +9093,8 @@ void ObjectMgr::LoadFactionChangeSpells() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u faction change spell pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u faction change spell pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadFactionChangeTitles() @@ -9117,7 +9105,7 @@ void ObjectMgr::LoadFactionChangeTitles() if (!result) { - LOG_INFO("server", ">> Loaded 0 faction change title pairs. DB table `player_factionchange_title` is empty."); + LOG_INFO("server.loading", ">> Loaded 0 faction change title pairs. DB table `player_factionchange_title` is empty."); return; } @@ -9131,17 +9119,17 @@ void ObjectMgr::LoadFactionChangeTitles() uint32 horde = fields[1].GetUInt32(); if (!sCharTitlesStore.LookupEntry(alliance)) - LOG_ERROR("server", "Title %u (alliance_id) referenced in `player_factionchange_title` does not exist, pair skipped!", alliance); + LOG_ERROR("sql.sql", "Title %u (alliance_id) referenced in `player_factionchange_title` does not exist, pair skipped!", alliance); else if (!sCharTitlesStore.LookupEntry(horde)) - LOG_ERROR("server", "Title %u (horde_id) referenced in `player_factionchange_title` does not exist, pair skipped!", horde); + LOG_ERROR("sql.sql", "Title %u (horde_id) referenced in `player_factionchange_title` does not exist, pair skipped!", horde); else FactionChangeTitles[alliance] = horde; ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u faction change title pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u faction change title pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } GameObjectTemplate const* ObjectMgr::GetGameObjectTemplate(uint32 entry) @@ -9211,7 +9199,7 @@ void ObjectMgr::LoadGameObjectQuestItems() if (!result) { - LOG_INFO("server", ">> Loaded 0 gameobject quest items. DB table `gameobject_questitem` is empty."); + LOG_INFO("server.loading", ">> Loaded 0 gameobject quest items. DB table `gameobject_questitem` is empty."); return; } @@ -9228,8 +9216,8 @@ void ObjectMgr::LoadGameObjectQuestItems() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u gameobject quest items in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u gameobject quest items in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } void ObjectMgr::LoadCreatureQuestItems() @@ -9241,7 +9229,7 @@ void ObjectMgr::LoadCreatureQuestItems() if (!result) { - LOG_INFO("server", ">> Loaded 0 creature quest items. DB table `creature_questitem` is empty."); + LOG_INFO("server.loading", ">> Loaded 0 creature quest items. DB table `creature_questitem` is empty."); return; } @@ -9258,6 +9246,6 @@ void ObjectMgr::LoadCreatureQuestItems() ++count; } while (result->NextRow()); - LOG_INFO("server", ">> Loaded %u creature quest items in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - LOG_INFO("server", " "); + LOG_INFO("server.loading", ">> Loaded %u creature quest items in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + LOG_INFO("server.loading", " "); } |