From 18a0978ab61b5d553b60b8a8e2486ce48cdce0d2 Mon Sep 17 00:00:00 2001
From: Aubin DORIVAL <aubindo@outlook.fr>
Date: Sun, 15 Dec 2024 13:15:04 +0100
Subject: [PATCH] retirer ligne noire

---
 display.c  | 8 +++++---
 display.h  | 2 +-
 function.c | 3 ++-
 main.c     | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/display.c b/display.c
index c077ea5..5feca41 100644
--- a/display.c
+++ b/display.c
@@ -25,7 +25,7 @@ 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;
-    int i, j;
+    unsigned int i, j;
 
     for (i = 0; i < display_user->size_box; ++i)
     {
@@ -69,7 +69,7 @@ void screenDisplaySDL (unsigned short int **tab, dis *display_user)
     SDL_RenderPresent (display_user->renderer);
 }
 
-int getMaxSize ()
+int getMaxSize (int size_box)
 {
     SDL_Init (SDL_INIT_VIDEO); // init if error
     SDL_DisplayMode display;
@@ -84,7 +84,9 @@ int getMaxSize ()
         result = display.h;
     }
     SDL_Quit ();
-    return (result - 50); // margin
+    int minus_mod = (result-50) % size_box;
+    printf("DIS :%d, size : %d ,mod : %d\n",result, size_box,minus_mod);
+    return (result - 50 - minus_mod); // margin
 }
 
 void initSDL (dis *display_user)
diff --git a/display.h b/display.h
index cb5a71f..3ee27f3 100644
--- a/display.h
+++ b/display.h
@@ -5,7 +5,7 @@
 #include <SDL2/SDL.h>
 
 void screenDisplay (unsigned short int **tab, int size);
-int getMaxSize ();
+int getMaxSize (int size_box);
 void displayImage (SDL_Renderer *renderer, SDL_Texture *texture, vect pos,
                    int size);
 void initSDL (dis *display_user);
diff --git a/function.c b/function.c
index 5009ee6..0e560a0 100644
--- a/function.c
+++ b/function.c
@@ -335,7 +335,8 @@ bool blockBox (unsigned short int **tab2d, vect box_coor)
             if (test_add_other.x == 0 && test_add_other.y == 0)
             {
 
-                if ((val1 == WALL || val1 == BOX || val1 == BOX_ON_TARGET))
+                if ((val1 == WALL || val1 == BOX || val1 == BOX_ON_TARGET)
+                    || (val2 == WALL || val2 == BOX || val2 == BOX_ON_TARGET))
                 {
                     return true;
                 }
diff --git a/main.c b/main.c
index 42aef79..30a9261 100644
--- a/main.c
+++ b/main.c
@@ -12,7 +12,7 @@
 int main ()
 {
     dis display_user;
-    display_user.size_window = getMaxSize ();
+    display_user.size_window = getMaxSize (SIZE_PLAY);
     display_user.size_box = SIZE_PLAY;
     initSDL (&display_user);