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

7 files changed, 17 insertions, 17 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 0785d9d5607..1a7d30baa65 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -164,24 +164,24 @@ public:
             switch(go->GetEntry())
             {
             case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards)
-                if (m_auiEncounter[0] == DONE)HandleGameObject(NULL,true,go);break;
+                if (m_auiEncounter[0] == DONE)HandleGameObject(0,true,go);break;
             case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus)
-                if (m_auiEncounter[1] == DONE)HandleGameObject(NULL,true,go);break;
+                if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break;
             case 185478: ShadeOfAkamaDoor = go->GetGUID();break;
             case 185480: CommonDoor = go->GetGUID();
-                if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,go);break;
+                if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break;
             case 186153: TeronDoor = go->GetGUID();
-                if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,go);break;
+                if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break;
             case 185892: GuurtogDoor = go->GetGUID();
-                if (m_auiEncounter[4] == DONE)HandleGameObject(NULL,true,go);break;
+                if (m_auiEncounter[4] == DONE)HandleGameObject(0,true,go);break;
             case 185479: TempleDoor = go->GetGUID();
-                if (m_auiEncounter[5] == DONE)HandleGameObject(NULL,true,go);break;
+                if (m_auiEncounter[5] == DONE)HandleGameObject(0,true,go);break;
             case 185482: MotherDoor = go->GetGUID();
-                if (m_auiEncounter[6] == DONE)HandleGameObject(NULL,true,go);break;
+                if (m_auiEncounter[6] == DONE)HandleGameObject(0,true,go);break;
             case 185481: CouncilDoor = go->GetGUID();
-                if (m_auiEncounter[7] == DONE)HandleGameObject(NULL,true,go);break;
+                if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break;
             case 186152: SimpleDoor = go->GetGUID();
-                if (m_auiEncounter[7] == DONE)HandleGameObject(NULL,true,go);break;
+                if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break;
             case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit
             case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit
             case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index 6705f4dda01..201fa46bb02 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -293,7 +293,7 @@ public:
                 if (continueTriggering)
                 {
                     DoCast(me, SPELL_BLESSING_OF_THE_TIDES);
-                    me->MonsterYell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL, NULL);
+                    me->MonsterYell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL, 0);
                     DoPlaySoundToSet(me, SOUND_GAIN_BLESSING_OF_TIDES);
                 }
             }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index d5a6f0d177c..153bb9e5a66 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -305,7 +305,7 @@ public:
                 {
                     if (MarkOfHydross_Count <= 5)
                     {
-                        uint32 mark_spell = NULL;
+                        uint32 mark_spell = 0;
 
                         switch(MarkOfHydross_Count)
                         {
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index bbb13b5bf15..20159b41a58 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -100,7 +100,7 @@ public:
             {
                 case 184468:
                     MaulgarDoor = go->GetGUID();
-                    if (m_auiEncounter[0] == DONE) HandleGameObject(NULL, true, go);
+                    if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go);
                     break;
                 case 184662: GruulDoor = go->GetGUID(); break;
             }
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index efb99e41278..f2cdce78903 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -158,7 +158,7 @@ class boss_kelidan_the_breaker : public CreatureScript
             uint64 GetChanneled(Creature *channeler1)
             {
                 SummonChannelers();
-                if (!channeler1) return NULL;
+                if (!channeler1) return 0;
                 uint8 i;
                 for (i=0; i<5; ++i)
                 {
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 4b459b6ab77..b463952f508 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -141,7 +141,7 @@ class boss_void_reaver : public CreatureScript
                         pTarget = me->getVictim();
 
                     if (pTarget)
-                        me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, NULL, pTarget);
+                        me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget);
                     ArcaneOrb_Timer = 3000;
                 }
                 else
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 8468bce657c..60d1baa0281 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -1090,10 +1090,10 @@ static TorlothCinematic TorlothAnim[]=
     {-1000367, 0, 2000},
     {-1000368, 1, 7000},
     {-1000369, 0, 3000},
-    {NULL, 0, 2000}, // Torloth stand
+    {0, 0, 2000}, // Torloth stand
     {-1000370, 0, 1000},
-    {NULL, 0, 3000},
-    {NULL, 0, NULL}
+    {0, 0, 3000},
+    {0, 0, 0}
 };
 
 struct Location