diff --git a/include/function.h b/include/function.h index 82c8fff..fde6b54 100644 --- a/include/function.h +++ b/include/function.h @@ -55,7 +55,6 @@ char *timeToText(time_t time); void nullScore(score *player_score); void winOrLoseLoop(dis *display_user,score *score_user, bool win); unsigned int scoreCalculator(score *score_user, bool win); -int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets, - int nbr_targets, dis *display_user,score *score_user, int num_fichier); +int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, dis *display_user,score *score_user, int num_fichier); int titleScreen (dis *display_user); #endif // FONCTION_H diff --git a/script/function.c b/script/function.c index 9f7b78f..e7750e4 100644 --- a/script/function.c +++ b/script/function.c @@ -452,26 +452,12 @@ int inGameLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets, * \param num_fichier Simplement le numéro de la map actuel. * \return renvoie -2 ce qui signifie l'editeur */ -int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets, - int nbr_targets, dis *display_user,score *score_user, int num_fichier) +int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, dis *display_user,score *score_user, int num_fichier) { vect direction = { 0, 0 }; int fov = -1; int indice_button = -1; - vect size_menu - = { display_user->size_menu - 10, display_user->size_window / 3 - 10 }; - vect coor_time - = { 40, display_user->size_window - display_user->size_menu + 50 }; - vect coor_move_player - = { display_user->size_window / 3 + 60, - display_user->size_window - display_user->size_menu + 50 }; - vect coor_move_box - = { (display_user->size_window / 3) * 2 + 10, - display_user->size_window - display_user->size_menu + 50 }; - - - char input; bool finish = false; SDL_Event event; @@ -611,10 +597,6 @@ int titleScreen (dis *display_user) SDL_Event event; - int indice_button = -1; - - vect size_menu - = { display_user->size_menu - 10, display_user->size_window / 3 - 10 }; vect coor_time = { 40, display_user->size_window - display_user->size_menu + 30 }; vect coor_move_player @@ -624,7 +606,7 @@ int titleScreen (dis *display_user) vect size_txt = { display_user->size_menu,display_user->size_window }; - snprintf (txt_button, 63," Aubin and Cyprien",indice_button); + snprintf (txt_button, 80," Aubin and Cyprien"); displayTextSDL (display_user, txt_button, coor_time,size_txt, 30); int tab[7] = {0,4,8,12,16,20,24}; @@ -657,7 +639,7 @@ int titleScreen (dis *display_user) if(tab[i]>60){ tab[i]=0; } } - tab[0]>30? snprintf(txt_button, 63," press enter ",indice_button):snprintf(txt_button, 63," ",indice_button); + tab[0]>30? snprintf(txt_button, 63," press enter "):snprintf(txt_button, 63," "); displayTextSDL (display_user, txt_button, coor_move_player,size_txt, 20); @@ -668,19 +650,19 @@ int titleScreen (dis *display_user) vect b = { display_user->size_window /2-200+240, 50 + sinus[4] * 2 }; vect a = { display_user->size_window /2-200+300, 50 + sinus[5] * 2 }; vect n = { display_user->size_window /2-200+360, 50 + sinus[6] * 2 }; - snprintf (txt_button, 63,"S",indice_button); + snprintf (txt_button, 63,"S"); displayTextSDL (display_user, txt_button, s,size_txt, 50); - snprintf (txt_button, 63,"O",indice_button); + snprintf (txt_button, 63,"O"); displayTextSDL (display_user, txt_button, o,size_txt, 50); - snprintf (txt_button, 63,"K",indice_button); + snprintf (txt_button, 63,"K"); displayTextSDL (display_user, txt_button, k,size_txt, 50); - snprintf (txt_button, 63,"O",indice_button); + snprintf (txt_button, 63,"O"); displayTextSDL (display_user, txt_button, oo,size_txt, 50); - snprintf (txt_button, 63,"B",indice_button); + snprintf (txt_button, 63,"B"); displayTextSDL (display_user, txt_button, b,size_txt, 50); - snprintf (txt_button, 63,"A",indice_button); + snprintf (txt_button, 63,"A"); displayTextSDL (display_user, txt_button, a,size_txt, 50); - snprintf (txt_button, 63,"N",indice_button); + snprintf (txt_button, 63,"N"); displayTextSDL (display_user, txt_button, n,size_txt, 50); SDL_Delay (16); @@ -950,10 +932,7 @@ unsigned int scoreCalculator(score *score_user, bool win) { result /= 50; } - if(result <0) - { - result=0; - } + return result; } diff --git a/script/main.c b/script/main.c index 0f757c4..42337f8 100644 --- a/script/main.c +++ b/script/main.c @@ -86,7 +86,7 @@ int main () { Mix_PlayMusic(music_editor, -1); backgroundDisplay(&display_user,2); - output = inEditorLoop(tab2d, &dim, playerPos, targets, nbr_targets, &display_user,&score_user ,num_fichier); + output = inEditorLoop(tab2d, &dim, playerPos, &display_user,&score_user ,num_fichier); } else if(output == -3) {