Don't pass non-const references to collision methods

Non const references cause a lot of confusion with behaviour of code,
and are disallowed by minetest style guide.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/unittest/test_collision.cpp b/src/unittest/test_collision.cpp
index e505de450..332d3fa13 100644
--- a/src/unittest/test_collision.cpp
+++ b/src/unittest/test_collision.cpp
@@ -51,7 +51,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1);
 			v3f v(1, 0, 0);
 			f32 dtime = 0;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0);
 			UASSERT(fabs(dtime - 1.000) < 0.001);
 		}
 		{
@@ -59,21 +59,21 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1);
 			v3f v(-1, 0, 0);
 			f32 dtime = 0;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == -1);
 		}
 		{
 			aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 			aabb3f m(bx-2, by+1.5, bz, bx-1, by+2.5, bz-1);
 			v3f v(1, 0, 0);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == -1);
 		}
 		{
 			aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 			aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1);
 			v3f v(0.5, 0.1, 0);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0);
 			UASSERT(fabs(dtime - 3.000) < 0.001);
 		}
 		{
@@ -81,7 +81,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1);
 			v3f v(0.5, 0.1, 0);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0);
 			UASSERT(fabs(dtime - 3.000) < 0.001);
 		}
 
@@ -91,7 +91,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1);
 			v3f v(-1, 0, 0);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0);
 			UASSERT(fabs(dtime - 1.000) < 0.001);
 		}
 		{
@@ -99,21 +99,21 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1);
 			v3f v(1, 0, 0);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == -1);
 		}
 		{
 			aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 			aabb3f m(bx+2, by, bz+1.5, bx+3, by+1, bz+3.5);
 			v3f v(-1, 0, 0);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == -1);
 		}
 		{
 			aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
 			aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1);
 			v3f v(-0.5, 0.2, 0);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);  // Y, not X!
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 1);  // Y, not X!
 			UASSERT(fabs(dtime - 2.500) < 0.001);
 		}
 		{
@@ -121,7 +121,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1);
 			v3f v(-0.5, 0.3, 0);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0);
 			UASSERT(fabs(dtime - 2.000) < 0.001);
 		}
 
@@ -133,7 +133,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx+2.3, by+2.29, bz+2.29, bx+4.2, by+4.2, bz+4.2);
 			v3f v(-1./3, -1./3, -1./3);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0);
 			UASSERT(fabs(dtime - 0.9) < 0.001);
 		}
 		{
@@ -141,7 +141,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx+2.29, by+2.3, bz+2.29, bx+4.2, by+4.2, bz+4.2);
 			v3f v(-1./3, -1./3, -1./3);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 1);
 			UASSERT(fabs(dtime - 0.9) < 0.001);
 		}
 		{
@@ -149,7 +149,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx+2.29, by+2.29, bz+2.3, bx+4.2, by+4.2, bz+4.2);
 			v3f v(-1./3, -1./3, -1./3);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 2);
 			UASSERT(fabs(dtime - 0.9) < 0.001);
 		}
 		{
@@ -157,7 +157,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.3, by-2.29, bz-2.29);
 			v3f v(1./7, 1./7, 1./7);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0);
 			UASSERT(fabs(dtime - 16.1) < 0.001);
 		}
 		{
@@ -165,7 +165,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.3, bz-2.29);
 			v3f v(1./7, 1./7, 1./7);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 1);
 			UASSERT(fabs(dtime - 16.1) < 0.001);
 		}
 		{
@@ -173,7 +173,7 @@ void TestCollision::testAxisAlignedCollision()
 			aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.29, bz-2.3);
 			v3f v(1./7, 1./7, 1./7);
 			f32 dtime;
-			UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2);
+			UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 2);
 			UASSERT(fabs(dtime - 16.1) < 0.001);
 		}
 	}