diff options
| author | hemagx <hemagx2@gmail.com> | 2015-12-26 11:17:14 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-01-06 15:14:43 +0100 |
| commit | 3007a376242f00d8127e39e9e6a89c7e0e5a8b20 (patch) | |
| tree | 94250ac801d65c7fdc7b979b98e9c86955ff4f0e /src/map/npc.c | |
| parent | 1f71f41ee0fdf23680b40ba3d5bd63629e87c3e2 (diff) | |
| download | hercules-3007a376242f00d8127e39e9e6a89c7e0e5a8b20.tar.gz hercules-3007a376242f00d8127e39e9e6a89c7e0e5a8b20.tar.bz2 hercules-3007a376242f00d8127e39e9e6a89c7e0e5a8b20.tar.xz hercules-3007a376242f00d8127e39e9e6a89c7e0e5a8b20.zip | |
Change all TBL_NPC to struct npc_data as per style guidelines
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index c4ed896a9..8dd27389f 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1171,7 +1171,7 @@ struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* b nullpo_retr(NULL, sd); if (bl == NULL) return NULL; if (bl->type != BL_NPC) return NULL; - nd = (TBL_NPC*)bl; + nd = (struct npc_data *)bl; if (sd->npc_id == bl->id) return nd; @@ -1296,8 +1296,8 @@ int npc_scriptcont(struct map_session_data* sd, int id, bool closing) { nullpo_retr(1, sd); if( id != sd->npc_id ){ - TBL_NPC* nd_sd=(TBL_NPC*)map->id2bl(sd->npc_id); - TBL_NPC* nd = BL_CAST(BL_NPC, target); + struct npc_data *nd_sd = (struct npc_data *)map->id2bl(sd->npc_id); + struct npc_data *nd = BL_CAST(BL_NPC, target); ShowDebug("npc_scriptcont: %s (sd->npc_id=%d) is not %s (id=%d).\n", nd_sd?(char*)nd_sd->name:"'Unknown NPC'", (int)sd->npc_id, nd?(char*)nd->name:"'Unknown NPC'", (int)id); |