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

Fix RCS1061

Browse Source
This commit is contained in:
RoosterDragon
2023-03-18 12:16:52 +00:00
committed by Gustas
parent 5d91b678bb
commit 4dd787be13
32 changed files with 167 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@@ -980,6 +980,9 @@ dotnet_diagnostic.RCS1058.severity = warning
# Avoid locking on publicly accessible instance.
dotnet_diagnostic.RCS1059.severity = warning
# Merge 'if' with nested 'if'.
dotnet_diagnostic.RCS1061.severity = warning
# Remove empty 'finally' clause.
dotnet_diagnostic.RCS1066.severity = warning

38
OpenRA.Game/FieldLoader.cs
View File

@@ -195,11 +195,11 @@ namespace OpenRA
if (value != null)
{
var parts = value.Split(SplitComma);
if (parts.Length == 3)
{
if (WDist.TryParse(parts[0], out var rx) && WDist.TryParse(parts[1], out var ry) && WDist.TryParse(parts[2], out var rz))
return new WVec(rx, ry, rz);
}
if (parts.Length == 3
&& WDist.TryParse(parts[0], out var rx)
&& WDist.TryParse(parts[1], out var ry)
&& WDist.TryParse(parts[2], out var rz))
return new WVec(rx, ry, rz);
}
return InvalidValueAction(value, fieldType, fieldName);
@@ -219,8 +219,8 @@ namespace OpenRA
for (var i = 0; i < vecs.Length; ++i)
{
if (WDist.TryParse(parts[3 * i], out var rx)
&& WDist.TryParse(parts[3 * i + 1], out var ry)
&& WDist.TryParse(parts[3 * i + 2], out var rz))
&& WDist.TryParse(parts[3 * i + 1], out var ry)
&& WDist.TryParse(parts[3 * i + 2], out var rz))
vecs[i] = new WVec(rx, ry, rz);
}
@@ -235,13 +235,11 @@ namespace OpenRA
if (value != null)
{
var parts = value.Split(SplitComma);
if (parts.Length == 3)
{
if (WDist.TryParse(parts[0], out var rx)
&& WDist.TryParse(parts[1], out var ry)
&& WDist.TryParse(parts[2], out var rz))
return new WPos(rx, ry, rz);
}
if (parts.Length == 3
&& WDist.TryParse(parts[0], out var rx)
&& WDist.TryParse(parts[1], out var ry)
&& WDist.TryParse(parts[2], out var rz))
return new WPos(rx, ry, rz);
}
return InvalidValueAction(value, fieldType, fieldName);
@@ -259,13 +257,11 @@ namespace OpenRA
if (value != null)
{
var parts = value.Split(SplitComma);
if (parts.Length == 3)
{
if (Exts.TryParseInt32Invariant(parts[0], out var rr)
&& Exts.TryParseInt32Invariant(parts[1], out var rp)
&& Exts.TryParseInt32Invariant(parts[2], out var ry))
return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
}
if (parts.Length == 3
&& Exts.TryParseInt32Invariant(parts[0], out var rr)
&& Exts.TryParseInt32Invariant(parts[1], out var rp)
&& Exts.TryParseInt32Invariant(parts[2], out var ry))
return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
}
return InvalidValueAction(value, fieldType, fieldName);

19
OpenRA.Game/FileSystem/FileSystem.cs
View File

