Skip to content

Commit

Permalink
C++11 nullptr
Browse files Browse the repository at this point in the history 
(based on cmangos/mangos-wotlk@7c4c777)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
  • Loading branch information
@xfurry
Cyberium authored and xfurry committed Nov 15, 2015
1 parent e95fcd6 commit bc14a22
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 54 deletions.
18 changes: 9 additions & 9 deletions src/game/Chat.cpp
View file
Expand Up @@ -297,15 +297,15 @@ ChatCommand* ChatHandler::getCommandTable()

static ChatCommand gobjectCommandTable[] =
{
{ "add", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectAddCommand, "", NULL },
{ "delete", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectDeleteCommand, "", NULL },
{ "move", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectMoveCommand, "", NULL },
{ "near", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectNearCommand, "", NULL },
{ "respawn", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectRespawnCommand, "", NULL },
{ "setphase", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectPhaseCommand, "", NULL },
{ "target", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectTargetCommand, "", NULL },
{ "turn", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectTurnCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
{ "add", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectAddCommand, "", nullptr },
{ "delete", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectDeleteCommand, "", nullptr },
{ "move", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectMoveCommand, "", nullptr },
{ "near", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectNearCommand, "", nullptr },
{ "respawn", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectRespawnCommand, "", nullptr },
{ "setphase", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectPhaseCommand, "", nullptr },
{ "target", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectTargetCommand, "", nullptr },
{ "turn", SEC_GAMEMASTER, false, &ChatHandler::HandleGameObjectTurnCommand, "", nullptr },
{ nullptr, 0, false, nullptr, "", nullptr }
};

static ChatCommand guildCommandTable[] =
Expand Down
2 changes: 1 addition & 1 deletion src/game/Corpse.cpp
View file
Expand Up @@ -28,7 +28,7 @@
#include "ObjectMgr.h"

Corpse::Corpse(CorpseType type) : WorldObject(),
lootRecipient(NULL),
lootRecipient(nullptr),
lootForBody(false)
{
m_objectType |= TYPEMASK_CORPSE;
Expand Down
8 changes: 4 additions & 4 deletions src/game/Creature.cpp
View file
Expand Up @@ -133,7 +133,7 @@ bool CreatureCreatePos::Relocate(Creature* cr) const
}

Creature::Creature(CreatureSubtype subtype) : Unit(),
i_AI(NULL),
i_AI(nullptr),
m_lootMoney(0), m_lootGroupRecipientId(0),
m_lootStatus(CREATURE_LOOT_STATUS_NONE),
m_corpseDecayTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_aggroDelay(0), m_respawnradius(5.0f),
Expand Down Expand Up @@ -208,7 +208,7 @@ void Creature::RemoveCorpse()
UpdateObjectVisibility();

delete loot;
loot = NULL;
loot = nullptr;
m_lootStatus = CREATURE_LOOT_STATUS_NONE;
uint32 respawnDelay = 0;

Expand Down Expand Up @@ -515,7 +515,7 @@ void Creature::Update(uint32 update_diff, uint32 diff)
m_respawnTime = 0;
m_aggroDelay = sWorld.getConfig(CONFIG_UINT32_CREATURE_RESPAWN_AGGRO_DELAY);
delete loot;
loot = NULL;
loot = nullptr;

// Clear possible auras having IsDeathPersistent() attribute
RemoveAllAuras();
Expand Down Expand Up @@ -974,7 +974,7 @@ void Creature::PrepareBodyLootState()
{
// loot may already exist (pickpocket case)
delete loot;
loot = NULL;
loot = nullptr;

Player* killer = GetLootRecipient();

Expand Down
20 changes: 10 additions & 10 deletions src/game/GameObject.cpp
View file
Expand Up @@ -44,9 +44,9 @@
#include <G3D/Quat.h>

GameObject::GameObject() : WorldObject(),
m_model(NULL),
m_goInfo(NULL),
m_displayInfo(NULL)
m_model(nullptr),
m_goInfo(nullptr),
m_displayInfo(nullptr)
{
m_objectType |= TYPEMASK_GAMEOBJECT;
m_objectTypeId = TYPEID_GAMEOBJECT;
Expand Down Expand Up @@ -271,12 +271,12 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
{
if (m_reStockTimer != 0)
{
if (m_reStockTimer <= time(NULL))
if (m_reStockTimer <= time(nullptr))
{
m_reStockTimer = 0;
m_lootState = GO_READY;
delete loot;
loot = NULL;
loot = nullptr;
ForceValuesUpdateAtIndex(GAMEOBJECT_DYNAMIC);
}
}
Expand Down Expand Up @@ -405,8 +405,8 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
if (loot)
{
if (loot->IsChanged())
m_despawnTimer = time(NULL) + 5 * MINUTE; // TODO:: need to add a define?
else if (m_despawnTimer != 0 && m_despawnTimer <= time(NULL))
m_despawnTimer = time(nullptr) + 5 * MINUTE; // TODO:: need to add a define?
else if (m_despawnTimer != 0 && m_despawnTimer <= time(nullptr))
m_lootState = GO_JUST_DEACTIVATED;

loot->Update();
Expand Down Expand Up @@ -470,7 +470,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
m_despawnTimer = 0;
if (m_goInfo->chest.chestRestockTime)
{
m_reStockTimer = time(NULL) + m_goInfo->chest.chestRestockTime;
m_reStockTimer = time(nullptr) + m_goInfo->chest.chestRestockTime;
m_lootState = GO_NOT_READY;
ForceValuesUpdateAtIndex(GAMEOBJECT_DYNAMIC);
return;
Expand Down Expand Up @@ -505,8 +505,8 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
}

delete loot;
loot = NULL;
SetLootRecipient(NULL);
loot = nullptr;
SetLootRecipient(nullptr);
SetLootState(GO_READY);

if (!m_respawnDelayTime)
Expand Down
2 changes: 1 addition & 1 deletion src/game/Level2.cpp
View file
Expand Up @@ -1224,7 +1224,7 @@ bool ChatHandler::HandleGameObjectRespawnCommand(char* args)
if (!lowguid)
return false;

GameObject* obj = NULL;
GameObject* obj = nullptr;

// by DB guid
if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
Expand Down
8 changes: 4 additions & 4 deletions src/game/LootHandler.cpp
View file
Expand Up @@ -54,7 +54,7 @@ void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recv_data)

if (!lootItem)
{
_player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL);
_player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr);
return;
}

Expand Down Expand Up @@ -161,7 +161,7 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket& recv_data)

if (!lootItem)
{
_player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL);
_player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr);
return;
}

Expand All @@ -178,9 +178,9 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket& recv_data)
{
// send duplicate of error massage to master looter
if (LootItem* lootItem = pLoot->GetLootItemInSlot(itemSlot))
_player->SendEquipError(result, NULL, NULL, lootItem->itemId);
_player->SendEquipError(result, nullptr, nullptr, lootItem->itemId);
else
_player->SendEquipError(result, NULL, NULL);
_player->SendEquipError(result, nullptr, nullptr);
return;
}
}
Expand Down
30 changes: 15 additions & 15 deletions src/game/LootMgr.cpp
View file
Expand Up @@ -727,7 +727,7 @@ void GroupLootRoll::Start(Loot& loot, uint32 itemSlot)
m_voteMask = RollVoteMask(m_voteMask & ~ROLL_VOTE_MASK_DISENCHANT);

SendStartRoll();
m_endTime = time(NULL) + (LOOT_ROLL_TIMEOUT / 1000);
m_endTime = time(nullptr) + (LOOT_ROLL_TIMEOUT / 1000);
m_isStarted = true;
}
}
Expand Down Expand Up @@ -782,7 +782,7 @@ bool GroupLootRoll::UpdateRoll()
{
RollVoteMap::const_iterator winnerItr = m_rollVoteMap.end();

if (AllPlayerVoted(winnerItr) || m_endTime <= time(NULL))
if (AllPlayerVoted(winnerItr) || m_endTime <= time(nullptr))
{
Finish(winnerItr);
return true;
Expand Down Expand Up @@ -867,7 +867,7 @@ GroupLootRoll* Loot::GetRollForSlot(uint32 itemSlot)
{
GroupLootRollMap::iterator rollItr = m_roll.find(itemSlot);
if (rollItr == m_roll.end())
return NULL;
return nullptr;
return &rollItr->second;
}

Expand Down Expand Up @@ -1504,7 +1504,7 @@ void Loot::SetGroupLootRight(Player* player)
Loot::Loot(Player* player, Creature* creature, LootType type) :
m_lootType(type), m_lootMethod(NOT_GROUP_TYPE_LOOT), m_threshold(ITEM_QUALITY_UNCOMMON), m_clientLootType(CLIENT_LOOT_CORPSE),
m_gold(0), m_maxEnchantSkill(0), m_maxSlot(0), m_isReleased(false), m_isChest(false), m_isChanged(false),
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(NULL)
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(nullptr)
{
// the player whose group may loot the corpse
if (!player)
Expand Down Expand Up @@ -1594,7 +1594,7 @@ Loot::Loot(Player* player, Creature* creature, LootType type) :
Loot::Loot(Player* player, GameObject* gameObject, LootType type) :
m_lootType(type), m_lootMethod(NOT_GROUP_TYPE_LOOT), m_threshold(ITEM_QUALITY_UNCOMMON), m_clientLootType(CLIENT_LOOT_CORPSE),
m_gold(0), m_maxEnchantSkill(0), m_maxSlot(0), m_isReleased(false), m_isChest(false), m_isChanged(false),
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(NULL)
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(nullptr)
{
// the player whose group may loot the corpse
if (!player)
Expand Down Expand Up @@ -1693,7 +1693,7 @@ Loot::Loot(Player* player, GameObject* gameObject, LootType type) :
Loot::Loot(Player* player, Corpse* corpse, LootType type) :
m_lootType(type), m_lootMethod(NOT_GROUP_TYPE_LOOT), m_threshold(ITEM_QUALITY_UNCOMMON), m_clientLootType(CLIENT_LOOT_CORPSE),
m_gold(0), m_maxEnchantSkill(0), m_maxSlot(0), m_isReleased(false), m_isChest(false), m_isChanged(false),
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(NULL)
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(nullptr)
{
// the player whose group may loot the corpse
if (!player)
Expand Down Expand Up @@ -1738,7 +1738,7 @@ Loot::Loot(Player* player, Corpse* corpse, LootType type) :
Loot::Loot(Player* player, Item* item, LootType type) :
m_lootType(type), m_lootMethod(NOT_GROUP_TYPE_LOOT), m_threshold(ITEM_QUALITY_UNCOMMON), m_clientLootType(CLIENT_LOOT_CORPSE),
m_gold(0), m_maxEnchantSkill(0), m_maxSlot(0), m_isReleased(false), m_isChest(false), m_isChanged(false),
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(NULL)
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(nullptr)
{
// the player whose group may loot the corpse
if (!player)
Expand Down Expand Up @@ -1785,7 +1785,7 @@ Loot::Loot(Player* player, Item* item, LootType type) :
Loot::Loot(Unit* unit, Item* item) :
m_lootType(LOOT_SKINNING), m_lootMethod(NOT_GROUP_TYPE_LOOT), m_threshold(ITEM_QUALITY_UNCOMMON), m_clientLootType(CLIENT_LOOT_PICKPOCKETING),
m_gold(0), m_maxEnchantSkill(0), m_maxSlot(0), m_isReleased(false), m_isChest(false), m_isChanged(false),
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(NULL), m_itemTarget(item)
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(nullptr), m_itemTarget(item)
{
m_ownerSet.insert(unit->GetObjectGuid());
m_guidTarget = item->GetObjectGuid();
Expand All @@ -1794,7 +1794,7 @@ Loot::Loot(Unit* unit, Item* item) :
Loot::Loot(Player* player, uint32 id, LootType type) :
m_lootType(type), m_lootMethod(NOT_GROUP_TYPE_LOOT), m_threshold(ITEM_QUALITY_UNCOMMON), m_clientLootType(CLIENT_LOOT_CORPSE),
m_gold(0), m_maxEnchantSkill(0), m_maxSlot(0), m_isReleased(false), m_isChest(false), m_isChanged(false),
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(NULL)
m_haveItemOverThreshold(false), m_isChecked(false), m_lootTarget(nullptr)
{
switch (type)
{
Expand Down Expand Up @@ -1872,7 +1872,7 @@ InventoryResult Loot::SendItem(Player* target, LootItem* lootItem)
m_isChanged = true;
}
else
target->SendEquipError(msg, NULL, NULL, lootItem->itemId);
target->SendEquipError(msg, nullptr, nullptr, lootItem->itemId);
}

if (!playerGotItem)
Expand Down Expand Up @@ -1915,7 +1915,7 @@ bool Loot::AutoStore(Player* player, bool broadcast /*= false*/, uint32 bag /*=
msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, lootItem->itemId, lootItem->count);
if (msg != EQUIP_ERR_OK)
{
player->SendEquipError(msg, NULL, NULL, lootItem->itemId);
player->SendEquipError(msg, nullptr, nullptr, lootItem->itemId);
result = false;
continue;
}
Expand Down Expand Up @@ -1957,7 +1957,7 @@ LootItem* Loot::GetLootItemInSlot(uint32 itemSlot)
if (lootItem->lootSlot == itemSlot)
return lootItem;
}
return NULL;
return nullptr;
}

// Will return available loot item for specific player. Use only for own loot like loot in item and mail
Expand Down Expand Up @@ -2724,7 +2724,7 @@ void LootMgr::PlayerVote(Player* player, ObjectGuid const& lootTargetGuid, uint3
// If target guid is not provided, try to find it by recipient or current player target
Loot* LootMgr::GetLoot(Player* player, ObjectGuid const& targetGuid)
{
Loot* loot = NULL;
Loot* loot = nullptr;
ObjectGuid lguid;
if (targetGuid.IsEmpty())
{
Expand All @@ -2734,7 +2734,7 @@ Loot* LootMgr::GetLoot(Player* player, ObjectGuid const& targetGuid)
{
lguid = player->GetTargetGuid();
if (lguid.IsEmpty())
return NULL;
return nullptr;
}
}
else
Expand Down Expand Up @@ -2779,7 +2779,7 @@ Loot* LootMgr::GetLoot(Player* player, ObjectGuid const& targetGuid)
break;
}
default:
return NULL; // unlootable type
return nullptr; // unlootable type
}

return loot;
Expand Down
4 changes: 2 additions & 2 deletions src/game/LootMgr.h
View file
Expand Up @@ -113,7 +113,7 @@ class GroupLootRoll
public:
typedef UNORDERED_MAP<ObjectGuid, PlayerRollVote> RollVoteMap;

GroupLootRoll() : m_rollVoteMap(ROLL_VOTE_MASK_ALL), m_isStarted(false), m_lootItem(NULL), m_loot(NULL) {}
GroupLootRoll() : m_rollVoteMap(ROLL_VOTE_MASK_ALL), m_isStarted(false), m_lootItem(nullptr), m_loot(nullptr) {}
~GroupLootRoll();

void Start(Loot& loot, uint32 itemSlot);
Expand Down Expand Up @@ -207,7 +207,7 @@ class LootStore
void Verify() const;

void LoadAndCollectLootIds(LootIdSet& ids_set);
void CheckLootRefs(LootIdSet* ref_set = NULL) const; // check existence reference and remove it from ref_set
void CheckLootRefs(LootIdSet* ref_set = nullptr) const; // check existence reference and remove it from ref_set
void ReportUnusedIds(LootIdSet const& ids_set) const;
void ReportNotExistedId(uint32 id) const;

Expand Down
2 changes: 1 addition & 1 deletion src/game/Object.cpp
View file
Expand Up @@ -56,7 +56,7 @@ Object::Object()

m_inWorld = false;
m_objectUpdated = false;
loot = NULL;
loot = nullptr;
}

Object::~Object()
Expand Down
14 changes: 7 additions & 7 deletions src/game/WorldSocket.cpp
View file
Expand Up @@ -454,7 +454,7 @@ int WorldSocket::handle_close(ACE_HANDLE h, ACE_Reactor_Mask)
{
GUARD_RETURN(m_SessionLock, -1);

m_Session = NULL;
m_Session = nullptr;
}

reactor()->remove_handler(this, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::ALL_EVENTS_MASK);
Expand All @@ -479,7 +479,7 @@ int WorldSocket::Update(void)

int WorldSocket::handle_input_header(void)
{
MANGOS_ASSERT(m_RecvWPct == NULL);
MANGOS_ASSERT(m_RecvWPct == nullptr);

MANGOS_ASSERT(m_Header.length() == sizeof(ClientPktHeader));

Expand Down Expand Up @@ -523,13 +523,13 @@ int WorldSocket::handle_input_payload(void)

MANGOS_ASSERT(m_RecvPct.space() == 0);
MANGOS_ASSERT(m_Header.space() == 0);
MANGOS_ASSERT(m_RecvWPct != NULL);
MANGOS_ASSERT(m_RecvWPct != nullptr);

const int ret = ProcessIncoming(m_RecvWPct);

m_RecvPct.base(NULL, 0);
m_RecvPct.base(nullptr, 0);
m_RecvPct.reset();
m_RecvWPct = NULL;
m_RecvWPct = nullptr;

m_Header.reset();

Expand Down Expand Up @@ -712,7 +712,7 @@ int WorldSocket::ProcessIncoming(WorldPacket* new_pct)
{
GUARD_RETURN(m_SessionLock, -1);

if (m_Session != NULL)
if (m_Session != nullptr)
{
// OK ,give the packet to WorldSession
aptr.release();
Expand Down Expand Up @@ -964,7 +964,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
sha.UpdateData ((uint8 *) & t, 4);
sha.UpdateData ((uint8 *) & clientSeed, 4);
sha.UpdateData ((uint8 *) & seed, 4);
sha.UpdateBigNumbers (&K, NULL);
sha.UpdateBigNumbers (&K, nullptr);
sha.Finalize ();

if (memcmp (sha.GetDigest (), digest, 20))
Expand Down

0 comments on commit bc14a22

Please sign in to comment.