From f44b6cd7dc9113d17f0a67657e1776cbafc9f3db Mon Sep 17 00:00:00 2001 From: MarcEricMartel Date: Mon, 30 Oct 2023 16:57:12 -0400 Subject: [PATCH] y tho --- SQCSim-srv/server.cpp | 10 +++++++--- SQCSim2021/engine.cpp | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SQCSim-srv/server.cpp b/SQCSim-srv/server.cpp index 983ed59..a515320 100644 --- a/SQCSim-srv/server.cpp +++ b/SQCSim-srv/server.cpp @@ -128,15 +128,18 @@ int Server::Ready() { if (recv(sock, m_buf.ptr, m_buf.len, 0) > 0) { PlayerInfo play; - + /* Packet pck = getPack(&m_buf); if (pck.type != PACKET_TYPE::LOGINF) { Log("Paquet invalide.", true, false); if (pck.type != PACKET_TYPE::ERR) netprot::emptyPack(pck); continue; // Passer au prochain appel si c'est pas un LoginInfo ou un LoginInfo invalide qui rentre. - } - LoginInfo* log = (LoginInfo*)pck.ptr; + }*/ + LoginInfo* log = new LoginInfo(); + + m_buf.len = BUFFER_LENGTH; + netprot::Deserialize(log, m_buf.ptr, m_buf.len);//(LoginInfo*)pck.ptr; log->sid = getUniqueId(); log->tid = 0; // TODO: À changer si on implemente un mode en equipe. @@ -164,6 +167,7 @@ int Server::Ready() { m_players[log->sid] = std::move(conn); delete log; + log = nullptr; if (++nbrconn >= nbrjoueurs) readystart = true; diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index 244d035..4710e3e 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -325,7 +325,6 @@ void Engine::Init() { while (playname.size() < 1) { std::cout << "Veuillez entrer un nom de joueur: "; - std::cin.ignore(); std::cin.getline(input, 32); std::cout << std::endl; playname = input;