summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-01-06 20:26:04 +0300
committerAndrei Karas <akaras@inbox.ru>2018-01-14 18:06:00 +0300
commitff19771c221b8f4687c38095f970671f24c4270d (patch)
treeeb1114b12f93f133e61dcdacd16ba8b8c022ad74 /src/map
parentadaebd02567d3034f88acda3a99c56358e1adc13 (diff)
downloadhercules-ff19771c221b8f4687c38095f970671f24c4270d.tar.gz
hercules-ff19771c221b8f4687c38095f970671f24c4270d.tar.bz2
hercules-ff19771c221b8f4687c38095f970671f24c4270d.tar.xz
hercules-ff19771c221b8f4687c38095f970671f24c4270d.zip
Move custom keys definition from packets_keys.h into clif.c
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/packets_keys.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index c79a4a1c6..7bce8f218 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -20151,7 +20151,11 @@ void packetdb_loaddb(void) {
#include "packets_shuffle.h"
#undef packet
#define packetKeys(a,b,c) do { clif->cryptKey[0] = (a); clif->cryptKey[1] = (b); clif->cryptKey[2] = (c); } while(0)
+#if defined(OBFUSCATIONKEY1) && defined(OBFUSCATIONKEY2) && defined(OBFUSCATIONKEY3)
+ packetKeys(OBFUSCATIONKEY1,OBFUSCATIONKEY2,OBFUSCATIONKEY3);
+#else
#include "packets_keys.h"
+#endif
#undef packetKeys
}
void clif_bc_ready(void) {
diff --git a/src/map/packets_keys.h b/src/map/packets_keys.h
index 61b1ac2b5..feb0a76ec 100644
--- a/src/map/packets_keys.h
+++ b/src/map/packets_keys.h
@@ -1896,8 +1896,4 @@
#endif // PACKETVER_ZERO
-#if defined(OBFUSCATIONKEY1) && defined(OBFUSCATIONKEY2) && defined(OBFUSCATIONKEY3)
- packetKeys(OBFUSCATIONKEY1,OBFUSCATIONKEY2,OBFUSCATIONKEY3);
-#endif
-
#endif /* MAP_PACKETS_KEYS_H */