From 5ad9821290f50840bef5d5ab16f88d5c5aed942b Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Thu, 29 Dec 2011 13:37:42 +0100 Subject: [PATCH] ASSERT_GUARD raycasts --- src/modules/physics/box2d/wrap_Fixture.cpp | 2 +- src/modules/physics/box2d/wrap_Fixture.h | 1 + src/modules/physics/box2d/wrap_Physics.h | 2 +- src/modules/physics/box2d/wrap_Shape.cpp | 2 +- src/modules/physics/box2d/wrap_Shape.h | 1 + src/modules/physics/box2d/wrap_World.cpp | 2 +- src/modules/physics/box2d/wrap_World.h | 1 + 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/modules/physics/box2d/wrap_Fixture.cpp b/src/modules/physics/box2d/wrap_Fixture.cpp index 41f89023a..8555811f6 100644 --- a/src/modules/physics/box2d/wrap_Fixture.cpp +++ b/src/modules/physics/box2d/wrap_Fixture.cpp @@ -152,7 +152,7 @@ namespace box2d { Fixture * t = luax_checkfixture(L, 1); lua_remove(L, 1); - return t->rayCast(L); + ASSERT_GUARD(return t->rayCast(L);) } int w_Fixture_setFilterData(lua_State * L) diff --git a/src/modules/physics/box2d/wrap_Fixture.h b/src/modules/physics/box2d/wrap_Fixture.h index a9f3f89d8..516c17201 100644 --- a/src/modules/physics/box2d/wrap_Fixture.h +++ b/src/modules/physics/box2d/wrap_Fixture.h @@ -24,6 +24,7 @@ // LOVE #include #include "Fixture.h" +#include "wrap_Physics.h" namespace love { diff --git a/src/modules/physics/box2d/wrap_Physics.h b/src/modules/physics/box2d/wrap_Physics.h index a7ac761fb..fa8cccf86 100644 --- a/src/modules/physics/box2d/wrap_Physics.h +++ b/src/modules/physics/box2d/wrap_Physics.h @@ -59,7 +59,7 @@ namespace box2d int w_newCircleShape(lua_State * L); int w_newRectangleShape(lua_State * L); int w_newPolygonShape(lua_State * L); - int w_newEdgeShape(lua_State * L); + int w_newEdgeShape(lua_State * L); int w_newChainShape(lua_State * L); int w_newDistanceJoint(lua_State * L); int w_newMouseJoint(lua_State * L); diff --git a/src/modules/physics/box2d/wrap_Shape.cpp b/src/modules/physics/box2d/wrap_Shape.cpp index 10790c3f1..cca6f2efa 100644 --- a/src/modules/physics/box2d/wrap_Shape.cpp +++ b/src/modules/physics/box2d/wrap_Shape.cpp @@ -74,7 +74,7 @@ namespace box2d { Shape * t = luax_checkshape(L, 1); lua_remove(L, 1); - return t->rayCast(L); + ASSERT_GUARD(return t->rayCast(L);) } int w_Shape_computeAABB(lua_State * L) diff --git a/src/modules/physics/box2d/wrap_Shape.h b/src/modules/physics/box2d/wrap_Shape.h index a54fb74b4..312075f3d 100644 --- a/src/modules/physics/box2d/wrap_Shape.h +++ b/src/modules/physics/box2d/wrap_Shape.h @@ -24,6 +24,7 @@ // LOVE #include #include "Shape.h" +#include "wrap_Physics.h" namespace love { diff --git a/src/modules/physics/box2d/wrap_World.cpp b/src/modules/physics/box2d/wrap_World.cpp index 94189ffbb..c509a2c7c 100644 --- a/src/modules/physics/box2d/wrap_World.cpp +++ b/src/modules/physics/box2d/wrap_World.cpp @@ -159,7 +159,7 @@ namespace box2d { World * t = luax_checkworld(L, 1); lua_remove(L, 1); - return t->rayCast(L); + ASSERT_GUARD(return t->rayCast(L);) } static const luaL_Reg functions[] = { diff --git a/src/modules/physics/box2d/wrap_World.h b/src/modules/physics/box2d/wrap_World.h index 6ff3d56af..64c9fdfcc 100644 --- a/src/modules/physics/box2d/wrap_World.h +++ b/src/modules/physics/box2d/wrap_World.h @@ -24,6 +24,7 @@ // LOVE #include #include "World.h" +#include "wrap_Physics.h" namespace love {