From 296d6791aab49f00c1edae4471d8b6a9636bb252 Mon Sep 17 00:00:00 2001
From: maximius <none@none>
Date: Tue, 17 Nov 2009 23:51:33 -0800
Subject: *Wintergrasp: Add number of players in ".wg status" command, by Spp.
 Closes #211

--HG--
branch : trunk
---
 src/game/Level2.cpp    | 12 +++++++-----
 src/game/Wintergrasp.h |  9 +++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 9b25a5216c3..5965a9f283b 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -4240,9 +4240,6 @@ bool ChatHandler::HandleNpcSetLinkCommand(const char* args)
 
 bool ChatHandler::HandleWintergraspStatusCommand(const char* args)
 {
-    if(!*args)
-        return false;
-
     OPvPWintergrasp *pvpWG = (OPvPWintergrasp*)sOutdoorPvPMgr.GetOutdoorPvPToZoneId(4197);
 
     if (!pvpWG || !sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED))
@@ -4252,7 +4249,12 @@ bool ChatHandler::HandleWintergraspStatusCommand(const char* args)
         return false;
     }
 
-    PSendSysMessage(LANG_BG_WG_STATUS, objmgr.GetTrinityStringForDBCLocale(pvpWG->GetTeam() == TEAM_ALLIANCE ? LANG_BG_AB_ALLY : LANG_BG_AB_HORDE), secsToTimeString(pvpWG->GetTimer(), true).c_str(), pvpWG->isWarTime() ? "Yes" : "No");
+    PSendSysMessage(LANG_BG_WG_STATUS, objmgr.GetTrinityStringForDBCLocale(
+        pvpWG->GetTeam() == TEAM_ALLIANCE ? LANG_BG_AB_ALLY : LANG_BG_AB_HORDE),
+        secsToTimeString(pvpWG->GetTimer(), true).c_str(),
+        pvpWG->isWarTime() ? "Yes" : "No",
+        pvpWG->GetNumPlayersH(),
+        pvpWG->GetNumPlayersA());
     return true;
 }
 
@@ -4298,7 +4300,7 @@ bool ChatHandler::HandleWintergraspEnableCommand(const char* args)
         SendSysMessage(LANG_BG_WG_DISABLE);
         SetSentErrorMessage(true);
         return false;
-    }    
+    }
 
     if (!strncmp(args, "on", 3))
     {
diff --git a/src/game/Wintergrasp.h b/src/game/Wintergrasp.h
index 59ffefb1411..a06f585d21a 100644
--- a/src/game/Wintergrasp.h
+++ b/src/game/Wintergrasp.h
@@ -215,6 +215,15 @@ class OPvPWintergrasp : public OutdoorPvP
             if (timer >= 0)
                 m_timer = timer;
         };
+        uint32 GetNumPlayersA() const
+        {
+            return m_players[TEAM_ALLIANCE].size();
+        }
+
+        uint32 GetNumPlayersH() const
+        {
+            return m_players[TEAM_HORDE].size();
+        }
         void forceChangeTeam();
         void forceStopBattle();
         void forceStartBattle();
-- 
cgit v1.2.3