stiti/SAE11_2023
stiti/SAE11_2023
1
6
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://dwarves.iut-fbleau.fr/gitiut/stiti/SAE11_2023

Browse Source
This commit is contained in:
Marco ORFAO 2023-12-01 21:43:57 +01:00
commit 0808392a9b
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/grille.c
View File

@ -9,6 +9,7 @@ int* creer_grille(void){
} }
void creer_grille_graph(){ void creer_grille_graph(){
<<<<<<< HEAD
int x_grille=0,y_grille=0,x,y; int x_grille=0,y_grille=0,x,y;
ChoisirCouleurDessin(CouleurParComposante(0,0,0)); ChoisirCouleurDessin(CouleurParComposante(0,0,0));
DessinerRectangle(x_grille,y_grille,1200,1000); DessinerRectangle(x_grille,y_grille,1200,1000);
@ -18,6 +19,19 @@ void creer_grille_graph(){
} }
for(y=y_grille;y<800;y=y+15){ for(y=y_grille;y<800;y=y+15){
DessinerSegment(x_grille,y,1100,y); DessinerSegment(x_grille,y,1100,y);
=======
int x=200,y=200;
ChoisirCouleurDessin(CouleurParComposante(0,0,0));
DessinerRectangle(x,y,1200,1000);
DessinerRectangle(x,y,900,600);
for(x=200;x<1100;x=x+15){
DessinerSegment(x,y,x,800);
}
x=200;
y=200;
for(y=200;y<800;y=y+15){
DessinerSegment(x,y,1100,y);
>>>>>>> 03cdfc71722afd1d8631e3ed432af6d031cd9b7e
} }
} }

2
src/menu.c
View File

@ -52,7 +52,7 @@ void afficherMenuModesDeJeu(){
} }
void afficherMenuCheatCode(){ void afficherMenuCheatCode(){
ChargerImageFond("menu_cheat_code.png") ChargerImageFond("menu_cheat_code.png");
} }
int attendreChoixModesDeJeu(){ int attendreChoixModesDeJeu(){