made bang dots hit rocks, removed blast_rocks function.

[vor.git] / common.h

diff --git a/common.h b/common.h
index ac9d87e..28d9ea0 100644 (file)
--- a/common.h
+++ b/common.h
@@ -1,17 +1,10 @@
 #ifndef VOR_COMMON_H
 #define VOR_COMMON_H
 
-#ifndef NULL
-#define NULL 0
-#endif
-
-#ifndef true
-#define true 1
-#endif
+#include <stdbool.h>
+#include <stddef.h>
 
-#ifndef false
-#define false 0
-#endif
+#define NONE (~0)
 
 #ifndef max
 #define max(a, b) ((a) > (b) ? (a) : (b))
@@ -25,4 +18,11 @@
 #define abs(a) ((a)<=0 ? -(a) : (a))
 #endif
 
+#define CONDERROR(a) if((a)) {initerror = strdup(SDL_GetError());return 1;}
+#define NULLERROR(a) CONDERROR((a) == NULL)
+
+#ifdef WIN32
+# include <windows.h>
+#endif
+
 #endif // VOR_COMMON_H