From 25dc3dd7a2fe1cea41b68559a7ccc0faa5ec5fa3 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Wed, 3 Aug 2016 22:35:44 +0200 Subject: Common/Maps: Reduce differences between 3.3.5 and 6.x branches Code functionality shouldn't have been modified. --- src/common/Collision/BoundingIntervalHierarchy.h | 4 ++-- src/common/Collision/RegularGrid.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common/Collision') diff --git a/src/common/Collision/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h index eb0a102806f..d84ee3f6bf3 100644 --- a/src/common/Collision/BoundingIntervalHierarchy.h +++ b/src/common/Collision/BoundingIntervalHierarchy.h @@ -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 void intersectRay(const G3D::Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const diff --git a/src/common/Collision/RegularGrid.h b/src/common/Collision/RegularGrid.h index 563cf516406..2f3819c872c 100644 --- a/src/common/Collision/RegularGrid.h +++ b/src/common/Collision/RegularGrid.h @@ -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 { -- cgit v1.2.3