Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Style tweaks from review

Browse source
This commit is contained in:
Simon Walton 2019-03-05 09:34:29 -08:00
parent 122b62a5b8
commit 743d1a58e2
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/avatars/AvatarMixerSlave.cpp
View file

@ -355,9 +355,6 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
// about avatars they've ignored or that are out of view
bool PALIsOpen = destinationNodeData->getRequestsDomainListData();
bool PALWasOpen = destinationNodeData->getPrevRequestsDomainListData();
if (PALIsOpen) {
qCWarning(avatars) << "PAL is open:" << avatar.getSessionDisplayName();
}
// When this is true, the AvatarMixer will send Avatar data to a client about avatars that have ignored them
bool getsAnyIgnored = PALIsOpen && destinationNode->getCanKick();
@ -526,9 +523,6 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
_stats.overBudgetAvatars++;
detail = AvatarData::PALMinimum;
} else {
if (currentVariant == kHero) {
qCWarning(avatars) << "Overbudget break with hero avatars!" << destinationNode->getUUID().toString();
}
_stats.overBudgetAvatars += remainingAvatars;
break;
}

6
assignment-client/src/avatars/MixerAvatar.h
View file

@ -19,11 +19,11 @@
class MixerAvatar : public AvatarData {
public:
bool getHasPriority() const { return _bHasPriority; }
void setHasPriority(bool bPriorityAvatar) { _bHasPriority = bPriorityAvatar; }
bool getHasPriority() const { return _hasPriority; }
void setHasPriority(bool hasPriority) { _hasPriority = hasPriority; }
private:
bool _bHasPriority { false };
bool _hasPriority { false };
};
using MixerAvatarSharedPointer = std::shared_ptr<MixerAvatar>;