Merge remote branch 'origin/master' into 330

This commit is contained in:
tomrus88 2009-12-19 21:04:49 +03:00
commit 90d76c61fa
17 changed files with 296 additions and 46 deletions

View file

@ -504,7 +504,7 @@ void ObjectMgr::LoadCreatureTemplates()
if (difficultyEntries[diff].find(i) != difficultyEntries[diff].end())
{
sLog.outErrorDb("Creature (Entry: %u) listed as difficulty %u but have value in `difficulty_entry_1`.", i, diff + 1);
sLog.outErrorDb("Creature (Entry: %u) listed as difficulty %u but have value in `difficulty_entry_%u`.", i, diff + 1, diff + 1);
continue;
}