diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/GridNotifiers.cpp | 5 | ||||
| -rw-r--r-- | src/game/OutdoorPvP.cpp | 14 | ||||
| -rw-r--r-- | src/game/OutdoorPvPMgr.cpp | 13 | ||||
| -rw-r--r-- | src/game/OutdoorPvPMgr.h | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp index 2b59a1a9098..facfc203758 100644 --- a/src/game/GridNotifiers.cpp +++ b/src/game/GridNotifiers.cpp @@ -73,7 +73,7 @@ PlayerVisibilityNotifier::Notify() if( i_data.HasData() ) { - uint32 entry = 0, map; + /*uint32 entry = 0, map; float x,y; if(!i_visibleNow.empty()) { @@ -81,7 +81,8 @@ PlayerVisibilityNotifier::Notify() map = (*i_visibleNow.begin())->GetMapId(); x = (*i_visibleNow.begin())->GetPositionX(); y = (*i_visibleNow.begin())->GetPositionY(); - } + sLog.outError("notify %u %u %f %f", entry, map, x, y); + }*/ // send create/outofrange packet to player (except player create updates that already sent using SendUpdateToPlayer) WorldPacket packet; diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp index 86fbb92a97a..c1e3c84e6f7 100644 --- a/src/game/OutdoorPvP.cpp +++ b/src/game/OutdoorPvP.cpp @@ -247,7 +247,7 @@ bool OPvPCapturePoint::Update(uint32 diff) } // get the difference of numbers - float fact_diff = (float)m_activePlayers[0].size() - (float)m_activePlayers[1].size(); + float fact_diff = ((float)m_activePlayers[0].size() - (float)m_activePlayers[1].size()) * diff / OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL; if(!fact_diff) return false; @@ -259,8 +259,8 @@ bool OPvPCapturePoint::Update(uint32 diff) if(m_State == OBJECTIVESTATE_HORDE && m_ShiftPhase <= -m_ShiftMaxPhase) return false; - if(fact_diff < - m_ShiftMaxCaptureSpeed) - fact_diff = - m_ShiftMaxCaptureSpeed; + if(fact_diff < -m_ShiftMaxCaptureSpeed) + fact_diff = -m_ShiftMaxCaptureSpeed; Challenger = HORDE; } @@ -283,16 +283,16 @@ bool OPvPCapturePoint::Update(uint32 diff) m_ShiftPhase += fact_diff; // check limits, these are over the grey part - if(m_ShiftPhase <= -m_ShiftMaxPhase * (float)(m_NeutralValue) / 100.0f) + if(m_ShiftPhase < -m_ShiftMaxPhase * (float)(m_NeutralValue) / 100.0f) { - if(m_ShiftPhase <= -m_ShiftMaxPhase) + if(m_ShiftPhase < -m_ShiftMaxPhase) m_ShiftPhase = -m_ShiftMaxPhase; m_State = OBJECTIVESTATE_HORDE; return true; } - else if(m_ShiftPhase >= m_ShiftMaxPhase * (float)(m_NeutralValue) / 100.0f) + else if(m_ShiftPhase > m_ShiftMaxPhase * (float)(m_NeutralValue) / 100.0f) { - if(m_ShiftPhase >= m_ShiftMaxPhase) + if(m_ShiftPhase > m_ShiftMaxPhase) m_ShiftPhase = m_ShiftMaxPhase; m_State = OBJECTIVESTATE_ALLIANCE; return true; diff --git a/src/game/OutdoorPvPMgr.cpp b/src/game/OutdoorPvPMgr.cpp index 446f7e2ce95..8a59b438d5b 100644 --- a/src/game/OutdoorPvPMgr.cpp +++ b/src/game/OutdoorPvPMgr.cpp @@ -31,7 +31,7 @@ INSTANTIATE_SINGLETON_1( OutdoorPvPMgr ); OutdoorPvPMgr::OutdoorPvPMgr() { - m_UpdateTimer = OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL; + m_UpdateTimer = 0; //sLog.outDebug("Instantiating OutdoorPvPMgr"); } @@ -187,14 +187,13 @@ OutdoorPvP * OutdoorPvPMgr::GetOutdoorPvPToZoneId(uint32 zoneid) void OutdoorPvPMgr::Update(uint32 diff) { - if(m_UpdateTimer < diff) + m_UpdateTimer += diff; + if(m_UpdateTimer > OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL) { for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr) - { - (*itr)->Update(diff); - } - m_UpdateTimer = OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL; - } else m_UpdateTimer -= diff; + (*itr)->Update(m_UpdateTimer); + m_UpdateTimer = 0; + } } bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go) diff --git a/src/game/OutdoorPvPMgr.h b/src/game/OutdoorPvPMgr.h index 9490ac87d4b..d3b1af92e97 100644 --- a/src/game/OutdoorPvPMgr.h +++ b/src/game/OutdoorPvPMgr.h @@ -74,7 +74,7 @@ private: // used in player event handling OutdoorPvPMap m_OutdoorPvPMap; // update interval - float m_UpdateTimer; + uint32 m_UpdateTimer; }; #define sOutdoorPvPMgr Trinity::Singleton<OutdoorPvPMgr>::Instance() |