summaryrefslogtreecommitdiffstats
path: root/source/Globals.h
diff options
context:
space:
mode:
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 ); } }