aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2016-08-03 22:35:44 +0200
committerjackpoz <giacomopoz@gmail.com>2016-08-03 22:35:44 +0200
commit25dc3dd7a2fe1cea41b68559a7ccc0faa5ec5fa3 (patch)
tree409e3e2f5cfd5591df3e7c1fdce3fa7da1363fdb /src
parent74bf937865dca0908c688bd1e54ddcacb564e46f (diff)
Common/Maps: Reduce differences between 3.3.5 and 6.x branches
Code functionality shouldn't have been modified.
Diffstat (limited to 'src')
-rw-r--r--src/common/Collision/BoundingIntervalHierarchy.h4
-rw-r--r--src/common/Collision/RegularGrid.h2
2 files changed, 3 insertions, 3 deletions
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<typename RayCallback>
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
{