metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

item_set and item_del packets normalized

Browse Source
This commit is contained in:
d1str4ught
2025-08-28 22:42:00 +02:00
parent 329eb74e7d
commit c1e308cd78
3 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/game/char_item.cpp
View File

@@ -404,7 +404,7 @@ void CHARACTER::SetItem(TItemPos Cell, LPITEM pItem)
{
TPacketGCItemSet pack;
pack.header = HEADER_GC_ITEM_SET;
pack.Cell = Cell;
pack.pos = Cell;
pack.count = pItem->GetCount();
pack.vnum = pItem->GetVnum();
@@ -412,7 +412,6 @@ void CHARACTER::SetItem(TItemPos Cell, LPITEM pItem)
pack.anti_flags = pItem->GetAntiFlag();
pack.highlight = (Cell.window_type == DRAGON_SOUL_INVENTORY);
thecore_memcpy(pack.alSockets, pItem->GetSockets(), sizeof(pack.alSockets));
thecore_memcpy(pack.aAttr, pItem->GetAttributes(), sizeof(pack.aAttr));
@@ -420,15 +419,10 @@ void CHARACTER::SetItem(TItemPos Cell, LPITEM pItem)
}
else
{
TPacketGCItemDelDeprecated pack;
TPacketGCItemDel pack;
pack.header = HEADER_GC_ITEM_DEL;
pack.Cell = Cell;
pack.count = 0;
pack.vnum = 0;
memset(pack.alSockets, 0, sizeof(pack.alSockets));
memset(pack.aAttr, 0, sizeof(pack.aAttr));
GetDesc()->Packet(&pack, sizeof(TPacketGCItemDelDeprecated));
pack.pos = Cell;
GetDesc()->Packet(&pack, sizeof(TPacketGCItemDel));
}
}

36
src/game/packet.h
View File

@@ -1096,35 +1096,25 @@ typedef struct packet_dead
uint32_t vid;
} TPacketGCDead;
struct TPacketGCItemDelDeprecated
typedef struct packet_del_item
{
uint8_t header;
TItemPos Cell;
uint32_t vnum;
uint8_t count;
int32_t alSockets[ITEM_SOCKET_MAX_NUM];
TPlayerItemAttribute aAttr[ITEM_ATTRIBUTE_MAX_NUM];
};
uint8_t header;
TItemPos pos;
} TPacketGCItemDel;
typedef struct packet_item_set
{
uint8_t header;
TItemPos Cell;
uint32_t vnum;
uint8_t count;
uint32_t flags;
uint32_t anti_flags;
bool highlight;
int32_t alSockets[ITEM_SOCKET_MAX_NUM];
TPlayerItemAttribute aAttr[ITEM_ATTRIBUTE_MAX_NUM];
uint8_t header;
TItemPos pos;
uint32_t vnum;
uint8_t count;
uint32_t flags;
uint32_t anti_flags;
uint8_t highlight;
int32_t alSockets[ITEM_SOCKET_MAX_NUM];
TPlayerItemAttribute aAttr[ITEM_ATTRIBUTE_MAX_NUM];
} TPacketGCItemSet;
typedef struct packet_item_del
{
uint8_t header;
uint8_t pos;
} TPacketGCItemDel;
struct packet_item_use
{
uint8_t header;

4
src/game/safebox.cpp
View File

@@ -71,7 +71,7 @@ bool CSafebox::Add(DWORD dwPos, LPITEM pkItem)
TPacketGCItemSet pack;
pack.header = m_bWindowMode == SAFEBOX ? HEADER_GC_SAFEBOX_SET : HEADER_GC_MALL_SET;
pack.Cell = TItemPos(m_bWindowMode, dwPos);
pack.pos = TItemPos(m_bWindowMode, dwPos);
pack.vnum = pkItem->GetVnum();
pack.count = pkItem->GetCount();
pack.flags = pkItem->GetFlag();
@@ -111,7 +111,7 @@ LPITEM CSafebox::Remove(DWORD dwPos)
TPacketGCItemDel pack;
pack.header = m_bWindowMode == SAFEBOX ? HEADER_GC_SAFEBOX_DEL : HEADER_GC_MALL_DEL;
pack.pos = dwPos;
pack.pos = TItemPos(m_bWindowMode, dwPos);
m_pkChrOwner->GetDesc()->Packet(&pack, sizeof(pack));
sys_log(1, "SAFEBOX: REMOVE %s %s count %d", m_pkChrOwner->GetName(), pkItem->GetName(), pkItem->GetCount());