From 8ca4efc29659512b74d7ae7e2d17a38665a606ec Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Fri, 23 Oct 2020 20:45:25 +0200 Subject: [PATCH] stuff --- Client/ViewModels/ViewModelGame.cs | 4 ++-- Server/Models/ServerClient.cs | 2 +- SharedClientServer/JSONConvert.cs | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Client/ViewModels/ViewModelGame.cs b/Client/ViewModels/ViewModelGame.cs index 3750369..d214565 100644 --- a/Client/ViewModels/ViewModelGame.cs +++ b/Client/ViewModels/ViewModelGame.cs @@ -32,8 +32,8 @@ namespace Client.ViewModels private dynamic _payload; - public string _username; - + public string _username; + public string _message; public string Message { diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs index 66b9d22..51552a9 100644 --- a/Server/Models/ServerClient.cs +++ b/Server/Models/ServerClient.cs @@ -183,7 +183,7 @@ namespace Server.Models case JSONConvert.CANVAS_RESET: dynamic canvasDataForReset = new { - type = JSONConvert.GetCanvasMessageType(payload) + canvasType = JSONConvert.GetCanvasMessageType(payload) }; serverCom.SendToLobby(serverCom.GetLobbyForUser(User), JSONConvert.GetMessageToSend(CANVAS, canvasDataForReset)); break; diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs index 1f11b5a..129b3ba 100644 --- a/SharedClientServer/JSONConvert.cs +++ b/SharedClientServer/JSONConvert.cs @@ -50,6 +50,14 @@ namespace SharedClientServer return (payload.username, payload.message); } + internal static byte[] ConstructCanvasResetMessage() + { + return GetMessageToSend(CANVAS, new + { + canvasType = CANVAS_RESET + }); + } + public static string GetUsernameLogin(byte[] json) { dynamic payload = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(json));