mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 22:57:45 +00:00
Code Activity

refactor transactionId -> sequence

Browse source
This commit is contained in:
NotAdam 2019-02-09 22:59:14 +11:00
parent 7f4eeef162
commit cc9e1a4275
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -1143,15 +1143,15 @@ struct FFXIVIpcCurrencyCrystalInfo :
struct FFXIVIpcInventoryTransactionFinish : struct FFXIVIpcInventoryTransactionFinish :
FFXIVIpcBasePacket< InventoryTransactionFinish > FFXIVIpcBasePacket< InventoryTransactionFinish >
{ {
uint32_t transactionId; uint32_t sequenceId;
uint32_t transactionId1; uint32_t sequenceId1;
uint64_t padding; uint64_t padding;
}; };
struct FFXIVIpcInventoryTransaction : struct FFXIVIpcInventoryTransaction :
FFXIVIpcBasePacket< InventoryTransaction > FFXIVIpcBasePacket< InventoryTransaction >
{ {
uint32_t transactionId; uint32_t sequence;
uint8_t type; uint8_t type;
uint8_t padding; uint8_t padding;
uint16_t padding1; uint16_t padding1;

14
src/world/Actor/PlayerInventory.cpp
View file

@ -751,7 +751,7 @@ void Sapphire::Entity::Player::swapItem( uint16_t fromInventoryId, uint8_t fromS
void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fromSlotId ) void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fromSlotId )
{ {
// i am not entirely sure how this should be generated or if it even is important for us... // i am not entirely sure how this should be generated or if it even is important for us...
uint32_t transactionId = getNextInventorySequence(); uint32_t sequence = getNextInventorySequence();
auto fromItem = m_storageMap[ fromInventoryId ]->getItem( fromSlotId ); auto fromItem = m_storageMap[ fromInventoryId ]->getItem( fromSlotId );
@ -761,7 +761,7 @@ void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fr
updateContainer( fromInventoryId, fromSlotId, nullptr ); updateContainer( fromInventoryId, fromSlotId, nullptr );
auto invTransPacket = makeZonePacket< FFXIVIpcInventoryTransaction >( getId() ); auto invTransPacket = makeZonePacket< FFXIVIpcInventoryTransaction >( getId() );
invTransPacket->data().transactionId = transactionId; invTransPacket->data().sequence = sequence;
invTransPacket->data().ownerId = getId(); invTransPacket->data().ownerId = getId();
invTransPacket->data().storageId = fromInventoryId; invTransPacket->data().storageId = fromInventoryId;
invTransPacket->data().catalogId = fromItem->getId(); invTransPacket->data().catalogId = fromItem->getId();
@ -771,8 +771,8 @@ void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fr
queuePacket( invTransPacket ); queuePacket( invTransPacket );
auto invTransFinPacket = makeZonePacket< FFXIVIpcInventoryTransactionFinish >( getId() ); auto invTransFinPacket = makeZonePacket< FFXIVIpcInventoryTransactionFinish >( getId() );
invTransFinPacket->data().transactionId = transactionId; invTransFinPacket->data().sequenceId = sequence;
invTransFinPacket->data().transactionId1 = transactionId; invTransFinPacket->data().sequenceId1 = sequence;
queuePacket( invTransFinPacket ); queuePacket( invTransFinPacket );
} }
@ -883,7 +883,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common:
// send inv update // send inv update
auto invTransPacket = makeZonePacket< FFXIVIpcInventoryTransaction >( getId() ); auto invTransPacket = makeZonePacket< FFXIVIpcInventoryTransaction >( getId() );
invTransPacket->data().transactionId = seq; invTransPacket->data().sequence = seq;
invTransPacket->data().ownerId = getId(); invTransPacket->data().ownerId = getId();
invTransPacket->data().storageId = type; invTransPacket->data().storageId = type;
invTransPacket->data().catalogId = item->getId(); invTransPacket->data().catalogId = item->getId();
@ -893,8 +893,8 @@ Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common:
queuePacket( invTransPacket ); queuePacket( invTransPacket );
auto invTransFinPacket = makeZonePacket< FFXIVIpcInventoryTransactionFinish >( getId() ); auto invTransFinPacket = makeZonePacket< FFXIVIpcInventoryTransactionFinish >( getId() );
invTransFinPacket->data().transactionId = seq; invTransFinPacket->data().sequenceId = seq;
invTransFinPacket->data().transactionId1 = seq; invTransFinPacket->data().sequenceId1 = seq;
queuePacket( invTransFinPacket ); queuePacket( invTransFinPacket );
return item; return item;