Fix compile under windows

This commit is contained in:
Spp
2012-08-03 15:54:54 +02:00
parent 55ce180f28
commit 634776e0bc
38 changed files with 334 additions and 334 deletions

View File

@@ -209,7 +209,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
sLog->outError(LOG_FILTER_SQL, "CreatureEventAI: Event %u has script for non-existing creature entry (%u), skipping.", i, creature_id);
continue;
}
// Only on the first script
if (cInfo->AIName != "EventAI" && m_CreatureEventAI_Event_Map[creature_id].empty())
sLog->outError(LOG_FILTER_SQL, "Creature entry %u has EventAI scripts, but its AIName is not 'EventAI' - possible AI-mismatch?", temp.creature_id);

View File

@@ -51,7 +51,7 @@ void SmartWaypointMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 SmartAI Waypoint Paths. DB table `waypoints` is empty.");
return;
}
@@ -89,7 +89,7 @@ void SmartWaypointMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u SmartAI waypoint paths (total %u waypoints) in %u ms", count, total, GetMSTimeDiffToNow(oldMSTime));
}
SmartWaypointMgr::~SmartWaypointMgr()
@@ -118,7 +118,7 @@ void SmartAIMgr::LoadSmartAIFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 SmartAI scripts. DB table `smartai_scripts` is empty.");
return;
}

View File

@@ -2202,7 +2202,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList()
if (sAchievementCriteriaStore.GetNumRows() == 0)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 achievement criteria.");
return;
}
@@ -2220,7 +2220,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList()
}
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded %lu achievement criteria in %u ms", (unsigned long)m_AchievementCriteriasByType->size(), GetMSTimeDiffToNow(oldMSTime));
}
void AchievementGlobalMgr::LoadAchievementReferenceList()
@@ -2230,7 +2230,7 @@ void AchievementGlobalMgr::LoadAchievementReferenceList()
if (sAchievementStore.GetNumRows() == 0)
{
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded 0 achievement references.");
return;
}
@@ -2251,7 +2251,7 @@ void AchievementGlobalMgr::LoadAchievementReferenceList()
const_cast<AchievementEntry*>(achievement)->mapID = 631; // Correct map requirement (currently has Ulduar)
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded %u achievement references in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void AchievementGlobalMgr::LoadAchievementCriteriaData()
@@ -2265,7 +2265,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData()
if (!result)
{
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded 0 additional achievement criteria data. DB table `achievement_criteria_data` is empty.");
return;
}
@@ -2397,7 +2397,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData()
}
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded %u additional achievement criteria data in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void AchievementGlobalMgr::LoadCompletedAchievements()
@@ -2409,7 +2409,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements()
if (!result)
{
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded 0 completed achievements. DB table `character_achievement` is empty.");
return;
}
@@ -2437,7 +2437,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded %lu completed achievements in %u ms", (unsigned long)m_allCompletedAchievements.size(), GetMSTimeDiffToNow(oldMSTime));
}
void AchievementGlobalMgr::LoadRewards()
@@ -2452,7 +2452,7 @@ void AchievementGlobalMgr::LoadRewards()
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 achievement rewards. DB table `achievement_reward` is empty.");
return;
}
@@ -2544,7 +2544,7 @@ void AchievementGlobalMgr::LoadRewards()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded %u achievement rewards in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void AchievementGlobalMgr::LoadRewardLocales()
@@ -2560,7 +2560,7 @@ void AchievementGlobalMgr::LoadRewardLocales()
if (!result)
{
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded 0 achievement reward locale strings. DB table `locales_achievement_reward` is empty");
return;
}
@@ -2587,5 +2587,5 @@ void AchievementGlobalMgr::LoadRewardLocales()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, ">> Loaded %lu achievement reward locale strings in %u ms", (unsigned long)m_achievementRewardLocales.size(), GetMSTimeDiffToNow(oldMSTime));
}

View File

@@ -44,7 +44,7 @@ void LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 known addons. DB table `addons` is empty!");
return;
}
@@ -64,7 +64,7 @@ void LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u known addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SaveAddon(AddonInfo const& addon)

View File

@@ -264,7 +264,7 @@ void AuctionHouseMgr::LoadAuctionItems()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 auction items. DB table `auctionhouse` or `item_instance` is empty!");
return;
}
@@ -297,7 +297,7 @@ void AuctionHouseMgr::LoadAuctionItems()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u auction items in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void AuctionHouseMgr::LoadAuctions()
@@ -310,7 +310,7 @@ void AuctionHouseMgr::LoadAuctions()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
return;
}
@@ -336,7 +336,7 @@ void AuctionHouseMgr::LoadAuctions()
CharacterDatabase.CommitTransaction(trans);
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u auctions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void AuctionHouseMgr::AddAItem(Item* it)
@@ -735,7 +735,7 @@ void AuctionHouseMgr::DeleteExpiredAuctionsAtStartup()
if (!expAuctions)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> No expired auctions to delete");
return;
}
@@ -783,7 +783,7 @@ void AuctionHouseMgr::DeleteExpiredAuctionsAtStartup()
} while (expAuctions->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Deleted %u expired auctions in %u ms", expirecount, GetMSTimeDiffToNow(oldMSTime));
}

