mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-19 04:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[0049] Implement SMSG_DEFENSE_MESSAGE for the upcoming opvp system

Browse source 
Also fix callig go type 29 progress event if there is no neutral area (like in Halaa)
This commit is contained in:
stfx 2012-08-10 11:21:51 +02:00 • committed by Antz
parent cfae212258
commit 428bb2c5e9
4 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/GameObject.cpp
View file

@ -2074,8 +2074,8 @@ void GameObject::TickCapturePoint()
}
/* PROGRESS EVENTS */
// alliance takes the tower from neutral or contested to alliance
else if ((m_captureState == CAPTURE_STATE_NEUTRAL && m_captureSlider > CAPTURE_SLIDER_NEUTRAL + neutralPercent * 0.5f) || (m_captureState == CAPTURE_STATE_CONTEST_ALLIANCE && progressFaction == ALLIANCE))
// alliance takes the tower from neutral, contested or horde (if there is no neutral area) to alliance
else if (m_captureState != CAPTURE_STATE_PROGRESS_ALLIANCE && m_captureSlider > CAPTURE_SLIDER_NEUTRAL + neutralPercent * 0.5f && progressFaction == ALLIANCE)
{
eventId = info->capturePoint.progressEventID1;
@ -2084,8 +2084,8 @@ void GameObject::TickCapturePoint()
// set capture state to alliance
m_captureState = CAPTURE_STATE_PROGRESS_ALLIANCE;
}
// horde takes the tower from neutral or contested to horde
else if ((m_captureState == CAPTURE_STATE_NEUTRAL && m_captureSlider < CAPTURE_SLIDER_NEUTRAL - neutralPercent * 0.5f) || (m_captureState == CAPTURE_STATE_CONTEST_HORDE && progressFaction == HORDE))
// horde takes the tower from neutral, contested or alliance (if there is no neutral area) to horde
else if (m_captureState != CAPTURE_STATE_PROGRESS_HORDE && m_captureSlider < CAPTURE_SLIDER_NEUTRAL - neutralPercent * 0.5f && progressFaction == HORDE)
{
eventId = info->capturePoint.progressEventID2;