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/status.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/status.c') diff --git a/src/map/status.c b/src/map/status.c index 8a04109b3..b7221ea6e 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4180,7 +4180,7 @@ int status_get_guild_id(struct block_list *bl) return ((TBL_HOM*)bl)->master->status.guild_id; break; case BL_NPC: - if (bl->subtype == SCRIPT) + if (((TBL_NPC*)bl)->subtype == SCRIPT) return ((TBL_NPC*)bl)->u.scr.guild_id; break; case BL_SKILL: @@ -4214,7 +4214,7 @@ int status_get_emblem_id(struct block_list *bl) return ((TBL_HOM*)bl)->master->guild_emblem_id; break; case BL_NPC: - if (bl->subtype == SCRIPT && ((TBL_NPC*)bl)->u.scr.guild_id > 0) { + if (((TBL_NPC*)bl)->subtype == SCRIPT && ((TBL_NPC*)bl)->u.scr.guild_id > 0) { struct guild *g = guild_search(((TBL_NPC*)bl)->u.scr.guild_id); if (g) return g->emblem_id; -- cgit v1.2.3-70-g09d2