mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 22:19:07 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
fgenesis 2013-08-27 02:45:42 +01:00
commit 3c38f614e7
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Aquaria/Game.cpp
View file

@ -6843,6 +6843,7 @@ void Game::bindInput()
dsq->user.control.actionSet.importAction(this, "PrimaryAction", ACTION_PRIMARY); 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); dsq->user.control.actionSet.importAction(this, "Escape", ACTION_ESC);

11
BBGE/MemoryAllocatorSmallBlock.cpp
View file

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

1
CMakeLists.txt
View file

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