From e16bc064a0a76608e41d9b4111a23d7426b32366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 6 Dec 2014 20:02:16 +0100
Subject: [PATCH] fix the end game dialog not showing which objectives failed

- don't mark everything as failed just because one objective did
- remove fake objectives workarounds for non-playable factions
---
 OpenRA.Game/Player.cs                      |  1 +
 OpenRA.Mods.RA/Player/MissionObjectives.cs | 10 +++++++---
 mods/ra/maps/allies-01/allies01.lua        |  4 ----
 mods/ra/maps/allies-02/allies02.lua        |  2 --
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/OpenRA.Game/Player.cs b/OpenRA.Game/Player.cs
index bb97e2b9fe..db69894c3f 100644
--- a/OpenRA.Game/Player.cs
+++ b/OpenRA.Game/Player.cs
@@ -41,6 +41,7 @@ namespace OpenRA
 		public readonly PlayerReference PlayerReference;
 		public bool IsBot;
 		public int SpawnPoint;
+		public bool HasObjectives = false;
 
 		public Shroud Shroud;
 		public World World { get; private set; }
diff --git a/OpenRA.Mods.RA/Player/MissionObjectives.cs b/OpenRA.Mods.RA/Player/MissionObjectives.cs
index 7efee51130..df24236025 100644
--- a/OpenRA.Mods.RA/Player/MissionObjectives.cs
+++ b/OpenRA.Mods.RA/Player/MissionObjectives.cs
@@ -129,7 +129,7 @@ namespace OpenRA.Mods.RA
 				{
 					foreach (var inou in inous)
 						inou.OnPlayerLost(player);
-	
+
 					CheckIfGameIsOver(player);
 				}
 			}
@@ -139,7 +139,7 @@ namespace OpenRA.Mods.RA
 		{
 			var players = player.World.Players.Where(p => !p.NonCombatant);
 
-			var gameOver = players.All(p => p.WinState != WinState.Undefined);
+			var gameOver = players.All(p => p.WinState != WinState.Undefined || !p.HasObjectives);
 			if (gameOver)
 				Game.RunAfterDelay(info.GameOverDelay, () =>
 				{
@@ -181,6 +181,8 @@ namespace OpenRA.Mods.RA
 					foreach (var p in enemies)
 						p.PlayerActor.Trait<MissionObjectives>().ForceDefeat(p);
 			}
+
+			CheckIfGameIsOver(player);
 		}
 
 		public void OnPlayerLost(Player player)
@@ -218,6 +220,8 @@ namespace OpenRA.Mods.RA
 						p.World.OnPlayerWinStateChanged(p);
 					}
 			}
+
+			CheckIfGameIsOver(player);
 		}
 
 		public void ForceDefeat(Player player)
@@ -227,7 +231,7 @@ namespace OpenRA.Mods.RA
 					MarkFailed(player, id);
 		}
 
-		public event Action<Player> ObjectiveAdded = player => { };
+		public event Action<Player> ObjectiveAdded = player => { player.HasObjectives = true; };
 
 		public void OnObjectiveAdded(Player player, int id) {}
 		public void OnObjectiveCompleted(Player player, int id) {}
diff --git a/mods/ra/maps/allies-01/allies01.lua b/mods/ra/maps/allies-01/allies01.lua
index 97f7dc0fe4..825951c6e1 100644
--- a/mods/ra/maps/allies-01/allies01.lua
+++ b/mods/ra/maps/allies-01/allies01.lua
@@ -96,7 +96,6 @@ end
 
 RescueFailed = function()
 	player.MarkFailedObjective(SurviveObjective)
-	ussr.MarkCompletedObjective(DefendObjective)
 end
 
 OilPumpDestroyed = function()
@@ -125,7 +124,6 @@ HelicopterGone = function()
 		Trigger.AfterDelay(DateTime.Seconds(1), function()
 			player.MarkCompletedObjective(ExtractObjective)
 			player.MarkCompletedObjective(SurviveObjective)
-			ussr.MarkFailedObjective(DefendObjective)
 			if not collateralDamage then
 				player.MarkCompletedObjective(CivilProtectionObjective)
 			end
@@ -178,9 +176,7 @@ WorldLoaded = function()
 	Media.PlayMovieFullscreen("landing.vqa", function()
 		FindEinsteinObjective = player.AddPrimaryObjective("Find Einstein.")
 		SurviveObjective = player.AddPrimaryObjective("Tanya and Einstein must survive.")
-		england.AddPrimaryObjective("Destroy the soviet base after a successful rescue.")
 		CivilProtectionObjective = player.AddSecondaryObjective("Protect all civilians.")
-		DefendObjective = ussr.AddPrimaryObjective("Kill Tanya and keep Einstein hostage.")
 
 		RunInitialActivities()
 	end)
diff --git a/mods/ra/maps/allies-02/allies02.lua b/mods/ra/maps/allies-02/allies02.lua
index e4ab2a992a..a332d67400 100644
--- a/mods/ra/maps/allies-02/allies02.lua
+++ b/mods/ra/maps/allies-02/allies02.lua
@@ -111,8 +111,6 @@ WorldLoaded = function()
 
 	Media.PlayMovieFullscreen("mcv.vqa", function()
 		ConquestObjective = player.AddPrimaryObjective("Secure the area.")
-		ussr.AddPrimaryObjective("Defend your base.")
-		ukraine.AddPrimaryObjective("Destroy the convoy.")
 	end)
 
 	Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlaySpeechNotification(allies, "MissionTimerInitialised") end)