From fc91d9f79bb8c57893aa3149d5c22cfd528b66fa Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Tue, 16 Jan 2007 20:40:01 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@834 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientgame.cpp | 10 +++++++++-
 source/src/clients2c.cpp  |  7 ++++++-
 source/src/cube.h         |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index c4d08b8f..89855e32 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -140,13 +140,21 @@ void arenacount(playerent *d, int &alive, int &dead, char *&lastteam, char *&las
     };
 };
 
+bool arenajoin = false;
 int arenarespawnwait = 0;
 int arenadetectwait  = 0;
 
 void arenarespawn()
 {
     if(!m_arena || intermission) return;
-    
+   
+    if(arenajoin)
+    {
+        if(player1->state!=CS_DEAD) arenajoin = false;
+        else loopv(players) if(players[i]) arenajoin = false;
+        if(arenajoin) return;
+    };
+
     if(arenarespawnwait)
     {
         if(arenarespawnwait<lastmillis)
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 40a261e9..606d4210 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -144,7 +144,12 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
         case SV_MAPCHANGE:     
             getstring(text, p);
             changemapserv(text, getint(p));
-            if(joining && m_arena && !firstplayer) deathstate(player1);
+            if(joining && m_arena && !firstplayer) 
+            {
+                deathstate(player1);
+                showscores(true);
+                arenajoin = true;
+            };
             mapchanged = true;
             break;
         
diff --git a/source/src/cube.h b/source/src/cube.h
index f07c0fe7..6d208e70 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -120,6 +120,7 @@ extern int gamemode, nextmode;
 extern int xtraverts;
 extern bool demoplayback;
 extern bool intermission;
+extern bool arenajoin;
 extern int maxclients;
 
 #define VIRTW 2400                      // virtual screen size for text & HUD