From ea4413517bce3d61b4954e0e9d7929a3df7163d0 Mon Sep 17 00:00:00 2001 From: driAn Date: Sat, 15 Nov 2008 18:31:42 +0000 Subject: [PATCH] no respawn timer in dm games git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3510 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 7e2d48d6..d96faa7b 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -325,9 +325,9 @@ void showrespawntimer() if(!arenaintermission) return; showhudtimer(5, arenaintermission, "FIGHT!", lastspawnattempt >= arenaintermission && lastmillis < lastspawnattempt+100); } - else if(player1->state==CS_DEAD && (!player1->isspectating() || player1->spectatemode==SM_DEATHCAM)) + else if(player1->state==CS_DEAD && m_flags && (!player1->isspectating() || player1->spectatemode==SM_DEATHCAM)) { - int secs = m_flags ? 5 : 2; + int secs = 5; showhudtimer(secs, player1->respawnoffset, "READY!", lastspawnattempt >= arenaintermission && lastmillis < lastspawnattempt+100); } } @@ -482,14 +482,7 @@ bool tryrespawn() { if(player1->state==CS_DEAD) { - // set min wait time when in spectate mode (avoid unfair specting) - if(player1->isspectating() && player1->spectatemode!=SM_DEATHCAM && !m_arena) - { - spectate(SM_DEATHCAM); - //player1->respawnoffset = lastmillis; // count again - } - - int respawnmillis = player1->respawnoffset+(m_arena ? 0 : (m_flags ? 5000 : 0)); + int respawnmillis = player1->respawnoffset+(m_arena ? 0 : (m_flags ? 5000 : 2000)); if(lastmillis>respawnmillis) { player1->attacking = false;