HPM Hooks Update

Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>

3 files changed, 92 insertions, 32 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
index b949ae952..6054e9d9a 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
@@ -3711,10 +3711,14 @@ struct {
 	struct HPMHookPoint *HP_pc_setcart_post;
 	struct HPMHookPoint *HP_pc_setfalcon_pre;
 	struct HPMHookPoint *HP_pc_setfalcon_post;
-	struct HPMHookPoint *HP_pc_setriding_pre;
-	struct HPMHookPoint *HP_pc_setriding_post;
+	struct HPMHookPoint *HP_pc_setridingpeco_pre;
+	struct HPMHookPoint *HP_pc_setridingpeco_post;
 	struct HPMHookPoint *HP_pc_setmadogear_pre;
 	struct HPMHookPoint *HP_pc_setmadogear_post;
+	struct HPMHookPoint *HP_pc_setridingdragon_pre;
+	struct HPMHookPoint *HP_pc_setridingdragon_post;
+	struct HPMHookPoint *HP_pc_setridingwug_pre;
+	struct HPMHookPoint *HP_pc_setridingwug_post;
 	struct HPMHookPoint *HP_pc_changelook_pre;
 	struct HPMHookPoint *HP_pc_changelook_post;
 	struct HPMHookPoint *HP_pc_equiplookall_pre;
@@ -8754,10 +8758,14 @@ struct {
 	int HP_pc_setcart_post;
 	int HP_pc_setfalcon_pre;
 	int HP_pc_setfalcon_post;
-	int HP_pc_setriding_pre;
-	int HP_pc_setriding_post;
+	int HP_pc_setridingpeco_pre;
+	int HP_pc_setridingpeco_post;
 	int HP_pc_setmadogear_pre;
 	int HP_pc_setmadogear_post;
+	int HP_pc_setridingdragon_pre;
+	int HP_pc_setridingdragon_post;
+	int HP_pc_setridingwug_pre;
+	int HP_pc_setridingwug_post;
 	int HP_pc_changelook_pre;
 	int HP_pc_changelook_post;
 	int HP_pc_equiplookall_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
index 336ce2651..e2f946f7e 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
@@ -1886,8 +1886,10 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(pc->setoption, HP_pc_setoption) },
 	{ HP_POP(pc->setcart, HP_pc_setcart) },
 	{ HP_POP(pc->setfalcon, HP_pc_setfalcon) },
-	{ HP_POP(pc->setriding, HP_pc_setriding) },
+	{ HP_POP(pc->setridingpeco, HP_pc_setridingpeco) },
 	{ HP_POP(pc->setmadogear, HP_pc_setmadogear) },
+	{ HP_POP(pc->setridingdragon, HP_pc_setridingdragon) },
+	{ HP_POP(pc->setridingwug, HP_pc_setridingwug) },
 	{ HP_POP(pc->changelook, HP_pc_changelook) },
 	{ HP_POP(pc->equiplookall, HP_pc_equiplookall) },
 	{ HP_POP(pc->readparam, HP_pc_readparam) },
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index 11d0e81c8..f47cf27f0 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -49633,64 +49633,62 @@ int HP_pc_setcart(struct map_session_data *sd, int type) {
 	}
 	return retVal___;
 }
-int HP_pc_setfalcon(struct map_session_data *sd, int flag) {
+void HP_pc_setfalcon(struct map_session_data *sd, bool flag) {
 	int hIndex = 0;
-	int retVal___ = 0;
 	if( HPMHooks.count.HP_pc_setfalcon_pre ) {
-		int (*preHookFunc) (struct map_session_data *sd, int *flag);
+		void (*preHookFunc) (struct map_session_data *sd, bool *flag);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setfalcon_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_pc_setfalcon_pre[hIndex].func;
-			retVal___ = preHookFunc(sd, &flag);
+			preHookFunc(sd, &flag);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
-			return retVal___;
+			return;
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.pc.setfalcon(sd, flag);
+		HPMHooks.source.pc.setfalcon(sd, flag);
 	}
 	if( HPMHooks.count.HP_pc_setfalcon_post ) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *flag);
+		void (*postHookFunc) (struct map_session_data *sd, bool *flag);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setfalcon_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_pc_setfalcon_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, &flag);
+			postHookFunc(sd, &flag);
 		}
 	}
