Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-08-01 15:41:23 +08:00
251 changed files with 4841 additions and 6135 deletions

View File

@@ -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));

View File

@@ -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