summaryrefslogtreecommitdiff
path: root/src/map/skill.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/skill.h')
-rw-r--r--src/map/skill.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/skill.h b/src/map/skill.h
index 34ce889b8..75cb63e9c 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -327,8 +327,9 @@ int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int
int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int skillid,int skilllv,unsigned int tick,int flag );
int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skilllv,unsigned int tick,int flag);
-int skill_blockpc_start (struct map_session_data*,int,int); // [celest]
-int skill_blockhomun_start (struct homun_data*,int,int); //[orn]
+int skill_blockpc_start (struct map_session_data*,int,int);
+int skill_blockhomun_start (struct homun_data*,int,int);
+int skill_blockmerc_start (struct mercenary_data*,int,int);
// スキル攻?一括?理
int skill_attack( int attack_type, struct block_list* src, struct block_list *dsrc,struct block_list *bl,int skillid,int skilllv,unsigned int tick,int flag );