fixed bug with alpha blending when configuring game controllers

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index d1ca675ade4ee756a308854482c68e99617f5355..d688627d87903d2bc41555f757dea25c38ebfc37 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -2429,16 +2429,17 @@
 #define FONT_OPTION_ON                 30
 #define FONT_VALUE_1                   31
 #define FONT_VALUE_2                   32
-#define FONT_VALUE_OLD                 33
-#define FONT_VALUE_NARROW              34
-#define FONT_LEVEL_NUMBER_ACTIVE       35
-#define FONT_LEVEL_NUMBER              36
-#define FONT_TAPE_RECORDER             37
-#define FONT_GAME_INFO                 38
-#define FONT_INFO_ELEMENTS             39
-#define FONT_INFO_LEVELSET             40
-
-#define NUM_FONTS                      41
+#define FONT_VALUE_OLD_NARROW          33
+#define FONT_VALUE_OLD                 34
+#define FONT_VALUE_NARROW              35
+#define FONT_LEVEL_NUMBER_ACTIVE       36
+#define FONT_LEVEL_NUMBER              37
+#define FONT_TAPE_RECORDER             38
+#define FONT_GAME_INFO                 39
+#define FONT_INFO_ELEMENTS             40
+#define FONT_INFO_LEVELSET             41
+
+#define NUM_FONTS                      42
 #define NUM_INITIAL_FONTS              4
 
 /* values for toon animation configuration */
@@ -2513,10 +2514,10 @@
 
 
 /* program information and versioning definitions */
-#define PROGRAM_VERSION_MAJOR          4
+#define PROGRAM_VERSION_SUPER          4
+#define PROGRAM_VERSION_MAJOR          1
 #define PROGRAM_VERSION_MINOR          0
 #define PROGRAM_VERSION_PATCH          1
-#define PROGRAM_VERSION_BUILD          5
 #define PROGRAM_VERSION_EXTRA          ""
 
 #define PROGRAM_TITLE_STRING           "Rocks'n'Diamonds"
@@ -2556,10 +2557,10 @@
 #define GAME_VERSION_2_0               FILE_VERSION_2_0
 #define GAME_VERSION_3_0               FILE_VERSION_3_0
 
-#define GAME_VERSION_ACTUAL            VERSION_IDENT(PROGRAM_VERSION_MAJOR, \
+#define GAME_VERSION_ACTUAL            VERSION_IDENT(PROGRAM_VERSION_SUPER, \
+                                                     PROGRAM_VERSION_MAJOR, \
                                                      PROGRAM_VERSION_MINOR, \
-                                                     PROGRAM_VERSION_PATCH, \
-                                                     PROGRAM_VERSION_BUILD)
+                                                     PROGRAM_VERSION_PATCH)
 
 /* values for game_emulation */
 #define EMU_NONE                       0
@@ -2721,21 +2722,34 @@ struct MenuInfo
   int list_size[NUM_SPECIAL_GFX_ARGS];
   int list_size_info[NUM_SPECIAL_GFX_INFO_ARGS];
 
-  int paragraph_spacing[NUM_SPECIAL_GFX_INFO_ARGS];
+  int left_spacing[NUM_SPECIAL_GFX_ARGS];
+  int left_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
+  int left_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
+  int right_spacing[NUM_SPECIAL_GFX_ARGS];
+  int right_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
+  int right_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
+  int top_spacing[NUM_SPECIAL_GFX_ARGS];
+  int top_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
+  int top_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
+  int bottom_spacing[NUM_SPECIAL_GFX_ARGS];
+  int bottom_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
+  int bottom_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
+
+  int paragraph_spacing[NUM_SPECIAL_GFX_ARGS];
   int paragraph_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
-  int paragraph_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS];
-  int headline1_spacing[NUM_SPECIAL_GFX_INFO_ARGS];
+  int paragraph_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
+  int headline1_spacing[NUM_SPECIAL_GFX_ARGS];
   int headline1_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
-  int headline1_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS];
-  int headline2_spacing[NUM_SPECIAL_GFX_INFO_ARGS];
+  int headline1_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
+  int headline2_spacing[NUM_SPECIAL_GFX_ARGS];
   int headline2_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
-  int headline2_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS];
-  int line_spacing[NUM_SPECIAL_GFX_INFO_ARGS];
+  int headline2_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
+  int line_spacing[NUM_SPECIAL_GFX_ARGS];
   int line_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
-  int line_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS];
-  int extra_spacing[NUM_SPECIAL_GFX_INFO_ARGS];
+  int line_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
+  int extra_spacing[NUM_SPECIAL_GFX_ARGS];
   int extra_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS];
-  int extra_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS];
+  int extra_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];
 
   struct TitleFadingInfo enter_menu;
   struct TitleFadingInfo leave_menu;