ajout nextfire et score du joueur

travail_de_groupe/chef_oeuvre/map.txt

@@ -5,9 +5,9 @@
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 2 2 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 2 2 0 0 0 0 0 0 1 0 0 0
+0 0 0 0 0 0 0 0 2 2 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

travail_de_groupe/chef_oeuvre/markov.txt

-90 10 0 0 0
-0 80 20 0 0
-0 10 80 10 0
+50 50 0 0 0
+0 60 40 0 0
+0 10 70 20 0
 0 0 10 50 40
-0 0 0 50 50
+0 0 0 100 0
\ No newline at end of file

travail_de_groupe/chef_oeuvre/src/fire.h

@@ -13,7 +13,7 @@
 #define STRONG 3
 #define SPREAD 4
 
-#define UPDATETIME 10
+#define UPDATETIME 5
 
 
 typedef struct fire{

travail_de_groupe/chef_oeuvre/src/player.c

@@ -16,6 +16,7 @@ void initPlayer(){
     player.currentHP = player.HPMax;
     player.invisible = 0;
     player.invisibleTime = 5;
+    player.score = 0;
 }
 
 int giveCaseBelowPosition(int x, int y){
@@ -189,6 +190,7 @@ void pourWater(int x, int y){
         //downgrade the cliqued fire
         if(onFire == 1 && selectStateHover() == 1){ 
             fireList = deleteFire (fireList, x, y); 
+            player.score+=1;
         }
         player.currentWater = player.currentWater - 1;
     }

travail_de_groupe/chef_oeuvre/src/player.h

@@ -24,6 +24,7 @@ typedef struct player{
     int invisible;
     int invisibleTime;
     int timeLastHitFire;
+    int score;
 } player_t;
 
 extern player_t player;

travail_de_groupe/chef_oeuvre/src/render.c

 #include "render.h"
 
-int score = 100;
 float timer = 0;
 
 SDL_Window *window;
@@ -76,6 +75,9 @@ SDL_Texture * heartTexture;
 SDL_Surface * scoreSurface;
 SDL_Texture * scoreTexture;
 
+SDL_Surface * nextFireSurface;
+SDL_Texture * nextFireTexture;
+
 void createWindow(){
 
     if (SDL_Init(SDL_INIT_VIDEO) != 0){
@@ -297,7 +299,7 @@ void drawScore(){
     SDL_RenderCopy(renderer, scoreTexture, NULL, &rect);
     rect.y += rect.h;
     char str[10];
-    //sprintf(str, "%d", score);
+    sprintf(str, "%d", player.score);
     SDL_Color textColor = {237,222,17};
     SDL_Surface * surface = TTF_RenderText_Solid(robotoFont, str, textColor);
     SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, surface);
@@ -310,7 +312,7 @@ void drawTime(){
     rect.w = (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2;
     rect.x = rect.w + (MAPSIZE * CELLSIZE);
     rect.y = 0;
-    SDL_RenderCopy(renderer, scoreTexture, NULL, &rect);
+    SDL_RenderCopy(renderer, nextFireTexture, NULL, &rect);
     rect.y += rect.h;
     char str[10];
     printf("%d\n", (UPDATETIME * 1000 - (int)timer % (UPDATETIME * 1000))/1000);
@@ -412,6 +414,9 @@ void mainLoop(){
     scoreSurface = IMG_Load("Res/score.png");
     scoreTexture = SDL_CreateTextureFromSurface(renderer, scoreSurface);
 
+    nextFireSurface = IMG_Load("Res/nextFire.png");
+    nextFireTexture = SDL_CreateTextureFromSurface(renderer, nextFireSurface);
+
     heartSurface = IMG_Load("Res/heart_spritesheet.png");
     heartTexture = SDL_CreateTextureFromSurface(renderer, heartSurface);