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

[FIX] fixed merge conflicts

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-10-21 20:56:38 +02:00
parent 298bd760e5 a4e45b1a6b
commit 61577e0df7
9 changed files with 94 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Client/Client.cs
View File

@@ -72,14 +72,15 @@ namespace Client
}
stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete), null);
}
private void handleData(byte[] message)
{
byte id = message[4];
byte[] payload = new byte[message.Length - 5];
Array.Copy(message, 5, payload, 0, message.Length - 5);
switch (id)
{
case JSONConvert.LOGIN:
@@ -90,8 +91,10 @@ namespace Client
(string, string) combo = JSONConvert.GetUsernameAndMessage(payload);
string textUsername = combo.Item1;
string textMsg = combo.Item2;
//TODO display username and message in chat window
//TODO display username and message in chat window
Debug.WriteLine("[CLIENT] INCOMING MESSAGE!");
Debug.WriteLine("[CLIENT] User name: {0}\t User message: {1}", textUsername, textMsg);
break;
case JSONConvert.LOBBY:
@@ -118,9 +121,11 @@ namespace Client
}
//TODO fill lobby with the data received
break;
case JSONConvert.CANVAS:
// canvas data
break;
default:
Debug.WriteLine("[CLIENT] Received weird identifier: " + id);
break;