diff options
| author | tartalo <none@none> | 2009-12-01 11:46:23 +0100 |
|---|---|---|
| committer | tartalo <none@none> | 2009-12-01 11:46:23 +0100 |
| commit | 36d41cdec5ddf486eccc6357f5cff4598b19d5c1 (patch) | |
| tree | 592404f8e6d9dead4c3003d5d1f5fb1efbc8665f /src/game/Wintergrasp.cpp | |
| parent | d7262a62986ccdf24fdf8a8f3702246adf359d3d (diff) | |
Wintergrasp: Fix Custom Honor rewards, by Spp. Closes #432
--HG--
branch : trunk
Diffstat (limited to 'src/game/Wintergrasp.cpp')
| -rw-r--r-- | src/game/Wintergrasp.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp index 46118cf9888..3d7eaa5598c 100644 --- a/src/game/Wintergrasp.cpp +++ b/src/game/Wintergrasp.cpp @@ -448,16 +448,6 @@ bool OPvPWintergrasp::SetupOutdoorPvP() m_towerDamagedCount[TEAM_HORDE] = 0; m_towerDestroyedCount[TEAM_HORDE] = 0; - // Load custom rewards - if (sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_CUSTOM_HONOR)) - { - m_customHonorReward[WIN_BATTLE] = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_WIN_BATTLE); - m_customHonorReward[LOSE_BATTLE] = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_LOSE_BATTLE); - m_customHonorReward[DAMAGED_TOWER] = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_TOWER); - m_customHonorReward[DESTROYED_TOWER] = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_DESTROYED_TOWER); - m_customHonorReward[DAMAGED_BUILDING] = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_BUILDING); - m_customHonorReward[INTACT_BUILDING] = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_INTACT_BUILDING); - } RemoveOfflinePlayerWGAuras(); RegisterZone(ZONE_WINTERGRASP); @@ -1539,11 +1529,11 @@ void OPvPWintergrasp::EndBattle() if ((*itr)->getLevel() > 69 && ((*itr)->HasAura(SPELL_LIEUTENANT) || (*itr)->HasAura(SPELL_CORPORAL))) ++playersWithRankNum; - baseHonor = m_customHonorReward[(team == getDefenderTeam()) ? WIN_BATTLE : LOSE_BATTLE]; - baseHonor += (m_customHonorReward[DAMAGED_TOWER] * m_towerDamagedCount[OTHER_TEAM(team)]); - baseHonor += (m_customHonorReward[DESTROYED_TOWER] * m_towerDestroyedCount[OTHER_TEAM(team)]); - baseHonor += (m_customHonorReward[INTACT_BUILDING] * intactNum); - baseHonor += (m_customHonorReward[DAMAGED_BUILDING] * damagedNum); + baseHonor = team == getDefenderTeam() ? sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_WIN_BATTLE) : sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_LOSE_BATTLE); + baseHonor += (sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_TOWER) * m_towerDamagedCount[OTHER_TEAM(team)]); + baseHonor += (sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_DESTROYED_TOWER) * m_towerDestroyedCount[OTHER_TEAM(team)]); + baseHonor += (sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_INTACT_BUILDING) * intactNum); + baseHonor += (sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_BUILDING) * damagedNum); if (playersWithRankNum) baseHonor /= playersWithRankNum; } |