*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1242 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-08-13 15:36:47 +00:00
parent 512ad859a6
commit 55992a18b4
2 changed files with 9 additions and 5 deletions
+6 -3
View File
@@ -574,7 +574,11 @@ void arenacheck()
if(arenaround)
{
arenaround = 0;
loopv(clients) if(clients[i]->type!=ST_EMPTY) sendspawn(clients[i]);
loopv(clients) if(clients[i]->type!=ST_EMPTY)
{
clients[i]->state.respawn();
sendspawn(clients[i]);
}
return;
}
@@ -1442,9 +1446,8 @@ void process(ENetPacket *packet, int sender, int chan) // sender may be -1
case SV_SPAWN:
{
int ls = getint(p), gunselect = getint(p);
if(cl->state.state!=CS_DEAD || ls!=cl->state.lifesequence || cl->state.lastspawn<0) break;
if((cl->state.state!=CS_ALIVE && cl->state.state!=CS_DEAD) || ls!=cl->state.lifesequence || cl->state.lastspawn<0) break;
cl->state.lastspawn = -1;
if(cl->state.lastdeath) cl->state.respawn();
cl->state.state = CS_ALIVE;
cl->state.gunselect = gunselect;
QUEUE_MSG;