diff --git a/image/button_c.png b/image/button_c.png new file mode 100644 index 0000000..8db67e5 --- /dev/null +++ b/image/button_c.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc8a6b5e3a557e41ce77eac206aa9162e10a89bb5576cd5e88329ccff13fd28a +size 4726 diff --git a/image/wall2.png b/image/wall2.png index 1d9adc3..ab8dd56 100644 --- a/image/wall2.png +++ b/image/wall2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f96b611b601a76b369f26daae5fde75bf20d5e8c458b0550c682c762618e7c4d -size 4540 +oid sha256:c1b82704a46266c1586b6d012695567f048441259053dda3cacdcc853ec0de77 +size 4544 diff --git a/image/wall3.png b/image/wall3.png index 131ae21..9472ec7 100644 --- a/image/wall3.png +++ b/image/wall3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95ed4577e9d665e52756228593256c6126e0a1b180dcedaec62389882ee6011e -size 4531 +oid sha256:ebf13eb08c7ace6bd59712916a109856fe62c3679fa9ea2625d231ddbef1570e +size 4777 diff --git a/include/function.h b/include/function.h index 4f4371f..3120e5d 100644 --- a/include/function.h +++ b/include/function.h @@ -17,6 +17,7 @@ #define PLAYER_ON_TARGET 6 #define BUTTON 7 #define PLAYER_ON_BUTTON 8 +#define BUTTON_CUSTOM 9 typedef struct Vecteur { diff --git a/script/display.c b/script/display.c index 2dcd227..bf86a73 100644 --- a/script/display.c +++ b/script/display.c @@ -95,9 +95,9 @@ void screenDisplayGameSDL (char **tab,vect dim_tab, dis *display_user, vect *pla break; case WALL: 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");} + rand_int = rand() % 6; + if(rand_int==5){img = IMG_Load ("image/wall3.png");} + else if(rand_int==4){img = IMG_Load ("image/wall2.png");} else{img = IMG_Load ("image/wall.png");} break; @@ -122,6 +122,9 @@ void screenDisplayGameSDL (char **tab,vect dim_tab, dis *display_user, vect *pla case PLAYER_ON_BUTTON: img = IMG_Load("image/player_on_button.png"); break; + case BUTTON_CUSTOM: + img = IMG_Load("image/button_c.png"); + break; } texture diff --git a/script/function.c b/script/function.c index a648133..6242f02 100644 --- a/script/function.c +++ b/script/function.c @@ -117,7 +117,7 @@ char canIGoDirection (char valueOfNCase, char valueOfNPlusOneCase) // move the box but player on a target return 5; } - if (valueOfNCase == BUTTON) + if (valueOfNCase == BUTTON || valueOfNCase == BUTTON_CUSTOM ) { return 7; } @@ -602,7 +602,7 @@ int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets, direction.y = 0; break; case SDL_SCANCODE_RETURN: - if (tab2d[playerPos->x][playerPos->y] == PLAYER_ON_BUTTON) + if (tab2d[playerPos->x][playerPos->y] == PLAYER_ON_BUTTON ) return indice_button; break; default: diff --git a/script/read.c b/script/read.c index 37fd119..a89ad17 100644 --- a/script/read.c +++ b/script/read.c @@ -114,7 +114,7 @@ char ** generatorMenu(char *name_directory, vect *size, vect *pos_player) menu[4][i] = EMPTY; if (i == size->y-2) { - menu[4][i] = BUTTON; + menu[4][i] = BUTTON_CUSTOM; } } @@ -125,10 +125,14 @@ char ** generatorMenu(char *name_directory, vect *size, vect *pos_player) for (k = 1 ; k < 4; ++k) { - if (k == 1) + if (k == 1 && j <16) { menu[k][j] = BUTTON; } + else if(k == 1) + { + menu[k][j] = BUTTON_CUSTOM; + } else { menu[k][j] = EMPTY;