Update some code for 322a

--HG--
branch : trunk

1 files changed, 246 insertions, 241 deletions

diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index eaeb583d0e9..c6cf5debe77 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -47,7 +47,7 @@ enum Races
     RACE_TROLL          = 8,
     //RACE_GOBLIN         = 9,
     RACE_BLOODELF       = 10,
-    RACE_DRAENEI        = 11,
+    RACE_DRAENEI        = 11
     //RACE_FEL_ORC        = 12,
     //RACE_NAGA           = 13,
     //RACE_BROKEN         = 14,
@@ -82,7 +82,7 @@ enum Classes
     CLASS_MAGE          = 8,
     CLASS_WARLOCK       = 9,
     //CLASS_UNK           = 10,
-    CLASS_DRUID         = 11,
+    CLASS_DRUID         = 11
 };
 
 // max+1 for player class
@@ -98,7 +98,7 @@ enum Classes
 
 #define CLASSMASK_WAND_USERS ((1<<(CLASS_PRIEST-1))|(1<<(CLASS_MAGE-1))|(1<<(CLASS_WARLOCK-1)))
 
-#define PLAYER_MAX_BATTLEGROUND_QUEUES 3
+#define PLAYER_MAX_BATTLEGROUND_QUEUES 2
 
 enum ReputationRank
 {
@@ -661,7 +661,7 @@ enum SpellEffects
     SPELL_EFFECT_SELF_RESURRECT            = 94,
     SPELL_EFFECT_SKINNING                  = 95,
     SPELL_EFFECT_CHARGE                    = 96,
-    SPELL_EFFECT_97                        = 97,
+    SPELL_EFFECT_CAST_BUTTON               = 97,
     SPELL_EFFECT_KNOCK_BACK                = 98,
     SPELL_EFFECT_DISENCHANT                = 99,
     SPELL_EFFECT_INEBRIATE                 = 100,
@@ -732,192 +732,193 @@ enum SpellEffects
 
 enum SpellCastResult
 {
-    SPELL_FAILED_AFFECTING_COMBAT               = 0x00,
-    SPELL_FAILED_ALREADY_AT_FULL_HEALTH         = 0x01,
-    SPELL_FAILED_ALREADY_AT_FULL_MANA           = 0x02,
-    SPELL_FAILED_ALREADY_AT_FULL_POWER          = 0x03,
-    SPELL_FAILED_ALREADY_BEING_TAMED            = 0x04,
-    SPELL_FAILED_ALREADY_HAVE_CHARM             = 0x05,
-    SPELL_FAILED_ALREADY_HAVE_SUMMON            = 0x06,
-    SPELL_FAILED_ALREADY_OPEN                   = 0x07,
-    SPELL_FAILED_AURA_BOUNCED                   = 0x08,
-    SPELL_FAILED_AUTOTRACK_INTERRUPTED          = 0x09,
-    SPELL_FAILED_BAD_IMPLICIT_TARGETS           = 0x0A,
-    SPELL_FAILED_BAD_TARGETS                    = 0x0B,
-    SPELL_FAILED_CANT_BE_CHARMED                = 0x0C,
-    SPELL_FAILED_CANT_BE_DISENCHANTED           = 0x0D,
-    SPELL_FAILED_CANT_BE_DISENCHANTED_SKILL     = 0x0E,
-    SPELL_FAILED_CANT_BE_MILLED                 = 0x0F,
-    SPELL_FAILED_CANT_BE_PROSPECTED             = 0x10,
-    SPELL_FAILED_CANT_CAST_ON_TAPPED            = 0x11,
-    SPELL_FAILED_CANT_DUEL_WHILE_INVISIBLE      = 0x12,
-    SPELL_FAILED_CANT_DUEL_WHILE_STEALTHED      = 0x13,
-    SPELL_FAILED_CANT_STEALTH                   = 0x14,
-    SPELL_FAILED_CASTER_AURASTATE               = 0x15,
-    SPELL_FAILED_CASTER_DEAD                    = 0x16,
-    SPELL_FAILED_CHARMED                        = 0x17,
-    SPELL_FAILED_CHEST_IN_USE                   = 0x18,
-    SPELL_FAILED_CONFUSED                       = 0x19,
-    SPELL_FAILED_DONT_REPORT                    = 0x1A,
-    SPELL_FAILED_EQUIPPED_ITEM                  = 0x1B,
-    SPELL_FAILED_EQUIPPED_ITEM_CLASS            = 0x1C,
-    SPELL_FAILED_EQUIPPED_ITEM_CLASS_MAINHAND   = 0x1D,
-    SPELL_FAILED_EQUIPPED_ITEM_CLASS_OFFHAND    = 0x1E,
-    SPELL_FAILED_ERROR                          = 0x1F,
-    SPELL_FAILED_FIZZLE                         = 0x20,
-    SPELL_FAILED_FLEEING                        = 0x21,
-    SPELL_FAILED_FOOD_LOWLEVEL                  = 0x22,
-    SPELL_FAILED_HIGHLEVEL                      = 0x23,
-    SPELL_FAILED_HUNGER_SATIATED                = 0x24,
-    SPELL_FAILED_IMMUNE                         = 0x25,
-    SPELL_FAILED_INCORRECT_AREA                 = 0x26,
-    SPELL_FAILED_INTERRUPTED                    = 0x27,
-    SPELL_FAILED_INTERRUPTED_COMBAT             = 0x28,
-    SPELL_FAILED_ITEM_ALREADY_ENCHANTED         = 0x29,
-    SPELL_FAILED_ITEM_GONE                      = 0x2A,
-    SPELL_FAILED_ITEM_NOT_FOUND                 = 0x2B,
-    SPELL_FAILED_ITEM_NOT_READY                 = 0x2C,
-    SPELL_FAILED_LEVEL_REQUIREMENT              = 0x2D,
-    SPELL_FAILED_LINE_OF_SIGHT                  = 0x2E,
-    SPELL_FAILED_LOWLEVEL                       = 0x2F,
-    SPELL_FAILED_LOW_CASTLEVEL                  = 0x30,
-    SPELL_FAILED_MAINHAND_EMPTY                 = 0x31,
-    SPELL_FAILED_MOVING                         = 0x32,
-    SPELL_FAILED_NEED_AMMO                      = 0x33,
-    SPELL_FAILED_NEED_AMMO_POUCH                = 0x34,
-    SPELL_FAILED_NEED_EXOTIC_AMMO               = 0x35,
-    SPELL_FAILED_NEED_MORE_ITEMS                = 0x36,
-    SPELL_FAILED_NOPATH                         = 0x37,
-    SPELL_FAILED_NOT_BEHIND                     = 0x38,
-    SPELL_FAILED_NOT_FISHABLE                   = 0x39,
-    SPELL_FAILED_NOT_FLYING                     = 0x3A,
-    SPELL_FAILED_NOT_HERE                       = 0x3B,
-    SPELL_FAILED_NOT_INFRONT                    = 0x3C,
-    SPELL_FAILED_NOT_IN_CONTROL                 = 0x3D,
-    SPELL_FAILED_NOT_KNOWN                      = 0x3E,
-    SPELL_FAILED_NOT_MOUNTED                    = 0x3F,
-    SPELL_FAILED_NOT_ON_TAXI                    = 0x40,
-    SPELL_FAILED_NOT_ON_TRANSPORT               = 0x41,
-    SPELL_FAILED_NOT_READY                      = 0x42,
-    SPELL_FAILED_NOT_SHAPESHIFT                 = 0x43,
-    SPELL_FAILED_NOT_STANDING                   = 0x44,
-    SPELL_FAILED_NOT_TRADEABLE                  = 0x45,
-    SPELL_FAILED_NOT_TRADING                    = 0x46,
-    SPELL_FAILED_NOT_UNSHEATHED                 = 0x47,
-    SPELL_FAILED_NOT_WHILE_GHOST                = 0x48,
-    SPELL_FAILED_NOT_WHILE_LOOTING              = 0x49,
-    SPELL_FAILED_NO_AMMO                        = 0x4A,
-    SPELL_FAILED_NO_CHARGES_REMAIN              = 0x4B,
-    SPELL_FAILED_NO_CHAMPION                    = 0x4C,
-    SPELL_FAILED_NO_COMBO_POINTS                = 0x4D,
-    SPELL_FAILED_NO_DUELING                     = 0x4E,
-    SPELL_FAILED_NO_ENDURANCE                   = 0x4F,
-    SPELL_FAILED_NO_FISH                        = 0x50,
-    SPELL_FAILED_NO_ITEMS_WHILE_SHAPESHIFTED    = 0x51,
-    SPELL_FAILED_NO_MOUNTS_ALLOWED              = 0x52,
-    SPELL_FAILED_NO_PET                         = 0x53,
-    SPELL_FAILED_NO_POWER                       = 0x54,
-    SPELL_FAILED_NOTHING_TO_DISPEL              = 0x55,
-    SPELL_FAILED_NOTHING_TO_STEAL               = 0x56,
-    SPELL_FAILED_ONLY_ABOVEWATER                = 0x57,
-    SPELL_FAILED_ONLY_DAYTIME                   = 0x58,
-    SPELL_FAILED_ONLY_INDOORS                   = 0x59,
-    SPELL_FAILED_ONLY_MOUNTED                   = 0x5A,
-    SPELL_FAILED_ONLY_NIGHTTIME                 = 0x5B,
-    SPELL_FAILED_ONLY_OUTDOORS                  = 0x5C,
-    SPELL_FAILED_ONLY_SHAPESHIFT                = 0x5D,
-    SPELL_FAILED_ONLY_STEALTHED                 = 0x5E,
-    SPELL_FAILED_ONLY_UNDERWATER                = 0x5F,
-    SPELL_FAILED_OUT_OF_RANGE                   = 0x60,
-    SPELL_FAILED_PACIFIED                       = 0x61,
-    SPELL_FAILED_POSSESSED                      = 0x62,
-    SPELL_FAILED_REAGENTS                       = 0x63,
-    SPELL_FAILED_REQUIRES_AREA                  = 0x64,
-    SPELL_FAILED_REQUIRES_SPELL_FOCUS           = 0x65,
-    SPELL_FAILED_ROOTED                         = 0x66,
-    SPELL_FAILED_SILENCED                       = 0x67,
-    SPELL_FAILED_SPELL_IN_PROGRESS              = 0x68,
-    SPELL_FAILED_SPELL_LEARNED                  = 0x69,
-    SPELL_FAILED_SPELL_UNAVAILABLE              = 0x6A,
-    SPELL_FAILED_STUNNED                        = 0x6B,
-    SPELL_FAILED_TARGETS_DEAD                   = 0x6C,
-    SPELL_FAILED_TARGET_AFFECTING_COMBAT        = 0x6D,
-    SPELL_FAILED_TARGET_AURASTATE               = 0x6E,
-    SPELL_FAILED_TARGET_DUELING                 = 0x6F,
-    SPELL_FAILED_TARGET_ENEMY                   = 0x70,
-    SPELL_FAILED_TARGET_ENRAGED                 = 0x71,
-    SPELL_FAILED_TARGET_FRIENDLY                = 0x72,
-    SPELL_FAILED_TARGET_IN_COMBAT               = 0x73,
-    SPELL_FAILED_TARGET_IS_PLAYER               = 0x74,
-    SPELL_FAILED_TARGET_IS_PLAYER_CONTROLLED    = 0x75,
-    SPELL_FAILED_TARGET_NOT_DEAD                = 0x76,
-    SPELL_FAILED_TARGET_NOT_IN_PARTY            = 0x77,
-    SPELL_FAILED_TARGET_NOT_LOOTED              = 0x78,
-    SPELL_FAILED_TARGET_NOT_PLAYER              = 0x79,
-    SPELL_FAILED_TARGET_NO_POCKETS              = 0x7A,
-    SPELL_FAILED_TARGET_NO_WEAPONS              = 0x7B,
-    SPELL_FAILED_TARGET_NO_RANGED_WEAPONS       = 0x7C,
-    SPELL_FAILED_TARGET_UNSKINNABLE             = 0x7D,
-    SPELL_FAILED_THIRST_SATIATED                = 0x7E,
-    SPELL_FAILED_TOO_CLOSE                      = 0x7F,
-    SPELL_FAILED_TOO_MANY_OF_ITEM               = 0x80,
-    SPELL_FAILED_TOTEM_CATEGORY                 = 0x81,
-    SPELL_FAILED_TOTEMS                         = 0x82,
-    SPELL_FAILED_TRY_AGAIN                      = 0x83,
-    SPELL_FAILED_UNIT_NOT_BEHIND                = 0x84,
-    SPELL_FAILED_UNIT_NOT_INFRONT               = 0x85,
-    SPELL_FAILED_WRONG_PET_FOOD                 = 0x86,
-    SPELL_FAILED_NOT_WHILE_FATIGUED             = 0x87,
-    SPELL_FAILED_TARGET_NOT_IN_INSTANCE         = 0x88,
-    SPELL_FAILED_NOT_WHILE_TRADING              = 0x89,
-    SPELL_FAILED_TARGET_NOT_IN_RAID             = 0x8A,
-    SPELL_FAILED_TARGET_FREEFORALL              = 0x8B,
-    SPELL_FAILED_NO_EDIBLE_CORPSES              = 0x8C,
-    SPELL_FAILED_ONLY_BATTLEGROUNDS             = 0x8D,
-    SPELL_FAILED_TARGET_NOT_GHOST               = 0x8E,
-    SPELL_FAILED_TRANSFORM_UNUSABLE             = 0x8F,
-    SPELL_FAILED_WRONG_WEATHER                  = 0x90,
-    SPELL_FAILED_DAMAGE_IMMUNE                  = 0x91,
-    SPELL_FAILED_PREVENTED_BY_MECHANIC          = 0x92,
-    SPELL_FAILED_PLAY_TIME                      = 0x93,
-    SPELL_FAILED_REPUTATION                     = 0x94,
-    SPELL_FAILED_MIN_SKILL                      = 0x95,
-    SPELL_FAILED_NOT_IN_ARENA                   = 0x96,
-    SPELL_FAILED_NOT_ON_SHAPESHIFT              = 0x97,
-    SPELL_FAILED_NOT_ON_STEALTHED               = 0x98,
-    SPELL_FAILED_NOT_ON_DAMAGE_IMMUNE           = 0x99,
-    SPELL_FAILED_NOT_ON_MOUNTED                 = 0x9A,
-    SPELL_FAILED_TOO_SHALLOW                    = 0x9B,
-    SPELL_FAILED_TARGET_NOT_IN_SANCTUARY        = 0x9C,
-    SPELL_FAILED_TARGET_IS_TRIVIAL              = 0x9D,
-    SPELL_FAILED_BM_OR_INVISGOD                 = 0x9E,
-    SPELL_FAILED_EXPERT_RIDING_REQUIREMENT      = 0x9F,
-    SPELL_FAILED_ARTISAN_RIDING_REQUIREMENT     = 0xA0,
-    SPELL_FAILED_NOT_IDLE                       = 0xA1,
-    SPELL_FAILED_NOT_INACTIVE                   = 0xA2,
-    SPELL_FAILED_PARTIAL_PLAYTIME               = 0xA3,
-    SPELL_FAILED_NO_PLAYTIME                    = 0xA4,
-    SPELL_FAILED_NOT_IN_BATTLEGROUND            = 0xA5,
-    SPELL_FAILED_NOT_IN_RAID_INSTANCE           = 0xA6,
-    SPELL_FAILED_ONLY_IN_ARENA                  = 0xA7,
-    SPELL_FAILED_TARGET_LOCKED_TO_RAID_INSTANCE = 0xA8,
-    SPELL_FAILED_ON_USE_ENCHANT                 = 0xA9,
-    SPELL_FAILED_NOT_ON_GROUND                  = 0xAA,
-    SPELL_FAILED_CUSTOM_ERROR                   = 0xAB,
-    SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW         = 0xAC,
-    SPELL_FAILED_TOO_MANY_SOCKETS               = 0xAD,
-    SPELL_FAILED_INVALID_GLYPH                  = 0xAE,
-    SPELL_FAILED_UNIQUE_GLYPH                   = 0xAF,
-    SPELL_FAILED_GLYPH_SOCKET_LOCKED            = 0xB0,
-    SPELL_FAILED_NO_VALID_TARGETS               = 0xB1,
-    SPELL_FAILED_ITEM_AT_MAX_CHARGES            = 0xB2,
-    SPELL_FAILED_NOT_IN_BARBERSHOP              = 0xB3,
-    SPELL_FAILED_FISHING_TOO_LOW                = 0xB4,
-    SPELL_FAILED_ITEM_ENCHANT_TRADE_WINDOW      = 0xB5,
-    SPELL_FAILED_SUMMON_PENDING                 = 0xB6,
-    SPELL_FAILED_MAX_SOCKETS                    = 0xB7,
-    SPELL_FAILED_PET_CAN_RENAME                 = 0xB8,
-    SPELL_FAILED_UNKNOWN                        = 0xB9,
+    SPELL_FAILED_SUCCESS                        = 0x00,
+    SPELL_FAILED_AFFECTING_COMBAT               = 0x01,
+    SPELL_FAILED_ALREADY_AT_FULL_HEALTH         = 0x02,
+    SPELL_FAILED_ALREADY_AT_FULL_MANA           = 0x03,
+    SPELL_FAILED_ALREADY_AT_FULL_POWER          = 0x04,
+    SPELL_FAILED_ALREADY_BEING_TAMED            = 0x05,
+    SPELL_FAILED_ALREADY_HAVE_CHARM             = 0x06,
+    SPELL_FAILED_ALREADY_HAVE_SUMMON            = 0x07,
+    SPELL_FAILED_ALREADY_OPEN                   = 0x08,
+    SPELL_FAILED_AURA_BOUNCED                   = 0x09,
+    SPELL_FAILED_AUTOTRACK_INTERRUPTED          = 0x0A,
+    SPELL_FAILED_BAD_IMPLICIT_TARGETS           = 0x0B,
+    SPELL_FAILED_BAD_TARGETS                    = 0x0C,
+    SPELL_FAILED_CANT_BE_CHARMED                = 0x0D,
+    SPELL_FAILED_CANT_BE_DISENCHANTED           = 0x0E,
+    SPELL_FAILED_CANT_BE_DISENCHANTED_SKILL     = 0x0F,
+    SPELL_FAILED_CANT_BE_MILLED                 = 0x10,
+    SPELL_FAILED_CANT_BE_PROSPECTED             = 0x11,
+    SPELL_FAILED_CANT_CAST_ON_TAPPED            = 0x12,
+    SPELL_FAILED_CANT_DUEL_WHILE_INVISIBLE      = 0x13,
+    SPELL_FAILED_CANT_DUEL_WHILE_STEALTHED      = 0x14,
+    SPELL_FAILED_CANT_STEALTH                   = 0x15,
+    SPELL_FAILED_CASTER_AURASTATE               = 0x16,
+    SPELL_FAILED_CASTER_DEAD                    = 0x17,
+    SPELL_FAILED_CHARMED                        = 0x18,
+    SPELL_FAILED_CHEST_IN_USE                   = 0x19,
+    SPELL_FAILED_CONFUSED                       = 0x1A,
+    SPELL_FAILED_DONT_REPORT                    = 0x1B,
+    SPELL_FAILED_EQUIPPED_ITEM                  = 0x1C,
+    SPELL_FAILED_EQUIPPED_ITEM_CLASS            = 0x1D,
+    SPELL_FAILED_EQUIPPED_ITEM_CLASS_MAINHAND   = 0x1E,
+    SPELL_FAILED_EQUIPPED_ITEM_CLASS_OFFHAND    = 0x1F,
+    SPELL_FAILED_ERROR                          = 0x20,
+    SPELL_FAILED_FIZZLE                         = 0x21,
+    SPELL_FAILED_FLEEING                        = 0x22,
+    SPELL_FAILED_FOOD_LOWLEVEL                  = 0x23,
+    SPELL_FAILED_HIGHLEVEL                      = 0x24,
+    SPELL_FAILED_HUNGER_SATIATED                = 0x25,
+    SPELL_FAILED_IMMUNE                         = 0x26,
+    SPELL_FAILED_INCORRECT_AREA                 = 0x27,
+    SPELL_FAILED_INTERRUPTED                    = 0x28,
+    SPELL_FAILED_INTERRUPTED_COMBAT             = 0x29,
+    SPELL_FAILED_ITEM_ALREADY_ENCHANTED         = 0x2A,
+    SPELL_FAILED_ITEM_GONE                      = 0x2B,
+    SPELL_FAILED_ITEM_NOT_FOUND                 = 0x2C,
+    SPELL_FAILED_ITEM_NOT_READY                 = 0x2D,
+    SPELL_FAILED_LEVEL_REQUIREMENT              = 0x2E,
+    SPELL_FAILED_LINE_OF_SIGHT                  = 0x2F,
+    SPELL_FAILED_LOWLEVEL                       = 0x30,
+    SPELL_FAILED_LOW_CASTLEVEL                  = 0x31,
+    SPELL_FAILED_MAINHAND_EMPTY                 = 0x32,
+    SPELL_FAILED_MOVING                         = 0x33,
+    SPELL_FAILED_NEED_AMMO                      = 0x34,
+    SPELL_FAILED_NEED_AMMO_POUCH                = 0x35,
+    SPELL_FAILED_NEED_EXOTIC_AMMO               = 0x36,
+    SPELL_FAILED_NEED_MORE_ITEMS                = 0x37,
+    SPELL_FAILED_NOPATH                         = 0x38,
+    SPELL_FAILED_NOT_BEHIND                     = 0x39,
+    SPELL_FAILED_NOT_FISHABLE                   = 0x3A,
+    SPELL_FAILED_NOT_FLYING                     = 0x3B,
+    SPELL_FAILED_NOT_HERE                       = 0x3C,
+    SPELL_FAILED_NOT_INFRONT                    = 0x3D,
+    SPELL_FAILED_NOT_IN_CONTROL                 = 0x3E,
+    SPELL_FAILED_NOT_KNOWN                      = 0x3F,
+    SPELL_FAILED_NOT_MOUNTED                    = 0x40,
+    SPELL_FAILED_NOT_ON_TAXI                    = 0x41,
+    SPELL_FAILED_NOT_ON_TRANSPORT               = 0x42,
+    SPELL_FAILED_NOT_READY                      = 0x43,
+    SPELL_FAILED_NOT_SHAPESHIFT                 = 0x44,
+    SPELL_FAILED_NOT_STANDING                   = 0x45,
+    SPELL_FAILED_NOT_TRADEABLE                  = 0x46,
+    SPELL_FAILED_NOT_TRADING                    = 0x47,
+    SPELL_FAILED_NOT_UNSHEATHED                 = 0x48,
+    SPELL_FAILED_NOT_WHILE_GHOST                = 0x49,
+    SPELL_FAILED_NOT_WHILE_LOOTING              = 0x4A,
+    SPELL_FAILED_NO_AMMO                        = 0x4B,
+    SPELL_FAILED_NO_CHARGES_REMAIN              = 0x4C,
+    SPELL_FAILED_NO_CHAMPION                    = 0x4D,
+    SPELL_FAILED_NO_COMBO_POINTS                = 0x4E,
+    SPELL_FAILED_NO_DUELING                     = 0x4F,
+    SPELL_FAILED_NO_ENDURANCE                   = 0x50,
+    SPELL_FAILED_NO_FISH                        = 0x51,
+    SPELL_FAILED_NO_ITEMS_WHILE_SHAPESHIFTED    = 0x52,
+    SPELL_FAILED_NO_MOUNTS_ALLOWED              = 0x53,
+    SPELL_FAILED_NO_PET                         = 0x54,
+    SPELL_FAILED_NO_POWER                       = 0x55,
+    SPELL_FAILED_NOTHING_TO_DISPEL              = 0x56,
+    SPELL_FAILED_NOTHING_TO_STEAL               = 0x57,
+    SPELL_FAILED_ONLY_ABOVEWATER                = 0x58,
+    SPELL_FAILED_ONLY_DAYTIME                   = 0x59,
+    SPELL_FAILED_ONLY_INDOORS                   = 0x5A,
+    SPELL_FAILED_ONLY_MOUNTED                   = 0x5B,
+    SPELL_FAILED_ONLY_NIGHTTIME                 = 0x5C,
+    SPELL_FAILED_ONLY_OUTDOORS                  = 0x5D,
+    SPELL_FAILED_ONLY_SHAPESHIFT                = 0x5E,
+    SPELL_FAILED_ONLY_STEALTHED                 = 0x5F,
+    SPELL_FAILED_ONLY_UNDERWATER                = 0x60,
+    SPELL_FAILED_OUT_OF_RANGE                   = 0x61,
+    SPELL_FAILED_PACIFIED                       = 0x62,
+    SPELL_FAILED_POSSESSED                      = 0x63,
+    SPELL_FAILED_REAGENTS                       = 0x64,
+    SPELL_FAILED_REQUIRES_AREA                  = 0x65,
+    SPELL_FAILED_REQUIRES_SPELL_FOCUS           = 0x66,
+    SPELL_FAILED_ROOTED                         = 0x67,
+    SPELL_FAILED_SILENCED                       = 0x68,
+    SPELL_FAILED_SPELL_IN_PROGRESS              = 0x69,
+    SPELL_FAILED_SPELL_LEARNED                  = 0x6A,
+    SPELL_FAILED_SPELL_UNAVAILABLE              = 0x6B,
+    SPELL_FAILED_STUNNED                        = 0x6C,
+    SPELL_FAILED_TARGETS_DEAD                   = 0x6D,
+    SPELL_FAILED_TARGET_AFFECTING_COMBAT        = 0x6E,
+    SPELL_FAILED_TARGET_AURASTATE               = 0x6F,
+    SPELL_FAILED_TARGET_DUELING                 = 0x70,
+    SPELL_FAILED_TARGET_ENEMY                   = 0x71,
+    SPELL_FAILED_TARGET_ENRAGED                 = 0x72,
+    SPELL_FAILED_TARGET_FRIENDLY                = 0x73,
+    SPELL_FAILED_TARGET_IN_COMBAT               = 0x74,
+    SPELL_FAILED_TARGET_IS_PLAYER               = 0x75,
+    SPELL_FAILED_TARGET_IS_PLAYER_CONTROLLED    = 0x76,
+    SPELL_FAILED_TARGET_NOT_DEAD                = 0x77,
+    SPELL_FAILED_TARGET_NOT_IN_PARTY            = 0x78,
+    SPELL_FAILED_TARGET_NOT_LOOTED              = 0x79,
+    SPELL_FAILED_TARGET_NOT_PLAYER              = 0x7A,
+    SPELL_FAILED_TARGET_NO_POCKETS              = 0x7B,
+    SPELL_FAILED_TARGET_NO_WEAPONS              = 0x7C,
+    SPELL_FAILED_TARGET_NO_RANGED_WEAPONS       = 0x7D,
+    SPELL_FAILED_TARGET_UNSKINNABLE             = 0x7E,
+    SPELL_FAILED_THIRST_SATIATED                = 0x7F,
+    SPELL_FAILED_TOO_CLOSE                      = 0x80,
+    SPELL_FAILED_TOO_MANY_OF_ITEM               = 0x81,
+    SPELL_FAILED_TOTEM_CATEGORY                 = 0x82,
+    SPELL_FAILED_TOTEMS                         = 0x83,
+    SPELL_FAILED_TRY_AGAIN                      = 0x84,
+    SPELL_FAILED_UNIT_NOT_BEHIND                = 0x85,
+    SPELL_FAILED_UNIT_NOT_INFRONT               = 0x86,
+    SPELL_FAILED_WRONG_PET_FOOD                 = 0x87,
+    SPELL_FAILED_NOT_WHILE_FATIGUED             = 0x88,
+    SPELL_FAILED_TARGET_NOT_IN_INSTANCE         = 0x89,
+    SPELL_FAILED_NOT_WHILE_TRADING              = 0x8A,
+    SPELL_FAILED_TARGET_NOT_IN_RAID             = 0x8B,
+    SPELL_FAILED_TARGET_FREEFORALL              = 0x8C,
+    SPELL_FAILED_NO_EDIBLE_CORPSES              = 0x8D,
+    SPELL_FAILED_ONLY_BATTLEGROUNDS             = 0x8E,
+    SPELL_FAILED_TARGET_NOT_GHOST               = 0x8F,
+    SPELL_FAILED_TRANSFORM_UNUSABLE             = 0x90,
+    SPELL_FAILED_WRONG_WEATHER                  = 0x91,
+    SPELL_FAILED_DAMAGE_IMMUNE                  = 0x92,
+    SPELL_FAILED_PREVENTED_BY_MECHANIC          = 0x93,
+    SPELL_FAILED_PLAY_TIME                      = 0x94,
+    SPELL_FAILED_REPUTATION                     = 0x95,
+    SPELL_FAILED_MIN_SKILL                      = 0x96,
+    SPELL_FAILED_NOT_IN_ARENA                   = 0x97,
+    SPELL_FAILED_NOT_ON_SHAPESHIFT              = 0x98,
+    SPELL_FAILED_NOT_ON_STEALTHED               = 0x99,
+    SPELL_FAILED_NOT_ON_DAMAGE_IMMUNE           = 0x9A,
+    SPELL_FAILED_NOT_ON_MOUNTED                 = 0x9B,
+    SPELL_FAILED_TOO_SHALLOW                    = 0x9C,
+    SPELL_FAILED_TARGET_NOT_IN_SANCTUARY        = 0x9D,
+    SPELL_FAILED_TARGET_IS_TRIVIAL              = 0x9E,
+    SPELL_FAILED_BM_OR_INVISGOD                 = 0x9F,
+    SPELL_FAILED_EXPERT_RIDING_REQUIREMENT      = 0xA0,
+    SPELL_FAILED_ARTISAN_RIDING_REQUIREMENT     = 0xA1,
+    SPELL_FAILED_NOT_IDLE                       = 0xA2,
+    SPELL_FAILED_NOT_INACTIVE                   = 0xA3,
+    SPELL_FAILED_PARTIAL_PLAYTIME               = 0xA4,
+    SPELL_FAILED_NO_PLAYTIME                    = 0xA5,
+    SPELL_FAILED_NOT_IN_BATTLEGROUND            = 0xA6,
+    SPELL_FAILED_NOT_IN_RAID_INSTANCE           = 0xA7,
+    SPELL_FAILED_ONLY_IN_ARENA                  = 0xA8,
+    SPELL_FAILED_TARGET_LOCKED_TO_RAID_INSTANCE = 0xA9,
+    SPELL_FAILED_ON_USE_ENCHANT                 = 0xAA,
+    SPELL_FAILED_NOT_ON_GROUND                  = 0xAB,
+    SPELL_FAILED_CUSTOM_ERROR                   = 0xAC,
+    SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW         = 0xAD,
+    SPELL_FAILED_TOO_MANY_SOCKETS               = 0xAE,
+    SPELL_FAILED_INVALID_GLYPH                  = 0xAF,
+    SPELL_FAILED_UNIQUE_GLYPH                   = 0xB0,
+    SPELL_FAILED_GLYPH_SOCKET_LOCKED            = 0xB1,
+    SPELL_FAILED_NO_VALID_TARGETS               = 0xB2,
+    SPELL_FAILED_ITEM_AT_MAX_CHARGES            = 0xB3,
+    SPELL_FAILED_NOT_IN_BARBERSHOP              = 0xB4,
+    SPELL_FAILED_FISHING_TOO_LOW                = 0xB5,
+    SPELL_FAILED_ITEM_ENCHANT_TRADE_WINDOW      = 0xB6,
+    SPELL_FAILED_SUMMON_PENDING                 = 0xB7,
+    SPELL_FAILED_MAX_SOCKETS                    = 0xB8,
+    SPELL_FAILED_PET_CAN_RENAME                 = 0xB9,
+    SPELL_FAILED_UNKNOWN                        = 0xBA,
 
     SPELL_CAST_OK                               = 0xFF      // custom value, don't must be send to client
 };
@@ -2363,8 +2364,8 @@ enum ChatMsg
     CHAT_MSG_OFFICER                = 0x05,
     CHAT_MSG_YELL                   = 0x06,
     CHAT_MSG_WHISPER                = 0x07,
-    CHAT_MSG_WHISPER_INFORM         = 0x08,
-    CHAT_MSG_REPLY                  = 0x09,
+    CHAT_MSG_WHISPER_INFORM         = 0x08, // WHISPER_FOREIGN?
+    CHAT_MSG_REPLY                  = 0x09, // WHISPER_INFORM?
     CHAT_MSG_EMOTE                  = 0x0A,
     CHAT_MSG_TEXT_EMOTE             = 0x0B,
     CHAT_MSG_MONSTER_SAY            = 0x0C,
@@ -2437,10 +2438,10 @@ enum PetDiet
 #define CHAIN_SPELL_JUMP_RADIUS 10
 
 // Max values for Guild & Guild Bank
-#define GUILD_BANK_MAX_TABS         6
+#define GUILD_BANK_MAX_TABS         6                       // send by client for money log also
 #define GUILD_BANK_MAX_SLOTS        98
 #define GUILD_BANK_MAX_LOGS         25
-#define GUILD_BANK_MONEY_LOGS_TAB   100
+#define GUILD_BANK_MONEY_LOGS_TAB   100                     // used for money log in DB
 #define GUILD_EVENTLOG_MAX_RECORDS  100
 #define GUILD_RANKS_MIN_COUNT       5
 #define GUILD_RANKS_MAX_COUNT       10
@@ -2487,14 +2488,7 @@ enum DiminishingGroup
     DIMINISHING_TAUNT,
     DIMINISHING_LIMITONLY               // Don't Diminish, but limit duration to 10s
 };
