summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-29 17:54:30 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-29 17:54:30 +0000
commit77b25285e66e43ff2bc112d7a03dc02428adbc04 (patch)
tree8e5a92c37901f657f8348b0aa81580c656a27a70 /src
parent82bfe67b47a6f51242dec643334fb6b7e2cfaad6 (diff)
downloadhercules-77b25285e66e43ff2bc112d7a03dc02428adbc04.tar.gz
hercules-77b25285e66e43ff2bc112d7a03dc02428adbc04.tar.bz2
hercules-77b25285e66e43ff2bc112d7a03dc02428adbc04.tar.xz
hercules-77b25285e66e43ff2bc112d7a03dc02428adbc04.zip
- Fixed a visual bug in mail when sending Zeny.
- Fixed bug pet loosing loot on logout. Bug Report 1291. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12449 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/map.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 0d8a5803a..0940ea03b 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2231,7 +2231,7 @@ int clif_updatestatus(struct map_session_data *sd,int type)
case SP_ZENY:
WFIFOW(fd,0)=0xb1;
- WFIFOL(fd,4)=sd->status.zeny - sd->mail.zeny;
+ WFIFOL(fd,4)=sd->status.zeny;
break;
case SP_BASEEXP:
WFIFOW(fd,0)=0xb1;
diff --git a/src/map/map.c b/src/map/map.c
index 8ca1ac5f1..c2260feef 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1617,6 +1617,9 @@ int map_quit(struct map_session_data *sd)
}
}
+ // Return loot to owner
+ if( sd->pd ) pet_lootitem_drop(sd->pd, sd);
+
unit_remove_map_pc(sd,3);
pc_makesavestatus(sd);
pc_clean_skilltree(sd);