netplay readying cleanup

This commit is contained in:
Chris Forbes
2010-01-16 18:47:28 +13:00
parent e01f684878
commit e920ee8c92
5 changed files with 30 additions and 17 deletions

View File

@@ -160,13 +160,12 @@ namespace OpenRa.Game
buttons.Clear();
renderer.Device.DisableScissor();
renderer.DrawText("RenderFrame {0} ({2:F1} ms)\nTick {1} ({3:F1} ms)\nReady: {4} (F8 to toggle)".F(
renderer.DrawText("RenderFrame {0} ({2:F1} ms)\nTick {1} ({3:F1} ms)\n".F(
Game.RenderFrame,
Game.orderManager.FrameNumber,
PerfHistory.items["render"].LastValue,
PerfHistory.items["tick_time"].LastValue,
Game.LocalPlayer.IsReady ? "Yes" : "No"
), new int2(140, 15), Color.White);
PerfHistory.items["tick_time"].LastValue),
new int2(140, 15), Color.White);
if (Game.Settings.PerfGraph)
PerfHistory.Render(renderer, Game.worldRenderer.lineRenderer);

View File

@@ -146,10 +146,8 @@ namespace OpenRa.Game
/* hack hack hack */
if (e.KeyCode == Keys.F8 && !Game.orderManager.GameStarted)
{
Game.LocalPlayer.IsReady ^= true;
Game.controller.AddOrder(
new Order( "ToggleReady", Game.LocalPlayer.PlayerActor, null, int2.Zero,
Game.LocalPlayer.IsReady ? "ready" : "not ready") { IsImmediate = true });
new Order( "ToggleReady", Game.LocalPlayer.PlayerActor, null, int2.Zero, "") { IsImmediate = true });
}
/* temporary hack: DO NOT LEAVE IN */

View File

@@ -26,8 +26,6 @@ namespace OpenRa.Game
public int PowerProvided = 0;
public int PowerDrained = 0;
public bool IsReady;
public Shroud Shroud = new Shroud();
public Dictionary<string, SupportPower> SupportPowers;