aboutsummaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/AchievementMgr.cpp16
-rw-r--r--src/game/AuctionHouseMgr.cpp12
-rw-r--r--src/game/BattleGroundMgr.cpp8
-rw-r--r--src/game/CreatureGroups.cpp4
-rw-r--r--src/game/GameEventMgr.cpp66
-rw-r--r--src/game/InstanceSaveMgr.cpp4
-rw-r--r--src/game/ItemEnchantmentMgr.cpp4
-rw-r--r--src/game/LootMgr.cpp4
-rw-r--r--src/game/ObjectMgr.cpp238
-rw-r--r--src/game/PoolHandler.cpp18
-rw-r--r--src/game/ScriptCalls.cpp2
-rw-r--r--src/game/SkillDiscovery.cpp4
-rw-r--r--src/game/SkillExtraItems.cpp4
-rw-r--r--src/game/SpellMgr.cpp54
-rw-r--r--src/game/Transports.cpp4
-rw-r--r--src/game/World.cpp54
16 files changed, 254 insertions, 242 deletions
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
index 59e2c533462..9267409f362 100644
--- a/src/game/AchievementMgr.cpp
+++ b/src/game/AchievementMgr.cpp
@@ -1291,7 +1291,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList()
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded 0 achievement criteria.");
return;
}
@@ -1308,7 +1308,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList()
m_AchievementCriteriasByType[criteria->requiredType].push_back(criteria);
}
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u achievement criteria.",m_AchievementCriteriasByType->size());
}
@@ -1322,7 +1322,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements()
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 realm completed achievements . DB table `character_achievement` is empty.");
return;
}
@@ -1337,7 +1337,7 @@ void AchievementGlobalMgr::LoadCompletedAchievements()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u realm completed achievements.",m_allCompletedAchievements.size());
}
@@ -1354,7 +1354,7 @@ void AchievementGlobalMgr::LoadRewards()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded 0 achievement rewards. DB table `achievement_reward` is empty.");
return;
}
@@ -1447,7 +1447,7 @@ void AchievementGlobalMgr::LoadRewards()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u achievement reward locale strings", m_achievementRewardLocales.size() );
}
@@ -1463,7 +1463,7 @@ void AchievementGlobalMgr::LoadRewardLocales()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 achievement reward locale strings. DB table `locales_achievement_reward` is empty.");
return;
}
@@ -1516,6 +1516,6 @@ void AchievementGlobalMgr::LoadRewardLocales()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u achievement reward locale strings", m_achievementRewardLocales.size() );
}
diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index 9e905d72564..0e028b62296 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -285,7 +285,7 @@ void AuctionHouseMgr::LoadAuctionItems()
{
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 auction items");
return;
}
@@ -325,7 +325,7 @@ void AuctionHouseMgr::LoadAuctionItems()
while( result->NextRow() );
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u auction items", count );
}
@@ -336,7 +336,7 @@ void AuctionHouseMgr::LoadAuctions()
{
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
return;
}
@@ -349,7 +349,7 @@ void AuctionHouseMgr::LoadAuctions()
{
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
return;
}
@@ -359,7 +359,7 @@ void AuctionHouseMgr::LoadAuctions()
{
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
return;
}
@@ -430,7 +430,7 @@ void AuctionHouseMgr::LoadAuctions()
} while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u auctions", AuctionCount );
}
diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp
index e6492a7a100..ce9eae6a5c8 100644
--- a/src/game/BattleGroundMgr.cpp
+++ b/src/game/BattleGroundMgr.cpp
@@ -1719,7 +1719,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded 0 battlegrounds. DB table `battleground_template` is empty.");
return;
}
@@ -1815,7 +1815,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u battlegrounds", count );
}
@@ -2097,7 +2097,7 @@ void BattleGroundMgr::LoadBattleMastersEntry()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded 0 battlemaster entries - table is empty!" );
return;
}
@@ -2125,6 +2125,6 @@ void BattleGroundMgr::LoadBattleMastersEntry()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u battlemaster entries", count );
}
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 1314e865b48..74e03c97e3b 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -117,9 +117,9 @@ void CreatureGroupManager::LoadCreatureFormations()
}
while(result->NextRow()) ;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u creatures in formations", total_records );
- sLog.outString();
+ sLog.outString("");
//Free some heap
delete result;
}
diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
index 53d01529fb9..a1342b972b0 100644
--- a/src/game/GameEventMgr.cpp
+++ b/src/game/GameEventMgr.cpp
@@ -175,7 +175,7 @@ void GameEventMgr::LoadFromDB()
if( !result )
{
sLog.outString(">> Table game_event is empty.");
- sLog.outString();
+ sLog.outString("");
return;
}
@@ -192,7 +192,7 @@ void GameEventMgr::LoadFromDB()
{
mGameEvent.clear();
sLog.outString(">> Table game_event is empty!");
- sLog.outString();
+ sLog.outString("");
return;
}
@@ -246,7 +246,7 @@ void GameEventMgr::LoadFromDB()
} while( result->NextRow() );
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u game events", count );
}
@@ -260,7 +260,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar2(1);
bar2.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u game event saves in game events", count );
}
else
@@ -295,7 +295,7 @@ void GameEventMgr::LoadFromDB()
++count;
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u game event saves in game events", count );
delete result;
}
@@ -307,7 +307,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar2(1);
bar2.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u game event prerequisites in game events", count );
}
else
@@ -348,7 +348,7 @@ void GameEventMgr::LoadFromDB()
++count;
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u game event prerequisites in game events", count );
delete result;
}
@@ -364,7 +364,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u creatures in game events", count );
}
else
@@ -395,7 +395,7 @@ void GameEventMgr::LoadFromDB()
} while( result->NextRow() );
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u creatures in game events", count );
}
@@ -410,7 +410,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u gameobjects in game events", count );
}
else
@@ -441,7 +441,7 @@ void GameEventMgr::LoadFromDB()
} while( result->NextRow() );
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u gameobjects in game events", count );
}
@@ -458,7 +458,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u model/equipment changes in game events", count );
}
else
@@ -501,7 +501,7 @@ void GameEventMgr::LoadFromDB()
} while( result->NextRow() );
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u model/equipment changes in game events", count );
}
@@ -515,7 +515,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u quests additions in game events", count );
}
else
@@ -542,7 +542,7 @@ void GameEventMgr::LoadFromDB()
questlist.push_back(QuestRelation(id, quest));
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u quests additions in game events", count );
delete result;
@@ -558,7 +558,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar3(1);
bar3.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u go quests additions in game events", count );
}
else
@@ -587,7 +587,7 @@ void GameEventMgr::LoadFromDB()
} while( result->NextRow() );
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u quests additions in game events", count );
}
@@ -601,7 +601,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar3(1);
bar3.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u quest event conditions in game events", count );
}
else
@@ -630,7 +630,7 @@ void GameEventMgr::LoadFromDB()
mQuestToEventConditions[quest].num = num;
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u quest event conditions in game events", count );
delete result;
@@ -646,7 +646,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar3(1);
bar3.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u conditions in game events", count );
}
else
@@ -675,7 +675,7 @@ void GameEventMgr::LoadFromDB()
++count;
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u conditions in game events", count );
delete result;
@@ -691,7 +691,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar3(1);
bar3.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u condition saves in game events", count );
}
else
@@ -726,7 +726,7 @@ void GameEventMgr::LoadFromDB()
++count;
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u condition saves in game events", count );
delete result;
@@ -743,7 +743,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar3(1);
bar3.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u npcflags in game events", count );
}
else
@@ -770,7 +770,7 @@ void GameEventMgr::LoadFromDB()
++count;
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u npcflags in game events", count );
delete result;
@@ -786,7 +786,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar3(1);
bar3.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u vendor additions in game events", count );
}
else
@@ -837,7 +837,7 @@ void GameEventMgr::LoadFromDB()
vendors.push_back(newEntry);
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u vendor additions in game events", count );
delete result;
@@ -853,7 +853,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar3(1);
bar3.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u npc gossip textids in game events", count );
}
else
@@ -880,7 +880,7 @@ void GameEventMgr::LoadFromDB()
++count;
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u npc gossip textids in game events", count );
delete result;
@@ -898,7 +898,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar3(1);
bar3.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u battleground holidays in game events", count );
}
else
@@ -924,7 +924,7 @@ void GameEventMgr::LoadFromDB()
mGameEventBattleGroundHolidays[event_id] = fields[1].GetUInt32();
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u battleground holidays in game events", count );
delete result;
@@ -945,7 +945,7 @@ void GameEventMgr::LoadFromDB()
barGoLink bar2(1);
bar2.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u pools in game events", count );
}
else
@@ -980,7 +980,7 @@ void GameEventMgr::LoadFromDB()
poollist.push_back(entry);
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u pools in game events", count );
delete result;
}
diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp
index d4232a71838..ff4810ad729 100644
--- a/src/game/InstanceSaveMgr.cpp
+++ b/src/game/InstanceSaveMgr.cpp
@@ -308,7 +308,7 @@ void InstanceSaveManager::CleanupInstances()
}
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Initialized %u instances", (uint32)InstanceSet.size());
}
@@ -358,7 +358,7 @@ void InstanceSaveManager::PackInstances()
}
sLog.outString( ">> Instance numbers remapped, next instance id is %u", InstanceNumber );
- sLog.outString();
+ sLog.outString("");
}
void InstanceSaveManager::LoadResetTimes()
diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/game/ItemEnchantmentMgr.cpp
index e4b2d809582..78754a5941a 100644
--- a/src/game/ItemEnchantmentMgr.cpp
+++ b/src/game/ItemEnchantmentMgr.cpp
@@ -78,12 +78,12 @@ void LoadRandomEnchantmentsTable()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u Item Enchantment definitions", count );
}
else
{
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb( ">> Loaded 0 Item Enchantment definitions. DB table `item_enchantment_template` is empty.");
}
}
diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp
index 100e1b8c33a..ec1ebca5381 100644
--- a/src/game/LootMgr.cpp
+++ b/src/game/LootMgr.cpp
@@ -168,12 +168,12 @@ void LootStore::LoadLootTable()
Verify(); // Checks validity of the loot store
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u loot definitions (%d templates)", count, m_LootTemplates.size());
}
else
{
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb( ">> Loaded 0 loot definitions. DB table `%s` is empty.",GetName() );
}
}
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 6326ac7ff7a..0db8a328d3f 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -213,7 +213,7 @@ void ObjectMgr::LoadPlayerInfoInCache()
while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded info about %d players", m_mPlayerInfoMap.size());
}
@@ -336,7 +336,7 @@ void ObjectMgr::LoadCreatureLocales()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 creature locale strings. DB table `locales_creature` is empty.");
return;
}
@@ -383,7 +383,7 @@ void ObjectMgr::LoadCreatureLocales()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u creature locale strings", mCreatureLocaleMap.size() );
}
@@ -404,7 +404,7 @@ void ObjectMgr::LoadNpcOptionLocales()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 npc_option locale strings. DB table `locales_npc_option` is empty.");
return;
}
@@ -451,7 +451,7 @@ void ObjectMgr::LoadNpcOptionLocales()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u npc_option locale strings", mNpcOptionLocaleMap.size() );
}
@@ -467,7 +467,7 @@ void ObjectMgr::LoadPointOfInterestLocales()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 points_of_interest locale strings. DB table `locales_points_of_interest` is empty.");
return;
}
@@ -502,7 +502,7 @@ void ObjectMgr::LoadPointOfInterestLocales()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u points_of_interest locale strings", mPointOfInterestLocaleMap.size() );
}
@@ -521,7 +521,7 @@ void ObjectMgr::LoadCreatureTemplates()
loader.Load(sCreatureStorage);
sLog.outString( ">> Loaded %u creature definitions", sCreatureStorage.RecordCount );
- sLog.outString();
+ sLog.outString("");
std::set<uint32> heroicEntries; // already loaded heroic value in creatures
std::set<uint32> hasHeroicEntries; // already loaded creatures with heroic entry values
@@ -779,7 +779,7 @@ void ObjectMgr::LoadCreatureAddons()
sCreatureInfoAddonStorage.Load();
sLog.outString( ">> Loaded %u creature template addons", sCreatureInfoAddonStorage.RecordCount );
- sLog.outString();
+ sLog.outString("");
// check data correctness and convert 'auras'
for(uint32 i = 1; i < sCreatureInfoAddonStorage.MaxEntry; ++i)
@@ -797,7 +797,7 @@ void ObjectMgr::LoadCreatureAddons()
sCreatureDataAddonStorage.Load();
sLog.outString( ">> Loaded %u creature addons", sCreatureDataAddonStorage.RecordCount );
- sLog.outString();
+ sLog.outString("");
// check data correctness and convert 'auras'
for(uint32 i = 1; i < sCreatureDataAddonStorage.MaxEntry; ++i)
@@ -859,7 +859,7 @@ void ObjectMgr::LoadEquipmentTemplates()
}
}
sLog.outString( ">> Loaded %u equipment template", sEquipmentStorage.RecordCount );
- sLog.outString();
+ sLog.outString("");
// This DBC is currently only used for item templates and creature equipments checks.
sItemStore.Clear();
@@ -910,7 +910,7 @@ void ObjectMgr::LoadCreatureModelInfo()
sCreatureModelStorage.Load();
sLog.outString( ">> Loaded %u creature model based info", sCreatureModelStorage.RecordCount );
- sLog.outString();
+ sLog.outString("");
// check if combat_reach is valid
for(uint32 i = 1; i < sCreatureModelStorage.MaxEntry; ++i)
@@ -945,7 +945,7 @@ void ObjectMgr::LoadCreatures()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded 0 creature. DB table `creature` is empty.");
return;
}
@@ -1067,7 +1067,7 @@ void ObjectMgr::LoadCreatures()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u creatures", mCreatureDataMap.size() );
}
@@ -1120,7 +1120,7 @@ void ObjectMgr::LoadGameobjects()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded 0 gameobjects. DB table `gameobject` is empty.");
return;
}
@@ -1195,7 +1195,7 @@ void ObjectMgr::LoadGameobjects()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u gameobjects", mGameObjectDataMap.size());
}
@@ -1246,7 +1246,7 @@ void ObjectMgr::LoadCreatureRespawnTimes()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 creature respawn time.");
return;
}
@@ -1270,7 +1270,7 @@ void ObjectMgr::LoadCreatureRespawnTimes()
delete result;
sLog.outString( ">> Loaded %u creature respawn times", mCreatureRespawnTimes.size() );
- sLog.outString();
+ sLog.outString("");
}
void ObjectMgr::LoadGameobjectRespawnTimes()
@@ -1288,7 +1288,7 @@ void ObjectMgr::LoadGameobjectRespawnTimes()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 gameobject respawn time.");
return;
}
@@ -1312,7 +1312,7 @@ void ObjectMgr::LoadGameobjectRespawnTimes()
delete result;
sLog.outString( ">> Loaded %u gameobject respawn times", mGORespawnTimes.size() );
- sLog.outString();
+ sLog.outString("");
}
// name must be checked to correctness (if received) before call this function
@@ -1414,7 +1414,7 @@ void ObjectMgr::LoadItemLocales()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 Item locale strings. DB table `locales_item` is empty.");
return;
}
@@ -1462,7 +1462,7 @@ void ObjectMgr::LoadItemLocales()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u Item locale strings", mItemLocaleMap.size() );
}
@@ -1480,7 +1480,7 @@ void ObjectMgr::LoadItemPrototypes()
SQLItemLoader loader;
loader.Load(sItemStorage);
sLog.outString( ">> Loaded %u item prototypes", sItemStorage.RecordCount );
- sLog.outString();
+ sLog.outString("");
// check data correctness
for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i)
@@ -1852,7 +1852,7 @@ void ObjectMgr::LoadPetLevelInfo()
{
barGoLink bar( 1 );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u level pet stats definitions", count );
sLog.outErrorDb( "Error loading `pet_levelstats` table or empty table.");
return;
@@ -1913,7 +1913,7 @@ void ObjectMgr::LoadPetLevelInfo()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u level pet stats definitions", count );
}
@@ -1966,7 +1966,7 @@ void ObjectMgr::LoadPlayerInfo()
{
barGoLink bar( 1 );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u player create definitions", count );
sLog.outErrorDb( "Error loading `playercreateinfo` table or empty table.");
exit(1);
@@ -2042,7 +2042,7 @@ void ObjectMgr::LoadPlayerInfo()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u player create definitions", count );
}
@@ -2059,7 +2059,7 @@ void ObjectMgr::LoadPlayerInfo()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u custom player create items", count );
}
else
@@ -2111,7 +2111,7 @@ void ObjectMgr::LoadPlayerInfo()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u custom player create items", count );
}
}
@@ -2131,7 +2131,7 @@ void ObjectMgr::LoadPlayerInfo()
{
barGoLink bar( 1 );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u player create spells", count );
sLog.outErrorDb( "Error loading player starting spells or empty table.");
}
@@ -2167,7 +2167,7 @@ void ObjectMgr::LoadPlayerInfo()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u player create spells", count );
}
}
@@ -2183,7 +2183,7 @@ void ObjectMgr::LoadPlayerInfo()
{
barGoLink bar( 1 );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u player create actions", count );
sLog.outErrorDb( "Error loading `playercreateinfo_action` table or empty table.");
}
@@ -2222,7 +2222,7 @@ void ObjectMgr::LoadPlayerInfo()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u player create actions", count );
}
}
@@ -2238,7 +2238,7 @@ void ObjectMgr::LoadPlayerInfo()
{
barGoLink bar( 1 );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u level health/mana definitions", count );
sLog.outErrorDb( "Error loading `player_classlevelstats` table or empty table.");
exit(1);
@@ -2287,7 +2287,7 @@ void ObjectMgr::LoadPlayerInfo()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u level health/mana definitions", count );
}
@@ -2329,7 +2329,7 @@ void ObjectMgr::LoadPlayerInfo()
{
barGoLink bar( 1 );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u level stats definitions", count );
sLog.outErrorDb( "Error loading `player_levelstats` table or empty table.");
exit(1);
@@ -2387,7 +2387,7 @@ void ObjectMgr::LoadPlayerInfo()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u level stats definitions", count );
}
@@ -2452,7 +2452,7 @@ void ObjectMgr::LoadPlayerInfo()
{
barGoLink bar( 1 );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u xp for level definitions", count );
sLog.outErrorDb( "Error loading `player_xp_for_level` table or empty table.");
exit(1);
@@ -2487,7 +2487,7 @@ void ObjectMgr::LoadPlayerInfo()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u xp for level definitions", count );
}
@@ -2619,7 +2619,7 @@ void ObjectMgr::LoadGuilds()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u guild definitions", count );
return;
}
@@ -2646,7 +2646,7 @@ void ObjectMgr::LoadGuilds()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u guild definitions", count );
}
@@ -2663,7 +2663,7 @@ void ObjectMgr::LoadArenaTeams()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u arenateam definitions", count );
return;
}
@@ -2688,7 +2688,7 @@ void ObjectMgr::LoadArenaTeams()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u arenateam definitions", count );
}
@@ -2707,7 +2707,7 @@ void ObjectMgr::LoadGroups()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u group definitions", count );
return;
}
@@ -2733,7 +2733,7 @@ void ObjectMgr::LoadGroups()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u group definitions", count );
// -- loading members --
@@ -2839,10 +2839,10 @@ void ObjectMgr::LoadGroups()
delete result;
}
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u group-instance binds total", count );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u group members total", count );
}
@@ -2891,7 +2891,7 @@ void ObjectMgr::LoadQuests()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded 0 quests definitions" );
sLog.outErrorDb("`quest_template` table is empty!");
return;
@@ -3480,7 +3480,7 @@ void ObjectMgr::LoadQuests()
}
}
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u quests definitions", mQuestTemplates.size() );
}
@@ -3506,7 +3506,7 @@ void ObjectMgr::LoadQuestLocales()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 Quest locale strings. DB table `locales_quest` is empty.");
return;
}
@@ -3616,7 +3616,7 @@ void ObjectMgr::LoadQuestLocales()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u Quest locale strings", mQuestLocaleMap.size() );
}
@@ -3628,7 +3628,7 @@ void ObjectMgr::LoadPetCreateSpells()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded 0 pet create spells" );
sLog.outErrorDb("`petcreateinfo_spell` table is empty!");
return;
@@ -3667,7 +3667,7 @@ void ObjectMgr::LoadPetCreateSpells()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u pet create spells", count );
}
@@ -3689,7 +3689,7 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u script definitions", count );
return;
}
@@ -3911,7 +3911,7 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u script definitions", count );
}
@@ -4061,7 +4061,7 @@ void ObjectMgr::LoadItemTexts()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u item pages", count );
return;
}
@@ -4083,7 +4083,7 @@ void ObjectMgr::LoadItemTexts()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u item texts", count );
}
@@ -4093,7 +4093,7 @@ void ObjectMgr::LoadPageTexts()
sPageTextStore.Load();
sLog.outString( ">> Loaded %u page texts", sPageTextStore.RecordCount );
- sLog.outString();
+ sLog.outString("");
for(uint32 i = 1; i < sPageTextStore.MaxEntry; ++i)
{
@@ -4143,7 +4143,7 @@ void ObjectMgr::LoadPageTextLocales()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 PageText locale strings. DB table `locales_page_text` is empty.");
return;
}
@@ -4179,7 +4179,7 @@ void ObjectMgr::LoadPageTextLocales()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u PageText locale strings", mPageTextLocaleMap.size() );
}
@@ -4234,7 +4234,7 @@ void ObjectMgr::LoadInstanceTemplate()
}
sLog.outString( ">> Loaded %u Instance Template definitions", sInstanceTemplate.RecordCount );
- sLog.outString();
+ sLog.outString("");
}
GossipText const *ObjectMgr::GetGossipText(uint32 Text_ID) const
@@ -4255,7 +4255,7 @@ void ObjectMgr::LoadGossipText()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u npc texts", count );
return;
}
@@ -4298,7 +4298,7 @@ void ObjectMgr::LoadGossipText()
}
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u npc texts", count );
delete result;
}
@@ -4324,7 +4324,7 @@ void ObjectMgr::LoadNpcTextLocales()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 Quest locale strings. DB table `locales_npc_text` is empty.");
return;
}
@@ -4374,7 +4374,7 @@ void ObjectMgr::LoadNpcTextLocales()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u NpcText locale strings", mNpcTextLocaleMap.size() );
}
@@ -4392,7 +4392,7 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
{
barGoLink bar(1);
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Only expired mails (need to be return or delete) or DB table `mail` is empty.");
return; // any mails need to be returned or deleted
}
@@ -4479,7 +4479,7 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
} while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u mails", count );
}
@@ -4496,7 +4496,7 @@ void ObjectMgr::LoadQuestAreaTriggers()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u quest trigger points", count );
return;
}
@@ -4544,7 +4544,7 @@ void ObjectMgr::LoadQuestAreaTriggers()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u quest trigger points", count );
}
@@ -4561,7 +4561,7 @@ void ObjectMgr::LoadTavernAreaTriggers()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u tavern triggers", count );
return;
}
@@ -4589,7 +4589,7 @@ void ObjectMgr::LoadTavernAreaTriggers()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u tavern triggers", count );
}
@@ -4605,7 +4605,7 @@ void ObjectMgr::LoadAreaTriggerScripts()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u areatrigger scripts", count );
return;
}
@@ -4633,7 +4633,7 @@ void ObjectMgr::LoadAreaTriggerScripts()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u areatrigger scripts", count );
}
@@ -4791,7 +4791,7 @@ void ObjectMgr::LoadGraveyardZones()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u graveyard-zone links", count );
return;
}
@@ -4841,7 +4841,7 @@ void ObjectMgr::LoadGraveyardZones()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u graveyard-zone links", count );
}
@@ -5058,7 +5058,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u area trigger teleport definitions", count );
return;
}
@@ -5110,7 +5110,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u area trigger teleport definitions", count );
}
@@ -5129,7 +5129,7 @@ void ObjectMgr::LoadAccessRequirements()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u access requirement definitions", count );
return;
}
@@ -5225,7 +5225,7 @@ void ObjectMgr::LoadAccessRequirements()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u access requirement definitions", count );
}
@@ -5491,7 +5491,7 @@ void ObjectMgr::LoadGameObjectLocales()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded 0 gameobject locale strings. DB table `locales_gameobject` is empty.");
return;
}
@@ -5543,7 +5543,7 @@ void ObjectMgr::LoadGameObjectLocales()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u gameobject locale strings", mGameObjectLocaleMap.size() );
}
@@ -5739,7 +5739,7 @@ void ObjectMgr::LoadGameobjectInfo()
}
sLog.outString( ">> Loaded %u game object templates", sGOStorage.RecordCount );
- sLog.outString();
+ sLog.outString("");
}
void ObjectMgr::LoadExplorationBaseXP()
@@ -5753,7 +5753,7 @@ void ObjectMgr::LoadExplorationBaseXP()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u BaseXP definitions", count );
return;
}
@@ -5774,7 +5774,7 @@ void ObjectMgr::LoadExplorationBaseXP()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u BaseXP definitions", count );
}
@@ -5801,7 +5801,7 @@ void ObjectMgr::LoadPetNames()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u pet name parts", count );
return;
}
@@ -5825,7 +5825,7 @@ void ObjectMgr::LoadPetNames()
while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u pet name parts", count );
}
@@ -5842,7 +5842,7 @@ void ObjectMgr::LoadPetNumber()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded the max pet number: %d", m_hiPetNumber-1);
}
@@ -5880,7 +5880,7 @@ void ObjectMgr::LoadCorpses()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u corpses", count );
return;
}
@@ -5909,7 +5909,7 @@ void ObjectMgr::LoadCorpses()
while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u corpses", count );
}
@@ -5929,7 +5929,7 @@ void ObjectMgr::LoadReputationOnKill()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded 0 creature award reputation definitions. DB table `creature_onkill_reputation` is empty.");
return;
}
@@ -5987,7 +5987,7 @@ void ObjectMgr::LoadReputationOnKill()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u creature award reputation definitions", count);
}
@@ -6004,7 +6004,7 @@ void ObjectMgr::LoadPointsOfInterest()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded 0 Points of Interest definitions. DB table `points_of_interest` is empty.");
return;
}
@@ -6039,7 +6039,7 @@ void ObjectMgr::LoadPointsOfInterest()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u Points of Interest definitions", count);
}
@@ -6056,7 +6056,7 @@ void ObjectMgr::LoadWeatherZoneChances()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded 0 weather definitions. DB table `game_weather` is empty.");
return;
}
@@ -6102,7 +6102,7 @@ void ObjectMgr::LoadWeatherZoneChances()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u weather definitions", count);
}
@@ -6196,7 +6196,7 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map,char const* table)
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded 0 quest relations from %s. DB table `%s` is empty.",table,table);
return;
}
@@ -6224,7 +6224,7 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map,char const* table)
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u quest relations from %s", count,table);
}
@@ -6297,7 +6297,7 @@ void ObjectMgr::LoadReservedPlayersNames()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u reserved player names", count );
return;
}
@@ -6326,7 +6326,7 @@ void ObjectMgr::LoadReservedPlayersNames()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u reserved player names", count );
}
@@ -6497,7 +6497,7 @@ void ObjectMgr::LoadGameObjectForQuests()
{
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded 0 GameObjects for quests" );
return;
}
@@ -6542,7 +6542,7 @@ void ObjectMgr::LoadGameObjectForQuests()
}
}
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u GameObjects for quests", count );
}
@@ -6569,7 +6569,7 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
bar.step();
- sLog.outString();
+ sLog.outString("");
if(min_value == MIN_TRINITY_STRING_ID) // error only in case internal strings
sLog.outErrorDb(">> Loaded 0 trinity strings. DB table `%s` is empty. Cannot continue.",table);
else
@@ -6635,7 +6635,7 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
delete result;
- sLog.outString();
+ sLog.outString("");
if(min_value == MIN_TRINITY_STRING_ID) // internal Trinity strings
sLog.outString( ">> Loaded %u Trinity strings from table %s", count,table);
else
@@ -6677,7 +6677,7 @@ void ObjectMgr::LoadSpellDisabledEntrys()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u disabled spells", total_count );
return;
}
@@ -6707,7 +6707,7 @@ void ObjectMgr::LoadSpellDisabledEntrys()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u disabled spells from `spell_disabled`", total_count);
}
@@ -6724,7 +6724,7 @@ void ObjectMgr::LoadFishingBaseSkillLevel()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded `skill_fishing_base_level`, table is empty!");
return;
}
@@ -6753,7 +6753,7 @@ void ObjectMgr::LoadFishingBaseSkillLevel()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u areas for fishing base skill level", count );
}
@@ -7049,7 +7049,7 @@ void ObjectMgr::LoadGameTele()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded `game_tele`, table is empty!");
return;
}
@@ -7094,7 +7094,7 @@ void ObjectMgr::LoadGameTele()
while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u GameTeleports", count );
}
@@ -7183,7 +7183,7 @@ void ObjectMgr::LoadTrainerSpell()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded `npc_trainer`, table is empty!");
return;
}
@@ -7264,7 +7264,7 @@ void ObjectMgr::LoadTrainerSpell()
} while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %d Trainers", count );
}
@@ -7284,7 +7284,7 @@ void ObjectMgr::LoadVendors()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded `npc_vendor`, table is empty!");
return;
}
@@ -7314,7 +7314,7 @@ void ObjectMgr::LoadVendors()
} while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %d Vendors ", count );
}
@@ -7330,7 +7330,7 @@ void ObjectMgr::LoadNpcTextId()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded `npc_gossip`, table is empty!");
return;
}
@@ -7365,7 +7365,7 @@ void ObjectMgr::LoadNpcTextId()
} while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %d NpcTextId ", count );
}
@@ -7384,7 +7384,7 @@ void ObjectMgr::LoadNpcOptions()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded `npc_option`, table is empty!");
return;
}
@@ -7417,7 +7417,7 @@ void ObjectMgr::LoadNpcOptions()
} while (result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %d npc_option entries", count );
}
@@ -7548,7 +7548,7 @@ void ObjectMgr::LoadScriptNames()
{
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outErrorDb(">> Loaded empty set of Script Names!");
return;
}
@@ -7565,7 +7565,7 @@ void ObjectMgr::LoadScriptNames()
delete result;
std::sort(m_scriptNames.begin(), m_scriptNames.end());
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %d Script Names", count );
}
diff --git a/src/game/PoolHandler.cpp b/src/game/PoolHandler.cpp
index bd47c7b6a89..a2c688dac2f 100644
--- a/src/game/PoolHandler.cpp
+++ b/src/game/PoolHandler.cpp
@@ -342,7 +342,7 @@ void PoolHandler::LoadFromDB()
if (!result)
{
sLog.outString(">> Table pool_template is empty.");
- sLog.outString();
+ sLog.outString("");
return;
}
else
@@ -359,7 +359,7 @@ void PoolHandler::LoadFromDB()
{
mPoolTemplate.clear();
sLog.outString(">> Table pool_template is empty:");
- sLog.outString();
+ sLog.outString("");
return;
}
@@ -380,7 +380,7 @@ void PoolHandler::LoadFromDB()
} while (result->NextRow());
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u objects pools", count );
delete result;
@@ -397,7 +397,7 @@ void PoolHandler::LoadFromDB()
barGoLink bar2(1);
bar2.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u creatures in pools", count );
}
else
@@ -440,7 +440,7 @@ void PoolHandler::LoadFromDB()
mCreatureSearchMap.insert(p);
} while (result->NextRow());
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u creatures in pools", count );
delete result;
}
@@ -458,7 +458,7 @@ void PoolHandler::LoadFromDB()
barGoLink bar2(1);
bar2.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u gameobject in pools", count );
}
else
@@ -510,7 +510,7 @@ void PoolHandler::LoadFromDB()
mGameobjectSearchMap.insert(p);
} while( result->NextRow() );
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u gameobject in pools", count );
delete result;
}
@@ -526,7 +526,7 @@ void PoolHandler::LoadFromDB()
barGoLink bar2(1);
bar2.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u pools in pools", count );
}
else
@@ -598,7 +598,7 @@ void PoolHandler::LoadFromDB()
}
}
}
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u pools in mother pools", count );
delete result;
}
diff --git a/src/game/ScriptCalls.cpp b/src/game/ScriptCalls.cpp
index 33423611146..66d41304f7f 100644
--- a/src/game/ScriptCalls.cpp
+++ b/src/game/ScriptCalls.cpp
@@ -89,7 +89,7 @@ bool LoadScriptingModule(char const* libName)
return false;
}
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">>> Scripts Library %s was successfully loaded.\n", name.c_str() );
//heh we are still there :P we have a valid library
diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp
index 0fbaeb0fbaf..3dcafc3e556 100644
--- a/src/game/SkillDiscovery.cpp
+++ b/src/game/SkillDiscovery.cpp
@@ -126,14 +126,14 @@ void LoadSkillDiscoveryTable()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u skill discovery definitions", count );
if(!ssNonDiscoverableEntries.str().empty())
sLog.outErrorDb("Some items can't be successfully discovered: have in chance field value < 0.000001 in `skill_discovery_template` DB table . List:\n%s",ssNonDiscoverableEntries.str().c_str());
}
else
{
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded 0 skill discovery definitions. DB table `skill_discovery_template` is empty." );
}
}
diff --git a/src/game/SkillExtraItems.cpp b/src/game/SkillExtraItems.cpp
index f0061f97c00..6ffc8cf36ac 100644
--- a/src/game/SkillExtraItems.cpp
+++ b/src/game/SkillExtraItems.cpp
@@ -110,12 +110,12 @@ void LoadSkillExtraItemTable()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell specialization definitions", count );
}
else
{
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded 0 spell specialization definitions. DB table `skill_extra_item_template` is empty." );
}
}
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 08bcdbb1152..3183b1b4274 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -850,7 +850,7 @@ void SpellMgr::LoadSpellTargetPositions()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell target coordinates", count );
return;
}
@@ -916,7 +916,7 @@ void SpellMgr::LoadSpellTargetPositions()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell teleport coordinates", count );
}
@@ -935,7 +935,7 @@ void SpellMgr::LoadSpellAffects()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell affect definitions", count );
return;
}
@@ -996,7 +996,7 @@ void SpellMgr::LoadSpellAffects()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u custom spell affect definitions", count );
for (uint32 id = 0; id < sSpellStore.GetNumRows(); ++id)
@@ -1056,7 +1056,7 @@ void SpellMgr::LoadSpellProcEvents()
{
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell proc event conditions", count );
return;
}
@@ -1107,7 +1107,7 @@ void SpellMgr::LoadSpellProcEvents()
delete result;
- sLog.outString();
+ sLog.outString("");
if (customProc)
sLog.outString( ">> Loaded %u extra spell proc event conditions +%u custom", count, customProc );
else
@@ -1124,7 +1124,7 @@ void SpellMgr::LoadSpellBonusess()
{
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell bonus data", count);
return;
}
@@ -1154,7 +1154,7 @@ void SpellMgr::LoadSpellBonusess()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u extra spell bonus data", count);
}
@@ -1238,7 +1238,7 @@ void SpellMgr::LoadSpellElixirs()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell elixir definitions", count );
return;
}
@@ -1269,7 +1269,7 @@ void SpellMgr::LoadSpellElixirs()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell elixir definitions", count );
}
@@ -1280,7 +1280,7 @@ void SpellMgr::LoadSpellThreats()
sSpellThreatStore.Load();
sLog.outString( ">> Loaded %u aggro generating spells", sSpellThreatStore.RecordCount );
- sLog.outString();
+ sLog.outString("");
}
bool SpellMgr::IsRankSpellDueToSpell(SpellEntry const *spellInfo_1,uint32 spellId_2) const
@@ -1542,7 +1542,7 @@ void SpellMgr::LoadSpellRequired()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded 0 spell required records" );
sLog.outErrorDb("`spell_required` table is empty!");
return;
@@ -1564,7 +1564,7 @@ void SpellMgr::LoadSpellRequired()
} while( result->NextRow() );
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell required records", rows );
}
@@ -1860,7 +1860,7 @@ void SpellMgr::LoadSpellChains()
//for (UNORDERED_MAP<uint32, SpellChainNode>::iterator itr=mSpellChains.begin();itr!=mSpellChains.end();itr++)
//sLog.outString( "Id: %u, Rank: %d , %s, %u, %u, %u, %u",itr->first,itr->second.rank, sSpellStore.LookupEntry(itr->first)->Rank[sWorld.GetDefaultDbcLocale()], itr->second.first, itr->second.last,itr->second.next ,itr->second.prev);
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell chains",count);
}
@@ -1900,7 +1900,7 @@ void SpellMgr::LoadSpellLearnSkills()
}
}
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u Spell Learn Skills from DBC", dbc_count );
}
@@ -1915,7 +1915,7 @@ void SpellMgr::LoadSpellLearnSpells()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded 0 spell learn spells" );
sLog.outErrorDb("`spell_learn_spell` table is empty!");
return;
@@ -2005,7 +2005,7 @@ void SpellMgr::LoadSpellLearnSpells()
}
}
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell learn spells + %u found in DBC", count, dbc_count );
}
@@ -2023,7 +2023,7 @@ void SpellMgr::LoadSpellScriptTarget()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded 0 spell script target" );
sLog.outErrorDb("`spell_script_target` table is empty!");
return;
@@ -2142,7 +2142,7 @@ void SpellMgr::LoadSpellScriptTarget()
}
*/
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u Spell Script Targets", count);
}
@@ -2161,7 +2161,7 @@ void SpellMgr::LoadSpellPetAuras()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell pet auras", count );
return;
}
@@ -2220,7 +2220,7 @@ void SpellMgr::LoadSpellPetAuras()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell pet auras", count );
}
@@ -2387,7 +2387,7 @@ void SpellMgr::LoadSpellLinked()
{
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u linked spells", count );
return;
}
@@ -2445,7 +2445,7 @@ void SpellMgr::LoadSpellLinked()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u linked spells", count );
}
@@ -2485,7 +2485,7 @@ void SpellMgr::LoadPetLevelupSpellMap()
}
}
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u pet levelup spells", count );
}
@@ -2583,7 +2583,7 @@ void SpellMgr::LoadSpellAreas()
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell area requirements", count );
return;
}
@@ -2771,7 +2771,7 @@ void SpellMgr::LoadSpellAreas()
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u spell area requirements", count );
}
@@ -2892,7 +2892,7 @@ void SpellMgr::LoadSkillLineAbilityMap()
++count;
}
- sLog.outString();
+ sLog.outString("");
sLog.outString(">> Loaded %u SkillLineAbility MultiMap Data", count);
}
diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp
index 865c9ccf0b8..feafa0076dd 100644
--- a/src/game/Transports.cpp
+++ b/src/game/Transports.cpp
@@ -42,7 +42,7 @@ void MapManager::LoadTransports()
barGoLink bar( 1 );
bar.step();
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u transports", count );
return;
}
@@ -114,7 +114,7 @@ void MapManager::LoadTransports()
} while(result->NextRow());
delete result;
- sLog.outString();
+ sLog.outString("");
sLog.outString( ">> Loaded %u transports", count );
// check transport data DB integrity
diff --git a/src/game/World.cpp b/src/game/World.cpp
index 9145c107299..bbfa47edd6c 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1110,7 +1110,7 @@ void World::SetInitialWorldSettings()
}
///- Loading strings. Getting no records means core load has to be canceled because no error message can be output.
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading Trinity strings..." );
if (!objmgr.LoadTrinityStrings())
exit(1); // Error message displayed in function already
@@ -1147,7 +1147,7 @@ void World::SetInitialWorldSettings()
sLog.outString( "Packing instances..." );
sInstanceSaveManager.PackInstances();
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading Localization strings..." );
objmgr.LoadCreatureLocales();
objmgr.LoadGameObjectLocales();
@@ -1159,7 +1159,7 @@ void World::SetInitialWorldSettings()
objmgr.LoadPointOfInterestLocales();
objmgr.SetDBCLocaleIndex(GetDefaultDbcLocale()); // Get once for all the locale index of DBC language (console/broadcasts)
sLog.outString( ">>> Localization strings loaded" );
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading Page Texts..." );
objmgr.LoadPageTexts();
@@ -1231,10 +1231,10 @@ void World::SetInitialWorldSettings()
objmgr.LoadCreatures();
sLog.outString( "Loading Creature Addon Data..." );
- sLog.outString();
+ sLog.outString("");
objmgr.LoadCreatureAddons(); // must be after LoadCreatureTemplates() and LoadCreatures()
sLog.outString( ">>> Creature Addon Data loaded" );
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading Creature Respawn Data..." ); // must be after PackInstances()
objmgr.LoadCreatureRespawnTimes();
@@ -1249,10 +1249,10 @@ void World::SetInitialWorldSettings()
poolhandler.LoadFromDB();
sLog.outString( "Loading Game Event Data...");
- sLog.outString();
+ sLog.outString("");
gameeventmgr.LoadFromDB();
sLog.outString( ">>> Game Event Data loaded" );
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading Weather Data..." );
objmgr.LoadWeatherZoneChances();
@@ -1261,10 +1261,10 @@ void World::SetInitialWorldSettings()
objmgr.LoadQuests(); // must be loaded after DBCs, creature_template, item_template, gameobject tables
sLog.outString( "Loading Quests Relations..." );
- sLog.outString();
+ sLog.outString("");
objmgr.LoadQuestRelations(); // must be after quest load
sLog.outString( ">>> Quests Relations loaded" );
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading SpellArea Data..." ); // must be after quest load
spellmgr.LoadSpellAreas();
@@ -1306,10 +1306,10 @@ void World::SetInitialWorldSettings()
spellmgr.LoadSpellLinked();
sLog.outString( "Loading Player Create Info & Level Stats..." );
- sLog.outString();
+ sLog.outString("");
objmgr.LoadPlayerInfo();
sLog.outString( ">>> Player Create Info & Level Stats loaded" );
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading Exploration BaseXP Data..." );
objmgr.LoadExplorationBaseXP();
@@ -1330,10 +1330,10 @@ void World::SetInitialWorldSettings()
objmgr.LoadSpellDisabledEntrys();
sLog.outString( "Loading Loot Tables..." );
- sLog.outString();
+ sLog.outString("");
LoadLootTables();
sLog.outString( ">>> Loot Tables loaded" );
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading Skill Discovery Table..." );
LoadSkillDiscoveryTable();
@@ -1345,21 +1345,21 @@ void World::SetInitialWorldSettings()
objmgr.LoadFishingBaseSkillLevel();
sLog.outString( "Loading Achievements..." );
- sLog.outString();
+ sLog.outString("");
achievementmgr.LoadAchievementCriteriaList();
achievementmgr.LoadRewards();
achievementmgr.LoadRewardLocales();
achievementmgr.LoadCompletedAchievements();
sLog.outString( ">>> Achievements loaded" );
- sLog.outString();
+ sLog.outString("");
///- Load dynamic data tables from the database
sLog.outString( "Loading Auctions..." );
- sLog.outString();
+ sLog.outString("");
auctionmgr.LoadAuctionItems();
auctionmgr.LoadAuctions();
sLog.outString( ">>> Auctions loaded" );
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading Guilds..." );
objmgr.LoadGuilds();
@@ -1395,7 +1395,7 @@ void World::SetInitialWorldSettings()
objmgr.LoadTrainerSpell(); // must be after load CreatureTemplate
sLog.outString( "Loading Waypoints..." );
- sLog.outString();
+ sLog.outString("");
WaypointMgr.Load();
sLog.outString( "Loading Creature Formations..." );
@@ -1410,7 +1410,7 @@ void World::SetInitialWorldSettings()
///- Load and initialize scripts
sLog.outString( "Loading Scripts..." );
- sLog.outString();
+ sLog.outString("");
objmgr.LoadQuestStartScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
objmgr.LoadQuestEndScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
objmgr.LoadSpellScripts(); // must be after load Creature/Gameobject(Template/Data)
@@ -1418,7 +1418,7 @@ void World::SetInitialWorldSettings()
objmgr.LoadEventScripts(); // must be after load Creature/Gameobject(Template/Data)
objmgr.LoadWaypointScripts();
sLog.outString( ">>> Scripts loaded" );
- sLog.outString();
+ sLog.outString("");
sLog.outString( "Loading Scripts text locales..." ); // must be after Load*Scripts calls
objmgr.LoadDbScriptStrings();
@@ -1500,6 +1500,18 @@ void World::SetInitialWorldSettings()
sLog.outString("Initialize AuctionHouseBot...");
AuctionHouseBotInit();
+ // possibly enable db logging; avoid massive startup spam by doing it here.
+ if (sLog.GetLogDBLater())
+ {
+ sLog.outString("Enabling database logging...");
+ sLog.SetLogDBLater(false);
+ sLog.SetLogDB(true);
+ }
+ else
+ {
+ sLog.SetLogDBLater(false);
+ }
+
sLog.outString( "WORLD: World initialized" );
}
@@ -1544,7 +1556,7 @@ void World::DetectDBCLang()
m_defaultDbcLocale = LocaleConstant(default_locale);
sLog.outString("Using %s DBC Locale as default. All available DBC locales: %s",localeNames[m_defaultDbcLocale],availableLocalsStr.empty() ? "<none>" : availableLocalsStr.c_str());
- sLog.outString();
+ sLog.outString("");
}
void World::RecordTimeDiff(const char *text, ...)