diff --git a/src/CNShardServer.hpp b/src/CNShardServer.hpp index c403f99..139f71e 100644 --- a/src/CNShardServer.hpp +++ b/src/CNShardServer.hpp @@ -45,7 +45,7 @@ enum SHARDPACKETID { P_FE2CL_NPC_EXIT = 822083596, P_FE2CL_ANNOUNCE_MSG = 822083778, P_FE2CL_GM_REP_PC_SET_VALUE = 822083781, - P_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC = 822083602, + P_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC = 822083602, P_FE2CL_REP_PC_AVATAR_EMOTES_CHAT = 822083730, P_FE2CL_REP_PC_EXIT_SUCC = 822083589, P_FE2CL_PC_MOTD_LOGIN = 822083793 diff --git a/src/CNStructs.hpp b/src/CNStructs.hpp index 8fd70ca..4007758 100644 --- a/src/CNStructs.hpp +++ b/src/CNStructs.hpp @@ -35,9 +35,9 @@ uint64_t getTime(); #define CNPROTO_VERSION_0104 #if defined(CNPROTO_VERSION_0104) - #include "structs/0104.hpp" + #include "structs/0104.hpp" #elif defined(CNPROTO_VERSION_0728) - #include "structs/0728.hpp" + #include "structs/0728.hpp" #endif #endif diff --git a/src/NanoManager.cpp b/src/NanoManager.cpp index 5d2a560..4e773d0 100644 --- a/src/NanoManager.cpp +++ b/src/NanoManager.cpp @@ -4,20 +4,20 @@ #include "PlayerManager.hpp" void NanoManager::init() { - REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_ACTIVE, nanoSummonHandler); + REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_ACTIVE, nanoSummonHandler); } void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) { - if (data->size != sizeof(sP_CL2FE_REQ_NANO_ACTIVE)) + if (data->size != sizeof(sP_CL2FE_REQ_NANO_ACTIVE)) return; // malformed packet - sP_CL2FE_REQ_NANO_ACTIVE* nano = (sP_CL2FE_REQ_NANO_ACTIVE*)data->buf; - PlayerView plr = PlayerManager::players[sock]; + sP_CL2FE_REQ_NANO_ACTIVE* nano = (sP_CL2FE_REQ_NANO_ACTIVE*)data->buf; + PlayerView plr = PlayerManager::players[sock]; - // Send to client - sP_FE2CL_REP_NANO_ACTIVE_SUCC* resp = (sP_FE2CL_REP_NANO_ACTIVE_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_NANO_ACTIVE_SUCC)); - resp->iActiveNanoSlotNum = nano->iNanoSlotNum; - sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_ACTIVE_SUCC, sizeof(sP_FE2CL_REP_NANO_ACTIVE_SUCC), sock->getFEKey())); + // Send to client + sP_FE2CL_REP_NANO_ACTIVE_SUCC* resp = (sP_FE2CL_REP_NANO_ACTIVE_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_NANO_ACTIVE_SUCC)); + resp->iActiveNanoSlotNum = nano->iNanoSlotNum; + sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_ACTIVE_SUCC, sizeof(sP_FE2CL_REP_NANO_ACTIVE_SUCC), sock->getFEKey())); - std::cout << U16toU8(plr.plr.PCStyle.szFirstName) << U16toU8(plr.plr.PCStyle.szLastName) << " requested to summon nano slot: " << nano->iNanoSlotNum << std::endl; -} \ No newline at end of file + std::cout << U16toU8(plr.plr.PCStyle.szFirstName) << U16toU8(plr.plr.PCStyle.szLastName) << " requested to summon nano slot: " << nano->iNanoSlotNum << std::endl; +}