diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-01-06 17:36:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-01-06 17:36:33 +0300 |
| commit | d5199cee806fb9f18987dea0c3a20a2d381927ca (patch) | |
| tree | 135f15dadc1c7964b3078fd8223771f94d1ed0e6 /src/map/elemental.c | |
| parent | 756be9835054a3b2b8ebace388546fa15ffd4a92 (diff) | |
| parent | e3eac134b1607cfe78331e298aaa20b260662571 (diff) | |
| download | hercules-d5199cee806fb9f18987dea0c3a20a2d381927ca.tar.gz hercules-d5199cee806fb9f18987dea0c3a20a2d381927ca.tar.bz2 hercules-d5199cee806fb9f18987dea0c3a20a2d381927ca.tar.xz hercules-d5199cee806fb9f18987dea0c3a20a2d381927ca.zip | |
Merge pull request #1034 from HerculesWS/bl_cast
Changed all TBL_* to the appropriate structs
Diffstat (limited to 'src/map/elemental.c')
| -rw-r--r-- | src/map/elemental.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/elemental.c b/src/map/elemental.c index a6fe94ab2..a87deb7d7 100644 --- a/src/map/elemental.c +++ b/src/map/elemental.c @@ -273,9 +273,10 @@ int elemental_data_received(struct s_elemental *ele, bool flag) { db = &elemental->db[i]; if( !sd->ed ) { // Initialize it after first summon. - sd->ed = ed = (struct elemental_data*)aCalloc(1,sizeof(struct elemental_data)); + CREATE(ed, struct elemental_data, 1); ed->bl.type = BL_ELEM; ed->bl.id = npc->get_new_npc_id(); + sd->ed = ed; ed->master = sd; ed->db = db; memcpy(&ed->elemental, ele, sizeof(struct s_elemental)); |