Corrections merge de master

hell.
This commit is contained in:
MarcEricMartel
2023-12-05 13:44:54 -05:00
parent 4775de01d8
commit 464ba131c4
19 changed files with 327 additions and 170 deletions

View File

@@ -72,13 +72,13 @@ int Connector::Connect(const char* srv_addr, std::string name) {
//using namespace std::chrono_literals;
//std::this_thread::sleep_for(100ms);
memset(bf.ptr, '\0', BUFFER_LENGTH);
//memset(bf.ptr, '\0', BUFFER_LENGTH);
bool ready = false;
int errors = 0;
std::vector<char*> lsPck;
while (!ready) {
lsPck = netprot::recvPacks(m_sock_tcp, &bf);
lsPck = netprot::recvPacks(m_sock_udp, &bf);
for (auto& pck : lsPck) {
uint32_t bsize = bf.len - (pck - bf.ptr);
@@ -97,7 +97,9 @@ int Connector::Connect(const char* srv_addr, std::string name) {
pl = new netprot::PlayerInfo();
if (!netprot::Deserialize(pl, pck, &bsize))
++errors;
else m_players[pl->id] = pl;
else {
m_players[pl->id] = pl;
}
break;
case TEAMINF:
// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.