Merge remote-tracking branch 'origin/master' into 4.3.4

3 files changed, 12 insertions, 31 deletions

diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h
index 738d82135d2..97807eb989c 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h
@@ -171,7 +171,7 @@ enum WGGraveyardId
     BATTLEFIELD_WG_GRAVEYARD_MAX,
 };
 
-enum eWGGossipText
+enum WGGossipText
 {
     BATTLEFIELD_WG_GOSSIPTEXT_GY_NE              = -1850501,
     BATTLEFIELD_WG_GOSSIPTEXT_GY_NW              = -1850502,
@@ -231,12 +231,14 @@ struct BfWGCoordGY
     TeamId startcontrol;
 };
 
-const uint32 WGQuest[2][6] = {
+uint32 const WGQuest[2][6] =
+{
     { 13186, 13181, 13222, 13538, 13177, 13179 },
     { 13185, 13183, 13223, 13539, 13178, 13180 },
 };
 // 7 in sql, 7 in header
-const BfWGCoordGY WGGraveYard[BATTLEFIELD_WG_GRAVEYARD_MAX] = {
+BfWGCoordGY const WGGraveYard[BATTLEFIELD_WG_GRAVEYARD_MAX] =
+{
     { 5104.750f, 2300.940f, 368.579f, 0.733038f, 1329, BATTLEFIELD_WG_GY_WORKSHOP_NE, BATTLEFIELD_WG_GOSSIPTEXT_GY_NE, TEAM_NEUTRAL },
     { 5099.120f, 3466.036f, 368.484f, 5.317802f, 1330, BATTLEFIELD_WG_GY_WORKSHOP_NW, BATTLEFIELD_WG_GOSSIPTEXT_GY_NW, TEAM_NEUTRAL },
     { 4314.648f, 2408.522f, 392.642f, 6.268125f, 1333, BATTLEFIELD_WG_GY_WORKSHOP_SE, BATTLEFIELD_WG_GOSSIPTEXT_GY_SE, TEAM_NEUTRAL },
diff --git a/src/server/scripts/Northrend/wintergrasp.cpp b/src/server/scripts/Northrend/wintergrasp.cpp
index eba5b7f69d4..37994e40b63 100644
--- a/src/server/scripts/Northrend/wintergrasp.cpp
+++ b/src/server/scripts/Northrend/wintergrasp.cpp
@@ -22,13 +22,16 @@
 #include "ObjectMgr.h"
 #include "Vehicle.h"
 #include "GameObjectAI.h"
+#include "ScriptedCreature.h"
+#include "ScriptedGossip.h"
+#include "SpellScript.h"
 
 #define GOSSIP_HELLO_DEMO1  "Build catapult."
 #define GOSSIP_HELLO_DEMO2  "Build demolisher."
 #define GOSSIP_HELLO_DEMO3  "Build siege engine."
 #define GOSSIP_HELLO_DEMO4  "I cannot build more!"
 
-enum eWGqueuenpctext
+enum WGqueuenpctext
 {
     WG_NPCQUEUE_TEXT_H_NOWAR            = 14775,
     WG_NPCQUEUE_TEXT_H_QUEUE            = 14790,
@@ -98,7 +101,8 @@ enum QuestIds
 
 uint8 const MAX_WINTERGRASP_VEHICLES = 4;
 
-uint32 const vehiclesList[MAX_WINTERGRASP_VEHICLES] = {
+uint32 const vehiclesList[MAX_WINTERGRASP_VEHICLES] =
+{
     NPC_WINTERGRASP_CATAPULT,
     NPC_WINTERGRASP_DEMOLISHER,
     NPC_WINTERGRASP_SIEGE_ENGINE_ALLIANCE,
@@ -135,7 +139,7 @@ class npc_wg_demolisher_engineer : public CreatureScript
             return true;
         }
 
-        bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender */ , uint32 action)
+        bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender */, uint32 action)
         {
             player->CLOSE_GOSSIP_MENU();
 
diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp
index 3dc737f0c95..60572ee3e6a 100755
--- a/src/server/scripts/World/achievement_scripts.cpp
+++ b/src/server/scripts/World/achievement_scripts.cpp
@@ -235,30 +235,6 @@ class achievement_bg_av_perfection : public AchievementCriteriaScript
         }
 };
 
-class achievement_wg_didnt_stand_a_chance : public AchievementCriteriaScript
-{
-public:
-    achievement_wg_didnt_stand_a_chance() : AchievementCriteriaScript("achievement_wg_didnt_stand_a_chance") { }
-
-    bool OnCheck(Player* source, Unit* target)
-    {
-        if (!target)
-            return false;
-
-        if (Player* victim = target->ToPlayer())
-        {
-            if (!victim->IsMounted())
-                return false;
-
-            if (Vehicle* vehicle = source->GetVehicle())
-                if (vehicle->GetVehicleInfo()->m_ID == 244) // Wintergrasp Tower Cannon
-                    return true;
-        }
-
-        return false;
-    }
-};
-
 class achievement_bg_sa_defense_of_ancients : public AchievementCriteriaScript
 {
     public:
@@ -344,7 +320,6 @@ void AddSC_achievement_scripts()
     new achievement_bg_ic_mowed_down();
     new achievement_bg_sa_artillery();
     new achievement_sickly_gazelle();
-    new achievement_wg_didnt_stand_a_chance();
     new achievement_everything_counts();
     new achievement_bg_av_perfection();
     new achievement_arena_kills("achievement_arena_2v2_kills", ARENA_TYPE_2v2);