From d68cb35056f08655b18894c887f9285d797d4053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Tue, 21 Feb 2017 17:02:52 +0100 Subject: [PATCH] Physics2D/Collider2D: Fix collision id and trigger default values --- include/Nazara/Physics2D/Collider2D.hpp | 2 +- include/Nazara/Physics2D/Collider2D.inl | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Physics2D/Collider2D.hpp b/include/Nazara/Physics2D/Collider2D.hpp index 7238237af..e5b988756 100644 --- a/include/Nazara/Physics2D/Collider2D.hpp +++ b/include/Nazara/Physics2D/Collider2D.hpp @@ -35,7 +35,7 @@ namespace Nz friend RigidBody2D; public: - Collider2D() = default; + inline Collider2D(); Collider2D(const Collider2D&) = delete; Collider2D(Collider2D&&) = delete; virtual ~Collider2D(); diff --git a/include/Nazara/Physics2D/Collider2D.inl b/include/Nazara/Physics2D/Collider2D.inl index bf4902a81..71b909a2c 100644 --- a/include/Nazara/Physics2D/Collider2D.inl +++ b/include/Nazara/Physics2D/Collider2D.inl @@ -7,6 +7,12 @@ namespace Nz { + inline Collider2D::Collider2D() : + m_collisionId(0), + m_trigger(false) + { + } + inline unsigned int Collider2D::GetCollisionId() const { return m_collisionId;