diff --git a/src/battle/hud.c b/src/battle/hud.c index eca800b..738a69d 100644 --- a/src/battle/hud.c +++ b/src/battle/hud.c @@ -409,7 +409,7 @@ static void drawObjectives(void) if (!game.currentMission->challengeData.isChallenge) { blit(objectives, (SCREEN_WIDTH / 2) - 50, 14, 0); - drawText(SCREEN_WIDTH / 2, 10, 16, TA_CENTER, colors.white, "%d / %d", battle.numObjectivesComplete, battle.numObjectivesTotal); + drawText(SCREEN_WIDTH / 2, 10, 16, TA_CENTER, colors.white, "%d / %d", battle.numObjectivesComplete, (battle.numObjectivesTotal + battle.numConditions)); } else { diff --git a/src/battle/objectives.c b/src/battle/objectives.c index 122b7e0..c4f46e6 100644 --- a/src/battle/objectives.c +++ b/src/battle/objectives.c @@ -26,7 +26,7 @@ void doObjectives(void) int numHiddenObjectives; Objective *o; - battle.numObjectivesComplete = battle.numObjectivesTotal = 0; + battle.numObjectivesComplete = battle.numObjectivesTotal = battle.numConditions = 0; objectiveFailed = 0; numHiddenObjectives = 0; @@ -38,6 +38,10 @@ void doObjectives(void) { battle.numObjectivesTotal++; } + else + { + battle.numConditions++; + } } else { diff --git a/src/structs.h b/src/structs.h index 65a9e74..7e462bc 100644 --- a/src/structs.h +++ b/src/structs.h @@ -339,7 +339,7 @@ typedef struct { int ecmTimer; int radarRange; int numPlayerGuns; - int numObjectivesComplete, numObjectivesTotal; + int numObjectivesComplete, numObjectivesTotal, numConditions; Entity *missionTarget; Entity *jumpgate; SDL_Texture *background, *planetTexture;