From 726a9f99dbf1e06b062ea283aca8646c9dc7c830 Mon Sep 17 00:00:00 2001 From: Steve Date: Sat, 23 Jul 2016 12:51:35 +0100 Subject: [PATCH] Pacifist trophy should be awarded only if enemies were present. --- src/game/trophies.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/trophies.c b/src/game/trophies.c index fe3290b..527a816 100644 --- a/src/game/trophies.c +++ b/src/game/trophies.c @@ -476,9 +476,9 @@ void awardPostMissionTrophies(void) } /* - * Must be a non-challenge mission, a common fighter, must not be Sol, and must not have fired any shots or missiles + * Must be a non-challenge mission, a common fighter, must not be Sol, and must not have fired any shots or missiles (and there should have been some enemies present) */ - if (player->flags & EF_COMMON_FIGHTER && player->missiles && strcmp(game.selectedStarSystem, "Sol") && !battle.stats[STAT_SHOTS_FIRED] && !battle.stats[STAT_MISSILES_FIRED]) + if (player->flags & EF_COMMON_FIGHTER && player->missiles && strcmp(game.selectedStarSystem, "Sol") && !battle.stats[STAT_SHOTS_FIRED] && !battle.stats[STAT_MISSILES_FIRED] && battle.numInitialEnemies > 0) { awardTrophy("PACIFIST"); }