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.
This commit is contained in:
SengokuNadeko 2020-09-23 13:52:21 -04:00 committed by GitHub
parent e0e474924d
commit 9cfced88c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,7 +4,10 @@
#include "PlayerManager.hpp" #include "PlayerManager.hpp"
#include "BuddyManager.hpp" #include "BuddyManager.hpp"
#include <iostream>
#include <chrono>
#include <algorithm> #include <algorithm>
#include <thread>
void BuddyManager::init() { void BuddyManager::init() {
REGISTER_SHARD_PACKET(P_CL2FE_REQ_REQUEST_MAKE_BUDDY, requestBuddy); REGISTER_SHARD_PACKET(P_CL2FE_REQ_REQUEST_MAKE_BUDDY, requestBuddy);
@ -73,8 +76,6 @@ void BuddyManager::reqBuddyByName(CNSocket* sock, CNPacketData* data) {
} }
} }
PlayerView& plr = PlayerManager::players[otherSock];
resp.iPCUID = plrReq->PCStyle.iPC_UID; resp.iPCUID = plrReq->PCStyle.iPC_UID;
resp.iNameCheckFlag = plrReq->PCStyle.iNameCheck; resp.iNameCheckFlag = plrReq->PCStyle.iNameCheck;
@ -312,30 +313,7 @@ void BuddyManager::reqBuddyDelete(CNSocket* sock, CNPacketData* data) {
} }
//Warping to buddy //Warping to buddy
void BuddyManager::reqBuddyWarp(CNSocket* sock, CNPacketData* data) { void BuddyManager::reqBuddyWarp(CNSocket* sock, CNPacketData* data) {} //stub
if (data->size != sizeof(sP_CL2FE_REQ_PC_BUDDY_WARP))
return; //malformed packet
sP_CL2FE_REQ_PC_BUDDY_WARP* pkt = (sP_CL2FE_REQ_PC_BUDDY_WARP*)data->buf;
INITSTRUCT(sP_FE2CL_REP_PC_BUDDY_WARP_OTHER_SHARD_SUCC, resp);
resp.iBuddyPCUID = pkt->iBuddyPCUID;
CNSocket* otherSock = sock;
for (auto pair : PlayerManager::players) {
if (pair.second.plr->PCStyle.iPC_UID == pkt->iBuddyPCUID) {
otherSock = pair.first;
}
}
Player* buddy = PlayerManager::getPlayer(otherSock);
PlayerManager::updatePlayerPosition(sock, buddy->x, buddy->y, buddy->z);
sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_BUDDY_WARP_OTHER_SHARD_SUCC, sizeof(sP_FE2CL_REP_PC_BUDDY_WARP_OTHER_SHARD_SUCC));
}
#pragma region Helper methods #pragma region Helper methods