OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 21:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

warping to the past now sets PayZoneFlag and removes all active missions

Browse Source
This commit is contained in:
kamilprzyb 2020-09-24 22:32:09 +02:00
parent df936e8c9c
commit 1874f1081b
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/MissionManager.cpp
View File

@ -157,13 +157,17 @@ void MissionManager::quitMission(CNSocket* sock, CNPacketData* data) {
return; // malformed packet return; // malformed packet
sP_CL2FE_REQ_PC_TASK_STOP* missionData = (sP_CL2FE_REQ_PC_TASK_STOP*)data->buf; sP_CL2FE_REQ_PC_TASK_STOP* missionData = (sP_CL2FE_REQ_PC_TASK_STOP*)data->buf;
quitTask(sock, missionData->iTaskNum);
}
void MissionManager::quitTask(CNSocket* sock, int32_t TaskNum) {
INITSTRUCT(sP_FE2CL_REP_PC_TASK_STOP_SUCC, response); INITSTRUCT(sP_FE2CL_REP_PC_TASK_STOP_SUCC, response);
Player *plr = PlayerManager::getPlayer(sock); Player* plr = PlayerManager::getPlayer(sock);
// update player // update player
int i; int i;
for (i = 0; i < ACTIVE_MISSION_COUNT; i++) { for (i = 0; i < ACTIVE_MISSION_COUNT; i++) {
if (plr->tasks[i] == missionData->iTaskNum) if (plr->tasks[i] == TaskNum)
{ {
plr->tasks[i] = 0; plr->tasks[i] = 0;
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {
@ -177,7 +181,7 @@ void MissionManager::quitMission(CNSocket* sock, CNPacketData* data) {
// remove current mission // remove current mission
plr->CurrentMissionID = 0; plr->CurrentMissionID = 0;
TaskData& task = *Tasks[missionData->iTaskNum]; TaskData& task = *Tasks[TaskNum];
// clean up quest items // clean up quest items
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -193,7 +197,7 @@ void MissionManager::quitMission(CNSocket* sock, CNPacketData* data) {
memset(&plr->QInven[j], 0, sizeof(sItemBase)); memset(&plr->QInven[j], 0, sizeof(sItemBase));
} }
response.iTaskNum = missionData->iTaskNum; response.iTaskNum = TaskNum;
sock->sendPacket((void*)&response, P_FE2CL_REP_PC_TASK_STOP_SUCC, sizeof(sP_FE2CL_REP_PC_TASK_STOP_SUCC)); sock->sendPacket((void*)&response, P_FE2CL_REP_PC_TASK_STOP_SUCC, sizeof(sP_FE2CL_REP_PC_TASK_STOP_SUCC));
} }

1
src/MissionManager.hpp
View File

@ -56,4 +56,5 @@ namespace MissionManager {
void mobKilled(CNSocket *sock, int mobid); void mobKilled(CNSocket *sock, int mobid);
void saveMission(Player* player, int missionId); void saveMission(Player* player, int missionId);
void quitTask(CNSocket* sock, int32_t TaskNum);
} }

12
src/PlayerManager.cpp
View File

@ -815,7 +815,17 @@ void PlayerManager::changePlayerGuide(CNSocket *sock, CNPacketData *data) {
resp.iFusionMatter = plr->fusionmatter; // no cost resp.iFusionMatter = plr->fusionmatter; // no cost
sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_CHANGE_MENTOR_SUCC, sizeof(sP_FE2CL_REP_PC_CHANGE_MENTOR_SUCC)); sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_CHANGE_MENTOR_SUCC, sizeof(sP_FE2CL_REP_PC_CHANGE_MENTOR_SUCC));
//save it on player // if it's changed from computress
if (plr->mentor == 5) {
// we're warping to the past
plr->PCStyle2.iPayzoneFlag = 1;
// remove all active missions
for (int i = 0; i < ACTIVE_MISSION_COUNT; i++) {
if (plr->tasks[i] != 0)
MissionManager::quitTask(sock, plr->tasks[i]);
}
}
// save it on player
plr->mentor = pkt->iMentor; plr->mentor = pkt->iMentor;
} }