Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Intersect.Editor/Forms/Controls/MapTreeList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public partial class MapTreeList : UserControl
private readonly Dictionary<MapListItem, TreeNode> _nodeLookup = new();

//Cross Thread Delegates
public delegate void TryUpdateMapList(Guid selectMap, List<Guid> restrictMaps = null);
public delegate void TryUpdateMapList(Guid selectMap, List<Guid>? restrictMaps = null);

public bool Chronological = false;

Expand Down Expand Up @@ -406,7 +406,7 @@ private void list_AfterCollapse(object sender, TreeViewEventArgs e)
}
}

public static void Scroll(Control control)
public static new void Scroll(Control control)
{
var pt = control.PointToClient(Cursor.Position);

Expand Down
2 changes: 1 addition & 1 deletion Intersect.Editor/Forms/Controls/SearchableDarkTreeView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public string SearchText
}
}

public virtual void Refresh()
public new virtual void Refresh()
{
UpdateNodes();
}
Expand Down
2 changes: 1 addition & 1 deletion Intersect.Editor/Forms/DockingElements/frmMapEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1579,7 +1579,7 @@ public void SmartFillLayer(int x, int y)
}
}

private void SmartFillAttribute(int x, int y, string data = null, MapAttribute newAttribute = null)
private void SmartFillAttribute(int x, int y, string? data = null, MapAttribute? newAttribute = null)
{
if (x < 0 || x >= Options.Instance.Map.MapWidth || y < 0 || y >= Options.Instance.Map.MapHeight)
{
Expand Down
2 changes: 1 addition & 1 deletion Intersect.Editor/Forms/DockingElements/frmMapLayers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ private MapCritterAttribute CreateCritterAttribute()
return critterAttribute;
}

public MapAttribute PlaceAttribute(MapDescriptor mapDescriptor, int x, int y, MapAttribute attribute = null)
public MapAttribute PlaceAttribute(MapDescriptor mapDescriptor, int x, int y, MapAttribute? attribute = null)
{
if (attribute == null)
{
Expand Down
2 changes: 1 addition & 1 deletion Intersect.Editor/Forms/DockingElements/frmMapProperties.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private void InitLocalization()
Text = Strings.MapProperties.title;
}

public void Update()
public new void Update()
{
gridMapProperties.Refresh();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public partial class EventGraphicSelector : UserControl
public EventGraphicSelector(
EventGraphic editingGraphic,
FrmEvent eventEditor,
EventMoveRouteDesigner moveRouteDesigner = null,
EventMoveRouteDesigner? moveRouteDesigner = null,
bool newMoveRouteAction = false
)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public EventMoveRouteDesigner(
MapDescriptor currentMap,
EventDescriptor currentEvent,
EventMoveRoute editingRoute,
SetMoveRouteCommand editingCommand = null,
SetMoveRouteCommand? editingCommand = null,
bool disableRouteTarget = false
)
{
Expand Down
6 changes: 3 additions & 3 deletions Intersect.Editor/Forms/FrmUploadToServer.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Intersect.Editor/Forms/Helpers/GridHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public partial struct GridCell

public Color? LabelColor { get; private set; }

public GridCell(int x, int y, Color? color = default, string label = null, Color? labelColor = default)
public GridCell(int x, int y, Color? color = default, string? label = null, Color? labelColor = default)
{
X = x;
Y = y;
Expand Down
2 changes: 1 addition & 1 deletion Intersect.Editor/Forms/frmMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ public void MouseDownHandler(object sender, MouseEventArgs e)
}

//Update
public void Update()
public new void Update()
{
if (Globals.CurrentMap != null)
{
Expand Down
Loading