memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

SQC-15_online #1

Merged
memartel merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Conversation 0 Commits 349 Files Changed 181 +5 -5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e6b3f2fb1c - Show all commits

8
SQCSim-srv/server.cpp
View File

@@ -146,7 +146,7 @@ int Server::Ready() {
str.clear(); str.clear();
sendPack<LoginInfo>(sock, log, &m_buf); sendPackTo<LoginInfo>(m_sock_udp, log, &m_buf, &sockad);
play.id = getUniqueId(); play.id = getUniqueId();
play.tid = log->tid; play.tid = log->tid;
@@ -157,12 +157,12 @@ int Server::Ready() {
.append(" TID: [").append(std::to_string(play.tid)).append("]"), false, false); .append(" TID: [").append(std::to_string(play.tid)).append("]"), false, false);
play.tid = log->tid; play.tid = log->tid;
sendPack<GameInfo>(sock, &m_game, &m_buf); sendPackTo<GameInfo>(m_sock_udp, &m_game, &m_buf, &sockad);
Connection* conn = new Connection(sock, sockad, *log, play); Connection* conn = new Connection(sock, sockad, *log, play);
for (auto& [key, player] : m_players) { for (auto& [key, player] : m_players) {
sendPack<PlayerInfo>(player->getSock(), &play, &m_buf); // Envoyer les infos de joueur distant aux joueurs d<>j<EFBFBD> connect<63>s sendPackTo<PlayerInfo>(m_sock_udp, &play, &m_buf, &sockad); // Envoyer les infos de joueur distant aux joueurs d<>j<EFBFBD> connect<63>s
sendPack<PlayerInfo>(sock, player->getInfo(), &m_buf); // et envoyer les infos des joueurs distants au nouveau joueur. sendPackTo<PlayerInfo>(m_sock_udp, player->getInfo(), &m_buf, player->getAddr()); // et envoyer les infos des joueurs distants au nouveau joueur.
} }
m_players[log->sid] = conn; m_players[log->sid] = conn;

2
SQCSim2021/connector.cpp
View File

@@ -78,7 +78,7 @@ int Connector::Connect(const char* srv_addr, std::string name) {
int errors = 0; int errors = 0;
std::vector<char*> lsPck; std::vector<char*> lsPck;
while (!ready) { while (!ready) {
lsPck = netprot::recvPacks(m_sock_tcp, &bf); lsPck = netprot::recvPacks(m_sock_udp, &bf);
for (auto& pck : lsPck) { for (auto& pck : lsPck) {
uint32_t bsize = bf.len - (pck - bf.ptr); uint32_t bsize = bf.len - (pck - bf.ptr);