optimisation
This commit is contained in:
@@ -57,5 +57,5 @@ void winOrLoseLoop(dis *display_user,score *score_user, bool win);
|
|||||||
unsigned int scoreCalculator(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 inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets,
|
||||||
int nbr_targets, dis *display_user,score *score_user, int num_fichier);
|
int nbr_targets, dis *display_user,score *score_user, int num_fichier);
|
||||||
int titleScreen (char **tab2d, vect *dim_tab, dis *display_user);
|
int titleScreen (dis *display_user);
|
||||||
#endif // FONCTION_H
|
#endif // FONCTION_H
|
||||||
|
|||||||
@@ -297,7 +297,6 @@ void backgroundDisplay(dis *display_user,int bg)
|
|||||||
|
|
||||||
SDL_RenderPresent (display_user->renderer);
|
SDL_RenderPresent (display_user->renderer);
|
||||||
|
|
||||||
SDL_Event event;
|
|
||||||
SDL_Delay(100);
|
SDL_Delay(100);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -625,12 +625,11 @@ int inEditorLoop (char **tab2d, vect *dim_tab, vect *playerPos, vect *targets,
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* \brief La fonction permet de faire la boucle de l'éditeur.
|
* \brief La fonction permet d' afficher le title screen.
|
||||||
* \param tab2d Le tableau 2d carre.
|
* \param display_user Tout les information SDL pour afficher le jeu.
|
||||||
|
* \return renvoie -3 ce qui signifie le title screen
|
||||||
* \return renvoie -2 ce qui signifie l'editeur
|
|
||||||
*/
|
*/
|
||||||
int titleScreen (char **tab2d, vect *dim_tab, dis *display_user)
|
int titleScreen (dis *display_user)
|
||||||
{
|
{
|
||||||
char input;
|
char input;
|
||||||
bool finish = false;
|
bool finish = false;
|
||||||
@@ -653,20 +652,8 @@ int titleScreen (char **tab2d, vect *dim_tab, dis *display_user)
|
|||||||
snprintf (txt_button, 63," Aubin and Cyprien",indice_button);
|
snprintf (txt_button, 63," Aubin and Cyprien",indice_button);
|
||||||
displayTextSDL (display_user, txt_button, coor_time,size_txt, 30);
|
displayTextSDL (display_user, txt_button, coor_time,size_txt, 30);
|
||||||
|
|
||||||
int tmp =0;
|
int tab[7] = {0,4,8,12,16,20,24};
|
||||||
int tmp2 =4;
|
int sinus[7] = {10,14,18,22,26,30,34};
|
||||||
int tmp3 =8;
|
|
||||||
int tmp4 =12;
|
|
||||||
int tmp5 =16;
|
|
||||||
int tmp6 =20;
|
|
||||||
int tmp7 =24;
|
|
||||||
int sinus =10;
|
|
||||||
int sinus2 =14;
|
|
||||||
int sinus3 =18;
|
|
||||||
int sinus4 =22;
|
|
||||||
int sinus5 =26;
|
|
||||||
int sinus6 =30;
|
|
||||||
int sinus7 =34;
|
|
||||||
|
|
||||||
while (!finish)
|
while (!finish)
|
||||||
{
|
{
|
||||||
@@ -688,41 +675,24 @@ int titleScreen (char **tab2d, vect *dim_tab, dis *display_user)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tmp++;
|
for(int i=0;i<7;i++)
|
||||||
tmp2++;
|
{
|
||||||
tmp3++;
|
tab[i]++;
|
||||||
tmp4++;
|
if (tab[i] >30){sinus[i]--; } else{sinus[i]++;}
|
||||||
tmp5++;
|
if(tab[i]>60){ tab[i]=0; }
|
||||||
tmp6++;
|
|
||||||
tmp7++;
|
|
||||||
if (tmp2 >30){sinus2--; } else{sinus2++;}
|
|
||||||
if (tmp3 >30){sinus3--; } else{sinus3++;}
|
|
||||||
if (tmp4 >30){sinus4--; } else{sinus4++;}
|
|
||||||
if (tmp5 >30){sinus5--; } else{sinus5++;}
|
|
||||||
if (tmp6 >30){sinus6--; } else{sinus6++;}
|
|
||||||
if (tmp7 >30){sinus7--; } else{sinus7++;}
|
|
||||||
if (tmp >30) { snprintf (txt_button, 63," press enter ",indice_button);sinus--;}
|
|
||||||
else{ sinus++; snprintf (txt_button, 63," ",indice_button);}
|
|
||||||
|
|
||||||
|
}
|
||||||
|
tab[0]>30? snprintf(txt_button, 63," press enter ",indice_button):snprintf(txt_button, 63," ",indice_button);
|
||||||
|
|
||||||
|
displayTextSDL (display_user, txt_button, coor_move_player,size_txt, 20);
|
||||||
|
|
||||||
if(tmp>60){ tmp=0; }
|
vect s = { display_user->size_window /2-200, 50 + sinus[0] * 2 };
|
||||||
if(tmp2>60){ tmp2=0; }
|
vect o = { display_user->size_window /2-200+60, 50 + sinus[1] * 2 };
|
||||||
if(tmp3>60){ tmp3=0; }
|
vect k = { display_user->size_window /2-200+120, 50 + sinus[2] * 2 };
|
||||||
if(tmp4>60){ tmp4=0; }
|
vect oo = { display_user->size_window/2-200+180, 50 + sinus[3] * 2 };
|
||||||
if(tmp5>60){ tmp5=0; }
|
vect b = { display_user->size_window /2-200+240, 50 + sinus[4] * 2 };
|
||||||
if(tmp6>60){ tmp6=0; }
|
vect a = { display_user->size_window /2-200+300, 50 + sinus[5] * 2 };
|
||||||
if(tmp7>60){ tmp7=0; }
|
vect n = { display_user->size_window /2-200+360, 50 + sinus[6] * 2 };
|
||||||
|
|
||||||
displayTextSDL (display_user, txt_button, coor_move_player,size_txt, 20);
|
|
||||||
|
|
||||||
vect s = { display_user->size_window /2-200, 50 + sinus * 2 };
|
|
||||||
vect o = { display_user->size_window /2-200+60, 50 + sinus2 * 2 };
|
|
||||||
vect k = { display_user->size_window /2-200+120, 50 + sinus3 * 2 };
|
|
||||||
vect oo = { display_user->size_window/2-200+180, 50 + sinus4 * 2 };
|
|
||||||
vect b = { display_user->size_window /2-200+240, 50 + sinus5 * 2 };
|
|
||||||
vect a = { display_user->size_window /2-200+300, 50 + sinus6 * 2 };
|
|
||||||
vect n = { display_user->size_window /2-200+360, 50 + sinus7 * 2 };
|
|
||||||
snprintf (txt_button, 63,"S",indice_button);
|
snprintf (txt_button, 63,"S",indice_button);
|
||||||
displayTextSDL (display_user, txt_button, s,size_txt, 50);
|
displayTextSDL (display_user, txt_button, s,size_txt, 50);
|
||||||
snprintf (txt_button, 63,"O",indice_button);
|
snprintf (txt_button, 63,"O",indice_button);
|
||||||
|
|||||||
@@ -138,8 +138,8 @@ int main ()
|
|||||||
else if(output == -3)
|
else if(output == -3)
|
||||||
{
|
{
|
||||||
Mix_PlayMusic(music_menu, -1);
|
Mix_PlayMusic(music_menu, -1);
|
||||||
backgroundDisplay(&display_user,0);
|
backgroundDisplay(&display_user,3);
|
||||||
output = titleScreen(tab2d, &dim, &display_user);
|
output = titleScreen(&display_user);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user