X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=4268c9018b494b39e759a60e340852237313637e;hb=4179dabc517f32c163c5d2c9aec2e15c57225d42;hp=56ecbd16a67dbeabac69dadc4ffd331e1411cd83;hpb=d442dd6ca65b694c37fbd3c93505644fe8478263;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 56ecbd16..4268c901 100644
--- a/src/main.h
+++ b/src/main.h
@@ -43,13 +43,17 @@
 #define SND_UNDEFINED			(-1)
 #define MUS_UNDEFINED			(-1)
 
+#if 0
 #define WIN_XSIZE			672
 #define WIN_YSIZE			560
+#endif
 
 #define DEFAULT_FULLSCREEN_MODE		"800x600"
 
+#if 0
 #define SCR_FIELDX			17
 #define SCR_FIELDY			17
+#endif
 #define MAX_BUF_XSIZE			(SCR_FIELDX + 2)
 #define MAX_BUF_YSIZE			(SCR_FIELDY + 2)
 #define MIN_LEV_FIELDX			3
@@ -947,12 +951,14 @@
 #define SY			8
 #define REAL_SX			(SX - 2)
 #define REAL_SY			(SY - 2)
+#if 0
 #define DX			566
 #define DY			60
 #define VX			DX
 #define VY			400
 #define EX			DX
 #define EY			(VY - 44)
+#endif
 #define TILESIZE		32
 #define TILEX			TILESIZE
 #define TILEY			TILESIZE
@@ -1852,10 +1858,11 @@
 #define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1	8
 #define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2	9
 #define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3	10
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK	11
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER	12
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4	11
+#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK	12
+#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER	13
 
-#define NUM_SPECIAL_GFX_SETUP_ARGS		13
+#define NUM_SPECIAL_GFX_SETUP_ARGS		14
 
 
 /* values for image configuration suffixes */
@@ -1905,8 +1912,10 @@
 #define GFX_ARG_ALIGN			43
 #define GFX_ARG_VALIGN			44
 #define GFX_ARG_SORT_PRIORITY		45
+#define GFX_ARG_CLASS			46
+#define GFX_ARG_STYLE			47
 
-#define NUM_GFX_ARGS			46
+#define NUM_GFX_ARGS			48
 
 
 /* values for sound configuration suffixes */
@@ -2248,6 +2257,14 @@ struct PreviewInfo
   int anim_mode;
 };
 
+struct ViewportInfo
+{
+  struct Rect window;
+  struct Rect playfield[NUM_SPECIAL_GFX_ARGS];
+  struct Rect door_1[NUM_SPECIAL_GFX_ARGS];
+  struct Rect door_2[NUM_SPECIAL_GFX_ARGS];
+};
+
 struct HiScore
 {
   char Name[MAX_PLAYER_NAME_LEN + 1];
@@ -2696,6 +2713,9 @@ struct GraphicInfo
   int align, valign;		/* optional setting for drawing title screens */
   int sort_priority;		/* optional setting for drawing title screens */
 
+  int class;
+  int style;
+
   boolean use_image_size;	/* use image size as default width and height */
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
@@ -2792,7 +2812,11 @@ extern SDL_Thread	       *server_thread;
 
 extern int			key_joystick_mapping;
 
+#if 1
+extern boolean			redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2];
+#else
 extern boolean			redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+#endif
 extern int			redraw_x1, redraw_y1;
 
 extern short			Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -2837,6 +2861,12 @@ extern int			ActiveFont[NUM_FONTS];
 extern int			lev_fieldx, lev_fieldy;
 extern int			scroll_x, scroll_y;
 
+extern int			WIN_XSIZE, WIN_YSIZE;
+extern int			SCR_FIELDX, SCR_FIELDY;
+extern int			DX, DY;
+extern int			VX, VY;
+extern int			EX, EY;
+
 extern int			FX, FY;
 extern int			ScrollStepSize;
 extern int			ScreenMovDir, ScreenMovPos, ScreenGfxPos;
@@ -2863,6 +2893,7 @@ extern struct HiScore		highscore[];
 extern struct TapeInfo		tape;
 extern struct GlobalInfo	global;
 extern struct BorderInfo	border;
+extern struct ViewportInfo	viewport;
 extern struct TitleFadingInfo	fading;
 extern struct TitleFadingInfo	fading_none;
 extern struct TitleFadingInfo	title_initial_default;
@@ -2872,7 +2903,7 @@ extern struct TitleMessageInfo	titlemessage_initial[];
 extern struct TitleMessageInfo	titlemessage_default;
 extern struct TitleMessageInfo	titlemessage[];
 extern struct TitleMessageInfo	readme;
-extern struct InitInfo		init;
+extern struct InitInfo		init, init_last;
 extern struct MenuInfo		menu;
 extern struct DoorInfo		door_1, door_2;
 extern struct PreviewInfo	preview;