josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Follow codingstyle guidelines (CamelCase for functions, lowerCamel for vars and local stuff)

Browse Source 
(cherry picked from commit adb39317fa78632c452cba1d3c9eeb31a5c3309a)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellInfo.cpp
This commit is contained in:
click
2015-04-14 01:02:16 +01:00
committed by DDuarte
parent abb9e5dd29
commit 1c5a193aba
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -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);
src/server/game/Entities/Player/Player.h
+1 -1
View File
@@ -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);
src/server/game/Spells/SpellInfo.cpp
+1 -1
View File
@@ -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;
}
}