mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-05 06:50:04 +00:00
Use FE2CL_..._AROUND, _AROUND_DEL packets (#295)
* Use FE2CL_..._AROUND, _AROUND_DEL packets * Use increased buffer size for 728 and 1013 protocols
This commit is contained in:
parent
6ffde9bb44
commit
ae327cc104
1
Makefile
1
Makefile
@ -115,6 +115,7 @@ CXXHDR=\
|
|||||||
src/settings.hpp\
|
src/settings.hpp\
|
||||||
src/Transport.hpp\
|
src/Transport.hpp\
|
||||||
src/TableData.hpp\
|
src/TableData.hpp\
|
||||||
|
src/Bucket.hpp\
|
||||||
src/Chunking.hpp\
|
src/Chunking.hpp\
|
||||||
src/Buddies.hpp\
|
src/Buddies.hpp\
|
||||||
src/Groups.hpp\
|
src/Groups.hpp\
|
||||||
|
40
src/Bucket.hpp
Normal file
40
src/Bucket.hpp
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
#include <optional>
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
template<class T, size_t N>
|
||||||
|
class Bucket {
|
||||||
|
std::array<T, N> buf;
|
||||||
|
size_t sz;
|
||||||
|
public:
|
||||||
|
Bucket() {
|
||||||
|
sz = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void add(const T& item) {
|
||||||
|
assert(sz < N);
|
||||||
|
buf[sz++] = item;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::optional<T> get(size_t idx) const {
|
||||||
|
if (idx < sz) {
|
||||||
|
return buf[idx];
|
||||||
|
}
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t size() const {
|
||||||
|
return sz;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool isFull() const {
|
||||||
|
return sz == N;
|
||||||
|
}
|
||||||
|
|
||||||
|
void clear() {
|
||||||
|
sz = 0;
|
||||||
|
}
|
||||||
|
};
|
163
src/Chunking.cpp
163
src/Chunking.cpp
@ -1,7 +1,9 @@
|
|||||||
#include "Chunking.hpp"
|
#include "Chunking.hpp"
|
||||||
|
|
||||||
|
#include "Player.hpp"
|
||||||
#include "MobAI.hpp"
|
#include "MobAI.hpp"
|
||||||
#include "NPCManager.hpp"
|
#include "NPCManager.hpp"
|
||||||
|
#include "Bucket.hpp"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
@ -11,6 +13,12 @@ using namespace Chunking;
|
|||||||
* The initial chunkPos value before a player is placed into the world.
|
* The initial chunkPos value before a player is placed into the world.
|
||||||
*/
|
*/
|
||||||
const ChunkPos Chunking::INVALID_CHUNK = {};
|
const ChunkPos Chunking::INVALID_CHUNK = {};
|
||||||
|
constexpr size_t MAX_PC_PER_AROUND = (CN_PACKET_BODY_SIZE - sizeof(int32_t)) / sizeof(sPCAppearanceData);
|
||||||
|
constexpr size_t MAX_NPC_PER_AROUND = (CN_PACKET_BODY_SIZE - sizeof(int32_t)) / sizeof(sNPCAppearanceData);
|
||||||
|
constexpr size_t MAX_SHINY_PER_AROUND = (CN_PACKET_BODY_SIZE - sizeof(int32_t)) / sizeof(sShinyAppearanceData);
|
||||||
|
constexpr size_t MAX_TRANSPORTATION_PER_AROUND = (CN_PACKET_BODY_SIZE - sizeof(int32_t)) / sizeof(sTransportationAppearanceData);
|
||||||
|
constexpr size_t MAX_IDS_PER_AROUND_DEL = (CN_PACKET_BODY_SIZE - sizeof(int32_t)) / sizeof(int32_t);
|
||||||
|
constexpr size_t MAX_TRANSPORTATION_IDS_PER_AROUND_DEL = MAX_IDS_PER_AROUND_DEL - 1; // 1 less for eTT
|
||||||
|
|
||||||
std::map<ChunkPos, Chunk*> Chunking::chunks;
|
std::map<ChunkPos, Chunk*> Chunking::chunks;
|
||||||
|
|
||||||
@ -75,11 +83,80 @@ void Chunking::untrackEntity(ChunkPos chunkPos, const EntityRef ref) {
|
|||||||
deleteChunk(chunkPos);
|
deleteChunk(chunkPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<class T, size_t N>
|
||||||
|
static void sendAroundPackets(const EntityRef recipient, std::vector<Bucket<T, N>>& buckets, uint32_t packetId) {
|
||||||
|
assert(recipient.kind == EntityKind::PLAYER);
|
||||||
|
|
||||||
|
uint8_t pktBuf[CN_PACKET_BODY_SIZE];
|
||||||
|
for (const auto& bucket : buckets) {
|
||||||
|
memset(pktBuf, 0, CN_PACKET_BODY_SIZE);
|
||||||
|
int count = bucket.size();
|
||||||
|
*((int32_t*)pktBuf) = count;
|
||||||
|
T* data = (T*)(pktBuf + sizeof(int32_t));
|
||||||
|
for (size_t i = 0; i < count; i++) {
|
||||||
|
data[i] = bucket.get(i).value();
|
||||||
|
}
|
||||||
|
recipient.sock->sendPacket(pktBuf, packetId, sizeof(int32_t) + (count * sizeof(T)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template<size_t N>
|
||||||
|
static void sendAroundDelPackets(const EntityRef recipient, std::vector<Bucket<int32_t, N>>& buckets, uint32_t packetId) {
|
||||||
|
assert(recipient.kind == EntityKind::PLAYER);
|
||||||
|
|
||||||
|
uint8_t pktBuf[CN_PACKET_BODY_SIZE];
|
||||||
|
for (const auto& bucket : buckets) {
|
||||||
|
memset(pktBuf, 0, CN_PACKET_BODY_SIZE);
|
||||||
|
int count = bucket.size();
|
||||||
|
assert(count <= N);
|
||||||
|
|
||||||
|
size_t baseSize;
|
||||||
|
if (packetId == P_FE2CL_AROUND_DEL_TRANSPORTATION) {
|
||||||
|
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;
|
||||||
|
baseSize = sizeof(int32_t);
|
||||||
|
}
|
||||||
|
int32_t* ids = (int32_t*)(pktBuf + baseSize);
|
||||||
|
|
||||||
|
for (size_t i = 0; i < count; i++) {
|
||||||
|
ids[i] = bucket.get(i).value();
|
||||||
|
}
|
||||||
|
recipient.sock->sendPacket(pktBuf, packetId, baseSize + (count * sizeof(int32_t)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class T, size_t N>
|
||||||
|
static void bufferAppearanceData(std::vector<Bucket<T, N>>& buckets, const T& data) {
|
||||||
|
if (buckets.empty())
|
||||||
|
buckets.push_back({});
|
||||||
|
auto& bucket = buckets[buckets.size() - 1];
|
||||||
|
bucket.add(data);
|
||||||
|
if (bucket.isFull())
|
||||||
|
buckets.push_back({});
|
||||||
|
}
|
||||||
|
|
||||||
|
template<size_t N>
|
||||||
|
static void bufferIdForDisappearance(std::vector<Bucket<int32_t, N>>& buckets, int32_t id) {
|
||||||
|
if (buckets.empty())
|
||||||
|
buckets.push_back({});
|
||||||
|
auto& bucket = buckets[buckets.size() - 1];
|
||||||
|
bucket.add(id);
|
||||||
|
if (bucket.isFull())
|
||||||
|
buckets.push_back({});
|
||||||
|
}
|
||||||
|
|
||||||
void Chunking::addEntityToChunks(std::set<Chunk*> chnks, const EntityRef ref) {
|
void Chunking::addEntityToChunks(std::set<Chunk*> chnks, const EntityRef ref) {
|
||||||
Entity *ent = ref.getEntity();
|
Entity *ent = ref.getEntity();
|
||||||
bool alive = ent->isExtant();
|
bool alive = ent->isExtant();
|
||||||
|
|
||||||
// TODO: maybe optimize this, potentially using AROUND packets?
|
std::vector<Bucket<sPCAppearanceData, MAX_PC_PER_AROUND>> pcAppearances;
|
||||||
|
std::vector<Bucket<sNPCAppearanceData, MAX_NPC_PER_AROUND>> npcAppearances;
|
||||||
|
std::vector<Bucket<sShinyAppearanceData, MAX_SHINY_PER_AROUND>> shinyAppearances;
|
||||||
|
std::vector<Bucket<sTransportationAppearanceData, MAX_TRANSPORTATION_PER_AROUND>> transportationAppearances;
|
||||||
for (Chunk *chunk : chnks) {
|
for (Chunk *chunk : chnks) {
|
||||||
for (const EntityRef otherRef : chunk->entities) {
|
for (const EntityRef otherRef : chunk->entities) {
|
||||||
// skip oneself
|
// skip oneself
|
||||||
@ -95,7 +172,38 @@ void Chunking::addEntityToChunks(std::set<Chunk*> chnks, const EntityRef ref) {
|
|||||||
|
|
||||||
// notify this *player* of the existence of all visible Entities
|
// notify this *player* of the existence of all visible Entities
|
||||||
if (ref.kind == EntityKind::PLAYER && other->isExtant()) {
|
if (ref.kind == EntityKind::PLAYER && other->isExtant()) {
|
||||||
other->enterIntoViewOf(ref.sock);
|
sPCAppearanceData pcData;
|
||||||
|
sNPCAppearanceData npcData;
|
||||||
|
sShinyAppearanceData eggData;
|
||||||
|
sTransportationAppearanceData busData;
|
||||||
|
switch(otherRef.kind) {
|
||||||
|
case EntityKind::PLAYER:
|
||||||
|
pcData = dynamic_cast<Player*>(other)->getAppearanceData();
|
||||||
|
bufferAppearanceData(pcAppearances, pcData);
|
||||||
|
break;
|
||||||
|
case EntityKind::SIMPLE_NPC:
|
||||||
|
npcData = dynamic_cast<BaseNPC*>(other)->getAppearanceData();
|
||||||
|
bufferAppearanceData(npcAppearances, npcData);
|
||||||
|
break;
|
||||||
|
case EntityKind::COMBAT_NPC:
|
||||||
|
npcData = dynamic_cast<CombatNPC*>(other)->getAppearanceData();
|
||||||
|
bufferAppearanceData(npcAppearances, npcData);
|
||||||
|
break;
|
||||||
|
case EntityKind::MOB:
|
||||||
|
npcData = dynamic_cast<Mob*>(other)->getAppearanceData();
|
||||||
|
bufferAppearanceData(npcAppearances, npcData);
|
||||||
|
break;
|
||||||
|
case EntityKind::EGG:
|
||||||
|
eggData = dynamic_cast<Egg*>(other)->getShinyAppearanceData();
|
||||||
|
bufferAppearanceData(shinyAppearances, eggData);
|
||||||
|
break;
|
||||||
|
case EntityKind::BUS:
|
||||||
|
busData = dynamic_cast<Bus*>(other)->getTransportationAppearanceData();
|
||||||
|
bufferAppearanceData(transportationAppearances, busData);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// for mobs, increment playersInView
|
// for mobs, increment playersInView
|
||||||
@ -105,13 +213,27 @@ void Chunking::addEntityToChunks(std::set<Chunk*> chnks, const EntityRef ref) {
|
|||||||
((Mob*)other)->playersInView++;
|
((Mob*)other)->playersInView++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ref.kind == EntityKind::PLAYER) {
|
||||||
|
if (!pcAppearances.empty())
|
||||||
|
sendAroundPackets(ref, pcAppearances, P_FE2CL_PC_AROUND);
|
||||||
|
if (!npcAppearances.empty())
|
||||||
|
sendAroundPackets(ref, npcAppearances, P_FE2CL_NPC_AROUND);
|
||||||
|
if (!shinyAppearances.empty())
|
||||||
|
sendAroundPackets(ref, shinyAppearances, P_FE2CL_SHINY_AROUND);
|
||||||
|
if (!transportationAppearances.empty())
|
||||||
|
sendAroundPackets(ref, transportationAppearances, P_FE2CL_TRANSPORTATION_AROUND);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Chunking::removeEntityFromChunks(std::set<Chunk*> chnks, const EntityRef ref) {
|
void Chunking::removeEntityFromChunks(std::set<Chunk*> chnks, const EntityRef ref) {
|
||||||
Entity *ent = ref.getEntity();
|
Entity *ent = ref.getEntity();
|
||||||
bool alive = ent->isExtant();
|
bool alive = ent->isExtant();
|
||||||
|
|
||||||
// TODO: same as above
|
std::vector<Bucket<int32_t, MAX_IDS_PER_AROUND_DEL>> pcDisappearances;
|
||||||
|
std::vector<Bucket<int32_t, MAX_IDS_PER_AROUND_DEL>> npcDisappearances;
|
||||||
|
std::vector<Bucket<int32_t, MAX_IDS_PER_AROUND_DEL>> shinyDisappearances;
|
||||||
|
std::vector<Bucket<int32_t, MAX_TRANSPORTATION_IDS_PER_AROUND_DEL>> transportationDisappearances;
|
||||||
for (Chunk *chunk : chnks) {
|
for (Chunk *chunk : chnks) {
|
||||||
for (const EntityRef otherRef : chunk->entities) {
|
for (const EntityRef otherRef : chunk->entities) {
|
||||||
// skip oneself
|
// skip oneself
|
||||||
@ -127,7 +249,29 @@ void Chunking::removeEntityFromChunks(std::set<Chunk*> chnks, const EntityRef re
|
|||||||
|
|
||||||
// notify this *player* of the departure of all visible Entities
|
// notify this *player* of the departure of all visible Entities
|
||||||
if (ref.kind == EntityKind::PLAYER && other->isExtant()) {
|
if (ref.kind == EntityKind::PLAYER && other->isExtant()) {
|
||||||
other->disappearFromViewOf(ref.sock);
|
int32_t id;
|
||||||
|
switch(otherRef.kind) {
|
||||||
|
case EntityKind::PLAYER:
|
||||||
|
id = dynamic_cast<Player*>(other)->iID;
|
||||||
|
bufferIdForDisappearance(pcDisappearances, id);
|
||||||
|
break;
|
||||||
|
case EntityKind::SIMPLE_NPC:
|
||||||
|
case EntityKind::COMBAT_NPC:
|
||||||
|
case EntityKind::MOB:
|
||||||
|
id = dynamic_cast<BaseNPC*>(other)->id;
|
||||||
|
bufferIdForDisappearance(npcDisappearances, id);
|
||||||
|
break;
|
||||||
|
case EntityKind::EGG:
|
||||||
|
id = dynamic_cast<Egg*>(other)->id;
|
||||||
|
bufferIdForDisappearance(shinyDisappearances, id);
|
||||||
|
break;
|
||||||
|
case EntityKind::BUS:
|
||||||
|
id = dynamic_cast<Bus*>(other)->id;
|
||||||
|
bufferIdForDisappearance(transportationDisappearances, id);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// for mobs, decrement playersInView
|
// for mobs, decrement playersInView
|
||||||
@ -137,6 +281,17 @@ void Chunking::removeEntityFromChunks(std::set<Chunk*> chnks, const EntityRef re
|
|||||||
((Mob*)other)->playersInView--;
|
((Mob*)other)->playersInView--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ref.kind == EntityKind::PLAYER) {
|
||||||
|
if (!pcDisappearances.empty())
|
||||||
|
sendAroundDelPackets(ref, pcDisappearances, P_FE2CL_AROUND_DEL_PC);
|
||||||
|
if (!npcDisappearances.empty())
|
||||||
|
sendAroundDelPackets(ref, npcDisappearances, P_FE2CL_AROUND_DEL_NPC);
|
||||||
|
if (!shinyDisappearances.empty())
|
||||||
|
sendAroundDelPackets(ref, shinyDisappearances, P_FE2CL_AROUND_DEL_SHINY);
|
||||||
|
if (!transportationDisappearances.empty())
|
||||||
|
sendAroundDelPackets(ref, transportationDisappearances, P_FE2CL_AROUND_DEL_TRANSPORTATION);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void emptyChunk(ChunkPos chunkPos) {
|
static void emptyChunk(ChunkPos chunkPos) {
|
||||||
|
@ -126,15 +126,6 @@ static void eggStep(CNServer* serv, time_t currTime) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Eggs::npcDataToEggData(int x, int y, int z, sNPCAppearanceData* npc, sShinyAppearanceData* egg) {
|
|
||||||
egg->iX = x;
|
|
||||||
egg->iY = y;
|
|
||||||
egg->iZ = z;
|
|
||||||
// client doesn't care about egg->iMapNum
|
|
||||||
egg->iShinyType = npc->iNPCType;
|
|
||||||
egg->iShiny_ID = npc->iNPC_ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void eggPickup(CNSocket* sock, CNPacketData* data) {
|
static void eggPickup(CNSocket* sock, CNPacketData* data) {
|
||||||
auto pickup = (sP_CL2FE_REQ_SHINY_PICKUP*)data->buf;
|
auto pickup = (sP_CL2FE_REQ_SHINY_PICKUP*)data->buf;
|
||||||
Player* plr = PlayerManager::getPlayer(sock);
|
Player* plr = PlayerManager::getPlayer(sock);
|
||||||
|
@ -15,5 +15,4 @@ namespace Eggs {
|
|||||||
void init();
|
void init();
|
||||||
|
|
||||||
void eggBuffPlayer(CNSocket* sock, int skillId, int eggId, int duration);
|
void eggBuffPlayer(CNSocket* sock, int skillId, int eggId, int duration);
|
||||||
void npcDataToEggData(int x, int y, int z, sNPCAppearanceData* npc, sShinyAppearanceData* egg);
|
|
||||||
}
|
}
|
||||||
|
@ -70,11 +70,7 @@ void Bus::enterIntoViewOf(CNSocket *sock) {
|
|||||||
INITSTRUCT(sP_FE2CL_TRANSPORTATION_ENTER, pkt);
|
INITSTRUCT(sP_FE2CL_TRANSPORTATION_ENTER, pkt);
|
||||||
|
|
||||||
// TODO: Potentially decouple this from BaseNPC?
|
// TODO: Potentially decouple this from BaseNPC?
|
||||||
pkt.AppearanceData = {
|
pkt.AppearanceData = getTransportationAppearanceData();
|
||||||
3, id, type,
|
|
||||||
x, y, z
|
|
||||||
};
|
|
||||||
|
|
||||||
sock->sendPacket(pkt, P_FE2CL_TRANSPORTATION_ENTER);
|
sock->sendPacket(pkt, P_FE2CL_TRANSPORTATION_ENTER);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,12 +78,22 @@ void Egg::enterIntoViewOf(CNSocket *sock) {
|
|||||||
INITSTRUCT(sP_FE2CL_SHINY_ENTER, pkt);
|
INITSTRUCT(sP_FE2CL_SHINY_ENTER, pkt);
|
||||||
|
|
||||||
// TODO: Potentially decouple this from BaseNPC?
|
// TODO: Potentially decouple this from BaseNPC?
|
||||||
pkt.ShinyAppearanceData = {
|
pkt.ShinyAppearanceData = getShinyAppearanceData();
|
||||||
|
sock->sendPacket(pkt, P_FE2CL_SHINY_ENTER);
|
||||||
|
}
|
||||||
|
|
||||||
|
sTransportationAppearanceData Bus::getTransportationAppearanceData() {
|
||||||
|
return sTransportationAppearanceData {
|
||||||
|
3, id, type,
|
||||||
|
x, y, z
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
sShinyAppearanceData Egg::getShinyAppearanceData() {
|
||||||
|
return sShinyAppearanceData {
|
||||||
id, type, 0, // client doesn't care about map num
|
id, type, 0, // client doesn't care about map num
|
||||||
x, y, z
|
x, y, z
|
||||||
};
|
};
|
||||||
|
|
||||||
sock->sendPacket(pkt, P_FE2CL_SHINY_ENTER);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sNano* Player::getActiveNano() {
|
sNano* Player::getActiveNano() {
|
||||||
|
@ -161,6 +161,8 @@ struct Egg : public BaseNPC {
|
|||||||
|
|
||||||
virtual void enterIntoViewOf(CNSocket *sock) override;
|
virtual void enterIntoViewOf(CNSocket *sock) override;
|
||||||
virtual void disappearFromViewOf(CNSocket *sock) override;
|
virtual void disappearFromViewOf(CNSocket *sock) override;
|
||||||
|
|
||||||
|
sShinyAppearanceData getShinyAppearanceData();
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Bus : public BaseNPC {
|
struct Bus : public BaseNPC {
|
||||||
@ -172,4 +174,6 @@ struct Bus : public BaseNPC {
|
|||||||
|
|
||||||
virtual void enterIntoViewOf(CNSocket *sock) override;
|
virtual void enterIntoViewOf(CNSocket *sock) override;
|
||||||
virtual void disappearFromViewOf(CNSocket *sock) override;
|
virtual void disappearFromViewOf(CNSocket *sock) override;
|
||||||
|
|
||||||
|
sTransportationAppearanceData getTransportationAppearanceData();
|
||||||
};
|
};
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
/* enum definitions from the client */
|
/* enum definitions from the client */
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "core/CNStructs.hpp"
|
||||||
|
|
||||||
// floats
|
// floats
|
||||||
const float VALUE_BATTERY_EMPTY_PENALTY = 0.5f;
|
const float VALUE_BATTERY_EMPTY_PENALTY = 0.5f;
|
||||||
const float CN_EP_RANK_1 = 0.8f;
|
const float CN_EP_RANK_1 = 0.8f;
|
||||||
@ -410,7 +412,13 @@ enum {
|
|||||||
SEND_ANYCAST_NEW = 3,
|
SEND_ANYCAST_NEW = 3,
|
||||||
SEND_BROADCAST = 4,
|
SEND_BROADCAST = 4,
|
||||||
|
|
||||||
|
#if PROTOCOL_VERSION == 728
|
||||||
|
CN_PACKET_BUFFER_SIZE = 8192,
|
||||||
|
#elif PROTOCOL_VERSION == 1013
|
||||||
|
CN_PACKET_BUFFER_SIZE = 8192,
|
||||||
|
#else
|
||||||
CN_PACKET_BUFFER_SIZE = 4096,
|
CN_PACKET_BUFFER_SIZE = 4096,
|
||||||
|
#endif
|
||||||
|
|
||||||
P_CL2LS_REQ_LOGIN = 0x12000001, // 301989889
|
P_CL2LS_REQ_LOGIN = 0x12000001, // 301989889
|
||||||
P_CL2LS_REQ_CHECK_CHAR_NAME = 0x12000002, // 301989890
|
P_CL2LS_REQ_CHECK_CHAR_NAME = 0x12000002, // 301989890
|
||||||
|
@ -235,7 +235,7 @@ std::map<uint32_t, PacketDesc> Packets::packets = {
|
|||||||
PACKET(P_FE2CL_REP_PC_EXIT_FAIL),
|
PACKET(P_FE2CL_REP_PC_EXIT_FAIL),
|
||||||
PACKET(P_FE2CL_REP_PC_EXIT_SUCC),
|
PACKET(P_FE2CL_REP_PC_EXIT_SUCC),
|
||||||
PACKET(P_FE2CL_PC_EXIT),
|
PACKET(P_FE2CL_PC_EXIT),
|
||||||
PACKET(P_FE2CL_PC_AROUND),
|
VAR_PACKET(P_FE2CL_PC_AROUND, iPCCnt, sPCAppearanceData),
|
||||||
PACKET(P_FE2CL_PC_MOVE),
|
PACKET(P_FE2CL_PC_MOVE),
|
||||||
PACKET(P_FE2CL_PC_STOP),
|
PACKET(P_FE2CL_PC_STOP),
|
||||||
PACKET(P_FE2CL_PC_JUMP),
|
PACKET(P_FE2CL_PC_JUMP),
|
||||||
@ -243,9 +243,9 @@ std::map<uint32_t, PacketDesc> Packets::packets = {
|
|||||||
PACKET(P_FE2CL_NPC_EXIT),
|
PACKET(P_FE2CL_NPC_EXIT),
|
||||||
PACKET(P_FE2CL_NPC_MOVE),
|
PACKET(P_FE2CL_NPC_MOVE),
|
||||||
PACKET(P_FE2CL_NPC_NEW),
|
PACKET(P_FE2CL_NPC_NEW),
|
||||||
PACKET(P_FE2CL_NPC_AROUND),
|
VAR_PACKET(P_FE2CL_NPC_AROUND, iNPCCnt, sNPCAppearanceData),
|
||||||
PACKET(P_FE2CL_AROUND_DEL_PC),
|
VAR_PACKET(P_FE2CL_AROUND_DEL_PC, iPCCnt, int32_t),
|
||||||
PACKET(P_FE2CL_AROUND_DEL_NPC),
|
VAR_PACKET(P_FE2CL_AROUND_DEL_NPC, iNPCCnt, int32_t),
|
||||||
PACKET(P_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC),
|
PACKET(P_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC),
|
||||||
PACKET(P_FE2CL_REP_SEND_FREECHAT_MESSAGE_FAIL),
|
PACKET(P_FE2CL_REP_SEND_FREECHAT_MESSAGE_FAIL),
|
||||||
VAR_PACKET(P_FE2CL_PC_ATTACK_NPCs_SUCC, iNPCCnt, sAttackResult),
|
VAR_PACKET(P_FE2CL_PC_ATTACK_NPCs_SUCC, iNPCCnt, sAttackResult),
|
||||||
@ -387,8 +387,8 @@ std::map<uint32_t, PacketDesc> Packets::packets = {
|
|||||||
PACKET(P_FE2CL_TRANSPORTATION_EXIT),
|
PACKET(P_FE2CL_TRANSPORTATION_EXIT),
|
||||||
PACKET(P_FE2CL_TRANSPORTATION_MOVE),
|
PACKET(P_FE2CL_TRANSPORTATION_MOVE),
|
||||||
PACKET(P_FE2CL_TRANSPORTATION_NEW),
|
PACKET(P_FE2CL_TRANSPORTATION_NEW),
|
||||||
PACKET(P_FE2CL_TRANSPORTATION_AROUND),
|
VAR_PACKET(P_FE2CL_TRANSPORTATION_AROUND, iCnt, sTransportationAppearanceData),
|
||||||
PACKET(P_FE2CL_AROUND_DEL_TRANSPORTATION),
|
VAR_PACKET(P_FE2CL_AROUND_DEL_TRANSPORTATION, iCnt, int32_t),
|
||||||
PACKET(P_FE2CL_REP_EP_RANK_LIST),
|
PACKET(P_FE2CL_REP_EP_RANK_LIST),
|
||||||
PACKET(P_FE2CL_REP_EP_RANK_DETAIL),
|
PACKET(P_FE2CL_REP_EP_RANK_DETAIL),
|
||||||
PACKET(P_FE2CL_REP_EP_RANK_PC_INFO),
|
PACKET(P_FE2CL_REP_EP_RANK_PC_INFO),
|
||||||
@ -404,8 +404,8 @@ std::map<uint32_t, PacketDesc> Packets::packets = {
|
|||||||
PACKET(P_FE2CL_SHINY_ENTER),
|
PACKET(P_FE2CL_SHINY_ENTER),
|
||||||
PACKET(P_FE2CL_SHINY_EXIT),
|
PACKET(P_FE2CL_SHINY_EXIT),
|
||||||
PACKET(P_FE2CL_SHINY_NEW),
|
PACKET(P_FE2CL_SHINY_NEW),
|
||||||
PACKET(P_FE2CL_SHINY_AROUND),
|
VAR_PACKET(P_FE2CL_SHINY_AROUND, iShinyCnt, sShinyAppearanceData),
|
||||||
PACKET(P_FE2CL_AROUND_DEL_SHINY),
|
VAR_PACKET(P_FE2CL_AROUND_DEL_SHINY, iShinyCnt, int32_t),
|
||||||
PACKET(P_FE2CL_REP_SHINY_PICKUP_FAIL),
|
PACKET(P_FE2CL_REP_SHINY_PICKUP_FAIL),
|
||||||
PACKET(P_FE2CL_REP_SHINY_PICKUP_SUCC),
|
PACKET(P_FE2CL_REP_SHINY_PICKUP_SUCC),
|
||||||
PACKET(P_FE2CL_PC_MOVETRANSPORTATION),
|
PACKET(P_FE2CL_PC_MOVETRANSPORTATION),
|
||||||
|
Loading…
Reference in New Issue
Block a user