From bac2cb50e6db2b1f4a189469e63ef637fcbf4012 Mon Sep 17 00:00:00 2001 From: driAn Date: Sat, 15 Nov 2008 15:47:39 +0000 Subject: [PATCH] respawn delay only in flag modes, dont recount respawn time when spectating git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3502 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index c63473a1..1bd8adfe 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -106,7 +106,7 @@ void newteam(char *name) if(m_teammode) { if(!strcmp(name, player1->team)) return; // same team - if(player1->isspectating()) { conoutf("\f3 you can not switch teams when spectating"); return; } + if(player1->isspectating()) { conoutf("\f3you can not switch teams when spectating"); return; } if(!team_valid(name)) { conoutf("\f3\"%s\" is not a valid team name (try CLA or RVSF)", name); return; } bool checkteamsize = autoteambalance && players.length() >= 1 && !m_botmode; @@ -486,10 +486,10 @@ bool tryrespawn() if(player1->isspectating() && player1->spectatemode!=SM_DEATHCAM && !m_arena) { spectate(SM_DEATHCAM); - player1->respawnoffset = lastmillis; // count again + //player1->respawnoffset = lastmillis; // count again } - int respawnmillis = player1->respawnoffset+(m_arena ? 0 : (m_flags ? 5000 : 2000)); + int respawnmillis = player1->respawnoffset+(m_arena ? 0 : (m_flags ? 5000 : 0)); if(lastmillis>respawnmillis) { player1->attacking = false;