mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-05 06:50:04 +00:00
Fix a bug where nanos aren't unsummoned when unequipped.
Thanks fabriXfinn for reporting it. Also improved sanity checks.
This commit is contained in:
parent
dff710cf61
commit
41898bb6b7
@ -20,16 +20,20 @@ void NanoManager::nanoEquipHandler(CNSocket* sock, CNPacketData* data) {
|
|||||||
INITSTRUCT(sP_FE2CL_REP_NANO_EQUIP_SUCC, resp);
|
INITSTRUCT(sP_FE2CL_REP_NANO_EQUIP_SUCC, resp);
|
||||||
Player *plr = PlayerManager::getPlayer(sock);
|
Player *plr = PlayerManager::getPlayer(sock);
|
||||||
|
|
||||||
if (nano->iNanoSlotNum > 2)
|
// sanity check
|
||||||
|
if (nano->iNanoSlotNum > 2 || nano->iNanoSlotNum < 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
resp.iNanoID = nano->iNanoID;
|
resp.iNanoID = nano->iNanoID;
|
||||||
resp.iNanoSlotNum = nano->iNanoSlotNum;
|
resp.iNanoSlotNum = nano->iNanoSlotNum;
|
||||||
|
|
||||||
|
|
||||||
// Update player
|
// Update player
|
||||||
plr->equippedNanos[nano->iNanoSlotNum] = nano->iNanoID;
|
plr->equippedNanos[nano->iNanoSlotNum] = nano->iNanoID;
|
||||||
|
|
||||||
|
// unsummon nano if replaced
|
||||||
|
if (plr->activeNano == plr->equippedNanos[nano->iNanoSlotNum])
|
||||||
|
summonNano(sock, -1);
|
||||||
|
|
||||||
sock->sendPacket((void*)&resp, P_FE2CL_REP_NANO_EQUIP_SUCC, sizeof(sP_FE2CL_REP_NANO_EQUIP_SUCC));
|
sock->sendPacket((void*)&resp, P_FE2CL_REP_NANO_EQUIP_SUCC, sizeof(sP_FE2CL_REP_NANO_EQUIP_SUCC));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,11 +45,16 @@ void NanoManager::nanoUnEquipHandler(CNSocket* sock, CNPacketData* data) {
|
|||||||
INITSTRUCT(sP_FE2CL_REP_NANO_UNEQUIP_SUCC, resp);
|
INITSTRUCT(sP_FE2CL_REP_NANO_UNEQUIP_SUCC, resp);
|
||||||
Player *plr = PlayerManager::getPlayer(sock);
|
Player *plr = PlayerManager::getPlayer(sock);
|
||||||
|
|
||||||
if (nano->iNanoSlotNum > 2)
|
// sanity check
|
||||||
|
if (nano->iNanoSlotNum > 2 || nano->iNanoSlotNum < 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
resp.iNanoSlotNum = nano->iNanoSlotNum;
|
resp.iNanoSlotNum = nano->iNanoSlotNum;
|
||||||
|
|
||||||
|
// unsummon nano if removed
|
||||||
|
if (plr->equippedNanos[nano->iNanoSlotNum] == plr->activeNano)
|
||||||
|
summonNano(sock, -1);
|
||||||
|
|
||||||
// update player
|
// update player
|
||||||
plr->equippedNanos[nano->iNanoSlotNum] = 0;
|
plr->equippedNanos[nano->iNanoSlotNum] = 0;
|
||||||
|
|
||||||
@ -75,33 +84,9 @@ void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) {
|
|||||||
sP_CL2FE_REQ_NANO_ACTIVE* pkt = (sP_CL2FE_REQ_NANO_ACTIVE*)data->buf;
|
sP_CL2FE_REQ_NANO_ACTIVE* pkt = (sP_CL2FE_REQ_NANO_ACTIVE*)data->buf;
|
||||||
Player *plr = PlayerManager::getPlayer(sock);
|
Player *plr = PlayerManager::getPlayer(sock);
|
||||||
|
|
||||||
|
summonNano(sock, pkt->iNanoSlotNum);
|
||||||
|
|
||||||
// Send to client
|
// Send to client
|
||||||
INITSTRUCT(sP_FE2CL_REP_NANO_ACTIVE_SUCC, resp);
|
|
||||||
resp.iActiveNanoSlotNum = pkt->iNanoSlotNum;
|
|
||||||
sock->sendPacket((void*)&resp, P_FE2CL_REP_NANO_ACTIVE_SUCC, sizeof(sP_FE2CL_REP_NANO_ACTIVE_SUCC));
|
|
||||||
|
|
||||||
if (pkt->iNanoSlotNum > 2)
|
|
||||||
return;
|
|
||||||
|
|
||||||
int nanoId = plr->equippedNanos[pkt->iNanoSlotNum];
|
|
||||||
|
|
||||||
if (nanoId > 36)
|
|
||||||
return; // sanity check
|
|
||||||
|
|
||||||
sNano nano = plr->Nanos[nanoId];
|
|
||||||
|
|
||||||
// Send to other players
|
|
||||||
INITSTRUCT(sP_FE2CL_NANO_ACTIVE, pkt1);
|
|
||||||
|
|
||||||
pkt1.iPC_ID = plr->iID;
|
|
||||||
pkt1.Nano = nano;
|
|
||||||
|
|
||||||
for (CNSocket* s : PlayerManager::players[sock].viewable)
|
|
||||||
s->sendPacket((void*)&pkt1, P_FE2CL_NANO_ACTIVE, sizeof(sP_FE2CL_NANO_ACTIVE));
|
|
||||||
|
|
||||||
// update player
|
|
||||||
plr->activeNano = nanoId;
|
|
||||||
|
|
||||||
DEBUGLOG(
|
DEBUGLOG(
|
||||||
std::cout << U16toU8(plr->PCStyle.szFirstName) << U16toU8(plr->PCStyle.szLastName) << " requested to summon nano slot: " << pkt->iNanoSlotNum << std::endl;
|
std::cout << U16toU8(plr->PCStyle.szFirstName) << U16toU8(plr->PCStyle.szLastName) << " requested to summon nano slot: " << pkt->iNanoSlotNum << std::endl;
|
||||||
)
|
)
|
||||||
@ -158,6 +143,37 @@ void NanoManager::addNano(CNSocket* sock, int16_t nanoId, int16_t slot) {
|
|||||||
plr->Nanos[nanoId] = resp.Nano;
|
plr->Nanos[nanoId] = resp.Nano;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void NanoManager::summonNano(CNSocket *sock, int slot) {
|
||||||
|
INITSTRUCT(sP_FE2CL_REP_NANO_ACTIVE_SUCC, resp);
|
||||||
|
resp.iActiveNanoSlotNum = slot;
|
||||||
|
sock->sendPacket((void*)&resp, P_FE2CL_REP_NANO_ACTIVE_SUCC, sizeof(sP_FE2CL_REP_NANO_ACTIVE_SUCC));
|
||||||
|
Player *plr = PlayerManager::getPlayer(sock);
|
||||||
|
|
||||||
|
std::cout << "summon nano\n";
|
||||||
|
|
||||||
|
if (slot > 2 || slot < 0)
|
||||||
|
return; //sanity check
|
||||||
|
|
||||||
|
int nanoId = plr->equippedNanos[slot];
|
||||||
|
|
||||||
|
if (nanoId > 36 || nanoId < 0)
|
||||||
|
return; // sanity check
|
||||||
|
|
||||||
|
sNano nano = plr->Nanos[nanoId];
|
||||||
|
|
||||||
|
// Send to other players
|
||||||
|
INITSTRUCT(sP_FE2CL_NANO_ACTIVE, pkt1);
|
||||||
|
|
||||||
|
pkt1.iPC_ID = plr->iID;
|
||||||
|
pkt1.Nano = nano;
|
||||||
|
|
||||||
|
for (CNSocket* s : PlayerManager::players[sock].viewable)
|
||||||
|
s->sendPacket((void*)&pkt1, P_FE2CL_NANO_ACTIVE, sizeof(sP_FE2CL_NANO_ACTIVE));
|
||||||
|
|
||||||
|
// update player
|
||||||
|
plr->activeNano = nanoId;
|
||||||
|
}
|
||||||
|
|
||||||
void NanoManager::setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId) {
|
void NanoManager::setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId) {
|
||||||
if (nanoId > 36)
|
if (nanoId > 36)
|
||||||
return;
|
return;
|
||||||
|
@ -13,6 +13,7 @@ namespace NanoManager {
|
|||||||
|
|
||||||
// Helper methods
|
// Helper methods
|
||||||
void addNano(CNSocket* sock, int16_t nanoId, int16_t slot);
|
void addNano(CNSocket* sock, int16_t nanoId, int16_t slot);
|
||||||
|
void summonNano(CNSocket* sock, int slot);
|
||||||
void setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId);
|
void setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId);
|
||||||
void resetNanoSkill(CNSocket* sock, int16_t nanoId);
|
void resetNanoSkill(CNSocket* sock, int16_t nanoId);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user