Move touchscreen input handling to base GUIModalMenu class

[dragonfireclient.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index 50755224b6a10eebadee26c9c395ba30eb9bfe8e..4d47171eaff9f6e0bfdf7d841f43a9829a3d72d1 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>
@@ -36,7 +35,8 @@ enum CollisionType
 
 struct CollisionInfo
 {
-       CollisionInfo() {}
+       CollisionInfo() = default;
+
        CollisionType type = COLLISION_NODE;
        v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE
        v3f old_speed;
@@ -45,7 +45,8 @@ struct CollisionInfo
 
 struct collisionMoveResult
 {
-       collisionMoveResult() {}
+       collisionMoveResult() = default;
+
        bool touching_ground = false;
        bool collides = false;
        bool standing_on_object = false;
@@ -74,7 +75,3 @@ bool wouldCollideWithCeiling(
                const std::vector<aabb3f> &staticboxes,
                const aabb3f &movingbox,
                f32 y_increase, f32 d);
-
-
-#endif
-