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)
{
string msg = Encoding.ASCII.GetString(json);
dynamic payload = JsonConvert.DeserializeObject(msg);
dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
return payload.username;
}
}

124
SharedClientServer/Lobby.cs
View File

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