Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

build fix

Browse Source
This commit is contained in:
treeston
2017-06-15 04:19:12 +02:00
committed by Aokromes
parent 29cbbc50d3
commit 5812c6559f
8 changed files with 93 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/game/Reputation/ReputationMgr.cpp
View File

@@ -169,7 +169,7 @@ void ReputationMgr::SendForceReactions()
void ReputationMgr::SendState(FactionState const* faction)
{
uint32 count = 1;
uint32 count = faction ? 1 : 0;
WorldPacket data(SMSG_SET_FACTION_STANDING, 17);
data << float(0);
@@ -179,15 +179,18 @@ void ReputationMgr::SendState(FactionState const* faction)
size_t p_count = data.wpos();
data << uint32(count);
data << uint32(faction->ReputationListID);
data << uint32(faction->Standing);
if (faction)
{
data << uint32(faction->ReputationListID);
data << uint32(faction->Standing);
}
for (FactionStateList::iterator itr = _factions.begin(); itr != _factions.end(); ++itr)
{
if (itr->second.needSend)
{
itr->second.needSend = false;
if (itr->second.ReputationListID != faction->ReputationListID)
if (!faction || itr->second.ReputationListID != faction->ReputationListID)
{
data << uint32(itr->second.ReputationListID);
data << uint32(itr->second.Standing);
@@ -236,6 +239,7 @@ void ReputationMgr::SendInitialReputations()
_player->SendDirectMessage(&data);
}
<<<<<<< HEAD
void ReputationMgr::SendStates()
{
for (FactionStateList::iterator itr = _factions.begin(); itr != _factions.end(); ++itr)
@@ -243,6 +247,9 @@ void ReputationMgr::SendStates()
}
void ReputationMgr::SendVisible(FactionState const* faction, bool visible /* = true*/) const
=======
void ReputationMgr::SendVisible(FactionState const* faction) const
>>>>>>> 4b6351e... Fixes to all-reputation and all-skill custom option handling:
{
if (_player->GetSession()->PlayerLoading())
return;