diff options
| author | Haru <haru@dotalux.com> | 2013-09-27 00:55:25 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-09-27 00:55:25 +0200 |
| commit | 17bc1fab375f8ecc951fbba058a346b1460bf783 (patch) | |
| tree | 7d51b5eda324985925b153b34441298f3e9bac21 /src/map/mercenary.c | |
| parent | 3e5bca5a3df07320ff5c41edbb282df041c36f66 (diff) | |
| download | hercules-17bc1fab375f8ecc951fbba058a346b1460bf783.tar.gz hercules-17bc1fab375f8ecc951fbba058a346b1460bf783.tar.bz2 hercules-17bc1fab375f8ecc951fbba058a346b1460bf783.tar.xz hercules-17bc1fab375f8ecc951fbba058a346b1460bf783.zip | |
Renamed iStatus interface to status
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 402c477bf..881038eb4 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -297,8 +297,7 @@ int merc_data_received(struct s_mercenary *merc, bool flag) } db = &mercenary->db[i]; - if( !sd->md ) - { + if( !sd->md ) { sd->md = md = (struct mercenary_data*)aCalloc(1,sizeof(struct mercenary_data)); md->bl.type = BL_MER; md->bl.id = npc->get_new_npc_id(); @@ -307,8 +306,8 @@ int merc_data_received(struct s_mercenary *merc, bool flag) md->master = sd; md->db = db; memcpy(&md->mercenary, merc, sizeof(struct s_mercenary)); - iStatus->set_viewdata(&md->bl, md->mercenary.class_); - iStatus->change_init(&md->bl); + status->set_viewdata(&md->bl, md->mercenary.class_); + status->change_init(&md->bl); unit->dataset(&md->bl); md->ud.dir = sd->ud.dir; |