- Updated svn-revision reading, now it can read the new svn file system

- Fixed a bug with homunc which could spawn on a non-walkable cell

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8500 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 11 insertions, 2 deletions

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 5ba260c18..4ff2c34b5 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -588,7 +588,8 @@ int search_homunculusDB_index(int key,int type)
 int merc_hom_alloc(struct map_session_data *sd)

 {

 	struct homun_data *hd;

-	int i = 0 ;

+	int i = 0;

+	short x,y;

 

 	nullpo_retr(1, sd);

 

@@ -605,8 +606,16 @@ int merc_hom_alloc(struct map_session_data *sd)
 	hd->master = sd;

 

 	hd->bl.m = sd->bl.m;

+

+	// Find a random valid pos around the player

 	hd->bl.x = sd->bl.x;

-	hd->bl.y = sd->bl.y - 1 ;

+	hd->bl.y = sd->bl.y;

+	x = sd->bl.x + 1;

+	y = sd->bl.y + 1;

+	map_random_dir(&hd->bl, &x, &y);

+	hd->bl.x = x;

+	hd->bl.y = y;

+

 	hd->bl.subtype = MONS;

 	hd->bl.type = BL_HOM;

 	hd->bl.id = npc_get_new_npc_id();