Fix build and formatting and reenable the WG script load

Signed-off-by: Xfurry <xfurry.cmangos@outlook.com>
cmangos · Jan 8, 2018 · 29d5b90 · 29d5b90
1 parent a3a2528
commit 29d5b90
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/src/game/Battlefield/Battlefield.h b/src/game/Battlefield/Battlefield.h
@@ -29,29 +29,29 @@ class Group;
 
 enum BattlefieldStatus
 {
-    BF_STATUS_COOLDOWN = 0,
-    BF_STATUS_IN_PROGRESS = 1
+    BF_STATUS_COOLDOWN      = 0,
+    BF_STATUS_IN_PROGRESS   = 1
 };
 
 enum
 {
-    BF_INACTIVE_REMOVE_DELAY = 5 * MINUTE,
-    BF_UNACCEPTED_REMOVE_DELAY = 10,
-    BF_TIME_TO_ACCEPT = 20,
+    BF_INACTIVE_REMOVE_DELAY    = 5 * MINUTE,
+    BF_UNACCEPTED_REMOVE_DELAY  = 10,
+    BF_TIME_TO_ACCEPT           = 20,
 };
 
 enum BattlefieldGoState
 {
-    BF_GO_STATE_NONE = 0,
-    BF_GO_STATE_NEUTRAL_INTACT = 1,
-    BF_GO_STATE_NEUTRAL_DAMAGED = 2,
-    BF_GO_STATE_NEUTRAL_DESTROYED = 3,
-    BF_GO_STATE_HORDE_INTACT = 4,
-    BF_GO_STATE_HORDE_DAMAGED = 5,
-    BF_GO_STATE_HORDE_DESTROYED = 6,
-    BF_GO_STATE_ALLIANCE_INTACT = 7,
-    BF_GO_STATE_ALLIANCE_DAMAGED = 8,
-    BF_GO_STATE_ALLIANCE_DESTROYED = 9,
+    BF_GO_STATE_NONE                = 0,
+    BF_GO_STATE_NEUTRAL_INTACT      = 1,
+    BF_GO_STATE_NEUTRAL_DAMAGED     = 2,
+    BF_GO_STATE_NEUTRAL_DESTROYED   = 3,
+    BF_GO_STATE_HORDE_INTACT        = 4,
+    BF_GO_STATE_HORDE_DAMAGED       = 5,
+    BF_GO_STATE_HORDE_DESTROYED     = 6,
+    BF_GO_STATE_ALLIANCE_INTACT     = 7,
+    BF_GO_STATE_ALLIANCE_DAMAGED    = 8,
+    BF_GO_STATE_ALLIANCE_DESTROYED  = 9,
 };
 
 class BattlefieldBuilding

diff --git a/src/game/Battlefield/BattlefieldHandler.cpp b/src/game/Battlefield/BattlefieldHandler.cpp
@@ -20,6 +20,9 @@
 #include "Server/WorldSession.h"
 #include "OutdoorPvP/OutdoorPvPMgr.h"
 #include "Battlefield/Battlefield.h"
+#include "WorldPacket.h"
+#include "Log.h"
+#include "Server/Opcodes.h"
 
 /**
 Invite a player to join and teleport to a battlefield

diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -73,7 +73,7 @@ void OutdoorPvPMgr::InitOutdoorPvP()
     LOAD_OPVP_ZONE(TF);
     LOAD_OPVP_ZONE(NA);
     LOAD_OPVP_ZONE(GH);
-    //LOAD_BATTLEFIELD(WG);
+    LOAD_BATTLEFIELD(WG);
 
     sLog.outString(">> Loaded %u Outdoor PvP zones", counter);
     sLog.outString();