Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
Subv
2012-10-21 17:26:37 -05:00
parent 1fc3aad9d7 cff550449d
commit bcabdb08e4
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/server/game/Entities/Player/Player.h
View File

@@ -115,6 +115,40 @@ struct PlayerTalent
uint8 spec : 8;
};
enum TalentTree // talent tabs
{
TALENT_TREE_WARRIOR_ARMS = 746,
TALENT_TREE_WARRIOR_FURY = 815,
TALENT_TREE_WARRIOR_PROTECTION = 845,
TALENT_TREE_PALADIN_HOLY = 831,
TALENT_TREE_PALADIN_PROTECTION = 839,
TALENT_TREE_PALADIN_RETRIBUTION = 855,
TALENT_TREE_HUNTER_BEAST_MASTERY = 811,
TALENT_TREE_HUNTER_MARKSMANSHIP = 807,
TALENT_TREE_HUNTER_SURVIVAL = 809,
TALENT_TREE_ROGUE_ASSASSINATION = 182,
TALENT_TREE_ROGUE_COMBAT = 181,
TALENT_TREE_ROGUE_SUBTLETY = 183,
TALENT_TREE_PRIEST_DISCIPLINE = 760,
TALENT_TREE_PRIEST_HOLY = 813,
TALENT_TREE_PRIEST_SHADOW = 795,
TALENT_TREE_DEATH_KNIGHT_BLOOD = 398,
TALENT_TREE_DEATH_KNIGHT_FROST = 399,
TALENT_TREE_DEATH_KNIGHT_UNHOLY = 400,
TALENT_TREE_SHAMAN_ELEMENTAL = 261,
TALENT_TREE_SHAMAN_ENHANCEMENT = 263,
TALENT_TREE_SHAMAN_RESTORATION = 262,
TALENT_TREE_MAGE_ARCANE = 799,
TALENT_TREE_MAGE_FIRE = 851,
TALENT_TREE_MAGE_FROST = 823,
TALENT_TREE_WARLOCK_AFFLICTION = 871,
TALENT_TREE_WARLOCK_DEMONOLOGY = 867,
TALENT_TREE_WARLOCK_DESTRUCTION = 865,
TALENT_TREE_DRUID_BALANCE = 752,
TALENT_TREE_DRUID_FERAL_COMBAT = 750,
TALENT_TREE_DRUID_RESTORATION = 748
};
// Spell modifier (used for modify other spells)
struct SpellModifier
{

3
src/server/scripts/Spells/spell_druid.cpp
View File

@@ -158,7 +158,6 @@ enum EclipseSpells
SPELL_DRUID_SOLAR_ECLIPSE_MARKER = 67483, // Will make the yellow arrow on eclipse bar point to the yellow side (solar)
SPELL_DRUID_SOLAR_ECLIPSE = 48517,
SPELL_DRUID_LUNAR_ECLIPSE = 48518,
TALENT_TREE_BALANCE = 752,
};
// Wrath, Starfire, and Starsurge
@@ -191,7 +190,7 @@ public:
Player* caster = GetCaster()->ToPlayer();
// No boomy, no deal.
if (caster->GetPrimaryTalentTree(caster->GetActiveSpec()) != TALENT_TREE_BALANCE)
if (caster->GetPrimaryTalentTree(caster->GetActiveSpec()) != TALENT_TREE_DRUID_BALANCE)
return;
switch(GetSpellInfo()->Id)