From abe317e31bb9b9a88b0c88b1477a952240d1847f Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Sat, 13 Jan 2018 14:58:40 +0500 Subject: Replaced all usages of NC to new implementation --- src/GlobalState.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/GlobalState.cpp') diff --git a/src/GlobalState.cpp b/src/GlobalState.cpp index f04bb35..57b42ea 100644 --- a/src/GlobalState.cpp +++ b/src/GlobalState.cpp @@ -64,6 +64,11 @@ void InitEvents() { PUSH_EVENT("Disconnect", data); }); + listener.RegisterHandler("ReceivedPacket", [](const Event& eventData) { + std::shared_ptr packet = eventData.get>(); + gs->UpdatePacket(packet); + }); + /* * GameState Events */ @@ -88,7 +93,8 @@ void InitEvents() { listener.RegisterHandler("SendChatMessage", [](const Event& eventData) { auto message = eventData.get(); - nc->SendPacket(std::make_shared(message)); + auto packet = std::static_pointer_cast(std::make_shared(message)); + PUSH_EVENT("SendPacket",packet); }); } @@ -183,9 +189,6 @@ void GsExec() { while (isRunning) { try { while (nc && gs) { - nc->UpdatePacket(); - - gs->UpdatePacket(nc.get()); listener.HandleAllEvents(); } } catch (std::exception &e) { -- cgit v1.2.3