Advanced settings noiseparams: Remove '}' left in .conf

[oweals/minetest.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index d72c6d62f1b160edd6d7f0f7f92911e35b4d8537..4c5594528d101dd136924647a3b5578e671c9c56 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef COLLISION_HEADER
-#define COLLISION_HEADER
+#pragma once
 
 #include "irrlichttypes_bloated.h"
 #include <vector>
@@ -42,6 +41,7 @@ struct CollisionInfo
        v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE
        v3f old_speed;
        v3f new_speed;
+       int plane = -1;
 };
 
 struct collisionMoveResult
@@ -76,7 +76,3 @@ bool wouldCollideWithCeiling(
                const std::vector<aabb3f> &staticboxes,
                const aabb3f &movingbox,
                f32 y_increase, f32 d);
-
-
-#endif
-