diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/char/char.c | 6 | ||||
| -rw-r--r-- | src/char_sql/char.c | 7 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7d3efc38c..5cf0d96af 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added 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. +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 * Skill use is now cancelled when you use it while cloaking, and the uncloaking process warps you. [Skotlex] diff --git a/src/char/char.c b/src/char/char.c index 16dfe1192..79ae917ba 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1695,8 +1695,7 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) { for(i = 0; i < found_num; i++) { p = &char_dat[sd->found_char[i]].status; #if PACKETVER > 7 - j = offset + (found_num * 2) + (i * 106); // increase speed of code - WFIFOW(fd,offset+(i*2)) = 1; //TODO: Handle this rename bit: 0 to enable renaming + j = offset + (i * 108); // increase speed of code #else j = offset + (i * 106); // increase speed of code #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+103) = (p->luk > UCHAR_MAX) ? UCHAR_MAX : p->luk; 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)); diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 3c1a98a12..cd1983c73 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1725,8 +1725,7 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) { p = &char_dat; #if PACKETVER > 7 - j = offset + (found_num * 2) + (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 + j = offset + (i * 108); #else j = offset + (i * 106); // increase speed of code #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+103) = (p->luk > UCHAR_MAX) ? UCHAR_MAX : p->luk; 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)); // printf("mmo_char_send006b end..\n"); |