maj
This commit is contained in:
@@ -6,6 +6,11 @@
|
||||
#include <stdlib.h>
|
||||
#include <graph.h>
|
||||
#include "plateau_init.h"
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
|
||||
>>>>>>> 2d7d16101fad9327b5f27c54983bc5cff31508a3
|
||||
|
||||
|
||||
|
||||
@@ -13,7 +18,9 @@ int start (void) {
|
||||
|
||||
couleur green, grey, yellow, red, black, white;
|
||||
|
||||
int** tableau = plateau_init();
|
||||
int* plateau_tete_queue = plateau_init();
|
||||
|
||||
int** tableau = plateau_tete_queue[0];
|
||||
|
||||
int i, j;
|
||||
|
||||
@@ -26,6 +33,7 @@ int start (void) {
|
||||
|
||||
int score=0;
|
||||
|
||||
<<<<<<< HEAD
|
||||
char* num_score = "score : 00000";
|
||||
|
||||
|
||||
@@ -35,6 +43,8 @@ int start (void) {
|
||||
|
||||
CreerFenetre(10,10,1450,840);
|
||||
|
||||
=======
|
||||
>>>>>>> 2d7d16101fad9327b5f27c54983bc5cff31508a3
|
||||
|
||||
/* remplisage du fond d'écran */
|
||||
|
||||
@@ -95,7 +105,7 @@ int start (void) {
|
||||
/* remplissage du plateau de jeux avec les couleur adéquate */
|
||||
|
||||
|
||||
for (i = 0; i < LIGNES; i++) {
|
||||
for (i = 0; i < LIGNES; i++) {
|
||||
for (j = 0; j < COLONNES; j++) {
|
||||
|
||||
if ( tableau[i][j] == 0) {
|
||||
@@ -105,7 +115,7 @@ int start (void) {
|
||||
RemplirRectangle(20*(j+1),20*(i+1),20,20);
|
||||
}
|
||||
|
||||
if ( tableau[i][j] == 1 || tableau[i][j] == -1 || tableau[i][j] == -2) {
|
||||
if ( tableau[i][j] == 1) {
|
||||
|
||||
yellow = CouleurParComposante(255,255,0);
|
||||
ChoisirCouleurDessin(yellow);
|
||||
@@ -136,13 +146,6 @@ int start (void) {
|
||||
free(tableau);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Touche();
|
||||
FermerGraphique();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user