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

Merge branch 'master' into SQC-15_online

Browse Source
This commit is contained in:
MarcEricMartel
2023-12-05 06:34:51 -05:00
parent 2446b90bff d9152a721c
commit 4775de01d8
69 changed files with 172 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
SQCSim-common/netprotocol.cpp
View File

@@ -29,13 +29,13 @@ void netprot::Serialize(Input* in, char* buf[], uint32_t* buflen) {
Keys keys = in->keys;
uint8_t keys8 = // Reste un bit.
(keys.forward? 0b10000000: 0) |
(keys.backward? 0b01000000: 0) |
(keys.left? 0b00100000: 0) |
(keys.right? 0b00010000: 0) |
(keys.jump? 0b00001000: 0) |
(keys.shoot? 0b00000100: 0) |
(keys.block? 0b00000010: 0);
keys.forward & 0b10000000 |
keys.backward & 0b01000000 |
keys.left & 0b00100000 |
keys.right & 0b00010000 |
keys.jump & 0b00001000 |
keys.shoot & 0b00000100 |
keys.block & 0b00000010;
memcpy(*buf + sizeof(uint64_t) * 2 + 1, &keys8, sizeof(uint8_t));
@@ -90,14 +90,14 @@ void netprot::Serialize(Output* out, char* buf[], uint32_t* buflen) {
States states = out->states;
uint8_t states8 =
(states.jumping? 0b10000000: 0) |
(states.shooting? 0b01000000: 0) |
(states.hit? 0b00100000: 0) |
(states.powerup? 0b00010000: 0) |
(states.dead? 0b00001000: 0) |
(states.still? 0b00000100: 0) |
(states.jumpshot? 0b00000010: 0) |
(states.running? 0b00000001: 0);
states.jumping & 0b10000000 |
states.shooting & 0b01000000 |
states.hit & 0b00100000 |
states.powerup & 0b00010000 |
states.dead & 0b00001000 |
states.still & 0b00000100 |
states.jumpshot & 0b00000010 |
states.running & 0b00000001;
memcpy(*buf + sizeof(uint64_t) * 2 + 1, &states8, sizeof(uint8_t));
@@ -530,7 +530,7 @@ bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
(uint64_t)diff[5] << 16 |
(uint64_t)diff[6] << 8 |
(uint64_t)diff[7];
memcpy(diff, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
in->sid =
(uint64_t)diff[0] << 56 |