no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@344 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-08-20 15:33:36 +00:00
parent 9382c6b9e7
commit 245e9d8e3d
10 changed files with 60 additions and 31 deletions
+3 -2
View File
@@ -139,7 +139,7 @@ void respawnself()
void respawn()
{
if(player1->state==CS_DEAD)
if(player1->state==CS_DEAD && lastmillis>player1->lastaction+3000)
{
player1->attacking = false;
if(m_arena) { conoutf("waiting for new round to start..."); return; };
@@ -392,7 +392,8 @@ void attack(bool on)
{
if(intermission) return;
if(editmode) editdrag(on);
else if(player1->attacking = on) respawn();
else if(player1->state==CS_DEAD) respawn();
else player1->attacking = on;
};
void jumpn(bool on) { if(!intermission && (player1->jumpnext = on) ) respawn(); };