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

Change spaces to tabs.

Browse Source 
To follow code style.
This commit is contained in:
RoosterDragon
2022-09-19 10:48:54 +01:00
committed by abcdefg30
parent 3f106bef72
commit 70c2ec15d3
7 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Map/ActorInitializer.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA
{ {
var init = GetOrDefault<T>(info); var init = GetOrDefault<T>(info);
if (init == null) 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; return init;
} }

2
OpenRA.Game/Support/Log.cs
View File

@@ -178,7 +178,7 @@ namespace OpenRA
public static void Write(string channelName, string format, params object[] args) 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() public static void Dispose()

4
OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs
View File

@@ -105,10 +105,10 @@ namespace OpenRA.Mods.Cnc.Traits
{ {
case TargetType.Actor: case TargetType.Actor:
return Info.Types.Overlaps(target.Actor.GetEnabledTargetTypes()) && 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: case TargetType.FrozenActor:
return target.FrozenActor.IsValid && Info.Types.Overlaps(target.FrozenActor.TargetTypes) && 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: default:
return false; return false;
} }

7
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -136,9 +136,10 @@ namespace OpenRA.Mods.Common.Orders
var ret = InnerOrder(world, cell, mi).ToArray(); var ret = InnerOrder(world, cell, mi).ToArray();
// If there was a successful placement order // If there was a successful placement order
if (ret.Any(o => o.OrderString == "PlaceBuilding" if (ret.Any(o =>
|| o.OrderString == "LineBuild" o.OrderString == "PlaceBuilding"
|| o.OrderString == "PlacePlug")) || o.OrderString == "LineBuild"
|| o.OrderString == "PlacePlug"))
world.CancelInputMode(); world.CancelInputMode();
return ret; return ret;

2
OpenRA.Mods.Common/Orders/UnitOrderGenerator.cs
View File

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Orders
return cursorOrder.Cursor; return cursorOrder.Cursor;
useSelect = target.Type == TargetType.Actor && target.Actor.Info.HasTraitInfo<ISelectableInfo>() && 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; return useSelect ? worldSelectCursor : worldDefaultCursor;

2
OpenRA.Mods.Common/UpdateRules/Rules/20200503/RenameStances.cs
View File

@@ -14,7 +14,7 @@ using System.Collections.Generic;
namespace OpenRA.Mods.Common.UpdateRules.Rules namespace OpenRA.Mods.Common.UpdateRules.Rules
{ {
public class RenameStances : UpdateRule public class RenameStances : UpdateRule
{ {
public override string Name => "Renamed player 'Stances' to 'Relationships'."; public override string Name => "Renamed player 'Stances' to 'Relationships'.";
public override string Description => public override string Description =>

6
OpenRA.Mods.Common/Widgets/Logic/SystemInfoPromptLogic.cs
View File

@@ -52,9 +52,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return ""; return "";
return $"&sysinfoversion={SystemInformationVersion}&" return $"&sysinfoversion={SystemInformationVersion}&"
+ GetSystemInformation() + GetSystemInformation()
.Select(kv => kv.Key + "=" + Uri.EscapeDataString(kv.Value.Value)) .Select(kv => kv.Key + "=" + Uri.EscapeDataString(kv.Value.Value))
.JoinWith("&"); .JoinWith("&");
} }
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]