From 0c20e2ae20bb982435a52e555bf9c2a24ebd6350 Mon Sep 17 00:00:00 2001 From: cyjullien1 Date: Tue, 7 Jan 2025 19:20:22 +0100 Subject: [PATCH] flower seed --- image/button.png | 4 ++-- image/empty_grass.png | 3 +++ image/empty_mud.png | 3 +++ image/empty_mushroom.png | 3 +++ image/empty_mushroom2.png | 3 +++ image/wall2.png | 3 +++ image/wall3.png | 3 +++ include/display.h | 3 +++ maps/custom_1.txt | 20 -------------------- maps/custom_2.txt | 20 -------------------- script/display.c | 18 +++++++++++++++--- script/function.c | 2 ++ script/main.c | 13 +++++++++++-- 13 files changed, 51 insertions(+), 47 deletions(-) create mode 100644 image/empty_grass.png create mode 100644 image/empty_mud.png create mode 100644 image/empty_mushroom.png create mode 100644 image/empty_mushroom2.png create mode 100644 image/wall2.png create mode 100644 image/wall3.png delete mode 100644 maps/custom_1.txt delete mode 100644 maps/custom_2.txt diff --git a/image/button.png b/image/button.png index fc5e36d..e4c09b5 100644 --- a/image/button.png +++ b/image/button.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c05f6da28cf2954e5263b19e9c209afc612f7623ea72e3379a552516e096654 -size 4285 +oid sha256:46d7867f9d68759493489fc5c99afcb1944cb71caea178600875f6ed3b63220e +size 4505 diff --git a/image/empty_grass.png b/image/empty_grass.png new file mode 100644 index 0000000..f5a26f1 --- /dev/null +++ b/image/empty_grass.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4be3e71a60037483f83b86344b1c58625e35cf66f29ce4f88f888715ba94c9b6 +size 4519 diff --git a/image/empty_mud.png b/image/empty_mud.png new file mode 100644 index 0000000..c231930 --- /dev/null +++ b/image/empty_mud.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66f220b8afe641615d125d1840db8212c4afbf88f7e07d44dcb0bd4de2a3d748 +size 4493 diff --git a/image/empty_mushroom.png b/image/empty_mushroom.png new file mode 100644 index 0000000..61e00f2 --- /dev/null +++ b/image/empty_mushroom.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d587bb9fad13d3319f0a976ae13a76bafc2c6c77cbcf5faf37e9caa516e309f2 +size 4535 diff --git a/image/empty_mushroom2.png b/image/empty_mushroom2.png new file mode 100644 index 0000000..fffb9e1 --- /dev/null +++ b/image/empty_mushroom2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55b9a5e718214d8bc0ff6b13007176842bfa9791ef486ced6d0869fb09e91ecb +size 4505 diff --git a/image/wall2.png b/image/wall2.png new file mode 100644 index 0000000..1d9adc3 --- /dev/null +++ b/image/wall2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f96b611b601a76b369f26daae5fde75bf20d5e8c458b0550c682c762618e7c4d +size 4540 diff --git a/image/wall3.png b/image/wall3.png new file mode 100644 index 0000000..131ae21 --- /dev/null +++ b/image/wall3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95ed4577e9d665e52756228593256c6126e0a1b180dcedaec62389882ee6011e +size 4531 diff --git a/include/display.h b/include/display.h index a563167..011a441 100644 --- a/include/display.h +++ b/include/display.h @@ -5,6 +5,9 @@ #include #include + + +extern unsigned int seed; void screenDisplay (char **tab, int x, int y); int getMaxSize (dis display_user); void displayImage (SDL_Renderer *renderer, SDL_Texture *texture, vect pos, diff --git a/maps/custom_1.txt b/maps/custom_1.txt deleted file mode 100644 index 960f687..0000000 --- a/maps/custom_1.txt +++ /dev/null @@ -1,20 +0,0 @@ -#################### -# # -# # -# # -# # # -# # -# # # -# I # -# P # -# # -# C # -# # -# # # -# # -# # -# # -# # -# # -# # -#################### diff --git a/maps/custom_2.txt b/maps/custom_2.txt deleted file mode 100644 index 67d79f0..0000000 --- a/maps/custom_2.txt +++ /dev/null @@ -1,20 +0,0 @@ -#################### -# # -# # -# # -# # -# # -# # -# I # -# # -# P # -# C # -# I # -# I # -# # -# # -# # -# # -# # -# # -#################### diff --git a/script/display.c b/script/display.c index fcf1e1f..2dcd227 100644 --- a/script/display.c +++ b/script/display.c @@ -72,7 +72,7 @@ void screenDisplayGameSDL (char **tab,vect dim_tab, dis *display_user, vect *pla size = display_game / (fov*2); } - + SDL_Surface *img; SDL_Texture *texture; @@ -84,10 +84,22 @@ void screenDisplayGameSDL (char **tab,vect dim_tab, dis *display_user, vect *pla switch (tab[j][i]) { case EMPTY: - img = IMG_Load ("image/empty.png"); + srand(seed+i*15+j*13); + int rand_int = rand() % 45; + if(rand_int==26){img = IMG_Load ("image/empty_grass.png");} + else if(rand_int==27){img = IMG_Load ("image/empty_mud.png");} + else if(rand_int==28){img = IMG_Load ("image/empty_mushroom.png");} + else if(rand_int==29){img = IMG_Load ("image/empty_mushroom2.png");} + else{img = IMG_Load ("image/empty.png");} + break; case WALL: - img = IMG_Load ("image/wall.png"); + srand(seed+i*15+j*13); + int rand_int = rand() % 30; + if(rand_int==26){img = IMG_Load ("image/wall3.png");} + else if(rand_int==29){img = IMG_Load ("image/wall2.png");} + else{img = IMG_Load ("image/wall.png");} + break; case PLAYER: img = IMG_Load ("image/player.png"); diff --git a/script/function.c b/script/function.c index 273faf4..a648133 100644 --- a/script/function.c +++ b/script/function.c @@ -522,6 +522,7 @@ int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets, if (event.type == SDL_MOUSEBUTTONDOWN) { if (event.button.button == SDL_BUTTON_LEFT) { // Lorsque le clic gauche est effectué + playAudio(2); int click_x, click_y; SDL_GetMouseState(&click_x, &click_y); // Récupérer la position de la souris @@ -548,6 +549,7 @@ int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets, } if (event.button.button == SDL_BUTTON_RIGHT) { // Lorsque le clic gauche est effectué + playAudio(2); int click_x, click_y; SDL_GetMouseState(&click_x, &click_y); // Récupérer la position de la souris diff --git a/script/main.c b/script/main.c index 5170767..b399c06 100644 --- a/script/main.c +++ b/script/main.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -17,6 +18,8 @@ #define SIZE_PLAY 20 #define SIZE_MENU 200 +// Définir une seed globale +unsigned int seed; /** @@ -28,7 +31,6 @@ */ void playAudio(int sfx) { - // Charger un fichier son Mix_Chunk* sfx_win = Mix_LoadWAV("sfx/win.wav"); Mix_Chunk* sfx_lose = Mix_LoadWAV("sfx/lose.wav"); @@ -36,7 +38,6 @@ void playAudio(int sfx) Mix_Chunk* sfx_block_on_target = Mix_LoadWAV("sfx/blockontarget.wav"); Mix_Chunk* sfx_move = Mix_LoadWAV("sfx/move.mp3"); Mix_Chunk* sfx_move_block = Mix_LoadWAV("sfx/moveblock.wav"); - switch (sfx) { case 0: @@ -60,9 +61,17 @@ void playAudio(int sfx) } Mix_FreeChunk(sfx_win); + Mix_FreeChunk(sfx_lose); + Mix_FreeChunk(sfx_cant_move); + Mix_FreeChunk(sfx_block_on_target); + Mix_FreeChunk(sfx_move); + Mix_FreeChunk(sfx_move_block); } + int main () { + seed = (unsigned int)time(NULL); + dis display_user; display_user.size_menu = SIZE_MENU; display_user.size_box = SIZE_PLAY;