diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2013-07-04 17:25:18 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2013-07-04 17:25:18 -0300 |
| commit | 5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1 (patch) | |
| tree | b3b02e05f343a3e24b7cceb34ce04bbb8721ed1c /src/map/mercenary.c | |
| parent | 5ea7b8b9e172ed16fda6ee5a051ae0dbb767b4ac (diff) | |
| parent | aefa8d6bd88e5056080f45ed89f86258f1bf81d7 (diff) | |
| download | hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.tar.gz hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.tar.bz2 hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.tar.xz hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 566f68409..a08b587e7 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -307,8 +307,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)); - status_set_viewdata(&md->bl, md->mercenary.class_); - status_change_init(&md->bl); + iStatus->set_viewdata(&md->bl, md->mercenary.class_); + iStatus->change_init(&md->bl); unit_dataset(&md->bl); md->ud.dir = sd->ud.dir; |