summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-16 18:23:28 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-16 18:23:28 +0000
commitf8047993636ed47b0cb6c49ff650f0bd5e9217b0 (patch)
treef2f6c174811b89ccfba65b182f42ab46c63f4225 /src/map/mercenary.c
parent9b3a759edca28fa9445949aa0a3664d7dc8f6b2f (diff)
downloadhercules-f8047993636ed47b0cb6c49ff650f0bd5e9217b0.tar.gz
hercules-f8047993636ed47b0cb6c49ff650f0bd5e9217b0.tar.bz2
hercules-f8047993636ed47b0cb6c49ff650f0bd5e9217b0.tar.xz
hercules-f8047993636ed47b0cb6c49ff650f0bd5e9217b0.zip
- Fixed null-pointer crash on Evolving a homunculus.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8319 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index e76e1bcac..6c5ffe923 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -353,7 +353,7 @@ int merc_hom_evolution(struct homun_data *hd)
y = hd->bl.y;
merc_hom_vaporize(sd, 0);
unit_free(&hd->bl);
- merc_call_homunculus(hd->master, x, y);
+ merc_call_homunculus(sd, x, y);
clif_emotion(&sd->bl, 21) ; //no1
clif_misceffect2(&hd->bl,568);
return 1 ;