@@ -226,14 +226,11 @@ namespace OpenRA.FileSystem
public bool TryOpen(string filename, out Stream s)
{
var explicitSplit = filename.IndexOf('|');
if (explicitSplit > 0)
if (explicitSplit > 0 && explicitMounts.TryGetValue(filename[..explicitSplit], out var explicitPackage))
{
if (explicitMounts.TryGetValue(filename[..explicitSplit], out var explicitPackage))
{
s = explicitPackage.GetStream(filename[(explicitSplit + 1)..]);
if (s != null)
return true;
}
s = explicitPackage.GetStream(filename[(explicitSplit + 1)..]);
if (s != null)
return true;
}
s = GetFromCache(filename);
@@ -262,10 +259,10 @@ namespace OpenRA.FileSystem
public bool Exists(string filename)
{
var explicitSplit = filename.IndexOf('|');
if (explicitSplit > 0)
if (explicitMounts.TryGetValue(filename[..explicitSplit], out var explicitPackage))
if (explicitPackage.Contains(filename[(explicitSplit + 1)..]))
return true;
if (explicitSplit > 0 &&
explicitMounts.TryGetValue(filename[..explicitSplit], out var explicitPackage) &&
explicitPackage.Contains(filename[(explicitSplit + 1)..]))
return true;
return fileIndex.ContainsKey(filename);
}

5
OpenRA.Game/Network/GameServer.cs
View File

@@ -169,9 +169,8 @@ namespace OpenRA.Network
}
// Games advertised using the old API calculated the play time locally
if (State == 2 && PlayTime < 0)
if (DateTime.TryParse(Started, out var startTime))
PlayTime = (int)(DateTime.UtcNow - startTime).TotalSeconds;
if (State == 2 && PlayTime < 0 && DateTime.TryParse(Started, out var startTime))
PlayTime = (int)(DateTime.UtcNow - startTime).TotalSeconds;
var externalKey = ExternalMod.MakeKey(Mod, Version);
if (Game.ExternalMods.TryGetValue(externalKey, out var external) && external.Version == Version)

9
OpenRA.Game/Scripting/ScriptTypes.cs
View File

@@ -40,13 +40,10 @@ namespace OpenRA.Scripting
t = nullable;
// Value wraps a CLR object
if (value.TryGetClrObject(out var temp))
if (value.TryGetClrObject(out var temp) && temp.GetType() == t)
{
if (temp.GetType() == t)
{
clrObject = temp;
return true;
}
clrObject = temp;
return true;
}
if (value is LuaNil && !t.IsValueType)

5
OpenRA.Game/Server/Connection.cs
View File

@@ -153,9 +153,8 @@ namespace OpenRA.Server
return;
// Regularly check player ping
if (lastPingSent.ElapsedMilliseconds > 1000)
if (TrySendData(CreatePingFrame()))
lastPingSent.Restart();
if (lastPingSent.ElapsedMilliseconds > 1000 && TrySendData(CreatePingFrame()))
lastPingSent.Restart();
// Send all data immediately, we will block again on read
while (sendQueue.TryTake(out var data, 0))

10
OpenRA.Game/Support/VariableExpression.cs
View File

@@ -750,13 +750,11 @@ namespace OpenRA.Support
public void Push(Expression expression, ExpressionType type)
{
expressions.Add(expression);
if (type == ExpressionType.Int)
if (expression.Type != typeof(int))
throw new InvalidOperationException($"Expected System.Int type instead of {expression.Type} for {expression}");
if (type == ExpressionType.Int && expression.Type != typeof(int))
throw new InvalidOperationException($"Expected System.Int type instead of {expression.Type} for {expression}");
if (type == ExpressionType.Bool)
if (expression.Type != typeof(bool))
throw new InvalidOperationException($"Expected System.Boolean type instead of {expression.Type} for {expression}");
if (type == ExpressionType.Bool && expression.Type != typeof(bool))
throw new InvalidOperationException($"Expected System.Boolean type instead of {expression.Type} for {expression}");
types.Add(type);
}

5
OpenRA.Game/Widgets/Widget.cs
View File

@@ -312,9 +312,8 @@ namespace OpenRA.Widgets
return true;
foreach (var child in Children)
if (child.IsVisible())
if (child.EventBoundsContains(location))
return true;
if (child.IsVisible() && child.EventBoundsContains(location))
return true;
return false;
}

7
OpenRA.Mods.Cnc/FileFormats/BlowfishKeyProvider.cs
View File

