team shuffle fixes, cleanups

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1465 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-12-22 13:57:44 +00:00
parent d8b205455a
commit 4e0a0309f9
7 changed files with 39 additions and 43 deletions
+5 -7
View File
@@ -165,11 +165,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
case SV_MAPCHANGE:
getstring(text, p);
changemapserv(text, getint(p));
if(m_arena && joining>2)
{
deathstate(player1);
showscores(true);
}
if(m_arena && joining>2) deathstate(player1);
mapchanged = true;
break;
@@ -504,12 +500,14 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
int cn = getint(p);
playerent *d = cn==getclientnum() ? player1 : newclient(cn);
if(!d) break;
if(d==player1)
// FIXME
/*if(d==player1)
{
if(editmode) toggleedit();
showscores(true);
}
d->state = CS_DEAD;
d->state = CS_DEAD;*/
deathstate(d);
break;
}