Core/Scripts: Split OnCreatureCreate() and OnGameObjectCreate() into two virtual functions each.

Note to scripters: be aware that you will need to hook into the Remove functions if you want to do stuff at GO/creature removal.
Closes issue 5011.

--HG--
branch : trunk

12 files changed, 143 insertions, 137 deletions

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index 80eb83c227a..41644fee53c 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -94,49 +94,49 @@ public:
             uiDeathTimes = 0;
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            switch (pCreature->GetEntry())
+            switch (creature->GetEntry())
             {
                 case NPC_TWILIGHT_LORD_KELRIS:
-                    m_uiTwilightLordKelrisGUID = pCreature->GetGUID();
+                    m_uiTwilightLordKelrisGUID = creature->GetGUID();
                     break;
                 case NPC_LORGUS_JETT:
-                    pCreature->SetHomePosition(LorgusPosition[urand(0,3)]);
+                    creature->SetHomePosition(LorgusPosition[urand(0,3)]);
                     break;
             }
         }
 
-        void OnGameObjectCreate(GameObject* pGo, bool /*add*/)
+        void OnGameObjectCreate(GameObject* go)
         {
-            switch(pGo->GetEntry())
+            switch(go->GetEntry())
             {
                 case GO_FIRE_OF_AKU_MAI_1:
-                    m_uiShrine1GUID = pGo->GetGUID();
+                    m_uiShrine1GUID = go->GetGUID();
                     break;
                 case GO_FIRE_OF_AKU_MAI_2:
-                    m_uiShrine2GUID = pGo->GetGUID();
+                    m_uiShrine2GUID = go->GetGUID();
                     break;
                 case GO_FIRE_OF_AKU_MAI_3:
-                    m_uiShrine3GUID = pGo->GetGUID();
+                    m_uiShrine3GUID = go->GetGUID();
                     break;
                 case GO_FIRE_OF_AKU_MAI_4:
-                    m_uiShrine4GUID = pGo->GetGUID();
+                    m_uiShrine4GUID = go->GetGUID();
                     break;
                 case GO_SHRINE_OF_GELIHAST:
-                    m_uiShrineOfGelihastGUID = pGo->GetGUID();
+                    m_uiShrineOfGelihastGUID = go->GetGUID();
                     if (m_auiEncounter[0] != DONE)
-                        pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
+                        go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
                     break;
                 case GO_ALTAR_OF_THE_DEEPS:
-                    m_uiAltarOfTheDeepsGUID = pGo->GetGUID();
+                    m_uiAltarOfTheDeepsGUID = go->GetGUID();
                     if (m_auiEncounter[3] != DONE)
-                        pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
+                        go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
                     break;
                 case GO_AKU_MAI_DOOR:
                     if (m_auiEncounter[2] == DONE)
-                        HandleGameObject(NULL,true,pGo);
-                    m_uiMainDoorGUID = pGo->GetGUID();
+                        HandleGameObject(NULL,true,go);
+                    m_uiMainDoorGUID = go->GetGUID();
                     break;
             }
         }
@@ -148,16 +148,16 @@ public:
                 case TYPE_GELIHAST:
                     m_auiEncounter[0] = uiData;
                     if (uiData == DONE)
-                        if (GameObject *pGo = instance->GetGameObject(m_uiShrineOfGelihastGUID))
-                            pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
+                        if (GameObject* go = instance->GetGameObject(m_uiShrineOfGelihastGUID))
+                            go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
                     break;
                 case TYPE_AKU_MAI:
                     m_auiEncounter[3] = uiData;
                     if (uiData == DONE)