@@ -378,11 +378,8 @@ namespace OpenRA.Mods.Cnc.FileFormats
if (tmp > 0)
{
MulBignumWord(esi, globOne, tmp, 2 * len);
if ((*edi & 0x8000) == 0)
{
if (SubBigNum((uint*)esi, (uint*)esi, g1, 0, (int)len) != 0)
(*edi)--;
}
if ((*edi & 0x8000) == 0 && SubBigNum((uint*)esi, (uint*)esi, g1, 0, (int)len) != 0)
(*edi)--;
}
}

7
OpenRA.Mods.Cnc/FileSystem/MixFile.cs
View File

@@ -235,10 +235,9 @@ namespace OpenRA.Mods.Cnc.FileSystem
}
// Load the global mix database
if (globalFilenames == null)
if (context.TryOpen("global mix database.dat", out var mixDatabase))
using (var db = new XccGlobalDatabase(mixDatabase))
globalFilenames = db.Entries.ToHashSet().ToArray();
if (globalFilenames == null && context.TryOpen("global mix database.dat", out var mixDatabase))
using (var db = new XccGlobalDatabase(mixDatabase))
globalFilenames = db.Entries.ToHashSet().ToArray();
package = new MixFile(s, filename, globalFilenames ?? Array.Empty<string>());
return true;

11
OpenRA.Mods.Cnc/Graphics/ClassicTilesetSpecificSpriteSequence.cs
View File

@@ -60,14 +60,11 @@ namespace OpenRA.Mods.Cnc.Graphics
var tilesetNode = node.Value.NodeWithKeyOrDefault(tileset);
if (tilesetNode != null)
{
if (frames == null)
if (frames == null && LoadField<string>("Length", null, data) != "*")
{
if (LoadField<string>("Length", null, data) != "*")
{
var subStart = LoadField("Start", 0, data);
var subLength = LoadField("Length", 1, data);
frames = Exts.MakeArray(subLength, i => subStart + i);
}
var subStart = LoadField("Start", 0, data);
var subLength = LoadField("Length", 1, data);
frames = Exts.MakeArray(subLength, i => subStart + i);
}
return new[] { new ReservationInfo(tilesetNode.Value.Value, frames, frames, tilesetNode.Location) };

9
OpenRA.Mods.Cnc/Traits/MadTank.cs
View File

@@ -203,13 +203,10 @@ namespace OpenRA.Mods.Cnc.Traits
mad.initiated = true;
}
if (++ticks % mad.info.ThumpInterval == 0)
if (++ticks % mad.info.ThumpInterval == 0 && mad.info.ThumpDamageWeapon != null)
{
if (mad.info.ThumpDamageWeapon != null)
{
// Use .FromPos since this weapon needs to affect more than just the MadTank actor
mad.info.ThumpDamageWeaponInfo.Impact(Target.FromPos(self.CenterPosition), self);
}
// Use .FromPos since this weapon needs to affect more than just the MadTank actor
mad.info.ThumpDamageWeaponInfo.Impact(Target.FromPos(self.CenterPosition), self);
}
if (ticks == mad.info.ChargeDelay)

10
OpenRA.Mods.Cnc/UtilityCommands/ImportGen2MapCommand.cs
View File

@@ -441,14 +441,12 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
// Only import the top-left cell of multi-celled overlays
// Returning true here means this is a part of a bigger overlay that has already been handled.
var aboveType = overlayPack[overlayIndex[cell - new CVec(1, 0)]];
if (shape.Width > 1 && aboveType != 0xFF)
if (OverlayToActor.TryGetValue(aboveType, out var a) && a == actorType)
return true;
if (shape.Width > 1 && aboveType != 0xFF && OverlayToActor.TryGetValue(aboveType, out var a) && a == actorType)
return true;
var leftType = overlayPack[overlayIndex[cell - new CVec(0, 1)]];
if (shape.Height > 1 && leftType != 0xFF)
if (OverlayToActor.TryGetValue(leftType, out var a) && a == actorType)
return true;
if (shape.Height > 1 && leftType != 0xFF && OverlayToActor.TryGetValue(leftType, out var l) && l == actorType)
return true;
}
actorReference = new ActorReference(actorType)

