diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:11:14 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:11:14 +0100 |
| commit | 68e0ef80390d0163ec7b9cef9b949db8ea19262d (patch) | |
| tree | d34fcd889d598680609190fdc6cc6501c42abaee /src/server/game/Entities/Pet | |
| parent | dd9d7e6870f32a76da99f00d9c16812332a9e2f8 (diff) | |
| parent | 8d049545de87595a84e6e2c54d7b44b354644144 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/DataStores/DBCEnums.h
src/server/game/Entities/Object/ObjectDefines.h
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.h
src/server/game/Instances/InstanceScript.h
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/OutdoorPvP/OutdoorPvP.h
src/server/game/Quests/QuestDef.h
src/server/game/Spells/Spell.h
src/server/game/Spells/SpellInfo.h
Diffstat (limited to 'src/server/game/Entities/Pet')
| -rwxr-xr-x | src/server/game/Entities/Pet/Pet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index ed08386be20..f1170f728f5 100755 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -27,7 +27,7 @@ enum PetType { SUMMON_PET = 0, HUNTER_PET = 1, - MAX_PET_TYPE = 4, + MAX_PET_TYPE = 4 }; #define MAX_PET_STABLES 4 @@ -54,7 +54,7 @@ enum PetSpellType { PETSPELL_NORMAL = 0, PETSPELL_FAMILY = 1, - PETSPELL_TALENT = 2, + PETSPELL_TALENT = 2 }; struct PetSpell |