Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Common/Maps: Reduce differences between 3.3.5 and 6.x branches

Browse Source 
Code functionality shouldn't have been modified.
This commit is contained in:
jackpoz
2016-08-03 22:35:44 +02:00
parent 74bf937865
commit 25dc3dd7a2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/Collision/BoundingIntervalHierarchy.h
View File

@@ -91,7 +91,7 @@ class TC_COMMON_API BIH
buildData dat;
dat.maxPrims = leafSize;
dat.numPrims = primitives.size();
dat.numPrims = uint32(primitives.size());
dat.indices = new uint32[dat.numPrims];
dat.primBound = new G3D::AABox[dat.numPrims];
getBounds(primitives[0], bounds);
@@ -115,7 +115,7 @@ class TC_COMMON_API BIH
delete[] dat.primBound;
delete[] dat.indices;
}
uint32 primCount() const { return objects.size(); }
uint32 primCount() const { return uint32(objects.size()); }
template<typename RayCallback>
void intersectRay(const G3D::Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const

2
src/common/Collision/RegularGrid.h
View File

@@ -71,7 +71,7 @@ public:
}
bool contains(const T& value) const { return memberTable.containsKey(&value); }
int size() const { return memberTable.size(); }
int size() const { return uint32(memberTable.size()); }
struct Cell
{