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

[EDIT] smol line edit

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-10-19 22:41:15 +02:00
parent 0b12e530aa
commit d41a2d2668
2 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SharedClientServer/JSONConvert.cs
View File

@@ -16,8 +16,7 @@ namespace SharedClientServer
public static string GetUsernameLogin(byte[] json) public static string GetUsernameLogin(byte[] json)
{ {
string msg = Encoding.ASCII.GetString(json); dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
dynamic payload = JsonConvert.DeserializeObject(msg);
return payload.username; return payload.username;
} }
} }

124
SharedClientServer/Lobby.cs
View File

@@ -1,41 +1,41 @@
using SharedClientServer; using SharedClientServer;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Text; using System.Text;
namespace Client namespace Client
{ {
class Lobby : INotifyPropertyChanged class Lobby : INotifyPropertyChanged
{ {
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
private int _id; private int _id;
private int _playersIn; private int _playersIn;
private int _maxPlayers; private int _maxPlayers;
//private List<string> _usernames; //private List<string> _usernames;
private List<User> _users; private List<User> _users;
//public void AddUsername(string username, out bool success) //public void AddUsername(string username, out bool success)
//{ //{
// success = false; // success = false;
// if (_usernames.Count < _maxPlayers) // if (_usernames.Count < _maxPlayers)
// { // {
// _usernames.Add(username); // _usernames.Add(username);
// success = true; // success = true;
// } // }
//} //}
public Lobby(int id, int playersIn, int maxPlayers) public Lobby(int id, int playersIn, int maxPlayers)
{ {
_id = id; _id = id;
_playersIn = playersIn; _playersIn = playersIn;
_maxPlayers = maxPlayers; _maxPlayers = maxPlayers;
//_usernames = new List<string>(); //_usernames = new List<string>();
_users = new List<User>(); _users = new List<User>();
} }
public void AddUser(string username, out bool succes) public void AddUser(string username, out bool succes)
{ {
succes = false; succes = false;
@@ -44,8 +44,8 @@ namespace Client
_users.Add(new User(username, 0)); _users.Add(new User(username, 0));
succes = true; succes = true;
} }
} }
public void AddUser(User user, out bool succes) public void AddUser(User user, out bool succes)
{ {
succes = false; succes = false;
@@ -54,26 +54,26 @@ namespace Client
_users.Add(user); _users.Add(user);
succes = true; succes = true;
} }
} }
public int ID public int ID
{ {
get { return _id; } get { return _id; }
set { _id = value; } set { _id = value; }
} }
public int PlayersIn public int PlayersIn
{ {
get { return _playersIn; } get { return _playersIn; }
set { _playersIn = value; } set { _playersIn = value; }
} }
public int MaxPlayers public int MaxPlayers
{ {
get { return _maxPlayers; } get { return _maxPlayers; }
set { _maxPlayers = value; } set { _maxPlayers = value; }
} }
} }
} }