View File

@@ -102,7 +102,7 @@ void ArenaTeamMgr::LoadArenaTeams()
if (!result)
{
sLog->outInfo(LOG_FILTER_BATTLEGROUND, ">> Loaded 0 arena teams. DB table `arena_team` is empty!");
return;
}
@@ -133,7 +133,7 @@ void ArenaTeamMgr::LoadArenaTeams()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_BATTLEGROUND, ">> Loaded %u arena teams in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void ArenaTeamMgr::DistributeArenaPoints()

View File

@@ -684,7 +684,7 @@ void BattlegroundMgr::CreateInitialBattlegrounds()
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 battlegrounds. DB table `battleground_template` is empty.");
return;
}
@@ -772,7 +772,7 @@ void BattlegroundMgr::CreateInitialBattlegrounds()
}
data.StartMaxDist = fields[9].GetFloat();
selectionWeight = fields[10].GetUInt8();
data.scriptId = sObjectMgr->GetScriptId(fields[11].GetCString());
data.BattlegroundName = bl->name[sWorld->GetDefaultDbcLocale()];
@@ -793,7 +793,7 @@ void BattlegroundMgr::CreateInitialBattlegrounds()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_BATTLEGROUND, ">> Loaded %u battlegrounds in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void BattlegroundMgr::InitAutomaticArenaPointDistribution()
@@ -1078,7 +1078,7 @@ void BattlegroundMgr::LoadBattleMastersEntry()
if (!result)
{
sLog->outInfo(LOG_FILTER_BATTLEGROUND, ">> Loaded 0 battlemaster entries. DB table `battlemaster_entry` is empty!");
return;
}
@@ -1103,7 +1103,7 @@ void BattlegroundMgr::LoadBattleMastersEntry()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_BATTLEGROUND, ">> Loaded %u battlemaster entries in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
HolidayIds BattlegroundMgr::BGTypeToWeekendHolidayId(BattlegroundTypeId bgTypeId)

View File

@@ -245,6 +245,6 @@ void BattlegroundRV::TogglePillarCollision()
gob->SendUpdateToPlayer(player);
}
}
SetPillarCollision(!apply);
}

View File

@@ -713,7 +713,7 @@ void ConditionMgr::LoadConditions(bool isReload)
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 conditions. DB table `conditions` is empty!");
return;
}
@@ -927,7 +927,7 @@ void ConditionMgr::LoadConditions(bool isReload)
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u conditions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
bool ConditionMgr::addToLootTemplate(Condition* cond, LootTemplate* loot)

View File

@@ -60,7 +60,7 @@ void LoadDisables()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 disables. DB table `disables` is empty!");
return;
}
@@ -229,7 +229,7 @@ void LoadDisables()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u disables in %u ms", total_count, GetMSTimeDiffToNow(oldMSTime));
}
void CheckQuestDisables()
@@ -240,7 +240,7 @@ void CheckQuestDisables()
if (!count)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Checked 0 quest disables.");
return;
}
@@ -260,7 +260,7 @@ void CheckQuestDisables()
}
sLog->outInfo(LOG_FILTER_GENERAL, ">> Checked %u quest disables in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags)

View File

@@ -637,7 +637,7 @@ void LoadDBCStores(const std::string& dataPath)
}
sLog->outInfo(LOG_FILTER_GENERAL, ">> Initialized %d data stores in %u ms", DBCFileCount, GetMSTimeDiffToNow(oldMSTime));
}
SimpleFactionsList const* GetFactionTeamList(uint32 faction)

View File

@@ -136,7 +136,7 @@ void LFGMgr::LoadRewards()
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 lfg dungeon rewards. DB table `lfg_dungeon_rewards` is empty!");
return;
}
@@ -184,7 +184,7 @@ void LFGMgr::LoadRewards()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_LFG, ">> Loaded %u lfg dungeon rewards in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void LFGMgr::Update(uint32 diff)

View File

@@ -85,7 +85,7 @@ void FormationMgr::LoadCreatureFormations()
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 creatures in formations. DB table `creature_formations` is empty!");
return;
}
@@ -137,7 +137,7 @@ void FormationMgr::LoadCreatureFormations()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_UNITS, ">> Loaded %u creatures in formations in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void CreatureGroup::AddMember(Creature* member)

