summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-18 01:12:31 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-18 01:12:31 +0000
commita449f78713564d63597262bf9450e090cf4cd930 (patch)
tree7d73f2d19631143c199059043b63b5fe12e8861b
parenta2e15285da9da6bdd83015091d8963c4584ec5d5 (diff)
downloadhercules-a449f78713564d63597262bf9450e090cf4cd930.tar.gz
hercules-a449f78713564d63597262bf9450e090cf4cd930.tar.bz2
hercules-a449f78713564d63597262bf9450e090cf4cd930.tar.xz
hercules-a449f78713564d63597262bf9450e090cf4cd930.zip
* Merged changes up to eAthena 15034.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15154 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/char/char.c6
-rw-r--r--src/char_sql/char.c6
-rw-r--r--src/common/mmo.h1
4 files changed, 13 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8dcbcaef7..0049ba317 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,7 @@
Date Added
+2011-12-17
+ * Added field for "'add-ons' sidebar" to character select list packet for 2011-10-25aRagexeRE and newer. [Ai4rei]
2011-12-10
* Disabled creation of merceneries on TXT until charmerge is done, since the current char-server does not support it (bugreport:2502, since r13116). [Ai4rei]
* Updated pcre3.dll and related files from 7.0 to 8.20 (bugreport:4948). [Ai4rei]
diff --git a/src/char/char.c b/src/char/char.c
index 90e954002..aac469c5b 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 140 //Max size (for WFIFOHEAD calls)
+#define MAX_CHAR_BUF 144 //Max size (for WFIFOHEAD calls)
int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
{
unsigned short offset = 0;
@@ -1865,6 +1865,10 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
WBUFL(buf,132) = 0; // change slot feature (0 = disabled, otherwise enabled)
offset += 4;
#endif
+#if PACKETVER >= 20111025
+ WBUFL(buf,136) = 0; // unknown purpose (0 = disabled, otherwise displays "Add-Ons" sidebar)
+ offset += 4;
+#endif
return 106+offset;
}
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 4df1a58dd..745209ef6 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -1595,7 +1595,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 140 //Max size (for WFIFOHEAD calls)
+#define MAX_CHAR_BUF 144 //Max size (for WFIFOHEAD calls)
int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
{
unsigned short offset = 0;
@@ -1667,6 +1667,10 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
WBUFL(buf,132) = 0; // change slot feature (0 = disabled, otherwise enabled)
offset += 4;
#endif
+#if PACKETVER >= 20111025
+ WBUFL(buf,136) = 0; // unknown purpose (0 = disabled, otherwise displays "Add-Ons" sidebar)
+ offset += 4;
+#endif
return 106+offset;
}
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 2b39bf6d8..0d14970d1 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -42,6 +42,7 @@
// 20101124 - 2010-11-24aRagexeRE+ - 0x856, 0x857, 0x858
// 20110111 - 2011-01-11aRagexeRE+ - 0x6b, 0x6d
// 20110928 - 2011-09-28aRagexeRE+ - 0x6b, 0x6d
+// 20111025 - 2011-10-25aRagexeRE+ - 0x6b, 0x6d
#ifndef PACKETVER
#define PACKETVER 20110609