diff options
| author | Haru <haru@dotalux.com> | 2015-12-28 15:41:36 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-01-06 15:18:39 +0100 |
| commit | e3eac134b1607cfe78331e298aaa20b260662571 (patch) | |
| tree | 135f15dadc1c7964b3078fd8223771f94d1ed0e6 /src/map/mercenary.c | |
| parent | 0e05c1ed742707e0eb5923b562b2f6b8c6c5a3be (diff) | |
| download | hercules-e3eac134b1607cfe78331e298aaa20b260662571.tar.gz hercules-e3eac134b1607cfe78331e298aaa20b260662571.tar.bz2 hercules-e3eac134b1607cfe78331e298aaa20b260662571.tar.xz hercules-e3eac134b1607cfe78331e298aaa20b260662571.zip | |
Replaced the remaining explicit casts with BL_CAST/BL_UCAST
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index fb801a8da..e6c911ef6 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -317,10 +317,11 @@ int merc_data_received(struct s_mercenary *merc, bool flag) { db = &mercenary->db[i]; if( !sd->md ) { - sd->md = md = (struct mercenary_data*)aCalloc(1,sizeof(struct mercenary_data)); + CREATE(md, struct mercenary_data, 1); md->bl.type = BL_MER; md->bl.id = npc->get_new_npc_id(); md->devotion_flag = 0; + sd->md = md; md->master = sd; md->db = db; |