X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fdisplay.h;h=f6a82af453c8a13991d8dd0b85a5331b8fa2cb8f;hb=88c9b68c44a16e7df62557b63cc7e86731e028c9;hp=3ba720be692335a1d5e3da031ce29491df911cd7;hpb=ef9242bb9320d705010959ba11fdf697dc1e5b70;p=rocksndiamonds.git

diff --git a/src/game_em/display.h b/src/game_em/display.h
index 3ba720be..f6a82af4 100644
--- a/src/game_em/display.h
+++ b/src/game_em/display.h
@@ -1,7 +1,7 @@
 #ifndef DISPLAY_H
 #define DISPLAY_H
 
-#include "game_em.h"
+#include "main_em.h"
 
 #define ORIG_TILEX		16
 #define ORIG_TILEY		16
@@ -41,8 +41,23 @@
 #define SXSIZE			(SCR_FIELDX * TILEX)
 #define SYSIZE			(SCR_FIELDY * TILEY)
 
-#define DISPLAY_TIME(x)		(((x) * 8 + 49) / 50)
+#if 1
+#define FRAMES_PER_SECOND	50
+
+#define ROUNDED_DIVIDE(x, y)	(((x) + (y) - 1) / (y))
+
+#define SECONDS_TO_FRAMES(x)	((x) * FRAMES_PER_SECOND)
+#define FRAMES_TO_SECONDS(x)	((x) / FRAMES_PER_SECOND)
+
+#define SECONDS_TO_CYCLES(x)	ROUNDED_DIVIDE((x) * FRAMES_PER_SECOND, 8)
+#define CYCLES_TO_SECONDS(x)	ROUNDED_DIVIDE((x) * 8, FRAMES_PER_SECOND)
 
+#define DISPLAY_TIME(x)		ROUNDED_DIVIDE(x, FRAMES_PER_SECOND)
+
+#else
+
+#define DISPLAY_TIME(x)		(((x) * 8 + 49) / 50)
+#endif
 
 extern Bitmap *screenBitmap;
 extern Bitmap *scoreBitmap;