diff --git a/pendu.c b/pendu.c index c6032b4..c8bb158 100644 --- a/pendu.c +++ b/pendu.c @@ -1,7 +1,9 @@ +#include #include #include #include #include +#include #define MAX_WORDS 14 #define MAX_TRIES 6 @@ -41,9 +43,12 @@ 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 letters try by the gamer + try -> the wrong 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[]) { +void save_party(char * status, const char * good_word, char try[], int cpt_try, char good_try[], int cpt_good_try) { time_t t; time(&t); //stock the current time char * date; @@ -66,24 +71,84 @@ void save_party(char * status, const char * good_word, char try[]) { fputs("\n",fichier); fputs("tried letters: ", fichier); - for (int i = 0; i < sizeof(try); i++) { + for (int i = 0; i < cpt_try; i++) { fputc(try[i],fichier); } fputs("\n",fichier); - - fclose(fichier); // On ferme le fichier qui a été ouvert - } + fputs("guessed letters: ", fichier); + 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 = words[rand() % MAX_WORDS]; + const char *word = getWordByLength(); + 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 try + char try[MAX_TRIES]; //save the carcater false + 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] = '_'; @@ -91,12 +156,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; @@ -106,7 +173,6 @@ int main() { if (guessed[i] == '_') { guessed[i] = guess; guessed_correctly++; - try[tries] = guess; } found = 1; } @@ -115,17 +181,20 @@ 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); + save_party("Win", word, try, tries, good_try, cpt); } else { printf("Désolé, vous avez perdu. Le mot était : %s\n", word); display_hangman(MAX_TRIES); - save_party("Lose", word, try); + save_party("Lose", word, try, tries, good_try, cpt); } return 0; -} +} \ No newline at end of file diff --git a/save_party.txt b/save_party.txt index 8175bdd..bbdc5b8 100644 Binary files a/save_party.txt and b/save_party.txt differ