From ed8127a72e1a2d2703372d5b5dfa8d96703ec3bb Mon Sep 17 00:00:00 2001 From: Oxore Date: Tue, 3 Jul 2018 15:11:54 +0300 Subject: Refactor field, refactor next shape drawing Refactor field functions names. Transfer next shape drawing to painter. Introduce idlist struct with foreach function. Refactor config. Introduce color map array instead of "switch case" statement bloating while coloring rectangles. Decouple field and shape structs from SFML sfVector2 structs by introducing own vector2i and vector2ui structs. Also remove sfRectangleShape members form field an shape structs. --- include/engine.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'include/engine.h') diff --git a/include/engine.h b/include/engine.h index 2dd7e9f..bca16ed 100644 --- a/include/engine.h +++ b/include/engine.h @@ -1,15 +1,13 @@ -#define RIGHT 1 -#define DOWN 2 -#define UP 4 -#define LEFT 8 -#define RIGHTHOLD 16 -#define LEFTHOLD 128 +#define RIGHT (1 << 0) +#define DOWN (1 << 1) +#define UP (1 << 2) +#define LEFT (1 << 3) +#define RIGHTHOLD (1 << 4) +#define LEFTHOLD (1 << 5) void tKeyCtrl(); void tTick(); void checkLevelUp(struct game *game); -int getMoveLatencyOfLevel(int level); +int getMoveLatencyOfLevel(unsigned int level); void valueAfterTextDisplay(int value, List *texts, char *type); -void drawFld(sfRenderWindow *window, struct field *fld); void gameover(struct game *game); -void drawNextShape(sfRenderWindow *window); -- cgit v1.2.3