summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-30 20:28:37 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-30 20:28:37 +0000
commit794453043edb43f3d5d756c9793e704003df85cc (patch)
tree7dda4b9b5a74530704923ee7327c9e8a8a96fabf /src
parent98329766ed1e1a3afb7d8138ec375ad85d0410e3 (diff)
downloadhercules-794453043edb43f3d5d756c9793e704003df85cc.tar.gz
hercules-794453043edb43f3d5d756c9793e704003df85cc.tar.bz2
hercules-794453043edb43f3d5d756c9793e704003df85cc.tar.xz
hercules-794453043edb43f3d5d756c9793e704003df85cc.zip
- Reverted the packet structure changes to mmo_char_send006b in r9588 and corrected the bug that I was originally fixing.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9598 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/char/char.c6
-rw-r--r--src/char_sql/char.c7
2 files changed, 9 insertions, 4 deletions
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");