From c5c29495387ed285301b84800b5ee7d54a24f59b Mon Sep 17 00:00:00 2001 From: Aubin DORIVAL Date: Sun, 15 Dec 2024 17:56:06 +0100 Subject: [PATCH] marge for game view --- display.c | 14 +++++++++----- display.h | 2 +- function.h | 1 + main.c | 4 +++- test.txt | 13 +++++++++++++ 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/display.c b/display.c index b8b0e97..307aca8 100644 --- a/display.c +++ b/display.c @@ -24,7 +24,9 @@ void screenDisplay (unsigned short int **tab, int size) void screenDisplaySDL (unsigned short int **tab, dis *display_user) { - int size = display_user->size_window / display_user->size_box; + unsigned int display_game = display_user->size_window - display_user->size_menu; + int size = display_game / display_user->size_box; + unsigned int marge = display_user->size_menu /2; unsigned int i, j; for (i = 0; i < display_user->size_box; ++i) @@ -33,7 +35,7 @@ void screenDisplaySDL (unsigned short int **tab, dis *display_user) { SDL_Surface *img; SDL_Texture *texture; - vect pos = { i * size, j * size }; + vect pos = { i * size + marge, j * size}; switch (tab[j][i]) { case EMPTY: @@ -69,7 +71,7 @@ void screenDisplaySDL (unsigned short int **tab, dis *display_user) SDL_RenderPresent (display_user->renderer); } -int getMaxSize (int size_box) +int getMaxSize (dis display_user) { SDL_Init (SDL_INIT_VIDEO); // init if error SDL_DisplayMode display; @@ -84,8 +86,8 @@ int getMaxSize (int size_box) result = display.h; } SDL_Quit (); - int minus_mod = (result-50) % size_box; - printf("DIS :%d, size : %d ,mod : %d\n",result, size_box,minus_mod); + int minus_mod = (result-50) % display_user.size_box; + //printf("DIS :%d, size : %d ,mod : %d\n",result, size_box,minus_mod); return (result - 50 - minus_mod); // margin } @@ -119,3 +121,5 @@ void displayImage (SDL_Renderer *renderer, SDL_Texture *texture, vect pos, SDL_Rect rect = { pos.x, pos.y, size, size }; SDL_RenderCopy (renderer, texture, NULL, &rect); } + + diff --git a/display.h b/display.h index 3ee27f3..61235db 100644 --- a/display.h +++ b/display.h @@ -5,7 +5,7 @@ #include void screenDisplay (unsigned short int **tab, int size); -int getMaxSize (int size_box); +int getMaxSize (dis display_user); void displayImage (SDL_Renderer *renderer, SDL_Texture *texture, vect pos, int size); void initSDL (dis *display_user); diff --git a/function.h b/function.h index 8f7b275..7df3e79 100644 --- a/function.h +++ b/function.h @@ -36,6 +36,7 @@ typedef struct essential_sdl SDL_Renderer *renderer; unsigned int size_window; unsigned int size_box; + unsigned int size_menu; } dis; unsigned short int **creatArea2D (const unsigned int N); diff --git a/main.c b/main.c index c18bddc..8d403b1 100644 --- a/main.c +++ b/main.c @@ -8,12 +8,14 @@ #include #define SIZE_PLAY 26 +#define SIZE_MENU 200; int main () { dis display_user; - display_user.size_window = getMaxSize (SIZE_PLAY); + display_user.size_menu = SIZE_MENU; display_user.size_box = SIZE_PLAY; + display_user.size_window = getMaxSize (display_user); initSDL (&display_user); vect *playerPos = (vect *)malloc (sizeof (vect)); diff --git a/test.txt b/test.txt index e5df6f4..f214e67 100644 --- a/test.txt +++ b/test.txt @@ -9,3 +9,16 @@ ##### ### #P## II# # ######### ####### + + + + + + + + + + + + + #