X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=77c2677957f26a34347f1cf0536d8f540846358c;hb=91e1f77adf5c43318040d2a8ca204652f2f036ed;hp=d1ca675ade4ee756a308854482c68e99617f5355;hpb=310781167f731177d6d46b15093dc32606eeac4e;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index d1ca675a..77c26779 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2513,10 +2513,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 +2556,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 +2721,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;