From 58a02a609cbb96dc11f5f31943b558e7adf3ce3b Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Sun, 15 Sep 2019 15:58:04 +0200 Subject: [PATCH] Defined TILES_TO_UNITS and UNITS_TO_TILES in terms of TILES_TO_PIXELS, PIXELS_TO_TILES, PIXELS_TO_UNITS and UNITS_TO_PIXELS Signed-off-by: Gabriel Ravier --- src/CommonDefines.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CommonDefines.h b/src/CommonDefines.h index a3350f01..d0e72807 100644 --- a/src/CommonDefines.h +++ b/src/CommonDefines.h @@ -3,12 +3,13 @@ #define WINDOW_WIDTH 320 #define WINDOW_HEIGHT 240 -#define TILES_TO_UNITS(x) ((x) * 0x2000) -#define UNITS_TO_TILES(x) ((x) / 0x2000) #define TILES_TO_PIXELS(x) ((x) * 0x10) #define PIXELS_TO_TILES(x) ((x) / 0x10) #define PIXELS_TO_UNITS(x) ((x) * 0x200) #define UNITS_TO_PIXELS(x) ((x) / 0x200) +#define TILES_TO_UNITS(x) (PIXELS_TO_UNITS(TILES_TO_PIXELS(x))) // * 0x2000 +#define UNITS_TO_TILES(x) (PIXELS_TO_TILES(UNITS_TO_PIXELS(x))) // / 0x2000 + #define SECONDS_TO_FRAMES(x) ((x) * 50) #define FRAMES_TO_SECONDS(x) ((x) / 50)