Merge master and modified some line due to merge

# Conflicts:
#	pendu.c

pendu.c

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <stdbool.h>
 
 #define MAX_WORDS 14
 #define MAX_TRIES 6
@@ -48,17 +49,17 @@ char* choix_diff(){
     printf("chosed_wordsez la difficulté du jeu en chosed_wordsant la size : ");
     scanf(" %d", &size); //&size
 
-    static char word_finale[100] = ""; 
+    static char word_finale[100] = "";
     const char *chosed_word[MAX_WORDS]; //chosed_word
 
-    word_finale[0] = '\0'; 
+    word_finale[0] = '\0';
 
     while (size >= 3) {
         const char *word;
         int word_length;
 
         do {
-            word = words[rand() % MAX_WORDS];  
+            word = words[rand() % MAX_WORDS];
             word_length = strlen(word);
             for(i;i<word_account;i++){
                 if(word == chosed_word[i]){ //chosed_word
@@ -70,32 +71,40 @@ char* choix_diff(){
 
         chosed_word[word_account] = word;
         word_account++;
-        
+
         strcat(word_finale, word);
-        
+
-        
+
         size -= word_length;
         if(size > 3){
             strcat(word_finale, "-");
         }
     }
-    
+
     return word_finale;
 }
 
+// main function which starts the game and calculates time and points
 int main() {
     char *word = choix_diff();
-    int word_length = strlen(word);
+    int word_length = strlen(word), guessed_correctly = 0, score=0, past_time=0;
     char guessed[word_length];
     int tries = 0;
-    int guessed_correctly = 0;
+    bool is_time_ecouled;
 
     for (int i = 0; i < word_length; i++) {
         guessed[i] = '_';
     }
     guessed[word_length] = '\0';
+    long now = (long) time(NULL);
 
     while (tries < MAX_TRIES && guessed_correctly < word_length) {
+        long past = now;
+        now = (long) time(NULL);
+        int current_past_time = now - past;
+        past_time = past_time + current_past_time;
+        score = score + (30 - current_past_time);
+
         printf("\nMot à deviner : %s\n", guessed);
         display_hangman(tries);
         char guess;
@@ -112,18 +121,18 @@ int main() {
                 found = 1;
             }
         }
-
         if (!found) {
             tries++;
+            score =  score - past_time;
         }
     }
-
     if (guessed_correctly == word_length) {
-        printf("Félicitations ! Vous avez deviné le mot : %s\n", word);
+        printf("Félicitations ! Vous avez deviné le mot : %s. Votre partie à durée %d secondes pour un score de %d points\n", word, past_time, score);
+    } else if (is_time_ecouled == true) {
+        printf("Partie perdue, temps écoulé. La partie a durée %d secondes\n", past_time);
     } else {
-        printf("Désolé, vous avez perdu. Le mot était : %s\n", word);
+       printf("Désolé, vous avez perdu. Le mot était : %s. Votre partie à durée : %d secondes\n", word, past_time);
         display_hangman(MAX_TRIES);
     }
-
     return 0;
-}
+}