mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-25 06:20:14 +00:00
Compare commits
No commits in common. "4429e5f49d840d5ec6a4afb7dfc59faeff18dd87" and "bbaaa53df2082a35f9b43fefea437a0abd81fb26" have entirely different histories.
4429e5f49d
...
bbaaa53df2
@ -252,26 +252,11 @@ static void emailSend(CNSocket* sock, CNPacketData* data) {
|
|||||||
if (attachment.ItemInven.iID == 0)
|
if (attachment.ItemInven.iID == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
sItemBase* item = &pkt->aItem[i].ItemInven;
|
|
||||||
sItemBase* real = &plr->Inven[attachment.iSlotNum];
|
|
||||||
|
|
||||||
resp.aItem[i] = attachment;
|
resp.aItem[i] = attachment;
|
||||||
attachments.push_back(attachment.ItemInven);
|
attachments.push_back(attachment.ItemInven);
|
||||||
attSlots.push_back(attachment.iSlotNum);
|
attSlots.push_back(attachment.iSlotNum);
|
||||||
if (real->iOpt == item->iOpt) // delete item (if they attached the whole stack)
|
// delete item
|
||||||
*real = { 0, 0, 0, 0 };
|
plr->Inven[attachment.iSlotNum] = { 0, 0, 0, 0 };
|
||||||
else // otherwise, decrement the item
|
|
||||||
real->iOpt -= item->iOpt;
|
|
||||||
|
|
||||||
// update the slot
|
|
||||||
INITSTRUCT(sP_FE2CL_PC_ITEM_MOVE_SUCC, itemResp);
|
|
||||||
itemResp.iFromSlotNum = attachment.iSlotNum;
|
|
||||||
itemResp.iToSlotNum = attachment.iSlotNum;
|
|
||||||
itemResp.FromSlotItem = *real;
|
|
||||||
itemResp.ToSlotItem = *real;
|
|
||||||
itemResp.eFrom = (int32_t)Items::SlotType::INVENTORY;
|
|
||||||
itemResp.eTo = (int32_t)Items::SlotType::INVENTORY;
|
|
||||||
sock->sendPacket(itemResp, P_FE2CL_PC_ITEM_MOVE_SUCC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int cost = pkt->iCash + 50 + 20 * attachments.size(); // attached taros + postage
|
int cost = pkt->iCash + 50 + 20 * attachments.size(); // attached taros + postage
|
||||||
|
@ -157,7 +157,6 @@ static sock_filter filter[] = {
|
|||||||
ALLOW_SYSCALL(stat),
|
ALLOW_SYSCALL(stat),
|
||||||
#endif
|
#endif
|
||||||
ALLOW_SYSCALL(fstat),
|
ALLOW_SYSCALL(fstat),
|
||||||
ALLOW_SYSCALL(newfstatat),
|
|
||||||
ALLOW_SYSCALL(fsync), // maybe
|
ALLOW_SYSCALL(fsync), // maybe
|
||||||
#if __NR_creat
|
#if __NR_creat
|
||||||
ALLOW_SYSCALL(creat), // maybe; for DB journal
|
ALLOW_SYSCALL(creat), // maybe; for DB journal
|
||||||
|
Loading…
Reference in New Issue
Block a user