diff options
| -rw-r--r-- | src/common/HPMDataCheck.h | 10 | ||||
| -rw-r--r-- | src/common/HPMSymbols.inc.h | 8 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 12 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h index 510ea9d4e..923b6ccbf 100644 --- a/src/common/HPMDataCheck.h +++ b/src/common/HPMDataCheck.h @@ -144,16 +144,16 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { #else #define COMMON_HPMI_H #endif // COMMON_HPMI_H - #ifdef COMMON_MALLOC_H - { "malloc_interface", sizeof(struct malloc_interface), SERVER_TYPE_ALL }, - #else - #define COMMON_MALLOC_H - #endif // COMMON_MALLOC_H #ifdef COMMON_MAPINDEX_H { "mapindex_interface", sizeof(struct mapindex_interface), SERVER_TYPE_CHAR|SERVER_TYPE_MAP }, #else #define COMMON_MAPINDEX_H #endif // COMMON_MAPINDEX_H + #ifdef COMMON_MEMMGR_H + { "malloc_interface", sizeof(struct malloc_interface), SERVER_TYPE_ALL }, + #else + #define COMMON_MEMMGR_H + #endif // COMMON_MEMMGR_H #ifdef COMMON_MMO_H { "auction_data", sizeof(struct auction_data), SERVER_TYPE_ALL }, { "fame_list", sizeof(struct fame_list), SERVER_TYPE_ALL }, diff --git a/src/common/HPMSymbols.inc.h b/src/common/HPMSymbols.inc.h index 3a4c5852c..4c3722b69 100644 --- a/src/common/HPMSymbols.inc.h +++ b/src/common/HPMSymbols.inc.h @@ -125,9 +125,9 @@ struct loginif_interface *loginif; #ifdef MAP_MAIL_H /* mail */ struct mail_interface *mail; #endif // MAP_MAIL_H -#ifdef COMMON_MALLOC_H /* iMalloc */ +#ifdef COMMON_MEMMGR_H /* iMalloc */ struct malloc_interface *iMalloc; -#endif // COMMON_MALLOC_H +#endif // COMMON_MEMMGR_H #ifdef MAP_MAP_H /* map */ struct map_interface *map; #endif // MAP_MAP_H @@ -348,9 +348,9 @@ if ((server_type&(SERVER_TYPE_CHAR)) && !HPM_SYMBOL("loginif", loginif)) return #ifdef MAP_MAIL_H /* mail */ if ((server_type&(SERVER_TYPE_MAP)) && !HPM_SYMBOL("mail", mail)) return "mail"; #endif // MAP_MAIL_H -#ifdef COMMON_MALLOC_H /* iMalloc */ +#ifdef COMMON_MEMMGR_H /* iMalloc */ if ((server_type&(SERVER_TYPE_ALL)) && !HPM_SYMBOL("iMalloc", iMalloc)) return "iMalloc"; -#endif // COMMON_MALLOC_H +#endif // COMMON_MEMMGR_H #ifdef MAP_MAP_H /* map */ if ((server_type&(SERVER_TYPE_MAP)) && !HPM_SYMBOL("map", map)) return "map"; #endif // MAP_MAP_H diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index b05525734..645873e13 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -46001,15 +46001,15 @@ bool HP_mob_get_const(const config_setting_t *it, int *value) { } return retVal___; } -int HP_mob_read_libconfig(const char *filename) { +int HP_mob_read_libconfig(const char *filename, bool ignore_missing) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_read_libconfig_pre ) { - int (*preHookFunc) (const char *filename); + int (*preHookFunc) (const char *filename, bool *ignore_missing); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_libconfig_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_libconfig_pre[hIndex].func; - retVal___ = preHookFunc(filename); + retVal___ = preHookFunc(filename, &ignore_missing); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46017,13 +46017,13 @@ int HP_mob_read_libconfig(const char *filename) { } } { - retVal___ = HPMHooks.source.mob.read_libconfig(filename); + retVal___ = HPMHooks.source.mob.read_libconfig(filename, ignore_missing); } if( HPMHooks.count.HP_mob_read_libconfig_post ) { - int (*postHookFunc) (int retVal___, const char *filename); + int (*postHookFunc) (int retVal___, const char *filename, bool *ignore_missing); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_libconfig_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_read_libconfig_post[hIndex].func; - retVal___ = postHookFunc(retVal___, filename); + retVal___ = postHookFunc(retVal___, filename, &ignore_missing); } } return retVal___; |