Core/DBLayer: Fix remaining errors in loading world tables and a couple of them in characters database

Also removed World::LoadIp2nation(), it was not doing anything.
Closes #5897
This commit is contained in:
Nay
2012-03-28 00:38:24 +01:00
parent 76397cf931
commit f44e6834df
7 changed files with 13 additions and 32 deletions
-20
View File
@@ -1625,9 +1625,6 @@ void World::SetInitialWorldSettings()
sLog->outString("Loading Autobroadcasts...");
LoadAutobroadcasts();
sLog->outString("Loading Ip2nation...");
LoadIp2nation();
///- Load and initialize scripts
sObjectMgr->LoadQuestStartScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
sObjectMgr->LoadQuestEndScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
@@ -1884,23 +1881,6 @@ void World::LoadAutobroadcasts()
sLog->outString();
}
void World::LoadIp2nation()
{
uint32 oldMSTime = getMSTime();
QueryResult result = WorldDatabase.Query("SELECT count(c.code) FROM ip2nationCountries c, ip2nation i WHERE c.code = i.country");
uint32 count = 0;
if (result)
{
Field* fields = result->Fetch();
count = fields[0].GetUInt32();
}
sLog->outString(">> Loaded %u ip2nation definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
/// Update the World !
void World::Update(uint32 diff)
{
-2
View File
@@ -741,8 +741,6 @@ class World
void LoadAutobroadcasts();
void LoadIp2nation();
void UpdateAreaDependentAuras();
void ProcessStartEvent();