Merge branch 'master' into 303

This commit is contained in:
tomrus88 2008-12-01 08:21:10 +03:00
commit 518d7f6297
11 changed files with 86 additions and 97 deletions

View file

@ -6400,7 +6400,7 @@ bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min
bar.step();
sLog.outString("");
if(min_value > 0) // error only in case internal strings
if(min_value == MIN_MANGOS_STRING_ID) // error only in case internal strings
sLog.outErrorDb(">> Loaded 0 mangos strings. DB table `%s` is empty. Cannot continue.",table);
else
sLog.outString(">> Loaded 0 string templates. DB table `%s` is empty.",table);
@ -6466,7 +6466,7 @@ bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min
delete result;
sLog.outString();
if(min_value > 0) // internal mangos strings
if(min_value == MIN_MANGOS_STRING_ID) // error only in case internal strings
sLog.outString( ">> Loaded %u MaNGOS strings from table %s", count,table);
else
sLog.outString( ">> Loaded %u string templates from %s", count,table);