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

Allow custom commands to be parsed when the player is in a ready state.

Browse Source
This commit is contained in:
Paul Chote
2010-11-08 17:28:59 +13:00
parent d33806e932
commit ed4c588701
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,22 +254,15 @@ namespace OpenRA.Server
{ {
case "Command": case "Command":
{ {
if (GameStarted) bool handled = false;
SendChatTo(conn, "Cannot change state when game started. ({0})".F(so.Data)); foreach (var t in ServerTraits.WithInterface<IInterpretCommand>())
else if (GetClient(conn).State == Session.ClientState.Ready && !(so.Data == "ready" || so.Data == "startgame")) if ((handled = t.InterpretCommand(conn, GetClient(conn), so.Data)))
SendChatTo(conn, "Cannot change state when marked as ready."); break;
else
if (!handled)
{ {
bool handled = false; Log.Write("server", "Unknown server command: {0}", so.Data);
foreach (var t in ServerTraits.WithInterface<IInterpretCommand>()) SendChatTo(conn, "Unknown server command: {0}".F(so.Data));
if ((handled = t.InterpretCommand(conn, GetClient(conn), so.Data)))
break;
if (!handled)
{
Log.Write("server", "Unknown server command: {0}", so.Data);
SendChatTo(conn, "Unknown server command: {0}".F(so.Data));
}
} }
} }
break; break;

11
OpenRA.Game/ServerTraits/LobbyCommands.cs
View File

@@ -22,6 +22,17 @@ namespace OpenRA.Server.Traits
public bool InterpretCommand(Connection conn, Session.Client client, string cmd) public bool InterpretCommand(Connection conn, Session.Client client, string cmd)
{ {
if (Server.GameStarted)
{
Server.SendChatTo(conn, "Cannot change state when game started. ({0})".F(cmd));
return false;
}
else if (client.State == Session.ClientState.Ready && !(cmd == "ready" || cmd == "startgame"))
{
Server.SendChatTo(conn, "Cannot change state when marked as ready.");
return false;
}
var dict = new Dictionary<string, Func<string, bool>> var dict = new Dictionary<string, Func<string, bool>>
{ {
{ "ready", { "ready",

11
OpenRA.Game/ServerTraits/PlayerCommands.cs
View File

@@ -20,6 +20,17 @@ namespace OpenRA.Server.Traits
{ {
public bool InterpretCommand(Connection conn, Session.Client client, string cmd) public bool InterpretCommand(Connection conn, Session.Client client, string cmd)
{ {
if (Server.GameStarted)
{
Server.SendChatTo(conn, "Cannot change state when game started. ({0})".F(cmd));
return false;
}
else if (client.State == Session.ClientState.Ready && !(cmd == "ready" || cmd == "startgame"))
{
Server.SendChatTo(conn, "Cannot change state when marked as ready.");
return false;
}
var dict = new Dictionary<string, Func<string, bool>> var dict = new Dictionary<string, Func<string, bool>>
{ {
{ "name", { "name",