Improve weapon collision and fix packet pack

- Pixel round the weapon and player positions when checking overlap.
- Fix player-weapon collision box boundaries.
- Pack the sync request packet so it's the correct size.

Author: plushmonkey

src/null/Math.h

@@ -199,7 +199,7 @@ inline bool BoxBoxIntersect(const Vector2f& first_min, const Vector2f& first_max
 
 inline bool BoxBoxOverlap(const Vector2f& first_min, const Vector2f& first_max, const Vector2f& second_min,
                           const Vector2f& second_max) {
-  return (first_max.x > second_min.x && first_min.x < second_max.x && first_max.y > second_min.y &&
+  return (first_max.x >= second_min.x && first_min.x < second_max.x && first_max.y >= second_min.y &&
           first_min.y < second_max.y);
 }
 

src/null/WeaponManager.cpp

@@ -287,7 +287,7 @@ WeaponSimulateResult WeaponManager::Simulate(Weapon& weapon) {
 
     float radius = connection.settings.ShipSettings[player->ship].GetRadius();
     Vector2f player_r(radius, radius);
-    Vector2f& pos = player->position;
+    Vector2f pos = player->position.PixelRounded();
 
     float weapon_radius = 18.0f;
 
@@ -303,8 +303,8 @@ WeaponSimulateResult WeaponManager::Simulate(Weapon& weapon) {
 
     weapon_radius = (weapon_radius - 14.0f) / 16.0f;
 
-    Vector2f min_w(weapon.position.x - weapon_radius, weapon.position.y - weapon_radius);
-    Vector2f max_w(weapon.position.x + weapon_radius, weapon.position.y + weapon_radius);
+    Vector2f min_w = weapon.position.PixelRounded() - Vector2f(weapon_radius, weapon_radius);
+    Vector2f max_w = weapon.position.PixelRounded() + Vector2f(weapon_radius, weapon_radius);
 
     if (BoxBoxOverlap(pos - player_r, pos + player_r, min_w, max_w)) {
       bool hit = true;
@@ -324,8 +324,8 @@ WeaponSimulateResult WeaponManager::Simulate(Weapon& weapon) {
 
         weapon_radius = 4.0f / 16.0f;
 
-        min_w = Vector2f(weapon.position.x - weapon_radius, weapon.position.y - weapon_radius);
-        max_w = Vector2f(weapon.position.x + weapon_radius, weapon.position.y + weapon_radius);
+        min_w = weapon.position.PixelRounded() - Vector2f(weapon_radius, weapon_radius);
+        max_w = weapon.position.PixelRounded() + Vector2f(weapon_radius, weapon_radius);
 
         // Fully trigger the bomb if it hits the player's normal radius check
         hit = BoxBoxOverlap(pos - player_r, pos + player_r, min_w, max_w);

src/null/net/Connection.cpp

@@ -288,12 +288,14 @@ void Connection::ProcessPacket(u8* pkt, size_t size) {
       case ProtocolCore::SyncTimeRequest: {
         u32 timestamp = buffer.ReadU32();
 
+#pragma pack(push, 1)
         struct {
           u8 core;
           u8 type;
           u32 received_timestamp;
           u32 local_timestamp;
         } sync_response = {0x00, 0x06, timestamp, GetCurrentTick()};
+#pragma pack(pop)
 
         packet_sequencer.SendReliableMessage(*this, (u8*)&sync_response, sizeof(sync_response));
 
@@ -1021,10 +1023,12 @@ size_t Connection::Send(u8* data, size_t size) {
 }
 
 void Connection::SendDisconnect() {
+#pragma pack(push, 1)
   struct {
     u8 core;
     u8 type;
   } disconnect = {0x00, 0x07};
+#pragma pack(pop)
 
   Send((u8*)&disconnect, sizeof(u16));
 }
@@ -1065,10 +1069,12 @@ void Connection::SendSpectateRequest(u16 pid) {
 }
 
 void Connection::SendShipRequest(u8 ship) {
+#pragma pack(push, 1)
   struct {
     u8 type;
     u8 ship;
   } request = {0x18, ship};
+#pragma pack(pop)
 
   packet_sequencer.SendReliableMessage(*this, (u8*)&request, sizeof(request));
 }