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

Use DefaultCash for the default cash.

Browse Source
This commit is contained in:
Paul Chote
2016-02-29 19:57:30 +00:00
parent 76b1810925
commit e34864fe40
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -648,13 +648,14 @@ namespace OpenRA.Mods.Common.Server
return true;
}
if (server.Map.Options.StartingCash.HasValue)
var playerResources = server.Map.Rules.Actors["player"].TraitInfo<PlayerResourcesInfo>();
if (playerResources.DefaultCashLocked)
{
server.SendOrderTo(conn, "Message", "Map has disabled cash configuration.");
return true;
}
var startingCashOptions = server.Map.Rules.Actors["player"].TraitInfo<PlayerResourcesInfo>().SelectableCash;
var startingCashOptions = playerResources.SelectableCash;
var requestedCash = Exts.ParseIntegerInvariant(s);
if (!startingCashOptions.Contains(requestedCash))
{
@@ -1026,6 +1027,9 @@ namespace OpenRA.Mods.Common.Server
gs.Fog = shroud.FogEnabled;
gs.Shroud = !shroud.ExploredMapEnabled;
var resources = server.Map.Rules.Actors["player"].TraitInfo<PlayerResourcesInfo>();
gs.StartingCash = resources.DefaultCash;
server.Map.Options.UpdateServerSettings(server.LobbyInfo.GlobalSettings);
}