1 files changed, 26 insertions, 3 deletions

diff --git a/src/map/clif.h b/src/map/clif.h
index 07d2ef4a8..4bc3abdeb 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -59,6 +59,7 @@ struct s_refine_requirement;
 struct PACKET_ZC_ACK_RANKING_sub;
 struct SKILLDATA;
 
+enum battle_dmg_type;
 enum clif_messages;
 enum rodex_add_item;
 enum rodex_get_zeny;
@@ -632,6 +633,13 @@ enum inventory_type {
 	INVTYPE_GUILD_STORAGE = 3,
 };
 
+/** Guild Teleport Results */
+enum siege_teleport_result {
+	SIEGE_TP_SUCCESS = 0x0,
+	SIEGE_TP_NOT_ENOUGH_ZENY = 0x1,
+	SIEGE_TP_INVALID_MODE = 0x2
+};
+
 /**
  * Structures
  **/
@@ -719,6 +727,12 @@ enum market_buy_result {
 };
 #endif
 
+enum lapineddukddak_result {
+	LAPINEDDKUKDDAK_SUCCESS = 0,
+	LAPINEDDKUKDDAK_INSUFFICIENT_AMOUNT = 5,
+	LAPINEDDKUKDDAK_INVALID_ITEM = 7,
+};
+
 /**
  * Clif.c Interface
  **/
@@ -861,7 +875,7 @@ struct clif_interface {
 	void (*scriptclear) (struct map_session_data *sd, int npcid);
 	/* client-user-interface-related */
 	void (*viewpoint) (struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color);
-	int (*damage) (struct block_list* src, struct block_list* dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2);
+	int (*damage) (struct block_list* src, struct block_list* dst, int sdelay, int ddelay, int64 damage, short div, enum battle_dmg_type type, int64 damage2);
 	void (*sitting) (struct block_list* bl);
 	void (*standing) (struct block_list* bl);
 	void (*arrow_create_list) (struct map_session_data *sd);
@@ -987,7 +1001,7 @@ struct clif_interface {
 	void (*wedding_effect) (struct block_list *bl);
 	void (*divorced) (struct map_session_data* sd, const char* name);
 	void (*callpartner) (struct map_session_data *sd);
-	int (*skill_damage) (struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type);
+	int (*skill_damage) (struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type);
 	int (*skill_nodamage) (struct block_list *src,struct block_list *dst,uint16 skill_id,int heal,int fail);
 	void (*skill_poseffect) (struct block_list *src, uint16 skill_id, int val, int x, int y, int64 tick);
 	void (*skill_estimation) (struct map_session_data *sd,struct block_list *dst);
@@ -1113,6 +1127,8 @@ struct clif_interface {
 	void (*guild_masterormember) (struct map_session_data *sd);
 	void (*guild_basicinfo) (struct map_session_data *sd);
 	void (*guild_allianceinfo) (struct map_session_data *sd);
+	void (*guild_castlelist) (struct map_session_data *sd);
+	void (*guild_castleinfo) (struct map_session_data *sd, struct guild_castle *gc);
 	void (*guild_memberlist) (struct map_session_data *sd);
 	void (*guild_skillinfo) (struct map_session_data* sd);
 	void (*guild_send_onlineinfo) (struct map_session_data *sd); //[LuzZza]
@@ -1282,7 +1298,7 @@ struct clif_interface {
 	/* */
 	void (*notify_bounditem) (struct map_session_data *sd, unsigned short index);
 	/* */
-	int (*delay_damage) (int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type);
+	int (*delay_damage) (int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type);
 	int (*delay_damage_sub) (int tid, int64 tick, int id, intptr_t data);
 	/* NPC Market */
 	void (*npc_market_open) (struct map_session_data *sd, struct npc_data *nd);
@@ -1646,6 +1662,13 @@ struct clif_interface {
 	void (*pRefineryUIClose) (int fd, struct map_session_data *sd);
 	void (*pRefineryUIRefine) (int fd, struct map_session_data *sd);
 	void (*announce_refine_status) (struct map_session_data *sd, int item_id, int refine_level, bool success, enum send_target target);
+	void (*pGuildCastleTeleportRequest) (int fd, struct map_session_data *sd);
+	void (*pGuildCastleInfoRequest) (int fd, struct map_session_data *sd);
+	void (*guild_castleteleport_res) (struct map_session_data *sd, enum siege_teleport_result result);
+	bool (*lapineDdukDdak_open) (struct map_session_data *sd, int item_id);
+	bool (*lapineDdukDdak_result) (struct map_session_data *sd, enum lapineddukddak_result result);
+	void (*plapineDdukDdak_ack) (int fd, struct map_session_data *sd);
+	void (*plapineDdukDdak_close) (int fd, struct map_session_data *sd);
 };
 
 #ifdef HERCULES_CORE