From 017d1c1d45c8dcfe194037dae5eb347bdc0f3cbe Mon Sep 17 00:00:00 2001 From: driAn Date: Wed, 16 May 2007 17:39:16 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1003 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 2 +- source/src/console.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 5a6dcb77..4f09dec8 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -173,7 +173,7 @@ void respawnself() void respawn() { - if(player1->state==CS_DEAD && lastmillis>player1->lastaction+(m_ctf ? 5000 : 2000)) + if(player1->state==CS_DEAD && lastmillis>player1->lastpain+(m_ctf ? 5000 : 2000)) { player1->attacking = false; if(m_arena) { conoutf("waiting for new round to start..."); return; } diff --git a/source/src/console.cpp b/source/src/console.cpp index 34f06407..6cd689fa 100644 --- a/source/src/console.cpp +++ b/source/src/console.cpp @@ -306,7 +306,6 @@ void keypress(int code, bool isdown, int cooked) commandbuf[len+1] = '\0'; } } - } } else