diff options
| author | shennetsind <ind@henn.et> | 2013-07-04 16:12:38 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-04 16:12:38 -0300 |
| commit | fb945b7b7eb17f707215ef2b4f1e775ed430b012 (patch) | |
| tree | 907838da968f711033da17f26c6f55191e1c2ac3 /src/map/mercenary.c | |
| parent | 6570776ff8b52b141b9f0b581d6fd6fa06117db5 (diff) | |
| parent | b9889903e89bd4127c7503a512cfe215b9ccc740 (diff) | |
| download | hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.tar.gz hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.tar.bz2 hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.tar.xz hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.zip | |
Merge branch 'master' of github.com:Earisu/Hercules into Earisu-master
Adjusting for merge.
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
src/map/status.c
src/map/status.h
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; |