10
OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianSunMapCommand.cs
View File

@@ -282,14 +282,12 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
// Only import the top-left cell of multi-celled overlays
// Returning true here means this is a part of a bigger overlay that has already been handled.
var aboveType = overlayPack[overlayIndex[cell - new CVec(1, 0)]];
if (shape.Width > 1 && aboveType != 0xFF)
if (OverlayToActor.TryGetValue(aboveType, out var a) && a == actorType)
return true;
if (shape.Width > 1 && aboveType != 0xFF && OverlayToActor.TryGetValue(aboveType, out var a) && a == actorType)
return true;
var leftType = overlayPack[overlayIndex[cell - new CVec(0, 1)]];
if (shape.Height > 1 && leftType != 0xFF)
if (OverlayToActor.TryGetValue(leftType, out var a) && a == actorType)
return true;
if (shape.Height > 1 && leftType != 0xFF && OverlayToActor.TryGetValue(leftType, out var l) && l == actorType)
return true;
}
// Fix position of vein hole actors.

11
OpenRA.Mods.Common/Graphics/TilesetSpecificSpriteSequence.cs
View File

@@ -58,14 +58,11 @@ namespace OpenRA.Mods.Common.Graphics
var tilesetNode = node.Value.NodeWithKeyOrDefault(tileset);
if (tilesetNode != null)
{
if (frames == null)
if (frames == null && LoadField<string>("Length", null, data) != "*")
{
if (LoadField<string>("Length", null, data) != "*")
{
var subStart = LoadField("Start", 0, data);
var subLength = LoadField("Length", 1, data);
frames = Exts.MakeArray(subLength, i => subStart + i);
}
var subStart = LoadField("Start", 0, data);
var subLength = LoadField("Length", 1, data);
frames = Exts.MakeArray(subLength, i => subStart + i);
}
return new[] { new ReservationInfo(tilesetNode.Value.Value, frames, frames, tilesetNode.Location) };

7
OpenRA.Mods.Common/Lint/CheckChromeHotkeys.cs
View File

@@ -109,9 +109,10 @@ namespace OpenRA.Mods.Common.Lint
}
foreach (var n in node.Value.Nodes)
if (checkArgKeys.Contains(n.Key))
if (!namedKeys.Contains(n.Value.Value) && !Hotkey.TryParse(n.Value.Value, out var unused))
emitError($"{filename} {node.Value.Value}:{n.Key} refers to a Key named `{n.Value.Value}` that does not exist.");
if (checkArgKeys.Contains(n.Key) &&
!namedKeys.Contains(n.Value.Value) &&
!Hotkey.TryParse(n.Value.Value, out var unused))
emitError($"{filename} {node.Value.Value}:{n.Key} refers to a Key named `{n.Value.Value}` that does not exist.");
}
if (node.Value.Nodes != null)

5
OpenRA.Mods.Common/Lint/CheckOwners.cs
View File

@@ -40,9 +40,8 @@ namespace OpenRA.Mods.Common.Lint
if (!playerNames.Contains(ownerName))
emitError($"Actor `{kv.Key}` is owned by unknown player `{ownerName}`.");
if (actorsWithRequiredOwner.TryGetValue(kv.Value.Value, out var info))
if (!info.ValidOwnerNames.Contains(ownerName))
emitError($"Actor `{kv.Key}` owner `{ownerName}` is not one of ValidOwnerNames: {info.ValidOwnerNames.JoinWith(", ")}");
if (actorsWithRequiredOwner.TryGetValue(kv.Value.Value, out var info) && !info.ValidOwnerNames.Contains(ownerName))
emitError($"Actor `{kv.Key}` owner `{ownerName}` is not one of ValidOwnerNames: {info.ValidOwnerNames.JoinWith(", ")}");
}
}
}

