From c2ca8110f6a3cab0171d32920b7a724d0c180068 Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 21 Nov 2007 13:29:45 +0000 Subject: - Moved subtype from struct block_list to struct npc_data. - Fixed some compilation warnings. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11772 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mob.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/mob.c') diff --git a/src/map/mob.c b/src/map/mob.c index 236934c4a..00ef6f794 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -207,7 +207,6 @@ struct mob_data* mob_spawn_dataset(struct spawn_data *data) struct mob_data *md = aCalloc(1, sizeof(struct mob_data)); md->bl.id= npc_get_new_npc_id(); md->bl.type = BL_MOB; - md->bl.subtype = MONS; md->bl.m = data->m; md->bl.x = data->x; md->bl.y = data->y; @@ -889,10 +888,11 @@ static int mob_warpchase_sub(struct block_list *bl,va_list ap) target_nd= va_arg(ap, struct npc_data**); min_distance= va_arg(ap, int*); - if(bl->subtype != WARP) - return 0; //Not a warp nd = (TBL_NPC*) bl; + if(nd->subtype != WARP) + return 0; //Not a warp + if(nd->u.warp.mapindex != map[target->m].index) return 0; //Does not lead to the same map. -- cgit v1.2.3-70-g09d2