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

- Reverted the packet structure changes to mmo_char_send006b in r9588 and corrected the bug that I was originally fixing.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9598 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
FlavioJS 2006-12-30 20:28:37 +00:00
parent 8160fd2b40
commit 4fa4e26d99
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/12/30
* Reverted the packet structure changes to mmo_char_send006b in r9588 and
corrected the bug that I was originally fixing. [FlavioJS]
2006/12/29 2006/12/29
* Skill use is now cancelled when you use it while cloaking, and the * Skill use is now cancelled when you use it while cloaking, and the
uncloaking process warps you. [Skotlex] uncloaking process warps you. [Skotlex]

6
src/char/char.c
View File

@ -1695,8 +1695,7 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) {
for(i = 0; i < found_num; i++) { for(i = 0; i < found_num; i++) {
p = &char_dat[sd->found_char[i]].status; p = &char_dat[sd->found_char[i]].status;
#if PACKETVER > 7 #if PACKETVER > 7
j = offset + (found_num * 2) + (i * 106); // increase speed of code j = offset + (i * 108); // increase speed of code
WFIFOW(fd,offset+(i*2)) = 1; //TODO: Handle this rename bit: 0 to enable renaming
#else #else
j = offset + (i * 106); // increase speed of code j = offset + (i * 106); // increase speed of code
#endif #endif
@ -1741,6 +1740,9 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) {
WFIFOB(fd,j+102) = (p->dex > UCHAR_MAX) ? UCHAR_MAX : p->dex; WFIFOB(fd,j+102) = (p->dex > UCHAR_MAX) ? UCHAR_MAX : p->dex;
WFIFOB(fd,j+103) = (p->luk > UCHAR_MAX) ? UCHAR_MAX : p->luk; WFIFOB(fd,j+103) = (p->luk > UCHAR_MAX) ? UCHAR_MAX : p->luk;
WFIFOW(fd,j+104) = p->char_num; WFIFOW(fd,j+104) = p->char_num;
#if PACKETVER > 7
WFIFOW(fd,j+106) = 1; //TODO: Handle this rename bit: 0 to enable renaming
#endif
} }
WFIFOSET(fd,WFIFOW(fd,2)); WFIFOSET(fd,WFIFOW(fd,2));

7
src/char_sql/char.c
View File

@ -1725,8 +1725,7 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) {
p = &char_dat; p = &char_dat;
#if PACKETVER > 7 #if PACKETVER > 7
j = offset + (found_num * 2) + (i * 108); j = offset + (i * 108);
WFIFOW(fd,offset+(i*2)) = 1; //TODO: Handle this rename bit: 0 to enable renaming //Updated packet structure with rename-button included. Credits to Sara-chan
#else #else
j = offset + (i * 106); // increase speed of code j = offset + (i * 106); // increase speed of code
#endif #endif
@ -1771,6 +1770,10 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) {
WFIFOB(fd,j+102) = (p->dex > UCHAR_MAX) ? UCHAR_MAX : p->dex; WFIFOB(fd,j+102) = (p->dex > UCHAR_MAX) ? UCHAR_MAX : p->dex;
WFIFOB(fd,j+103) = (p->luk > UCHAR_MAX) ? UCHAR_MAX : p->luk; WFIFOB(fd,j+103) = (p->luk > UCHAR_MAX) ? UCHAR_MAX : p->luk;
WFIFOW(fd,j+104) = p->char_num; WFIFOW(fd,j+104) = p->char_num;
#if PACKETVER > 7
//Updated packet structure with rename-button included. Credits to Sara-chan
WFIFOW(fd,j+106) = 1; //TODO: Handle this rename bit: 0 to enable renaming
#endif
} }
WFIFOSET(fd,WFIFOW(fd,2)); WFIFOSET(fd,WFIFOW(fd,2));
// printf("mmo_char_send006b end..\n"); // printf("mmo_char_send006b end..\n");