diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-04-23 15:53:48 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-04-23 15:53:48 +0200 |
| commit | 8898db8b272cc3745a76f4cd284912866ca884c5 (patch) | |
| tree | 4c497fcf6bd68651907cd77c7e7e61e58d47a171 /src/server/scripts/Northrend | |
| parent | a2a751b9d6ee3a86045cca2e1444499bd290708b (diff) | |
Core: Corrected NULL usage, it should only be used with pointers, not integers
Diffstat (limited to 'src/server/scripts/Northrend')
9 files changed, 26 insertions, 26 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index a81098a8821..1b9e978ac01 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -89,7 +89,7 @@ public: case 192395: uiKrikthirDoor = go->GetGUID(); if (auiEncounter[0] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); break; case 192396: uiAnubarakDoor[0] = go->GetGUID(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index 82945aa89e1..f693c7aad16 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -112,7 +112,7 @@ public: switch(go->GetEntry()) { case 193564: Prince_TaldaramPlatform = go->GetGUID(); - if (m_auiEncounter[1] == DONE) HandleGameObject(NULL,true,go); break; + if (m_auiEncounter[1] == DONE) HandleGameObject(0,true,go); break; case 193093: Prince_TaldaramSpheres[0] = go->GetGUID(); if (spheres[0] == IN_PROGRESS) { @@ -130,7 +130,7 @@ public: else go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; case 192236: Prince_TaldaramGate = go->GetGUID(); // Web gate past Prince Taldaram - if (m_auiEncounter[1] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break; } } diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 84e2ea26d81..e25f9b900a4 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -220,21 +220,21 @@ public: case 192632: uiEckTheFerociousDoor = go->GetGUID(); if (bHeroicMode && m_auiEncounter[1] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); break; case 192569: uiEckTheFerociousDoorBehind = go->GetGUID(); if (bHeroicMode && m_auiEncounter[4] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); case 193208: uiGalDarahDoor1 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); break; case 193209: uiGalDarahDoor2 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); break; case 193188: uiBridge = go->GetGUID(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 8a60dfd0e96..6fc96c8dd7f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -231,7 +231,7 @@ public: { SlagPotTarget->ExitVehicle(); SlagPotTarget = NULL; - SlagPotGUID = NULL; + SlagPotGUID = 0; events.CancelEvent(EVENT_END_POT); } break; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index 561df2d00d2..671a8c72574 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -238,7 +238,7 @@ public: break; case GO_VEZAX_DOOR: uiVezaxDoorGUID = go->GetGUID(); - HandleGameObject(NULL, false, go); + HandleGameObject(0, false, go); break; case GO_RAZOR_HARPOON_1: uiRazorHarpoonGUIDs[0] = go->GetGUID(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index afa587f9e4b..92972d67469 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -139,27 +139,27 @@ public: { //door and object id case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_BELLOW_2: forge_bellow[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_BELLOW_3: forge_bellow[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_FORGEFIRE_1: forge_fire[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_FORGEFIRE_2: forge_fire[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_FORGEFIRE_3: forge_fire[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_GIANT_PORTCULLIS_1: portcullis[0] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; case ENTRY_GIANT_PORTCULLIS_2: portcullis[1] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index db6bdeebdf3..60259a8c413 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -125,17 +125,17 @@ public: { case ENTRY_SKADI_THE_RUTHLESS_DOOR: uiSkadiTheRuthlessDoor = go->GetGUID(); - if (m_auiEncounter[2] == DONE) HandleGameObject(NULL, true, go); + if (m_auiEncounter[2] == DONE) HandleGameObject(0, true, go); break; case ENTRY_KING_YMIRON_DOOR: uiKingYmironDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE) HandleGameObject(NULL, true, go); + if (m_auiEncounter[3] == DONE) HandleGameObject(0, true, go); break; case ENTRY_GORK_PALEHOOF_SPHERE: uiGortokPalehoofSphere = go->GetGUID(); if (m_auiEncounter[1] == DONE) { - HandleGameObject(NULL, true, go); + HandleGameObject(0, true, go); go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 6b1ca242309..7b0c5de36d2 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -1628,7 +1628,7 @@ public: { EnterEvadeMode(); //We make sure that the npc is not attacking the player! me->SetReactState(REACT_PASSIVE); - StartFollow(CAST_PLR(pCaster), NULL, NULL); + StartFollow(pCaster->ToPlayer(), 0, NULL); me->UpdateEntry(NPC_CAPTURED_BERLY_SORCERER, TEAM_NEUTRAL); DoCast(me, SPELL_COSMETIC_ENSLAVE_CHAINS_SELF, true); CAST_PLR(pCaster)->KilledMonsterCredit(NPC_CAPTURED_BERLY_SORCERER, 0); @@ -1699,7 +1699,7 @@ public: { uiStep = 1; uiPhase = 0; - CasterGUID = NULL; + CasterGUID = 0; } void EnterCombat(Unit* /*pWho*/) diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 568b9e848a9..2bf418a2130 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -159,7 +159,7 @@ public: me->setFaction(me->GetCreatureInfo()->faction_H); DoCast(me, SPELL_UNSHACKLED, true); - me->MonsterSay(SAY_RAGECLAW, LANG_UNIVERSAL, NULL); + me->MonsterSay(SAY_RAGECLAW, LANG_UNIVERSAL, 0); me->GetMotionMaster()->MoveRandom(10); DespawnTimer = 10000; |
