Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Merged changes up to eAthena 15034.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15154 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
eathenabot 2011-12-18 01:12:31 +00:00
parent cf56304952
commit 21d300706a
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -1,5 +1,7 @@
Date Added 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 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] * 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] * Updated pcre3.dll and related files from 7.0 to 8.20 (bugreport:4948). [Ai4rei]

6
src/char/char.c
View File

@ -1793,7 +1793,7 @@ int count_users(void)
// Writes char data to the buffer in the format used by the client. // Writes char data to the buffer in the format used by the client.
// Used in packets 0x6b (chars info) and 0x6d (new char info) // Used in packets 0x6b (chars info) and 0x6d (new char info)
// Returns the size // 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) int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
{ {
unsigned short offset = 0; unsigned short offset = 0;
@ -1864,6 +1864,10 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
#if PACKETVER >= 20110928 #if PACKETVER >= 20110928
WBUFL(buf,132) = 0; // change slot feature (0 = disabled, otherwise enabled) WBUFL(buf,132) = 0; // change slot feature (0 = disabled, otherwise enabled)
offset += 4; offset += 4;
#endif
#if PACKETVER >= 20111025
WBUFL(buf,136) = 0; // unknown purpose (0 = disabled, otherwise displays "Add-Ons" sidebar)
offset += 4;
#endif #endif
return 106+offset; return 106+offset;
} }

6
src/char_sql/char.c
View File

@ -1595,7 +1595,7 @@ int count_users(void)
// Writes char data to the buffer in the format used by the client. // Writes char data to the buffer in the format used by the client.
// Used in packets 0x6b (chars info) and 0x6d (new char info) // Used in packets 0x6b (chars info) and 0x6d (new char info)
// Returns the size // 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) int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
{ {
unsigned short offset = 0; unsigned short offset = 0;
@ -1666,6 +1666,10 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
#if PACKETVER >= 20110928 #if PACKETVER >= 20110928
WBUFL(buf,132) = 0; // change slot feature (0 = disabled, otherwise enabled) WBUFL(buf,132) = 0; // change slot feature (0 = disabled, otherwise enabled)
offset += 4; offset += 4;
#endif
#if PACKETVER >= 20111025
WBUFL(buf,136) = 0; // unknown purpose (0 = disabled, otherwise displays "Add-Ons" sidebar)
offset += 4;
#endif #endif
return 106+offset; return 106+offset;
} }

1
src/common/mmo.h
View File

@ -42,6 +42,7 @@
// 20101124 - 2010-11-24aRagexeRE+ - 0x856, 0x857, 0x858 // 20101124 - 2010-11-24aRagexeRE+ - 0x856, 0x857, 0x858
// 20110111 - 2011-01-11aRagexeRE+ - 0x6b, 0x6d // 20110111 - 2011-01-11aRagexeRE+ - 0x6b, 0x6d
// 20110928 - 2011-09-28aRagexeRE+ - 0x6b, 0x6d // 20110928 - 2011-09-28aRagexeRE+ - 0x6b, 0x6d
// 20111025 - 2011-10-25aRagexeRE+ - 0x6b, 0x6d
#ifndef PACKETVER #ifndef PACKETVER
#define PACKETVER 20110609 #define PACKETVER 20110609