Scripts/Texts:

* fix script texts in various locations (thanks TerrorBringer for the heads up). Closes issue #2055. Closes issue #3087.
* cleanup world_script_texts.sql file (remove spaces, order entries)
Scripts/Misc:
* remove obsolete random seed initialization from scripts
* fix some warnings in scripts
* some cleanup in chat_log.cpp

--HG--
branch : trunk

16 files changed, 212 insertions, 218 deletions

diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
index 7cfec5403b0..d985335699c 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
@@ -113,7 +113,7 @@ public:
 
         uint32 HellfireTimer;
         uint32 CleanupTimer;
-        uint32 malchezaar;
+        uint64 malchezaar;
         InfernalPoint *point;
 
         void Reset() {}
diff --git a/src/server/scripts/EasternKingdoms/dun_morogh.cpp b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
index edc53921bb1..99068450724 100644
--- a/src/server/scripts/EasternKingdoms/dun_morogh.cpp
+++ b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
@@ -34,7 +34,10 @@ EndContentData */
 ######*/
 
 // signed for 6172
-#define SAY_HEAL -1100280
+enum eNarmFaulkData
+{
+    SAY_HEAL = -1000187,
+};
 
 class npc_narm_faulk : public CreatureScript
 {
diff --git a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
index 6562b20606f..b418106e814 100644
--- a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
@@ -32,8 +32,10 @@ EndContentData */
 /*######
 ## npc_henze_faulk
 ######*/
-
-#define SAY_HEAL -1100280
+enum eHenzeFaulkData
+{
+    SAY_HEAL = -1000187,
+};
 
 class npc_henze_faulk : public CreatureScript
 {
@@ -66,7 +68,6 @@ public:
 
         void MoveInLineOfSight(Unit * /*who*/)
         {
-            return;
         }
 
         void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
index 11fde98f75a..1568cd34d2a 100644
--- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
+++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
@@ -32,12 +32,14 @@ EndContentData */
 /*#######
 # npc_blood_knight_stillblade
 #######*/
+enum eStillbladeData
+{
+    SAY_HEAL                    = -1000193,
 
-#define SAY_HEAL -1000334
-
-#define QUEST_REDEEMING_THE_DEAD        9685
-#define SPELL_SHIMMERING_VESSEL         31225
-#define SPELL_REVIVE_SELF               32343
+    QUEST_REDEEMING_THE_DEAD    = 9685,
+    SPELL_SHIMMERING_VESSEL     = 31225,
+    SPELL_REVIVE_SELF           = 32343,
+};
 
 class npc_blood_knight_stillblade : public CreatureScript
 {
diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
index f4958896603..e7e1116eae6 100644
--- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
@@ -282,13 +282,13 @@ enum eTruuen
 
     QUEST_TOMB_LIGHTBRINGER     = 9446,
 
-    SAY_WP_0                    = -1999981,  //Beware! We are attacked!
-    SAY_WP_1                    = -1999982,  //It must be the purity of the Mark of the Lightbringer that is drawing forth the Scourge to attack us. We must proceed with caution lest we be overwhelmed!
-    SAY_WP_2                    = -1999983,  //This land truly needs to be cleansed by the Light! Let us continue on to the tomb. It isn't far now...
-    SAY_WP_3                    = -1999984,  //Be welcome, friends!
-    SAY_WP_4                    = -1999985,  //Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart.
-    SAY_WP_5                    = -1999986,  //Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire.
-    SAY_WP_6                    = -1999987   //Thank you my friend for making this possible. This is a day that I shall never forget! I think I will stay a while. Please return to High Priestess MacDonnell at the camp. I know that she'll be keenly interested to know of what has transpired here.
+    SAY_WP_0                    = -1800064,  //Beware! We are attacked!
+    SAY_WP_1                    = -1800065,  //It must be the purity of the Mark of the Lightbringer that is drawing forth the Scourge to attack us. We must proceed with caution lest we be overwhelmed!
+    SAY_WP_2                    = -1800066,  //This land truly needs to be cleansed by the Light! Let us continue on to the tomb. It isn't far now...
+    SAY_WP_3                    = -1800067,  //Be welcome, friends!
+    SAY_WP_4                    = -1800068,  //Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart.
+    SAY_WP_5                    = -1800069,  //Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire.
+    SAY_WP_6                    = -1800070   //Thank you my friend for making this possible. This is a day that I shall never forget! I think I will stay a while. Please return to High Priestess MacDonnell at the camp. I know that she'll be keenly interested to know of what has transpired here.
 };
 
 class npc_anchorite_truuen : public CreatureScript
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp
index 9cc80dbfe16..d476b790a4a 100644
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/azshara.cpp
@@ -173,31 +173,32 @@ public:
 
         return true;
     }
-
 };
 
