X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=0933b06470633fc74a3e888c0a12ab90540d7b2a;hb=e51177796149f37de339bda83558c3c49758be93;hp=09306600a7dbbcc6e9b06e0f445f98690ef72555;hpb=5cdf02eb2a6d9627f7461ab9d386698cb7596096;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 09306600..0933b064 100644
--- a/src/main.h
+++ b/src/main.h
@@ -947,11 +947,11 @@
 #define MAX_INITIAL_INVENTORY_SIZE	8
 
 /* often used screen positions */
+#if 0
 #define SX			8
 #define SY			8
 #define REAL_SX			(SX - 2)
 #define REAL_SY			(SY - 2)
-#if 0
 #define DX			566
 #define DY			60
 #define VX			DX
@@ -2021,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"
@@ -2257,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];
@@ -2454,21 +2462,6 @@ struct GlobalInfo
 #endif
 };
 
-struct SubViewportInfo
-{
-  struct Rect menu;
-  struct Rect game;
-  struct Rect editor;
-};
-
-struct ViewportInfo
-{
-  struct Rect window;
-  struct SubViewportInfo playfield;
-  struct SubViewportInfo door_1;
-  struct SubViewportInfo door_2;
-};
-
 struct ElementChangeInfo
 {
   boolean can_change;		/* use or ignore this change info */
@@ -2799,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;
@@ -2870,9 +2864,12 @@ 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;