diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
| commit | 29f4963673b1f793448a083a21be3e6ae4d69c54 (patch) | |
| tree | 8722f2e506fc7ba97070a79739f819f0ade4f03d /src/map/packets.h | |
| parent | fb82e87c39227921fc3397a8763f0bdb0921a28b (diff) | |
| parent | 7b1293c3caf76b5587aa3abe8df57b1083c2175d (diff) | |
| download | hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.gz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.bz2 hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.xz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
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 |