From 91589b18c119af65b6995a8437d61c5dbb1bdb77 Mon Sep 17 00:00:00 2001
From: Gent Semaj <me@ycc.dev>
Date: Sun, 27 Oct 2024 11:55:06 -0700
Subject: [PATCH] More cleanup

---
 src/Chunking.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Chunking.cpp b/src/Chunking.cpp
index afdb298..06ba53f 100644
--- a/src/Chunking.cpp
+++ b/src/Chunking.cpp
@@ -95,12 +95,11 @@ static void sendAroundPacket(const EntityRef recipient, std::vector<std::vector<
         for (size_t i = 0; i < count; i++) {
             data[i] = slice[i];
         }
-        recipient.sock->sendPacket(pktBuf, packetId, 4 + (count * sizeof(T)));
+        recipient.sock->sendPacket(pktBuf, packetId, sizeof(int32_t) + (count * sizeof(T)));
     }
 }
 
-template<class T>
-static void sendAroundDelPacket(const EntityRef recipient, std::vector<std::vector<T>>& slices, bool isTransportation, uint32_t packetId) {
+static void sendAroundDelPacket(const EntityRef recipient, std::vector<std::vector<int32_t>>& slices, bool isTransportation, uint32_t packetId) {
     assert(recipient.kind == EntityKind::PLAYER);
 
     size_t maxCnt = MAX_IDS_PER_AROUND_DEL;
@@ -113,20 +112,22 @@ static void sendAroundDelPacket(const EntityRef recipient, std::vector<std::vect
         int count = slice.size();
         assert(count <= maxCnt);
 
-        T* data;
+        size_t baseSize;
         if (isTransportation) {
-            *((int32_t*)pktBuf) = 3; // eTT
-            *((int32_t*)pktBuf + sizeof(int32_t)) = count;
-            data = (T*)(pktBuf + sizeof(int32_t) + sizeof(int32_t));
+            sP_FE2CL_AROUND_DEL_TRANSPORTATION* pkt = (sP_FE2CL_AROUND_DEL_TRANSPORTATION*)pktBuf;
+            pkt->eTT = 3;
+            pkt->iCnt = count;
+            baseSize = sizeof(sP_FE2CL_AROUND_DEL_TRANSPORTATION);
         } else {
             *((int32_t*)pktBuf) = count;
-            data = (T*)(pktBuf + sizeof(int32_t));
+            baseSize = sizeof(int32_t);
         }
+        int32_t* ids = (int32_t*)(pktBuf + baseSize);
 
         for (size_t i = 0; i < count; i++) {
-            data[i] = slice[i];
+            ids[i] = slice[i];
         }
-        recipient.sock->sendPacket(pktBuf, packetId, isTransportation ? 8 : 4 + (count * sizeof(T)));
+        recipient.sock->sendPacket(pktBuf, packetId, baseSize + (count * sizeof(int32_t)));
     }
 }