diff options
author | Haru <haru@dotalux.com> | 2016-02-11 13:39:49 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2016-08-19 21:32:17 +0200 |
commit | e370cc44c9e79ee284d1658fab42112c0193672a (patch) | |
tree | 61d8a68230bde3c78ea319324cb7531d1199caf3 | |
parent | 85d10885379bbe52930c233f02bf1c94ec86ac30 (diff) | |
download | hercules-e370cc44c9e79ee284d1658fab42112c0193672a.tar.gz hercules-e370cc44c9e79ee284d1658fab42112c0193672a.tar.bz2 hercules-e370cc44c9e79ee284d1658fab42112c0193672a.tar.xz hercules-e370cc44c9e79ee284d1658fab42112c0193672a.zip |
HPM Hooks Update
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking.Defs.inc | 8 | ||||
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 28 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc index cc3724a13..4440950a3 100644 --- a/src/plugins/HPMHooking/HPMHooking.Defs.inc +++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc @@ -4036,10 +4036,10 @@ typedef int (*HPMHOOK_pre_map_readgat) (struct map_data **m); typedef int (*HPMHOOK_post_map_readgat) (int retVal___, struct map_data *m); typedef int (*HPMHOOK_pre_map_readallmaps) (void); typedef int (*HPMHOOK_post_map_readallmaps) (int retVal___); -typedef int (*HPMHOOK_pre_map_config_read) (char **cfgName); -typedef int (*HPMHOOK_post_map_config_read) (int retVal___, char *cfgName); -typedef int (*HPMHOOK_pre_map_config_read_sub) (char **cfgName); -typedef int (*HPMHOOK_post_map_config_read_sub) (int retVal___, char *cfgName); +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.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index 6889e2658..d3dfe9148 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -42734,15 +42734,15 @@ int HP_map_readallmaps(void) { } return retVal___; } -int HP_map_config_read(char *cfgName) { +bool HP_map_config_read(const char *filename, bool imported) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_map_config_read_pre ) { - int (*preHookFunc) (char **cfgName); + bool (*preHookFunc) (const char **filename, bool *imported); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_config_read_pre[hIndex].func; - retVal___ = preHookFunc(&cfgName); + retVal___ = preHookFunc(&filename, &imported); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42750,26 +42750,26 @@ int HP_map_config_read(char *cfgName) { } } { - retVal___ = HPMHooks.source.map.config_read(cfgName); + retVal___ = HPMHooks.source.map.config_read(filename, imported); } if( HPMHooks.count.HP_map_config_read_post ) { - int (*postHookFunc) (int retVal___, char *cfgName); + bool (*postHookFunc) (bool retVal___, const char *filename, bool imported); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_config_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_config_read_post[hIndex].func; - retVal___ = postHookFunc(retVal___, cfgName); + retVal___ = postHookFunc(retVal___, filename, imported); } } return retVal___; } -int HP_map_config_read_sub(char *cfgName) { +bool HP_map_config_read_sub(char *filename) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_map_config_read_sub_pre ) { - int (*preHookFunc) (char **cfgName); + 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(&cfgName); + retVal___ = preHookFunc(&filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42777,13 +42777,13 @@ int HP_map_config_read_sub(char *cfgName) { } } { - retVal___ = HPMHooks.source.map.config_read_sub(cfgName); + retVal___ = HPMHooks.source.map.config_read_sub(filename); } if( HPMHooks.count.HP_map_config_read_sub_post ) { - int (*postHookFunc) (int retVal___, char *cfgName); + 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___, cfgName); + retVal___ = postHookFunc(retVal___, filename); } } return retVal___; |