Complete message for explore objectives (#198)

cxong · Dec 10, 2013 · 318e3cd · 318e3cd
1 parent ea3ac38
commit 318e3cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/cdogs/mission.c b/src/cdogs/mission.c
@@ -908,6 +908,18 @@ void SetPaletteRanges(int wall_range, int floor_range, int room_range, int alt_r
 	SetRange(ALT_COLORS, abs(alt_range) % COLORRANGE_COUNT);
 }
 
+void MissionSetMessageIfComplete(struct MissionOptions *options)
+{
+	if (CanCompleteMission(options))
+	{
+		GameEvent msg;
+		msg.Type = GAME_EVENT_SET_MESSAGE;
+		strcpy(msg.u.SetMessage.Message, "Mission Complete");
+		msg.u.SetMessage.Ticks = -1;
+		GameEventsEnqueue(&gGameEvents, msg);
+	}
+}
+
 int CheckMissionObjective(
 	struct MissionOptions *options, int flags, ObjectiveType type)
 {
@@ -922,14 +934,7 @@ int CheckMissionObjective(
 		return 0;
 	}
 	gMission.objectives[idx].done++;
-	if (CanCompleteMission(options))
-	{
-		GameEvent msg;
-		msg.Type = GAME_EVENT_SET_MESSAGE;
-		strcpy(msg.u.SetMessage.Message, "Mission Complete");
-		msg.u.SetMessage.Ticks = -1;
-		GameEventsEnqueue(&gGameEvents, msg);
-	}
+	MissionSetMessageIfComplete(options);
 	return 1;
 }
 

diff --git a/src/cdogs/mission.h b/src/cdogs/mission.h
@@ -71,6 +71,7 @@ void SetupQuickPlayCampaign(
 void SetupMission(int index, int buildTables, CampaignOptions *campaign);
 void SetPaletteRanges(int wall_range, int floor_range, int room_range, int alt_range);
 
+void MissionSetMessageIfComplete(struct MissionOptions *options);
 // If object is a mission objective, complete it and return true
 int CheckMissionObjective(
 	struct MissionOptions *options, int flags, ObjectiveType type);

diff --git a/src/game.c b/src/game.c
@@ -486,6 +486,7 @@ static void MissionUpdateObjectives(void)
 		if (mo->type == OBJECTIVE_INVESTIGATE)
 		{
 			o->done = ExploredPercentage();
+			MissionSetMessageIfComplete(&gMission);
 		}
 
 		// Don't draw anything else for optional objectives