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

Merge pull request #11 from SemvdH/setupBranch

Browse Source 
merge Setup branch into master
This commit is contained in:
SemvdH
2020-10-23 14:06:36 +02:00
committed by GitHub
parent 92f57a87bc c16f7cf68f
commit 2c7bf3e217
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/ViewModels/ViewModel.cs
View File

@@ -61,6 +61,7 @@ namespace Client
Debug.WriteLine("attempting to host game for " + ClientData.Instance.User.Username); Debug.WriteLine("attempting to host game for " + ClientData.Instance.User.Username);
client.SendMessage(JSONConvert.ConstructLobbyHostMessage()); client.SendMessage(JSONConvert.ConstructLobbyHostMessage());
client.OnLobbyCreated = becomeHostForLobby; client.OnLobbyCreated = becomeHostForLobby;
} }
private void becomeHostForLobby(int id) private void becomeHostForLobby(int id)
@@ -68,6 +69,7 @@ namespace Client
Debug.WriteLine($"got host succes with data {id} "); Debug.WriteLine($"got host succes with data {id} ");
wantToBeHost = true; wantToBeHost = true;
wantToBeHostId = id; wantToBeHostId = id;
ClientData.Instance.User.Host = true;
client.OnLobbiesReceivedAndWaitingForHost = hostLobbiesReceived; client.OnLobbiesReceivedAndWaitingForHost = hostLobbiesReceived;
} }

2
Client/Views/LoginScreen.xaml.cs
View File

@@ -29,6 +29,7 @@ namespace Client.Views
{ {
User user = new User(usernameTextbox.Text); User user = new User(usernameTextbox.Text);
Client client = new Client(user.Username); Client client = new Client(user.Username);
loginButton.IsEnabled = false;
client.OnSuccessfullConnect = () => client.OnSuccessfullConnect = () =>
{ {
// because we need to start the main window on a UI thread, we need to let the dispatcher handle it, which will execute the code on the ui thread // because we need to start the main window on a UI thread, we need to let the dispatcher handle it, which will execute the code on the ui thread
@@ -42,6 +43,7 @@ namespace Client.Views
}); });
}; };
} }
} }
} }