Skip to content

Commit c67015a

Browse files
AsherafAsheraf
committed
HPM Hooks Update
1 parent e657ef0 commit c67015a

File tree

4 files changed

+53
-19
lines changed

4 files changed

+53
-19
lines changed

‎src/plugins/HPMHooking/HPMHooking.Defs.inc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3050,8 +3050,10 @@ typedef struct map_session_data* (*HPMHOOK_pre_guild_sd_check) (int *guild_id, i
30503050
typedef struct map_session_data* (*HPMHOOK_post_guild_sd_check) (struct map_session_data* retVal___, int guild_id, int account_id, int char_id);
30513051
typedef bool (*HPMHOOK_pre_guild_read_guildskill_tree_db) (char **split[], int *columns, int *current);
30523052
typedef bool (*HPMHOOK_post_guild_read_guildskill_tree_db) (bool retVal___, char *split[], int columns, int current);
3053-
typedef bool (*HPMHOOK_pre_guild_read_castledb) (char **str[], int *columns, int *current);
3054-
typedef bool (*HPMHOOK_post_guild_read_castledb) (bool retVal___, char *str[], int columns, int current);
3053+
typedef bool (*HPMHOOK_pre_guild_read_castledb_libconfig) (void);
3054+
typedef bool (*HPMHOOK_post_guild_read_castledb_libconfig) (bool retVal___);
3055+
typedef bool (*HPMHOOK_pre_guild_read_castledb_libconfig_sub) (struct config_setting_t **it, int *idx, const char **source);
3056+
typedef bool (*HPMHOOK_post_guild_read_castledb_libconfig_sub) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
30553057
typedef int (*HPMHOOK_pre_guild_payexp_timer_sub) (union DBKey *key, struct DBData **data, va_list ap);
30563058
typedef int (*HPMHOOK_post_guild_payexp_timer_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap);
30573059
typedef int (*HPMHOOK_pre_guild_send_xy_timer_sub) (union DBKey *key, struct DBData **data, va_list ap);

‎src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2614,8 +2614,10 @@ struct {
26142614
struct HPMHookPoint *HP_guild_sd_check_post;
26152615
struct HPMHookPoint *HP_guild_read_guildskill_tree_db_pre;
26162616
struct HPMHookPoint *HP_guild_read_guildskill_tree_db_post;
2617-
struct HPMHookPoint *HP_guild_read_castledb_pre;
2618-
struct HPMHookPoint *HP_guild_read_castledb_post;
2617+
struct HPMHookPoint *HP_guild_read_castledb_libconfig_pre;
2618+
struct HPMHookPoint *HP_guild_read_castledb_libconfig_post;
2619+
struct HPMHookPoint *HP_guild_read_castledb_libconfig_sub_pre;
2620+
struct HPMHookPoint *HP_guild_read_castledb_libconfig_sub_post;
26192621
struct HPMHookPoint *HP_guild_payexp_timer_sub_pre;
26202622
struct HPMHookPoint *HP_guild_payexp_timer_sub_post;
26212623
struct HPMHookPoint *HP_guild_send_xy_timer_sub_pre;
@@ -9401,8 +9403,10 @@ struct {
94019403
int HP_guild_sd_check_post;
94029404
int HP_guild_read_guildskill_tree_db_pre;
94039405
int HP_guild_read_guildskill_tree_db_post;
9404-
int HP_guild_read_castledb_pre;
9405-
int HP_guild_read_castledb_post;
9406+
int HP_guild_read_castledb_libconfig_pre;
9407+
int HP_guild_read_castledb_libconfig_post;
9408+
int HP_guild_read_castledb_libconfig_sub_pre;
9409+
int HP_guild_read_castledb_libconfig_sub_post;
94069410
int HP_guild_payexp_timer_sub_pre;
94079411
int HP_guild_payexp_timer_sub_post;
94089412
int HP_guild_send_xy_timer_sub_pre;

‎src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,8 @@ struct HookingPointData HookingPoints[] = {
13401340
{ HP_POP(guild->payexp_timer, HP_guild_payexp_timer) },
13411341
{ HP_POP(guild->sd_check, HP_guild_sd_check) },
13421342
{ HP_POP(guild->read_guildskill_tree_db, HP_guild_read_guildskill_tree_db) },
1343-
{ HP_POP(guild->read_castledb, HP_guild_read_castledb) },
1343+
{ HP_POP(guild->read_castledb_libconfig, HP_guild_read_castledb_libconfig) },
1344+
{ HP_POP(guild->read_castledb_libconfig_sub, HP_guild_read_castledb_libconfig_sub) },
13441345
{ HP_POP(guild->payexp_timer_sub, HP_guild_payexp_timer_sub) },
13451346
{ HP_POP(guild->send_xy_timer_sub, HP_guild_send_xy_timer_sub) },
13461347
{ HP_POP(guild->send_xy_timer, HP_guild_send_xy_timer) },

‎src/plugins/HPMHooking/HPMHooking_map.Hooks.inc‎

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34199,29 +34199,56 @@ bool HP_guild_read_guildskill_tree_db(char *split[], int columns, int current) {
3419934199
}
3420034200
return retVal___;
3420134201
}
34202-
bool HP_guild_read_castledb(char *str[], int columns, int current) {
34202+
bool HP_guild_read_castledb_libconfig(void) {
3420334203
int hIndex = 0;
3420434204
bool retVal___ = false;
34205-
if (HPMHooks.count.HP_guild_read_castledb_pre > 0) {
34206-
bool (*preHookFunc) (char **str[], int *columns, int *current);
34205+
if (HPMHooks.count.HP_guild_read_castledb_libconfig_pre > 0) {
34206+
bool (*preHookFunc) (void);
3420734207
*HPMforce_return = false;
34208-
for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_pre; hIndex++) {
34209-
preHookFunc = HPMHooks.list.HP_guild_read_castledb_pre[hIndex].func;
34210-
retVal___ = preHookFunc(&str, &columns, &current);
34208+
for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_pre; hIndex++) {
34209+
preHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_pre[hIndex].func;
34210+
retVal___ = preHookFunc();
3421134211
}
3421234212
if (*HPMforce_return) {
3421334213
*HPMforce_return = false;
3421434214
return retVal___;
3421534215
}
3421634216
}
3421734217
{
34218-
retVal___ = HPMHooks.source.guild.read_castledb(str, columns, current);
34218+
retVal___ = HPMHooks.source.guild.read_castledb_libconfig();
3421934219
}
34220-
if (HPMHooks.count.HP_guild_read_castledb_post > 0) {
34221-
bool (*postHookFunc) (bool retVal___, char *str[], int columns, int current);
34222-
for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_post; hIndex++) {
34223-
postHookFunc = HPMHooks.list.HP_guild_read_castledb_post[hIndex].func;
34224-
retVal___ = postHookFunc(retVal___, str, columns, current);
34220+
if (HPMHooks.count.HP_guild_read_castledb_libconfig_post > 0) {
34221+
bool (*postHookFunc) (bool retVal___);
34222+
for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_post; hIndex++) {
34223+
postHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_post[hIndex].func;
34224+
retVal___ = postHookFunc(retVal___);
34225+
}
34226+
}
34227+
return retVal___;
34228+
}
34229+
bool HP_guild_read_castledb_libconfig_sub(struct config_setting_t *it, int idx, const char *source) {
34230+
int hIndex = 0;
34231+
bool retVal___ = false;
34232+
if (HPMHooks.count.HP_guild_read_castledb_libconfig_sub_pre > 0) {
34233+
bool (*preHookFunc) (struct config_setting_t **it, int *idx, const char **source);
34234+
*HPMforce_return = false;
34235+
for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_sub_pre; hIndex++) {
34236+
preHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_sub_pre[hIndex].func;
34237+
retVal___ = preHookFunc(&it, &idx, &source);
34238+
}
34239+
if (*HPMforce_return) {
34240+
*HPMforce_return = false;
34241+
return retVal___;
34242+
}
34243+
}
34244+
{
34245+
retVal___ = HPMHooks.source.guild.read_castledb_libconfig_sub(it, idx, source);
34246+
}
34247+
if (HPMHooks.count.HP_guild_read_castledb_libconfig_sub_post > 0) {
34248+
bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
34249+
for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_sub_post; hIndex++) {
34250+
postHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_sub_post[hIndex].func;
34251+
retVal___ = postHookFunc(retVal___, it, idx, source);
3422534252
}
3422634253
}
3422734254
return retVal___;

0 commit comments

Comments
 (0)