From d9d9f32adf481d2999188661cc3a4836685c67e5 Mon Sep 17 00:00:00 2001 From: ApoC Date: Wed, 21 Jan 2009 02:08:23 +0100 Subject: [PATCH] [7129] Changed uint64 results to const uint64& on some methods. Signed-off-by: ApoC --- src/game/GroupHandler.cpp | 4 ++-- src/game/Pet.h | 2 +- src/game/Player.h | 6 +++--- src/shared/revision_nr.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index 51fc8cb7c..9ec47103e 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -707,7 +707,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke if (mask & GROUP_UPDATE_FLAG_AURAS) { - uint64 auramask = player->GetAuraUpdateMask(); + const uint64& auramask = player->GetAuraUpdateMask(); *data << uint64(auramask); for(uint32 i = 0; i < MAX_AURAS; ++i) { @@ -788,7 +788,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke { if(pet) { - uint64 auramask = pet->GetAuraUpdateMask(); + const uint64& auramask = pet->GetAuraUpdateMask(); *data << uint64(auramask); for(uint32 i = 0; i < MAX_AURAS; ++i) { diff --git a/src/game/Pet.h b/src/game/Pet.h index 88e12c4a9..f309bc518 100644 --- a/src/game/Pet.h +++ b/src/game/Pet.h @@ -214,7 +214,7 @@ class Pet : public Creature time_t m_resetTalentsTime; uint32 m_usedTalentCount; - uint64 GetAuraUpdateMask() { return m_auraUpdateMask; } + const uint64& GetAuraUpdateMask() const { return m_auraUpdateMask; } void SetAuraUpdateMask(uint8 slot) { m_auraUpdateMask |= (uint64(1) << slot); } void ResetAuraUpdateMask() { m_auraUpdateMask = 0; } diff --git a/src/game/Player.h b/src/game/Player.h index b5448c2c4..e8ddedb78 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1418,7 +1418,7 @@ class MANGOS_DLL_SPEC Player : public Unit void SetSelection(const uint64 &guid) { m_curSelection = guid; SetUInt64Value(UNIT_FIELD_TARGET, guid); } uint8 GetComboPoints() { return m_comboPoints; } - uint64 GetComboTarget() { return m_comboTarget; } + const uint64& GetComboTarget() const { return m_comboTarget; } void AddComboPoints(Unit* target, int8 count); void ClearComboPoints(); @@ -2150,9 +2150,9 @@ class MANGOS_DLL_SPEC Player : public Unit GroupReference& GetGroupRef() { return m_group; } void SetGroup(Group *group, int8 subgroup = -1); uint8 GetSubGroup() const { return m_group.getSubGroup(); } - uint32 GetGroupUpdateFlag() { return m_groupUpdateMask; } + uint32 GetGroupUpdateFlag() const { return m_groupUpdateMask; } void SetGroupUpdateFlag(uint32 flag) { m_groupUpdateMask |= flag; } - uint64 GetAuraUpdateMask() { return m_auraUpdateMask; } + const uint64& GetAuraUpdateMask() const { return m_auraUpdateMask; } void SetAuraUpdateMask(uint8 slot) { m_auraUpdateMask |= (uint64(1) << slot); } Player* GetNextRandomRaidMember(float radius); PartyResult CanUninviteFromGroup() const; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4a4b91b7e..128c6e1f9 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7128" + #define REVISION_NR "7129" #endif // __REVISION_NR_H__ -- 2.11.4.GIT