From 56bf0db20d6a1d4c7f50b6613e4d45267e19f998 Mon Sep 17 00:00:00 2001 From: Onii-chan Date: Sat, 22 Aug 2020 20:02:08 +0200 Subject: [PATCH 1/6] Added more nano features (commands, equip & unequip, powers) (#26) * Revert "fixed window build" This reverts commit b94f602537e5773026b25deb868536868530b414. * Revert "Revert "fixed window build"" This reverts commit dac4457ed27267774b1692533d2a9db8c3e344a9. * Add nano power feature * Update CNShardServer.hpp * Update CNShardServer.hpp * Test: Add nano power feature Nano powers are set to the first power in its selection by default. * Update NanoManager.cpp * Test: More nano features * Update NanoManager.hpp * Update PlayerManager.hpp * Update PlayerManager.cpp * Updated indentations * Update PlayerManager.cpp * Add DEBUGLOG() Co-authored-by: CPunch --- src/NanoManager.cpp | 130 +++++++++++++++++++++++++++++++++++++++++- src/NanoManager.hpp | 10 ++++ src/Player.hpp | 1 + src/PlayerManager.cpp | 65 ++++++++++++--------- src/PlayerManager.hpp | 1 + 5 files changed, 178 insertions(+), 29 deletions(-) diff --git a/src/NanoManager.cpp b/src/NanoManager.cpp index 4e773d0..38534d9 100644 --- a/src/NanoManager.cpp +++ b/src/NanoManager.cpp @@ -5,6 +5,50 @@ void NanoManager::init() { REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_ACTIVE, nanoSummonHandler); + REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_EQUIP, nanoEquipHandler); + REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_UNEQUIP, nanoUnEquipHandler); + REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_GIVE_NANO, nanoGMGiveHandler); + REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_TUNE, nanoSkillSetHandler); + REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_SKILL_USE, nanoSkillUseHandler); +} + +void NanoManager::nanoEquipHandler(CNSocket* sock, CNPacketData* data) { + if (data->size != sizeof(sP_CL2FE_REQ_NANO_EQUIP)) + return; // malformed packet + + sP_CL2FE_REQ_NANO_EQUIP* nano = (sP_CL2FE_REQ_NANO_EQUIP*)data->buf; + sP_FE2CL_REP_NANO_EQUIP_SUCC* resp = (sP_FE2CL_REP_NANO_EQUIP_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_NANO_EQUIP_SUCC)); + resp->iNanoID = nano->iNanoID; + resp->iNanoSlotNum = nano->iNanoSlotNum; + + sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_EQUIP_SUCC, sizeof(sP_FE2CL_REP_NANO_EQUIP_SUCC), sock->getFEKey())); +} + +void NanoManager::nanoUnEquipHandler(CNSocket* sock, CNPacketData* data) { + if (data->size != sizeof(sP_CL2FE_REQ_NANO_UNEQUIP)) + return; // malformed packet + + sP_CL2FE_REQ_NANO_UNEQUIP* nano = (sP_CL2FE_REQ_NANO_UNEQUIP*)data->buf; + sP_FE2CL_REP_NANO_UNEQUIP_SUCC* resp = (sP_FE2CL_REP_NANO_UNEQUIP_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_NANO_UNEQUIP_SUCC)); + resp->iNanoSlotNum = nano->iNanoSlotNum; + + sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_UNEQUIP_SUCC, sizeof(sP_FE2CL_REP_NANO_UNEQUIP_SUCC), sock->getFEKey())); +} + +void NanoManager::nanoGMGiveHandler(CNSocket* sock, CNPacketData* data) { + if (data->size != sizeof(sP_CL2FE_REQ_PC_GIVE_NANO)) + return; // ignore the malformed packet + + // Cmd: /nano + sP_CL2FE_REQ_PC_GIVE_NANO* nano = (sP_CL2FE_REQ_PC_GIVE_NANO*)data->buf; + Player plr = PlayerManager::getPlayer(sock); + + // Add nano to player + addNano(sock, nano->iNanoID, 0); + + DEBUGLOG( + std::cout << U16toU8(plr.PCStyle.szFirstName) << U16toU8(plr.PCStyle.szLastName) << " requested to add nano id: " << nano->iNanoID << std::endl; + ) } void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) { @@ -19,5 +63,89 @@ void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) { 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; + DEBUGLOG( + std::cout << U16toU8(plr.plr.PCStyle.szFirstName) << U16toU8(plr.plr.PCStyle.szLastName) << " requested to summon nano slot: " << nano->iNanoSlotNum << std::endl; + ) } + +void NanoManager::nanoSkillUseHandler(CNSocket* sock, CNPacketData* data) { + if (data->size != sizeof(sP_CL2FE_REQ_NANO_SKILL_USE)) + return; // malformed packet + + sP_CL2FE_REQ_NANO_SKILL_USE* skill = (sP_CL2FE_REQ_NANO_SKILL_USE*)data->buf; + PlayerView plr = PlayerManager::players[sock]; + + // Send to client + sP_FE2CL_NANO_SKILL_USE_SUCC* resp = (sP_FE2CL_NANO_SKILL_USE_SUCC*)xmalloc(sizeof(sP_FE2CL_NANO_SKILL_USE_SUCC)); + resp->iArg1 = skill->iArg1; + resp->iArg2 = skill->iArg2; + resp->iArg3 = skill->iArg3; + resp->iBulletID = skill->iBulletID; + resp->iTargetCnt = skill->iTargetCnt; + resp->iPC_ID = plr.plr.iID; + resp->iNanoStamina = 150; // Hardcoded for now + + sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_NANO_SKILL_USE_SUCC, sizeof(sP_FE2CL_NANO_SKILL_USE_SUCC), sock->getFEKey())); + DEBUGLOG( + std::cout << U16toU8(plr.plr.PCStyle.szFirstName) << U16toU8(plr.plr.PCStyle.szLastName) << " requested to summon nano skill " << std::endl; + ) +} + +void NanoManager::nanoSkillSetHandler(CNSocket* sock, CNPacketData* data) { + if (data->size != sizeof(sP_CL2FE_REQ_NANO_TUNE)) + return; // malformed packet + + sP_CL2FE_REQ_NANO_TUNE* skill = (sP_CL2FE_REQ_NANO_TUNE*)data->buf; + setNanoSkill(sock, skill->iNanoID, skill->iTuneID); +} + +#pragma region Helper methods +void NanoManager::addNano(CNSocket* sock, int16_t nanoId, int16_t slot) { + Player plr = PlayerManager::getPlayer(sock); + + // Send to client + sP_FE2CL_REP_PC_NANO_CREATE_SUCC* resp = new sP_FE2CL_REP_PC_NANO_CREATE_SUCC(); + resp->Nano.iID = nanoId; + resp->Nano.iStamina = 150; + resp->iQuestItemSlotNum = slot; + + sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_PC_NANO_CREATE_SUCC, sizeof(sP_FE2CL_REP_PC_NANO_CREATE_SUCC), sock->getFEKey())); + + // Update player + plr.Nanos[nanoId] = resp->Nano; + PlayerManager::updatePlayer(sock, plr); +} + +void NanoManager::setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId) { + Player plr = PlayerManager::getPlayer(sock); + sNano nano = plr.Nanos[nanoId]; + + nano.iSkillID = skillId; + plr.Nanos[nanoId] = nano; + + // Send to client + sP_FE2CL_REP_NANO_TUNE_SUCC* resp = (sP_FE2CL_REP_NANO_TUNE_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_NANO_TUNE_SUCC)); + resp->iNanoID = nanoId; + resp->iSkillID = skillId; + + sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_TUNE_SUCC, sizeof(sP_FE2CL_REP_NANO_TUNE_SUCC), sock->getFEKey())); + + DEBUGLOG( + std::cout << U16toU8(plr.PCStyle.szFirstName) << U16toU8(plr.PCStyle.szLastName) << " set skill id " << skillId << " for nano: " << nanoId << std::endl; + ) + + // Update the player + PlayerManager::updatePlayer(sock, plr); +} + +void NanoManager::resetNanoSkill(CNSocket* sock, int16_t nanoId) { + Player plr = PlayerManager::getPlayer(sock); + sNano nano = plr.Nanos[nanoId]; + + nano.iSkillID = 0; + plr.Nanos[nanoId] = nano; + + // Update the player + PlayerManager::updatePlayer(sock, plr); +} +#pragma endregion \ No newline at end of file diff --git a/src/NanoManager.hpp b/src/NanoManager.hpp index b583d7a..d1f2646 100644 --- a/src/NanoManager.hpp +++ b/src/NanoManager.hpp @@ -6,6 +6,16 @@ namespace NanoManager { void init(); void nanoSummonHandler(CNSocket* sock, CNPacketData* data); + void nanoEquipHandler(CNSocket* sock, CNPacketData* data); + void nanoUnEquipHandler(CNSocket* sock, CNPacketData* data); + void nanoGMGiveHandler(CNSocket* sock, CNPacketData* data); + void nanoSkillUseHandler(CNSocket* sock, CNPacketData* data); + void nanoSkillSetHandler(CNSocket* sock, CNPacketData* data); + + // Helper methods + void addNano(CNSocket* sock, int16_t nanoId, int16_t slot); + void setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId); + void resetNanoSkill(CNSocket* sock, int16_t nanoId); } #endif \ No newline at end of file diff --git a/src/Player.hpp b/src/Player.hpp index 8c6d917..9c3c001 100644 --- a/src/Player.hpp +++ b/src/Player.hpp @@ -17,6 +17,7 @@ struct Player { int slot; sPCStyle PCStyle; sPCStyle2 PCStyle2; + sNano Nanos[37]; int x, y, z, angle; sItemBase Equip[AEQUIP_COUNT]; diff --git a/src/PlayerManager.cpp b/src/PlayerManager.cpp index ef41df3..47dd443 100644 --- a/src/PlayerManager.cpp +++ b/src/PlayerManager.cpp @@ -82,7 +82,8 @@ void PlayerManager::updatePlayerPosition(CNSocket* sock, int X, int Y, int Z) { if (diffX < settings::VIEWDISTANCE && diffY < settings::VIEWDISTANCE) { yesView.push_back(pair.first); - } else { + } + else { noView.push_back(pair.first); } } @@ -95,7 +96,7 @@ void PlayerManager::updatePlayerPosition(CNSocket* sock, int X, int Y, int Z) { sP_FE2CL_PC_EXIT* exitPacket = (sP_FE2CL_PC_EXIT*)xmalloc(sizeof(sP_FE2CL_PC_EXIT)); sP_FE2CL_PC_EXIT* exitPacketOther = (sP_FE2CL_PC_EXIT*)xmalloc(sizeof(sP_FE2CL_PC_EXIT)); - + exitPacket->iID = players[sock].plr.iID; exitPacketOther->iID = players[otherSock].plr.iID; @@ -164,13 +165,13 @@ void PlayerManager::enterPlayer(CNSocket* sock, CNPacketData* data) { DEBUGLOG( std::cout << "P_CL2FE_REQ_PC_ENTER:" << std::endl; - std::cout << "\tID: " << U16toU8(enter->szID) << std::endl; - std::cout << "\tSerial: " << enter->iEnterSerialKey << std::endl; - std::cout << "\tTemp: " << enter->iTempValue << std::endl; - std::cout << "\tPC_UID: " << plr.PCStyle.iPC_UID << std::endl; + std::cout << "\tID: " << U16toU8(enter->szID) << std::endl; + std::cout << "\tSerial: " << enter->iEnterSerialKey << std::endl; + std::cout << "\tTemp: " << enter->iTempValue << std::endl; + std::cout << "\tPC_UID: " << plr.PCStyle.iPC_UID << std::endl; ) - response->iID = rand(); + response->iID = rand(); response->uiSvrTime = getTime(); response->PCLoadData2CL.iUserLevel = 1; response->PCLoadData2CL.iHP = 1000 * plr.level; @@ -213,9 +214,10 @@ void PlayerManager::enterPlayer(CNSocket* sock, CNPacketData* data) { response->PCLoadData2CL.aNanoBank[i].iStamina = 150; } - response->PCLoadData2CL.aNanoSlots[0] = 1; - response->PCLoadData2CL.aNanoSlots[1] = 2; - response->PCLoadData2CL.aNanoSlots[2] = 3; + // temporarily not add nanos for nano add test through commands + //response->PCLoadData2CL.aNanoSlots[0] = 1; + //response->PCLoadData2CL.aNanoSlots[1] = 2; + //response->PCLoadData2CL.aNanoSlots[2] = 3; response->PCLoadData2CL.aQuestFlag[0] = -1; @@ -245,10 +247,10 @@ void PlayerManager::loadPlayer(CNSocket* sock, CNPacketData* data) { DEBUGLOG( std::cout << "P_CL2FE_REQ_PC_LOADING_COMPLETE:" << std::endl; - std::cout << "\tPC_ID: " << complete->iPC_ID << std::endl; + std::cout << "\tPC_ID: " << complete->iPC_ID << std::endl; ) - response->iPC_ID = complete->iPC_ID; + response->iPC_ID = complete->iPC_ID; sock->sendPacket(new CNPacketData((void*)response, P_FE2CL_REP_PC_LOADING_COMPLETE_SUCC, sizeof(sP_FE2CL_REP_PC_LOADING_COMPLETE_SUCC), sock->getFEKey())); } @@ -256,7 +258,7 @@ void PlayerManager::loadPlayer(CNSocket* sock, CNPacketData* data) { void PlayerManager::movePlayer(CNSocket* sock, CNPacketData* data) { if (data->size != sizeof(sP_CL2FE_REQ_PC_MOVE)) return; // ignore the malformed packet - + sP_CL2FE_REQ_PC_MOVE* moveData = (sP_CL2FE_REQ_PC_MOVE*)data->buf; updatePlayerPosition(sock, moveData->iX, moveData->iY, moveData->iZ); @@ -276,7 +278,7 @@ void PlayerManager::movePlayer(CNSocket* sock, CNPacketData* data) { moveResponse->fVX = moveData->fVX; moveResponse->fVY = moveData->fVY; moveResponse->fVZ = moveData->fVZ; - + moveResponse->iSpeed = moveData->iSpeed; moveResponse->iCliTime = moveData->iCliTime; // maybe don't send this??? seems unneeded... moveResponse->iSvrTime = tm; @@ -313,7 +315,7 @@ void PlayerManager::stopPlayer(CNSocket* sock, CNPacketData* data) { void PlayerManager::jumpPlayer(CNSocket* sock, CNPacketData* data) { if (data->size != sizeof(sP_CL2FE_REQ_PC_JUMP)) return; // ignore the malformed packet - + sP_CL2FE_REQ_PC_JUMP* jumpData = (sP_CL2FE_REQ_PC_JUMP*)data->buf; updatePlayerPosition(sock, jumpData->iX, jumpData->iY, jumpData->iZ); @@ -332,7 +334,7 @@ void PlayerManager::jumpPlayer(CNSocket* sock, CNPacketData* data) { jumpResponse->iVX = jumpData->iVX; jumpResponse->iVY = jumpData->iVY; jumpResponse->iVZ = jumpData->iVZ; - + jumpResponse->iSpeed = jumpData->iSpeed; jumpResponse->iCliTime = jumpData->iCliTime; // maybe don't send this??? seems unneeded... jumpResponse->iSvrTime = tm; @@ -344,7 +346,7 @@ void PlayerManager::jumpPlayer(CNSocket* sock, CNPacketData* data) { void PlayerManager::jumppadPlayer(CNSocket* sock, CNPacketData* data) { if (data->size != sizeof(sP_CL2FE_REQ_PC_JUMPPAD)) return; // ignore the malformed packet - + sP_CL2FE_REQ_PC_JUMPPAD* jumppadData = (sP_CL2FE_REQ_PC_JUMPPAD*)data->buf; updatePlayerPosition(sock, jumppadData->iX, jumppadData->iY, jumppadData->iZ); @@ -362,7 +364,7 @@ void PlayerManager::jumppadPlayer(CNSocket* sock, CNPacketData* data) { jumppadResponse->iVX = jumppadData->iVX; jumppadResponse->iVY = jumppadData->iVY; jumppadResponse->iVZ = jumppadData->iVZ; - + jumppadResponse->iCliTime = jumppadData->iCliTime; jumppadResponse->iSvrTime = tm; @@ -373,7 +375,7 @@ void PlayerManager::jumppadPlayer(CNSocket* sock, CNPacketData* data) { void PlayerManager::launchPlayer(CNSocket* sock, CNPacketData* data) { if (data->size != sizeof(sP_CL2FE_REQ_PC_LAUNCHER)) return; // ignore the malformed packet - + sP_CL2FE_REQ_PC_LAUNCHER* launchData = (sP_CL2FE_REQ_PC_LAUNCHER*)data->buf; updatePlayerPosition(sock, launchData->iX, launchData->iY, launchData->iZ); @@ -392,7 +394,7 @@ void PlayerManager::launchPlayer(CNSocket* sock, CNPacketData* data) { launchResponse->iVZ = launchData->iVZ; launchResponse->iSpeed = launchData->iSpeed; launchResponse->iAngle = launchData->iAngle; - + launchResponse->iCliTime = launchData->iCliTime; launchResponse->iSvrTime = tm; @@ -513,12 +515,12 @@ void PlayerManager::gotoPlayer(CNSocket* sock, CNPacketData* data) { DEBUGLOG( std::cout << "P_CL2FE_REQ_PC_GOTO:" << std::endl; - std::cout << "\tX: " << gotoData->iToX << std::endl; - std::cout << "\tY: " << gotoData->iToY << std::endl; - std::cout << "\tZ: " << gotoData->iToZ << std::endl; + std::cout << "\tX: " << gotoData->iToX << std::endl; + std::cout << "\tY: " << gotoData->iToY << std::endl; + std::cout << "\tZ: " << gotoData->iToZ << std::endl; ) - response->iX = gotoData->iToX; + response->iX = gotoData->iToX; response->iY = gotoData->iToY; response->iZ = gotoData->iToZ; @@ -534,12 +536,12 @@ void PlayerManager::setSpecialPlayer(CNSocket* sock, CNPacketData* data) { DEBUGLOG( std::cout << "P_CL2FE_GM_REQ_PC_SET_VALUE:" << std::endl; - std::cout << "\tPC_ID: " << setData->iPC_ID << std::endl; - std::cout << "\tSetValueType: " << setData->iSetValueType << std::endl; - std::cout << "\tSetValue: " << setData->iSetValue << std::endl; + std::cout << "\tPC_ID: " << setData->iPC_ID << std::endl; + std::cout << "\tSetValueType: " << setData->iSetValueType << std::endl; + std::cout << "\tSetValue: " << setData->iSetValue << std::endl; ) - response->iPC_ID = setData->iPC_ID; + response->iPC_ID = setData->iPC_ID; response->iSetValue = setData->iSetValue; response->iSetValueType = setData->iSetValueType; @@ -559,3 +561,10 @@ void PlayerManager::exitGame(CNSocket* sock, CNPacketData* data) { sock->sendPacket(new CNPacketData((void*)response, P_FE2CL_REP_PC_EXIT_SUCC, sizeof(sP_FE2CL_REP_PC_EXIT_SUCC), sock->getFEKey())); } + +void PlayerManager::updatePlayer(CNSocket* key, Player plr) { + PlayerView plrv = players[key]; + plrv.plr = plr; + + players[key] = plrv; +} \ No newline at end of file diff --git a/src/PlayerManager.hpp b/src/PlayerManager.hpp index bfee3f1..3105f51 100644 --- a/src/PlayerManager.hpp +++ b/src/PlayerManager.hpp @@ -25,6 +25,7 @@ namespace PlayerManager { void removePlayer(CNSocket* key); Player getPlayer(CNSocket* key); + void updatePlayer(CNSocket* key, Player plr); void updatePlayerPosition(CNSocket* sock, int X, int Y, int Z); void enterPlayer(CNSocket* sock, CNPacketData* data); From cd9fb6ec25dd285befa6b4df69105c6bb77b22a5 Mon Sep 17 00:00:00 2001 From: CPunch Date: Sat, 22 Aug 2020 13:08:37 -0500 Subject: [PATCH 2/6] added sanity check to exitGame() --- src/NanoManager.cpp | 1 + src/PlayerManager.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/NanoManager.cpp b/src/NanoManager.cpp index 38534d9..c692060 100644 --- a/src/NanoManager.cpp +++ b/src/NanoManager.cpp @@ -86,6 +86,7 @@ void NanoManager::nanoSkillUseHandler(CNSocket* sock, CNPacketData* data) { resp->iNanoStamina = 150; // Hardcoded for now sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_NANO_SKILL_USE_SUCC, sizeof(sP_FE2CL_NANO_SKILL_USE_SUCC), sock->getFEKey())); + DEBUGLOG( std::cout << U16toU8(plr.plr.PCStyle.szFirstName) << U16toU8(plr.plr.PCStyle.szLastName) << " requested to summon nano skill " << std::endl; ) diff --git a/src/PlayerManager.cpp b/src/PlayerManager.cpp index 47dd443..f956bbc 100644 --- a/src/PlayerManager.cpp +++ b/src/PlayerManager.cpp @@ -553,6 +553,9 @@ void PlayerManager::heartbeatPlayer(CNSocket* sock, CNPacketData* data) { } void PlayerManager::exitGame(CNSocket* sock, CNPacketData* data) { + if (data->size != sizeof(sP_CL2FE_REQ_PC_EXIT)) + return; + sP_CL2FE_REQ_PC_EXIT* exitData = (sP_CL2FE_REQ_PC_EXIT*)data->buf; sP_FE2CL_REP_PC_EXIT_SUCC* response = (sP_FE2CL_REP_PC_EXIT_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_PC_EXIT_SUCC)); From 4f10ee050507f9295297065a3d46abe70963e6f2 Mon Sep 17 00:00:00 2001 From: Zenpock <70054140+Zenpock@users.noreply.github.com> Date: Sat, 22 Aug 2020 13:11:47 -0500 Subject: [PATCH 3/6] MenuChat Added (#25) * Update CNShardServer.hpp * Update ChatManager.cpp * Update ChatManager.hpp Co-authored-by: CPunch --- src/ChatManager.cpp | 23 ++++++++++++++++++++++- src/ChatManager.hpp | 3 ++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/ChatManager.cpp b/src/ChatManager.cpp index efbc77f..f786c95 100644 --- a/src/ChatManager.cpp +++ b/src/ChatManager.cpp @@ -6,12 +6,12 @@ void ChatManager::init() { REGISTER_SHARD_PACKET(P_CL2FE_REQ_SEND_FREECHAT_MESSAGE, chatHandler); REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_AVATAR_EMOTES_CHAT, emoteHandler); + REGISTER_SHARD_PACKET(P_CL2FE_REQ_SEND_MENUCHAT_MESSAGE, menuChatHandler); } void ChatManager::chatHandler(CNSocket* sock, CNPacketData* data) { if (data->size != sizeof(sP_CL2FE_REQ_SEND_FREECHAT_MESSAGE)) return; // malformed packet - sP_CL2FE_REQ_SEND_FREECHAT_MESSAGE* chat = (sP_CL2FE_REQ_SEND_FREECHAT_MESSAGE*)data->buf; PlayerView plr = PlayerManager::players[sock]; @@ -31,7 +31,28 @@ void ChatManager::chatHandler(CNSocket* sock, CNPacketData* data) { otherSock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC, sizeof(sP_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC), otherSock->getFEKey())); } } +void ChatManager::menuChatHandler(CNSocket* sock, CNPacketData* data) { + if (data->size != sizeof(sP_CL2FE_REQ_SEND_MENUCHAT_MESSAGE)) + return; // malformed packet + sP_CL2FE_REQ_SEND_MENUCHAT_MESSAGE* chat = (sP_CL2FE_REQ_SEND_MENUCHAT_MESSAGE*)data->buf; + PlayerView plr = PlayerManager::players[sock]; + // send to client + sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC* resp = (sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC)); + memcpy(resp->szFreeChat, chat->szFreeChat, sizeof(chat->szFreeChat)); + resp->iPC_ID = PlayerManager::players[sock].plr.iID; + resp->iEmoteCode = chat->iEmoteCode; + sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC, sizeof(sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC), sock->getFEKey())); + + // send to visible players + for (CNSocket* otherSock : plr.viewable) { + sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC* resp = (sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC)); + memcpy(resp->szFreeChat, chat->szFreeChat, sizeof(chat->szFreeChat)); + resp->iPC_ID = PlayerManager::players[sock].plr.iID; + resp->iEmoteCode = chat->iEmoteCode; + otherSock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC, sizeof(sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC), otherSock->getFEKey())); + } +} void ChatManager::emoteHandler(CNSocket* sock, CNPacketData* data) { if (data->size != sizeof(sP_CL2FE_REQ_PC_AVATAR_EMOTES_CHAT)) return; // ignore the malformed packet diff --git a/src/ChatManager.hpp b/src/ChatManager.hpp index 3f669d7..241d47b 100644 --- a/src/ChatManager.hpp +++ b/src/ChatManager.hpp @@ -8,6 +8,7 @@ namespace ChatManager { void chatHandler(CNSocket* sock, CNPacketData* data); void emoteHandler(CNSocket* sock, CNPacketData* data); + void menuChatHandler(CNSocket* sock, CNPacketData* data); } -#endif \ No newline at end of file +#endif From 2072bdcff7800677176cb9c2e08e5810cd39973e Mon Sep 17 00:00:00 2001 From: CPunch Date: Sat, 22 Aug 2020 13:29:38 -0500 Subject: [PATCH 4/6] updated appveyor --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a242792..b897783 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![](res/radiorave_logo.png) -[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/OpenFusionProject/OpenFusion?svg=true)](https://ci.appveyor.com/project/Raymonf/openfusion) +[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/OpenFusionProject/OpenFusion?svg=true)](https://ci.appveyor.com/project/OpenFusionProject/openfusion) [![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg?logo=discord)](https://discord.gg/DYavckB) OpenFusion is a landwalker server for FusionFall. It currently supports versions `beta-20100104` and `beta-20100728` of the original game. From 35b424c5318d83d8de79c64559ebc7ce7a808aee Mon Sep 17 00:00:00 2001 From: CPunch Date: Sat, 22 Aug 2020 13:38:27 -0500 Subject: [PATCH 5/6] fixed warnings for VC++ --- src/CNProtocol.hpp | 2 +- src/CNShardServer.cpp | 2 +- src/CNStructs.cpp | 2 +- src/CNStructs.hpp | 2 +- src/Defines.hpp | 12 ++++++------ src/PlayerManager.hpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/CNProtocol.hpp b/src/CNProtocol.hpp index 5887384..8f87962 100644 --- a/src/CNProtocol.hpp +++ b/src/CNProtocol.hpp @@ -133,7 +133,7 @@ protected: void init(); bool active = true; - long int lastTimer; + uint64_t lastTimer; public: PacketHandler pHandler; diff --git a/src/CNShardServer.cpp b/src/CNShardServer.cpp index 6aa26b4..e603d01 100644 --- a/src/CNShardServer.cpp +++ b/src/CNShardServer.cpp @@ -37,7 +37,7 @@ void CNShardServer::killConnection(CNSocket* cns) { } void CNShardServer::onTimer() { - long int currTime = getTime(); + uint64_t currTime = getTime(); auto cachedPlayers = PlayerManager::players; diff --git a/src/CNStructs.cpp b/src/CNStructs.cpp index b580cc3..c58c6fe 100644 --- a/src/CNStructs.cpp +++ b/src/CNStructs.cpp @@ -10,7 +10,7 @@ std::string U16toU8(char16_t* src) { } // returns number of char16_t that was written at des -int U8toU16(std::string src, char16_t* des) { +size_t U8toU16(std::string src, char16_t* des) { std::wstring_convert,char16_t> convert; std::u16string tmp = convert.from_bytes(src); diff --git a/src/CNStructs.hpp b/src/CNStructs.hpp index 113d794..6adebec 100644 --- a/src/CNStructs.hpp +++ b/src/CNStructs.hpp @@ -28,7 +28,7 @@ // TODO: rewrite U16toU8 & U8toU16 to not use codecvt std::string U16toU8(char16_t* src); -int U8toU16(std::string src, char16_t* des); // returns number of char16_t that was written at des +size_t U8toU16(std::string src, char16_t* des); // returns number of char16_t that was written at des uint64_t getTime(); // The PROTOCOL_VERSION definition is defined by the build system. diff --git a/src/Defines.hpp b/src/Defines.hpp index a10fa75..21eb8f2 100644 --- a/src/Defines.hpp +++ b/src/Defines.hpp @@ -8,12 +8,12 @@ * implementing just yet anyway. */ -const float VALUE_BATTERY_EMPTY_PENALTY = 0.5; -const float CN_EP_RANK_1 = 0.8; -const float CN_EP_RANK_2 = 0.7; -const float CN_EP_RANK_3 = 0.5; -const float CN_EP_RANK_4 = 0.3; -const float CN_EP_RANK_5 = 0.29; +const float VALUE_BATTERY_EMPTY_PENALTY = 0.5f; +const float CN_EP_RANK_1 = 0.8f; +const float CN_EP_RANK_2 = 0.7f; +const float CN_EP_RANK_3 = 0.5f; +const float CN_EP_RANK_4 = 0.3f; +const float CN_EP_RANK_5 = 0.29f; enum { SUCC = 1, diff --git a/src/PlayerManager.hpp b/src/PlayerManager.hpp index 3105f51..34cfb6a 100644 --- a/src/PlayerManager.hpp +++ b/src/PlayerManager.hpp @@ -13,7 +13,7 @@ struct PlayerView { std::list viewable; std::list viewableNPCs; Player plr; - int long lastHeartbeat; + uint64_t lastHeartbeat; }; From 0ff1f74cd381ee58c5c0f65fd3389ef525e21f62 Mon Sep 17 00:00:00 2001 From: CPunch Date: Sat, 22 Aug 2020 14:02:58 -0500 Subject: [PATCH 6/6] fixed inet_ntoa warnings --- src/CNProtocol.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CNProtocol.cpp b/src/CNProtocol.cpp index f7df999..ce76875 100644 --- a/src/CNProtocol.cpp +++ b/src/CNProtocol.cpp @@ -1,6 +1,10 @@ #include "CNProtocol.hpp" #include "CNStructs.hpp" +#ifdef _MSC_VER + #define _WINSOCK_DEPRECATED_NO_WARNINGS +#endif + // ========================================================[[ CNSocketEncryption ]]======================================================== // literally C/P from the client and converted to C++ (does some byte swapping /shrug)