From 8877777c62e263f4ffbd8a3179336c68c7c676c9 Mon Sep 17 00:00:00 2001
From: schied <killian.schied@etu.u-pec.fr>
Date: Tue, 15 Oct 2024 12:27:04 +0200
Subject: [PATCH] Commentaires

---
 pendu.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pendu.c b/pendu.c
index 12a0173..9b1a816 100644
--- a/pendu.c
+++ b/pendu.c
@@ -37,6 +37,7 @@ void display_hangman(int tries) {
     }
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 /*
@@ -79,6 +80,16 @@ void save_party(char * status, const char * good_word, char try[]) {
     }
 
 =======
+<<<<<<< HEAD
+=======
+void sig_handler(int signum){
+    printf("\ntime out\n");
+    exit (1);
+>>>>>>> b4f25a5 (ajout du cooldown sur le scanf)
+=======
+=======
+>>>>>>> dev-rocherl
+>>>>>>> 083b1f2 (Commentaires)
 /* this function display time out when user does nothing during 30s and verify signal*/
 void sig_handler(int signum){
     if (signum == SIGALRM){
@@ -86,7 +97,10 @@ void sig_handler(int signum){
         printf("\ntime out\n");
         exit (1);
     }
+<<<<<<< HEAD
 >>>>>>> 83066e1 (ajout des commentaires.)
+=======
+>>>>>>> dev-rocherl
 }
 
 int main() {
@@ -100,6 +114,8 @@ int main() {
 
     signal(SIGALRM,sig_handler);
 
+    signal(SIGALRM,sig_handler);
+
     for (int i = 0; i < word_length; i++) {
         guessed[i] = '_';
     }