From 1c52d5fff738aa01bd27fd117076ac33515acef5 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 14 Aug 2020 17:06:03 +0200 Subject: Core/Misc: Replace NULL with nullptr --- src/server/game/Loot/Loot.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/game/Loot/Loot.cpp') diff --git a/src/server/game/Loot/Loot.cpp b/src/server/game/Loot/Loot.cpp index e54a007f962..73ccbca886e 100644 --- a/src/server/game/Loot/Loot.cpp +++ b/src/server/game/Loot/Loot.cpp @@ -235,7 +235,7 @@ bool Loot::FillLoot(uint32 lootId, LootStore const& store, Player* lootOwner, bo { roundRobinPlayer = lootOwner->GetGUID(); - for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) if (Player* player = itr->GetSource()) // should actually be looted object instead of lootOwner but looter has to be really close so doesnt really matter if (player->IsInMap(lootOwner)) FillNotNormalLootFor(player, player->IsAtGroupRewardDistance(lootOwner)); @@ -303,7 +303,7 @@ LootItem const* Loot::GetItemInSlot(uint32 lootSlot) const LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, NotNormalLootItem* *qitem, NotNormalLootItem* *ffaitem, NotNormalLootItem* *conditem) { - LootItem* item = NULL; + LootItem* item = nullptr; bool is_looted = true; if (lootSlot >= items.size()) { @@ -359,7 +359,7 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, NotNormalLootIte } if (is_looted) - return NULL; + return nullptr; return item; } @@ -660,7 +660,7 @@ void Loot::FillNotNormalLootFor(Player* player, bool presentAtLooting) // Process currency items uint32 max_slot = GetMaxSlotInLootFor(player); - LootItem const* item = NULL; + LootItem const* item = nullptr; uint32 itemsSize = uint32(items.size()); for (uint32 i = 0; i < max_slot; ++i) { @@ -692,7 +692,7 @@ NotNormalLootItemList* Loot::FillFFALoot(Player* player) if (ql->empty()) { delete ql; - return NULL; + return nullptr; } PlayerFFAItems[player->GetGUID()] = ql; @@ -702,7 +702,7 @@ NotNormalLootItemList* Loot::FillFFALoot(Player* player) NotNormalLootItemList* Loot::FillQuestLoot(Player* player) { if (items.size() == MAX_NR_LOOT_ITEMS) - return NULL; + return nullptr; NotNormalLootItemList* ql = new NotNormalLootItemList(); @@ -730,7 +730,7 @@ NotNormalLootItemList* Loot::FillQuestLoot(Player* player) if (ql->empty()) { delete ql; - return NULL; + return nullptr; } PlayerQuestItems[player->GetGUID()] = ql; @@ -762,7 +762,7 @@ NotNormalLootItemList* Loot::FillNonQuestNonFFAConditionalLoot(Player* player, b if (ql->empty()) { delete ql; - return NULL; + return nullptr; } PlayerNonQuestNonFFAConditionalItems[player->GetGUID()] = ql; -- cgit v1.2.3