Merge branch 'master' into 303

This commit is contained in:
tomrus88 2008-11-04 18:28:39 +03:00
commit d4ab3ca463
25 changed files with 495 additions and 317 deletions

View file

@ -511,7 +511,7 @@ void BattleGround::SendRewardMarkByMail(Player *plr,uint32 mark, uint32 count)
int loc_idx = plr->GetSession()->GetSessionDbLocaleIndex();
if ( loc_idx >= 0 )
if(ItemLocale const *il = objmgr.GetItemLocale(markProto->ItemId))
if (il->Name.size() > loc_idx && !il->Name[loc_idx].empty())
if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty())
subject = il->Name[loc_idx];
// text