Merge branch 'master' of https://github.com/HerculesWS/Hercules

4 files changed, 43 insertions, 43 deletions

diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 816d07cdc..0d7993dac 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -1450,7 +1450,7 @@ OnTimer5000:
 2@tower,96,138,0	duplicate(1FGate102tower)	42FGate102tower	WARPNPC,2,2
 2@tower,184,138,0	duplicate(1FGate102tower)	43FGate102tower	WARPNPC,2,2
 2@tower,270,138,0	duplicate(1FGate102tower)	44FGate102tower	WARPNPC,2,2
-2@tower,355,138,0	duplicate(1FGate102tower)	WARPNPCFGate102tower	WARPNPC,2,2
+2@tower,355,138,0	duplicate(1FGate102tower)	45FGate102tower	WARPNPC,2,2
 2@tower,12,51,0	duplicate(1FGate102tower)	46FGate102tower	WARPNPC,2,2
 2@tower,96,51,0	duplicate(1FGate102tower)	47FGate102tower	WARPNPC,2,2
 2@tower,184,51,0	duplicate(1FGate102tower)	48FGate102tower	WARPNPC,2,2
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
index 42a881a49..1f64a5057 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
@@ -495,8 +495,6 @@ struct {
 	struct HPMHookPoint *HP_clif_refreshlook_post;
 	struct HPMHookPoint *HP_clif_class_change_pre;
 	struct HPMHookPoint *HP_clif_class_change_post;
-	struct HPMHookPoint *HP_clif_skill_setunit_pre;
-	struct HPMHookPoint *HP_clif_skill_setunit_post;
 	struct HPMHookPoint *HP_clif_skill_delunit_pre;
 	struct HPMHookPoint *HP_clif_skill_delunit_post;
 	struct HPMHookPoint *HP_clif_skillunit_update_pre;
@@ -523,6 +521,8 @@ struct {
 	struct HPMHookPoint *HP_clif_clearchar_skillunit_post;
 	struct HPMHookPoint *HP_clif_getareachar_pre;
 	struct HPMHookPoint *HP_clif_getareachar_post;
+	struct HPMHookPoint *HP_clif_graffiti_entry_pre;
+	struct HPMHookPoint *HP_clif_graffiti_entry_post;
 	struct HPMHookPoint *HP_clif_spawn_pre;
 	struct HPMHookPoint *HP_clif_spawn_post;
 	struct HPMHookPoint *HP_clif_changemap_pre;
@@ -5456,8 +5456,6 @@ struct {
 	int HP_clif_refreshlook_post;
 	int HP_clif_class_change_pre;
 	int HP_clif_class_change_post;
-	int HP_clif_skill_setunit_pre;
-	int HP_clif_skill_setunit_post;
 	int HP_clif_skill_delunit_pre;
 	int HP_clif_skill_delunit_post;
 	int HP_clif_skillunit_update_pre;
@@ -5484,6 +5482,8 @@ struct {
 	int HP_clif_clearchar_skillunit_post;
 	int HP_clif_getareachar_pre;
 	int HP_clif_getareachar_post;
+	int HP_clif_graffiti_entry_pre;
+	int HP_clif_graffiti_entry_post;
 	int HP_clif_spawn_pre;
 	int HP_clif_spawn_post;
 	int HP_clif_changemap_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
index 2dead85db..319887f92 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
@@ -257,7 +257,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->changetraplook, HP_clif_changetraplook) },
 	{ HP_POP(clif->refreshlook, HP_clif_refreshlook) },
 	{ HP_POP(clif->class_change, HP_clif_class_change) },
-	{ HP_POP(clif->skill_setunit, HP_clif_skill_setunit) },
 	{ HP_POP(clif->skill_delunit, HP_clif_skill_delunit) },
 	{ HP_POP(clif->skillunit_update, HP_clif_skillunit_update) },
 	{ HP_POP(clif->clearunit_delayed_sub, HP_clif_clearunit_delayed_sub) },
@@ -271,6 +270,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->getareachar_unit, HP_clif_getareachar_unit) },
 	{ HP_POP(clif->clearchar_skillunit, HP_clif_clearchar_skillunit) },
 	{ HP_POP(clif->getareachar, HP_clif_getareachar) },
+	{ HP_POP(clif->graffiti_entry, HP_clif_graffiti_entry) },
 	{ HP_POP(clif->spawn, HP_clif_spawn) },
 	{ HP_POP(clif->changemap, HP_clif_changemap) },
 	{ HP_POP(clif->changemapcell, HP_clif_changemapcell) },
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index 836e4e124..eaf04930a 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -1049,14 +1049,14 @@ void HP_battle_drain(struct map_session_data *sd, struct block_list *tbl, int64
 	}
 	return;
 }
