sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge Setup branch into develop #1

Merged
SemvdH merged 71 commits from setupBranch into master 2020-10-21 18:59:02 +00:00
Conversation 2 Commits 71 Files Changed 42 +9 -1
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a837611317 - Show all commits

8
Client/Models/Model.cs
View File

@@ -11,6 +11,7 @@ namespace Client
private int _numbers; private int _numbers;
private bool _status; private bool _status;
private bool _canStartGame;
//Test code //Test code
public int Numbers public int Numbers
@@ -37,11 +38,18 @@ namespace Client
} }
} }
public bool CanStartGame
{
get { return _canStartGame; }
set { _canStartGame = value; }
}
public Model() public Model()
{ {
_status = false; _status = false;
_numbers = 0; _numbers = 0;
_canStartGame = true;
} }
} }

2
Client/ViewModels/ViewModel.cs
View File

@@ -39,6 +39,7 @@ namespace Client
{ {
if (SelectedLobby != null) if (SelectedLobby != null)
{ {
_model.CanStartGame = false;
GameWindow window = new GameWindow(); GameWindow window = new GameWindow();
window.Show(); window.Show();
} }
@@ -55,7 +56,6 @@ namespace Client
} }
private Model _model; private Model _model;
public Model Model public Model Model
{ {