diff options
| author | Haru <haru@dotalux.com> | 2013-11-02 20:44:46 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-11-03 21:07:31 +0100 |
| commit | 2ea51e2b2ac4e39d748e1ec24e34364746e43a8f (patch) | |
| tree | ea5b74270dc9ac6329d7b795430d08785e7c1568 /src | |
| parent | 3b0cd11f980a48b903262c857fde1cd9c784c2e0 (diff) | |
| download | hercules-2ea51e2b2ac4e39d748e1ec24e34364746e43a8f.tar.gz hercules-2ea51e2b2ac4e39d748e1ec24e34364746e43a8f.tar.bz2 hercules-2ea51e2b2ac4e39d748e1ec24e34364746e43a8f.tar.xz hercules-2ea51e2b2ac4e39d748e1ec24e34364746e43a8f.zip | |
Added some packetver-related flags to the UNIX build script
- The --disable-packetver-re (or --enable-packetver-re=no) flag
prevents the definition of PACKETVER_RE (without editing mmo.h)
- The --with-key1=, --with-key2=, --with-key3= flags override the
encryption key defined by the current packetver. All three flags are
required if at least one is used, or they'll be ignored.
- These options are mostly useful for buildbots, developers who often
use git bisect, or users who want to minimize their diffs and still
want to override those settings.
- (unrelated minor tweak) Silenced an unnecessarily verbose STDERR
message caused by the $CC shipped with clang-5 during the MinGW check.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/mmo.h | 14 | ||||
| -rw-r--r-- | src/map/packets.h | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index 349912a39..5f4da6eb0 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -48,18 +48,18 @@ // 20120307 - 2012-03-07aRagexeRE+ - 0x970 #ifndef PACKETVER - #define PACKETVER 20120418 -#endif +#define PACKETVER 20120418 +#endif // PACKETVER +#ifndef DISABLE_PACKETVER_RE // Comment the following line if your client is NOT ragexeRE (required because of conflicting packets in ragexe vs ragexeRE). #define PACKETVER_RE +#endif // DISABLE_PACKETVER_RE // Client support for experimental RagexeRE UI present in 2012-04-10 and 2012-04-18 -#ifdef PACKETVER_RE -#if (PACKETVER == 20120410) || (PACKETVER == 20120418) - #define PARTY_RECRUIT -#endif -#endif +#if defined(PACKETVER_RE) && ( PACKETVER == 20120410 || PACKETVER == 20120418 ) +#define PARTY_RECRUIT +#endif // PACKETVER_RE && (PACKETVER == 20120410 || PACKETVER == 10120418) // Comment the following line to disable sc_data saving. [Skotlex] #define ENABLE_SC_SAVING diff --git a/src/map/packets.h b/src/map/packets.h index 918f0a10f..55a85e182 100644 --- a/src/map/packets.h +++ b/src/map/packets.h @@ -2646,4 +2646,8 @@ packet(0x020d,-1); packetKeys(0x7E241DE0,0x5E805580,0x3D807D80); /* Thanks to Shakto */ #endif +#if defined(OBFUSCATIONKEY1) && defined(OBFUSCATIONKEY2) && defined(OBFUSCATIONKEY3) + packetKeys(OBFUSCATIONKEY1,OBFUSCATIONKEY2,OBFUSCATIONKEY3); +#endif + #endif /* _PACKETS_H_ */ |