diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-06-19 23:20:06 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-06-19 23:20:06 -0300 |
| commit | 85a7d5ce9ac68b30da2277cc91d4b70358f1880d (patch) | |
| tree | df3d2084ee2e35008903c03178039b9c986e2d08 /src/server/game/Groups/GroupMgr.cpp | |
| parent | 052fc24315ace866ea1cf610e85df119b68100c9 (diff) | |
Core: ported headers cleanup from master branch
Diffstat (limited to 'src/server/game/Groups/GroupMgr.cpp')
| -rw-r--r-- | src/server/game/Groups/GroupMgr.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/server/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp index 1d0714bdf3e..13a017c4443 100644 --- a/src/server/game/Groups/GroupMgr.cpp +++ b/src/server/game/Groups/GroupMgr.cpp @@ -15,11 +15,13 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "Common.h" #include "GroupMgr.h" +#include "Common.h" +#include "DatabaseEnv.h" +#include "DBCStores.h" #include "InstanceSaveMgr.h" +#include "Log.h" #include "World.h" -#include "DBCStores.h" GroupMgr::GroupMgr() { @@ -39,7 +41,7 @@ uint32 GroupMgr::GenerateNewGroupDbStoreId() for (uint32 i = ++NextGroupDbStoreId; i < 0xFFFFFFFF; ++i) { - if ((i < GroupDbStore.size() && GroupDbStore[i] == NULL) || i >= GroupDbStore.size()) + if ((i < GroupDbStore.size() && GroupDbStore[i] == nullptr) || i >= GroupDbStore.size()) { NextGroupDbStoreId = i; break; @@ -71,7 +73,7 @@ void GroupMgr::FreeGroupDbStoreId(Group* group) if (storageId < NextGroupDbStoreId) NextGroupDbStoreId = storageId; - GroupDbStore[storageId] = NULL; + GroupDbStore[storageId] = nullptr; } Group* GroupMgr::GetGroupByDbStoreId(uint32 storageId) const @@ -79,7 +81,7 @@ Group* GroupMgr::GetGroupByDbStoreId(uint32 storageId) const if (storageId < GroupDbStore.size()) return GroupDbStore[storageId]; - return NULL; + return nullptr; } ObjectGuid::LowType GroupMgr::GenerateGroupId() @@ -104,7 +106,7 @@ Group* GroupMgr::GetGroupByGUID(ObjectGuid::LowType groupId) const if (itr != GroupStore.end()) return itr->second; - return NULL; + return nullptr; } void GroupMgr::AddGroup(Group* group) |