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

Revert "new PauseState to differentiate game and editor pausing"

Browse Source 
This reverts commit d1e18cad7a.
This commit is contained in:
Paul Chote
2014-07-08 10:40:23 +12:00
parent 18c9a25232
commit 802b6a652c
10 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Console/PlayerCommands.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA
{
case "pause":
world.IssueOrder(new Order("PauseGame", null, false)
{ TargetString = world.Paused == World.PauseState.Paused ? "UnPause" : "Pause" });
{ TargetString = world.Paused ? "UnPause" : "Pause" });
break;
case "surrender":
world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false));

2
OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.RA.Orders
IEnumerable<Order> InnerOrder(World world, CPos xy, MouseInput mi)
{
if (world.Paused == World.PauseState.Paused)
if (world.Paused)
yield break;
if (mi.Button == MouseButton.Left)

7
OpenRA.Mods.RA/Render/WithActiveAnimation.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Render
public object Create(ActorInitializer init) { return new WithActiveAnimation(init.self, this); }
}
public class WithActiveAnimation : ITickRender, INotifyBuildComplete, INotifySold
public class WithActiveAnimation : ITick, INotifyBuildComplete, INotifySold
{
readonly IEnumerable<IDisable> disabled;
readonly WithActiveAnimationInfo info;
@@ -42,11 +42,8 @@ namespace OpenRA.Mods.RA.Render
}
int ticks;
public void TickRender(WorldRenderer wr, Actor self)
public void Tick(Actor self)
{
if (wr.world.Paused == World.PauseState.Paused)
return;
if (!buildComplete)
return;

4
OpenRA.Mods.RA/Widgets/Logic/GameTimerLogic.cs
View File

@@ -27,12 +27,12 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
var startTick = Ui.LastTickTime;
// Blink the status line
status.IsVisible = () => (world.Paused == World.PauseState.Paused || world.Timestep != Game.Timestep)
status.IsVisible = () => (world.Paused || world.Timestep != Game.Timestep)
&& (Ui.LastTickTime - startTick) / 1000 % 2 == 0;
status.GetText = () =>
{
if (world.Paused == World.PauseState.Paused || world.Timestep == 0)
if (world.Paused || world.Timestep == 0)
return "Paused";
if (world.Timestep == 1)

2
OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
optionsBG.Visible ^= true;
if (optionsBG.Visible)
{
cachedPause = world.PredictedPaused == World.PauseState.Paused;
cachedPause = world.PredictedPaused;
if (world.LobbyInfo.IsSinglePlayer)
world.SetPauseState(true);