summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
authorSusu <bruant.bastien@gmail.com>2013-07-29 15:28:48 +0200
committerSusu <bruant.bastien@gmail.com>2013-07-29 15:28:48 +0200
commit9d5309327da9543f86385549001df7e9a7c98833 (patch)
tree8d36faa7961fcca952442caefb93e270140e11a9 /src/map/unit.c
parent5a22b0445416dbf7d0a0ddd95d31c1f068e704b3 (diff)
downloadhercules-9d5309327da9543f86385549001df7e9a7c98833.tar.gz
hercules-9d5309327da9543f86385549001df7e9a7c98833.tar.bz2
hercules-9d5309327da9543f86385549001df7e9a7c98833.tar.xz
hercules-9d5309327da9543f86385549001df7e9a7c98833.zip
Added elemental interface
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 7a1c15838..8a11363cb 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2265,7 +2265,7 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file,
case BL_ELEM: {
struct elemental_data *ed = (struct elemental_data *)bl;
ud->canact_tick = ud->canmove_tick;
- if( elemental_get_lifetime(ed) <= 0 && !(ed->master && !ed->master->state.active) )
+ if( elemental->get_lifetime(ed) <= 0 && !(ed->master && !ed->master->state.active) )
{
clif->clearunit_area(bl,clrtype);
iMap->delblock(bl);
@@ -2548,8 +2548,8 @@ int unit_free(struct block_list *bl, clr_type clrtype)
case BL_ELEM: {
struct elemental_data *ed = (TBL_ELEM*)bl;
struct map_session_data *sd = ed->master;
- if( elemental_get_lifetime(ed) > 0 )
- elemental_save(ed);
+ if( elemental->get_lifetime(ed) > 0 )
+ elemental->save(ed);
else {
intif_elemental_delete(ed->elemental.elemental_id);
if( sd )
@@ -2558,7 +2558,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
if( sd )
sd->ed = NULL;
- elemental_summon_stop(ed);
+ elemental->summon_stop(ed);
break;
}
}