rnd-20100417-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 09306600a7dbbcc6e9b06e0f445f98690ef72555..f71341b2b513ed5fea5f63777c653eabf7d8fd9d 100644 (file)
--- 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
@@ -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 */
@@ -2870,6 +2863,8 @@ 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;