Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental

Aquaria/Game.cpp

@@ -6843,6 +6843,7 @@ void Game::bindInput()
 
 
 	dsq->user.control.actionSet.importAction(this, "PrimaryAction", ACTION_PRIMARY);
+	dsq->user.control.actionSet.importAction(this, "SecondaryAction", ACTION_SECONDARY);
 
 	dsq->user.control.actionSet.importAction(this, "Escape",		ACTION_ESC);
 

BBGE/MemoryAllocatorSmallBlock.cpp

@@ -7,11 +7,18 @@
 #include "MemoryAllocatorSmallBlock.h"
 #include "bithacks.h"
 
-//#define DD(...) logdev(__VA_ARGS__)
+#include <assert.h>
+
+//#define DD(...) fprintf(stderr, __VA_ARGS__)
 #define DD(...)
 #define logdev(...)
 #define logerror(...)
-#define ASSERT(x) assert(x)
+
+#ifdef NDEBUG
+# define ASSERT(x)
+#else
+# define ASSERT(x) assert(x)
+#endif
 
 
 SmallBlockAllocator::SmallBlockAllocator(unsigned int blockSizeMin,

CMakeLists.txt

@@ -448,6 +448,7 @@ SET(BBGE_SRCS
     ${BBGEDIR}/LensFlare.cpp
     ${BBGEDIR}/Localization.cpp
     ${BBGEDIR}/Math.cpp
+    ${BBGEDIR}/MemoryAllocatorSmallBlock.cpp
     ${BBGEDIR}/MT.cpp
     ${BBGEDIR}/ParticleEffect.cpp
     ${BBGEDIR}/ParticleManager.cpp