-int64 HP_battle_calc_return_damage(struct block_list *bl, struct block_list *src, int64 *p1, int flag, uint16 skill_id, int *rdelay) {
+int64 HP_battle_calc_return_damage(struct block_list *target, struct block_list *src, int64 damage, int flag, uint16 skill_id) {
 	int hIndex = 0;
 	int64 retVal___ = 0;
 	if( HPMHooks.count.HP_battle_calc_return_damage_pre ) {
-		int64 (*preHookFunc) (struct block_list *bl, struct block_list *src, int64 *p1, int *flag, uint16 *skill_id, int *rdelay);
+		int64 (*preHookFunc) (struct block_list *target, struct block_list *src, int64 *damage, int *flag, uint16 *skill_id);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_return_damage_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_battle_calc_return_damage_pre[hIndex].func;
-			retVal___ = preHookFunc(bl, src, p1, &flag, &skill_id, rdelay);
+			retVal___ = preHookFunc(target, src, &damage, &flag, &skill_id);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
@@ -1064,13 +1064,13 @@ int64 HP_battle_calc_return_damage(struct block_list *bl, struct block_list *src
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.battle.calc_return_damage(bl, src, p1, flag, skill_id, rdelay);
+		retVal___ = HPMHooks.source.battle.calc_return_damage(target, src, damage, flag, skill_id);
 	}
 	if( HPMHooks.count.HP_battle_calc_return_damage_post ) {
-		int64 (*postHookFunc) (int64 retVal___, struct block_list *bl, struct block_list *src, int64 *p1, int *flag, uint16 *skill_id, int *rdelay);
+		int64 (*postHookFunc) (int64 retVal___, struct block_list *target, struct block_list *src, int64 *damage, int *flag, uint16 *skill_id);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_return_damage_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_battle_calc_return_damage_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, bl, src, p1, &flag, &skill_id, rdelay);
+			retVal___ = postHookFunc(retVal___, target, src, &damage, &flag, &skill_id);
 		}
 	}
 	return retVal___;
@@ -6391,31 +6391,6 @@ void HP_clif_class_change(struct block_list *bl, int class_, int type) {
 	}
 	return;
 }
-void HP_clif_skill_setunit(struct skill_unit *su) {
-	int hIndex = 0;
-	if( HPMHooks.count.HP_clif_skill_setunit_pre ) {
-		void (*preHookFunc) (struct skill_unit *su);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_setunit_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_clif_skill_setunit_pre[hIndex].func;
-			preHookFunc(su);
-		}
-		if( *HPMforce_return ) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.clif.skill_setunit(su);
-	}
-	if( HPMHooks.count.HP_clif_skill_setunit_post ) {
-		void (*postHookFunc) (struct skill_unit *su);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_setunit_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_clif_skill_setunit_post[hIndex].func;
-			postHookFunc(su);
-		}
-	}
-	return;
-}
 void HP_clif_skill_delunit(struct skill_unit *su) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_clif_skill_delunit_pre ) {
@@ -6643,13 +6618,13 @@ int HP_clif_calc_walkdelay(struct block_list *bl, int delay, int type, int damag
 	}
 	return retVal___;
 }
-void HP_clif_getareachar_skillunit(struct map_session_data *sd, struct skill_unit *su) {
+void HP_clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *su, enum send_target target) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_clif_getareachar_skillunit_pre ) {
-		void (*preHookFunc) (struct map_session_data *sd, struct skill_unit *su);
+		void (*preHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_skillunit_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_clif_getareachar_skillunit_pre[hIndex].func;
-			preHookFunc(sd, su);
+			preHookFunc(bl, su, &target);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
@@ -6657,13 +6632,13 @@ void HP_clif_getareachar_skillunit(struct map_session_data *sd, struct skill_uni
 		}
 	}
 	{
-		HPMHooks.source.clif.getareachar_skillunit(sd, su);
+		HPMHooks.source.clif.getareachar_skillunit(bl, su, target);
 	}
 	if( HPMHooks.count.HP_clif_getareachar_skillunit_post ) {
-		void (*postHookFunc) (struct map_session_data *sd, struct skill_unit *su);
+		void (*postHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_skillunit_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_clif_getareachar_skillunit_post[hIndex].func;
-			postHookFunc(sd, su);
+			postHookFunc(bl, su, &target);
 		}
 	}
 	return;
@@ -6750,6 +6725,31 @@ int HP_clif_getareachar(struct block_list *bl, va_list ap) {
 	}
 	return retVal___;
 }
+void HP_clif_graffiti_entry(struct block_list *bl, struct skill_unit *su, enum send_target target) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_graffiti_entry_pre ) {
+		void (*preHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_graffiti_entry_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_graffiti_entry_pre[hIndex].func;
+			preHookFunc(bl, su, &target);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.graffiti_entry(bl, su, target);
+	}
+	if( HPMHooks.count.HP_clif_graffiti_entry_post ) {
+		void (*postHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_graffiti_entry_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_graffiti_entry_post[hIndex].func;
+			postHookFunc(bl, su, &target);
+		}
+	}
+	return;
+}
 int HP_clif_spawn(struct block_list *bl) {
 	int hIndex = 0;
 	int retVal___ = 0;