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

691,697 fixed

Browse Source
This commit is contained in:
Chris Forbes
2011-04-14 12:13:08 +12:00
parent d221cb1902
commit f45ec6f918
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
View File

@@ -74,19 +74,6 @@ namespace OpenRA.Mods.RA.Server
server.SyncLobbyInfo(); server.SyncLobbyInfo();
return true; return true;
}}, }},
{ "spectator",
s =>
{
var slotData = server.lobbyInfo.Slots.Where(ax => ax.Spectator && !server.lobbyInfo.Clients.Any(l => l.Slot == ax.Index)).FirstOrDefault();
if (slotData == null)
return true;
client.Slot = slotData.Index;
S.SyncClientToPlayerReference(client, slotData.MapPlayer != null ? server.Map.Players[slotData.MapPlayer] : null);
server.SyncLobbyInfo();
return true;
}},
{ "slot", { "slot",
s => s =>
{ {
@@ -101,6 +88,10 @@ namespace OpenRA.Mods.RA.Server
client.Slot = slot; client.Slot = slot;
S.SyncClientToPlayerReference(client, slotData.MapPlayer != null ? server.Map.Players[slotData.MapPlayer] : null); S.SyncClientToPlayerReference(client, slotData.MapPlayer != null ? server.Map.Players[slotData.MapPlayer] : null);
// if we're entering a spectator slot, relinquish our spawnpoint.
if (slotData.Spectator)
client.SpawnPoint = 0;
server.SyncLobbyInfo(); server.SyncLobbyInfo();
return true; return true;
}}, }},

6
OpenRA.Mods.RA/ServerTraits/PlayerCommands.cs
View File

@@ -71,6 +71,12 @@ namespace OpenRA.Mods.RA.Server
return false; return false;
} }
if (server.lobbyInfo.Slots[client.Slot].Spectator)
{
server.SendChatTo( conn, "Can't select a spawnpoint as a spectator" );
return false;
}
if (server.lobbyInfo.Clients.Where( c => c != client ).Any( c => (c.SpawnPoint == spawnPoint) && (c.SpawnPoint != 0) )) if (server.lobbyInfo.Clients.Where( c => c != client ).Any( c => (c.SpawnPoint == spawnPoint) && (c.SpawnPoint != 0) ))
{ {
server.SendChatTo( conn, "You can't be at the same spawn point as another player" ); server.SendChatTo( conn, "You can't be at the same spawn point as another player" );