OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-16 18:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Assorted cleanups and fixes.

Browse Source 
* Clean up spacing/indentation
* Proper enum formatting
* Fix nano dismissal (for real this time)
* Do not copy Player struct when a pointer is right there
* Stop looking after the trade partner has been found
* Make sure we're shifting unsigned values (and 64-bit when they need to be)
* Look for JSONs in tdata/
* Add a dbsaveinterval to the example config.ini, in the login category
This commit is contained in:
dongresource
2020-09-14 15:20:55 +02:00
parent 38d5998a6e
commit ed86bc9160
13 changed files with 180 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/ItemManager.cpp
View File

@@ -55,28 +55,28 @@ void ItemManager::itemMoveHandler(CNSocket* sock, CNPacketData* data) {
//get the fromItem
sItemBase *fromItem;
switch (itemmove->eFrom) {
case (int)slot::equip:
switch ((SlotType)itemmove->eFrom) {
case SlotType::EQUIP:
fromItem = &plr.plr->Equip[itemmove->iFromSlotNum];
break;
case (int)slot::inventory:
case SlotType::INVENTORY:
fromItem = &plr.plr->Inven[itemmove->iFromSlotNum];
break;
case (int)slot::bank:
case SlotType::BANK:
fromItem = &plr.plr->Bank[itemmove->iFromSlotNum];
break;
}
//get the toItem
sItemBase* toItem;
switch (itemmove->eTo) {
case (int)slot::equip:
switch ((SlotType)itemmove->eTo) {
case SlotType::EQUIP:
toItem = &plr.plr->Equip[itemmove->iToSlotNum];
break;
case (int)slot::inventory:
case SlotType::INVENTORY:
toItem = &plr.plr->Inven[itemmove->iToSlotNum];
break;
case (int)slot::bank:
case SlotType::BANK:
toItem = &plr.plr->Bank[itemmove->iToSlotNum];
break;
}
@@ -91,11 +91,11 @@ void ItemManager::itemMoveHandler(CNSocket* sock, CNPacketData* data) {
*fromItem = temp;
//send equip change to viewable players
if (itemmove->eFrom == (int)slot::equip || itemmove->eTo == (int)slot::equip) {
if (itemmove->eFrom == (int)SlotType::EQUIP || itemmove->eTo == (int)SlotType::EQUIP) {
INITSTRUCT(sP_FE2CL_PC_EQUIP_CHANGE, equipChange);
equipChange.iPC_ID = plr.plr->iID;
if (itemmove->eFrom == (int)slot::equip) {
if (itemmove->eFrom == (int)SlotType::EQUIP) {
equipChange.iEquipSlotNum = itemmove->iFromSlotNum;
equipChange.EquipSlotItem = resp.ToSlotItem;
}
@@ -202,9 +202,10 @@ void ItemManager::itemTradeOfferHandler(CNSocket* sock, CNPacketData* data) {
CNSocket* otherSock = sock;
for (auto pair : PlayerManager::players) {
for (auto& pair : PlayerManager::players) {
if (pair.second.plr->iID == iID_Check) {
otherSock = pair.first;
break;
}
}
@@ -247,9 +248,10 @@ void ItemManager::itemTradeOfferAcceptHandler(CNSocket* sock, CNPacketData* data
CNSocket* otherSock = sock;
for (auto pair : PlayerManager::players) {
for (auto& pair : PlayerManager::players) {
if (pair.second.plr->iID == iID_Check) {
otherSock = pair.first;
break;
}
}
@@ -281,21 +283,8 @@ void ItemManager::itemTradeOfferAcceptHandler(CNSocket* sock, CNPacketData* data
plr.plr->isTradeConfirm = false;
plr2.plr->isTradeConfirm = false;
for (int i = 0; i < 5; i++) {
plr.plr->Trade[i].iID = 0;
plr.plr->Trade[i].iType = 0;
plr.plr->Trade[i].iOpt = 0;
plr.plr->Trade[i].iInvenNum = 0;
plr.plr->Trade[i].iSlotNum = 0;
}
for (int i = 0; i < 5; i++) {
plr2.plr->Trade[i].iID = 0;
plr2.plr->Trade[i].iType = 0;
plr2.plr->Trade[i].iOpt = 0;
plr2.plr->Trade[i].iInvenNum = 0;
plr2.plr->Trade[i].iSlotNum = 0;
}
memset(&plr.plr->Trade, 0, sizeof(plr.plr->Trade));
memset(&plr2.plr->Trade, 0, sizeof(plr2.plr->Trade));
otherSock->sendPacket((void*)&resp, P_FE2CL_REP_PC_TRADE_OFFER_SUCC, sizeof(sP_FE2CL_REP_PC_TRADE_OFFER_SUCC));
}
@@ -321,9 +310,10 @@ void ItemManager::itemTradeOfferRefusalHandler(CNSocket* sock, CNPacketData* dat
CNSocket* otherSock = sock;
for (auto pair : PlayerManager::players) {
for (auto& pair : PlayerManager::players) {
if (pair.second.plr->iID == iID_Check) {
otherSock = pair.first;
break;
}
}
@@ -346,9 +336,10 @@ void ItemManager::itemTradeConfirmHandler(CNSocket* sock, CNPacketData* data) {
CNSocket* otherSock = sock;
for (auto pair : PlayerManager::players) {
for (auto& pair : PlayerManager::players) {
if (pair.second.plr->iID == iID_Check) {
otherSock = pair.first;
break;
}
}