diff --git a/Qwirkle/QwirkleClassLibrary/Board.cs b/Qwirkle/QwirkleClassLibrary/Board.cs index 0885ded..7f335e7 100644 --- a/Qwirkle/QwirkleClassLibrary/Board.cs +++ b/Qwirkle/QwirkleClassLibrary/Board.cs @@ -31,7 +31,7 @@ namespace QwirkleClassLibrary { if (this.Cells[i].GetX == x && this.Cells[i].GetY == y) { - if(Cells[i].SetTile(tile) == true) + if (Cells[i].SetTile(tile) == true) { return true; } @@ -40,7 +40,7 @@ namespace QwirkleClassLibrary Console.WriteLine("Please enter new coordinates for the cell where you want to place your tile."); return false; } - + } } Console.WriteLine("The cell you're searching for doesn't exist. PLease enter new coordinates for the cell where you want to place your tile."); diff --git a/Qwirkle/QwirkleClassLibrary/Cell.cs b/Qwirkle/QwirkleClassLibrary/Cell.cs index 7a8b2b4..9769743 100644 --- a/Qwirkle/QwirkleClassLibrary/Cell.cs +++ b/Qwirkle/QwirkleClassLibrary/Cell.cs @@ -36,7 +36,7 @@ public class Cell get { return tile; } } - public bool SetTile(Tile? addedTile) + public bool SetTile(Tile addedTile) { if(tile == null) { diff --git a/Qwirkle/QwirkleClassLibrary/Game.cs b/Qwirkle/QwirkleClassLibrary/Game.cs index 828a995..611f949 100644 --- a/Qwirkle/QwirkleClassLibrary/Game.cs +++ b/Qwirkle/QwirkleClassLibrary/Game.cs @@ -74,7 +74,7 @@ namespace QwirkleClassLibrary players[old].IsPlaying = false; } players[neew].IsPlaying = true; - Console.WriteLine(players[neew].GetName + "you have main now !"); + Console.WriteLine(players[neew].GetNameTag + "you have main now !"); } diff --git a/Qwirkle/QwirkleClassLibrary/Score.cs b/Qwirkle/QwirkleClassLibrary/Score.cs index 9989d92..4fd0b21 100644 --- a/Qwirkle/QwirkleClassLibrary/Score.cs +++ b/Qwirkle/QwirkleClassLibrary/Score.cs @@ -14,7 +14,7 @@ namespace QwirkleClassLibrary public Score(Player p) { score = 0; - playerTag = p.GetName; + playerTag = p.GetNameTag; } } diff --git a/Qwirkle/QwirkleClassLibrary/Tile.cs b/Qwirkle/QwirkleClassLibrary/Tile.cs index 737fd36..4aa4589 100644 --- a/Qwirkle/QwirkleClassLibrary/Tile.cs +++ b/Qwirkle/QwirkleClassLibrary/Tile.cs @@ -10,7 +10,6 @@ namespace QwirkleClassLibrary public class Tile { private Shape shape; - private Color color; public Tile(Shape sh, Color co) { diff --git a/Qwirkle/QwirkleClassLibrary/TileBag.cs b/Qwirkle/QwirkleClassLibrary/TileBag.cs index 158200c..16405ce 100644 --- a/Qwirkle/QwirkleClassLibrary/TileBag.cs +++ b/Qwirkle/QwirkleClassLibrary/TileBag.cs @@ -16,7 +16,7 @@ namespace QwirkleClassLibrary tiles = new List(); - for(int i=0; i<3; i++) + for (int i = 0; i < 3; i++) { foreach (Shape s in Enum.GetValues(typeof(Shape))) { @@ -34,7 +34,7 @@ namespace QwirkleClassLibrary public void RemoveTileInBag(Tile tile) { - for(int i=0; i