-	return retVal___;
+	return;
 }
-int HP_pc_setriding(struct map_session_data *sd, int flag) {
+void HP_pc_setridingpeco(struct map_session_data *sd, bool flag) {
 	int hIndex = 0;
-	int retVal___ = 0;
-	if( HPMHooks.count.HP_pc_setriding_pre ) {
-		int (*preHookFunc) (struct map_session_data *sd, int *flag);
+	if( HPMHooks.count.HP_pc_setridingpeco_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, bool *flag);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setriding_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_pc_setriding_pre[hIndex].func;
-			retVal___ = preHookFunc(sd, &flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingpeco_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pc_setridingpeco_pre[hIndex].func;
+			preHookFunc(sd, &flag);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
-			return retVal___;
+			return;
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.pc.setriding(sd, flag);
+		HPMHooks.source.pc.setridingpeco(sd, flag);
 	}
-	if( HPMHooks.count.HP_pc_setriding_post ) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *flag);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setriding_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_pc_setriding_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, &flag);
+	if( HPMHooks.count.HP_pc_setridingpeco_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, bool *flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingpeco_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pc_setridingpeco_post[hIndex].func;
+			postHookFunc(sd, &flag);
 		}
 	}
-	return retVal___;
+	return;
 }
-void HP_pc_setmadogear(struct map_session_data *sd, int flag) {
+void HP_pc_setmadogear(struct map_session_data *sd, bool flag) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_pc_setmadogear_pre ) {
-		void (*preHookFunc) (struct map_session_data *sd, int *flag);
+		void (*preHookFunc) (struct map_session_data *sd, bool *flag);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setmadogear_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_pc_setmadogear_pre[hIndex].func;
@@ -49705,7 +49703,7 @@ void HP_pc_setmadogear(struct map_session_data *sd, int flag) {
 		HPMHooks.source.pc.setmadogear(sd, flag);
 	}
 	if( HPMHooks.count.HP_pc_setmadogear_post ) {
-		void (*postHookFunc) (struct map_session_data *sd, int *flag);
+		void (*postHookFunc) (struct map_session_data *sd, bool *flag);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setmadogear_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_pc_setmadogear_post[hIndex].func;
 			postHookFunc(sd, &flag);
@@ -49713,6 +49711,58 @@ void HP_pc_setmadogear(struct map_session_data *sd, int flag) {
 	}
 	return;
 }
+void HP_pc_setridingdragon(struct map_session_data *sd, unsigned int type) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pc_setridingdragon_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, unsigned int *type);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingdragon_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pc_setridingdragon_pre[hIndex].func;
+			preHookFunc(sd, &type);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pc.setridingdragon(sd, type);
+	}
+	if( HPMHooks.count.HP_pc_setridingdragon_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, unsigned int *type);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingdragon_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pc_setridingdragon_post[hIndex].func;
+			postHookFunc(sd, &type);
+		}
+	}
+	return;
+}
+void HP_pc_setridingwug(struct map_session_data *sd, bool flag) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pc_setridingwug_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, bool *flag);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingwug_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pc_setridingwug_pre[hIndex].func;
+			preHookFunc(sd, &flag);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pc.setridingwug(sd, flag);
+	}
+	if( HPMHooks.count.HP_pc_setridingwug_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, bool *flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingwug_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pc_setridingwug_post[hIndex].func;
+			postHookFunc(sd, &flag);
+		}
+	}
+	return;
+}
 int HP_pc_changelook(struct map_session_data *sd, int type, int val) {
 	int hIndex = 0;
 	int retVal___ = 0;