diff options
| author | Spp- <u84280@epreinf21.(none)> | 2011-08-01 14:51:44 +0200 |
|---|---|---|
| committer | Spp- <u84280@epreinf21.(none)> | 2011-08-01 14:51:44 +0200 |
| commit | 079f292b15eea7d5bb679d098c4675797ba14e5f (patch) | |
| tree | 2162a5ad9c1726664de03d90ff4ebb9097585b60 /src/server/game/Entities | |
| parent | acd0fc79f63f6881ead6fff2985755dd45ea3a5d (diff) | |
Core: Some more missing changes from previous commit (Pass by const reference for simple objects replaced with pass by value). Also fix unintended change
Diffstat (limited to 'src/server/game/Entities')
| -rwxr-xr-x | src/server/game/Entities/Corpse/Corpse.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Creature/TemporarySummon.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Item/Item.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Object/ObjectDefines.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h index d977aed0719..c58e89d68a5 100755 --- a/src/server/game/Entities/Corpse/Corpse.h +++ b/src/server/game/Entities/Corpse/Corpse.h @@ -64,7 +64,7 @@ class Corpse : public WorldObject, public GridObject<Corpse> void DeleteBonesFromWorld(); void DeleteFromDB(SQLTransaction& trans); - uint64 const& GetOwnerGUID() const { return GetUInt64Value(CORPSE_FIELD_OWNER); } + unit64 const GetOwnerGUID() const { return GetUInt64Value(CORPSE_FIELD_OWNER); } time_t const& GetGhostTime() const { return m_time; } void ResetGhostTime() { m_time = time(NULL); } diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h index 67a94ecd591..7130b0b6944 100755 --- a/src/server/game/Entities/Creature/TemporarySummon.h +++ b/src/server/game/Entities/Creature/TemporarySummon.h @@ -34,7 +34,7 @@ class TempSummon : public Creature void SetTempSummonType(TempSummonType type); void SaveToDB(uint32 /*mapid*/, uint8 /*spawnMask*/, uint32 /*phaseMask*/) {} Unit* GetSummoner() const; - uint64 const& GetSummonerGUID() { return m_summonerGUID; } + unit64 const GetSummonerGUID() { return m_summonerGUID; } TempSummonType const& GetSummonType() { return m_type; } const SummonPropertiesEntry * const m_Properties; diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index c3c6b999fcc..22aa9e96590 100755 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -235,7 +235,7 @@ class Item : public Object ItemTemplate const* GetTemplate() const; - uint64 const& GetOwnerGUID() const { return GetUInt64Value(ITEM_FIELD_OWNER); } + unit64 const GetOwnerGUID() const { return GetUInt64Value(ITEM_FIELD_OWNER); } void SetOwnerGUID(uint64 guid) { SetUInt64Value(ITEM_FIELD_OWNER, guid); } Player* GetOwner()const; diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h index 956370e7878..f2a04d827bc 100755 --- a/src/server/game/Entities/Object/ObjectDefines.h +++ b/src/server/game/Entities/Object/ObjectDefines.h @@ -78,7 +78,7 @@ enum HighGuid #define _GUID_LOPART_2(x) (uint32)(uint64(x) & UI64LIT(0x00000000FFFFFFFF)) #define _GUID_LOPART_3(x) (uint32)(uint64(x) & UI64LIT(0x0000000000FFFFFF)) -inline bool IsGuidHaveEnPart(uint64 const& guid) +inline bool IsGuidHaveEnPart(unit64 const guid) { switch(GUID_HIPART(guid)) { diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index b20fe3237f9..6838d9edaec 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -118,7 +118,7 @@ class Vehicle Unit* GetBase() const { return _me; } VehicleEntry const* GetVehicleInfo() const { return _vehicleInfo; } - uint32 const& GetCreatureEntry() const { return _creatureEntry; } + uint32 const GetCreatureEntry() const { return _creatureEntry; } bool HasEmptySeat(int8 seatId) const; Unit* GetPassenger(int8 seatId) const; |
