Merge branch 'master' into 303

Conflicts:
	src/shared/Database/DBCStores.cpp
	src/shared/Database/DBCfmt.cpp
This commit is contained in:
tomrus88 2008-11-28 07:20:02 +03:00
commit 93cf13acec
14 changed files with 168 additions and 467 deletions

View file

@ -2143,8 +2143,7 @@ void ObjectMgr::LoadPlayerInfo()
barGoLink bar( 1 );
sLog.outString();
sLog.outString( ">> Loaded %u player create items", count );
sLog.outErrorDb( "Error loading `playercreateinfo_item` table or empty table.");
sLog.outString( ">> Loaded %u custom player create items", count );
}
else
{
@ -2196,7 +2195,7 @@ void ObjectMgr::LoadPlayerInfo()
delete result;
sLog.outString();
sLog.outString( ">> Loaded %u player create items", count );
sLog.outString( ">> Loaded %u custom player create items", count );
}
}