1 files changed, 53 insertions, 71 deletions
diff --git a/src/map/unit.h b/src/map/unit.h
index b743fc8cb..be7b789d9 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -68,79 +68,61 @@ struct view_data {
 	unsigned dead_sit : 2;
 };
 
-// PC, MOB, PET に共通する処理を１つにまとめる計画
-
-// 歩行開始
-//     戻り値は、0 ( 成功 ), 1 ( 失敗 )
-int unit_walktoxy( struct block_list *bl, short x, short y, int easy);
-int unit_walktobl( struct block_list *bl, struct block_list *target, int range, int easy);
-int unit_run(struct block_list *bl);
-int unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir);
-
-// 歩行停止
-// typeは以下の組み合わせ :
-//     1: 位置情報の送信( この関数の後に位置情報を送信する場合は不要 )
-//     2: ダメージディレイ有り
-//     4: 不明(MOBのみ？)
-int unit_stop_walking(struct block_list *bl,int type);
-int unit_can_move(struct block_list *bl);
-int unit_is_walking(struct block_list *bl);
-int unit_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int type);
-
-int unit_escape(struct block_list *bl, struct block_list *target, short dist);
-// 位置の強制移動(吹き飛ばしなど)
-int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath);
-int unit_warp(struct block_list *bl, short map, short x, short y, clr_type type);
-int unit_setdir(struct block_list *bl,unsigned char dir);
-uint8 unit_getdir(struct block_list *bl);
-int unit_blown(struct block_list* bl, int dx, int dy, int count, int flag);
-
-// そこまで歩行でたどり着けるかの判定
-bool unit_can_reach_pos(struct block_list *bl,int x,int y,int easy);
-bool unit_can_reach_bl(struct block_list *bl,struct block_list *tbl, int range, int easy, short *x, short *y);
-
-// 攻撃関連
-int unit_stop_attack(struct block_list *bl);
-int unit_attack(struct block_list *src,int target_id,int continuous);
-int unit_cancel_combo(struct block_list *bl);
-
-// スキル使用
-int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv);
-int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv);
-
-// スキル使用( 補正済みキャスト時間、キャンセル不可設定付き )
-int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel);
-int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel);
-
-// 詠唱キャンセル
-int unit_skillcastcancel(struct block_list *bl,int type);
-
-int unit_counttargeted(struct block_list *bl);
-int unit_set_target(struct unit_data* ud, int target_id);
-
-// unit_data の初期化処理
-void unit_dataset(struct block_list *bl);
+extern const short dirx[8];
+extern const short diry[8];
 
-int unit_fixdamage(struct block_list *src,struct block_list *target,unsigned int tick,int sdelay,int ddelay,int64 damage,int div,int type,int64 damage2);
-// その他
-struct unit_data* unit_bl2ud(struct block_list *bl);
-struct unit_data* unit_bl2ud2(struct block_list *bl);
-void unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype);
-void unit_free_pc(struct map_session_data *sd);
-#define unit_remove_map(bl,clrtype) unit_remove_map_(bl,clrtype,__FILE__,__LINE__,__func__)
-int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file, int line, const char* func);
-int unit_free(struct block_list *bl, clr_type clrtype);
-int unit_changeviewsize(struct block_list *bl,short size);
+struct unit_interface {
+	int (*init) (void);
+	int (*final) (void);
+	/* */
+	struct unit_data* (*bl2ud) (struct block_list *bl);
+	struct unit_data* (*bl2ud2) (struct block_list *bl);
+	int (*attack_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*walktoxy_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*walktoxy_sub) (struct block_list *bl);
+	int (*delay_walktoxy_timer) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*walktoxy) (struct block_list *bl, short x, short y, int flag);
+	int (*walktobl_sub) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*walktobl) (struct block_list *bl, struct block_list *tbl, int range, int flag);
+	int (*run) (struct block_list *bl);
+	int (*wugdash) (struct block_list *bl, struct map_session_data *sd);
+	int (*escape) (struct block_list *bl, struct block_list *target, short dist);
+	int (*movepos) (struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath);
+	int (*setdir) (struct block_list *bl, unsigned char dir);
+	uint8 (*getdir) (struct block_list *bl);
+	int (*blown) (struct block_list *bl, int dx, int dy, int count, int flag);
+	int (*warp) (struct block_list *bl, short m, short x, short y, clr_type type);
+	int (*stop_walking) (struct block_list *bl, int type);
+	int (*skilluse_id) (struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv);
+	int (*is_walking) (struct block_list *bl);
+	int (*can_move) (struct block_list *bl);
+	int (*resume_running) (int tid, unsigned int tick, int id, intptr_t data);
+	int (*set_walkdelay) (struct block_list *bl, unsigned int tick, int delay, int type);
+	int (*skilluse_id2) (struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel);
+	int (*skilluse_pos) (struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv);
+	int (*skilluse_pos2) (struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel);
+	int (*set_target) (struct unit_data *ud, int target_id);
+	int (*stop_attack) (struct block_list *bl);
+	int (*unattackable) (struct block_list *bl);
+	int (*attack) (struct block_list *src, int target_id, int continuous);
+	int (*cancel_combo) (struct block_list *bl);
+	bool (*can_reach_pos) (struct block_list *bl, int x, int y, int easy);
+	bool (*can_reach_bl) (struct block_list *bl, struct block_list *tbl, int range, int easy, short *x, short *y);
+	int (*calc_pos) (struct block_list *bl, int tx, int ty, uint8 dir);
+	int (*attack_timer_sub) (struct block_list *src, int tid, unsigned int tick);
+	int (*skillcastcancel) (struct block_list *bl, int type);
+	void (*dataset) (struct block_list *bl);
+	int (*counttargeted) (struct block_list *bl);
+	int (*fixdamage) (struct block_list *src, struct block_list *target, unsigned int tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2);
+	int (*changeviewsize) (struct block_list *bl, short size);
+	int (*remove_map) (struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func);
+	void (*remove_map_pc) (struct map_session_data *sd, clr_type clrtype);
+	void (*free_pc) (struct map_session_data *sd);
+	int (*free) (struct block_list *bl, clr_type clrtype);
+};
 
-// 初期化ルーチン
-int do_init_unit(void);
-int do_final_unit(void);
-/**
- * Ranger
- **/
-int unit_wugdash(struct block_list *bl, struct map_session_data *sd);
+struct unit_interface *unit;
 
-extern const short dirx[8];
-extern const short diry[8];
+void unit_defaults(void);
 
 #endif /* _UNIT_H_ */