-
-enum DungeonDifficulties
-{
-    DIFFICULTY_NORMAL = 0,
-    DIFFICULTY_HEROIC = 1,
-    TOTAL_DIFFICULTIES
-};
-
+ 
 enum SummonCategory
 {
     SUMMON_CATEGORY_WILD        = 0,
@@ -2596,42 +2590,51 @@ enum ResponseCodes
     CHAR_CREATE_EXPANSION_CLASS                            = 0x3A,
     CHAR_CREATE_LEVEL_REQUIREMENT                          = 0x3B,
     CHAR_CREATE_UNIQUE_CLASS_LIMIT                         = 0x3C,
-
-    CHAR_DELETE_IN_PROGRESS                                = 0x3D,
-    CHAR_DELETE_SUCCESS                                    = 0x3E,
-    CHAR_DELETE_FAILED                                     = 0x3F,
-    CHAR_DELETE_FAILED_LOCKED_FOR_TRANSFER                 = 0x40,
-    CHAR_DELETE_FAILED_GUILD_LEADER                        = 0x41,
-    CHAR_DELETE_FAILED_ARENA_CAPTAIN                       = 0x42,
-
-    CHAR_LOGIN_IN_PROGRESS                                 = 0x43,
-    CHAR_LOGIN_SUCCESS                                     = 0x44,
-    CHAR_LOGIN_NO_WORLD                                    = 0x45,
-    CHAR_LOGIN_DUPLICATE_CHARACTER                         = 0x46,
-    CHAR_LOGIN_NO_INSTANCES                                = 0x47,
-    CHAR_LOGIN_FAILED                                      = 0x48,
-    CHAR_LOGIN_DISABLED                                    = 0x49,
-    CHAR_LOGIN_NO_CHARACTER                                = 0x4A,
-    CHAR_LOGIN_LOCKED_FOR_TRANSFER                         = 0x4B,
-    CHAR_LOGIN_LOCKED_BY_BILLING                           = 0x4C,
-
-    CHAR_NAME_SUCCESS                                      = 0x4D,
-    CHAR_NAME_FAILURE                                      = 0x4E,
-    CHAR_NAME_NO_NAME                                      = 0x4F,
-    CHAR_NAME_TOO_SHORT                                    = 0x50,
-    CHAR_NAME_TOO_LONG                                     = 0x51,
-    CHAR_NAME_INVALID_CHARACTER                            = 0x52,
-    CHAR_NAME_MIXED_LANGUAGES                              = 0x53,
-    CHAR_NAME_PROFANE                                      = 0x54,
-    CHAR_NAME_RESERVED                                     = 0x55,
-    CHAR_NAME_INVALID_APOSTROPHE                           = 0x56,
-    CHAR_NAME_MULTIPLE_APOSTROPHES                         = 0x57,
-    CHAR_NAME_THREE_CONSECUTIVE                            = 0x58,
-    CHAR_NAME_INVALID_SPACE                                = 0x59,
-    CHAR_NAME_CONSECUTIVE_SPACES                           = 0x5A,
-    CHAR_NAME_RUSSIAN_CONSECUTIVE_SILENT_CHARACTERS        = 0x5B,
-    CHAR_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END = 0x5C,
-    CHAR_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME            = 0x5D
+    CHAR_CREATE_CHARACTER_IN_GUILD                         = 0x3D,
+    CHAR_CREATE_RESTRICTED_RACECLASS                       = 0x3E,
+    CHAR_CREATE_CHARACTER_CHOOSE_RACE                      = 0x3F,
+    CHAR_CREATE_CHARACTER_ARENA_LEADER                     = 0x40,
+    CHAR_CREATE_CHARACTER_DELETE_MAIL                      = 0x41,
+    CHAR_CREATE_CHARACTER_SWAP_FACTION                     = 0x42,
+    CHAR_CREATE_CHARACTER_RACE_ONLY                        = 0x43,
+
+    CHAR_CREATE_CHARACTER_GOLD_LIMIT                       = 0x44,
+
+    CHAR_DELETE_IN_PROGRESS                                = 0x45,
+    CHAR_DELETE_SUCCESS                                    = 0x46,
+    CHAR_DELETE_FAILED                                     = 0x47,
+    CHAR_DELETE_FAILED_LOCKED_FOR_TRANSFER                 = 0x48,
+    CHAR_DELETE_FAILED_GUILD_LEADER                        = 0x49,
+    CHAR_DELETE_FAILED_ARENA_CAPTAIN                       = 0x4A,
+
+    CHAR_LOGIN_IN_PROGRESS                                 = 0x4B,
+    CHAR_LOGIN_SUCCESS                                     = 0x4C,
+    CHAR_LOGIN_NO_WORLD                                    = 0x4D,
+    CHAR_LOGIN_DUPLICATE_CHARACTER                         = 0x4E,
+    CHAR_LOGIN_NO_INSTANCES                                = 0x4F,
+    CHAR_LOGIN_FAILED                                      = 0x50,
+    CHAR_LOGIN_DISABLED                                    = 0x51,
+    CHAR_LOGIN_NO_CHARACTER                                = 0x52,
+    CHAR_LOGIN_LOCKED_FOR_TRANSFER                         = 0x53,
+    CHAR_LOGIN_LOCKED_BY_BILLING                           = 0x54,
+
+    CHAR_NAME_SUCCESS                                      = 0x55,
+    CHAR_NAME_FAILURE                                      = 0x56,
+    CHAR_NAME_NO_NAME                                      = 0x57,
+    CHAR_NAME_TOO_SHORT                                    = 0x58,
+    CHAR_NAME_TOO_LONG                                     = 0x59,
+    CHAR_NAME_INVALID_CHARACTER                            = 0x5A,
+    CHAR_NAME_MIXED_LANGUAGES                              = 0x5B,
+    CHAR_NAME_PROFANE                                      = 0x5C,
+    CHAR_NAME_RESERVED                                     = 0x5D,
+    CHAR_NAME_INVALID_APOSTROPHE                           = 0x5E,
+    CHAR_NAME_MULTIPLE_APOSTROPHES                         = 0x5F,
+    CHAR_NAME_THREE_CONSECUTIVE                            = 0x60,
+    CHAR_NAME_INVALID_SPACE                                = 0x61,
+    CHAR_NAME_CONSECUTIVE_SPACES                           = 0x62,
+    CHAR_NAME_RUSSIAN_CONSECUTIVE_SILENT_CHARACTERS        = 0x63,
+    CHAR_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END = 0x64,
+    CHAR_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME            = 0x65
 };
 
 /// Ban function modes
@@ -2664,9 +2667,12 @@ enum BattleGroundTypeId
     BATTLEGROUND_RL            = 8,
     BATTLEGROUND_SA            = 9,
     BATTLEGROUND_DS            = 10,
-    BATTLEGROUND_RV            = 11
+    BATTLEGROUND_RV            = 11,
+    BATTLEGROUND_IC            = 30,
+    BATTLEGROUND_ABG           = 32
 };
-#define MAX_BATTLEGROUND_TYPE_ID 12
+
+#define MAX_BATTLEGROUND_TYPE_ID 33
 
 enum MailResponseType
 {
@@ -2719,4 +2725,3 @@ enum SpellFamilyNames
 };
 
 #endif
-