aboutsummaryrefslogtreecommitdiff
path: root/src/game/OutdoorPvPHP.cpp
diff options
context:
space:
mode:
authorBlaymoira <none@none>2008-12-22 21:11:32 +0100
committerBlaymoira <none@none>2008-12-22 21:11:32 +0100
commitf41a1496d906779c78a9af0c4eaea1b97aa2a2e8 (patch)
tree3fdb337713e1d14e6e68a2fa8235086c13fa41bb /src/game/OutdoorPvPHP.cpp
parent22413c016e1057623c7e1b6a476cebd861f163fa (diff)
parenta007964d93833f8d7d9558e40db16eb34c113f86 (diff)
*Merge with 582
--HG-- branch : trunk
Diffstat (limited to 'src/game/OutdoorPvPHP.cpp')
-rw-r--r--src/game/OutdoorPvPHP.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/OutdoorPvPHP.cpp b/src/game/OutdoorPvPHP.cpp
index 5c59bb6b5e6..846e23c8107 100644
--- a/src/game/OutdoorPvPHP.cpp
+++ b/src/game/OutdoorPvPHP.cpp
@@ -72,11 +72,11 @@ bool OutdoorPvPHP::SetupOutdoorPvP()
for(int i = 0; i < OutdoorPvPHPBuffZonesNum; ++i)
sOutdoorPvPMgr.AddZone(OutdoorPvPHPBuffZones[i],this);
- m_OutdoorPvPObjectives.insert(new OutdoorPvPObjectiveHP(this,HP_TOWER_BROKEN_HILL));
+ m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveHP(this,HP_TOWER_BROKEN_HILL));
- m_OutdoorPvPObjectives.insert(new OutdoorPvPObjectiveHP(this,HP_TOWER_OVERLOOK));
+ m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveHP(this,HP_TOWER_OVERLOOK));
- m_OutdoorPvPObjectives.insert(new OutdoorPvPObjectiveHP(this,HP_TOWER_STADIUM));
+ m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveHP(this,HP_TOWER_STADIUM));
return true;
}
@@ -277,7 +277,7 @@ bool OutdoorPvPObjectiveHP::Update(uint32 diff)
// send this too, sometimes the slider disappears, dunno why :(
SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 1);
}
- return true;
+ return m_OldState != m_State;
}
return false;
}