summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordastgirpojee <dastgirpojee@rocketmail.com>2015-01-07 19:01:26 +0530
committerdastgirpojee <dastgirpojee@rocketmail.com>2015-01-07 19:01:26 +0530
commitc149b0f7ba22a900d0bf4d34fb10b3afbece4551 (patch)
tree60eaf997631350091753536b9c7aba3bc1972932
parent5a9aa4456714db8cc8752d685e24bbe39f71f94e (diff)
downloadhercules-c149b0f7ba22a900d0bf4d34fb10b3afbece4551.tar.gz
hercules-c149b0f7ba22a900d0bf4d34fb10b3afbece4551.tar.bz2
hercules-c149b0f7ba22a900d0bf4d34fb10b3afbece4551.tar.xz
hercules-c149b0f7ba22a900d0bf4d34fb10b3afbece4551.zip
Fixed char-server crash for clients >= 20141022, Thanks to Yommy and Ind
-rw-r--r--src/char/char.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/char/char.c b/src/char/char.c
index f63f1c66d..1b8d466f9 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1952,17 +1952,16 @@ int char_mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) {
WBUFW(buf,48) = min(p->max_sp, INT16_MAX);
WBUFW(buf,50) = DEFAULT_WALK_SPEED; // p->speed;
WBUFW(buf,52) = p->class_;
- WBUFW(buf,54) = p->hair;
-
#if PACKETVER >= 20141022
- //When the weapon is sent and your option is riding, the client crashes on login!?
- WBUFL(buf,56) = p->option&(0x20|0x80000|0x100000|0x200000|0x400000|0x800000|0x1000000|0x2000000|0x4000000|0x8000000) ? 0 : p->weapon;
+ WBUFL(buf,54) = p->hair;
offset+=2;
buf = WBUFP(buffer,offset);
#else
+ WBUFW(buf,54) = p->hair;
+#endif
+
//When the weapon is sent and your option is riding, the client crashes on login!?
WBUFW(buf,56) = p->option&(0x20|0x80000|0x100000|0x200000|0x400000|0x800000|0x1000000|0x2000000|0x4000000|0x8000000) ? 0 : p->weapon;
-#endif
WBUFW(buf,58) = p->base_level;
WBUFW(buf,60) = min(p->skill_point, INT16_MAX);