From 6174ccc882cb0949916b0ac5f772d094c0b90860 Mon Sep 17 00:00:00 2001 From: Tirili Date: Sun, 23 Oct 2011 13:11:39 +1300 Subject: [PATCH] Change World.DisableTick to World.EnableTick --- OpenRA.Game/World.cs | 5 +++-- OpenRA.Mods.RA/Scripting/Media.cs | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs index 17db8b2631..eb1389f922 100644 --- a/OpenRA.Game/World.cs +++ b/OpenRA.Game/World.cs @@ -150,11 +150,12 @@ namespace OpenRA public event Action ActorRemoved = _ => { }; // Will do bad things in multiplayer games - public bool DisableTick = false; + public bool EnableTick = true; + public void Tick() { // Todo: Expose this as an order so it can be synced - if (!DisableTick) + if (EnableTick) { using( new PerfSample("tick_idle") ) foreach( var ni in ActorsWithTrait() ) diff --git a/OpenRA.Mods.RA/Scripting/Media.cs b/OpenRA.Mods.RA/Scripting/Media.cs index 97dd9b0ee8..3db07b3422 100644 --- a/OpenRA.Mods.RA/Scripting/Media.cs +++ b/OpenRA.Mods.RA/Scripting/Media.cs @@ -19,7 +19,7 @@ namespace OpenRA.Scripting { var playerRoot = Game.OpenWindow(w, "FMVPLAYER"); var player = playerRoot.GetWidget("PLAYER"); - w.DisableTick = true; + w.EnableTick = false; player.Load(movie); // Mute world sounds @@ -39,7 +39,7 @@ namespace OpenRA.Scripting Widget.CloseWindow(); Sound.SoundVolumeModifier = oldModifier; - w.DisableTick = false; + w.EnableTick = true; onComplete(); }); }