Change spaces to tabs.
To follow code style.
This commit is contained in:
@@ -66,7 +66,7 @@ namespace OpenRA
|
||||
{
|
||||
var init = GetOrDefault<T>(info);
|
||||
if (init == null)
|
||||
throw new InvalidOperationException($"TypeDictionary does not contain instance of type `{typeof(T)}`");
|
||||
throw new InvalidOperationException($"TypeDictionary does not contain instance of type `{typeof(T)}`");
|
||||
|
||||
return init;
|
||||
}
|
||||
|
||||
@@ -178,7 +178,7 @@ namespace OpenRA
|
||||
|
||||
public static void Write(string channelName, string format, params object[] args)
|
||||
{
|
||||
ChannelWriter.TryWrite(new ChannelData(channelName, format.F(args)));
|
||||
ChannelWriter.TryWrite(new ChannelData(channelName, format.F(args)));
|
||||
}
|
||||
|
||||
public static void Dispose()
|
||||
|
||||
@@ -105,10 +105,10 @@ namespace OpenRA.Mods.Cnc.Traits
|
||||
{
|
||||
case TargetType.Actor:
|
||||
return Info.Types.Overlaps(target.Actor.GetEnabledTargetTypes()) &&
|
||||
Info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(target.Actor.Owner));
|
||||
Info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(target.Actor.Owner));
|
||||
case TargetType.FrozenActor:
|
||||
return target.FrozenActor.IsValid && Info.Types.Overlaps(target.FrozenActor.TargetTypes) &&
|
||||
Info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(target.FrozenActor.Owner));
|
||||
Info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(target.FrozenActor.Owner));
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -136,9 +136,10 @@ namespace OpenRA.Mods.Common.Orders
|
||||
var ret = InnerOrder(world, cell, mi).ToArray();
|
||||
|
||||
// If there was a successful placement order
|
||||
if (ret.Any(o => o.OrderString == "PlaceBuilding"
|
||||
|| o.OrderString == "LineBuild"
|
||||
|| o.OrderString == "PlacePlug"))
|
||||
if (ret.Any(o =>
|
||||
o.OrderString == "PlaceBuilding"
|
||||
|| o.OrderString == "LineBuild"
|
||||
|| o.OrderString == "PlacePlug"))
|
||||
world.CancelInputMode();
|
||||
|
||||
return ret;
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Orders
|
||||
return cursorOrder.Cursor;
|
||||
|
||||
useSelect = target.Type == TargetType.Actor && target.Actor.Info.HasTraitInfo<ISelectableInfo>() &&
|
||||
(mi.Modifiers.HasModifier(Modifiers.Shift) || !world.Selection.Actors.Any());
|
||||
(mi.Modifiers.HasModifier(Modifiers.Shift) || !world.Selection.Actors.Any());
|
||||
}
|
||||
|
||||
return useSelect ? worldSelectCursor : worldDefaultCursor;
|
||||
|
||||
@@ -14,7 +14,7 @@ using System.Collections.Generic;
|
||||
namespace OpenRA.Mods.Common.UpdateRules.Rules
|
||||
{
|
||||
public class RenameStances : UpdateRule
|
||||
{
|
||||
{
|
||||
public override string Name => "Renamed player 'Stances' to 'Relationships'.";
|
||||
|
||||
public override string Description =>
|
||||
|
||||
@@ -52,9 +52,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
return "";
|
||||
|
||||
return $"&sysinfoversion={SystemInformationVersion}&"
|
||||
+ GetSystemInformation()
|
||||
.Select(kv => kv.Key + "=" + Uri.EscapeDataString(kv.Value.Value))
|
||||
.JoinWith("&");
|
||||
+ GetSystemInformation()
|
||||
.Select(kv => kv.Key + "=" + Uri.EscapeDataString(kv.Value.Value))
|
||||
.JoinWith("&");
|
||||
}
|
||||
|
||||
[ObjectCreator.UseCtor]
|
||||
|
||||
Reference in New Issue
Block a user