From 1c4485dba5528707e5c1db328b98f663f15823e4 Mon Sep 17 00:00:00 2001
From: Rafael Barreto <baarreth@hotmail.com>
Date: Sat, 23 Oct 2010 21:04:23 +0000
Subject: [PATCH] fixing the respawn time evasion... it was never fixed :|

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5787 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientgame.cpp |  9 ++++++++-
 source/src/server.cpp     | 17 +++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 860f8cfa..a31e76f7 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -618,6 +618,8 @@ inline const char * spawn_message()
     // in large, friendly letters.
 }
 
+int waiting_permission = 0;
+
 bool tryrespawn()
 {
     if ( m_mp(gamemode) && bad_map() )
@@ -647,7 +649,12 @@ bool tryrespawn()
                     else lastspawnattempt = lastmillis;
                     return false;
                 }
-                respawnself();
+                if (lastmillis > waiting_permission)
+                {
+                    waiting_permission = lastmillis + 1000;
+                    respawnself();
+                }
+                else hudeditf(HUDMSG_TIMER, "\f%s", spawn_message());
                 return true;
             }
             else lastspawnattempt = lastmillis;
diff --git a/source/src/server.cpp b/source/src/server.cpp
index fefad1c9..2ceea6a1 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -1398,7 +1398,8 @@ void updatesdesc(const char *newdesc, ENetAddress *caller = NULL)
 int canspawn(client *c)   // beware: canspawn() doesn't check m_arena!
 {
     if(!c || c->type == ST_EMPTY || !c->isauthed || !team_isvalid(c->team) ||
-        (servmillis - c->connectmillis < 5000 + c->state.reconnections && gamemillis > 10000 && totalclients > 3) ) return -1;
+        (servmillis - c->connectmillis < 1000 + c->state.reconnections * 2000 &&
+            gamemillis > 10000 && totalclients > 3 && !team_isspect(c->team)) ) return SP_OK_NUM; // equivalent to SP_DENY
     if(!c->isonrightmap) return SP_WRONGMAP;
     if(mastermode == MM_MATCH && matchteamsize)
     {
@@ -2160,7 +2161,7 @@ void disconnect_client(int n, int reason)
     if(!clients.inrange(n) || clients[n]->type!=ST_TCPIP) return;
     sdropflag(n);
     client &c = *clients[n];
-    if (c.state.state == CS_ALIVE) c.state.lastdisc = servmillis;
+    c.state.lastdisc = servmillis;
     const char *scoresaved = "";
     if(c.haswelcome)
     {
@@ -2289,7 +2290,8 @@ bool restorescore(client &c)
     {
         sc->restore(c.state);
         sc->valid = false;
-        if ( c.connectmillis - sc->lastdisc < 5000 && (++c.state.reconnections >= 3) ) c.state.deaths++;
+        if ( c.connectmillis - c.state.lastdisc < 5000 ) c.state.reconnections++;
+        else if ( c.state.reconnections ) c.state.reconnections--;
         return true;
     }
     return false;
@@ -2807,13 +2809,16 @@ void process(ENetPacket *packet, int sender, int chan)
             }
 
             case SV_TRYSPAWN:
-                if(team_isspect(cl->team) && canspawn(cl) < SP_OK_NUM)
+            {
+                int sp = canspawn(cl);
+                if(team_isspect(cl->team) && sp < SP_OK_NUM)
                 {
                     updateclientteam(sender, TEAM_ANYACTIVE, FTR_PLAYERWISH);
+                    sp = canspawn(cl);
                 }
-                if( !m_arena && canspawn(cl) < SP_OK_NUM && gamemillis > cl->state.lastspawn + 1000 ) sendspawn(cl);
+                if( !m_arena && sp < SP_OK_NUM && gamemillis > cl->state.lastspawn + 1000 ) sendspawn(cl);
                 break;
-
+            }
             case SV_SPAWN:
             {
                 int ls = getint(p), gunselect = getint(p);