mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11012] Remove battlemaster mails support as unused now.

Browse source
This commit is contained in:
VladimirMangos 2011-01-15 19:13:17 +03:00
parent 3d551a68b5
commit 1e8ca772b3
3 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Mail.cpp
View file

@ -38,7 +38,6 @@
#include "Unit.h" #include "Unit.h"
#include "Language.h" #include "Language.h"
#include "DBCStores.h" #include "DBCStores.h"
#include "BattleGroundMgr.h"
#include "Item.h" #include "Item.h"
#include "AuctionHouseMgr.h" #include "AuctionHouseMgr.h"
@ -1015,9 +1014,6 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
// auction mail without any items and money (auction sale note) pending 1 hour // auction mail without any items and money (auction sale note) pending 1 hour
if (sender.GetMailMessageType() == MAIL_AUCTION && m_items.empty() && !m_money) if (sender.GetMailMessageType() == MAIL_AUCTION && m_items.empty() && !m_money)
expire_delay = HOUR; expire_delay = HOUR;
// mail from battlemaster (rewardmarks) should last only one day
else if (sender.GetMailMessageType() == MAIL_CREATURE && sBattleGroundMgr.GetBattleMasterBG(sender.GetSenderId()) != BATTLEGROUND_TYPE_NONE)
expire_delay = DAY;
// default case: expire time if COD 3 days, if no COD 30 days // default case: expire time if COD 3 days, if no COD 30 days
else else
expire_delay = (m_COD > 0) ? 3 * DAY : 30 * DAY; expire_delay = (m_COD > 0) ? 3 * DAY : 30 * DAY;

10
src/game/SpellEffects.cpp
View file

@ -3685,16 +3685,6 @@ void Spell::DoCreateItem(SpellEffectIndex eff_idx, uint32 itemtype)
if(!bg_mark) if(!bg_mark)
player->UpdateCraftSkill(m_spellInfo->Id); player->UpdateCraftSkill(m_spellInfo->Id);
} }
// for battleground marks send by mail if not add all expected
// FIXME: single existing bg marks for outfield bg and we not have it..
/*
if(no_space > 0 && bg_mark)
{
if(BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(BattleGroundTypeId(bgType)))
bg->SendRewardMarkByMail(player, newitemid, no_space);
}
*/
} }
void Spell::EffectCreateItem(SpellEffectIndex eff_idx) void Spell::EffectCreateItem(SpellEffectIndex eff_idx)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11011" #define REVISION_NR "11012"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__