From dd445ed1827a373dd38453de93228e19d9fb5ad8 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sat, 17 Oct 2020 22:52:58 -0400 Subject: [PATCH] Fix b2Assert location and fix isfinite missing --- src/libraries/box2d/b2_common.h | 3 ++- src/libraries/box2d/b2_math.h | 1 + src/libraries/box2d/b2_settings.h | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libraries/box2d/b2_common.h b/src/libraries/box2d/b2_common.h index dfca8af1b..44d9a2625 100644 --- a/src/libraries/box2d/b2_common.h +++ b/src/libraries/box2d/b2_common.h @@ -34,7 +34,8 @@ #endif #define B2_NOT_USED(x) ((void)(x)) -#define b2Assert(A) assert(A) +void loveAssert(bool test, const char* teststr); +#define b2Assert(A) loveAssert((A), #A) #define b2_maxFloat FLT_MAX #define b2_epsilon FLT_EPSILON diff --git a/src/libraries/box2d/b2_math.h b/src/libraries/box2d/b2_math.h index 64ce86f51..cf90ad448 100644 --- a/src/libraries/box2d/b2_math.h +++ b/src/libraries/box2d/b2_math.h @@ -24,6 +24,7 @@ #define B2_MATH_H #include +#include #include "b2_api.h" #include "b2_settings.h" diff --git a/src/libraries/box2d/b2_settings.h b/src/libraries/box2d/b2_settings.h index 6db959ada..48cd95dfe 100644 --- a/src/libraries/box2d/b2_settings.h +++ b/src/libraries/box2d/b2_settings.h @@ -122,9 +122,6 @@ inline void b2Log(const char* string, ...) #endif // B2_USER_SETTINGS -void loveAssert(bool test, const char* teststr); -#define b2Assert(A) loveAssert((A), #A) - #include "b2_common.h" #endif