Bug fix for epic battle spawning.

This commit is contained in:
Steve 2015-12-20 16:41:46 +00:00
parent a50e1685a3
commit e83e078873
1 changed files with 4 additions and 4 deletions

View File

@ -201,7 +201,7 @@ void doEntities(void)
{ {
numAllies++; numAllies++;
if (e->health > 0 && (battle.epic || e->active) && !(e->flags & EF_NO_EPIC)) if (e->health > 0 && e->active && !(e->flags & EF_NO_EPIC))
{ {
numActiveAllies++; numActiveAllies++;
} }
@ -210,7 +210,7 @@ void doEntities(void)
{ {
numEnemies++; numEnemies++;
if (e->health > 0 && (battle.epic || e->active) && !(e->flags & EF_NO_EPIC)) if (e->health > 0 && e->active && !(e->flags & EF_NO_EPIC))
{ {
numActiveEnemies++; numActiveEnemies++;
} }
@ -220,8 +220,8 @@ void doEntities(void)
prev = e; prev = e;
} }
battle.numAllies = numActiveAllies; battle.numAllies = (battle.epic) ? numAllies : numActiveAllies;
battle.numEnemies = numActiveEnemies; battle.numEnemies = (battle.epic) ? numEnemies : numActiveEnemies;
if (!battle.numInitialEnemies) if (!battle.numInitialEnemies)
{ {