diff --git a/Client/ViewModels/ViewModelGame.cs b/Client/ViewModels/ViewModelGame.cs index 2f6e03e..98846e3 100644 --- a/Client/ViewModels/ViewModelGame.cs +++ b/Client/ViewModels/ViewModelGame.cs @@ -73,7 +73,12 @@ namespace Client.ViewModels data.Client.RandomWord = HandleRandomWord; data.Client.IncomingMsg = HandleIncomingMsg; data.Client.IncomingPlayer = HandleIncomingPlayer; - data.Client.UpdateUserScores = UpdateUserScores; + data.Client.UpdateUserScores = UpdateUserScores; + + + queueTimer = new Timer(50); + queueTimer.Start(); + queueTimer.Elapsed += sendArrayFromQueue; } public ICommand OnKeyDown { get; set; } @@ -82,10 +87,7 @@ namespace Client.ViewModels public void BeginGame() { - - queueTimer = new Timer(50); - queueTimer.Start(); - queueTimer.Elapsed += sendArrayFromQueue; + data.Client.SendMessage(JSONConvert.ConstructGameStartData(data.Lobby.ID)); } @@ -186,7 +188,7 @@ namespace Client.ViewModels private void CanvasResetData() { - this.window.CanvasForPaint.Children.Clear(); + this.window.CanvasForPaint.Children.Clear(); } private void ChatBox_KeyDown() diff --git a/Client/Views/GameWindow.xaml b/Client/Views/GameWindow.xaml index eaf5391..0f1a0c7 100644 --- a/Client/Views/GameWindow.xaml +++ b/Client/Views/GameWindow.xaml @@ -43,7 +43,7 @@