OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-11-01 01:00:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed mission quit:

Browse Source 
- fixed wrong json name, causing qitems not deleting properly
- quitting mission now resets npc kill count
This commit is contained in:
kamilprzyb
2020-09-16 23:41:25 +02:00
parent 0e19603eab
commit 4d02668add
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MissionManager.cpp
View File

@@ -151,7 +151,13 @@ void MissionManager::quitMission(CNSocket* sock, CNPacketData* data) {
int i;
for (i = 0; i < ACTIVE_MISSION_COUNT; i++) {
if (plr->tasks[i] == missionData->iTaskNum)
{
plr->tasks[i] = 0;
for (int j = 0; j < 3; j++) {
plr->killNPCCount[i][j] = 0;
plr->NeededItemCount[i][j] = 0;
}
}
}
if (i == ACTIVE_MISSION_COUNT - 1 && plr->tasks[i] != 0) {
std::cout << "[WARN] Player quit non-active mission!?" << std::endl;
@@ -164,7 +170,7 @@ void MissionManager::quitMission(CNSocket* sock, CNPacketData* data) {
// clean up quest items
for (i = 0; i < 3; i++) {
if (task["m_iSUItem"][i] == 0 && task["m_iCSUItem"][i] == 0)
if (task["m_iSUItem"][i] == 0 && task["m_iCSUItemID"][i] == 0)
continue;
/*
@@ -172,7 +178,7 @@ void MissionManager::quitMission(CNSocket* sock, CNPacketData* data) {
* slot later items will be placed in.
*/
for (int j = 0; j < AQINVEN_COUNT; j++)
if (plr->QInven[j].iID == task["m_iSUItem"][i] || plr->QInven[j].iID == task["m_iCSUItem"][i])
if (plr->QInven[j].iID == task["m_iSUItem"][i] || plr->QInven[j].iID == task["m_iCSUItemID"][i])
memset(&plr->QInven[j], 0, sizeof(sItemBase));
}