X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=34f8bcbf72ba2470331274e0ed08e48ad836cc80;hb=90bf2712051fd9dd255f3269891daec81f746566;hp=d16f5bc9fa1ce72bc978af69a64a58b2eb852e89;hpb=0d4ace80d081e080a704ee15227e209d5953e325;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index d16f5bc9..34f8bcbf 100644
--- a/src/main.h
+++ b/src/main.h
@@ -31,6 +31,8 @@
 #include "conf_mus.h"	/* include auto-generated data structure definitions */
 
 
+#define NEW_SCROLL			0
+
 #define IMG_UNDEFINED			(-1)
 #define IMG_EMPTY			IMG_EMPTY_SPACE
 #define IMG_SP_EMPTY			IMG_EMPTY_SPACE
@@ -1828,11 +1830,12 @@
 #define GFX_SPECIAL_ARG_SETUP		9
 #define GFX_SPECIAL_ARG_PLAYING		10
 #define GFX_SPECIAL_ARG_DOOR		11
-#define GFX_SPECIAL_ARG_PANEL		12
-#define GFX_SPECIAL_ARG_PREVIEW		13
-#define GFX_SPECIAL_ARG_CRUMBLED	14
+#define GFX_SPECIAL_ARG_TAPE		12
+#define GFX_SPECIAL_ARG_PANEL		13
+#define GFX_SPECIAL_ARG_PREVIEW		14
+#define GFX_SPECIAL_ARG_CRUMBLED	15
 
-#define NUM_SPECIAL_GFX_ARGS		15
+#define NUM_SPECIAL_GFX_ARGS		16
 
 /* these additional definitions are currently only used for draw offsets */
 #define GFX_SPECIAL_ARG_INFO_MAIN	0
@@ -1914,8 +1917,12 @@
 #define GFX_ARG_SORT_PRIORITY		45
 #define GFX_ARG_CLASS			46
 #define GFX_ARG_STYLE			47
+#define GFX_ARG_ACTIVE_XOFFSET		48
+#define GFX_ARG_ACTIVE_YOFFSET		49
+#define GFX_ARG_PRESSED_XOFFSET		50
+#define GFX_ARG_PRESSED_YOFFSET		51
 
-#define NUM_GFX_ARGS			48
+#define NUM_GFX_ARGS			52
 
 
 /* values for sound configuration suffixes */
@@ -2001,13 +2008,14 @@
 #define GAME_MODE_SETUP			9
 #define GAME_MODE_PLAYING		10
 #define GAME_MODE_PSEUDO_DOOR		11
-#define GAME_MODE_PSEUDO_PANEL		12
-#define GAME_MODE_PSEUDO_PREVIEW	13
-#define GAME_MODE_PSEUDO_CRUMBLED	14
+#define GAME_MODE_PSEUDO_TAPE		12
+#define GAME_MODE_PSEUDO_PANEL		13
+#define GAME_MODE_PSEUDO_PREVIEW	14
+#define GAME_MODE_PSEUDO_CRUMBLED	15
 
 /* there are no special config file suffixes for these modes */
-#define GAME_MODE_PSEUDO_TYPENAME	15
-#define GAME_MODE_QUIT			16
+#define GAME_MODE_PSEUDO_TYPENAME	16
+#define GAME_MODE_QUIT			17
 
 /* special definitions currently only used for custom artwork configuration */
 #define MUSIC_PREFIX_BACKGROUND		0
@@ -2023,7 +2031,7 @@
 #define PROGRAM_VERSION_MAJOR		3
 #define PROGRAM_VERSION_MINOR		3
 #define PROGRAM_VERSION_PATCH		0
-#define PROGRAM_VERSION_BUILD		1
+#define PROGRAM_VERSION_BUILD		2
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
@@ -2460,6 +2468,8 @@ struct GlobalInfo
   int fading_status;
   int fading_type;
 #endif
+
+  boolean use_envelope_request;
 };
 
 struct ElementChangeInfo
@@ -2716,6 +2726,11 @@ struct GraphicInfo
   int class;
   int style;
 
+  int active_xoffset;
+  int active_yoffset;
+  int pressed_xoffset;
+  int pressed_yoffset;
+
   boolean use_image_size;	/* use image size as default width and height */
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
@@ -2814,7 +2829,11 @@ extern SDL_Thread	       *server_thread;
 extern int			key_joystick_mapping;
 
 #if 1
+#if NEW_SCROLL
+extern boolean			redraw[2 + MAX_LEV_FIELDX + 2][2 + MAX_LEV_FIELDY + 2];
+#else
 extern boolean			redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2];
+#endif
 #else
 extern boolean			redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 #endif