no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@789 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-01-08 22:12:31 +00:00
parent 222db40606
commit cf533fc234
9 changed files with 50 additions and 49 deletions
+2 -8
View File
@@ -144,13 +144,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
case SV_MAPCHANGE:
getstring(text, p);
changemapserv(text, getint(p));
if(joining && m_arena)
{
/* TESTME
player1->state = CS_DEAD;
showscores(true);*/
playerdeath(player1);
};
if(joining && m_arena) deathstate(player1);
mapchanged = true;
break;
@@ -266,7 +260,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
if(m_ctf)
{
flaginfo &flag = flaginfos[team_opposite(team_int(d->team))];
if(flag.state == CTFF_STOLEN && flag.actor == d) playerdeath(player1); // punish for ctf TK
if(flag.state == CTFF_STOLEN && flag.actor == d) deathstate(player1); // punish for ctf TK
};
}
else