epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix marking player as spectator going through unsynced code

Browse Source
This commit is contained in:
Matthias Mailänder
2015-08-03 10:28:32 +02:00
parent 1eb46d4922
commit bbb186d9c8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Player/MissionObjectives.cs
View File

@@ -238,7 +238,10 @@ namespace OpenRA.Mods.Common.Traits
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "Surrender") if (order.OrderString == "Surrender")
{
ForceDefeat(self.Owner); ForceDefeat(self.Owner);
self.Owner.Spectating = true;
}
} }
} }

1
OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
View File

@@ -38,7 +38,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (world.LocalPlayer.WinState != WinState.Undefined) if (world.LocalPlayer.WinState != WinState.Undefined)
Game.RunAfterDelay(objectives != null ? objectives.Info.GameOverDelay : 0, () => Game.RunAfterDelay(objectives != null ? objectives.Info.GameOverDelay : 0, () =>
{ {
world.LocalPlayer.Spectating = true;
playerRoot.RemoveChildren(); playerRoot.RemoveChildren();
Game.LoadWidget(world, "OBSERVER_WIDGETS", playerRoot, new WidgetArgs()); Game.LoadWidget(world, "OBSERVER_WIDGETS", playerRoot, new WidgetArgs());
}); });