View File

@@ -71,12 +71,12 @@ void LoadRandomEnchantmentsTable()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_PLAYER_ITEMS, ">> Loaded %u Item Enchantment definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
else
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 Item Enchantment definitions. DB table `item_enchantment_template` is empty.");
}
}

View File

@@ -36,7 +36,7 @@ void MapManager::LoadTransports()
if (!result)
{
sLog->outInfo(LOG_FILTER_TRANSPORTS, ">> Loaded 0 transports. DB table `transports` is empty!");
return;
}
@@ -122,7 +122,7 @@ void MapManager::LoadTransports()
}
sLog->outInfo(LOG_FILTER_TRANSPORTS, ">> Loaded %u transports in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void MapManager::LoadTransportNPCs()
@@ -135,7 +135,7 @@ void MapManager::LoadTransportNPCs()
if (!result)
{
sLog->outInfo(LOG_FILTER_TRANSPORTS, ">> Loaded 0 transport NPCs. DB table `creature_transport` is empty!");
return;
}
@@ -167,7 +167,7 @@ void MapManager::LoadTransportNPCs()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_TRANSPORTS, ">> Loaded %u transport npcs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
Transport::Transport(uint32 period, uint32 script) : GameObject(), m_pathTime(0), m_timer(0),

View File

@@ -211,7 +211,7 @@ void GameEventMgr::LoadFromDB()
{
mGameEvent.clear();
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 game events. DB table `game_event` is empty.");
return;
}
@@ -261,7 +261,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
sLog->outInfo(LOG_FILTER_GAMEEVENTS, "Loading Game Event Saves Data...");
@@ -274,7 +274,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 game event saves in game events. DB table `game_event_save` is empty.");
}
else
{
@@ -307,7 +307,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u game event saves in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -320,7 +320,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 game event prerequisites in game events. DB table `game_event_prerequisite` is empty.");
}
else
{
@@ -358,7 +358,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u game event prerequisites in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -373,7 +373,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 creatures in game events. DB table `game_event_creature` is empty");
}
else
{
@@ -401,7 +401,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u creatures in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -416,7 +416,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 gameobjects in game events. DB table `game_event_gameobject` is empty.");
}
else
{
@@ -444,7 +444,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u gameobjects in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -459,7 +459,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 model/equipment changes in game events. DB table `game_event_model_equip` is empty.");
}
else
{
@@ -501,7 +501,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u model/equipment changes in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -515,7 +515,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 quests additions in game events. DB table `game_event_creature_quest` is empty.");
}
else
{
@@ -542,7 +542,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u quests additions in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -556,7 +556,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 go quests additions in game events. DB table `game_event_gameobject_quest` is empty.");
}
else
{
@@ -583,7 +583,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u quests additions in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -597,7 +597,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 quest event conditions in game events. DB table `game_event_quest_condition` is empty.");
}
else
{
@@ -626,7 +626,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u quest event conditions in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -640,7 +640,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 conditions in game events. DB table `game_event_condition` is empty.");
}
else
{
@@ -668,7 +668,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u conditions in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -682,7 +682,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 condition saves in game events. DB table `game_event_condition_save` is empty.");
}
else
{
@@ -716,7 +716,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u condition saves in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -730,7 +730,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 npcflags in game events. DB table `game_event_npcflag` is empty.");
}
else
{
@@ -756,7 +756,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u npcflags in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -770,7 +770,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 seasonal quests additions in game events. DB table `game_event_seasonal_questrelation` is empty.");
}
else
{
@@ -800,7 +800,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u quests additions in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -814,7 +814,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 vendor additions in game events. DB table `game_event_npc_vendor` is empty.");
}
else
{
@@ -866,7 +866,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u vendor additions in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -880,7 +880,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 battleground holidays in game events. DB table `game_event_condition` is empty.");
}
else
{
@@ -904,7 +904,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u battleground holidays in game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -919,7 +919,7 @@ void GameEventMgr::LoadFromDB()
if (!result)
{
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded 0 pools for game events. DB table `game_event_pool` is empty.");
}
else
{
@@ -953,7 +953,7 @@ void GameEventMgr::LoadFromDB()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GAMEEVENTS, ">> Loaded %u pools for game events in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
}
@@ -1030,7 +1030,7 @@ void GameEventMgr::StartArenaSeason()
StartEvent(eventId, true);
sLog->outInfo(LOG_FILTER_GAMEEVENTS, "Arena Season %u started...", season);
}
uint32 GameEventMgr::Update() // return the next event delay in ms

File diff suppressed because it is too large Load Diff

View File