12
OpenRA.Mods.Common/Lint/CheckTranslationReference.cs
View File

@@ -256,9 +256,9 @@ namespace OpenRA.Mods.Common.Lint
if (element is Placeable placeable)
{
var expression = placeable.Expression;
if (expression is IInlineExpression inlineExpression)
if (inlineExpression is VariableReference variableReference)
CheckVariableReference(variableReference.Id.Name.ToString(), key, attribute, emitWarning, file);
if (expression is IInlineExpression inlineExpression &&
inlineExpression is VariableReference variableReference)
CheckVariableReference(variableReference.Id.Name.ToString(), key, attribute, emitWarning, file);
if (expression is SelectExpression selectExpression)
{
@@ -269,9 +269,9 @@ namespace OpenRA.Mods.Common.Lint
if (variantElement is Placeable variantPlaceable)
{
var variantExpression = variantPlaceable.Expression;
if (variantExpression is IInlineExpression variantInlineExpression)
if (variantInlineExpression is VariableReference variantVariableReference)
CheckVariableReference(variantVariableReference.Id.Name.ToString(), key, attribute, emitWarning, file);
if (variantExpression is IInlineExpression variantInlineExpression &&
variantInlineExpression is VariableReference variantVariableReference)
CheckVariableReference(variantVariableReference.Id.Name.ToString(), key, attribute, emitWarning, file);
}
}
}

5
OpenRA.Mods.Common/Projectiles/Bullet.cs
View File

@@ -377,9 +377,8 @@ namespace OpenRA.Mods.Common.Projectiles
// If the impact position is within any actor's HitShape, we have a direct hit
// PERF: Avoid using TraitsImplementing<HitShape> that needs to find the actor in the trait dictionary.
foreach (var targetPos in victim.EnabledTargetablePositions)
if (targetPos is HitShape h)
if (h.DistanceFromEdge(victim, pos).Length <= 0)
return true;
if (targetPos is HitShape h && h.DistanceFromEdge(victim, pos).Length <= 0)
return true;
}
return false;

7
OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
View File

@@ -94,9 +94,10 @@ namespace OpenRA.Mods.Common.Traits
var pos = self.CenterPosition;
var armaments = ChooseArmamentsForTarget(target, forceAttack);
foreach (var a in armaments)
if (target.IsInRange(pos, a.MaxRange()) && (a.Weapon.MinRange == WDist.Zero || !target.IsInRange(pos, a.Weapon.MinRange)))
if (TargetInFiringArc(self, target, Info.FacingTolerance))
return true;
if (target.IsInRange(pos, a.MaxRange()) &&
(a.Weapon.MinRange == WDist.Zero || !target.IsInRange(pos, a.Weapon.MinRange)) &&
TargetInFiringArc(self, target, Info.FacingTolerance))
return true;
return false;
}

10
OpenRA.Mods.Common/Traits/BotModules/BotModuleLogic/BaseBuilderQueueManager.cs
View File

@@ -247,13 +247,11 @@ namespace OpenRA.Mods.Common.Traits
a => a.TraitInfos<PowerInfo>().Where(i => i.EnabledByDefault).Sum(p => p.Amount));
// First priority is to get out of a low power situation
if (playerPower != null && playerPower.ExcessPower < minimumExcessPower)
if (playerPower != null && playerPower.ExcessPower < minimumExcessPower &&
power != null && power.TraitInfos<PowerInfo>().Where(i => i.EnabledByDefault).Sum(p => p.Amount) > 0)
{
if (power != null && power.TraitInfos<PowerInfo>().Where(i => i.EnabledByDefault).Sum(p => p.Amount) > 0)
{
AIUtils.BotDebug("{0} decided to build {1}: Priority override (low power)", queue.Actor.Owner, power.Name);
return power;
}
AIUtils.BotDebug("{0} decided to build {1}: Priority override (low power)", queue.Actor.Owner, power.Name);
return power;
}
// Next is to build up a strong economy

