diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-05 14:28:58 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-05 14:28:58 +0200 |
| commit | a508ce1976caaf8ede6afcea7e8a857399f548ef (patch) | |
| tree | a74648a065e92da70251066a99ecda387a9fe1a2 /src/server/game/Globals/ObjectMgr.h | |
| parent | 6d93a0a810c9d092797a5016738576d03005d1b7 (diff) | |
| parent | d28b66bca88de621fd00495e4edc7e4d9d01e7eb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 006bdfeaebf..a6e2ce9b067 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -670,7 +670,7 @@ enum SkillRangeType SKILL_RANGE_NONE // 0..0 always }; -SkillRangeType GetSkillRangeType(SkillLineEntry const* pSkill, bool racial); +SkillRangeType GetSkillRangeType(SkillRaceClassInfoEntry const* rcEntry); #define MAX_PLAYER_NAME 12 // max allowed by client name length #define MAX_INTERNAL_PLAYER_NAME 15 // max server internal player name length (> MAX_PLAYER_NAME for support declined names) |