@@ -126,7 +126,7 @@ void GroupMgr::LoadGroups()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 group definitions. DB table `groups` is empty!");
return;
}
@@ -152,7 +152,7 @@ void GroupMgr::LoadGroups()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u group definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
sLog->outInfo(LOG_FILTER_GENERAL, "Loading Group members...");
@@ -170,7 +170,7 @@ void GroupMgr::LoadGroups()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 group members. DB table `group_member` is empty!");
return;
}
@@ -191,7 +191,7 @@ void GroupMgr::LoadGroups()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u group members in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
sLog->outInfo(LOG_FILTER_GENERAL, "Loading Group instance saves...");
@@ -204,7 +204,7 @@ void GroupMgr::LoadGroups()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 group-instance saves. DB table `group_instance` is empty!");
return;
}
@@ -236,6 +236,6 @@ void GroupMgr::LoadGroups()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u group-instance saves in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}

View File

@@ -106,7 +106,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded 0 guild definitions. DB table `guild` is empty.");
return;
}
else
@@ -129,7 +129,7 @@ void GuildMgr::LoadGuilds()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded %u guild definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -147,7 +147,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded 0 guild ranks. DB table `guild_rank` is empty.");
}
else
{
@@ -165,7 +165,7 @@ void GuildMgr::LoadGuilds()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded %u guild ranks in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -190,7 +190,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded 0 guild members. DB table `guild_member` is empty.");
}
else
{
@@ -209,7 +209,7 @@ void GuildMgr::LoadGuilds()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded %u guild members int %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -227,7 +227,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded 0 guild bank tab rights. DB table `guild_bank_right` is empty.");
}
else
{
@@ -245,7 +245,7 @@ void GuildMgr::LoadGuilds()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded %u bank tab rights in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -262,7 +262,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded 0 guild event logs. DB table `guild_eventlog` is empty.");
}
else
{
@@ -280,7 +280,7 @@ void GuildMgr::LoadGuilds()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded %u guild event logs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -298,7 +298,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded 0 guild bank event logs. DB table `guild_bank_eventlog` is empty.");
}
else
{
@@ -316,7 +316,7 @@ void GuildMgr::LoadGuilds()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded %u guild bank event logs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -334,7 +334,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded 0 guild bank tabs. DB table `guild_bank_tab` is empty.");
}
else
{
@@ -352,7 +352,7 @@ void GuildMgr::LoadGuilds()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded %u guild bank tabs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -372,7 +372,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded 0 guild bank tab items. DB table `guild_bank_item` or `item_instance` is empty.");
}
else
{
@@ -390,7 +390,7 @@ void GuildMgr::LoadGuilds()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GUILD, ">> Loaded %u guild bank tab items in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
}
@@ -413,6 +413,6 @@ void GuildMgr::LoadGuilds()
}
sLog->outInfo(LOG_FILTER_GUILD, ">> Validated data of loaded guilds in %u ms", GetMSTimeDiffToNow(oldMSTime));
}
}

View File

@@ -276,7 +276,7 @@ void InstanceSaveManager::LoadInstances()
sInstanceSaveMgr->LoadResetTimes();
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded instances in %u ms", GetMSTimeDiffToNow(oldMSTime));
}
void InstanceSaveManager::LoadResetTimes()

View File

@@ -1481,7 +1481,7 @@ void LoadLootTemplates_Creature()
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 creature loot templates. DB table `creature_loot_template` is empty");
}
void LoadLootTemplates_Disenchant()
@@ -1515,7 +1515,7 @@ void LoadLootTemplates_Disenchant()
sLog->outInfo(LOG_FILTER_LOOT, ">> Loaded %u disenchanting loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 disenchanting loot templates. DB table `disenchant_loot_template` is empty");
}
void LoadLootTemplates_Fishing()
@@ -1541,7 +1541,7 @@ void LoadLootTemplates_Fishing()
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 fishing loot templates. DB table `fishing_loot_template` is empty");
}
void LoadLootTemplates_Gameobject()
@@ -1577,7 +1577,7 @@ void LoadLootTemplates_Gameobject()
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 gameobject loot templates. DB table `gameobject_loot_template` is empty");
}
void LoadLootTemplates_Item()
@@ -1603,7 +1603,7 @@ void LoadLootTemplates_Item()
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 item loot templates. DB table `item_loot_template` is empty");
}
void LoadLootTemplates_Milling()
@@ -1634,7 +1634,7 @@ void LoadLootTemplates_Milling()
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 milling loot templates. DB table `milling_loot_template` is empty");
}
void LoadLootTemplates_Pickpocketing()
@@ -1670,7 +1670,7 @@ void LoadLootTemplates_Pickpocketing()
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 pickpocketing loot templates. DB table `pickpocketing_loot_template` is empty");
}
void LoadLootTemplates_Prospecting()
@@ -1701,7 +1701,7 @@ void LoadLootTemplates_Prospecting()
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 prospecting loot templates. DB table `prospecting_loot_template` is empty");
}
void LoadLootTemplates_Mail()
@@ -1727,7 +1727,7 @@ void LoadLootTemplates_Mail()
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 mail loot templates. DB table `mail_loot_template` is empty");
}
void LoadLootTemplates_Skinning()
@@ -1763,7 +1763,7 @@ void LoadLootTemplates_Skinning()
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 skinning loot templates. DB table `skinning_loot_template` is empty");
}
void LoadLootTemplates_Spell()
@@ -1806,7 +1806,7 @@ void LoadLootTemplates_Spell()
sLog->outInfo(LOG_FILTER_LOOT, ">> Loaded %u spell loot templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
else
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 spell loot templates. DB table `spell_loot_template` is empty");
}
void LoadLootTemplates_Reference()
@@ -1835,5 +1835,5 @@ void LoadLootTemplates_Reference()
LootTemplates_Reference.ReportUnusedIds(lootIdSet);
sLog->outInfo(LOG_FILTER_LOOT, ">> Loaded refence loot templates in %u ms", GetMSTimeDiffToNow(oldMSTime));
}