-                        if (GameObject *pGo = instance->GetGameObject(m_uiAltarOfTheDeepsGUID))
+                        if (GameObject* go = instance->GetGameObject(m_uiAltarOfTheDeepsGUID))
                         {
-                            pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
-                            pGo->SummonCreature(NPC_MORRIDUNE,SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                            go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
+                            go->SummonCreature(NPC_MORRIDUNE,SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
                         }
                     break;
                 case DATA_FIRE:
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 0cc3056b648..de73311bd72 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -115,42 +115,42 @@ public:
             return false;
         }
 
-        void OnGameObjectCreate(GameObject* pGo, bool /*add*/)
+        void OnGameObjectCreate(GameObject* go)
         {
-            switch(pGo->GetEntry())
+            switch(go->GetEntry())
             {
                 case 182060:
-                    HordeGate = pGo->GetGUID();
+                    HordeGate = go->GetGUID();
                     if (allianceRetreat)
-                        HandleGameObject(0, true, pGo);
+                        HandleGameObject(0, true, go);
                     else
-                        HandleGameObject(0, false, pGo);
+                        HandleGameObject(0, false, go);
                     break;
                 case 182061:
-                    ElfGate = pGo->GetGUID();
+                    ElfGate = go->GetGUID();
                     if (hordeRetreat)
-                        HandleGameObject(0, true, pGo);
+                        HandleGameObject(0, true, go);
                     else
-                        HandleGameObject(0, false, pGo);
+                        HandleGameObject(0, false, go);
                     break;
                 case GO_ANCIENT_GEM:
-                    m_uiAncientGemGUID.push_back(pGo->GetGUID());
+                    m_uiAncientGemGUID.push_back(go->GetGUID());
                     break;
             }
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            switch(pCreature->GetEntry())
+            switch(creature->GetEntry())
             {
-                case 17767: RageWinterchill = pCreature->GetGUID(); break;
-                case 17808: Anetheron = pCreature->GetGUID(); break;
-                case 17888: Kazrogal = pCreature->GetGUID();  break;
-                case 17842: Azgalor = pCreature->GetGUID(); break;
-                case 17968: Archimonde = pCreature->GetGUID(); break;
-                case 17772: JainaProudmoore = pCreature->GetGUID(); break;
-                case 17852: Thrall = pCreature->GetGUID(); break;
-                case 17948: TyrandeWhisperwind = pCreature->GetGUID(); break;
+                case 17767: RageWinterchill = creature->GetGUID(); break;
+                case 17808: Anetheron = creature->GetGUID(); break;
+                case 17888: Kazrogal = creature->GetGUID();  break;
+                case 17842: Azgalor = creature->GetGUID(); break;
+                case 17968: Archimonde = creature->GetGUID(); break;
+                case 17772: JainaProudmoore = creature->GetGUID(); break;
+                case 17852: Thrall = creature->GetGUID(); break;
+                case 17948: TyrandeWhisperwind = creature->GetGUID(); break;
             }
         }
 
@@ -188,12 +188,12 @@ public:
                             if (ArchiYell)break;
                             ArchiYell = true;
 
-                            Creature* pCreature = instance->GetCreature(Azgalor);
-                            if (pCreature)
+                            Creature* creature = instance->GetCreature(Azgalor);
+                            if (creature)
                             {
-                                Creature* pUnit = pCreature->SummonCreature(21987,pCreature->GetPositionX(),pCreature->GetPositionY(),pCreature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,10000);
+                                Creature* pUnit = creature->SummonCreature(21987,creature->GetPositionX(),creature->GetPositionY(),creature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,10000);
 
-                                Map* pMap = pCreature->GetMap();
+                                Map* pMap = creature->GetMap();
                                 if (pMap->IsDungeon() && pUnit)
                                 {
                                     pUnit->SetVisible(false);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
index e5714a2bdde..2c14506e102 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -66,54 +66,54 @@ public:
             return false;
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            switch(pCreature->GetEntry())
+            switch(creature->GetEntry())
             {
                 case NPC_ARTHAS:
-                    uiArthas = pCreature->GetGUID();
+                    uiArthas = creature->GetGUID();
                     break;
                 case NPC_MEATHOOK:
-                    uiMeathook = pCreature->GetGUID();
+                    uiMeathook = creature->GetGUID();
                     break;
                 case NPC_SALRAMM:
-                    uiSalramm = pCreature->GetGUID();
+                    uiSalramm = creature->GetGUID();
                     break;
                 case NPC_EPOCH:
-                    uiEpoch = pCreature->GetGUID();
+                    uiEpoch = creature->GetGUID();
                     break;
                 case NPC_MAL_GANIS:
-                    uiMalGanis = pCreature->GetGUID();
+                    uiMalGanis = creature->GetGUID();
                     break;
                 case NPC_INFINITE:
-                    uiInfinite = pCreature->GetGUID();
+                    uiInfinite = creature->GetGUID();
                     break;
             }
         }
 
-        void OnGameObjectCreate(GameObject* pGo, bool /*add*/)
+        void OnGameObjectCreate(GameObject* go)
         {
-            switch(pGo->GetEntry())
+            switch(go->GetEntry())
             {
                 case GO_SHKAF_GATE:
-                    uiShkafGate = pGo->GetGUID();
+                    uiShkafGate = go->GetGUID();
                     break;
                 case GO_MALGANIS_GATE_1:
-                    uiMalGanisGate1 = pGo->GetGUID();
+                    uiMalGanisGate1 = go->GetGUID();
                     break;
                 case GO_MALGANIS_GATE_2:
-                    uiMalGanisGate2 = pGo->GetGUID();
+                    uiMalGanisGate2 = go->GetGUID();
                     break;
                 case GO_EXIT_GATE:
-                    uiExitGate = pGo->GetGUID();
+                    uiExitGate = go->GetGUID();
                     if (m_auiEncounter[3] == DONE)
                         HandleGameObject(uiExitGate,true);
                     break;
                 case GO_MALGANIS_CHEST_N:
                 case GO_MALGANIS_CHEST_H:
-                    uiMalGanisChest = pGo->GetGUID();
+                    uiMalGanisChest = go->GetGUID();
                     if (m_auiEncounter[3] == DONE)
-                        pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND);
+                        go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND);
                     break;
             }
         }
