diff options
author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-16 09:06:42 +0000 |
---|---|---|
committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-16 09:06:42 +0000 |
commit | 2424ac9283f7e370d4e3135758f92322c061c05e (patch) | |
tree | 7c338f13c3b7b9cc2657b22ec1a4f62515436f3e | |
parent | 6669de77431e0bb6548bdcbb13a6cf13f40b247f (diff) | |
download | hercules-2424ac9283f7e370d4e3135758f92322c061c05e.tar.gz hercules-2424ac9283f7e370d4e3135758f92322c061c05e.tar.bz2 hercules-2424ac9283f7e370d4e3135758f92322c061c05e.tar.xz hercules-2424ac9283f7e370d4e3135758f92322c061c05e.zip |
* Added field for the change slot feature to character select list packet for 2011-09-28aRagexeRE and newer.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14977 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
-rw-r--r-- | src/char/char.c | 6 | ||||
-rw-r--r-- | src/char_sql/char.c | 6 | ||||
-rw-r--r-- | src/common/mmo.h | 1 |
4 files changed, 12 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e3054d51d..f54c97819 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2011/10/16 + * Added field for the change slot feature to character select list packet for 2011-09-28aRagexeRE and newer. [Ai4rei] * Changed function-like macros into inline functions where it seemed appropriate (topic:264007). [Ai4rei] * Fixed public/guild chat message packets sending strings without zero-termination causing recent clients to display trailing junk on such messages (bugreport:5068). [Ai4rei] - Changed memcpy to safestrncpy in message packets where overlong messages are truncated (thus loose zero-termination). diff --git a/src/char/char.c b/src/char/char.c index dfcbc9230..90e954002 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1793,7 +1793,7 @@ int count_users(void) // Writes char data to the buffer in the format used by the client. // Used in packets 0x6b (chars info) and 0x6d (new char info) // Returns the size -#define MAX_CHAR_BUF 136 //Max size (for WFIFOHEAD calls) +#define MAX_CHAR_BUF 140 //Max size (for WFIFOHEAD calls) int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) { unsigned short offset = 0; @@ -1861,6 +1861,10 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) WBUFL(buf,128) = p->robe; offset += 4; #endif +#if PACKETVER >= 20110928 + WBUFL(buf,132) = 0; // change slot feature (0 = disabled, otherwise enabled) + offset += 4; +#endif return 106+offset; } diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 0654be60a..19ea01f66 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1591,7 +1591,7 @@ int count_users(void) // Writes char data to the buffer in the format used by the client. // Used in packets 0x6b (chars info) and 0x6d (new char info) // Returns the size -#define MAX_CHAR_BUF 136 //Max size (for WFIFOHEAD calls) +#define MAX_CHAR_BUF 140 //Max size (for WFIFOHEAD calls) int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) { unsigned short offset = 0; @@ -1659,6 +1659,10 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) WBUFL(buf,128) = p->robe; offset += 4; #endif +#if PACKETVER >= 20110928 + WBUFL(buf,132) = 0; // change slot feature (0 = disabled, otherwise enabled) + offset += 4; +#endif return 106+offset; } diff --git a/src/common/mmo.h b/src/common/mmo.h index 3134d9374..239e1dddd 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -41,6 +41,7 @@ // 20100803 - 2010-08-03aRagexeRE+ - 0x6b, 0x6d, 0x827, 0x828, 0x829, 0x82a, 0x82b, 0x82c, 0x842, 0x843 // 20101124 - 2010-11-24aRagexeRE+ - 0x856, 0x857, 0x858 // 20110111 - 2011-01-11aRagexeRE+ - 0x6b, 0x6d +// 20110928 - 2011-09-28aRagexeRE+ - 0x6b, 0x6d #ifndef PACKETVER #define PACKETVER 20081126 |