From 3827a5436a9407551de9abd562a8b44e4e73ac3c Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 10 Jun 2012 17:17:38 +1200 Subject: [PATCH] #2191 fixed -- custom OGs canceled on win/lose --- OpenRA.Mods.RA/Orders/PowerDownOrderGenerator.cs | 8 +++++++- OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/Orders/PowerDownOrderGenerator.cs b/OpenRA.Mods.RA/Orders/PowerDownOrderGenerator.cs index c344a6706a..3dcf38a460 100755 --- a/OpenRA.Mods.RA/Orders/PowerDownOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/PowerDownOrderGenerator.cs @@ -48,7 +48,13 @@ namespace OpenRA.Mods.RA.Orders } } - public void Tick(World world) { } + public void Tick(World world) + { + if (world.LocalPlayer != null && + world.LocalPlayer.WinState != WinState.Undefined) + world.CancelInputMode(); + } + public void RenderAfterWorld(WorldRenderer wr, World world) { } public void RenderBeforeWorld(WorldRenderer wr, World world) { } diff --git a/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs b/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs index c1ede6fc60..cbbf16e54c 100644 --- a/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs @@ -42,7 +42,13 @@ namespace OpenRA.Mods.RA.Orders } } - public void Tick(World world) { } + public void Tick(World world) + { + if (world.LocalPlayer != null && + world.LocalPlayer.WinState != WinState.Undefined) + world.CancelInputMode(); + } + public void RenderAfterWorld(WorldRenderer wr, World world) { } public void RenderBeforeWorld(WorldRenderer wr, World world) { }