rnd-20040918-1-src

[rocksndiamonds.git] / src / game_em / display.h

diff --git a/src/game_em/display.h b/src/game_em/display.h
index 9a6ca203217c2aa1ff0c9128e75f461697f0cce0..0eb026a6397538ea556465de84208cfb85bbc25e 100644 (file)
--- a/src/game_em/display.h
+++ b/src/game_em/display.h
@@ -6,6 +6,8 @@
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
+#include "game_em.h"
+
 #define ORIG_TILEX             16
 #define ORIG_TILEY             16
 #define ORIG_SCOREX            8
@@ -26,9 +28,23 @@
 #define MENUFONTX              (ORIG_MENUFONTX         * ZOOM_FACTOR)
 #define MENUFONTY              (ORIG_MENUFONTY         * ZOOM_FACTOR)
 
+#define ORIG_SCR_MENUX         20
+#define ORIG_SCR_MENUY         12
+#define SCR_MENUX              17
+#define SCR_MENUY              12
+#define SCR_FIELDX             17
+#define SCR_FIELDY             17
+#define MAX_BUF_XSIZE          (SCR_FIELDX + 2)
+#define MAX_BUF_YSIZE          (SCR_FIELDY + 2)
+
 /* often used screen positions */
+#define ORIG_MENU_SX           ((ORIG_SCR_MENUX - SCR_MENUX) * TILEX / 2)
+#define ORIG_MENU_SY           0
+#define SY                     8
 #define SX                     8
 #define SY                     8
+#define SXSIZE                 (SCR_FIELDX * TILEX)
+#define SYSIZE                 (SCR_FIELDY * TILEY)
 
 #if 0
 
@@ -38,8 +54,6 @@ extern Window window;
 
 #else
 
-#include "../libgame/system.h"
-
 #define xwindow (window->drawable)
 
 #endif