summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-02 04:46:03 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-02 04:46:03 +0000
commit43e0c8d2faff0879920d5fc6613509e9ba0464a5 (patch)
tree07c9c1484a549f755c9542fe97f5413be47491cb
parent989015f131e987dd67792c86c2e12284bf39ec9e (diff)
downloadhercules-43e0c8d2faff0879920d5fc6613509e9ba0464a5.tar.gz
hercules-43e0c8d2faff0879920d5fc6613509e9ba0464a5.tar.bz2
hercules-43e0c8d2faff0879920d5fc6613509e9ba0464a5.tar.xz
hercules-43e0c8d2faff0879920d5fc6613509e9ba0464a5.zip
Applied fix by Ai4rei to reintroduce mapName within charinfo packet when PACKETVER >= 20100803. Follow-up to r14432. (bugreport:4413)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14440 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/char/char.c2
-rw-r--r--src/char_sql/char.c2
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