HPM Hooks Update

4 files changed, 5 insertions, 39 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 4440950a3..3c470e736 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -3966,8 +3966,8 @@ typedef int (*HPMHOOK_pre_map_random_dir) (struct block_list **bl, short **x, sh
 typedef int (*HPMHOOK_post_map_random_dir) (int retVal___, struct block_list *bl, short *x, short *y);
 typedef int (*HPMHOOK_pre_map_cleanup_sub) (struct block_list **bl, va_list ap);
 typedef int (*HPMHOOK_post_map_cleanup_sub) (int retVal___, struct block_list *bl, va_list ap);
-typedef int (*HPMHOOK_pre_map_delmap) (char **mapname);
-typedef int (*HPMHOOK_post_map_delmap) (int retVal___, char *mapname);
+typedef int (*HPMHOOK_pre_map_delmap) (const char **mapname);
+typedef int (*HPMHOOK_post_map_delmap) (int retVal___, const char *mapname);
 typedef void (*HPMHOOK_pre_map_flags_init) (void);
 typedef void (*HPMHOOK_post_map_flags_init) (void);
 typedef bool (*HPMHOOK_pre_map_iwall_set) (int16 *m, int16 *x, int16 *y, int *size, int8 *dir, bool *shootable, const char **wall_name);
@@ -4038,8 +4038,6 @@ typedef int (*HPMHOOK_pre_map_readallmaps) (void);
 typedef int (*HPMHOOK_post_map_readallmaps) (int retVal___);
 typedef bool (*HPMHOOK_pre_map_config_read) (const char **filename, bool *imported);
 typedef bool (*HPMHOOK_post_map_config_read) (bool retVal___, const char *filename, bool imported);
-typedef bool (*HPMHOOK_pre_map_config_read_sub) (char **filename);
-typedef bool (*HPMHOOK_post_map_config_read_sub) (bool retVal___, char *filename);
 typedef void (*HPMHOOK_pre_map_reloadnpc_sub) (char **cfgName);
 typedef void (*HPMHOOK_post_map_reloadnpc_sub) (char *cfgName);
 typedef bool (*HPMHOOK_pre_map_inter_config_read) (const char **filename, bool *imported);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index b4a0087e2..5268f9d3f 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -3234,8 +3234,6 @@ struct {
 	struct HPMHookPoint *HP_map_readallmaps_post;
 	struct HPMHookPoint *HP_map_config_read_pre;
 	struct HPMHookPoint *HP_map_config_read_post;
-	struct HPMHookPoint *HP_map_config_read_sub_pre;
-	struct HPMHookPoint *HP_map_config_read_sub_post;
 	struct HPMHookPoint *HP_map_reloadnpc_sub_pre;
 	struct HPMHookPoint *HP_map_reloadnpc_sub_post;
 	struct HPMHookPoint *HP_map_inter_config_read_pre;
@@ -9289,8 +9287,6 @@ struct {
 	int HP_map_readallmaps_post;
 	int HP_map_config_read_pre;
 	int HP_map_config_read_post;
-	int HP_map_config_read_sub_pre;
-	int HP_map_config_read_sub_post;
 	int HP_map_reloadnpc_sub_pre;
 	int HP_map_reloadnpc_sub_post;
 	int HP_map_inter_config_read_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 1f231b653..df97d7d47 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -1659,7 +1659,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(map->readgat, HP_map_readgat) },
 	{ HP_POP(map->readallmaps, HP_map_readallmaps) },
 	{ HP_POP(map->config_read, HP_map_config_read) },
-	{ HP_POP(map->config_read_sub, HP_map_config_read_sub) },
 	{ HP_POP(map->reloadnpc_sub, HP_map_reloadnpc_sub) },
 	{ HP_POP(map->inter_config_read, HP_map_inter_config_read) },
 	{ HP_POP(map->inter_config_read_database_names, HP_map_inter_config_read_database_names) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index d3dfe9148..eff263649 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -41774,11 +41774,11 @@ int HP_map_cleanup_sub(struct block_list *bl, va_list ap) {
 	}
 	return retVal___;
 }
-int HP_map_delmap(char *mapname) {
+int HP_map_delmap(const char *mapname) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_map_delmap_pre ) {
-		int (*preHookFunc) (char **mapname);
+		int (*preHookFunc) (const char **mapname);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_map_delmap_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_map_delmap_pre[hIndex].func;
@@ -41793,7 +41793,7 @@ int HP_map_delmap(char *mapname) {
 		retVal___ = HPMHooks.source.map.delmap(mapname);
 	}
 	if( HPMHooks.count.HP_map_delmap_post ) {
-		int (*postHookFunc) (int retVal___, char *mapname);
+		int (*postHookFunc) (int retVal___, const char *mapname);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_map_delmap_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_map_delmap_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, mapname);
@@ -42761,33 +42761,6 @@ bool HP_map_config_read(const char *filename, bool imported) {
 	}
 	return retVal___;
 }
-bool HP_map_config_read_sub(char *filename) {
-	int hIndex = 0;
-	bool retVal___ = false;
-	if( HPMHooks.count.HP_map_config_read_sub_pre ) {
-		bool (*preHookFunc) (char **filename);
-		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_map_config_read_sub_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_map_config_read_sub_pre[hIndex].func;
-			retVal___ = preHookFunc(&filename);
-		}
-		if( *HPMforce_return ) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.map.config_read_sub(filename);
-	}
-	if( HPMHooks.count.HP_map_config_read_sub_post ) {
-		bool (*postHookFunc) (bool retVal___, char *filename);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_map_config_read_sub_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_map_config_read_sub_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, filename);
-		}
-	}
-	return retVal___;
-}
 void HP_map_reloadnpc_sub(char *cfgName) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_map_reloadnpc_sub_pre ) {