*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1209 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-08-07 16:48:37 +00:00
parent 7d2107f9bd
commit fdfc4f4358
4 changed files with 13 additions and 11 deletions
+2 -3
View File
@@ -130,7 +130,7 @@ extern void thrownade(playerent *d, const vec &vel, bounceent *p);
void deathstate(playerent *pl)
{
pl->lastaction = lastmillis;
pl->lastpain = lastmillis;
pl->attacking = false;
pl->state = CS_DEAD;
pl->pitch = 0;
@@ -146,7 +146,6 @@ void deathstate(playerent *pl)
void spawnstate(playerent *d) // reset player state not persistent accross spawns
{
d->respawn();
//d->lastaction = lastmillis;
if(d==player1)
{
gun_changed = true;
@@ -308,7 +307,7 @@ void updateworld(int curtime, int lastmillis) // main game update loop
//put game mode extra call here
if(player1->state==CS_DEAD)
{
if(lastmillis-player1->lastaction<2000)
if(lastmillis-player1->lastpain<2000)
{
player1->move = player1->strafe = 0;
moveplayer(player1, 10, false);