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

respawn delay only in flag modes, dont recount respawn time when spectating

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