aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Commands
diff options
context:
space:
mode:
authorBootz <Stage6Dev@EMPulseGaming.com>2011-10-07 19:45:43 -0500
committerBootz <Stage6Dev@EMPulseGaming.com>2011-10-07 19:45:43 -0500
commit5b4c7783c2a28e420cb4aaf4f2967083db8f6787 (patch)
tree887be454d8d9d1a916d8085a243a2afaff2c0dbe /src/server/scripts/Commands
parentc89b1f6989ce1f5a48c48766993c3dd8101cc21b (diff)
REPO: Code-style clean-ups
* 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...
Diffstat (limited to 'src/server/scripts/Commands')
-rw-r--r--src/server/scripts/Commands/cs_quest.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp
index a616588367c..31d8cd3c8f2 100644
--- a/src/server/scripts/Commands/cs_quest.cpp
+++ b/src/server/scripts/Commands/cs_quest.cpp
@@ -66,9 +66,9 @@ public:
uint32 entry = atol(cId);
- Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry);
+ Quest const* quest = sObjectMgr->GetQuestTemplate(entry);
- if (!pQuest)
+ if (!quest)
{
handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
handler->SetSentErrorMessage(true);
@@ -87,9 +87,9 @@ public:
}
// ok, normal (creature/GO starting) quest
- if (player->CanAddQuest(pQuest, true))
+ if (player->CanAddQuest(quest, true))
{
- player->AddQuest(pQuest, NULL);
+ player->AddQuest(quest, NULL);
if (player->CanCompleteQuest(entry))
player->CompleteQuest(entry);
@@ -116,9 +116,9 @@ public:
uint32 entry = atol(cId);
- Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry);
+ Quest const* quest = sObjectMgr->GetQuestTemplate(entry);
- if (!pQuest)
+ if (!quest)
{
handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
handler->SetSentErrorMessage(true);
@@ -163,10 +163,10 @@ public:
uint32 entry = atol(cId);
- Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry);
+ Quest const* quest = sObjectMgr->GetQuestTemplate(entry);
// If player doesn't have the quest
- if (!pQuest || player->GetQuestStatus(entry) == QUEST_STATUS_NONE)
+ if (!quest || player->GetQuestStatus(entry) == QUEST_STATUS_NONE)
{
handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
handler->SetSentErrorMessage(true);
@@ -176,8 +176,8 @@ public:
// Add quest items for quests that require items
for (uint8 x = 0; x < QUEST_ITEM_OBJECTIVES_COUNT; ++x)
{
- uint32 id = pQuest->ReqItemId[x];
- uint32 count = pQuest->ReqItemCount[x];
+ uint32 id = quest->ReqItemId[x];
+ uint32 count = quest->ReqItemCount[x];
if (!id || !count)
continue;
@@ -195,10 +195,10 @@ public:
// All creature/GO slain/casted (not required, but otherwise it will display "Creature slain 0/10")
for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
{
- int32 creature = pQuest->ReqCreatureOrGOId[i];
- uint32 creaturecount = pQuest->ReqCreatureOrGOCount[i];
+ int32 creature = quest->ReqCreatureOrGOId[i];
+ uint32 creaturecount = quest->ReqCreatureOrGOCount[i];
- if (uint32 spell_id = pQuest->ReqSpell[i])
+ if (uint32 spell_id = quest->ReqSpell[i])
{
for (uint16 z = 0; z < creaturecount; ++z)
player->CastedCreatureOrGO(creature, 0, spell_id);
@@ -217,9 +217,9 @@ public:
}
// If the quest requires reputation to complete
- if (uint32 repFaction = pQuest->GetRepObjectiveFaction())
+ if (uint32 repFaction = quest->GetRepObjectiveFaction())
{
- uint32 repValue = pQuest->GetRepObjectiveValue();
+ uint32 repValue = quest->GetRepObjectiveValue();
uint32 curRep = player->GetReputationMgr().GetReputation(repFaction);
if (curRep < repValue)
if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(repFaction))
@@ -227,9 +227,9 @@ public:
}
// If the quest requires a SECOND reputation to complete
- if (uint32 repFaction = pQuest->GetRepObjectiveFaction2())
+ if (uint32 repFaction = quest->GetRepObjectiveFaction2())
{
- uint32 repValue2 = pQuest->GetRepObjectiveValue2();
+ uint32 repValue2 = quest->GetRepObjectiveValue2();
uint32 curRep = player->GetReputationMgr().GetReputation(repFaction);
if (curRep < repValue2)
if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(repFaction))
@@ -237,7 +237,7 @@ public:
}
// If the quest requires money
- int32 ReqOrRewMoney = pQuest->GetRewOrReqMoney();
+ int32 ReqOrRewMoney = quest->GetRewOrReqMoney();
if (ReqOrRewMoney < 0)
player->ModifyMoney(-ReqOrRewMoney);