diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-21 13:29:45 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-21 13:29:45 +0000 |
| commit | c2ca8110f6a3cab0171d32920b7a724d0c180068 (patch) | |
| tree | cce3f3a36fd692a9c7d87963ef4b14dd9c57103b /src/map/mob.c | |
| parent | edaa6dcc93fd64bd961fcbc701e7ce16bf31a350 (diff) | |
| download | hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.gz hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.bz2 hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.xz hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.zip | |
- 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
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 6 |
1 files changed, 3 insertions, 3 deletions
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. |