aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/combat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/xeen/combat.cpp')
-rw-r--r--engines/xeen/combat.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index c1c70ac86c..34246b69d1 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1125,7 +1125,11 @@ void Combat::setSpeedTable() {
}
bool Combat::allHaveGone() const {
- for (uint idx = 0; idx < _charsGone.size(); ++idx) {
+ int monsCount = (_attackMonsters[0] != -1 ? 1 : 0)
+ + (_attackMonsters[1] != -1 ? 1 : 0)
+ + (_attackMonsters[2] != -1 ? 1 : 0);
+
+ for (uint idx = 0; idx < (_combatParty.size() + monsCount); ++idx) {
if (!_charsGone[idx]) {
if (idx >= _combatParty.size()) {
return false;