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

made ToggleReady work through chat (/ready) rather than an order against an actor

Browse Source
This commit is contained in:
Chris Forbes
2010-03-17 21:26:57 +13:00
parent 66818543a8
commit 38172dcda5
3 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.FileFormats/ProtocolVersion.cs
View File

@@ -23,6 +23,6 @@ namespace OpenRA.FileFormats
public static class ProtocolVersion
{
// you *must* increment this whenever you make an incompatible protocol change
public static readonly int Version = 3;
public static readonly int Version = 4;
}
}

3
OpenRA.Game/Chrome.cs
View File

@@ -411,8 +411,7 @@ namespace OpenRA
void CycleReady(bool left)
{
Game.IssueOrder(
new Order("ToggleReady", Game.world.LocalPlayer.PlayerActor, "") { IsImmediate = true });
Game.IssueOrder(Order.Chat("/ready"));
}
void CycleSpawnPoint(bool left)

65
OpenRA.Game/Server/Server.cs
View File

@@ -258,6 +258,39 @@ namespace OpenRA.Server
{
var dict = new Dictionary<string, Func<string, bool>>
{
{ "ready",
s =>
{
// if we're downloading, we can't ready up.
var client = GetClient(conn);
if (client.State == Session.ClientState.NotReady)
client.State = Session.ClientState.Ready;
else if (client.State == Session.ClientState.Ready)
client.State = Session.ClientState.NotReady;
Console.WriteLine("Player @{0} is {1}",
conn.socket.RemoteEndPoint, client.State);
SyncLobbyInfo();
// start the game if everyone is ready.
if (conns.Count > 0 && conns.All(c => GetClient(c).State == Session.ClientState.Ready))
{
Console.WriteLine("All players are ready. Starting the game!");
GameStarted = true;
foreach( var c in conns )
foreach( var d in conns )
DispatchOrdersToClient( c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF } );
DispatchOrders(null, 0,
new ServerOrder("StartGame", "").Serialize());
PingMasterServer();
}
return true;
}},
{ "name",
s =>
{
@@ -431,38 +464,6 @@ namespace OpenRA.Server
{
switch (so.Name)
{
case "ToggleReady":
{
// if we're downloading, we can't ready up.
var client = GetClient(conn);
if (client.State == Session.ClientState.NotReady)
client.State = Session.ClientState.Ready;
else if (client.State == Session.ClientState.Ready)
client.State = Session.ClientState.NotReady;
Console.WriteLine("Player @{0} is {1}",
conn.socket.RemoteEndPoint, client.State);
SyncLobbyInfo();
// start the game if everyone is ready.
if (conns.Count > 0 && conns.All(c => GetClient(c).State == Session.ClientState.Ready))
{
Console.WriteLine("All players are ready. Starting the game!");
GameStarted = true;
foreach( var c in conns )
foreach( var d in conns )
DispatchOrdersToClient( c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF } );
DispatchOrders(null, 0,
new ServerOrder("StartGame", "").Serialize());
PingMasterServer();
}
}
break;
case "Chat":
if (so.Data.StartsWith("/"))
{