walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Show number of conditions on HUD, as well as objectives.

This commit is contained in:
Steve 2016-03-29 07:19:39 +01:00
parent e6ea4bff06
commit 8705337e2a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle/hud.c
View File

@ -409,7 +409,7 @@ static void drawObjectives(void)
if (!game.currentMission->challengeData.isChallenge) if (!game.currentMission->challengeData.isChallenge)
{ {
blit(objectives, (SCREEN_WIDTH / 2) - 50, 14, 0); 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 else
{ {

6
src/battle/objectives.c
View File

@ -26,7 +26,7 @@ void doObjectives(void)
int numHiddenObjectives; int numHiddenObjectives;
Objective *o; Objective *o;
battle.numObjectivesComplete = battle.numObjectivesTotal = 0; battle.numObjectivesComplete = battle.numObjectivesTotal = battle.numConditions = 0;
objectiveFailed = 0; objectiveFailed = 0;
numHiddenObjectives = 0; numHiddenObjectives = 0;
@ -38,6 +38,10 @@ void doObjectives(void)
{ {
battle.numObjectivesTotal++; battle.numObjectivesTotal++;
} }
else
{
battle.numConditions++;
}
} }
else else
{ {

2
src/structs.h
View File

@ -339,7 +339,7 @@ typedef struct {
int ecmTimer; int ecmTimer;
int radarRange; int radarRange;
int numPlayerGuns; int numPlayerGuns;
int numObjectivesComplete, numObjectivesTotal; int numObjectivesComplete, numObjectivesTotal, numConditions;
Entity *missionTarget; Entity *missionTarget;
Entity *jumpgate; Entity *jumpgate;
SDL_Texture *background, *planetTexture; SDL_Texture *background, *planetTexture;