mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-02-11 14:41:27 +00:00
Merge branch 'master' into Playerbot
This commit is contained in:
@@ -75,7 +75,7 @@ public:
|
||||
{
|
||||
// Resize
|
||||
typedef char* ptr;
|
||||
size_t newSize = id + 1;
|
||||
std::size_t newSize = id + 1;
|
||||
ptr* newArr = new ptr[newSize];
|
||||
memset(newArr, 0, newSize * sizeof(ptr));
|
||||
memcpy(newArr, _indexTable.AsChar, _indexTableSize * sizeof(ptr));
|
||||
|
||||
@@ -2281,7 +2281,7 @@ typedef std::map<uint32, TaxiPathSetForSource> TaxiPathSetBySource;
|
||||
typedef std::vector<TaxiPathNodeEntry const*> TaxiPathNodeList;
|
||||
typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath;
|
||||
|
||||
static constexpr size_t TaxiMaskSize = 14;
|
||||
static constexpr std::size_t TaxiMaskSize = 14;
|
||||
typedef std::array<uint32, TaxiMaskSize> TaxiMask;
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user