diff --git a/src/game/game.h b/src/game/game.h index c6ecd02..0a71c52 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -7,7 +7,7 @@ // stores the data used in the game #define COLUMNS ((int8_t)10) -#define ROWS ((int8_t)(COLUMNS * 2)) +#define ROWS ((int8_t)24) typedef const Colour8* CRow; typedef Colour8* Row; diff --git a/src/window/renderer.h b/src/window/renderer.h index 98cbd8f..678501f 100644 --- a/src/window/renderer.h +++ b/src/window/renderer.h @@ -5,14 +5,14 @@ #include "../game/game.h" -#define SCREEN_RESOLUTION 25 // pixels per block -#define SCREEN_WIDTH ((COLUMNS) * 25) // window width -#define SCREEN_HEIGHT (SCREEN_WIDTH / COLUMNS * ROWS) // window height -#define TET_PADDING 10 // padding around the tetris playing field -#define TET_WIDTH (SCREEN_WIDTH - TET_PADDING * 2) // tetris playing field width -#define TET_HEIGHT (SCREEN_HEIGHT - TET_PADDING * 2) // tetris playing field height -#define BLOCK_WIDTH (TET_WIDTH / COLUMNS) // width of a block -#define BLOCK_HEIGHT (TET_HEIGHT / ROWS) // height of a block +#define PX_DENS 25 // pixel density; pixels per block +#define TET_PADDING 10 // padding around the tetris playing field +#define TET_WIDTH (COLUMNS * PX_DENS - TET_PADDING) // tetris playing field width +#define TET_HEIGHT (TET_WIDTH / COLUMNS * ROWS) // tetris playing field height +#define SCREEN_WIDTH ((COLUMNS + 4) * PX_DENS) // window width +#define SCREEN_HEIGHT ((COLUMNS + 1) * PX_DENS / COLUMNS * ROWS) // window height +#define BLOCK_WIDTH (TET_WIDTH / COLUMNS) // width of a block +#define BLOCK_HEIGHT (TET_HEIGHT / ROWS) // height of a block typedef struct { SDL_Window* window;