View File

@@ -49,7 +49,7 @@ void WaypointMgr::Load()
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 waypoints. DB table `waypoint_data` is empty!");
return;
}
@@ -87,7 +87,7 @@ void WaypointMgr::Load()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u waypoints in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void WaypointMgr::ReloadPath(uint32 id)

View File

@@ -47,7 +47,7 @@ void OutdoorPvPMgr::InitOutdoorPvP()
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 outdoor PvP definitions. DB table `outdoorpvp_template` is empty.");
return;
}
@@ -107,7 +107,7 @@ void OutdoorPvPMgr::InitOutdoorPvP()
}
sLog->outInfo(LOG_FILTER_OUTDOORPVP, ">> Loaded %u outdoor PvP definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void OutdoorPvPMgr::AddZone(uint32 zoneid, OutdoorPvP* handle)

View File

@@ -257,7 +257,7 @@ void ScriptMgr::Initialize()
AddScripts();
sLog->outInfo(LOG_FILTER_TSCR, ">> Loaded %u C++ scripts in %u ms", GetScriptCount(), GetMSTimeDiffToNow(oldMSTime));
}
void ScriptMgr::Unload()

View File

@@ -30,14 +30,14 @@ void SystemMgr::LoadScriptTexts()
sLog->outInfo(LOG_FILTER_TSCR, "TSCR: Loading Script Texts additional data...");
uint32 oldMSTime = getMSTime();
// 0 1 2 3
QueryResult result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts");
if (!result)
{
sLog->outInfo(LOG_FILTER_TSCR, ">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
return;
}
@@ -84,7 +84,7 @@ void SystemMgr::LoadScriptTexts()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_TSCR, ">> Loaded %u additional Script Texts data in %u ms", uiCount, GetMSTimeDiffToNow(oldMSTime));
}
void SystemMgr::LoadScriptTextsCustom()
@@ -99,7 +99,7 @@ void SystemMgr::LoadScriptTextsCustom()
if (!result)
{
sLog->outInfo(LOG_FILTER_TSCR, ">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
return;
}
@@ -146,7 +146,7 @@ void SystemMgr::LoadScriptTextsCustom()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_TSCR, ">> Loaded %u additional Custom Texts data.", uiCount);
}
void SystemMgr::LoadScriptWaypoints()
@@ -171,7 +171,7 @@ void SystemMgr::LoadScriptWaypoints()
if (!result)
{
sLog->outInfo(LOG_FILTER_TSCR, ">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
return;
}
@@ -207,5 +207,5 @@ void SystemMgr::LoadScriptWaypoints()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_TSCR, ">> Loaded %u Script Waypoint nodes in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}

View File

@@ -56,7 +56,7 @@ void LoadSkillDiscoveryTable()
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 skill discovery definitions. DB table `skill_discovery_template` is empty.");
return;
}
@@ -154,7 +154,7 @@ void LoadSkillDiscoveryTable()
}
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u skill discovery definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)

View File

@@ -61,7 +61,7 @@ void LoadSkillExtraItemTable()
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 spell specialization definitions. DB table `skill_extra_item_template` is empty.");
return;
}
@@ -111,7 +111,7 @@ void LoadSkillExtraItemTable()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u spell specialization definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
bool canCreateExtraItems(Player* player, uint32 spellId, float &additionalChance, uint8 &additionalMax)

View File

