diff options
| author | Spp- <u84280@epreinf21.(none)> | 2011-08-01 14:57:30 +0200 |
|---|---|---|
| committer | Spp- <u84280@epreinf21.(none)> | 2011-08-01 14:57:30 +0200 |
| commit | c69b149d7e23a302b08895107d30384f9631fed0 (patch) | |
| tree | 6387946cea607cedbde4e618a15e1bc1a917c2ff /src/server/game | |
| parent | 079f292b15eea7d5bb679d098c4675797ba14e5f (diff) | |
Core: Typo fix introduced in previous commit (:S)
Diffstat (limited to 'src/server/game')
| -rwxr-xr-x | src/server/game/AI/CoreAI/UnitAI.h | 2 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/ArenaTeamMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/ArenaTeamMgr.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Battlegrounds/Zones/BattlegroundEY.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Battlegrounds/Zones/BattlegroundIC.h | 2 | ||||
| -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 | ||||
| -rw-r--r-- | src/server/game/Guilds/GuildMgr.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuras.h | 8 | ||||
| -rwxr-xr-x | src/server/game/Spells/SpellScript.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Spells/SpellScript.h | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index dbd4c14ed25..29804fb2899 100755 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -120,7 +120,7 @@ class UnitAI virtual void DoAction(int32 const /*param*/) {} virtual uint32 GetData(uint32 /*id = 0*/) { return 0; } virtual void SetData(uint32 /*id*/, uint32 /*value*/) {} - virtual void SetGUID(unit64 const/*guid*/, int32 /*id*/ = 0) {} + virtual void SetGUID(uint64 const/*guid*/, int32 /*id*/ = 0) {} virtual uint64 GetGUID(int32 /*id*/ = 0) { return 0; } Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp index 0ff3faf50af..f164f56dffd 100644 --- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp +++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp @@ -53,7 +53,7 @@ ArenaTeam* ArenaTeamMgr::GetArenaTeamByName(const std::string& arenaTeamName) co return NULL; } -ArenaTeam* ArenaTeamMgr::GetArenaTeamByCaptain(unit64 const guid) const +ArenaTeam* ArenaTeamMgr::GetArenaTeamByCaptain(uint64 const guid) const { for (ArenaTeamContainer::const_iterator itr = ArenaTeamStore.begin(); itr != ArenaTeamStore.end(); ++itr) if (itr->second->GetCaptain() == guid) diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.h b/src/server/game/Battlegrounds/ArenaTeamMgr.h index 0f58b145012..1e45158b353 100644 --- a/src/server/game/Battlegrounds/ArenaTeamMgr.h +++ b/src/server/game/Battlegrounds/ArenaTeamMgr.h @@ -31,7 +31,7 @@ public: ArenaTeam* GetArenaTeamById(uint32 arenaTeamId) const; ArenaTeam* GetArenaTeamByName(const std::string& arenaTeamName) const; - ArenaTeam* GetArenaTeamByCaptain(unit64 const guid) const; + ArenaTeam* GetArenaTeamByCaptain(uint64 const guid) const; void LoadArenaTeams(); void AddArenaTeam(ArenaTeam* arenaTeam); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index d8369c29582..33d7ccdadb5 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -349,7 +349,7 @@ class BattlegroundEY : public Battleground void RespawnFlagAfterDrop(); void RemovePlayer(Player *plr, uint64 guid, uint32 team); - void HandleBuffUse(unit64 const buff_guid); + void HandleBuffUse(uint64 const buff_guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); void HandleKillPlayer(Player* player, Player* killer); virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index bd0e0fc0251..622a193cc21 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -85,7 +85,7 @@ void BattlegroundIC::SendTransportInit(Player* player) player->GetSession()->SendPacket(&packet); } -void BattlegroundIC::DoAction(uint32 action, unit64 const var) +void BattlegroundIC::DoAction(uint32 action, uint64 const var) { if (action != ACTION_TELEPORT_PLAYER_TO_TRANSPORT) return; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h index e26aaad64a4..563d477c796 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h @@ -888,7 +888,7 @@ class BattlegroundIC : public Battleground void FillInitialWorldStates(WorldPacket& data); - void DoAction(uint32 action, unit64 const var); + void DoAction(uint32 action, uint64 const var); virtual void HandlePlayerResurrect(Player* player); diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h index c58e89d68a5..2d37f9bf809 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); - unit64 const GetOwnerGUID() const { return GetUInt64Value(CORPSE_FIELD_OWNER); } + uint64 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 7130b0b6944..76b49877455 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; - unit64 const GetSummonerGUID() { return m_summonerGUID; } + uint64 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 22aa9e96590..1784bdbe8c6 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; - unit64 const GetOwnerGUID() const { return GetUInt64Value(ITEM_FIELD_OWNER); } + uint64 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 f2a04d827bc..b231cb38e1a 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(unit64 const guid) +inline bool IsGuidHaveEnPart(uint64 const guid) { switch(GUID_HIPART(guid)) { diff --git a/src/server/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h index 0f6823eb378..ce756fceb69 100644 --- a/src/server/game/Guilds/GuildMgr.h +++ b/src/server/game/Guilds/GuildMgr.h @@ -29,7 +29,7 @@ class GuildMgr public: typedef UNORDERED_MAP<uint32, Guild*> GuildContainer; - Guild* GetGuildByLeader(unit64 const guid) const; + Guild* GetGuildByLeader(uint64 const guid) const; Guild* GetGuildById(uint32 guildId) const; Guild* GetGuildByName(const std::string& guildName) const; std::string GetGuildNameById(uint32 guildId) const; diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index b7473954b2b..6574cbb909e 100755 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -99,7 +99,7 @@ class Aura uint32 GetId() const{ return GetSpellInfo()->Id; } uint64 GetCastItemGUID() const { return m_castItemGuid; } - unit64 const GetCasterGUID() const { return m_casterGuid; } + uint64 const GetCasterGUID() const { return m_casterGuid; } Unit* GetCaster() const; WorldObject * GetOwner() const { return m_owner; } Unit* GetUnitOwner() const { ASSERT(GetType() == UNIT_AURA_TYPE); return (Unit*)m_owner; } @@ -175,9 +175,9 @@ class Aura // Helpers for targets ApplicationMap const & GetApplicationMap() {return m_applications;} void GetApplicationList(std::list<AuraApplication*> & applicationList) const; - const AuraApplication * GetApplicationOfTarget (unit64 const guid) const { ApplicationMap::const_iterator itr = m_applications.find(guid); if (itr != m_applications.end()) return itr->second; return NULL; } - AuraApplication * GetApplicationOfTarget (unit64 const guid) { ApplicationMap::iterator itr = m_applications.find(guid); if (itr != m_applications.end()) return itr->second; return NULL; } - bool IsAppliedOnTarget(unit64 const guid) const { return m_applications.find(guid) != m_applications.end(); } + const AuraApplication * GetApplicationOfTarget (uint64 const guid) const { ApplicationMap::const_iterator itr = m_applications.find(guid); if (itr != m_applications.end()) return itr->second; return NULL; } + AuraApplication * GetApplicationOfTarget (uint64 const guid) { ApplicationMap::iterator itr = m_applications.find(guid); if (itr != m_applications.end()) return itr->second; return NULL; } + bool IsAppliedOnTarget(uint64 const guid) const { return m_applications.find(guid) != m_applications.end(); } void SetNeedClientUpdateForTargets() const; void HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, bool apply, bool onReapply); diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 689ab3bf8be..9c41d7155d2 100755 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -713,7 +713,7 @@ uint32 AuraScript::GetId() const return m_aura->GetId(); } -unit64 const AuraScript::GetCasterGUID() const +uint64 const AuraScript::GetCasterGUID() const { return m_aura->GetCasterGUID(); } diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 3b44bf92667..1f181ca8900 100755 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -585,7 +585,7 @@ class AuraScript : public _SpellScript uint32 GetId() const; // returns guid of object which casted the aura (m_originalCaster of the Spell class) - unit64 const GetCasterGUID() const; + uint64 const GetCasterGUID() const; // returns unit which casted the aura or NULL if not avalible (caster logged out for example) Unit* GetCaster() const; // returns object on which aura was casted, target for non-area auras, area aura source for area auras |
