aboutsummaryrefslogtreecommitdiff
path: root/src/game/OutdoorPvPZM.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-12 08:51:51 -0500
committermegamage <none@none>2009-08-12 08:51:51 -0500
commit99eafd6a522b8fb480182be87828a00a6f500575 (patch)
tree298cd78ed419fb1731a35069e1fa3eb1c558e0cc /src/game/OutdoorPvPZM.cpp
parentcd78172c7d04e96bb1392cd6729d333b49518923 (diff)
*Allow players to capture siege workshops in wintergrasp.
--HG-- branch : trunk
Diffstat (limited to 'src/game/OutdoorPvPZM.cpp')
-rw-r--r--src/game/OutdoorPvPZM.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/OutdoorPvPZM.cpp b/src/game/OutdoorPvPZM.cpp
index c3861e7a7ec..b2b717e06c4 100644
--- a/src/game/OutdoorPvPZM.cpp
+++ b/src/game/OutdoorPvPZM.cpp
@@ -57,9 +57,9 @@ bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player *plr)
if(OPvPCapturePoint::HandlePlayerEnter(plr))
{
plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_disp, 1);
- uint32 phase = (uint32)ceil(( m_ShiftPhase + m_ShiftMaxPhase) / ( 2 * m_ShiftMaxPhase ) * 100.0f);
+ uint32 phase = (uint32)ceil(( m_value + m_maxValue) / ( 2 * m_maxValue ) * 100.0f);
plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_pos, phase);
- plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_n, m_NeutralValue);
+ plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_n, m_neutralValuePct);
return true;
}
return false;
@@ -119,9 +119,9 @@ void OPvPCapturePointZM_Beacon::SendChangePhase()
// send this too, sometimes the slider disappears, dunno why :(
SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_disp, 1);
// send these updates to only the ones in this objective
- uint32 phase = (uint32)ceil(( m_ShiftPhase + m_ShiftMaxPhase) / ( 2 * m_ShiftMaxPhase ) * 100.0f);
+ uint32 phase = (uint32)ceil(( m_value + m_maxValue) / ( 2 * m_maxValue ) * 100.0f);
SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_pos, phase);
- SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_n, m_NeutralValue);
+ SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_n, m_neutralValuePct);
}
bool OutdoorPvPZM::Update(uint32 diff)