*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@834 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2007-01-16 20:40:01 +00:00
parent e03175099d
commit fc91d9f79b
3 changed files with 16 additions and 2 deletions
@@ -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)