walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Don't reset a unit's alive status if it's already dead.

This commit is contained in:
Steve 2018-03-18 08:36:51 +00:00
parent cf5939dd3c
commit c39974e2a7
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/entities/unit.c
View File

@ -173,27 +173,30 @@ static void applyDamage(int damage)
u = (Unit*)self;
if (u->health < 0)
if (u->alive != ALIVE_DEAD)
{
u->health = 0;
u->alive = ALIVE_ALIVE;
}
u->health -= damage;
if (u->health > 0)
{
u->thinkTime = 0;
u->facing = u->x < world.bob->x ? FACING_RIGHT : FACING_LEFT;
if (u->isMissionTarget && rand() % 100 < 10)
if (u->health < 0)
{
u->action = reappear;
u->flags |= EF_GONE;
u->thinkTime = rrnd(FPS, FPS * 2);
addTeleportStars(self);
playBattleSound(SND_APPEAR, self->uniqueId % MAX_SND_CHANNELS, u->x, u->y);
u->health = 0;
u->alive = ALIVE_ALIVE;
}
u->health -= damage;
if (u->health > 0)
{
u->thinkTime = 0;
u->facing = u->x < world.bob->x ? FACING_RIGHT : FACING_LEFT;
if (u->isMissionTarget && rand() % 100 < 10)
{
u->action = reappear;
u->flags |= EF_GONE;
u->thinkTime = rrnd(FPS, FPS * 2);
addTeleportStars(self);
playBattleSound(SND_APPEAR, self->uniqueId % MAX_SND_CHANNELS, u->x, u->y);
}
}
}
}