X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=76304e2a2dc1c7f5f7832043576120bfe5e28fd1;hb=643bbf5bfe5db8cf56ff57f7e835e67053bb30ff;hp=f2ce9d601fc88f91647af319ff89c0fa2b5dd61d;hpb=78f3f677c919e5c185c63f462b54b72d73ca9c57;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index f2ce9d60..76304e2a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -851,7 +851,7 @@
 				 (d) == MV_DOWN  ? "MV_DOWN"  : "(various)")
 
 #define ELEMENT_ACTIVE(e)	(ActiveElement[e])
-
+#define BUTTON_ACTIVE(b)	(ActiveButton[b])
 #define FONT_ACTIVE(f)		(ActiveFont[f])
 
 
@@ -1598,9 +1598,17 @@
 #define EL_BD_DEFAULT			(EL_FIRST_DUMMY + 22)
 #define EL_SP_DEFAULT			(EL_FIRST_DUMMY + 23)
 #define EL_SB_DEFAULT			(EL_FIRST_DUMMY + 24)
+#define EL_GRAPHIC_1			(EL_FIRST_DUMMY + 25)
+#define EL_GRAPHIC_2			(EL_FIRST_DUMMY + 26)
+#define EL_GRAPHIC_3			(EL_FIRST_DUMMY + 27)
+#define EL_GRAPHIC_4			(EL_FIRST_DUMMY + 28)
+#define EL_GRAPHIC_5			(EL_FIRST_DUMMY + 29)
+#define EL_GRAPHIC_6			(EL_FIRST_DUMMY + 30)
+#define EL_GRAPHIC_7			(EL_FIRST_DUMMY + 31)
+#define EL_GRAPHIC_8			(EL_FIRST_DUMMY + 32)
 
 /* internal elements (only used for internal purposes like copying) */
-#define EL_FIRST_INTERNAL		(EL_FIRST_DUMMY + 25)
+#define EL_FIRST_INTERNAL		(EL_FIRST_DUMMY + 33)
 
 #define EL_INTERNAL_CLIPBOARD_CUSTOM	(EL_FIRST_INTERNAL + 0)
 #define EL_INTERNAL_CLIPBOARD_CHANGE	(EL_FIRST_INTERNAL + 1)
@@ -1940,7 +1948,7 @@
 #define PROGRAM_VERSION_MAJOR		3
 #define PROGRAM_VERSION_MINOR		2
 #define PROGRAM_VERSION_PATCH		4
-#define PROGRAM_VERSION_BUILD		1
+#define PROGRAM_VERSION_BUILD		2
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
@@ -2031,6 +2039,7 @@
 struct BorderInfo
 {
   boolean draw_masked[NUM_SPECIAL_GFX_ARGS];
+  boolean draw_masked_when_fading;
 };
 
 struct MenuMainButtonInfo
@@ -2326,6 +2335,13 @@ struct GlobalInfo
   float frames_per_second;
   boolean fps_slowdown;
   int fps_slowdown_factor;
+
+  /* global values for fading screens and masking borders */
+  int border_status;
+#if 0
+  int fading_status;
+  int fading_type;
+#endif
 };
 
 struct ElementChangeInfo
@@ -2706,6 +2722,7 @@ extern int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int 			GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
 extern int			ActiveElement[MAX_NUM_ELEMENTS];
+extern int			ActiveButton[NUM_IMAGE_FILES];
 extern int			ActiveFont[NUM_FONTS];
 
 extern int			lev_fieldx, lev_fieldy;