diff --git a/snake/Makefile b/snake/Makefile index 66bf988..c0a9d4a 100755 --- a/snake/Makefile +++ b/snake/Makefile @@ -8,6 +8,7 @@ but : run OFILES = plateau_init.o \ fenetre.o \ + time.o \ main.o CC = gcc @@ -20,7 +21,10 @@ plateau_init.o : plateau_init.h fenetre.o : fenetre.h plateau_init.h -main.o : main.c fenetre.h +time.o : time.h + +main.o : main.c fenetre.h time.h + ### COMMANDES ### diff --git a/snake/deplacement.c b/snake/deplacement.c index 7ec7cd0..8f8d690 100644 --- a/snake/deplacement.c +++ b/snake/deplacement.c @@ -72,7 +72,7 @@ int** deplacement(int* p, int timer) { if (TouchEnAttente() == 1) { - if (Touche() == "XK_Left") { + if (Touche() == XK_Left) { p[tete[0]][tete[1]] = 0; @@ -84,7 +84,7 @@ int** deplacement(int* p, int timer) { } - if (Touch() == "XK_Right") { + if (Touch() == XK_Right) { p[tete[0]][tete[1]] = 0; @@ -96,7 +96,7 @@ int** deplacement(int* p, int timer) { } - if (Touch() == "XK_Up") { + if (Touch() == XK_Up") { p[tete[0]][tete[1]] = 0; diff --git a/snake/main.c b/snake/main.c index 97eb166..0b601af 100644 --- a/snake/main.c +++ b/snake/main.c @@ -1,8 +1,9 @@ #include #include +#include #include "fenetre.h" #include "plateau_init.h" -#include +#include "time.h" @@ -18,9 +19,6 @@ int main(void) { start(); - - - Touche(); diff --git a/snake/time.c b/snake/time.c index 6162421..4d4edc4 100644 --- a/snake/time.c +++ b/snake/time.c @@ -11,15 +11,21 @@ int main(void) { unsigned long suivant; - unsigned int secondes = 0, minutes = 0; + /* int* time = NULL; */ + + /* time = malloc( sizeof(short int)); + + time[0] = 0; + time[1] = 0; */ + suivant = Microsecondes() + CYCLE; - printf("%d : %d\n", minutes, secondes); + /*printf("%d : %d\n", &time[0],&time[1]);*/ while (1) { - if (Microsecondes() > suivant) { + if (Microsecondes() > suivant) { @@ -28,17 +34,16 @@ int main(void) { suivant = Microsecondes()+CYCLE; - secondes++; + /*time[1]++; - if ( secondes == 60) { + if ( time[1] == 60) { - secondes = 0; + time[1] = 0; - minutes ++; + time[0] ++; - } - - printf("%d : %d\n", minutes,secondes); + }*/ + printf("%lu", Microsecondes()); @@ -47,8 +52,19 @@ int main(void) { } + + /* if ( ToucheEnAttente() == 1 ) { + + if (Touche() == XK_space) { + + break; + + } + }*/ + - } + } return EXIT_SUCCESS; + } diff --git a/snake/time.h b/snake/time.h new file mode 100644 index 0000000..612f1b4 --- /dev/null +++ b/snake/time.h @@ -0,0 +1,10 @@ + + + +#ifndef TIME_H +#define TIME_H + +void time(void); + + +#endif /* TIME_H */