@@ -144,8 +144,8 @@ public:
                             break;
                         case DONE:
                             HandleGameObject(uiExitGate, true);
-                            if (GameObject *pGo = instance->GetGameObject(uiMalGanisChest))
-                                pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND);
+                            if (GameObject* go = instance->GetGameObject(uiMalGanisChest))
+                                go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND);
                             break;
                     }
                     break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
index 77f82a180db..1b66ec70698 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -130,10 +130,10 @@ public:
             pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0);
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            if (pCreature->GetEntry() == C_MEDIVH)
-                MedivhGUID = pCreature->GetGUID();
+            if (creature->GetEntry() == C_MEDIVH)
+                MedivhGUID = creature->GetGUID();
         }
 
         //what other conditions to check?
@@ -272,7 +272,7 @@ public:
             //normalize Z-level if we can, if rift is not at ground level.
             pos.m_positionZ = std::max(me->GetMap()->GetHeight(pos.m_positionX, pos.m_positionY, MAX_HEIGHT), me->GetMap()->GetWaterLevel(pos.m_positionX, pos.m_positionY));
 
-            if (Creature *summon = me->SummonCreature(entry, pos, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000))
+            if (Creature* summon = me->SummonCreature(entry, pos, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000))
                 return summon;
 
             sLog.outDebug("TSCR: Instance Dark Portal: What just happened there? No boss, no loot, no fun...");
@@ -292,7 +292,7 @@ public:
 
                 CurrentRiftId = tmp;
 
