Core: Corrected NULL usage, it should only be used with pointers, not integers

7 files changed, 59 insertions, 59 deletions

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index 4833827755c..c66eb20f3c7 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -233,7 +233,7 @@ public:
         {
             DoScriptText(SAY_MORRIDUNE_1,pCreature);
             me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
-            Start(false,false,NULL);
+            Start(false,false,0);
         }
 
         void WaypointReached(uint32 uiPoint)
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index 418cc5a8fad..c1fb711e5fd 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -135,7 +135,7 @@ public:
                     break;
                 case GO_AKU_MAI_DOOR:
                     if (m_auiEncounter[2] == DONE)
-                        HandleGameObject(NULL,true,go);
+                        HandleGameObject(0,true,go);
                     m_uiMainDoorGUID = go->GetGUID();
                     break;
             }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index 417d875da83..3959337bc49 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -94,7 +94,7 @@ public:
             if (pInstance && IsEvent)
                 pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS);
             DoPlaySoundToSet(me, SOUND_ONAGGRO);
-            me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL);
+            me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0);
         }
 
         void KilledUnit(Unit * /*victim*/)
@@ -103,15 +103,15 @@ public:
             {
                 case 0:
                     DoPlaySoundToSet(me, SOUND_ONSLAY1);
-                    me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL);
+                    me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0);
                     break;
                 case 1:
                     DoPlaySoundToSet(me, SOUND_ONSLAY2);
-                    me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL);
+                    me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0);
                     break;
                 case 2:
                     DoPlaySoundToSet(me, SOUND_ONSLAY3);
-                    me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, NULL);
+                    me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, 0);
                     break;
             }
         }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
index 377ca4c2e25..fc3abbaab9f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -89,7 +89,7 @@ public:
             if (pInstance && IsEvent)
                 pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS);
             DoPlaySoundToSet(me, SOUND_ONAGGRO);
-            me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL);
+            me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0);
         }
 
         void KilledUnit(Unit * /*victim*/)
@@ -98,15 +98,15 @@ public:
             {
                 case 0:
                     DoPlaySoundToSet(me, SOUND_ONSLAY1);
-                    me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL);
+                    me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0);
                     break;
                 case 1:
                     DoPlaySoundToSet(me, SOUND_ONSLAY2);
-                    me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL);
+                    me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0);
                     break;
                 case 2:
                     DoPlaySoundToSet(me, SOUND_ONSLAY3);
-                    me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, NULL);
+                    me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, 0);
                     break;
             }
         }
@@ -195,11 +195,11 @@ public:
                 {
                     case 0:
                         DoPlaySoundToSet(me, SOUND_MARK1);
-                        me->MonsterYell(SAY_MARK1, LANG_UNIVERSAL, NULL);
+                        me->MonsterYell(SAY_MARK1, LANG_UNIVERSAL, 0);
                         break;
                     case 1:
                         DoPlaySoundToSet(me, SOUND_MARK2);
-                        me->MonsterYell(SAY_MARK2, LANG_UNIVERSAL, NULL);
+                        me->MonsterYell(SAY_MARK2, LANG_UNIVERSAL, 0);
                         break;
                 }
             } else MarkTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
index f46b374b2e8..295727c44ac 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
@@ -98,11 +98,11 @@ public:
             {
                 case 0:
                     DoPlaySoundToSet(me, SOUND_ONSLAY1);
-                    me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL);
+                    me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0);
                     break;
                 case 1:
                     DoPlaySoundToSet(me, SOUND_ONSLAY2);
-                    me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL);
+                    me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0);
                     break;
             }
         }
@@ -124,7 +124,7 @@ public:
             if (pInstance && IsEvent)
                 pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE);
             DoPlaySoundToSet(me, SOUND_ONDEATH);
-            me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, NULL);
+            me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0);
         }
 
         void UpdateAI(const uint32 diff)
@@ -169,11 +169,11 @@ public:
                 {
                     case 0:
                         DoPlaySoundToSet(me, SOUND_DECAY1);
-                        me->MonsterYell(SAY_DECAY1, LANG_UNIVERSAL, NULL);
+                        me->MonsterYell(SAY_DECAY1, LANG_UNIVERSAL, 0);
                         break;
                     case 1:
                         DoPlaySoundToSet(me, SOUND_DECAY2);
-                        me->MonsterYell(SAY_DECAY2, LANG_UNIVERSAL, NULL);
+                        me->MonsterYell(SAY_DECAY2, LANG_UNIVERSAL, 0);
                         break;
                 }
             } else DecayTimer -= diff;
@@ -185,11 +185,11 @@ public:
                 {
                     case 0:
                         DoPlaySoundToSet(me, SOUND_NOVA1);
-                        me->MonsterYell(SAY_NOVA1, LANG_UNIVERSAL, NULL);
+                        me->MonsterYell(SAY_NOVA1, LANG_UNIVERSAL, 0);
                         break;
                     case 1:
                         DoPlaySoundToSet(me, SOUND_NOVA2);
-                        me->MonsterYell(SAY_NOVA2, LANG_UNIVERSAL, NULL);
+                        me->MonsterYell(SAY_NOVA2, LANG_UNIVERSAL, 0);
                         break;
                 }
             } else NovaTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index bfdf0d28f41..38ffeeed042 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -929,7 +929,7 @@ void hyjalAI::JustDied(Unit* /*killer*/)
             pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED);
         if (pInstance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS)
             pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED);
-        pInstance->SetData(DATA_RESET_RAIDDAMAGE, NULL);//reset damage on die
+        pInstance->SetData(DATA_RESET_RAIDDAMAGE, 0);//reset damage on die
     }
 }
 void hyjalAI::HideNearPos(float x, float y)
diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp
index 4f26073d50b..9a9fba3aec0 100644
--- a/src/server/scripts/Kalimdor/silithus.cpp
+++ b/src/server/scripts/Kalimdor/silithus.cpp
@@ -310,41 +310,41 @@ static QuestCinematic EventAnim[]=
     {ARYGOS_EMOTE_1, 2, 2000},
     {CAELESTRASZ_SAY_1, 4, 8000},
     {MERITHRA_SAY_2, 3, 6000},
-    {NULL,3,2000},
+    {0,3,2000},
     {MERITHRA_YELL_1, 3, 2500},
-    {NULL, 3, 3000},//Morph
-    {NULL,3,4000},//EmoteLiftoff
-    {NULL, 3, 4000},// spell
-    {NULL, 3, 1250},//fly
-    {NULL, 3, 250},//remove flags
+    {0, 3, 3000},//Morph
+    {0,3,4000},//EmoteLiftoff
+    {0, 3, 4000},// spell
+    {0, 3, 1250},//fly
+    {0, 3, 250},//remove flags
     {ARYGOS_SAY_1, 2, 3000},
-    {NULL,3,2000},
+    {0,3,2000},
     {ARYGOS_YELL_1, 2, 3000},
-    {NULL, 3, 3000},//Morph
-    {NULL,3,4000},//EmoteLiftoff
-    {NULL, 3, 4000},// spell
-    {NULL, 3, 1000},//fly
-    {NULL, 3, 1000},//remove flags
+    {0, 3, 3000},//Morph
+    {0,3,4000},//EmoteLiftoff
+    {0, 3, 4000},// spell
+    {0, 3, 1000},//fly
+    {0, 3, 1000},//remove flags
     {CAELESTRASZ_SAY_2, 4, 5000},
-    {NULL,3,3000},
+    {0,3,3000},
     {CAELESTRASZ_YELL_1, 4, 3000},
-    {NULL, 3, 3000},//Morph
-    {NULL,3,4000},//EmoteLiftoff
-    {NULL, 3, 2500},// spell
+    {0, 3, 3000},//Morph
+    {0,3,4000},//EmoteLiftoff
+    {0, 3, 2500},// spell
     {ANACHRONOS_SAY_2, 0, 2000},
-    {NULL, 3, 250},//fly
-    {NULL, 3, 25},//remove flags
+    {0, 3, 250},//fly
+    {0, 3, 25},//remove flags
     {FANDRAL_SAY_2, 1, 3000},
     {ANACHRONOS_SAY_3, 0, 10000},//Both run through the armies
-    {NULL,3,2000},// Sands will stop
-    {NULL,3,8000},// Summon Gate
+    {0,3,2000},// Sands will stop
+    {0,3,8000},// Summon Gate
     {ANACHRONOS_SAY_4, 0, 4000},
-    {NULL, 0, 2000},//spell 1-> Arcane cosmetic (Mobs freeze)
-    {NULL, 0, 5000}, //Spell 2-> Arcane long cosmetic (barrier appears) (Barrier -> Glyphs)
-    {NULL, 0, 7000},//BarrieR
-    {NULL, 0, 4000},//Glyphs
+    {0, 0, 2000},//spell 1-> Arcane cosmetic (Mobs freeze)
+    {0, 0, 5000}, //Spell 2-> Arcane long cosmetic (barrier appears) (Barrier -> Glyphs)
+    {0, 0, 7000},//BarrieR
+    {0, 0, 4000},//Glyphs
     {ANACHRONOS_SAY_5, 0, 2000},
-    {NULL, 0, 4000},// Roots
+    {0, 0, 4000},// Roots
     {FANDRAL_SAY_3, 1, 3000},//Root Text
     {FANDRAL_EMOTE_1, 1, 3000},//falls knee
     {ANACHRONOS_SAY_6, 0, 3000},
@@ -358,19 +358,19 @@ static QuestCinematic EventAnim[]=
     {FANDRAL_SAY_6, 1, 3000}, //fandral goes away
     {ANACHRONOS_EMOTE_2, 0, 3000},
     {ANACHRONOS_EMOTE_3, 0, 3000},
-    {NULL, 0, 2000},
-    {NULL, 0, 2000},
-    {NULL, 0, 4000},
+    {0, 0, 2000},
+    {0, 0, 2000},
+    {0, 0, 4000},
     {ANACHRONOS_SAY_10, 0, 3000},
-    {NULL, 0, 2000},
-    {NULL, 0, 3000},
-    {NULL, 0, 15000},
-    {NULL, 0, 5000},
-    {NULL, 0, 3500},
-    {NULL, 0, 5000},
-    {NULL, 0, 3500},
-    {NULL, 0, 5000},
-    {NULL, 0, NULL}
+    {0, 0, 2000},
+    {0, 0, 3000},
+    {0, 0, 15000},
+    {0, 0, 5000},
+    {0, 0, 3500},
+    {0, 0, 5000},
+    {0, 0, 3500},
+    {0, 0, 5000},
+    {0, 0, 0}
 };
 
 //Cordinates for Spawns
@@ -548,7 +548,7 @@ public:
                         DoScriptText(FANDRAL_SAY_1, Fandral,me);
                         break;
                     case 2:
-                        Fandral->SetUInt64Value(UNIT_FIELD_TARGET,NULL);
+                        Fandral->SetUInt64Value(UNIT_FIELD_TARGET, 0);
                         DoScriptText(MERITHRA_EMOTE_1,Merithra);
                         break;
                     case 3:
@@ -565,7 +565,7 @@ public:
                         DoScriptText(MERITHRA_SAY_2, Merithra);
                         break;
                     case 7:
-                        Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, NULL);
+                        Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, 0);
                         Merithra->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10);
                         break;
                     case 8: