diff options
| author | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
| commit | 093193bd26b87f6afc876fd96b46271bd4e2ed81 (patch) | |
| tree | e52e626bc8edc9ea68eb48ad2e8ec517ee997d33 /src/map/packets.h | |
| parent | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (diff) | |
| download | hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.gz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.bz2 hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.xz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.zip | |
Merged conflicts.
Diffstat (limited to 'src/map/packets.h')
| -rw-r--r-- | src/map/packets.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/map/packets.h b/src/map/packets.h index 8e070dd05..648e662fa 100644 --- a/src/map/packets.h +++ b/src/map/packets.h @@ -2025,14 +2025,6 @@ packet(0x020d,-1); packet(0x08E5,41,clif->pPartyBookingRegisterReq,2,4); packet(0x08d2,10); packet(0x0916,26,clif->pGuildInvite2,2); - packetKeys(0x1540e48,0x13041224,0x31247924); - -#endif - -#ifndef PACKETVER_RE -#if PACKETVER >= 20120604 - packet(0x0861,18,clif->pPartyBookingRegisterReq,2,4,6); -#endif #endif #ifndef PACKETVER_RE @@ -2074,7 +2066,6 @@ packet(0x020d,-1); //2012-07-16aRagExe (special thanks to Yommy!) #if PACKETVER >= 20120716 packet(0x0364,8,clif->pMoveFromKafra,2,4); - packetKeys(0x76052205, 0x22052205, 0x22052205); #endif //2013-03-20Ragexe (Judas + Yommy) @@ -2109,7 +2100,6 @@ packet(0x020d,-1); packet(0x086F,26,clif->pFriendsListAdd,2); packet(0x093F,5,clif->pHomMenu,2,4); packet(0x0947,36,clif->pStoragePassword,0); - packetKeys(0x3F094C49, 0x55F86C1E, 0x58AA359A); // Shuffle End // New Packets @@ -2255,12 +2245,6 @@ packet(0x020d,-1); packet(0x0883,36,clif->pStoragePassword,0); #endif -<<<<<<< HEAD -#if PACKETVER >= 20130612 - packetKeys(0x6D166F66, 0x3C000FCF, 0x295B0FCB); /* Thanks to Shakto */ -#endif - -======= /* PacketKeys: http://hercules.ws/board/topic/1105-hercules-wpe-free-june-14th-patch/ */ #if PACKETVER >= 20110817 packetKeys(0x053D5CED,0x3DED6DED,0x6DED6DED); /* Thanks to Shakto */ @@ -2443,5 +2427,4 @@ packet(0x020d,-1); #endif ->>>>>>> upstream/master #endif /* _PACKETS_H_ */ |