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

[bugfix] Don't set iType on empty item slots.

Browse Source 
This confuses ItemManager::findFreeSlot().
This commit is contained in:
dongresource 2020-09-12 02:25:45 +02:00
parent 579aa9d31d
commit 5747c24479
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CNLoginServer.cpp
View File

@ -130,7 +130,7 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
for (int i = 5; i < AEQUIP_COUNT; i++) { for (int i = 5; i < AEQUIP_COUNT; i++) {
// empty equips // empty equips
charInfo.aEquip[i].iID = 0; charInfo.aEquip[i].iID = 0;
charInfo.aEquip[i].iType = i; charInfo.aEquip[i].iType = 0;
charInfo.aEquip[i].iOpt = 0; charInfo.aEquip[i].iOpt = 0;
} }

2
src/Database.cpp
View File

@ -337,7 +337,7 @@ Player Database::DbToPlayer(DbPlayer player) {
for (int i = 4; i < AEQUIP_COUNT; i++) { for (int i = 4; i < AEQUIP_COUNT; i++) {
// empty equips // empty equips
result.Equip[i].iID = 0; result.Equip[i].iID = 0;
result.Equip[i].iType = i; result.Equip[i].iType = 0;
result.Equip[i].iOpt = 0; result.Equip[i].iOpt = 0;
} }
for (int i = 0; i < AINVEN_COUNT; i++) { for (int i = 0; i < AINVEN_COUNT; i++) {

5
src/ItemManager.cpp
View File

@ -720,12 +720,9 @@ void ItemManager::chestOpenHandler(CNSocket *sock, CNPacketData *data) {
// TODO: use this in cleaned up ItemManager // TODO: use this in cleaned up ItemManager
int ItemManager::findFreeSlot(Player *plr) { int ItemManager::findFreeSlot(Player *plr) {
int i; int i;
sItemBase free;
memset((void*)&free, 0, sizeof(sItemBase));
for (i = 0; i < AINVEN_COUNT; i++) for (i = 0; i < AINVEN_COUNT; i++)
if (memcmp((void*)&plr->Inven[i], (void*)&free, sizeof(sItemBase)) == 0) if (plr->Inven[i].iType == 0 && plr->Inven[i].iID == 0 && plr->Inven[i].iOpt == 0)
return i; return i;
// not found // not found

2
src/MissionManager.cpp
View File

@ -141,7 +141,7 @@ void MissionManager::quitMission(CNSocket* sock, CNPacketData* data) {
/* /*
* It's ok to do this only server-side, because the server decides which * It's ok to do this only server-side, because the server decides which
* slot latter items will be placed in. * slot later items will be placed in.
*/ */
for (int j = 0; j < AQINVEN_COUNT; j++) 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_iCSUItem"][i])

2
src/NPCManager.cpp
View File

@ -44,7 +44,7 @@ void NPCManager::npcVendorBuy(CNSocket* sock, CNPacketData* data) {
if (slot != req->iInvenSlotNum) { if (slot != req->iInvenSlotNum) {
// possible item stacking? // possible item stacking?
std::cout << "[WARN] Client and server disagree on bought item slot" << std::endl; std::cout << "[WARN] Client and server disagree on bought item slot (" << req->iInvenSlotNum << " vs " << slot << ")" << std::endl;
} }
INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_ITEM_BUY_SUCC, resp); INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_ITEM_BUY_SUCC, resp);