Merge branch 'master' into 320

This commit is contained in:
VladimirMangos 2009-09-10 05:46:08 +04:00
commit 7974e1ebcb
55 changed files with 2899 additions and 2780 deletions

View file

@ -597,14 +597,14 @@ void WorldSession::LoadAccountData(QueryResult* result, uint32 mask)
if (type >= NUM_ACCOUNT_DATA_TYPES)
{
sLog.outError("Table `%s` have invalid account data type (%u), ignore.",
mask == GLOBAL_CACHE_MASK ? "account_data" : "character_account_data");
mask == GLOBAL_CACHE_MASK ? "account_data" : "character_account_data", type);
continue;
}
if ((mask & (1 << type))==0)
{
sLog.outError("Table `%s` have non appropriate for table account data type (%u), ignore.",
mask == GLOBAL_CACHE_MASK ? "account_data" : "character_account_data");
mask == GLOBAL_CACHE_MASK ? "account_data" : "character_account_data", type);
continue;
}