OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-12-18 01:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: OpenPunk:1c979a76b6e662728f56f17f6fefbb57a6875167
Branches Tags
OpenPunk:master
OpenPunk:db
OpenPunk:landlock
OpenPunk:lua-more-better
OpenPunk:refactor
OpenPunk:win32-x86
OpenPunk:patchmap
OpenPunk:lua
OpenPunk:1.6
OpenPunk:1.5.2
OpenPunk:1.5.1
OpenPunk:1.5
OpenPunk:1.4
OpenPunk:1.3
OpenPunk:1.2.1
OpenPunk:1.2
OpenPunk:1.1
OpenPunk:1.0
...
compare: OpenPunk:a87c8aadbd0d600920621bfb3f353861b521403b
Branches Tags
OpenPunk:master
OpenPunk:db
OpenPunk:landlock
OpenPunk:lua-more-better
OpenPunk:refactor
OpenPunk:win32-x86
OpenPunk:patchmap
OpenPunk:lua
OpenPunk:1.6
OpenPunk:1.5.2
OpenPunk:1.5.1
OpenPunk:1.5
OpenPunk:1.4
OpenPunk:1.3
OpenPunk:1.2.1
OpenPunk:1.2
OpenPunk:1.1
OpenPunk:1.0

2 Commits
1c979a76b6 ... a87c8aadbd

Author SHA1 Message Date
Gent Semaj
a87c8aadbd
Merge 91589b18c1 into 8568fd1c46 2024-10-27 18:56:26 +00:00
Gent Semaj
91589b18c1
More cleanup 2024-10-27 11:56:19 -07:00
1 changed files with 11 additions and 10 deletions
Show Stats Expand all files Collapse all files

21
src/Chunking.cpp
View File

@ -95,12 +95,11 @@ static void sendAroundPacket(const EntityRef recipient, std::vector<std::vector<
for (size_t i = 0; i < count; i++) { for (size_t i = 0; i < count; i++) {
data[i] = slice[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<int32_t>>& slices, bool isTransportation, uint32_t packetId) {
static void sendAroundDelPacket(const EntityRef recipient, std::vector<std::vector<T>>& slices, bool isTransportation, uint32_t packetId) {
assert(recipient.kind == EntityKind::PLAYER); assert(recipient.kind == EntityKind::PLAYER);
size_t maxCnt = MAX_IDS_PER_AROUND_DEL; 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(); int count = slice.size();
assert(count <= maxCnt); assert(count <= maxCnt);
T* data; size_t baseSize;
if (isTransportation) { if (isTransportation) {
*((int32_t*)pktBuf) = 3; // eTT sP_FE2CL_AROUND_DEL_TRANSPORTATION* pkt = (sP_FE2CL_AROUND_DEL_TRANSPORTATION*)pktBuf;
*((int32_t*)pktBuf + sizeof(int32_t)) = count; pkt->eTT = 3;
data = (T*)(pktBuf + sizeof(int32_t) + sizeof(int32_t)); pkt->iCnt = count;
baseSize = sizeof(sP_FE2CL_AROUND_DEL_TRANSPORTATION);
} else { } else {
*((int32_t*)pktBuf) = count; *((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++) { 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)));
} }
} }