diff options
| author | Paradox <iamparadox@netscape.net> | 2009-10-19 02:26:42 -0400 |
|---|---|---|
| committer | Paradox <iamparadox@netscape.net> | 2009-10-19 02:26:42 -0400 |
| commit | 4e39cd332949f188a6390dc4ca5a7236e5554f4b (patch) | |
| tree | fd67a74d88c15d29cea27a6130aee2768262f887 /src | |
| parent | 14f043bbde1334eb9197ccf5985177e9693ecfc5 (diff) | |
Few small cleanups in Wintergrasp
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Wintergrasp.cpp | 10 | ||||
| -rw-r--r-- | src/game/Wintergrasp.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp index 34febbbbcad..20be5fc3cb6 100644 --- a/src/game/Wintergrasp.cpp +++ b/src/game/Wintergrasp.cpp @@ -95,7 +95,7 @@ OPvPWintergrasp::OPvPWintergrasp() bool OPvPWintergrasp::SetupOutdoorPvP() { - if(!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED)) + if (!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED)) return false; m_defender = TeamId(rand()%2); @@ -771,7 +771,7 @@ bool OPvPWintergrasp::UpdateGameObjectInfo(GameObject *go) const void OPvPWintergrasp::HandlePlayerEnterZone(Player * plr, uint32 zone) { - if(plr->GetTeamId() == getDefenderTeam() && !isWarTime()) + if (!isWarTime() && (plr->GetTeamId() == getDefenderTeam())) plr->CastSpell(plr,SPELL_ESSENCE_OF_WG,true); if (isWarTime() && !plr->HasAura(SPELL_RECRUIT) && !plr->HasAura(SPELL_CORPORAL) @@ -847,7 +847,7 @@ void OPvPWintergrasp::HandleKill(Player *killer, Unit *victim) if (victim->getLevel() >= 70) ok = true; - if(killer->GetQuestStatus(SLAY_THEM_ALL_1) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(SLAY_THEM_ALL_2) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(NO_MERCY_MERCILESS_1) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(NO_MERCY_MERCILESS) == QUEST_STATUS_INCOMPLETE) + if (killer->GetQuestStatus(SLAY_THEM_ALL_1) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(SLAY_THEM_ALL_2) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(NO_MERCY_MERCILESS_1) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(NO_MERCY_MERCILESS) == QUEST_STATUS_INCOMPLETE) killer->KilledMonsterCredit(CRE_PVP_KILL,0); } else @@ -996,7 +996,7 @@ void OPvPWintergrasp::UpdateClock() bool OPvPWintergrasp::Update(uint32 diff) { - if(!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED)) + if (!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED)) return false; if (m_timer > diff) @@ -1187,7 +1187,7 @@ void OPvPWintergrasp::EndBattle() } if (team == getDefenderTeam()) { - if((*itr)->HasAura(SPELL_LIEUTENANT) || (*itr)->HasAura(SPELL_CORPORAL)) + if ((*itr)->HasAura(SPELL_LIEUTENANT) || (*itr)->HasAura(SPELL_CORPORAL)) { (*itr)->AreaExploredOrEventHappens(A_VICTORY_IN_WG); (*itr)->AreaExploredOrEventHappens(H_VICTORY_IN_WG); diff --git a/src/game/Wintergrasp.h b/src/game/Wintergrasp.h index 121d8afd0f6..776b5b94b07 100644 --- a/src/game/Wintergrasp.h +++ b/src/game/Wintergrasp.h @@ -118,7 +118,7 @@ enum DamageState { // Do not change order DAMAGE_INTACT, DAMAGE_DAMAGED, - DAMAGE_DESTROYED, + DAMAGE_DESTROYED, }; const uint32 AreaPOIIconId[3][3] = {{7,8,9},{4,5,6},{1,2,3}}; |