-
 /*####
 # mob_rizzle_sprysprocket
 ####*/
 
-#define MOB_DEPTH_CHARGE 23025
-#define SPELL_RIZZLE_BLACKJACK 39865
-#define SPELL_RIZZLE_ESCAPE 39871
-#define SPELL_RIZZLE_FROST_GRENADE 40525
-#define SPELL_DEPTH_CHARGE_TRAP 38576
-#define SPELL_PERIODIC_DEPTH_CHARGE 39912
-#define SPELL_GIVE_SOUTHFURY_MOONSTONE 39886
-
-#define SAY_RIZZLE_START -1000245
-#define SAY_RIZZLE_GRENADE -1000246
-#define SAY_RIZZLE_FINAL -1000247
+enum eRizzleSprysprocketData
+{
+    MOB_DEPTH_CHARGE                = 23025,
+    SPELL_RIZZLE_BLACKJACK          = 39865,
+    SPELL_RIZZLE_ESCAPE             = 39871,
+    SPELL_RIZZLE_FROST_GRENADE      = 40525,
+    SPELL_DEPTH_CHARGE_TRAP         = 38576,
+    SPELL_PERIODIC_DEPTH_CHARGE     = 39912,
+    SPELL_GIVE_SOUTHFURY_MOONSTONE  = 39886,
+
+    SAY_RIZZLE_START                = -1000351,
+    MSG_ESCAPE_NOTICE               = -1000352,
+    SAY_RIZZLE_GRENADE              = -1000353,
+    SAY_RIZZLE_GRENADE_BACKFIRE     = -1000354, // Not used
+    SAY_RIZZLE_FINAL                = -1000355,
+    SAY_RIZZLE_FINAL2               = -1000356, // Not used
+};
 
 #define GOSSIP_GET_MOONSTONE "Hand over the Southfury moonstone and I'll let you go."
 
-//next message must be send to player when Rizzle jump into river, not implemented
-#define MSG_ESCAPE_NOTICE "Rizzle Sprysprocket takes the Southfury moonstone and escapes into the river. Follow her!"
-
 float WPs[58][4] =
 {
 //pos_x   pos_y     pos_z    orien
@@ -414,12 +415,11 @@ public:
 
         }
 
-        void SendText(const char *text, Player* pPlayer)
+        void SendText(int32 iTextEntry, Player* pPlayer)
         {
-            WorldPacket data(SMSG_SERVER_MESSAGE, 0);              // guess size
-            data << text;
-            if (pPlayer)
-                pPlayer->GetSession()->SendPacket(&data);
+            int loc_idx = pPlayer->GetSession()->GetSessionDbLocaleIndex();
+            const char* text = sObjectMgr.GetTrinityString(iTextEntry, loc_idx);
+            sWorld.SendServerMessage(SERVER_MSG_STRING, text, pPlayer);
         }
 
         void AttackStart(Unit *who)
@@ -452,18 +452,12 @@ public:
             ++CurrWP;
             ContinueWP = true;
         }
-
     };
-
 };
 
-
-
-
 /*####
 # mob_depth_charge
 ####*/
