diff --git a/images/IMG_GARAGE.png b/images/IMG_GARAGE.png deleted file mode 100644 index 98bf54a..0000000 Binary files a/images/IMG_GARAGE.png and /dev/null differ diff --git a/images/Mort.png b/images/Mort.png deleted file mode 100644 index 1f13a3c..0000000 Binary files a/images/Mort.png and /dev/null differ diff --git a/images/Mort_Essence.png b/images/Mort_Essence.png deleted file mode 100644 index bab3f86..0000000 Binary files a/images/Mort_Essence.png and /dev/null differ diff --git a/images/Mort_Percut.png b/images/Mort_Percut.png deleted file mode 100644 index cf815d0..0000000 Binary files a/images/Mort_Percut.png and /dev/null differ diff --git a/images/Mort_Vie.png b/images/Mort_Vie.png deleted file mode 100644 index 4a49a51..0000000 Binary files a/images/Mort_Vie.png and /dev/null differ diff --git a/images/Thumbs.db b/images/Thumbs.db deleted file mode 100644 index cded5ff..0000000 Binary files a/images/Thumbs.db and /dev/null differ diff --git a/images/bande_droite.png b/images/bande_droite.png deleted file mode 100644 index 10d2bfd..0000000 Binary files a/images/bande_droite.png and /dev/null differ diff --git a/images/boost.png b/images/boost.png deleted file mode 100644 index 491ef15..0000000 Binary files a/images/boost.png and /dev/null differ diff --git a/images/essence.png b/images/essence.png deleted file mode 100644 index 2ad8b52..0000000 Binary files a/images/essence.png and /dev/null differ diff --git a/images/f1.png b/images/f1.png deleted file mode 100644 index 21d8a76..0000000 Binary files a/images/f1.png and /dev/null differ diff --git a/images/formel1.png b/images/formel1.png deleted file mode 100644 index 5433d36..0000000 Binary files a/images/formel1.png and /dev/null differ diff --git a/images/menu.png b/images/menu.png deleted file mode 100644 index c9e58a7..0000000 Binary files a/images/menu.png and /dev/null differ diff --git a/images/obstacle.bmp b/images/obstacle.bmp deleted file mode 100644 index 8ce2ff6..0000000 Binary files a/images/obstacle.bmp and /dev/null differ diff --git a/images/piece_1.png b/images/piece_1.png deleted file mode 100644 index f31f34c..0000000 Binary files a/images/piece_1.png and /dev/null differ diff --git a/images/piece_2.png b/images/piece_2.png deleted file mode 100644 index 58f0d52..0000000 Binary files a/images/piece_2.png and /dev/null differ diff --git a/images/speed_down.png b/images/speed_down.png deleted file mode 100644 index 682954c..0000000 Binary files a/images/speed_down.png and /dev/null differ diff --git a/images/speed_up.png b/images/speed_up.png deleted file mode 100644 index 0a9ca2e..0000000 Binary files a/images/speed_up.png and /dev/null differ diff --git a/images/stop.png b/images/stop.png deleted file mode 100644 index f4436dd..0000000 Binary files a/images/stop.png and /dev/null differ diff --git a/images/vide.png b/images/vide.png deleted file mode 100644 index 798abc2..0000000 Binary files a/images/vide.png and /dev/null differ diff --git a/images/vie.png b/images/vie.png deleted file mode 100644 index f5d6125..0000000 Binary files a/images/vie.png and /dev/null differ diff --git a/include/voiture.h b/include/voiture.h index 7ccc23d..cc544ed 100644 --- a/include/voiture.h +++ b/include/voiture.h @@ -3,6 +3,7 @@ unsigned int key; char decal=1; + char anim=0; char obstacles[100]; // permet d'avoir de l'aléatoire pondéré pour les obstacles/bonus diff --git a/lib/libfx.a b/lib/libfx.a deleted file mode 100644 index 5ef92aa..0000000 Binary files a/lib/libfx.a and /dev/null differ diff --git a/src/voiture.c b/src/voiture.c index 2fcc3a8..8d8c4df 100644 --- a/src/voiture.c +++ b/src/voiture.c @@ -10,34 +10,47 @@ Obstacles obstacle[4]; void new_frame() { +extern Image img_formel1; +extern Image img_obstacle; - extern Image img_formel1; - extern Image img_obstacle; +int i,j; - dclear(); +dclear(); +// dessin des lignes +for(i=1;i<4;i++) + { + for(j=anim;j<128;j+=4) + { + dline(2*j, i*11+10, 2*j+3, i*11+10, Color_Black); + } + } - dimage(19, 11*decal, &img_formel1); - dimage(1, 1, &img_obstacle); +anim=(anim==0 ? 1 : 0); - dupdate(); +dline(1, 10, 128, 10, Color_Black); +dline(1, 54, 128, 54, Color_Black); +dimage(19, 11*decal, &img_formel1); +dimage_part(1, 1, &img_obstacle, 10*7, 0, 10, 10); + +dupdate(); } int Jeu() { - while(1) +while(1) { - timer_start(TIMER_USER, 25, Clock_Hz, new_frame, 0); + timer_start(TIMER_USER, 15, Clock_Hz, new_frame, 0); while(1) { key = getkey(); switch(key) { - case KEY_UP : decal=(decal<=1 ? 1 : decal-1); break; - case KEY_DOWN : decal=(decal>=4 ? 4 : decal+1); break; - case KEY_EXIT : timer_stop(TIMER_USER); return 1; + case KEY_UP : decal=(decal<=1 ? 1 : decal-1); break; + case KEY_DOWN : decal=(decal>=4 ? 4 : decal+1); break; + case KEY_EXIT : timer_stop(TIMER_USER); return 1; } } } @@ -46,37 +59,37 @@ int Jeu() int main(void) { - short menu=0; +short menu=0; - extern Image img_menu; +extern Image img_menu; - while(1) +while(1) + { + dclear(); + + dimage(0, 0, &img_menu); + + dreverse_area(62+16*menu,23+21*menu,108+16*menu,39+21*menu); + + dupdate(); + + key=getkey(); + + switch(key) { - dclear(); + case KEY_UP : case KEY_DOWN : menu=!menu; break; + case KEY_EXE : - dimage(0, 0, &img_menu); - - dreverse_area(62+16*menu,23+21*menu,108+16*menu,39+21*menu); - - dupdate(); - - key=getkey(); - - switch(key) + switch(menu) { - case KEY_UP : case KEY_DOWN : menu=!menu; break; - case KEY_EXE : - - switch(menu) - { - case 0 : Jeu(); break; - case 1 : /*garage();*/ break; - } - break; - case KEY_EXIT : return 1; + case 0 : Jeu(); break; + case 1 : /*garage();*/ break; } - } + break; + case KEY_EXIT : return 1; + } + } } /*void garage(void) @@ -95,32 +108,32 @@ Bdisp_AllClr_DDVRAM(); ML_bmp_or(IMG_GARAGE, 0, 0, 128, 64); - for(i=0;i",0); sprintf(buffer,"argent %d prix %d" , 500, 500); PrintMini(11,17,buffer,0); - GetKey(&key); +GetKey(&key); - switch(key) - { - case KEY_CTRL_UP : case KEY_CTRL_DOWN : choix=(choix== 1 ? 0 : 1); break; - case KEY_CTRL_EXE : choice[choix]++; break; - case KEY_CTRL_EXIT : return ; - } - } +switch(key) +{ +case KEY_CTRL_UP : case KEY_CTRL_DOWN : choix=(choix== 1 ? 0 : 1); break; +case KEY_CTRL_EXE : choice[choix]++; break; +case KEY_CTRL_EXIT : return ; +} +} }*/ /*int Jeu() @@ -144,95 +157,95 @@ short essence=100; init_obstacle(); while(1) - { - dclear(); - speed=(score%5==0 ? speed+1: speed); - draw_lines(i); +{ +dclear(); +speed=(score%5==0 ? speed+1: speed); +draw_lines(i); - dimage(decalx_car-19, 11*decal, &img_formel1); +dimage(decalx_car-19, 11*decal, &img_formel1); for(j=0;j<4;j++) - { - obstacle[j].coordx-=2+speed/25; +{ +obstacle[j].coordx-=2+speed/25; // ML_bmp_or(*(OBSTACLES+obstacle[j].num_obst), obstacle[j].coordx, 11*(j+1), 10, 10); - dimage_part(obstacle[j].coordx, 11*(j+1), &img_obstacle, 10*obstacle[j].num_obst, 10*obstacle[j].num_obst +10, 10, 10); +dimage_part(obstacle[j].coordx, 11*(j+1), &img_obstacle, 10*obstacle[j].num_obst, 10*obstacle[j].num_obst +10, 10, 10); - if(obstacle[j].coordx<0) - { - obstacle[j].num_obst=obstacles[rand()%100]; - obstacle[j].coordx=128+40*j; - } - if(obstacle[0].num_obst==1 && obstacle[1].num_obst==1 && obstacle[2].num_obst==1 && obstacle[3].num_obst==1) obstacle[0].num_obst=0; - } +if(obstacle[j].coordx<0) +{ +obstacle[j].num_obst=obstacles[rand()%100]; +obstacle[j].coordx=128+40*j; +} +if(obstacle[0].num_obst==1 && obstacle[1].num_obst==1 && obstacle[2].num_obst==1 && obstacle[3].num_obst==1) obstacle[0].num_obst=0; +} - if(obstacle[decal-1].coordxdecalx_car-20 && obstacle[decal-1].num_obst>0) - { - switch(obstacle[decal-1].num_obst) - { - case 1 : if(vie==1) - { - mort(score, 0); return 1; - } - else vie--; break; - case 2 : speed+=25; break; - case 3 : speed-=25; break; - case 4 : vie++; break; - // case 5 : decalx_car=74; obstacle[decal-1].num_obst=0;break; - case 6 : essence=max; break; - case 7 : money++; break; - case 8 : money+=2; break; - } +if(obstacle[decal-1].coordxdecalx_car-20 && obstacle[decal-1].num_obst>0) +{ +switch(obstacle[decal-1].num_obst) +{ +case 1 : if(vie==1) +{ +mort(score, 0); return 1; +} +else vie--; break; +case 2 : speed+=25; break; +case 3 : speed-=25; break; +case 4 : vie++; break; +// case 5 : decalx_car=74; obstacle[decal-1].num_obst=0;break; +case 6 : essence=max; break; +case 7 : money++; break; +case 8 : money+=2; break; +} - // if(decalx_car==74 && (int)(RTC_getTicks()-start_time)>192) - // { - // decalx_car=24; - // } +// if(decalx_car==74 && (int)(RTC_getTicks()-start_time)>192) +// { +// decalx_car=24; +// } - obstacle[decal-1].num_obst=0; - } - if(essence<=0) - { - mort(score, 1); - return 1; - } - essence=(i%26==0 ? essence-10 : essence); //chaque seconde 10 d'essence partent +obstacle[decal-1].num_obst=0; +} +if(essence<=0) +{ +mort(score, 1); +return 1; +} +essence=(i%26==0 ? essence-10 : essence); //chaque seconde 10 d'essence partent - //dupdate(); - dprint(1, 1, "metre : %d vie : %d", score, vie); +//dupdate(); +dprint(1, 1, "metre : %d vie : %d", score, vie); - dprint(1,56,"essence %d/%d Argent %d ", essence, max, money); +dprint(1,56,"essence %d/%d Argent %d ", essence, max, money); - timer_start(TIMER_USER, 80, Clock_Hz, vide, 0); +timer_start(TIMER_USER, 80, Clock_Hz, vide, 0); - //while(1) { +//while(1) { - if(key==KEY_UP && appuie==0) // KEY_CTRL_UP - { - decal=(decal<=1 ? 1 : decal-1); - appuie=1; - break; - } - else if(key==KEY_DOWN && appuie==0) //KEY_CTRL_DOWN - { - decal=(decal>=4 ? 4 : decal+1); - appuie=1; - break; - } - else if (key==KEY_NONE) // permet de ne pas rester appuiyer sur la touche (simule le Getkey()) - { - appuie=0; - break; - } - if(key==KEY_EXIT) //KEY_CTRL_EXIT - { - timer_stop(TIMER_USER); - return 1; - } - //} +if(key==KEY_UP && appuie==0) // KEY_CTRL_UP +{ +decal=(decal<=1 ? 1 : decal-1); +appuie=1; +break; +} +else if(key==KEY_DOWN && appuie==0) //KEY_CTRL_DOWN +{ +decal=(decal>=4 ? 4 : decal+1); +appuie=1; +break; +} +else if (key==KEY_NONE) // permet de ne pas rester appuiyer sur la touche (simule le Getkey()) +{ +appuie=0; +break; +} +if(key==KEY_EXIT) //KEY_CTRL_EXIT +{ +timer_stop(TIMER_USER); +return 1; +} +//} - i+=3; - score=(i%4==0 ? score+2: score); - } +i+=3; +score=(i%4==0 ? score+2: score); +} return 1; }*/ @@ -243,15 +256,13 @@ int key=0; dclear(); while(key == KEY_NONE) - { - + { dtext(10,10,"Vous etes mort"); + key = getkey(); + } - key = getkey(); - } - -return; + return; } void init_obstacle() @@ -260,37 +271,36 @@ int i=0,j=0; char proba[10]={0,30,70,75,80,83,86,95,98,100}; while(j<9) -{ -for(i=proba[j];i