kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no respawn timer in dm games

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3510 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-11-15 18:31:42 +00:00
parent ffc3c88e2f
commit ea4413517b
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+3 -10
View File
@@ -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;