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

Use null propagation

Browse Source
This commit is contained in:
Gustas
2023-02-19 15:29:08 +02:00
committed by Pavel Penev
parent b06cbd7a95
commit 157d1b32dc
12 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/ProductionTabsWidget.cs
View File

@@ -171,7 +171,7 @@ namespace OpenRA.Mods.Common.Widgets
set
{
paletteWidget.Value.CurrentQueue = value;
queueGroup = value != null ? value.Info.Group : null;
queueGroup = value?.Info.Group;
// TODO: Scroll tabs so selected queue is visible
}

5
OpenRA.Mods.Common/Widgets/RadarWidget.cs
View File

@@ -129,7 +129,7 @@ namespace OpenRA.Mods.Common.Widgets
{
currentPlayer = player;
var newShroud = player != null ? player.Shroud : null;
var newShroud = player?.Shroud;
if (newShroud != shroud)
{
@@ -146,8 +146,7 @@ namespace OpenRA.Mods.Common.Widgets
shroud = newShroud;
}
var newPlayerRadarTerrain =
currentPlayer != null ? currentPlayer.PlayerActor.TraitOrDefault<PlayerRadarTerrain>() : null;
var newPlayerRadarTerrain = currentPlayer?.PlayerActor.TraitOrDefault<PlayerRadarTerrain>();
if (forceUpdate || newPlayerRadarTerrain != playerRadarTerrain)
{