@@ -1156,7 +1156,7 @@ void SpellMgr::LoadSpellRanks()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell rank records. DB table `spell_ranks` is empty.");
return;
}
@@ -1252,7 +1252,7 @@ void SpellMgr::LoadSpellRanks()
} while (!finished);
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u spell rank records in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellRequired()
@@ -1268,7 +1268,7 @@ void SpellMgr::LoadSpellRequired()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell required records. DB table `spell_required` is empty.");
return;
}
@@ -1313,7 +1313,7 @@ void SpellMgr::LoadSpellRequired()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u spell required records in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellLearnSkills()
@@ -1351,7 +1351,7 @@ void SpellMgr::LoadSpellLearnSkills()
}
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u Spell Learn Skills from DBC in %u ms", dbc_count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellLearnSpells()
@@ -1365,7 +1365,7 @@ void SpellMgr::LoadSpellLearnSpells()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell learn spells. DB table `spell_learn_spell` is empty.");
return;
}
@@ -1454,7 +1454,7 @@ void SpellMgr::LoadSpellLearnSpells()
}
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u spell learn spells + %u found in DBC in %u ms", count, dbc_count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellTargetPositions()
@@ -1468,7 +1468,7 @@ void SpellMgr::LoadSpellTargetPositions()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell target coordinates. DB table `spell_target_position` is empty.");
return;
}
@@ -1574,7 +1574,7 @@ void SpellMgr::LoadSpellTargetPositions()
}*/
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u spell teleport coordinates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellGroups()
@@ -1589,7 +1589,7 @@ void SpellMgr::LoadSpellGroups()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell group definitions. DB table `spell_group` is empty.");
return;
}
@@ -1656,7 +1656,7 @@ void SpellMgr::LoadSpellGroups()
}
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u spell group definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellGroupStackRules()
@@ -1670,7 +1670,7 @@ void SpellMgr::LoadSpellGroupStackRules()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell group stack rules. DB table `spell_group_stack_rules` is empty.");
return;
}
@@ -1701,7 +1701,7 @@ void SpellMgr::LoadSpellGroupStackRules()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u spell group stack rules in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellProcEvents()
@@ -1715,7 +1715,7 @@ void SpellMgr::LoadSpellProcEvents()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell proc event conditions. DB table `spell_proc_event` is empty.");
return;
}
@@ -1765,7 +1765,7 @@ void SpellMgr::LoadSpellProcEvents()
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u extra and %u custom spell proc event conditions in %u ms", count, customProc, GetMSTimeDiffToNow(oldMSTime));
else
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u extra spell proc event conditions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellProcs()
@@ -1779,7 +1779,7 @@ void SpellMgr::LoadSpellProcs()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell proc conditions and data. DB table `spell_proc` is empty.");
return;
}
@@ -1906,7 +1906,7 @@ void SpellMgr::LoadSpellProcs()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u spell proc conditions and data in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellBonusess()
@@ -1920,7 +1920,7 @@ void SpellMgr::LoadSpellBonusess()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell bonus data. DB table `spell_bonus_data` is empty.");
return;
}
@@ -1947,7 +1947,7 @@ void SpellMgr::LoadSpellBonusess()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u extra spell bonus data in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellThreats()
@@ -1961,7 +1961,7 @@ void SpellMgr::LoadSpellThreats()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 aggro generating spells. DB table `spell_threat` is empty.");
return;
}
@@ -1988,7 +1988,7 @@ void SpellMgr::LoadSpellThreats()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u SpellThreatEntries in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSkillLineAbilityMap()
@@ -2010,7 +2010,7 @@ void SpellMgr::LoadSkillLineAbilityMap()
}
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u SkillLineAbility MultiMap Data in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellPetAuras()
@@ -2024,7 +2024,7 @@ void SpellMgr::LoadSpellPetAuras()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell pet auras. DB table `spell_pet_auras` is empty.");
return;
}
@@ -2072,7 +2072,7 @@ void SpellMgr::LoadSpellPetAuras()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u spell pet auras in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
// Fill custom data about enchancments
@@ -2113,7 +2113,7 @@ void SpellMgr::LoadEnchantCustomAttr()
}
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u custom enchant attributes in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellEnchantProcData()
@@ -2127,7 +2127,7 @@ void SpellMgr::LoadSpellEnchantProcData()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell enchant proc event conditions. DB table `spell_enchant_proc_data` is empty.");
return;
}
@@ -2157,7 +2157,7 @@ void SpellMgr::LoadSpellEnchantProcData()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u enchant proc data definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellLinked()
@@ -2171,7 +2171,7 @@ void SpellMgr::LoadSpellLinked()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 linked spells. DB table `spell_linked_spell` is empty.");
return;
}
@@ -2210,7 +2210,7 @@ void SpellMgr::LoadSpellLinked()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u linked spells in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadPetLevelupSpellMap()
@@ -2267,7 +2267,7 @@ void SpellMgr::LoadPetLevelupSpellMap()
}
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u pet levelup and default spells for %u families in %u ms", count, family_count, GetMSTimeDiffToNow(oldMSTime));
}
bool LoadPetDefaultSpells_helper(CreatureTemplate const* cInfo, PetDefaultSpellsEntry& petDefSpells)
@@ -2352,7 +2352,7 @@ void SpellMgr::LoadPetDefaultSpells()
}
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded addition spells for %u pet spell data entries in %u ms", countData, GetMSTimeDiffToNow(oldMSTime));
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, "Loading summonable creature templates...");
oldMSTime = getMSTime();
@@ -2396,7 +2396,7 @@ void SpellMgr::LoadPetDefaultSpells()
}
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u summonable creature templates in %u ms", countCreature, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellAreas()
@@ -2415,7 +2415,7 @@ void SpellMgr::LoadSpellAreas()
if (!result)
{
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded 0 spell area requirements. DB table `spell_area` is empty.");
return;
}
@@ -2596,7 +2596,7 @@ void SpellMgr::LoadSpellAreas()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded %u spell area requirements in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadSpellInfoStore()
@@ -2613,7 +2613,7 @@ void SpellMgr::LoadSpellInfoStore()
}
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded spell custom attributes in %u ms", GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::UnloadSpellInfoStore()
@@ -2926,7 +2926,7 @@ void SpellMgr::LoadSpellCustomAttr()
CreatureAI::FillAISpellInfo();
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loaded spell custom attributes in %u ms", GetMSTimeDiffToNow(oldMSTime));
}
void SpellMgr::LoadDbcDataCorrections()
@@ -3570,5 +3570,5 @@ void SpellMgr::LoadDbcDataCorrections()
properties->Type = SUMMON_TYPE_TOTEM;
sLog->outInfo(LOG_FILTER_SPELLS_AURAS, ">> Loading spell dbc data corrections in %u ms", GetMSTimeDiffToNow(oldMSTime));
}

