X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibem%2Fdisplay.h;h=171f73e49b25ceaf8763685ef0fb12d23cdc9529;hb=b7c0e8ca1c06e1d54714b382d6b92f4ff2d47af7;hp=a13d3a7b15e575420bc820e8f3f4a93f99679fb9;hpb=bec4e2a1fb71569a3302583f71fbb11aa3f58b63;p=rocksndiamonds.git diff --git a/src/libem/display.h b/src/libem/display.h index a13d3a7b..171f73e4 100644 --- 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 #include +#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;