Merge pull request 'dev-landrin' (#6) from dev-landrin into master

Reviewed-on: #6

pendu.c

@@ -1,9 +1,7 @@
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
 
 #define MAX_WORDS 14
 #define MAX_TRIES 6
@@ -43,12 +41,9 @@ this function allow to save the last party
 Parameters:
     status -> state that save if the gamer win or lose the party
     good_word -> the word to guess
-    try -> the wrong letters try by the gamer 
+    try -> the letters try by the gamer
-    cpt_try -> the try's table size
-    good_try -> the good letters try by the gamer
-    cpt_good_try -> the good_try's table size
 */
-void save_party(char * status, const char * good_word, char try[], int cpt_try, char good_try[], int cpt_good_try) {
+void save_party(char * status, const char * good_word, char try[]) {
     time_t t;
     time(&t); //stock the current time
     char * date;
@@ -71,84 +66,24 @@ void save_party(char * status, const char * good_word, char try[], int cpt_try,
         fputs("\n",fichier);
 
         fputs("tried letters: ", fichier);
-        for (int i = 0; i < cpt_try; i++) {
+        for (int i = 0; i < sizeof(try); i++) {
             fputc(try[i],fichier);
         }
         fputs("\n",fichier);
         
-        fputs("guessed letters: ", fichier);
+        fclose(fichier); // On ferme le fichier qui a été ouvert
-        for (int i = 0; i < cpt_good_try; i++) {
-            fputc(good_try[i],fichier);
     }
-        fputs("\n",fichier);
 
-        fclose(fichier); // Close the opened file
-    }
-}
-
-/* this function display time out when user does nothing during 30s and verify signal*/
-void sig_handler(int signum){
-    if (signum == SIGALRM){
-
-        printf("\ntime out\n");
-        exit (1);
-    }
-}
-
-/*
-getWordByLength() function adds the possibility to the user to choose how many letters maximum the word to guess can contains.
-
-Returns:
-    A random word from the words list that correspond to the user input
-*/
-const char* getWordByLength(){
-    int maxLetters;
-    printf("Difficulté - Entrez le nombre de lettres maximum à deviner : ");
-    scanf(" %d", &maxLetters);
-    const char *newWords[MAX_WORDS];
-    int wordsFound = 0;
-    for (int i = 0; i < MAX_WORDS; i++) {
-        if(strlen(words[i]) <= maxLetters){
-            newWords[wordsFound] = words[i];
-            wordsFound++;
-        }
-    }
-    if(wordsFound==0){
-        return "";
-    }
-    const char *word = newWords[rand() % wordsFound];
-    /* SECOND WORD TO GUESS (NOT WORKING)
-    wordsFound = 0;
-    for (int i = 0; i < MAX_WORDS; i++) {
-        if(strlen(words[i]) <= maxLetters-strlen(word)){
-            newWords[wordsFound] = words[i];
-            wordsFound++;
-        }
-    }
-    if(wordsFound != 0){
-        word = (const char*) strcat((char *) word, newWords[rand() % wordsFound]);
-    }*/
-    return word;
 }
 
 int main() {
     srand(time(NULL));
-    const char *word = getWordByLength();
+    const char *word = words[rand() % MAX_WORDS];
-    if(word==""){
-        printf("Aucun mot n'a été trouvé.");
-        return 1;
-    }
     int word_length = strlen(word);
     char guessed[word_length];
     int tries = 0;
     int guessed_correctly = 0;
-    char try[MAX_TRIES]; //save the carcater false
+    char try[MAX_TRIES]; //save the carcater try
-    char good_try[word_length]; //save the carcater good
-    int cpt = 0;
-
-    signal(SIGALRM,sig_handler);
-
-    signal(SIGALRM,sig_handler);
 
     for (int i = 0; i < word_length; i++) {
         guessed[i] = '_';
@@ -156,16 +91,14 @@ int main() {
     guessed[word_length] = '\0';
 
     while (tries < MAX_TRIES && guessed_correctly < word_length) {
-
         printf("\nMot à deviner : %s\n", guessed);
         display_hangman(tries);
         char guess;
-        alarm(30);
         printf("Entrez une lettre : ");
-        alarm(30);
         scanf(" %c", &guess);
 
         
+
         int found = 0;
 
         for (int i = 0; i < word_length; i++) {
@@ -173,6 +106,7 @@ int main() {
                 if (guessed[i] == '_') {
                     guessed[i] = guess;
                     guessed_correctly++;
+                    try[tries] = guess;
                 }
                 found = 1;
             }
@@ -181,19 +115,16 @@ int main() {
         if (!found) {
             try[tries] = guess;
             tries++;
-        }else{
-            good_try[cpt] = guess;
-            cpt++;
         }
     }
 
     if (guessed_correctly == word_length) {
         printf("Félicitations ! Vous avez deviné le mot : %s\n", word);
-        save_party("Win", word, try, tries, good_try, cpt);
+        save_party("Win", word, try);
     } else {
         printf("Désolé, vous avez perdu. Le mot était : %s\n", word);
         display_hangman(MAX_TRIES);
-        save_party("Lose", word, try, tries, good_try, cpt); 
+        save_party("Lose", word, try); 
     }
 
     return 0;