summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-07 10:44:16 +0000
committerGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-07 10:44:16 +0000
commitb6dbb89d9149f4da36c861eb5b74b136aebe3864 (patch)
treedd85e3e77f4e71432dafc528779c0a8d13b9e42f
parentfdfb3663c2839c5331abadc4b333adefd49213f4 (diff)
downloadhercules-b6dbb89d9149f4da36c861eb5b74b136aebe3864.tar.gz
hercules-b6dbb89d9149f4da36c861eb5b74b136aebe3864.tar.bz2
hercules-b6dbb89d9149f4da36c861eb5b74b136aebe3864.tar.xz
hercules-b6dbb89d9149f4da36c861eb5b74b136aebe3864.zip
Applied clif_equiplist fix by Ai4rei to prevent client crash when equipment is broken/repaired and PACKETVER >= 20100629. Follow-up to r14368. (bugreport:4459)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14449 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/clif.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 649ea12d5..c5f2cc069 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,7 @@
Date Added
+2010/11/07
+ * Applied clif_equiplist fix by Ai4rei to prevent client crash when equipment is broken/repaired and PACKETVER >= 20100629. Follow-up to r14368. (bugreport:4459) [Gepard]
2010/11/02
* Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523) [Paradox924X]
* Ensured character data is saved even when last map is the only value that has changed during save time. (bugreport:2218) [Paradox924X]
diff --git a/src/map/clif.c b/src/map/clif.c
index a13811913..a6865d833 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2147,6 +2147,12 @@ void clif_equiplist(struct map_session_data *sd)
WBUFL(buf,n*cmd+24)=sd->status.inventory[i].expire_time;
WBUFW(buf,n*cmd+28)=0; //Unknown
#endif
+#if PACKETVER >= 20100629
+ if (sd->inventory_data[i]->equip&EQP_HELM)
+ WBUFW(buf,n*cmd+30)= sd->inventory_data[i]->look;
+ else
+ WBUFW(buf,n*cmd+30)=0;
+#endif
n++;
}
if (n) {