summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-21 21:57:56 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-21 21:57:56 +0000
commitdcd2283d1018e5f56ceff2bd24f18245c565e79b (patch)
treef8f0aea01a184d3cd6b0fc3196cf574c9c188090
parent231a3b4ee0bc05308bcf24051dc2ab34fe1f7f5a (diff)
downloadhercules-dcd2283d1018e5f56ceff2bd24f18245c565e79b.tar.gz
hercules-dcd2283d1018e5f56ceff2bd24f18245c565e79b.tar.bz2
hercules-dcd2283d1018e5f56ceff2bd24f18245c565e79b.tar.xz
hercules-dcd2283d1018e5f56ceff2bd24f18245c565e79b.zip
Fixed call homunc bug when the homunc was vapo and the master has change of map
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8414 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/mercenary.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a1e1b7bab..89a853b24 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/21
+ * Fixed call homunc bug when the homunc was vapo and the master has change
+ of map [Toms]
* Fixed SQL-Guild Creation, guild name was escaped 2 times [Toms]
* Some cleaning of the splash skills. Updated skill-attack to enable again
passing of flag 0xF000 which signals that the skill level sent to the
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 46108fbb6..068143f0a 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -708,6 +708,7 @@ int merc_call_homunculus(struct map_session_data *sd, short x, short y)
{ //Spawn him
hd->bl.x = x;
hd->bl.y = y;
+ hd->bl.m = sd->bl.m;
map_addblock(&hd->bl);
clif_spawn(&hd->bl);
clif_send_homdata(sd,SP_ACK,0);