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

Redressage des classes; seed est reçue du serveur

Browse Source
This commit is contained in:
MarcEricMartel
2023-09-27 17:34:25 -04:00
parent 7eabee38ad
commit df52d4a084
8 changed files with 198 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
SQCSim2021/connector.cpp
View File

@@ -44,44 +44,58 @@ int Connector::Init() {
int Connector::Connect(char* srv_addr, std::string name) {
sockaddr_in add;
add.sin_family = AF_INET;
add.sin_port = htons(SRV_PORT);
m_srvsockaddr.sin_family = AF_INET;
m_srvsockaddr.sin_port = htons(SRV_PORT);
if (inet_pton(AF_INET, srv_addr, &add.sin_addr) <= 0) {
if (inet_pton(AF_INET, srv_addr, &m_srvsockaddr.sin_addr) <= 0) {
std::cout << "Addresse serveur invalide." << std::endl;
return 1;
}
if (connect(m_sock_tcp, (sockaddr*)&add, sizeof(add)) < 0) {
if (connect(m_sock_tcp, (sockaddr*)&m_srvsockaddr, sizeof(m_srvsockaddr)) < 0) {
std::cout << "<EFBFBD>chec de la connexion." << std::endl;
}
char* buf = new char[150];
uint32_t buflen = 150;
netprot::LoginInfo log, retlog;
log.sid = 0;
netprot::LoginInfo log;
memcpy(&log.name, name.c_str(), name.size() + 1);
netprot::Serialize(&log, &buf, &buflen);
int se = send(m_sock_tcp, buf, buflen, 0);
delete[] buf;
buf = new char[150] {0};
buflen = 150;
int rpack = 0;
while (recv(m_sock_tcp, buf, buflen, 0) < se) {}
while (rpack < 2) {
recv(m_sock_tcp, buf, buflen, 0);
if (!netprot::Deserialize(&retlog, buf, buflen)) {
std::cout << "Packet invalide." << std::endl;
return 2;
switch (netprot::getType(buf, buflen)) {
case netprot::PACKET_TYPE::LOGINF:
if (!netprot::Deserialize(&m_loginfo, buf, buflen)) {
std::cout << "Packet LoginInfo invalide." << std::endl;
return 2;
}
++rpack;
break;
case netprot::PACKET_TYPE::GAMEINFO:
if (!netprot::Deserialize(&m_gameinfo, buf, buflen)) {
std::cout << "Packet GameInfo invalide." << std::endl;
return 3;
}
++rpack;
break;
default:
std::cout << "Packet invalide." << std::endl;
break;
}
}
m_name = retlog.name;
m_sid = retlog.sid;
return 0;
}
uint64_t Connector::getId() const { return m_sid; }
uint64_t Connector::getId() const { return m_loginfo.sid; }
unsigned int Connector::getSeed() const { return m_seed; }
unsigned int Connector::getSeed() const { return m_gameinfo.seed; }

14
SQCSim2021/connector.h
View File

@@ -21,12 +21,16 @@ private:
#ifdef _WIN32
WSADATA m_wsaData;
#endif
std::map<Timestamp, netprot::Input> m_inputmanifest;
std::map<uint64_t, netprot::PlayerInfo> m_players;
std::map<uint64_t, netprot::TeamInfo> m_teams;
netprot::LoginInfo m_loginfo;
netprot::GameInfo m_gameinfo;
sockaddr_in m_srvsockaddr;
SOCKET m_sock_udp = 0,
m_sock_tcp = 0;
std::string m_name = "";
uint64_t m_sid = 0,
m_tid = 0;
unsigned int m_seed = 0;
m_sock_tcp = 0;
};
#endif

3
SQCSim2021/engine.cpp
View File

@@ -53,7 +53,8 @@ void Engine::Init() {
if (!m_conn.Connect(SRV_ADDR, playname)) {
// setup jeu en r<>seau.
std::cout << "ID re<72>u du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
//seed = m_conn.getSeed();
std::cout << "Seed re<72>u du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
seed = m_conn.getSeed();
}
else std::cout << "Erreur de connexion." << std::endl;
}