OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-05 06:50:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
262dca7dd6
OpenFusion/src/BuddyManager.cpp

390 lines
16 KiB
C++
Raw Normal View History

Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
#include "CNShardServer.hpp"
#include "CNStructs.hpp"
#include "ChatManager.hpp"
#include "PlayerManager.hpp"
#include "BuddyManager.hpp"
Stubbed buddy warping After testing warping a lot I saw how buggy it is. I decided to stub it for this PR and work on it in a later PR.
2020-09-23 17:52:21 +00:00
#include <iostream>
#include <chrono>
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
#include <algorithm>
Stubbed buddy warping After testing warping a lot I saw how buggy it is. I decided to stub it for this PR and work on it in a later PR.
2020-09-23 17:52:21 +00:00
#include <thread>
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
void BuddyManager::init() {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
REGISTER_SHARD_PACKET(P_CL2FE_REQ_REQUEST_MAKE_BUDDY, requestBuddy);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_FIND_NAME_MAKE_BUDDY, reqBuddyByName);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_ACCEPT_MAKE_BUDDY, reqAcceptBuddy);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_FIND_NAME_ACCEPT_BUDDY, reqFindNameBuddyAccept);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_SEND_BUDDY_FREECHAT_MESSAGE, reqBuddyFreechat);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_SEND_BUDDY_MENUCHAT_MESSAGE, reqBuddyMenuchat);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_GET_BUDDY_STATE, reqPktGetBuddyState);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_SET_BUDDY_BLOCK, reqBuddyBlock);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_REMOVE_BUDDY, reqBuddyDelete);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_BUDDY_WARP, reqBuddyWarp);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Buddy request
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
void BuddyManager::requestBuddy(CNSocket* sock, CNPacketData* data) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (data->size != sizeof(sP_CL2FE_REQ_REQUEST_MAKE_BUDDY))
return; // malformed packet
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
sP_CL2FE_REQ_REQUEST_MAKE_BUDDY* req = (sP_CL2FE_REQ_REQUEST_MAKE_BUDDY*)data->buf;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
Player* plr = PlayerManager::getPlayer(sock);
Player* otherPlr = PlayerManager::getPlayerFromID(req->iBuddyID);
if (plr == nullptr || otherPlr == nullptr)
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
return;
minor refactoring
2020-09-28 18:11:13 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
if (plr->buddyCnt >= 50 || otherPlr->buddyCnt >= 50)
{
INITSTRUCT(sP_FE2CL_REP_REQUEST_MAKE_BUDDY_FAIL, failResp);
sock->sendPacket((void*)&failResp, P_FE2CL_REP_REQUEST_MAKE_BUDDY_FAIL, sizeof(sP_FE2CL_REP_REQUEST_MAKE_BUDDY_FAIL));
return;
}
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
CNSocket* otherSock = PlayerManager::getSockFromID(otherPlr->iID);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
if (otherSock == nullptr)
return;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
INITSTRUCT(sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC, resp);
INITSTRUCT(sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC_TO_ACCEPTER, otherResp);
resp.iRequestID = plr->iID;
resp.iBuddyID = req->iBuddyID;
resp.iBuddyPCUID = req->iBuddyPCUID;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
otherResp.iRequestID = plr->iID;
otherResp.iBuddyID = req->iBuddyID;
memcpy(otherResp.szFirstName, plr->PCStyle.szFirstName, sizeof(plr->PCStyle.szFirstName));
memcpy(otherResp.szLastName, plr->PCStyle.szLastName, sizeof(plr->PCStyle.szLastName));
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
std::cout << "Buddy ID: " << req->iBuddyID << std::endl;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
sock->sendPacket((void*)&resp, P_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC, sizeof(sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC));
otherSock->sendPacket((void*)&otherResp, P_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC_TO_ACCEPTER, sizeof(sP_FE2CL_REP_REQUEST_MAKE_BUDDY_SUCC_TO_ACCEPTER));
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Sending buddy request by player name
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
void BuddyManager::reqBuddyByName(CNSocket* sock, CNPacketData* data) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (data->size != sizeof(sP_CL2FE_REQ_PC_FIND_NAME_MAKE_BUDDY)) {
return; // malformed packet
}
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sP_CL2FE_REQ_PC_FIND_NAME_MAKE_BUDDY* pkt = (sP_CL2FE_REQ_PC_FIND_NAME_MAKE_BUDDY*)data->buf;
Player* plrReq = PlayerManager::getPlayer(sock);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (plrReq == nullptr)
return;
minor refactoring
2020-09-28 18:11:13 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_SUCC, resp);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
CNSocket* otherSock = sock;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
int sizeOfRes = sizeof(pkt->szFirstName) / 9; // Maximum size of a player's first name
int sizeOfLNRes = sizeof(pkt->szLastName) / 17; // Maximum size of a player's last name
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
for (auto pair : PlayerManager::players) {
int sizeOfReq = sizeof(pair.second.plr->PCStyle.szFirstName) / 9;
int sizeOfLNReq = sizeof(pair.second.plr->PCStyle.szLastName) / 17;
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
if (BuddyManager::NameCheck(pair.second.plr->PCStyle.szFirstName, pkt->szFirstName, sizeOfReq, sizeOfRes) == true && BuddyManager::NameCheck(pair.second.plr->PCStyle.szLastName, pkt->szLastName, sizeOfLNReq, sizeOfLNRes) == true) { // This long line of gorgeous parameters is to check if the player's name matches :eyes:
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
otherSock = pair.first;
Implemented player tick (health/nano stamina). * The player now heals while not in combat * Nanos lose stamina while active, regain it while resting * Using active nano powers drains stamina * Standing in FM patches/lakes now deals damage * Fixed a memory error in npcAttackPc() * Mobs now aggro when a player gets close * Mobs now give up the chase if the player gets out of the combat zone; they no longer try chasing until they themselves have left it * Added a few missing break statements in the loops in BuddyManager Other players are not yet instantly notified of health/stamina updates, as finding the correct way to do this has proven tricky. FM patch damage updates other player's views just fine, though.
2020-09-26 22:16:15 +00:00
break;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
}
}
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
resp.iPCUID = plrReq->PCStyle.iPC_UID;
resp.iNameCheckFlag = plrReq->PCStyle.iNameCheck;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
memcpy(resp.szFirstName, plrReq->PCStyle.szFirstName, sizeof(plrReq->PCStyle.szFirstName));
memcpy(resp.szLastName, plrReq->PCStyle.szLastName, sizeof(plrReq->PCStyle.szLastName));
otherSock->sendPacket((void*)&resp, P_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_SUCC, sizeof(sP_FE2CL_REP_PC_FIND_NAME_MAKE_BUDDY_SUCC));
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Accepting buddy request
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
void BuddyManager::reqAcceptBuddy(CNSocket* sock, CNPacketData* data) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (data->size != sizeof(sP_CL2FE_REQ_ACCEPT_MAKE_BUDDY))
return; // malformed packet
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
sP_CL2FE_REQ_ACCEPT_MAKE_BUDDY* req = (sP_CL2FE_REQ_ACCEPT_MAKE_BUDDY*)data->buf;
Player* plr = PlayerManager::getPlayer(sock);
Player* otherPlr = PlayerManager::getPlayerFromID(req->iBuddyID);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
if (plr == nullptr || otherPlr == nullptr)
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
return;
minor refactoring
2020-09-28 18:11:13 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC, resp);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
CNSocket* otherSock = PlayerManager::getSockFromID(otherPlr->iID);
resp.iBuddySlot = plr->buddyCnt;
resp.BuddyInfo.iID = otherPlr->iID;
resp.BuddyInfo.iPCUID = otherPlr->PCStyle.iPC_UID;
resp.BuddyInfo.iPCState = 1; //to show whether the other player is online or offline (hardcoded for now)
resp.BuddyInfo.bBlocked = 0; //to show whether the other player is blocked (hardcoded for now)
resp.BuddyInfo.iGender = otherPlr->PCStyle.iGender; //shows the other player's gender
resp.BuddyInfo.bFreeChat = 1; //shows whether or not the other player has freechat on (hardcoded for now)
resp.BuddyInfo.iNameCheckFlag = otherPlr->PCStyle.iNameCheck;
memcpy(resp.BuddyInfo.szFirstName, otherPlr->PCStyle.szFirstName, sizeof(otherPlr->PCStyle.szFirstName));
memcpy(resp.BuddyInfo.szLastName, otherPlr->PCStyle.szLastName, sizeof(otherPlr->PCStyle.szLastName));
if (req->iAcceptFlag == 1)
{
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sock->sendPacket((void*)&resp, P_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC, sizeof(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC));
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
plr->buddyIDs[plr->buddyCnt] = otherPlr->PCStyle.iPC_UID;
std::cout << "Buddy's ID: " << plr->buddyIDs[plr->buddyCnt] << std::endl;
plr->buddyCnt++;
if (plr->iID != otherPlr->iID)
{
resp.iBuddySlot = otherPlr->buddyCnt;
resp.BuddyInfo.iID = plr->iID;
resp.BuddyInfo.iPCUID = plr->PCStyle.iPC_UID;
resp.BuddyInfo.iPCState = 1; //to show whether the other player is online or offline (hardcoded for now)
resp.BuddyInfo.bBlocked = 0; //to show whether the other player is blocked (hardcoded for now)
resp.BuddyInfo.iGender = plr->PCStyle.iGender; //shows the other player's gender
resp.BuddyInfo.bFreeChat = 1; //shows whether or not the other player has freechat on (hardcoded for now)
resp.BuddyInfo.iNameCheckFlag = plr->PCStyle.iNameCheck;
memcpy(resp.BuddyInfo.szFirstName, plr->PCStyle.szFirstName, sizeof(plr->PCStyle.szFirstName));
memcpy(resp.BuddyInfo.szLastName, plr->PCStyle.szLastName, sizeof(plr->PCStyle.szLastName));
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
otherSock->sendPacket((void*)&resp, P_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC, sizeof(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC));
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
otherPlr->buddyIDs[otherPlr->buddyCnt] = plr->PCStyle.iPC_UID;
std::cout << "Buddy's ID: " << plr->buddyIDs[plr->buddyCnt] << std::endl;
otherPlr->buddyCnt++;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
}
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
}
else
{
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_FAIL, declineResp);
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
declineResp.iErrorCode = 6; // Buddy declined notification
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
declineResp.iBuddyID = req->iBuddyID;
declineResp.iBuddyPCUID = req->iBuddyPCUID;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
otherSock->sendPacket((void*)&declineResp, P_FE2CL_REP_ACCEPT_MAKE_BUDDY_FAIL, sizeof(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_FAIL));
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
}
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Accepting buddy request from the find name request
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
void BuddyManager::reqFindNameBuddyAccept(CNSocket* sock, CNPacketData* data) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (data->size != sizeof(sP_CL2FE_REQ_PC_FIND_NAME_ACCEPT_BUDDY)) {
return; // malformed packet
}
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sP_CL2FE_REQ_PC_FIND_NAME_ACCEPT_BUDDY* pkt = (sP_CL2FE_REQ_PC_FIND_NAME_ACCEPT_BUDDY*)data->buf;
Player* plrReq = PlayerManager::getPlayer(sock);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (plrReq == nullptr)
return;
minor refactoring
2020-09-28 18:11:13 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC, resp);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
CNSocket* otherSock = sock;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
int sizeOfRes = sizeof(pkt->szFirstName) / 9;
int sizeOfLNRes = sizeof(pkt->szLastName) / 17;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
for (auto pair : PlayerManager::players) {
int sizeOfReq = sizeof(pair.second.plr->PCStyle.szFirstName) / 9;
int sizeOfLNReq = sizeof(pair.second.plr->PCStyle.szLastName) / 17;
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
if (BuddyManager::NameCheck(pair.second.plr->PCStyle.szFirstName, pkt->szFirstName, sizeOfReq, sizeOfRes) == true && BuddyManager::NameCheck(pair.second.plr->PCStyle.szLastName, pkt->szLastName, sizeOfLNReq, sizeOfLNRes) == true) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
otherSock = pair.first;
Implemented player tick (health/nano stamina). * The player now heals while not in combat * Nanos lose stamina while active, regain it while resting * Using active nano powers drains stamina * Standing in FM patches/lakes now deals damage * Fixed a memory error in npcAttackPc() * Mobs now aggro when a player gets close * Mobs now give up the chase if the player gets out of the combat zone; they no longer try chasing until they themselves have left it * Added a few missing break statements in the loops in BuddyManager Other players are not yet instantly notified of health/stamina updates, as finding the correct way to do this has proven tricky. FM patch damage updates other player's views just fine, though.
2020-09-26 22:16:15 +00:00
break;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
}
}
PlayerView& plr = PlayerManager::players[otherSock];
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
resp.iBuddySlot = plrReq->buddyCnt;
resp.BuddyInfo.iID = plr.plr->iID;
resp.BuddyInfo.iPCUID = pkt->iBuddyPCUID;
resp.BuddyInfo.iNameCheckFlag = plr.plr->PCStyle.iNameCheck;
resp.BuddyInfo.iPCState = 1;
resp.BuddyInfo.iGender = plr.plr->PCStyle.iGender;
resp.BuddyInfo.bBlocked = 0;
resp.BuddyInfo.bFreeChat = 1;
memcpy(resp.BuddyInfo.szFirstName, plr.plr->PCStyle.szFirstName, sizeof(plr.plr->PCStyle.szFirstName));
memcpy(resp.BuddyInfo.szLastName, plr.plr->PCStyle.szLastName, sizeof(plr.plr->PCStyle.szLastName));
if (pkt->iAcceptFlag == 1)
{
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sock->sendPacket((void*)&resp, P_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC, sizeof(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC));
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
plrReq->buddyIDs[plrReq->buddyCnt] = plr.plr->PCStyle.iPC_UID;
plrReq->buddyCnt++;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
if (plr.plr->PCStyle.iPC_UID == pkt->iBuddyPCUID)
{
resp.iBuddySlot = plr.plr->buddyCnt;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
resp.BuddyInfo.iID = plrReq->iID;
resp.BuddyInfo.iPCUID = plrReq->PCStyle.iPC_UID;
resp.BuddyInfo.iNameCheckFlag = plrReq->PCStyle.iNameCheck;
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
resp.BuddyInfo.iPCState = 1;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
resp.BuddyInfo.iGender = plrReq->PCStyle.iGender;
resp.BuddyInfo.bBlocked = 0;
resp.BuddyInfo.bFreeChat = 1;
memcpy(resp.BuddyInfo.szFirstName, plrReq->PCStyle.szFirstName, sizeof(plrReq->PCStyle.szFirstName));
memcpy(resp.BuddyInfo.szLastName, plrReq->PCStyle.szLastName, sizeof(plrReq->PCStyle.szLastName));
otherSock->sendPacket((void*)&resp, P_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC, sizeof(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_SUCC));
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
plr.plr->buddyIDs[plr.plr->buddyCnt] = plrReq->PCStyle.iPC_UID;
plr.plr->buddyCnt++;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
}
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
}
else
{
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_FAIL, declineResp);
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
declineResp.iErrorCode = 6; // Buddy declined notification
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
declineResp.iBuddyPCUID = pkt->iBuddyPCUID;
otherSock->sendPacket((void*)&declineResp, P_FE2CL_REP_ACCEPT_MAKE_BUDDY_FAIL, sizeof(sP_FE2CL_REP_ACCEPT_MAKE_BUDDY_FAIL));
}
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Buddy freechatting
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
void BuddyManager::reqBuddyFreechat(CNSocket* sock, CNPacketData* data) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (data->size != sizeof(sP_CL2FE_REQ_SEND_BUDDY_FREECHAT_MESSAGE))
return; // malformed packet
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sP_CL2FE_REQ_SEND_BUDDY_FREECHAT_MESSAGE* pkt = (sP_CL2FE_REQ_SEND_BUDDY_FREECHAT_MESSAGE*)data->buf;
Player* plr = PlayerManager::getPlayer(sock);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (plr == nullptr)
return;
minor refactoring
2020-09-28 18:11:13 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_SUCC, resp);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
CNSocket* otherSock = sock;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
resp.iFromPCUID = plr->PCStyle.iPC_UID;
resp.iToPCUID = pkt->iBuddyPCUID;
resp.iEmoteCode = pkt->iEmoteCode;
memcpy(resp.szFreeChat, pkt->szFreeChat, sizeof(pkt->szFreeChat));
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
sock->sendPacket((void*)&resp, P_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_SUCC, sizeof(sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_SUCC)); // shows the player that they sent the message to their buddy
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
for (auto pair : PlayerManager::players) {
if (pair.second.plr->PCStyle.iPC_UID != plr->PCStyle.iPC_UID) {
otherSock = pair.first;
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
otherSock->sendPacket((void*)&resp, P_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_SUCC, sizeof(sP_FE2CL_REP_SEND_BUDDY_FREECHAT_MESSAGE_SUCC)); // sends the message to the buddy.
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
}
}
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Buddy menuchat
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
void BuddyManager::reqBuddyMenuchat(CNSocket* sock, CNPacketData* data) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (data->size != sizeof(sP_CL2FE_REQ_SEND_BUDDY_MENUCHAT_MESSAGE))
return; // malformed packet
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sP_CL2FE_REQ_SEND_BUDDY_MENUCHAT_MESSAGE* pkt = (sP_CL2FE_REQ_SEND_BUDDY_MENUCHAT_MESSAGE*)data->buf;
Player* plr = PlayerManager::getPlayer(sock);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (plr == nullptr)
return;
minor refactoring
2020-09-28 18:11:13 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_SUCC, resp);
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
CNSocket* otherSock = sock;
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
resp.iFromPCUID = plr->PCStyle.iPC_UID;
resp.iToPCUID = pkt->iBuddyPCUID;
resp.iEmoteCode = pkt->iEmoteCode;
memcpy(resp.szFreeChat, pkt->szFreeChat, sizeof(pkt->szFreeChat));
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
sock->sendPacket((void*)&resp, P_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_SUCC, sizeof(sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_SUCC)); // shows the player that they sent the message to their buddy
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
for (auto pair : PlayerManager::players) {
if (pair.second.plr->PCStyle.iPC_UID != plr->PCStyle.iPC_UID) {
otherSock = pair.first;
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
otherSock->sendPacket((void*)&resp, P_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_SUCC, sizeof(sP_FE2CL_REP_SEND_BUDDY_MENUCHAT_MESSAGE_SUCC)); // sends the message to the buddy.
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
}
}
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Getting buddy state
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
void BuddyManager::reqPktGetBuddyState(CNSocket* sock, CNPacketData* data) {
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
Player* plr = PlayerManager::getPlayer(sock);
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_GET_BUDDY_STATE_SUCC, resp);
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
for (int BuddySlot = 0; BuddySlot < 50; BuddySlot++) {
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
//resp.aBuddyState[plr->buddyCnt] = 1; // this sets every buddy to online. Will get the pcstate right directly from the DB.
resp.aBuddyID[BuddySlot] = plr->buddyIDs[BuddySlot];
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sock->sendPacket((void*)&resp, P_FE2CL_REP_GET_BUDDY_STATE_SUCC, sizeof(sP_FE2CL_REP_GET_BUDDY_STATE_SUCC));
}
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Blocking the buddy
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
void BuddyManager::reqBuddyBlock(CNSocket* sock, CNPacketData* data) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (data->size != sizeof(sP_CL2FE_REQ_SET_BUDDY_BLOCK))
return; // malformed packet
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sP_CL2FE_REQ_SET_BUDDY_BLOCK* pkt = (sP_CL2FE_REQ_SET_BUDDY_BLOCK*)data->buf;
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_SET_BUDDY_BLOCK_SUCC, resp);
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
resp.iBuddyPCUID = pkt->iBuddyPCUID;
resp.iBuddySlot = pkt->iBuddySlot;
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sock->sendPacket((void*)&resp, P_FE2CL_REP_SET_BUDDY_BLOCK_SUCC, sizeof(sP_FE2CL_REP_SET_BUDDY_BLOCK_SUCC));
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Deleting the buddy
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
void BuddyManager::reqBuddyDelete(CNSocket* sock, CNPacketData* data) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
if (data->size != sizeof(sP_CL2FE_REQ_REMOVE_BUDDY))
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
return; // malformed packet
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sP_CL2FE_REQ_REMOVE_BUDDY* pkt = (sP_CL2FE_REQ_REMOVE_BUDDY*)data->buf;
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
Player* plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
INITSTRUCT(sP_FE2CL_REP_REMOVE_BUDDY_SUCC, resp);
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
resp.iBuddyPCUID = pkt->iBuddyPCUID;
resp.iBuddySlot = pkt->iBuddySlot;
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
plr->buddyIDs[resp.iBuddySlot] -= resp.iBuddyPCUID;
plr->buddyCnt--;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
sock->sendPacket((void*)&resp, P_FE2CL_REP_REMOVE_BUDDY_SUCC, sizeof(sP_FE2CL_REP_REMOVE_BUDDY_SUCC));
Buddy deleting/blocking works and code clean up Added in buddy deleting and buddy blocking. I also cleaned up some of the code and added some comments to the code.
2020-09-21 18:28:04 +00:00
}
Cleanup for 1.2. Cleaned up whitespace, comments, brace style, etc. Updated tdata reference.
2020-10-19 17:26:14 +00:00
// Warping to buddy
void BuddyManager::reqBuddyWarp(CNSocket* sock, CNPacketData* data) {} // stub
Implemented buddy warping Buddy warping now works, if anything else needs to be added/redone in regards to this feel free to let me know ^
2020-09-22 17:02:00 +00:00
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
#pragma region Helper methods
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
bool BuddyManager::NameCheck(char16_t reqName[], char16_t resName[], int sizeOfLNReq, int sizeOfLNRes) {
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
// If lengths of array are not equal means
// array are not equal
if (sizeOfLNReq != sizeOfLNRes)
return false;
// Sort both arrays
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
std::sort(reqName, reqName + sizeOfLNReq);
std::sort(resName, resName + sizeOfLNRes);
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
// Linearly compare elements
for (int i = 0; i < sizeOfLNReq; i++)
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
if (reqName[i] != resName[i])
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
return false;
// If all elements were same.
return true;
Buddy System draft (W.I.P) The w.i.p buddy system
2020-09-19 19:07:09 +00:00
}
#pragma endregion
Reference in New Issue Copy Permalink