diff options
author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-01 23:59:10 +0000 |
---|---|---|
committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-01 23:59:10 +0000 |
commit | db9a386246f67f25a4374e7a7b8bdccb1174d0d3 (patch) | |
tree | 235636067bca533b8fa3fd54cfc5c2905573f93e /src/map/mercenary.c | |
parent | 1b968f83d51a3247e5ee528e77fb16942546141f (diff) | |
download | hercules-db9a386246f67f25a4374e7a7b8bdccb1174d0d3.tar.gz hercules-db9a386246f67f25a4374e7a7b8bdccb1174d0d3.tar.bz2 hercules-db9a386246f67f25a4374e7a7b8bdccb1174d0d3.tar.xz hercules-db9a386246f67f25a4374e7a7b8bdccb1174d0d3.zip |
* Confirmed packet 0x291 (ZC_MSG) to be general-purpose msgstringtable.txt packet and updated all functions using it (related r12245 and r13126).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14538 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r-- | src/map/mercenary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 53f70a462..79bec2da6 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -258,7 +258,7 @@ int merc_delete(struct mercenary_data *md, int reply) case 1: mercenary_set_faith(md, -1); break; // -1 Loyalty on Mercenary killed } - clif_mercenary_message(sd->fd, reply); + clif_mercenary_message(sd, reply); return unit_remove_map(&md->bl, CLR_OUTSIGHT); } |