reordered some preprocessor definitions

[rocksndiamonds.git] / src / libgame / system.h

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 082fc252cee7b33286944fa5d36b126c629fc9f8..bec94cf5add793eac97cd9ad2b00c27506293e90 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -288,6 +288,7 @@
 // values for drawing stages for global animations
 #define DRAW_GLOBAL_ANIM_STAGE_1       1
 #define DRAW_GLOBAL_ANIM_STAGE_2       2
+#define DRAW_GLOBAL_ANIM_STAGE_3       3
 
 // values for drawing target (various functions)
 #define DRAW_TO_BACKBUFFER             0
@@ -378,34 +379,6 @@
 
 #define ANIM_DEFAULT           ANIM_LOOP
 
-// values for special drawing styles and event handling
-#define STYLE_NONE             0
-
-// values used for crumbled graphics
-#define STYLE_ACCURATE_BORDERS (1 << 0)
-#define STYLE_INNER_CORNERS    (1 << 1)
-
-// values used for game panel graphics
-#define STYLE_REVERSE          (1 << 2)
-#define STYLE_LEFTMOST_POSITION        (1 << 3)
-
-// values used for global animations
-#define STYLE_BLOCK            (1 << 4)
-#define STYLE_PASSTHROUGH      (1 << 5)
-#define STYLE_MULTIPLE_ACTIONS (1 << 6)
-
-#define STYLE_DEFAULT          STYLE_NONE
-
-// values for special global animation delay types
-#define ANIM_DELAY_UNDEFINED   -1
-#define ANIM_DELAY_NONE                0
-#define ANIM_DELAY_INIT                1
-#define ANIM_DELAY_ANIM                2
-#define ANIM_DELAY_POST                3
-
-// values for special global animation delay actions
-#define ANIM_DELAY_ACTION_NONE -1
-
 // values for special global animation events
 #define ANIM_EVENT_UNDEFINED   -1
 #define ANIM_EVENT_NONE                0
@@ -431,6 +404,34 @@
 // values for special global animation event actions
 #define ANIM_EVENT_ACTION_NONE -1
 
+// values for special global animation delay types
+#define ANIM_DELAY_UNDEFINED   -1
+#define ANIM_DELAY_NONE                0
+#define ANIM_DELAY_INIT                1
+#define ANIM_DELAY_ANIM                2
+#define ANIM_DELAY_POST                3
+
+// values for special global animation delay actions
+#define ANIM_DELAY_ACTION_NONE -1
+
+// values for special drawing styles and event handling
+#define STYLE_NONE             0
+
+// values used for crumbled graphics
+#define STYLE_ACCURATE_BORDERS (1 << 0)
+#define STYLE_INNER_CORNERS    (1 << 1)
+
+// values used for game panel graphics
+#define STYLE_REVERSE          (1 << 2)
+#define STYLE_LEFTMOST_POSITION        (1 << 3)
+
+// values used for global animations
+#define STYLE_BLOCK            (1 << 4)
+#define STYLE_PASSTHROUGH      (1 << 5)
+#define STYLE_MULTIPLE_ACTIONS (1 << 6)
+
+#define STYLE_DEFAULT          STYLE_NONE
+
 // values for fade mode
 #define FADE_TYPE_NONE         0
 #define FADE_TYPE_FADE_IN      (1 << 0)
@@ -482,9 +483,9 @@
 #define VALIGN_MIDDLE          (1 << 2)
 #define VALIGN_DEFAULT         VALIGN_TOP
 
-#define ALIGNED_XPOS(x,w,a)    ((a) == ALIGN_CENTER  ? (x) - (w) / 2 : \
+#define ALIGNED_XPOS(x, w, a)  ((a) == ALIGN_CENTER  ? (x) - (w) / 2 : \
                                 (a) == ALIGN_RIGHT   ? (x) - (w) : (x))
-#define ALIGNED_YPOS(y,h,v)    ((v) == VALIGN_MIDDLE ? (y) - (h) / 2 : \
+#define ALIGNED_YPOS(y, h, v)  ((v) == VALIGN_MIDDLE ? (y) - (h) / 2 : \
                                 (v) == VALIGN_BOTTOM ? (y) - (h) : (y))
 #define ALIGNED_TEXT_XPOS(p)   ALIGNED_XPOS((p)->x, (p)->width,  (p)->align)
 #define ALIGNED_TEXT_YPOS(p)   ALIGNED_YPOS((p)->y, (p)->height, (p)->valign)
@@ -607,7 +608,7 @@
                                         JOY_NO_ACTION)
 
 // maximum number of level sets in the level set history
-#define MAX_LEVELDIR_HISTORY   12
+#define MAX_LEVELDIR_HISTORY   100
 
 // default name for empty highscore entry
 #define EMPTY_PLAYER_NAME      "no name"
@@ -633,10 +634,13 @@
 // default value for undefined password
 #define UNDEFINED_PASSWORD     "[undefined]"
 
-// default value for undefined parameter
+// default value for undefined string parameter
+#define ARG_UNDEFINED_STRING   "[undefined]"
+
+// default value for default string parameter
 #define ARG_DEFAULT            "[DEFAULT]"
 
-// default values for undefined configuration file parameters
+// default values for undefined numerical parameter (as string and integer)
 #define ARG_UNDEFINED          "-1000000"
 #define ARG_UNDEFINED_VALUE    (-1000000)
 
@@ -1995,7 +1999,7 @@ Bitmap *CreateBitmap(int, int, int);
 void ReCreateBitmap(Bitmap **, int, int);
 void FreeBitmap(Bitmap *);
 void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
-void BlitBitmapTiled(Bitmap *, Bitmap *, int, int, int, int, int, int, int,int);
+void BlitBitmapTiled(Bitmap *, Bitmap *, int, int, int, int, int, int, int, int);
 void FadeRectangle(int, int, int, int, int, int, int,
                   void (*draw_border_function)(void));
 void FillRectangle(Bitmap *, int, int, int, int, Pixel);
@@ -2014,7 +2018,7 @@ void BlitToScreenMasked(Bitmap *, int, int, int, int, int, int);
 void DrawSimpleWhiteLine(Bitmap *, int, int, int, int);
 void DrawLines(Bitmap *, struct XY *, int, Pixel);
 Pixel GetPixel(Bitmap *, int, int);
-Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int);
+Pixel GetPixelFromRGB(Bitmap *, unsigned int, unsigned int, unsigned int);
 
 void KeyboardAutoRepeatOn(void);
 void KeyboardAutoRepeatOff(void);