From 3da68297e4d8f6ad7daf45e320f5a8881b646474 Mon Sep 17 00:00:00 2001
From: MarcEricMartel <marcericmartel@gmail.com>
Date: Fri, 8 Dec 2023 04:58:27 -0500
Subject: [PATCH] Cleanup + client.

---
 SQCSim-srv/server.cpp    | 6 +-----
 SQCSim2021/connector.cpp | 2 +-
 SQCSim2021/engine.cpp    | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/SQCSim-srv/server.cpp b/SQCSim-srv/server.cpp
index 91a0f23..d32057e 100644
--- a/SQCSim-srv/server.cpp
+++ b/SQCSim-srv/server.cpp
@@ -258,7 +258,7 @@ void Server::Run() {
 
 			/* In */
 
-			Input in; Chat chat; Sync sync;
+			Input in; Sync sync;
 
 			recvPacks(m_sock_udp, &m_buf, &lsPck);
 			for (auto& pck : lsPck) {
@@ -274,10 +274,6 @@ void Server::Run() {
 				case SYNC:
 					if (Deserialize(&sync, pck, &bsize)) {}
 					break;
-				case CHAT:
-					//if (Deserialize(&chat, pck, &bsize))
-						//chatlog.push_back(chat);
-					break;
 				default: break;
 				}
 			}
diff --git a/SQCSim2021/connector.cpp b/SQCSim2021/connector.cpp
index 3844783..f10b094 100644
--- a/SQCSim2021/connector.cpp
+++ b/SQCSim2021/connector.cpp
@@ -73,7 +73,7 @@ int Connector::Connect(const char* srv_addr, std::string name) {
 	int errors = 0;
 	std::vector<char*> lsPck;
 	while (!ready) {
-		lsPck = netprot::recvPacks(m_sock_udp, &bf);
+		netprot::recvPacks(m_sock_udp, &bf, &lsPck);
 
 		for (auto& pck : lsPck) {
 			uint32_t bsize = bf.len - (pck - bf.ptr);
diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp
index b1bdb34..848528e 100644
--- a/SQCSim2021/engine.cpp
+++ b/SQCSim2021/engine.cpp
@@ -1387,7 +1387,7 @@ void Engine::Render(float elapsedTime) {
 
 			sendPackTo<Input>(m_conn.m_sock_udp, &input, &m_bufout, &m_conn.m_srvsockaddr);
 
-			lsPck = recvPacks(m_conn.m_sock_udp, &m_buf);
+			recvPacks(m_conn.m_sock_udp, &m_buf, &lsPck);
 			char* prevptr = nullptr;
 			for (auto& pck : lsPck) { // We could make a few threads out of this.
 				Sync sync; Output out; ChunkMod cmod; BulletAdd bull; Chat chat;