diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-10-07 14:57:18 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-10-07 14:57:18 +0100 |
| commit | 44c2edee51ba9cec3c481007c5c659b1e2124058 (patch) | |
| tree | 59cbd3539bcb18f0c22a53c31cc9d9672c25ee35 /src/server/game/Battlefield/Battlefield.cpp | |
| parent | f570383fbadf12c02d2a3f323eadf5ca2417c3bd (diff) | |
| parent | 1a89de87c19936b18d45ec783a3244addb996062 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.cpp')
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index cbaab482b01..b7572c6f2b0 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -1001,7 +1001,7 @@ bool BfCapturePoint::Update(uint32 diff) // get the difference of numbers float fact_diff = ((float) m_activePlayers[0].size() - (float) m_activePlayers[1].size()) * diff / BATTLEFIELD_OBJECTIVE_UPDATE_INTERVAL; - if (!fact_diff) + if (G3D::fuzzyEq(fact_diff, 0.0f)) return false; uint32 Challenger = 0; @@ -1071,7 +1071,7 @@ bool BfCapturePoint::Update(uint32 diff) m_team = TEAM_NEUTRAL; } - if (m_value != oldValue) + if (G3D::fuzzyNe(m_value, oldValue)) SendChangePhase(); if (m_OldState != m_State) |