-
 class mob_depth_charge : public CreatureScript
 {
 public:
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index 48c147404c1..441d332ca00 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -420,15 +420,15 @@ enum eGeezle
 
     SPELL_TREE_DISGUISE = 30298,
 
-    GEEZLE_SAY_1    = -1100259,
-    SPARK_SAY_2     = -1100260,
-    SPARK_SAY_3     = -1100261,
-    GEEZLE_SAY_4    = -1100262,
-    SPARK_SAY_5     = -1100263,
-    SPARK_SAY_6     = -1100264,
-    GEEZLE_SAY_7    = -1100265,
-
-    EMOTE_SPARK     = -1100266,
+    GEEZLE_SAY_1    = -1000629,
+    SPARK_SAY_2     = -1000630,
+    SPARK_SAY_3     = -1000631,
+    GEEZLE_SAY_4    = -1000632,
+    SPARK_SAY_5     = -1000633,
+    SPARK_SAY_6     = -1000634,
+    GEEZLE_SAY_7    = -1000635,
+
+    EMOTE_SPARK     = -1000636,
 
     MOB_SPARK       = 17243,
     GO_NAGA_FLAG    = 181694
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
index d2d7ca6a7c5..b11977093ed 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -321,8 +321,8 @@ public:
 
 enum eThreshwackonator
 {
-    EMOTE_START             = -1000413, //signed for 4966
-    SAY_AT_CLOSE            = -1000414, //signed for 4966
+    EMOTE_START             = -1000325, //signed for 4966
+    SAY_AT_CLOSE            = -1000326, //signed for 4966
     QUEST_GYROMAST_REV      = 2078,
     NPC_GELKAK              = 6667,
     FACTION_HOSTILE         = 14
diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp
index 79afa6981f3..3e6e7090ccd 100644
--- a/src/server/scripts/Kalimdor/durotar.cpp
+++ b/src/server/scripts/Kalimdor/durotar.cpp
@@ -24,7 +24,7 @@
 
 enum LazyPeonYells
 {
-    SAY_SPELL_HIT                                 = -1999900   //Ow! OK, I''ll get back to work, $N!'
+    SAY_SPELL_HIT                                 = -1000600   //Ow! OK, I''ll get back to work, $N!'
 };
 
 enum LazyPeon
diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp
index e003a8409e4..884913c17ff 100644
--- a/src/server/scripts/Kalimdor/silithus.cpp
+++ b/src/server/scripts/Kalimdor/silithus.cpp
@@ -975,7 +975,6 @@ public:
         {
             //uint8 count = WavesInfo[WaveCount].SpawnCount;
             uint8 locIndex = WavesInfo[WaveCount].UsedSpawnPoint;
-            srand(time(NULL));//initializing random seed
             //uint8 KaldoreiSoldierCount = 0;
             //uint8 AnubisathConquerorCount = 0;
             //uint8 QirajiWaspCount = 0;
diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp
index 2352b95f387..7916a77c33a 100644
--- a/src/server/scripts/Kalimdor/ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp
@@ -32,19 +32,22 @@ EndContentData */
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 
-#define SAY_READY -1100200
-#define SAY_AGGRO1 -1100201
-#define SAY_SEARCH -1100202
-#define SAY_AGGRO2 -1100203
-#define SAY_AGGRO3 -1100204
-#define SAY_FINISH -1100205
-
-#define SPELL_DEMORALIZINGSHOUT  13730
-
-#define QUEST_CHASING_AME 4245
-#define ENTRY_TARLORD 6519
-#define ENTRY_TARLORD1 6519
-#define ENTRY_STOMPER 6513
+enum eAMeData
+{
+    SAY_READY               = -1000517,
+    SAY_AGGRO1              = -1000518,
+    SAY_SEARCH              = -1000519,
+    SAY_AGGRO2              = -1000520,
+    SAY_AGGRO3              = -1000521,
+    SAY_FINISH              = -1000522,
+
+    SPELL_DEMORALIZINGSHOUT = 13730,
+
+    QUEST_CHASING_AME       = 4245,
+    ENTRY_TARLORD           = 6519,
+    ENTRY_TARLORD1          = 6519,
+    ENTRY_STOMPER           = 6513,
+};
 
 class npc_ame : public CreatureScript
 {
@@ -57,7 +60,7 @@ public:
         {
             CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, false, pPlayer->GetGUID());
             DoScriptText(SAY_READY, pCreature, pPlayer);
-            pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
+            pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
             // Change faction so mobs attack
             pCreature->setFaction(113);
         }
@@ -84,34 +87,32 @@ public:
 
             switch (i)
             {
-
-             case 19:
-                me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-                DoScriptText(SAY_AGGRO1, me, pPlayer);
-                break;
+                case 19:
+                    me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+                    DoScriptText(SAY_AGGRO1, me, pPlayer);
+                    break;
                 case 28:
-                DoScriptText(SAY_SEARCH, me, pPlayer);
-                break;
+                    DoScriptText(SAY_SEARCH, me, pPlayer);
+                    break;
                 case 38:
-                me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-                DoScriptText(SAY_AGGRO2, me, pPlayer);
-                break;
+                    me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+                    DoScriptText(SAY_AGGRO2, me, pPlayer);
+                    break;
                 case 49:
-                me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-                DoScriptText(SAY_AGGRO3, me, pPlayer);
-                break;
-             case 55:
-                DoScriptText(SAY_FINISH, me, pPlayer);
-                if (pPlayer)
-                    pPlayer->GroupEventHappens(QUEST_CHASING_AME,me);
-                break;
-
+                    me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+                    DoScriptText(SAY_AGGRO3, me, pPlayer);
+                    break;
+                case 55:
+                    DoScriptText(SAY_FINISH, me, pPlayer);
+                    if (pPlayer)
+                        pPlayer->GroupEventHappens(QUEST_CHASING_AME, me);
+                    break;
             }
         }
 
         void Reset()
         {
-          DEMORALIZINGSHOUT_Timer = 5000;
+            DEMORALIZINGSHOUT_Timer = 5000;
         }
 
         void JustSummoned(Creature* summoned)
@@ -136,14 +137,10 @@ public:
                 DoCast(me->getVictim(), SPELL_DEMORALIZINGSHOUT);
                 DEMORALIZINGSHOUT_Timer = 70000;
             } else DEMORALIZINGSHOUT_Timer -= diff;
-
         }
     };
