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/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+11 -11
View File
@@ -37,7 +37,7 @@ class go_blackfathom_altar : public GameObjectScript
public:
go_blackfathom_altar() : GameObjectScript("go_blackfathom_altar") { }
bool OnGossipHello(Player* player, GameObject* /*pGo*/)
bool OnGossipHello(Player* player, GameObject* /*go*/)
{
if (!player->HasAura(SPELL_BLESSING_OF_BLACKFATHOM))
player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player);
@@ -51,15 +51,15 @@ class go_blackfathom_fire : public GameObjectScript
public:
go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { }
bool OnGossipHello(Player* /*player*/, GameObject* pGo)
bool OnGossipHello(Player* /*player*/, GameObject* go)
{
InstanceScript* pInstance = pGo->GetInstanceScript();
InstanceScript* instance = go->GetInstanceScript();
if (pInstance)
if (instance)
{
pGo->SetGoState(GO_STATE_ACTIVE);
pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
pInstance->SetData(DATA_FIRE, pInstance->GetData(DATA_FIRE) + 1);
go->SetGoState(GO_STATE_ACTIVE);
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
instance->SetData(DATA_FIRE, instance->GetData(DATA_FIRE) + 1);
return true;
}
return false;
@@ -87,10 +87,10 @@ public:
AttackPlayer();
}
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 uiRavageTimer;
uint32 uiFrostNovaTimer;
@@ -183,8 +183,8 @@ public:
void JustDied(Unit* /*killer*/)
{
if (me->isSummon()) //we are not a normal spawn.
if (pInstance)
pInstance->SetData(DATA_EVENT, pInstance->GetData(DATA_EVENT) + 1);
if (instance)
instance->SetData(DATA_EVENT, instance->GetData(DATA_EVENT) + 1);
}
};
src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+8 -8
View File
@@ -38,32 +38,32 @@ public:
{
boss_aku_maiAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
uint32 uiPoisonCloudTimer;
bool bIsEnraged;
InstanceScript* pInstance;
InstanceScript* instance;
void Reset()
{
uiPoisonCloudTimer = urand(5000, 9000);
bIsEnraged = false;
if (pInstance)
pInstance->SetData(TYPE_AKU_MAI, NOT_STARTED);
if (instance)
instance->SetData(TYPE_AKU_MAI, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(TYPE_AKU_MAI, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_AKU_MAI, IN_PROGRESS);
}
void JustDied(Unit* /*killer*/)
{
if (pInstance)
pInstance->SetData(TYPE_AKU_MAI, DONE);
if (instance)
instance->SetData(TYPE_AKU_MAI, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+8 -8
View File
@@ -37,30 +37,30 @@ public:
{
boss_gelihastAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
uint32 uiNetTimer;
InstanceScript* pInstance;
InstanceScript* instance;
void Reset()
{
uiNetTimer = urand(2000, 4000);
if (pInstance)
pInstance->SetData(TYPE_GELIHAST, NOT_STARTED);
if (instance)
instance->SetData(TYPE_GELIHAST, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(TYPE_GELIHAST, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_GELIHAST, IN_PROGRESS);
}
void JustDied(Unit* /*killer*/)
{
if (pInstance)
pInstance->SetData(TYPE_GELIHAST, DONE);
if (instance)
instance->SetData(TYPE_GELIHAST, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+8 -8
View File
@@ -46,34 +46,34 @@ public:
{
boss_kelrisAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
instance = c->GetInstanceScript();
}
uint32 uiMindBlastTimer;
uint32 uiSleepTimer;
InstanceScript* pInstance;
InstanceScript* instance;
void Reset()
{
uiMindBlastTimer = urand(2000, 5000);
uiSleepTimer = urand(9000, 12000);
if (pInstance)
pInstance->SetData(TYPE_KELRIS, NOT_STARTED);
if (instance)
instance->SetData(TYPE_KELRIS, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
if (pInstance)
pInstance->SetData(TYPE_KELRIS, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_KELRIS, IN_PROGRESS);
}
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
if (pInstance)
pInstance->SetData(TYPE_KELRIS, DONE);
if (instance)
instance->SetData(TYPE_KELRIS, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+3 -3
View File
@@ -56,14 +56,14 @@ class instance_blackfathom_deeps : public InstanceMapScript
public:
instance_blackfathom_deeps() : InstanceMapScript("instance_blackfathom_deeps", 48) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_blackfathom_deeps_InstanceMapScript(pMap);
return new instance_blackfathom_deeps_InstanceMapScript(map);
}
struct instance_blackfathom_deeps_InstanceMapScript : public InstanceScript
{
instance_blackfathom_deeps_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint64 m_uiTwilightLordKelrisGUID;
uint64 m_uiShrine1GUID;