Core/Battlefield: fix issues with vehicles. return correct vehicle data when using getdata. small cleanups. codestyle

4 files changed, 14 insertions, 6 deletions

diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h
index 928e77c22b9..2bc7ccca408 100644
--- a/src/server/game/Battlefield/Battlefield.h
+++ b/src/server/game/Battlefield/Battlefield.h
@@ -177,7 +177,7 @@ protected:
     Battlefield *m_Bf;
 };
 
-class Battlefield:public ZoneScript
+class Battlefield : public ZoneScript
 {
     friend class BattlefieldMgr;
 
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
index cb9a1ac795d..2068741b4e5 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
@@ -890,6 +890,9 @@ uint32 BattlefieldWG::GetData(uint32 data)
             // Graveyards and Workshops are controlled by the same team.
             if (m_GraveYardList[GetSpiritGraveyardId(data)])
                 return m_GraveYardList[GetSpiritGraveyardId(data)]->GetControlTeamId();
+        default:
+            if (m_Data32[data])
+                return m_Data32[data];
     }
 
     return Battlefield::GetData(data);
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 319fd1eb702..0c6948160eb 100755
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -508,6 +508,7 @@ void AddSC_howling_fjord();
 void AddSC_icecrown();
 void AddSC_sholazar_basin();
 void AddSC_storm_peaks();
+void AddSC_wintergrasp();
 void AddSC_zuldrak();
 void AddSC_crystalsong_forest();
 void AddSC_isle_of_conquest();
@@ -1224,6 +1225,7 @@ void AddNorthrendScripts()
     AddSC_icecrown();
     AddSC_sholazar_basin();
     AddSC_storm_peaks();
+    AddSC_wintergrasp();
     AddSC_zuldrak();
     AddSC_crystalsong_forest();
     AddSC_isle_of_conquest();
diff --git a/src/server/scripts/Northrend/wintergrasp.cpp b/src/server/scripts/Northrend/wintergrasp.cpp
index fd09edd7b55..d8ecd042fcc 100644
--- a/src/server/scripts/Northrend/wintergrasp.cpp
+++ b/src/server/scripts/Northrend/wintergrasp.cpp
@@ -38,7 +38,7 @@ enum eWGqueuenpctext
     WG_NPCQUEUE_TEXTOPTION_JOIN         = -1850507,
 };
 
-enum eWGdata
+enum WGscriptdata
 {
     // engineer spells
     SPELL_BUILD_CATAPULT                = 56663,
@@ -49,6 +49,9 @@ enum eWGdata
 
     // teleporter spells
     SPELL_VEHICLE_TELEPORT              = 49759,
+
+    // npcs
+    NPC_ROBOTIC_ARMS                    = 27852,
 };
 
 class npc_wg_demolisher_engineer : public CreatureScript
@@ -63,7 +66,7 @@ class npc_wg_demolisher_engineer : public CreatureScript
         if (creature->isQuestGiver())
             player->PrepareQuestMenu(creature->GetGUID());
 
-        Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(1);
+        Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
 
         if (!BfWG)
             return true;
@@ -91,7 +94,7 @@ class npc_wg_demolisher_engineer : public CreatureScript
     {
         player->CLOSE_GOSSIP_MENU();
 
-        Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(1);
+        Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
 
         if (!BfWG)
             return true;
@@ -113,8 +116,8 @@ class npc_wg_demolisher_engineer : public CreatureScript
             }
             //spell 49899 Emote : 406 from sniff
             //INSERT INTO `spell_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES ('49899', '0', '1', '406', '0', '0', '0', '0', '0', '0');
-            if (Creature* creature = creature->FindNearestCreature(27852, 30.0f, true))
-                creature->CastSpell(creature, SPELL_ACTIVATE_ROBOTIC_ARMS, true);
+            if (Creature* mechCreature = creature->FindNearestCreature(NPC_ROBOTIC_ARMS, 30.0f, true))
+                creature->CastSpell(mechCreature, SPELL_ACTIVATE_ROBOTIC_ARMS, true);
         }
         return true;
     }