From c61b591f757520b4e4945de711b6c29c0d58b65a Mon Sep 17 00:00:00 2001 From: Steve Date: Thu, 19 Nov 2015 12:44:56 +0000 Subject: [PATCH] Epic battle bug fixes. --- src/battle/entities.c | 2 +- src/battle/player.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle/entities.c b/src/battle/entities.c index 56757f4..020c460 100644 --- a/src/battle/entities.c +++ b/src/battle/entities.c @@ -132,7 +132,7 @@ void doEntities(void) if (e->type == ET_FIGHTER && (battle.epic || e->active)) { - if (self->side == SIDE_ALLIES) + if (e->side == SIDE_ALLIES) { numAllies++; } diff --git a/src/battle/player.c b/src/battle/player.c index 9c96ccc..5e89c24 100644 --- a/src/battle/player.c +++ b/src/battle/player.c @@ -181,7 +181,7 @@ void initPlayerSelect(void) for (e = battle.entityHead.next ; e != NULL ; e = e->next) { - if (e->type == ET_FIGHTER && e->health > 0 && e->side == SIDE_ALLIES && selectedPlayerIndex < MAX_SELECTABLE_PLAYERS) + if (e->active && e->type == ET_FIGHTER && e->health > 0 && e->side == SIDE_ALLIES && selectedPlayerIndex < MAX_SELECTABLE_PLAYERS) { availablePlayerUnits[selectedPlayerIndex++] = e; }