View File

@@ -78,7 +78,7 @@ void CreatureTextMgr::LoadCreatureTexts()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 ceature texts. DB table `creature_texts` is empty.");
return;
}
@@ -137,7 +137,7 @@ void CreatureTextMgr::LoadCreatureTexts()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u creature texts for %u creatures in %u ms", textCount, creatureCount, GetMSTimeDiffToNow(oldMSTime));
}
void CreatureTextMgr::LoadCreatureTextLocales()
@@ -167,7 +167,7 @@ void CreatureTextMgr::LoadCreatureTextLocales()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u creature localized texts in %u ms", textCount, GetMSTimeDiffToNow(oldMSTime));
}
uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, uint64 whisperGuid /*= 0*/, ChatMsg msgType /*= CHAT_MSG_ADDON*/, Language language /*= LANG_ADDON*/, TextRange range /*= TEXT_RANGE_NORMAL*/, uint32 sound /*= 0*/, Team team /*= TEAM_OTHER*/, bool gmOnly /*= false*/, Player* srcPlr /*= NULL*/)

View File

@@ -264,7 +264,7 @@ void TicketMgr::LoadTickets()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 GM tickets. DB table `gm_tickets` is empty!");
return;
}
@@ -291,7 +291,7 @@ void TicketMgr::LoadTickets()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u GM tickets in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void TicketMgr::LoadSurveys()
@@ -304,7 +304,7 @@ void TicketMgr::LoadSurveys()
_lastSurveyId = (*result)[0].GetUInt32();
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded GM Survey count from database in %u ms", GetMSTimeDiffToNow(oldMSTime));
}
void TicketMgr::AddTicket(GmTicket* ticket)

View File

@@ -64,7 +64,7 @@ void CharacterDatabaseCleaner::CleanDatabase()
sWorld->SetCleaningFlags(flags);
sLog->outInfo(LOG_FILTER_GENERAL, ">> Cleaned character database in %u ms", GetMSTimeDiffToNow(oldMSTime));
}
void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table, bool (*check)(uint32))

View File

