rnd-20040819-1-src

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

diff --git a/src/libem/display.h b/src/libem/display.h
index a13d3a7b15e575420bc820e8f3f4a93f99679fb9..171f73e49b25ceaf8763685ef0fb12d23cdc9529 100644 (file)
--- a/src/libem/display.h
+++ b/src/libem/display.h
@@ -1,8 +1,13 @@
 #ifndef DISPLAY_H
 #define DISPLAY_H
 
+#if 1
+#define TILEX 32
+#define TILEY 32
+#else
 #define TILEX 16
 #define TILEY 16
+#endif
 #define SCOREX 8
 #define SCOREY 9
 
@@ -11,12 +16,30 @@
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
+#if 0
+
 extern Display *display;
 extern Window window;
-#if 0
-extern Window xwindow;
-#else
 #define xwindow window
+
+#else
+
+#include "../libgame/system.h"
+
+#define xwindow (window->drawable)
+
+#endif
+
+#if 1
+
+extern Bitmap *screenBitmap;
+extern Bitmap *scoreBitmap;
+
+extern Bitmap *objBitmap;
+extern Bitmap *sprBitmap;
+extern Bitmap *ttlBitmap;
+extern Bitmap *botBitmap;
+
 #endif
 
 extern Pixmap screenPixmap;