X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fdisplay.h;h=f6a82af453c8a13991d8dd0b85a5331b8fa2cb8f;hb=d9b86b7b2ebe0b2be3926656c3bbdcd060ee5811;hp=0eb026a6397538ea556465de84208cfb85bbc25e;hpb=4a8314a1bba69c0ca6ea33bd11d7e4cf9aa0f65d;p=rocksndiamonds.git

diff --git a/src/game_em/display.h b/src/game_em/display.h
index 0eb026a6..f6a82af4 100644
--- a/src/game_em/display.h
+++ b/src/game_em/display.h
@@ -1,12 +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 "game_em.h"
+#include "main_em.h"
 
 #define ORIG_TILEX		16
 #define ORIG_TILEY		16
@@ -46,19 +41,23 @@
 #define SXSIZE			(SCR_FIELDX * TILEX)
 #define SYSIZE			(SCR_FIELDY * TILEY)
 
-#if 0
+#if 1
+#define FRAMES_PER_SECOND	50
 
-extern Display *display;
-extern Window window;
-#define xwindow window
+#define ROUNDED_DIVIDE(x, y)	(((x) + (y) - 1) / (y))
 
-#else
+#define SECONDS_TO_FRAMES(x)	((x) * FRAMES_PER_SECOND)
+#define FRAMES_TO_SECONDS(x)	((x) / FRAMES_PER_SECOND)
 
-#define xwindow (window->drawable)
+#define SECONDS_TO_CYCLES(x)	ROUNDED_DIVIDE((x) * FRAMES_PER_SECOND, 8)
+#define CYCLES_TO_SECONDS(x)	ROUNDED_DIVIDE((x) * 8, FRAMES_PER_SECOND)
 
-#endif
+#define DISPLAY_TIME(x)		ROUNDED_DIVIDE(x, FRAMES_PER_SECOND)
 
-#if 1
+#else
+
+#define DISPLAY_TIME(x)		(((x) * 8 + 49) / 50)
+#endif
 
 extern Bitmap *screenBitmap;
 extern Bitmap *scoreBitmap;
@@ -68,35 +67,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