@@ -44,7 +44,7 @@ void WardenCheckMgr::LoadWardenChecks()
if (!sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED))
{
sLog->outInfo(LOG_FILTER_WARDEN, ">> Warden disabled, loading checks skipped.");
return;
}
@@ -53,7 +53,7 @@ void WardenCheckMgr::LoadWardenChecks()
if (!result)
{
sLog->outInfo(LOG_FILTER_WARDEN, ">> Loaded 0 Warden checks. DB table `warden_checks` is empty!");
return;
}
@@ -146,7 +146,7 @@ void WardenCheckMgr::LoadWardenChecks()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_WARDEN, ">> Loaded %u warden checks.", count);
}
void WardenCheckMgr::LoadWardenOverrides()
@@ -155,7 +155,7 @@ void WardenCheckMgr::LoadWardenOverrides()
if (!sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED))
{
sLog->outInfo(LOG_FILTER_WARDEN, ">> Warden disabled, loading check overrides skipped.");
return;
}
@@ -165,7 +165,7 @@ void WardenCheckMgr::LoadWardenOverrides()
if (!result)
{
sLog->outInfo(LOG_FILTER_WARDEN, ">> Loaded 0 Warden action overrides. DB table `warden_action` is empty!");
return;
}
@@ -195,7 +195,7 @@ void WardenCheckMgr::LoadWardenOverrides()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_WARDEN, ">> Loaded %u warden action overrides.", count);
}
WardenCheck* WardenCheckMgr::GetWardenDataById(uint16 Id)

View File

@@ -94,7 +94,7 @@ void LoadWeatherData()
if (!result)
{
sLog->outError(LOG_FILTER_SQL, ">> Loaded 0 weather definitions. DB table `game_weather` is empty.");
return;
}
@@ -138,7 +138,7 @@ void LoadWeatherData()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u weather definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
void SendFineWeatherUpdateToPlayer(Player* player)

View File

@@ -1246,7 +1246,7 @@ void World::SetInitialWorldSettings()
sGameEventMgr->Initialize();
///- Loading strings. Getting no records means core load has to be canceled because no error message can be output.
sLog->outInfo(LOG_FILTER_GENERAL, "Loading Trinity strings...");
if (!sObjectMgr->LoadTrinityStrings())
exit(1); // Error message displayed in function already
@@ -1314,7 +1314,7 @@ void World::SetInitialWorldSettings()
sObjectMgr->SetDBCLocaleIndex(GetDefaultDbcLocale()); // Get once for all the locale index of DBC language (console/broadcasts)
sLog->outInfo(LOG_FILTER_GENERAL, ">> Localization strings loaded in %u ms", GetMSTimeDiffToNow(oldMSTime));
sLog->outInfo(LOG_FILTER_GENERAL, "Loading Page Texts...");
sObjectMgr->LoadPageTexts();
@@ -1794,7 +1794,7 @@ void World::DetectDBCLang()
m_defaultDbcLocale = LocaleConstant(default_locale);
sLog->outInfo(LOG_FILTER_GENERAL, "Using %s DBC Locale as default. All available DBC locales: %s", localeNames[m_defaultDbcLocale], availableLocalsStr.empty() ? "<none>" : availableLocalsStr.c_str());
}
void World::RecordTimeDiff(const char *text, ...)
@@ -1834,7 +1834,7 @@ void World::LoadAutobroadcasts()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 autobroadcasts definitions. DB table `autobroadcast` is empty!");
return;
}
@@ -1852,7 +1852,7 @@ void World::LoadAutobroadcasts()
} while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u autobroadcasts definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
/// Update the World !
@@ -2835,7 +2835,7 @@ void World::LoadWorldStates()
if (!result)
{
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 world states. DB table `worldstates` is empty!");
return;
}
@@ -2850,7 +2850,7 @@ void World::LoadWorldStates()
while (result->NextRow());
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u world states in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}
// Setting a worldstate will save it to DB

View File

@@ -27,7 +27,7 @@ namespace Trinity
{
public:
AutoPtr() : ACE_Strong_Bound_Ptr<Pointer, Lock>() {}
AutoPtr(Pointer* x)
{
ACE_Strong_Bound_Ptr<Pointer, Lock>::reset(x);

View File

@@ -175,7 +175,7 @@ bool MySQLConnection::Execute(const char* sql)
return false;
}
else
else
sLog->outDebug(LOG_FILTER_SQL, "[%u ms] SQL: %s", getMSTimeDiff(_s, getMSTime()), sql);
}

View File

@@ -2,7 +2,7 @@
#define APPENDER_H
#include "Define.h"
#include <time.h>
#include <string>
#include <map>

View File

@@ -480,12 +480,12 @@ class ByteBuffer
{
if (!sLog->ShouldLog(LOG_FILTER_NETWORKIO, LOG_LEVEL_TRACE)) // optimize disabled debug output
return;
uint32 j = 1, k = 1;
std::ostringstream o;
o << "STORAGE_SIZE: " << size();
for (uint32 i = 0; i < size(); ++i)
{
char buf[3];
@@ -501,7 +501,7 @@ class ByteBuffer
++k;
++j;
}
o << buf;
}
o << " ";