From b8c21f177d53e78e934a45b25aec73771725da88 Mon Sep 17 00:00:00 2001
From: Taha Belkhiri <belkhiri.taha53@gmail.com>
Date: Thu, 23 Jun 2022 20:32:47 +0200
Subject: [PATCH] modifications finales. le jeu est bien maintenant !
---
travail_de_groupe/chef_oeuvre/markov.txt | 6 +++---
travail_de_groupe/chef_oeuvre/src/render.c | 16 ++++++++++++++--
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/travail_de_groupe/chef_oeuvre/markov.txt b/travail_de_groupe/chef_oeuvre/markov.txt
index 4c18679..7b171fb 100644
--- a/travail_de_groupe/chef_oeuvre/markov.txt
+++ b/travail_de_groupe/chef_oeuvre/markov.txt
@@ -1,5 +1,5 @@
50 50 0 0 0
-0 60 40 0 0
-0 10 70 20 0
-0 0 10 50 40
+0 30 70 0 0
+0 10 50 40 0
+0 0 10 40 50
0 0 0 50 50
diff --git a/travail_de_groupe/chef_oeuvre/src/render.c b/travail_de_groupe/chef_oeuvre/src/render.c
index f8facc8..0e31c3a 100644
--- a/travail_de_groupe/chef_oeuvre/src/render.c
+++ b/travail_de_groupe/chef_oeuvre/src/render.c
@@ -143,7 +143,7 @@ void endSDL(){
TTF_CloseFont(robotoFont);
TTF_Quit();
SDL_Quit();
- if (!fireList){
+ if (gameState != WON){
fireList = freeListFire(fireList);
}
}
@@ -404,7 +404,6 @@ void drawLost(){
SDL_RenderCopy(renderer, playAgainButtonHoverTexture, NULL, &rect);
SDL_RenderCopy(renderer, quitButtonHoverTexture, NULL, &rect);
SDL_RenderCopy(renderer, playAgainButtonHoverTexture, NULL, &rect);
- SDL_RenderPresent(renderer);
// draw score
rect.h = screenDimension.h/12;
@@ -417,6 +416,7 @@ void drawLost(){
SDL_Surface * surface = TTF_RenderText_Solid(robotoFont, str, textColor);
SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, surface);
SDL_RenderCopy(renderer, texture, NULL, &rect);
+ SDL_RenderPresent(renderer);
}
void drawWon(){
@@ -429,6 +429,18 @@ void drawWon(){
SDL_RenderCopy(renderer, playAgainButtonHoverTexture, NULL, &rect);
SDL_RenderCopy(renderer, quitButtonHoverTexture, NULL, &rect);
SDL_RenderCopy(renderer, playAgainButtonHoverTexture, NULL, &rect);
+
+ // draw score
+ rect.h = screenDimension.h/12;
+ rect.w = rect.h;
+ rect.x = screenDimension.w/2;
+ rect.y = screenDimension.h/2 - rect.h;
+ char str[10];
+ 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);
+ SDL_RenderCopy(renderer, texture, NULL, &rect);
SDL_RenderPresent(renderer);
}
--
GitLab