order latency via lobbyinfo

This commit is contained in:
Chris Forbes
2010-01-16 11:22:01 +13:00
parent 705954ebca
commit b0fed3be91
3 changed files with 12 additions and 17 deletions

View File

@@ -216,8 +216,8 @@ namespace OpenRA.Server
Console.WriteLine("Order lag is now {0} frames.", lag); Console.WriteLine("Order lag is now {0} frames.", lag);
DispatchOrders(null, 0, lobbyInfo.GlobalSettings.OrderLatency = lag;
new ServerOrder(0, "SetLag", lag.ToString()).Serialize()); SyncLobbyInfo();
return true; return true;
}}, }},
{ "race", { "race",

View File

@@ -377,9 +377,18 @@ namespace OpenRa.Game
if (mapName != LobbyInfo.GlobalSettings.Map) if (mapName != LobbyInfo.GlobalSettings.Map)
{ {
chat.AddLine(Color.White, "Debug", "Map change {0} -> {1}".F(mapName, session.GlobalSettings.Map)); chat.AddLine(Color.White, "Debug",
"Map change {0} -> {1}".F(mapName, session.GlobalSettings.Map));
ChangeMap(LobbyInfo.GlobalSettings.Map); ChangeMap(LobbyInfo.GlobalSettings.Map);
} }
if (Game.orderManager.FramesAhead != LobbyInfo.GlobalSettings.OrderLatency
&& !Game.orderManager.GameStarted)
{
Game.orderManager.FramesAhead = LobbyInfo.GlobalSettings.OrderLatency;
Game.chat.AddLine(Color.White, "Server",
"Order lag is now {0} frames.".F(LobbyInfo.GlobalSettings.OrderLatency));
}
} }
} }
} }

View File

@@ -49,19 +49,6 @@ namespace OpenRa.Game.Orders
Game.chat.AddLine(order.Player, "is now YOU."); Game.chat.AddLine(order.Player, "is now YOU.");
break; break;
} }
case "SetLag":
{
int lag = int.Parse(order.TargetString);
if (Game.orderManager.GameStarted)
{
Game.chat.AddLine(Color.White, "Server", "Failed to change lag to {0} frames".F(lag));
return;
}
Game.orderManager.FramesAhead = lag;
Game.chat.AddLine(Color.White, "Server", "Order lag is now {0} frames.".F(lag));
break;
}
case "StartGame": case "StartGame":
{ {
Game.chat.AddLine(Color.White, "Server", "The game has started."); Game.chat.AddLine(Color.White, "Server", "The game has started.");
@@ -70,7 +57,6 @@ namespace OpenRa.Game.Orders
} }
case "SyncInfo": case "SyncInfo":
{ {
// Game.chat.AddLine(Color.White, "Server", "Synchronizing lobby info...");
Game.SyncLobbyInfo(order.TargetString); Game.SyncLobbyInfo(order.TargetString);
break; break;
} }