-                Creature *pTemp = pMedivh->SummonCreature(C_TIME_RIFT,
+                Creature* pTemp = pMedivh->SummonCreature(C_TIME_RIFT,
                     PortalLocation[tmp][0],PortalLocation[tmp][1],PortalLocation[tmp][2],PortalLocation[tmp][3],
                     TEMPSUMMON_CORPSE_DESPAWN,0);
                 if (pTemp)
@@ -300,7 +300,7 @@ public:
                     pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                     pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
-                    if (Creature *pBoss = SummonedPortalBoss(pTemp))
+                    if (Creature* pBoss = SummonedPortalBoss(pTemp))
                     {
                         if (pBoss->GetEntry() == C_AEONUS)
                             pBoss->AddThreat(pMedivh,0.0f);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index a6916fdb2e7..ac1c2508ca8 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -101,18 +101,18 @@ public:
             }
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            switch(pCreature->GetEntry())
+            switch(creature->GetEntry())
             {
                 case THRALL_ENTRY:
-                    ThrallGUID = pCreature->GetGUID();
+                    ThrallGUID = creature->GetGUID();
                     break;
                 case TARETHA_ENTRY:
-                    TarethaGUID = pCreature->GetGUID();
+                    TarethaGUID = creature->GetGUID();
                     break;
             case EPOCH_ENTRY:
-            EpochGUID = pCreature->GetGUID();
+            EpochGUID = creature->GetGUID();
             break;
             }
         }
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index c5ed6541f2a..a0d4880b5f9 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -67,33 +67,30 @@ public:
             m_uiEruptTimer = 0;
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            switch (pCreature->GetEntry())
+            switch (creature->GetEntry())
             {
                 case NPC_ONYXIA:
-                    m_uiOnyxiasGUID = pCreature->GetGUID();
+                    m_uiOnyxiasGUID = creature->GetGUID();
                     break;
             }
         }
 
-        void OnGameObjectCreate(GameObject* pGo, bool add)
+        void OnGameObjectCreate(GameObject* go)
         {
-            if ((pGo->GetGOInfo()->displayId == 4392 || pGo->GetGOInfo()->displayId == 4472) && pGo->GetGOInfo()->trap.spellId == 17731)
+            if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731)
             {
-                if (add)
-                    FloorEruptionGUID[0].insert(std::make_pair(pGo->GetGUID(),0));
-                else
-                    FloorEruptionGUID[0].erase(pGo->GetGUID());
+                FloorEruptionGUID[0].insert(std::make_pair(go->GetGUID(),0));
                 return;
             }
 
-            switch(pGo->GetEntry())
+            switch(go->GetEntry())
             {
                 case GO_WHELP_SPAWNER:
-                    Position pGoPos;
-                    pGo->GetPosition(&pGoPos);
-                    if (Creature* pTemp = pGo->SummonCreature(NPC_WHELP,pGoPos,TEMPSUMMON_CORPSE_DESPAWN))
+                    Position goPos;
+                    go->GetPosition(&goPos);
+                    if (Creature* pTemp = go->SummonCreature(NPC_WHELP,goPos,TEMPSUMMON_CORPSE_DESPAWN))
                     {
                         pTemp->SetInCombatWithZone();
                         ++m_uiManyWhelpsCounter;
@@ -102,9 +99,18 @@ public:
             }
         }
 
+        void OnGameObjectRemove(GameObject* go)
+        {
+            if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731)
+            {
+                FloorEruptionGUID[0].erase(go->GetGUID());
+                return;
+            }
+        }
+
         void FloorEruption(uint64 floorEruptedGUID)
         {
-            if (GameObject *pFloorEruption = instance->GetGameObject(floorEruptedGUID))
+            if (GameObject* pFloorEruption = instance->GetGameObject(floorEruptedGUID))
             {
                 //THIS GOB IS A TRAP - What shall i do? =(
                 //Cast it spell? Copyed Heigan method
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
index 6aad9c69986..9266aa52b25 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -99,14 +99,14 @@ public:
             OUT_LOAD_INST_DATA_COMPLETE;
         }
 
-        void OnGameObjectCreate(GameObject* pGo, bool /*bAdd*/)
+        void OnGameObjectCreate(GameObject* go)
         {
-            switch(pGo->GetEntry())
+            switch(go->GetEntry())
             {
                 case GO_GONG:
-                    uiGongGUID = pGo->GetGUID();
+                    uiGongGUID = go->GetGUID();
                     if (m_auiEncounter[0] == DONE)
-                        pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1);
+                        go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1);
                     break;
                 default:
                     break;
@@ -123,19 +123,19 @@ public:
                 {
                     case 9:
                     case 14:
-                        if (GameObject* pGo = instance->GetGameObject(uiGongGUID))
-                            pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1);
+                        if (GameObject* go = instance->GetGameObject(uiGongGUID))
+                            go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1);
                         break;
                     case 1:
                     case 10:
                     case 16:
                     {
-                        GameObject* pGo = instance->GetGameObject(uiGongGUID);
+                        GameObject* go = instance->GetGameObject(uiGongGUID);
 
-                        if (!pGo)
+                        if (!go)
                             return;
 
-                        pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1);
+                        go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1);
 
                         uint32 uiCreature = 0;
                         uint8 uiSummonTimes = 0;