11
OpenRA.Mods.Common/Traits/BotModules/BuildingRepairBotModule.cs
View File

@@ -34,14 +34,11 @@ namespace OpenRA.Mods.Common.Traits
return;
var rb = self.TraitOrDefault<RepairableBuilding>();
if (rb != null)
if (rb != null && e.DamageState > DamageState.Light && e.PreviousDamageState <= DamageState.Light && !rb.RepairActive)
{
if (e.DamageState > DamageState.Light && e.PreviousDamageState <= DamageState.Light && !rb.RepairActive)
{
AIUtils.BotDebug("{0} noticed damage {1} {2}->{3}, repairing.",
self.Owner, self, e.PreviousDamageState, e.DamageState);
bot.QueueOrder(new Order("RepairBuilding", self.Owner.PlayerActor, Target.FromActor(self), false));
}
AIUtils.BotDebug("{0} noticed damage {1} {2}->{3}, repairing.",
self.Owner, self, e.PreviousDamageState, e.DamageState);
bot.QueueOrder(new Order("RepairBuilding", self.Owner.PlayerActor, Target.FromActor(self), false));
}
}
}

10
OpenRA.Mods.Common/Traits/Conditions/ExternalCondition.cs
View File

@@ -75,11 +75,13 @@ namespace OpenRA.Mods.Common.Traits
// Timed tokens do not count towards the source cap: the condition with the shortest
// remaining duration can always be revoked to make room.
if (Info.SourceCap > 0)
if (permanentTokens.TryGetValue(source, out var permanentTokensForSource) && permanentTokensForSource.Count >= Info.SourceCap)
return false;
if (Info.SourceCap > 0 &&
permanentTokens.TryGetValue(source, out var permanentTokensForSource) &&
permanentTokensForSource.Count >= Info.SourceCap)
return false;
if (Info.TotalCap > 0 && permanentTokens.Values.Sum(t => t.Count) >= Info.TotalCap)
if (Info.TotalCap > 0 &&
permanentTokens.Values.Sum(t => t.Count) >= Info.TotalCap)
return false;
return true;

35
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnAttack.cs
View File

@@ -93,29 +93,34 @@ namespace OpenRA.Mods.Common.Traits
static bool TargetChanged(in Target lastTarget, in Target target)
{
// Invalidate reveal changing the target.
if (lastTarget.Type == TargetType.FrozenActor && target.Type == TargetType.Actor)
if (lastTarget.FrozenActor.Actor == target.Actor)
return false;
if (lastTarget.Type == TargetType.FrozenActor &&
target.Type == TargetType.Actor &&
lastTarget.FrozenActor.Actor == target.Actor)
return false;
if (lastTarget.Type == TargetType.Actor && target.Type == TargetType.FrozenActor)
if (target.FrozenActor.Actor == lastTarget.Actor)
return false;
if (lastTarget.Type == TargetType.Actor &&
target.Type == TargetType.FrozenActor &&
target.FrozenActor.Actor == lastTarget.Actor)
return false;
if (lastTarget.Type != target.Type)
return true;
// Invalidate attacking different targets with shared target types.
if (lastTarget.Type == TargetType.Actor && target.Type == TargetType.Actor)
if (lastTarget.Actor != target.Actor)
return true;
if (lastTarget.Type == TargetType.Actor &&
target.Type == TargetType.Actor &&
lastTarget.Actor != target.Actor)
return true;
if (lastTarget.Type == TargetType.FrozenActor && target.Type == TargetType.FrozenActor)
if (lastTarget.FrozenActor != target.FrozenActor)
return true;
if (lastTarget.Type == TargetType.FrozenActor &&
target.Type == TargetType.FrozenActor &&
lastTarget.FrozenActor != target.FrozenActor)
return true;
if (lastTarget.Type == TargetType.Terrain && target.Type == TargetType.Terrain)
if (lastTarget.CenterPosition != target.CenterPosition)
return true;
if (lastTarget.Type == TargetType.Terrain &&
target.Type == TargetType.Terrain &&
lastTarget.CenterPosition != target.CenterPosition)
return true;
return false;
}

