Merge [SD2]

r1120 Add CallForHelp at aggro for two instance bosses. Requires Mangos 7951+
r1121 Added basic parts of boss spell definitions and texts for Nexus instance - skip (already have better)
r1122 Correct one spellId, add more spell definitions for boss noth - skip
r1123 Remove wrong spell for gluth and add missing emote text. Summon only expected amount of adds. Some additional cleanup in anubrekhan and check heroic for a few spell cast. - skip
r1124 Use normal health check calculation for easier backport (to older client)
r1125 Fixed typo in previous commit
r1126 Add spell cast to dragon in scrying orb event and add workaround for kill credit.
r1127 Convert gossip related define to enum and remove one useless (redefinition)
r1128 Remove no longer needed item scripts that can be controlled with database table item_required_target (Mangos 7980+)
r1129 Remove one more obsolete item script (use spell_area DB table for area limited spell).
      Cleanup other and provide spell error message. Requires Mangos 7983+

--HG--
branch : trunk

1 files changed, 50 insertions, 51 deletions

diff --git a/src/bindings/scripts/include/sc_gossip.h b/src/bindings/scripts/include/sc_gossip.h
index 9665a7e1123..0bee1dca5c8 100644
--- a/src/bindings/scripts/include/sc_gossip.h
+++ b/src/bindings/scripts/include/sc_gossip.h
@@ -73,60 +73,59 @@
 #define GOSSIP_TEXT_JEWELCRAFTING       "Jewelcrafting"
 #define GOSSIP_TEXT_INSCRIPTION         "Inscription"
 
+enum
+{
 // Skill defines
-
-#define TRADESKILL_ALCHEMY                  1
-#define TRADESKILL_BLACKSMITHING            2
-#define TRADESKILL_COOKING                  3
-#define TRADESKILL_ENCHANTING               4
-#define TRADESKILL_ENGINEERING              5
-#define TRADESKILL_FIRSTAID                 6
-#define TRADESKILL_HERBALISM                7
-#define TRADESKILL_LEATHERWORKING           8
-#define TRADESKILL_POISONS                  9
-#define TRADESKILL_TAILORING                10
-#define TRADESKILL_MINING                   11
-#define TRADESKILL_FISHING                  12
-#define TRADESKILL_SKINNING                 13
-#define TRADESKILL_JEWLCRAFTING             14
-#define TRADESKILL_INSCRIPTION              15
-
-#define TRADESKILL_LEVEL_NONE               0
-#define TRADESKILL_LEVEL_APPRENTICE         1
-#define TRADESKILL_LEVEL_JOURNEYMAN         2
-#define TRADESKILL_LEVEL_EXPERT             3
-#define TRADESKILL_LEVEL_ARTISAN            4
-#define TRADESKILL_LEVEL_MASTER             5
-#define TRADESKILL_LEVEL_GRAND_MASTER       6
+    TRADESKILL_ALCHEMY                  = 1,
+    TRADESKILL_BLACKSMITHING            = 2,
+    TRADESKILL_COOKING                  = 3,
+    TRADESKILL_ENCHANTING               = 4,
+    TRADESKILL_ENGINEERING              = 5,
+    TRADESKILL_FIRSTAID                 = 6,
+    TRADESKILL_HERBALISM                = 7,
+    TRADESKILL_LEATHERWORKING           = 8,
+    TRADESKILL_POISONS                  = 9,
+    TRADESKILL_TAILORING                = 10,
+    TRADESKILL_MINING                   = 11,
+    TRADESKILL_FISHING                  = 12,
+    TRADESKILL_SKINNING                 = 13,
+    TRADESKILL_JEWLCRAFTING             = 14,
+    TRADESKILL_INSCRIPTION              = 15,
+
+    TRADESKILL_LEVEL_NONE               = 0,
+    TRADESKILL_LEVEL_APPRENTICE         = 1,
+    TRADESKILL_LEVEL_JOURNEYMAN         = 2,
+    TRADESKILL_LEVEL_EXPERT             = 3,
+    TRADESKILL_LEVEL_ARTISAN            = 4,
+    TRADESKILL_LEVEL_MASTER             = 5,
+    TRADESKILL_LEVEL_GRAND_MASTER       = 6,
 
 // Gossip defines
-
-#define GOSSIP_ACTION_TRADE                 1
-#define GOSSIP_ACTION_TRAIN                 2
-#define GOSSIP_ACTION_TAXI                  3
-#define GOSSIP_ACTION_GUILD                 4
-#define GOSSIP_ACTION_BATTLE                5
-#define GOSSIP_ACTION_BANK                  6
-#define GOSSIP_ACTION_INN                   7
-#define GOSSIP_ACTION_HEAL                  8
-#define GOSSIP_ACTION_TABARD                9
-#define GOSSIP_ACTION_AUCTION               10
-#define GOSSIP_ACTION_INN_INFO              11
-#define GOSSIP_ACTION_UNLEARN               12
-#define GOSSIP_ACTION_INFO_DEF              1000
-
-#define GOSSIP_SENDER_MAIN                  1
-#define GOSSIP_SENDER_INN_INFO              2
-#define GOSSIP_SENDER_INFO                  3
-#define GOSSIP_SENDER_SEC_PROFTRAIN         4
-#define GOSSIP_SENDER_SEC_CLASSTRAIN        5
-#define GOSSIP_SENDER_SEC_BATTLEINFO        6
-#define GOSSIP_SENDER_SEC_BANK              7
-#define GOSSIP_SENDER_SEC_INN               8
-#define GOSSIP_SENDER_SEC_MAILBOX           9
-#define GOSSIP_SENDER_SEC_STABLEMASTER      10
-
-#define DEFAULT_GOSSIP_MESSAGE              0xffffff
+    GOSSIP_ACTION_TRADE                 = 1,
+    GOSSIP_ACTION_TRAIN                 = 2,
+    GOSSIP_ACTION_TAXI                  = 3,
+    GOSSIP_ACTION_GUILD                 = 4,
+    GOSSIP_ACTION_BATTLE                = 5,
+    GOSSIP_ACTION_BANK                  = 6,
+    GOSSIP_ACTION_INN                   = 7,
+    GOSSIP_ACTION_HEAL                  = 8,
+    GOSSIP_ACTION_TABARD                = 9,
+    GOSSIP_ACTION_AUCTION               = 10,
+    GOSSIP_ACTION_INN_INFO              = 11,
+    GOSSIP_ACTION_UNLEARN               = 12,
+    GOSSIP_ACTION_INFO_DEF              = 1000,
+
+    GOSSIP_SENDER_MAIN                  = 1,
+    GOSSIP_SENDER_INN_INFO              = 2,
+    GOSSIP_SENDER_INFO                  = 3,
+    GOSSIP_SENDER_SEC_PROFTRAIN         = 4,
+    GOSSIP_SENDER_SEC_CLASSTRAIN        = 5,
+    GOSSIP_SENDER_SEC_BATTLEINFO        = 6,
+    GOSSIP_SENDER_SEC_BANK              = 7,
+    GOSSIP_SENDER_SEC_INN               = 8,
+    GOSSIP_SENDER_SEC_MAILBOX           = 9,
+    GOSSIP_SENDER_SEC_STABLEMASTER      = 10
+};
 
 extern uint32 GetSkillLevel(Player *player,uint32 skill);