From b6ba99ae23836b755a56f602cf45deabca2f68a1 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Tue, 31 May 2016 09:02:35 +0200
Subject: [PATCH] Physics: Upgrade Newton to 3.13

Former-commit-id: 0744442f892fd7f53d9497669975b381b7bc1369
---
 include/Nazara/Physics/Geom.hpp       |  2 +-
 include/Nazara/Physics/PhysObject.hpp |  2 +-
 include/Nazara/Physics/PhysWorld.hpp  |  2 +-
 src/Nazara/Physics/PhysObject.cpp     | 10 ++++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/Nazara/Physics/Geom.hpp b/include/Nazara/Physics/Geom.hpp
index 34b6c58ba..23a02c72b 100644
--- a/include/Nazara/Physics/Geom.hpp
+++ b/include/Nazara/Physics/Geom.hpp
@@ -20,7 +20,7 @@
 #include <Nazara/Physics/Enums.hpp>
 #include <unordered_map>
 
-struct NewtonCollision;
+class NewtonCollision;
 
 namespace Nz
 {
diff --git a/include/Nazara/Physics/PhysObject.hpp b/include/Nazara/Physics/PhysObject.hpp
index 7df72b1d1..d4d9c61b7 100644
--- a/include/Nazara/Physics/PhysObject.hpp
+++ b/include/Nazara/Physics/PhysObject.hpp
@@ -15,7 +15,7 @@
 #include <Nazara/Physics/Config.hpp>
 #include <Nazara/Physics/Geom.hpp>
 
-struct NewtonBody;
+class NewtonBody;
 
 namespace Nz
 {
diff --git a/include/Nazara/Physics/PhysWorld.hpp b/include/Nazara/Physics/PhysWorld.hpp
index b6fd7eae3..0300048b5 100644
--- a/include/Nazara/Physics/PhysWorld.hpp
+++ b/include/Nazara/Physics/PhysWorld.hpp
@@ -12,7 +12,7 @@
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Physics/Config.hpp>
 
-struct NewtonWorld;
+class NewtonWorld;
 
 namespace Nz
 {
diff --git a/src/Nazara/Physics/PhysObject.cpp b/src/Nazara/Physics/PhysObject.cpp
index 1b4816ee6..1ee4a44d5 100644
--- a/src/Nazara/Physics/PhysObject.cpp
+++ b/src/Nazara/Physics/PhysObject.cpp
@@ -68,7 +68,7 @@ namespace Nz
 	PhysObject::~PhysObject()
 	{
 		if (m_body)
-			NewtonDestroyBody(m_world->GetHandle(), m_body);
+			NewtonDestroyBody(m_body);
 	}
 
 	void PhysObject::AddForce(const Vector3f& force, CoordSys coordSys)
@@ -304,11 +304,13 @@ namespace Nz
 			Vector3f min, max;
 			NewtonBodyGetAABB(m_body, min, max);
 
-			NewtonWorldForEachBodyInAABBDo(m_world->GetHandle(), min, max, [](const NewtonBody* const body, void* const userData)
+			NewtonWorldForEachBodyInAABBDo(m_world->GetHandle(), min, max, [](const NewtonBody* const body, void* const userData) -> int
 			{
 				NazaraUnused(userData);
 				NewtonBodySetSleepState(body, 0);
-			}, nullptr);
+				return 1;
+			}, 
+			nullptr);
 		}
 		/*for (std::set<PhysObjectListener*>::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
 			(*it)->PhysObjectOnUpdate(this);*/
@@ -317,7 +319,7 @@ namespace Nz
 	PhysObject& PhysObject::operator=(PhysObject&& object)
 	{
 		if (m_body)
-			NewtonDestroyBody(m_world->GetHandle(), m_body);
+			NewtonDestroyBody(m_body);
 
 		m_body               = object.m_body;
 		m_forceAccumulator   = std::move(object.m_forceAccumulator);