17
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnClientDock.cs
View File

@@ -48,17 +48,16 @@ namespace OpenRA.Mods.Common.Traits
void INotifyDockClient.Docked(Actor self, Actor host)
{
if (info.Condition != null && (info.DockHostNames == null || info.DockHostNames.Contains(host.Info.Name)))
if (info.Condition != null &&
(info.DockHostNames == null || info.DockHostNames.Contains(host.Info.Name)) &&
token == Actor.InvalidConditionToken)
{
if (token == Actor.InvalidConditionToken)
if (delayedtoken == Actor.InvalidConditionToken)
token = self.GrantCondition(info.Condition);
else
{
if (delayedtoken == Actor.InvalidConditionToken)
token = self.GrantCondition(info.Condition);
else
{
token = delayedtoken;
delayedtoken = Actor.InvalidConditionToken;
}
token = delayedtoken;
delayedtoken = Actor.InvalidConditionToken;
}
}
}

17
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnHostDock.cs
View File

@@ -48,17 +48,16 @@ namespace OpenRA.Mods.Common.Traits
void INotifyDockHost.Docked(Actor self, Actor client)
{
if (info.Condition != null && (info.DockClientNames == null || info.DockClientNames.Contains(client.Info.Name)))
if (info.Condition != null &&
(info.DockClientNames == null || info.DockClientNames.Contains(client.Info.Name)) &&
token == Actor.InvalidConditionToken)
{
if (token == Actor.InvalidConditionToken)
if (delayedtoken == Actor.InvalidConditionToken)
token = self.GrantCondition(info.Condition);
else
{
if (delayedtoken == Actor.InvalidConditionToken)
token = self.GrantCondition(info.Condition);
else
{
token = delayedtoken;
delayedtoken = Actor.InvalidConditionToken;
}
token = delayedtoken;
delayedtoken = Actor.InvalidConditionToken;
}
}
}

15
OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
View File

@@ -97,15 +97,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var palettePresetRows = 2;
var paletteCustomRows = 1;
if (logicArgs.TryGetValue("PaletteColumns", out var yaml))
if (!int.TryParse(yaml.Value, out paletteCols))
throw new YamlException($"Invalid value for PaletteColumns: {yaml.Value}");
if (logicArgs.TryGetValue("PalettePresetRows", out yaml))
if (!int.TryParse(yaml.Value, out palettePresetRows))
throw new YamlException($"Invalid value for PalettePresetRows: {yaml.Value}");
if (logicArgs.TryGetValue("PaletteCustomRows", out yaml))
if (!int.TryParse(yaml.Value, out paletteCustomRows))
throw new YamlException($"Invalid value for PaletteCustomRows: {yaml.Value}");
if (logicArgs.TryGetValue("PaletteColumns", out var yaml) && !int.TryParse(yaml.Value, out paletteCols))
throw new YamlException($"Invalid value for PaletteColumns: {yaml.Value}");
if (logicArgs.TryGetValue("PalettePresetRows", out yaml) && !int.TryParse(yaml.Value, out palettePresetRows))
throw new YamlException($"Invalid value for PalettePresetRows: {yaml.Value}");
if (logicArgs.TryGetValue("PaletteCustomRows", out yaml) && !int.TryParse(yaml.Value, out paletteCustomRows))
throw new YamlException($"Invalid value for PaletteCustomRows: {yaml.Value}");
var presetColors = colorManager.PresetColors;
for (var j = 0; j < palettePresetRows; j++)

13
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorEditLogic.cs
View File

