diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/char/char.c | 2 | ||||
| -rw-r--r-- | src/char_sql/char.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 430d69bab..6edc0cb83 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2010/11/02 + * Applied fix by Ai4rei to reintroduce mapName within charinfo packet when PACKETVER >= 20100803. Follow-up to r14432. (bugreport:4413) [Paradox924X] * Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898) [Paradox924X] * Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512) [Paradox924X] 2010/11/01 diff --git a/src/char/char.c b/src/char/char.c index b3e219e3e..98a213316 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1736,7 +1736,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) WBUFW(buf,106) = ( p->rename > 0 ) ? 0 : 1; offset += 2; #endif -#if PACKETVER >= 20100720 && PACKETVER <= 20100727 +#if (PACKETVER >= 20100720 && PACKETVER <= 20100727) || PACKETVER >= 20100803 mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108)); offset += 16; #endif diff --git a/src/char_sql/char.c b/src/char_sql/char.c index b73b8c32a..df3ea7fd6 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1596,7 +1596,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) WBUFW(buf,106) = ( p->rename > 0 ) ? 0 : 1; offset+=2; #endif -#if PACKETVER >= 20100720 && PACKETVER <= 20100727 +#if (PACKETVER >= 20100720 && PACKETVER <= 20100727) || PACKETVER >= 20100803 mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108)); offset += 16; #endif |