ECS: Update some types with the rfc

PATCH

Author: Saverio976

src/Client/Systems/Network/ClientNetwork.cpp

@@ -99,6 +99,7 @@ namespace Systems {
         if (registry.getClock().elapsedMillisecondsSince(clockId) < delay) {
             return;
         }
+        registry.getClock().restart(clockId);
         auto ids = registry.getEntitiesByComponents({typeid(Types::Position), typeid(Types::Player)});
         auto arrPosition = registry.getComponents<Types::Position>();
 
@@ -112,7 +113,6 @@ namespace Systems {
         auto &posCached = positionPlayerCached.second;
         const auto &pos = arrPosition[positionPlayerCached.first];
         if (pos.x != posCached.x || pos.y != posCached.y) {
-            registry.getClock().restart(clockId);
             struct position_relative_s msg = {
                 .x = static_cast<char>(static_cast<int>(pos.x - posCached.x)),
                 .y = static_cast<char>(static_cast<int>(pos.y - posCached.y)),

src/ECS/MessageTypes.h

@@ -15,14 +15,16 @@ enum enemy_type_e {
     CLASSIC_ENEMY = 0,
 };
 
-enum missileTypes_e { CLASSIC };
+enum missileTypes_e {
+    CLASSIC = 0,
+};
 
 PACK(struct health_s {
     int hp;
 });
 
 PACK(struct enemy_id_s {
-    unsigned int id;
+    n_id_t id;
 });
 
 PACK(struct position_relative_s {
@@ -43,7 +45,7 @@ PACK(struct enemy_infos_s {
 });
 
 PACK(struct player_infos_s {
-    unsigned int id;
+    n_id_t id;
     struct position_absolute_s pos;
 });
 

src/Nitwork/Nitwork.h

@@ -22,15 +22,18 @@
 
     #define MAGICK_INIT '\x06'
     #define MAGICK_READY '\x17'
-    #define MAGICK_START_WAVE '\a'
-    #define MAGICK_POSITION_RELATIVE '\b'
-    #define MAGICK_POSITION_ABSOLUTE '\f'
+    #define MAGICK_START_WAVE '\x07'
+    #define MAGICK_POSITION_RELATIVE '\x08'
+    #define MAGICK_POSITION_ABSOLUTE '\x09'
     #define MAGICK_LIFE_UPDATE '\x0b'
     #define MAGICK_ENEMY_DEATH '\x0c'
     #define MAGICK_NEW_ENEMY '\x0e'
     #define MAGICK_NEW_BULLET '\x0c'
+    #define MAGICK_POSITION_RELATIVE_BROADCAST '\x0f'
+    #define MAGICK_POSITION_ABSOLUTE_BROADCAST '\xae'
+    #define MAGICK_NEW_ALLIE '\x0a'
 
-typedef char n_magick_t;
+typedef unsigned char n_magick_t;
 typedef int n_idsReceived_t;
 typedef unsigned char n_nbAction_t;
 
@@ -198,8 +201,8 @@ PACK(struct packetNewAllie_s {
 
 /* Message broadcast position relative */
 PACK(struct msgPositionRelativeBroadcast_s {
-    char x;
-    char y;
+    n_magick_t magick;
+    struct position_relative_s pos;
     n_id_t playerId;
 });
 

src/Nitwork/NitworkServer.cpp

@@ -152,10 +152,11 @@ namespace Nitwork {
                          .magick2          = HEADER_CODE2},
             .action = {.magick = POSITION_RELATIVE_BROADCAST},
             .msg    = {
-                         .x        = pos.x,
-                         .y        = pos.y,
-                         .playerId = getPlayerId(endpoint),
-                         }
+                        .magick = MAGICK_POSITION_RELATIVE_BROADCAST,
+                        .pos = {
+                            .x = pos.x,
+                            .y = pos.y},
+                         .playerId = getPlayerId(endpoint)}
         };
         Packet packet(
             msgPosBroadcast.action.magick,