Moved macros and such from config.h to common.h

[vor.git] / config.h

diff --git a/config.h b/config.h
index 62b9fda..99bed8f 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,53 +1,42 @@
 #ifndef VOR_CONFIG_H
 #define VOR_CONFIG_H
 
-#define debug(x) if(DEBUG) { x; }
-
-#define VERSION "0.1"
-#define DATA_PREFIX "/usr/share/vor"
-
-// Speed of the game.  New players may like to try 3/4 or 2/3 speed.
-#define GAMESPEED 1.00
-// #define GAMESPEED (3.0/4.0)
-// #define GAMESPEED (2.0/3.0)
+#define VERSION "0.4pre"
 
 // screen size
 #define XSIZE 640
 #define YSIZE 480
 
-// number of rock image files.
-#define NROCKS 50
+#define SCREENDXMIN 7.5
+
 // image file containing font for score stuff.
 #define BIG_FONT_FILE "fonts/score.png"
 
-#define MAXROCKS 120 // MAX Rocks
-#define MAXROCKHEIGHT 100
-#define ROCKRATE 2
-#define MAXBLACKPOINTS 500
+
+// -----------------------------------------------------------------------
+// Rocks
+
+// number of rock images
+#define NROCKS 50 
+
+// initial/final counts for rocks-on-screen
+#define I_ROCKS 25
+#define F_ROCKS 45
+
+// number of rock structs to allocate
+#define MAXROCKS 120
+
 #define MAXENGINEDOTS 5000
 #define MAXBANGDOTS 50000
 #define MAXSPACEDOTS 2000
 #define MAXDUSTDEPTH 2
 #define W 100
 #define M 255
-#define BLAST_RADIUS 300 // radius^2 (pixels) which will be cleared of rocks when you die
+
+// radius^2 (pixels) which will be cleared of rocks when you die
+#define BLAST_RADIUS 300
 #define DEAD_PAUSE_LENGTH 40.0
 
 #define MAX_PATH_LEN 1024
 
-#ifndef true
-#define true 1
-#endif
-
-#ifndef false
-#define false 0
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#define CONDERROR(a) if((a)) {initerror = strdup(SDL_GetError());return 1;}
-#define NULLERROR(a) CONDERROR((a) == NULL)
-
 #endif // VOR_CONFIG_H