josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REPO: Code-style clean-ups

Browse Source 
* Fixed pMap->map
* Fixed pInstance->instance
* Fixed pInsta->instance
* Fixed pQuest->quest
* Fixed pWho->who
* Fixed pTarget->target
* Fixed pGo->go

~DEVNOTES: Handlers/QuestHandler.cpp still needs to be cleaned...
This commit is contained in:
Bootz
2011-10-07 19:45:43 -05:00
parent c89b1f6989
commit 5b4c7783c2
324 changed files with 4886 additions and 4849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+75 -75
View File
@@ -49,19 +49,19 @@ class go_shadowforge_brazier : public GameObjectScript
public:
go_shadowforge_brazier() : GameObjectScript("go_shadowforge_brazier") { }
bool OnGossipHello(Player* /*player*/, GameObject* pGo)
bool OnGossipHello(Player* /*player*/, GameObject* go)
{
if (InstanceScript* pInstance = pGo->GetInstanceScript())
if (InstanceScript* instance = go->GetInstanceScript())
{
if (pInstance->GetData(TYPE_LYCEUM) == IN_PROGRESS)
pInstance->SetData(TYPE_LYCEUM, DONE);
if (instance->GetData(TYPE_LYCEUM) == IN_PROGRESS)
instance->SetData(TYPE_LYCEUM, DONE);
else
pInstance->SetData(TYPE_LYCEUM, IN_PROGRESS);
instance->SetData(TYPE_LYCEUM, IN_PROGRESS);
// If used brazier open linked doors (North or South)
if (pGo->GetGUID() == pInstance->GetData64(DATA_SF_BRAZIER_N))
pInstance->HandleGameObject(pInstance->GetData64(DATA_GOLEM_DOOR_N), true);
else if (pGo->GetGUID() == pInstance->GetData64(DATA_SF_BRAZIER_S))
pInstance->HandleGameObject(pInstance->GetData64(DATA_GOLEM_DOOR_S), true);
if (go->GetGUID() == instance->GetData64(DATA_SF_BRAZIER_N))
instance->HandleGameObject(instance->GetData64(DATA_GOLEM_DOOR_N), true);
else if (go->GetGUID() == instance->GetData64(DATA_SF_BRAZIER_S))
instance->HandleGameObject(instance->GetData64(DATA_GOLEM_DOOR_S), true);
}
return false;
}
@@ -108,12 +108,12 @@ public:
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
{
if (InstanceScript* pInstance = player->GetInstanceScript())
if (InstanceScript* instance = player->GetInstanceScript())
{
if (pInstance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || pInstance->GetData(TYPE_RING_OF_LAW) == DONE)
if (instance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || instance->GetData(TYPE_RING_OF_LAW) == DONE)
return false;
pInstance->SetData(TYPE_RING_OF_LAW, IN_PROGRESS);
instance->SetData(TYPE_RING_OF_LAW, IN_PROGRESS);
player->SummonCreature(NPC_GRIMSTONE, 625.559f, -205.618f, -52.735f, 2.609f, TEMPSUMMON_DEAD_DESPAWN, 0);
return false;
@@ -152,11 +152,11 @@ public:
{
npc_grimstoneAI(Creature* c) : npc_escortAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
MobSpawnId = rand()%6;
}
InstanceScript* pInstance;
InstanceScript* instance;
uint8 EventPhase;
uint32 Event_Timer;
@@ -235,10 +235,10 @@ public:
Event_Timer = 5000;
break;
case 5:
if (pInstance)
if (instance)
{
pInstance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, NPC_GRIMSTONE, me);
pInstance->SetData(TYPE_RING_OF_LAW, DONE);
instance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, NPC_GRIMSTONE, me);
instance->SetData(TYPE_RING_OF_LAW, DONE);
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_grimstone: event reached end and set complete.");
}
break;
@@ -247,12 +247,12 @@ public:
void HandleGameObject(uint32 id, bool open)
{
pInstance->HandleGameObject(pInstance->GetData64(id), open);
instance->HandleGameObject(instance->GetData64(id), open);
}
void UpdateAI(const uint32 diff)
{
if (!pInstance)
if (!instance)
return;
if (MobDeath_Timer)
@@ -641,14 +641,14 @@ public:
player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, player->GetGUID());
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS);
instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS);
}
return true;
}
bool OnGossipHello(Player* player, Creature* creature)
{
if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
{
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(2846, creature->GetGUID());
@@ -665,12 +665,12 @@ public:
switch (i)
{
case 0:me->Say(SAY_DUGHAL_FREE, LANG_UNIVERSAL, PlayerGUID); break;
case 1:pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break;
case 1:instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break;
case 2:
me->SetVisibility(VISIBILITY_OFF);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
break;
}
}
@@ -685,14 +685,14 @@ public:
me->SetVisibility(VISIBILITY_OFF);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
}
}
void UpdateAI(const uint32 diff)
{
if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if ((pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED)
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED)
{
me->SetVisibility(VISIBILITY_OFF);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -765,10 +765,10 @@ public:
{
if (quest->GetQuestId() == 4322)
{PlayerStart = player;
if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED)
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED)
{
CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS);
instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS);
creature->setFaction(11);
}
@@ -780,7 +780,7 @@ public:
{
npc_marshal_windsorAI(Creature* c) : npc_escortAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
void WaypointReached(uint32 i)
@@ -800,13 +800,13 @@ public:
break;
case 12:
me->Say(SAY_WINDSOR_6, LANG_UNIVERSAL, PlayerGUID);
pInstance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_IN_PROGRESS);
instance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_IN_PROGRESS);
break;
case 13:
me->HandleEmoteCommand(EMOTE_STATE_USESTANDING);//EMOTE_STATE_WORK
break;
case 14:
pInstance->SetData(DATA_GATE_SR, 0);
instance->SetData(DATA_GATE_SR, 0);
me->setFaction(11);
break;
case 16:
@@ -816,14 +816,14 @@ public:
me->HandleEmoteCommand(EMOTE_STATE_USESTANDING);//EMOTE_STATE_WORK
break;
case 18:
pInstance->SetData(DATA_GATE_SC, 0);
instance->SetData(DATA_GATE_SC, 0);
break;
case 19:
me->SetVisibility(VISIBILITY_OFF);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0);
pInstance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED);
break;
}
}
@@ -842,25 +842,25 @@ public:
void JustDied(Unit* slayer)
{
pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED);
instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED);
}
void UpdateAI(const uint32 diff)
{
if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if (pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED)
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if (instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED)
SetEscortPaused(false);
if (!pInstance->GetData(DATA_GATE_D) && pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_NOT_STARTED)
if (!instance->GetData(DATA_GATE_D) && instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_NOT_STARTED)
{
me->Say(SAY_WINDSOR_4_2, LANG_UNIVERSAL, PlayerGUID);
pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_BEFORE_START);
instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_BEFORE_START);
}
if (pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED)
if (instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED)
{
me->Say(SAY_WINDSOR_4_3, LANG_UNIVERSAL, PlayerGUID);
pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
}
if ((pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_SUPPLY_ROOM) == ENCOUNTER_STATE_ENDED)
if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_SUPPLY_ROOM) == ENCOUNTER_STATE_ENDED)
{
me->SetVisibility(VISIBILITY_OFF);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -1009,7 +1009,7 @@ public:
case 32:
me->Say(SAY_REGINALD_WINDSOR_20_2, LANG_UNIVERSAL, PlayerGUID);
PlayerStart->GroupEventHappens(QUEST_JAIL_BREAK, me);
pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED);
break;
}
}
@@ -1046,53 +1046,53 @@ public:
void JustDied(Unit* slayer)
{
pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED);
instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED);
}
void UpdateAI(const uint32 diff)
{
if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if (wp == 7)
{
if (!pInstance->GetData(DATA_GATE_J) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED)
if (!instance->GetData(DATA_GATE_J) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED)
{
pInstance->SetData(DATA_CREATURE_JAZ, 1);
pInstance->SetData(DATA_JAZ, ENCOUNTER_STATE_IN_PROGRESS);
instance->SetData(DATA_CREATURE_JAZ, 1);
instance->SetData(DATA_JAZ, ENCOUNTER_STATE_IN_PROGRESS);
}
if (pInstance->GetData(DATA_CREATURE_JAZ) && pInstance->GetData(DATA_CREATURE_OGRABISI) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS)
if (instance->GetData(DATA_CREATURE_JAZ) && instance->GetData(DATA_CREATURE_OGRABISI) && instance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS)
{
SetEscortPaused(false);
pInstance->SetData(DATA_JAZ, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_JAZ, ENCOUNTER_STATE_ENDED);
}
}
else if (wp == 11)
{
if (!pInstance->GetData(DATA_GATE_S) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED)
if (!instance->GetData(DATA_GATE_S) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED)
{
pInstance->SetData(DATA_CREATURE_SHILL, 1);
pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_IN_PROGRESS);
instance->SetData(DATA_CREATURE_SHILL, 1);
instance->SetData(DATA_SHILL, ENCOUNTER_STATE_IN_PROGRESS);
}
if (pInstance->GetData(DATA_CREATURE_SHILL) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS)
if (instance->GetData(DATA_CREATURE_SHILL) && instance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS)
{
pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED);
SetEscortPaused(false);
}
}
else if (wp == 20)
{
if (!pInstance->GetData(DATA_GATE_C) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED)
if (!instance->GetData(DATA_GATE_C) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED)
{
pInstance->SetData(DATA_CREATURE_CREST, 1);
instance->SetData(DATA_CREATURE_CREST, 1);
me->Say(SAY_REGINALD_WINDSOR_13_2, LANG_UNIVERSAL, PlayerGUID);
pInstance->SetData(DATA_CREST, ENCOUNTER_STATE_IN_PROGRESS);
instance->SetData(DATA_CREST, ENCOUNTER_STATE_IN_PROGRESS);
}
if (pInstance->GetData(DATA_CREATURE_CREST) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS)
if (instance->GetData(DATA_CREATURE_CREST) && instance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS)
{
SetEscortPaused(false);
pInstance->SetData(DATA_CREST, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_CREST, ENCOUNTER_STATE_ENDED);
}
}
if (pInstance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) SetEscortPaused(false);
if (instance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) SetEscortPaused(false);
npc_escortAI::UpdateAI(diff);
}
};
@@ -1131,14 +1131,14 @@ public:
player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escort::npc_escortAI, (creature->AI()))->Start(false, true, player->GetGUID());
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_IN_PROGRESS);
instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_IN_PROGRESS);
}
return true;
}
bool OnGossipHello(Player* player, Creature* creature)
{
if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
{
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(2847, creature->GetGUID());
@@ -1160,7 +1160,7 @@ public:
me->SetVisibility(VISIBILITY_OFF);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED);
}
}
@@ -1170,20 +1170,20 @@ public:
{
case 0:me->Say(SAY_TOBIAS_FREE, LANG_UNIVERSAL, PlayerGUID); break;
case 2:
pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break;
instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break;
case 4:
me->SetVisibility(VISIBILITY_OFF);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED);
instance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED);
break;
}
}
void UpdateAI(const uint32 diff)
{
if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if ((pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_ENDED)
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_ENDED)
{
me->SetVisibility(VISIBILITY_OFF);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -1265,10 +1265,10 @@ public:
{
npc_rocknotAI(Creature* c) : npc_escortAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 BreakKeg_Timer;
uint32 BreakDoor_Timer;
@@ -1284,13 +1284,13 @@ public:
void DoGo(uint32 id, uint32 state)
{
if (GameObject* pGo = pInstance->instance->GetGameObject(pInstance->GetData64(id)))
pGo->SetGoState((GOState)state);
if (GameObject* go = instance->instance->GetGameObject(instance->GetData64(id)))
go->SetGoState((GOState)state);
}
void WaypointReached(uint32 i)
{
if (!pInstance)
if (!instance)
return;
switch (i)
@@ -1316,7 +1316,7 @@ public:
void UpdateAI(const uint32 diff)
{
if (!pInstance)
if (!instance)
return;
if (BreakKeg_Timer)
@@ -1337,12 +1337,12 @@ public:
DoGo(DATA_GO_BAR_KEG_TRAP, 0); //doesn't work very well, leaving code here for future
//spell by trap has effect61, this indicate the bar go hostile
if (Unit* tmp = Unit::GetUnit(*me, pInstance->GetData64(DATA_PHALANX)))
if (Unit* tmp = Unit::GetUnit(*me, instance->GetData64(DATA_PHALANX)))
tmp->setFaction(14);
//for later, this event(s) has alot more to it.
//optionally, DONE can trigger bar to go hostile.
pInstance->SetData(TYPE_BAR, DONE);
instance->SetData(TYPE_BAR, DONE);
BreakDoor_Timer = 0;
} else BreakDoor_Timer -= diff;
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+2 -2
View File
@@ -91,8 +91,8 @@ public:
// When he die open door to last chamber
void JustDied(Unit* who)
{
if (InstanceScript* pInstance = who->GetInstanceScript())
pInstance->HandleGameObject(pInstance->GetData64(DATA_THRONE_DOOR), true);
if (InstanceScript* instance = who->GetInstanceScript())
instance->HandleGameObject(instance->GetData64(DATA_THRONE_DOOR), true);
}
};
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+13 -13
View File
@@ -71,10 +71,10 @@ public:
break;
case GOSSIP_ACTION_INFO_DEF+22:
player->CLOSE_GOSSIP_MENU();
if (InstanceScript* pInstance = creature->GetInstanceScript())
if (InstanceScript* instance = creature->GetInstanceScript())
{
//are 5 minutes expected? go template may have data to despawn when used at quest
pInstance->DoRespawnGameObject(pInstance->GetData64(DATA_GO_CHALICE), MINUTE*5);
instance->DoRespawnGameObject(instance->GetData64(DATA_GO_CHALICE), MINUTE*5);
}
break;
}
@@ -127,9 +127,9 @@ public:
creature->setFaction(FACTION_HOSTILE);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
creature->AI()->AttackStart(player);
InstanceScript* pInstance = creature->GetInstanceScript();
if (pInstance)
pInstance->SetData64(DATA_EVENSTARTER, player->GetGUID());
InstanceScript* instance = creature->GetInstanceScript();
if (instance)
instance->SetData64(DATA_EVENSTARTER, player->GetGUID());
break;
}
return true;
@@ -152,10 +152,10 @@ public:
{
boss_doomrelAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 ShadowVolley_Timer;
uint32 Immolate_Timer;
uint32 CurseOfWeakness_Timer;
@@ -175,9 +175,9 @@ public:
// was set before event start, so set again
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
if (pInstance)
if (instance)
{
if (pInstance->GetData(DATA_GHOSTKILL) >= 7)
if (instance->GetData(DATA_GHOSTKILL) >= 7)
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
else
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -197,14 +197,14 @@ public:
if (me->isAlive())
me->GetMotionMaster()->MoveTargetedHome();
me->SetLootRecipient(NULL);
if (pInstance)
pInstance->SetData64(DATA_EVENSTARTER, 0);
if (instance)
instance->SetData64(DATA_EVENSTARTER, 0);
}
void JustDied(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_GHOSTKILL, 1);
if (instance)
instance->SetData(DATA_GHOSTKILL, 1);
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+3 -3
View File
@@ -73,14 +73,14 @@ class instance_blackrock_depths : public InstanceMapScript
public:
instance_blackrock_depths() : InstanceMapScript("instance_blackrock_depths", 230) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_blackrock_depths_InstanceMapScript(pMap);
return new instance_blackrock_depths_InstanceMapScript(map);
}
struct instance_blackrock_depths_InstanceMapScript : public InstanceScript
{
instance_blackrock_depths_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
+1 -1
View File
@@ -261,7 +261,7 @@ public:
&& unit->HasAura(SPELL_BROODAF_BRONZE)
&& unit->HasAura(SPELL_BROODAF_GREEN))
{
//pTarget->RemoveAllAuras();
//target->RemoveAllAuras();
//DoCast(target, SPELL_CHROMATIC_MUT_1);
//Chromatic mutation is causing issues
src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+1 -1
View File
@@ -249,7 +249,7 @@ public:
void MoveInLineOfSight(Unit* who)
{
//We simply use this function to find players until we can use pMap->GetPlayers()
//We simply use this function to find players until we can use map->GetPlayers()
if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsHostileTo(who))
{
src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+5 -5
View File
@@ -51,10 +51,10 @@ public:
{
boss_mr_smiteAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 uiTrashTimer;
uint32 uiSlamTimer;
@@ -126,11 +126,11 @@ public:
++uiHealth;
DoCastAOE(SPELL_SMITE_STOMP, false);
SetCombatMovement(false);
if (pInstance)
if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_SMITE_CHEST)))
if (instance)
if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_SMITE_CHEST)))
{
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MovePoint(1, pGo->GetPositionX() - 3.0f, pGo->GetPositionY(), pGo->GetPositionZ());
me->GetMotionMaster()->MovePoint(1, go->GetPositionX() - 3.0f, go->GetPositionY(), go->GetPositionZ());
}
}
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+4 -4
View File
@@ -38,18 +38,18 @@ public:
bool OnUse(Player* player, Item* item, SpellCastTargets const& targets)
{
InstanceScript* pInstance = player->GetInstanceScript();
InstanceScript* instance = player->GetInstanceScript();
if (!pInstance)
if (!instance)
{
player->GetSession()->SendNotification("Instance script not initialized");
return true;
}
if (pInstance->GetData(EVENT_STATE)!= CANNON_NOT_USED)
if (instance->GetData(EVENT_STATE)!= CANNON_NOT_USED)
return false;
if (targets.GetGOTarget() && targets.GetGOTarget()->GetEntry() == GO_DEFIAS_CANNON)
{
pInstance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED);
instance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED);
}
player->DestroyItemCount(item->GetEntry(), 1, true);
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+3 -3
View File
@@ -53,7 +53,7 @@ class instance_deadmines : public InstanceMapScript
struct instance_deadmines_InstanceMapScript : public InstanceScript
{
instance_deadmines_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint64 FactoryDoorGUID;
uint64 IronCladDoorGUID;
@@ -251,9 +251,9 @@ class instance_deadmines : public InstanceMapScript
}
};
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_deadmines_InstanceMapScript(pMap);
return new instance_deadmines_InstanceMapScript(map);
}
};
src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+52 -52
View File
@@ -113,9 +113,9 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
InstanceScript* pInstance = creature->GetInstanceScript();
InstanceScript* instance = creature->GetInstanceScript();
if (pInstance && pInstance->GetData(TYPE_EVENT) == NOT_STARTED)
if (instance && instance->GetData(TYPE_EVENT) == NOT_STARTED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(GOSSIP_TEXT_EMI, creature->GetGUID());
@@ -127,12 +127,12 @@ public:
{
npc_blastmaster_emi_shortfuseAI(Creature* creature) : npc_escortAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
creature->RestoreFaction();
Reset();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint8 uiPhase;
uint32 uiTimer;
@@ -170,63 +170,63 @@ public:
for (std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr)
{
if (GameObject* pGo = GameObject::GetGameObject(*me, *itr))
if (GameObject* go = GameObject::GetGameObject(*me, *itr))
{
if (pGo)
if (go)
{
if (Creature* trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 1))
if (Creature* trigger = go->SummonTrigger(go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0, 1))
{
//visual effects are not working!
trigger->CastSpell(trigger, 11542, true);
trigger->CastSpell(trigger, 35470, true);
}
pGo->RemoveFromWorld();
//pGo->CastSpell(me, 12158); makes all die?!
go->RemoveFromWorld();
//go->CastSpell(me, 12158); makes all die?!
}
}
}
if (bBool)
{
if (pInstance)
if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
pInstance->HandleGameObject(0, false, pGo);
if (instance)
if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
instance->HandleGameObject(0, false, go);
}else
if (pInstance)
if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT)))
pInstance->HandleGameObject(0, false, pGo);
if (instance)
if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
instance->HandleGameObject(0, false, go);
}
void SetInFace(bool bBool)
{
if (!pInstance)
if (!instance)
return;
if (bBool)
{
if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
me->SetFacingToObject(pGo);
if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
me->SetFacingToObject(go);
}else
if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT)))
me->SetFacingToObject(pGo);
if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
me->SetFacingToObject(go);
}
void RestoreAll()
{
if (!pInstance)
if (!instance)
return;
if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
pInstance->HandleGameObject(0, false, pGo);
if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
instance->HandleGameObject(0, false, go);
if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT)))
pInstance->HandleGameObject(0, false, pGo);
if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
instance->HandleGameObject(0, false, go);
if (!GoSummonList.empty())
for (std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr)
{
if (GameObject* pGo = GameObject::GetGameObject(*me, *itr))
pGo->RemoveFromWorld();
if (GameObject* go = GameObject::GetGameObject(*me, *itr))
go->RemoveFromWorld();
}
if (!SummonList.empty())
@@ -242,7 +242,7 @@ public:
}
}
void AggroAllPlayers(Creature* pTemp)
void AggroAllPlayers(Creature* temp)
{
Map::PlayerList const &PlList = me->GetMap()->GetPlayers();
@@ -258,9 +258,9 @@ public:
if (player->isAlive())
{
pTemp->SetInCombatWith(player);
player->SetInCombatWith(pTemp);
pTemp->AddThreat(player, 0.0f);
temp->SetInCombatWith(player);
player->SetInCombatWith(temp);
temp->AddThreat(player, 0.0f);
}
}
}
@@ -320,16 +320,16 @@ public:
NextStep(1500, true);
break;
case 2:
if (!pInstance)
if (!instance)
return;
switch (uiValue)
{
case 1:
pInstance->SetData(TYPE_EVENT, IN_PROGRESS);
instance->SetData(TYPE_EVENT, IN_PROGRESS);
break;
case 2:
pInstance->SetData(TYPE_EVENT, DONE);
instance->SetData(TYPE_EVENT, DONE);
NextStep(5000, false, 22);
break;
}
@@ -354,10 +354,10 @@ public:
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[9], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
break;
case 2:
if (GameObject* pGo = me->SummonGameObject(183410, -533.140f, -105.322f, -156.016f, 0, 0, 0, 0, 0, 1000))
if (GameObject* go = me->SummonGameObject(183410, -533.140f, -105.322f, -156.016f, 0, 0, 0, 0, 0, 1000))
{
GoSummonList.push_back(pGo->GetGUID());
pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it!
GoSummonList.push_back(go->GetGUID());
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it!
}
Summon(3);
break;
@@ -369,10 +369,10 @@ public:
DoScriptText(SAY_BLASTMASTER_19, me);
break;
case 4:
if (GameObject* pGo = me->SummonGameObject(183410, -542.199f, -96.854f, -155.790f, 0, 0, 0, 0, 0, 1000))
if (GameObject* go = me->SummonGameObject(183410, -542.199f, -96.854f, -155.790f, 0, 0, 0, 0, 0, 1000))
{
GoSummonList.push_back(pGo->GetGUID());
pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
GoSummonList.push_back(go->GetGUID());
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
}
break;
case 5:
@@ -389,18 +389,18 @@ public:
me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[14], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000);
break;
case 7:
if (GameObject* pGo = me->SummonGameObject(183410, -507.820f, -103.333f, -151.353f, 0, 0, 0, 0, 0, 1000))
if (GameObject* go = me->SummonGameObject(183410, -507.820f, -103.333f, -151.353f, 0, 0, 0, 0, 0, 1000))
{
GoSummonList.push_back(pGo->GetGUID());
pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it!
GoSummonList.push_back(go->GetGUID());
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it!
Summon(6);
}
break;
case 8:
if (GameObject* pGo = me->SummonGameObject(183410, -511.829f, -86.249f, -151.431f, 0, 0, 0, 0, 0, 1000))
if (GameObject* go = me->SummonGameObject(183410, -511.829f, -86.249f, -151.431f, 0, 0, 0, 0, 0, 1000))
{
GoSummonList.push_back(pGo->GetGUID());
pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it!
GoSummonList.push_back(go->GetGUID());
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); //We can't use it!
}
break;
case 9:
@@ -444,9 +444,9 @@ public:
SetInFace(true);
DoScriptText(SAY_BLASTMASTER_5, me);
Summon(1);
if (pInstance)
if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
pInstance->HandleGameObject(0, true, pGo);
if (instance)
if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
instance->HandleGameObject(0, true, go);
NextStep(3000, true);
break;
case 7:
@@ -490,9 +490,9 @@ public:
case 16:
DoScriptText(SAY_BLASTMASTER_23, me);
SetInFace(false);
if (pInstance)
if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT)))
pInstance->HandleGameObject(0, true, pGo);
if (instance)
if (GameObject* go = GameObject::GetGameObject((*me), instance->GetData64(DATA_GO_CAVE_IN_LEFT)))
instance->HandleGameObject(0, true, go);
NextStep(2000, true);
break;
case 17:
src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+3 -3
View File
@@ -25,14 +25,14 @@ class instance_gnomeregan : public InstanceMapScript
public:
instance_gnomeregan() : InstanceMapScript("instance_gnomeregan", 90) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_gnomeregan_InstanceMapScript(pMap);
return new instance_gnomeregan_InstanceMapScript(map);
}
struct instance_gnomeregan_InstanceMapScript : public InstanceScript
{
instance_gnomeregan_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
instance_gnomeregan_InstanceMapScript(Map* map) : InstanceScript(map)
{
}
src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+18 -18
View File
@@ -78,10 +78,10 @@ public:
{
AddId[i] = 0;
}
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 AddGUID[4];
@@ -110,14 +110,14 @@ public:
SpawnAdds();
}
if (pInstance)
pInstance->SetData(TYPE_MOROES, NOT_STARTED);
if (instance)
instance->SetData(TYPE_MOROES, NOT_STARTED);
}
void StartEvent()
{
if (pInstance)
pInstance->SetData(TYPE_MOROES, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_MOROES, IN_PROGRESS);
DoZoneInCombat();
}
@@ -140,14 +140,14 @@ public:
{
DoScriptText(SAY_DEATH, me);
if (pInstance)
pInstance->SetData(TYPE_MOROES, DONE);
if (instance)
instance->SetData(TYPE_MOROES, DONE);
DeSpawnAdds();
//remove aura from spell Garrote when Moroes dies
if (pInstance)
pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_GARROTE);
if (instance)
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_GARROTE);
}
void SpawnAdds()
@@ -237,7 +237,7 @@ public:
if (!UpdateVictim())
return;
if (pInstance && !pInstance->GetData(TYPE_MOROES))
if (instance && !instance->GetData(TYPE_MOROES))
{
EnterEvadeMode();
return;
@@ -318,7 +318,7 @@ public:
struct boss_moroes_guestAI : public ScriptedAI
{
InstanceScript* pInstance;
InstanceScript* instance;
uint64 GuestGUID[4];
@@ -327,21 +327,21 @@ struct boss_moroes_guestAI : public ScriptedAI
for (uint8 i = 0; i < 4; ++i)
GuestGUID[i] = 0;
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
void Reset()
{
if (pInstance)
pInstance->SetData(TYPE_MOROES, NOT_STARTED);
if (instance)
instance->SetData(TYPE_MOROES, NOT_STARTED);
}
void AcquireGUID()
{
if (!pInstance)
if (!instance)
return;
uint64 MoroesGUID = pInstance->GetData64(DATA_MOROES);
uint64 MoroesGUID = instance->GetData64(DATA_MOROES);
Creature* Moroes = (Unit::GetCreature((*me), MoroesGUID));
if (Moroes)
{
@@ -369,7 +369,7 @@ struct boss_moroes_guestAI : public ScriptedAI
void UpdateAI(const uint32 /*diff*/)
{
if (pInstance && !pInstance->GetData(TYPE_MOROES))
if (instance && !instance->GetData(TYPE_MOROES))
EnterEvadeMode();
DoMeleeAttackIfReady();
src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+3 -3
View File
@@ -72,7 +72,7 @@ public:
{
boss_netherspiteAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
for (int i=0; i<3; ++i)
{
@@ -82,7 +82,7 @@ public:
}
}
InstanceScript* pInstance;
InstanceScript* instance;
bool PortalPhase;
bool Berserk;
@@ -247,7 +247,7 @@ public:
void HandleDoors(bool open) // Massive Door switcher
{
if (GameObject* Door = GameObject::GetGameObject(*me, pInstance ? pInstance->GetData64(DATA_GO_MASSIVE_DOOR) : 0))
if (GameObject* Door = GameObject::GetGameObject(*me, instance ? instance->GetData64(DATA_GO_MASSIVE_DOOR) : 0))
Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
}
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+12 -12
View File
@@ -72,11 +72,11 @@ public:
{
boss_nightbaneAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
Intro = true;
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 Phase;
@@ -125,12 +125,12 @@ public:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->setActive(true);
if (pInstance)
if (instance)
{
if (pInstance->GetData(TYPE_NIGHTBANE) == DONE || pInstance->GetData(TYPE_NIGHTBANE) == IN_PROGRESS)
if (instance->GetData(TYPE_NIGHTBANE) == DONE || instance->GetData(TYPE_NIGHTBANE) == IN_PROGRESS)
me->DisappearAndDie();
else
pInstance->SetData(TYPE_NIGHTBANE, NOT_STARTED);
instance->SetData(TYPE_NIGHTBANE, NOT_STARTED);
}
HandleTerraceDoors(true);
@@ -147,17 +147,17 @@ public:
void HandleTerraceDoors(bool open)
{
if (pInstance)
if (instance)
{
pInstance->HandleGameObject(pInstance->GetData64(DATA_MASTERS_TERRACE_DOOR_1), open);
pInstance->HandleGameObject(pInstance->GetData64(DATA_MASTERS_TERRACE_DOOR_2), open);
instance->HandleGameObject(instance->GetData64(DATA_MASTERS_TERRACE_DOOR_1), open);
instance->HandleGameObject(instance->GetData64(DATA_MASTERS_TERRACE_DOOR_2), open);
}
}
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(TYPE_NIGHTBANE, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_NIGHTBANE, IN_PROGRESS);
HandleTerraceDoors(false);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
@@ -171,8 +171,8 @@ public:
void JustDied(Unit* /*killer*/)
{
if (pInstance)
pInstance->SetData(TYPE_NIGHTBANE, DONE);
if (instance)
instance->SetData(TYPE_NIGHTBANE, DONE);
HandleTerraceDoors(true);
}
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+8 -8
View File
@@ -185,10 +185,10 @@ public:
{
boss_malchezaarAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 EnfeebleTimer;
uint32 EnfeebleResetTimer;
uint32 ShadowNovaTimer;
@@ -234,8 +234,8 @@ public:
SunderArmorTimer = urand(5000, 10000);
phase = 1;
if (pInstance)
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true);
if (instance)
instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true);
}
void KilledUnit(Unit* /*victim*/)
@@ -255,16 +255,16 @@ public:
for (uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
positions.push_back(&InfernalPoints[i]);
if (pInstance)
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true);
if (instance)
instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
if (pInstance)
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), false); // Open the door leading further in
if (instance)
instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), false); // Open the door leading further in
}
void InfernalCleanup()
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+13 -13
View File
@@ -95,10 +95,10 @@ public:
{
boss_aranAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 SecondarySpellTimer;
uint32 NormalCastTimer;
@@ -149,11 +149,11 @@ public:
Drinking = false;
DrinkInturrupted = false;
if (pInstance)
if (instance)
{
// Not in progress
pInstance->SetData(TYPE_ARAN, NOT_STARTED);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), true);
instance->SetData(TYPE_ARAN, NOT_STARTED);
instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), true);
}
}
@@ -166,10 +166,10 @@ public:
{
DoScriptText(SAY_DEATH, me);
if (pInstance)
if (instance)
{
pInstance->SetData(TYPE_ARAN, DONE);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), true);
instance->SetData(TYPE_ARAN, DONE);
instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), true);
}
}
@@ -177,10 +177,10 @@ public:
{
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
if (pInstance)
if (instance)
{
pInstance->SetData(TYPE_ARAN, IN_PROGRESS);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), false);
instance->SetData(TYPE_ARAN, IN_PROGRESS);
instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), false);
}
}
@@ -228,9 +228,9 @@ public:
{
if (CloseDoorTimer <= diff)
{
if (pInstance)
if (instance)
{
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), false);
instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), false);
CloseDoorTimer = 0;
}
} else CloseDoorTimer -= diff;
src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+11 -11
View File
@@ -70,10 +70,10 @@ public:
{
mob_kilrekAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 TerestianGUID;
@@ -87,7 +87,7 @@ public:
void EnterCombat(Unit* /*who*/)
{
if (!pInstance)
if (!instance)
{
ERROR_INST_DATA(me);
return;
@@ -96,9 +96,9 @@ public:
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
if (instance)
{
uint64 TerestianGUID = pInstance->GetData64(DATA_TERESTIAN);
uint64 TerestianGUID = instance->GetData64(DATA_TERESTIAN);
if (TerestianGUID)
{
Unit* Terestian = Unit::GetUnit((*me), TerestianGUID);
@@ -262,10 +262,10 @@ public:
{
for (uint8 i = 0; i < 2; ++i)
PortalGUID[i] = 0;
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 PortalGUID[2];
uint8 PortalsCount;
@@ -303,8 +303,8 @@ public:
SummonedPortals = false;
Berserk = false;
if (pInstance)
pInstance->SetData(TYPE_TERESTIAN, NOT_STARTED);
if (instance)
instance->SetData(TYPE_TERESTIAN, NOT_STARTED);
me->RemoveAurasDueToSpell(SPELL_BROKEN_PACT);
@@ -359,8 +359,8 @@ public:
DoScriptText(SAY_DEATH, me);
if (pInstance)
pInstance->SetData(TYPE_TERESTIAN, DONE);
if (instance)
instance->SetData(TYPE_TERESTIAN, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+47 -47
View File
@@ -88,11 +88,11 @@ EndScriptData */
#define CREATURE_CYCLONE 18412
#define CREATURE_CRONE 18168
void SummonCroneIfReady(InstanceScript* pInstance, Creature* creature)
void SummonCroneIfReady(InstanceScript* instance, Creature* creature)
{
pInstance->SetData(DATA_OPERA_OZ_DEATHCOUNT, SPECIAL); // Increment DeathCount
instance->SetData(DATA_OPERA_OZ_DEATHCOUNT, SPECIAL); // Increment DeathCount
if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4)
if (instance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4)
{
if (Creature* pCrone = creature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, creature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
{
@@ -116,10 +116,10 @@ public:
{
boss_dorotheeAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 AggroTimer;
@@ -158,8 +158,8 @@ public:
{
DoScriptText(SAY_DOROTHEE_DEATH, me);
if (pInstance)
SummonCroneIfReady(pInstance, me);
if (instance)
SummonCroneIfReady(instance, me);
}
void AttackStart(Unit* who)
@@ -298,10 +298,10 @@ public:
{
boss_strawmanAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 AggroTimer;
uint32 BrainBashTimer;
@@ -357,8 +357,8 @@ public:
{
DoScriptText(SAY_STRAWMAN_DEATH, me);
if (pInstance)
SummonCroneIfReady(pInstance, me);
if (instance)
SummonCroneIfReady(instance, me);
}
void KilledUnit(Unit* /*victim*/)
@@ -413,10 +413,10 @@ public:
{
boss_tinheadAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 AggroTimer;
uint32 CleaveTimer;
@@ -463,8 +463,8 @@ public:
{
DoScriptText(SAY_TINHEAD_DEATH, me);
if (pInstance)
SummonCroneIfReady(pInstance, me);
if (instance)
SummonCroneIfReady(instance, me);
}
void KilledUnit(Unit* /*victim*/)
@@ -523,10 +523,10 @@ public:
{
boss_roarAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 AggroTimer;
uint32 MangleTimer;
@@ -571,8 +571,8 @@ public:
{
DoScriptText(SAY_ROAR_DEATH, me);
if (pInstance)
SummonCroneIfReady(pInstance, me);
if (instance)
SummonCroneIfReady(instance, me);
}
void KilledUnit(Unit* /*victim*/)
@@ -632,10 +632,10 @@ public:
{
boss_croneAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 CycloneTimer;
uint32 ChainLightningTimer;
@@ -662,13 +662,13 @@ public:
{
DoScriptText(SAY_CRONE_DEATH, me);
if (pInstance)
if (instance)
{
pInstance->SetData(TYPE_OPERA, DONE);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORRIGHT), true);
instance->SetData(TYPE_OPERA, DONE);
instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORLEFT), true);
instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORRIGHT), true);
if (GameObject* pSideEntrance = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR)))
if (GameObject* pSideEntrance = instance->instance->GetGameObject(instance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR)))
pSideEntrance->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
}
}
@@ -807,10 +807,10 @@ public:
{
boss_bigbadwolfAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 ChaseTimer;
uint32 FearTimer;
@@ -847,13 +847,13 @@ public:
{
DoPlaySoundToSet(me, SOUND_WOLF_DEATH);
if (pInstance)
if (instance)
{
pInstance->SetData(TYPE_OPERA, DONE);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORRIGHT), true);
instance->SetData(TYPE_OPERA, DONE);
instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORLEFT), true);
instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORRIGHT), true);
if (GameObject* pSideEntrance = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR)))
if (GameObject* pSideEntrance = instance->instance->GetGameObject(instance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR)))
pSideEntrance->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
}
}
@@ -1006,13 +1006,13 @@ public:
{
boss_julianneAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
EntryYellTimer = 1000;
AggroYellTimer = 10000;
IsFakingDeath = false;
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 EntryYellTimer;
uint32 AggroYellTimer;
@@ -1095,12 +1095,12 @@ public:
{
DoScriptText(SAY_JULIANNE_DEATH02, me);
if (pInstance)
if (instance)
{
pInstance->SetData(TYPE_OPERA, DONE);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORRIGHT), true);
if (GameObject* pSideEntrance = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR)))
instance->SetData(TYPE_OPERA, DONE);
instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORLEFT), true);
instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORRIGHT), true);
if (GameObject* pSideEntrance = instance->instance->GetGameObject(instance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR)))
pSideEntrance->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
}
}
@@ -1129,12 +1129,12 @@ public:
{
boss_romuloAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
EntryYellTimer = 8000;
AggroYellTimer = 15000;
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 JulianneGUID;
uint32 Phase;
@@ -1250,13 +1250,13 @@ public:
{
DoScriptText(SAY_ROMULO_DEATH, me);
if (pInstance)
if (instance)
{
pInstance->SetData(TYPE_OPERA, DONE);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true);
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORRIGHT), true);
instance->SetData(TYPE_OPERA, DONE);
instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORLEFT), true);
instance->HandleGameObject(instance->GetData64(DATA_GO_STAGEDOORRIGHT), true);
if (GameObject* pSideEntrance = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR)))
if (GameObject* pSideEntrance = instance->instance->GetGameObject(instance->GetData64(DATA_GO_SIDE_ENTRANCE_DOOR)))
pSideEntrance->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
}
}
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+3 -3
View File
@@ -48,14 +48,14 @@ class instance_karazhan : public InstanceMapScript
public:
instance_karazhan() : InstanceMapScript("instance_karazhan", 532) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_karazhan_InstanceMapScript(pMap);
return new instance_karazhan_InstanceMapScript(map);
}
struct instance_karazhan_InstanceMapScript : public InstanceScript
{
instance_karazhan_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string strSaveData;
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+25 -25
View File
@@ -113,10 +113,10 @@ public:
{
RaidWiped = false;
m_uiEventId = 0;
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 m_uiSpotlightGUID;
@@ -138,20 +138,20 @@ public:
PerformanceReady = false;
if (pInstance)
m_uiEventId = pInstance->GetData(DATA_OPERA_PERFORMANCE);
if (instance)
m_uiEventId = instance->GetData(DATA_OPERA_PERFORMANCE);
}
void StartEvent()
{
if (!pInstance)
if (!instance)
return;
pInstance->SetData(TYPE_OPERA, IN_PROGRESS);
instance->SetData(TYPE_OPERA, IN_PROGRESS);
//resets count for this event, in case earlier failed
if (m_uiEventId == EVENT_OZ)
pInstance->SetData(DATA_OPERA_OZ_DEATHCOUNT, IN_PROGRESS);
instance->SetData(DATA_OPERA_OZ_DEATHCOUNT, IN_PROGRESS);
Start(false, false);
}
@@ -160,14 +160,14 @@ public:
void WaypointReached(uint32 i)
{
if (!pInstance)
if (!instance)
return;
switch (i)
{
case 0:
DoCast(me, SPELL_TUXEDO, false);
pInstance->DoUseDoorOrButton(pInstance->GetData64(DATA_GO_STAGEDOORLEFT));
instance->DoUseDoorOrButton(instance->GetData64(DATA_GO_STAGEDOORLEFT));
break;
case 4:
TalkCount = 0;
@@ -183,12 +183,12 @@ public:
}
break;
case 8:
pInstance->DoUseDoorOrButton(pInstance->GetData64(DATA_GO_STAGEDOORLEFT));
instance->DoUseDoorOrButton(instance->GetData64(DATA_GO_STAGEDOORLEFT));
PerformanceReady = true;
break;
case 9:
PrepareEncounter();
pInstance->DoUseDoorOrButton(pInstance->GetData64(DATA_GO_CURTAINS));
instance->DoUseDoorOrButton(instance->GetData64(DATA_GO_CURTAINS));
break;
}
}
@@ -291,11 +291,11 @@ public:
{
if (WipeTimer <= diff)
{
Map* pMap = me->GetMap();
if (!pMap->IsDungeon())
Map* map = me->GetMap();
if (!map->IsDungeon())
return;
Map::PlayerList const &PlayerList = pMap->GetPlayers();
Map::PlayerList const &PlayerList = map->GetPlayers();
if (PlayerList.isEmpty())
return;
@@ -361,10 +361,10 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
if (InstanceScript* pInstance = creature->GetInstanceScript())
if (InstanceScript* instance = creature->GetInstanceScript())
{
// Check for death of Moroes and if opera event is not done already
if (pInstance->GetData(TYPE_MOROES) == DONE && pInstance->GetData(TYPE_OPERA) != DONE)
if (instance->GetData(TYPE_MOROES) == DONE && instance->GetData(TYPE_OPERA) != DONE)
{
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
@@ -426,10 +426,10 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
if (InstanceScript* pInstance = creature->GetInstanceScript())
if (InstanceScript* instance = creature->GetInstanceScript())
{
// Check if Shade of Aran event is done
if (pInstance->GetData(TYPE_ARAN) == DONE)
if (instance->GetData(TYPE_ARAN) == DONE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
}
@@ -476,10 +476,10 @@ public:
{
npc_image_of_medivhAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 ArcanagosGUID;
@@ -494,9 +494,9 @@ public:
{
ArcanagosGUID = 0;
if (pInstance && pInstance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0)
if (instance && instance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0)
{
pInstance->SetData64(DATA_IMAGE_OF_MEDIVH, me->GetGUID());
instance->SetData64(DATA_IMAGE_OF_MEDIVH, me->GetGUID());
(*me).GetMotionMaster()->MovePoint(1, MedivPos[0], MedivPos[1], MedivPos[2]);
Step = 0;
}else
@@ -537,7 +537,7 @@ public:
uint32 NextStep(uint32 Step)
{
Unit* arca = Unit::GetUnit((*me), ArcanagosGUID);
Map* pMap = me->GetMap();
Map* map = me->GetMap();
switch (Step)
{
case 0: return 9999999;
@@ -593,9 +593,9 @@ public:
me->SetVisible(false);
me->ClearInCombat();
if (pMap->IsDungeon())
if (map->IsDungeon())
{
InstanceMap::PlayerList const &PlayerList = pMap->GetPlayers();
InstanceMap::PlayerList const &PlayerList = map->GetPlayers();
for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
if (i->getSource()->isAlive())
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+15 -15
View File
@@ -91,10 +91,10 @@ public:
{
boss_felblood_kaelthasAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 FireballTimer;
uint32 PhoenixTimer;
@@ -138,10 +138,10 @@ public:
Phase = 0;
if (pInstance)
if (instance)
{
pInstance->SetData(DATA_KAELTHAS_EVENT, NOT_STARTED);
pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_DOOR), true);
instance->SetData(DATA_KAELTHAS_EVENT, NOT_STARTED);
instance->HandleGameObject(instance->GetData64(DATA_KAEL_DOOR), true);
// Open the big encounter door. Close it in Aggro and open it only in JustDied(and here)
// Small door opened after event are expected to be closed by default
}
@@ -151,10 +151,10 @@ public:
{
DoScriptText(SAY_DEATH, me);
if (!pInstance)
if (!instance)
return;
pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_DOOR), true);
instance->HandleGameObject(instance->GetData64(DATA_KAEL_DOOR), true);
// Open the encounter door
}
@@ -166,10 +166,10 @@ public:
void EnterCombat(Unit* /*who*/)
{
if (!pInstance)
if (!instance)
return;
pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_DOOR), false);
instance->HandleGameObject(instance->GetData64(DATA_KAEL_DOOR), false);
//Close the encounter door, open it in JustDied/Reset
}
@@ -361,10 +361,10 @@ public:
DoScriptText(SAY_GRAVITY_LAPSE, me);
FirstGravityLapse = false;
if (pInstance)
if (instance)
{
pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_STATUE_LEFT), true);
pInstance->HandleGameObject(pInstance->GetData64(DATA_KAEL_STATUE_RIGHT), true);
instance->HandleGameObject(instance->GetData64(DATA_KAEL_STATUE_LEFT), true);
instance->HandleGameObject(instance->GetData64(DATA_KAEL_STATUE_RIGHT), true);
}
}else
{
@@ -485,10 +485,10 @@ public:
{
mob_felkael_phoenixAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 BurnTimer;
uint32 Death_Timer;
bool Rebirth;
@@ -520,7 +520,7 @@ public:
}
//Don't really die in all phases of Kael'Thas
if (pInstance && pInstance->GetData(DATA_KAELTHAS_EVENT) == 0)
if (instance && instance->GetData(DATA_KAELTHAS_EVENT) == 0)
{
//prevent death
damage = 0;
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+27 -27
View File
@@ -101,12 +101,12 @@ public:
{
boss_priestess_delrissaAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
memset(&m_auiLackeyGUID, 0, sizeof(m_auiLackeyGUID));
LackeyEntryList.clear();
}
InstanceScript* pInstance;
InstanceScript* instance;
std::vector<uint32> LackeyEntryList;
uint64 m_auiLackeyGUID[MAX_ACTIVE_LACKEY];
@@ -137,8 +137,8 @@ public:
//this mean she at some point evaded
void JustReachedHome()
{
if (pInstance)
pInstance->SetData(DATA_DELRISSA_EVENT, FAIL);
if (instance)
instance->SetData(DATA_DELRISSA_EVENT, FAIL);
}
void EnterCombat(Unit* who)
@@ -157,8 +157,8 @@ public:
}
}
if (pInstance)
pInstance->SetData(DATA_DELRISSA_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_DELRISSA_EVENT, IN_PROGRESS);
}
void InitializeLackeys()
@@ -224,11 +224,11 @@ public:
{
DoScriptText(SAY_DEATH, me);
if (!pInstance)
if (!instance)
return;
if (pInstance->GetData(DATA_DELRISSA_DEATH_COUNT) == MAX_ACTIVE_LACKEY)
pInstance->SetData(DATA_DELRISSA_EVENT, DONE);
if (instance->GetData(DATA_DELRISSA_DEATH_COUNT) == MAX_ACTIVE_LACKEY)
instance->SetData(DATA_DELRISSA_EVENT, DONE);
else
{
if (me->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE))
@@ -342,12 +342,12 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
{
boss_priestess_lackey_commonAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
memset(&m_auiLackeyGUIDs, 0, sizeof(m_auiLackeyGUIDs));
AcquireGUIDs();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 m_auiLackeyGUIDs[MAX_ACTIVE_LACKEY];
uint32 ResetThreatTimer;
@@ -365,7 +365,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
ResetThreatTimer = urand(5000, 20000);
// in case she is not alive and Reset was for some reason called, respawn her (most likely party wipe after killing her)
if (Creature* pDelrissa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DELRISSA) : 0))
if (Creature* pDelrissa = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_DELRISSA) : 0))
{
if (!pDelrissa->isAlive())
pDelrissa->Respawn();
@@ -377,7 +377,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
if (!who)
return;
if (pInstance)
if (instance)
{
for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
{
@@ -391,7 +391,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
}
}
if (Creature* pDelrissa = Unit::GetCreature(*me, pInstance->GetData64(DATA_DELRISSA)))
if (Creature* pDelrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA)))
{
if (pDelrissa->isAlive() && !pDelrissa->getVictim())
{
@@ -404,11 +404,11 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
void JustDied(Unit* /*killer*/)
{
if (!pInstance)
if (!instance)
return;
Creature* pDelrissa = Unit::GetCreature(*me, pInstance->GetData64(DATA_DELRISSA));
uint32 uiLackeyDeathCount = pInstance->GetData(DATA_DELRISSA_DEATH_COUNT);
Creature* pDelrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA));
uint32 uiLackeyDeathCount = instance->GetData(DATA_DELRISSA_DEATH_COUNT);
if (!pDelrissa)
return;
@@ -416,7 +416,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
//should delrissa really yell if dead?
DoScriptText(LackeyDeath[uiLackeyDeathCount].id, pDelrissa);
pInstance->SetData(DATA_DELRISSA_DEATH_COUNT, SPECIAL);
instance->SetData(DATA_DELRISSA_DEATH_COUNT, SPECIAL);
//increase local var, since we now may have four dead
++uiLackeyDeathCount;
@@ -429,26 +429,26 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
if (!pDelrissa->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE))
pDelrissa->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
pInstance->SetData(DATA_DELRISSA_EVENT, DONE);
instance->SetData(DATA_DELRISSA_EVENT, DONE);
}
}
}
void KilledUnit(Unit* victim)
{
if (!pInstance)
if (!instance)
return;
if (Creature* Delrissa = Unit::GetCreature(*me, pInstance->GetData64(DATA_DELRISSA)))
if (Creature* Delrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA)))
Delrissa->AI()->KilledUnit(victim);
}
void AcquireGUIDs()
{
if (!pInstance)
if (!instance)
return;
if (Creature* Delrissa = (Unit::GetCreature(*me, pInstance->GetData64(DATA_DELRISSA))))
if (Creature* Delrissa = (Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA))))
{
for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
m_auiLackeyGUIDs[i] = CAST_AI(boss_priestess_delrissa::boss_priestess_delrissaAI, Delrissa->AI())->m_auiLackeyGUID[i];
@@ -1055,14 +1055,14 @@ public:
if (Freezing_Trap_Timer <= diff)
{
//attempt find go summoned from spell (casted by me)
GameObject* pGo = me->GetGameObject(SPELL_FREEZING_TRAP);
GameObject* go = me->GetGameObject(SPELL_FREEZING_TRAP);
//if we have a pGo, we need to wait (only one trap at a time)
if (pGo)
//if we have a go, we need to wait (only one trap at a time)
if (go)
Freezing_Trap_Timer = 2500;
else
{
//if pGo does not exist, then we can cast
//if go does not exist, then we can cast
DoCast(me->getVictim(), SPELL_FREEZING_TRAP);
Freezing_Trap_Timer = 15000;
}
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+16 -16
View File
@@ -65,23 +65,23 @@ public:
{
boss_selin_fireheartAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
Crystals.clear();
//GUIDs per instance is static, so we only need to load them once.
if (pInstance)
if (instance)
{
uint32 size = pInstance->GetData(DATA_FEL_CRYSTAL_SIZE);
uint32 size = instance->GetData(DATA_FEL_CRYSTAL_SIZE);
for (uint8 i = 0; i < size; ++i)
{
uint64 guid = pInstance->GetData64(DATA_FEL_CRYSTAL);
uint64 guid = instance->GetData64(DATA_FEL_CRYSTAL);
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Selin: Adding Fel Crystal " UI64FMTD " to list", guid);
Crystals.push_back(guid);
}
}
}
InstanceScript* pInstance;
InstanceScript* instance;
std::list<uint64> Crystals;
@@ -98,7 +98,7 @@ public:
void Reset()
{
if (pInstance)
if (instance)
{
//for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
@@ -115,11 +115,11 @@ public:
}
}
pInstance->HandleGameObject(pInstance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), true);
instance->HandleGameObject(instance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), true);
// Open the big encounter door. Close it in Aggro and open it only in JustDied(and here)
// Small door opened after event are expected to be closed by default
// Set Inst data for encounter
pInstance->SetData(DATA_SELIN_EVENT, NOT_STARTED);
instance->SetData(DATA_SELIN_EVENT, NOT_STARTED);
} else sLog->outError(ERROR_INST_DATA);
DrainLifeTimer = 3000 + rand()%4000;
@@ -196,8 +196,8 @@ public:
{
DoScriptText(SAY_AGGRO, me);
if (pInstance)
pInstance->HandleGameObject(pInstance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), false);
if (instance)
instance->HandleGameObject(instance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), false);
//Close the encounter door, open it in JustDied/Reset
}
@@ -232,12 +232,12 @@ public:
{
DoScriptText(SAY_DEATH, me);
if (!pInstance)
if (!instance)
return;
pInstance->SetData(DATA_SELIN_EVENT, DONE); // Encounter complete!
pInstance->HandleGameObject(pInstance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), true); // Open the encounter door
pInstance->HandleGameObject(pInstance->GetData64(DATA_SELIN_DOOR), true); // Open the door leading further in
instance->SetData(DATA_SELIN_EVENT, DONE); // Encounter complete!
instance->HandleGameObject(instance->GetData64(DATA_SELIN_ENCOUNTER_DOOR), true); // Open the encounter door
instance->HandleGameObject(instance->GetData64(DATA_SELIN_DOOR), true); // Open the door leading further in
ShatterRemainingCrystals();
}
@@ -343,9 +343,9 @@ public:
void JustDied(Unit* /*killer*/)
{
if (InstanceScript* pInstance = me->GetInstanceScript())
if (InstanceScript* instance = me->GetInstanceScript())
{
Creature* Selin = (Unit::GetCreature(*me, pInstance->GetData64(DATA_SELIN)));
Creature* Selin = (Unit::GetCreature(*me, instance->GetData64(DATA_SELIN)));
if (Selin && Selin->isAlive())
{
if (CAST_AI(boss_selin_fireheart::boss_selin_fireheartAI, Selin->AI())->CrystalGUID == me->GetGUID())
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+8 -8
View File
@@ -73,10 +73,10 @@ public:
{
boss_vexallusAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 ChainLightningTimer;
uint32 ArcaneShockTimer;
@@ -92,8 +92,8 @@ public:
IntervalHealthAmount = 1;
Enraged = false;
if (pInstance)
pInstance->SetData(DATA_VEXALLUS_EVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_VEXALLUS_EVENT, NOT_STARTED);
}
void KilledUnit(Unit* /*victim*/)
@@ -103,16 +103,16 @@ public:
void JustDied(Unit* /*victim*/)
{
if (pInstance)
pInstance->SetData(DATA_VEXALLUS_EVENT, DONE);
if (instance)
instance->SetData(DATA_VEXALLUS_EVENT, DONE);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
if (pInstance)
pInstance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS);
}
void JustSummoned(Creature* summoned)
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+3 -3
View File
@@ -40,14 +40,14 @@ class instance_magisters_terrace : public InstanceMapScript
public:
instance_magisters_terrace() : InstanceMapScript("instance_magisters_terrace", 585) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_magisters_terrace_InstanceMapScript(pMap);
return new instance_magisters_terrace_InstanceMapScript(map);
}
struct instance_magisters_terrace_InstanceMapScript : public InstanceScript
{
instance_magisters_terrace_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint32 DelrissaDeathCount;
src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+3 -3
View File
@@ -128,12 +128,12 @@ public:
// some targeting issues with the spell, so use this workaround as temporary solution
void DoWorkaroundForQuestCredit()
{
Map* pMap = me->GetMap();
Map* map = me->GetMap();
if (!pMap || pMap->IsHeroic())
if (!map || map->IsHeroic())
return;
Map::PlayerList const &lList = pMap->GetPlayers();
Map::PlayerList const &lList = map->GetPlayers();
if (lList.isEmpty())
return;
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+2 -2
View File
@@ -313,9 +313,9 @@ class go_acherus_soul_prison : public GameObjectScript
public:
go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") { }
bool OnGossipHello(Player* player, GameObject* pGo)
bool OnGossipHello(Player* player, GameObject* go)
{
if (Creature* anchor = pGo->FindNearestCreature(29521, 15))
if (Creature* anchor = go->FindNearestCreature(29521, 15))
if (uint64 prisonerGUID = anchor->AI()->GetGUID())
if (Creature* prisoner = Creature::GetCreature(*player, prisonerGUID))
CAST_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, player);
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+4 -4
View File
@@ -177,9 +177,9 @@ class npc_koltira_deathweaver : public CreatureScript
public:
npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { }
bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest)
{
if (pQuest->GetQuestId() == QUEST_BREAKOUT)
if (quest->GetQuestId() == QUEST_BREAKOUT)
{
creature->SetStandState(UNIT_STAND_STATE_STAND);
@@ -305,9 +305,9 @@ public:
break;
case 4:
{
Creature* pTemp = Unit::GetCreature(*me, m_uiValrothGUID);
Creature* temp = Unit::GetCreature(*me, m_uiValrothGUID);
if (!pTemp || !pTemp->isAlive())
if (!temp || !temp->isAlive())
{
DoScriptText(SAY_BREAKOUT8, me);
m_uiWave_Timer = 5000;
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+432 -432
View File
File diff suppressed because it is too large Load Diff
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+17 -17
View File
@@ -361,10 +361,10 @@ public:
{
boss_headless_horsemanAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 headGUID;
uint64 PlayerGUID;
@@ -413,8 +413,8 @@ public:
headGUID = 0;
}
//if (pInstance)
// pInstance->SetData(DATA_HORSEMAN_EVENT, NOT_STARTED);
//if (instance)
// instance->SetData(DATA_HORSEMAN_EVENT, NOT_STARTED);
}
void FlyMode()
@@ -450,8 +450,8 @@ public:
break;
}
case 6:
if (pInstance)
pInstance->SetData(GAMEOBJECT_PUMPKIN_SHRINE, 0); //hide gameobject
if (instance)
instance->SetData(GAMEOBJECT_PUMPKIN_SHRINE, 0); //hide gameobject
break;
case 19:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_LEVITATING);
@@ -473,8 +473,8 @@ public:
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS);
DoZoneInCombat();
}
void AttackStart(Unit* who) {ScriptedAI::AttackStart(who);}
@@ -503,10 +503,10 @@ public:
Player* SelectRandomPlayer(float range = 0.0f, bool checkLoS = true)
{
Map* pMap = me->GetMap();
if (!pMap->IsDungeon()) return NULL;
Map* map = me->GetMap();
if (!map->IsDungeon()) return NULL;
Map::PlayerList const &PlayerList = pMap->GetPlayers();
Map::PlayerList const &PlayerList = map->GetPlayers();
Map::PlayerList::const_iterator i;
if (PlayerList.isEmpty()) return NULL;
@@ -542,8 +542,8 @@ public:
flame->CastSpell(flame, SPELL_BODY_FLAME, false);
if (Creature* wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000))
CAST_AI(mob_wisp_invis::mob_wisp_invisAI, wisp->AI())->SetType(4);
if (pInstance)
pInstance->SetData(DATA_HORSEMAN_EVENT, DONE);
if (instance)
instance->SetData(DATA_HORSEMAN_EVENT, DONE);
}
void SpellHit(Unit* caster, const SpellInfo* spell)
@@ -824,12 +824,12 @@ public:
bool OnGossipHello(Player* player, GameObject* soil)
{
InstanceScript* pInstance = player->GetInstanceScript();
if (pInstance)
InstanceScript* instance = player->GetInstanceScript();
if (instance)
{
if (pInstance->GetData(DATA_HORSEMAN_EVENT) != NOT_STARTED)
if (instance->GetData(DATA_HORSEMAN_EVENT) != NOT_STARTED)
return true;
pInstance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS);
instance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS);
}
/* if (soil->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER && player->getLevel() > 64)
{
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+4 -4
View File
@@ -51,10 +51,10 @@ public:
{
boss_interrogator_vishasAI(Creature* c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
bool Yell30;
bool Yell60;
@@ -77,11 +77,11 @@ public:
void JustDied(Unit* /*Killer*/)
{
if (!pInstance)
if (!instance)
return;
//Any other actions to do with vorrel? setStandState?
if (Unit* vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL)))
if (Unit* vorrel = Unit::GetUnit(*me, instance->GetData64(DATA_VORREL)))
DoScriptText(SAY_TRIGGER_VORREL, vorrel);
}
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+23 -23
View File
@@ -67,10 +67,10 @@ public:
{
boss_scarlet_commander_mograineAI(Creature* creature) : ScriptedAI(creature)
{
m_pInstance = creature->GetInstanceScript();
m_instance = creature->GetInstanceScript();
}
InstanceScript* m_pInstance;
InstanceScript* m_instance;
uint32 m_uiCrusaderStrike_Timer;
uint32 m_uiHammerOfJustice_Timer;
@@ -89,9 +89,9 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetStandState(UNIT_STAND_STATE_STAND);
if (m_pInstance)
if (m_instance)
if (me->isAlive())
m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED);
m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED);
m_bHasDied = false;
m_bHeal = false;
@@ -100,10 +100,10 @@ public:
void JustReachedHome()
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT != NOT_STARTED))
m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, FAIL);
if (m_instance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT != NOT_STARTED))
m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, FAIL);
}
}
@@ -125,13 +125,13 @@ public:
if (uiDamage < me->GetHealth() || m_bHasDied || m_bFakeDeath)
return;
if (!m_pInstance)
if (!m_instance)
return;
//On first death, fake death and open door, as well as initiate whitemane if exist
if (Unit* Whitemane = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_WHITEMANE)))
if (Unit* Whitemane = Unit::GetUnit((*me), m_instance->GetData64(DATA_WHITEMANE)))
{
m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS);
m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS);
Whitemane->GetMotionMaster()->MovePoint(1, 1163.113370f, 1398.856812f, 32.527786f);
@@ -165,8 +165,8 @@ public:
DoScriptText(SAY_MO_RESSURECTED, me);
m_bFakeDeath = false;
if (m_pInstance)
m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, SPECIAL);
if (m_instance)
m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, SPECIAL);
}
}
@@ -175,10 +175,10 @@ public:
if (!UpdateVictim())
return;
if (m_bHasDied && !m_bHeal && m_pInstance && m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == SPECIAL)
if (m_bHasDied && !m_bHeal && m_instance && m_instance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == SPECIAL)
{
//On ressurection, stop fake death and heal whitemane and resume fight
if (Unit* Whitemane = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_WHITEMANE)))
if (Unit* Whitemane = Unit::GetUnit((*me), m_instance->GetData64(DATA_WHITEMANE)))
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetStandState(UNIT_STAND_STATE_STAND);
@@ -232,10 +232,10 @@ public:
{
boss_high_inquisitor_whitemaneAI(Creature* creature) : ScriptedAI(creature)
{
m_pInstance = creature->GetInstanceScript();
m_instance = creature->GetInstanceScript();
}
InstanceScript* m_pInstance;
InstanceScript* m_instance;
uint32 m_uiHeal_Timer;
uint32 m_uiPowerWordShield_Timer;
@@ -255,14 +255,14 @@ public:
m_bCanResurrectCheck = false;
m_bCanResurrect = false;
if (m_pInstance)
if (m_instance)
if (me->isAlive())
m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED);
m_instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED);
}
void AttackStart(Unit* who)
{
if (m_pInstance && m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == NOT_STARTED)
if (m_instance && m_instance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == NOT_STARTED)
return;
ScriptedAI::AttackStart(who);
@@ -286,9 +286,9 @@ public:
if (m_bCanResurrect)
{
//When casting resuruction make sure to delay so on rez when reinstate battle deepsleep runs out
if (m_pInstance && m_uiWait_Timer <= uiDiff)
if (m_instance && m_uiWait_Timer <= uiDiff)
{
if (Unit* Mograine = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_MOGRAINE)))
if (Unit* Mograine = Unit::GetUnit((*me), m_instance->GetData64(DATA_MOGRAINE)))
{
DoCast(Mograine, SPELL_SCARLETRESURRECTION);
DoScriptText(SAY_WH_RESSURECT, me);
@@ -322,9 +322,9 @@ public:
if (!HealthAbovePct(75))
target = me;
if (m_pInstance)
if (m_instance)
{
if (Creature* pMograine = Unit::GetCreature((*me), m_pInstance->GetData64(DATA_MOGRAINE)))
if (Creature* pMograine = Unit::GetCreature((*me), m_instance->GetData64(DATA_MOGRAINE)))
{
// checking m_bCanResurrectCheck prevents her healing Mograine while he is "faking death"
if (m_bCanResurrectCheck && pMograine->isAlive() && !pMograine->HealthAbovePct(75))
src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+3 -3
View File
@@ -38,14 +38,14 @@ class instance_scarlet_monastery : public InstanceMapScript
public:
instance_scarlet_monastery() : InstanceMapScript("instance_scarlet_monastery", 189) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_scarlet_monastery_InstanceMapScript(pMap);
return new instance_scarlet_monastery_InstanceMapScript(map);
}
struct instance_scarlet_monastery_InstanceMapScript : public InstanceScript
{
instance_scarlet_monastery_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_scarlet_monastery_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint64 PumpkinShrineGUID;
uint64 HorsemanGUID;
src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+4 -4
View File
@@ -64,10 +64,10 @@ public:
{
boss_darkmaster_gandlingAI(Creature* c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 ArcaneMissiles_Timer;
uint32 ShadowShield_Timer;
@@ -88,8 +88,8 @@ public:
void JustDied(Unit* /*killer*/)
{
if (pInstance)
pInstance->SetData(TYPE_GANDLING, DONE);
if (instance)
instance->SetData(TYPE_GANDLING, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+4 -4
View File
@@ -60,12 +60,12 @@ public:
void JustDied(Unit* /*killer*/)
{
InstanceScript* pInstance = me->GetInstanceScript();
if (pInstance)
InstanceScript* instance = me->GetInstanceScript();
if (instance)
{
pInstance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0);
instance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+4 -4
View File
@@ -60,12 +60,12 @@ public:
void JustDied(Unit* /*killer*/)
{
InstanceScript* pInstance = me->GetInstanceScript();
if (pInstance)
InstanceScript* instance = me->GetInstanceScript();
if (instance)
{
pInstance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0);
instance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+4 -4
View File
@@ -67,12 +67,12 @@ public:
void JustDied(Unit* /*killer*/)
{
InstanceScript* pInstance = me->GetInstanceScript();
if (pInstance)
InstanceScript* instance = me->GetInstanceScript();
if (instance)
{
pInstance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0);
instance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+4 -4
View File
@@ -56,12 +56,12 @@ public:
void JustDied(Unit* /*killer*/)
{
InstanceScript* pInstance = me->GetInstanceScript();
if (pInstance)
InstanceScript* instance = me->GetInstanceScript();
if (instance)
{
pInstance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0);
instance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+4 -4
View File
@@ -60,12 +60,12 @@ public:
void JustDied(Unit* /*killer*/)
{
InstanceScript* pInstance = me->GetInstanceScript();
if (pInstance)
InstanceScript* instance = me->GetInstanceScript();
if (instance)
{
pInstance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0);
instance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+4 -4
View File
@@ -62,12 +62,12 @@ public:
void JustDied(Unit* /*killer*/)
{
InstanceScript* pInstance = me->GetInstanceScript();
if (pInstance)
InstanceScript* instance = me->GetInstanceScript();
if (instance)
{
pInstance->SetData(DATA_THERAVENIAN_DEATH, 0);
instance->SetData(DATA_THERAVENIAN_DEATH, 0);
if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS)
if (instance->GetData(TYPE_GANDLING) == IN_PROGRESS)
me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0);
}
}
src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+3 -3
View File
@@ -42,14 +42,14 @@ class instance_scholomance : public InstanceMapScript
public:
instance_scholomance() : InstanceMapScript("instance_scholomance", 289) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_scholomance_InstanceMapScript(pMap);
return new instance_scholomance_InstanceMapScript(map);
}
struct instance_scholomance_InstanceMapScript : public InstanceScript
{
instance_scholomance_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_scholomance_InstanceMapScript(Map* map) : InstanceScript(map) {}
//Lord Alexei Barov, Doctor Theolen Krastinov, The Ravenian, Lorekeeper Polkelt, Instructor Malicia and the Lady Illucia Barov.
bool IsBossDied[6];
src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+3 -3
View File
@@ -59,14 +59,14 @@ class instance_shadowfang_keep : public InstanceMapScript
public:
instance_shadowfang_keep() : InstanceMapScript("instance_shadowfang_keep", 33) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_shadowfang_keep_InstanceMapScript(pMap);
return new instance_shadowfang_keep_InstanceMapScript(map);
}
struct instance_shadowfang_keep_InstanceMapScript : public InstanceScript
{
instance_shadowfang_keep_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+10 -10
View File
@@ -78,9 +78,9 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
InstanceScript* pInstance = creature->GetInstanceScript();
InstanceScript* instance = creature->GetInstanceScript();
if (pInstance && pInstance->GetData(TYPE_FREE_NPC) != DONE && pInstance->GetData(TYPE_RETHILGORE) == DONE)
if (instance && instance->GetData(TYPE_FREE_NPC) != DONE && instance->GetData(TYPE_RETHILGORE) == DONE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DOOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
@@ -92,11 +92,11 @@ public:
{
npc_shadowfang_prisonerAI(Creature* c) : npc_escortAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
uiNpcEntry = c->GetEntry();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 uiNpcEntry;
void WaypointReached(uint32 uiPoint)
@@ -125,8 +125,8 @@ public:
else
DoScriptText(SAY_POST1_DOOR_AD, me);
if (pInstance)
pInstance->SetData(TYPE_FREE_NPC, DONE);
if (instance)
instance->SetData(TYPE_FREE_NPC, DONE);
break;
case 13:
if (uiNpcEntry != NPC_ASH)
@@ -155,10 +155,10 @@ public:
{
npc_arugal_voidwalkerAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 uiDarkOffering;
@@ -189,8 +189,8 @@ public:
void JustDied(Unit* /*killer*/)
{
if (pInstance)
pInstance->SetData(TYPE_FENRUS, pInstance->GetData(TYPE_FENRUS) + 1);
if (instance)
instance->SetData(TYPE_FENRUS, instance->GetData(TYPE_FENRUS) + 1);
}
};
src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+8 -8
View File
@@ -91,10 +91,10 @@ public:
{
boss_baron_rivendareAI(Creature* c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 ShadowBolt_Timer;
uint32 Cleave_Timer;
@@ -109,14 +109,14 @@ public:
MortalStrike_Timer = 12000;
// RaiseDead_Timer = 30000;
SummonSkeletons_Timer = 34000;
if (pInstance && pInstance->GetData(TYPE_RAMSTEIN) == DONE)
pInstance->SetData(TYPE_BARON, NOT_STARTED);
if (instance && instance->GetData(TYPE_RAMSTEIN) == DONE)
instance->SetData(TYPE_BARON, NOT_STARTED);
}
void AttackStart(Unit* who)
{
if (pInstance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door
pInstance->SetData(TYPE_BARON, IN_PROGRESS);
if (instance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door
instance->SetData(TYPE_BARON, IN_PROGRESS);
ScriptedAI::AttackStart(who);
}
@@ -128,8 +128,8 @@ public:
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
pInstance->SetData(TYPE_BARON, DONE);
if (instance)
instance->SetData(TYPE_BARON, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+4 -4
View File
@@ -45,10 +45,10 @@ public:
{
boss_baroness_anastariAI(Creature* c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 BansheeWail_Timer;
uint32 BansheeCurse_Timer;
@@ -69,8 +69,8 @@ public:
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
pInstance->SetData(TYPE_BARONESS, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_BARONESS, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+4 -4
View File
@@ -45,10 +45,10 @@ public:
{
boss_maleki_the_pallidAI(Creature* c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 Frostbolt_Timer;
uint32 IceTomb_Timer;
@@ -67,8 +67,8 @@ public:
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
pInstance->SetData(TYPE_PALLID, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_PALLID, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+4 -4
View File
@@ -45,10 +45,10 @@ public:
{
boss_nerubenkanAI(Creature* c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 EncasingWebs_Timer;
uint32 PierceArmor_Timer;
@@ -69,8 +69,8 @@ public:
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
pInstance->SetData(TYPE_NERUB, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_NERUB, IN_PROGRESS);
}
void RaiseUndeadScarab(Unit* victim)
src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+15 -15
View File
@@ -56,10 +56,10 @@ public:
{
boss_silver_hand_bossesAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 HolyLight_Timer;
uint32 DivineShield_Timer;
@@ -69,24 +69,24 @@ public:
HolyLight_Timer = 20000;
DivineShield_Timer = 20000;
if (pInstance)
if (instance)
{
switch (me->GetEntry())
{
case SH_AELMAR:
pInstance->SetData(TYPE_SH_AELMAR, 0);
instance->SetData(TYPE_SH_AELMAR, 0);
break;
case SH_CATHELA:
pInstance->SetData(TYPE_SH_CATHELA, 0);
instance->SetData(TYPE_SH_CATHELA, 0);
break;
case SH_GREGOR:
pInstance->SetData(TYPE_SH_GREGOR, 0);
instance->SetData(TYPE_SH_GREGOR, 0);
break;
case SH_NEMAS:
pInstance->SetData(TYPE_SH_NEMAS, 0);
instance->SetData(TYPE_SH_NEMAS, 0);
break;
case SH_VICAR:
pInstance->SetData(TYPE_SH_VICAR, 0);
instance->SetData(TYPE_SH_VICAR, 0);
break;
}
}
@@ -98,27 +98,27 @@ public:
void JustDied(Unit* Killer)
{
if (pInstance)
if (instance)
{
switch (me->GetEntry())
{
case SH_AELMAR:
pInstance->SetData(TYPE_SH_AELMAR, 2);
instance->SetData(TYPE_SH_AELMAR, 2);
break;
case SH_CATHELA:
pInstance->SetData(TYPE_SH_CATHELA, 2);
instance->SetData(TYPE_SH_CATHELA, 2);
break;
case SH_GREGOR:
pInstance->SetData(TYPE_SH_GREGOR, 2);
instance->SetData(TYPE_SH_GREGOR, 2);
break;
case SH_NEMAS:
pInstance->SetData(TYPE_SH_NEMAS, 2);
instance->SetData(TYPE_SH_NEMAS, 2);
break;
case SH_VICAR:
pInstance->SetData(TYPE_SH_VICAR, 2);
instance->SetData(TYPE_SH_VICAR, 2);
break;
}
if (pInstance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER)
if (instance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(Killer)->KilledMonsterCredit(SH_QUEST_CREDIT, 0);
}
}
src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+4 -4
View File
@@ -45,10 +45,10 @@ public:
{
boss_ramstein_the_gorgerAI(Creature* c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 Trample_Timer;
uint32 Knockout_Timer;
@@ -71,8 +71,8 @@ public:
mob->AI()->AttackStart(me->SelectNearestTarget(100.0f));
}
if (pInstance)
pInstance->SetData(TYPE_RAMSTEIN, DONE);
if (instance)
instance->SetData(TYPE_RAMSTEIN, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+10 -10
View File
@@ -19,7 +19,7 @@
/* ScriptData
SDName: Stratholme
SD%Complete: 100
SDComment: Misc mobs for instance. pGo-script to apply aura and start event for quest 8945
SDComment: Misc mobs for instance. go-script to apply aura and start event for quest 8945
SDCategory: Stratholme
EndScriptData */
@@ -43,14 +43,14 @@ class go_gauntlet_gate : public GameObjectScript
public:
go_gauntlet_gate() : GameObjectScript("go_gauntlet_gate") { }
bool OnGossipHello(Player* player, GameObject* pGo)
bool OnGossipHello(Player* player, GameObject* go)
{
InstanceScript* pInstance = pGo->GetInstanceScript();
InstanceScript* instance = go->GetInstanceScript();
if (!pInstance)
if (!instance)
return false;
if (pInstance->GetData(TYPE_BARON_RUN) != NOT_STARTED)
if (instance->GetData(TYPE_BARON_RUN) != NOT_STARTED)
return false;
if (Group* group = player->GetGroup())
@@ -63,15 +63,15 @@ public:
if (pGroupie->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE &&
!pGroupie->HasAura(SPELL_BARON_ULTIMATUM) &&
pGroupie->GetMap() == pGo->GetMap())
pGroupie->GetMap() == go->GetMap())
pGroupie->CastSpell(pGroupie, SPELL_BARON_ULTIMATUM, true);
}
} else if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE &&
!player->HasAura(SPELL_BARON_ULTIMATUM) &&
player->GetMap() == pGo->GetMap())
player->GetMap() == go->GetMap())
player->CastSpell(player, SPELL_BARON_ULTIMATUM, true);
pInstance->SetData(TYPE_BARON_RUN, IN_PROGRESS);
instance->SetData(TYPE_BARON_RUN, IN_PROGRESS);
return false;
}
@@ -177,9 +177,9 @@ public:
{
if (Die_Timer <= diff)
{
if (Unit* pTemp = Unit::GetUnit(*me, Tagger))
if (Unit* temp = Unit::GetUnit(*me, Tagger))
{
CAST_PLR(pTemp)->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID());
CAST_PLR(temp)->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID());
me->Kill(me);
}
} else Die_Timer -= diff;
src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+3 -3
View File
@@ -44,14 +44,14 @@ class instance_sunken_temple : public InstanceMapScript
public:
instance_sunken_temple() : InstanceMapScript("instance_sunken_temple", 109) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_sunken_temple_InstanceMapScript(pMap);
return new instance_sunken_temple_InstanceMapScript(map);
}
struct instance_sunken_temple_InstanceMapScript : public InstanceScript
{
instance_sunken_temple_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
instance_sunken_temple_InstanceMapScript(Map* map) : InstanceScript(map)
{
}
src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
+3 -3
View File
@@ -56,10 +56,10 @@ class go_atalai_statue : public GameObjectScript
public:
go_atalai_statue() : GameObjectScript("go_atalai_statue") { }
bool OnGossipHello(Player* player, GameObject* pGo)
bool OnGossipHello(Player* player, GameObject* go)
{
if (InstanceScript* pInstance = player->GetInstanceScript())
pInstance->SetData(EVENT_STATE, pGo->GetEntry());
if (InstanceScript* instance = player->GetInstanceScript())
instance->SetData(EVENT_STATE, go->GetEntry());
return false;
}
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+13 -13
View File
@@ -80,11 +80,11 @@ public:
{
boss_brutallusAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
Intro = true;
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 SlashTimer;
uint32 BurnTimer;
@@ -115,16 +115,16 @@ public:
DoCast(me, SPELL_DUAL_WIELD, true);
if (pInstance)
pInstance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(YELL_AGGRO, me);
if (pInstance)
pInstance->SetData(DATA_BRUTALLUS_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_BRUTALLUS_EVENT, IN_PROGRESS);
}
void KilledUnit(Unit* /*victim*/)
@@ -136,9 +136,9 @@ public:
{
DoScriptText(YELL_DEATH, me);
if (pInstance)
if (instance)
{
pInstance->SetData(DATA_BRUTALLUS_EVENT, DONE);
instance->SetData(DATA_BRUTALLUS_EVENT, DONE);
float x, y, z;
me->GetPosition(x, y, z);
me->SummonCreature(FELMYST, x, y, z+30, me->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0);
@@ -155,7 +155,7 @@ public:
{
if (!Intro || IsIntro)
return;
Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0);
Creature* Madrigosa = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_MADRIGOSA) : 0);
if (Madrigosa)
{
Madrigosa->Respawn();
@@ -191,7 +191,7 @@ public:
void DoIntro()
{
Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0);
Creature* Madrigosa = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_MADRIGOSA) : 0);
if (!Madrigosa)
return;
@@ -271,8 +271,8 @@ public:
{
if (!me->IsValidAttackTarget(who))
return;
if (pInstance && Intro)
pInstance->SetData(DATA_BRUTALLUS_EVENT, SPECIAL);
if (instance && Intro)
instance->SetData(DATA_BRUTALLUS_EVENT, SPECIAL);
if (Intro && !IsIntro)
StartIntro();
@@ -292,7 +292,7 @@ public:
{
if (IntroFrostBoltTimer <= diff)
{
if (Creature* Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0))
if (Creature* Madrigosa = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_MADRIGOSA) : 0))
{
Madrigosa->CastSpell(me, SPELL_INTRO_FROSTBOLT, true);
IntroFrostBoltTimer = 2000;
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+31 -31
View File
@@ -99,10 +99,10 @@ public:
{
boss_sacrolashAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
bool SisterDeath;
bool Enraged;
@@ -118,9 +118,9 @@ public:
{
Enraged = false;
if (pInstance)
if (instance)
{
Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS));
Unit* Temp = Unit::GetUnit((*me), instance->GetData64(DATA_ALYTHESS));
if (Temp)
{
if (Temp->isDead())
@@ -142,23 +142,23 @@ public:
SisterDeath = false;
}
if (pInstance)
pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* who)
{
DoZoneInCombat();
if (pInstance)
if (instance)
{
Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS));
Unit* Temp = Unit::GetUnit((*me), instance->GetData64(DATA_ALYTHESS));
if (Temp && Temp->isAlive() && !(Temp->getVictim()))
CAST_CRE(Temp)->AI()->AttackStart(who);
}
if (pInstance)
pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS);
}
void KilledUnit(Unit* /*victim*/)
@@ -174,8 +174,8 @@ public:
{
DoScriptText(SAY_SAC_DEAD, me);
if (pInstance)
pInstance->SetData(DATA_EREDAR_TWINS_EVENT, DONE);
if (instance)
instance->SetData(DATA_EREDAR_TWINS_EVENT, DONE);
}
else
me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
@@ -228,10 +228,10 @@ public:
{
if (!SisterDeath)
{
if (pInstance)
if (instance)
{
Unit* Temp = NULL;
Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS));
Temp = Unit::GetUnit((*me), instance->GetData64(DATA_ALYTHESS));
if (Temp && Temp->isDead())
{
DoScriptText(YELL_SISTER_ALYTHESS_DEAD, me);
@@ -357,11 +357,11 @@ public:
{
boss_alythessAI(Creature* c) : Scripted_NoMovementAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
IntroStepCounter = 10;
}
InstanceScript* pInstance;
InstanceScript* instance;
bool SisterDeath;
bool Enraged;
@@ -380,9 +380,9 @@ public:
{
Enraged = false;
if (pInstance)
if (instance)
{
Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH));
Unit* Temp = Unit::GetUnit((*me), instance->GetData64(DATA_SACROLASH));
if (Temp)
{
if (Temp->isDead())
@@ -405,23 +405,23 @@ public:
SisterDeath = false;
}
if (pInstance)
pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* who)
{
DoZoneInCombat();
if (pInstance)
if (instance)
{
Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH));
Unit* Temp = Unit::GetUnit((*me), instance->GetData64(DATA_SACROLASH));
if (Temp && Temp->isAlive() && !(Temp->getVictim()))
CAST_CRE(Temp)->AI()->AttackStart(who);
}
if (pInstance)
pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS);
}
void AttackStart(Unit* who)
@@ -468,8 +468,8 @@ public:
{
DoScriptText(YELL_ALY_DEAD, me);
if (pInstance)
pInstance->SetData(DATA_EREDAR_TWINS_EVENT, DONE);
if (instance)
instance->SetData(DATA_EREDAR_TWINS_EVENT, DONE);
}
else
me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
@@ -524,7 +524,7 @@ public:
uint32 IntroStep(uint32 step)
{
Creature* Sacrolash = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_SACROLASH) : 0);
Creature* Sacrolash = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_SACROLASH) : 0);
switch (step)
{
case 0: return 0;
@@ -564,10 +564,10 @@ public:
if (!SisterDeath)
{
if (pInstance)
if (instance)
{
Unit* Temp = NULL;
Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH));
Temp = Unit::GetUnit((*me), instance->GetData64(DATA_SACROLASH));
if (Temp && Temp->isDead())
{
DoScriptText(YELL_SISTER_SACROLASH_DEAD, me);
@@ -579,9 +579,9 @@ public:
}
if (!me->getVictim())
{
if (pInstance)
if (instance)
{
Creature* sisiter = Unit::GetCreature((*me), pInstance->GetData64(DATA_SACROLASH));
Creature* sisiter = Unit::GetCreature((*me), instance->GetData64(DATA_SACROLASH));
if (sisiter && !sisiter->isDead() && sisiter->getVictim())
{
me->AddThreat(sisiter->getVictim(), 0.0f);
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+12 -12
View File
@@ -117,10 +117,10 @@ public:
{
boss_felmystAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
PhaseFelmyst phase;
EventMap events;
@@ -144,8 +144,8 @@ public:
DespawnSummons(MOB_VAPOR_TRAIL);
me->setActive(false);
if (pInstance)
pInstance->SetData(DATA_FELMYST_EVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_FELMYST_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
@@ -158,8 +158,8 @@ public:
DoCast(me, AURA_NOXIOUS_FUMES, true);
EnterPhase(PHASE_GROUND);
if (pInstance)
pInstance->SetData(DATA_FELMYST_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_FELMYST_EVENT, IN_PROGRESS);
}
void AttackStart(Unit* who)
@@ -188,8 +188,8 @@ public:
{
DoScriptText(YELL_DEATH, me);
if (pInstance)
pInstance->SetData(DATA_FELMYST_EVENT, DONE);
if (instance)
instance->SetData(DATA_FELMYST_EVENT, DONE);
}
void SpellHit(Unit* caster, const SpellInfo* spell)
@@ -284,7 +284,7 @@ public:
{
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
if (!target)
target = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0);
target = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0);
if (!target)
{
@@ -311,7 +311,7 @@ public:
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
if (!target)
target = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0);
target = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0);
if (!target)
{
@@ -319,7 +319,7 @@ public:
return;
}
//pTarget->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support
//target->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support
Creature* pVapor = me->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
if (pVapor)
{
@@ -341,7 +341,7 @@ public:
{
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
if (!target)
target = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0);
target = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0);
if (!target)
{
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+25 -25
View File
@@ -117,14 +117,14 @@ public:
{
boss_kalecgosAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
SathGUID = 0;
DoorGUID = 0;
bJustReset = false;
me->setActive(true);
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 ArcaneBuffetTimer;
uint32 FrostBreathTimer;
@@ -146,10 +146,10 @@ public:
void Reset()
{
if (pInstance)
if (instance)
{
SathGUID = pInstance->GetData64(DATA_SATHROVARR);
pInstance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED);
SathGUID = instance->GetData64(DATA_SATHROVARR);
instance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED);
}
if (Creature* Sath = Unit::GetCreature(*me, SathGUID))
@@ -351,8 +351,8 @@ public:
DoScriptText(SAY_EVIL_AGGRO, me);
DoZoneInCombat();
if (pInstance)
pInstance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS);
}
void KilledUnit(Unit* /*victim*/)
@@ -445,7 +445,7 @@ public:
struct boss_kalecAI : public ScriptedAI
{
InstanceScript* pInstance;
InstanceScript* instance;
uint32 RevitalizeTimer;
uint32 HeroicStrikeTimer;
@@ -458,13 +458,13 @@ public:
boss_kalecAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
void Reset()
{
if (pInstance)
SathGUID = pInstance->GetData64(DATA_SATHROVARR);
if (instance)
SathGUID = instance->GetData64(DATA_SATHROVARR);
RevitalizeTimer = 5000;
HeroicStrikeTimer = 3000;
@@ -540,14 +540,14 @@ class kalecgos_teleporter : public GameObjectScript
public:
kalecgos_teleporter() : GameObjectScript("kalecgos_teleporter") { }
bool OnGossipHello(Player* player, GameObject* pGo)
bool OnGossipHello(Player* player, GameObject* go)
{
uint8 SpectralPlayers = 0;
Map* pMap = pGo->GetMap();
if (!pMap->IsDungeon())
Map* map = go->GetMap();
if (!map->IsDungeon())
return true;
Map::PlayerList const &PlayerList = pMap->GetPlayers();
Map::PlayerList const &PlayerList = map->GetPlayers();
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
if (i->getSource() && i->getSource()->GetPositionZ() < DEMON_REALM_Z + 5)
@@ -577,12 +577,12 @@ public:
{
boss_sathrovarrAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
KalecGUID = 0;
KalecgosGUID = 0;
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 CorruptionStrikeTimer;
uint32 AgonyCurseTimer;
@@ -600,10 +600,10 @@ public:
{
me->SetFullHealth();//dunno why it does not resets health at evade..
me->setActive(true);
if (pInstance)
if (instance)
{
KalecgosGUID = pInstance->GetData64(DATA_KALECGOS_DRAGON);
pInstance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED);
KalecgosGUID = instance->GetData64(DATA_KALECGOS_DRAGON);
instance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED);
}
if (KalecGUID)
{
@@ -669,15 +669,15 @@ public:
CAST_AI(boss_kalecgos::boss_kalecgosAI, Kalecgos->AI())->isFriendly = true;
}
if (pInstance)
pInstance->SetData(DATA_KALECGOS_EVENT, DONE);
if (instance)
instance->SetData(DATA_KALECGOS_EVENT, DONE);
}
void TeleportAllPlayersBack()
{
Map* pMap = me->GetMap();
if (!pMap->IsDungeon()) return;
Map::PlayerList const &PlayerList = pMap->GetPlayers();
Map* map = me->GetMap();
if (!map->IsDungeon()) return;
Map::PlayerList const &PlayerList = map->GetPlayers();
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
if (i->getSource()->GetPositionZ() <= DRAGON_REALM_Z-5)
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+42 -42
View File
@@ -253,10 +253,10 @@ public:
{
boss_kalecgos_kjAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint8 OrbsEmpowered;
uint8 EmpowerCount;
@@ -275,19 +275,19 @@ public:
GameObject* GetOrb(int32 index)
{
if (!pInstance)
if (!instance)
return NULL;
switch (index)
{
case 0:
return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1));
return instance->instance->GetGameObject(instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1));
case 1:
return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_2));
return instance->instance->GetGameObject(instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_2));
case 2:
return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_3));
return instance->instance->GetGameObject(instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_3));
case 3:
return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_4));
return instance->instance->GetGameObject(instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_4));
}
return NULL;
@@ -374,19 +374,19 @@ class go_orb_of_the_blue_flight : public GameObjectScript
public:
go_orb_of_the_blue_flight() : GameObjectScript("go_orb_of_the_blue_flight") { }
bool OnGossipHello(Player* player, GameObject* pGo)
bool OnGossipHello(Player* player, GameObject* go)
{
if (pGo->GetUInt32Value(GAMEOBJECT_FACTION) == 35)
if (go->GetUInt32Value(GAMEOBJECT_FACTION) == 35)
{
InstanceScript* pInstance = pGo->GetInstanceScript();
InstanceScript* instance = go->GetInstanceScript();
player->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000);
player->CastSpell(player, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, false);
pGo->SetUInt32Value(GAMEOBJECT_FACTION, 0);
go->SetUInt32Value(GAMEOBJECT_FACTION, 0);
if (Creature* pKalec = Unit::GetCreature(*player, pInstance->GetData64(DATA_KALECGOS_KJ)))
if (Creature* pKalec = Unit::GetCreature(*player, instance->GetData64(DATA_KALECGOS_KJ)))
CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalec->AI())->SetRingOfBlueFlames();
pGo->Refresh();
go->Refresh();
}
return true;
}
@@ -408,10 +408,10 @@ public:
{
mob_kiljaeden_controllerAI(Creature* c) : Scripted_NoMovementAI(c), summons(me)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
SummonList summons;
bool bSummonedDeceivers;
@@ -434,7 +434,7 @@ public:
{
phase = PHASE_DECEIVERS;
if (Creature* pKalecKJ = Unit::GetCreature((*me), pInstance->GetData64(DATA_KALECGOS_KJ)))
if (Creature* pKalecKJ = Unit::GetCreature((*me), instance->GetData64(DATA_KALECGOS_KJ)))
CAST_AI(boss_kalecgos_kj::boss_kalecgos_kjAI, pKalecKJ->AI())->ResetOrbs();
deceiverDeathCount = 0;
bSummonedDeceivers = false;
@@ -467,7 +467,7 @@ public:
{
if (uiRandomSayTimer < diff)
{
if (pInstance && pInstance->GetData(DATA_MURU_EVENT) != DONE && pInstance->GetData(DATA_KILJAEDEN_EVENT) == NOT_STARTED)
if (instance && instance->GetData(DATA_MURU_EVENT) != DONE && instance->GetData(DATA_KILJAEDEN_EVENT) == NOT_STARTED)
DoScriptText(RAND(SAY_KJ_OFFCOMBAT1, SAY_KJ_OFFCOMBAT2, SAY_KJ_OFFCOMBAT3, SAY_KJ_OFFCOMBAT4, SAY_KJ_OFFCOMBAT5), me);
uiRandomSayTimer = 30000;
} else uiRandomSayTimer -= diff;
@@ -508,10 +508,10 @@ public:
{
boss_kiljaedenAI(Creature* c) : Scripted_NoMovementAI(c), summons(me)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
SummonList summons;
uint8 Phase;
@@ -567,9 +567,9 @@ public:
OrbActivated = false;
SpeechBegins = true;
if (pInstance)
if (instance)
{
if (Creature* pKalec = Unit::GetCreature(*me, pInstance->GetData64(DATA_KALECGOS_KJ)))
if (Creature* pKalec = Unit::GetCreature(*me, instance->GetData64(DATA_KALECGOS_KJ)))
pKalec->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES);
}
me->SetFloatValue(UNIT_FIELD_COMBATREACH, 12);
@@ -616,8 +616,8 @@ public:
DoScriptText(SAY_KJ_DEATH, me);
summons.DespawnAll();
if (pInstance)
pInstance->SetData(DATA_KILJAEDEN_EVENT, DONE);
if (instance)
instance->SetData(DATA_KILJAEDEN_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -631,9 +631,9 @@ public:
summons.DespawnAll();
// Reset the controller
if (pInstance)
if (instance)
{
if (Creature* pControl = Unit::GetCreature(*me, pInstance->GetData64(DATA_KILJAEDEN_CONTROLLER)))
if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER)))
CAST_AI(mob_kiljaeden_controller::mob_kiljaeden_controllerAI, pControl->AI())->Reset();
}
}
@@ -722,11 +722,11 @@ public:
if (Speeches[speechCount].timer < SpeechTimer)
{
SpeechTimer = 0;
if (pInstance)
if (Creature* pSpeechCreature = Unit::GetCreature(*me, pInstance->GetData64(Speeches[speechCount].creature)))
if (instance)
if (Creature* pSpeechCreature = Unit::GetCreature(*me, instance->GetData64(Speeches[speechCount].creature)))
DoScriptText(Speeches[speechCount].textid, pSpeechCreature);
if (speechCount == 12)
if (Creature* pAnveena = Unit::GetCreature(*me, pInstance->GetData64(DATA_ANVEENA)))
if (Creature* pAnveena = Unit::GetCreature(*me, instance->GetData64(DATA_ANVEENA)))
pAnveena->CastSpell(me, SPELL_SACRIFICE_OF_ANVEENA, false);
// ChangeTimers(true, 10000); // Kil should do an emote while screaming without attacking for 10 seconds
if (speechCount == speechPhaseEnd)
@@ -825,8 +825,8 @@ public:
}
break;
case TIMER_ORBS_EMPOWER: //Phase 3
if (pInstance)
if (Creature* pKalec = Unit::GetCreature(*me, pInstance->GetData64(DATA_KALECGOS_KJ)))
if (instance)
if (Creature* pKalec = Unit::GetCreature(*me, instance->GetData64(DATA_KALECGOS_KJ)))
{
switch (Phase)
{
@@ -922,10 +922,10 @@ public:
{
mob_hand_of_the_deceiverAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 ShadowBoltVolleyTimer;
uint32 FelfirePortalTimer;
@@ -935,8 +935,8 @@ public:
// TODO: Timers!
ShadowBoltVolleyTimer = urand(8000, 14000); // So they don't all cast it in the same moment.
FelfirePortalTimer = 20000;
if (pInstance)
pInstance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED);
}
void JustSummoned(Creature* summoned)
@@ -947,10 +947,10 @@ public:
void EnterCombat(Unit* who)
{
if (pInstance)
if (instance)
{
pInstance->SetData(DATA_KILJAEDEN_EVENT, IN_PROGRESS);
if (Creature* pControl = Unit::GetCreature(*me, pInstance->GetData64(DATA_KILJAEDEN_CONTROLLER)))
instance->SetData(DATA_KILJAEDEN_EVENT, IN_PROGRESS);
if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER)))
pControl->AddThreat(who, 1.0f);
}
me->InterruptNonMeleeSpells(true);
@@ -958,10 +958,10 @@ public:
void JustDied(Unit* /*killer*/)
{
if (!pInstance)
if (!instance)
return;
if (Creature* pControl = Unit::GetCreature(*me, pInstance->GetData64(DATA_KILJAEDEN_CONTROLLER)))
if (Creature* pControl = Unit::GetCreature(*me, instance->GetData64(DATA_KILJAEDEN_CONTROLLER)))
++(CAST_AI(mob_kiljaeden_controller::mob_kiljaeden_controllerAI, pControl->AI())->deceiverDeathCount);
}
@@ -1181,10 +1181,10 @@ public:
{
mob_shield_orbAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
bool bPointReached;
bool bClockwise;
@@ -1237,7 +1237,7 @@ public:
if (uiTimer <= diff)
{
if (Unit* random = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0))
if (Unit* random = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0))
DoCast(random, SPELL_SHADOW_BOLT, false);
uiTimer = urand(500, 1000);
} else uiTimer -= diff;
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+24 -24
View File
@@ -115,10 +115,10 @@ public:
{
boss_entropiusAI(Creature* c) : ScriptedAI(c), Summons(me)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
SummonList Summons;
uint32 BlackHoleSummonTimer;
@@ -130,8 +130,8 @@ public:
Summons.DespawnAll();
if (pInstance)
pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_MURU_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
@@ -139,8 +139,8 @@ public:
DoCastAOE(SPELL_NEGATIVE_ENERGY_E, true);
DoCast(me, SPELL_ENTROPIUS_SPAWN, false);
if (pInstance)
pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_MURU_EVENT, IN_PROGRESS);
}
void JustSummoned(Creature* summoned)
@@ -165,8 +165,8 @@ public:
{
Summons.DespawnAll();
if (pInstance)
pInstance->SetData(DATA_MURU_EVENT, DONE);
if (instance)
instance->SetData(DATA_MURU_EVENT, DONE);
}
void UpdateAI(const uint32 diff)
@@ -215,10 +215,10 @@ public:
{
boss_muruAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
SummonList Summons;
uint8 Phase;
@@ -242,16 +242,16 @@ public:
Summons.DespawnAll();
if (pInstance)
pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_MURU_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoCastAOE(SPELL_NEGATIVE_ENERGY, false);
if (pInstance)
pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_MURU_EVENT, IN_PROGRESS);
}
void DamageTaken(Unit* /*done_by*/, uint32 &damage)
@@ -292,9 +292,9 @@ public:
{
if (Timer[TIMER_PHASE] <= diff)
{
if (!pInstance)
if (!instance)
return;
switch (pInstance->GetData(DATA_MURU_EVENT))
switch (instance->GetData(DATA_MURU_EVENT))
{
case NOT_STARTED:
Reset();
@@ -380,10 +380,10 @@ public:
{
npc_muru_portalAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
SummonList Summons;
@@ -406,8 +406,8 @@ public:
void JustSummoned(Creature* summoned)
{
if (pInstance)
if (Player* Target = Unit::GetPlayer(*me, pInstance->GetData64(DATA_PLAYER_GUID)))
if (instance)
if (Player* Target = Unit::GetPlayer(*me, instance->GetData64(DATA_PLAYER_GUID)))
summoned->AI()->AttackStart(Target);
Summons.Summon(summoned);
@@ -435,7 +435,7 @@ public:
{
if (!SummonSentinel)
{
if (InAction && pInstance && pInstance->GetData(DATA_MURU_EVENT) == NOT_STARTED)
if (InAction && instance && instance->GetData(DATA_MURU_EVENT) == NOT_STARTED)
Reset();
return;
}
@@ -583,10 +583,10 @@ public:
{
npc_blackholeAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 DespawnTimer;
uint32 SpellTimer;
@@ -607,7 +607,7 @@ public:
{
if (SpellTimer <= diff)
{
Unit* Victim = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0);
Unit* Victim = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_PLAYER_GUID) : 0);
switch (NeedForAHack)
{
case 0:
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+3 -3
View File
@@ -42,14 +42,14 @@ class instance_sunwell_plateau : public InstanceMapScript
public:
instance_sunwell_plateau() : InstanceMapScript("instance_sunwell_plateau", 580) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_sunwell_plateau_InstanceMapScript(pMap);
return new instance_sunwell_plateau_InstanceMapScript(map);
}
struct instance_sunwell_plateau_InstanceMapScript : public InstanceScript
{
instance_sunwell_plateau_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_sunwell_plateau_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+34 -34
View File
@@ -65,7 +65,7 @@ class boss_archaedas : public CreatureScript
{
boss_archaedasAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
uint32 uiTremorTimer;
@@ -75,7 +75,7 @@ class boss_archaedas : public CreatureScript
bool bGuardiansAwake;
bool bVaultWalkersAwake;
InstanceScript* pInstance;
InstanceScript* instance;
void Reset()
{
@@ -87,8 +87,8 @@ class boss_archaedas : public CreatureScript
bGuardiansAwake = false;
bVaultWalkersAwake = false;
if (pInstance)
pInstance->SetData(0, 5); // respawn any dead minions
if (instance)
instance->SetData(0, 5); // respawn any dead minions
me->setFaction(35);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
@@ -132,7 +132,7 @@ class boss_archaedas : public CreatureScript
void UpdateAI(const uint32 uiDiff)
{
if (!pInstance)
if (!instance)
return;
// we're still doing awaken animation
if (bWakingUp && iAwakenTimer >= 0)
@@ -142,7 +142,7 @@ class boss_archaedas : public CreatureScript
} else if (bWakingUp && iAwakenTimer <= 0)
{
bWakingUp = false;
AttackStart(Unit::GetUnit(*me, pInstance->GetData64(0)));
AttackStart(Unit::GetUnit(*me, instance->GetData64(0)));
return; // dont want to continue until we finish the AttackStart method
}
@@ -153,7 +153,7 @@ class boss_archaedas : public CreatureScript
// wake a wall minion
if (uiWallMinionTimer <= uiDiff)
{
pInstance->SetData (DATA_MINIONS, IN_PROGRESS);
instance->SetData (DATA_MINIONS, IN_PROGRESS);
uiWallMinionTimer = 10000;
} else uiWallMinionTimer -= uiDiff;
@@ -161,12 +161,12 @@ class boss_archaedas : public CreatureScript
//If we are <66 summon the guardians
if (!bGuardiansAwake && !HealthAbovePct(66))
{
ActivateMinion(pInstance->GetData64(5), true); // EarthenGuardian1
ActivateMinion(pInstance->GetData64(6), true); // EarthenGuardian2
ActivateMinion(pInstance->GetData64(7), true); // EarthenGuardian3
ActivateMinion(pInstance->GetData64(8), true); // EarthenGuardian4
ActivateMinion(pInstance->GetData64(9), true); // EarthenGuardian5
ActivateMinion(pInstance->GetData64(10), false); // EarthenGuardian6
ActivateMinion(instance->GetData64(5), true); // EarthenGuardian1
ActivateMinion(instance->GetData64(6), true); // EarthenGuardian2
ActivateMinion(instance->GetData64(7), true); // EarthenGuardian3
ActivateMinion(instance->GetData64(8), true); // EarthenGuardian4
ActivateMinion(instance->GetData64(9), true); // EarthenGuardian5
ActivateMinion(instance->GetData64(10), false); // EarthenGuardian6
me->MonsterYell(SAY_SUMMON, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_SUMMON);
bGuardiansAwake = true;
@@ -175,10 +175,10 @@ class boss_archaedas : public CreatureScript
//If we are <33 summon the vault walkers
if (!bVaultWalkersAwake && !HealthAbovePct(33))
{
ActivateMinion(pInstance->GetData64(1), true); // VaultWalker1
ActivateMinion(pInstance->GetData64(2), true); // VaultWalker2
ActivateMinion(pInstance->GetData64(3), true); // VaultWalker3
ActivateMinion(pInstance->GetData64(4), false); // VaultWalker4
ActivateMinion(instance->GetData64(1), true); // VaultWalker1
ActivateMinion(instance->GetData64(2), true); // VaultWalker2
ActivateMinion(instance->GetData64(3), true); // VaultWalker3
ActivateMinion(instance->GetData64(4), false); // VaultWalker4
me->MonsterYell(SAY_SUMMON2, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_SUMMON2);
bVaultWalkersAwake = true;
@@ -198,10 +198,10 @@ class boss_archaedas : public CreatureScript
void JustDied (Unit* /*killer*/)
{
if (pInstance)
if (instance)
{
pInstance->SetData(DATA_ANCIENT_DOOR, DONE); // open the vault door
pInstance->SetData(DATA_MINIONS, SPECIAL); // deactivate his minions
instance->SetData(DATA_ANCIENT_DOOR, DONE); // open the vault door
instance->SetData(DATA_MINIONS, SPECIAL); // deactivate his minions
}
}
};
@@ -234,7 +234,7 @@ class mob_archaedas_minions : public CreatureScript
{
mob_archaedas_minionsAI(Creature* c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
uint32 uiArcing_Timer;
@@ -242,7 +242,7 @@ class mob_archaedas_minions : public CreatureScript
bool bWakingUp;
bool bAmIAwake;
InstanceScript* pInstance;
InstanceScript* instance;
void Reset()
{
@@ -293,7 +293,7 @@ class mob_archaedas_minions : public CreatureScript
{
bWakingUp = false;
bAmIAwake = true;
// AttackStart(Unit::GetUnit(*me, pInstance->GetData64(0))); // whoWokeArchaedasGUID
// AttackStart(Unit::GetUnit(*me, instance->GetData64(0))); // whoWokeArchaedasGUID
return; // dont want to continue until we finish the AttackStart method
}
@@ -333,10 +333,10 @@ class mob_stonekeepers : public CreatureScript
{
mob_stonekeepersAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = me->GetInstanceScript();
instance = me->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
void Reset()
{
@@ -365,8 +365,8 @@ class mob_stonekeepers : public CreatureScript
void JustDied(Unit* /*attacker*/)
{
DoCast (me, SPELL_SELF_DESTRUCT, true);
if (pInstance)
pInstance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate next stonekeeper
if (instance)
instance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate next stonekeeper
}
};
@@ -396,13 +396,13 @@ class go_altar_of_archaedas : public GameObjectScript
bool OnGossipHello(Player* player, GameObject* /*pGO*/)
{
InstanceScript* pInstance = player->GetInstanceScript();
if (!pInstance)
InstanceScript* instance = player->GetInstanceScript();
if (!instance)
return false;
player->CastSpell (player, SPELL_BOSS_OBJECT_VISUAL, false);
pInstance->SetData64(0, player->GetGUID()); // activate archaedas
instance->SetData64(0, player->GetGUID()); // activate archaedas
return false;
}
};
@@ -425,15 +425,15 @@ class go_altar_of_the_keepers : public GameObjectScript
{
}
bool OnGossipHello(Player* player, GameObject* /*pGo*/)
bool OnGossipHello(Player* player, GameObject* /*go*/)
{
InstanceScript* pInstance = player->GetInstanceScript();
if (!pInstance)
InstanceScript* instance = player->GetInstanceScript();
if (!instance)
return false;
player->CastSpell (player, SPELL_BOSS_OBJECT_VISUAL, false);
pInstance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate the Stone Keepers
instance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate the Stone Keepers
return false;
}
};
src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+3 -3
View File
@@ -42,7 +42,7 @@ class instance_uldaman : public InstanceMapScript
struct instance_uldaman_InstanceMapScript : public InstanceScript
{
instance_uldaman_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map)
{
}
@@ -480,9 +480,9 @@ class instance_uldaman : public InstanceMapScript
} // end GetData64
};
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_uldaman_InstanceMapScript(pMap);
return new instance_uldaman_InstanceMapScript(map);
}
};
src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+3 -3
View File
@@ -110,10 +110,10 @@ class go_keystone_chamber : public GameObjectScript
public:
go_keystone_chamber() : GameObjectScript("go_keystone_chamber") { }
bool OnGossipHello(Player* /*player*/, GameObject* pGo)
bool OnGossipHello(Player* /*player*/, GameObject* go)
{
if (InstanceScript* pInstance = pGo->GetInstanceScript())
pInstance->SetData(DATA_IRONAYA_SEAL, IN_PROGRESS); //door animation and save state.
if (InstanceScript* instance = go->GetInstanceScript())
instance->SetData(DATA_IRONAYA_SEAL, IN_PROGRESS); //door animation and save state.
return false;
}
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+11 -11
View File
@@ -74,9 +74,9 @@ class boss_akilzon : public CreatureScript
{
boss_akilzonAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 BirdGUIDs[8];
uint64 TargetGUID;
@@ -97,8 +97,8 @@ class boss_akilzon : public CreatureScript
void Reset()
{
if (pInstance)
pInstance->SetData(DATA_AKILZONEVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_AKILZONEVENT, NOT_STARTED);
StaticDisruption_Timer = urand(10000, 20000); //10 to 20 seconds (bosskillers)
GustOfWind_Timer = urand(20000, 30000); //20 to 30 seconds(bosskillers)
@@ -127,16 +127,16 @@ class boss_akilzon : public CreatureScript
me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_ONAGGRO);
//DoZoneInCombat();
if (pInstance)
pInstance->SetData(DATA_AKILZONEVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_AKILZONEVENT, IN_PROGRESS);
}
void JustDied(Unit* /*Killer*/)
{
me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_ONDEATH);
if (pInstance)
pInstance->SetData(DATA_AKILZONEVENT, DONE);
if (instance)
instance->SetData(DATA_AKILZONEVENT, DONE);
DespawnSummons();
}
@@ -170,14 +170,14 @@ class boss_akilzon : public CreatureScript
void SetWeather(uint32 weather, float grade)
{
Map* pMap = me->GetMap();
if (!pMap->IsDungeon())
Map* map = me->GetMap();
if (!map->IsDungeon())
return;
WorldPacket data(SMSG_WEATHER, (4+4+4));
data << uint32(weather) << float(grade) << uint8(0);
pMap->SendToPlayers(&data);
map->SendToPlayers(&data);
}
void HandleStormSequence(Unit* Cloud) // 1: begin, 2-9: tick, 10: end
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+8 -8
View File
@@ -85,10 +85,10 @@ class boss_halazzi : public CreatureScript
{
boss_halazziAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 FrenzyTimer;
uint32 SaberlashTimer;
@@ -105,8 +105,8 @@ class boss_halazzi : public CreatureScript
void Reset()
{
if (pInstance)
pInstance->SetData(DATA_HALAZZIEVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_HALAZZIEVENT, NOT_STARTED);
TransformCount = 0;
BerserkTimer = 600000;
@@ -120,8 +120,8 @@ class boss_halazzi : public CreatureScript
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_AGGRO);
@@ -326,8 +326,8 @@ class boss_halazzi : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
pInstance->SetData(DATA_HALAZZIEVENT, DONE);
if (instance)
instance->SetData(DATA_HALAZZIEVENT, DONE);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_DEATH);
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+14 -14
View File
@@ -177,11 +177,11 @@ static PlayerAbilityStruct PlayerAbility[][3] =
struct boss_hexlord_addAI : public ScriptedAI
{
InstanceScript* pInstance;
InstanceScript* instance;
boss_hexlord_addAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
void Reset() {}
@@ -190,7 +190,7 @@ struct boss_hexlord_addAI : public ScriptedAI
void UpdateAI(const uint32 /*diff*/)
{
if (pInstance && pInstance->GetData(DATA_HEXLORDEVENT) != IN_PROGRESS)
if (instance && instance->GetData(DATA_HEXLORDEVENT) != IN_PROGRESS)
{
EnterEvadeMode();
return;
@@ -213,13 +213,13 @@ class boss_hexlord_malacrass : public CreatureScript
{
boss_hex_lord_malacrassAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
SelectAddEntry();
for (uint8 i = 0; i < 4; ++i)
AddGUID[i] = 0;
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 AddGUID[4];
uint32 AddEntry[4];
@@ -237,8 +237,8 @@ class boss_hexlord_malacrass : public CreatureScript
void Reset()
{
if (pInstance)
pInstance->SetData(DATA_HEXLORDEVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_HEXLORDEVENT, NOT_STARTED);
SpiritBolts_Timer = 20000;
DrainPower_Timer = 60000;
@@ -255,8 +255,8 @@ class boss_hexlord_malacrass : public CreatureScript
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS);
DoZoneInCombat();
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
@@ -292,8 +292,8 @@ class boss_hexlord_malacrass : public CreatureScript
void JustDied(Unit* /*victim*/)
{
if (pInstance)
pInstance->SetData(DATA_HEXLORDEVENT, DONE);
if (instance)
instance->SetData(DATA_HEXLORDEVENT, DONE);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_DEATH);
@@ -359,9 +359,9 @@ class boss_hexlord_malacrass : public CreatureScript
if (CheckAddState_Timer <= diff)
{
for (uint8 i = 0; i < 4; ++i)
if (Creature* pTemp = Unit::GetCreature(*me, AddGUID[i]))
if (pTemp->isAlive() && !pTemp->getVictim())
pTemp->AI()->AttackStart(me->getVictim());
if (Creature* temp = Unit::GetCreature(*me, AddGUID[i]))
if (temp->isAlive() && !temp->getVictim())
temp->AI()->AttackStart(me->getVictim());
CheckAddState_Timer = 5000;
} else CheckAddState_Timer -= diff;
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+17 -17
View File
@@ -115,10 +115,10 @@ class boss_janalai : public CreatureScript
{
boss_janalaiAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 FireBreathTimer;
uint32 BombTimer;
@@ -137,8 +137,8 @@ class boss_janalai : public CreatureScript
void Reset()
{
if (pInstance)
pInstance->SetData(DATA_JANALAIEVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_JANALAIEVENT, NOT_STARTED);
FireBreathTimer = 8000;
BombTimer = 30000;
@@ -163,8 +163,8 @@ class boss_janalai : public CreatureScript
{
DoScriptText(SAY_DEATH, me);
if (pInstance)
pInstance->SetData(DATA_JANALAIEVENT, DONE);
if (instance)
instance->SetData(DATA_JANALAIEVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -174,8 +174,8 @@ class boss_janalai : public CreatureScript
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_JANALAIEVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_JANALAIEVENT, IN_PROGRESS);
DoScriptText(SAY_AGGRO, me);
// DoZoneInCombat();
@@ -375,9 +375,9 @@ class boss_janalai : public CreatureScript
BombSequenceTimer = 100;
//Teleport every Player into the middle
Map* pMap = me->GetMap();
if (!pMap->IsDungeon()) return;
Map::PlayerList const &PlayerList = pMap->GetPlayers();
Map* map = me->GetMap();
if (!map->IsDungeon()) return;
Map::PlayerList const &PlayerList = map->GetPlayers();
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* i_pl = i->getSource())
if (i_pl->isAlive())
@@ -488,10 +488,10 @@ class mob_janalai_hatcher : public CreatureScript
{
mob_janalai_hatcherAI(Creature* c) : ScriptedAI(c)
{
pInstance =c->GetInstanceScript();
instance =c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 waypoint;
uint32 HatchNum;
@@ -561,7 +561,7 @@ class mob_janalai_hatcher : public CreatureScript
void UpdateAI(const uint32 diff)
{
if (!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS))
if (!instance || !(instance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS))
{
me->DisappearAndDie();
return;
@@ -621,10 +621,10 @@ class mob_janalai_hatchling : public CreatureScript
{
mob_janalai_hatchlingAI(Creature* c) : ScriptedAI(c)
{
pInstance =c->GetInstanceScript();
instance =c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 BuffetTimer;
void Reset()
@@ -642,7 +642,7 @@ class mob_janalai_hatchling : public CreatureScript
void UpdateAI(const uint32 diff)
{
if (!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS))
if (!instance || !(instance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS))
{
me->DisappearAndDie();
return;
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+8 -8
View File
@@ -105,10 +105,10 @@ class boss_nalorakk : public CreatureScript
{
MoveEvent = true;
MovePhase = 0;
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 BrutalSwipe_Timer;
uint32 Mangle_Timer;
@@ -142,8 +142,8 @@ class boss_nalorakk : public CreatureScript
(*me).GetMotionMaster()->MovePoint(0, NalorakkWay[7][0], NalorakkWay[7][1], NalorakkWay[7][2]);
}
if (pInstance)
pInstance->SetData(DATA_NALORAKKEVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_NALORAKKEVENT, NOT_STARTED);
Surge_Timer = 15000 + rand()%5000;
BrutalSwipe_Timer = 7000 + rand()%5000;
@@ -269,8 +269,8 @@ class boss_nalorakk : public CreatureScript
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_AGGRO);
@@ -279,8 +279,8 @@ class boss_nalorakk : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
pInstance->SetData(DATA_NALORAKKEVENT, DONE);
if (instance)
instance->SetData(DATA_NALORAKKEVENT, DONE);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_DEATH);
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+9 -9
View File
@@ -153,9 +153,9 @@ class boss_zuljin : public CreatureScript
{
boss_zuljinAI(Creature* c) : ScriptedAI(c), Summons(me)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 SpiritGUID[4];
uint64 ClawTargetGUID;
@@ -186,8 +186,8 @@ class boss_zuljin : public CreatureScript
void Reset()
{
if (pInstance)
pInstance->SetData(DATA_ZULJINEVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_ZULJINEVENT, NOT_STARTED);
Phase = 0;
@@ -223,8 +223,8 @@ class boss_zuljin : public CreatureScript
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_ZULJINEVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_ZULJINEVENT, IN_PROGRESS);
DoZoneInCombat();
@@ -254,8 +254,8 @@ class boss_zuljin : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
pInstance->SetData(DATA_ZULJINEVENT, DONE);
if (instance)
instance->SetData(DATA_ZULJINEVENT, DONE);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_DEATH);
@@ -608,7 +608,7 @@ class mob_zuljin_vortex : public CreatureScript
void Reset() {}
void EnterCombat(Unit* /*pTarget*/) {}
void EnterCombat(Unit* /*target*/) {}
void SpellHit(Unit* caster, const SpellInfo* spell)
{
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+3 -3
View File
@@ -61,7 +61,7 @@ class instance_zulaman : public InstanceMapScript
struct instance_zulaman_InstanceMapScript : public InstanceScript
{
instance_zulaman_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_zulaman_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint64 HarkorsSatchelGUID;
uint64 TanzarsTrunkGUID;
@@ -314,9 +314,9 @@ class instance_zulaman : public InstanceMapScript
}
};
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_zulaman_InstanceMapScript(pMap);
return new instance_zulaman_InstanceMapScript(map);
}
};
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+11 -11
View File
@@ -51,10 +51,10 @@ class npc_forest_frog : public CreatureScript
{
npc_forest_frogAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
void Reset() {}
@@ -62,7 +62,7 @@ class npc_forest_frog : public CreatureScript
void DoSpawnRandom()
{
if (pInstance)
if (instance)
{
uint32 cEntry = 0;
switch (rand()%10)
@@ -79,15 +79,15 @@ class npc_forest_frog : public CreatureScript
case 9: cEntry = 24455; break; //Hollee
}
if (!pInstance->GetData(TYPE_RAND_VENDOR_1))
if (!instance->GetData(TYPE_RAND_VENDOR_1))
if (rand()%10 == 1) cEntry = 24408; //Gunter
if (!pInstance->GetData(TYPE_RAND_VENDOR_2))
if (!instance->GetData(TYPE_RAND_VENDOR_2))
if (rand()%10 == 1) cEntry = 24409; //Kyren
if (cEntry) me->UpdateEntry(cEntry);
if (cEntry == 24408) pInstance->SetData(TYPE_RAND_VENDOR_1, DONE);
if (cEntry == 24409) pInstance->SetData(TYPE_RAND_VENDOR_2, DONE);
if (cEntry == 24408) instance->SetData(TYPE_RAND_VENDOR_1, DONE);
if (cEntry == 24409) instance->SetData(TYPE_RAND_VENDOR_2, DONE);
}
}
@@ -167,11 +167,11 @@ class npc_zulaman_hostage : public CreatureScript
return true;
creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
InstanceScript* pInstance = creature->GetInstanceScript();
if (pInstance)
InstanceScript* instance = creature->GetInstanceScript();
if (instance)
{
//uint8 progress = pInstance->GetData(DATA_CHESTLOOTED);
pInstance->SetData(DATA_CHESTLOOTED, 0);
//uint8 progress = instance->GetData(DATA_CHESTLOOTED);
instance->SetData(DATA_CHESTLOOTED, 0);
float x, y, z;
creature->GetPosition(x, y, z);
uint32 entry = creature->GetEntry();
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+10 -10
View File
@@ -61,10 +61,10 @@ class boss_arlokk : public CreatureScript
{
boss_arlokkAI(Creature* creature) : ScriptedAI(creature)
{
m_pInstance = creature->GetInstanceScript();
m_instance = creature->GetInstanceScript();
}
InstanceScript* m_pInstance;
InstanceScript* m_instance;
uint32 m_uiShadowWordPain_Timer;
uint32 m_uiGouge_Timer;
@@ -110,8 +110,8 @@ class boss_arlokk : public CreatureScript
void JustReachedHome()
{
if (m_pInstance)
m_pInstance->SetData(DATA_ARLOKK, NOT_STARTED);
if (m_instance)
m_instance->SetData(DATA_ARLOKK, NOT_STARTED);
//we should be summoned, so despawn
me->DespawnOrUnsummon();
@@ -124,8 +124,8 @@ class boss_arlokk : public CreatureScript
me->SetDisplayId(MODEL_ID_NORMAL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
if (m_pInstance)
m_pInstance->SetData(DATA_ARLOKK, DONE);
if (m_instance)
m_instance->SetData(DATA_ARLOKK, DONE);
}
void DoSummonPhanters()
@@ -269,14 +269,14 @@ class go_gong_of_bethekk : public GameObjectScript
{
}
bool OnGossipHello(Player* /*player*/, GameObject* pGo)
bool OnGossipHello(Player* /*player*/, GameObject* go)
{
if (InstanceScript* m_pInstance = pGo->GetInstanceScript())
if (InstanceScript* m_instance = go->GetInstanceScript())
{
if (m_pInstance->GetData(DATA_ARLOKK) == DONE || m_pInstance->GetData(DATA_ARLOKK) == IN_PROGRESS)
if (m_instance->GetData(DATA_ARLOKK) == DONE || m_instance->GetData(DATA_ARLOKK) == IN_PROGRESS)
return true;
m_pInstance->SetData(DATA_ARLOKK, IN_PROGRESS);
m_instance->SetData(DATA_ARLOKK, IN_PROGRESS);
return true;
}
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+12 -12
View File
@@ -57,10 +57,10 @@ class boss_hakkar : public CreatureScript
{
boss_hakkarAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
m_instance = c->GetInstanceScript();
}
InstanceScript* m_pInstance;
InstanceScript* m_instance;
uint32 BloodSiphon_Timer;
uint32 CorruptedBlood_Timer;
@@ -156,9 +156,9 @@ class boss_hakkar : public CreatureScript
//Checking if Jeklik is dead. If not we cast her Aspect
if (CheckJeklik_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_JEKLIK) != DONE)
if (m_instance->GetData(DATA_JEKLIK) != DONE)
{
if (AspectOfJeklik_Timer <= diff)
{
@@ -173,9 +173,9 @@ class boss_hakkar : public CreatureScript
//Checking if Venoxis is dead. If not we cast his Aspect
if (CheckVenoxis_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_VENOXIS) != DONE)
if (m_instance->GetData(DATA_VENOXIS) != DONE)
{
if (AspectOfVenoxis_Timer <= diff)
{
@@ -190,9 +190,9 @@ class boss_hakkar : public CreatureScript
//Checking if Marli is dead. If not we cast her Aspect
if (CheckMarli_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_MARLI) != DONE)
if (m_instance->GetData(DATA_MARLI) != DONE)
{
if (AspectOfMarli_Timer <= diff)
{
@@ -208,9 +208,9 @@ class boss_hakkar : public CreatureScript
//Checking if Thekal is dead. If not we cast his Aspect
if (CheckThekal_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_THEKAL) != DONE)
if (m_instance->GetData(DATA_THEKAL) != DONE)
{
if (AspectOfThekal_Timer <= diff)
{
@@ -225,9 +225,9 @@ class boss_hakkar : public CreatureScript
//Checking if Arlokk is dead. If yes we cast her Aspect
if (CheckArlokk_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_ARLOKK) != DONE)
if (m_instance->GetData(DATA_ARLOKK) != DONE)
{
if (AspectOfArlokk_Timer <= diff)
{
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+8 -8
View File
@@ -56,10 +56,10 @@ class boss_jeklik : public CreatureScript
{
boss_jeklikAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
m_instance = c->GetInstanceScript();
}
InstanceScript* m_pInstance;
InstanceScript* m_instance;
uint32 Charge_Timer;
uint32 SonicBurst_Timer;
@@ -98,8 +98,8 @@ class boss_jeklik : public CreatureScript
{
DoScriptText(SAY_DEATH, me);
if (m_pInstance)
m_pInstance->SetData(DATA_JEKLIK, DONE);
if (m_instance)
m_instance->SetData(DATA_JEKLIK, DONE);
}
void UpdateAI(const uint32 diff)
@@ -238,10 +238,10 @@ class mob_batrider : public CreatureScript
{
mob_batriderAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
m_instance = c->GetInstanceScript();
}
InstanceScript* m_pInstance;
InstanceScript* m_instance;
uint32 Bomb_Timer;
uint32 Check_Timer;
@@ -274,9 +274,9 @@ class mob_batrider : public CreatureScript
//Check_Timer
if (Check_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_JEKLIK) == DONE)
if (m_instance->GetData(DATA_JEKLIK) == DONE)
{
me->setDeathState(JUST_DIED);
me->RemoveCorpse();
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+4 -4
View File
@@ -189,12 +189,12 @@ class mob_healing_ward : public CreatureScript
{
mob_healing_wardAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
uint32 Heal_Timer;
InstanceScript* pInstance;
InstanceScript* instance;
void Reset()
{
@@ -210,9 +210,9 @@ class mob_healing_ward : public CreatureScript
//Heal_Timer
if (Heal_Timer <= diff)
{
if (pInstance)
if (instance)
{
Unit* pJindo = Unit::GetUnit((*me), pInstance->GetData64(DATA_JINDO));
Unit* pJindo = Unit::GetUnit((*me), instance->GetData64(DATA_JINDO));
if (pJindo)
DoCast(pJindo, SPELL_HEAL);
}
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+10 -10
View File
@@ -57,7 +57,7 @@ class boss_mandokir : public CreatureScript
{
boss_mandokirAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
m_instance = c->GetInstanceScript();
}
uint32 KillCount;
@@ -72,7 +72,7 @@ class boss_mandokir : public CreatureScript
float targetY;
float targetZ;
InstanceScript* m_pInstance;
InstanceScript* m_instance;
bool endWatch;
bool someWatched;
@@ -116,9 +116,9 @@ class boss_mandokir : public CreatureScript
{
DoScriptText(SAY_DING_KILL, me);
if (m_pInstance)
if (m_instance)
{
uint64 JindoGUID = m_pInstance->GetData64(DATA_JINDO);
uint64 JindoGUID = m_instance->GetData64(DATA_JINDO);
if (JindoGUID)
{
if (Unit* jTemp = Unit::GetUnit(*me, JindoGUID))
@@ -256,9 +256,9 @@ class boss_mandokir : public CreatureScript
//Checking if Ohgan is dead. If yes Mandokir will enrage.
if (Check_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_OHGAN) == DONE)
if (m_instance->GetData(DATA_OHGAN) == DONE)
{
if (!RaptorDead)
{
@@ -296,11 +296,11 @@ class mob_ohgan : public CreatureScript
{
mob_ohganAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
m_instance = c->GetInstanceScript();
}
uint32 SunderArmor_Timer;
InstanceScript* m_pInstance;
InstanceScript* m_instance;
void Reset()
{
@@ -311,8 +311,8 @@ class mob_ohgan : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
if (m_pInstance)
m_pInstance->SetData(DATA_OHGAN, DONE);
if (m_instance)
m_instance->SetData(DATA_OHGAN, DONE);
}
void UpdateAI (const uint32 diff)
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+4 -4
View File
@@ -53,10 +53,10 @@ class boss_marli : public CreatureScript
{
boss_marliAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
m_instance = c->GetInstanceScript();
}
InstanceScript* m_pInstance;
InstanceScript* m_instance;
uint32 SpawnStartSpiders_Timer;
uint32 PoisonVolley_Timer;
@@ -91,8 +91,8 @@ class boss_marli : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
DoScriptText(SAY_DEATH, me);
if (m_pInstance)
m_pInstance->SetData(DATA_MARLI, DONE);
if (m_instance)
m_instance->SetData(DATA_MARLI, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+40 -40
View File
@@ -68,7 +68,7 @@ class boss_thekal : public CreatureScript
{
boss_thekalAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
m_instance = c->GetInstanceScript();
}
uint32 MortalCleave_Timer;
@@ -81,7 +81,7 @@ class boss_thekal : public CreatureScript
uint32 Check_Timer;
uint32 Resurrect_Timer;
InstanceScript* m_pInstance;
InstanceScript* m_instance;
bool Enraged;
bool PhaseTwo;
bool WasDead;
@@ -111,14 +111,14 @@ class boss_thekal : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
DoScriptText(SAY_DEATH, me);
if (m_pInstance)
m_pInstance->SetData(DATA_THEKAL, DONE);
if (m_instance)
m_instance->SetData(DATA_THEKAL, DONE);
}
void JustReachedHome()
{
if (m_pInstance)
m_pInstance->SetData(DATA_THEKAL, NOT_STARTED);
if (m_instance)
m_instance->SetData(DATA_THEKAL, NOT_STARTED);
}
void UpdateAI(const uint32 diff)
@@ -129,26 +129,26 @@ class boss_thekal : public CreatureScript
//Check_Timer for the death of LorKhan and Zath.
if (!WasDead && Check_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_LORKHAN) == SPECIAL)
if (m_instance->GetData(DATA_LORKHAN) == SPECIAL)
{
//Resurrect LorKhan
if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN)))
if (Unit* pLorKhan = Unit::GetUnit((*me), m_instance->GetData64(DATA_LORKHAN)))
{
pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pLorKhan->setFaction(14);
pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pLorKhan->SetFullHealth();
m_pInstance->SetData(DATA_LORKHAN, DONE);
m_instance->SetData(DATA_LORKHAN, DONE);
}
}
if (m_pInstance->GetData(DATA_ZATH) == SPECIAL)
if (m_instance->GetData(DATA_ZATH) == SPECIAL)
{
//Resurrect Zath
Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH));
Unit* pZath = Unit::GetUnit((*me), m_instance->GetData64(DATA_ZATH));
if (pZath)
{
pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
@@ -156,7 +156,7 @@ class boss_thekal : public CreatureScript
pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pZath->SetFullHealth();
m_pInstance->SetData(DATA_ZATH, DONE);
m_instance->SetData(DATA_ZATH, DONE);
}
}
}
@@ -185,8 +185,8 @@ class boss_thekal : public CreatureScript
me->SetStandState(UNIT_STAND_STATE_SLEEP);
me->AttackStop();
if (m_pInstance)
m_pInstance->SetData(DATA_THEKAL, SPECIAL);
if (m_instance)
m_instance->SetData(DATA_THEKAL, SPECIAL);
WasDead=true;
}
@@ -279,7 +279,7 @@ class mob_zealot_lorkhan : public CreatureScript
{
mob_zealot_lorkhanAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
m_instance = c->GetInstanceScript();
}
uint32 Shield_Timer;
@@ -290,7 +290,7 @@ class mob_zealot_lorkhan : public CreatureScript
bool FakeDeath;
InstanceScript* m_pInstance;
InstanceScript* m_instance;
void Reset()
{
@@ -302,8 +302,8 @@ class mob_zealot_lorkhan : public CreatureScript
FakeDeath = false;
if (m_pInstance)
m_pInstance->SetData(DATA_LORKHAN, NOT_STARTED);
if (m_instance)
m_instance->SetData(DATA_LORKHAN, NOT_STARTED);
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -335,10 +335,10 @@ class mob_zealot_lorkhan : public CreatureScript
//Casting Greaterheal to Thekal or Zath if they are in meele range.
if (GreaterHeal_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL));
Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH));
Unit* pThekal = Unit::GetUnit((*me), m_instance->GetData64(DATA_THEKAL));
Unit* pZath = Unit::GetUnit((*me), m_instance->GetData64(DATA_ZATH));
if (!pThekal || !pZath)
return;
@@ -369,12 +369,12 @@ class mob_zealot_lorkhan : public CreatureScript
//Check_Timer for the death of LorKhan and Zath.
if (!FakeDeath && Check_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_THEKAL) == SPECIAL)
if (m_instance->GetData(DATA_THEKAL) == SPECIAL)
{
//Resurrect Thekal
if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)))
if (Unit* pThekal = Unit::GetUnit((*me), m_instance->GetData64(DATA_THEKAL)))
{
pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -383,10 +383,10 @@ class mob_zealot_lorkhan : public CreatureScript
}
}
if (m_pInstance->GetData(DATA_ZATH) == SPECIAL)
if (m_instance->GetData(DATA_ZATH) == SPECIAL)
{
//Resurrect Zath
if (Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)))
if (Unit* pZath = Unit::GetUnit((*me), m_instance->GetData64(DATA_ZATH)))
{
pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -409,8 +409,8 @@ class mob_zealot_lorkhan : public CreatureScript
me->setFaction(35);
me->AttackStop();
if (m_pInstance)
m_pInstance->SetData(DATA_LORKHAN, SPECIAL);
if (m_instance)
m_instance->SetData(DATA_LORKHAN, SPECIAL);
FakeDeath = true;
}
@@ -439,7 +439,7 @@ class mob_zealot_zath : public CreatureScript
{
mob_zealot_zathAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
m_instance = c->GetInstanceScript();
}
uint32 SweepingStrikes_Timer;
@@ -451,7 +451,7 @@ class mob_zealot_zath : public CreatureScript
bool FakeDeath;
InstanceScript* m_pInstance;
InstanceScript* m_instance;
void Reset()
{
@@ -464,8 +464,8 @@ class mob_zealot_zath : public CreatureScript
FakeDeath = false;
if (m_pInstance)
m_pInstance->SetData(DATA_ZATH, NOT_STARTED);
if (m_instance)
m_instance->SetData(DATA_ZATH, NOT_STARTED);
me->SetStandState(UNIT_STAND_STATE_STAND);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -522,12 +522,12 @@ class mob_zealot_zath : public CreatureScript
//Check_Timer for the death of LorKhan and Zath.
if (!FakeDeath && Check_Timer <= diff)
{
if (m_pInstance)
if (m_instance)
{
if (m_pInstance->GetData(DATA_LORKHAN) == SPECIAL)
if (m_instance->GetData(DATA_LORKHAN) == SPECIAL)
{
//Resurrect LorKhan
if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN)))
if (Unit* pLorKhan = Unit::GetUnit((*me), m_instance->GetData64(DATA_LORKHAN)))
{
pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -536,10 +536,10 @@ class mob_zealot_zath : public CreatureScript
}
}
if (m_pInstance->GetData(DATA_THEKAL) == SPECIAL)
if (m_instance->GetData(DATA_THEKAL) == SPECIAL)
{
//Resurrect Thekal
if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)))
if (Unit* pThekal = Unit::GetUnit((*me), m_instance->GetData64(DATA_THEKAL)))
{
pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -562,8 +562,8 @@ class mob_zealot_zath : public CreatureScript
me->setFaction(35);
me->AttackStop();
if (m_pInstance)
m_pInstance->SetData(DATA_ZATH, SPECIAL);
if (m_instance)
m_instance->SetData(DATA_ZATH, SPECIAL);
FakeDeath = true;
}
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+3 -3
View File
@@ -36,7 +36,7 @@ class instance_zulgurub : public InstanceMapScript
struct instance_zulgurub_InstanceMapScript : public InstanceScript
{
instance_zulgurub_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_zulgurub_InstanceMapScript(Map* map) : InstanceScript(map) {}
//If all High Priest bosses were killed. Lorkhan, Zath and Ohgan are added too.
uint32 m_auiEncounter[MAX_ENCOUNTERS];
@@ -153,9 +153,9 @@ class instance_zulgurub : public InstanceMapScript
}
};
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_zulgurub_InstanceMapScript(pMap);
return new instance_zulgurub_InstanceMapScript(map);
}
};
src/server/scripts/EasternKingdoms/hinterlands.cpp
+8 -8
View File
@@ -57,9 +57,9 @@ class npc_00x09hl : public CreatureScript
public:
npc_00x09hl() : CreatureScript("npc_00x09hl") { }
bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest)
{
if (pQuest->GetQuestId() == QUEST_RESQUE_OOX_09)
if (quest->GetQuestId() == QUEST_RESQUE_OOX_09)
{
creature->SetStandState(UNIT_STAND_STATE_STAND);
@@ -71,7 +71,7 @@ public:
DoScriptText(SAY_OOX_START, creature, player);
if (npc_00x09hlAI* pEscortAI = CAST_AI(npc_00x09hl::npc_00x09hlAI, creature->AI()))
pEscortAI->Start(false, false, player->GetGUID(), pQuest);
pEscortAI->Start(false, false, player->GetGUID(), quest);
}
return true;
}
@@ -191,15 +191,15 @@ class npc_rinji : public CreatureScript
public:
npc_rinji() : CreatureScript("npc_rinji") { }
bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest)
{
if (pQuest->GetQuestId() == QUEST_RINJI_TRAPPED)
if (quest->GetQuestId() == QUEST_RINJI_TRAPPED)
{
if (GameObject* pGo = creature->FindNearestGameObject(GO_RINJI_CAGE, INTERACTION_DISTANCE))
pGo->UseDoorOrButton();
if (GameObject* go = creature->FindNearestGameObject(GO_RINJI_CAGE, INTERACTION_DISTANCE))
go->UseDoorOrButton();
if (npc_rinjiAI* pEscortAI = CAST_AI(npc_rinji::npc_rinjiAI, creature->AI()))
pEscortAI->Start(false, false, player->GetGUID(), pQuest);
pEscortAI->Start(false, false, player->GetGUID(), quest);
}
return true;
}
src/server/scripts/EasternKingdoms/redridge_mountains.cpp
+3 -3
View File
@@ -43,11 +43,11 @@ class npc_corporal_keeshan : public CreatureScript
public:
npc_corporal_keeshan() : CreatureScript("npc_corporal_keeshan") { }
bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{
if (pQuest->GetQuestId() == QUEST_MISSING_IN_ACTION)
if (quest->GetQuestId() == QUEST_MISSING_IN_ACTION)
{
CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, creature->AI())->Start(true, false, player->GetGUID(), pQuest);
CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, creature->AI())->Start(true, false, player->GetGUID(), quest);
DoScriptText(SAY_CORPORAL_1, creature);
}
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+2 -2
View File
@@ -225,9 +225,9 @@ class pyrewood_ambush : public CreatureScript
public:
pyrewood_ambush() : CreatureScript("pyrewood_ambush") { }
bool OnQuestAccept(Player* player, Creature* creature, const Quest *pQuest)
bool OnQuestAccept(Player* player, Creature* creature, const Quest *quest)
{
if (pQuest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress)
if (quest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress)
{
CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress = true;
CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->Phase = 0;
src/server/scripts/EasternKingdoms/stormwind_city.cpp
+6 -6
View File
@@ -90,9 +90,9 @@ class npc_bartleby : public CreatureScript
public:
npc_bartleby() : CreatureScript("npc_bartleby") { }
bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{
if (pQuest->GetQuestId() == QUEST_BEAT)
if (quest->GetQuestId() == QUEST_BEAT)
{
creature->setFaction(FACTION_ENEMY);
creature->AI()->AttackStart(player);
@@ -162,9 +162,9 @@ class npc_dashel_stonefist : public CreatureScript
public:
npc_dashel_stonefist() : CreatureScript("npc_dashel_stonefist") { }
bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{
if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT8)
if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT8)
{
creature->setFaction(FACTION_HOSTILE);
CAST_AI(npc_dashel_stonefist::npc_dashel_stonefistAI, creature->AI())->AttackStart(player);
@@ -696,9 +696,9 @@ class npc_tyrion : public CreatureScript
public:
npc_tyrion() : CreatureScript("npc_tyrion") { }
bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{
if (pQuest->GetQuestId() == QUEST_THE_ATTACK)
if (quest->GetQuestId() == QUEST_THE_ATTACK)
{
if (Creature* pSpybot = creature->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true))
{
src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
+5 -5
View File
@@ -48,9 +48,9 @@ class npc_calvin_montague : public CreatureScript
public:
npc_calvin_montague() : CreatureScript("npc_calvin_montague") { }
bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{
if (pQuest->GetQuestId() == QUEST_590)
if (quest->GetQuestId() == QUEST_590)
{
creature->setFaction(FACTION_HOSTILE);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
@@ -171,7 +171,7 @@ class go_mausoleum_door : public GameObjectScript
public:
go_mausoleum_door() : GameObjectScript("go_mausoleum_door") { }
bool OnGossipHello(Player* player, GameObject* /*pGo*/)
bool OnGossipHello(Player* player, GameObject* /*go*/)
{
if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE)
return false;
@@ -193,14 +193,14 @@ class go_mausoleum_trigger : public GameObjectScript
public:
go_mausoleum_trigger() : GameObjectScript("go_mausoleum_trigger") { }
bool OnGossipHello(Player* player, GameObject* pGo)
bool OnGossipHello(Player* player, GameObject* go)
{
if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE)
return false;
if (GameObject* pDoor = player->FindNearestGameObject(GO_DOOR, 30.0f))
{
pGo->SetGoState(GO_STATE_ACTIVE);
go->SetGoState(GO_STATE_ACTIVE);
pDoor->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND);
return true;
}
src/server/scripts/EasternKingdoms/westfall.cpp
+2 -2
View File
@@ -54,9 +54,9 @@ class npc_daphne_stilwell : public CreatureScript
public:
npc_daphne_stilwell() : CreatureScript("npc_daphne_stilwell") { }
bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest)
{
if (pQuest->GetQuestId() == QUEST_TOME_VALOR)
if (quest->GetQuestId() == QUEST_TOME_VALOR)
{
DoScriptText(SAY_DS_START, creature);
src/server/scripts/EasternKingdoms/wetlands.cpp
+3 -3
View File
@@ -144,9 +144,9 @@ class npc_mikhail : public CreatureScript
public:
npc_mikhail() : CreatureScript("npc_mikhail") { }
bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest)
{
if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT11)
if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT11)
{
Creature* pSlim = creature->FindNearestCreature(NPC_TAPOKE_SLIM_JAHN, 25.0f);
@@ -157,7 +157,7 @@ public:
pSlim->CastSpell(pSlim, SPELL_STEALTH, true);
if (npc_tapoke_slim_jahn::npc_tapoke_slim_jahnAI* pEscortAI = CAST_AI(npc_tapoke_slim_jahn::npc_tapoke_slim_jahnAI, pSlim->AI()))
pEscortAI->Start(false, false, player->GetGUID(), pQuest);
pEscortAI->Start(false, false, player->GetGUID(), quest);
}
return false;
}