Wintergrasp: Fix Custom Honor rewards, by Spp. Closes #432

--HG--
branch : trunk

2 files changed, 5 insertions, 28 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;
         }
diff --git a/src/game/Wintergrasp.h b/src/game/Wintergrasp.h
index 97ad004c2db..cc34520ae34 100644
--- a/src/game/Wintergrasp.h
+++ b/src/game/Wintergrasp.h
@@ -54,17 +54,6 @@ enum WintergraspSpell
 //    SPELL_VICTORY_AURA                           = 60044,
 };
 
-enum WintergraspRewardEvent
-{
-    WIN_BATTLE,
-    LOSE_BATTLE,
-    DAMAGED_TOWER,
-    DESTROYED_TOWER,
-    DAMAGED_BUILDING,
-    INTACT_BUILDING,
-    WG_REWARD_EVENT_MAX,
-};
-
 /* Not used / Not implemented
 
 const uint16 GameEventWintergraspDefender[2] = {50, 51};
@@ -260,8 +249,6 @@ class OPvPWintergrasp : public OutdoorPvP
         uint32 m_towerDestroyedCount[2];
         uint32 m_towerDamagedCount[2];
 
-        uint32 m_customHonorReward[WG_REWARD_EVENT_MAX];
-
         SiegeWorkshop *GetWorkshop(uint32 lowguid) const;
         SiegeWorkshop *GetWorkshopByEngGuid(uint32 lowguid) const;
         SiegeWorkshop *GetWorkshopByGOGuid(uint32 lowguid) const;