crouching

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1419 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-11-11 14:20:52 +00:00
parent 9d74fda65d
commit eb81f05ec9
14 changed files with 56 additions and 46 deletions
+1 -2
View File
@@ -147,7 +147,6 @@ void spawnstate(playerent *d) // reset player state not persistent
{
d->respawn();
d->spawnstate(gamemode);
//d->lastaction = lastmillis;
if(d==player1)
{
if(player1->skin!=player1->nextskin) setskin(player1, player1->nextskin);
@@ -375,7 +374,7 @@ void showteamkill() { player1->lastteamkill = lastmillis; }
void dodamage(int damage, playerent *pl, playerent *actor, bool gib, bool local)
{
if(pl->state != CS_ALIVE || pl->state == CS_EDITING || intermission) return;
if(pl->state != CS_ALIVE || intermission) return;
pl->lastpain = lastmillis;
if(local) damage = pl->dodamage(damage);