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

Hahaha il manquait les ChunkMods dans netprot :finnadie:

Browse Source
This commit is contained in:
MarcEricMartel
2023-12-02 10:04:18 -05:00
parent c44d1453ae
commit 20eb410b08
5 changed files with 76 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
SQCSim-common/netprotocol.cpp
View File

@@ -402,6 +402,33 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
*buflen = messize + sizeof(uint64_t) * 3 + 2;
}
void netprot::Serialize(ChunkMod* chmod, char* buf[], uint32_t* buflen) {
*buf[0] = (char)netprot::PACKET_TYPE::CHUNKMOD;
uint32_t vec[3];
memcpy(vec, &chmod->pos, sizeof(Vector3f)); // Pour d<>naturer les floats.
uint8_t vec8[3 * sizeof(uint32_t)] = {
(uint8_t)((vec[0] >> 24) & 0xFF),
(uint8_t)((vec[0] >> 16) & 0xFF),
(uint8_t)((vec[0] >> 8) & 0xFF),
(uint8_t)(vec[0] & 0xFF),
(uint8_t)((vec[1] >> 24) & 0xFF),
(uint8_t)((vec[1] >> 16) & 0xFF),
(uint8_t)((vec[1] >> 8) & 0xFF),
(uint8_t)(vec[1] & 0xFF),
(uint8_t)((vec[2] >> 24) & 0xFF),
(uint8_t)((vec[2] >> 16) & 0xFF),
(uint8_t)((vec[2] >> 8) & 0xFF),
(uint8_t)(vec[2] & 0xFF) };
memcpy(*buf + 1, vec8, sizeof(uint32_t) * 3);
memcpy(*buf + sizeof(uint32_t) * 3 + 1, &chmod->b_type, sizeof(BlockType));
*buflen = sizeof(uint32_t) * 3 + 2;
}
void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
*buf[0] = (char)netprot::PACKET_TYPE::ERRLOG;
@@ -818,6 +845,35 @@ bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
return true;
}
bool netprot::Deserialize(ChunkMod* chmod, char* buf, uint32_t* buflen) {
if (*buflen <= sizeof(ChunkMod))
return false;
uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
memcpy(subvec, &buf[1], sizeof(uint8_t) * 12);
uint32_t vec[3] = {
(uint32_t)subvec[0] << 24 |
(uint32_t)subvec[1] << 16 |
(uint32_t)subvec[2] << 8 |
(uint32_t)subvec[3],
(uint32_t)subvec[4] << 24 |
(uint32_t)subvec[5] << 16 |
(uint32_t)subvec[6] << 8 |
(uint32_t)subvec[7],
(uint32_t)subvec[8] << 24 |
(uint32_t)subvec[9] << 16 |
(uint32_t)subvec[10] << 8 |
(uint32_t)subvec[11] };
memcpy(&chmod->pos, vec, sizeof(uint32_t) * 3);
memcpy(&chmod->b_type, &buf[1 + sizeof(uint8_t) * 12], sizeof(BlockType));
*buflen = sizeof(uint32_t) * 3 + 2;
return true;
}
bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(ErrorLog))
return false;