From 500d04c2f1999e10f26e02395ad6b117bf14382a Mon Sep 17 00:00:00 2001
From: Terence Denning <terrencedenning@gmail.com>
Date: Sat, 20 Apr 2019 20:34:07 -0700
Subject: [PATCH] game fully functional w/o cookie and list display

---
 http-server.c |  20 ++++++++++++--------
 server        | Bin 22600 -> 22632 bytes
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/http-server.c b/http-server.c
index 690c7ce..8bb9bf8 100644
--- a/http-server.c
+++ b/http-server.c
@@ -44,6 +44,8 @@ static int user2_start = 0;
 char user2_guesses[100][100];
 int user2_guess_number = 0;
 
+int gameover = 0;
+
 static char *webpage;
 
 // represents the types of method
@@ -157,6 +159,7 @@ static bool handle_http_request(int sockfd)
             struct stat st;
 
             if(strstr(buff, "quit=Quit") != NULL){
+                webpage = "html/7_gameover.html";
                 stat(webpage, &st);
                 // Reset User
                 if(sockfd == user1){
@@ -176,8 +179,6 @@ static bool handle_http_request(int sockfd)
                     return false;
                 }
 
-                webpage = "html/7_gameover.html.html";
-
                 int filefd = open(webpage, O_RDONLY);
                 n = read(filefd, buff, 2048);
                 if (n < 0)
@@ -216,6 +217,7 @@ static bool handle_http_request(int sockfd)
                         for(int i=0; i<user2_guess_number; i++)
                         {
                             if(strcmp(user2_guesses[i], keyword) == 0){
+                                gameover = 1;
                                 user1 = -1;
                                 user2 = -1;
                                 user1_guess_number = 0;
@@ -230,10 +232,10 @@ static bool handle_http_request(int sockfd)
                             }
                         }
                         
-                    } 
-                    else if(user2 == -1){
-                        webpage = "html/7_gameover.html";
-                    } 
+                    } else if( gameover == 1){
+                        webpage = "html/6_endgame.html";
+                        gameover = 0;
+                    }
                     else {
                         webpage = "html/5_discarded.html";
                     }
@@ -247,6 +249,7 @@ static bool handle_http_request(int sockfd)
                         for(int i=0; i<user1_guess_number; i++)
                         {
                             if(strcmp(user1_guesses[i], keyword) == 0){
+                                gameover = 1;
                                 user1 = -1;
                                 user2 = -1;
                                 user1_guess_number = 0;
@@ -261,8 +264,9 @@ static bool handle_http_request(int sockfd)
                             }
                         }
                     } 
-                    else if(user1 == -1){
-                        webpage = "html/7_gameover.html";
+                    else if( gameover == 1){
+                        webpage = "html/6_endgame.html";
+                        gameover = 0;
                     }
                     else {
                         webpage = "html/5_discarded.html";
diff --git a/server b/server
index 862ae668d08ab686c8b4ef3e8a50a8c1bda3ca2b..00938fb81485c1556c43662239b1ea99bea2e934 100755
GIT binary patch
delta 2813
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

delta 2751
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
B`7i(g

-- 
GitLab