rnd-20060319-1-src

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

diff --git a/src/game_em/display.h b/src/game_em/display.h
index e5e5f55e42788dacbe83d83c563da3494a3a67e1..9079feea90744c0f418b8d040885de46c6d3b79a 100644 (file)
--- 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,6 +41,27 @@
 #define SXSIZE                 (SCR_FIELDX * TILEX)
 #define SYSIZE                 (SCR_FIELDY * TILEY)
 
+#if 1
+
+#if 0
+#define FRAMES_PER_SECOND      50
+#endif
+
+#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;