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/status.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/status.c')
| -rw-r--r-- | src/map/status.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |