sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core): apply clang-tidy modernize-use-nullptr (#3819)

Browse Source
This commit is contained in:
Francesco Borzì
2020-12-06 20:55:11 +01:00
committed by GitHub
parent 161302252e
commit cba126fa84
40 changed files with 127 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectAccessor.h
+6 -6
View File
@@ -104,12 +104,12 @@ public:
static Unit* GetObjectInOrOutOfWorld(uint64 guid, Unit* /*typeSpecifier*/)
{
if (IS_PLAYER_GUID(guid))
return (Unit*)GetObjectInOrOutOfWorld(guid, (Player*)NULL);
return (Unit*)GetObjectInOrOutOfWorld(guid, (Player*)nullptr);
if (IS_PET_GUID(guid))
return (Unit*)GetObjectInOrOutOfWorld(guid, (Pet*)NULL);
return (Unit*)GetObjectInOrOutOfWorld(guid, (Pet*)nullptr);
return (Unit*)GetObjectInOrOutOfWorld(guid, (Creature*)NULL);
return (Unit*)GetObjectInOrOutOfWorld(guid, (Creature*)nullptr);
}
// returns object if is in world
@@ -124,12 +124,12 @@ public:
static Unit* GetObjectInWorld(uint64 guid, Unit* /*typeSpecifier*/)
{
if (IS_PLAYER_GUID(guid))
return (Unit*)GetObjectInWorld(guid, (Player*)NULL);
return (Unit*)GetObjectInWorld(guid, (Player*)nullptr);
if (IS_PET_GUID(guid))
return (Unit*)GetObjectInWorld(guid, (Pet*)NULL);
return (Unit*)GetObjectInWorld(guid, (Pet*)nullptr);
return (Unit*)GetObjectInWorld(guid, (Creature*)NULL);
return (Unit*)GetObjectInWorld(guid, (Creature*)nullptr);
}
// returns object if is in map
src/server/game/Globals/ObjectMgr.h
+1 -1
View File
@@ -1286,7 +1286,7 @@ public:
void AddVendorItem(uint32 entry, uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedCost, bool persist = true); // for event
bool RemoveVendorItem(uint32 entry, uint32 item, bool persist = true); // for event
bool IsVendorItemValid(uint32 vendor_entry, uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* player = NULL, std::set<uint32>* skip_vendors = NULL, uint32 ORnpcflag = 0) const;
bool IsVendorItemValid(uint32 vendor_entry, uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* player = nullptr, std::set<uint32>* skip_vendors = nullptr, uint32 ORnpcflag = 0) const;
void LoadScriptNames();
ScriptNameContainer& GetScriptNames() { return _scriptNamesStore; }