This commit is contained in:
Michele Scandura 2020-11-10 12:47:09 +00:00
parent 194f3cbffa
commit e009ef07b0
3 changed files with 452 additions and 464 deletions

View file

@ -7,5 +7,6 @@ namespace Sledgemapper.Shared.Entities
public string Firstname { get; set; } public string Firstname { get; set; }
public string LastName { get; set; } public string LastName { get; set; }
public string Token { get; set; } public string Token { get; set; }
public string Initials { get; set; }
} }
} }

View file

@ -35,7 +35,7 @@ namespace Sledgemapper.Shared.Entities
public ConcurrentDictionary<string, Overlay> Overlays { get; set; } public ConcurrentDictionary<string, Overlay> Overlays { get; set; }
public bool IsValid { get; set; } public bool IsValid { get; set; }
public List<Player> Players { get; set; } public List<Player> Players { get; set; }
public List<string> Colors; public List<string> Colors { get; set; }
public string SessionName { get; set; } public string SessionName { get; set; }
public void NewTile(Tile selectedTile, string tileId) public void NewTile(Tile selectedTile, string tileId)
@ -67,10 +67,10 @@ namespace Sledgemapper.Shared.Entities
return; return;
} }
var overlayExist = Overlays.TryGetValue(selectedOverlay.ToString(), out var overlay); var overlayExist = Overlays.TryGetValue(selectedOverlay.ToString(), out var overlay);
var newOverlay = new Overlay { X = selectedOverlay.X, Y = selectedOverlay.Y, ID = overlayId, Intersection = selectedOverlay.Intersection }; ; var newOverlay = new Overlay { X = selectedOverlay.X, Y = selectedOverlay.Y, ID = overlayId, Intersection = selectedOverlay.Intersection };
if (overlayExist) if (overlayExist)
{ {
Overlays.TryRemove(overlay.ToString(), out var rrtile); Overlays.TryRemove(overlay.ToString(), out var _);
if (overlay.ID == overlayId) if (overlay.ID == overlayId)
{ {
newOverlay.Rotation = (overlay.Rotation + 1) % 4; newOverlay.Rotation = (overlay.Rotation + 1) % 4;
@ -139,20 +139,12 @@ namespace Sledgemapper.Shared.Entities
protected virtual void OnRaiseMapEntityAddedEvent(MapEntityAddedEventArgs e) protected virtual void OnRaiseMapEntityAddedEvent(MapEntityAddedEventArgs e)
{ {
var raiseEvent = MapEntityAdded; MapEntityAdded?.Invoke(this, e);
if (raiseEvent != null)
{
raiseEvent(this, e);
}
} }
protected virtual void OnRaiseMapEntityDeletedEvent(MapEntityDeletedEventArgs e) protected virtual void OnRaiseMapEntityDeletedEvent(MapEntityDeletedEventArgs e)
{ {
var raiseEvent = MapEntityDeleted; MapEntityDeleted?.Invoke(this, e);
if (raiseEvent != null)
{
raiseEvent(this, e);
}
} }
} }
} }

File diff suppressed because it is too large Load diff