From 408679433b45c13380b98af278d93c52074c3530 Mon Sep 17 00:00:00 2001 From: MarcEricMartel Date: Wed, 1 Nov 2023 15:02:41 -0400 Subject: [PATCH] wtf?! --- SQCSim-srv/server.cpp | 5 +++++ SQCSim2021/engine.cpp | 12 +++--------- SQCSim2021/engine.h | 1 + 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SQCSim-srv/server.cpp b/SQCSim-srv/server.cpp index fc2184e..e006055 100644 --- a/SQCSim-srv/server.cpp +++ b/SQCSim-srv/server.cpp @@ -154,10 +154,15 @@ int Server::Ready() { play.tid = log->tid; + //using namespace std::chrono_literals; + //std::this_thread::sleep_for(100ms); + sendPack(sock, &m_game, &m_buf); std::unique_ptr conn = std::make_unique(sock, sockad, *log, play); for (auto& [key, player] : m_players) { + //using namespace std::chrono_literals; + //std::this_thread::sleep_for(100ms); sendPack(player->getSock(), &play, &m_buf); // Envoyer les infos de joueur distant aux joueurs d�j� connect�s sendPack(sock, player->getInfo(), &m_buf); // et envoyer les infos des joueurs distants au nouveau joueur. } diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index 074a7fd..d6ebfbb 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -1102,14 +1102,11 @@ void Engine::Render(float elapsedTime) { } if (m_networkgame) { - static char* buf = new char[BUFFER_LENGTH]; - uint32_t buflen = BUFFER_LENGTH; netprot::Input input; - //sockaddr_in addr = m_conn.m_srvsockaddr; - input.direction = m_player.GetDirection(); input.sid = m_conn.getId(); - input.timestamp = 12345; + input.direction = m_player.GetDirection(); + input.timestamp = 12345; // TODO: Implémenter input.keys.forward = m_keyW; input.keys.backward = m_keyS; input.keys.left = m_keyA; @@ -1118,10 +1115,7 @@ void Engine::Render(float elapsedTime) { input.keys.block = m_mouseR; input.keys.shoot = m_mouseL; - //netprot::Serialize(&input, &buf, &buflen); - //sendto(m_conn.m_sock_udp, buf, buflen, 0, (sockaddr*)&addr, sizeof(addr)); - - netprot::sendPackTo(m_conn.m_sock_udp, &input, &buf, &buflen, &m_conn.m_srvsockaddr); + netprot::sendPackTo(m_conn.m_sock_udp, &input, &m_buf, &m_conn.m_srvsockaddr); } } else if (m_gamestate == GameState::MAIN_MENU || m_gamestate == GameState::OPTIONS) diff --git a/SQCSim2021/engine.h b/SQCSim2021/engine.h index d51d064..5306d10 100644 --- a/SQCSim2021/engine.h +++ b/SQCSim2021/engine.h @@ -88,6 +88,7 @@ private: Bullet* m_bullets[MAX_BULLETS]; std::map m_players; + netprot::Buffer m_buf; //Menu enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };