From fcbeb38ea5de865e0f4c9f7a608d23ffe4e87fc9 Mon Sep 17 00:00:00 2001 From: Aaro Saila Date: Sun, 30 Mar 2025 22:32:56 +0300 Subject: [PATCH] v1.1.7 moved board info to board.h --- src/board/board.c | 4 +--- src/board/board.h | 12 +++++++++++- src/globals.h | 16 ---------------- src/main.c | 3 +-- src/snake/snake.h | 2 +- src/utils/utils.h | 2 +- 6 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 src/globals.h diff --git a/src/board/board.c b/src/board/board.c index 381cf8d..db76383 100644 --- a/src/board/board.c +++ b/src/board/board.c @@ -1,8 +1,6 @@ #include -#include "../globals.h" - -extern boardInfo brdInfo; +#include "board.h" void setBoardBorders(char board[][brdInfo.x]) { for (int i = 0; i < brdInfo.y; i++) { diff --git a/src/board/board.h b/src/board/board.h index 74b127f..d51ef14 100644 --- a/src/board/board.h +++ b/src/board/board.h @@ -1,7 +1,17 @@ #ifndef BOARD_H_ #define BOARD_H_ -#include "../globals.h" +typedef struct { + int x; + int y; +} boardInfo; + +typedef struct { + int xs; + int xe; + int ys; + int ye; +} playableBoardInfo; extern boardInfo brdInfo; diff --git a/src/globals.h b/src/globals.h deleted file mode 100644 index c02cfaf..0000000 --- a/src/globals.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef GLOBALS_H_ -#define GLOBALS_H_ - -typedef struct { - int x; - int y; -} boardInfo; - -typedef struct { - int xs; - int xe; - int ys; - int ye; -} playableBoardInfo; - -#endif // GLOBALS_H_ diff --git a/src/main.c b/src/main.c index c6c3f0e..c0bfd1f 100644 --- a/src/main.c +++ b/src/main.c @@ -10,9 +10,8 @@ #include "./utils/utils.h" #include "./snake/snake.h" #include "./board/board.h" -#include "globals.h" -const char* VERSION = "1.1.6"; +const char* VERSION = "1.1.7"; const char SNAKE_VIS = '#'; diff --git a/src/snake/snake.h b/src/snake/snake.h index 285d7f9..27411bc 100644 --- a/src/snake/snake.h +++ b/src/snake/snake.h @@ -1,7 +1,7 @@ #ifndef SNAKE_H_ #define SNAKE_H_ -#include "../globals.h" +#include "../board/board.h" extern boardInfo brdInfo; diff --git a/src/utils/utils.h b/src/utils/utils.h index bc21530..87b53e4 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -3,7 +3,7 @@ #include -#include "../globals.h" +#include "../board/board.h" extern boardInfo brdInfo;