diff options
Diffstat (limited to 'src/map/skill.h')
| -rw-r--r-- | src/map/skill.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/map/skill.h b/src/map/skill.h index 5b583406d..34ce889b8 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -311,8 +311,10 @@ bool skill_check_cloaking(struct block_list *bl, struct status_change_entry *sce // ステ?タス異常 int skill_enchant_elemental_end(struct block_list *bl, int type); int skillnotok(int skillid, struct map_session_data *sd); -int skillnotok_hom (int skillid, struct homun_data *hd) ; //[orn] -int skill_chastle_mob_changetarget(struct block_list *bl,va_list ap); //[orn] +int skillnotok_hom(int skillid, struct homun_data *hd); +int skillnotok_mercenary(int skillid, struct mercenary_data *md); + +int skill_chastle_mob_changetarget(struct block_list *bl,va_list ap); // アイテム作成 int skill_can_produce_mix( struct map_session_data *sd, int nameid, int trigger, int qty); @@ -324,8 +326,9 @@ int skill_arrow_create( struct map_session_data *sd,int nameid); int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int skillid,int skilllv,unsigned int tick,int flag ); 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_blockmerc_start (struct homun_data*,int,int); //[orn] +int skill_blockhomun_start (struct homun_data*,int,int); //[orn] // スキル攻?一括?理 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 ); @@ -1009,7 +1012,7 @@ enum e_skill { HVAN_CHAOTIC, HVAN_INSTRUCT, HVAN_EXPLOSION, - /* + MS_BASH = 8201, MS_MAGNUM, MS_BOWLINGBASH, @@ -1047,7 +1050,6 @@ enum e_skill { MER_SCAPEGOAT, MER_LEXDIVINA, MER_ESTIMATION, - */ }; enum { |