X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fdisplay.h;h=70728a7e3ff84593b4e19e394d4e0856c4658f42;hb=0078fa1620abed262370083c0c6aa475a25e1b04;hp=b9dbb590641c4acf0f7728826b7d44c1c4f92056;hpb=b19246464046dd481ab0e9bd133ba09b9d0b0300;p=rocksndiamonds.git

diff --git a/src/game_em/display.h b/src/game_em/display.h
index b9dbb590..70728a7e 100644
--- a/src/game_em/display.h
+++ b/src/game_em/display.h
@@ -1,10 +1,7 @@
 #ifndef DISPLAY_H
 #define DISPLAY_H
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
+#include "main_em.h"
 
 #define ORIG_TILEX		16
 #define ORIG_TILEY		16
@@ -44,21 +41,8 @@
 #define SXSIZE			(SCR_FIELDX * TILEX)
 #define SYSIZE			(SCR_FIELDY * TILEY)
 
-#if 0
+#define DISPLAY_TIME(x)		(((x) * 8 + 49) / 50)
 
-extern Display *display;
-extern Window window;
-#define xwindow window
-
-#else
-
-#include "../libgame/system.h"
-
-#define xwindow (window->drawable)
-
-#endif
-
-#if 1
 
 extern Bitmap *screenBitmap;
 extern Bitmap *scoreBitmap;
@@ -68,35 +52,13 @@ extern Bitmap *sprBitmap;
 extern Bitmap *ttlBitmap;
 extern Bitmap *botBitmap;
 
-#endif
-
 extern Pixmap screenPixmap;
 extern Pixmap scorePixmap;
 extern Pixmap spriteBitmap;
 
-extern Pixmap objPixmap;
 extern Pixmap objmaskBitmap;
-extern Pixmap sprPixmap;
 extern Pixmap sprmaskBitmap;
-extern Pixmap ttlPixmap;
-extern Pixmap ttlmaskBitmap;
-extern Pixmap botPixmap;
-extern Pixmap botmaskBitmap;
 
-extern GC screenGC;
-extern GC scoreGC;
 extern GC spriteGC;
-extern GC antsGC;
-
-extern Atom deleteAtom;
-
-extern KeySym lastKeySym;
-
-extern KeyCode northKeyCode[];
-extern KeyCode eastKeyCode[];
-extern KeyCode southKeyCode[];
-extern KeyCode westKeyCode[];
-extern KeyCode fireKeyCode[];
-extern KeyCode escKeyCode[];
 
 #endif