@@ -140,15 +140,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
// Check for duplicate actor ID
if (!CurrentActor.ID.Equals(actorId, StringComparison.OrdinalIgnoreCase))
if (!CurrentActor.ID.Equals(actorId, StringComparison.OrdinalIgnoreCase) && editorActorLayer[actorId] != null)
{
if (editorActorLayer[actorId] != null)
{
nextActorIDStatus = ActorIDStatus.Duplicate;
actorIDErrorLabel.Text = TranslationProvider.GetString(DuplicateActorId);
actorIDErrorLabel.Visible = true;
return;
}
nextActorIDStatus = ActorIDStatus.Duplicate;
actorIDErrorLabel.Text = TranslationProvider.GetString(DuplicateActorId);
actorIDErrorLabel.Visible = true;
return;
}
SetActorID(actorId);

21
OpenRA.Mods.Common/Widgets/Logic/PlayerProfileLogic.cs
View File

@@ -100,27 +100,24 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
badgesVisible = false;
if (localProfile.State == LocalPlayerProfile.LinkState.Linked)
if (localProfile.State == LocalPlayerProfile.LinkState.Linked && localProfile.ProfileData.Badges.Count > 0)
{
if (localProfile.ProfileData.Badges.Count > 0)
{
Func<int, int> negotiateWidth = _ => widget.Get("PROFILE_HEADER").Bounds.Width;
Func<int, int> negotiateWidth = _ => widget.Get("PROFILE_HEADER").Bounds.Width;
// Remove any stale badges that may be left over from a previous session
badgeContainer.RemoveChildren();
// Remove any stale badges that may be left over from a previous session
badgeContainer.RemoveChildren();
var badges = Ui.LoadWidget("PLAYER_PROFILE_BADGES_INSERT", badgeContainer, new WidgetArgs()
var badges = Ui.LoadWidget("PLAYER_PROFILE_BADGES_INSERT", badgeContainer, new WidgetArgs()
{
{ "worldRenderer", worldRenderer },
{ "profile", localProfile.ProfileData },
{ "negotiateWidth", negotiateWidth }
});
if (badges.Bounds.Height > 0)
{
badgeContainer.Bounds.Height = badges.Bounds.Height;
badgesVisible = true;
}
if (badges.Bounds.Height > 0)
{
badgeContainer.Bounds.Height = badges.Bounds.Height;
badgesVisible = true;
}
}

5
OpenRA.Mods.Common/Widgets/Logic/SingleHotkeyBaseLogic.cs
View File

@@ -25,9 +25,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var keyhandler = widget.Get<LogicKeyListenerWidget>(parentName);
keyhandler.AddHandler(e =>
{
if (e.Event == KeyInputEvent.Down)
if (namedKey.IsActivatedBy(e))
return OnHotkeyActivated(e);
if (e.Event == KeyInputEvent.Down && namedKey.IsActivatedBy(e))
return OnHotkeyActivated(e);
return false;
});

17
OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -107,16 +107,15 @@ namespace OpenRA.Mods.Common.Widgets
if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Up)
{
if (useClassicMouseStyle && HasMouseFocus)
if (useClassicMouseStyle && HasMouseFocus &&
!IsValidDragbox && World.Selection.Actors.Count != 0 &&
!multiClick && uog.InputOverridesSelection(World, mousePos, mi))
{
if (!IsValidDragbox && World.Selection.Actors.Count != 0 && !multiClick && uog.InputOverridesSelection(World, mousePos, mi))
{
// Order units instead of selecting
ApplyOrders(World, mi);
isDragging = false;
YieldMouseFocus(mi);
return true;
}
// Order units instead of selecting
ApplyOrders(World, mi);
isDragging = false;
YieldMouseFocus(mi);
return true;
}
if (multiClick)

11
OpenRA.Platforms.Default/FreeTypeFont.cs
View File

@@ -131,15 +131,12 @@ namespace OpenRA.Platforms.Default
public void Dispose()
{
if (!disposed)
if (!disposed && faceHandle.IsAllocated)
{
if (faceHandle.IsAllocated)
{
FreeType.FT_Done_Face(face);
FreeType.FT_Done_Face(face);
faceHandle.Free();
disposed = true;
}
faceHandle.Free();
disposed = true;
}
}
}