From 59649efc8705405126fcda9f4a4cee90dd6fa64c Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 22 Apr 2006 08:22:07 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@90
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/eduke32/source/game.c  | 9 +++++----
 polymer/eduke32/source/menus.c | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 000e626af..3086c69bd 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -432,7 +432,7 @@ void getpackets(void)
 
             k = j;
             for(i=connecthead;i>=0;i=connectpoint2[i])
-                j += playerquitflag[i]+1;
+                j += playerquitflag[i]+playerquitflag[i];
             for(i=connecthead;i>=0;i=connectpoint2[i])
             {
                 if (playerquitflag[i] == 0) continue;
@@ -712,7 +712,7 @@ void getpackets(void)
             playerreadyflag[other]++;
             break;
         case 255:
-            sendquit();
+            gameexit(" ");
             break;
         }
     }
@@ -9749,12 +9749,13 @@ char domovethings(void)
         pus = NUMPAGES;
         vscrn();
 
-        Bsprintf(buf,"%s is history!",ud.user_name[i]);
-
         quickkill(&ps[i]);
         deletesprite(ps[i].i);
 
+        Bsprintf(buf,"%s is history!",ud.user_name[i]);
         adduserquote(buf);
+        Bstrcpy(fta_quotes[116],buf);
+        ps[myconnectindex].ftq = 116, ps[myconnectindex].fta = 60;
 
         if(j < 0 && networkmode == 0 )
             gameexit( " \nThe 'MASTER/First player' just quit the game.  All\nplayers are returned from the game.");
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 386cd6757..bd4875b4d 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -766,7 +766,7 @@ void menus(void)
 
         if (current_menu == 20004)
         {
-            x = probesm(23,45,8,10);
+            x = probesm(24,45,8,10);
             if(x == -1)
             {
                 cmenu(20002);
@@ -783,7 +783,7 @@ void menus(void)
                 KB_FlushKeyboardQueue();
             }
         } else {
-            x = strget(25,40+(8*probey),buf,34,0);
+            x = strget(26,40+(8*probey),buf,34,0);
             if (x) {
                 if (x == 1) {
                     Bstrcpy(ud.ridecule[last_probey],buf);
@@ -797,7 +797,7 @@ void menus(void)
         for(i=0;i<10;i++)
         {
             if(current_menu == 20005 && i == last_probey) continue;
-            gametextpal(25,40+(i<<3),ud.ridecule[i],MENUHIGHLIGHT(i),0);
+            gametextpal(26,40+(i<<3),ud.ridecule[i],MENUHIGHLIGHT(i),0);
         }
         break;