This commit is contained in:
MarcEricMartel
2023-12-18 11:10:10 -05:00
parent 2c346139d5
commit 9a669acd9c
5 changed files with 140 additions and 45 deletions

View File

@@ -58,6 +58,12 @@ namespace netprot {
running = false;
};
struct Boosts {
bool invincible = false,
damage = false,
hp = false;
};
/* Structures de paquets */
struct Input { // cli -> srv UDP ~frame
@@ -80,10 +86,11 @@ namespace netprot {
uint64_t sid = 0;
uint32_t timer = 0;
uint16_t ammo = 0;
Boosts boost;
float hp = 0;
Vector3f position;
Sync() {}
Sync(Sync* sync) : timestamp(sync->timestamp), sid(sync->sid), timer(sync->timer), ammo(sync->ammo), hp(sync->hp), position(sync->position) {}
Sync(Sync* sync) : timestamp(sync->timestamp), sid(sync->sid), timer(sync->timer), ammo(sync->ammo), hp(sync->hp), position(sync->position), boost(sync->boost) {}
};
struct TeamInfo { // cli <-> srv TCP once
@@ -121,6 +128,15 @@ namespace netprot {
GameInfo(GameInfo* gam) : seed(gam->seed), countdown(gam->countdown), gameType(gam->gameType) {}
};
struct PickupMod {
uint64_t id;
Vector3f pos;
Boosts boost;
bool available = true;
PickupMod();
PickupMod(PickupMod* pmod) : id(pmod->id), pos(pmod->pos), boost(pmod->boost), available(pmod->available) {}
};
struct Chat { // cli <-> srv TCP event
uint64_t src_id = 0,
dest_id = 0,
@@ -161,6 +177,7 @@ namespace netprot {
void Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen); // cli/srv
void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv
void Serialize(ChunkMod* chmod, char* buf[], uint32_t* buflen); // srv
void Serialize(PickupMod* chmod, char* buf[], uint32_t* buflen); // srv
void Serialize(BulletAdd* bull, char* buf[], uint32_t* buflen); // srv
void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv
@@ -173,6 +190,7 @@ namespace netprot {
bool Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen); // cli
bool Deserialize(Chat* chat, char* buf, uint32_t* buflen); // srv/cli
bool Deserialize(ChunkMod* chmod, char* buf, uint32_t* buflen); // cli
bool Deserialize(PickupMod* chmod, char* buf, uint32_t* buflen); // cli
bool Deserialize(BulletAdd* bull, char* buf, uint32_t* buflen); // cli
bool Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen); // srv