diff options
| author | click <click@gonnamakeyou.com> | 2015-04-10 04:14:50 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-04-14 01:02:16 +0100 |
| commit | 1c5a193aba260489505964c9e56f8633dbb1718c (patch) | |
| tree | ae740ac8f9724fb89d9ac641b98f56e389216e80 | |
| parent | abb9e5dd2981c497fc83932221b2ce81d8a5a668 (diff) | |
Core: Follow codingstyle guidelines (CamelCase for functions, lowerCamel for vars and local stuff)
(cherry picked from commit adb39317fa78632c452cba1d3c9eeb31a5c3309a)
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Spells/SpellInfo.cpp
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 62b935b598e..7c192d6b1fd 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -24630,7 +24630,7 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot) SendEquipError(msg, NULL, NULL, item->itemid); } -bool Player::canFlyInZone(uint32 mapid, uint32 zone) const +bool Player::CanFlyInZone(uint32 mapid, uint32 zone) const { // continent checked in SpellInfo::CheckLocation at cast and area update uint32 v_map = GetVirtualMapForMapAndZone(mapid, zone); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 07669bab025..9631f9f2cfe 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2396,7 +2396,7 @@ class Player : public Unit, public GridObject<Player> void SetFallInformation(uint32 time, float z); void HandleFall(MovementInfo const& movementInfo); - bool canFlyInZone(uint32 mapid, uint32 zone) const; + bool CanFlyInZone(uint32 mapid, uint32 zone) const; void SetClientControl(Unit* target, bool allowMove); diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 77fbd9a8332..cf48c3d5ae5 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1819,7 +1819,7 @@ SpellCastResult SpellInfo::CheckLocation(uint32 map_id, uint32 zone_id, uint32 a for (SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter) { if (skillIter->second->skillId == SKILL_MOUNTS) - if (!player->canFlyInZone(map_id, zone_id)) + if (!player->CanFlyInZone(map_id, zone_id)) return SPELL_FAILED_INCORRECT_AREA; } } |