Change pc_autocast_clear() function to void

4 files changed, 16 insertions, 19 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index d1d224aa7..4497ef54f 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5355,17 +5355,15 @@ static void pc_autocast_clear_current(struct map_session_data *sd)
 /**
  * Unsets a character's auto-cast related data.
  *
- * @param sd The character's session data.
- * @return 0 if parameter sd is NULL, otherwise 1.
- */
-static int pc_autocast_clear(struct map_session_data *sd)
+ * @param sd The character.
+ *
+ **/
+static void pc_autocast_clear(struct map_session_data *sd)
 {
-	nullpo_ret(sd);
+	nullpo_retv(sd);
 
 	pc->autocast_clear_current(sd);
 	VECTOR_TRUNCATE(sd->auto_cast); // Truncate auto-cast vector.
-
-	return 1;
 }
 
 /**
diff --git a/src/map/pc.h b/src/map/pc.h
index eff317847..f2eca0b89 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -1034,7 +1034,7 @@ END_ZEROED_BLOCK; /* End */
 	int (*checkitem) (struct map_session_data *sd);
 	int (*useitem) (struct map_session_data *sd,int n);
 	void (*autocast_clear_current) (struct map_session_data *sd);
-	int (*autocast_clear) (struct map_session_data *sd);
+	void (*autocast_clear) (struct map_session_data *sd);
 	void (*autocast_set_current) (struct map_session_data *sd, int skill_id);
 	void (*autocast_remove) (struct map_session_data *sd, enum autocast_type type, int skill_id, int skill_lv);
 
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index ef71f1967..54e5c2da3 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -6200,8 +6200,8 @@ typedef int (*HPMHOOK_pre_pc_checkitem) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_pc_checkitem) (int retVal___, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_pc_useitem) (struct map_session_data **sd, int *n);
 typedef int (*HPMHOOK_post_pc_useitem) (int retVal___, struct map_session_data *sd, int n);
-typedef int (*HPMHOOK_pre_pc_autocast_clear) (struct map_session_data **sd);
-typedef int (*HPMHOOK_post_pc_autocast_clear) (int retVal___, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_pc_autocast_clear) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_pc_autocast_clear) (struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_pc_skillatk_bonus) (struct map_session_data **sd, uint16 *skill_id);
 typedef int (*HPMHOOK_post_pc_skillatk_bonus) (int retVal___, struct map_session_data *sd, uint16 skill_id);
 typedef int (*HPMHOOK_pre_pc_skillheal_bonus) (struct map_session_data **sd, uint16 *skill_id);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 02d55228e..c5be1529e 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -63569,32 +63569,31 @@ int HP_pc_useitem(struct map_session_data *sd, int n) {
 	}
 	return retVal___;
 }
-int HP_pc_autocast_clear(struct map_session_data *sd) {
+void HP_pc_autocast_clear(struct map_session_data *sd) {
 	int hIndex = 0;
-	int retVal___ = 0;
 	if (HPMHooks.count.HP_pc_autocast_clear_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd);
+		void (*preHookFunc) (struct map_session_data **sd);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_autocast_clear_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_pc_autocast_clear_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd);
+			preHookFunc(&sd);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
-			return retVal___;
+			return;
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.pc.autocast_clear(sd);
+		HPMHooks.source.pc.autocast_clear(sd);
 	}
 	if (HPMHooks.count.HP_pc_autocast_clear_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd);
+		void (*postHookFunc) (struct map_session_data *sd);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_autocast_clear_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_pc_autocast_clear_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd);
+			postHookFunc(sd);
 		}
 	}
-	return retVal___;
+	return;
 }
 int HP_pc_skillatk_bonus(struct map_session_data *sd, uint16 skill_id) {
 	int hIndex = 0;