-
 };
 
-
-
 /*####
 # npc_ringo
 ####*/
@@ -352,11 +349,8 @@ public:
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
-
-
 void AddSC_ungoro_crater()
 {
     new npc_ame();
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index 5ad35f231a7..3358d67c62a 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -112,7 +112,6 @@ public:
         boss_ymironAI(Creature *c) : ScriptedAI(c)
         {
             pInstance = c->GetInstanceScript();
-            srand(time(NULL));
             for (int i = 0; i < 4; ++i)
                 m_uiActiveOrder[i] = i;
             for (int i = 0; i < 3; ++i)
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index a4745e2fac5..2c96d595211 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -39,28 +39,31 @@ EndContentData */
 ######*/
 
 //used by 20209,20417,20418,20440, signed for 20209
-#define EMOTE_START     -1000211
-#define EMOTE_60        -1000212
-#define EMOTE_30        -1000213
-#define EMOTE_10        -1000214
-#define EMOTE_COMPLETE  -1000215
-#define EMOTE_ABORT     -1000216
-
-#define ENTRY_BNAAR_C_CONSOLE   20209
-#define ENTRY_CORUU_C_CONSOLE   20417
-#define ENTRY_DURO_C_CONSOLE    20418
-#define ENTRY_ARA_C_CONSOLE     20440
-
-#define ENTRY_SUNFURY_TECH      20218
-#define ENTRY_SUNFURY_PROT      20436
-
-#define ENTRY_ARA_TECH          20438
-#define ENTRY_ARA_ENGI          20439
-#define ENTRY_ARA_GORKLONN      20460
-
-#define SPELL_DISABLE_VISUAL    35031
-#define SPELL_INTERRUPT_1       35016                       //ACID mobs should cast this
-#define SPELL_INTERRUPT_2       35176                       //ACID mobs should cast this (Manaforge Ara-version)
+enum eManaforgeConsoleData
+{
+    EMOTE_START                 = -1000211,
+    EMOTE_60                    = -1000212,
+    EMOTE_30                    = -1000213,
+    EMOTE_10                    = -1000214,
+    EMOTE_COMPLETE              = -1000215,
+    EMOTE_ABORT                 = -1000216,
+
+    ENTRY_BNAAR_C_CONSOLE       = 20209,
+    ENTRY_CORUU_C_CONSOLE       = 20417,
+    ENTRY_DURO_C_CONSOLE        = 20418,
+    ENTRY_ARA_C_CONSOLE         = 20440,
+
+    ENTRY_SUNFURY_TECH          = 20218,
+    ENTRY_SUNFURY_PROT          = 20436,
+
+    ENTRY_ARA_TECH              = 20438,
+    ENTRY_ARA_ENGI              = 20439,
+    ENTRY_ARA_GORKLONN          = 20460,
+
+    SPELL_DISABLE_VISUAL        = 35031,
+    SPELL_INTERRUPT_1           = 35016,                       //ACID mobs should cast this
+    SPELL_INTERRUPT_2           = 35176,                       //ACID mobs should cast this (Manaforge Ara-version)
+};
 
 class npc_manaforge_control_console : public CreatureScript
 {
@@ -354,20 +357,23 @@ public:
 ######*/
 
 // The Speech of Dawnforge, Ardonis & Pathaleon
-#define SAY_COMMANDER_DAWNFORGE_1           -1000128
-#define SAY_ARCANIST_ARDONIS_1              -1000129
-#define SAY_COMMANDER_DAWNFORGE_2           -1000130
-#define SAY_PATHALEON_CULATOR_IMAGE_1       -1000131
-#define SAY_COMMANDER_DAWNFORGE_3           -1000132
-#define SAY_PATHALEON_CULATOR_IMAGE_2       -1000133
-#define SAY_PATHALEON_CULATOR_IMAGE_2_1     -1000134
-#define SAY_PATHALEON_CULATOR_IMAGE_2_2     -1000135
-#define SAY_COMMANDER_DAWNFORGE_4           -1000136
-#define SAY_ARCANIST_ARDONIS_2              -1000136
-#define SAY_COMMANDER_DAWNFORGE_5           -1000137
-
-#define QUEST_INFO_GATHERING                10198
-#define SPELL_SUNFURY_DISGUISE              34603
+enum eCommanderDawnforgeData
+{
+    SAY_COMMANDER_DAWNFORGE_1       = -1000128,
+    SAY_ARCANIST_ARDONIS_1          = -1000129,
+    SAY_COMMANDER_DAWNFORGE_2       = -1000130,
+    SAY_PATHALEON_CULATOR_IMAGE_1   = -1000131,
+    SAY_COMMANDER_DAWNFORGE_3       = -1000132,
+    SAY_PATHALEON_CULATOR_IMAGE_2   = -1000133,
+    SAY_PATHALEON_CULATOR_IMAGE_2_1 = -1000134,
+    SAY_PATHALEON_CULATOR_IMAGE_2_2 = -1000135,
+    SAY_COMMANDER_DAWNFORGE_4       = -1000136,
+    SAY_ARCANIST_ARDONIS_2          = -1000136,
+    SAY_COMMANDER_DAWNFORGE_5       = -1000137,
+
+    QUEST_INFO_GATHERING            = 10198,
+    SPELL_SUNFURY_DISGUISE          = 34603,
+};
 
 // Entries of Arcanist Ardonis, Commander Dawnforge, Pathaleon the Curators Image
 const uint32 CreatureEntry[3] =
@@ -659,13 +665,17 @@ public:
 /*######
 ## npc_professor_dabiri
 ######*/
+enum eProfessorDabiriData
+{
+    SPELL_PHASE_DISTRUPTOR  = 35780,
 
-#define SPELL_PHASE_DISTRUPTOR  35780
-#define GOSSIP_ITEM "I need a new phase distruptor, Professor"
-#define WHISPER_DABIRI -1000302
+    WHISPER_DABIRI          = -1000522,
 
-#define QUEST_DIMENSIUS 10439
-#define QUEST_ON_NETHERY_WINGS 10438
+    QUEST_DIMENSIUS         = 10439,
+    QUEST_ON_NETHERY_WINGS  = 10438,
+};
+
+#define GOSSIP_ITEM "I need a new phase distruptor, Professor"
 
 class npc_professor_dabiri : public CreatureScript
 {
@@ -713,19 +723,22 @@ public:
 ## mob_phase_hunter
 ######*/
 
-#define QUEST_RECHARGING_THE_BATTERIES  10190
+enum ePhaseHunterData
+{
+    QUEST_RECHARGING_THE_BATTERIES  = 10190,
 
-#define NPC_PHASE_HUNTER_ENTRY          18879
-#define NPC_DRAINED_PHASE_HUNTER_ENTRY  19595
+    NPC_PHASE_HUNTER_ENTRY          = 18879,
+    NPC_DRAINED_PHASE_HUNTER_ENTRY  = 19595,
 
-#define EMOTE_WEAK                      -1000303
+    EMOTE_WEAK                      = -1000303,
 
-// Spells
-#define SPELL_RECHARGING_BATTERY        34219
-#define SPELL_PHASE_SLIP                36574
-#define SPELL_MANA_BURN                 13321
-#define SPELL_MATERIALIZE               34804
-#define SPELL_DE_MATERIALIZE            34814
+    // Spells
+    SPELL_RECHARGING_BATTERY        = 34219,
+    SPELL_PHASE_SLIP                = 36574,
+    SPELL_MANA_BURN                 = 13321,
+    SPELL_MATERIALIZE               = 34804,
+    SPELL_DE_MATERIALIZE            = 34814,
+};
 
 class mob_phase_hunter : public CreatureScript
 {
@@ -745,7 +758,6 @@ public:
         bool Materialize;
         bool Drained;
         uint8 WeakPercent;
-        float HpPercent;
 
         Player *pPlayer;
         uint64 PlayerGUID;
@@ -758,7 +770,6 @@ public:
             Materialize = false;
             Drained = false;
             WeakPercent = 25 + (rand() % 16); // 25-40
-            HpPercent = 0.0f;
 
             PlayerGUID = 0;
 
@@ -829,11 +840,11 @@ public:
                 if (Weak && !Drained && me->HasAura(SPELL_RECHARGING_BATTERY))
                 {
                     Drained = true;
-                    HpPercent = me->GetHealthPct();
+                    int32 uHpPct = int32(me->GetHealthPct());
 
                     me->UpdateEntry(NPC_DRAINED_PHASE_HUNTER_ENTRY);
 
-                    me->SetHealth(me->CountPctFromMaxHealth(HpPercent));
+                    me->SetHealth(me->CountPctFromMaxHealth(uHpPct));
                     me->LowerPlayerDamageReq(me->GetMaxHealth() - me->GetHealth());
                     me->SetInCombatWith(pPlayer);
                 }
@@ -849,13 +860,15 @@ public:
 /*######
 ## npc_bessy
 ######*/
-
-#define Q_ALMABTRIEB    10337
-#define N_THADELL       20464
-#define SPAWN_FIRST     20512
-#define SPAWN_SECOND    19881
-#define SAY_THADELL_1   -1000304
-#define SAY_THADELL_2   -1000305
+enum eBessyData
+{
+    Q_ALMABTRIEB    = 10337,
+    N_THADELL       = 20464,
+    SPAWN_FIRST     = 20512,
+    SPAWN_SECOND    = 19881,
+    SAY_THADELL_1   = -1000524,
+    SAY_THADELL_2   = -1000525,
+};
 
 class npc_bessy : public CreatureScript
 {
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 81b40589457..576913629e8 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -50,7 +50,7 @@ EndContentData */
 
 enum eMatureNetherwing
 {
-    SAY_JUST_EATEN              = -1000222,
+    SAY_JUST_EATEN              = -1000175,
 
     SPELL_PLACE_CARCASS         = 38439,
     SPELL_JUST_EATEN            = 38502,
@@ -722,36 +722,38 @@ public:
 /*####
 # npc_overlord_morghor
 ####*/
-
-#define QUEST_LORD_ILLIDAN_STORMRAGE 11108
-
-#define C_ILLIDAN 22083
-#define C_YARZILL 23141
-
-#define SPELL_ONE 39990 // Red Lightning Bolt
-#define SPELL_TWO 41528 // Mark of Stormrage
-#define SPELL_THREE 40216 // Dragonaw Faction
-#define SPELL_FOUR 42016 // Dragonaw Trasform
-
-#define OVERLORD_SAY_1 -1100206
-#define OVERLORD_SAY_2 -1100207
-#define OVERLORD_SAY_3 -1100208 //signed for 28315
-#define OVERLORD_SAY_4 -1100209
-#define OVERLORD_SAY_5 -1100210
-#define OVERLORD_SAY_6 -1100211
-
-#define OVERLORD_YELL_1 -1000212
-#define OVERLORD_YELL_2 -1000213
-
-#define LORD_ILLIDAN_SAY_1 -1100214
-#define LORD_ILLIDAN_SAY_2 -1100215
-#define LORD_ILLIDAN_SAY_3 -1100216
-#define LORD_ILLIDAN_SAY_4 -1100217
-#define LORD_ILLIDAN_SAY_5 -1100218
-#define LORD_ILLIDAN_SAY_6 -1100219
-#define LORD_ILLIDAN_SAY_7 -1100220
-
-#define YARZILL_THE_MERC_SAY -1100221
+enum eOverlordData
+{
+    QUEST_LORD_ILLIDAN_STORMRAGE    = 11108,
+
+    C_ILLIDAN                       = 22083,
+    C_YARZILL                       = 23141,
+
+    SPELL_ONE                       = 39990, // Red Lightning Bolt
+    SPELL_TWO                       = 41528, // Mark of Stormrage
+    SPELL_THREE                     = 40216, // Dragonaw Faction
+    SPELL_FOUR                      = 42016, // Dragonaw Trasform
+
+    OVERLORD_SAY_1                  = -1000606,
+    OVERLORD_SAY_2                  = -1000607,
+    OVERLORD_SAY_3                  = -1000608, //signed for 28315
+    OVERLORD_SAY_4                  = -1000609,
+    OVERLORD_SAY_5                  = -1000610,
+    OVERLORD_SAY_6                  = -1000611,
+
+    OVERLORD_YELL_1                 = -1000612,
+    OVERLORD_YELL_2                 = -1000613,
+
+    LORD_ILLIDAN_SAY_1              = -1000614,
+    LORD_ILLIDAN_SAY_2              = -1000615,
+    LORD_ILLIDAN_SAY_3              = -1000616,
+    LORD_ILLIDAN_SAY_4              = -1000617,
+    LORD_ILLIDAN_SAY_5              = -1000618,
+    LORD_ILLIDAN_SAY_6              = -1000619,
+    LORD_ILLIDAN_SAY_7              = -1000620,
+
+    YARZILL_THE_MERC_SAY            = -1000621,
+};
 
 class npc_overlord_morghor : public CreatureScript
 {
@@ -1655,7 +1657,6 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave()
 {
     uint8 count = WavesInfo[WaveCount].SpawnCount;
     uint8 locIndex = WavesInfo[WaveCount].UsedSpawnPoint;
-    srand(time(NULL));//initializing random seed
     uint8 FelguardCount = 0;
     uint8 DreadlordCount = 0;
 
diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp
index d465c9bbb87..ab9eb43f891 100644
--- a/src/server/scripts/Outland/terokkar_forest.cpp
+++ b/src/server/scripts/Outland/terokkar_forest.cpp
@@ -448,16 +448,18 @@ public:
 /*######
 ## npc_isla_starmane
 ######*/
-
-#define SAY_PROGRESS_1  -1100353
-#define SAY_PROGRESS_2  -1100354
-#define SAY_PROGRESS_3  -1100355
-#define SAY_PROGRESS_4  -1100356
-
-#define QUEST_EFTW_H    10052
-#define QUEST_EFTW_A    10051
-#define GO_CAGE         182794
-#define SPELL_CAT       32447
+enum eIslaStarmaneData
+{
+    SAY_PROGRESS_1  = -1000571,
+    SAY_PROGRESS_2  = -1000572,
+    SAY_PROGRESS_3  = -1000573,
+    SAY_PROGRESS_4  = -1000574,
+
+    QUEST_EFTW_H    = 10052,
+    QUEST_EFTW_A    = 10051,
+    GO_CAGE         = 182794,
+    SPELL_CAT       = 32447,
+};
 
 class npc_isla_starmane : public CreatureScript
 {
diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp
index 3b1d3af38bb..5b26a722305 100644
--- a/src/server/scripts/World/chat_log.cpp
+++ b/src/server/scripts/World/chat_log.cpp
@@ -58,10 +58,8 @@ public:
     void OnChat(Player *player, uint32 type, uint32 lang, std::string msg, Player *receiver)
     {
         if (sWorld.getBoolConfig(CONFIG_CHATLOG_WHISPER))
-        {
             sLog.outChat("[WHISPER] Player %s tells %s: %s",
                 player->GetName(), receiver ? receiver->GetName() : "<unknown>", msg.c_str());
-        }
     }
 
     void OnChat(Player *player, uint32 type, uint32 lang, std::string msg, Group *group)
@@ -70,10 +68,8 @@ public:
         {
             case CHAT_MSG_PARTY:
                 if (sWorld.getBoolConfig(CONFIG_CHATLOG_PARTY))
-                {
                     sLog.outChat("[PARTY] Player %s tells group with leader %s: %s",
                         player->GetName(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
-                }
                 break;
 
             case CHAT_MSG_RAID_LEADER:
@@ -102,18 +98,14 @@ public:
 
             case CHAT_MSG_RAID:
                 if (sWorld.getBoolConfig(CONFIG_CHATLOG_RAID))
-                {
                     sLog.outChat("[RAID] Player %s tells raid with leader %s: %s",
                         player->GetName(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
-                }
                 break;
 
             case CHAT_MSG_BATTLEGROUND:
                 if (sWorld.getBoolConfig(CONFIG_CHATLOG_BGROUND))
-                {
                     sLog.outChat("[BATTLEGROUND] Player %s tells battleground with leader %s: %s",
                         player->GetName(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
-                }
                 break;
         }
     }
@@ -124,23 +116,17 @@ public:
         {
             case CHAT_MSG_GUILD:
                 if (lang != LANG_ADDON && sWorld.getBoolConfig(CONFIG_CHATLOG_GUILD))
-                {
                     sLog.outChat("[GUILD] Player %s tells guild %s: %s",
                         player->GetName(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str());
-                }
                 else if (lang == LANG_ADDON && sWorld.getBoolConfig(CONFIG_CHATLOG_ADDON))
-                {
                     sLog.outChat("[ADDON] Player %s sends to guild %s: %s",
                         player->GetName(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str());
-                }
                 break;
 
             case CHAT_MSG_OFFICER:
                 if (sWorld.getBoolConfig(CONFIG_CHATLOG_GUILD))
-                {
                     sLog.outChat("[OFFICER] Player %s tells guild %s officers: %s",
                         player->GetName(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str());
-                }
                 break;
         }
     }
@@ -164,5 +150,5 @@ public:
 
 void AddSC_chat_log()
 {
-    new ChatLogScript;
+    new ChatLogScript();
 }