summaryrefslogtreecommitdiffstats
path: root/source/Globals.h
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-20 00:00:00 +0100
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-20 00:00:00 +0100
commit0b616909e3472a4360e22d6b01749ee44092e967 (patch)
tree6a70857aa2839acd133b77fcc225af6828cb8f39 /source/Globals.h
parentFixed assertion bug in NamedEntitySpawn packet, it used to assert when item ID is 0, but now 0 is allowed (diff)
downloadcuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.gz
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.bz2
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.lz
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.xz
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.zst
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.zip
Diffstat (limited to 'source/Globals.h')
-rw-r--r--source/Globals.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/source/Globals.h b/source/Globals.h
index 1ede57bd4..c2aa3753c 100644
--- a/source/Globals.h
+++ b/source/Globals.h
@@ -75,13 +75,6 @@
-// Compatibility:
-#define ASSERT assert
-
-
-
-
-
// STL stuff:
#include <vector>
#include <list>
@@ -127,6 +120,7 @@
/// Faster than (int)floorf((float)x / (float)div)
#define FAST_FLOOR_DIV( x, div ) ( (x) < 0 ? (((int)x / div) - 1) : ((int)x / div) )
+#define ASSERT( x ) { if( !(x) ) { LOGERROR("Assertion failed: \"%s\", file %s, line %i", #x, __FILE__, __LINE__ ); assert( !#x ); } }