X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=c237aa33a4de4b1c03acc7b7a197cfc4680b7844;hb=24090f8655f9fbf138c1f9105427728f5c21b0b9;hp=8632855a043f5b6a4a2a8e6094a2acaa5014d9e3;hpb=59ee473b86e7cbc1d9b09a3c22b0bbd3a410f16f;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 8632855a..c237aa33 100644
--- a/src/main.h
+++ b/src/main.h
@@ -50,8 +50,10 @@
 
 #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
@@ -945,6 +947,7 @@
 #define MAX_INITIAL_INVENTORY_SIZE	8
 
 /* often used screen positions */
+#if 0
 #define SX			8
 #define SY			8
 #define REAL_SX			(SX - 2)
@@ -955,6 +958,7 @@
 #define VY			400
 #define EX			DX
 #define EY			(VY - 44)
+#endif
 #define TILESIZE		32
 #define TILEX			TILESIZE
 #define TILEY			TILESIZE
@@ -2253,6 +2257,14 @@ struct PreviewInfo
   int anim_mode;
 };
 
+struct ViewportInfo
+{
+  struct RectWithBorder window;
+  struct RectWithBorder playfield[NUM_SPECIAL_GFX_ARGS];
+  struct RectWithBorder door_1[NUM_SPECIAL_GFX_ARGS];
+  struct RectWithBorder door_2[NUM_SPECIAL_GFX_ARGS];
+};
+
 struct HiScore
 {
   char Name[MAX_PLAYER_NAME_LEN + 1];
@@ -2448,8 +2460,6 @@ struct GlobalInfo
   int fading_status;
   int fading_type;
 #endif
-
-  struct Rect screen;
 };
 
 struct ElementChangeInfo
@@ -2782,6 +2792,7 @@ struct HelpAnimInfo
 };
 
 
+extern Bitmap		       *bitmap_db_store;
 extern Bitmap		       *bitmap_db_cross;
 extern Bitmap		       *bitmap_db_field;
 extern Bitmap		       *bitmap_db_panel;
@@ -2802,7 +2813,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];
@@ -2848,6 +2863,12 @@ 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			SX, SY;
+extern int			REAL_SX, REAL_SY;
+extern int			DX, DY;
+extern int			VX, VY;
+extern int			EX, EY;
 
 extern int			FX, FY;
 extern int			ScrollStepSize;
@@ -2875,6 +2896,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;