diff --git a/src/map/elemental.c b/src/map/elemental.c index 292b481b09..aa8f20be17 100644 --- a/src/map/elemental.c +++ b/src/map/elemental.c @@ -167,7 +167,7 @@ static int elemental_summon_end(int tid, unsigned int tick, int id, intptr_t dat } ed->summon_timer = INVALID_TIMER; - elemental_delete(ed, 0); // Elemental's summon time is over. + elemental_delete(ed); // Elemental's summon time is over. return 0; } @@ -179,7 +179,7 @@ void elemental_summon_stop(struct elemental_data *ed) { ed->summon_timer = INVALID_TIMER; } -int elemental_delete(struct elemental_data *ed, int reply) { +int elemental_delete(struct elemental_data *ed) { struct map_session_data *sd; nullpo_ret(ed); @@ -535,7 +535,7 @@ void elemental_heal(struct elemental_data *ed, int hp, int sp) { } int elemental_dead(struct elemental_data *ed) { - elemental_delete(ed, 1); + elemental_delete(ed); return 0; } @@ -651,7 +651,7 @@ static int elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_ } if( status_get_sp(&sd->bl) < sp ){ // Can't sustain delete it. - elemental_delete(sd->ed,0); + elemental_delete(sd->ed); return 0; } diff --git a/src/map/elemental.h b/src/map/elemental.h index 521525e8f6..8559eb2530 100644 --- a/src/map/elemental.h +++ b/src/map/elemental.h @@ -86,7 +86,7 @@ int elemental_change_mode(struct elemental_data *ed, int mode); void elemental_heal(struct elemental_data *ed, int hp, int sp); int elemental_dead(struct elemental_data *ed); -int elemental_delete(struct elemental_data *ed, int reply); +int elemental_delete(struct elemental_data *ed); void elemental_summon_stop(struct elemental_data *ed); int elemental_get_lifetime(struct elemental_data *ed); diff --git a/src/map/pc.c b/src/map/pc.c index cbcd83b2a8..b06fe70347 100755 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -7313,7 +7313,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) mercenary_delete(sd->md, 3); // Your mercenary soldier has ran away. if( sd->ed ) - elemental_delete(sd->ed, 0); + elemental_delete(sd->ed); // Leave duel if you die [LuzZza] if(battle_config.duel_autoleave_when_die) { @@ -8211,7 +8211,7 @@ bool pc_jobchange(struct map_session_data *sd,int job, char upper) clif_skillinfoblock(sd); if (sd->ed) - elemental_delete(sd->ed, 0); + elemental_delete(sd->ed); if (sd->state.vending) vending_closevending(sd); if (sd->state.buyingstore) diff --git a/src/map/skill.c b/src/map/skill.c index ddde02ca92..7a3a0630b7 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9928,7 +9928,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui // Remove previous elemental first. if( sd->ed ) - elemental_delete(sd->ed,0); + elemental_delete(sd->ed); // Summoning the new one. if( !elemental_create(sd,elemental_class,skill_get_time(skill_id,skill_lv)) ) { @@ -9946,7 +9946,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui if( !sd->ed ) break; if( skill_lv == 4 ) {// At level 4 delete elementals. - elemental_delete(sd->ed, 0); + elemental_delete(sd->ed); break; } switch( skill_lv ) {// Select mode bassed on skill level used. @@ -10475,7 +10475,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui if (sd && sd->status.party_id == 0) { clif_skill_nodamage(src,bl,skill_id,skill_lv,1); if (sd->ed && skill_get_state(skill_id) == ST_ELEMENTALSPIRIT2) - elemental_delete(sd->ed,0); + elemental_delete(sd->ed); } skill_unitsetting(bl, MG_SAFETYWALL, skill_lv + 5, bl->x, bl->y, 0); skill_unitsetting(bl, AL_PNEUMA, 1, bl->x, bl->y, 0); @@ -10483,7 +10483,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui else { clif_skill_nodamage(src,bl,skill_id,skill_lv,1); if (sd->ed && skill_get_state(skill_id) == ST_ELEMENTALSPIRIT2) - elemental_delete(sd->ed,0); + elemental_delete(sd->ed); party_foreachsamemap(skill_area_sub, sd, skill_get_splash(skill_id,skill_lv), src, skill_id, skill_lv, tick, flag|BCT_PARTY|1, skill_castend_nodamage_id); } break;