@@ -158,17 +158,17 @@ public:
                         }
 
 
-                        if (Creature* pCreature = pGo->SummonCreature(uiCreature,2502.635f,844.140f,46.896f,0.633f))
+                        if (Creature* creature = go->SummonCreature(uiCreature,2502.635f,844.140f,46.896f,0.633f))
                         {
                             if (uiGongWaves == 10 || uiGongWaves == 1)
                             {
                                 for (uint8 i = 0; i < uiSummonTimes; ++i)
                                 {
-                                    if (Creature* pSummon = pGo->SummonCreature(uiCreature,2502.635f + float(irand(-5,5)),844.140f + float(irand(-5,5)),46.896f,0.633f))
+                                    if (Creature* pSummon = go->SummonCreature(uiCreature,2502.635f + float(irand(-5,5)),844.140f + float(irand(-5,5)),46.896f,0.633f))
                                         pSummon->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f);
                                 }
                             }
-                            pCreature->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f);
+                            creature->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f);
                         }
                         break;
                     }
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index 4a6e5573c91..3fe930b2cc8 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -69,11 +69,11 @@ public:
             return NULL;
         }
 
-        void OnGameObjectCreate(GameObject* pGo, bool /*apply*/)
+        void OnGameObjectCreate(GameObject* go)
         {
-            switch(pGo->GetEntry())
+            switch(go->GetEntry())
             {
-            case 21099: DoorWardGUID = pGo->GetGUID(); break;
+            case 21099: DoorWardGUID = go->GetGUID(); break;
             }
         }
 
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index 10dea9ef9fe..8b1e1a6e483 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -80,27 +80,27 @@ public:
             return false;
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            switch (pCreature->GetEntry())
+            switch (creature->GetEntry())
             {
                 case CREATURE_KURINAXX:
-                    uiKurinaxx = pCreature->GetGUID();
+                    uiKurinaxx = creature->GetGUID();
                     break;
                 case CREATURE_RAJAXX:
-                    uiRajaxx = pCreature->GetGUID();
+                    uiRajaxx = creature->GetGUID();
                     break;
                 case CREATURE_MOAM:
-                    uiMoam = pCreature->GetGUID();
+                    uiMoam = creature->GetGUID();
                     break;
                 case CREATURE_BURU:
-                    uiBuru = pCreature->GetGUID();
+                    uiBuru = creature->GetGUID();
                     break;
                 case CREATURE_AYAMISS:
-                    uiAyamiss = pCreature->GetGUID();
+                    uiAyamiss = creature->GetGUID();
                     break;
                 case CREATURE_OSSIRIAN:
-                    uiOssirian = pCreature->GetGUID();
+                    uiOssirian = creature->GetGUID();
                     break;
             }
         }
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index 132719cb083..84ef4d86485 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -71,15 +71,15 @@ public:
             CthunPhase = 0;
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            switch (pCreature->GetEntry())
+            switch (creature->GetEntry())
             {
-                case 15263: SkeramGUID = pCreature->GetGUID(); break;
-                case 15544: VemGUID = pCreature->GetGUID(); break;
-                case 15511: KriGUID = pCreature->GetGUID(); break;
-                case 15276: VeklorGUID = pCreature->GetGUID(); break;
-                case 15275: VeknilashGUID = pCreature->GetGUID(); break;
+                case 15263: SkeramGUID = creature->GetGUID(); break;
+                case 15544: VemGUID = creature->GetGUID(); break;
+                case 15511: KriGUID = creature->GetGUID(); break;
+                case 15276: VeklorGUID = creature->GetGUID(); break;
+                case 15275: VeknilashGUID = creature->GetGUID(); break;
             }
         }
 
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
index 12d6bd61247..e783ec18df0 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
@@ -55,10 +55,10 @@ public:
             NaralexGUID = 0;
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            if (pCreature->GetEntry() == DATA_NARALEX)
-                NaralexGUID = pCreature->GetGUID();
+            if (creature->GetEntry() == DATA_NARALEX)
+                NaralexGUID = creature->GetGUID();
         }
 
         void SetData(uint32 type, uint32 data)
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index 2b8b590022d..89a57254406 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -120,48 +120,48 @@ public:
             GahzRillaEncounter = NOT_STARTED;
         }
 
