diff options
author | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
---|---|---|
committer | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
commit | 041e0625b543215e8b319fc4ef32fa24cd199656 (patch) | |
tree | 4f36abbb84364ad48c53f1f8bc6db007b01a20f6 /src/map/packets.h | |
parent | 5fd40de233d3a897284f771338cbf8e657182261 (diff) | |
parent | 856b6f1feb25ca74d716a4c22fff650e0ff065a0 (diff) | |
download | hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.gz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.bz2 hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.xz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.zip |
Merge pull request #586 from hemagx/master
Update UID system to match official and Implement Merger
Diffstat (limited to 'src/map/packets.h')
-rw-r--r-- | src/map/packets.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/packets.h b/src/map/packets.h index 53278f66e..6623c091c 100644 --- a/src/map/packets.h +++ b/src/map/packets.h @@ -448,6 +448,8 @@ packet(0x020a,10); //packet(0x020b,-1); //packet(0x020c,-1); packet(0x020d,-1); +packet(0x974,2,clif->cancelmergeitem); +packet(0x96e,-1,clif->ackmergeitems); //2004-07-05aSakexe #if PACKETVER >= 20040705 |