Merge branch 'master' into master

1 files changed, 4 insertions, 4 deletions

diff --git a/src/raycast.h b/src/raycast.h
index 38190287f..4f5ca2a5b 100644
--- a/src/raycast.h
+++ b/src/raycast.h
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 //! Sorts PointedThings based on their distance.
 struct RaycastSort
 {
-	bool operator()(const PointedThing &pt1, const PointedThing &pt2) const;
+	bool operator() (const PointedThing &pt1, const PointedThing &pt2) const;
 };
 
 //! Describes the state of a raycast.
@@ -38,7 +38,7 @@ public:
 	 * @param liquids pointable if false, liquid nodes won't be found
 	 */
 	RaycastState(const core::line3d<f32> &shootline, bool objects_pointable,
-			bool liquids_pointable, bool nodes_pointable = true);
+		bool liquids_pointable, bool nodes_pointable = true);
 
 	//! Shootline of the raycast.
 	core::line3d<f32> m_shootline;
@@ -58,7 +58,7 @@ public:
 	bool m_nodes_pointable;
 
 	//! The code needs to search these nodes around the center node.
-	core::aabbox3d<s16> m_search_range{0, 0, 0, 0, 0, 0};
+	core::aabbox3d<s16> m_search_range { 0, 0, 0, 0, 0, 0 };
 
 	//! If true, the Environment will initialize this state.
 	bool m_initialization_needed = true;
@@ -75,4 +75,4 @@ public:
  * @returns true if a collision point was found
  */
 bool boxLineCollision(const aabb3f &box, const v3f &start, const v3f &dir,
-		v3f *collision_point, v3s16 *collision_normal);
+	v3f *collision_point, v3s16 *collision_normal);