aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWyldePointer <sohrab.monfared@gmail.com>2013-03-09 15:20:57 +0000
committerNay <dnpd.dd@gmail.com>2013-03-09 15:20:57 +0000
commit47f7687bab80c1434ac7641b81bbbc064d4f22db (patch)
tree697eeab528fc9da414c690cd64f515e2b1cecdcc /src
parentd2024c5c05690fd9047029156d85fb6cc08e50ca (diff)
Core: Remove unnecessary commas
Last element of enumerator does not need comma after it's value. Closes #9367
Diffstat (limited to 'src')
-rw-r--r--src/server/authserver/Authentication/AuthCodes.h4
-rw-r--r--src/server/collision/Management/MMapFactory.h2
-rw-r--r--src/server/collision/Maps/MapTree.h4
-rw-r--r--src/server/collision/Models/WorldModel.h6
-rw-r--r--src/server/game/AI/EventAI/CreatureEventAIMgr.h4
-rw-r--r--src/server/game/AI/SmartScripts/SmartAI.h2
-rw-r--r--src/server/game/AI/SmartScripts/SmartScriptMgr.h4
-rw-r--r--src/server/game/Battlegrounds/Zones/BattlegroundDS.h20
-rw-r--r--src/server/game/Battlegrounds/Zones/BattlegroundRV.h8
9 files changed, 27 insertions, 27 deletions
diff --git a/src/server/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h
index 492ac53f8cd..416d14ba5a0 100644
--- a/src/server/authserver/Authentication/AuthCodes.h
+++ b/src/server/authserver/Authentication/AuthCodes.h
@@ -41,7 +41,7 @@ enum AuthResult
WOW_FAIL_GAME_ACCOUNT_LOCKED = 0x18,
WOW_FAIL_INTERNET_GAME_ROOM_WITHOUT_BNET = 0x19,
WOW_FAIL_UNLOCKABLE_LOCK = 0x20,
- WOW_FAIL_DISCONNECTED = 0xFF,
+ WOW_FAIL_DISCONNECTED = 0xFF
};
enum LoginResult
@@ -62,7 +62,7 @@ enum LoginResult
LOGIN_FAILED4 = 0x0D,
LOGIN_CONNECTED = 0x0E,
LOGIN_PARENTALCONTROL = 0x0F,
- LOGIN_LOCKED_ENFORCED = 0x10,
+ LOGIN_LOCKED_ENFORCED = 0x10
};
enum ExpansionFlags
diff --git a/src/server/collision/Management/MMapFactory.h b/src/server/collision/Management/MMapFactory.h
index 00f19a194d3..038d44a941c 100644
--- a/src/server/collision/Management/MMapFactory.h
+++ b/src/server/collision/Management/MMapFactory.h
@@ -31,7 +31,7 @@ namespace MMAP
{
MMAP_LOAD_RESULT_ERROR,
MMAP_LOAD_RESULT_OK,
- MMAP_LOAD_RESULT_IGNORED,
+ MMAP_LOAD_RESULT_IGNORED
};
// static class
diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h
index 5de8e616d2b..e97c44d089e 100644
--- a/src/server/collision/Maps/MapTree.h
+++ b/src/server/collision/Maps/MapTree.h
@@ -31,7 +31,7 @@ namespace VMAP
struct LocationInfo
{
- LocationInfo(): hitInstance(0), hitModel(0), ground_Z(-G3D::inf()) {};
+ LocationInfo(): hitInstance(0), hitModel(0), ground_Z(-G3D::inf()) {}
const ModelInstance* hitInstance;
const GroupModel* hitModel;
float ground_Z;
@@ -85,7 +85,7 @@ namespace VMAP
struct AreaInfo
{
- AreaInfo(): result(false), ground_Z(-G3D::inf()) {};
+ AreaInfo(): result(false), ground_Z(-G3D::inf()) {}
bool result;
float ground_Z;
uint32 flags;
diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h
index cea32cfedfb..9d588316cce 100644
--- a/src/server/collision/Models/WorldModel.h
+++ b/src/server/collision/Models/WorldModel.h
@@ -36,8 +36,8 @@ namespace VMAP
class MeshTriangle
{
public:
- MeshTriangle(){};
- MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) {};
+ MeshTriangle(){}
+ MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) {}
uint32 idx0;
uint32 idx1;
@@ -59,7 +59,7 @@ namespace VMAP
bool writeToFile(FILE* wf);
static bool readFromFile(FILE* rf, WmoLiquid* &liquid);
private:
- WmoLiquid(): iHeight(0), iFlags(0) {};
+ WmoLiquid(): iHeight(0), iFlags(0) {}
uint32 iTilesX; //!< number of tiles in x direction, each
uint32 iTilesY;
G3D::Vector3 iCorner; //!< the lower corner
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.h b/src/server/game/AI/EventAI/CreatureEventAIMgr.h
index 1ec08682563..8e862a9279b 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.h
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.h
@@ -27,8 +27,8 @@ class CreatureEventAIMgr
friend class ACE_Singleton<CreatureEventAIMgr, ACE_Null_Mutex>;
private:
- CreatureEventAIMgr(){};
- ~CreatureEventAIMgr(){};
+ CreatureEventAIMgr(){}
+ ~CreatureEventAIMgr(){}
public:
void LoadCreatureEventAI_Texts();
diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h
index b5b92efdcd2..dee6bec905c 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.h
+++ b/src/server/game/AI/SmartScripts/SmartAI.h
@@ -45,7 +45,7 @@ enum SmartEscortVars
class SmartAI : public CreatureAI
{
public:
- ~SmartAI(){};
+ ~SmartAI(){}
explicit SmartAI(Creature* c);
// Start moving to the desired MovePoint
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
index 7b184503e88..2ff5ce27aa0 100644
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
@@ -1301,9 +1301,9 @@ typedef UNORDERED_MAP<int32, SmartAIEventList> SmartAIEventMap;
class SmartAIMgr
{
friend class ACE_Singleton<SmartAIMgr, ACE_Null_Mutex>;
- SmartAIMgr(){};
+ SmartAIMgr(){}
public:
- ~SmartAIMgr(){};
+ ~SmartAIMgr(){}
void LoadSmartAIFromDB();
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
index c9fe5e43c33..43437595220 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
@@ -106,15 +106,15 @@ class BattlegroundDS : public Battleground
void PostUpdateImpl(uint32 diff);
protected:
- uint32 getWaterFallStatus() { return _waterfallStatus; };
- void setWaterFallStatus(uint8 status) { _waterfallStatus = status; };
- uint32 getWaterFallTimer() { return _waterfallTimer; };
- void setWaterFallTimer(uint32 timer) { _waterfallTimer = timer; };
- uint32 getWaterFallKnockbackTimer() { return _waterfallKnockbackTimer; };
- void setWaterFallKnockbackTimer(uint32 timer) { _waterfallKnockbackTimer = timer; };
- uint8 getPipeKnockBackCount() { return _pipeKnockBackCount; };
- void setPipeKnockBackCount(uint8 count) { _pipeKnockBackCount = count; };
- uint32 getPipeKnockBackTimer() { return _pipeKnockBackTimer; };
- void setPipeKnockBackTimer(uint32 timer) { _pipeKnockBackTimer = timer; };
+ uint32 getWaterFallStatus() { return _waterfallStatus; }
+ void setWaterFallStatus(uint8 status) { _waterfallStatus = status; }
+ uint32 getWaterFallTimer() { return _waterfallTimer; }
+ void setWaterFallTimer(uint32 timer) { _waterfallTimer = timer; }
+ uint32 getWaterFallKnockbackTimer() { return _waterfallKnockbackTimer; }
+ void setWaterFallKnockbackTimer(uint32 timer) { _waterfallKnockbackTimer = timer; }
+ uint8 getPipeKnockBackCount() { return _pipeKnockBackCount; }
+ void setPipeKnockBackCount(uint8 count) { _pipeKnockBackCount = count; }
+ uint32 getPipeKnockBackTimer() { return _pipeKnockBackTimer; }
+ void setPipeKnockBackTimer(uint32 timer) { _pipeKnockBackTimer = timer; }
};
#endif
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
index af6b5996edd..b6dc3775df8 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
@@ -118,11 +118,11 @@ class BattlegroundRV : public Battleground
void PostUpdateImpl(uint32 diff);
protected:
- uint32 getTimer() { return Timer; };
- void setTimer(uint32 timer) { Timer = timer; };
+ uint32 getTimer() { return Timer; }
+ void setTimer(uint32 timer) { Timer = timer; }
- uint32 getState() { return State; };
- void setState(uint32 state) { State = state; };
+ uint32 getState() { return State; }
+ void setState(uint32 state) { State = state; }
void TogglePillarCollision();
bool GetPillarCollision() { return PillarCollision; }
void SetPillarCollision(bool apply) { PillarCollision = apply; }