ParticleSpawner: Fix crash when attaching to invisible entity

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

diff --git a/src/collision.h b/src/collision.h
index 50755224b6a10eebadee26c9c395ba30eb9bfe8e..87a50282870c11cb5075bce68a99a50f7c496a95 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>
@@ -34,18 +33,31 @@ enum CollisionType
        COLLISION_OBJECT,
 };
 
+enum CollisionAxis
+{
+       COLLISION_AXIS_NONE = -1,
+       COLLISION_AXIS_X,
+       COLLISION_AXIS_Y,
+       COLLISION_AXIS_Z,
+};
+
 struct CollisionInfo
 {
-       CollisionInfo() {}
+       CollisionInfo() = default;
+
        CollisionType type = COLLISION_NODE;
+       CollisionAxis axis = COLLISION_AXIS_NONE;
        v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE
+       ActiveObject *object = nullptr; // COLLISION_OBJECT
        v3f old_speed;
        v3f new_speed;
+       int plane = -1;
 };
 
 struct collisionMoveResult
 {
-       collisionMoveResult() {}
+       collisionMoveResult() = default;
+
        bool touching_ground = false;
        bool collides = false;
        bool standing_on_object = false;
@@ -64,9 +76,9 @@ collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef,
 // Checks for collision of a moving aabbox with a static aabbox
 // Returns -1 if no collision, 0 if X collision, 1 if Y collision, 2 if Z collision
 // dtime receives time until first collision, invalid if -1 is returned
-int axisAlignedCollision(
+CollisionAxis axisAlignedCollision(
                const aabb3f &staticbox, const aabb3f &movingbox,
-               const v3f &speed, f32 d, f32 *dtime);
+               const v3f &speed, f32 *dtime);
 
 // Helper function:
 // Checks if moving the movingbox up by the given distance would hit a ceiling.
@@ -74,7 +86,3 @@ bool wouldCollideWithCeiling(
                const std::vector<aabb3f> &staticboxes,
                const aabb3f &movingbox,
                f32 y_increase, f32 d);
-
-
-#endif
-