dukantic/Sokoban
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

retirer ligne noire

Browse Source
This commit is contained in:
Aubin DORIVAL
2024-12-15 13:15:04 +01:00
parent 0553a603ff
commit 18a0978ab6
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
display.c
View File

@@ -25,7 +25,7 @@ void screenDisplay (unsigned short int **tab, int size)
void screenDisplaySDL (unsigned short int **tab, dis *display_user) void screenDisplaySDL (unsigned short int **tab, dis *display_user)
{ {
int size = display_user->size_window / display_user->size_box; 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) 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); SDL_RenderPresent (display_user->renderer);
} }
int getMaxSize () int getMaxSize (int size_box)
{ {
SDL_Init (SDL_INIT_VIDEO); // init if error SDL_Init (SDL_INIT_VIDEO); // init if error
SDL_DisplayMode display; SDL_DisplayMode display;
@@ -84,7 +84,9 @@ int getMaxSize ()
result = display.h; result = display.h;
} }
SDL_Quit (); 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) void initSDL (dis *display_user)

2
display.h
View File

@@ -5,7 +5,7 @@
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
void screenDisplay (unsigned short int **tab, int size); 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, void displayImage (SDL_Renderer *renderer, SDL_Texture *texture, vect pos,
int size); int size);
void initSDL (dis *display_user); void initSDL (dis *display_user);

3
function.c
View File

@@ -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 (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; return true;
} }

2
main.c
View File

@@ -12,7 +12,7 @@
int main () int main ()
{ {
dis display_user; dis display_user;
display_user.size_window = getMaxSize (); display_user.size_window = getMaxSize (SIZE_PLAY);
display_user.size_box = SIZE_PLAY; display_user.size_box = SIZE_PLAY;
initSDL (&display_user); initSDL (&display_user);