josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove trailing spaces in Dungeon Finder files

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-08-24 10:32:53 +02:00
parent 0079e8e3b5
commit 33f1c597a0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/DungeonFinding/LFGMgr.cpp
+5 -5
View File
@@ -101,7 +101,7 @@ void LFGMgr::Cleaner()
m_QueueInfoMap.erase(itQueue); m_QueueInfoMap.erase(itQueue);
} }
} }
// Remove from NewToQueue those guids that do not exist in queueMap // Remove from NewToQueue those guids that do not exist in queueMap
for (LfgGuidList::iterator it = m_newToQueue.begin(); it != m_newToQueue.end();) for (LfgGuidList::iterator it = m_newToQueue.begin(); it != m_newToQueue.end();)
{ {
@@ -278,7 +278,7 @@ void LFGMgr::Update(uint32 diff)
SendUpdateProposal(plr, m_lfgProposalId, pProposal); SendUpdateProposal(plr, m_lfgProposalId, pProposal);
} }
} }
if (pProposal->state == LFG_PROPOSAL_SUCCESS) if (pProposal->state == LFG_PROPOSAL_SUCCESS)
UpdateProposal(m_lfgProposalId, lowGuid, 1); UpdateProposal(m_lfgProposalId, lowGuid, 1);
@@ -1185,7 +1185,7 @@ void LFGMgr::UpdateProposal(uint32 proposalId, uint32 lowGuid, uint8 accept)
else if (role & ROLE_DAMAGE) else if (role & ROLE_DAMAGE)
m_WaitTimeDps = int32((m_WaitTimeDps * m_NumWaitTimeDps + waitTime) / ++m_NumWaitTimeDps); m_WaitTimeDps = int32((m_WaitTimeDps * m_NumWaitTimeDps + waitTime) / ++m_NumWaitTimeDps);
} }
grp->SetLfgRoles(plr->GetGUID(), pProposal->players[plr->GetGUIDLow()]->role); grp->SetLfgRoles(plr->GetGUID(), pProposal->players[plr->GetGUIDLow()]->role);
} }
@@ -1251,7 +1251,7 @@ void LFGMgr::RemoveProposal(LfgProposalMap::iterator itProposal, LfgUpdateType t
updateType = type; updateType = type;
plr->GetLfgDungeons()->clear(); plr->GetLfgDungeons()->clear();
plr->SetLfgRoles(ROLE_NONE); plr->SetLfgRoles(ROLE_NONE);
if (itQueue != m_QueueInfoMap.end()) if (itQueue != m_QueueInfoMap.end())
m_QueueInfoMap.erase(itQueue); m_QueueInfoMap.erase(itQueue);
} }
@@ -1656,7 +1656,7 @@ void LFGMgr::SendLfgPlayerReward(Player *plr)
uint32 rdungeonId = 0; uint32 rdungeonId = 0;
uint32 sdungeonId = 0; uint32 sdungeonId = 0;
LFGDungeonEntry const *dungeon = sLFGDungeonStore.LookupEntry(*plr->GetLfgDungeons()->begin()); LFGDungeonEntry const *dungeon = sLFGDungeonStore.LookupEntry(*plr->GetLfgDungeons()->begin());
if (dungeon) if (dungeon)
rdungeonId = dungeon->Entry(); rdungeonId = dungeon->Entry();
if (plr->GetGroup()) if (plr->GetGroup())
sdungeonId = plr->GetGroup()->GetLfgDungeonEntry(false); sdungeonId = plr->GetGroup()->GetLfgDungeonEntry(false);
src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
+2 -2
View File
@@ -64,10 +64,10 @@ void WorldSession::HandleLfgJoinOpcode(WorldPacket &recv_data)
Group *grp = GetPlayer()->GetGroup(); Group *grp = GetPlayer()->GetGroup();
bool isRandomDungeon = dungeons->size() == 1 && sLFGMgr.isRandomDungeon(*dungeons->begin()); bool isRandomDungeon = dungeons->size() == 1 && sLFGMgr.isRandomDungeon(*dungeons->begin());
bool isCurrentDungeon = newDungeons.size() == 1 && grp && grp->isLFGGroup() && grp->GetLfgDungeonEntry() == *newDungeons.begin(); bool isCurrentDungeon = newDungeons.size() == 1 && grp && grp->isLFGGroup() && grp->GetLfgDungeonEntry() == *newDungeons.begin();
if (!isRandomDungeon || !isCurrentDungeon) // is not offer to continue - clear old dungeons and use new dungeons if (!isRandomDungeon || !isCurrentDungeon) // is not offer to continue - clear old dungeons and use new dungeons
{ {
dungeons->clear(); dungeons->clear();
for (LfgDungeonSet::const_iterator it = newDungeons.begin(); it != newDungeons.end(); ++it) for (LfgDungeonSet::const_iterator it = newDungeons.begin(); it != newDungeons.end(); ++it)
dungeons->insert(*it); dungeons->insert(*it);
} }