-        void OnCreatureCreate(Creature* pCreature, bool /*add*/)
+        void OnCreatureCreate(Creature* creature)
         {
-            switch (pCreature->GetEntry())
+            switch (creature->GetEntry())
             {
                 case ENTRY_ZUMRAH:
-                    ZumrahGUID = pCreature->GetGUID();
+                    ZumrahGUID = creature->GetGUID();
                     break;
                 case ENTRY_BLY:
-                    BlyGUID = pCreature->GetGUID();
-                    pCreature->SetReactState(REACT_PASSIVE); // starts out passive (in a cage)
+                    BlyGUID = creature->GetGUID();
+                    creature->SetReactState(REACT_PASSIVE); // starts out passive (in a cage)
                     break;
                 case ENTRY_RAVEN:
-                    RavenGUID = pCreature->GetGUID();
-                    pCreature->SetReactState(REACT_PASSIVE);// starts out passive (in a cage)
+                    RavenGUID = creature->GetGUID();
+                    creature->SetReactState(REACT_PASSIVE);// starts out passive (in a cage)
                     break;
                 case ENTRY_ORO:
-                    OroGUID = pCreature->GetGUID();
-                    pCreature->SetReactState(REACT_PASSIVE);// starts out passive (in a cage)
+                    OroGUID = creature->GetGUID();
+                    creature->SetReactState(REACT_PASSIVE);// starts out passive (in a cage)
                     break;
                 case ENTRY_WEEGLI:
-                    WeegliGUID = pCreature->GetGUID();
-                    pCreature->SetReactState(REACT_PASSIVE);// starts out passive (in a cage)
+                    WeegliGUID = creature->GetGUID();
+                    creature->SetReactState(REACT_PASSIVE);// starts out passive (in a cage)
                     break;
                 case ENTRY_MURTA:
-                    MurtaGUID = pCreature->GetGUID();
-                    pCreature->SetReactState(REACT_PASSIVE);// starts out passive (in a cage)
+                    MurtaGUID = creature->GetGUID();
+                    creature->SetReactState(REACT_PASSIVE);// starts out passive (in a cage)
                     break;
                 case NPC_GAHZRILLA:
                     if (GahzRillaEncounter >= IN_PROGRESS)
-                        pCreature->DisappearAndDie();
+                        creature->DisappearAndDie();
                     else
                         GahzRillaEncounter = IN_PROGRESS;
                     break;
             }
         }
 
-        void OnGameObjectCreate(GameObject* pGo, bool /*apply*/)
+        void OnGameObjectCreate(GameObject* go)
         {
-            switch(pGo->GetEntry())
+            switch(go->GetEntry())
             {
                 case GO_END_DOOR:
-                    EndDoorGUID = pGo->GetGUID();
+                    EndDoorGUID = go->GetGUID();
                     break;
             }
         }