X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=0933b06470633fc74a3e888c0a12ab90540d7b2a;hp=640a4fc962bf99ef94b31f99d048abe6e3bf4ef3;hb=e51177796149f37de339bda83558c3c49758be93;hpb=328e3b0f53ca41e626fda33427f5c51325bc700b

diff --git a/src/main.h b/src/main.h
index 640a4fc9..0933b064 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
@@ -943,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)
@@ -953,6 +958,7 @@
 #define VY			400
 #define EX			DX
 #define EY			(VY - 44)
+#endif
 #define TILESIZE		32
 #define TILEX			TILESIZE
 #define TILEY			TILESIZE
@@ -2015,13 +2021,13 @@
 
 /* program information and versioning definitions */
 #define PROGRAM_VERSION_MAJOR		3
-#define PROGRAM_VERSION_MINOR		2
-#define PROGRAM_VERSION_PATCH		6
-#define PROGRAM_VERSION_BUILD		2
+#define PROGRAM_VERSION_MINOR		3
+#define PROGRAM_VERSION_PATCH		0
+#define PROGRAM_VERSION_BUILD		0
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
-#define PROGRAM_COPYRIGHT_STRING	"Copyright ©1995-2009 by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING	"Copyright ©1995-2010 by Holger Schemel"
 #define PROGRAM_EMAIL_STRING		"info@artsoft.org"
 #define PROGRAM_WEBSITE_STRING		"http://www.artsoft.org/"
 #define PROGRAM_GAME_BY_STRING		"A Game by Artsoft Entertainment"
@@ -2251,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];
@@ -2778,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;
@@ -2798,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];
@@ -2843,6 +2862,15 @@ 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			SX, SY;
+extern int			REAL_SX, REAL_SY;
+extern int			DX, DY;
+extern int			VX, VY;
+extern int			EX, EY;
+extern int			dDX, dDY;
+
 extern int			FX, FY;
 extern int			ScrollStepSize;
 extern int			ScreenMovDir, ScreenMovPos, ScreenGfxPos;
@@ -2869,6 +2897,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;
@@ -2878,7 +2907,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;