diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-10-04 11:44:25 +0200 |
|---|---|---|
| committer | SnapperRy <snapperryen@gmail.com> | 2016-10-04 11:44:25 +0200 |
| commit | 7267a414183fce4e146d464e0a2124f617da9648 (patch) | |
| tree | 3363fd744d4b36dc6f25be3e0a9871593c61f3e1 /src | |
| parent | 723c253f8f09d773cd0fd47615c9f424b5c51d9d (diff) | |
Make travis happy and fix codestyle for previous commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index b4d9d097f14..ddcf21c197a 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -499,13 +499,11 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const case CONDITION_WINTERGRASP_HORDE: { condMeets = false; - if (Player* player = object->ToPlayer()) - { - Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(1); - if (wintergrasp->IsEnabled()) - if (wintergrasp->GetDefenderTeam() == TEAM_HORDE) - condMeets = true; - } + if (object->ToPlayer()) + if (Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG)) + if (wintergrasp->IsEnabled()) + if (wintergrasp->GetDefenderTeam() == TEAM_HORDE) + condMeets = true; break; } default: |