diff options
| author | leak <none@none> | 2010-12-05 18:04:10 +0100 |
|---|---|---|
| committer | leak <none@none> | 2010-12-05 18:04:10 +0100 |
| commit | 6fe19b5a863dd1109700c8a28dad22a8c3b7526c (patch) | |
| tree | 65b29925addfe35b78125e0527b1092798411597 /src/server/scripts/Northrend | |
| parent | dfa1e9532bef9e06fd20afcca800e37cb9783497 (diff) | |
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
Diffstat (limited to 'src/server/scripts/Northrend')
21 files changed, 479 insertions, 475 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 ace34710b4c..c7d8c118289 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -69,36 +69,36 @@ public: return false; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { - case 28684: uiKrikthir = pCreature->GetGUID(); break; - case 28921: uiHadronox = pCreature->GetGUID(); break; - case 29120: uiAnubarak = pCreature->GetGUID(); break; - case 28730: uiWatcherGashra = pCreature->GetGUID(); break; - case 28731: uiWatcherSilthik = pCreature->GetGUID(); break; - case 28729: uiWatcherNarjil = pCreature->GetGUID(); break; + case 28684: uiKrikthir = creature->GetGUID(); break; + case 28921: uiHadronox = creature->GetGUID(); break; + case 29120: uiAnubarak = creature->GetGUID(); break; + case 28730: uiWatcherGashra = creature->GetGUID(); break; + case 28731: uiWatcherSilthik = creature->GetGUID(); break; + case 28729: uiWatcherNarjil = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + void OnGameObjectCreate(GameObject* go) { - switch (pGo->GetEntry()) + switch (go->GetEntry()) { case 192395: - uiKrikthirDoor = pGo->GetGUID(); + uiKrikthirDoor = go->GetGUID(); if (auiEncounter[0] == DONE) - HandleGameObject(NULL,true,pGo); + HandleGameObject(NULL,true,go); break; case 192396: - uiAnubarakDoor[0] = pGo->GetGUID(); + uiAnubarakDoor[0] = go->GetGUID(); break; case 192397: - uiAnubarakDoor[1] = pGo->GetGUID(); + uiAnubarakDoor[1] = go->GetGUID(); break; case 192398: - uiAnubarakDoor[2] = pGo->GetGUID(); + uiAnubarakDoor[2] = go->GetGUID(); break; } } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index 1a72efe6e79..54a0e906b76 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -94,43 +94,43 @@ public: return false; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { - case 29309: Elder_Nadox = pCreature->GetGUID(); break; - case 29308: Prince_Taldaram = pCreature->GetGUID(); break; - case 29310: Jedoga_Shadowseeker = pCreature->GetGUID(); break; - case 29311: Herald_Volazj = pCreature->GetGUID(); break; - case 30258: Amanitar = pCreature->GetGUID(); break; - case 30114: InitiandGUIDs.insert(pCreature->GetGUID()); break; + case 29309: Elder_Nadox = creature->GetGUID(); break; + case 29308: Prince_Taldaram = creature->GetGUID(); break; + case 29310: Jedoga_Shadowseeker = creature->GetGUID(); break; + case 29311: Herald_Volazj = creature->GetGUID(); break; + case 30258: Amanitar = creature->GetGUID(); break; + case 30114: InitiandGUIDs.insert(creature->GetGUID()); break; } } - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGo->GetEntry()) + switch(go->GetEntry()) { - case 193564: Prince_TaldaramPlatform = pGo->GetGUID(); - if (m_auiEncounter[1] == DONE) HandleGameObject(NULL,true,pGo); break; - case 193093: Prince_TaldaramSpheres[0] = pGo->GetGUID(); + case 193564: Prince_TaldaramPlatform = go->GetGUID(); + if (m_auiEncounter[1] == DONE) HandleGameObject(NULL,true,go); break; + case 193093: Prince_TaldaramSpheres[0] = go->GetGUID(); if (spheres[0] == IN_PROGRESS) { - pGo->SetGoState(GO_STATE_ACTIVE); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + go->SetGoState(GO_STATE_ACTIVE); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } - else pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + else go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; - case 193094: Prince_TaldaramSpheres[1] = pGo->GetGUID(); + case 193094: Prince_TaldaramSpheres[1] = go->GetGUID(); if (spheres[1] == IN_PROGRESS) { - pGo->SetGoState(GO_STATE_ACTIVE); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + go->SetGoState(GO_STATE_ACTIVE); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } - else pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + else go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; - case 192236: Prince_TaldaramGate = pGo->GetGUID(); // Web gate past Prince Taldaram - if (m_auiEncounter[1] == DONE)HandleGameObject(NULL,true,pGo);break; + case 192236: Prince_TaldaramGate = go->GetGUID(); // Web gate past Prince Taldaram + if (m_auiEncounter[1] == DONE)HandleGameObject(NULL,true,go);break; } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 8d2910db245..7fd62fc13f7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -99,7 +99,7 @@ public: return false; } - void OnCreatureCreate(Creature* pCreature, bool /*bAdd*/) + void OnCreatureCreate(Creature* creature) { Map::PlayerList const &players = instance->GetPlayers(); uint32 TeamInInstance = 0; @@ -110,56 +110,56 @@ public: TeamInInstance = pPlayer->GetTeam(); } - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { // Champions case VEHICLE_MOKRA_SKILLCRUSHER_MOUNT: if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT, ALLIANCE); + creature->UpdateEntry(VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT, ALLIANCE); break; case VEHICLE_ERESSEA_DAWNSINGER_MOUNT: if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_AMBROSE_BOLTSPARK_MOUNT, ALLIANCE); + creature->UpdateEntry(VEHICLE_AMBROSE_BOLTSPARK_MOUNT, ALLIANCE); break; case VEHICLE_RUNOK_WILDMANE_MOUNT: if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_COLOSOS_MOUNT, ALLIANCE); + creature->UpdateEntry(VEHICLE_COLOSOS_MOUNT, ALLIANCE); break; case VEHICLE_ZUL_TORE_MOUNT: if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_EVENSONG_MOUNT, ALLIANCE); + creature->UpdateEntry(VEHICLE_EVENSONG_MOUNT, ALLIANCE); break; case VEHICLE_DEATHSTALKER_VESCERI_MOUNT: if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_LANA_STOUTHAMMER_MOUNT, ALLIANCE); + creature->UpdateEntry(VEHICLE_LANA_STOUTHAMMER_MOUNT, ALLIANCE); break; // Coliseum Announcer || Just NPC_JAEREN must be spawned. case NPC_JAEREN: - uiAnnouncerGUID = pCreature->GetGUID(); + uiAnnouncerGUID = creature->GetGUID(); if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_ARELAS,ALLIANCE); + creature->UpdateEntry(NPC_ARELAS,ALLIANCE); break; case VEHICLE_ARGENT_WARHORSE: case VEHICLE_ARGENT_BATTLEWORG: - VehicleList.push_back(pCreature->GetGUID()); + VehicleList.push_back(creature->GetGUID()); break; case NPC_EADRIC: case NPC_PALETRESS: - uiArgentChampionGUID = pCreature->GetGUID(); + uiArgentChampionGUID = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGO, bool /*bAdd*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGO->GetEntry()) + switch(go->GetEntry()) { case GO_MAIN_GATE: - uiMainGateGUID = pGO->GetGUID(); + uiMainGateGUID = go->GetGUID(); break; case GO_CHAMPIONS_LOOT: case GO_CHAMPIONS_LOOT_H: - uiChampionLootGUID = pGO->GetGUID(); + uiChampionLootGUID = go->GetGUID(); break; } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 41368d86415..eb1c1881927 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -149,63 +149,63 @@ public: void OpenDoor(uint64 guid) { if (!guid) return; - GameObject* pGo = instance->GetGameObject(guid); - if (pGo) pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE); + GameObject* go = instance->GetGameObject(guid); + if (go) go->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE); } void CloseDoor(uint64 guid) { if (!guid) return; - GameObject* pGo = instance->GetGameObject(guid); - if (pGo) pGo->SetGoState(GO_STATE_READY); + GameObject* go = instance->GetGameObject(guid); + if (go) go->SetGoState(GO_STATE_READY); } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { - case NPC_BARRENT: m_uiBarrentGUID = pCreature->GetGUID(); break; - case NPC_TIRION: m_uiTirionGUID = pCreature->GetGUID(); break; - case NPC_FIZZLEBANG: m_uiFizzlebangGUID = pCreature->GetGUID(); break; - case NPC_GARROSH: m_uiGarroshGUID = pCreature->GetGUID(); break; - case NPC_VARIAN: m_uiVarianGUID = pCreature->GetGUID(); break; - - case NPC_GORMOK: m_uiGormokGUID = pCreature->GetGUID(); break; - case NPC_ACIDMAW: m_uiAcidmawGUID = pCreature->GetGUID(); break; - case NPC_DREADSCALE: m_uiDreadscaleGUID = pCreature->GetGUID(); break; - case NPC_ICEHOWL: m_uiIcehowlGUID = pCreature->GetGUID(); break; - case NPC_JARAXXUS: m_uiJaraxxusGUID = pCreature->GetGUID(); break; - case NPC_CHAMPIONS_CONTROLLER: m_uiChampionsControllerGUID = pCreature->GetGUID(); break; - case NPC_DARKBANE: m_uiDarkbaneGUID = pCreature->GetGUID(); break; - case NPC_LIGHTBANE: m_uiLightbaneGUID = pCreature->GetGUID(); break; - case NPC_ANUBARAK: m_uiAnubarakGUID = pCreature->GetGUID(); break; + case NPC_BARRENT: m_uiBarrentGUID = creature->GetGUID(); break; + case NPC_TIRION: m_uiTirionGUID = creature->GetGUID(); break; + case NPC_FIZZLEBANG: m_uiFizzlebangGUID = creature->GetGUID(); break; + case NPC_GARROSH: m_uiGarroshGUID = creature->GetGUID(); break; + case NPC_VARIAN: m_uiVarianGUID = creature->GetGUID(); break; + + case NPC_GORMOK: m_uiGormokGUID = creature->GetGUID(); break; + case NPC_ACIDMAW: m_uiAcidmawGUID = creature->GetGUID(); break; + case NPC_DREADSCALE: m_uiDreadscaleGUID = creature->GetGUID(); break; + case NPC_ICEHOWL: m_uiIcehowlGUID = creature->GetGUID(); break; + case NPC_JARAXXUS: m_uiJaraxxusGUID = creature->GetGUID(); break; + case NPC_CHAMPIONS_CONTROLLER: m_uiChampionsControllerGUID = creature->GetGUID(); break; + case NPC_DARKBANE: m_uiDarkbaneGUID = creature->GetGUID(); break; + case NPC_LIGHTBANE: m_uiLightbaneGUID = creature->GetGUID(); break; + case NPC_ANUBARAK: m_uiAnubarakGUID = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGO, bool /*bAdd*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGO->GetEntry()) + switch(go->GetEntry()) { case GO_CRUSADERS_CACHE_10: if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL) - m_uiCrusadersCacheGUID = pGO->GetGUID(); + m_uiCrusadersCacheGUID = go->GetGUID(); break; case GO_CRUSADERS_CACHE_25: if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL) - m_uiCrusadersCacheGUID = pGO->GetGUID(); + m_uiCrusadersCacheGUID = go->GetGUID(); break; case GO_CRUSADERS_CACHE_10_H: if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC) - m_uiCrusadersCacheGUID = pGO->GetGUID(); + m_uiCrusadersCacheGUID = go->GetGUID(); break; case GO_CRUSADERS_CACHE_25_H: if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC) - m_uiCrusadersCacheGUID = pGO->GetGUID(); + m_uiCrusadersCacheGUID = go->GetGUID(); break; - case GO_ARGENT_COLISEUM_FLOOR: m_uiFloorGUID = pGO->GetGUID(); break; - case GO_MAIN_GATE_DOOR: m_uiMainGateDoorGUID = pGO->GetGUID(); break; - case GO_EAST_PORTCULLIS: m_uiEastPortcullisGUID = pGO->GetGUID(); break; - case GO_WEB_DOOR: m_uiWebDoorGUID = pGO->GetGUID(); break; + case GO_ARGENT_COLISEUM_FLOOR: m_uiFloorGUID = go->GetGUID(); break; + case GO_MAIN_GATE_DOOR: m_uiMainGateDoorGUID = go->GetGUID(); break; + case GO_EAST_PORTCULLIS: m_uiEastPortcullisGUID = go->GetGUID(); break; + case GO_WEB_DOOR: m_uiWebDoorGUID = go->GetGUID(); break; case GO_TRIBUTE_CHEST_10H_25: case GO_TRIBUTE_CHEST_10H_45: @@ -215,7 +215,7 @@ public: case GO_TRIBUTE_CHEST_25H_45: case GO_TRIBUTE_CHEST_25H_50: case GO_TRIBUTE_CHEST_25H_99: - m_uiTributeChestGUID = pGO->GetGUID(); break; + m_uiTributeChestGUID = go->GetGUID(); break; } } diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 9ee754b4a56..d7282522838 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -88,40 +88,40 @@ public: return false; } - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGo->GetEntry()) + switch(go->GetEntry()) { case GO_NOVOS_CRYSTAL_1: - uiNovosCrystal1 = pGo->GetGUID(); + uiNovosCrystal1 = go->GetGUID(); break; case GO_NOVOS_CRYSTAL_2: - uiNovosCrystal2 = pGo->GetGUID(); + uiNovosCrystal2 = go->GetGUID(); break; case GO_NOVOS_CRYSTAL_3: - uiNovosCrystal3 = pGo->GetGUID(); + uiNovosCrystal3 = go->GetGUID(); break; case GO_NOVOS_CRYSTAL_4: - uiNovosCrystal4 = pGo->GetGUID(); + uiNovosCrystal4 = go->GetGUID(); break; } } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case NPC_TROLLGORE: - uiTrollgore = pCreature->GetGUID(); + uiTrollgore = creature->GetGUID(); break; case NPC_NOVOS: - uiNovos = pCreature->GetGUID(); + uiNovos = creature->GetGUID(); break; case NPC_KING_DRED: - uiDred = pCreature->GetGUID(); + uiDred = creature->GetGUID(); break; case NPC_THARON_JA: - uiTharonJa = pCreature->GetGUID(); + uiTharonJa = creature->GetGUID(); break; } } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 1a48b1f4cc6..f9cb4a04db6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -41,7 +41,7 @@ class instance_forge_of_souls : public InstanceMapScript teamInInstance = 0; } - void OnCreatureCreate(Creature* creature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index f86878bbc3f..73239e18028 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -150,67 +150,61 @@ public: uiEncounter[i] = NOT_STARTED; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* creature) { - if (!add) - return; - Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) if (Player* pPlayer = players.begin()->getSource()) uiTeamInInstance = pPlayer->GetTeam(); - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case NPC_FALRIC: - uiFalric = pCreature->GetGUID(); + uiFalric = creature->GetGUID(); break; case NPC_MARWYN: - uiMarwyn = pCreature->GetGUID(); + uiMarwyn = creature->GetGUID(); break; case NPC_LICH_KING_EVENT: - uiLichKingEvent = pCreature->GetGUID(); + uiLichKingEvent = creature->GetGUID(); break; case NPC_JAINA_PART1: - uiJainaPart1 = pCreature->GetGUID(); + uiJainaPart1 = creature->GetGUID(); break; case NPC_SYLVANAS_PART1: - uiSylvanasPart1 = pCreature->GetGUID(); + uiSylvanasPart1 = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* go) { - if (!add) - return; - // TODO: init state depending on encounters - switch(pGo->GetEntry()) + switch(go->GetEntry()) { case GO_FROSTMOURNE: - uiFrostmourne = pGo->GetGUID(); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - HandleGameObject(0, false, pGo); + uiFrostmourne = go->GetGUID(); + go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + HandleGameObject(0, false, go); break; case GO_FROSTMOURNE_ALTAR: - uiFrostmourneAltar = pGo->GetGUID(); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - HandleGameObject(0, true, pGo); + uiFrostmourneAltar = go->GetGUID(); + go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + HandleGameObject(0, true, go); break; case GO_FRONT_DOOR: - uiFrontDoor = pGo->GetGUID(); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - HandleGameObject(0, true, pGo); + uiFrontDoor = go->GetGUID(); + go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + HandleGameObject(0, true, go); break; case GO_ARTHAS_DOOR: - uiArthasDoor = pGo->GetGUID(); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + uiArthasDoor = go->GetGUID(); + go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); if (uiEncounter[1] == DONE) - HandleGameObject(0, true, pGo); + HandleGameObject(0, true, go); else - HandleGameObject(0, false, pGo); + HandleGameObject(0, false, go); break; } } @@ -333,13 +327,13 @@ public: case 2: case 3: case 4: - if (Creature *pFalric = instance->GetCreature(uiFalric)) + if (Creature* pFalric = instance->GetCreature(uiFalric)) SpawnWave(pFalric); break; case 5: if (GetData(DATA_FALRIC_EVENT) == DONE) events.ScheduleEvent(EVENT_NEXT_WAVE, 10000); - else if (Creature *pFalric = instance->GetCreature(uiFalric)) + else if (Creature* pFalric = instance->GetCreature(uiFalric)) if (pFalric->AI()) pFalric->AI()->DoAction(ACTION_ENTER_COMBAT); break; @@ -347,12 +341,12 @@ public: case 7: case 8: case 9: - if (Creature *pMarwyn = instance->GetCreature(uiMarwyn)) + if (Creature* pMarwyn = instance->GetCreature(uiMarwyn)) SpawnWave(pMarwyn); break; case 10: if (GetData(DATA_MARWYN_EVENT) != DONE) // wave should not have been started if DONE. Check anyway to avoid bug exploit! - if (Creature *pMarwyn = instance->GetCreature(uiMarwyn)) + if (Creature* pMarwyn = instance->GetCreature(uiMarwyn)) if (pMarwyn->AI()) pMarwyn->AI()->DoAction(ACTION_ENTER_COMBAT); break; @@ -383,7 +377,7 @@ public: } // spawn a wave on behalf of the summoner. - void SpawnWave(Creature *pSummoner) + void SpawnWave(Creature* pSummoner) { uint32 index; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 177b2d2d55e..a5d691768c0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -72,7 +72,7 @@ public: return false; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { Map::PlayerList const &players = instance->GetPlayers(); @@ -82,57 +82,57 @@ public: uiTeamInInstance = pPlayer->GetTeam(); } - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case CREATURE_KRICK: - uiKrick = pCreature->GetGUID(); + uiKrick = creature->GetGUID(); break; case CREATURE_ICK: - uiIck = pCreature->GetGUID(); + uiIck = creature->GetGUID(); break; case CREATURE_GARFROST: - uiGarfrost = pCreature->GetGUID(); + uiGarfrost = creature->GetGUID(); break; case CREATURE_TYRANNUS: - uiTyrannus = pCreature->GetGUID(); + uiTyrannus = creature->GetGUID(); break; case CREATURE_RIMEFANG: - uiRimefang = pCreature->GetGUID(); + uiRimefang = creature->GetGUID(); break; case NPC_SYLVANAS_PART1: if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_JAINA_PART1, ALLIANCE); - uiJainaOrSylvanas1 = pCreature->GetGUID(); + creature->UpdateEntry(NPC_JAINA_PART1, ALLIANCE); + uiJainaOrSylvanas1 = creature->GetGUID(); break; case NPC_SYLVANAS_PART2: if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_JAINA_PART2, ALLIANCE); - uiJainaOrSylvanas2 = pCreature->GetGUID(); + creature->UpdateEntry(NPC_JAINA_PART2, ALLIANCE); + uiJainaOrSylvanas2 = creature->GetGUID(); break; case NPC_KILARA: if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_ELANDRA, ALLIANCE); + creature->UpdateEntry(NPC_ELANDRA, ALLIANCE); break; case NPC_KORALEN: if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_KORLAEN, ALLIANCE); + creature->UpdateEntry(NPC_KORLAEN, ALLIANCE); break; case NPC_CHAMPION_1_HORDE: if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_CHAMPION_1_ALLIANCE, ALLIANCE); + creature->UpdateEntry(NPC_CHAMPION_1_ALLIANCE, ALLIANCE); break; case NPC_CHAMPION_2_HORDE: if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE); + creature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE); break; case NPC_CHAMPION_3_HORDE: // No 3rd set for Alliance? if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE); + creature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE); break; } } diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 82b7a5d3519..2610a1d0923 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -137,115 +137,115 @@ public: return false; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { - case CREATURE_SLAD_RAN: uiSladRan = pCreature->GetGUID(); break; - case CREATURE_MOORABI: uiMoorabi = pCreature->GetGUID(); break; - case CREATURE_GALDARAH: uiGalDarah = pCreature->GetGUID(); break; - case CREATURE_DRAKKARICOLOSSUS: uiDrakkariColossus = pCreature->GetGUID(); break; - case CREATURE_ECK: uiEckTheFerocious = pCreature->GetGUID(); break; + case CREATURE_SLAD_RAN: uiSladRan = creature->GetGUID(); break; + case CREATURE_MOORABI: uiMoorabi = creature->GetGUID(); break; + case CREATURE_GALDARAH: uiGalDarah = creature->GetGUID(); break; + case CREATURE_DRAKKARICOLOSSUS: uiDrakkariColossus = creature->GetGUID(); break; + case CREATURE_ECK: uiEckTheFerocious = creature->GetGUID(); break; case CREATURE_RUIN_DWELLER: - if (pCreature->isAlive()) - DwellerGUIDs.insert(pCreature->GetGUID()); + if (creature->isAlive()) + DwellerGUIDs.insert(creature->GetGUID()); break; } } - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGo->GetEntry()) + switch(go->GetEntry()) { case 192518: - uiSladRanAltar = pGo->GetGUID(); + uiSladRanAltar = go->GetGUID(); // Make sure that they start out as unusuable - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiSladRanStatueState == GO_STATE_ACTIVE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); else { ++phase; - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); } } break; case 192519: - uiMoorabiAltar = pGo->GetGUID(); + uiMoorabiAltar = go->GetGUID(); // Make sure that they start out as unusuable - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiMoorabiStatueState == GO_STATE_ACTIVE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); else { ++phase; - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); } } break; case 192520: - uiDrakkariColossusAltar = pGo->GetGUID(); + uiDrakkariColossusAltar = go->GetGUID(); // Make sure that they start out as unusuable - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiDrakkariColossusStatueState == GO_STATE_ACTIVE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); else { ++phase; - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); } } break; case 192564: - uiSladRanStatue = pGo->GetGUID(); - pGo->SetGoState(uiSladRanStatueState); + uiSladRanStatue = go->GetGUID(); + go->SetGoState(uiSladRanStatueState); break; case 192565: - uiMoorabiStatue = pGo->GetGUID(); - pGo->SetGoState(uiMoorabiStatueState); + uiMoorabiStatue = go->GetGUID(); + go->SetGoState(uiMoorabiStatueState); break; case 192566: - uiGalDarahStatue = pGo->GetGUID(); - pGo->SetGoState(uiGalDarahStatueState); + uiGalDarahStatue = go->GetGUID(); + go->SetGoState(uiGalDarahStatueState); break; case 192567: - uiDrakkariColossusStatue = pGo->GetGUID(); - pGo->SetGoState(uiDrakkariColossusStatueState); + uiDrakkariColossusStatue = go->GetGUID(); + go->SetGoState(uiDrakkariColossusStatueState); break; case 192632: - uiEckTheFerociousDoor = pGo->GetGUID(); + uiEckTheFerociousDoor = go->GetGUID(); if (bHeroicMode && m_auiEncounter[1] == DONE) - HandleGameObject(NULL,true,pGo); + HandleGameObject(NULL,true,go); break; case 192569: - uiEckTheFerociousDoorBehind = pGo->GetGUID(); + uiEckTheFerociousDoorBehind = go->GetGUID(); if (bHeroicMode && m_auiEncounter[4] == DONE) - HandleGameObject(NULL,true,pGo); + HandleGameObject(NULL,true,go); case 193208: - uiGalDarahDoor1 = pGo->GetGUID(); + uiGalDarahDoor1 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(NULL,true,pGo); + HandleGameObject(NULL,true,go); break; case 193209: - uiGalDarahDoor2 = pGo->GetGUID(); + uiGalDarahDoor2 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(NULL,true,pGo); + HandleGameObject(NULL,true,go); break; case 193188: - uiBridge = pGo->GetGUID(); - pGo->SetGoState(uiBridgeState); + uiBridge = go->GetGUID(); + go->SetGoState(uiBridgeState); break; case 192633: - uiCollision = pGo->GetGUID(); - pGo->SetGoState(uiCollisionState); + uiCollision = go->GetGUID(); + go->SetGoState(uiCollisionState); - // Can't spawn here with SpawnGameObject because pGo isn't added to world yet... + // Can't spawn here with SpawnGameObject because go isn't added to world yet... if (uiCollisionState == GO_STATE_ACTIVE_ALTERNATIVE) spawnSupport = true; break; @@ -260,18 +260,18 @@ public: m_auiEncounter[0] = data; if (data == DONE) { - GameObject* pGo = instance->GetGameObject(uiSladRanAltar); - if (pGo) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + GameObject* go = instance->GetGameObject(uiSladRanAltar); + if (go) + go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); } break; case DATA_MOORABI_EVENT: m_auiEncounter[1] = data; if (data == DONE) { - GameObject* pGo = instance->GetGameObject(uiMoorabiAltar); - if (pGo) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + GameObject* go = instance->GetGameObject(uiMoorabiAltar); + if (go) + go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); if (bHeroicMode) HandleGameObject(uiEckTheFerociousDoor,true); } @@ -280,9 +280,9 @@ public: m_auiEncounter[2] = data; if (data == DONE) { - GameObject* pGo = instance->GetGameObject(uiDrakkariColossusAltar); - if (pGo) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + GameObject* go = instance->GetGameObject(uiDrakkariColossusAltar); + if (go) + go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); } break; case DATA_GAL_DARAH_EVENT: @@ -506,7 +506,7 @@ class go_gundrak_altar : public GameObjectScript public: go_gundrak_altar() : GameObjectScript("go_gundrak_altar") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player * /*pPlayer*/, GameObject* pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); uint64 uiStatue = 0; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index a0ad03265d9..bacb7761223 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -84,11 +84,8 @@ class instance_icecrown_citadel : public InstanceMapScript teamInInstance = player->GetTeam(); } - void OnCreatureCreate(Creature* creature, bool add) + void OnCreatureCreate(Creature* creature) { - if (!add) - return; - if (!teamInInstance) { Map::PlayerList const &players = instance->GetPlayers(); @@ -178,7 +175,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go, bool add) + void OnGameObjectCreate(GameObject* go) { switch (go->GetEntry()) { @@ -199,7 +196,7 @@ class instance_icecrown_citadel : public InstanceMapScript case GO_SINDRAGOSA_ENTRANCE_DOOR: case GO_SINDRAGOSA_SHORTCUT_ENTRANCE_DOOR: case GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR: - AddDoor(go, add); + AddDoor(go, true); break; case GO_LADY_DEATHWHISPER_ELEVATOR: ladyDeathwisperElevator = go->GetGUID(); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 6d770294c7b..09c8229c277 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -144,60 +144,73 @@ public: time_t minHorsemenDiedTime; time_t maxHorsemenDiedTime; - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { - case 15989: SapphironGUID = add ? pCreature->GetGUID() : 0; return; - case 15953: uiFaerlina = pCreature->GetGUID(); return; - case 16064: uiThane = pCreature->GetGUID(); return; - case 16065: uiLady = pCreature->GetGUID(); return; - case 30549: uiBaron = pCreature->GetGUID(); return; - case 16063: uiSir = pCreature->GetGUID(); return; - case 15928: uiThaddius = pCreature->GetGUID(); return; - case 15930: uiFeugen = pCreature->GetGUID(); return; - case 15929: uiStalagg = pCreature->GetGUID(); return; - case 15990: uiKelthuzad = pCreature->GetGUID(); return; + case 15989: SapphironGUID = creature->GetGUID(); return; + case 15953: uiFaerlina = creature->GetGUID(); return; + case 16064: uiThane = creature->GetGUID(); return; + case 16065: uiLady = creature->GetGUID(); return; + case 30549: uiBaron = creature->GetGUID(); return; + case 16063: uiSir = creature->GetGUID(); return; + case 15928: uiThaddius = creature->GetGUID(); return; + case 15930: uiFeugen = creature->GetGUID(); return; + case 15929: uiStalagg = creature->GetGUID(); return; + case 15990: uiKelthuzad = creature->GetGUID(); return; } - AddMinion(pCreature, add); + AddMinion(creature, true); } - void OnGameObjectCreate(GameObject* pGo, bool add) + void OnGameObjectCreate(GameObject* go) { - if (pGo->GetGOInfo()->displayId == 6785 || pGo->GetGOInfo()->displayId == 1287) + if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) { - uint32 section = GetEruptionSection(pGo->GetPositionX(), pGo->GetPositionY()); - if (add) - HeiganEruptionGUID[section].insert(pGo->GetGUID()); - else - HeiganEruptionGUID[section].erase(pGo->GetGUID()); + uint32 section = GetEruptionSection(go->GetPositionX(), go->GetPositionY()); + HeiganEruptionGUID[section].insert(go->GetGUID()); + return; } - switch(pGo->GetEntry()) + switch(go->GetEntry()) + { + case GO_GOTHIK_GATE: + GothikGateGUID = go->GetGUID(); + go->SetGoState(gothikDoorState); + break; + case GO_HORSEMEN_CHEST: HorsemenChestGUID = go->GetGUID(); break; + case GO_HORSEMEN_CHEST_HERO: HorsemenChestGUID = go->GetGUID(); break; + case GO_KELTHUZAD_PORTAL01: uiPortals[0] = go->GetGUID(); break; + case GO_KELTHUZAD_PORTAL02: uiPortals[1] = go->GetGUID(); break; + case GO_KELTHUZAD_PORTAL03: uiPortals[2] = go->GetGUID(); break; + case GO_KELTHUZAD_PORTAL04: uiPortals[3] = go->GetGUID(); break; + case GO_KELTHUZAD_TRIGGER: uiKelthuzadTrigger = go->GetGUID(); break; + } + + AddDoor(go, true); + } + + void OnGameObjectRemove(GameObject* go) + { + if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) + { + uint32 section = GetEruptionSection(go->GetPositionX(), go->GetPositionY()); + + HeiganEruptionGUID[section].erase(go->GetGUID()); + return; + } + + switch(go->GetEntry()) { case GO_BIRTH: - if (!add && SapphironGUID) + if (SapphironGUID) { - if (Creature *pSapphiron = instance->GetCreature(SapphironGUID)) + if (Creature* pSapphiron = instance->GetCreature(SapphironGUID)) pSapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH); return; } - case GO_GOTHIK_GATE: - GothikGateGUID = add ? pGo->GetGUID() : 0; - pGo->SetGoState(gothikDoorState); - break; - case GO_HORSEMEN_CHEST: HorsemenChestGUID = add ? pGo->GetGUID() : 0; break; - case GO_HORSEMEN_CHEST_HERO: HorsemenChestGUID = add ? pGo->GetGUID() : 0; break; - case GO_KELTHUZAD_PORTAL01: uiPortals[0] = pGo->GetGUID(); break; - case GO_KELTHUZAD_PORTAL02: uiPortals[1] = pGo->GetGUID(); break; - case GO_KELTHUZAD_PORTAL03: uiPortals[2] = pGo->GetGUID(); break; - case GO_KELTHUZAD_PORTAL04: uiPortals[3] = pGo->GetGUID(); break; - case GO_KELTHUZAD_TRIGGER: uiKelthuzadTrigger = pGo->GetGUID(); break; } - - AddDoor(pGo, add); } void SetData(uint32 id, uint32 value) @@ -208,8 +221,8 @@ public: HeiganErupt(value); break; case DATA_GOTHIK_GATE: - if (GameObject *pGothikGate = instance->GetGameObject(GothikGateGUID)) - pGothikGate->SetGoState(GOState(value)); + if (GameObject* gothikGate = instance->GetGameObject(GothikGateGUID)) + gothikGate->SetGoState(GOState(value)); gothikDoorState = GOState(value); break; @@ -278,7 +291,7 @@ public: if (id == BOSS_HORSEMEN && state == DONE) { - if (GameObject *pHorsemenChest = instance->GetGameObject(HorsemenChestGUID)) + if (GameObject* pHorsemenChest = instance->GetGameObject(HorsemenChestGUID)) pHorsemenChest->SetRespawnTime(pHorsemenChest->GetRespawnDelay()); } @@ -294,7 +307,7 @@ public: for (std::set<uint64>::const_iterator itr = HeiganEruptionGUID[i].begin(); itr != HeiganEruptionGUID[i].end(); ++itr) { - if (GameObject *pHeiganEruption = instance->GetGameObject(*itr)) + if (GameObject* pHeiganEruption = instance->GetGameObject(*itr)) { pHeiganEruption->SendCustomAnim(); pHeiganEruption->CastSpell(NULL, SPELL_ERUPTION); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 02970f242df..840e61e18d1 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -59,7 +59,7 @@ public: Keristrasza = 0; } - void OnCreatureCreate(Creature *pCreature, bool /*bAdd*/) + void OnCreatureCreate(Creature* creature) { Map::PlayerList const &players = instance->GetPlayers(); uint32 TeamInInstance = 0; @@ -69,81 +69,81 @@ public: if (Player* pPlayer = players.begin()->getSource()) TeamInInstance = pPlayer->GetTeam(); } - switch (pCreature->GetEntry()) + switch (creature->GetEntry()) { case 26763: - Anomalus = pCreature->GetGUID(); + Anomalus = creature->GetGUID(); break; case 26723: - Keristrasza = pCreature->GetGUID(); + Keristrasza = creature->GetGUID(); break; // Alliance npcs are spawned by default, if you are alliance, you will fight against horde npcs. case 26800: { if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + creature->setFaction(FACTION_HOSTILE_FOR_ALL); if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(26799, HORDE); + creature->UpdateEntry(26799, HORDE); break; } case 26802: { if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + creature->setFaction(FACTION_HOSTILE_FOR_ALL); if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(26801, HORDE); + creature->UpdateEntry(26801, HORDE); break; } case 26805: { if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + creature->setFaction(FACTION_HOSTILE_FOR_ALL); if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(26803, HORDE); + creature->UpdateEntry(26803, HORDE); break; } case 27949: { if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + creature->setFaction(FACTION_HOSTILE_FOR_ALL); if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(27947, HORDE); + creature->UpdateEntry(27947, HORDE); break; } case 26796: { if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + creature->setFaction(FACTION_HOSTILE_FOR_ALL); if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(26798, HORDE); + creature->UpdateEntry(26798, HORDE); break; } } } - void OnGameObjectCreate(GameObject *pGo, bool /*bAdd*/) + void OnGameObjectCreate(GameObject* go) { - switch (pGo->GetEntry()) + switch (go->GetEntry()) { case 188527: { - AnomalusContainmentSphere = pGo->GetGUID(); + AnomalusContainmentSphere = go->GetGUID(); if (m_auiEncounter[1] == DONE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; } case 188528: { - OrmoroksContainmentSphere = pGo->GetGUID(); + OrmoroksContainmentSphere = go->GetGUID(); if (m_auiEncounter[2] == DONE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; } case 188526: { - TelestrasContainmentSphere = pGo->GetGUID(); + TelestrasContainmentSphere = go->GetGUID(); if (m_auiEncounter[0] == DONE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; } } @@ -169,7 +169,7 @@ public: { if (data == DONE) { - GameObject *Sphere = instance->GetGameObject(TelestrasContainmentSphere); + GameObject* Sphere = instance->GetGameObject(TelestrasContainmentSphere); if (Sphere) Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } @@ -180,7 +180,7 @@ public: { if (data == DONE) { - if (GameObject *Sphere = instance->GetGameObject(AnomalusContainmentSphere)) + if (GameObject* Sphere = instance->GetGameObject(AnomalusContainmentSphere)) Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } m_auiEncounter[1] = data; @@ -190,7 +190,7 @@ public: { if (data == DONE) { - if (GameObject *Sphere = instance->GetGameObject(OrmoroksContainmentSphere)) + if (GameObject* Sphere = instance->GetGameObject(OrmoroksContainmentSphere)) Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } m_auiEncounter[2] = data; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index ae736181566..ebdff747de0 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -57,35 +57,35 @@ public: uiPlataformUrom = 0; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case CREATURE_DRAKOS: - uiDrakos = pCreature->GetGUID(); + uiDrakos = creature->GetGUID(); break; case CREATURE_VAROS: - uiVaros = pCreature->GetGUID(); + uiVaros = creature->GetGUID(); break; case CREATURE_UROM: - uiUrom = pCreature->GetGUID(); + uiUrom = creature->GetGUID(); break; case CREATURE_EREGOS: - uiEregos = pCreature->GetGUID(); + uiEregos = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGO, bool /*bAdd*/) + void OnGameObjectCreate(GameObject* go) { - if (pGO->GetEntry() == GO_DRAGON_CAGE_DOOR) + if (go->GetEntry() == GO_DRAGON_CAGE_DOOR) { if (GetData(DATA_DRAKOS_EVENT) == DONE) - pGO->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); else - pGO->SetGoState(GO_STATE_READY); + go->SetGoState(GO_STATE_READY); - GameObjectList.push_back(pGO->GetGUID()); + GameObjectList.push_back(go->GetGUID()); } } @@ -150,8 +150,8 @@ public: for (std::list<uint64>::const_iterator itr = GameObjectList.begin(); itr != GameObjectList.end(); ++itr) { - if (GameObject* pGO = instance->GetGameObject(*itr)) - pGO->SetGoState(GO_STATE_ACTIVE); + if (GameObject* go = instance->GetGameObject(*itr)) + go->SetGoState(GO_STATE_ACTIVE); } } diff --git a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp index 0ec9e42ebc3..a8eb91f8c8d 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -62,26 +62,26 @@ public: m_bVesperonKilled = false; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case NPC_SARTHARION: - m_uiSartharionGUID = pCreature->GetGUID(); + m_uiSartharionGUID = creature->GetGUID(); break; //three dragons below set to active state once created. //we must expect bigger raid to encounter main boss, and then three dragons must be active due to grid differences case NPC_TENEBRON: - m_uiTenebronGUID = pCreature->GetGUID(); - pCreature->setActive(true); + m_uiTenebronGUID = creature->GetGUID(); + creature->setActive(true); break; case NPC_SHADRON: - m_uiShadronGUID = pCreature->GetGUID(); - pCreature->setActive(true); + m_uiShadronGUID = creature->GetGUID(); + creature->setActive(true); break; case NPC_VESPERON: - m_uiVesperonGUID = pCreature->GetGUID(); - pCreature->setActive(true); + m_uiVesperonGUID = creature->GetGUID(); + creature->setActive(true); break; } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 546409fd406..db83deca383 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -76,59 +76,59 @@ public: m_uiLokenGlobeGUID = 0; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case NPC_BJARNGRIM: - m_uiGeneralBjarngrimGUID = pCreature->GetGUID(); + m_uiGeneralBjarngrimGUID = creature->GetGUID(); break; case NPC_VOLKHAN: - m_uiVolkhanGUID = pCreature->GetGUID(); + m_uiVolkhanGUID = creature->GetGUID(); break; case NPC_IONAR: - m_uiIonarGUID = pCreature->GetGUID(); + m_uiIonarGUID = creature->GetGUID(); break; case NPC_LOKEN: - m_uiLokenGUID = pCreature->GetGUID(); + m_uiLokenGUID = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGo->GetEntry()) + switch(go->GetEntry()) { case GO_BJARNGRIM_DOOR: - m_uiBjarngrimDoorGUID = pGo->GetGUID(); + m_uiBjarngrimDoorGUID = go->GetGUID(); if (m_auiEncounter[0] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); else - pGo->SetGoState(GO_STATE_READY); + go->SetGoState(GO_STATE_READY); break; case GO_VOLKHAN_DOOR: - m_uiVolkhanDoorGUID = pGo->GetGUID(); + m_uiVolkhanDoorGUID = go->GetGUID(); if (m_auiEncounter[1] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); else - pGo->SetGoState(GO_STATE_READY); + go->SetGoState(GO_STATE_READY); break; case GO_IONAR_DOOR: - m_uiIonarDoorGUID = pGo->GetGUID(); + m_uiIonarDoorGUID = go->GetGUID(); if (m_auiEncounter[2] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); else - pGo->SetGoState(GO_STATE_READY); + go->SetGoState(GO_STATE_READY); break; case GO_LOKEN_DOOR: - m_uiLokenDoorGUID = pGo->GetGUID(); + m_uiLokenDoorGUID = go->GetGUID(); if (m_auiEncounter[3] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); else - pGo->SetGoState(GO_STATE_READY); + go->SetGoState(GO_STATE_READY); break; case GO_LOKEN_THRONE: - m_uiLokenGlobeGUID = pGo->GetGUID(); + m_uiLokenGlobeGUID = go->GetGUID(); break; } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index c7e1f627414..55d4199b6d5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -89,65 +89,65 @@ public: m_auiEncounter[i] = NOT_STARTED; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { - case CREATURE_MAIDEN: uiMaidenOfGrief = pCreature->GetGUID(); break; - case CREATURE_KRYSTALLUS: uiKrystallus = pCreature->GetGUID(); break; - case CREATURE_SJONNIR: uiSjonnir = pCreature->GetGUID(); break; - case CREATURE_MARNAK: uiMarnak = pCreature->GetGUID(); break; - case CREATURE_KADDRAK: uiKaddrak = pCreature->GetGUID(); break; - case CREATURE_ABEDNEUM: uiAbedneum = pCreature->GetGUID(); break; - case CREATURE_BRANN: uiBrann = pCreature->GetGUID(); break; + case CREATURE_MAIDEN: uiMaidenOfGrief = creature->GetGUID(); break; + case CREATURE_KRYSTALLUS: uiKrystallus = creature->GetGUID(); break; + case CREATURE_SJONNIR: uiSjonnir = creature->GetGUID(); break; + case CREATURE_MARNAK: uiMarnak = creature->GetGUID(); break; + case CREATURE_KADDRAK: uiKaddrak = creature->GetGUID(); break; + case CREATURE_ABEDNEUM: uiAbedneum = creature->GetGUID(); break; + case CREATURE_BRANN: uiBrann = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGo->GetEntry()) + switch(go->GetEntry()) { case GO_ABEDNEUM: - uiAbedneumGo = pGo->GetGUID(); + uiAbedneumGo = go->GetGUID(); break; case GO_MARNAK: - uiMarnakGo = pGo->GetGUID(); + uiMarnakGo = go->GetGUID(); break; case GO_KADDRAK: - uiKaddrakGo = pGo->GetGUID(); + uiKaddrakGo = go->GetGUID(); break; case GO_MAIDEN_DOOR: - uiMaidenOfGriefDoor = pGo->GetGUID(); + uiMaidenOfGriefDoor = go->GetGUID(); if (m_auiEncounter[0] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); else - pGo->SetGoState(GO_STATE_READY); + go->SetGoState(GO_STATE_READY); break; case GO_BRANN_DOOR: - uiBrannDoor = pGo->GetGUID(); + uiBrannDoor = go->GetGUID(); if (m_auiEncounter[1] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); else - pGo->SetGoState(GO_STATE_READY); + go->SetGoState(GO_STATE_READY); break; case GO_SJONNIR_DOOR: - uiSjonnirDoor = pGo->GetGUID(); + uiSjonnirDoor = go->GetGUID(); if (m_auiEncounter[2] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); + go->SetGoState(GO_STATE_ACTIVE); else - pGo->SetGoState(GO_STATE_READY); + go->SetGoState(GO_STATE_READY); break; case GO_TRIBUNAL_CONSOLE: - uiTribunalConsole = pGo->GetGUID(); + uiTribunalConsole = go->GetGUID(); break; case GO_TRIBUNAL_CHEST: case GO_TRIBUNAL_CHEST_HERO: - uiTribunalChest = pGo->GetGUID(); + uiTribunalChest = go->GetGUID(); if (m_auiEncounter[2] == DONE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); break; case 191527: - uiTribunalSkyFloor = pGo->GetGUID(); + uiTribunalSkyFloor = go->GetGUID(); break; } } @@ -174,9 +174,9 @@ public: if (m_auiEncounter[2] == DONE) { HandleGameObject(uiSjonnirDoor,true); - GameObject *pGo = instance->GetGameObject(uiTribunalChest); - if (pGo) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + GameObject* go = instance->GetGameObject(uiTribunalChest); + if (go) + go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); } break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index 21e23a9c9e4..86eb822ada4 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -112,103 +112,103 @@ public: return false; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case NPC_LEVIATHAN: - uiLeviathanGUID = pCreature->GetGUID(); + uiLeviathanGUID = creature->GetGUID(); break; case NPC_IGNIS: - uiIgnisGUID = pCreature->GetGUID(); + uiIgnisGUID = creature->GetGUID(); break; case NPC_RAZORSCALE: - uiRazorscaleGUID = pCreature->GetGUID(); + uiRazorscaleGUID = creature->GetGUID(); break; case NPC_EXPEDITION_COMMANDER: - uiExpCommanderGUID = pCreature->GetGUID(); + uiExpCommanderGUID = creature->GetGUID(); return; case NPC_XT002: - uiXT002GUID = pCreature->GetGUID(); + uiXT002GUID = creature->GetGUID(); break; // Assembly of Iron case NPC_STEELBREAKER: - uiAssemblyGUIDs[0] = pCreature->GetGUID(); + uiAssemblyGUIDs[0] = creature->GetGUID(); break; case NPC_MOLGEIM: - uiAssemblyGUIDs[1] = pCreature->GetGUID(); + uiAssemblyGUIDs[1] = creature->GetGUID(); break; case NPC_BRUNDIR: - uiAssemblyGUIDs[2] = pCreature->GetGUID(); + uiAssemblyGUIDs[2] = creature->GetGUID(); break; case NPC_KOLOGARN: - uiKologarnGUID = pCreature->GetGUID(); + uiKologarnGUID = creature->GetGUID(); break; case NPC_AURIAYA: - uiAuriayaGUID = pCreature->GetGUID(); + uiAuriayaGUID = creature->GetGUID(); break; case NPC_MIMIRON: - uiMimironGUID = pCreature->GetGUID(); + uiMimironGUID = creature->GetGUID(); break; case NPC_HODIR: - uiHodirGUID = pCreature->GetGUID(); + uiHodirGUID = creature->GetGUID(); break; case NPC_THORIM: - uiThorimGUID = pCreature->GetGUID(); + uiThorimGUID = creature->GetGUID(); break; case NPC_FREYA: - uiFreyaGUID = pCreature->GetGUID(); + uiFreyaGUID = creature->GetGUID(); break; case NPC_VEZAX: - uiVezaxGUID = pCreature->GetGUID(); + uiVezaxGUID = creature->GetGUID(); break; case NPC_YOGGSARON: - uiYoggSaronGUID = pCreature->GetGUID(); + uiYoggSaronGUID = creature->GetGUID(); break; case NPC_ALGALON: - uiAlgalonGUID = pCreature->GetGUID(); + uiAlgalonGUID = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGO, bool add) + void OnGameObjectCreate(GameObject* go) { - switch(pGO->GetEntry()) + switch(go->GetEntry()) { case GO_KOLOGARN_CHEST_HERO: case GO_KOLOGARN_CHEST: - uiKologarnChestGUID = add ? pGO->GetGUID() : NULL; + uiKologarnChestGUID = go->GetGUID(); break; case GO_THORIM_CHEST_HERO: case GO_THORIM_CHEST: - uiThorimChestGUID = add ? pGO->GetGUID() : NULL; + uiThorimChestGUID =go->GetGUID(); break; case GO_HODIR_CHEST_HERO: case GO_HODIR_CHEST: - uiHodirChestGUID = add ? pGO->GetGUID() : NULL; + uiHodirChestGUID = go->GetGUID(); break; case GO_FREYA_CHEST_HERO: case GO_FREYA_CHEST: - uiFreyaChestGUID = add ? pGO->GetGUID() : NULL; + uiFreyaChestGUID = go->GetGUID(); break; case GO_LEVIATHAN_DOOR: - uiLeviathanDoor[flag] = pGO->GetGUID(); - HandleGameObject(NULL, true, pGO); + uiLeviathanDoor[flag] = go->GetGUID(); + HandleGameObject(NULL, true, go); flag++; if (flag == 7) flag =0; break; case GO_LEVIATHAN_GATE: - uiLeviathanGateGUID = add ? pGO->GetGUID() : NULL; - HandleGameObject(NULL, false, pGO); + uiLeviathanGateGUID = go->GetGUID(); + HandleGameObject(NULL, false, go); break; } } - void ProcessEvent(GameObject* /*pGO*/, uint32 uiEventId) + void ProcessEvent(GameObject* /*go*/, uint32 uiEventId) { // Flame Leviathan's Tower Event triggers Creature* pFlameLeviathan = instance->GetCreature(uiLeviathanGUID); @@ -261,23 +261,23 @@ public: break; case TYPE_KOLOGARN: if (state == DONE) - if (GameObject* pGO = instance->GetGameObject(uiKologarnChestGUID)) - pGO->SetRespawnTime(pGO->GetRespawnDelay()); + if (GameObject* go = instance->GetGameObject(uiKologarnChestGUID)) + go->SetRespawnTime(go->GetRespawnDelay()); break; case TYPE_HODIR: if (state == DONE) - if (GameObject* pGO = instance->GetGameObject(uiHodirChestGUID)) - pGO->SetRespawnTime(pGO->GetRespawnDelay()); + if (GameObject* go = instance->GetGameObject(uiHodirChestGUID)) + go->SetRespawnTime(go->GetRespawnDelay()); break; case TYPE_THORIM: if (state == DONE) - if (GameObject* pGO = instance->GetGameObject(uiThorimChestGUID)) - pGO->SetRespawnTime(pGO->GetRespawnDelay()); + if (GameObject* go = instance->GetGameObject(uiThorimChestGUID)) + go->SetRespawnTime(go->GetRespawnDelay()); break; case TYPE_FREYA: if (state == DONE) - if (GameObject* pGO = instance->GetGameObject(uiFreyaChestGUID)) - pGO->SetRespawnTime(pGO->GetRespawnDelay()); + if (GameObject* go = instance->GetGameObject(uiFreyaChestGUID)) + go->SetRespawnTime(go->GetRespawnDelay()); break; } 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 eed33507839..c8ae6ecfabd 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -122,44 +122,44 @@ public: return NULL; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { - case 23953: Keleseth = pCreature->GetGUID(); break; - case 24201: Dalronn = pCreature->GetGUID(); break; - case 24200: Skarvald = pCreature->GetGUID(); break; - case 23954: Ingvar = pCreature->GetGUID(); break; + case 23953: Keleseth = creature->GetGUID(); break; + case 24201: Dalronn = creature->GetGUID(); break; + case 24200: Skarvald = creature->GetGUID(); break; + case 23954: Ingvar = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGo->GetEntry()) + switch(go->GetEntry()) { //door and object id - case ENTRY_BELLOW_1: forge_bellow[0] = pGo->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_BELLOW_2: forge_bellow[1] = pGo->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_BELLOW_3: forge_bellow[2] = pGo->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_FORGEFIRE_1: forge_fire[0] = pGo->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_FORGEFIRE_2: forge_fire[1] = pGo->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_FORGEFIRE_3: forge_fire[2] = pGo->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = pGo->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = pGo->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = pGo->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GIANT_PORTCULLIS_1: portcullis[0] = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GIANT_PORTCULLIS_2: portcullis[1] = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,pGo);break; + case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); + if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + case ENTRY_BELLOW_2: forge_bellow[1] = go->GetGUID(); + if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + case ENTRY_BELLOW_3: forge_bellow[2] = go->GetGUID(); + if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + case ENTRY_FORGEFIRE_1: forge_fire[0] = go->GetGUID(); + if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + case ENTRY_FORGEFIRE_2: forge_fire[1] = go->GetGUID(); + if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + case ENTRY_FORGEFIRE_3: forge_fire[2] = go->GetGUID(); + if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = go->GetGUID(); + if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = go->GetGUID(); + if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = go->GetGUID(); + if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + case ENTRY_GIANT_PORTCULLIS_1: portcullis[0] = go->GetGUID(); + if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,go);break; + case ENTRY_GIANT_PORTCULLIS_2: portcullis[1] = go->GetGUID(); + if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,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 c5ad6e7b7bf..65b93fa2b43 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -102,41 +102,41 @@ public: return false; } - void OnCreatureCreate(Creature* pCreature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { - case BOSS_SVALA_SORROWGRAVE: uiSvalaSorrowgrave = pCreature->GetGUID(); break; - case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = pCreature->GetGUID(); break; - case BOSS_SKADI_RUTHLESS: uiSkadiTheRuthless = pCreature->GetGUID(); break; - case BOSS_KING_YMIRON: uiKingYmiron = pCreature->GetGUID(); break; - case MOB_FRENZIED_WORGEN: uiFrenziedWorgen = pCreature->GetGUID(); break; - case MOB_RAVENOUS_FURBOLG: uiRavenousFurbolg = pCreature->GetGUID(); break; - case MOB_MASSIVE_JORMUNGAR: uiMassiveJormungar = pCreature->GetGUID(); break; - case MOB_FEROCIOUS_RHINO: uiFerociousRhino = pCreature->GetGUID(); break; - case MOB_SVALA: uiSvala = pCreature->GetGUID(); break; - case MOB_PALEHOOF_ORB: uiPalehoofOrb = pCreature->GetGUID(); break; + case BOSS_SVALA_SORROWGRAVE: uiSvalaSorrowgrave = creature->GetGUID(); break; + case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = creature->GetGUID(); break; + case BOSS_SKADI_RUTHLESS: uiSkadiTheRuthless = creature->GetGUID(); break; + case BOSS_KING_YMIRON: uiKingYmiron = creature->GetGUID(); break; + case MOB_FRENZIED_WORGEN: uiFrenziedWorgen = creature->GetGUID(); break; + case MOB_RAVENOUS_FURBOLG: uiRavenousFurbolg = creature->GetGUID(); break; + case MOB_MASSIVE_JORMUNGAR: uiMassiveJormungar = creature->GetGUID(); break; + case MOB_FEROCIOUS_RHINO: uiFerociousRhino = creature->GetGUID(); break; + case MOB_SVALA: uiSvala = creature->GetGUID(); break; + case MOB_PALEHOOF_ORB: uiPalehoofOrb = creature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGo->GetEntry()) + switch(go->GetEntry()) { case ENTRY_SKADI_THE_RUTHLESS_DOOR: - uiSkadiTheRuthlessDoor = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE) HandleGameObject(NULL, true, pGo); + uiSkadiTheRuthlessDoor = go->GetGUID(); + if (m_auiEncounter[2] == DONE) HandleGameObject(NULL, true, go); break; case ENTRY_KING_YMIRON_DOOR: - uiKingYmironDoor = pGo->GetGUID(); - if (m_auiEncounter[3] == DONE) HandleGameObject(NULL, true, pGo); + uiKingYmironDoor = go->GetGUID(); + if (m_auiEncounter[3] == DONE) HandleGameObject(NULL, true, go); break; case ENTRY_GORK_PALEHOOF_SPHERE: - uiGortokPalehoofSphere = pGo->GetGUID(); + uiGortokPalehoofSphere = go->GetGUID(); if (m_auiEncounter[1] == DONE) { - HandleGameObject(NULL, true, pGo); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + HandleGameObject(NULL, true, go); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index 7ad0df957d3..8f672f586a8 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -68,7 +68,7 @@ public: return false; } - void OnCreatureCreate(Creature *creature, bool /*add*/) + void OnCreatureCreate(Creature* creature) { switch(creature->GetEntry()) { diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index c32bbfaa0d1..ec22b8125e6 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -227,85 +227,85 @@ public: return false; } - void OnCreatureCreate(Creature* pCreature, bool add) + void OnCreatureCreate(Creature* creature) { - switch(pCreature->GetEntry()) + switch(creature->GetEntry()) { case CREATURE_XEVOZZ: - uiXevozz = pCreature->GetGUID(); + uiXevozz = creature->GetGUID(); break; case CREATURE_LAVANTHOR: - uiLavanthor = pCreature->GetGUID(); + uiLavanthor = creature->GetGUID(); break; case CREATURE_ICHORON: - uiIchoron = pCreature->GetGUID(); + uiIchoron = creature->GetGUID(); break; case CREATURE_ZURAMAT: - uiZuramat = pCreature->GetGUID(); + uiZuramat = creature->GetGUID(); break; case CREATURE_EREKEM: - uiErekem = pCreature->GetGUID(); + uiErekem = creature->GetGUID(); break; case CREATURE_EREKEM_GUARD: if (uiCountErekemGuards < 2) { - uiErekemGuard[uiCountErekemGuards++] = pCreature->GetGUID(); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); + uiErekemGuard[uiCountErekemGuards++] = creature->GetGUID(); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); } break; case CREATURE_MORAGG: - uiMoragg = pCreature->GetGUID(); + uiMoragg = creature->GetGUID(); break; case CREATURE_CYANIGOSA: - uiCyanigosa = pCreature->GetGUID(); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); + uiCyanigosa = creature->GetGUID(); + creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); break; case CREATURE_SINCLARI: - uiSinclari = pCreature->GetGUID(); + uiSinclari = creature->GetGUID(); break; } - if (add && (pCreature->GetGUID() == uiFirstBoss || pCreature->GetGUID() == uiSecondBoss)) + if (creature->GetGUID() == uiFirstBoss || creature->GetGUID() == uiSecondBoss) { - pCreature->AllLootRemovedFromCorpse(); - pCreature->RemoveLootMode(1); + creature->AllLootRemovedFromCorpse(); + creature->RemoveLootMode(1); } } - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + void OnGameObjectCreate(GameObject* go) { - switch(pGo->GetEntry()) + switch(go->GetEntry()) { case GO_EREKEM_GUARD_1_DOOR: - uiErekemLeftGuardCell = pGo->GetGUID(); + uiErekemLeftGuardCell = go->GetGUID(); break; case GO_EREKEM_GUARD_2_DOOR: - uiErekemRightGuardCell = pGo->GetGUID(); + uiErekemRightGuardCell = go->GetGUID(); break; case GO_EREKEM_DOOR: - uiErekemCell = pGo->GetGUID(); + uiErekemCell = go->GetGUID(); break; case GO_ZURAMAT_DOOR: - uiZuramatCell = pGo->GetGUID(); + uiZuramatCell = go->GetGUID(); break; case GO_LAVANTHOR_DOOR: - uiLavanthorCell = pGo->GetGUID(); + uiLavanthorCell = go->GetGUID(); break; case GO_MORAGG_DOOR: - uiMoraggCell = pGo->GetGUID(); + uiMoraggCell = go->GetGUID(); break; case GO_ICHORON_DOOR: - uiIchoronCell = pGo->GetGUID(); + uiIchoronCell = go->GetGUID(); break; case GO_XEVOZZ_DOOR: - uiXevozzCell = pGo->GetGUID(); + uiXevozzCell = go->GetGUID(); break; case GO_MAIN_DOOR: - uiMainDoor = pGo->GetGUID(); + uiMainDoor = go->GetGUID(); break; case GO_ACTIVATION_CRYSTAL: if (uiCountActivationCrystals < 3) - uiActivationCrystal[uiCountActivationCrystals++] = pGo->GetGUID(); + uiActivationCrystal[uiCountActivationCrystals++] = go->GetGUID(); break; } } @@ -468,8 +468,8 @@ public: void SpawnPortal() { SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1,5))%6); - if (Creature *pSinclari = instance->GetCreature(uiSinclari)) - if(Creature *portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL,PortalLocation[GetData(DATA_PORTAL_LOCATION)],TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pSinclari = instance->GetCreature(uiSinclari)) + if(Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL,PortalLocation[GetData(DATA_PORTAL_LOCATION)],TEMPSUMMON_CORPSE_DESPAWN)) uiTeleportationPortal = portal->GetGUID(); } @@ -569,11 +569,11 @@ public: case 6: if (uiFirstBoss == 0) uiFirstBoss = urand(1,6); - if (Creature *pSinclari = instance->GetCreature(uiSinclari)) + if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { - if(Creature *pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) + if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) uiSaboteurPortal = pPortal->GetGUID(); - if (Creature *pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) + if (Creature* pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false); } break; @@ -583,17 +583,17 @@ public: { uiSecondBoss = urand(1,6); } while (uiSecondBoss == uiFirstBoss); - if (Creature *pSinclari = instance->GetCreature(uiSinclari)) + if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { - if(Creature *pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) + if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) uiSaboteurPortal = pPortal->GetGUID(); - if (Creature *pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) + if (Creature* pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false); } break; case 18: { - Creature *pSinclari = instance->GetCreature(uiSinclari); + Creature* pSinclari = instance->GetCreature(uiSinclari); if (pSinclari) pSinclari->SummonCreature(CREATURE_CYANIGOSA,CyanigosasSpawnLocation,TEMPSUMMON_DEAD_DESPAWN); break; @@ -727,7 +727,7 @@ public: } // Cyanigosa is spawned but not tranformed, prefight event - Creature *pCyanigosa = instance->GetCreature(uiCyanigosa); + Creature* pCyanigosa = instance->GetCreature(uiCyanigosa); if (pCyanigosa && !pCyanigosa->HasAura(CYANIGOSA_SPELL_TRANSFORM)) { if (uiCyanigosaEventTimer <= diff) @@ -788,9 +788,9 @@ public: // TODO: All visual, spells etc for (std::set<uint64>::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr) { - Creature* pCreature = instance->GetCreature(*itr); - if (pCreature && pCreature->isAlive()) - pCreature->CastSpell(pCreature,SPELL_ARCANE_LIGHTNING,true); // Who should cast the spell? + Creature* creature = instance->GetCreature(*itr); + if (creature && creature->isAlive()) + creature->CastSpell(creature,SPELL_ARCANE_LIGHTNING,true); // Who should cast the spell? } } |