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

Merge pull request #11082 from pchote/custom-rule-detection

Browse Source 
Fix and improve lobby custom rules warning.
This commit is contained in:
Oliver Brakmann
2016-04-10 14:52:06 +02:00
parent 602d96a8e1 aa061a5bc6
commit aac4820ac7
7 changed files with 79 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -398,7 +398,7 @@ namespace OpenRA.Mods.Common.Server
server.SendMessage("{0} changed the map to {1}.".F(client.Name, server.Map.Title));
if (server.Map.Rules.Actors != server.ModData.DefaultRules.Actors)
if (server.Map.DefinesUnsafeCustomRules)
server.SendMessage("This map contains custom rules. Game experience may change.");
if (server.Settings.DisableSinglePlayer)

2
OpenRA.Mods.Common/Traits/PaletteEffects/GlobalLightingPaletteEffect.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Used for day/night effects.")]
class GlobalLightingPaletteEffectInfo : ITraitInfo
class GlobalLightingPaletteEffectInfo : ITraitInfo, ILobbyCustomRulesIgnore
{
[Desc("Do not modify graphics that use any palette in this list.")]
public readonly HashSet<string> ExcludePalettes = new HashSet<string> { "cursor", "chrome", "colorpicker", "fog", "shroud", "alpha" };

2
OpenRA.Mods.Common/Traits/World/WeatherOverlay.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Adds a particle-based overlay.")]
public class WeatherOverlayInfo : ITraitInfo
public class WeatherOverlayInfo : ITraitInfo, ILobbyCustomRulesIgnore
{
[Desc("Factor for particle density. As higher as more particles will get spawned.")]
public readonly float ParticleDensityFactor = 0.0007625f;