diff options
Diffstat (limited to 'src')
128 files changed, 24122 insertions, 14572 deletions
diff --git a/src/char/Makefile.in b/src/char/Makefile.in index 8d9094f18..fe40621fb 100644 --- a/src/char/Makefile.in +++ b/src/char/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team +# Copyright (C) 2012-2016 Hercules Dev Team # Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ CONFIG_D = ../config CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) COMMON_D = ../common -COMMON_H = $(wildcard $(COMMON_D)/*.h) +COMMON_H = $(filter-out %.p.h, $(wildcard $(COMMON_D)/*.h)) ../plugins/HPMHooking.h SYSINFO_INC = $(COMMON_D)/sysinfo.inc COMMON_INCLUDE = -I.. @@ -47,6 +47,7 @@ CHAR_OBJ = $(addprefix obj_sql/, $(patsubst %.c,%.o,$(CHAR_C))) CHAR_H = char.h HPMchar.h loginif.h mapif.h geoip.h inter.h int_auction.h int_elemental.h int_guild.h \ int_homun.h int_mail.h int_mercenary.h int_party.h int_pet.h \ int_quest.h int_storage.h pincode.h +CHAR_PH = HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) @@ -89,7 +90,7 @@ help: Makefile: Makefile.in @$(MAKE) -C ../.. src/char/Makefile -$(SYSINFO_INC): $(CHAR_C) $(CHAR_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) +$(SYSINFO_INC): $(CHAR_C) $(CHAR_PH) $(CHAR_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " MAKE $@" @$(MAKE) -C ../.. sysinfo @@ -112,12 +113,6 @@ char-server: ../../char-server@EXEEXT@ @$(CC) @STATIC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) $(COMMON_D)/obj_sql/common_sql.a \ $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ -# char object files - -obj_sql/%.o: %.c $(CHAR_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql - @echo " CC $<" - @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< - # missing object files $(COMMON_D)/obj_all/common.a: @echo " MAKE $@" @@ -134,3 +129,11 @@ $(MT19937AR_OBJ): $(LIBCONFIG_OBJ): @echo " MAKE $@" @$(MAKE) -C $(LIBCONFIG_D) + +.SECONDEXPANSION: + +# char object files + +obj_sql/%.o: %.c $$(filter %.p.h, $(CHAR_PH)) $(CHAR_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql + @echo " CC $<" + @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< diff --git a/src/char/char.c b/src/char/char.c index 6cfeb7d1a..cf2f7d87c 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -62,6 +62,14 @@ #include <stdlib.h> #include <sys/types.h> +#if MAX_MAP_SERVERS > 1 +# ifdef _MSC_VER +# pragma message("WARNING: your settings allow more than one map server to connect, this is deprecated dangerous feature USE IT AT YOUR OWN RISK") +# else +# warning your settings allow more than one map server to connect, this is deprecated dangerous feature USE IT AT YOUR OWN RISK +# endif +#endif + // private declarations char char_db[256] = "char"; char scdata_db[256] = "sc_data"; @@ -162,7 +170,7 @@ unsigned short skillid2idx[MAX_SKILL_ID]; //----------------------------------------------------- #define AUTH_TIMEOUT 30000 -static DBMap* auth_db; // int account_id -> struct char_auth_node* +static struct DBMap *auth_db; // int account_id -> struct char_auth_node* //----------------------------------------------------- // Online User Database @@ -171,7 +179,7 @@ static DBMap* auth_db; // int account_id -> struct char_auth_node* /** * @see DBCreateData */ -static DBData char_create_online_char_data(DBKey key, va_list args) +static struct DBData char_create_online_char_data(union DBKey key, va_list args) { struct online_char_data* character; CREATE(character, struct online_char_data, 1); @@ -313,7 +321,7 @@ void char_set_char_offline(int char_id, int account_id) /** * @see DBApply */ -static int char_db_setoffline(DBKey key, DBData *data, va_list ap) +static int char_db_setoffline(union DBKey key, struct DBData *data, va_list ap) { struct online_char_data* character = (struct online_char_data*)DB->data2ptr(data); int server_id = va_arg(ap, int); @@ -333,7 +341,7 @@ static int char_db_setoffline(DBKey key, DBData *data, va_list ap) /** * @see DBApply */ -static int char_db_kickoffline(DBKey key, DBData *data, va_list ap) +static int char_db_kickoffline(union DBKey key, struct DBData *data, va_list ap) { struct online_char_data* character = (struct online_char_data*)DB->data2ptr(data); int server_id = va_arg(ap, int); @@ -388,7 +396,7 @@ void char_set_all_offline_sql(void) /** * @see DBCreateData */ -static DBData char_create_charstatus(DBKey key, va_list args) +static struct DBData char_create_charstatus(union DBKey key, va_list args) { struct mmo_charstatus *cp; cp = (struct mmo_charstatus *) aCalloc(1,sizeof(struct mmo_charstatus)); @@ -702,7 +710,7 @@ int char_mmo_char_tosql(int char_id, struct mmo_charstatus* p) int char_memitemdata_to_sql(const struct item items[], int max, int id, int tableswitch) { StringBuf buf; - SqlStmt *stmt = NULL; + struct SqlStmt *stmt = NULL; int i, j; const char *tablename = NULL; const char *selectoption = NULL; @@ -915,7 +923,7 @@ int char_mmo_gender(const struct char_session_data *sd, const struct mmo_charsta // Loads the basic character rooster for the given account. Returns total buffer used. int char_mmo_chars_fromsql(struct char_session_data* sd, uint8* buf) { - SqlStmt* stmt; + struct SqlStmt *stmt; struct mmo_charstatus p; int j = 0, i; char last_map[MAP_NAME_LENGTH_EXT]; @@ -1015,7 +1023,7 @@ int char_mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_every char t_msg[128] = ""; struct mmo_charstatus* cp; StringBuf buf; - SqlStmt* stmt; + struct SqlStmt *stmt; char last_map[MAP_NAME_LENGTH_EXT]; char save_map[MAP_NAME_LENGTH_EXT]; char point_map[MAP_NAME_LENGTH_EXT]; @@ -1882,7 +1890,7 @@ int char_mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) { //When the weapon is sent and your option is riding, the client crashes on login!? // FIXME[Haru]: is OPTION_HANBOK intended to be part of this list? And if it is, should the list also include other OPTION_ costumes? - WBUFW(buf,56) = p->option&(OPTION_RIDING|OPTION_DRAGON|OPTION_WUG|OPTION_WUGRIDER|OPTION_MADOGEAR|OPTION_HANBOK) ? 0 : p->weapon; + WBUFW(buf,56) = (p->option&(OPTION_RIDING|OPTION_DRAGON|OPTION_WUG|OPTION_WUGRIDER|OPTION_MADOGEAR|OPTION_HANBOK)) ? 0 : p->weapon; WBUFW(buf,58) = p->base_level; WBUFW(buf,60) = min(p->skill_point, INT16_MAX); @@ -2341,7 +2349,7 @@ int char_parse_fromlogin_changesex_reply(int fd) int char_id = 0, class_ = 0, guild_id = 0; int i; struct char_auth_node *node; - SqlStmt *stmt; + struct SqlStmt *stmt; int acc = RFIFOL(fd,2); int sex = RFIFOB(fd,6); @@ -3277,7 +3285,7 @@ void char_ban(int account_id, int char_id, time_t *unban_time, short year, short { time_t timestamp; struct tm *tmtime; - SqlStmt* stmt = SQL->StmtMalloc(inter->sql_handle); + struct SqlStmt *stmt = SQL->StmtMalloc(inter->sql_handle); nullpo_retv(unban_time); @@ -3298,8 +3306,8 @@ void char_ban(int account_id, int char_id, time_t *unban_time, short year, short if( SQL_SUCCESS != SQL->StmtPrepare(stmt, "UPDATE `%s` SET `unban_time` = ? WHERE `char_id` = ? LIMIT 1", char_db) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_LONG, (void*)×tamp, sizeof(timestamp)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_INT, (void*)&char_id, sizeof(char_id)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_LONG, ×tamp, sizeof(timestamp)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_INT, &char_id, sizeof(char_id)) || SQL_SUCCESS != SQL->StmtExecute(stmt) ) { SqlStmt_ShowDebug(stmt); @@ -5249,7 +5257,7 @@ int char_broadcast_user_count(int tid, int64 tick, int id, intptr_t data) { * Load this character's account id into the 'online accounts' packet * @see DBApply */ -static int char_send_accounts_tologin_sub(DBKey key, DBData *data, va_list ap) +static int char_send_accounts_tologin_sub(union DBKey key, struct DBData *data, va_list ap) { struct online_char_data* character = DB->data2ptr(data); int* i = va_arg(ap, int*); @@ -5318,7 +5326,7 @@ static int char_waiting_disconnect(int tid, int64 tick, int id, intptr_t data) { /** * @see DBApply */ -static int char_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap) +static int char_online_data_cleanup_sub(union DBKey key, struct DBData *data, va_list ap) { struct online_char_data *character= DB->data2ptr(data); nullpo_ret(character); diff --git a/src/char/char.h b/src/char/char.h index aedc52fbe..a0cfb3bd7 100644 --- a/src/char/char.h +++ b/src/char/char.h @@ -68,7 +68,11 @@ struct mmo_map_server { VECTOR_DECL(uint16) maps; }; -#define MAX_MAP_SERVERS 2 +/** + * deprecated feature, multi map been a dangerous in-complete feature for so long and going to be removed. + * USE IT AT YOUR OWN RISK! + */ +#define MAX_MAP_SERVERS 1 #define DEFAULT_AUTOSAVE_INTERVAL (300*1000) @@ -98,8 +102,8 @@ struct char_interface { struct mmo_map_server server[MAX_MAP_SERVERS]; int login_fd; int char_fd; - DBMap* online_char_db; // int account_id -> struct online_char_data* - DBMap* char_db_; + struct DBMap *online_char_db; // int account_id -> struct online_char_data* + struct DBMap *char_db_; char userid[NAME_LENGTH]; char passwd[NAME_LENGTH]; char server_name[20]; @@ -115,18 +119,18 @@ struct char_interface { int (*waiting_disconnect) (int tid, int64 tick, int id, intptr_t data); int (*delete_char_sql) (int char_id); - DBData (*create_online_char_data) (DBKey key, va_list args); + struct DBData (*create_online_char_data) (union DBKey key, va_list args); void (*set_account_online) (int account_id); void (*set_account_offline) (int account_id); void (*set_char_charselect) (int account_id); void (*set_char_online) (int map_id, int char_id, int account_id); void (*set_char_offline) (int char_id, int account_id); - int (*db_setoffline) (DBKey key, DBData *data, va_list ap); - int (*db_kickoffline) (DBKey key, DBData *data, va_list ap); + int (*db_setoffline) (union DBKey key, struct DBData *data, va_list ap); + int (*db_kickoffline) (union DBKey key, struct DBData *data, va_list ap); void (*set_login_all_offline) (void); void (*set_all_offline) (int id); void (*set_all_offline_sql) (void); - DBData (*create_charstatus) (DBKey key, va_list args); + struct DBData (*create_charstatus) (union DBKey key, va_list args); int (*mmo_char_tosql) (int char_id, struct mmo_charstatus* p); int (*memitemdata_to_sql) (const struct item items[], int max, int id, int tableswitch); int (*mmo_gender) (const struct char_session_data *sd, const struct mmo_charstatus *p, char sex); @@ -263,10 +267,10 @@ struct char_interface { int (*parse_char_unknown_packet) (int fd, uint32 ipl); int (*parse_char) (int fd); int (*broadcast_user_count) (int tid, int64 tick, int id, intptr_t data); - int (*send_accounts_tologin_sub) (DBKey key, DBData *data, va_list ap); + int (*send_accounts_tologin_sub) (union DBKey key, struct DBData *data, va_list ap); int (*send_accounts_tologin) (int tid, int64 tick, int id, intptr_t data); int (*check_connect_login_server) (int tid, int64 tick, int id, intptr_t data); - int (*online_data_cleanup_sub) (DBKey key, DBData *data, va_list ap); + int (*online_data_cleanup_sub) (union DBKey key, struct DBData *data, va_list ap); int (*online_data_cleanup) (int tid, int64 tick, int id, intptr_t data); void (*sql_config_read) (const char* cfgName); void (*config_dispatch) (char *w1, char *w2); diff --git a/src/char/geoip.c b/src/char/geoip.c index 433ff0918..002045850 100644 --- a/src/char/geoip.c +++ b/src/char/geoip.c @@ -132,9 +132,8 @@ void geoip_final(bool shutdown) **/ void geoip_init(void) { - int i, fno; + int fno; char db_type = 1; - unsigned char delim[3]; struct stat bufa; FILE *db; @@ -165,6 +164,8 @@ void geoip_init(void) if (fseek(db, -3l, SEEK_END) != 0) { db_type = 0; } else { + int i; + unsigned char delim[3]; for (i = 0; i < GEOIP_STRUCTURE_INFO_MAX_SIZE; i++) { if (fread(delim, sizeof(delim[0]), 3, db) != 3) { db_type = 0; diff --git a/src/char/int_auction.c b/src/char/int_auction.c index 464a2092b..51acb32a6 100644 --- a/src/char/int_auction.c +++ b/src/char/int_auction.c @@ -47,7 +47,7 @@ static int inter_auction_count(int char_id, bool buy) { int i = 0; struct auction_data *auction; - DBIterator *iter = db_iterator(inter_auction->db); + struct DBIterator *iter = db_iterator(inter_auction->db); for( auction = dbi_first(iter); dbi_exists(iter); auction = dbi_next(iter) ) { @@ -63,7 +63,7 @@ void inter_auction_save(struct auction_data *auction) { int j; StringBuf buf; - SqlStmt* stmt; + struct SqlStmt *stmt; if( !auction ) return; @@ -93,7 +93,7 @@ unsigned int inter_auction_create(struct auction_data *auction) { int j; StringBuf buf; - SqlStmt* stmt; + struct SqlStmt *stmt; if( !auction ) return false; @@ -280,7 +280,7 @@ void mapif_parse_auction_requestlist(int fd) int price = RFIFOL(fd,10); short type = RFIFOW(fd,8), page = max(1,RFIFOW(fd,14)); unsigned char buf[5 * sizeof(struct auction_data)]; - DBIterator *iter = db_iterator(inter_auction->db); + struct DBIterator *iter = db_iterator(inter_auction->db); struct auction_data *auction; short i = 0, j = 0, pages = 1; diff --git a/src/char/int_auction.h b/src/char/int_auction.h index 29b068dfd..ccd5bfbf5 100644 --- a/src/char/int_auction.h +++ b/src/char/int_auction.h @@ -22,14 +22,16 @@ #define CHAR_INT_AUCTION_H #include "common/hercules.h" -#include "common/db.h" #include "common/mmo.h" +/* Forward Declarations */ +struct DBMap; // common/db.h + /** * inter_auction_interface interface **/ struct inter_auction_interface { - DBMap* db; // int auction_id -> struct auction_data* + struct DBMap *db; // int auction_id -> struct auction_data* int (*count) (int char_id, bool buy); void (*save) (struct auction_data *auction); unsigned int (*create) (struct auction_data *auction); diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 2ba50d277..21f38d049 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -33,6 +33,7 @@ #include "common/nullpo.h" #include "common/showmsg.h" #include "common/socket.h" +#include "common/sql.h" #include "common/strlib.h" #include "common/timer.h" @@ -58,8 +59,8 @@ static const char dataToHex[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9 int inter_guild_save_timer(int tid, int64 tick, int id, intptr_t data) { static int last_id = 0; //To know in which guild we were. int state = 0; //0: Have not reached last guild. 1: Reached last guild, ready for save. 2: Some guild saved, don't do further saving. - DBIterator *iter = db_iterator(inter_guild->guild_db); - DBKey key; + struct DBIterator *iter = db_iterator(inter_guild->guild_db); + union DBKey key; struct guild* g; if( last_id == 0 ) //Save the first guild in the list. @@ -748,7 +749,7 @@ int inter_guild_sql_init(void) /** * @see DBApply */ -int inter_guild_db_final(DBKey key, DBData *data, va_list ap) +int inter_guild_db_final(union DBKey key, struct DBData *data, va_list ap) { struct guild *g = DB->data2ptr(data); nullpo_ret(g); @@ -1547,17 +1548,17 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int switch(type) { case GMI_POSITION: - { - g->member[i].position=*((const short *)data); + { + g->member[i].position = *(const short *)data; g->member[i].modified = GS_MEMBER_MODIFIED; mapif->guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; break; - } + } case GMI_EXP: { uint64 old_exp = g->member[i].exp; - g->member[i].exp=*((const uint64 *)data); + g->member[i].exp = *(const uint64 *)data; g->member[i].modified = GS_MEMBER_MODIFIED; if (g->member[i].exp > old_exp) { uint64 exp = g->member[i].exp - old_exp; @@ -1582,7 +1583,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int } case GMI_HAIR: { - g->member[i].hair=*((const short *)data); + g->member[i].hair = *(const short *)data; g->member[i].modified = GS_MEMBER_MODIFIED; mapif->guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. @@ -1590,7 +1591,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int } case GMI_HAIR_COLOR: { - g->member[i].hair_color=*((const short *)data); + g->member[i].hair_color = *(const short *)data; g->member[i].modified = GS_MEMBER_MODIFIED; mapif->guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. @@ -1598,7 +1599,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int } case GMI_GENDER: { - g->member[i].gender=*((const short *)data); + g->member[i].gender = *(const short *)data; g->member[i].modified = GS_MEMBER_MODIFIED; mapif->guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. @@ -1606,7 +1607,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int } case GMI_CLASS: { - g->member[i].class_=*((const short *)data); + g->member[i].class_ = *(const short *)data; g->member[i].modified = GS_MEMBER_MODIFIED; mapif->guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. @@ -1614,7 +1615,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int } case GMI_LEVEL: { - g->member[i].lv=*((const short *)data); + g->member[i].lv = *(const short *)data; g->member[i].modified = GS_MEMBER_MODIFIED; mapif->guild_memberinfochanged(guild_id,account_id,char_id,type,data,len); g->save_flag |= GS_MEMBER; //Save new data. diff --git a/src/char/int_guild.h b/src/char/int_guild.h index 40728c3b2..252c2dc47 100644 --- a/src/char/int_guild.h +++ b/src/char/int_guild.h @@ -44,8 +44,8 @@ enum { * inter_guild interface **/ struct inter_guild_interface { - DBMap* guild_db; // int guild_id -> struct guild* - DBMap* castle_db; + struct DBMap *guild_db; // int guild_id -> struct guild* + struct DBMap *castle_db; unsigned int exp[MAX_GUILDLEVEL]; int (*save_timer) (int tid, int64 tick, int id, intptr_t data); @@ -58,7 +58,7 @@ struct inter_guild_interface { int (*CharOnline) (int char_id, int guild_id); int (*CharOffline) (int char_id, int guild_id); int (*sql_init) (void); - int (*db_final) (DBKey key, DBData *data, va_list ap); + int (*db_final) (union DBKey key, struct DBData *data, va_list ap); void (*sql_final) (void); int (*search_guildname) (const char *str); bool (*check_empty) (struct guild *g); diff --git a/src/char/int_homun.c b/src/char/int_homun.c index e5fde2330..90643699c 100644 --- a/src/char/int_homun.c +++ b/src/char/int_homun.c @@ -163,7 +163,7 @@ bool mapif_homunculus_save(const struct s_homunculus *hd) flag = false; } else { int i; - SqlStmt *stmt = SQL->StmtMalloc(inter->sql_handle); + struct SqlStmt *stmt = SQL->StmtMalloc(inter->sql_handle); if (SQL_ERROR == SQL->StmtPrepare(stmt, "REPLACE INTO `%s` (`homun_id`, `id`, `lv`) VALUES (%d, ?, ?)", skill_homunculus_db, hd->hom_id)) { SqlStmt_ShowDebug(stmt); @@ -171,8 +171,8 @@ bool mapif_homunculus_save(const struct s_homunculus *hd) } else { for (i = 0; i < MAX_HOMUNSKILL; ++i) { if (hd->hskill[i].id > 0 && hd->hskill[i].lv != 0) { - SQL->StmtBindParam(stmt, 0, SQLDT_USHORT, (void*)&hd->hskill[i].id, 0); // FIXME: StmtBindParam should take const void - SQL->StmtBindParam(stmt, 1, SQLDT_USHORT, (void*)&hd->hskill[i].lv, 0); // FIXME: StmtBindParam should take const void + SQL->StmtBindParam(stmt, 0, SQLDT_USHORT, &hd->hskill[i].id, 0); + SQL->StmtBindParam(stmt, 1, SQLDT_USHORT, &hd->hskill[i].lv, 0); if (SQL_ERROR == SQL->StmtExecute(stmt)) { SqlStmt_ShowDebug(stmt); flag = false; diff --git a/src/char/int_mail.c b/src/char/int_mail.c index b75a362fb..bf3403b5f 100644 --- a/src/char/int_mail.c +++ b/src/char/int_mail.c @@ -129,7 +129,7 @@ static int inter_mail_fromsql(int char_id, struct mail_data* md) int inter_mail_savemessage(struct mail_message* msg) { StringBuf buf; - SqlStmt* stmt; + struct SqlStmt *stmt; int j; nullpo_ret(msg); diff --git a/src/char/int_party.h b/src/char/int_party.h index e6ad75bb8..62fef4192 100644 --- a/src/char/int_party.h +++ b/src/char/int_party.h @@ -22,9 +22,11 @@ #define CHAR_INT_PARTY_H #include "common/hercules.h" -#include "common/db.h" #include "common/mmo.h" +/* Forward Declarations */ +struct DBMap; // common/db.h + //Party Flags on what to save/delete. enum { PS_CREATE = 0x01, //Create a new party entry (index holds leader's info) @@ -47,7 +49,7 @@ struct party_data { **/ struct inter_party_interface { struct party_data *pt; - DBMap* db; // int party_id -> struct party_data* + struct DBMap *db; // int party_id -> struct party_data* int (*check_lv) (struct party_data *p); void (*calc_state) (struct party_data *p); int (*tosql) (struct party *p, int flag, int index); diff --git a/src/char/int_quest.c b/src/char/int_quest.c index b28c81331..cf93db51e 100644 --- a/src/char/int_quest.c +++ b/src/char/int_quest.c @@ -52,7 +52,7 @@ struct quest *mapif_quests_fromsql(int char_id, int *count) { struct quest *questlog = NULL; struct quest tmp_quest; - SqlStmt *stmt; + struct SqlStmt *stmt; StringBuf buf; int i; int sqlerror = SQL_SUCCESS; diff --git a/src/char/int_storage.c b/src/char/int_storage.c index 705aa02d2..e46a1c80f 100644 --- a/src/char/int_storage.c +++ b/src/char/int_storage.c @@ -277,7 +277,7 @@ int mapif_parse_ItemBoundRetrieve_sub(int fd) { #ifdef GP_BOUND_ITEMS StringBuf buf; - SqlStmt* stmt; + struct SqlStmt *stmt; struct item item; int j, i=0, s=0, bound_qt=0; struct item items[MAX_INVENTORY]; diff --git a/src/char/inter.c b/src/char/inter.c index 4ef94efdf..d277abec9 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -42,6 +42,7 @@ #include "common/nullpo.h" #include "common/showmsg.h" #include "common/socket.h" +#include "common/sql.h" #include "common/strlib.h" #include "common/timer.h" @@ -82,7 +83,7 @@ struct WisData { int64 tick; unsigned char src[24], dst[24], msg[512]; }; -static DBMap* wis_db = NULL; // int wis_id -> struct WisData* +static struct DBMap *wis_db = NULL; // int wis_id -> struct WisData* static int wis_dellist[WISDELLIST_MAX], wis_delnum; #define MAX_JOB_NAMES 150 @@ -967,8 +968,8 @@ int mapif_wis_message(struct WisData *wd) //if (wd->len > 2047-56) wd->len = 2047-56; //Force it to fit to avoid crashes. [Skotlex] if (wd->len < 0) wd->len = 0; - if (wd->len >= sizeof(wd->msg) - 1) - wd->len = sizeof(wd->msg) - 1; + if (wd->len >= (int)sizeof(wd->msg) - 1) + wd->len = (int)sizeof(wd->msg) - 1; WBUFW(buf, 0) = 0x3801; WBUFW(buf, 2) = 56 +wd->len; @@ -1037,7 +1038,7 @@ int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason) * Existence check of WISP data * @see DBApply */ -int inter_check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap) +int inter_check_ttl_wisdata_sub(union DBKey key, struct DBData *data, va_list ap) { int64 tick; struct WisData *wd = DB->data2ptr(data); @@ -1084,7 +1085,6 @@ int mapif_parse_broadcast(int fd) int mapif_parse_WisRequest(int fd) { struct WisData* wd; - static int wisid = 0; char name[NAME_LENGTH]; char esc_name[NAME_LENGTH*2+1];// escaped name char* data; @@ -1124,6 +1124,7 @@ int mapif_parse_WisRequest(int fd) } else { + static int wisid = 0; CREATE(wd, struct WisData, 1); // Whether the failure of previous wisp/page transmission (timeout) @@ -1171,7 +1172,7 @@ int mapif_parse_WisToGM(int fd) { unsigned char buf[2048]; // 0x3003/0x3803 <packet_len>.w <wispname>.24B <min_gm_level>.w <message>.?B - memcpy(WBUFP(buf,0), RFIFOP(fd,0), RFIFOW(fd,2)); + memcpy(WBUFP(buf,0), RFIFOP(fd,0), RFIFOW(fd,2)); // Message contains the NUL terminator (see intif_wis_message_to_gm()) WBUFW(buf, 0) = 0x3803; mapif->sendall(buf, RFIFOW(fd,2)); diff --git a/src/char/inter.h b/src/char/inter.h index b8bcb2def..4e8d113ce 100644 --- a/src/char/inter.h +++ b/src/char/inter.h @@ -23,15 +23,17 @@ #include "common/hercules.h" #include "common/db.h" -#include "common/sql.h" #include <stdarg.h> +/* Forward Declarations */ +struct Sql; // common/sql.h + /** * inter interface **/ struct inter_interface { - Sql* sql_handle; + struct Sql *sql_handle; const char* (*msg_txt) (int msg_number); bool (*msg_config_read) (const char *cfg_name, bool allow_override); void (*do_final_msg) (void); @@ -45,7 +47,7 @@ struct inter_interface { int (*log) (char* fmt, ...); int (*init_sql) (const char *file); int (*mapif_init) (int fd); - int (*check_ttl_wisdata_sub) (DBKey key, DBData *data, va_list ap); + int (*check_ttl_wisdata_sub) (union DBKey key, struct DBData *data, va_list ap); int (*check_ttl_wisdata) (void); int (*check_length) (int fd, int length); int (*parse_frommap) (int fd); diff --git a/src/common/HPM.c b/src/common/HPM.c index fa4025fb8..02b675704 100644 --- a/src/common/HPM.c +++ b/src/common/HPM.c @@ -38,6 +38,7 @@ #include "common/timer.h" #include "common/utils.h" #include "common/nullpo.h" +#include "plugins/HPMHooking.h" #include <stdio.h> #include <stdlib.h> @@ -51,11 +52,12 @@ struct malloc_interface iMalloc_HPM; struct malloc_interface *HPMiMalloc; struct HPM_interface HPM_s; struct HPM_interface *HPM; +struct HPMHooking_core_interface HPMHooking_core_s; /** * (char*) data name -> (unsigned int) HPMDataCheck[] index **/ -DBMap *datacheck_db; +struct DBMap *datacheck_db; int datacheck_version; const struct s_HPMDataCheck *datacheck_data; @@ -341,13 +343,13 @@ void hplugins_removeFromHPData(enum HPluginDataTypes type, uint32 pluginID, stru /* TODO: add ability for tracking using pID for the upcoming runtime load/unload support. */ bool HPM_AddHook(enum HPluginHookType type, const char *target, void *hook, unsigned int pID) { - if (!HPM->hooking) { + if (!HPM->hooking->enabled) { ShowError("HPM:AddHook Fail! '%s' tried to hook to '%s' but HPMHooking is disabled!\n",HPM->pid2name(pID),target); return false; } /* search if target is a known hook point within 'common' */ /* if not check if a sub-hooking list is available (from the server) and run it by */ - if (HPM->addhook_sub && HPM->addhook_sub(type,target,hook,pID)) + if (HPM->hooking->addhook_sub != NULL && HPM->hooking->addhook_sub(type,target,hook,pID)) return true; ShowError("HPM:AddHook: unknown Hooking Point '%s'!\n",target); @@ -358,12 +360,12 @@ bool HPM_AddHook(enum HPluginHookType type, const char *target, void *hook, unsi void HPM_HookStop(const char *func, unsigned int pID) { /* track? */ - HPM->force_return = true; + HPM->hooking->force_return = true; } -bool HPM_HookStopped (void) +bool HPM_HookStopped(void) { - return HPM->force_return; + return HPM->hooking->force_return; } /** @@ -567,16 +569,20 @@ struct hplugin *hplugin_load(const char* filename) { plugin->hpi->addToHPData = hplugins_addToHPData; plugin->hpi->getFromHPData = hplugins_getFromHPData; plugin->hpi->removeFromHPData = hplugins_removeFromHPData; - plugin->hpi->AddHook = HPM_AddHook; - plugin->hpi->HookStop = HPM_HookStop; - plugin->hpi->HookStopped = HPM_HookStopped; plugin->hpi->addArg = hpm_add_arg; plugin->hpi->addConf = hplugins_addconf; + if ((plugin->hpi->hooking = plugin_import(plugin->dll, "HPMHooking_s", struct HPMHooking_interface *)) != NULL) { + plugin->hpi->hooking->AddHook = HPM_AddHook; + plugin->hpi->hooking->HookStop = HPM_HookStop; + plugin->hpi->hooking->HookStopped = HPM_HookStopped; + } /* server specific */ if( HPM->load_sub ) HPM->load_sub(plugin); - ShowStatus("HPM: Loaded plugin '"CL_WHITE"%s"CL_RESET"' (%s).\n", plugin->info->name, plugin->info->version); + ShowStatus("HPM: Loaded plugin '"CL_WHITE"%s"CL_RESET"' (%s)%s.\n", + plugin->info->name, plugin->info->version, + plugin->hpi->hooking != NULL ? " built with HPMHooking support" : ""); return plugin; } @@ -660,12 +666,13 @@ void hplugins_config_read(void) { bool (*addhook_sub) (enum HPluginHookType type, const char *target, void *hook, unsigned int pID); if ((func = plugin_import(plugin->dll, "Hooked",const char * (*)(bool *))) != NULL && (addhook_sub = plugin_import(plugin->dll, "HPM_Plugin_AddHook",bool (*)(enum HPluginHookType, const char *, void *, unsigned int))) != NULL) { - const char *failed = func(&HPM->force_return); + const char *failed = func(&HPM->hooking->force_return); if (failed) { ShowError("HPM: failed to retrieve '%s' for '"CL_WHITE"%s"CL_RESET"'!\n", failed, plugin_name); } else { - HPM->hooking = true; - HPM->addhook_sub = addhook_sub; + HPM->hooking->enabled = true; + HPM->hooking->addhook_sub = addhook_sub; + HPM->hooking->Hooked = func; // The purpose of this is type-checking 'func' at compile time. } } } @@ -1046,11 +1053,10 @@ void hpm_final(void) void hpm_defaults(void) { HPM = &HPM_s; + HPM->hooking = &HPMHooking_core_s; memset(&HPM->filenames, 0, sizeof(HPM->filenames)); VECTOR_INIT(HPM->cmdline_load_plugins); - HPM->force_return = false; - HPM->hooking = false; /* */ HPM->init = hpm_init; HPM->final = hpm_final; @@ -1067,7 +1073,6 @@ void hpm_defaults(void) HPM->pid2name = hplugins_id2name; HPM->parse_packets = hplugins_parse_packets; HPM->load_sub = NULL; - HPM->addhook_sub = NULL; HPM->parseConf = hplugins_parse_conf; HPM->getBattleConf = hplugins_get_battle_conf; HPM->DataCheck = HPM_DataCheck; @@ -1078,4 +1083,9 @@ void hpm_defaults(void) HPM->data_store_create = hplugin_data_store_create; HPM->data_store_validate = hplugin_data_store_validate; HPM->data_store_validate_sub = NULL; + + HPM->hooking->enabled = false; + HPM->hooking->force_return = false; + HPM->hooking->addhook_sub = NULL; + HPM->hooking->Hooked = NULL; } diff --git a/src/common/HPM.h b/src/common/HPM.h index 109549aad..0b1275fde 100644 --- a/src/common/HPM.h +++ b/src/common/HPM.h @@ -65,6 +65,8 @@ #endif // WIN32 +struct HPMHooking_core_interface; + struct hplugin { DLL dll; unsigned int idx; @@ -126,9 +128,6 @@ struct HPM_interface { /* vars */ unsigned int version[2]; bool off; - bool hooking; - /* hooking */ - bool force_return; /* data */ VECTOR_DECL(struct hplugin *) plugins; VECTOR_DECL(struct hpm_symbol *) symbols; @@ -159,7 +158,6 @@ struct HPM_interface { char *(*pid2name) (unsigned int pid); unsigned char (*parse_packets) (int fd, int packet_id, enum HPluginPacketHookingPoints point); void (*load_sub) (struct hplugin *plugin); - bool (*addhook_sub) (enum HPluginHookType type, const char *target, void *hook, unsigned int pID); /* for custom config parsing */ bool (*parseConf) (const char *w1, const char *w2, enum HPluginConfType point); bool (*getBattleConf) (const char* w1, int *value); @@ -173,6 +171,9 @@ struct HPM_interface { bool (*data_store_validate) (enum HPluginDataTypes type, struct hplugin_data_store **storeptr, bool initialize); /* for server-specific HPData e.g. map_session_data */ bool (*data_store_validate_sub) (enum HPluginDataTypes type, struct hplugin_data_store **storeptr, bool initialize); + + /* hooking */ + struct HPMHooking_core_interface *hooking; }; CMDLINEARG(loadplugin); diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h index 7e88b5a34..3d25d7330 100644 --- a/src/common/HPMDataCheck.h +++ b/src/common/HPMDataCheck.h @@ -270,6 +270,32 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { #else #define LOGIN_ACCOUNT_H #endif // LOGIN_ACCOUNT_H + #ifdef LOGIN_LCLIF_H + { "lclif_interface", sizeof(struct lclif_interface), SERVER_TYPE_LOGIN }, + { "login_packet_db", sizeof(struct login_packet_db), SERVER_TYPE_LOGIN }, + #else + #define LOGIN_LCLIF_H + #endif // LOGIN_LCLIF_H + #ifdef LOGIN_LCLIF_P_H + { "lclif_interface_dbs", sizeof(struct lclif_interface_dbs), SERVER_TYPE_LOGIN }, + { "lclif_interface_private", sizeof(struct lclif_interface_private), SERVER_TYPE_LOGIN }, + { "packet_AC_ACCEPT_LOGIN", sizeof(struct packet_AC_ACCEPT_LOGIN), SERVER_TYPE_LOGIN }, + { "packet_AC_REFUSE_LOGIN", sizeof(struct packet_AC_REFUSE_LOGIN), SERVER_TYPE_LOGIN }, + { "packet_AC_REFUSE_LOGIN_R2", sizeof(struct packet_AC_REFUSE_LOGIN_R2), SERVER_TYPE_LOGIN }, + { "packet_CA_CHARSERVERCONNECT", sizeof(struct packet_CA_CHARSERVERCONNECT), SERVER_TYPE_LOGIN }, + { "packet_CA_CONNECT_INFO_CHANGED", sizeof(struct packet_CA_CONNECT_INFO_CHANGED), SERVER_TYPE_LOGIN }, + { "packet_CA_EXE_HASHCHECK", sizeof(struct packet_CA_EXE_HASHCHECK), SERVER_TYPE_LOGIN }, + { "packet_CA_LOGIN", sizeof(struct packet_CA_LOGIN), SERVER_TYPE_LOGIN }, + { "packet_CA_LOGIN2", sizeof(struct packet_CA_LOGIN2), SERVER_TYPE_LOGIN }, + { "packet_CA_LOGIN3", sizeof(struct packet_CA_LOGIN3), SERVER_TYPE_LOGIN }, + { "packet_CA_LOGIN4", sizeof(struct packet_CA_LOGIN4), SERVER_TYPE_LOGIN }, + { "packet_CA_LOGIN_HAN", sizeof(struct packet_CA_LOGIN_HAN), SERVER_TYPE_LOGIN }, + { "packet_CA_LOGIN_PCBANG", sizeof(struct packet_CA_LOGIN_PCBANG), SERVER_TYPE_LOGIN }, + { "packet_CA_SSO_LOGIN_REQ", sizeof(struct packet_CA_SSO_LOGIN_REQ), SERVER_TYPE_LOGIN }, + { "packet_SC_NOTIFY_BAN", sizeof(struct packet_SC_NOTIFY_BAN), SERVER_TYPE_LOGIN }, + #else + #define LOGIN_LCLIF_P_H + #endif // LOGIN_LCLIF_P_H #ifdef LOGIN_LOGIN_H { "Login_Config", sizeof(struct Login_Config), SERVER_TYPE_LOGIN }, { "client_hash_node", sizeof(struct client_hash_node), SERVER_TYPE_LOGIN }, @@ -388,6 +414,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { #ifdef MAP_IRC_BOT_H { "irc_bot_interface", sizeof(struct irc_bot_interface), SERVER_TYPE_MAP }, { "irc_func", sizeof(struct irc_func), SERVER_TYPE_MAP }, + { "message_flood", sizeof(struct message_flood), SERVER_TYPE_MAP }, #else #define MAP_IRC_BOT_H #endif // MAP_IRC_BOT_H @@ -506,6 +533,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { { "packet_bgqueue_revoke_req", sizeof(struct packet_bgqueue_revoke_req), SERVER_TYPE_MAP }, { "packet_bgqueue_update_info", sizeof(struct packet_bgqueue_update_info), SERVER_TYPE_MAP }, { "packet_cart_additem_ack", sizeof(struct packet_cart_additem_ack), SERVER_TYPE_MAP }, + { "packet_chat_message", sizeof(struct packet_chat_message), SERVER_TYPE_MAP }, { "packet_damage", sizeof(struct packet_damage), SERVER_TYPE_MAP }, { "packet_dropflooritem", sizeof(struct packet_dropflooritem), SERVER_TYPE_MAP }, { "packet_equip_item", sizeof(struct packet_equip_item), SERVER_TYPE_MAP }, @@ -548,6 +576,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { { "packet_unequipitem_ack", sizeof(struct packet_unequipitem_ack), SERVER_TYPE_MAP }, { "packet_unit_walking", sizeof(struct packet_unit_walking), SERVER_TYPE_MAP }, { "packet_viewequip_ack", sizeof(struct packet_viewequip_ack), SERVER_TYPE_MAP }, + { "packet_whisper_message", sizeof(struct packet_whisper_message), SERVER_TYPE_MAP }, { "packet_wis_end", sizeof(struct packet_wis_end), SERVER_TYPE_MAP }, #else #define MAP_PACKETS_STRUCT_H diff --git a/src/common/HPMSymbols.inc.h b/src/common/HPMSymbols.inc.h index b06c43bf8..a6bf1622b 100644 --- a/src/common/HPMSymbols.inc.h +++ b/src/common/HPMSymbols.inc.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2015-2016 Hercules Dev Team + * Copyright (C) 2013-2016 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -129,6 +129,9 @@ struct irc_bot_interface *ircbot; #ifdef MAP_ITEMDB_H /* itemdb */ struct itemdb_interface *itemdb; #endif // MAP_ITEMDB_H +#ifdef LOGIN_LCLIF_H /* lclif */ +struct lclif_interface *lclif; +#endif // LOGIN_LCLIF_H #ifdef COMMON_CONF_H /* libconfig */ struct libconfig_interface *libconfig; #endif // COMMON_CONF_H @@ -358,6 +361,9 @@ if ((server_type&(SERVER_TYPE_MAP)) && !HPM_SYMBOL("ircbot", ircbot)) return "ir #ifdef MAP_ITEMDB_H /* itemdb */ if ((server_type&(SERVER_TYPE_MAP)) && !HPM_SYMBOL("itemdb", itemdb)) return "itemdb"; #endif // MAP_ITEMDB_H +#ifdef LOGIN_LCLIF_H /* lclif */ +if ((server_type&(SERVER_TYPE_LOGIN)) && !HPM_SYMBOL("lclif", lclif)) return "lclif"; +#endif // LOGIN_LCLIF_H #ifdef COMMON_CONF_H /* libconfig */ if ((server_type&(SERVER_TYPE_ALL)) && !HPM_SYMBOL("libconfig", libconfig)) return "libconfig"; #endif // COMMON_CONF_H diff --git a/src/common/HPMi.h b/src/common/HPMi.h index cf3e16277..e16eb1d75 100644 --- a/src/common/HPMi.h +++ b/src/common/HPMi.h @@ -24,15 +24,16 @@ #include "common/console.h" #include "common/core.h" #include "common/showmsg.h" -#include "common/sql.h" +struct HPMHooking_interface; +struct Sql; // common/sql.h struct script_state; struct AtCommandInfo; struct socket_data; struct map_session_data; struct hplugin_data_store; -#define HPM_VERSION "1.1" +#define HPM_VERSION "1.2" #define HPM_ADDCONF_LENGTH 40 struct hplugin_info { @@ -71,11 +72,6 @@ enum HPluginPacketHookingPoints { hpPHP_MAX, }; -enum HPluginHookType { - HOOK_TYPE_PRE, - HOOK_TYPE_POST, -}; - /** * Data types for plugin custom data. */ @@ -107,13 +103,6 @@ enum HPluginConfType { HPCT_MAX, }; -#define addHookPre(tname,hook) (HPMi->AddHook(HOOK_TYPE_PRE,(tname),(hook),HPMi->pid)) -#define addHookPost(tname,hook) (HPMi->AddHook(HOOK_TYPE_POST,(tname),(hook),HPMi->pid)) -/* need better names ;/ */ -/* will not run the original function after pre-hook processing is complete (other hooks will run) */ -#define hookStop() (HPMi->HookStop(__func__,HPMi->pid)) -#define hookStopped() (HPMi->HookStopped()) - #define addArg(name, param,func,help) (HPMi->addArg(HPMi->pid,(name),(param),(cmdline_arg_ ## func),(help))) /* HPData handy redirects */ /* session[] */ @@ -231,10 +220,6 @@ struct HPMi_interface { void (*removeFromHPData) (enum HPluginDataTypes type, uint32 pluginID, struct hplugin_data_store *store, uint32 classid); /* packet */ bool (*addPacket) (unsigned short cmd, unsigned short length, void (*receive)(int fd), unsigned int point, unsigned int pluginID); - /* Hooking */ - bool (*AddHook) (enum HPluginHookType type, const char *target, void *hook, unsigned int pID); - void (*HookStop) (const char *func, unsigned int pID); - bool (*HookStopped) (void); /* program --arg/-a */ bool (*addArg) (unsigned int pluginID, char *name, bool has_param, CmdlineExecFunc func, const char *help); /* battle-config recv param */ @@ -242,7 +227,10 @@ struct HPMi_interface { /* pc group permission */ void (*addPCGPermission) (unsigned int pluginID, char *name, unsigned int *mask); - Sql *sql_handle; + struct Sql *sql_handle; + + /* Hooking */ + struct HPMHooking_interface *hooking; }; #ifdef HERCULES_CORE #define HPM_SYMBOL(n, s) (HPM->share((s), (n)), true) diff --git a/src/common/Makefile.in b/src/common/Makefile.in index 9d4b2d044..6e7ffa088 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team +# Copyright (C) 2012-2016 Hercules Dev Team # Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify @@ -50,7 +50,9 @@ COMMON_C += console.c core.c memmgr.c socket.c COMMON_H = atomic.h cbasetypes.h conf.h console.h core.h db.h des.h ers.h \ grfio.h hercules.h HPM.h HPMi.h memmgr.h mapindex.h md5calc.h \ mmo.h mutex.h nullpo.h random.h showmsg.h socket.h spinlock.h \ - sql.h strlib.h sysinfo.h thread.h timer.h utils.h winapi.h + sql.h strlib.h sysinfo.h thread.h timer.h utils.h winapi.h \ + ../plugins/HPMHooking.h +COMMON_PH = COMMON_SQL_OBJ = obj_sql/sql.o COMMON_SQL_H = sql.h @@ -95,7 +97,7 @@ help: Makefile: Makefile.in @$(MAKE) -C ../.. src/common/Makefile -$(SYSINFO_INC): $(COMMON_C) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) +$(SYSINFO_INC): $(COMMON_C) $(COMMON_PH) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " MAKE $@" @$(MAKE) -C ../.. sysinfo @@ -131,25 +133,27 @@ common_mini: $(COMMON_MINI_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) obj_all/common common_sql: $(COMMON_SQL_OBJ) obj_sql/common_sql.a Makefile -obj_all/sysinfo.o: sysinfo.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) $(SYSINFO_INC) | obj_all +# missing object files +$(MT19937AR_OBJ): + @echo " MAKE $@" + @$(MAKE) -C $(MT19937AR_D) + +$(LIBCONFIG_OBJ): + @echo " MAKE $@" + @$(MAKE) -C $(LIBCONFIG_D) + +.SECONDEXPANSION: + +obj_all/sysinfo.o: sysinfo.c $(filter sysinfo.p.h, $(COMMON_PH)) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) $(SYSINFO_INC) | obj_all obj_all/%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_all @echo " CC $<" @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< -obj_all/mini%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_all +obj_all/mini%.o: %.c $$(filter %.p.h, $(COMMON_PH)) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_all @echo " CC $<" @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $< -obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H) $(CONFIG_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_sql +obj_sql/%.o: %.c $$(filter %.p.h, $(COMMON_PH)) $(COMMON_H) $(COMMON_SQL_H) $(CONFIG_H) $(LIBCONFIG_H) | $(SYSINFO_INC) obj_sql @echo " CC $<" @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< - -# missing object files -$(MT19937AR_OBJ): - @echo " MAKE $@" - @$(MAKE) -C $(MT19937AR_D) - -$(LIBCONFIG_OBJ): - @echo " MAKE $@" - @$(MAKE) -C $(LIBCONFIG_D) diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index 6843ce486..d3db86543 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -118,16 +118,6 @@ #include <limits.h> #include <time.h> -// temporary fix for bugreport:4961 (unintended conversion from signed to unsigned) -// (-20 >= UCHAR_MAX) returns true -// (-20 >= USHRT_MAX) returns true -#if defined(__FreeBSD__) && defined(__x86_64) -#undef UCHAR_MAX -#define UCHAR_MAX ((unsigned char)0xff) -#undef USHRT_MAX -#define USHRT_MAX ((unsigned short)0xffff) -#endif - // ILP64 isn't supported, so always 32 bits? #ifndef UINT_MAX #define UINT_MAX 0xffffffff @@ -262,16 +252,13 @@ typedef uintptr_t uintptr; #if defined(__BORLANDC__) || _MSC_VER < 1900 #define snprintf _snprintf #endif -#if defined(_MSC_VER) && _MSC_VER < 1400 -#define vsnprintf _vsnprintf -#endif #else #define strcmpi strcasecmp #define stricmp strcasecmp #define strncmpi strncasecmp #define strnicmp strncasecmp #endif -#if defined(_MSC_VER) && _MSC_VER > 1200 +#if defined(_MSC_VER) #define strtoull _strtoui64 #define strtoll _strtoi64 #endif @@ -295,6 +282,21 @@ typedef uintptr_t uintptr; #define analyzer_noreturn #endif +// gcc version (if any) - borrowed from Mana Plus +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) +#else +#define GCC_VERSION 0 +#endif + +// Pragma macro only enabled on gcc >= 4.5 or clang - borrowed from Mana Plus +#if defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40500) +#define PRAGMA_GCC45(str) _Pragma(#str) +#else // ! defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40500) +#define PRAGMA_GCC45(str) +#endif // ! defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40500) // boolean types for C #if !defined(_MSC_VER) || _MSC_VER >= 1800 @@ -327,24 +329,6 @@ typedef char bool; //#define swap(a,b) if (a != b) ((a ^= b), (b ^= a), (a ^= b)) // but is vulnerable to 'if (foo) swap(bar, baz); else quux();', causing the else to nest incorrectly. #define swap(a,b) do { if ((a) != (b)) { (a) ^= (b); (b) ^= (a); (a) ^= (b); } } while(0) -#if 0 //to be activated soon, more tests needed on how VS works with the macro above -#ifdef WIN32 -#undef swap -#define swap(a,b)__asm { \ - __asm mov eax, dword ptr [a] \ - __asm cmp eax, dword ptr [b] \ - __asm je _ret \ - __asm xor eax, dword ptr [b] \ - __asm mov dword ptr [a], eax \ - __asm xor eax, dword ptr [b] \ - __asm mov dword ptr [b], eax \ - __asm xor eax, dword ptr [a] \ - __asm mov dword ptr [a], eax \ - __asm _ret: \ -} -#endif -#endif - #define swap_ptr(a,b) do { if ((a) != (b)) (a) = (void*)((intptr_t)(a) ^ (intptr_t)(b)); (b) = (void*)((intptr_t)(a) ^ (intptr_t)(b)); (a) = (void*)((intptr_t)(a) ^ (intptr_t)(b)); } while(0) #ifndef max diff --git a/src/common/console.c b/src/common/console.c index 10e1bee1a..0be33e5c3 100644 --- a/src/common/console.c +++ b/src/common/console.c @@ -523,7 +523,8 @@ void console_parse_init(void) { timer->add_func_list(console->input->parse_timer, "console_parse_timer"); timer->add_interval(timer->gettick() + 1000, console->input->parse_timer, 0, 0, 500);/* start listening in 1s; re-try every 0.5s */ } -void console_setSQL(Sql *SQL_handle) { +void console_setSQL(struct Sql *SQL_handle) +{ console->input->SQL = SQL_handle; } #endif /* CONSOLE_INPUT */ diff --git a/src/common/console.h b/src/common/console.h index 43f48b865..57c750a7d 100644 --- a/src/common/console.h +++ b/src/common/console.h @@ -24,9 +24,11 @@ #include "common/db.h" #include "common/mutex.h" #include "common/spinlock.h" -#include "common/sql.h" #include "common/thread.h" +/* Forward Declarations */ +struct Sql; // common/sql.h + /** * Queue Max * why is there a limit, why not make it dynamic? - I'm playing it safe, I'd rather not play with memory management between threads @@ -78,7 +80,7 @@ struct console_input_interface { VECTOR_DECL(struct CParseEntry *) command_list; VECTOR_DECL(struct CParseEntry *) commands; /* */ - Sql *SQL; + struct Sql *SQL; /* */ void (*parse_init) (void); void (*parse_final) (void); @@ -90,7 +92,7 @@ struct console_input_interface { void (*load_defaults) (void); void (*parse_list_subs) (struct CParseEntry *cmd, unsigned char depth); void (*addCommand) (char *name, CParseFunc func); - void (*setSQL) (Sql *SQL_handle); + void (*setSQL) (struct Sql *SQL_handle); #else // not CONSOLE_INPUT UNAVAILABLE_STRUCT; #endif diff --git a/src/common/db.c b/src/common/db.c index ca9a70f7c..bbcac4b33 100644 --- a/src/common/db.c +++ b/src/common/db.c @@ -21,7 +21,7 @@ /*****************************************************************************\ * This file is separated in five sections: - * (1) Private typedefs, enums, structures, defines and global variables + * (1) Private enums, structures, defines and global variables * (2) Private functions * (3) Protected functions used internally * (4) Protected functions used in the interface of the database @@ -102,17 +102,17 @@ struct db_interface DB_s; struct db_interface *DB; -/*****************************************************************************\ - * (1) Private typedefs, enums, structures, defines and global variables of * - * the database system. * - * DB_ENABLE_STATS - Define to enable database statistics. * - * HASH_SIZE - Define with the size of the hashtable. * - * DBNColor - Enumeration of colors of the nodes. * - * DBNode - Structure of a node in RED-BLACK trees. * - * struct db_free - Structure that holds a deleted node to be freed. * - * DBMap_impl - Structure of the database. * - * stats - Statistics about the database system. * -\*****************************************************************************/ +/***************************************************************************** + * (1) Private enums, structures, defines and global variables of the * + * database system. * + * DB_ENABLE_STATS - Define to enable database statistics. * + * HASH_SIZE - Define with the size of the hashtable. * + * enum DBNodeColor - Enumeration of colors of the nodes. * + * struct DBNode - Structure of a node in RED-BLACK trees. * + * struct db_free - Structure that holds a deleted node to be freed. * + * struct DBMap_impl - Structure of the database. * + * stats - Statistics about the database system. * + *****************************************************************************/ /** * If defined statistics about database nodes, database creating/destruction @@ -129,19 +129,19 @@ struct db_interface *DB; /** * Size of the hashtable in the database. * @private - * @see DBMap_impl#ht + * @see struct DBMap_impl#ht */ #define HASH_SIZE (256+27) /** * The color of individual nodes. * @private - * @see struct dbn + * @see struct DBNode */ -typedef enum node_color { +enum DBNodeColor { RED, - BLACK -} node_color; + BLACK, +}; /** * A node in a RED-BLACK tree of the database. @@ -153,31 +153,31 @@ typedef enum node_color { * @param deleted If the node is deleted * @param color Color of the node * @private - * @see DBMap_impl#ht + * @see struct DBMap_impl#ht */ -typedef struct dbn { +struct DBNode { // Tree structure - struct dbn *parent; - struct dbn *left; - struct dbn *right; + struct DBNode *parent; + struct DBNode *left; + struct DBNode *right; // Node data - DBKey key; - DBData data; + union DBKey key; + struct DBData data; // Other - node_color color; + enum DBNodeColor color; unsigned deleted : 1; -} DBNode; +}; /** * Structure that holds a deleted node. * @param node Deleted node * @param root Address to the root of the tree * @private - * @see DBMap_impl#free_list + * @see struct DBMap_impl#free_list */ struct db_free { - DBNode *node; - DBNode **root; + struct DBNode *node; + struct DBNode **root; }; /** @@ -200,9 +200,9 @@ struct db_free { * @param maxlen Maximum length of strings in DB_STRING and DB_ISTRING databases * @param global_lock Global lock of the database * @private - * @see #db_alloc(const char*,int,DBType,DBOptions,unsigned short) + * @see #db_alloc() */ -typedef struct DBMap_impl { +struct DBMap_impl { // Database interface struct DBMap vtable; // File and line of allocation @@ -218,14 +218,14 @@ typedef struct DBMap_impl { DBComparator cmp; DBHasher hash; DBReleaser release; - DBNode *ht[HASH_SIZE]; - DBNode *cache; - DBType type; - DBOptions options; + struct DBNode *ht[HASH_SIZE]; + struct DBNode *cache; + enum DBType type; + enum DBOptions options; uint32 item_count; unsigned short maxlen; unsigned global_lock : 1; -} DBMap_impl; +}; /** * Complete iterator structure. @@ -234,17 +234,17 @@ typedef struct DBMap_impl { * @param ht_index Current index of the hashtable * @param node Current node * @private - * @see #DBIterator - * @see #DBMap_impl - * @see #DBNode + * @see struct DBIterator + * @see struct DBMap_impl + * @see struct DBNode */ -typedef struct DBIterator_impl { +struct DBIterator_impl { // Iterator interface struct DBIterator vtable; - DBMap_impl* db; + struct DBMap_impl *db; int ht_index; - DBNode *node; -} DBIterator_impl; + struct DBNode *node; +}; #if defined(DB_ENABLE_STATS) /** @@ -382,12 +382,12 @@ struct eri *db_alloc_ers; * @param node Node to be rotated * @param root Pointer to the root of the tree * @private - * @see #db_rebalance(DBNode *,DBNode **) - * @see #db_rebalance_erase(DBNode *,DBNode **) + * @see #db_rebalance() + * @see #db_rebalance_erase() */ -static void db_rotate_left(DBNode *node, DBNode **root) +static void db_rotate_left(struct DBNode *node, struct DBNode **root) { - DBNode *y = node->right; + struct DBNode *y = node->right; DB_COUNTSTAT(db_rotate_left); // put the left of y at the right of node @@ -413,12 +413,12 @@ static void db_rotate_left(DBNode *node, DBNode **root) * @param node Node to be rotated * @param root Pointer to the root of the tree * @private - * @see #db_rebalance(DBNode *,DBNode **) - * @see #db_rebalance_erase(DBNode *,DBNode **) + * @see #db_rebalance() + * @see #db_rebalance_erase() */ -static void db_rotate_right(DBNode *node, DBNode **root) +static void db_rotate_right(struct DBNode *node, struct DBNode **root) { - DBNode *y = node->left; + struct DBNode *y = node->left; DB_COUNTSTAT(db_rotate_right); // put the right of y at the left of node @@ -445,13 +445,13 @@ static void db_rotate_right(DBNode *node, DBNode **root) * @param node Node to be rebalanced * @param root Pointer to the root of the tree * @private - * @see #db_rotate_left(DBNode *,DBNode **) - * @see #db_rotate_right(DBNode *,DBNode **) - * @see #db_obj_put(DBMap*,DBKey,DBData) + * @see #db_rotate_left() + * @see #db_rotate_right() + * @see #db_obj_put() */ -static void db_rebalance(DBNode *node, DBNode **root) +static void db_rebalance(struct DBNode *node, struct DBNode **root) { - DBNode *y; + struct DBNode *y; DB_COUNTSTAT(db_rebalance); // Restore the RED-BLACK properties @@ -507,15 +507,15 @@ static void db_rebalance(DBNode *node, DBNode **root) * @param node Node to be erased from the tree * @param root Root of the tree * @private - * @see #db_rotate_left(DBNode *,DBNode **) - * @see #db_rotate_right(DBNode *,DBNode **) - * @see #db_free_unlock(DBMap_impl*) + * @see #db_rotate_left() + * @see #db_rotate_right() + * @see #db_free_unlock() */ -static void db_rebalance_erase(DBNode *node, DBNode **root) +static void db_rebalance_erase(struct DBNode *node, struct DBNode **root) { - DBNode *y = node; - DBNode *x = NULL; - DBNode *x_parent = NULL; + struct DBNode *y = node; + struct DBNode *x = NULL; + struct DBNode *x_parent = NULL; DB_COUNTSTAT(db_rebalance_erase); // Select where to change the tree @@ -561,7 +561,7 @@ static void db_rebalance_erase(DBNode *node, DBNode **root) y->parent = node->parent; // switch colors { - node_color tmp = y->color; + enum DBNodeColor tmp = y->color; y->color = node->color; node->color = tmp; } @@ -583,7 +583,7 @@ static void db_rebalance_erase(DBNode *node, DBNode **root) // Restore the RED-BLACK properties if (y->color != RED) { while (x != *root && (x == NULL || x->color == BLACK)) { - DBNode *w; + struct DBNode *w; if (x == x_parent->left) { w = x_parent->right; if (w->color == RED) { @@ -648,11 +648,11 @@ static void db_rebalance_erase(DBNode *node, DBNode **root) * @param key Key being tested * @return not 0 if considered NULL, 0 otherwise * @private - * @see #db_obj_get(DBMap*,DBKey) - * @see #db_obj_put(DBMap*,DBKey,DBData) - * @see #db_obj_remove(DBMap*,DBKey) + * @see #db_obj_get() + * @see #db_obj_put() + * @see #db_obj_remove() */ -static int db_is_key_null(DBType type, DBKey key) +static int db_is_key_null(enum DBType type, union DBKey key) { DB_COUNTSTAT(db_is_key_null); switch (type) { @@ -671,26 +671,26 @@ static int db_is_key_null(DBType type, DBKey key) * @param key Key to be duplicated * @param Duplicated key * @private - * @see #db_free_add(DBMap_impl*,DBNode *,DBNode **) - * @see #db_free_remove(DBMap_impl*,DBNode *) - * @see #db_obj_put(DBMap*,DBKey,void *) - * @see #db_dup_key_free(DBMap_impl*,DBKey) + * @see #db_free_add() + * @see #db_free_remove() + * @see #db_obj_put() + * @see #db_dup_key_free() */ -static DBKey db_dup_key(DBMap_impl* db, DBKey key) +static union DBKey db_dup_key(struct DBMap_impl *db, union DBKey key) { - char *str; - size_t len; - DB_COUNTSTAT(db_dup_key); switch (db->type) { case DB_STRING: case DB_ISTRING: - len = strnlen(key.str, db->maxlen); - str = (char*)aMalloc(len + 1); + { + size_t len = strnlen(key.str, db->maxlen); + char *str = aMalloc(len + 1); + memcpy(str, key.str, len); str[len] = '\0'; - key.str = str; + key.mutstr = str; return key; + } default: return key; @@ -702,15 +702,15 @@ static DBKey db_dup_key(DBMap_impl* db, DBKey key) * @param db Database the key is being used in * @param key Key to be freed * @private - * @see #db_dup_key(DBMap_impl*,DBKey) + * @see #db_dup_key() */ -static void db_dup_key_free(DBMap_impl* db, DBKey key) +static void db_dup_key_free(struct DBMap_impl *db, union DBKey key) { DB_COUNTSTAT(db_dup_key_free); switch (db->type) { case DB_STRING: case DB_ISTRING: - aFree((char*)key.str); + aFree(key.mutstr); return; default: @@ -727,15 +727,15 @@ static void db_dup_key_free(DBMap_impl* db, DBKey key) * @param node Target node * @private * @see #struct db_free - * @see DBMap_impl#free_list - * @see DBMap_impl#free_count - * @see DBMap_impl#free_max - * @see #db_obj_remove(DBMap*,DBKey) - * @see #db_free_remove(DBMap_impl*,DBNode *) + * @see struct DBMap_impl#free_list + * @see struct DBMap_impl#free_count + * @see struct DBMap_impl#free_max + * @see #db_obj_remove() + * @see #db_free_remove() */ -static void db_free_add(DBMap_impl* db, DBNode *node, DBNode **root) +static void db_free_add(struct DBMap_impl *db, struct DBNode *node, struct DBNode **root) { - DBKey old_key; + union DBKey old_key; DB_COUNTSTAT(db_free_add); if (db->free_lock == (unsigned int)~0) { @@ -777,12 +777,12 @@ static void db_free_add(DBMap_impl* db, DBNode *node, DBNode **root) * @param node Node being removed from free_list * @private * @see #struct db_free - * @see DBMap_impl#free_list - * @see DBMap_impl#free_count - * @see #db_obj_put(DBMap*,DBKey,DBData) - * @see #db_free_add(DBMap_impl*,DBNode**,DBNode*) + * @see struct DBMap_impl#free_list + * @see struct DBMap_impl#free_count + * @see #db_obj_put() + * @see #db_free_add() */ -static void db_free_remove(DBMap_impl* db, DBNode *node) +static void db_free_remove(struct DBMap_impl *db, struct DBNode *node) { unsigned int i; @@ -808,10 +808,10 @@ static void db_free_remove(DBMap_impl* db, DBNode *node) * Increment the free_lock of the database. * @param db Target database * @private - * @see DBMap_impl#free_lock - * @see #db_unlock(DBMap_impl*) + * @see struct DBMap_impl#free_lock + * @see #db_unlock() */ -static void db_free_lock(DBMap_impl* db) +static void db_free_lock(struct DBMap_impl *db) { DB_COUNTSTAT(db_free_lock); if (db->free_lock == (unsigned int)~0) { @@ -830,11 +830,11 @@ static void db_free_lock(DBMap_impl* db) * NOTE: Frees the duplicated keys of the nodes * @param db Target database * @private - * @see DBMap_impl#free_lock - * @see #db_free_dbn(DBNode*) - * @see #db_lock(DBMap_impl*) + * @see struct DBMap_impl#free_lock + * @see #db_free_dbn() + * @see #db_lock() */ -static void db_free_unlock(DBMap_impl* db) +static void db_free_unlock(struct DBMap_impl *db) { unsigned int i; @@ -889,11 +889,11 @@ static void db_free_unlock(DBMap_impl* db) * @param key2 Key being compared to * @param maxlen Maximum length of the key to hash * @return 0 if equal, negative if lower and positive if higher - * @see DBType#DB_INT + * @see enum DBType#DB_INT * @see #DBComparator - * @see #db_default_cmp(DBType) + * @see #db_default_cmp() */ -static int db_int_cmp(DBKey key1, DBKey key2, unsigned short maxlen) +static int db_int_cmp(union DBKey key1, union DBKey key2, unsigned short maxlen) { (void)maxlen;//not used DB_COUNTSTAT(db_int_cmp); @@ -911,11 +911,11 @@ static int db_int_cmp(DBKey key1, DBKey key2, unsigned short maxlen) * @param key2 Key being compared to * @param maxlen Maximum length of the key to hash * @return 0 if equal, negative if lower and positive if higher - * @see DBType#DB_UINT + * @see enum DBType#DB_UINT * @see #DBComparator - * @see #db_default_cmp(DBType) + * @see #db_default_cmp() */ -static int db_uint_cmp(DBKey key1, DBKey key2, unsigned short maxlen) +static int db_uint_cmp(union DBKey key1, union DBKey key2, unsigned short maxlen) { (void)maxlen;//not used DB_COUNTSTAT(db_uint_cmp); @@ -932,11 +932,11 @@ static int db_uint_cmp(DBKey key1, DBKey key2, unsigned short maxlen) * @param key2 Key being compared to * @param maxlen Maximum length of the key to hash * @return 0 if equal, negative if lower and positive if higher - * @see DBType#DB_STRING + * @see enum DBType#DB_STRING * @see #DBComparator - * @see #db_default_cmp(DBType) + * @see #db_default_cmp() */ -static int db_string_cmp(DBKey key1, DBKey key2, unsigned short maxlen) +static int db_string_cmp(union DBKey key1, union DBKey key2, unsigned short maxlen) { DB_COUNTSTAT(db_string_cmp); return strncmp((const char *)key1.str, (const char *)key2.str, maxlen); @@ -950,11 +950,11 @@ static int db_string_cmp(DBKey key1, DBKey key2, unsigned short maxlen) * @param key2 Key being compared to * @param maxlen Maximum length of the key to hash * @return 0 if equal, negative if lower and positive if higher - * @see DBType#DB_ISTRING + * @see enum DBType#DB_ISTRING * @see #DBComparator - * @see #db_default_cmp(DBType) + * @see #db_default_cmp() */ -static int db_istring_cmp(DBKey key1, DBKey key2, unsigned short maxlen) +static int db_istring_cmp(union DBKey key1, union DBKey key2, unsigned short maxlen) { DB_COUNTSTAT(db_istring_cmp); return strncasecmp((const char *)key1.str, (const char *)key2.str, maxlen); @@ -969,11 +969,11 @@ static int db_istring_cmp(DBKey key1, DBKey key2, unsigned short maxlen) * @param key2 Key being compared to * @param maxlen Maximum length of the key to hash * @return 0 if equal, negative if lower and positive if higher - * @see DBType#DB_INT64 + * @see enum DBType#DB_INT64 * @see #DBComparator - * @see #db_default_cmp(DBType) + * @see #db_default_cmp() */ -static int db_int64_cmp(DBKey key1, DBKey key2, unsigned short maxlen) +static int db_int64_cmp(union DBKey key1, union DBKey key2, unsigned short maxlen) { (void)maxlen;//not used DB_COUNTSTAT(db_int64_cmp); @@ -991,11 +991,11 @@ static int db_int64_cmp(DBKey key1, DBKey key2, unsigned short maxlen) * @param key2 Key being compared to * @param maxlen Maximum length of the key to hash * @return 0 if equal, negative if lower and positive if higher - * @see DBType#DB_UINT64 + * @see enum DBType#DB_UINT64 * @see #DBComparator - * @see #db_default_cmp(DBType) + * @see #db_default_cmp() */ -static int db_uint64_cmp(DBKey key1, DBKey key2, unsigned short maxlen) +static int db_uint64_cmp(union DBKey key1, union DBKey key2, unsigned short maxlen) { (void)maxlen;//not used DB_COUNTSTAT(db_uint64_cmp); @@ -1012,11 +1012,11 @@ static int db_uint64_cmp(DBKey key1, DBKey key2, unsigned short maxlen) * @param key Key to be hashed * @param maxlen Maximum length of the key to hash * @return hash of the key - * @see DBType#DB_INT + * @see enum DBType#DB_INT * @see #DBHasher - * @see #db_default_hash(DBType) + * @see #db_default_hash() */ -static uint64 db_int_hash(DBKey key, unsigned short maxlen) +static uint64 db_int_hash(union DBKey key, unsigned short maxlen) { (void)maxlen;//not used DB_COUNTSTAT(db_int_hash); @@ -1030,11 +1030,11 @@ static uint64 db_int_hash(DBKey key, unsigned short maxlen) * @param key Key to be hashed * @param maxlen Maximum length of the key to hash * @return hash of the key - * @see DBType#DB_UINT + * @see enum DBType#DB_UINT * @see #DBHasher - * @see #db_default_hash(DBType) + * @see #db_default_hash() */ -static uint64 db_uint_hash(DBKey key, unsigned short maxlen) +static uint64 db_uint_hash(union DBKey key, unsigned short maxlen) { (void)maxlen;//not used DB_COUNTSTAT(db_uint_hash); @@ -1046,11 +1046,11 @@ static uint64 db_uint_hash(DBKey key, unsigned short maxlen) * @param key Key to be hashed * @param maxlen Maximum length of the key to hash * @return hash of the key - * @see DBType#DB_STRING + * @see enum DBType#DB_STRING * @see #DBHasher - * @see #db_default_hash(DBType) + * @see #db_default_hash() */ -static uint64 db_string_hash(DBKey key, unsigned short maxlen) +static uint64 db_string_hash(union DBKey key, unsigned short maxlen) { const char *k = key.str; unsigned int hash = 0; @@ -1073,10 +1073,10 @@ static uint64 db_string_hash(DBKey key, unsigned short maxlen) * @param key Key to be hashed * @param maxlen Maximum length of the key to hash * @return hash of the key - * @see DBType#DB_ISTRING - * @see #db_default_hash(DBType) + * @see enum DBType#DB_ISTRING + * @see #db_default_hash() */ -static uint64 db_istring_hash(DBKey key, unsigned short maxlen) +static uint64 db_istring_hash(union DBKey key, unsigned short maxlen) { const char *k = key.str; unsigned int hash = 0; @@ -1101,11 +1101,11 @@ static uint64 db_istring_hash(DBKey key, unsigned short maxlen) * @param key Key to be hashed * @param maxlen Maximum length of the key to hash * @return hash of the key - * @see DBType#DB_INT64 + * @see enum DBType#DB_INT64 * @see #DBHasher - * @see #db_default_hash(DBType) + * @see #db_default_hash() */ -static uint64 db_int64_hash(DBKey key, unsigned short maxlen) +static uint64 db_int64_hash(union DBKey key, unsigned short maxlen) { (void)maxlen;//not used DB_COUNTSTAT(db_int64_hash); @@ -1119,11 +1119,11 @@ static uint64 db_int64_hash(DBKey key, unsigned short maxlen) * @param key Key to be hashed * @param maxlen Maximum length of the key to hash * @return hash of the key - * @see DBType#DB_UINT64 + * @see enum DBType#DB_UINT64 * @see #DBHasher - * @see #db_default_hash(DBType) + * @see #db_default_hash() */ -static uint64 db_uint64_hash(DBKey key, unsigned short maxlen) +static uint64 db_uint64_hash(union DBKey key, unsigned short maxlen) { (void)maxlen;//not used DB_COUNTSTAT(db_uint64_hash); @@ -1137,9 +1137,9 @@ static uint64 db_uint64_hash(DBKey key, unsigned short maxlen) * @param which What is being requested to be released * @protected * @see #DBReleaser - * @see #db_default_releaser(DBType,DBOptions) + * @see #db_default_releaser() */ -static void db_release_nothing(DBKey key, DBData data, DBRelease which) +static void db_release_nothing(union DBKey key, struct DBData data, enum DBReleaseOption which) { (void)key;(void)data;(void)which;//not used DB_COUNTSTAT(db_release_nothing); @@ -1152,13 +1152,14 @@ static void db_release_nothing(DBKey key, DBData data, DBRelease which) * @param which What is being requested to be released * @protected * @see #DBReleaser - * @see #db_default_release(DBType,DBOptions) + * @see #db_default_release() */ -static void db_release_key(DBKey key, DBData data, DBRelease which) +static void db_release_key(union DBKey key, struct DBData data, enum DBReleaseOption which) { (void)data;//not used DB_COUNTSTAT(db_release_key); - if (which&DB_RELEASE_KEY) aFree((char*)key.str); // needs to be a pointer + if (which&DB_RELEASE_KEY) + aFree(key.mutstr); // FIXME: Ensure this is the right db type. } /** @@ -1167,12 +1168,12 @@ static void db_release_key(DBKey key, DBData data, DBRelease which) * @param data Data of the database entry * @param which What is being requested to be released * @protected - * @see #DBData - * @see #DBRelease + * @see struct DBData + * @see enum DBReleaseOption * @see #DBReleaser - * @see #db_default_release(DBType,DBOptions) + * @see #db_default_release() */ -static void db_release_data(DBKey key, DBData data, DBRelease which) +static void db_release_data(union DBKey key, struct DBData data, enum DBReleaseOption which) { (void)key;//not used DB_COUNTSTAT(db_release_data); @@ -1188,16 +1189,17 @@ static void db_release_data(DBKey key, DBData data, DBRelease which) * @param data Data of the database entry * @param which What is being requested to be released * @protected - * @see #DBKey - * @see #DBData - * @see #DBRelease + * @see union DBKey + * @see struct DBData + * @see enum DBReleaseOption * @see #DBReleaser - * @see #db_default_release(DBType,DBOptions) + * @see #db_default_release() */ -static void db_release_both(DBKey key, DBData data, DBRelease which) +static void db_release_both(union DBKey key, struct DBData data, enum DBReleaseOption which) { DB_COUNTSTAT(db_release_both); - if (which&DB_RELEASE_KEY) aFree((char*)key.str); // needs to be a pointer + if (which&DB_RELEASE_KEY) + aFree(key.mutstr); // FIXME: Ensure this is the right db type. if (which&DB_RELEASE_DATA && data.type == DB_DATA_PTR) { aFree(data.u.ptr); data.u.ptr = NULL; @@ -1245,11 +1247,11 @@ static void db_release_both(DBKey key, DBData data, DBRelease which) * @param out_key Key of the entry * @return Data of the entry * @protected - * @see DBIterator#first + * @see struct DBIterator#first() */ -DBData* dbit_obj_first(DBIterator* self, DBKey* out_key) +struct DBData *dbit_obj_first(struct DBIterator *self, union DBKey *out_key) { - DBIterator_impl* it = (DBIterator_impl*)self; + struct DBIterator_impl *it = (struct DBIterator_impl *)self; DB_COUNTSTAT(dbit_first); // position before the first entry @@ -1267,11 +1269,11 @@ DBData* dbit_obj_first(DBIterator* self, DBKey* out_key) * @param out_key Key of the entry * @return Data of the entry * @protected - * @see DBIterator#last + * @see struct DBIterator#last() */ -DBData* dbit_obj_last(DBIterator* self, DBKey* out_key) +struct DBData *dbit_obj_last(struct DBIterator *self, union DBKey *out_key) { - DBIterator_impl* it = (DBIterator_impl*)self; + struct DBIterator_impl *it = (struct DBIterator_impl *)self; DB_COUNTSTAT(dbit_last); // position after the last entry @@ -1289,14 +1291,14 @@ DBData* dbit_obj_last(DBIterator* self, DBKey* out_key) * @param out_key Key of the entry * @return Data of the entry * @protected - * @see DBIterator#next + * @see struct DBIterator#next() */ -DBData* dbit_obj_next(DBIterator* self, DBKey* out_key) +struct DBData *dbit_obj_next(struct DBIterator *self, union DBKey *out_key) { - DBIterator_impl* it = (DBIterator_impl*)self; - DBNode *node; - DBNode *parent; - struct dbn fake; + struct DBIterator_impl *it = (struct DBIterator_impl *)self; + struct DBNode *node; + struct DBNode *parent; + struct DBNode fake; DB_COUNTSTAT(dbit_next); if( it->ht_index < 0 ) @@ -1348,7 +1350,7 @@ DBData* dbit_obj_next(DBIterator* self, DBKey* out_key) {// found next entry it->node = node; if( out_key ) - memcpy(out_key, &node->key, sizeof(DBKey)); + memcpy(out_key, &node->key, sizeof(union DBKey)); return &node->data; } } @@ -1365,14 +1367,14 @@ DBData* dbit_obj_next(DBIterator* self, DBKey* out_key) * @param out_key Key of the entry * @return Data of the entry * @protected - * @see DBIterator#prev + * @see struct DBIterator#prev() */ -DBData* dbit_obj_prev(DBIterator* self, DBKey* out_key) +struct DBData *dbit_obj_prev(struct DBIterator *self, union DBKey *out_key) { - DBIterator_impl* it = (DBIterator_impl*)self; - DBNode *node; - DBNode *parent; - struct dbn fake; + struct DBIterator_impl *it = (struct DBIterator_impl *)self; + struct DBNode *node; + struct DBNode *parent; + struct DBNode fake; DB_COUNTSTAT(dbit_prev); if( it->ht_index >= HASH_SIZE ) @@ -1424,7 +1426,7 @@ DBData* dbit_obj_prev(DBIterator* self, DBKey* out_key) {// found previous entry it->node = node; if( out_key ) - memcpy(out_key, &node->key, sizeof(DBKey)); + memcpy(out_key, &node->key, sizeof(union DBKey)); return &node->data; } } @@ -1440,11 +1442,11 @@ DBData* dbit_obj_prev(DBIterator* self, DBKey* out_key) * @param self Iterator * @return true if the entry exists * @protected - * @see DBIterator#exists + * @see struct DBIterator#exists() */ -bool dbit_obj_exists(DBIterator* self) +bool dbit_obj_exists(struct DBIterator *self) { - DBIterator_impl* it = (DBIterator_impl*)self; + struct DBIterator_impl *it = (struct DBIterator_impl *)self; DB_COUNTSTAT(dbit_exists); return (it->node && !it->node->deleted); @@ -1452,32 +1454,34 @@ bool dbit_obj_exists(DBIterator* self) /** * Removes the current entry from the database. - * NOTE: {@link DBIterator#exists} will return false until another entry - * is fetched + * + * NOTE: struct DBIterator#exists() will return false until another entry is + * fetched. + * * Puts data of the removed entry in out_data, if out_data is not NULL (unless data has been released) * @param self Iterator * @param out_data Data of the removed entry. * @return 1 if entry was removed, 0 otherwise * @protected - * @see DBMap#remove - * @see DBIterator#remove + * @see struct DBMap#remove() + * @see struct DBIterator#remove() */ -int dbit_obj_remove(DBIterator* self, DBData *out_data) +int dbit_obj_remove(struct DBIterator *self, struct DBData *out_data) { - DBIterator_impl* it = (DBIterator_impl*)self; - DBNode *node; + struct DBIterator_impl *it = (struct DBIterator_impl *)self; + struct DBNode *node; int retval = 0; DB_COUNTSTAT(dbit_remove); node = it->node; if( node && !node->deleted ) { - DBMap_impl* db = it->db; + struct DBMap_impl *db = it->db; if( db->cache == node ) db->cache = NULL; db->release(node->key, node->data, DB_RELEASE_DATA); if( out_data ) - memcpy(out_data, &node->data, sizeof(DBData)); + memcpy(out_data, &node->data, sizeof(struct DBData)); retval = 1; db_free_add(db, node, &db->ht[it->ht_index]); } @@ -1489,9 +1493,9 @@ int dbit_obj_remove(DBIterator* self, DBData *out_data) * @param self Iterator * @protected */ -void dbit_obj_destroy(DBIterator* self) +void dbit_obj_destroy(struct DBIterator *self) { - DBIterator_impl* it = (DBIterator_impl*)self; + struct DBIterator_impl *it = (struct DBIterator_impl *)self; DB_COUNTSTAT(dbit_destroy); // unlock the database @@ -1509,10 +1513,10 @@ void dbit_obj_destroy(DBIterator* self) * @return New iterator * @protected */ -static DBIterator* db_obj_iterator(DBMap* self) +static struct DBIterator *db_obj_iterator(struct DBMap *self) { - DBMap_impl* db = (DBMap_impl*)self; - DBIterator_impl* it; + struct DBMap_impl *db = (struct DBMap_impl *)self; + struct DBIterator_impl *it; DB_COUNTSTAT(db_iterator); it = ers_alloc(db_iterator_ers, struct DBIterator_impl); @@ -1539,12 +1543,12 @@ static DBIterator* db_obj_iterator(DBMap* self) * @param key Key that identifies the entry * @return true is the entry exists * @protected - * @see DBMap#exists + * @see struct DBMap#exists() */ -static bool db_obj_exists(DBMap* self, DBKey key) +static bool db_obj_exists(struct DBMap *self, union DBKey key) { - DBMap_impl* db = (DBMap_impl*)self; - DBNode *node; + struct DBMap_impl *db = (struct DBMap_impl *)self; + struct DBNode *node; bool found = false; DB_COUNTSTAT(db_exists); @@ -1589,13 +1593,13 @@ static bool db_obj_exists(DBMap* self, DBKey key) * @param key Key that identifies the entry * @return Data of the entry or NULL if not found * @protected - * @see DBMap#get + * @see struct DBMap#get() */ -static DBData* db_obj_get(DBMap* self, DBKey key) +static struct DBData *db_obj_get(struct DBMap *self, union DBKey key) { - DBMap_impl* db = (DBMap_impl*)self; - DBNode *node; - DBData *data = NULL; + struct DBMap_impl *db = (struct DBMap_impl *)self; + struct DBNode *node; + struct DBData *data = NULL; DB_COUNTSTAT(db_get); if (db == NULL) return NULL; // nullpo candidate @@ -1648,14 +1652,14 @@ static DBData* db_obj_get(DBMap* self, DBKey key) * @param ... Extra arguments for match * @return The number of entries that matched * @protected - * @see DBMap#vgetall + * @see struct DBMap#vgetall() */ -static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max, DBMatcher match, va_list args) +static unsigned int db_obj_vgetall(struct DBMap *self, struct DBData **buf, unsigned int max, DBMatcher match, va_list args) { - DBMap_impl* db = (DBMap_impl*)self; + struct DBMap_impl *db = (struct DBMap_impl *)self; unsigned int i; - DBNode *node; - DBNode *parent; + struct DBNode *node; + struct DBNode *parent; unsigned int ret = 0; DB_COUNTSTAT(db_vgetall); @@ -1705,7 +1709,8 @@ static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max, } /** - * Just calls {@link DBMap#vgetall}. + * Just calls struct DBMap#vgetall(). + * * Get the data of the entries matched by <code>match</code>. * It puts a maximum of <code>max</code> entries into <code>buf</code>. * If <code>buf</code> is NULL, it only counts the matches. @@ -1719,10 +1724,10 @@ static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max, * @param ... Extra arguments for match * @return The number of entries that matched * @protected - * @see DBMap#vgetall - * @see DBMap#getall + * @see struct DBMap#vgetall() + * @see struct DBMap#getall() */ -static unsigned int db_obj_getall(DBMap* self, DBData **buf, unsigned int max, DBMatcher match, ...) +static unsigned int db_obj_getall(struct DBMap *self, struct DBData **buf, unsigned int max, DBMatcher match, ...) { va_list args; unsigned int ret; @@ -1746,16 +1751,16 @@ static unsigned int db_obj_getall(DBMap* self, DBData **buf, unsigned int max, D * @param args Extra arguments for create * @return Data of the entry * @protected - * @see DBMap#vensure + * @see struct DBMap#vensure() */ -static DBData* db_obj_vensure(DBMap* self, DBKey key, DBCreateData create, va_list args) +static struct DBData *db_obj_vensure(struct DBMap *self, union DBKey key, DBCreateData create, va_list args) { - DBMap_impl* db = (DBMap_impl*)self; - DBNode *node; - DBNode *parent = NULL; + struct DBMap_impl *db = (struct DBMap_impl *)self; + struct DBNode *node; + struct DBNode *parent = NULL; unsigned int hash; int c = 0; - DBData *data = NULL; + struct DBData *data = NULL; DB_COUNTSTAT(db_vensure); if (db == NULL) return NULL; // nullpo candidate @@ -1795,7 +1800,7 @@ static DBData* db_obj_vensure(DBMap* self, DBKey key, DBCreateData create, va_li return NULL; } DB_COUNTSTAT(db_node_alloc); - node = ers_alloc(db->nodes, struct dbn); + node = ers_alloc(db->nodes, struct DBNode); node->left = NULL; node->right = NULL; node->deleted = 0; @@ -1835,7 +1840,8 @@ static DBData* db_obj_vensure(DBMap* self, DBKey key, DBCreateData create, va_li } /** - * Just calls {@link DBMap#vensure}. + * Just calls struct DBMap#vensure(). + * * Get the data of the entry identified by the key. * If the entry does not exist, an entry is added with the data returned by * <code>create</code>. @@ -1845,13 +1851,13 @@ static DBData* db_obj_vensure(DBMap* self, DBKey key, DBCreateData create, va_li * @param ... Extra arguments for create * @return Data of the entry * @protected - * @see DBMap#vensure - * @see DBMap#ensure + * @see struct DBMap#vensure() + * @see struct DBMap#ensure() */ -static DBData* db_obj_ensure(DBMap* self, DBKey key, DBCreateData create, ...) +static struct DBData *db_obj_ensure(struct DBMap *self, union DBKey key, DBCreateData create, ...) { va_list args; - DBData *ret = NULL; + struct DBData *ret = NULL; DB_COUNTSTAT(db_ensure); if (self == NULL) return NULL; // nullpo candidate @@ -1873,15 +1879,15 @@ static DBData* db_obj_ensure(DBMap* self, DBKey key, DBCreateData create, ...) * @return 1 if if the entry already exists, 0 otherwise * @protected * @see #db_malloc_dbn(void) - * @see DBMap#put + * @see struct DBMap#put() * FIXME: If this method fails shouldn't it return another value? * Other functions rely on this to know if they were able to put something [Panikon] */ -static int db_obj_put(DBMap* self, DBKey key, DBData data, DBData *out_data) +static int db_obj_put(struct DBMap *self, union DBKey key, struct DBData data, struct DBData *out_data) { - DBMap_impl* db = (DBMap_impl*)self; - DBNode *node; - DBNode *parent = NULL; + struct DBMap_impl *db = (struct DBMap_impl *)self; + struct DBNode *node; + struct DBNode *parent = NULL; int c = 0, retval = 0; unsigned int hash; @@ -1934,7 +1940,7 @@ static int db_obj_put(DBMap* self, DBKey key, DBData data, DBData *out_data) // allocate a new node if necessary if (node == NULL) { DB_COUNTSTAT(db_node_alloc); - node = ers_alloc(db->nodes, struct dbn); + node = ers_alloc(db->nodes, struct DBNode); node->left = NULL; node->right = NULL; node->deleted = 0; @@ -1973,19 +1979,19 @@ static int db_obj_put(DBMap* self, DBKey key, DBData data, DBData *out_data) /** * Remove an entry from the database. * Puts the previous data in out_data, if out_data is not NULL. (unless data has been released) - * NOTE: The key (of the database) is released in {@link #db_free_add(DBMap_impl*,DBNode*,DBNode **)}. + * NOTE: The key (of the database) is released in #db_free_add(). * @param self Interface of the database * @param key Key that identifies the entry * @param out_data Previous data if the entry exists * @return 1 if if the entry already exists, 0 otherwise * @protected - * @see #db_free_add(DBMap_impl*,DBNode*,DBNode **) - * @see DBMap#remove + * @see #db_free_add() + * @see struct DBMap#remove() */ -static int db_obj_remove(DBMap* self, DBKey key, DBData *out_data) +static int db_obj_remove(struct DBMap *self, union DBKey key, struct DBData *out_data) { - DBMap_impl* db = (DBMap_impl*)self; - DBNode *node; + struct DBMap_impl *db = (struct DBMap_impl *)self; + struct DBNode *node; unsigned int hash; int retval = 0; @@ -2035,15 +2041,15 @@ static int db_obj_remove(DBMap* self, DBKey key, DBData *out_data) * @param args Extra arguments for func * @return Sum of the values returned by func * @protected - * @see DBMap#vforeach + * @see struct DBMap#vforeach() */ -static int db_obj_vforeach(DBMap* self, DBApply func, va_list args) +static int db_obj_vforeach(struct DBMap *self, DBApply func, va_list args) { - DBMap_impl* db = (DBMap_impl*)self; + struct DBMap_impl *db = (struct DBMap_impl *)self; unsigned int i; int sum = 0; - DBNode *node; - DBNode *parent; + struct DBNode *node; + struct DBNode *parent; DB_COUNTSTAT(db_vforeach); if (db == NULL) return 0; // nullpo candidate @@ -2086,7 +2092,8 @@ static int db_obj_vforeach(DBMap* self, DBApply func, va_list args) } /** - * Just calls {@link DBMap#vforeach}. + * Just calls struct DBMap#vforeach(). + * * Apply <code>func</code> to every entry in the database. * Returns the sum of values returned by func. * @param self Interface of the database @@ -2094,10 +2101,10 @@ static int db_obj_vforeach(DBMap* self, DBApply func, va_list args) * @param ... Extra arguments for func * @return Sum of the values returned by func * @protected - * @see DBMap#vforeach - * @see DBMap#foreach + * @see struct DBMap#vforeach() + * @see struct DBMap#foreach() */ -static int db_obj_foreach(DBMap* self, DBApply func, ...) +static int db_obj_foreach(struct DBMap *self, DBApply func, ...) { va_list args; int ret; @@ -2121,15 +2128,15 @@ static int db_obj_foreach(DBMap* self, DBApply func, ...) * @param args Extra arguments for func * @return Sum of values returned by func * @protected - * @see DBMap#vclear + * @see struct DBMap#vclear() */ -static int db_obj_vclear(DBMap* self, DBApply func, va_list args) +static int db_obj_vclear(struct DBMap *self, DBApply func, va_list args) { - DBMap_impl* db = (DBMap_impl*)self; + struct DBMap_impl *db = (struct DBMap_impl *)self; int sum = 0; unsigned int i; - DBNode *node; - DBNode *parent; + struct DBNode *node; + struct DBNode *parent; DB_COUNTSTAT(db_vclear); if (db == NULL) return 0; // nullpo candidate @@ -2182,7 +2189,8 @@ static int db_obj_vclear(DBMap* self, DBApply func, va_list args) } /** - * Just calls {@link DBMap#vclear}. + * Just calls struct DBMap#vclear(). + * * Removes all entries from the database. * Before deleting an entry, func is applied to it. * Releases the key and the data. @@ -2194,10 +2202,10 @@ static int db_obj_vclear(DBMap* self, DBApply func, va_list args) * @param ... Extra arguments for func * @return Sum of values returned by func * @protected - * @see DBMap#vclear - * @see DBMap#clear + * @see struct DBMap#vclear() + * @see struct DBMap#clear() */ -static int db_obj_clear(DBMap* self, DBApply func, ...) +static int db_obj_clear(struct DBMap *self, DBApply func, ...) { va_list args; int ret; @@ -2222,11 +2230,11 @@ static int db_obj_clear(DBMap* self, DBApply func, ...) * @param args Extra arguments for func * @return Sum of values returned by func * @protected - * @see DBMap#vdestroy + * @see struct DBMap#vdestroy() */ -static int db_obj_vdestroy(DBMap* self, DBApply func, va_list args) +static int db_obj_vdestroy(struct DBMap *self, DBApply func, va_list args) { - DBMap_impl* db = (DBMap_impl*)self; + struct DBMap_impl *db = (struct DBMap_impl *)self; int sum; DB_COUNTSTAT(db_vdestroy); @@ -2265,7 +2273,7 @@ static int db_obj_vdestroy(DBMap* self, DBApply func, va_list args) } /** - * Just calls {@link DBMap#db_vdestroy}. + * Just calls struct DBMap#db_vdestroy(). * Finalize the database, feeing all the memory it uses. * Before deleting an entry, func is applied to it. * Releases the key and the data. @@ -2277,10 +2285,10 @@ static int db_obj_vdestroy(DBMap* self, DBApply func, va_list args) * @param ... Extra arguments for func * @return Sum of values returned by func * @protected - * @see DBMap#vdestroy - * @see DBMap#destroy + * @see struct DBMap#vdestroy() + * @see struct DBMap#destroy() */ -static int db_obj_destroy(DBMap* self, DBApply func, ...) +static int db_obj_destroy(struct DBMap *self, DBApply func, ...) { va_list args; int ret; @@ -2299,12 +2307,12 @@ static int db_obj_destroy(DBMap* self, DBApply func, ...) * @param self Interface of the database * @return Size of the database * @protected - * @see DBMap_impl#item_count - * @see DBMap#size + * @see struct DBMap_impl#item_count + * @see struct DBMap#size() */ -static unsigned int db_obj_size(DBMap* self) +static unsigned int db_obj_size(struct DBMap *self) { - DBMap_impl* db = (DBMap_impl*)self; + struct DBMap_impl *db = (struct DBMap_impl *)self; unsigned int item_count; DB_COUNTSTAT(db_size); @@ -2322,16 +2330,17 @@ static unsigned int db_obj_size(DBMap* self) * @param self Interface of the database * @return Type of the database * @protected - * @see DBMap_impl#type - * @see DBMap#type + * @see struct DBMap_impl#type + * @see struct DBMap#type() */ -static DBType db_obj_type(DBMap* self) +static enum DBType db_obj_type(struct DBMap *self) { - DBMap_impl* db = (DBMap_impl*)self; - DBType type; + struct DBMap_impl *db = (struct DBMap_impl *)self; + enum DBType type; DB_COUNTSTAT(db_type); - if (db == NULL) return (DBType)-1; // nullpo candidate - TODO what should this return? + if (db == NULL) + return (enum DBType)-1; // nullpo candidate - TODO what should this return? db_free_lock(db); type = db->type; @@ -2345,13 +2354,13 @@ static DBType db_obj_type(DBMap* self) * @param self Interface of the database * @return Options of the database * @protected - * @see DBMap_impl#options - * @see DBMap#options + * @see struct DBMap_impl#options + * @see struct DBMap#options() */ -static DBOptions db_obj_options(DBMap* self) +static enum DBOptions db_obj_options(struct DBMap *self) { - DBMap_impl* db = (DBMap_impl*)self; - DBOptions options; + struct DBMap_impl* db = (struct DBMap_impl *)self; + enum DBOptions options; DB_COUNTSTAT(db_options); if (db == NULL) return DB_OPT_BASE; // nullpo candidate - TODO what should this return? @@ -2371,17 +2380,17 @@ static DBOptions db_obj_options(DBMap* self) * db_default_release - Get the default releaser for a type of database with the specified options. * db_custom_release - Get a releaser that behaves a certain way. * db_alloc - Allocate a new database. - * db_i2key - Manual cast from 'int' to 'DBKey'. - * db_ui2key - Manual cast from 'unsigned int' to 'DBKey'. - * db_str2key - Manual cast from 'unsigned char *' to 'DBKey'. - * db_i642key - Manual cast from 'int64' to 'DBKey'. - * db_ui642key - Manual cast from 'uin64' to 'DBKey'. - * db_i2data - Manual cast from 'int' to 'DBData'. - * db_ui2data - Manual cast from 'unsigned int' to 'DBData'. - * db_ptr2data - Manual cast from 'void*' to 'DBData'. - * db_data2i - Gets 'int' value from 'DBData'. - * db_data2ui - Gets 'unsigned int' value from 'DBData'. - * db_data2ptr - Gets 'void*' value from 'DBData'. + * db_i2key - Manual cast from `int` to `union DBKey`. + * db_ui2key - Manual cast from `unsigned int` to `union DBKey`. + * db_str2key - Manual cast from `unsigned char *` to `union DBKey`. + * db_i642key - Manual cast from `int64` to `union DBKey`. + * db_ui642key - Manual cast from `uin64` to `union DBKey`. + * db_i2data - Manual cast from `int` to `struct DBData`. + * db_ui2data - Manual cast from `unsigned int` to `struct DBData`. + * db_ptr2data - Manual cast from `void*` to `struct DBData`. + * db_data2i - Gets `int` value from `struct DBData`. + * db_data2ui - Gets `unsigned int` value from `struct DBData`. + * db_data2ptr - Gets `void*` value from `struct DBData`. * db_init - Initializes the database system. * db_final - Finalizes the database system. \*****************************************************************************/ @@ -2394,10 +2403,10 @@ static DBOptions db_obj_options(DBMap* self) * @param options Original options of the database * @return Fixed options of the database * @private - * @see #db_default_release(DBType,DBOptions) - * @see #db_alloc(const char *,int,DBType,DBOptions,unsigned short) + * @see #db_default_release() + * @see #db_alloc() */ -DBOptions db_fix_options(DBType type, DBOptions options) +enum DBOptions db_fix_options(enum DBType type, enum DBOptions options) { DB_COUNTSTAT(db_fix_options); switch (type) { @@ -2405,7 +2414,7 @@ DBOptions db_fix_options(DBType type, DBOptions options) case DB_UINT: case DB_INT64: case DB_UINT64: // Numeric database, do nothing with the keys - return (DBOptions)(options&~(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY)); + return (enum DBOptions)(options&~(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY)); default: ShowError("db_fix_options: Unknown database type %u with options %x\n", type, options); @@ -2420,14 +2429,14 @@ DBOptions db_fix_options(DBType type, DBOptions options) * @param type Type of database * @return Comparator for the type of database or NULL if unknown database * @public - * @see #db_int_cmp(DBKey,DBKey,unsigned short) - * @see #db_uint_cmp(DBKey,DBKey,unsigned short) - * @see #db_string_cmp(DBKey,DBKey,unsigned short) - * @see #db_istring_cmp(DBKey,DBKey,unsigned short) - * @see #db_int64_cmp(DBKey,DBKey,unsigned short) - * @see #db_uint64_cmp(DBKey,DBKey,unsigned short) + * @see #db_int_cmp() + * @see #db_uint_cmp() + * @see #db_string_cmp() + * @see #db_istring_cmp() + * @see #db_int64_cmp() + * @see #db_uint64_cmp() */ -DBComparator db_default_cmp(DBType type) +DBComparator db_default_cmp(enum DBType type) { DB_COUNTSTAT(db_default_cmp); switch (type) { @@ -2448,14 +2457,14 @@ DBComparator db_default_cmp(DBType type) * @param type Type of database * @return Hasher of the type of database or NULL if unknown database * @public - * @see #db_int_hash(DBKey,unsigned short) - * @see #db_uint_hash(DBKey,unsigned short) - * @see #db_string_hash(DBKey,unsigned short) - * @see #db_istring_hash(DBKey,unsigned short) - * @see #db_int64_hash(DBKey,unsigned short) - * @see #db_uint64_hash(DBKey,unsigned short) + * @see #db_int_hash() + * @see #db_uint_hash() + * @see #db_string_hash() + * @see #db_istring_hash() + * @see #db_int64_hash() + * @see #db_uint64_hash() */ -DBHasher db_default_hash(DBType type) +DBHasher db_default_hash(enum DBType type) { DB_COUNTSTAT(db_default_hash); switch (type) { @@ -2474,19 +2483,21 @@ DBHasher db_default_hash(DBType type) /** * Returns the default releaser for the specified type of database with the * specified options. - * NOTE: the options are fixed with {@link #db_fix_options(DBType,DBOptions)} - * before choosing the releaser. + * + * NOTE: the options are fixed with #db_fix_options() before choosing the + * releaser. + * * @param type Type of database * @param options Options of the database * @return Default releaser for the type of database with the specified options * @public - * @see #db_release_nothing(DBKey,DBData,DBRelease) - * @see #db_release_key(DBKey,DBData,DBRelease) - * @see #db_release_data(DBKey,DBData,DBRelease) - * @see #db_release_both(DBKey,DBData,DBRelease) - * @see #db_custom_release(DBRelease) + * @see #db_release_nothing() + * @see #db_release_key() + * @see #db_release_data() + * @see #db_release_both() + * @see #db_custom_release() */ -DBReleaser db_default_release(DBType type, DBOptions options) +DBReleaser db_default_release(enum DBType type, enum DBOptions options) { DB_COUNTSTAT(db_default_release); options = DB->fix_options(type, options); @@ -2505,13 +2516,13 @@ DBReleaser db_default_release(DBType type, DBOptions options) * @param which Options that specified what the releaser releases * @return Releaser for the specified release options * @public - * @see #db_release_nothing(DBKey,DBData,DBRelease) - * @see #db_release_key(DBKey,DBData,DBRelease) - * @see #db_release_data(DBKey,DBData,DBRelease) - * @see #db_release_both(DBKey,DBData,DBRelease) - * @see #db_default_release(DBType,DBOptions) + * @see #db_release_nothing() + * @see #db_release_key() + * @see #db_release_data() + * @see #db_release_both() + * @see #db_default_release() */ -DBReleaser db_custom_release(DBRelease which) +DBReleaser db_custom_release(enum DBReleaseOption which) { DB_COUNTSTAT(db_custom_release); switch (which) { @@ -2527,8 +2538,10 @@ DBReleaser db_custom_release(DBRelease which) /** * Allocate a new database of the specified type. - * NOTE: the options are fixed by {@link #db_fix_options(DBType,DBOptions)} - * before creating the database. + * + * NOTE: the options are fixed by #db_fix_options() before creating the + * database. + * * @param file File where the database is being allocated * @param line Line of the file where the database is being allocated * @param type Type of database @@ -2537,11 +2550,12 @@ DBReleaser db_custom_release(DBRelease which) * databases. If 0, the maximum number of maxlen is used (64K). * @return The interface of the database * @public - * @see #DBMap_impl - * @see #db_fix_options(DBType,DBOptions) + * @see struct DBMap_impl + * @see #db_fix_options() */ -DBMap* db_alloc(const char *file, const char *func, int line, DBType type, DBOptions options, unsigned short maxlen) { - DBMap_impl* db; +struct DBMap *db_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) +{ + struct DBMap_impl *db; unsigned int i; char ers_name[50]; @@ -2588,7 +2602,7 @@ DBMap* db_alloc(const char *file, const char *func, int line, DBType type, DBOpt db->free_lock = 0; /* Other */ snprintf(ers_name, 50, "db_alloc:nodes:%s:%s:%d",func,file,line); - db->nodes = ers_new(sizeof(struct dbn),ers_name,ERS_OPT_WAIT|ERS_OPT_FREE_NAME|ERS_OPT_CLEAN); + db->nodes = ers_new(sizeof(struct DBNode),ers_name,ERS_OPT_WAIT|ERS_OPT_FREE_NAME|ERS_OPT_CLEAN); db->cmp = DB->default_cmp(type); db->hash = DB->default_hash(type); db->release = DB->default_release(type, options); @@ -2613,9 +2627,9 @@ DBMap* db_alloc(const char *file, const char *func, int line, DBType type, DBOpt * @return The key as a DBKey union * @public */ -DBKey db_i2key(int key) +union DBKey db_i2key(int key) { - DBKey ret; + union DBKey ret; DB_COUNTSTAT(db_i2key); ret.i = key; @@ -2628,9 +2642,9 @@ DBKey db_i2key(int key) * @return The key as a DBKey union * @public */ -DBKey db_ui2key(unsigned int key) +union DBKey db_ui2key(unsigned int key) { - DBKey ret; + union DBKey ret; DB_COUNTSTAT(db_ui2key); ret.ui = key; @@ -2643,9 +2657,9 @@ DBKey db_ui2key(unsigned int key) * @return The key as a DBKey union * @public */ -DBKey db_str2key(const char *key) +union DBKey db_str2key(const char *key) { - DBKey ret; + union DBKey ret; DB_COUNTSTAT(db_str2key); ret.str = key; @@ -2658,9 +2672,9 @@ DBKey db_str2key(const char *key) * @return The key as a DBKey union * @public */ -DBKey db_i642key(int64 key) +union DBKey db_i642key(int64 key) { - DBKey ret; + union DBKey ret; DB_COUNTSTAT(db_i642key); ret.i64 = key; @@ -2673,9 +2687,9 @@ DBKey db_i642key(int64 key) * @return The key as a DBKey union * @public */ -DBKey db_ui642key(uint64 key) +union DBKey db_ui642key(uint64 key) { - DBKey ret; + union DBKey ret; DB_COUNTSTAT(db_ui642key); ret.ui64 = key; @@ -2688,9 +2702,9 @@ DBKey db_ui642key(uint64 key) * @return The data as a DBData struct * @public */ -DBData db_i2data(int data) +struct DBData db_i2data(int data) { - DBData ret; + struct DBData ret; DB_COUNTSTAT(db_i2data); ret.type = DB_DATA_INT; @@ -2704,9 +2718,9 @@ DBData db_i2data(int data) * @return The data as a DBData struct * @public */ -DBData db_ui2data(unsigned int data) +struct DBData db_ui2data(unsigned int data) { - DBData ret; + struct DBData ret; DB_COUNTSTAT(db_ui2data); ret.type = DB_DATA_UINT; @@ -2720,9 +2734,9 @@ DBData db_ui2data(unsigned int data) * @return The data as a DBData struct * @public */ -DBData db_ptr2data(void *data) +struct DBData db_ptr2data(void *data) { - DBData ret; + struct DBData ret; DB_COUNTSTAT(db_ptr2data); ret.type = DB_DATA_PTR; @@ -2737,7 +2751,7 @@ DBData db_ptr2data(void *data) * @return Integer value of the data. * @public */ -int db_data2i(DBData *data) +int db_data2i(struct DBData *data) { DB_COUNTSTAT(db_data2i); if (data && DB_DATA_INT == data->type) @@ -2752,7 +2766,7 @@ int db_data2i(DBData *data) * @return Unsigned int value of the data. * @public */ -unsigned int db_data2ui(DBData *data) +unsigned int db_data2ui(struct DBData *data) { DB_COUNTSTAT(db_data2ui); if (data && DB_DATA_UINT == data->type) @@ -2767,7 +2781,7 @@ unsigned int db_data2ui(DBData *data) * @return Void* value of the data. * @public */ -void* db_data2ptr(DBData *data) +void *db_data2ptr(struct DBData *data) { DB_COUNTSTAT(db_data2ptr); if (data && DB_DATA_PTR == data->type) diff --git a/src/common/db.h b/src/common/db.h index b73970947..d7d111c86 100644 --- a/src/common/db.h +++ b/src/common/db.h @@ -43,8 +43,7 @@ * 2007/11/09 - Added an iterator to the database. * * 2.1 (Athena build #???#) - Portability fix * * - Fixed the portability of casting to union and added the functions * - * {@link DBMap#ensure(DBMap,DBKey,DBCreateData,...)} and * - * {@link DBMap#clear(DBMap,DBApply,...)}. * + * struct DBMap#ensure() and struct DBMap#clear(). * * 2.0 (Athena build 4859) - Transition version * * - Almost everything recoded with a strategy similar to objects, * * database structure is maintained. * @@ -64,41 +63,42 @@ #include <stdarg.h> -/*****************************************************************************\ +/***************************************************************************** * (1) Section with public typedefs, enums, unions, structures and defines. * - * DBRelease - Enumeration of release options. * - * DBType - Enumeration of database types. * - * DBOptions - Bitfield enumeration of database options. * - * DBKey - Union of used key types. * - * DBDataType - Enumeration of data types. * - * DBData - Struct for used data types. * - * DBApply - Format of functions applied to the databases. * - * DBMatcher - Format of matchers used in DBMap::getall. * - * DBComparator - Format of the comparators used by the databases. * - * DBHasher - Format of the hashers used by the databases. * - * DBReleaser - Format of the releasers used by the databases. * - * DBIterator - Database iterator. * - * DBMap - Database interface. * -\*****************************************************************************/ + * enum DBReleaseOption - Enumeration of release options. * + * enum DBType - Enumeration of database types. * + * enum DBOptions - Bitfield enumeration of database options. * + * union DBKey - Union of used key types. * + * enum DBDataType - Enumeration of data types. * + * struct DBData - Struct for used data types. * + * DBApply - Format of functions applied to the databases. * + * DBMatcher - Format of matchers used in struct DBMap#getall(). * + * DBComparator - Format of the comparators used by the databases. * + * DBHasher - Format of the hashers used by the databases. * + * DBReleaser - Format of the releasers used by the databases. * + * struct DBIterator - Database iterator. * + * struct DBMap - Database interface. * + *****************************************************************************/ /** * Bitfield with what should be released by the releaser function (if the * function supports it). * @public * @see #DBReleaser - * @see #db_custom_release(DBRelease) + * @see #db_custom_release() */ -typedef enum DBRelease { +enum DBReleaseOption { DB_RELEASE_NOTHING = 0x0, DB_RELEASE_KEY = 0x1, DB_RELEASE_DATA = 0x2, DB_RELEASE_BOTH = DB_RELEASE_KEY|DB_RELEASE_DATA, -} DBRelease; +}; /** * Supported types of database. - * See {@link #db_fix_options(DBType,DBOptions)} for restrictions of the - * types of databases. + * + * See #db_fix_options() for restrictions of the types of databases. + * * @param DB_INT Uses int's for keys * @param DB_UINT Uses unsigned int's for keys * @param DB_STRING Uses strings for keys. @@ -106,27 +106,28 @@ typedef enum DBRelease { * @param DB_INT64 Uses int64's for keys * @param DB_UINT64 Uses uint64's for keys * @public - * @see #DBOptions - * @see #DBKey - * @see #db_fix_options(DBType,DBOptions) - * @see #db_default_cmp(DBType) - * @see #db_default_hash(DBType) - * @see #db_default_release(DBType,DBOptions) - * @see #db_alloc(const char *,int,DBType,DBOptions,unsigned short) - */ -typedef enum DBType { + * @see enum DBOptions + * @see union DBKey + * @see #db_fix_options() + * @see #db_default_cmp() + * @see #db_default_hash() + * @see #db_default_release() + * @see #db_alloc() + */ +enum DBType { DB_INT, DB_UINT, DB_STRING, DB_ISTRING, DB_INT64, DB_UINT64, -} DBType; +}; /** * Bitfield of options that define the behavior of the database. - * See {@link #db_fix_options(DBType,DBOptions)} for restrictions of the - * types of databases. + * + * See #db_fix_options() for restrictions of the types of databases. + * * @param DB_OPT_BASE Base options: does not duplicate keys, releases nothing * and does not allow NULL keys or NULL data. * @param DB_OPT_DUP_KEY Duplicates the keys internally. If DB_OPT_RELEASE_KEY @@ -134,17 +135,17 @@ typedef enum DBType { * @param DB_OPT_RELEASE_KEY Releases the key. * @param DB_OPT_RELEASE_DATA Releases the data whenever an entry is removed * from the database. - * WARNING: for functions that return the data (like DBMap::remove), + * WARNING: for functions that return the data (like struct DBMap#remove()), * a dangling pointer will be returned. * @param DB_OPT_RELEASE_BOTH Releases both key and data. * @param DB_OPT_ALLOW_NULL_KEY Allow NULL keys in the database. * @param DB_OPT_ALLOW_NULL_DATA Allow NULL data in the database. * @public - * @see #db_fix_options(DBType,DBOptions) - * @see #db_default_release(DBType,DBOptions) - * @see #db_alloc(const char *,int,DBType,DBOptions,unsigned short) + * @see #db_fix_options() + * @see #db_default_release() + * @see #db_alloc() */ -typedef enum DBOptions { +enum DBOptions { DB_OPT_BASE = 0x00, DB_OPT_DUP_KEY = 0x01, DB_OPT_RELEASE_KEY = 0x02, @@ -152,7 +153,7 @@ typedef enum DBOptions { DB_OPT_RELEASE_BOTH = DB_OPT_RELEASE_KEY|DB_OPT_RELEASE_DATA, DB_OPT_ALLOW_NULL_KEY = 0x08, DB_OPT_ALLOW_NULL_DATA = 0x10, -} DBOptions; +}; /** * Union of key types used by the database. @@ -160,18 +161,19 @@ typedef enum DBOptions { * @param ui Type of key for DB_UINT databases * @param str Type of key for DB_STRING and DB_ISTRING databases * @public - * @see #DBType - * @see DBMap#get - * @see DBMap#put - * @see DBMap#remove + * @see enum DBType + * @see struct DBMap#get() + * @see struct DBMap#put() + * @see struct DBMap#remove() */ -typedef union DBKey { +union DBKey { int i; unsigned int ui; const char *str; + char *mutstr; int64 i64; uint64 ui64; -} DBKey; +}; /** * Supported types of database data. @@ -179,13 +181,13 @@ typedef union DBKey { * @param DB_DATA_UINT Uses unsigned ints for data. * @param DB_DATA_PTR Uses void pointers for data. * @public - * @see #DBData + * @see struct DBData */ -typedef enum DBDataType { +enum DBDataType { DB_DATA_INT, DB_DATA_UINT, DB_DATA_PTR, -} DBDataType; +}; /** * Struct for data types used by the database. @@ -196,14 +198,14 @@ typedef enum DBDataType { * @param u.ptr Data of void* type * @public */ -typedef struct DBData { - DBDataType type; +struct DBData { + enum DBDataType type; union { int i; unsigned int ui; void *ptr; } u; -} DBData; +}; /** * Format of functions that create the data for the key when the entry doesn't @@ -212,10 +214,10 @@ typedef struct DBData { * @param args Extra arguments of the function * @return Data identified by the key to be put in the database * @public - * @see DBMap#vensure - * @see DBMap#ensure + * @see struct DBMap#vensure() + * @see struct DBMap#ensure() */ -typedef DBData (*DBCreateData)(DBKey key, va_list args); +typedef struct DBData (*DBCreateData)(union DBKey key, va_list args); /** * Format of functions to be applied to an unspecified quantity of entries of @@ -227,12 +229,12 @@ typedef DBData (*DBCreateData)(DBKey key, va_list args); * @param args Extra arguments of the function * @return Value to be added up by the function that is applying this * @public - * @see DBMap#vforeach - * @see DBMap#foreach - * @see DBMap#vdestroy - * @see DBMap#destroy + * @see struct DBMap#vforeach() + * @see struct DBMap#foreach() + * @see struct DBMap#vdestroy() + * @see struct DBMap#destroy() */ -typedef int (*DBApply)(DBKey key, DBData *data, va_list args); +typedef int (*DBApply)(union DBKey key, struct DBData *data, va_list args); /** * Format of functions that match database entries. @@ -243,9 +245,9 @@ typedef int (*DBApply)(DBKey key, DBData *data, va_list args); * @param args Extra arguments of the function * @return 0 if a match, another number otherwise * @public - * @see DBMap#getall + * @see struct DBMap#getall() */ -typedef int (*DBMatcher)(DBKey key, DBData data, va_list args); +typedef int (*DBMatcher)(union DBKey key, struct DBData data, va_list args); /** * Format of the comparators used internally by the database system. @@ -257,9 +259,9 @@ typedef int (*DBMatcher)(DBKey key, DBData data, va_list args); * databases. * @return 0 if equal, negative if lower and positive if higher * @public - * @see #db_default_cmp(DBType) + * @see #db_default_cmp() */ -typedef int (*DBComparator)(DBKey key1, DBKey key2, unsigned short maxlen); +typedef int (*DBComparator)(union DBKey key1, union DBKey key2, unsigned short maxlen); /** * Format of the hashers used internally by the database system. @@ -269,9 +271,9 @@ typedef int (*DBComparator)(DBKey key1, DBKey key2, unsigned short maxlen); * databases. * @return Hash of the key * @public - * @see #db_default_hash(DBType) + * @see #db_default_hash() */ -typedef uint64 (*DBHasher)(DBKey key, unsigned short maxlen); +typedef uint64 (*DBHasher)(union DBKey key, unsigned short maxlen); /** * Format of the releaser used by the database system. @@ -281,27 +283,25 @@ typedef uint64 (*DBHasher)(DBKey key, unsigned short maxlen); * @param data Data of the database entry * @param which What is being requested to be released * @public - * @see #DBRelease - * @see #db_default_releaser(DBType,DBOptions) - * @see #db_custom_release(DBRelease) + * @see enum DBReleaseOption + * @see #db_default_releaser() + * @see #db_custom_release() */ -typedef void (*DBReleaser)(DBKey key, DBData data, DBRelease which); - -typedef struct DBIterator DBIterator; -typedef struct DBMap DBMap; +typedef void (*DBReleaser)(union DBKey key, struct DBData data, enum DBReleaseOption which); /** * Database iterator. + * * Supports forward iteration, backward iteration and removing entries from the database. * The iterator is initially positioned before the first entry of the database. + * * While the iterator exists the database is locked internally, so invoke - * {@link DBIterator#destroy} as soon as possible. + * struct DBIterator#destroy() as soon as possible. + * * @public - * @see #DBMap + * @see struct DBMap */ -struct DBIterator -{ - +struct DBIterator { /** * Fetches the first entry in the database. * Returns the data of the entry. @@ -311,7 +311,7 @@ struct DBIterator * @return Data of the entry * @protected */ - DBData* (*first)(DBIterator* self, DBKey* out_key); + struct DBData *(*first)(struct DBIterator *self, union DBKey *out_key); /** * Fetches the last entry in the database. @@ -322,7 +322,7 @@ struct DBIterator * @return Data of the entry * @protected */ - DBData* (*last)(DBIterator* self, DBKey* out_key); + struct DBData *(*last)(struct DBIterator *self, union DBKey *out_key); /** * Fetches the next entry in the database. @@ -333,7 +333,7 @@ struct DBIterator * @return Data of the entry * @protected */ - DBData* (*next)(DBIterator* self, DBKey* out_key); + struct DBData *(*next)(struct DBIterator *self, union DBKey *out_key); /** * Fetches the previous entry in the database. @@ -344,7 +344,7 @@ struct DBIterator * @return Data of the entry * @protected */ - DBData* (*prev)(DBIterator* self, DBKey* out_key); + struct DBData *(*prev)(struct DBIterator *self, union DBKey *out_key); /** * Returns true if the fetched entry exists. @@ -354,27 +354,29 @@ struct DBIterator * @return true is the entry exists * @protected */ - bool (*exists)(DBIterator* self); + bool (*exists)(struct DBIterator *self); /** * Removes the current entry from the database. - * NOTE: {@link DBIterator#exists} will return false until another entry - * is fetched + * + * NOTE: struct DBIterator#exists() will return false until another + * entry is fetched. + * * Puts data of the removed entry in out_data, if out_data is not NULL. * @param self Iterator * @param out_data Data of the removed entry. * @return 1 if entry was removed, 0 otherwise * @protected - * @see DBMap#remove + * @see struct DBMap#remove() */ - int (*remove)(DBIterator* self, DBData *out_data); + int (*remove)(struct DBIterator *self, struct DBData *out_data); /** * Destroys this iterator and unlocks the database. * @param self Iterator * @protected */ - void (*destroy)(DBIterator* self); + void (*destroy)(struct DBIterator *self); }; @@ -382,7 +384,7 @@ struct DBIterator * Public interface of a database. Only contains functions. * All the functions take the interface as the first argument. * @public - * @see #db_alloc(const char*,int,DBType,DBOptions,unsigned short) + * @see #db_alloc() */ struct DBMap { @@ -395,7 +397,7 @@ struct DBMap { * @return New iterator * @protected */ - DBIterator* (*iterator)(DBMap* self); + struct DBIterator *(*iterator)(struct DBMap *self); /** * Returns true if the entry exists. @@ -404,7 +406,7 @@ struct DBMap { * @return true is the entry exists * @protected */ - bool (*exists)(DBMap* self, DBKey key); + bool (*exists)(struct DBMap *self, union DBKey key); /** * Get the data of the entry identified by the key. @@ -413,10 +415,11 @@ struct DBMap { * @return Data of the entry or NULL if not found * @protected */ - DBData* (*get)(DBMap* self, DBKey key); + struct DBData *(*get)(struct DBMap *self, union DBKey key); /** - * Just calls {@link DBMap#vgetall}. + * Just calls struct DBMap#vgetall(). + * * Get the data of the entries matched by <code>match</code>. * It puts a maximum of <code>max</code> entries into <code>buf</code>. * If <code>buf</code> is NULL, it only counts the matches. @@ -430,9 +433,9 @@ struct DBMap { * @param ... Extra arguments for match * @return The number of entries that matched * @protected - * @see DBMap#vgetall(DBMap*,void **,unsigned int,DBMatcher,va_list) + * @see struct DBMap#vgetall() */ - unsigned int (*getall)(DBMap* self, DBData** buf, unsigned int max, DBMatcher match, ...); + unsigned int (*getall)(struct DBMap *self, struct DBData **buf, unsigned int max, DBMatcher match, ...); /** * Get the data of the entries matched by <code>match</code>. @@ -448,24 +451,25 @@ struct DBMap { * @param ... Extra arguments for match * @return The number of entries that matched * @protected - * @see DBMap#getall(DBMap*,void **,unsigned int,DBMatcher,...) + * @see struct DBMap#getall() */ - unsigned int (*vgetall)(DBMap* self, DBData** buf, unsigned int max, DBMatcher match, va_list args); + unsigned int (*vgetall)(struct DBMap *self, struct DBData **buf, unsigned int max, DBMatcher match, va_list args); /** - * Just calls {@link DBMap#vensure}. - * Get the data of the entry identified by the key. - * If the entry does not exist, an entry is added with the data returned by - * <code>create</code>. + * Just calls struct DBMap#vensure(). + * + * Get the data of the entry identified by the key. If the entry does + * not exist, an entry is added with the data returned by `create`. + * * @param self Database * @param key Key that identifies the entry * @param create Function used to create the data if the entry doesn't exist * @param ... Extra arguments for create * @return Data of the entry * @protected - * @see DBMap#vensure(DBMap*,DBKey,DBCreateData,va_list) + * @see struct DBMap#vensure() */ - DBData* (*ensure)(DBMap* self, DBKey key, DBCreateData create, ...); + struct DBData *(*ensure)(struct DBMap *self, union DBKey key, DBCreateData create, ...); /** * Get the data of the entry identified by the key. @@ -477,9 +481,9 @@ struct DBMap { * @param args Extra arguments for create * @return Data of the entry * @protected - * @see DBMap#ensure(DBMap*,DBKey,DBCreateData,...) + * @see struct DBMap#ensure() */ - DBData* (*vensure)(DBMap* self, DBKey key, DBCreateData create, va_list args); + struct DBData *(*vensure)(struct DBMap *self, union DBKey key, DBCreateData create, va_list args); /** * Put the data identified by the key in the database. @@ -492,7 +496,7 @@ struct DBMap { * @return 1 if if the entry already exists, 0 otherwise * @protected */ - int (*put)(DBMap* self, DBKey key, DBData data, DBData *out_data); + int (*put)(struct DBMap *self, union DBKey key, struct DBData data, struct DBData *out_data); /** * Remove an entry from the database. @@ -504,10 +508,11 @@ struct DBMap { * @return 1 if if the entry already exists, 0 otherwise * @protected */ - int (*remove)(DBMap* self, DBKey key, DBData *out_data); + int (*remove)(struct DBMap *self, union DBKey key, struct DBData *out_data); /** - * Just calls {@link DBMap#vforeach}. + * Just calls struct DBMap#vforeach(). + * * Apply <code>func</code> to every entry in the database. * Returns the sum of values returned by func. * @param self Database @@ -515,9 +520,9 @@ struct DBMap { * @param ... Extra arguments for func * @return Sum of the values returned by func * @protected - * @see DBMap#vforeach(DBMap*,DBApply,va_list) + * @see struct DBMap#vforeach() */ - int (*foreach)(DBMap* self, DBApply func, ...); + int (*foreach)(struct DBMap *self, DBApply func, ...); /** * Apply <code>func</code> to every entry in the database. @@ -527,12 +532,13 @@ struct DBMap { * @param args Extra arguments for func * @return Sum of the values returned by func * @protected - * @see DBMap#foreach(DBMap*,DBApply,...) + * @see struct DBMap#foreach() */ - int (*vforeach)(DBMap* self, DBApply func, va_list args); + int (*vforeach)(struct DBMap *self, DBApply func, va_list args); /** - * Just calls {@link DBMap#vclear}. + * Just calls struct DBMap#vclear(). + * * Removes all entries from the database. * Before deleting an entry, func is applied to it. * Releases the key and the data. @@ -542,9 +548,9 @@ struct DBMap { * @param ... Extra arguments for func * @return Sum of values returned by func * @protected - * @see DBMap#vclear(DBMap*,DBApply,va_list) + * @see struct DBMap#vclear() */ - int (*clear)(DBMap* self, DBApply func, ...); + int (*clear)(struct DBMap *self, DBApply func, ...); /** * Removes all entries from the database. @@ -556,12 +562,12 @@ struct DBMap { * @param args Extra arguments for func * @return Sum of values returned by func * @protected - * @see DBMap#clear(DBMap*,DBApply,...) + * @see struct DBMap#clear() */ - int (*vclear)(DBMap* self, DBApply func, va_list args); + int (*vclear)(struct DBMap *self, DBApply func, va_list args); /** - * Just calls {@link DBMap#vdestroy}. + * Just calls DBMap#vdestroy(). * Finalize the database, feeing all the memory it uses. * Before deleting an entry, func is applied to it. * Releases the key and the data. @@ -573,9 +579,9 @@ struct DBMap { * @param ... Extra arguments for func * @return Sum of values returned by func * @protected - * @see DBMap#vdestroy(DBMap*,DBApply,va_list) + * @see struct DBMap#vdestroy() */ - int (*destroy)(DBMap* self, DBApply func, ...); + int (*destroy)(struct DBMap *self, DBApply func, ...); /** * Finalize the database, feeing all the memory it uses. @@ -588,9 +594,9 @@ struct DBMap { * @param args Extra arguments for func * @return Sum of values returned by func * @protected - * @see DBMap#destroy(DBMap*,DBApply,...) + * @see struct DBMap#destroy() */ - int (*vdestroy)(DBMap* self, DBApply func, va_list args); + int (*vdestroy)(struct DBMap *self, DBApply func, va_list args); /** * Return the size of the database (number of items in the database). @@ -598,7 +604,7 @@ struct DBMap { * @return Size of the database * @protected */ - unsigned int (*size)(DBMap* self); + unsigned int (*size)(struct DBMap *self); /** * Return the type of the database. @@ -606,7 +612,7 @@ struct DBMap { * @return Type of the database * @protected */ - DBType (*type)(DBMap* self); + enum DBType (*type)(struct DBMap *self); /** * Return the options of the database. @@ -614,7 +620,7 @@ struct DBMap { * @return Options of the database * @protected */ - DBOptions (*options)(DBMap* self); + enum DBOptions (*options)(struct DBMap *self); }; @@ -712,7 +718,7 @@ struct DBMap { #define dbi_exists(dbi) ( (dbi)->exists(dbi) ) #define dbi_destroy(dbi) ( (dbi)->destroy(dbi) ) -/*****************************************************************************\ +/***************************************************************************** * (2) Section with public functions. * * db_fix_options - Fix the options for a type of database. * * db_default_cmp - Get the default comparator for a type of database. * @@ -721,20 +727,20 @@ struct DBMap { * with the fixed options. * * db_custom_release - Get the releaser that behaves as specified. * * db_alloc - Allocate a new database. * - * db_i2key - Manual cast from 'int' to 'DBKey'. * - * db_ui2key - Manual cast from 'unsigned int' to 'DBKey'. * - * db_str2key - Manual cast from 'unsigned char *' to 'DBKey'. * - * db_i642key - Manual cast from 'int64' to 'DBKey'. * - * db_ui642key - Manual cast from 'uint64' to 'DBKey'. * - * db_i2data - Manual cast from 'int' to 'DBData'. * - * db_ui2data - Manual cast from 'unsigned int' to 'DBData'. * - * db_ptr2data - Manual cast from 'void*' to 'DBData'. * - * db_data2i - Gets 'int' value from 'DBData'. * - * db_data2ui - Gets 'unsigned int' value from 'DBData'. * - * db_data2ptr - Gets 'void*' value from 'DBData'. * + * db_i2key - Manual cast from `int` to `union DBKey`. * + * db_ui2key - Manual cast from `unsigned int` to `union DBKey`. * + * db_str2key - Manual cast from `unsigned char *` to `union DBKey`.* + * db_i642key - Manual cast from `int64` to `union DBKey`. * + * db_ui642key - Manual cast from `uint64` to `union DBKey`. * + * db_i2data - Manual cast from `int` to `struct DBData`. * + * db_ui2data - Manual cast from `unsigned int` to `struct DBData`. * + * db_ptr2data - Manual cast from `void*` to `struct DBData`. * + * db_data2i - Gets `int` value from `struct DBData`. * + * db_data2ui - Gets `unsigned int` value from `struct DBData`. * + * db_data2ptr - Gets `void*` value from `struct DBData`. * * db_init - Initializes the database system. * * db_final - Finalizes the database system. * -\*****************************************************************************/ + *****************************************************************************/ struct db_interface { /** @@ -745,66 +751,71 @@ struct db_interface { * @param options Original options of the database * @return Fixed options of the database * @private - * @see #DBType - * @see #DBOptions - * @see #db_default_release(DBType,DBOptions) + * @see enum DBType + * @see enum DBOptions + * @see #db_default_release() */ -DBOptions (*fix_options) (DBType type, DBOptions options); +enum DBOptions (*fix_options) (enum DBType type, enum DBOptions options); /** * Returns the default comparator for the type of database. * @param type Type of database * @return Comparator for the type of database or NULL if unknown database * @public - * @see #DBType + * @see enum DBType * @see #DBComparator */ -DBComparator (*default_cmp) (DBType type); +DBComparator (*default_cmp) (enum DBType type); /** * Returns the default hasher for the specified type of database. * @param type Type of database * @return Hasher of the type of database or NULL if unknown database * @public - * @see #DBType + * @see enum DBType * @see #DBHasher */ -DBHasher (*default_hash) (DBType type); +DBHasher (*default_hash) (enum DBType type); /** * Returns the default releaser for the specified type of database with the * specified options. - * NOTE: the options are fixed by {@link #db_fix_options(DBType,DBOptions)} - * before choosing the releaser + * + * NOTE: the options are fixed by #db_fix_options() before choosing the + * releaser. + * * @param type Type of database * @param options Options of the database * @return Default releaser for the type of database with the fixed options * @public - * @see #DBType - * @see #DBOptions + * @see enum DBType + * @see enum DBOptions * @see #DBReleaser - * @see #db_fix_options(DBType,DBOptions) - * @see #db_custom_release(DBRelease) + * @see #db_fix_options() + * @see #db_custom_release() */ -DBReleaser (*default_release) (DBType type, DBOptions options); +DBReleaser (*default_release) (enum DBType type, enum DBOptions options); /** * Returns the releaser that behaves as <code>which</code> specifies. * @param which Defines what the releaser releases * @return Releaser for the specified release options * @public - * @see #DBRelease + * @see enum DBReleaseOption * @see #DBReleaser - * @see #db_default_release(DBType,DBOptions) + * @see #db_default_release() */ -DBReleaser (*custom_release) (DBRelease which); +DBReleaser (*custom_release) (enum DBReleaseOption which); /** * Allocate a new database of the specified type. + * * It uses the default comparator, hasher and releaser of the specified * database type and fixed options. - * NOTE: the options are fixed by {@link #db_fix_options(DBType,DBOptions)} - * before creating the database. + * + * NOTE: the options are fixed by #db_fix_options() before creating the + * database. + * * @param file File where the database is being allocated * @param line Line of the file where the database is being allocated * @param type Type of database @@ -813,14 +824,14 @@ DBReleaser (*custom_release) (DBRelease which); * databases. If 0, the maximum number of maxlen is used (64K). * @return The interface of the database * @public - * @see #DBType - * @see #DBMap - * @see #db_default_cmp(DBType) - * @see #db_default_hash(DBType) - * @see #db_default_release(DBType,DBOptions) - * @see #db_fix_options(DBType,DBOptions) + * @see enum DBType + * @see struct DBMap + * @see #db_default_cmp() + * @see #db_default_hash() + * @see #db_default_release() + * @see #db_fix_options() */ -DBMap* (*alloc) (const char *file, const char *func, int line, DBType type, DBOptions options, unsigned short maxlen); +struct DBMap *(*alloc) (const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); /** * Manual cast from 'int' to the union DBKey. @@ -828,7 +839,7 @@ DBMap* (*alloc) (const char *file, const char *func, int line, DBType type, DBOp * @return The key as a DBKey union * @public */ -DBKey (*i2key) (int key); +union DBKey (*i2key) (int key); /** * Manual cast from 'unsigned int' to the union DBKey. @@ -836,7 +847,7 @@ DBKey (*i2key) (int key); * @return The key as a DBKey union * @public */ -DBKey (*ui2key) (unsigned int key); +union DBKey (*ui2key) (unsigned int key); /** * Manual cast from 'unsigned char *' to the union DBKey. @@ -844,7 +855,7 @@ DBKey (*ui2key) (unsigned int key); * @return The key as a DBKey union * @public */ -DBKey (*str2key) (const char *key); +union DBKey (*str2key) (const char *key); /** * Manual cast from 'int64' to the union DBKey. @@ -852,7 +863,7 @@ DBKey (*str2key) (const char *key); * @return The key as a DBKey union * @public */ -DBKey (*i642key) (int64 key); +union DBKey (*i642key) (int64 key); /** * Manual cast from 'uint64' to the union DBKey. @@ -860,7 +871,7 @@ DBKey (*i642key) (int64 key); * @return The key as a DBKey union * @public */ -DBKey (*ui642key) (uint64 key); +union DBKey (*ui642key) (uint64 key); /** * Manual cast from 'int' to the struct DBData. @@ -868,7 +879,7 @@ DBKey (*ui642key) (uint64 key); * @return The data as a DBData struct * @public */ -DBData (*i2data) (int data); +struct DBData (*i2data) (int data); /** * Manual cast from 'unsigned int' to the struct DBData. @@ -876,7 +887,7 @@ DBData (*i2data) (int data); * @return The data as a DBData struct * @public */ -DBData (*ui2data) (unsigned int data); +struct DBData (*ui2data) (unsigned int data); /** * Manual cast from 'void *' to the struct DBData. @@ -884,7 +895,7 @@ DBData (*ui2data) (unsigned int data); * @return The data as a DBData struct * @public */ -DBData (*ptr2data) (void *data); +struct DBData (*ptr2data) (void *data); /** * Gets int type data from struct DBData. @@ -893,7 +904,7 @@ DBData (*ptr2data) (void *data); * @return Integer value of the data. * @public */ -int (*data2i) (DBData *data); +int (*data2i) (struct DBData *data); /** * Gets unsigned int type data from struct DBData. @@ -902,7 +913,7 @@ int (*data2i) (DBData *data); * @return Unsigned int value of the data. * @public */ -unsigned int (*data2ui) (DBData *data); +unsigned int (*data2ui) (struct DBData *data); /** * Gets void* type data from struct DBData. @@ -911,7 +922,7 @@ unsigned int (*data2ui) (DBData *data); * @return Void* value of the data. * @public */ -void* (*data2ptr) (DBData *data); +void* (*data2ptr) (struct DBData *data); /** * Initialize the database system. diff --git a/src/common/grfio.c b/src/common/grfio.c index 678875c91..c6e47d357 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -410,12 +410,12 @@ void *grfio_reads(const char *fname, int *size) // LocalFileCheck char lfname[256]; FILE *in; - unsigned char *buf = NULL; grfio_localpath_create(lfname, sizeof(lfname), (entry && entry->fnd) ? entry->fnd : fname); in = fopen(lfname, "rb"); if (in != NULL) { int declen; + unsigned char *buf = NULL; fseek(in,0,SEEK_END); declen = (int)ftell(in); if (declen == -1) { diff --git a/src/common/mapindex.h b/src/common/mapindex.h index 3fb170c1f..0ebbeb04b 100644 --- a/src/common/mapindex.h +++ b/src/common/mapindex.h @@ -22,9 +22,11 @@ #define COMMON_MAPINDEX_H #include "common/hercules.h" -#include "common/db.h" #include "common/mmo.h" +/* Forward Declarations */ +struct DBMap; // common/db.h + #define MAX_MAPINDEX 2000 /* wohoo, someone look at all those |: map_default could (or *should*) be a char-server.conf */ @@ -82,7 +84,7 @@ struct mapindex_interface { char config_file[80]; /* mapname (str) -> index (int) */ - DBMap *db; + struct DBMap *db; /* number of entries in the index table */ int num; /* default map name */ diff --git a/src/common/md5calc.c b/src/common/md5calc.c index bc70d9006..d346c8aa4 100644 --- a/src/common/md5calc.c +++ b/src/common/md5calc.c @@ -169,7 +169,7 @@ static void MD5_String2binary(const char * string, unsigned char * output) //var /*8bit*/ unsigned char padding_message[64]; //Extended message 512bit 64byte - const unsigned char *pstring; //The position of string in the present scanning notes is held. + const unsigned char *pstring; // The position of string in the present scanning notes is held. /*32bit*/ unsigned int string_byte_len, //The byte chief of string is held. @@ -192,7 +192,7 @@ static void MD5_String2binary(const char * string, unsigned char * output) //Step 1.Append Padding Bits (extension of a mark bit) //1-1 string_byte_len = (unsigned int)strlen(string); //The byte chief of a character sequence is acquired. - pstring = (const unsigned char *)string; //The position of the present character sequence is set. + pstring = (const unsigned char *)string; // The position of the present character sequence is set. //1-2 Repeat calculation until length becomes less than 64 bytes. for (i=string_byte_len; 64<=i; i-=64,pstring+=64) @@ -200,7 +200,7 @@ static void MD5_String2binary(const char * string, unsigned char * output) //1-3 copy_len = string_byte_len % 64; //The number of bytes which remained is computed. - strncpy((char *)padding_message, (const char *)pstring, copy_len); //A message is copied to an extended bit sequence. + strncpy((char *)padding_message, (const char *)pstring, copy_len); // A message is copied to an extended bit sequence. memset(padding_message+copy_len, 0, 64 - copy_len); //It buries by 0 until it becomes extended bit length. padding_message[copy_len] |= 0x80; //The next of a message is 1. diff --git a/src/common/memmgr.c b/src/common/memmgr.c index 15e55fbeb..dfea24465 100644 --- a/src/common/memmgr.c +++ b/src/common/memmgr.c @@ -154,8 +154,8 @@ void* aReallocz_(void *p, size_t size, const char *file, int line, const char *f #ifdef USE_MEMMGR ret = REALLOC(p, size, file, line, func); #else - size_t newSize; - if (p) { + if (p != NULL) { + size_t newSize; size_t oldSize = BUFFER_SIZE(p); ret = REALLOC(p, size, file, line, func); newSize = BUFFER_SIZE(ret); @@ -167,7 +167,7 @@ void* aReallocz_(void *p, size_t size, const char *file, int line, const char *f memset(ret, 0, BUFFER_SIZE(ret)); } #endif - if (ret == NULL){ + if (ret == NULL) { ShowFatalError("%s:%d: in func %s: aRealloc error out of memory!\n",file,line,func); exit(EXIT_FAILURE); } diff --git a/src/common/mmo.h b/src/common/mmo.h index 0abae6092..a2080d900 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2015 Hercules Dev Team + * Copyright (C) 2012-2016 Hercules Dev Team * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify @@ -120,7 +120,7 @@ #define MAX_SLOTS 4 //Max amount of a single stacked item #define MAX_AMOUNT 30000 -#define MAX_ZENY 1000000000 +#define MAX_ZENY INT_MAX //Official Limit: 2.1b ( the var that stores the money doesn't go much higher than this by default ) #define MAX_BANK_ZENY INT_MAX @@ -213,11 +213,6 @@ #define JOBL_BABY 0x2000 //8192 #define JOBL_THIRD 0x4000 //16384 -//Packet DB -#define MIN_PACKET_DB 0x0064 //what's the point of minimum packet id ? [hemagx] -#define MAX_PACKET_DB 0x0F00 -#define MAX_PACKET_POS 20 - #define SCRIPT_VARNAME_LENGTH 32 ///< Maximum length of a script variable #define INFINITE_DURATION (-1) // Infinite duration for status changes diff --git a/src/common/showmsg.c b/src/common/showmsg.c index 1c1d4ca8b..8ed8efc1d 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -244,13 +244,13 @@ int VFPRINTF(HANDLE handle, const char *fmt, va_list argptr) continue; } else if (*q == ';') { // delimiter - if (numpoint < sizeof(numbers)/sizeof(*numbers)) { + if (numpoint < ARRAYLENGTH(numbers)) { // go to next array position numpoint++; } else { // array is full, so we 'forget' the first value - memmove(numbers,numbers+1,sizeof(numbers)/sizeof(*numbers)-1); - numbers[sizeof(numbers)/sizeof(*numbers)-1]=0; + memmove(numbers, numbers+1, ARRAYLENGTH(numbers)-1); + numbers[ARRAYLENGTH(numbers)-1]=0; } ++q; // and next number @@ -605,9 +605,6 @@ int vShowMessage_(enum msg_type flag, const char *string, va_list ap) { va_list apcopy; char prefix[100]; -#if defined(DEBUGLOGMAP) || defined(DEBUGLOGCHAR) || defined(DEBUGLOGLOGIN) - FILE *fp; -#endif if (!string || *string == '\0') { ShowError("Empty string passed to vShowMessage_().\n"); @@ -702,8 +699,8 @@ int vShowMessage_(enum msg_type flag, const char *string, va_list ap) } #if defined(DEBUGLOGMAP) || defined(DEBUGLOGCHAR) || defined(DEBUGLOGLOGIN) - if(strlen(DEBUGLOGPATH) > 0) { - fp=fopen(DEBUGLOGPATH,"a"); + if (strlen(DEBUGLOGPATH) > 0) { + FILE *fp = fopen(DEBUGLOGPATH,"a"); if (fp == NULL) { FPRINTF(STDERR, CL_RED"[ERROR]"CL_RESET": Could not open '"CL_WHITE"%s"CL_RESET"', access denied.\n", DEBUGLOGPATH); FFLUSH(STDERR); diff --git a/src/common/socket.c b/src/common/socket.c index 10712c78b..5d4ea06a0 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -975,7 +975,7 @@ static int access_debug = 0; static int ddos_count = 10; static int ddos_interval = 3*1000; static int ddos_autoreset = 10*60*1000; -DBMap *connect_history = NULL; +struct DBMap *connect_history = NULL; static int connect_check_(uint32 ip); @@ -1089,7 +1089,7 @@ static int connect_check_clear(int tid, int64 tick, int id, intptr_t data) { int clear = 0; int list = 0; ConnectHistory *hist = NULL; - DBIterator *iter; + struct DBIterator *iter; if( !db_size(connect_history) ) return 0; diff --git a/src/common/sql.c b/src/common/sql.c index ed93169ea..9a90f9807 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -79,11 +79,11 @@ struct SqlStmt { /////////////////////////////////////////////////////////////////////////////// /// Allocates and initializes a new Sql handle. -Sql* Sql_Malloc(void) +struct Sql *Sql_Malloc(void) { - Sql* self; + struct Sql *self; - CREATE(self, Sql, 1); + CREATE(self, struct Sql, 1); mysql_init(&self->handle); StrBuf->Init(&self->buf); self->lengths = NULL; @@ -93,10 +93,10 @@ Sql* Sql_Malloc(void) return self; } -static int Sql_P_Keepalive(Sql* self); +static int Sql_P_Keepalive(struct Sql *self); /// Establishes a connection. -int Sql_Connect(Sql* self, const char* user, const char* passwd, const char* host, uint16 port, const char* db) +int Sql_Connect(struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db) { if( self == NULL ) return SQL_ERROR; @@ -119,7 +119,7 @@ int Sql_Connect(Sql* self, const char* user, const char* passwd, const char* hos } /// Retrieves the timeout of the connection. -int Sql_GetTimeout(Sql* self, uint32* out_timeout) +int Sql_GetTimeout(struct Sql *self, uint32 *out_timeout) { if( self && out_timeout && SQL_SUCCESS == SQL->Query(self, "SHOW VARIABLES LIKE 'wait_timeout'") ) { char* data; @@ -136,7 +136,7 @@ int Sql_GetTimeout(Sql* self, uint32* out_timeout) } /// Retrieves the name of the columns of a table into out_buf, with the separator after each name. -int Sql_GetColumnNames(Sql* self, const char* table, char* out_buf, size_t buf_len, char sep) +int Sql_GetColumnNames(struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep) { char* data; size_t len; @@ -164,7 +164,7 @@ int Sql_GetColumnNames(Sql* self, const char* table, char* out_buf, size_t buf_l } /// Changes the encoding of the connection. -int Sql_SetEncoding(Sql* self, const char* encoding) +int Sql_SetEncoding(struct Sql *self, const char *encoding) { if( self && mysql_set_character_set(&self->handle, encoding) == 0 ) return SQL_SUCCESS; @@ -172,7 +172,7 @@ int Sql_SetEncoding(Sql* self, const char* encoding) } /// Pings the connection. -int Sql_Ping(Sql* self) +int Sql_Ping(struct Sql *self) { if( self && mysql_ping(&self->handle) == 0 ) return SQL_SUCCESS; @@ -184,7 +184,7 @@ int Sql_Ping(Sql* self) /// @private static int Sql_P_KeepaliveTimer(int tid, int64 tick, int id, intptr_t data) { - Sql* self = (Sql*)data; + struct Sql *self = (struct Sql *)data; ShowInfo("Pinging SQL server to keep connection alive...\n"); Sql_Ping(self); return 0; @@ -194,7 +194,7 @@ static int Sql_P_KeepaliveTimer(int tid, int64 tick, int id, intptr_t data) /// /// @return the keepalive timer id, or INVALID_TIMER /// @private -static int Sql_P_Keepalive(Sql* self) +static int Sql_P_Keepalive(struct Sql *self) { uint32 timeout, ping_interval; @@ -214,26 +214,27 @@ static int Sql_P_Keepalive(Sql* self) } /// Escapes a string. -size_t Sql_EscapeString(Sql* self, char *out_to, const char *from) +size_t Sql_EscapeString(struct Sql *self, char *out_to, const char *from) { - if( self ) + if (self != NULL) return (size_t)mysql_real_escape_string(&self->handle, out_to, from, (unsigned long)strlen(from)); else return (size_t)mysql_escape_string(out_to, from, (unsigned long)strlen(from)); } /// Escapes a string. -size_t Sql_EscapeStringLen(Sql* self, char *out_to, const char *from, size_t from_len) +size_t Sql_EscapeStringLen(struct Sql *self, char *out_to, const char *from, size_t from_len) { - if( self ) + if (self != NULL) return (size_t)mysql_real_escape_string(&self->handle, out_to, from, (unsigned long)from_len); else return (size_t)mysql_escape_string(out_to, from, (unsigned long)from_len); } /// Executes a query. -int Sql_Query(Sql *self, const char *query, ...) __attribute__((format(printf, 2, 3))); -int Sql_Query(Sql *self, const char *query, ...) { +int Sql_Query(struct Sql *self, const char *query, ...) __attribute__((format(printf, 2, 3))); +int Sql_Query(struct Sql *self, const char *query, ...) +{ int res; va_list args; @@ -245,7 +246,7 @@ int Sql_Query(Sql *self, const char *query, ...) { } /// Executes a query. -int Sql_QueryV(Sql* self, const char* query, va_list args) +int Sql_QueryV(struct Sql *self, const char *query, va_list args) { if( self == NULL ) return SQL_ERROR; @@ -270,7 +271,7 @@ int Sql_QueryV(Sql* self, const char* query, va_list args) } /// Executes a query. -int Sql_QueryStr(Sql* self, const char* query) +int Sql_QueryStr(struct Sql *self, const char *query) { if( self == NULL ) return SQL_ERROR; @@ -295,33 +296,34 @@ int Sql_QueryStr(Sql* self, const char* query) } /// Returns the number of the AUTO_INCREMENT column of the last INSERT/UPDATE query. -uint64 Sql_LastInsertId(Sql* self) +uint64 Sql_LastInsertId(struct Sql *self) { - if( self ) + if (self != NULL) return (uint64)mysql_insert_id(&self->handle); else return 0; } /// Returns the number of columns in each row of the result. -uint32 Sql_NumColumns(Sql* self) +uint32 Sql_NumColumns(struct Sql *self) { - if( self && self->result ) + if (self != NULL && self->result != NULL) return (uint32)mysql_num_fields(self->result); return 0; } /// Returns the number of rows in the result. -uint64 Sql_NumRows(Sql* self) +uint64 Sql_NumRows(struct Sql *self) { - if( self && self->result ) + if (self != NULL && self->result != NULL) return (uint64)mysql_num_rows(self->result); return 0; } /// Fetches the next row. -int Sql_NextRow(Sql* self) { - if( self && self->result ) { +int Sql_NextRow(struct Sql *self) +{ + if (self != NULL && self->result != NULL) { self->row = mysql_fetch_row(self->result); if( self->row ) { self->lengths = mysql_fetch_lengths(self->result); @@ -335,7 +337,7 @@ int Sql_NextRow(Sql* self) { } /// Gets the data of a column. -int Sql_GetData(Sql* self, size_t col, char** out_buf, size_t* out_len) +int Sql_GetData(struct Sql *self, size_t col, char **out_buf, size_t *out_len) { if( self && self->row ) { if( col < SQL->NumColumns(self) ) { @@ -351,7 +353,8 @@ int Sql_GetData(Sql* self, size_t col, char** out_buf, size_t* out_len) } /// Frees the result of the query. -void Sql_FreeResult(Sql* self) { +void Sql_FreeResult(struct Sql *self) +{ if( self && self->result ) { mysql_free_result(self->result); self->result = NULL; @@ -361,7 +364,7 @@ void Sql_FreeResult(Sql* self) { } /// Shows debug information (last query). -void Sql_ShowDebug_(Sql* self, const char* debug_file, const unsigned long debug_line) +void Sql_ShowDebug_(struct Sql *self, const char *debug_file, const unsigned long debug_line) { if( self == NULL ) ShowDebug("at %s:%lu - self is NULL\n", debug_file, debug_line); @@ -372,7 +375,7 @@ void Sql_ShowDebug_(Sql* self, const char* debug_file, const unsigned long debug } /// Frees a Sql handle returned by Sql_Malloc. -void Sql_Free(Sql* self) { +void Sql_Free(struct Sql *self) { if( self ) { SQL->FreeResult(self); @@ -515,7 +518,7 @@ static void Sql_P_ShowDebugMysqlFieldInfo(const char* prefix, enum enum_field_ty /// Reports debug information about a truncated column. /// /// @private -static void SqlStmt_P_ShowDebugTruncatedColumn(SqlStmt* self, size_t i) +static void SqlStmt_P_ShowDebugTruncatedColumn(struct SqlStmt *self, size_t i) { MYSQL_RES* meta; MYSQL_FIELD* field; @@ -535,8 +538,9 @@ static void SqlStmt_P_ShowDebugTruncatedColumn(SqlStmt* self, size_t i) } /// Allocates and initializes a new SqlStmt handle. -SqlStmt* SqlStmt_Malloc(Sql* sql) { - SqlStmt* self; +struct SqlStmt *SqlStmt_Malloc(struct Sql *sql) +{ + struct SqlStmt *self; MYSQL_STMT* stmt; if( sql == NULL ) @@ -547,7 +551,7 @@ SqlStmt* SqlStmt_Malloc(Sql* sql) { ShowSQL("DB error - %s\n", mysql_error(&sql->handle)); return NULL; } - CREATE(self, SqlStmt, 1); + CREATE(self, struct SqlStmt, 1); StrBuf->Init(&self->buf); self->stmt = stmt; self->params = NULL; @@ -562,8 +566,9 @@ SqlStmt* SqlStmt_Malloc(Sql* sql) { } /// Prepares the statement. -int SqlStmt_Prepare(SqlStmt *self, const char *query, ...) __attribute__((format(printf, 2, 3))); -int SqlStmt_Prepare(SqlStmt *self, const char *query, ...) { +int SqlStmt_Prepare(struct SqlStmt *self, const char *query, ...) __attribute__((format(printf, 2, 3))); +int SqlStmt_Prepare(struct SqlStmt *self, const char *query, ...) +{ int res; va_list args; @@ -575,7 +580,7 @@ int SqlStmt_Prepare(SqlStmt *self, const char *query, ...) { } /// Prepares the statement. -int SqlStmt_PrepareV(SqlStmt* self, const char* query, va_list args) +int SqlStmt_PrepareV(struct SqlStmt *self, const char *query, va_list args) { if( self == NULL ) return SQL_ERROR; @@ -595,7 +600,7 @@ int SqlStmt_PrepareV(SqlStmt* self, const char* query, va_list args) } /// Prepares the statement. -int SqlStmt_PrepareStr(SqlStmt* self, const char* query) +int SqlStmt_PrepareStr(struct SqlStmt *self, const char *query) { if( self == NULL ) return SQL_ERROR; @@ -615,7 +620,7 @@ int SqlStmt_PrepareStr(SqlStmt* self, const char* query) } /// Returns the number of parameters in the prepared statement. -size_t SqlStmt_NumParams(SqlStmt* self) +size_t SqlStmt_NumParams(struct SqlStmt *self) { if( self ) return (size_t)mysql_stmt_param_count(self->stmt); @@ -624,7 +629,7 @@ size_t SqlStmt_NumParams(SqlStmt* self) } /// Binds a parameter to a buffer. -int SqlStmt_BindParam(SqlStmt* self, size_t idx, enum SqlDataType buffer_type, void* buffer, size_t buffer_len) +int SqlStmt_BindParam(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len) { if( self == NULL ) return SQL_ERROR; @@ -645,14 +650,23 @@ int SqlStmt_BindParam(SqlStmt* self, size_t idx, enum SqlDataType buffer_type, v self->params[i].buffer_type = MYSQL_TYPE_NULL; self->bind_params = true; } - if( idx < self->max_params ) - return Sql_P_BindSqlDataType(self->params+idx, buffer_type, buffer, buffer_len, NULL, NULL); - else - return SQL_SUCCESS;// out of range - ignore + if (idx >= self->max_params) + return SQL_SUCCESS; // out of range - ignore + +PRAGMA_GCC45(GCC diagnostic push) +PRAGMA_GCC45(GCC diagnostic ignored "-Wcast-qual") + /* + * MySQL uses the same struct with a non-const buffer for both + * parameters (input) and columns (output). + * As such, we get to close our eyes and pretend we didn't see we're + * dropping a const qualifier here. + */ + return Sql_P_BindSqlDataType(self->params+idx, buffer_type, (void *)buffer, buffer_len, NULL, NULL); +PRAGMA_GCC45(GCC diagnostic pop) } /// Executes the prepared statement. -int SqlStmt_Execute(SqlStmt* self) +int SqlStmt_Execute(struct SqlStmt *self) { if( self == NULL ) return SQL_ERROR; @@ -677,7 +691,7 @@ int SqlStmt_Execute(SqlStmt* self) } /// Returns the number of the AUTO_INCREMENT column of the last INSERT/UPDATE statement. -uint64 SqlStmt_LastInsertId(SqlStmt* self) +uint64 SqlStmt_LastInsertId(struct SqlStmt *self) { if( self ) return (uint64)mysql_stmt_insert_id(self->stmt); @@ -686,7 +700,7 @@ uint64 SqlStmt_LastInsertId(SqlStmt* self) } /// Returns the number of columns in each row of the result. -size_t SqlStmt_NumColumns(SqlStmt* self) +size_t SqlStmt_NumColumns(struct SqlStmt *self) { if( self ) return (size_t)mysql_stmt_field_count(self->stmt); @@ -695,7 +709,8 @@ size_t SqlStmt_NumColumns(SqlStmt* self) } /// Binds the result of a column to a buffer. -int SqlStmt_BindColumn(SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) { +int SqlStmt_BindColumn(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) +{ if (self == NULL) return SQL_ERROR; @@ -736,16 +751,16 @@ int SqlStmt_BindColumn(SqlStmt *self, size_t idx, enum SqlDataType buffer_type, } /// Returns the number of rows in the result. -uint64 SqlStmt_NumRows(SqlStmt* self) +uint64 SqlStmt_NumRows(struct SqlStmt *self) { - if( self ) + if (self != NULL) return (uint64)mysql_stmt_num_rows(self->stmt); else return 0; } /// Fetches the next row. -int SqlStmt_NextRow(SqlStmt* self) +int SqlStmt_NextRow(struct SqlStmt *self) { int err; size_t i; @@ -763,8 +778,6 @@ int SqlStmt_NextRow(SqlStmt* self) // check for errors if (err == MYSQL_NO_DATA) return SQL_NO_DATA; -#if defined(MYSQL_DATA_TRUNCATED) - // MySQL 5.0/5.1 defines and returns MYSQL_DATA_TRUNCATED [FlavioJS] if (err == MYSQL_DATA_TRUNCATED) { my_bool truncated; @@ -789,7 +802,6 @@ int SqlStmt_NextRow(SqlStmt* self) ShowSQL("DB error - data truncated (unknown source)\n"); return SQL_ERROR; } -#endif if (err) { ShowSQL("DB error - %s\n", mysql_stmt_error(self->stmt)); hercules_mysql_error_handler(mysql_stmt_errno(self->stmt)); @@ -801,18 +813,6 @@ int SqlStmt_NextRow(SqlStmt* self) for (i = 0; i < cols; ++i) { unsigned long length = self->column_lengths[i].length; MYSQL_BIND *column = &self->columns[i]; -#if !defined(MYSQL_DATA_TRUNCATED) - // MySQL 4.1/(below?) returns success even if data is truncated, so we test truncation manually [FlavioJS] - if (column->buffer_length < length) { - // report truncated column - if (column->buffer_type == MYSQL_TYPE_STRING || column->buffer_type == MYSQL_TYPE_BLOB) { - // string/enum/blob column - SqlStmt_P_ShowDebugTruncatedColumn(self, i); - return SQL_ERROR; - } - // FIXME numeric types and null [FlavioJS] - } -#endif if (self->column_lengths[i].out_length) *self->column_lengths[i].out_length = (uint32)length; if (column->buffer_type == MYSQL_TYPE_STRING) { @@ -828,14 +828,14 @@ int SqlStmt_NextRow(SqlStmt* self) } /// Frees the result of the statement execution. -void SqlStmt_FreeResult(SqlStmt* self) +void SqlStmt_FreeResult(struct SqlStmt *self) { if( self ) mysql_stmt_free_result(self->stmt); } /// Shows debug information (with statement). -void SqlStmt_ShowDebug_(SqlStmt* self, const char* debug_file, const unsigned long debug_line) +void SqlStmt_ShowDebug_(struct SqlStmt *self, const char *debug_file, const unsigned long debug_line) { if( self == NULL ) ShowDebug("at %s:%lu - self is NULL\n", debug_file, debug_line); @@ -846,7 +846,7 @@ void SqlStmt_ShowDebug_(SqlStmt* self, const char* debug_file, const unsigned lo } /// Frees a SqlStmt returned by SqlStmt_Malloc. -void SqlStmt_Free(SqlStmt* self) +void SqlStmt_Free(struct SqlStmt *self) { if( self ) { @@ -865,10 +865,10 @@ void SqlStmt_Free(SqlStmt* self) } /* receives mysql error codes during runtime (not on first-time-connects) */ void hercules_mysql_error_handler(unsigned int ecode) { - static unsigned int retry = 1; switch( ecode ) { case 2003:/* Can't connect to MySQL (this error only happens here when failing to reconnect) */ if( mysql_reconnect_type == 1 ) { + static unsigned int retry = 1; if( ++retry > mysql_reconnect_count ) { ShowFatalError("MySQL has been unreachable for too long, %u reconnects were attempted. Shutting Down\n", retry); exit(EXIT_FAILURE); @@ -919,7 +919,8 @@ void Sql_inter_server_read(const char* cfgName, bool first) { return; } -void Sql_HerculesUpdateCheck(Sql* self) { +void Sql_HerculesUpdateCheck(struct Sql *self) +{ char line[22];// "yyyy-mm-dd--hh-mm" (17) + ".sql" (4) + 1 FILE* ifp;/* index fp */ unsigned int performed = 0; @@ -980,7 +981,8 @@ void Sql_HerculesUpdateCheck(Sql* self) { StrBuf->Destroy(&buf); } -void Sql_HerculesUpdateSkip(Sql* self,const char *filename) { +void Sql_HerculesUpdateSkip(struct Sql *self, const char *filename) +{ char path[41];// "sql-files/upgrades/" (19) + "yyyy-mm-dd--hh-mm" (17) + ".sql" (4) + 1 char timestamp[11];// "1360186680" (10) + 1 FILE* ifp;/* index fp */ diff --git a/src/common/sql.h b/src/common/sql.h index e949a8280..07be829fc 100644 --- a/src/common/sql.h +++ b/src/common/sql.h @@ -71,90 +71,86 @@ enum SqlDataType { SQLDT_LASTID }; -struct Sql;// Sql handle (private access) -struct SqlStmt;// Sql statement (private access) - -typedef enum SqlDataType SqlDataType; -typedef struct Sql Sql; -typedef struct SqlStmt SqlStmt; +struct Sql; ///< Sql handle (private access) +struct SqlStmt; ///< Sql statement (private access) struct sql_interface { /// Establishes a connection. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*Connect) (Sql* self, const char* user, const char* passwd, const char* host, uint16 port, const char* db); + int (*Connect) (struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db); /// Retrieves the timeout of the connection. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*GetTimeout) (Sql* self, uint32* out_timeout); + int (*GetTimeout) (struct Sql *self, uint32 *out_timeout); /// Retrieves the name of the columns of a table into out_buf, with the separator after each name. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*GetColumnNames) (Sql* self, const char* table, char* out_buf, size_t buf_len, char sep); + int (*GetColumnNames) (struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep); /// Changes the encoding of the connection. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*SetEncoding) (Sql* self, const char* encoding); + int (*SetEncoding) (struct Sql *self, const char *encoding); /// Pings the connection. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*Ping) (Sql* self); + int (*Ping) (struct Sql *self); /// Escapes a string. /// The output buffer must be at least strlen(from)*2+1 in size. /// /// @return The size of the escaped string - size_t (*EscapeString) (Sql* self, char* out_to, const char* from); + size_t (*EscapeString) (struct Sql *self, char *out_to, const char *from); /// Escapes a string. /// The output buffer must be at least from_len*2+1 in size. /// /// @return The size of the escaped string - size_t (*EscapeStringLen) (Sql* self, char* out_to, const char* from, size_t from_len); + size_t (*EscapeStringLen) (struct Sql *self, char *out_to, const char *from, size_t from_len); /// Executes a query. /// Any previous result is freed. /// The query is constructed as if it was sprintf. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*Query) (Sql *self, const char *query, ...) __attribute__((format(printf, 2, 3))); + int (*Query) (struct Sql *self, const char *query, ...) __attribute__((format(printf, 2, 3))); /// Executes a query. /// Any previous result is freed. /// The query is constructed as if it was svprintf. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*QueryV) (Sql* self, const char* query, va_list args); + int (*QueryV) (struct Sql *self, const char *query, va_list args); /// Executes a query. /// Any previous result is freed. /// The query is used directly. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*QueryStr) (Sql* self, const char* query); + int (*QueryStr) (struct Sql *self, const char *query); /// Returns the number of the AUTO_INCREMENT column of the last INSERT/UPDATE query. /// /// @return Value of the auto-increment column - uint64 (*LastInsertId) (Sql* self); + uint64 (*LastInsertId) (struct Sql *self); /// Returns the number of columns in each row of the result. /// /// @return Number of columns - uint32 (*NumColumns) (Sql* self); + uint32 (*NumColumns) (struct Sql *self); /// Returns the number of rows in the result. /// /// @return Number of rows - uint64 (*NumRows) (Sql* self); + uint64 (*NumRows) (struct Sql *self); /// Fetches the next row. /// The data of the previous row is no longer valid. /// /// @return SQL_SUCCESS, SQL_ERROR or SQL_NO_DATA - int (*NextRow) (Sql* self); + int (*NextRow) (struct Sql *self); /// Gets the data of a column. /// The data remains valid until the next row is fetched or the result is freed. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*GetData) (Sql* self, size_t col, char** out_buf, size_t* out_len); + int (*GetData) (struct Sql *self, size_t col, char **out_buf, size_t *out_len); /// Frees the result of the query. - void (*FreeResult) (Sql* self); + void (*FreeResult) (struct Sql *self); /// Shows debug information (last query). - void (*ShowDebug_) (Sql* self, const char* debug_file, const unsigned long debug_line); + void (*ShowDebug_) (struct Sql *self, const char *debug_file, const unsigned long debug_line); /// Frees a Sql handle returned by Sql_Malloc. - void (*Free) (Sql* self); + void (*Free) (struct Sql *self); /// Allocates and initializes a new Sql handle. struct Sql *(*Malloc) (void); @@ -180,56 +176,56 @@ struct sql_interface { /// Queries in Sql and SqlStmt are independent and don't affect each other. /// /// @return SqlStmt handle or NULL if an error occurred - struct SqlStmt* (*StmtMalloc)(Sql* sql); + struct SqlStmt* (*StmtMalloc)(struct Sql *sql); /// Prepares the statement. /// Any previous result is freed and all parameter bindings are removed. /// The query is constructed as if it was sprintf. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*StmtPrepare) (SqlStmt *self, const char *query, ...) __attribute__((format(printf, 2, 3))); + int (*StmtPrepare) (struct SqlStmt *self, const char *query, ...) __attribute__((format(printf, 2, 3))); /// Prepares the statement. /// Any previous result is freed and all parameter bindings are removed. /// The query is constructed as if it was svprintf. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*StmtPrepareV)(SqlStmt* self, const char* query, va_list args); + int (*StmtPrepareV)(struct SqlStmt *self, const char *query, va_list args); /// Prepares the statement. /// Any previous result is freed and all parameter bindings are removed. /// The query is used directly. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*StmtPrepareStr)(SqlStmt* self, const char* query); + int (*StmtPrepareStr)(struct SqlStmt *self, const char *query); /// Returns the number of parameters in the prepared statement. /// /// @return Number or parameters - size_t (*StmtNumParams)(SqlStmt* self); + size_t (*StmtNumParams)(struct SqlStmt *self); /// Binds a parameter to a buffer. /// The buffer data will be used when the statement is executed. /// All parameters should have bindings. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*StmtBindParam)(SqlStmt* self, size_t idx, SqlDataType buffer_type, void* buffer, size_t buffer_len); + int (*StmtBindParam)(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len); /// Executes the prepared statement. /// Any previous result is freed and all column bindings are removed. /// /// @return SQL_SUCCESS or SQL_ERROR - int (*StmtExecute)(SqlStmt* self); + int (*StmtExecute)(struct SqlStmt *self); /// Returns the number of the AUTO_INCREMENT column of the last INSERT/UPDATE statement. /// /// @return Value of the auto-increment column - uint64 (*StmtLastInsertId)(SqlStmt* self); + uint64 (*StmtLastInsertId)(struct SqlStmt *self); /// Returns the number of columns in each row of the result. /// /// @return Number of columns - size_t (*StmtNumColumns)(SqlStmt* self); + size_t (*StmtNumColumns)(struct SqlStmt *self); /// Binds the result of a column to a buffer. /// The buffer will be filled with data when the next row is fetched. @@ -237,26 +233,26 @@ struct sql_interface { /// and the null-terminator (an extra byte). /// /// @return SQL_SUCCESS or SQL_ERROR - int (*StmtBindColumn)(SqlStmt* self, size_t idx, SqlDataType buffer_type, void* buffer, size_t buffer_len, uint32* out_length, int8* out_is_null); + int (*StmtBindColumn)(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null); /// Returns the number of rows in the result. /// /// @return Number of rows - uint64 (*StmtNumRows)(SqlStmt* self); + uint64 (*StmtNumRows)(struct SqlStmt *self); /// Fetches the next row. /// All column bindings will be filled with data. /// /// @return SQL_SUCCESS, SQL_ERROR or SQL_NO_DATA - int (*StmtNextRow)(SqlStmt* self); + int (*StmtNextRow)(struct SqlStmt *self); /// Frees the result of the statement execution. - void (*StmtFreeResult)(SqlStmt* self); + void (*StmtFreeResult)(struct SqlStmt *self); /// Frees a SqlStmt returned by SqlStmt_Malloc. - void (*StmtFree)(SqlStmt* self); + void (*StmtFree)(struct SqlStmt *self); - void (*StmtShowDebug_)(SqlStmt* self, const char* debug_file, const unsigned long debug_line); + void (*StmtShowDebug_)(struct SqlStmt *self, const char *debug_file, const unsigned long debug_line); }; @@ -265,8 +261,8 @@ void sql_defaults(void); void Sql_Init(void); -void Sql_HerculesUpdateCheck(Sql* self); -void Sql_HerculesUpdateSkip(Sql* self,const char *filename); +void Sql_HerculesUpdateCheck(struct Sql *self); +void Sql_HerculesUpdateSkip(struct Sql *self, const char *filename); #endif // HERCULES_CORE HPShared struct sql_interface *SQL; diff --git a/src/common/strlib.c b/src/common/strlib.c index 997b01ffa..9690151b4 100644 --- a/src/common/strlib.c +++ b/src/common/strlib.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2015 Hercules Dev Team + * Copyright (C) 2012-2016 Hercules Dev Team * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify @@ -271,10 +271,9 @@ char* strlib_strtok_r(char *s1, const char *s2, char **lasts) size_t strlib_strnlen(const char *string, size_t maxlen) { -// TODO: The _MSC_VER check can probably be removed (we no longer support VS -// versions <= 2003, do we?), but this implementation might be still necessary -// for NetBSD 5.x and possibly some Solaris versions. -#if !(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(HAVE_STRNLEN) +// TODO: Verify whether this implementation is still necessary for NetBSD 5.x +// and possibly some Solaris versions. +#if !(defined(WIN32) && defined(_MSC_VER)) && !defined(HAVE_STRNLEN) /* Find the length of STRING, but scan at most MAXLEN characters. * If no '\0' terminator is found in that many characters, return MAXLEN. */ @@ -424,13 +423,12 @@ int strlib_strline(const char *str, size_t pos) /// @param output Output string /// @param input Binary input buffer /// @param count Number of bytes to convert -bool strlib_bin2hex(char *output, unsigned char *input, size_t count) +bool strlib_bin2hex(char *output, const unsigned char *input, size_t count) { char toHex[] = "0123456789abcdef"; size_t i; - for( i = 0; i < count; ++i ) - { + for (i = 0; i < count; ++i) { *output++ = toHex[(*input & 0xF0) >> 4]; *output++ = toHex[(*input & 0x0F) >> 0]; ++input; @@ -630,6 +628,7 @@ int sv_parse(const char* str, int len, int startoff, char delim, int* out_pos, i svstate.opt = opt; svstate.delim = delim; svstate.done = false; + svstate.start = 0; // parse count = 0; @@ -1114,7 +1113,7 @@ void strlib_defaults(void) { strlib->normalize_name_ = strlib_normalize_name; strlib->stristr_ = strlib_stristr; -#if !(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(HAVE_STRNLEN) +#if !(defined(WIN32) && defined(_MSC_VER)) && !defined(HAVE_STRNLEN) strlib->strnlen_ = strlib_strnlen; #else strlib->strnlen_ = NULL; diff --git a/src/common/strlib.h b/src/common/strlib.h index c523f5d86..fa7d577eb 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2015 Hercules Dev Team + * Copyright (C) 2012-2016 Hercules Dev Team * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify @@ -33,7 +33,7 @@ #define normalize_name(str,delims) (strlib->normalize_name_((str),(delims))) #define stristr(haystack,needle) (strlib->stristr_((haystack),(needle))) -#if !(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(HAVE_STRNLEN) +#if !(defined(WIN32) && defined(_MSC_VER)) && !defined(HAVE_STRNLEN) #define strnlen(string,maxlen) (strlib->strnlen_((string),(maxlen))) #endif @@ -98,7 +98,7 @@ struct strlib_interface { char *(*normalize_name_) (char* str,const char* delims); const char *(*stristr_) (const char *haystack, const char *needle); - /* only used when '!(defined(WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400) && !defined(HAVE_STRNLEN)', needs to be defined at all times however */ + /* only used when '!(defined(WIN32) && defined(_MSC_VER)) && !defined(HAVE_STRNLEN)', needs to be defined at all times however */ size_t (*strnlen_) (const char* string, size_t maxlen); /* only used when 'WIN32' */ @@ -125,7 +125,7 @@ struct strlib_interface { /// Produces the hexadecimal representation of the given input. /// The output buffer must be at least count*2+1 in size. /// Returns true on success, false on failure. - bool (*bin2hex_) (char* output, unsigned char* input, size_t count); + bool (*bin2hex_) (char *output, const unsigned char *input, size_t count); }; struct stringbuf_interface { diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index 95f423ff7..aeb8d8e71 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -291,40 +291,6 @@ bool sysinfo_svn_get_revision(char **out) { if (*out != NULL) return true; } - - // subversion 1.6 and older? - if ((fp = fopen(".svn/entries", "r")) != NULL) { - char line[1024]; - int rev; - // Check the version - if (fgets(line, sizeof(line), fp)) { - if (!ISDIGIT(line[0])) { - // XML File format - while (fgets(line,sizeof(line),fp)) - if (strstr(line,"revision=")) break; - if (sscanf(line," %*[^\"]\"%d%*[^\n]", &rev) == 1) { - if (*out != NULL) - aFree(*out); - *out = aCalloc(1, 8); - snprintf(*out, 8, "%d", rev); - } - } else { - // Bin File format - if (fgets(line, sizeof(line), fp) == NULL) { printf("Can't get bin name\n"); } // Get the name - if (fgets(line, sizeof(line), fp) == NULL) { printf("Can't get entries kind\n"); } // Get the entries kind - if (fgets(line, sizeof(line), fp)) { // Get the rev numver - if (*out != NULL) - aFree(*out); - *out = aCalloc(1, 8); - snprintf(*out, 8, "%d", atoi(line)); - } - } - } - fclose(fp); - - if (*out != NULL) - return true; - } #endif if (*out != NULL) aFree(*out); diff --git a/src/common/timer.c b/src/common/timer.c index e7a57481a..0b28f6a06 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -51,7 +51,7 @@ struct timer_interface *timer; // timers (array) static struct TimerData* timer_data = NULL; static int timer_data_max = 0; -static int timer_data_num = 0; +static int timer_data_num = 1; // free timers (array) static int* free_timer_list = NULL; @@ -369,6 +369,7 @@ int timer_add_interval(int64 tick, TimerFunc func, int id, intptr_t data, int in /// Retrieves internal timer data const struct TimerData* timer_get(int tid) { + Assert_retr(NULL, tid > 0); return ( tid >= 0 && tid < timer_data_num ) ? &timer_data[tid] : NULL; } @@ -379,7 +380,7 @@ int timer_do_delete(int tid, TimerFunc func) { nullpo_ret(func); - if( tid < 0 || tid >= timer_data_num ) { + if (tid < 1 || tid >= timer_data_num) { ShowError("timer_do_delete error : no such timer [%d](%p(%s))\n", tid, func, search_timer_func_list(func)); Assert_retr(-1, 0); return -1; @@ -406,6 +407,11 @@ int timer_do_delete(int tid, TimerFunc func) /// Adjusts a timer's expiration time. /// Returns the new tick value, or -1 if it fails. int64 timer_addtick(int tid, int64 tick) { + if (tid < 1 || tid >= timer_data_num) { + ShowError("timer_addtick error : no such timer [%d]\n", tid); + Assert_retr(-1, 0); + return -1; + } return timer->settick(tid, timer_data[tid].tick+tick); } diff --git a/src/login/HPMlogin.c b/src/login/HPMlogin.c index f12996915..472cba3c9 100644 --- a/src/login/HPMlogin.c +++ b/src/login/HPMlogin.c @@ -25,6 +25,8 @@ #include "common/cbasetypes.h" #include "login/account.h" +#include "login/lclif.h" +#include "login/lclif.p.h" #include "login/login.h" #include "common/HPMi.h" #include "common/conf.h" diff --git a/src/login/Makefile.in b/src/login/Makefile.in index 6560e6497..c74ed1e10 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team +# Copyright (C) 2012-2016 Hercules Dev Team # Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ CONFIG_D = ../config CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) COMMON_D = ../common -COMMON_H = $(wildcard $(COMMON_D)/*.h) +COMMON_H = $(filter-out %.p.h, $(wildcard $(COMMON_D)/*.h)) ../plugins/HPMHooking.h SYSINFO_INC = $(COMMON_D)/sysinfo.inc COMMON_INCLUDE = -I.. @@ -40,9 +40,10 @@ MT19937AR_D = $(THIRDPARTY_D)/mt19937ar MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o MT19937AR_H = $(MT19937AR_D)/mt19937ar.h -LOGIN_C = account_sql.c HPMlogin.c ipban_sql.c login.c loginlog_sql.c +LOGIN_C = account_sql.c HPMlogin.c ipban_sql.c lclif.c login.c loginlog_sql.c LOGIN_OBJ = $(addprefix obj_sql/, $(patsubst %.c,%.o,$(LOGIN_C))) -LOGIN_H = login.h account.h HPMlogin.h ipban.h loginlog.h +LOGIN_H = login.h account.h HPMlogin.h ipban.h lclif.h loginlog.h +LOGIN_PH = lclif.p.h HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) @@ -85,7 +86,7 @@ help: Makefile: Makefile.in @$(MAKE) -C ../.. src/login/Makefile -$(SYSINFO_INC): $(LOGIN_C) $(LOGIN_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) +$(SYSINFO_INC): $(LOGIN_C) $(LOGIN_PH) $(LOGIN_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " MAKE $@" @$(MAKE) -C ../.. sysinfo @@ -108,12 +109,6 @@ login-server: ../../login-server@EXEEXT@ @$(CC) @STATIC@ @LDFLAGS@ -o ../../login-server@EXEEXT@ $(LOGIN_OBJ) $(COMMON_D)/obj_sql/common_sql.a \ $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ -# login object files - -obj_sql/%.o: %.c $(LOGIN_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql - @echo " CC $<" - @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< - # missing object files $(COMMON_D)/obj_all/common.a: @echo " MAKE $@" @@ -130,3 +125,11 @@ $(MT19937AR_OBJ): $(LIBCONFIG_OBJ): @echo " MAKE $@" @$(MAKE) -C $(LIBCONFIG_D) + +.SECONDEXPANSION: + +# login object files + +obj_sql/%.o: %.c $$(filter %.p.h, $(LOGIN_PH)) $(LOGIN_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql + @echo " CC $<" + @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< diff --git a/src/login/account.h b/src/login/account.h index 151a2863d..7e1930ad4 100644 --- a/src/login/account.h +++ b/src/login/account.h @@ -23,7 +23,9 @@ #include "common/cbasetypes.h" #include "common/mmo.h" // ACCOUNT_REG2_NUM -#include "common/sql.h" // Sql + +/* Forward declarations */ +struct Sql; // common/sql.h typedef struct AccountDB AccountDB; typedef struct AccountDBIterator AccountDBIterator; @@ -158,7 +160,7 @@ struct AccountDB }; #ifdef HERCULES_CORE -Sql *account_db_sql_up(AccountDB* self); +struct Sql *account_db_sql_up(AccountDB* self); void mmo_send_accreg2(AccountDB* self, int fd, int account_id, int char_id); void mmo_save_accreg2(AccountDB* self, int fd, int account_id, int char_id); diff --git a/src/login/account_sql.c b/src/login/account_sql.c index 2a7401f1b..195a10233 100644 --- a/src/login/account_sql.c +++ b/src/login/account_sql.c @@ -43,7 +43,7 @@ typedef struct AccountDB_SQL { AccountDB vtable; // public interface - Sql* accounts; // SQL accounts storage + struct Sql *accounts; // SQL accounts storage // global sql settings char global_db_hostname[32]; @@ -144,7 +144,7 @@ AccountDB* account_db_sql(void) static bool account_db_sql_init(AccountDB* self) { AccountDB_SQL* db = (AccountDB_SQL*)self; - Sql* sql_handle; + struct Sql *sql_handle; const char* username; const char* password; const char* hostname; @@ -379,7 +379,7 @@ static bool account_db_sql_set_property(AccountDB* self, const char* key, const static bool account_db_sql_create(AccountDB* self, struct mmo_account* acc) { AccountDB_SQL* db = (AccountDB_SQL*)self; - Sql* sql_handle; + struct Sql *sql_handle; // decide on the account id to assign int account_id; @@ -433,7 +433,7 @@ static bool account_db_sql_create(AccountDB* self, struct mmo_account* acc) static bool account_db_sql_remove(AccountDB* self, const int account_id) { AccountDB_SQL* db = (AccountDB_SQL*)self; - Sql* sql_handle; + struct Sql *sql_handle; bool result = false; nullpo_ret(db); @@ -470,7 +470,7 @@ static bool account_db_sql_load_num(AccountDB* self, struct mmo_account* acc, co static bool account_db_sql_load_str(AccountDB* self, struct mmo_account* acc, const char* userid) { AccountDB_SQL* db = (AccountDB_SQL*)self; - Sql* sql_handle; + struct Sql *sql_handle; char esc_userid[2*NAME_LENGTH+1]; int account_id; char* data; @@ -540,7 +540,7 @@ static bool account_db_sql_iter_next(AccountDBIterator* self, struct mmo_account { AccountDBIterator_SQL* iter = (AccountDBIterator_SQL*)self; AccountDB_SQL* db; - Sql* sql_handle; + struct Sql *sql_handle; char* data; nullpo_ret(iter); @@ -575,7 +575,7 @@ static bool account_db_sql_iter_next(AccountDBIterator* self, struct mmo_account static bool mmo_auth_fromsql(AccountDB_SQL* db, struct mmo_account* acc, int account_id) { - Sql* sql_handle; + struct Sql *sql_handle; char* data; nullpo_ret(db); @@ -620,8 +620,8 @@ static bool mmo_auth_fromsql(AccountDB_SQL* db, struct mmo_account* acc, int acc static bool mmo_auth_tosql(AccountDB_SQL* db, const struct mmo_account* acc, bool is_new) { - Sql* sql_handle; - SqlStmt* stmt; + struct Sql *sql_handle; + struct SqlStmt *stmt; bool result = false; nullpo_ret(db); @@ -644,22 +644,22 @@ static bool mmo_auth_tosql(AccountDB_SQL* db, const struct mmo_account* acc, boo if( SQL_SUCCESS != SQL->StmtPrepare(stmt, "INSERT INTO `%s` (`account_id`, `userid`, `user_pass`, `sex`, `email`, `group_id`, `state`, `unban_time`, `expiration_time`, `logincount`, `lastlogin`, `last_ip`, `birthdate`, `character_slots`, `pincode`, `pincode_change`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", db->account_db) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_INT, (void*)&acc->account_id, sizeof(acc->account_id)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, (void*)acc->userid, strlen(acc->userid)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 2, SQLDT_STRING, (void*)acc->pass, strlen(acc->pass)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 3, SQLDT_ENUM, (void*)&acc->sex, sizeof(acc->sex)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 4, SQLDT_STRING, (void*)&acc->email, strlen(acc->email)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 5, SQLDT_INT, (void*)&acc->group_id, sizeof(acc->group_id)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 6, SQLDT_UINT, (void*)&acc->state, sizeof(acc->state)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 7, SQLDT_LONG, (void*)&acc->unban_time, sizeof(acc->unban_time)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 8, SQLDT_INT, (void*)&acc->expiration_time, sizeof(acc->expiration_time)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 9, SQLDT_UINT, (void*)&acc->logincount, sizeof(acc->logincount)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 10, SQLDT_STRING, (void*)&acc->lastlogin, strlen(acc->lastlogin)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 11, SQLDT_STRING, (void*)&acc->last_ip, strlen(acc->last_ip)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 12, SQLDT_STRING, (void*)&acc->birthdate, strlen(acc->birthdate)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 13, SQLDT_UCHAR, (void*)&acc->char_slots, sizeof(acc->char_slots)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 14, SQLDT_STRING, (void*)&acc->pincode, strlen(acc->pincode)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 15, SQLDT_LONG, (void*)&acc->pincode_change, sizeof(acc->pincode_change)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_INT, &acc->account_id, sizeof(acc->account_id)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, acc->userid, strlen(acc->userid)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 2, SQLDT_STRING, acc->pass, strlen(acc->pass)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 3, SQLDT_ENUM, &acc->sex, sizeof(acc->sex)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 4, SQLDT_STRING, &acc->email, strlen(acc->email)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 5, SQLDT_INT, &acc->group_id, sizeof(acc->group_id)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 6, SQLDT_UINT, &acc->state, sizeof(acc->state)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 7, SQLDT_LONG, &acc->unban_time, sizeof(acc->unban_time)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 8, SQLDT_INT, &acc->expiration_time, sizeof(acc->expiration_time)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 9, SQLDT_UINT, &acc->logincount, sizeof(acc->logincount)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 10, SQLDT_STRING, &acc->lastlogin, strlen(acc->lastlogin)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 11, SQLDT_STRING, &acc->last_ip, strlen(acc->last_ip)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 12, SQLDT_STRING, &acc->birthdate, strlen(acc->birthdate)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 13, SQLDT_UCHAR, &acc->char_slots, sizeof(acc->char_slots)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 14, SQLDT_STRING, &acc->pincode, strlen(acc->pincode)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 15, SQLDT_LONG, &acc->pincode_change, sizeof(acc->pincode_change)) || SQL_SUCCESS != SQL->StmtExecute(stmt) ) { SqlStmt_ShowDebug(stmt); @@ -667,21 +667,21 @@ static bool mmo_auth_tosql(AccountDB_SQL* db, const struct mmo_account* acc, boo } } else {// update account table if( SQL_SUCCESS != SQL->StmtPrepare(stmt, "UPDATE `%s` SET `userid`=?,`user_pass`=?,`sex`=?,`email`=?,`group_id`=?,`state`=?,`unban_time`=?,`expiration_time`=?,`logincount`=?,`lastlogin`=?,`last_ip`=?,`birthdate`=?,`character_slots`=?,`pincode`=?,`pincode_change`=? WHERE `account_id` = '%d'", db->account_db, acc->account_id) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, (void*)acc->userid, strlen(acc->userid)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, (void*)acc->pass, strlen(acc->pass)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 2, SQLDT_ENUM, (void*)&acc->sex, sizeof(acc->sex)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 3, SQLDT_STRING, (void*)acc->email, strlen(acc->email)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 4, SQLDT_INT, (void*)&acc->group_id, sizeof(acc->group_id)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 5, SQLDT_UINT, (void*)&acc->state, sizeof(acc->state)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 6, SQLDT_LONG, (void*)&acc->unban_time, sizeof(acc->unban_time)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 7, SQLDT_LONG, (void*)&acc->expiration_time, sizeof(acc->expiration_time)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 8, SQLDT_UINT, (void*)&acc->logincount, sizeof(acc->logincount)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 9, SQLDT_STRING, (void*)&acc->lastlogin, strlen(acc->lastlogin)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 10, SQLDT_STRING, (void*)&acc->last_ip, strlen(acc->last_ip)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 11, SQLDT_STRING, (void*)&acc->birthdate, strlen(acc->birthdate)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 12, SQLDT_UCHAR, (void*)&acc->char_slots, sizeof(acc->char_slots)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 13, SQLDT_STRING, (void*)&acc->pincode, strlen(acc->pincode)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 14, SQLDT_LONG, (void*)&acc->pincode_change, sizeof(acc->pincode_change)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, acc->userid, strlen(acc->userid)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, acc->pass, strlen(acc->pass)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 2, SQLDT_ENUM, &acc->sex, sizeof(acc->sex)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 3, SQLDT_STRING, acc->email, strlen(acc->email)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 4, SQLDT_INT, &acc->group_id, sizeof(acc->group_id)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 5, SQLDT_UINT, &acc->state, sizeof(acc->state)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 6, SQLDT_LONG, &acc->unban_time, sizeof(acc->unban_time)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 7, SQLDT_LONG, &acc->expiration_time, sizeof(acc->expiration_time)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 8, SQLDT_UINT, &acc->logincount, sizeof(acc->logincount)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 9, SQLDT_STRING, &acc->lastlogin, strlen(acc->lastlogin)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 10, SQLDT_STRING, &acc->last_ip, strlen(acc->last_ip)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 11, SQLDT_STRING, &acc->birthdate, strlen(acc->birthdate)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 12, SQLDT_UCHAR, &acc->char_slots, sizeof(acc->char_slots)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 13, SQLDT_STRING, &acc->pincode, strlen(acc->pincode)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 14, SQLDT_LONG, &acc->pincode_change, sizeof(acc->pincode_change)) || SQL_SUCCESS != SQL->StmtExecute(stmt) ) { SqlStmt_ShowDebug(stmt); @@ -701,12 +701,14 @@ static bool mmo_auth_tosql(AccountDB_SQL* db, const struct mmo_account* acc, boo return result; } -Sql* account_db_sql_up(AccountDB* self) { +struct Sql *account_db_sql_up(AccountDB* self) +{ AccountDB_SQL* db = (AccountDB_SQL*)self; return db ? db->accounts : NULL; } -void mmo_save_accreg2(AccountDB* self, int fd, int account_id, int char_id) { - Sql* sql_handle; +void mmo_save_accreg2(AccountDB* self, int fd, int account_id, int char_id) +{ + struct Sql *sql_handle; AccountDB_SQL* db = (AccountDB_SQL*)self; int count = RFIFOW(fd, 12); @@ -756,8 +758,9 @@ void mmo_save_accreg2(AccountDB* self, int fd, int account_id, int char_id) { } } -void mmo_send_accreg2(AccountDB* self, int fd, int account_id, int char_id) { - Sql* sql_handle; +void mmo_send_accreg2(AccountDB* self, int fd, int account_id, int char_id) +{ + struct Sql *sql_handle; AccountDB_SQL* db = (AccountDB_SQL*)self; char* data; int plen = 0; diff --git a/src/login/ipban_sql.c b/src/login/ipban_sql.c index 301d22c18..bec0217f4 100644 --- a/src/login/ipban_sql.c +++ b/src/login/ipban_sql.c @@ -49,7 +49,7 @@ static char ipban_codepage[32] = ""; static char ipban_table[32] = "ipbanlist"; // globals -static Sql* sql_handle = NULL; +static struct Sql *sql_handle = NULL; static int cleanup_timer_id = INVALID_TIMER; static bool ipban_inited = false; diff --git a/src/login/lclif.c b/src/login/lclif.c new file mode 100644 index 000000000..9515c5940 --- /dev/null +++ b/src/login/lclif.c @@ -0,0 +1,566 @@ +/** + * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules + * + * Copyright (C) 2016 Hercules Dev Team + * + * Hercules is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#define HERCULES_CORE + +#include "lclif.p.h" + +#include "login/ipban.h" +#include "login/login.h" +#include "login/loginlog.h" +#include "common/HPM.h" +#include "common/cbasetypes.h" +#include "common/db.h" +#include "common/md5calc.h" +#include "common/memmgr.h" +#include "common/mmo.h" +#include "common/nullpo.h" +#include "common/random.h" +#include "common/showmsg.h" +#include "common/socket.h" +#include "common/strlib.h" +#include "common/utils.h" + +/** @file + * Implementation of the login client interface. + */ + +struct lclif_interface lclif_s; +struct lclif_interface_private lclif_p; +struct lclif_interface_dbs lclif_dbs; +struct lclif_interface *lclif; + +/// @copydoc lclif_interface::connection_error() +void lclif_connection_error(int fd, uint8 error) +{ + struct packet_SC_NOTIFY_BAN *packet = NULL; + WFIFOHEAD(fd, sizeof(*packet)); + packet = WP2PTR(fd); + packet->packet_id = PACKET_ID_SC_NOTIFY_BAN; + packet->error_code = error; + WFIFOSET(fd, sizeof(*packet)); +} + +/// @copydoc lclif_interface_private::parse_CA_CONNECT_INFO_CHANGED() +enum parsefunc_rcode lclif_parse_CA_CONNECT_INFO_CHANGED(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_CONNECT_INFO_CHANGED(int fd, struct login_session_data *sd) +{ + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_EXE_HASHCHECK() +enum parsefunc_rcode lclif_parse_CA_EXE_HASHCHECK(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_EXE_HASHCHECK(int fd, struct login_session_data *sd) +{ + const struct packet_CA_EXE_HASHCHECK *packet = RP2PTR(fd); + sd->has_client_hash = 1; + memcpy(sd->client_hash, packet->hash_value, 16); + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_LOGIN() +enum parsefunc_rcode lclif_parse_CA_LOGIN(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_LOGIN(int fd, struct login_session_data *sd) +{ + const struct packet_CA_LOGIN *packet = RP2PTR(fd); + + sd->version = packet->version; + sd->clienttype = packet->clienttype; + safestrncpy(sd->userid, packet->id, NAME_LENGTH); + safestrncpy(sd->passwd, packet->password, PASSWD_LEN); + + if (login->config->use_md5_passwds) + MD5_String(sd->passwd, sd->passwd); + sd->passwdenc = PWENC_NONE; + + login->client_login(fd, sd); + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_LOGIN2() +enum parsefunc_rcode lclif_parse_CA_LOGIN2(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_LOGIN2(int fd, struct login_session_data *sd) +{ + const struct packet_CA_LOGIN2 *packet = RP2PTR(fd); + + sd->version = packet->version; + sd->clienttype = packet->clienttype; + safestrncpy(sd->userid, packet->id, NAME_LENGTH); + bin2hex(sd->passwd, packet->password_md5, 16); + sd->passwdenc = PASSWORDENC; + + login->client_login(fd, sd); + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_LOGIN3() +enum parsefunc_rcode lclif_parse_CA_LOGIN3(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_LOGIN3(int fd, struct login_session_data *sd) +{ + const struct packet_CA_LOGIN3 *packet = RP2PTR(fd); + + sd->version = packet->version; + sd->clienttype = packet->clienttype; + /* unused */ + /* sd->clientinfo = packet->clientinfo; */ + safestrncpy(sd->userid, packet->id, NAME_LENGTH); + bin2hex(sd->passwd, packet->password_md5, 16); + sd->passwdenc = PASSWORDENC; + + login->client_login(fd, sd); + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_LOGIN4() +enum parsefunc_rcode lclif_parse_CA_LOGIN4(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_LOGIN4(int fd, struct login_session_data *sd) +{ + const struct packet_CA_LOGIN4 *packet = RP2PTR(fd); + + sd->version = packet->version; + sd->clienttype = packet->clienttype; + /* unused */ + /* safestrncpy(sd->mac_address, packet->mac_address, sizeof(sd->mac_address)); */ + safestrncpy(sd->userid, packet->id, NAME_LENGTH); + bin2hex(sd->passwd, packet->password_md5, 16); + sd->passwdenc = PASSWORDENC; + + login->client_login(fd, sd); + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_LOGIN_PCBANG() +enum parsefunc_rcode lclif_parse_CA_LOGIN_PCBANG(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_LOGIN_PCBANG(int fd, struct login_session_data *sd) +{ + const struct packet_CA_LOGIN_PCBANG *packet = RP2PTR(fd); + + sd->version = packet->version; + sd->clienttype = packet->clienttype; + /* unused */ + /* safestrncpy(sd->ip, packet->ip, sizeof(sd->ip)); */ + /* safestrncpy(sd->mac_address, packet->mac_address, sizeof(sd->mac_address)); */ + safestrncpy(sd->userid, packet->id, NAME_LENGTH); + safestrncpy(sd->passwd, packet->password, PASSWD_LEN); + + if (login->config->use_md5_passwds) + MD5_String(sd->passwd, sd->passwd); + sd->passwdenc = PWENC_NONE; + + login->client_login(fd, sd); + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_LOGIN_HAN() +enum parsefunc_rcode lclif_parse_CA_LOGIN_HAN(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_LOGIN_HAN(int fd, struct login_session_data *sd) +{ + const struct packet_CA_LOGIN_HAN *packet = RP2PTR(fd); + + sd->version = packet->version; + sd->clienttype = packet->clienttype; + /* unused */ + /* safestrncpy(sd->ip, packet->ip, sizeof(sd->ip)); */ + /* safestrncpy(sd->mac_address, packet->mac_address, sizeof(sd->mac_address)); */ + /* sd->ishan = packet->is_han_game_user; */ + safestrncpy(sd->userid, packet->id, NAME_LENGTH); + safestrncpy(sd->passwd, packet->password, PASSWD_LEN); + + if (login->config->use_md5_passwds) + MD5_String(sd->passwd, sd->passwd); + sd->passwdenc = PWENC_NONE; + + login->client_login(fd, sd); + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_SSO_LOGIN_REQ() +enum parsefunc_rcode lclif_parse_CA_SSO_LOGIN_REQ(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_SSO_LOGIN_REQ(int fd, struct login_session_data *sd) +{ + const struct packet_CA_SSO_LOGIN_REQ *packet = RP2PTR(fd); + int tokenlen = (int)RFIFOREST(fd) - (int)sizeof(*packet); + + if (tokenlen > PASSWD_LEN || tokenlen < 1) { + ShowError("packet_CA_SSO_LOGIN_REQ: Token length is not between allowed password length, kicking player ('%s')", packet->id); + sockt->eof(fd); + return PACKET_VALID; + } + + sd->clienttype = packet->clienttype; + sd->version = packet->version; + safestrncpy(sd->userid, packet->id, NAME_LENGTH); + safestrncpy(sd->passwd, packet->t1, min(tokenlen + 1, PASSWD_LEN)); // Variable-length field, don't copy more than necessary + + if (login->config->use_md5_passwds) + MD5_String(sd->passwd, sd->passwd); + sd->passwdenc = PWENC_NONE; + + login->client_login(fd, sd); + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_REQ_HASH() +enum parsefunc_rcode lclif_parse_CA_REQ_HASH(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_REQ_HASH(int fd, struct login_session_data *sd) +{ + memset(sd->md5key, '\0', sizeof(sd->md5key)); + sd->md5keylen = (uint16)(12 + rnd() % 4); + MD5_Salt(sd->md5keylen, sd->md5key); + + lclif->coding_key(fd, sd); + return PACKET_VALID; +} + +/// @copydoc lclif_interface_private::parse_CA_CHARSERVERCONNECT() +enum parsefunc_rcode lclif_parse_CA_CHARSERVERCONNECT(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +enum parsefunc_rcode lclif_parse_CA_CHARSERVERCONNECT(int fd, struct login_session_data *sd) +{ + char ip[16]; + uint32 ipl = sockt->session[fd]->client_addr; + sockt->ip2str(ipl, ip); + + login->parse_request_connection(fd, sd, ip, ipl); + + return PACKET_STOPPARSE; +} + +/// @copydoc lclif_interface::server_list() +bool lclif_send_server_list(struct login_session_data *sd) +{ + int server_num = 0, i, n, length; + uint32 ip; + struct packet_AC_ACCEPT_LOGIN *packet = NULL; + + for (i = 0; i < ARRAYLENGTH(server); ++i) { + if (sockt->session_is_active(server[i].fd)) + server_num++; + } + if (server_num == 0) + return false; + + length = sizeof(*packet) + sizeof(packet->server_list[0]) * server_num; + ip = sockt->session[sd->fd]->client_addr; + + // Allocate the packet + WFIFOHEAD(sd->fd, length); + packet = WP2PTR(sd->fd); + + packet->packet_id = PACKET_ID_AC_ACCEPT_LOGIN; + packet->packet_len = length; + packet->auth_code = sd->login_id1; + packet->aid = sd->account_id; + packet->user_level = sd->login_id2; + packet->last_login_ip = 0; // Not used anymore + memset(packet->last_login_time, '\0', sizeof(packet->last_login_time)); // Not used anymore + packet->sex = sex_str2num(sd->sex); + for (i = 0, n = 0; i < ARRAYLENGTH(server); ++i) { + uint32 subnet_char_ip; + + if (!sockt->session_is_valid(server[i].fd)) + continue; + + subnet_char_ip = login->lan_subnet_check(ip); + packet->server_list[n].ip = htonl((subnet_char_ip) ? subnet_char_ip : server[i].ip); + packet->server_list[n].port = sockt->ntows(htons(server[i].port)); // [!] LE byte order here [!] + safestrncpy(packet->server_list[n].name, server[i].name, 20); + packet->server_list[n].usercount = server[i].users; + + if (server[i].type == CST_PAYING && sd->expiration_time > time(NULL)) + packet->server_list[n].property = CST_NORMAL; + else + packet->server_list[n].property = server[i].type; + + packet->server_list[n].state = server[i].new_; + ++n; + } + WFIFOSET(sd->fd, length); + + return true; +} + +/// @copydoc lclif_interface::auth_failed() +void lclif_send_auth_failed(int fd, time_t ban, uint32 error) +{ +#if PACKETVER >= 20120000 /* not sure when this started */ + struct packet_AC_REFUSE_LOGIN_R2 *packet = NULL; + int packet_id = PACKET_ID_AC_REFUSE_LOGIN_R2; +#else + struct packet_AC_REFUSE_LOGIN *packet = NULL; + int packet_id = PACKET_ID_AC_REFUSE_LOGIN; +#endif + WFIFOHEAD(fd, sizeof(*packet)); + packet = WP2PTR(fd); + packet->packet_id = packet_id; + packet->error_code = error; + if (error == 6) + timestamp2string(packet->block_date, sizeof(packet->block_date), ban, login->config->date_format); + else + memset(packet->block_date, '\0', sizeof(packet->block_date)); + WFIFOSET(fd, sizeof(*packet)); +} + +/// @copydoc lclif_interface::login_error() +void lclif_send_login_error(int fd, uint8 error) +{ + struct packet_AC_REFUSE_LOGIN *packet = NULL; + WFIFOHEAD(fd, sizeof(*packet)); + packet = WP2PTR(fd); + packet->packet_id = PACKET_ID_AC_REFUSE_LOGIN; + packet->error_code = error; + memset(packet->block_date, '\0', sizeof(packet->block_date)); + WFIFOSET(fd, sizeof(*packet)); +} + +/// @copydoc lclif_interface::coding_key() +void lclif_send_coding_key(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +void lclif_send_coding_key(int fd, struct login_session_data *sd) +{ + struct packet_AC_ACK_HASH *packet = NULL; + int16 size = sizeof(*packet) + sd->md5keylen; + + WFIFOHEAD(fd, size); + packet = WP2PTR(fd); + packet->packet_id = PACKET_ID_AC_ACK_HASH; + packet->packet_len = size; + memcpy(packet->secret, sd->md5key, sd->md5keylen); + WFIFOSET(fd, size); +} + +/// @copydoc lclif_interface::parse() +int lclif_parse(int fd) +{ + struct login_session_data *sd = NULL; + int i; + char ip[16]; + uint32 ipl = sockt->session[fd]->client_addr; + sockt->ip2str(ipl, ip); + + if (sockt->session[fd]->flag.eof) { + ShowInfo("Closed connection from '"CL_WHITE"%s"CL_RESET"'.\n", ip); + sockt->close(fd); + return 0; + } + + if ((sd = sockt->session[fd]->session_data) == NULL) { + // Perform ip-ban check + if (login->config->ipban && !sockt->trusted_ip_check(ipl) && ipban_check(ipl)) { + ShowStatus("Connection refused: IP isn't authorized (deny/allow, ip: %s).\n", ip); + login_log(ipl, "unknown", -3, "ip banned"); + lclif->login_error(fd, 3); // 3 = Rejected from Server + sockt->eof(fd); + return 0; + } + + // create a session for this new connection + CREATE(sockt->session[fd]->session_data, struct login_session_data, 1); + sd = sockt->session[fd]->session_data; + sd->fd = fd; + } + + for (i = 0; i < MAX_PROCESSED_PACKETS; ++i) { + enum parsefunc_rcode result; + int16 packet_id = RFIFOW(fd, 0); + int packet_len = (int)RFIFOREST(fd); + + if (packet_len < 2) + return 0; + + result = lclif->p->parse_sub(fd, sd); + + switch (result) { + case PACKET_SKIP: + continue; + case PACKET_INCOMPLETE: + case PACKET_STOPPARSE: + return 0; + case PACKET_UNKNOWN: + ShowWarning("lclif_parse: Received unsupported packet (packet 0x%04x, %d bytes received), disconnecting session #%d.\n", (unsigned int)packet_id, packet_len, fd); +#ifdef DUMP_INVALID_PACKET + ShowDump(RFIFOP(fd, 0), RFIFOREST(fd)); +#endif + sockt->eof(fd); + return 0; + case PACKET_INVALIDLENGTH: + ShowWarning("lclif_parse: Received packet 0x%04x specifies invalid packet_len (%d), disconnecting session #%d.\n", (unsigned int)packet_id, packet_len, fd); +#ifdef DUMP_INVALID_PACKET + ShowDump(RFIFOP(fd, 0), RFIFOREST(fd)); +#endif + sockt->eof(fd); + return 0; + } + } + return 0; +} + +/// @copydoc lclif_interface_private::parse_sub() +enum parsefunc_rcode lclif_parse_sub(int fd, struct login_session_data *sd) +{ + int packet_len = (int)RFIFOREST(fd); + int16 packet_id = RFIFOW(fd, 0); + const struct login_packet_db *lpd; + + if (VECTOR_LENGTH(HPM->packets[hpParse_Login]) > 0) { + int result = HPM->parse_packets(fd, packet_id, hpParse_Login); + if (result == 1) + return PACKET_VALID; + if (result == 2) + return PACKET_INCOMPLETE; // Packet not completed yet + } + + lpd = lclif->packet(packet_id); + + if (lpd == NULL) + return PACKET_UNKNOWN; + + if (lpd->len == 0) + return PACKET_UNKNOWN; + + if (lpd->len > 0 && lpd->pFunc == NULL) + return PACKET_UNKNOWN; //This Packet is defined for length purpose ? should never be sent from client ? + + if (lpd->len == -1) { + uint16 packet_var_len = 0; //Max Variable Packet length is signed int16 size + + if (packet_len < 4) + return PACKET_INCOMPLETE; //Packet incomplete + + packet_var_len = RFIFOW(fd, 2); + + if (packet_var_len < 4 || packet_var_len > SINT16_MAX) + return PACKET_INVALIDLENGTH; //Something is wrong, close connection. + + if (RFIFOREST(fd) < packet_var_len) + return PACKET_INCOMPLETE; //Packet incomplete again. + + return lclif->parse_packet(lpd, fd, sd); + } else if (lpd->len <= packet_len) { + return lclif->parse_packet(lpd, fd, sd); + } + + return PACKET_VALID; +} + +/// @copydoc lclif_interface::packet() +const struct login_packet_db *lclif_packet(int16 packet_id) +{ + if (packet_id == PACKET_ID_CA_CHARSERVERCONNECT) + return &lclif->p->dbs->packet_db[0]; + + if (packet_id > MAX_PACKET_DB || packet_id < MIN_PACKET_DB) + return NULL; + + return &lclif->p->dbs->packet_db[packet_id]; +} + +/// @copydoc lclif_interface::parse_packet() +enum parsefunc_rcode lclif_parse_packet(const struct login_packet_db *lpd, int fd, struct login_session_data *sd) +{ + int result; + result = (*lpd->pFunc)(fd, sd); + RFIFOSKIP(fd, (lpd->len == -1) ? RFIFOW(fd, 2) : lpd->len); + return result; +} + +/// @copydoc lclif_interface_private::packetdb_loaddb() +void packetdb_loaddb(void) +{ + int i; + struct packet { + int16 packet_id; + int16 packet_len; + LoginParseFunc **pFunc; + } packet[] = { +#define packet_def(name) { PACKET_ID_ ## name, sizeof(struct packet_ ## name), &lclif->p->parse_ ## name } +#define packet_def2(name, len) { PACKET_ID_ ## name, (len), &lclif->p->parse_ ## name } + packet_def(CA_CONNECT_INFO_CHANGED), + packet_def(CA_EXE_HASHCHECK), + packet_def(CA_LOGIN), + packet_def(CA_LOGIN2), + packet_def(CA_LOGIN3), + packet_def(CA_LOGIN4), + packet_def(CA_LOGIN_PCBANG), + packet_def(CA_LOGIN_HAN), + packet_def2(CA_SSO_LOGIN_REQ, -1), + packet_def(CA_REQ_HASH), +#undef packet_def +#undef packet_def2 + }; + int length = ARRAYLENGTH(packet); + + memset(lclif->p->dbs->packet_db, '\0', sizeof(lclif->p->dbs->packet_db)); + + for (i = 0; i < length; ++i) { + int16 packet_id = packet[i].packet_id; + Assert_retb(packet_id >= MIN_PACKET_DB && packet_id < MAX_PACKET_DB); + lclif->p->dbs->packet_db[packet_id].len = packet[i].packet_len; + lclif->p->dbs->packet_db[packet_id].pFunc = packet[i].pFunc; + } + + //Explict case, we will save character login packet in position 0 which is unused and not valid by normal + lclif->p->dbs->packet_db[0].len = sizeof(struct packet_CA_CHARSERVERCONNECT); + lclif->p->dbs->packet_db[0].pFunc = &lclif->p->parse_CA_CHARSERVERCONNECT; +} + +/// @copydoc lclif_interface::init() +void lclif_init(void) +{ + lclif->p->packetdb_loaddb(); +} + +/// @copydoc lclif_interface::final() +void lclif_final(void) +{ +} + +/// Interface base initialization. +void lclif_defaults(void) +{ + lclif = &lclif_s; + lclif->p = &lclif_p; + lclif->p->dbs = &lclif_dbs; + + lclif->init = lclif_init; + lclif->final = lclif_final; + + lclif->connection_error = lclif_connection_error; + lclif->server_list = lclif_send_server_list; + lclif->auth_failed = lclif_send_auth_failed; + lclif->login_error = lclif_send_login_error; + lclif->coding_key = lclif_send_coding_key; + + lclif->packet = lclif_packet; + lclif->parse_packet = lclif_parse_packet; + lclif->parse = lclif_parse; + + lclif->p->packetdb_loaddb = packetdb_loaddb; + lclif->p->parse_sub = lclif_parse_sub; + + lclif->p->parse_CA_CONNECT_INFO_CHANGED = lclif_parse_CA_CONNECT_INFO_CHANGED; + lclif->p->parse_CA_EXE_HASHCHECK = lclif_parse_CA_EXE_HASHCHECK; + lclif->p->parse_CA_LOGIN = lclif_parse_CA_LOGIN; + lclif->p->parse_CA_LOGIN2 = lclif_parse_CA_LOGIN2; + lclif->p->parse_CA_LOGIN3 = lclif_parse_CA_LOGIN3; + lclif->p->parse_CA_LOGIN4 = lclif_parse_CA_LOGIN4; + lclif->p->parse_CA_LOGIN_PCBANG = lclif_parse_CA_LOGIN_PCBANG; + lclif->p->parse_CA_LOGIN_HAN = lclif_parse_CA_LOGIN_HAN; + lclif->p->parse_CA_SSO_LOGIN_REQ = lclif_parse_CA_SSO_LOGIN_REQ; + lclif->p->parse_CA_REQ_HASH = lclif_parse_CA_REQ_HASH; + lclif->p->parse_CA_CHARSERVERCONNECT = lclif_parse_CA_CHARSERVERCONNECT; +} diff --git a/src/login/lclif.h b/src/login/lclif.h new file mode 100644 index 000000000..d1e4317a2 --- /dev/null +++ b/src/login/lclif.h @@ -0,0 +1,150 @@ +/** + * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules + * + * Copyright (C) 2016 Hercules Dev Team + * + * Hercules is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef LOGIN_LCLIF_H +#define LOGIN_LCLIF_H + +#include "common/hercules.h" + +/** @file + * Login Client Interface. + **/ + +/* Forward Declarations */ +struct login_session_data; +struct lclif_interface_private; + +/* Enums */ +/// Parse function return code +enum parsefunc_rcode { + PACKET_VALID = 1, + PACKET_INCOMPLETE = 0, + PACKET_UNKNOWN = -1, + PACKET_INVALIDLENGTH = -2, + PACKET_STOPPARSE = -3, + PACKET_SKIP = -4, //internal parser will skip this packet and go parser another, meant for plugins. [hemagx] +}; + +/* Function Typedefs */ +typedef enum parsefunc_rcode (LoginParseFunc)(int fd, struct login_session_data *sd); + +/* Structs */ + +/// Login packet DB entry +struct login_packet_db { + int16 len; ///< Packet length + LoginParseFunc **pFunc; ///< Packet parsing function +}; + +/// The login clif (client interface) interface. +struct lclif_interface { + struct lclif_interface_private *p; ///< Private interface + + /// Interface initialization. + void (*init)(void); + + /// Interface finalization. + void (*final)(void); + + /** + * Reports a connection error to the client. + * + * @param fd Client connection file descriptor. + * @param error Error code. + * @see #PACKET_SC_NOTIFY_BAN. + */ + void (*connection_error)(int fd, uint8 error); + + /** + * Sends the character server list to the client. + * + * @param sd The client to send to. + * @return Success status. + * @retval false in case of failure (no server available). + * @see #PACKET_AC_ACCEPT_LOGIN. + */ + bool (*server_list)(struct login_session_data *sd); + + /** + * Reports an authentication failure to the client. + * + * @param fd The client connection file descriptor. + * @param ban The ban duration (if error == 6). + * @param error The authentication error code. + * @see #PACKET_ID_AC_REFUSE_LOGIN. + * @see #PACKET_ID_AC_REFUSE_LOGIN_R2. + */ + void (*auth_failed)(int fd, time_t ban, uint32 error); + + /** + * Reports a login error to the client. + * + * @param fd Client connection file descriptor. + * @param error Error code. + * @see #PACKET_AC_REFUSE_LOGIN. + */ + void (*login_error)(int fd, uint8 error); + + /** + * Sends an authentication challenge to the client. + * + * @param fd Client connection file descriptor. + * @param sd The client to send to. + * @see #PACKET_AC_ACK_HASH. + */ + void (*coding_key)(int fd, struct login_session_data *sd); + + /** + * Retrieves a packet's data from the packet db. + * + * @param packet_id The packet id. + * @return The packet data. + * @retval NULL if the packet doesn't exist. + */ + const struct login_packet_db *(*packet)(int16 packet_id); + + /** + * Parses a packet. + * + * @param lpd Packet database entry. + * @param fd Client connection file descriptor. + * @param sd Session data. + * @return Parse result error code. + */ + enum parsefunc_rcode (*parse_packet)(const struct login_packet_db *lpd, int fd, struct login_session_data *sd); + + /** + * Packet parser loop function. + * + * Parses packets received from a client. + * + * @param fd Client connection file descriptor. + * @return error code. + * @retval 0 in case of success. + */ + int (*parse)(int fd); +}; + +#ifdef HERCULES_CORE +void lclif_defaults(void); +#endif + +HPShared struct lclif_interface *lclif; + +#endif // LOGIN_LCLIF_H diff --git a/src/login/lclif.p.h b/src/login/lclif.p.h new file mode 100644 index 000000000..ae9d1bc14 --- /dev/null +++ b/src/login/lclif.p.h @@ -0,0 +1,324 @@ +/** + * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules + * + * Copyright (C) 2016 Hercules Dev Team + * + * Hercules is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef LOGIN_LCLIF_P_H +#define LOGIN_LCLIF_P_H + +/** @file + * Private header for the login client interface. + */ + +#include "login/lclif.h" + +#include "common/hercules.h" +#include "common/mmo.h" + +/* Definitions and macros */ +/// Maximum amount of packets processed at once from the same client +#define MAX_PROCESSED_PACKETS (3) + +// Packet DB +#define MIN_PACKET_DB 0x0064 +#define MAX_PACKET_DB 0x08ff + +/* Enums */ + +/// Packet IDs +enum login_packet_id { + // CA (Client to Login) + PACKET_ID_CA_LOGIN = 0x0064, + PACKET_ID_CA_LOGIN2 = 0x01dd, + PACKET_ID_CA_LOGIN3 = 0x01fa, + PACKET_ID_CA_CONNECT_INFO_CHANGED = 0x0200, + PACKET_ID_CA_EXE_HASHCHECK = 0x0204, + PACKET_ID_CA_LOGIN_PCBANG = 0x0277, + PACKET_ID_CA_LOGIN4 = 0x027c, + PACKET_ID_CA_LOGIN_HAN = 0x02b0, + PACKET_ID_CA_SSO_LOGIN_REQ = 0x0825, + PACKET_ID_CA_REQ_HASH = 0x01db, + PACKET_ID_CA_CHARSERVERCONNECT = 0x2710, // Custom Hercules Packet + //PACKET_ID_CA_SSO_LOGIN_REQa = 0x825a, /* unused */ + + // AC (Login to Client) + PACKET_ID_AC_ACCEPT_LOGIN = 0x0069, + PACKET_ID_AC_REFUSE_LOGIN = 0x006a, + PACKET_ID_SC_NOTIFY_BAN = 0x0081, + PACKET_ID_AC_ACK_HASH = 0x01dc, + PACKET_ID_AC_REFUSE_LOGIN_R2 = 0x083e, +}; + +/* Packets Structs */ +#if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute +#pragma pack(push, 1) +#endif // not NetBSD < 6 / Solaris + +/** + * Packet structure for CA_LOGIN. + */ +struct packet_CA_LOGIN { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_LOGIN) + uint32 version; ///< Client Version + char id[24]; ///< Username + char password[24]; ///< Password + uint8 clienttype; ///< Client Type +} __attribute__((packed)); + +/** + * Packet structure for CA_LOGIN2. + */ +struct packet_CA_LOGIN2 { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_LOGIN2) + uint32 version; ///< Client Version + char id[24]; ///< Username + uint8 password_md5[16]; ///< Password hash + uint8 clienttype; ///< Client Type +} __attribute__((packed)); + +/** + * Packet structure for CA_LOGIN3. + */ +struct packet_CA_LOGIN3 { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_LOGIN3) + uint32 version; ///< Client Version + char id[24]; ///< Username + uint8 password_md5[16]; ///< Password hash + uint8 clienttype; ///< Client Type + uint8 clientinfo; ///< Index of the connection in the clientinfo file (+10 if the command-line contains "pc") +} __attribute__((packed)); + +/** + * Packet structure for CA_LOGIN4. + */ +struct packet_CA_LOGIN4 { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_LOGIN4) + uint32 version; ///< Client Version + char id[24]; ///< Username + uint8 password_md5[16]; ///< Password hash + uint8 clienttype; ///< Client Type + char mac_address[13]; ///< MAC Address +} __attribute__((packed)); + +/** + * Packet structure for CA_LOGIN_PCBANG. + */ +struct packet_CA_LOGIN_PCBANG { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_LOGIN_PCBANG) + uint32 version; ///< Client Version + char id[24]; ///< Username + char password[24]; ///< Password + uint8 clienttype; ///< Client Type + char ip[16]; ///< IP Address + char mac_address[13]; ///< MAC Address +} __attribute__((packed)); + +/** + * Packet structure for CA_LOGIN_HAN. + */ +struct packet_CA_LOGIN_HAN { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_LOGIN_HAN) + uint32 version; ///< Client Version + char id[24]; ///< Username + char password[24]; ///< Password + uint8 clienttype; ///< Client Type + char ip[16]; ///< IP Address + char mac_address[13]; ///< MAC Address + uint8 is_han_game_user; ///< 'isGravityID' +} __attribute__((packed)); + +/** + * Packet structure for CA_SSO_LOGIN_REQ. + * + * Variable-length packet. + */ +struct packet_CA_SSO_LOGIN_REQ { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_SSO_LOGIN_REQ) + int16 packet_len; ///< Length (variable length) + uint32 version; ///< Clientver + uint8 clienttype; ///< Clienttype + char id[24]; ///< Username + char password[27]; ///< Password + int8 mac_address[17]; ///< MAC Address + char ip[15]; ///< IP Address + char t1[]; ///< SSO Login Token (variable length) +} __attribute__((packed)); + +#if 0 // Unused +struct packet_CA_SSO_LOGIN_REQa { + int16 packet_id; + int16 packet_len; + uint32 version; + uint8 clienttype; + char id[24]; + int8 mac_address[17]; + char ip[15]; + char t1[]; +} __attribute__((packed)); +#endif // unused + +/** + * Packet structure for CA_CONNECT_INFO_CHANGED. + * + * New alive packet. Used to verify if client is always alive. + */ +struct packet_CA_CONNECT_INFO_CHANGED { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_CONNECT_INFO_CHANGED) + char id[24]; ///< account.userid +} __attribute__((packed)); + +/** + * Packet structure for CA_EXE_HASHCHECK. + * + * (kRO 2004-05-31aSakexe langtype 0 and 6) + */ +struct packet_CA_EXE_HASHCHECK { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_EXE_HASHCHECK) + uint8 hash_value[16]; ///< Client MD5 hash +} __attribute__((packed)); + +/** + * Packet structure for CA_REQ_HASH. + */ +struct packet_CA_REQ_HASH { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_REQ_HASH) +} __attribute__((packed)); + +/** + * Packet structure for CA_CHARSERVERCONNECT. + * + * This packet is used internally, to signal a char-server connection. + */ +struct packet_CA_CHARSERVERCONNECT { + int16 packet_id; ///< Packet ID (#PACKET_ID_CA_CHARSERVERCONNECT) + char userid[24]; ///< Username + char password[24]; ///< Password + int32 unknown; + int32 ip; ///< Charserver IP + int16 port; ///< Charserver port + char name[20]; ///< Charserver name + int16 unknown2; + int16 type; ///< Charserver type + int16 new; ///< Whether charserver is to be marked as new +} __attribute__((packed)); + +/** + * Packet structure for SC_NOTIFY_BAN. + */ +struct packet_SC_NOTIFY_BAN { + int16 packet_id; ///< Packet ID (#PACKET_ID_SC_NOTIFY_BAN) + uint8 error_code; ///< Error code +} __attribute__((packed)); + +/** + * Packet structure for AC_REFUSE_LOGIN. + */ +struct packet_AC_REFUSE_LOGIN { + int16 packet_id; ///< Packet ID (#PACKET_ID_AC_REFUSE_LOGIN) + uint8 error_code; ///< Error code + char block_date[20]; ///< Ban expiration date +} __attribute__((packed)); + +/** + * Packet structure for AC_REFUSE_LOGIN_R2. + */ +struct packet_AC_REFUSE_LOGIN_R2 { + int16 packet_id; ///< Packet ID (#PACKET_ID_AC_REFUSE_LOGIN_R2) + uint32 error_code; ///< Error code + char block_date[20]; ///< Ban expiration date +} __attribute__((packed)); + +/** + * Packet structure for AC_ACCEPT_LOGIN. + * + * Variable-length packet. + */ +struct packet_AC_ACCEPT_LOGIN { + int16 packet_id; ///< Packet ID (#PACKET_ID_AC_ACCEPT_LOGIN) + int16 packet_len; ///< Packet length (variable length) + int32 auth_code; ///< Authentication code + uint32 aid; ///< Account ID + uint32 user_level; ///< User level + uint32 last_login_ip; ///< Last login IP + char last_login_time[26]; ///< Last login timestamp + uint8 sex; ///< Account sex + struct { + uint32 ip; ///< Server IP address + int16 port; ///< Server port + char name[20]; ///< Server name + uint16 usercount; ///< Online users + uint16 state; ///< Server state + uint16 property; ///< Server property + } server_list[]; ///< List of charservers +} __attribute__((packed)); + +/** + * Packet structure for AC_ACK_HASH. + * + * Variable-length packet + */ +struct packet_AC_ACK_HASH { + int16 packet_id; ///< Packet ID (#PACKET_ID_AC_ACK_HASH) + int16 packet_len; ///< Packet length (variable length) + uint8 secret[]; ///< Challenge string +} __attribute__((packed)); + +#if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute +#pragma pack(pop) +#endif // not NetBSD < 6 / Solaris + +/** + * Login Client Interface additional data + */ +struct lclif_interface_dbs { + struct login_packet_db packet_db[MAX_PACKET_DB + 1]; ///< Packet database. +}; + +/** + * Login Client Interface Private Interface + */ +struct lclif_interface_private { + struct lclif_interface_dbs *dbs; + + /** + * Populates the packet database. + */ + void (*packetdb_loaddb)(void); + + /** + * Attempts to validate and parse a received packet. + * + * @param fd Client connection file descriptor. + * @param sd Session data. + * @return Parse result error code. + */ + enum parsefunc_rcode (*parse_sub)(int fd, struct login_session_data *sd); + + LoginParseFunc *parse_CA_CONNECT_INFO_CHANGED; ///< Packet handler for #packet_CA_CONNECT_INFO_CHANGED. + LoginParseFunc *parse_CA_EXE_HASHCHECK; ///< Packet handler for #packet_CA_EXE_HASHCHECK. + LoginParseFunc *parse_CA_LOGIN; ///< Packet handler for #packet_CA_LOGIN. + LoginParseFunc *parse_CA_LOGIN2; ///< Packet handler for #packet_CA_LOGIN2. + LoginParseFunc *parse_CA_LOGIN3; ///< Packet handler for #packet_CA_LOGIN3. + LoginParseFunc *parse_CA_LOGIN4; ///< Packet handler for #packet_CA_LOGIN4. + LoginParseFunc *parse_CA_LOGIN_PCBANG; ///< Packet handler for #packet_CA_LOGIN_PCBANG. + LoginParseFunc *parse_CA_LOGIN_HAN; ///< Packet handler for #packet_CA_LOGIN_HAN. + LoginParseFunc *parse_CA_SSO_LOGIN_REQ; ///< Packet handler for #packet_CA_SSO_LOGIN_REQ. + LoginParseFunc *parse_CA_REQ_HASH; ///< Packet handler for #packet_CA_REQ_HASH. + LoginParseFunc *parse_CA_CHARSERVERCONNECT; ///< Packet handler for #packet_CA_CHARSERVERCONNECT. +}; + +#endif // LOGIN_LCLIF_P_H diff --git a/src/login/login.c b/src/login/login.c index bd826b300..d7c7321d8 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2015 Hercules Dev Team + * Copyright (C) 2012-2016 Hercules Dev Team * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify @@ -26,6 +26,7 @@ #include "login/account.h" #include "login/ipban.h" #include "login/loginlog.h" +#include "login/lclif.h" #include "common/HPM.h" #include "common/cbasetypes.h" #include "common/core.h" @@ -43,6 +44,10 @@ #include <stdio.h> #include <stdlib.h> +/** @file + * Implementation of the login interface. + */ + struct login_interface login_s; struct login_interface *login; struct Login_Config login_config_; @@ -63,7 +68,7 @@ AccountDB* accounts = NULL; /** * @see DBCreateData */ -static DBData login_create_online_user(DBKey key, va_list args) +static struct DBData login_create_online_user(union DBKey key, va_list args) { struct online_login_data* p; CREATE(p, struct online_login_data, 1); @@ -112,7 +117,7 @@ static int login_waiting_disconnect_timer(int tid, int64 tick, int id, intptr_t /** * @see DBApply */ -static int login_online_db_setoffline(DBKey key, DBData *data, va_list ap) +static int login_online_db_setoffline(union DBKey key, struct DBData *data, va_list ap) { struct online_login_data* p = DB->data2ptr(data); int server_id = va_arg(ap, int); @@ -134,7 +139,7 @@ static int login_online_db_setoffline(DBKey key, DBData *data, va_list ap) /** * @see DBApply */ -static int login_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap) +static int login_online_data_cleanup_sub(union DBKey key, struct DBData *data, va_list ap) { struct online_login_data *character= DB->data2ptr(data); nullpo_ret(character); @@ -1180,14 +1185,6 @@ int login_mmo_auth(struct login_session_data* sd, bool isServer) { return -1; // account OK } -void login_connection_problem(int fd, uint8 status) -{ - WFIFOHEAD(fd,3); - WFIFOW(fd,0) = 0x81; - WFIFOB(fd,2) = status; - WFIFOSET(fd,3); -} - void login_kick(struct login_session_data* sd) { uint8 buf[6]; @@ -1201,9 +1198,7 @@ void login_auth_ok(struct login_session_data* sd) { int fd = 0; uint32 ip; - uint8 server_num, n; struct login_auth_node* node; - int i; nullpo_retv(sd); fd = sd->fd; @@ -1211,29 +1206,17 @@ void login_auth_ok(struct login_session_data* sd) if( core->runflag != LOGINSERVER_ST_RUNNING ) { // players can only login while running - login->connection_problem(fd, 1); // 01 = server closed + lclif->connection_error(fd, 1); // 01 = server closed return; } if (login->config->group_id_to_connect >= 0 && sd->group_id != login->config->group_id_to_connect) { ShowStatus("Connection refused: the required group id for connection is %d (account: %s, group: %d).\n", login->config->group_id_to_connect, sd->userid, sd->group_id); - login->connection_problem(fd, 1); // 01 = server closed + lclif->connection_error(fd, 1); // 01 = server closed return; } else if (login->config->min_group_id_to_connect >= 0 && login->config->group_id_to_connect == -1 && sd->group_id < login->config->min_group_id_to_connect) { ShowStatus("Connection refused: the minimum group id required for connection is %d (account: %s, group: %d).\n", login->config->min_group_id_to_connect, sd->userid, sd->group_id); - login->connection_problem(fd, 1); // 01 = server closed - return; - } - - server_num = 0; - for( i = 0; i < ARRAYLENGTH(server); ++i ) - if (sockt->session_is_active(server[i].fd)) - server_num++; - - if( server_num == 0 ) - {// if no char-server, don't send void list of servers, just disconnect the player with proper message - ShowStatus("Connection refused: there is no char-server online (account: %s).\n", sd->userid); - login->connection_problem(fd, 1); // 01 = server closed + lclif->connection_error(fd, 1); // 01 = server closed return; } @@ -1248,7 +1231,7 @@ void login_auth_ok(struct login_session_data* sd) if( data->waiting_disconnect == INVALID_TIMER ) data->waiting_disconnect = timer->add(timer->gettick()+AUTH_TIMEOUT, login->waiting_disconnect_timer, sd->account_id, 0); - login->connection_problem(fd, 8); // 08 = Server still recognizes your last login + lclif->connection_error(fd, 8); // 08 = Server still recognizes your last login return; } else @@ -1262,42 +1245,16 @@ void login_auth_ok(struct login_session_data* sd) } } + if (!lclif->server_list(sd)) { + // if no char-server, don't send void list of servers, just disconnect the player with proper message + ShowStatus("Connection refused: there is no char-server online (account: %s).\n", sd->userid); + lclif->connection_error(fd, 1); // 01 = server closed + return; + } + login_log(ip, sd->userid, 100, "login ok"); ShowStatus("Connection of the account '%s' accepted.\n", sd->userid); - WFIFOHEAD(fd,47+32*server_num); - WFIFOW(fd,0) = 0x69; - WFIFOW(fd,2) = 47+32*server_num; - WFIFOL(fd,4) = sd->login_id1; - WFIFOL(fd,8) = sd->account_id; - WFIFOL(fd,12) = sd->login_id2; - WFIFOL(fd,16) = 0; // in old version, that was for ip (not more used) - //memcpy(WFIFOP(fd,20), sd->lastlogin, 24); // in old version, that was for name (not more used) - memset(WFIFOP(fd,20), 0, 24); - WFIFOW(fd,44) = 0; // unknown - WFIFOB(fd,46) = sex_str2num(sd->sex); - for (i = 0, n = 0; i < ARRAYLENGTH(server); ++i) { - uint32 subnet_char_ip; - - if (!sockt->session_is_valid(server[i].fd)) - continue; - - subnet_char_ip = login->lan_subnet_check(ip); - WFIFOL(fd,47+n*32) = htonl((subnet_char_ip) ? subnet_char_ip : server[i].ip); - WFIFOW(fd,47+n*32+4) = sockt->ntows(htons(server[i].port)); // [!] LE byte order here [!] - memcpy(WFIFOP(fd,47+n*32+6), server[i].name, 20); - WFIFOW(fd,47+n*32+26) = server[i].users; - - if( server[i].type == CST_PAYING && sd->expiration_time > time(NULL) ) - WFIFOW(fd,47+n*32+28) = CST_NORMAL; - else - WFIFOW(fd,47+n*32+28) = server[i].type; - - WFIFOW(fd,47+n*32+30) = server[i].new_; - n++; - } - WFIFOSET(fd,47+32*server_num); - // create temporary auth entry CREATE(node, struct login_auth_node, 1); node->account_id = sd->account_id; @@ -1322,10 +1279,11 @@ void login_auth_ok(struct login_session_data* sd) } } -void login_auth_failed(struct login_session_data* sd, int result) +void login_auth_failed(struct login_session_data *sd, int result) { int fd; uint32 ip; + time_t ban_time = 0; nullpo_retv(sd); fd = sd->fd; @@ -1364,121 +1322,23 @@ void login_auth_failed(struct login_session_data* sd, int result) if (result == 1 && login->config->dynamic_pass_failure_ban && !sockt->trusted_ip_check(ip)) ipban_log(ip); // log failed password attempt -#if PACKETVER >= 20120000 /* not sure when this started */ - WFIFOHEAD(fd,26); - WFIFOW(fd,0) = 0x83e; - WFIFOL(fd,2) = result; - if( result != 6 ) - memset(WFIFOP(fd,6), '\0', 20); - else { // 6 = Your are Prohibited to log in until %s - struct mmo_account acc; - time_t unban_time = ( accounts->load_str(accounts, &acc, sd->userid) ) ? acc.unban_time : 0; - timestamp2string(WFIFOP(fd,6), 20, unban_time, login->config->date_format); - } - WFIFOSET(fd,26); -#else - WFIFOHEAD(fd,23); - WFIFOW(fd,0) = 0x6a; - WFIFOB(fd,2) = (uint8)result; - if( result != 6 ) - memset(WFIFOP(fd,3), '\0', 20); - else { // 6 = Your are Prohibited to log in until %s - struct mmo_account acc; - time_t unban_time = ( accounts->load_str(accounts, &acc, sd->userid) ) ? acc.unban_time : 0; - timestamp2string(WFIFOP(fd,3), 20, unban_time, login->config->date_format); + if (result == 6) { + struct mmo_account acc = { 0 }; + if (accounts->load_str(accounts, &acc, sd->userid)) + ban_time = acc.unban_time; } - WFIFOSET(fd,23); -#endif -} - -void login_login_error(int fd, uint8 status) -{ - WFIFOHEAD(fd,23); - WFIFOW(fd,0) = 0x6a; - WFIFOB(fd,2) = status; - WFIFOSET(fd,23); -} - -void login_parse_ping(int fd, struct login_session_data* sd) __attribute__((nonnull (2))); -void login_parse_ping(int fd, struct login_session_data* sd) -{ - RFIFOSKIP(fd,26); -} - -void login_parse_client_md5(int fd, struct login_session_data* sd) __attribute__((nonnull (2))); -void login_parse_client_md5(int fd, struct login_session_data* sd) -{ - sd->has_client_hash = 1; - memcpy(sd->client_hash, RFIFOP(fd, 2), 16); - - RFIFOSKIP(fd,18); + lclif->auth_failed(fd, ban_time, result); } -bool login_parse_client_login(int fd, struct login_session_data* sd, const char *const ip) __attribute__((nonnull (2))); -bool login_parse_client_login(int fd, struct login_session_data* sd, const char *const ip) +bool login_client_login(int fd, struct login_session_data *sd) __attribute__((nonnull (2))); +bool login_client_login(int fd, struct login_session_data *sd) { - uint32 version; - char username[NAME_LENGTH]; - char password[PASSWD_LEN]; - unsigned char passhash[16]; - uint8 clienttype; int result; - uint16 command = RFIFOW(fd,0); - bool israwpass = (command==0x0064 || command==0x0277 || command==0x02b0 || command == 0x0825); - - // Shinryo: For the time being, just use token as password. - if(command == 0x0825) - { - const char *accname = RFIFOP(fd, 9); - const char *token = RFIFOP(fd, 0x5C); - size_t uAccLen = strlen(accname); - size_t uTokenLen = RFIFOREST(fd) - 0x5C; - - version = RFIFOL(fd,4); - - if(uAccLen <= 0 || uTokenLen <= 0) { - login->auth_failed(sd, 3); - return true; - } - - safestrncpy(username, accname, NAME_LENGTH); - safestrncpy(password, token, min(uTokenLen+1, PASSWD_LEN)); // Variable-length field, don't copy more than necessary - clienttype = RFIFOB(fd, 8); - } - else - { - version = RFIFOL(fd,2); - safestrncpy(username, RFIFOP(fd,6), NAME_LENGTH); - if( israwpass ) - { - safestrncpy(password, RFIFOP(fd,30), NAME_LENGTH); - clienttype = RFIFOB(fd,54); - } - else - { - memcpy(passhash, RFIFOP(fd,30), 16); - clienttype = RFIFOB(fd,46); - } - } - RFIFOSKIP(fd,RFIFOREST(fd)); // assume no other packet was sent + char ip[16]; + uint32 ipl = sockt->session[fd]->client_addr; + sockt->ip2str(ipl, ip); - sd->clienttype = clienttype; - sd->version = version; - safestrncpy(sd->userid, username, NAME_LENGTH); - if( israwpass ) - { - ShowStatus("Request for connection of %s (ip: %s).\n", sd->userid, ip); - safestrncpy(sd->passwd, password, PASSWD_LEN); - if (login->config->use_md5_passwds) - MD5_String(sd->passwd, sd->passwd); - sd->passwdenc = PWENC_NONE; - } - else - { - ShowStatus("Request for connection (passwdenc mode) of %s (ip: %s).\n", sd->userid, ip); - bin2hex(sd->passwd, passhash, 16); // raw binary data here! - sd->passwdenc = PASSWORDENC; - } + ShowStatus("Request for connection %sof %s (ip: %s).\n", sd->passwdenc == PASSWORDENC ? " (passwdenc mode)" : "", sd->userid, ip); if (sd->passwdenc != PWENC_NONE && login->config->use_md5_passwds) { login->auth_failed(sd, 3); // send "rejected from server" @@ -1486,32 +1346,12 @@ bool login_parse_client_login(int fd, struct login_session_data* sd, const char } result = login->mmo_auth(sd, false); - if( result == -1 ) login->auth_ok(sd); else login->auth_failed(sd, result); - return false; -} -void login_send_coding_key(int fd, struct login_session_data* sd) __attribute__((nonnull (2))); -void login_send_coding_key(int fd, struct login_session_data* sd) -{ - WFIFOHEAD(fd,4 + sd->md5keylen); - WFIFOW(fd,0) = 0x01dc; - WFIFOW(fd,2) = 4 + sd->md5keylen; - memcpy(WFIFOP(fd,4), sd->md5key, sd->md5keylen); - WFIFOSET(fd,WFIFOW(fd,2)); -} - -void login_parse_request_coding_key(int fd, struct login_session_data* sd) __attribute__((nonnull (2))); -void login_parse_request_coding_key(int fd, struct login_session_data* sd) -{ - memset(sd->md5key, '\0', sizeof(sd->md5key)); - sd->md5keylen = (uint16)(12 + rnd() % 4); - MD5_Salt(sd->md5keylen, sd->md5key); - - login->send_coding_key(fd, sd); + return false; } void login_char_server_connection_status(int fd, struct login_session_data* sd, uint8 status) __attribute__((nonnull (2))); @@ -1523,6 +1363,7 @@ void login_char_server_connection_status(int fd, struct login_session_data* sd, WFIFOSET(fd,3); } +// CA_CHARSERVERCONNECT void login_parse_request_connection(int fd, struct login_session_data* sd, const char *const ip, uint32 ipl) __attribute__((nonnull (2, 3))); void login_parse_request_connection(int fd, struct login_session_data* sd, const char *const ip, uint32 ipl) { @@ -1545,7 +1386,6 @@ void login_parse_request_connection(int fd, struct login_session_data* sd, const safestrncpy(server_name, RFIFOP(fd,60), 20); type = RFIFOW(fd,82); new_ = RFIFOW(fd,84); - RFIFOSKIP(fd,86); ShowInfo("Connection request of the char-server '%s' @ %u.%u.%u.%u:%u (account: '%s', pass: '%s', ip: '%s')\n", server_name, CONVIP(server_ip), server_port, sd->userid, sd->passwd, ip); sprintf(message, "charserver - %s@%u.%u.%u.%u:%u", server_name, CONVIP(server_ip), server_port); @@ -1583,121 +1423,6 @@ void login_parse_request_connection(int fd, struct login_session_data* sd, const } } -//---------------------------------------------------------------------------------------- -// Default packet parsing (normal players or char-server connection requests) -//---------------------------------------------------------------------------------------- -int login_parse_login(int fd) -{ - struct login_session_data* sd = (struct login_session_data*)sockt->session[fd]->session_data; - - char ip[16]; - uint32 ipl = sockt->session[fd]->client_addr; - sockt->ip2str(ipl, ip); - - if( sockt->session[fd]->flag.eof ) - { - ShowInfo("Closed connection from '"CL_WHITE"%s"CL_RESET"'.\n", ip); - sockt->close(fd); - return 0; - } - - if( sd == NULL ) - { - // Perform ip-ban check - if (login->config->ipban && !sockt->trusted_ip_check(ipl) && ipban_check(ipl)) { - ShowStatus("Connection refused: IP isn't authorized (deny/allow, ip: %s).\n", ip); - login_log(ipl, "unknown", -3, "ip banned"); - login->login_error(fd, 3); // 3 = Rejected from Server - sockt->eof(fd); - return 0; - } - - // create a session for this new connection - CREATE(sockt->session[fd]->session_data, struct login_session_data, 1); - sd = (struct login_session_data*)sockt->session[fd]->session_data; - sd->fd = fd; - } - - while (RFIFOREST(fd) >= 2) { - uint16 command = RFIFOW(fd,0); - - if (VECTOR_LENGTH(HPM->packets[hpParse_Login]) > 0) { - int result = HPM->parse_packets(fd,command,hpParse_Login); - if (result == 1) - continue; - if (result == 2) - return 0; - } - - switch (command) { - - case 0x0200: // New alive packet: structure: 0x200 <account.userid>.24B. used to verify if client is always alive. - if (RFIFOREST(fd) < 26) - return 0; - login->parse_ping(fd, sd); - break; - - // client md5 hash (binary) - case 0x0204: // S 0204 <md5 hash>.16B (kRO 2004-05-31aSakexe langtype 0 and 6) - if (RFIFOREST(fd) < 18) - return 0; - - login->parse_client_md5(fd, sd); - break; - - // request client login (raw password) - case 0x0064: // S 0064 <version>.L <username>.24B <password>.24B <clienttype>.B - case 0x0277: // S 0277 <version>.L <username>.24B <password>.24B <clienttype>.B <ip address>.16B <adapter address>.13B - case 0x02b0: // S 02b0 <version>.L <username>.24B <password>.24B <clienttype>.B <ip address>.16B <adapter address>.13B <g_isGravityID>.B - // request client login (md5-hashed password) - case 0x01dd: // S 01dd <version>.L <username>.24B <password hash>.16B <clienttype>.B - case 0x01fa: // S 01fa <version>.L <username>.24B <password hash>.16B <clienttype>.B <?>.B(index of the connection in the clientinfo file (+10 if the command-line contains "pc")) - case 0x027c: // S 027c <version>.L <username>.24B <password hash>.16B <clienttype>.B <?>.13B(junk) - case 0x0825: // S 0825 <packetsize>.W <version>.L <clienttype>.B <userid>.24B <password>.27B <mac>.17B <ip>.15B <token>.(packetsize - 0x5C)B - { - size_t packet_len = RFIFOREST(fd); - - if( (command == 0x0064 && packet_len < 55) - || (command == 0x0277 && packet_len < 84) - || (command == 0x02b0 && packet_len < 85) - || (command == 0x01dd && packet_len < 47) - || (command == 0x01fa && packet_len < 48) - || (command == 0x027c && packet_len < 60) - || (command == 0x0825 && (packet_len < 4 || packet_len < RFIFOW(fd, 2))) ) - return 0; - } - { - if (login->parse_client_login(fd, sd, ip)) - return 0; - } - break; - - case 0x01db: // Sending request of the coding key - RFIFOSKIP(fd,2); - { - login->parse_request_coding_key(fd, sd); - } - break; - - case 0x2710: // Connection request of a char-server - if (RFIFOREST(fd) < 86) - return 0; - { - login->parse_request_connection(fd, sd, ip, ipl); - } - return 0; // processing will continue elsewhere - - default: - ShowNotice("Abnormal end of connection (ip: %s): Unknown packet 0x%x\n", ip, command); - sockt->eof(fd); - return 0; - } - } - - return 0; -} - - void login_config_set_defaults(void) { login->config->login_ip = INADDR_ANY; @@ -1892,6 +1617,8 @@ int do_final(void) { login->fd = -1; } + lclif->final(); + HPM_login_do_final(); aFree(login->LOGIN_CONF_NAME); @@ -1981,6 +1708,7 @@ int do_init(int argc, char** argv) } login_defaults(); + lclif_defaults(); // read login-server configuration login->config_set_defaults(); @@ -1988,6 +1716,8 @@ int do_init(int argc, char** argv) login->LOGIN_CONF_NAME = aStrdup("conf/login-server.conf"); login->NET_CONF_NAME = aStrdup("conf/network.conf"); + lclif->init(); + HPM_login_do_init(); cmdline->exec(argc, argv, CMDLINE_OPT_PREINIT); HPM->config_read(); @@ -2014,8 +1744,8 @@ int do_init(int argc, char** argv) // Interserver auth init login->auth_db = idb_alloc(DB_OPT_RELEASE_DATA); - // set default parser as login_parse_login function - sockt->set_defaultparse(login->parse_login); + // set default parser as lclif->parse function + sockt->set_defaultparse(lclif->parse); // every 10 minutes cleanup online account db. timer->add_func_list(login->online_data_cleanup, "login->online_data_cleanup"); @@ -2107,19 +1837,12 @@ void login_defaults(void) { login->fromchar_parse_accinfo = login_fromchar_parse_accinfo; login->parse_fromchar = login_parse_fromchar; - login->parse_login = login_parse_login; - login->parse_ping = login_parse_ping; - login->parse_client_md5 = login_parse_client_md5; - login->parse_client_login = login_parse_client_login; - login->parse_request_coding_key = login_parse_request_coding_key; + login->client_login = login_client_login; login->parse_request_connection = login_parse_request_connection; login->auth_ok = login_auth_ok; login->auth_failed = login_auth_failed; login->char_server_connection_status = login_char_server_connection_status; - login->connection_problem = login_connection_problem; login->kick = login_kick; - login->login_error = login_login_error; - login->send_coding_key = login_send_coding_key; login->config_set_defaults = login_config_set_defaults; login->config_read = login_config_read; diff --git a/src/login/login.h b/src/login/login.h index f79f75cb3..36085ae91 100644 --- a/src/login/login.h +++ b/src/login/login.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2015 Hercules Dev Team + * Copyright (C) 2012-2016 Hercules Dev Team * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify @@ -26,6 +26,10 @@ #include "common/db.h" #include "common/mmo.h" // NAME_LENGTH,SEX_* +/** @file + * Login interface. + */ + struct mmo_account; struct AccountDB; @@ -149,8 +153,8 @@ struct online_login_data { * Login.c Interface **/ struct login_interface { - DBMap* auth_db; - DBMap* online_db; + struct DBMap *auth_db; + struct DBMap *online_db; int fd; struct Login_Config *config; struct AccountDB* accounts; @@ -158,11 +162,11 @@ struct login_interface { int (*mmo_auth) (struct login_session_data* sd, bool isServer); int (*mmo_auth_new) (const char* userid, const char* pass, const char sex, const char* last_ip); int (*waiting_disconnect_timer) (int tid, int64 tick, int id, intptr_t data); - DBData (*create_online_user) (DBKey key, va_list args); + struct DBData (*create_online_user) (union DBKey key, va_list args); struct online_login_data* (*add_online_user) (int char_server, int account_id); void (*remove_online_user) (int account_id); - int (*online_db_setoffline) (DBKey key, DBData *data, va_list ap); - int (*online_data_cleanup_sub) (DBKey key, DBData *data, va_list ap); + int (*online_db_setoffline) (union DBKey key, struct DBData *data, va_list ap); + int (*online_data_cleanup_sub) (union DBKey key, struct DBData *data, va_list ap); int (*online_data_cleanup) (int tid, int64 tick, int id, intptr_t data); int (*sync_ip_addresses) (int tid, int64 tick, int id, intptr_t data); bool (*check_encrypted) (const char* str1, const char* str2, const char* passwd); @@ -196,19 +200,12 @@ struct login_interface { bool (*fromchar_parse_wrong_pincode) (int fd); void (*fromchar_parse_accinfo) (int fd); int (*parse_fromchar) (int fd); - void (*connection_problem) (int fd, uint8 status); void (*kick) (struct login_session_data* sd); void (*auth_ok) (struct login_session_data* sd); void (*auth_failed) (struct login_session_data* sd, int result); - void (*login_error) (int fd, uint8 status); - void (*parse_ping) (int fd, struct login_session_data* sd); - void (*parse_client_md5) (int fd, struct login_session_data* sd); - bool (*parse_client_login) (int fd, struct login_session_data* sd, const char *ip); - void (*send_coding_key) (int fd, struct login_session_data* sd); - void (*parse_request_coding_key) (int fd, struct login_session_data* sd); + bool (*client_login) (int fd, struct login_session_data *sd); void (*char_server_connection_status) (int fd, struct login_session_data* sd, uint8 status); void (*parse_request_connection) (int fd, struct login_session_data* sd, const char *ip, uint32 ipl); - int (*parse_login) (int fd); void (*config_set_defaults) (void); int (*config_read) (const char *cfgName); char *LOGIN_CONF_NAME; diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c index 356bba3b4..16accfada 100644 --- a/src/login/loginlog_sql.c +++ b/src/login/loginlog_sql.c @@ -47,7 +47,7 @@ static char log_db_database[32] = ""; static char log_codepage[32] = ""; static char log_login_db[256] = "loginlog"; -static Sql* sql_handle = NULL; +static struct Sql *sql_handle = NULL; static bool enabled = false; diff --git a/src/map/Makefile.in b/src/map/Makefile.in index b5a3d4461..3c6a3f806 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team +# Copyright (C) 2012-2016 Hercules Dev Team # Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ CONFIG_D = ../config CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) COMMON_D = ../common -COMMON_H = $(wildcard $(COMMON_D)/*.h) +COMMON_H = $(filter-out %.p.h, $(wildcard $(COMMON_D)/*.h)) ../plugins/HPMHooking.h SYSINFO_INC = $(COMMON_D)/sysinfo.inc COMMON_INCLUDE = -I.. @@ -53,6 +53,7 @@ MAP_H = atcommand.h battle.h battleground.h buyingstore.h channel.h chat.h \ mercenary.h mob.h npc.h packets.h packets_struct.h party.h path.h \ pc.h pc_groups.h pet.h quest.h script.h searchstore.h skill.h \ status.h storage.h trade.h unit.h vending.h +MAP_PH = HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) @@ -95,7 +96,7 @@ help: Makefile: Makefile.in @$(MAKE) -C ../.. src/map/Makefile -$(SYSINFO_INC): $(MAP_C) $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) +$(SYSINFO_INC): $(MAP_C) $(MAP_PH) $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " MAKE $@" @$(MAKE) -C ../.. sysinfo @@ -118,12 +119,6 @@ map-server: ../../map-server@EXEEXT@ @$(CC) @STATIC@ @LDFLAGS@ -o ../../map-server@EXEEXT@ $(MAP_OBJ) $(COMMON_D)/obj_sql/common_sql.a \ $(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ -# map object files - -obj_sql/%.o: %.c $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql - @echo " CC $<" - @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< - # missing object files $(COMMON_D)/obj_all/common.a: @echo " MAKE $@" @@ -140,3 +135,11 @@ $(MT19937AR_OBJ): $(LIBCONFIG_OBJ): @echo " MAKE $@" @$(MAKE) -C $(LIBCONFIG_D) + +.SECONDEXPANSION: + +# map object files + +obj_sql/%.o: %.c $$(filter %.p.h, $(MAP_PH)) $(MAP_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql + @echo " CC $<" + @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< diff --git a/src/map/atcommand.c b/src/map/atcommand.c index f28c24dcb..841cf855d 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -547,7 +547,7 @@ ACMD(jumpto) { return false; } - if((pl_sd=map->nick2sd((const char *)message)) == NULL && (pl_sd=map->charid2sd(atoi(message))) == NULL) { + if ((pl_sd=map->nick2sd(message)) == NULL && (pl_sd=map->charid2sd(atoi(message))) == NULL) { clif->message(fd, msg_fd(fd,3)); // Character not found. return false; } @@ -1091,9 +1091,9 @@ ACMD(kami) sscanf(message, "%199[^\n]", atcmd_output); if (stristr(info->command, "l") != NULL) - clif->broadcast(&sd->bl, atcmd_output, strlen(atcmd_output) + 1, BC_DEFAULT, ALL_SAMEMAP); + clif->broadcast(&sd->bl, atcmd_output, (int)strlen(atcmd_output) + 1, BC_DEFAULT, ALL_SAMEMAP); else - intif->broadcast(atcmd_output, strlen(atcmd_output) + 1, (*(info->command + 4) == 'b' || *(info->command + 4) == 'B') ? BC_BLUE : BC_YELLOW); + intif->broadcast(atcmd_output, (int)strlen(atcmd_output) + 1, (*(info->command + 4) == 'b' || *(info->command + 4) == 'B') ? BC_BLUE : BC_YELLOW); } else { if(!*message || (sscanf(message, "%10u %199[^\n]", &color, atcmd_output) < 2)) { clif->message(fd, msg_fd(fd,981)); // Please enter color and message (usage: @kamic <color> <message>). @@ -1104,7 +1104,7 @@ ACMD(kami) clif->message(fd, msg_fd(fd,982)); // Invalid color. return false; } - intif->broadcast2(atcmd_output, strlen(atcmd_output) + 1, color, 0x190, 12, 0, 0); + intif->broadcast2(atcmd_output, (int)strlen(atcmd_output) + 1, color, 0x190, 12, 0, 0); } return true; } @@ -1511,7 +1511,7 @@ ACMD(help) { clif->message(fd, atcmd_output); { // Display aliases - DBIterator* iter; + struct DBIterator *iter; AtCommandInfo *command_info; AliasInfo *alias_info = NULL; StringBuf buf; @@ -2747,7 +2747,7 @@ ACMD(recall) { return false; } - if((pl_sd=map->nick2sd((const char *)message)) == NULL && (pl_sd=map->charid2sd(atoi(message))) == NULL) { + if ((pl_sd=map->nick2sd(message)) == NULL && (pl_sd=map->charid2sd(atoi(message))) == NULL) { clif->message(fd, msg_fd(fd,3)); // Character not found. return false; } @@ -3072,7 +3072,7 @@ ACMD(kick) return false; } - if((pl_sd=map->nick2sd((const char *)message)) == NULL && (pl_sd=map->charid2sd(atoi(message))) == NULL) { + if ((pl_sd=map->nick2sd(message)) == NULL && (pl_sd=map->charid2sd(atoi(message))) == NULL) { clif->message(fd, msg_fd(fd,3)); // Character not found. return false; } @@ -3643,6 +3643,8 @@ ACMD(reloadbattleconf) memcpy(&prev_config, &battle_config, sizeof(prev_config)); battle->config_read(map->BATTLE_CONF_FILENAME); + if (prev_config.feature_roulette == 0 && battle_config.feature_roulette == 1 && !clif->parse_roulette_db()) + battle_config.feature_roulette = 0; if( prev_config.item_rate_mvp != battle_config.item_rate_mvp || prev_config.item_rate_common != battle_config.item_rate_common @@ -3791,7 +3793,7 @@ ACMD(mapinfo) if( pl_sd->mapindex == m_index ) { if( pl_sd->state.vending ) vend_num++; - else if ((cd = map->id2cd(pl_sd->chatID)) != NULL && cd->usersd[0] == pl_sd) + else if ((cd = map->id2cd(pl_sd->chat_id)) != NULL && cd->usersd[0] == pl_sd) chat_num++; } } @@ -3970,7 +3972,7 @@ ACMD(mapinfo) clif->message(fd, msg_fd(fd,1113)); // ----- Chats in Map ----- iter = mapit_getallusers(); for (pl_sd = BL_UCCAST(BL_PC, mapit->first(iter)); mapit->exists(iter); pl_sd = BL_UCCAST(BL_PC, mapit->next(iter))) { - if ((cd = map->id2cd(pl_sd->chatID)) != NULL && pl_sd->mapindex == m_index && cd->usersd[0] == pl_sd) { + if ((cd = map->id2cd(pl_sd->chat_id)) != NULL && pl_sd->mapindex == m_index && cd->usersd[0] == pl_sd) { safesnprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd,1114), // Chat: %s | Player: %s | Location: %d %d cd->title, pl_sd->status.name, cd->bl.x, cd->bl.y); clif->message(fd, atcmd_output); @@ -4909,7 +4911,7 @@ ACMD(broadcast) } safesnprintf(atcmd_output, sizeof(atcmd_output), "%s: %s", sd->status.name, message); - intif->broadcast(atcmd_output, strlen(atcmd_output) + 1, BC_DEFAULT); + intif->broadcast(atcmd_output, (int)strlen(atcmd_output) + 1, BC_DEFAULT); return true; } @@ -4928,7 +4930,7 @@ ACMD(localbroadcast) safesnprintf(atcmd_output, sizeof(atcmd_output), "%s: %s", sd->status.name, message); - clif->broadcast(&sd->bl, atcmd_output, strlen(atcmd_output) + 1, BC_DEFAULT, ALL_SAMEMAP); + clif->broadcast(&sd->bl, atcmd_output, (int)strlen(atcmd_output) + 1, BC_DEFAULT, ALL_SAMEMAP); return true; } @@ -5123,8 +5125,7 @@ ACMD(follow) { return true; } - if ((pl_sd = map->nick2sd((const char *)message)) == NULL) - { + if ((pl_sd = map->nick2sd(message)) == NULL) { clif->message(fd, msg_fd(fd,3)); // Character not found. return false; } @@ -5262,7 +5263,7 @@ ACMD(clearcart) for( i = 0; i < MAX_CART; i++ ) if(sd->status.cart[i].nameid > 0) - pc->cart_delitem(sd, i, sd->status.cart[i].amount, 1, LOG_TYPE_OTHER); + pc->cart_delitem(sd, i, sd->status.cart[i].amount, 1, LOG_TYPE_COMMAND); clif->clearcart(fd); clif->updatestatus(sd,SP_CARTINFO); @@ -5277,12 +5278,13 @@ ACMD(clearcart) *------------------------------------------*/ #define MAX_SKILLID_PARTIAL_RESULTS 5 #define MAX_SKILLID_PARTIAL_RESULTS_LEN 74 /* "skill " (6) + "%d:" (up to 5) + "%s" (up to 30) + " (%s)" (up to 33) */ -ACMD(skillid) { +ACMD(skillid) +{ int i, found = 0; size_t skillen; - DBIterator* iter; - DBKey key; - DBData *data; + struct DBIterator *iter; + union DBKey key; + struct DBData *data; char partials[MAX_SKILLID_PARTIAL_RESULTS][MAX_SKILLID_PARTIAL_RESULTS_LEN]; if (!*message) { @@ -5601,7 +5603,7 @@ ACMD(changegm) { return false; } - if ((pl_sd=map->nick2sd((const char *) message)) == NULL || pl_sd->status.guild_id != sd->status.guild_id) { + if ((pl_sd=map->nick2sd(message)) == NULL || pl_sd->status.guild_id != sd->status.guild_id) { clif->message(fd, msg_fd(fd,1184)); // Target character must be online and be a guild member. return false; } @@ -5621,7 +5623,7 @@ ACMD(changeleader) { return false; } - if (party->changeleader(sd, map->nick2sd((const char *) message))) + if (party->changeleader(sd, map->nick2sd(message))) return true; return false; } @@ -6380,7 +6382,7 @@ ACMD(trade) { return false; } - if ( (pl_sd = map->nick2sd((const char *)message)) == NULL ) { + if ((pl_sd = map->nick2sd(message)) == NULL) { clif->message(fd, msg_fd(fd,3)); // Character not found. return false; } @@ -6423,8 +6425,7 @@ ACMD(unmute) { return false; } - if ((pl_sd = map->nick2sd((const char *)message)) == NULL) - { + if ((pl_sd = map->nick2sd(message)) == NULL) { clif->message(fd, msg_fd(fd,3)); // Character not found. return false; } @@ -6778,7 +6779,7 @@ ACMD(showmobs) clif->message(fd, atcmd_output); it = mapit_geteachmob(); - for (md = BL_UCCAST(BL_MOB, mapit->first(it)); mapit->next(it); md = BL_UCCAST(BL_MOB, mapit->next(it))) { + for (md = BL_UCCAST(BL_MOB, mapit->first(it)); mapit->exists(it); md = BL_UCCAST(BL_MOB, mapit->next(it))) { if( md->bl.m != sd->bl.m ) continue; if( mob_id != -1 && md->class_ != mob_id ) @@ -7665,9 +7666,10 @@ ACMD(showdelay) * @reject - reject invitation * @leave - leave duel *------------------------------------------*/ -ACMD(invite) { +ACMD(invite) +{ unsigned int did = sd->duel_group; - struct map_session_data *target_sd = map->nick2sd((const char *)message); + struct map_session_data *target_sd = map->nick2sd(message); if (did == 0) { @@ -7739,8 +7741,7 @@ ACMD(duel) { } duel->create(sd, maxpl); } else { - struct map_session_data *target_sd; - target_sd = map->nick2sd((const char *)message); + struct map_session_data *target_sd = map->nick2sd(message); if (target_sd != NULL) { unsigned int newduel; if ((newduel = duel->create(sd, 2)) != -1) { @@ -7835,7 +7836,7 @@ ACMD(cash) // If this option is set, the message is already sent by pc function if( !battle_config.cashshop_show_points ){ sprintf(output, msg_fd(fd,505), ret, sd->cashPoints); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); clif->message(fd, output); } } else @@ -7843,7 +7844,7 @@ ACMD(cash) } else { if( (ret=pc->paycash(sd, -value, 0)) >= 0){ sprintf(output, msg_fd(fd,410), ret, sd->cashPoints); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); clif->message(fd, output); } else clif->message(fd, msg_fd(fd,41)); // Unable to decrease the number/value. @@ -7854,7 +7855,7 @@ ACMD(cash) // If this option is set, the message is already sent by pc function if( !battle_config.cashshop_show_points ){ sprintf(output, msg_fd(fd,506), ret, sd->kafraPoints); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); clif->message(fd, output); } } else @@ -7862,7 +7863,7 @@ ACMD(cash) } else { if( (ret=pc->paycash(sd, -value, -value)) >= 0){ sprintf(output, msg_fd(fd,411), ret, sd->kafraPoints); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); clif->message(fd, output); } else clif->message(fd, msg_fd(fd,41)); // Unable to decrease the number/value. @@ -7882,7 +7883,7 @@ ACMD(clone) { return false; } - if ((pl_sd=map->nick2sd((const char *)message)) == NULL && (pl_sd=map->charid2sd(atoi(message))) == NULL) { + if ((pl_sd=map->nick2sd(message)) == NULL && (pl_sd=map->charid2sd(atoi(message))) == NULL) { clif->message(fd, msg_fd(fd,3)); // Character not found. return false; } @@ -7957,7 +7958,7 @@ ACMD(request) safesnprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd,278), message); // (@request): %s intif->wis_message_to_gm(sd->status.name, PC_PERM_RECEIVE_REQUESTS, atcmd_output); - clif_disp_onlyself(sd, atcmd_output, strlen(atcmd_output)); + clif_disp_onlyself(sd, atcmd_output); clif->message(sd->fd,msg_fd(fd,279)); // @request sent. return true; } @@ -8352,7 +8353,7 @@ void atcommand_commands_sub(struct map_session_data* sd, const int fd, AtCommand char line_buff[CHATBOX_SIZE]; char* cur = line_buff; AtCommandInfo* cmd; - DBIterator *iter = db_iterator(atcommand->db); + struct DBIterator *iter = db_iterator(atcommand->db); int count = 0; memset(line_buff,' ',CHATBOX_SIZE); @@ -8498,30 +8499,34 @@ ACMD(set) CREATE(data, struct script_data,1); - if( is_str ) {// string variable - switch( reg[0] ) { + if (is_str) { + // string variable + const char *str = NULL; + switch (reg[0]) { case '@': - data->u.str = pc->readregstr(sd, script->add_str(reg)); + str = pc->readregstr(sd, script->add_str(reg)); break; case '$': - data->u.str = mapreg->readregstr(script->add_str(reg)); + str = mapreg->readregstr(script->add_str(reg)); break; case '#': - if( reg[1] == '#' ) - data->u.str = pc_readaccountreg2str(sd, script->add_str(reg));// global + if (reg[1] == '#') + str = pc_readaccountreg2str(sd, script->add_str(reg));// global else - data->u.str = pc_readaccountregstr(sd, script->add_str(reg));// local + str = pc_readaccountregstr(sd, script->add_str(reg));// local break; default: - data->u.str = pc_readglobalreg_str(sd, script->add_str(reg)); + str = pc_readglobalreg_str(sd, script->add_str(reg)); break; } - if( data->u.str == NULL || data->u.str[0] == '\0' ) {// empty string + if (str == NULL || str[0] == '\0') { + // empty string data->type = C_CONSTSTR; data->u.str = ""; - } else {// duplicate string + } else { + // duplicate string data->type = C_STR; - data->u.str = aStrdup(data->u.str); + data->u.mutstr = aStrdup(str); } } else {// integer variable data->type = C_INT; @@ -8549,7 +8554,7 @@ ACMD(set) safesnprintf(atcmd_output, sizeof(atcmd_output),msg_fd(fd,1373),reg,data->u.num); // %s value is now :%d break; case C_STR: - safesnprintf(atcmd_output, sizeof(atcmd_output),msg_fd(fd,1374),reg,data->u.str); // %s value is now :%s + safesnprintf(atcmd_output, sizeof(atcmd_output),msg_fd(fd,1374),reg,data->u.mutstr); // %s value is now :%s break; case C_CONSTSTR: safesnprintf(atcmd_output, sizeof(atcmd_output),msg_fd(fd,1375),reg); // %s is empty @@ -8822,7 +8827,7 @@ ACMD(channel) { clif->messagecolor_self(fd, channel->config->colors[k], atcmd_output); } } else { - DBIterator *iter = db_iterator(channel->db); + struct DBIterator *iter = db_iterator(channel->db); bool show_all = pc_has_permission(sd, PC_PERM_HCHSYS_ADMIN) ? true : false; clif->message(fd, msg_fd(fd,1410)); // -- Public Channels if (channel->config->local) { @@ -9052,9 +9057,9 @@ ACMD(channel) { clif->message(fd, atcmd_output); } else if (strcmpi(subcmd,"banlist") == 0) { // sub1 = channel name; sub2 = unused; sub3 = unused - DBIterator *iter = NULL; - DBKey key; - DBData *data; + struct DBIterator *iter = NULL; + union DBKey key; + struct DBData *data; bool isA = pc_has_permission(sd, PC_PERM_HCHSYS_ADMIN)?true:false; if (sub1[0] != '#') { clif->message(fd, msg_fd(fd,1405));// Channel name must start with a '#' @@ -9729,8 +9734,7 @@ const char* atcommand_checkalias(const char *aliasname) { /// AtCommand suggestion void atcommand_get_suggestions(struct map_session_data* sd, const char *name, bool is_atcmd_cmd) { - DBIterator* atcommand_iter; - DBIterator* alias_iter; + struct DBIterator *atcommand_iter, *alias_iter; AtCommandInfo* command_info = NULL; AliasInfo* alias_info = NULL; AtCommandType type = is_atcmd_cmd ? COMMAND_ATCOMMAND : COMMAND_CHARCOMMAND; @@ -10116,7 +10120,7 @@ static inline int atcommand_command_type2idx(AtCommandType type) */ void atcommand_db_load_groups(GroupSettings **groups, struct config_setting_t **commands_, size_t sz) { - DBIterator *iter = db_iterator(atcommand->db); + struct DBIterator *iter = db_iterator(atcommand->db); AtCommandInfo *atcmd; nullpo_retv(groups); @@ -10218,7 +10222,8 @@ bool atcommand_hp_add(char *name, AtCommandFunc func) { /** * @see DBApply */ -int atcommand_db_clear_sub(DBKey key, DBData *data, va_list args) { +int atcommand_db_clear_sub(union DBKey key, struct DBData *data, va_list args) +{ AtCommandInfo *cmd = DB->data2ptr(data); aFree(cmd->at_groups); aFree(cmd->char_groups); diff --git a/src/map/atcommand.h b/src/map/atcommand.h index a4f9afce7..0e7895825 100644 --- a/src/map/atcommand.h +++ b/src/map/atcommand.h @@ -94,8 +94,8 @@ struct atcommand_interface { struct atcmd_binding_data** binding; int binding_count; /* other vars */ - DBMap* db; //name -> AtCommandInfo - DBMap* alias_db; //alias -> AtCommandInfo + struct DBMap *db; //name -> AtCommandInfo + struct DBMap *alias_db; //alias -> AtCommandInfo /** * msg_table[lang_id][msg_id] * Server messages (0-499 reserved for GM commands, 500-999 reserved for others) @@ -135,7 +135,7 @@ struct atcommand_interface { /* */ void (*commands_sub) (struct map_session_data* sd, const int fd, AtCommandType type); void (*cmd_db_clear) (void); - int (*cmd_db_clear_sub) (DBKey key, DBData *data, va_list args); + int (*cmd_db_clear_sub) (union DBKey key, struct DBData *data, va_list args); void (*doload) (void); void (*base_commands) (void); bool (*add) (char *name, AtCommandFunc func, bool replace); diff --git a/src/map/battle.c b/src/map/battle.c index a7a6f4719..09b99aa05 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3512,8 +3512,6 @@ int battle_blewcount_bonus(struct map_session_data *sd, uint16 skill_id) { struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv,int mflag) { int nk; short s_ele = 0; - unsigned int skillratio = 100; //Skill dmg modifiers. - struct map_session_data *sd = NULL; struct status_change *sc; struct Damage ad; @@ -3666,6 +3664,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list ad.damage = status->get_lv(src) * 10 + sstatus->int_; break; default: { + unsigned int skillratio = 100; //Skill dmg modifiers. MATK_ADD( status->get_matk(src, 2) ); #ifdef RENEWAL ad.damage = battle->calc_cardfix(BF_MAGIC, src, target, nk, s_ele, 0, ad.damage, 0, ad.flag); @@ -4276,7 +4275,6 @@ void battle_calc_misc_attack_unknown(struct block_list *src, struct block_list * // FIXME: wflag is undocumented struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv,int wflag) { - unsigned int skillratio = 100; //Skill dmg modifiers. short temp=0; short s_ele, s_ele_; int i, nk; @@ -4775,6 +4773,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list } //End hit/miss calculation if (flag.hit && !flag.infdef) { //No need to do the math for plants + unsigned int skillratio = 100; //Skill dmg modifiers. //Hitting attack //Assuming that 99% of the cases we will not need to check for the flag.rh... we don't. diff --git a/src/map/battleground.c b/src/map/battleground.c index 311690ec3..5231ce3d2 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -171,7 +171,7 @@ int bg_team_leave(struct map_session_data *sd, enum bg_team_leave_type flag) { sprintf(output, "Server : %s has been afk-kicked from the battlefield...", sd->status.name); break; } - clif->bg_message(bgd, 0, "Server", output, strlen(output) + 1); + clif->bg_message(bgd, 0, "Server", output); } if( bgd->logout_event[0] && flag ) @@ -265,21 +265,23 @@ int bg_team_get_id(struct block_list *bl) { return 0; } -bool bg_send_message(struct map_session_data *sd, const char *mes, int len) { +bool bg_send_message(struct map_session_data *sd, const char *mes) +{ struct battleground_data *bgd; nullpo_ret(sd); nullpo_ret(mes); if( sd->bg_id == 0 || (bgd = bg->team_search(sd->bg_id)) == NULL ) return false; // Couldn't send message - clif->bg_message(bgd, sd->bl.id, sd->status.name, mes, len); + clif->bg_message(bgd, sd->bl.id, sd->status.name, mes); return true; } /** * @see DBApply */ -int bg_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) { +int bg_send_xy_timer_sub(union DBKey key, struct DBData *data, va_list ap) +{ struct battleground_data *bgd = DB->data2ptr(data); struct map_session_data *sd; int i; @@ -925,7 +927,8 @@ void do_init_battleground(bool minimal) { /** * @see DBApply */ -int bg_team_db_final(DBKey key, DBData *data, va_list ap) { +int bg_team_db_final(union DBKey key, struct DBData *data, va_list ap) +{ struct battleground_data* bgd = DB->data2ptr(data); HPM->data_store_destroy(&bgd->hdata); diff --git a/src/map/battleground.h b/src/map/battleground.h index bb77db125..4c3d4878f 100644 --- a/src/map/battleground.h +++ b/src/map/battleground.h @@ -102,7 +102,7 @@ struct battleground_interface { struct bg_arena **arena; unsigned char arenas; /* */ - DBMap *team_db; // int bg_id -> struct battleground_data* + struct DBMap *team_db; // int bg_id -> struct battleground_data* unsigned int team_counter; // Next bg_id /* */ void (*init) (bool minimal); @@ -130,11 +130,11 @@ struct battleground_interface { bool (*member_respawn) (struct map_session_data *sd); int (*create) (unsigned short map_index, short rx, short ry, const char *ev, const char *dev); int (*team_get_id) (struct block_list *bl); - bool (*send_message) (struct map_session_data *sd, const char *mes, int len); - int (*send_xy_timer_sub) (DBKey key, DBData *data, va_list ap); + bool (*send_message) (struct map_session_data *sd, const char *mes); + int (*send_xy_timer_sub) (union DBKey key, struct DBData *data, va_list ap); int (*send_xy_timer) (int tid, int64 tick, int id, intptr_t data); int (*afk_timer) (int tid, int64 tick, int id, intptr_t data); - int (*team_db_final) (DBKey key, DBData *data, va_list ap); + int (*team_db_final) (union DBKey key, struct DBData *data, va_list ap); /* */ enum bg_queue_types (*str2teamtype) (const char *str); /* */ diff --git a/src/map/channel.c b/src/map/channel.c index 28ef854da..ee8242b23 100644 --- a/src/map/channel.c +++ b/src/map/channel.c @@ -127,9 +127,8 @@ void channel_delete(struct channel_data *chan) nullpo_retv(chan); if (db_size(chan->users) && !channel->config->closing) { - DBIterator *iter; struct map_session_data *sd; - iter = db_iterator(chan->users); + struct DBIterator *iter = db_iterator(chan->users); for (sd = dbi_first(iter); dbi_exists(iter); sd = dbi_next(iter)) { channel->leave_sub(chan, sd); } @@ -610,7 +609,10 @@ void read_channels_config(void) local_autojoin = 0, ally_autojoin = 0, allow_user_channel_creation = 0, irc_enabled = 0, - irc_autojoin = 0; + irc_autojoin = 0, + irc_flood_protection_rate = 0, + irc_flood_protection_burst = 0, + irc_flood_protection_enabled = 0; if( !libconfig->setting_lookup_string(settings, "map_local_channel_name", &local_name) ) local_name = "map"; @@ -641,58 +643,52 @@ void read_channels_config(void) const char *irc_server, *irc_channel, *irc_nick, *irc_nick_pw; int irc_use_ghost = 0; - if( libconfig->setting_lookup_string(settings, "irc_channel_network", &irc_server) ) { - if( !strstr(irc_server,":") ) { + if (!libconfig->setting_lookup_string(settings, "irc_channel_network", &irc_server)) { + channel->config->irc = false; + ShowWarning("channels.conf : irc channel enabled but irc_channel_network wasn't found, disabling irc channel...\n"); + } else { + char *server = aStrdup(irc_server); + char *port = strchr(server, ':'); + if (port == NULL) { channel->config->irc = false; - ShowWarning("channels.conf : network port wasn't found in 'irc_channel_network', disabling irc channel...\n"); + ShowWarning("channels.conf: network port wasn't found in 'irc_channel_network', disabling irc channel...\n"); + } else if ((size_t)(port-server) > sizeof channel->config->irc_server - 1) { + channel->config->irc = false; + ShowWarning("channels.conf: server name is too long in 'irc_channel_network', disabling irc channel...\n"); } else { - unsigned char d = 0, dlen = strlen(irc_server); - char server[40]; - if (dlen > 39) - dlen = 39; - memset(server, '\0', sizeof(server)); - - for(d = 0; d < dlen; d++) { - if(irc_server[d] == ':') { - memcpy(server, irc_server, d); - safestrncpy(channel->config->irc_server, server, 40); - memcpy(server, &irc_server[d+1], dlen - d - 1); - channel->config->irc_server_port = atoi(server); - break; - } - } + *port = '\0'; + port++; + safestrncpy(channel->config->irc_server, server, sizeof channel->config->irc_server); + channel->config->irc_server_port = atoi(port); } - } else { - channel->config->irc = false; - ShowWarning("channels.conf : irc channel enabled but irc_channel_network wasn't found, disabling irc channel...\n"); + aFree(server); } - if( libconfig->setting_lookup_string(settings, "irc_channel_channel", &irc_channel) ) + if (libconfig->setting_lookup_string(settings, "irc_channel_channel", &irc_channel)) { safestrncpy(channel->config->irc_channel, irc_channel, 50); - else { + } else { channel->config->irc = false; ShowWarning("channels.conf : irc channel enabled but irc_channel_channel wasn't found, disabling irc channel...\n"); } - if( libconfig->setting_lookup_string(settings, "irc_channel_nick", &irc_nick) ) { - if( strcmpi(irc_nick,"Hercules_chSysBot") == 0 ) { + if (libconfig->setting_lookup_string(settings, "irc_channel_nick", &irc_nick)) { + if (strcmpi(irc_nick,"Hercules_chSysBot") == 0) { sprintf(channel->config->irc_nick, "Hercules_chSysBot%d",rnd()%777); - } else + } else { safestrncpy(channel->config->irc_nick, irc_nick, 40); + } } else { channel->config->irc = false; ShowWarning("channels.conf : irc channel enabled but irc_channel_nick wasn't found, disabling irc channel...\n"); } - if( libconfig->setting_lookup_string(settings, "irc_channel_nick_pw", &irc_nick_pw) ) { + if (libconfig->setting_lookup_string(settings, "irc_channel_nick_pw", &irc_nick_pw)) { safestrncpy(channel->config->irc_nick_pw, irc_nick_pw, 30); config_setting_lookup_bool(settings, "irc_channel_use_ghost", &irc_use_ghost); channel->config->irc_use_ghost = irc_use_ghost; } - } libconfig->setting_lookup_bool(settings, "map_local_channel_autojoin", &local_autojoin); libconfig->setting_lookup_bool(settings, "ally_channel_autojoin", &ally_autojoin); libconfig->setting_lookup_bool(settings, "irc_channel_autojoin", &irc_autojoin); - if (local_autojoin) channel->config->local_autojoin = true; if (ally_autojoin) @@ -700,6 +696,26 @@ void read_channels_config(void) if (irc_autojoin) channel->config->irc_autojoin = true; + libconfig->setting_lookup_bool(settings, "irc_flood_protection_enabled", &irc_flood_protection_enabled); + + if (irc_flood_protection_enabled) { + ircbot->flood_protection_enabled = true; + + libconfig->setting_lookup_int(settings, "irc_flood_protection_rate", &irc_flood_protection_rate); + libconfig->setting_lookup_int(settings, "irc_flood_protection_burst", &irc_flood_protection_burst); + + if (irc_flood_protection_rate > 0) + ircbot->flood_protection_rate = irc_flood_protection_rate; + else + ircbot->flood_protection_rate = 1000; + if (irc_flood_protection_burst > 0) + ircbot->flood_protection_burst = irc_flood_protection_burst; + else + ircbot->flood_protection_burst = 3; + } else { + ircbot->flood_protection_enabled = false; + } + libconfig->setting_lookup_bool(settings, "allow_user_channel_creation", &allow_user_channel_creation); if( allow_user_channel_creation ) @@ -814,7 +830,7 @@ int do_init_channel(bool minimal) void do_final_channel(void) { - DBIterator *iter = db_iterator(channel->db); + struct DBIterator *iter = db_iterator(channel->db); struct channel_data *chan; unsigned char i; diff --git a/src/map/channel.h b/src/map/channel.h index ac1c8f0cb..e8696fd90 100644 --- a/src/map/channel.h +++ b/src/map/channel.h @@ -21,12 +21,12 @@ #define MAP_CHANNEL_H #include "common/hercules.h" -#include "common/db.h" #include "common/mmo.h" /** * Declarations **/ +struct DBMap; // common/db.h struct map_session_data; struct guild; @@ -83,8 +83,8 @@ struct channel_data { char name[HCS_NAME_LENGTH]; char password[HCS_NAME_LENGTH]; unsigned char color; - DBMap *users; - DBMap *banned; + struct DBMap *users; + struct DBMap *banned; unsigned int options; unsigned int owner; enum channel_types type; @@ -94,7 +94,7 @@ struct channel_data { struct channel_interface { /* vars */ - DBMap *db; + struct DBMap *db; struct Channel_Config *config; int (*init) (bool minimal); diff --git a/src/map/chat.c b/src/map/chat.c index d60b9bece..df48e1f2c 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -97,7 +97,7 @@ bool chat_createpcchat(struct map_session_data* sd, const char* title, const cha nullpo_ret(title); nullpo_ret(pass); - if( sd->chatID ) + if (sd->chat_id != 0) return false; //Prevent people abusing the chat system by creating multiple chats, as pointed out by End of Exam. [Skotlex] if( sd->state.vending || sd->state.buyingstore ) @@ -142,8 +142,10 @@ bool chat_joinchat(struct map_session_data* sd, int chatid, const char* pass) { nullpo_ret(pass); cd = map->id2cd(chatid); - if( cd == NULL || cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m || sd->state.vending || sd->state.buyingstore || sd->chatID || ((cd->owner->type == BL_NPC) ? cd->users+1 : cd->users) >= cd->limit ) - { + if (cd == NULL || cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m + || sd->state.vending || sd->state.buyingstore || sd->chat_id != 0 + || ((cd->owner->type == BL_NPC) ? cd->users+1 : cd->users) >= cd->limit + ) { clif->joinchatfail(sd,0); // room full return false; } @@ -204,8 +206,8 @@ int chat_leavechat(struct map_session_data* sd, bool kicked) { nullpo_retr(0, sd); - cd = map->id2cd(sd->chatID); - if( cd == NULL ) { + cd = map->id2cd(sd->chat_id); + if (cd == NULL) { pc_setchatid(sd, 0); return 0; } @@ -279,7 +281,7 @@ bool chat_changechatowner(struct map_session_data* sd, const char* nextownername nullpo_ret(sd); nullpo_ret(nextownername); - cd = map->id2cd(sd->chatID); + cd = map->id2cd(sd->chat_id); if (cd == NULL || &sd->bl != cd->owner) return false; @@ -324,7 +326,7 @@ bool chat_changechatstatus(struct map_session_data* sd, const char* title, const nullpo_ret(title); nullpo_ret(pass); - cd = map->id2cd(sd->chatID); + cd = map->id2cd(sd->chat_id); if (cd == NULL || &sd->bl != cd->owner) return false; @@ -352,7 +354,7 @@ bool chat_kickchat(struct map_session_data* sd, const char* kickusername) { nullpo_ret(sd); nullpo_ret(kickusername); - cd = map->id2cd(sd->chatID); + cd = map->id2cd(sd->chat_id); if (cd == NULL || &sd->bl != cd->owner) return false; diff --git a/src/map/chat.h b/src/map/chat.h index 603d8441f..59d61a46e 100644 --- a/src/map/chat.h +++ b/src/map/chat.h @@ -23,8 +23,9 @@ #include "map/map.h" // struct block_list, CHATROOM_TITLE_SIZE #include "common/hercules.h" -#include "common/db.h" +/* Forward Declarations */ +struct DBMap; // common/db.h struct chat_data; struct map_session_data; struct npc_data; @@ -46,7 +47,7 @@ struct chat_data { struct block_list* owner; char npc_event[EVENT_NAME_LENGTH]; /* isn't this a waste? there is a enormous overhead, wouldn't something like skill_blockpc_start be better here? [Ind] */ - DBMap* kick_list; ///< DBMap of users who were kicked from this chat + struct DBMap *kick_list; ///< DBMap of users who were kicked from this chat }; /*===================================== diff --git a/src/map/chrif.c b/src/map/chrif.c index 578942897..52af1137e 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -471,7 +471,8 @@ void chrif_connectack(int fd) { /** * @see DBApply */ -int chrif_reconnect(DBKey key, DBData *data, va_list ap) { +int chrif_reconnect(union DBKey key, struct DBData *data, va_list ap) +{ struct auth_node *node = DB->data2ptr(data); nullpo_ret(node); @@ -681,7 +682,8 @@ void chrif_authfail(int fd) {/* HELLO WORLD. ip in RFIFOL 15 is not being used ( * This can still happen (client times out while waiting for char to confirm auth data) * @see DBApply */ -int auth_db_cleanup_sub(DBKey key, DBData *data, va_list ap) { +int auth_db_cleanup_sub(union DBKey key, struct DBData *data, va_list ap) +{ struct auth_node *node = DB->data2ptr(data); nullpo_retr(1, node); @@ -933,14 +935,14 @@ bool chrif_divorceack(int char_id, int partner_id) { sd->status.partner_id = 0; for(i = 0; i < MAX_INVENTORY; i++) if (sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F) - pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); + pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_DIVORCE); } if( ( sd = map->charid2sd(partner_id) ) != NULL && sd->status.partner_id == char_id ) { sd->status.partner_id = 0; for(i = 0; i < MAX_INVENTORY; i++) if (sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F) - pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); + pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_DIVORCE); } return true; @@ -1617,7 +1619,8 @@ void chrif_del_scdata_single(int account_id, int char_id, short type) /** * @see DBApply */ -int auth_db_final(DBKey key, DBData *data, va_list ap) { +int auth_db_final(union DBKey key, struct DBData *data, va_list ap) +{ struct auth_node *node = DB->data2ptr(data); nullpo_ret(node); diff --git a/src/map/chrif.h b/src/map/chrif.h index 6a5ec36b6..4a1e1da47 100644 --- a/src/map/chrif.h +++ b/src/map/chrif.h @@ -72,7 +72,7 @@ struct chrif_interface { /* */ struct eri *auth_db_ers; //For re-utilizing player login structures. - DBMap* auth_db; // int id -> struct auth_node* + struct DBMap *auth_db; // int id -> struct auth_node* /* */ int packet_len_table[CHRIF_PACKET_LEN_TABLE_SIZE]; int fd; @@ -133,10 +133,10 @@ struct chrif_interface { int (*check_connect_char_server) (int tid, int64 tick, int id, intptr_t data); bool (*auth_logout) (struct map_session_data *sd, enum sd_state state); void (*save_ack) (int fd); - int (*reconnect) (DBKey key, DBData *data, va_list ap); - int (*auth_db_cleanup_sub) (DBKey key, DBData *data, va_list ap); + int (*reconnect) (union DBKey key, struct DBData *data, va_list ap); + int (*auth_db_cleanup_sub) (union DBKey key, struct DBData *data, va_list ap); bool (*char_ask_name_answer) (int acc, const char* player_name, uint16 type, uint16 answer); - int (*auth_db_final) (DBKey key, DBData *data, va_list ap); + int (*auth_db_final) (union DBKey key, struct DBData *data, va_list ap); int (*send_usercount_tochar) (int tid, int64 tick, int id, intptr_t data); int (*auth_db_cleanup) (int tid, int64 tick, int id, intptr_t data); diff --git a/src/map/clif.c b/src/map/clif.c index 07b0b323b..259bc7253 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -319,17 +319,17 @@ int clif_send_sub(struct block_list *bl, va_list ap) { return 0; break; case AREA_WOC: - if (sd->chatID || bl == src_bl) + if (sd->chat_id != 0 || bl == src_bl) return 0; break; case AREA_WOSC: { if (src_bl->type == BL_PC) { const struct map_session_data *ssd = BL_UCCAST(BL_PC, src_bl); - if (ssd != NULL && sd->chatID != 0 && (sd->chatID == ssd->chatID)) + if (ssd != NULL && sd->chat_id != 0 && (sd->chat_id == ssd->chat_id)) return 0; } else if (src_bl->type == BL_NPC) { const struct npc_data *nd = BL_UCCAST(BL_NPC, src_bl); - if (nd != NULL && sd->chatID != 0 && (sd->chatID == nd->chat_id)) + if (nd != NULL && sd->chat_id != 0 && (sd->chat_id == nd->chat_id)) return 0; } } @@ -435,7 +435,7 @@ bool clif_send(const void* buf, int len, struct block_list* bl, enum send_target { const struct chat_data *cd = NULL; if (sd != NULL) { - cd = map->id2cd(sd->chatID); + cd = map->id2cd(sd->chat_id); } else { cd = BL_CCAST(BL_CHAT, bl); } @@ -1049,6 +1049,7 @@ void clif_set_unit_idle(struct block_list* bl, struct map_session_data *tsd, enu #endif #if PACKETVER >= 20150513 p.body = vd->body_style; + safestrncpy(p.name, clif->get_bl_name(bl), NAME_LENGTH); #endif clif->send(&p,sizeof(p),tsd?&tsd->bl:bl,target); @@ -1189,6 +1190,7 @@ void clif_spawn_unit(struct block_list* bl, enum send_target target) { #endif #if PACKETVER >= 20150513 p.body = vd->body_style; + safestrncpy(p.name, clif->get_bl_name(bl), NAME_LENGTH); #endif if( disguised(bl) ) { nullpo_retv(sd); @@ -1280,6 +1282,7 @@ void clif_set_unit_walking(struct block_list* bl, struct map_session_data *tsd, #endif #if PACKETVER >= 20150513 p.body = vd->body_style; + safestrncpy(p.name, clif->get_bl_name(bl), NAME_LENGTH); #endif clif->send(&p,sizeof(p),tsd?&tsd->bl:bl,target); @@ -1954,20 +1957,23 @@ void clif_selllist(struct map_session_data *sd) /// - set npcid of dialog window (0 by default) /// - if set to clear on next mes, clear contents /// - append this text -void clif_scriptmes(struct map_session_data *sd, int npcid, const char *mes) { - int fd = sd->fd; - size_t slen; +void clif_scriptmes(struct map_session_data *sd, int npcid, const char *mes) +{ + int fd, slen; nullpo_retv(sd); nullpo_retv(mes); - slen = strlen(mes) + 9; + + fd = sd->fd; + slen = (int)strlen(mes) + 9; + Assert_retv(slen <= INT16_MAX); sd->state.dialog = 1; WFIFOHEAD(fd, slen); - WFIFOW(fd,0)=0xb4; - WFIFOW(fd,2)=slen; - WFIFOL(fd,4)=npcid; + WFIFOW(fd,0) = 0xb4; + WFIFOW(fd,2) = slen; + WFIFOL(fd,4) = npcid; memcpy(WFIFOP(fd,8), mes, slen-8); WFIFOSET(fd,WFIFOW(fd,2)); } @@ -2069,24 +2075,27 @@ void clif_sendfakenpc(struct map_session_data *sd, int npcid) { /// WARNING: the 'cancel' button closes other windows besides the dialog window and the menu window. /// Which suggests their have intertwined behavior. (probably the mouse targeting) /// TODO investigate behavior of other windows [FlavioJS] -void clif_scriptmenu(struct map_session_data* sd, int npcid, const char* mes) { - int fd; - size_t slen; +void clif_scriptmenu(struct map_session_data *sd, int npcid, const char *mes) +{ + int fd, slen; struct block_list *bl = NULL; nullpo_retv(sd); nullpo_retv(mes); + fd = sd->fd; - slen = strlen(mes) + 9; + slen = (int)strlen(mes) + 9; + Assert_retv(slen <= INT16_MAX); + if (!sd->state.using_fake_npc && (npcid == npc->fake_nd->bl.id || ((bl = map->id2bl(npcid)) != NULL && (bl->m!=sd->bl.m || bl->x<sd->bl.x-AREA_SIZE-1 || bl->x>sd->bl.x+AREA_SIZE+1 || bl->y<sd->bl.y-AREA_SIZE-1 || bl->y>sd->bl.y+AREA_SIZE+1)))) clif->sendfakenpc(sd, npcid); WFIFOHEAD(fd, slen); - WFIFOW(fd,0)=0xb7; - WFIFOW(fd,2)=slen; - WFIFOL(fd,4)=npcid; + WFIFOW(fd,0) = 0xb7; + WFIFOW(fd,2) = slen; + WFIFOL(fd,4) = npcid; memcpy(WFIFOP(fd,8), mes, slen-8); WFIFOSET(fd,WFIFOW(fd,2)); } @@ -3607,26 +3616,29 @@ void clif_createchat(struct map_session_data* sd, int flag) /// 1 = public /// 2 = arena (npc waiting room) /// 3 = PK zone (non-clickable) -void clif_dispchat(struct chat_data* cd, int fd) +void clif_dispchat(struct chat_data *cd, int fd) { unsigned char buf[128]; uint8 type; + int len; - if( cd == NULL || cd->owner == NULL ) + if (cd == NULL || cd->owner == NULL) return; type = (cd->owner->type == BL_PC ) ? (cd->pub) ? 1 : 0 : (cd->owner->type == BL_NPC) ? (cd->limit) ? 2 : 3 : 1; + len = (int)strlen(cd->title); + Assert_retv(len <= INT16_MAX - 17); WBUFW(buf, 0) = 0xd7; - WBUFW(buf, 2) = 17 + strlen(cd->title); + WBUFW(buf, 2) = 17 + len; WBUFL(buf, 4) = cd->owner->id; WBUFL(buf, 8) = cd->bl.id; WBUFW(buf,12) = cd->limit; WBUFW(buf,14) = (cd->owner->type == BL_NPC) ? cd->users+1 : cd->users; WBUFB(buf,16) = type; - memcpy(WBUFP(buf,17), cd->title, strlen(cd->title)); // not zero-terminated + memcpy(WBUFP(buf,17), cd->title, len); // not zero-terminated if( fd ) { WFIFOHEAD(fd,WBUFW(buf,2)); @@ -3644,10 +3656,11 @@ void clif_dispchat(struct chat_data* cd, int fd) /// 1 = public /// 2 = arena (npc waiting room) /// 3 = PK zone (non-clickable) -void clif_changechatstatus(struct chat_data* cd) +void clif_changechatstatus(struct chat_data *cd) { unsigned char buf[128]; uint8 type; + int len; if( cd == NULL || cd->usersd[0] == NULL ) return; @@ -3655,15 +3668,17 @@ void clif_changechatstatus(struct chat_data* cd) type = (cd->owner->type == BL_PC ) ? (cd->pub) ? 1 : 0 : (cd->owner->type == BL_NPC) ? (cd->limit) ? 2 : 3 : 1; + len = (int)strlen(cd->title); + Assert_retv(len <= INT16_MAX - 17); WBUFW(buf, 0) = 0xdf; - WBUFW(buf, 2) = 17 + strlen(cd->title); + WBUFW(buf, 2) = 17 + len; WBUFL(buf, 4) = cd->owner->id; WBUFL(buf, 8) = cd->bl.id; WBUFW(buf,12) = cd->limit; WBUFW(buf,14) = (cd->owner->type == BL_NPC) ? cd->users+1 : cd->users; WBUFB(buf,16) = type; - memcpy(WBUFP(buf,17), cd->title, strlen(cd->title)); // not zero-terminated + memcpy(WBUFP(buf,17), cd->title, len); // not zero-terminated clif->send(buf,WBUFW(buf,2),cd->owner,CHAT); } @@ -4112,8 +4127,8 @@ void clif_getareachar_pc(struct map_session_data* sd,struct map_session_data* ds nullpo_retv(sd); nullpo_retv(dstsd); - if( dstsd->chatID ) { - struct chat_data *cd = map->id2cd(dstsd->chatID); + if (dstsd->chat_id != 0) { + struct chat_data *cd = map->id2cd(dstsd->chat_id); if (cd != NULL && cd->usersd[0] == dstsd) clif->dispchat(cd,sd->fd); } else if( dstsd->state.vending ) @@ -4615,9 +4630,9 @@ int clif_outsight(struct block_list *bl,va_list ap) case BL_PC: if (sd->vd.class_ != INVISIBLE_CLASS) clif->clearunit_single(bl->id,CLR_OUTSIGHT,tsd->fd); - if (sd->chatID) { - struct chat_data *cd = map->id2cd(sd->chatID); - if(cd->usersd[0]==sd) + if (sd->chat_id != 0) { + struct chat_data *cd = map->id2cd(sd->chat_id); + if (cd != NULL && cd->usersd[0] == sd) clif->dispchat(cd,tsd->fd); } if( sd->state.vending ) @@ -5475,23 +5490,24 @@ void clif_status_change(struct block_list *bl,int type,int flag,int tick,int val /// Send message (modified by [Yor]) (ZC_NOTIFY_PLAYERCHAT). /// 008e <packet len>.W <message>.?B -void clif_displaymessage(const int fd, const char* mes) { +void clif_displaymessage(const int fd, const char *mes) +{ nullpo_retv(mes); - if( map->cpsd_active && fd == 0 ) { + if (map->cpsd_active && fd == 0) { ShowInfo("HCP: %s\n",mes); - } else if ( fd > 0 ) { + } else if (fd > 0) { #if PACKETVER == 20141022 /** for some reason game client crashes depending on message pattern (only for this packet) **/ /** so we redirect to ZC_NPC_CHAT **/ clif->messagecolor_self(fd, COLOR_DEFAULT, mes); #else - size_t len; + int len = (int)strnlen(mes, 255); - if ( ( len = strnlen(mes, 255) ) > 0 ) { // don't send a void message (it's not displaying on the client chat). @help can send void line. + if (len > 0) { // don't send a void message (it's not displaying on the client chat). @help can send void line. WFIFOHEAD(fd, 5 + len); WFIFOW(fd,0) = 0x8e; - WFIFOW(fd,2) = 5 + len; // 4 + len + NULL terminate + WFIFOW(fd,2) = 5 + len; // 4 + len + NUL terminate safestrncpy(WFIFOP(fd,4), mes, len + 1); WFIFOSET(fd, 5 + len); } @@ -5513,7 +5529,7 @@ void clif_displaymessage2(const int fd, const char* mes) { line = strtok(message, "\n"); while(line != NULL) { // Limit message to 255+1 characters (otherwise it causes a buffer overflow in the client) - size_t len = strnlen(line, 255); + int len = (int)strnlen(line, 255); if (len > 0) { // don't send a void message (it's not displaying on the client chat). @help can send void line. if( map->cpsd_active && fd == 0 ) { @@ -5567,7 +5583,7 @@ void clif_displaymessage_sprintf(const int fd, const char *mes, ...) { } /// Send broadcast message in yellow or blue without font formatting (ZC_BROADCAST). /// 009a <packet len>.W <message>.?B -void clif_broadcast(struct block_list *bl, const char *mes, size_t len, int type, enum send_target target) +void clif_broadcast(struct block_list *bl, const char *mes, int len, int type, enum send_target target) { int lp = (type&BC_COLOR_MASK) ? 4 : 0; unsigned char *buf = NULL; @@ -5591,38 +5607,38 @@ void clif_broadcast(struct block_list *bl, const char *mes, size_t len, int type * Displays a message on a 'bl' to all it's nearby clients * Used by npc_globalmessage *------------------------------------------*/ -void clif_GlobalMessage(struct block_list* bl, const char* message) { +void clif_GlobalMessage(struct block_list *bl, const char *message) +{ char buf[256]; - size_t len; + int len; nullpo_retv(bl); - if(!message) + if (message == NULL) return; - len = strlen(message)+1; + len = (int)strlen(message)+1; - if (len > sizeof(buf)-8) { - ShowWarning("clif_GlobalMessage: Truncating too long message '%s' (len=%"PRIuS").\n", message, len); - len = sizeof(buf)-8; + if (len > (int)sizeof(buf)-8) { + ShowWarning("clif_GlobalMessage: Truncating too long message '%s' (len=%d).\n", message, len); + len = (int)sizeof(buf)-8; } - WBUFW(buf,0)=0x8d; - WBUFW(buf,2)=len+8; - WBUFL(buf,4)=bl->id; + WBUFW(buf,0) = 0x8d; + WBUFW(buf,2) = len+8; + WBUFL(buf,4) = bl->id; safestrncpy(WBUFP(buf,8),message,len); - clif->send((unsigned char *) buf,WBUFW(buf,2),bl,ALL_CLIENT); - + clif->send(buf,WBUFW(buf,2),bl,ALL_CLIENT); } /// Send broadcast message with font formatting (ZC_BROADCAST2). /// 01c3 <packet len>.W <fontColor>.L <fontType>.W <fontSize>.W <fontAlign>.W <fontY>.W <message>.?B -void clif_broadcast2(struct block_list* bl, const char* mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target) +void clif_broadcast2(struct block_list *bl, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target) { unsigned char *buf; nullpo_retv(mes); - buf = (unsigned char*)aMalloc((16 + len)*sizeof(unsigned char)); + buf = aMalloc((16 + len)*sizeof(unsigned char)); WBUFW(buf,0) = 0x1c3; WBUFW(buf,2) = len + 16; WBUFL(buf,4) = fontColor; @@ -5790,7 +5806,7 @@ void clif_upgrademessage(int fd, int result, int item_id) /// Whisper is transmitted to the destination player (ZC_WHISPER). /// 0097 <packet len>.W <nick>.24B <message>.?B /// 0097 <packet len>.W <nick>.24B <isAdmin>.L <message>.?B (PACKETVER >= 20091104) -void clif_wis_message(int fd, const char *nick, const char *mes, size_t mes_len) +void clif_wis_message(int fd, const char *nick, const char *mes, int mes_len) { #if PACKETVER >= 20091104 struct map_session_data *ssd = NULL; @@ -5799,21 +5815,21 @@ void clif_wis_message(int fd, const char *nick, const char *mes, size_t mes_len) nullpo_retv(mes); #if PACKETVER < 20091104 - WFIFOHEAD(fd, mes_len + NAME_LENGTH + 4); + WFIFOHEAD(fd, mes_len + NAME_LENGTH + 5); WFIFOW(fd,0) = 0x97; - WFIFOW(fd,2) = mes_len + NAME_LENGTH + 4; + WFIFOW(fd,2) = mes_len + NAME_LENGTH + 5; safestrncpy(WFIFOP(fd,4), nick, NAME_LENGTH); - safestrncpy(WFIFOP(fd,28), mes, mes_len); + safestrncpy(WFIFOP(fd,28), mes, mes_len + 1); WFIFOSET(fd,WFIFOW(fd,2)); #else ssd = map->nick2sd(nick); - WFIFOHEAD(fd, mes_len + NAME_LENGTH + 8); + WFIFOHEAD(fd, mes_len + NAME_LENGTH + 9); WFIFOW(fd,0) = 0x97; - WFIFOW(fd,2) = mes_len + NAME_LENGTH + 8; + WFIFOW(fd,2) = mes_len + NAME_LENGTH + 9; safestrncpy(WFIFOP(fd,4), nick, NAME_LENGTH); WFIFOL(fd,28) = (ssd && pc_get_group_level(ssd) == 99) ? 1 : 0; // isAdmin; if nonzero, also displays text above char - safestrncpy(WFIFOP(fd,32), mes, mes_len); + safestrncpy(WFIFOP(fd,32), mes, mes_len + 1); WFIFOSET(fd,WFIFOW(fd,2)); #endif } @@ -6599,7 +6615,7 @@ void clif_party_withdraw(struct party_data* p, struct map_session_data* sd, int /// Party chat message (ZC_NOTIFY_CHAT_PARTY). /// 0109 <packet len>.W <account id>.L <message>.?B -void clif_party_message(struct party_data* p, int account_id, const char* mes, int len) +void clif_party_message(struct party_data *p, int account_id, const char *mes, int len) { struct map_session_data *sd; int i; @@ -6607,22 +6623,24 @@ void clif_party_message(struct party_data* p, int account_id, const char* mes, i nullpo_retv(p); nullpo_retv(mes); - for(i=0; i < MAX_PARTY && !p->data[i].sd;i++); - if(i < MAX_PARTY){ + ARR_FIND(0, MAX_PARTY, i, p->data[i].sd != NULL); + + if (i < MAX_PARTY) { unsigned char buf[1024]; + int maxlen = (int)sizeof(buf) - 9; - if (len > sizeof(buf)-8) { - ShowWarning("clif_party_message: Truncated message '%s' (len=%d, max=%"PRIuS", party_id=%d).\n", - mes, len, sizeof(buf)-8, p->party.party_id); - len = sizeof(buf)-8; + if (len > maxlen) { + ShowWarning("clif_party_message: Truncated message '%s' (len=%d, max=%d, party_id=%d).\n", + mes, len, maxlen, p->party.party_id); + len = maxlen; } sd = p->data[i].sd; - WBUFW(buf,0)=0x109; - WBUFW(buf,2)=len+8; - WBUFL(buf,4)=account_id; - safestrncpy(WBUFP(buf,8), mes, len); - clif->send(buf,len+8,&sd->bl,PARTY); + WBUFW(buf,0) = 0x109; + WBUFW(buf,2) = len+9; + WBUFL(buf,4) = account_id; + safestrncpy(WBUFP(buf,8), mes, len+1); + clif->send(buf, len+9, &sd->bl, PARTY); } } @@ -7934,19 +7952,21 @@ void clif_marriage_proposal(int fd, struct map_session_data *sd, struct map_sess /*========================================== * Displays a message using the guild-chat colors to the specified targets. [Skotlex] *------------------------------------------*/ -void clif_disp_message(struct block_list* src, const char* mes, size_t len, enum send_target target) +void clif_disp_message(struct block_list *src, const char *mes, enum send_target target) { unsigned char buf[256]; + int len; + + nullpo_retv(mes); + nullpo_retv(src); + len = (int)strlen(mes); if (len == 0) return; - nullpo_retv(src); - nullpo_retv(mes); - - if (len > sizeof(buf)-5) { - ShowWarning("clif_disp_message: Truncated message '%s' (len=%"PRIuS", max=%"PRIuS", aid=%d).\n", mes, len, sizeof(buf)-5, src->id); - len = sizeof(buf)-5; + if (len > (int)sizeof(buf)-5) { + ShowWarning("clif_disp_message: Truncated message '%s' (len=%d, max=%"PRIuS", aid=%d).\n", mes, len, sizeof(buf)-5, src->id); + len = (int)sizeof(buf)-5; } WBUFW(buf, 0) = 0x17f; @@ -8200,10 +8220,11 @@ void clif_specialeffect_value(struct block_list* bl, int effect_id, int num, sen */ void clif_messagecolor_self(int fd, uint32 color, const char *msg) { - size_t msg_len; + int msg_len; nullpo_retv(msg); - msg_len = strlen(msg) + 1; + msg_len = (int)strlen(msg) + 1; + Assert_retv(msg_len <= INT16_MAX - 12); WFIFOHEAD(fd,msg_len + 12); WFIFOW(fd,0) = 0x2C1; @@ -8223,17 +8244,19 @@ void clif_messagecolor_self(int fd, uint32 color, const char *msg) * @param color Message color (RGB format: 0xRRGGBB) * @param msg Message text */ -void clif_messagecolor(struct block_list* bl, uint32 color, const char *msg) +void clif_messagecolor(struct block_list *bl, uint32 color, const char *msg) { - size_t msg_len = strlen(msg) + 1; + int msg_len; uint8 buf[256]; nullpo_retv(bl); nullpo_retv(msg); - if (msg_len > sizeof(buf)-12) { - ShowWarning("clif_messagecolor: Truncating too long message '%s' (len=%"PRIuS").\n", msg, msg_len); - msg_len = sizeof(buf)-12; + msg_len = (int)strlen(msg) + 1; + + if (msg_len > (int)sizeof(buf)-12) { + ShowWarning("clif_messagecolor: Truncating too long message '%s' (len=%d).\n", msg, msg_len); + msg_len = (int)sizeof(buf)-12; } WBUFW(buf,0) = 0x2C1; @@ -8313,7 +8336,7 @@ void clif_refresh(struct map_session_data *sd) clif->elemental_info(sd); map->foreachinrange(clif->getareachar,&sd->bl,AREA_SIZE,BL_ALL,sd); clif->weather_check(sd); - if( sd->chatID ) + if (sd->chat_id != 0) chat->leave(sd, false); if( sd->state.vending ) clif->openvending(sd, sd->bl.id, sd->vending); @@ -8553,34 +8576,33 @@ void clif_slide(struct block_list *bl, int x, int y) /// Public chat message (ZC_NOTIFY_CHAT). lordalfa/Skotlex - used by @me as well /// 008d <packet len>.W <id>.L <message>.?B -void clif_disp_overhead(struct block_list *bl, const char* mes) +void clif_disp_overhead(struct block_list *bl, const char *mes) { unsigned char buf[256]; //This should be more than sufficient, the theoretical max is CHAT_SIZE + 8 (pads and extra inserted crap) - size_t len_mes; + int mes_len; nullpo_retv(bl); nullpo_retv(mes); - len_mes = strlen(mes)+1; //Account for \0 + mes_len = (int)strlen(mes)+1; //Account for \0 - if (len_mes > sizeof(buf)-8) { - ShowError("clif_disp_overhead: Message too long (length %"PRIuS")\n", len_mes); - len_mes = sizeof(buf)-8; //Trunk it to avoid problems. + if (mes_len > (int)sizeof(buf)-8) { + ShowError("clif_disp_overhead: Message too long (length %d)\n", mes_len); + mes_len = sizeof(buf)-8; //Trunk it to avoid problems. } // send message to others WBUFW(buf,0) = 0x8d; - WBUFW(buf,2) = len_mes + 8; // len of message + 8 (command+len+id) + WBUFW(buf,2) = mes_len + 8; // len of message + 8 (command+len+id) WBUFL(buf,4) = bl->id; - safestrncpy(WBUFP(buf,8), mes, len_mes); + safestrncpy(WBUFP(buf,8), mes, mes_len); clif->send(buf, WBUFW(buf,2), bl, AREA_CHAT_WOC); // send back message to the speaker - if( bl->type == BL_PC ) { + if (bl->type == BL_PC) { WBUFW(buf,0) = 0x8e; - WBUFW(buf, 2) = len_mes + 4; - safestrncpy(WBUFP(buf,4), mes, len_mes); + WBUFW(buf, 2) = mes_len + 4; + safestrncpy(WBUFP(buf,4), mes, mes_len); clif->send(buf, WBUFW(buf,2), bl, SELF); } - } /*========================== @@ -8864,120 +8886,153 @@ void clif_msgtable_skill(struct map_session_data* sd, uint16 skill_id, int msg_i WFIFOSET(fd, packet_len(0x7e6)); } -/// Validates one global/guild/party/whisper message packet and tries to recognize its components. -/// Returns true if the packet was parsed successfully. -/// Formats: 0 - <packet id>.w <packet len>.w (<name> : <message>).?B 00 -/// 1 - <packet id>.w <packet len>.w <name>.24B <message>.?B 00 -bool clif_process_message(struct map_session_data *sd, int format, const char **name_, size_t *namelen_, const char **message_, size_t *messagelen_) +/** + * Validates and processes a global/guild/party message packet. + * + * @param[in] sd The source character. + * @param[in] packet The packet data. + * @param[out] out_buf The output buffer (must be a valid buffer), that will + * be filled with "Name : Message". + * @param[in] out_buflen The size of out_buf (including the NUL terminator). + * @return a pointer to the "Message" part of out_buf. + * @retval NULL if the validation failed, the messages was a command or the + * character can't send chat messages. out_buf shan't be used. + */ +const char *clif_process_chat_message(struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen) { - const char *text, *name, *message; - unsigned int packetlen, textlen; - size_t namelen, messagelen; - int fd = sd->fd; + const char *srcname = NULL, *srcmessage = NULL, *message = NULL; + int textlen = 0, namelen = 0, messagelen = 0; - nullpo_retr(false, sd); - nullpo_retr(false, name_); - nullpo_retr(false, namelen_); - nullpo_retr(false, message_); - nullpo_retr(false, messagelen_); - - *name_ = NULL; - *namelen_ = 0; - *message_ = NULL; - *messagelen_ = 0; - - packetlen = RFIFOW(fd,2); - // basic structure checks - if (packetlen < 4 + 1) { + nullpo_ret(sd); + nullpo_ret(packet); + nullpo_ret(out_buf); + + if (packet->packet_len < 4 + 1) { // 4-byte header and at least an empty string is expected - ShowWarning("clif_process_message: Received malformed packet from player '%s' (no message data)!\n", sd->status.name); - return false; + ShowWarning("clif_process_chat_message: Received malformed packet from player '%s' (no message data)!\n", sd->status.name); + return NULL; } - text = RFIFOP(fd,4); - textlen = packetlen - 4; +#if PACKETVER >= 20151001 + // Packet doesn't include a NUL terminator + textlen = packet->packet_len - 4; +#else // PACKETVER < 20151001 + // Packet includes a NUL terminator + textlen = packet->packet_len - 4 - 1; +#endif // PACKETVER > 20151001 - // process <name> part of the packet - if( format == 0 ) - {// name and message are separated by ' : ' - // validate name - name = text; - namelen = strnlen(sd->status.name, NAME_LENGTH-1); // name length (w/o zero byte) + // name and message are separated by ' : ' + srcname = packet->message; + namelen = (int)strnlen(sd->status.name, NAME_LENGTH-1); // name length (w/o zero byte) - if( strncmp(name, sd->status.name, namelen) || // the text must start with the speaker's name - name[namelen] != ' ' || name[namelen+1] != ':' || name[namelen+2] != ' ' ) // followed by ' : ' - { - //Hacked message, or infamous "client desynchronize" issue where they pick one char while loading another. - ShowWarning("clif_process_message: Player '%s' sent a message using an incorrect name! Forcing a relog...\n", sd->status.name); - sockt->eof(fd); // Just kick them out to correct it. - return false; - } + if (strncmp(srcname, sd->status.name, namelen) != 0 // the text must start with the speaker's name + || srcname[namelen] != ' ' || srcname[namelen+1] != ':' || srcname[namelen+2] != ' ' // followed by ' : ' + ) { + //Hacked message, or infamous "client desynchronize" issue where they pick one char while loading another. + ShowWarning("clif_process_chat_message: Player '%s' sent a message using an incorrect name! Forcing a relog...\n", sd->status.name); + sockt->eof(sd->fd); // Just kick them out to correct it. + return NULL; + } + + srcmessage = packet->message + namelen + 3; // <name> " : " <message> + messagelen = textlen - namelen - 3; - message = name + namelen + 3; - messagelen = textlen - namelen - 3; // this should be the message length (w/ zero byte included) + if (messagelen >= CHAT_SIZE_MAX || textlen >= out_buflen) { + // messages mustn't be too long + // Normally you can only enter CHATBOX_SIZE-1 letters into the chat box, but Frost Joke / Dazzler's text can be longer. + // Also, the physical size of strings that use multibyte encoding can go multiple times over the chatbox capacity. + // Neither the official client nor server place any restriction on the length of the data in the packet, + // but we'll only allow reasonably long strings here. This also makes sure that they fit into the `chatlog` table. + ShowWarning("clif_process_chat_message: Player '%s' sent a message too long ('%.*s')!\n", sd->status.name, CHATBOX_SIZE-1, srcmessage); + return NULL; } - else - {// name has fixed width - if( textlen < NAME_LENGTH + 1 ) - { - ShowWarning("clif_process_message: Received malformed packet from player '%s' (packet length is incorrect)!\n", sd->status.name); - return false; - } - // validate name - name = text; - namelen = strnlen(name, NAME_LENGTH-1); // name length (w/o zero byte) + safestrncpy(out_buf, packet->message, textlen+1); // [!] packet->message is not necessarily NUL terminated + message = out_buf + namelen + 3; - if (name[namelen] != '\0') { - // only restriction is that the name must be zero-terminated - ShowWarning("clif_process_message: Player '%s' sent an unterminated name!\n", sd->status.name); - return false; - } + if (!pc->process_chat_message(sd, message)) + return NULL; + return message; +} - message = name + NAME_LENGTH; - messagelen = textlen - NAME_LENGTH; // this should be the message length (w/ zero byte included) - } +/** + * Validates and processes a whisper message packet. + * + * @param[in] sd The source character. + * @param[in] packet The packet data. + * @param[out] out_name The parsed target name buffer (must be a valid + * buffer of size NAME_LENGTH). + * @param[out] out_message The output message buffer (must be a valid buffer). + * @param[in] out_messagelen The size of out_message. + * @retval true if the validation succeeded and the message is a chat message. + * @retval false if the validation failed, the messages was a command or the + * character can't send chat messages. out_name and out_message + * shan't be used. + */ +bool clif_process_whisper_message(struct map_session_data *sd, const struct packet_whisper_message *packet, char *out_name, char *out_message, int out_messagelen) +{ + int namelen = 0, messagelen = 0; + + nullpo_retr(false, sd); + nullpo_retr(false, packet); + nullpo_retr(false, out_name); + nullpo_retr(false, out_message); - if (messagelen != strnlen(message, messagelen)+1) { - // the declared length must match real length - ShowWarning("clif_process_message: Received malformed packet from player '%s' (length is incorrect)!\n", sd->status.name); + if (packet->packet_len < NAME_LENGTH + 4 + 1) { + // 4-byte header and at least an empty string is expected + ShowWarning("clif_process_whisper_message: Received malformed packet from player '%s' (packet length is incorrect)!\n", sd->status.name); return false; } - // verify <message> part of the packet - if (message[messagelen-1] != '\0') { - // message must be zero-terminated - ShowWarning("clif_process_message: Player '%s' sent an unterminated message string!\n", sd->status.name); + + // validate name + namelen = (int)strnlen(packet->name, NAME_LENGTH-1); // name length (w/o zero byte) + + if (packet->name[namelen] != '\0') { + // only restriction is that the name must be zero-terminated + ShowWarning("clif_process_whisper_message: Player '%s' sent an unterminated name!\n", sd->status.name); return false; } - if (messagelen > CHAT_SIZE_MAX-1) { + +#if PACKETVER >= 20151001 + // Packet doesn't include a NUL terminator + messagelen = packet->packet_len - NAME_LENGTH - 4; +#else // PACKETVER < 20151001 + // Packet includes a NUL terminator + messagelen = packet->packet_len - NAME_LENGTH - 4 - 1; +#endif // PACKETVER > 20151001 + + if (messagelen >= CHAT_SIZE_MAX || messagelen >= out_messagelen) { // messages mustn't be too long // Normally you can only enter CHATBOX_SIZE-1 letters into the chat box, but Frost Joke / Dazzler's text can be longer. // Also, the physical size of strings that use multibyte encoding can go multiple times over the chatbox capacity. // Neither the official client nor server place any restriction on the length of the data in the packet, // but we'll only allow reasonably long strings here. This also makes sure that they fit into the `chatlog` table. - ShowWarning("clif_process_message: Player '%s' sent a message too long ('%.*s')!\n", sd->status.name, CHAT_SIZE_MAX-1, message); + ShowWarning("clif_process_whisper_message: Player '%s' sent a message too long ('%.*s')!\n", sd->status.name, CHAT_SIZE_MAX-1, packet->message); return false; } - *name_ = name; - *namelen_ = namelen; - *message_ = message; - *messagelen_ = messagelen; + safestrncpy(out_name, packet->name, namelen+1); // [!] packet->name is not NUL terminated + safestrncpy(out_message, packet->message, messagelen+1); // [!] packet->message is not necessarily NUL terminated + + if (!pc->process_chat_message(sd, out_message)) + return false; + return true; } void clif_channel_msg(struct channel_data *chan, struct map_session_data *sd, char *msg) { - DBIterator *iter; + struct DBIterator *iter; struct map_session_data *user; - unsigned short msg_len; + int msg_len; uint32 color; nullpo_retv(chan); nullpo_retv(sd); nullpo_retv(msg); iter = db_iterator(chan->users); - msg_len = strlen(msg) + 1; + msg_len = (int)strlen(msg) + 1; + Assert_retv(msg_len <= INT16_MAX - 12); color = channel->config->colors[chan->color]; WFIFOHEAD(sd->fd,msg_len + 12); @@ -9002,16 +9057,17 @@ void clif_channel_msg(struct channel_data *chan, struct map_session_data *sd, ch void clif_channel_msg2(struct channel_data *chan, char *msg) { - DBIterator *iter; + struct DBIterator *iter; struct map_session_data *user; unsigned char buf[210]; - unsigned short msg_len; + int msg_len; uint32 color; nullpo_retv(chan); nullpo_retv(msg); iter = db_iterator(chan->users); - msg_len = strlen(msg) + 1; + msg_len = (int)strlen(msg) + 1; + Assert_retv(msg_len <= INT16_MAX - 12); color = channel->config->colors[chan->color]; WBUFW(buf,0) = 0x2C1; @@ -9377,7 +9433,7 @@ void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) { if( map->list[sd->bl.m].flag.allowks && !map_flag_ks(sd->bl.m) ) { char output[128]; sprintf(output, "[ Kill Steal Protection Disabled. KS is allowed in this map ]"); - clif->broadcast(&sd->bl, output, strlen(output) + 1, BC_BLUE, SELF); + clif->broadcast(&sd->bl, output, (int)strlen(output) + 1, BC_BLUE, SELF); } map->iwall_get(sd); // Updates Walls Info on this Map to Client @@ -9709,144 +9765,108 @@ int clif_undisguise_timer(int tid, int64 tick, int id, intptr_t data) { return 0; } -void clif_parse_GlobalMessage(int fd, struct map_session_data* sd) __attribute__((nonnull (2))); -/// Validates and processes global messages -/// 008c <packet len>.W <text>.?B (<name> : <message>) 00 (CZ_REQUEST_CHAT) -/// There are various variants of this packet. -void clif_parse_GlobalMessage(int fd, struct map_session_data* sd) +/** + * Validates and processed global messages. + * + * There are various variants of this packet. + * + * @code + * 008c <packet len>.W <text>.?B (<name> : <message>) 00 (CZ_REQUEST_CHAT) + * @endcode + * + * @param fd The incoming file descriptor. + * @param sd The related character. + */ +void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); +void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { - const char *text = RFIFOP(fd,4); - size_t textlen = RFIFOW(fd,2) - 4; - - const char *name = NULL, *message = NULL; - char *fakename = NULL; - size_t namelen, messagelen; + const struct packet_chat_message *packet = NULL; + char full_message[CHAT_SIZE_MAX + NAME_LENGTH + 3 + 1]; + const char *message = NULL; + bool is_fakename = false; + int outlen = 0; - bool is_fake; - - // validate packet and retrieve name and message - if( !clif->process_message(sd, 0, &name, &namelen, &message, &messagelen) ) + packet = RP2PTR(fd); + message = clif->process_chat_message(sd, packet, full_message, sizeof full_message); + if (message == NULL) return; - if( atcommand->exec(fd, sd, message, true) ) - return; + pc->check_supernovice_call(sd, message); - if( !pc->can_talk(sd) ) + if (sd->gcbind != NULL) { + channel->send(sd->gcbind, sd, message); return; - - if( battle_config.min_chat_delay ) { //[Skotlex] - if (DIFF_TICK(sd->cantalk_tick, timer->gettick()) > 0) - return; - sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay; } - if( (sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE ) { - unsigned int next = pc->nextbaseexp(sd); - if( next == 0 ) next = pc->thisbaseexp(sd); - if( next ) { // 0%, 10%, 20%, ... - int percent = (int)( ( (float)sd->status.base_exp/(float)next )*1000. ); - if( (battle_config.snovice_call_type || percent) && ( percent%100 ) == 0 ) {// 10.0%, 20.0%, ..., 90.0% - switch (sd->state.snovice_call_flag) { - case 0: - if( strstr(message, msg_txt(1479)) ) // "Dear angel, can you hear my voice?" - sd->state.snovice_call_flag = 1; - break; - case 1: { - char buf[256]; - snprintf(buf, 256, msg_txt(1480), sd->status.name); - if( strstr(message, buf) ) // "I am %s Super Novice~" - sd->state.snovice_call_flag = 2; - } - break; - case 2: - if( strstr(message, msg_txt(1481)) ) // "Help me out~ Please~ T_T" - sd->state.snovice_call_flag = 3; - break; - case 3: - sc_start(NULL,&sd->bl, status->skill2sc(MO_EXPLOSIONSPIRITS), 100, 17, skill->get_time(MO_EXPLOSIONSPIRITS, 5)); //Lv17-> +50 critical (noted by Poki) [Skotlex] - clif->skill_nodamage(&sd->bl, &sd->bl, MO_EXPLOSIONSPIRITS, 5, 1); // prayer always shows successful Lv5 cast and disregards noskill restrictions - sd->state.snovice_call_flag = 0; - break; - } - } - } + if (sd->fakename[0] != '\0') { + is_fakename = true; + outlen = (int)strlen(sd->fakename) + (int)strlen(message) + 3 + 1; + } else { + outlen = (int)strlen(full_message) + 1; } - pc->update_idle_time(sd, BCIDLE_CHAT); - - if( sd->gcbind ) { - channel->send(sd->gcbind,sd,message); - return; - } else if ( sd->fontcolor && !sd->chatID ) { - char mout[200]; - unsigned char mylen = 1; + if (sd->fontcolor != 0 && sd->chat_id == 0) { uint32 color = 0; - if( sd->disguise == -1 ) { + if (sd->disguise == -1) { sd->fontcolor_tid = timer->add(timer->gettick()+5000, clif->undisguise_timer, sd->bl.id, 0); pc->disguise(sd,sd->status.class_); - if( pc_isdead(sd) ) + if (pc_isdead(sd)) clif->clearunit_single(-sd->bl.id, CLR_DEAD, sd->fd); - if( unit->is_walking(&sd->bl) ) + if (unit->is_walking(&sd->bl)) clif->move(&sd->ud); - } else if ( sd->disguise == sd->status.class_ && sd->fontcolor_tid != INVALID_TIMER ) { + } else if (sd->disguise == sd->status.class_ && sd->fontcolor_tid != INVALID_TIMER) { const struct TimerData *td; - if( (td = timer->get(sd->fontcolor_tid)) ) { + if ((td = timer->get(sd->fontcolor_tid)) != NULL) timer->settick(sd->fontcolor_tid, td->tick+5000); - } } - mylen += snprintf(mout, 200, "%s : %s",sd->fakename[0]?sd->fakename:sd->status.name,message); - color = channel->config->colors[sd->fontcolor - 1]; - WFIFOHEAD(fd,mylen + 12); + WFIFOHEAD(fd, outlen + 12); WFIFOW(fd,0) = 0x2C1; - WFIFOW(fd,2) = mylen + 12; + WFIFOW(fd,2) = outlen + 12; WFIFOL(fd,4) = sd->bl.id; WFIFOL(fd,8) = RGB2BGR(color); - safestrncpy(WFIFOP(fd,12), mout, mylen); + if (is_fakename) + safesnprintf(WFIFOP(fd, 12), outlen, "%s : %s", sd->fakename, message); + else + safestrncpy(WFIFOP(fd, 12), full_message, outlen); clif->send(WFIFOP(fd,0), WFIFOW(fd,2), &sd->bl, AREA_WOS); WFIFOL(fd,4) = -sd->bl.id; - WFIFOSET(fd, mylen + 12); + WFIFOSET(fd, outlen + 12); return; } - /** - * Fake Name Design by FatalEror (bug report #9) - **/ - if( ( is_fake = ( sd->fakename[0] ) ) ) { - fakename = (char*) aMalloc(strlen(sd->fakename)+messagelen+3); - strcpy(fakename, sd->fakename); - strcat(fakename, " : "); - strcat(fakename, message); - textlen = strlen(fakename) + 1; + { + // send message to others + void *buf = aMalloc(8 + outlen); + WBUFW(buf, 0) = 0x8d; + WBUFW(buf, 2) = 8 + outlen; + WBUFL(buf, 4) = sd->bl.id; + if (is_fakename) + safesnprintf(WBUFP(buf, 8), outlen, "%s : %s", sd->fakename, message); + else + safestrncpy(WBUFP(buf, 8), full_message, outlen); + //FIXME: chat has range of 9 only + clif->send(buf, WBUFW(buf, 2), &sd->bl, sd->chat_id != 0 ? CHAT_WOS : AREA_CHAT_WOC); + aFree(buf); } - // send message to others (using the send buffer for temp. storage) - WFIFOHEAD(fd, 8 + textlen); - WFIFOW(fd,0) = 0x8d; - WFIFOW(fd,2) = 8 + textlen; - WFIFOL(fd,4) = sd->bl.id; - safestrncpy(WFIFOP(fd,8), is_fake ? fakename : text, textlen); - //FIXME: chat has range of 9 only - clif->send(WFIFOP(fd,0), WFIFOW(fd,2), &sd->bl, sd->chatID ? CHAT_WOS : AREA_CHAT_WOC); // send back message to the speaker - if( is_fake ) { - WFIFOW(fd,0) = 0x8e; - WFIFOW(fd,2) = textlen + 4; - safestrncpy(WFIFOP(fd,4), fakename, textlen); - aFree(fakename); - } else { - memcpy(WFIFOP(fd,0), RFIFOP(fd,0), RFIFOW(fd,2)); - WFIFOW(fd,0) = 0x8e; - } + WFIFOHEAD(fd, 4 + outlen); + WFIFOW(fd, 0) = 0x8e; + WFIFOW(fd, 2) = 4 + outlen; + if (is_fakename) + safesnprintf(WFIFOP(fd, 4), outlen, "%s : %s", sd->fakename, message); + else + safestrncpy(WFIFOP(fd, 4), full_message, outlen); WFIFOSET(fd, WFIFOW(fd,2)); // Chat logging type 'O' / Global Chat logs->chat(LOG_CHAT_GLOBAL, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message); // trigger listening npcs - map->foreachinrange(npc_chat->sub, &sd->bl, AREA_SIZE, BL_NPC, text, textlen, &sd->bl); + map->foreachinrange(npc_chat->sub, &sd->bl, AREA_SIZE, BL_NPC, full_message, strlen(full_message), &sd->bl); } void clif_parse_MapMove(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); @@ -10119,37 +10139,28 @@ void clif_parse_Restart(int fd, struct map_session_data *sd) { } } -void clif_parse_WisMessage(int fd, struct map_session_data* sd) __attribute__((nonnull (2))); -/// Validates and processes whispered messages (CZ_WHISPER). -/// 0096 <packet len>.W <nick>.24B <message>.?B +/** + * Validates and processes whispered messages (CZ_WHISPER). + * + * @code + * 0096 <packet len>.W <nick>.24B <message>.?B + * @endcode + * + * @param fd The incoming file descriptor. + * @param sd The related character. + */ +void clif_parse_WisMessage(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); void clif_parse_WisMessage(int fd, struct map_session_data* sd) { struct map_session_data* dstsd; int i; - const char *target, *message; - size_t namelen, messagelen; - - // validate packet and retrieve name and message - if( !clif->process_message(sd, 1, &target, &namelen, &message, &messagelen) ) - return; - - if ( atcommand->exec(fd, sd, message, true) ) - return; + char target[NAME_LENGTH], message[CHAT_SIZE_MAX + 1]; + const struct packet_whisper_message *packet = RP2PTR(fd); - // Statuses that prevent the player from whispering - if( !pc->can_talk(sd) ) + if (!clif->process_whisper_message(sd, packet, target, message, sizeof message)) return; - if (battle_config.min_chat_delay) { //[Skotlex] - if (DIFF_TICK(sd->cantalk_tick, timer->gettick()) > 0) { - return; - } - sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay; - } - - pc->update_idle_time(sd, BCIDLE_CHAT); - // Chat logging type 'W' / Whisper logs->chat(LOG_CHAT_WHISPER, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, target, message); @@ -10219,7 +10230,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd) // if there are 'Test' player on an other map-server and 'test' player on this map-server, // and if we ask for 'Test', we must not contact 'test' player // so, we send information to inter-server, which is the only one which decide (and copy correct name). - intif->wis_message(sd, target, message, messagelen); + intif->wis_message(sd, target, message, (int)strlen(message)); return; } @@ -10233,10 +10244,10 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd) } // if player is autotrading - if( dstsd->state.autotrade ) { + if (dstsd->state.autotrade) { char output[256]; sprintf(output, "%s is in autotrade mode and cannot receive whispered messages.", dstsd->status.name); - clif->wis_message(fd, map->wisp_server_name, output, strlen(output) + 1); + clif->wis_message(fd, map->wisp_server_name, output, (int)strlen(output)); return; } @@ -10253,7 +10264,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd) clif->wis_end(fd, 0); // 0: success to send wisper // Normal message - clif->wis_message(dstsd->fd, sd->status.name, message, messagelen); + clif->wis_message(dstsd->fd, sd->status.name, message, (int)strlen(message)); } void clif_parse_Broadcast(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); @@ -10370,7 +10381,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd) return; } - if ( (!sd->npc_id && pc_istrading(sd)) || sd->chatID ) + if ((!sd->npc_id && pc_istrading(sd)) || sd->chat_id != 0) return; //Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex] @@ -10730,10 +10741,10 @@ void clif_noask_sub(struct map_session_data *src, struct map_session_data *targe nullpo_retv(src); // Your request has been rejected by autoreject option. msg = msg_sd(src,392); - clif_disp_onlyself(src, msg, strlen(msg)); + clif_disp_onlyself(src, msg); //Notice that a request was rejected. snprintf(output, 256, msg_sd(target,393+type), src->status.name, 256); - clif_disp_onlyself(target, output, strlen(output)); + clif_disp_onlyself(target, output); } void clif_parse_TradeRequest(int fd,struct map_session_data *sd) __attribute__((nonnull (2))); @@ -10744,7 +10755,7 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd) { t_sd = map->id2sd(RFIFOL(fd,2)); - if(!sd->chatID && pc_cant_act(sd)) + if (sd->chat_id == 0 && pc_cant_act(sd)) return; //You can trade while in a chatroom. // @noask [LuzZza] @@ -11521,7 +11532,7 @@ void clif_parse_OneClick_ItemIdentify(int fd, struct map_session_data *sd) return; if ((n = pc->have_magnifier(sd) ) != INDEX_NOT_FOUND && - pc->delitem(sd, n, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER) == 0) + pc->delitem(sd, n, 1, 0, DELITEM_NORMAL, LOG_TYPE_CONSUME) == 0) skill->identify(sd, idx); } @@ -11949,36 +11960,26 @@ void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd) #endif } -void clif_parse_PartyMessage(int fd, struct map_session_data* sd) __attribute__((nonnull (2))); -/// Validates and processes party messages (CZ_REQUEST_CHAT_PARTY). -/// 0108 <packet len>.W <text>.?B (<name> : <message>) 00 -void clif_parse_PartyMessage(int fd, struct map_session_data* sd) +/** + * Validates and processes party messages (CZ_REQUEST_CHAT_PARTY). + * + * @code + * 0108 <packet len>.W <text>.?B (<name> : <message>) 00 + * @endcode + * + * @param fd The incoming file descriptor. + * @param sd The related character. + */ +void clif_parse_PartyMessage(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); +void clif_parse_PartyMessage(int fd, struct map_session_data *sd) { - const char *text = RFIFOP(fd,4); - int textlen = RFIFOW(fd,2) - 4; - - const char *name, *message; - size_t namelen, messagelen; + const struct packet_chat_message *packet = RP2PTR(fd); + char message[CHAT_SIZE_MAX + NAME_LENGTH + 3 + 1]; - // validate packet and retrieve name and message - if( !clif->process_message(sd, 0, &name, &namelen, &message, &messagelen) ) + if (clif->process_chat_message(sd, packet, message, sizeof message) == NULL) return; - if( atcommand->exec(fd, sd, message, true) ) - return; - - if( !pc->can_talk(sd) ) - return; - - if (battle_config.min_chat_delay) { - if (DIFF_TICK(sd->cantalk_tick, timer->gettick()) > 0) - return; - sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay; - } - - pc->update_idle_time(sd, BCIDLE_CHAT); - - party->send_message(sd, text, textlen); + party->send_message(sd, message); } void clif_parse_PartyChangeLeader(int fd, struct map_session_data* sd) __attribute__((nonnull (2))); @@ -12820,7 +12821,7 @@ bool clif_validate_emblem(const uint8 *emblem, unsigned long emblem_len) { //uint8 b; //uint8 g; //uint8 r; - unsigned int rgb:24; + uint32 rgb:24; } __attribute__((packed)); #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #pragma pack(pop) @@ -13057,39 +13058,29 @@ void clif_parse_GuildExpulsion(int fd,struct map_session_data *sd) { guild->expulsion(sd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOP(fd,14)); } -void clif_parse_GuildMessage(int fd, struct map_session_data* sd) __attribute__((nonnull (2))); -/// Validates and processes guild messages (CZ_GUILD_CHAT). -/// 017e <packet len>.W <text>.?B (<name> : <message>) 00 -void clif_parse_GuildMessage(int fd, struct map_session_data* sd) +/** + * Validates and processes guild messages (CZ_GUILD_CHAT). + * + * @code + * 017e <packet len>.W <text>.?B (<name> : <message>) 00 + * @endcode + * + * @param fd The incoming file descriptor. + * @param sd The related character. + */ +void clif_parse_GuildMessage(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); +void clif_parse_GuildMessage(int fd, struct map_session_data *sd) { - const char *text = RFIFOP(fd,4); - int textlen = RFIFOW(fd,2) - 4; + const struct packet_chat_message *packet = RP2PTR(fd); + char message[CHAT_SIZE_MAX + NAME_LENGTH + 3 + 1]; - const char *name, *message; - size_t namelen, messagelen; - - // validate packet and retrieve name and message - if( !clif->process_message(sd, 0, &name, &namelen, &message, &messagelen) ) - return; - - if( atcommand->exec(fd, sd, message, true) ) + if (clif->process_chat_message(sd, packet, message, sizeof message) == NULL) return; - if( !pc->can_talk(sd) ) - return; - - if (battle_config.min_chat_delay) { - if (DIFF_TICK(sd->cantalk_tick, timer->gettick()) > 0) - return; - sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay; - } - - pc->update_idle_time(sd, BCIDLE_CHAT); - - if( sd->bg_id ) - bg->send_message(sd, text, textlen); + if (sd->bg_id) + bg->send_message(sd, message); else - guild->send_message(sd, text, textlen); + guild->send_message(sd, message); } void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); @@ -13284,7 +13275,7 @@ void clif_parse_GMKick(int fd, struct map_session_data *sd) { case BL_PC: { char command[NAME_LENGTH+6]; - sprintf(command, "%ckick %s", atcommand->at_symbol, status->get_name(target)); + sprintf(command, "%ckick %s", atcommand->at_symbol, clif->get_bl_name(target)); atcommand->exec(fd, sd, command, true); } break; @@ -13299,7 +13290,7 @@ void clif_parse_GMKick(int fd, struct map_session_data *sd) { clif->GM_kickack(sd, 0); return; } - sprintf(command, "/kick %s (%d)", status->get_name(target), status->get_class(target)); + sprintf(command, "/kick %s (%d)", clif->get_bl_name(target), status->get_class(target)); logs->atcommand(sd, command); status_percent_damage(&sd->bl, target, 100, 0, true); // can invalidate 'target' } @@ -14671,7 +14662,7 @@ void clif_Mail_refreshinbox(struct map_session_data *sd) if( md->full ) {// TODO: is this official? char output[100]; sprintf(output, "Inbox is full (Max %d). Delete some mails.", MAIL_MAX_INBOX); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); } } @@ -14709,11 +14700,16 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id) struct mail_message *msg = &sd->mail.inbox.msg[i]; struct item *item = &msg->item; struct item_data *data; - size_t msg_len = strlen(msg->body), len; + int msg_len = (int)strlen(msg->body), len; - if( msg_len == 0 ) { + if (msg_len == 0) { strcpy(msg->body, "(no message)"); - msg_len = strlen(msg->body); + msg_len = (int)strlen(msg->body); + } + + if (msg_len > UINT8_MAX) { + Assert_report(msg_len > UINT8_MAX); + msg_len = UINT8_MAX; } len = 101 + msg_len; @@ -14741,7 +14737,7 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id) } else // no item, set all to zero memset(WFIFOP(fd,80), 0x00, 19); - WFIFOB(fd,99) = (unsigned char)msg_len; + WFIFOB(fd,99) = (uint8)msg_len; safestrncpy(WFIFOP(fd,100), msg->body, msg_len + 1); WFIFOSET(fd,len); @@ -14775,7 +14771,6 @@ void clif_parse_Mail_getattach(int fd, struct map_session_data *sd) { int mail_id = RFIFOL(fd,2); int i; - bool fail = false; if( !chrif->isconnected() ) return; @@ -14799,6 +14794,7 @@ void clif_parse_Mail_getattach(int fd, struct map_session_data *sd) if( sd->mail.inbox.msg[i].item.nameid > 0 ) { struct item_data *data; unsigned int weight; + bool fail = false; if ((data = itemdb->exists(sd->mail.inbox.msg[i].item.nameid)) == NULL) return; @@ -16148,58 +16144,53 @@ void clif_bg_xy_remove(struct map_session_data *sd) /// Notifies clients of a battleground message (ZC_BATTLEFIELD_CHAT). /// 02dc <packet len>.W <account id>.L <name>.24B <message>.?B -void clif_bg_message(struct battleground_data *bgd, int src_id, const char *name, const char *mes, size_t len) +void clif_bg_message(struct battleground_data *bgd, int src_id, const char *name, const char *mes) { struct map_session_data *sd; unsigned char *buf; + int len; nullpo_retv(bgd); nullpo_retv(name); nullpo_retv(mes); - if( !bgd->count || (sd = bg->getavailablesd(bgd)) == NULL ) + + if (!bgd->count || (sd = bg->getavailablesd(bgd)) == NULL) return; + len = (int)strlen(mes); + Assert_retv(len <= INT16_MAX - NAME_LENGTH - 8); buf = (unsigned char*)aMalloc((len + NAME_LENGTH + 8)*sizeof(unsigned char)); WBUFW(buf,0) = 0x2dc; WBUFW(buf,2) = len + NAME_LENGTH + 8; WBUFL(buf,4) = src_id; memcpy(WBUFP(buf,8), name, NAME_LENGTH); - memcpy(WBUFP(buf,32), mes, len); + memcpy(WBUFP(buf,32), mes, len); // [!] no NUL terminator clif->send(buf,WBUFW(buf,2), &sd->bl, BG); aFree(buf); } -void clif_parse_BattleChat(int fd, struct map_session_data* sd) __attribute__((nonnull (2))); -/// Validates and processes battlechat messages [pakpil] (CZ_BATTLEFIELD_CHAT). -/// 0x2db <packet len>.W <text>.?B (<name> : <message>) 00 -void clif_parse_BattleChat(int fd, struct map_session_data* sd) +/** + * Validates and processes battlechat messages [pakpil] (CZ_BATTLEFIELD_CHAT). + * + * @code + * 0x2db <packet len>.W <text>.?B (<name> : <message>) 00 + * @endcode + * + * @param fd The incoming file descriptor. + * @param sd The related character. + */ +void clif_parse_BattleChat(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); +void clif_parse_BattleChat(int fd, struct map_session_data *sd) { - const char *text = RFIFOP(fd,4); - int textlen = RFIFOW(fd,2) - 4; - - const char *name, *message; - size_t namelen, messagelen; - - if( !clif->process_message(sd, 0, &name, &namelen, &message, &messagelen) ) - return; - - if( atcommand->exec(fd, sd, message, true) ) - return; + const struct packet_chat_message *packet = RP2PTR(fd); + char message[CHAT_SIZE_MAX + NAME_LENGTH + 3 + 1]; - if( !pc->can_talk(sd) ) + if (clif->process_chat_message(sd, packet, message, sizeof message) == NULL) return; - if( battle_config.min_chat_delay ) { - if( DIFF_TICK(sd->cantalk_tick, timer->gettick()) > 0 ) - return; - sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay; - } - - pc->update_idle_time(sd, BCIDLE_CHAT); - - bg->send_message(sd, text, textlen); + bg->send_message(sd, message); } /// Notifies client of a battleground score change (ZC_BATTLEFIELD_NOTIFY_POINT). @@ -17694,26 +17685,27 @@ void clif_partytickack(struct map_session_data* sd, bool flag) { WFIFOSET(sd->fd, packet_len(0x2c9)); } -void clif_ShowScript(struct block_list* bl, const char* message) { +void clif_ShowScript(struct block_list *bl, const char *message) +{ char buf[256]; - size_t len; + int len; nullpo_retv(bl); - if(!message) + if (message == NULL) return; - len = strlen(message)+1; + len = (int)strlen(message)+1; - if (len > sizeof(buf)-8) { - ShowWarning("clif_ShowScript: Truncating too long message '%s' (len=%"PRIuS").\n", message, len); - len = sizeof(buf)-8; + if (len > (int)sizeof(buf)-8) { + ShowWarning("clif_ShowScript: Truncating too long message '%s' (len=%d).\n", message, len); + len = (int)sizeof(buf)-8; } - WBUFW(buf,0)=0x8b3; - WBUFW(buf,2)=len+8; - WBUFL(buf,4)=bl->id; + WBUFW(buf,0) = 0x8b3; + WBUFW(buf,2) = len+8; + WBUFL(buf,4) = bl->id; safestrncpy(WBUFP(buf,8),message,len); - clif->send((unsigned char *) buf,WBUFW(buf,2),bl,ALL_CLIENT); + clif->send(buf,WBUFW(buf,2),bl,ALL_CLIENT); } void clif_status_change_end(struct block_list *bl, int tid, enum send_target target, int type) { @@ -17808,7 +17800,6 @@ void clif_parse_bgqueue_checkstate(int fd, struct map_session_data *sd) { const struct packet_bgqueue_checkstate *p = RP2PTR(fd); - nullpo_retv(sd); if (sd->bg_queue.arena && sd->bg_queue.type) { clif->bgqueue_update_info(sd,sd->bg_queue.arena->id,bg->id2pos(sd->bg_queue.arena->queue_id,sd->status.account_id)); } else { @@ -18059,7 +18050,7 @@ void clif_show_modifiers (struct map_session_data *sd) { snprintf(output,128,"Base EXP : %d%% | Base Drop: %d%% | Base Death Penalty: %d%%", sd->status.mod_exp,sd->status.mod_drop,sd->status.mod_death); - clif->broadcast2(&sd->bl,output, strlen(output) + 1, 0xffbc90, 0x190, 12, 0, 0, SELF); + clif->broadcast2(&sd->bl, output, (int)strlen(output) + 1, 0xffbc90, 0x190, 12, 0, 0, SELF); } } @@ -18404,7 +18395,7 @@ void clif_parse_RouletteGenerate(int fd, struct map_session_data* sd) { it.nameid = clif->rd.nameid[stage][0]; it.identify = 1; - pc->additem(sd, &it, clif->rd.qty[stage][0], LOG_TYPE_OTHER);/** TODO maybe a new log type for roulette items? **/ + pc->additem(sd, &it, clif->rd.qty[stage][0], LOG_TYPE_ROULETTE);/** TODO maybe a new log type for roulette items? **/ sd->roulette.stage = 0; result = GENERATE_ROULETTE_LOSING; @@ -18439,7 +18430,7 @@ void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) { it.nameid = clif->rd.nameid[sd->roulette.prizeStage][sd->roulette.prizeIdx]; it.identify = 1; - switch (pc->additem(sd, &it, clif->rd.qty[sd->roulette.prizeStage][sd->roulette.prizeIdx], LOG_TYPE_OTHER)) { + switch (pc->additem(sd, &it, clif->rd.qty[sd->roulette.prizeStage][sd->roulette.prizeIdx], LOG_TYPE_ROULETTE)) { case 0: p.Result = RECV_ITEM_SUCCESS; sd->roulette.claimPrize = false; @@ -18760,6 +18751,22 @@ void clif_selectcart(struct map_session_data *sd) #endif } +/** + * Returns the name of the given bl, in a client-friendly format. + * + * @param bl The requested bl. + * @return The bl's name (guaranteed to be non-NULL). + */ +const char *clif_get_bl_name(const struct block_list *bl) +{ + const char *name = status->get_name(bl); + + if (name == NULL) + return "Unknown"; + + return name; +} + /* */ unsigned short clif_decrypt_cmd( int cmd, struct map_session_data *sd ) { if( sd ) { @@ -19346,7 +19353,8 @@ void clif_defaults(void) { clif->message = clif_displaymessage; clif->messageln = clif_displaymessage2; clif->messages = clif_displaymessage_sprintf; - clif->process_message = clif_process_message; + clif->process_chat_message = clif_process_chat_message; + clif->process_whisper_message = clif_process_whisper_message; clif->wisexin = clif_wisexin; clif->wisall = clif_wisall; clif->PMIgnoreList = clif_PMIgnoreList; @@ -19829,4 +19837,5 @@ void clif_defaults(void) { clif->pHotkeyRowShift = clif_parse_HotkeyRowShift; clif->dressroom_open = clif_dressroom_open; clif->pOneClick_ItemIdentify = clif_parse_OneClick_ItemIdentify; + clif->get_bl_name = clif_get_bl_name; } diff --git a/src/map/clif.h b/src/map/clif.h index ac0191210..4d22fd4af 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -60,7 +60,7 @@ struct view_data; **/ #define packet_len(cmd) packet_db[cmd].len #define clif_menuskill_clear(sd) ((sd)->menuskill_id = (sd)->menuskill_val = (sd)->menuskill_val2 = 0) -#define clif_disp_onlyself(sd,mes,len) clif->disp_message( &(sd)->bl, (mes), (len), SELF ) +#define clif_disp_onlyself(sd, mes) clif->disp_message(&(sd)->bl, (mes), SELF) #define MAX_ROULETTE_LEVEL 7 /** client-defined value **/ #define MAX_ROULETTE_COLUMNS 9 /** client-defined value **/ #define RGB2BGR(c) (((c) & 0x0000FF) << 16 | ((c) & 0x00FF00) | ((c) & 0xFF0000) >> 16) @@ -841,11 +841,11 @@ struct clif_interface { void (*clearchat) (struct chat_data *cd,int fd); void (*leavechat) (struct chat_data* cd, struct map_session_data* sd, bool flag); void (*changechatstatus) (struct chat_data* cd); - void (*wis_message) (int fd, const char* nick, const char* mes, size_t mes_len); + void (*wis_message) (int fd, const char *nick, const char *mes, int mes_len); void (*wis_end) (int fd, int flag); - void (*disp_message) (struct block_list* src, const char* mes, size_t len, enum send_target target); - void (*broadcast) (struct block_list* bl, const char* mes, size_t len, int type, enum send_target target); - void (*broadcast2) (struct block_list* bl, const char* mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target); + void (*disp_message) (struct block_list *src, const char *mes, enum send_target target); + void (*broadcast) (struct block_list *bl, const char *mes, int len, int type, enum send_target target); + void (*broadcast2) (struct block_list *bl, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target); void (*messagecolor_self) (int fd, uint32 color, const char *msg); void (*messagecolor) (struct block_list* bl, uint32 color, const char* msg); void (*disp_overhead) (struct block_list *bl, const char* mes); @@ -856,7 +856,8 @@ struct clif_interface { void (*messageln) (const int fd, const char* mes); /* message+s(printf) */ void (*messages) (const int fd, const char *mes, ...) __attribute__((format(printf, 2, 3))); - bool (*process_message) (struct map_session_data *sd, int format, const char **name_, size_t *namelen_, const char **message_, size_t *messagelen_); + const char *(*process_chat_message) (struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen); + bool (*process_whisper_message) (struct map_session_data *sd, const struct packet_whisper_message *packet, char *out_name, char *out_message, int out_messagelen); void (*wisexin) (struct map_session_data *sd,int type,int flag); void (*wisall) (struct map_session_data *sd,int type,int flag); void (*PMIgnoreList) (struct map_session_data* sd); @@ -942,7 +943,7 @@ struct clif_interface { void (*bg_hp) (struct map_session_data *sd); void (*bg_xy) (struct map_session_data *sd); void (*bg_xy_remove) (struct map_session_data *sd); - void (*bg_message) (struct battleground_data *bgd, int src_id, const char *name, const char *mes, size_t len); + void (*bg_message) (struct battleground_data *bgd, int src_id, const char *name, const char *mes); void (*bg_updatescore) (int16 m); void (*bg_updatescore_single) (struct map_session_data *sd); void (*sendbgemblem_area) (struct map_session_data *sd); @@ -1334,8 +1335,10 @@ struct clif_interface { void (*dressroom_open) (struct map_session_data *sd, int view); void (*pOneClick_ItemIdentify) (int fd,struct map_session_data *sd); /* Cart Deco */ - void(*selectcart) (struct map_session_data *sd); - void(*pSelectCart) (int fd, struct map_session_data *sd); + void (*selectcart) (struct map_session_data *sd); + void (*pSelectCart) (int fd, struct map_session_data *sd); + + const char *(*get_bl_name) (const struct block_list *bl); }; #ifdef HERCULES_CORE diff --git a/src/map/duel.c b/src/map/duel.c index c658ea3e3..64991d39c 100644 --- a/src/map/duel.c +++ b/src/map/duel.c @@ -73,7 +73,7 @@ static int duel_showinfo_sub(struct map_session_data* sd, va_list va) if (sd->duel_group != ssd->duel_group) return 0; sprintf(output, " %d. %s", ++(*p), sd->status.name); - clif_disp_onlyself(ssd, output, strlen(output)); + clif_disp_onlyself(ssd, output); return 1; } @@ -93,7 +93,7 @@ void duel_showinfo(const unsigned int did, struct map_session_data* sd) { duel->list[did].members_count, duel->list[did].members_count + duel->list[did].invites_count); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); map->foreachpc(duel_showinfo_sub, sd, &p); } @@ -113,7 +113,7 @@ int duel_create(struct map_session_data* sd, const unsigned int maxpl) { duel->list[i].max_players_limit = maxpl; safestrncpy(output, msg_sd(sd,372), sizeof(output)); // " -- Duel has been created (@invite/@leave) --" - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); clif->map_property(sd, MAPPROPERTY_FREEPVPZONE); clif->maptypeproperty2(&sd->bl,SELF); @@ -127,14 +127,14 @@ void duel_invite(const unsigned int did, struct map_session_data* sd, struct map nullpo_retv(target_sd); // " -- Player %s invites %s to duel --" sprintf(output, msg_sd(sd,373), sd->status.name, target_sd->status.name); - clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS); + clif->disp_message(&sd->bl, output, DUEL_WOS); target_sd->duel_invite = did; duel->list[did].invites_count++; // "Blue -- Player %s invites you to PVP duel (@accept/@reject) --" sprintf(output, msg_sd(target_sd,374), sd->status.name); - clif->broadcast(&target_sd->bl, output, strlen(output)+1, BC_BLUE, SELF); + clif->broadcast(&target_sd->bl, output, (int)strlen(output)+1, BC_BLUE, SELF); } static int duel_leave_sub(struct map_session_data* sd, va_list va) @@ -152,7 +152,7 @@ void duel_leave(const unsigned int did, struct map_session_data* sd) { nullpo_retv(sd); // " <- Player %s has left duel --" sprintf(output, msg_sd(sd,375), sd->status.name); - clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS); + clif->disp_message(&sd->bl, output, DUEL_WOS); duel->list[did].members_count--; if(duel->list[did].members_count == 0) { @@ -177,7 +177,7 @@ void duel_accept(const unsigned int did, struct map_session_data* sd) { // " -> Player %s has accepted duel --" sprintf(output, msg_sd(sd,376), sd->status.name); - clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS); + clif->disp_message(&sd->bl, output, DUEL_WOS); clif->map_property(sd, MAPPROPERTY_FREEPVPZONE); clif->maptypeproperty2(&sd->bl,SELF); @@ -189,7 +189,7 @@ void duel_reject(const unsigned int did, struct map_session_data* sd) { nullpo_retv(sd); // " -- Player %s has rejected duel --" sprintf(output, msg_sd(sd,377), sd->status.name); - clif->disp_message(&sd->bl, output, strlen(output), DUEL_WOS); + clif->disp_message(&sd->bl, output, DUEL_WOS); duel->list[did].invites_count--; sd->duel_invite = 0; diff --git a/src/map/guild.c b/src/map/guild.c index 13acfc0db..1929808ca 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -178,7 +178,7 @@ struct guild* guild_search(int guild_id) struct guild* guild_searchname(char* str) { struct guild* g; - DBIterator *iter = db_iterator(guild->db); + struct DBIterator *iter = db_iterator(guild->db); nullpo_retr(NULL, str); for( g = dbi_first(iter); dbi_exists(iter); g = dbi_next(iter) ) @@ -201,7 +201,7 @@ struct guild_castle* guild_castle_search(int gcid) struct guild_castle* guild_mapindex2gc(short map_index) { struct guild_castle* gc; - DBIterator *iter = db_iterator(guild->castle_db); + struct DBIterator *iter = db_iterator(guild->castle_db); for( gc = dbi_first(iter); dbi_exists(iter); gc = dbi_next(iter) ) { @@ -282,7 +282,8 @@ void guild_makemember(struct guild_member *m,struct map_session_data *sd) * Server cache to be flushed to inter the Guild EXP * @see DBApply */ -int guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) { +int guild_payexp_timer_sub(union DBKey key, struct DBData *data, va_list ap) +{ int i; struct guild_expcache *c; struct guild *g; @@ -318,7 +319,7 @@ int guild_payexp_timer(int tid, int64 tick, int id, intptr_t data) { * Taken from party_send_xy_timer_sub. [Skotlex] * @see DBApply */ -int guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) +int guild_send_xy_timer_sub(union DBKey key, struct DBData *data, va_list ap) { struct guild *g = DB->data2ptr(data); int i; @@ -423,7 +424,7 @@ int guild_npc_request_info(int guild_id,const char *event) if( event && *event ) { struct eventlist *ev; - DBData prev; + struct DBData prev; ev=(struct eventlist *)aCalloc(sizeof(struct eventlist),1); memcpy(ev->name,event,strlen(event)); //The one in the db (if present) becomes the next event from this. @@ -481,7 +482,7 @@ int guild_recv_info(const struct guild *sg) { struct guild *g,before; int i,bm,m; - DBData data; + struct DBData data; struct map_session_data *sd; bool guild_new = false; struct channel_data *aChSysSave = NULL; @@ -1059,14 +1060,15 @@ int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int onlin /*==================================================== * Send a message to whole guild *---------------------------------------------------*/ -int guild_send_message(struct map_session_data *sd,const char *mes,int len) +int guild_send_message(struct map_session_data *sd, const char *mes) { + int len = (int)strlen(mes); nullpo_ret(sd); - if(sd->status.guild_id==0) + if (sd->status.guild_id == 0) return 0; - intif->guild_message(sd->status.guild_id,sd->status.account_id,mes,len); - guild->recv_message(sd->status.guild_id,sd->status.account_id,mes,len); + intif->guild_message(sd->status.guild_id, sd->status.account_id, mes, len); + guild->recv_message(sd->status.guild_id, sd->status.account_id, mes, len); // Chat logging type 'G' / Guild Chat logs->chat(LOG_CHAT_GUILD, sd->status.guild_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes); @@ -1224,7 +1226,7 @@ int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data) } } {// update guardians (mobs) - DBIterator* iter = db_iterator(guild->castle_db); + struct DBIterator *iter = db_iterator(guild->castle_db); struct guild_castle* gc; for( gc = (struct guild_castle*)dbi_first(iter) ; dbi_exists(iter); gc = (struct guild_castle*)dbi_next(iter) ) { @@ -1262,7 +1264,7 @@ int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data) /** * @see DBCreateData */ -DBData create_expcache(DBKey key, va_list args) +struct DBData create_expcache(union DBKey key, va_list args) { struct guild_expcache *c; struct map_session_data *sd = va_arg(args, struct map_session_data*); @@ -1720,7 +1722,7 @@ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id * Notification for the guild disbanded * @see DBApply */ -int guild_broken_sub(DBKey key, DBData *data, va_list ap) +int guild_broken_sub(union DBKey key, struct DBData *data, va_list ap) { struct guild *g = DB->data2ptr(data); int guild_id=va_arg(ap,int); @@ -1746,7 +1748,7 @@ int guild_broken_sub(DBKey key, DBData *data, va_list ap) * Invoked on Castles when a guild is broken. [Skotlex] * @see DBApply */ -int castle_guild_broken_sub(DBKey key, DBData *data, va_list ap) +int castle_guild_broken_sub(union DBKey key, struct DBData *data, va_list ap) { struct guild_castle *gc = DB->data2ptr(data); int guild_id = va_arg(ap, int); @@ -1827,7 +1829,7 @@ int guild_gm_change(int guild_id, struct map_session_data *sd) return 0; //Notify servers that master has changed. - intif->guild_change_gm(guild_id, sd->status.name, strlen(sd->status.name)+1); + intif->guild_change_gm(guild_id, sd->status.name, (int)strlen(sd->status.name)+1); return 1; } @@ -1955,7 +1957,7 @@ void guild_castle_map_init(void) if (num > 0) { struct guild_castle* gc = NULL; int *castle_ids, *cursor; - DBIterator* iter = NULL; + struct DBIterator *iter = NULL; CREATE(castle_ids, int, num); cursor = castle_ids; @@ -2153,7 +2155,7 @@ int guild_checkcastles(struct guild *g) { int nb_cas = 0; struct guild_castle* gc = NULL; - DBIterator *iter = db_iterator(guild->castle_db); + struct DBIterator *iter = db_iterator(guild->castle_db); for (gc = dbi_first(iter); dbi_exists(iter); gc = dbi_next(iter)) { if (gc->guild_id == g->guild_id) { @@ -2222,7 +2224,8 @@ void guild_flag_remove(struct npc_data *nd) { /** * @see DBApply */ -int eventlist_db_final(DBKey key, DBData *data, va_list ap) { +int eventlist_db_final(union DBKey key, struct DBData *data, va_list ap) +{ struct eventlist *next = NULL; struct eventlist *current = DB->data2ptr(data); while (current != NULL) { @@ -2236,7 +2239,8 @@ int eventlist_db_final(DBKey key, DBData *data, va_list ap) { /** * @see DBApply */ -int guild_expcache_db_final(DBKey key, DBData *data, va_list ap) { +int guild_expcache_db_final(union DBKey key, struct DBData *data, va_list ap) +{ ers_free(guild->expcache_ers, DB->data2ptr(data)); return 0; } @@ -2244,7 +2248,8 @@ int guild_expcache_db_final(DBKey key, DBData *data, va_list ap) { /** * @see DBApply */ -int guild_castle_db_final(DBKey key, DBData *data, va_list ap) { +int guild_castle_db_final(union DBKey key, struct DBData *data, va_list ap) +{ struct guild_castle* gc = DB->data2ptr(data); if( gc->temp_guardians ) aFree(gc->temp_guardians); @@ -2283,8 +2288,9 @@ void do_init_guild(bool minimal) { timer->add_interval(timer->gettick()+GUILD_SEND_XY_INVERVAL,guild->send_xy_timer,0,0,GUILD_SEND_XY_INVERVAL); } -void do_final_guild(void) { - DBIterator *iter = db_iterator(guild->db); +void do_final_guild(void) +{ + struct DBIterator *iter = db_iterator(guild->db); struct guild *g; for( g = dbi_first(iter); dbi_exists(iter); g = dbi_next(iter) ) { diff --git a/src/map/guild.h b/src/map/guild.h index cd796adb3..4fe7106d3 100644 --- a/src/map/guild.h +++ b/src/map/guild.h @@ -71,10 +71,10 @@ struct guild_interface { void (*init) (bool minimal); void (*final) (void); /* */ - DBMap* db; // int guild_id -> struct guild* - DBMap* castle_db; // int castle_id -> struct guild_castle* - DBMap* expcache_db; // int char_id -> struct guild_expcache* - DBMap* infoevent_db; // int guild_id -> struct eventlist* + struct DBMap *db; // int guild_id -> struct guild* + struct DBMap *castle_db; // int castle_id -> struct guild_castle* + struct DBMap *expcache_db; // int char_id -> struct guild_expcache* + struct DBMap *infoevent_db; // int guild_id -> struct eventlist* /* */ struct eri *expcache_ers; //For handling of guild exp payment. /* */ @@ -135,7 +135,7 @@ struct guild_interface { int (*notice_changed) (int guild_id,const char *mes1,const char *mes2); int (*change_emblem) (struct map_session_data *sd,int len,const char *data); int (*emblem_changed) (int len,int guild_id,int emblem_id,const char *data); - int (*send_message) (struct map_session_data *sd,const char *mes,int len); + int (*send_message) (struct map_session_data *sd, const char *mes); int (*recv_message) (int guild_id,int account_id,const char *mes,int len); int (*send_dot_remove) (struct map_session_data *sd); int (*skillupack) (int guild_id,uint16 skill_id,int account_id); @@ -166,15 +166,15 @@ struct guild_interface { struct map_session_data *(*sd_check) (int guild_id, int account_id, int char_id); bool (*read_guildskill_tree_db) (char* split[], int columns, int current); bool (*read_castledb) (char* str[], int columns, int current); - int (*payexp_timer_sub) (DBKey key, DBData *data, va_list ap); - int (*send_xy_timer_sub) (DBKey key, DBData *data, va_list ap); + int (*payexp_timer_sub) (union DBKey key, struct DBData *data, va_list ap); + int (*send_xy_timer_sub) (union DBKey key, struct DBData *data, va_list ap); int (*send_xy_timer) (int tid, int64 tick, int id, intptr_t data); - DBData (*create_expcache) (DBKey key, va_list args); - int (*eventlist_db_final) (DBKey key, DBData *data, va_list ap); - int (*expcache_db_final) (DBKey key, DBData *data, va_list ap); - int (*castle_db_final) (DBKey key, DBData *data, va_list ap); - int (*broken_sub) (DBKey key, DBData *data, va_list ap); - int (*castle_broken_sub) (DBKey key, DBData *data, va_list ap); + struct DBData (*create_expcache) (union DBKey key, va_list args); + int (*eventlist_db_final) (union DBKey key, struct DBData *data, va_list ap); + int (*expcache_db_final) (union DBKey key, struct DBData *data, va_list ap); + int (*castle_db_final) (union DBKey key, struct DBData *data, va_list ap); + int (*broken_sub) (union DBKey key, struct DBData *data, va_list ap); + int (*castle_broken_sub) (union DBKey key, struct DBData *data, va_list ap); void (*makemember) (struct guild_member *m,struct map_session_data *sd); int (*check_member) (const struct guild *g); int (*get_alliance_count) (struct guild *g,int flag); diff --git a/src/map/homunculus.c b/src/map/homunculus.c index bda8fd9e6..66cce23e6 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -391,7 +391,7 @@ bool homunculus_levelup(struct homun_data *hd) { growth_max_hp, growth_max_sp, growth_str/10.0, growth_agi/10.0, growth_vit/10.0, growth_int/10.0, growth_dex/10.0, growth_luk/10.0); - clif_disp_onlyself(hd->master,output,strlen(output)); + clif_disp_onlyself(hd->master, output); } return true; } diff --git a/src/map/instance.c b/src/map/instance.c index a6700d486..fa2cfec16 100644 --- a/src/map/instance.c +++ b/src/map/instance.c @@ -551,7 +551,7 @@ void instance_destroy(int instance_id) { struct party_data *p = NULL; struct guild *g = NULL; short *iptr = NULL; - int type, j; + int type; unsigned int now = (unsigned int)time(NULL); if( !instance->valid(instance_id) ) @@ -596,9 +596,10 @@ void instance_destroy(int instance_id) { } if( iptr != NULL ) { - ARR_FIND(0, *icptr, j, iptr[j] == instance_id); - if( j != *icptr ) - iptr[j] = -1; + int i; + ARR_FIND(0, *icptr, i, iptr[i] == instance_id); + if (i != *icptr) + iptr[i] = -1; } if (instance->list[instance_id].map) { diff --git a/src/map/intif.c b/src/map/intif.c index 7d2493d46..2d6d39406 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -150,7 +150,7 @@ int intif_rename(struct map_session_data *sd, int type, const char *name) } // GM Send a message -int intif_broadcast(const char* mes, size_t len, int type) +int intif_broadcast(const char *mes, int len, int type) { int lp = (type&BC_COLOR_MASK) ? 4 : 0; @@ -182,7 +182,7 @@ int intif_broadcast(const char* mes, size_t len, int type) return 0; } -int intif_broadcast2(const char* mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY) +int intif_broadcast2(const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY) { nullpo_ret(mes); Assert_ret(len < 32000); @@ -222,7 +222,7 @@ int intif_main_message(struct map_session_data* sd, const char* message) snprintf( output, sizeof(output), msg_txt(386), sd->status.name, message ); // send the message using the inter-server broadcast service - intif->broadcast2( output, strlen(output) + 1, 0xFE000000, 0, 0, 0, 0 ); + intif->broadcast2(output, (int)strlen(output) + 1, 0xFE000000, 0, 0, 0, 0); // log the chat message logs->chat( LOG_CHAT_MAINCHAT, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message ); @@ -231,7 +231,7 @@ int intif_main_message(struct map_session_data* sd, const char* message) } // The transmission of Wisp/Page to inter-server (player not found on this server) -int intif_wis_message(struct map_session_data *sd, const char *nick, const char *mes, size_t mes_len) +int intif_wis_message(struct map_session_data *sd, const char *nick, const char *mes, int mes_len) { if (intif->CheckForCharServer()) return 0; @@ -279,12 +279,14 @@ int intif_wis_replay(int id, int flag) // The transmission of GM only Wisp/Page from server to inter-server int intif_wis_message_to_gm(char *wisp_name, int permission, char *mes) { - size_t mes_len; + int mes_len; if (intif->CheckForCharServer()) return 0; nullpo_ret(wisp_name); nullpo_ret(mes); - mes_len = strlen(mes) + 1; // + null + mes_len = (int)strlen(mes) + 1; // + null + Assert_ret(mes_len > 0 && mes_len <= INT16_MAX - 32); + WFIFOHEAD(inter_fd, mes_len + 32); WFIFOW(inter_fd,0) = 0x3003; WFIFOW(inter_fd,2) = mes_len + 32; @@ -300,10 +302,11 @@ int intif_wis_message_to_gm(char *wisp_name, int permission, char *mes) } //Request for saving registry values. -int intif_saveregistry(struct map_session_data *sd) { - DBIterator *iter; - DBKey key; - DBData *data; +int intif_saveregistry(struct map_session_data *sd) +{ + struct DBIterator *iter; + union DBKey key; + struct DBData *data; int plen = 0; size_t len; @@ -657,7 +660,7 @@ int intif_guild_addmember(int guild_id,struct guild_member *m) } // Request a new leader for guild -int intif_guild_change_gm(int guild_id, const char* name, size_t len) +int intif_guild_change_gm(int guild_id, const char *name, int len) { if (intif->CheckForCharServer()) return 0; @@ -985,7 +988,7 @@ void intif_parse_WisMessage(int fd) { return; } //Success to send whisper. - clif->wis_message(sd->fd, wisp_source, RFIFOP(fd,56),RFIFOW(fd,2)-56); + clif->wis_message(sd->fd, wisp_source, RFIFOP(fd,56),RFIFOW(fd,2)-57); intif_wis_replay(id,0); // success } @@ -1004,7 +1007,8 @@ void intif_parse_WisEnd(int fd) return; } -int mapif_parse_WisToGM_sub(struct map_session_data* sd,va_list va) { +int intif_parse_WisToGM_sub(struct map_session_data *sd, va_list va) +{ int permission = va_arg(va, int); char *wisp_name; char *message; @@ -1022,22 +1026,22 @@ int mapif_parse_WisToGM_sub(struct map_session_data* sd,va_list va) { // Received wisp message from map-server via char-server for ALL gm // 0x3003/0x3803 <packet_len>.w <wispname>.24B <permission>.l <message>.?B -void mapif_parse_WisToGM(int fd) +void intif_parse_WisToGM(int fd) { int permission, mes_len; char Wisp_name[NAME_LENGTH]; char mbuf[255] = { 0 }; char *message; - mes_len = RFIFOW(fd,2) - 32; + mes_len = RFIFOW(fd,2) - 33; // Length not including the NUL terminator Assert_retv(mes_len > 0 && mes_len < 32000); - message = (char *) (mes_len >= 255 ? (char *) aMalloc(mes_len) : mbuf); + message = (mes_len >= 255 ? aMalloc(mes_len + 1) : mbuf); permission = RFIFOL(fd,28); safestrncpy(Wisp_name, RFIFOP(fd,4), NAME_LENGTH); - safestrncpy(message, RFIFOP(fd,32), mes_len); + safestrncpy(message, RFIFOP(fd,32), mes_len + 1); // information is sent to all online GM - map->foreachpc(mapif_parse_WisToGM_sub, permission, Wisp_name, message, mes_len); + map->foreachpc(intif->pWisToGM_sub, permission, Wisp_name, message, mes_len); if (message != mbuf) aFree(message); @@ -1110,7 +1114,7 @@ void intif_parse_Registers(int fd) safestrncpy(sval, RFIFOP(fd, cursor + 1), min((int)sizeof(sval), len)); cursor += len + 1; - script->set_reg(NULL,sd,reference_uid(script->add_str(key), index), key, (void*)sval, NULL); + script->set_reg(NULL,sd,reference_uid(script->add_str(key), index), key, sval, NULL); } /** * Vessel! @@ -1132,7 +1136,7 @@ void intif_parse_Registers(int fd) ival = RFIFOL(fd, cursor); cursor += 4; - script->set_reg(NULL,sd,reference_uid(script->add_str(key), index), key, (void*)h64BPTRSIZE(ival), NULL); + script->set_reg(NULL,sd,reference_uid(script->add_str(key), index), key, (const void *)h64BPTRSIZE(ival), NULL); } } script->parser_current_file = NULL;/* reset */ @@ -1653,7 +1657,7 @@ void intif_parse_MailInboxReceived(int fd) { else if( battle_config.mail_show_status && ( battle_config.mail_show_status == 1 || sd->mail.inbox.unread ) ) { char output[128]; sprintf(output, msg_sd(sd,510), sd->mail.inbox.unchecked, sd->mail.inbox.unread + sd->mail.inbox.unchecked); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); } } /*------------------------------------------ @@ -2488,8 +2492,8 @@ void intif_defaults(void) { /* parse functions */ intif->pWisMessage = intif_parse_WisMessage; intif->pWisEnd = intif_parse_WisEnd; - intif->pWisToGM_sub = mapif_parse_WisToGM_sub; - intif->pWisToGM = mapif_parse_WisToGM; + intif->pWisToGM_sub = intif_parse_WisToGM_sub; + intif->pWisToGM = intif_parse_WisToGM; intif->pRegisters = intif_parse_Registers; intif->pChangeNameOk = intif_parse_ChangeNameOk; intif->pMessageToFD = intif_parse_MessageToFD; diff --git a/src/map/intif.h b/src/map/intif.h index dccd31d80..5e7f86fc2 100644 --- a/src/map/intif.h +++ b/src/map/intif.h @@ -59,10 +59,10 @@ struct intif_interface { int (*parse) (int fd); int (*create_pet)(int account_id, int char_id, short pet_type, short pet_lv, short pet_egg_id, short pet_equip, short intimate, short hungry, char rename_flag, char incubate, char *pet_name); - int (*broadcast) (const char* mes, size_t len, int type); - int (*broadcast2) (const char* mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY); + int (*broadcast) (const char *mes, int len, int type); + int (*broadcast2) (const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY); int (*main_message) (struct map_session_data* sd, const char* message); - int (*wis_message) (struct map_session_data *sd, const char *nick, const char *mes, size_t mes_len); + int (*wis_message) (struct map_session_data *sd, const char *nick, const char *mes, int mes_len); int (*wis_message_to_gm) (char *Wisp_name, int permission, char *mes); int (*saveregistry) (struct map_session_data *sd); int (*request_registry) (struct map_session_data *sd, int flag); @@ -84,7 +84,7 @@ struct intif_interface { int (*guild_memberinfoshort) (int guild_id, int account_id, int char_id, int online, int lv, int class_); int (*guild_break) (int guild_id); int (*guild_message) (int guild_id, int account_id, const char *mes, int len); - int (*guild_change_gm) (int guild_id, const char* name, size_t len); + int (*guild_change_gm) (int guild_id, const char *name, int len); int (*guild_change_basicinfo) (int guild_id, int type, const void *data, int len); int (*guild_change_memberinfo) (int guild_id, int account_id, int char_id, int type, const void *data, int len); int (*guild_position) (int guild_id, int idx, struct guild_position *p); diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c index b520e9e91..5820ad2cf 100644 --- a/src/map/irc-bot.c +++ b/src/map/irc-bot.c @@ -48,10 +48,7 @@ struct irc_bot_interface *ircbot; char send_string[IRC_MESSAGE_LENGTH]; -/** - * Timer callback to (re-)connect to an IRC server - * @see timer->do_timer - */ +/// @copydoc irc_bot_interface::connect_timer() int irc_connect_timer(int tid, int64 tick, int id, intptr_t data) { struct hSockOpt opt; if( ircbot->isOn || ++ircbot->fails >= 3 ) @@ -71,53 +68,43 @@ int irc_connect_timer(int tid, int64 tick, int id, intptr_t data) { return 0; } -/** - * Timer callback to send identification commands to an IRC server - * @see timer->do_timer - */ +/// @copydoc irc_bot_interface::identify_timer() int irc_identify_timer(int tid, int64 tick, int id, intptr_t data) { if( !ircbot->isOn ) return 0; sprintf(send_string, "USER HerculesWS%d 8 * : Hercules IRC Bridge",rnd()%777); - ircbot->send(send_string); + ircbot->send(send_string, true); sprintf(send_string, "NICK %s", channel->config->irc_nick); - ircbot->send(send_string); + ircbot->send(send_string, true); timer->add(timer->gettick() + 3000, ircbot->join_timer, 0, 0); return 0; } -/** - * Timer callback to join channels (and optionally send NickServ commands) - * @see timer->do_timer - */ +/// @copydoc irc_bot_interface::join_timer() int irc_join_timer(int tid, int64 tick, int id, intptr_t data) { if( !ircbot->isOn ) return 0; if (channel->config->irc_nick_pw[0] != '\0') { sprintf(send_string, "PRIVMSG NICKSERV : IDENTIFY %s", channel->config->irc_nick_pw); - ircbot->send(send_string); + ircbot->send(send_string, true); if (channel->config->irc_use_ghost) { sprintf(send_string, "PRIVMSG NICKSERV : GHOST %s %s", channel->config->irc_nick, channel->config->irc_nick_pw); + ircbot->send(send_string, true); } } sprintf(send_string, "JOIN %s", channel->config->irc_channel); - ircbot->send(send_string); + ircbot->send(send_string, true); ircbot->isIn = true; return 0; } -/** - * Search the handler for a given IRC received command - * @param function_name Name of the received IRC command - * @return Function pointer to the command handler, NULL in case - * of unhandled commands - */ +/// @copydoc irc_bot_interface::func_search() struct irc_func* irc_func_search(char* function_name) { int i; nullpo_retr(NULL, function_name); @@ -129,10 +116,7 @@ struct irc_func* irc_func_search(char* function_name) { return NULL; } -/** - * Parser for the IRC server connection - * @see do_sockets - */ +/// @copydoc irc_bot_interface::parse() int irc_parse(int fd) { char *parse_string = NULL, *p = NULL, *str_safe = NULL; @@ -166,16 +150,7 @@ int irc_parse(int fd) { return 0; } -/** - * Parse the source from a received irc message - * @param source Source string, as reported by the server - * @param nick Pointer to a string where to return the nick (may not be NULL, - * needs to be able to fit an IRC_NICK_LENGTH long string) - * @param ident Pointer to a string where to return the ident (may not be - * NULL, needs to be able to fit an IRC_IDENT_LENGTH long string) - * @param host Pointer to a string where to return the hostname (may not be - * NULL, needs to be able to fit an IRC_HOST_LENGTH long string) - */ +/// @copydoc irc_bot_interface::parse_source() void irc_parse_source(char *source, char *nick, char *ident, char *host) { int i, pos = 0; size_t len; @@ -199,12 +174,7 @@ void irc_parse_source(char *source, char *nick, char *ident, char *host) { } } -/** - * Parse a received message from the irc server, and do the appropriate action - * for the detected command - * @param fd IRC server connection file descriptor - * @param str Raw received message - */ +/// @copydoc irc_bot_interface::parse_sub() void irc_parse_sub(int fd, char *str) { char source[180], command[60], buf1[IRC_MESSAGE_LENGTH], buf2[IRC_MESSAGE_LENGTH]; char *target = buf1, *message = buf2; @@ -234,35 +204,92 @@ void irc_parse_sub(int fd, char *str) { func->func(fd,command,source,target,message); } -/** - * Send a raw command to the irc server - * @param str Command to send - */ -void irc_send(char *str) { +/// @copydoc irc_bot_interface::queue() +void irc_queue(char *str) +{ + struct message_flood *queue_entry = NULL; + + if (!ircbot->flood_protection_enabled) { + ircbot->send(str, true); + return; + } + + if (ircbot->message_current == NULL) { + // No queue yet + if (ircbot->messages_burst_count < ircbot->flood_protection_burst) { + ircbot->send(str, true); + if (DIFF_TICK(timer->gettick(), ircbot->last_message_tick) <= ircbot->flood_protection_rate) + ircbot->messages_burst_count++; + else + ircbot->messages_burst_count = 0; + ircbot->last_message_tick = timer->gettick(); + } else { //queue starts + CREATE(queue_entry, struct message_flood, 1); + safestrncpy(queue_entry->message, str, sizeof(queue_entry->message)); + queue_entry->next = NULL; + ircbot->message_current = queue_entry; + ircbot->message_last = queue_entry; + ircbot->queue_tid = timer->add(timer->gettick() + ircbot->flood_protection_rate, ircbot->queue_timer, 0, 0); //start queue timer + ircbot->messages_burst_count = 0; + } + } else { + CREATE(queue_entry, struct message_flood, 1); + safestrncpy(queue_entry->message, str, sizeof(queue_entry->message)); + queue_entry->next = NULL; + ircbot->message_last->next = queue_entry; + ircbot->message_last = queue_entry; + } +} + +/// @copydoc irc_bot_interface::queue_timer() +int irc_queue_timer(int tid, int64 tick, int id, intptr_t data) +{ + struct message_flood *queue_entry = ircbot->message_current; + nullpo_ret(queue_entry); + + ircbot->send(queue_entry->message, true); + if (queue_entry->next != NULL) { + ircbot->message_current = queue_entry->next; + ircbot->queue_tid = timer->add(timer->gettick() + ircbot->flood_protection_rate, ircbot->queue_timer, 0, 0); + } else { + ircbot->message_current = NULL; + ircbot->message_last = NULL; + ircbot->queue_tid = INVALID_TIMER; + } + + aFree(queue_entry); + + return 0; +} + +/// @copydoc irc_bot_interface::send() +void irc_send(char *str, bool force) +{ size_t len; nullpo_retv(str); len = strlen(str) + 2; if (len > IRC_MESSAGE_LENGTH-3) len = IRC_MESSAGE_LENGTH-3; + + if (!force && ircbot->flood_protection_enabled) { + // Add to queue + ircbot->queue(str); + return; + } + WFIFOHEAD(ircbot->fd, len); snprintf(WFIFOP(ircbot->fd,0),IRC_MESSAGE_LENGTH, "%s\r\n", str); WFIFOSET(ircbot->fd, len); } -/** - * Handler for the PING IRC command (send back a PONG) - * @see irc_parse_sub - */ +/// @copydoc irc_interface_bot::pong() void irc_pong(int fd, char *cmd, char *source, char *target, char *msg) { nullpo_retv(cmd); snprintf(send_string, IRC_MESSAGE_LENGTH, "PONG %s", cmd); - ircbot->send(send_string); + ircbot->send(send_string, false); } -/** - * Handler for CTCP commands received via PRIVMSG - * @see irc_privmsg - */ +/// @copydoc irc_interface_bot::privmsg_ctcp() void irc_privmsg_ctcp(int fd, char *cmd, char *source, char *target, char *msg) { char source_nick[IRC_NICK_LENGTH], source_ident[IRC_IDENT_LENGTH], source_host[IRC_HOST_LENGTH]; @@ -283,7 +310,7 @@ void irc_privmsg_ctcp(int fd, char *cmd, char *source, char *target, char *msg) // Ignore it } else if( strcmpi(cmd,"PING") == 0 ) { snprintf(send_string, IRC_MESSAGE_LENGTH, "NOTICE %s :\001PING %s\001",source_nick,msg); - ircbot->send(send_string); + ircbot->send(send_string, false); } else if( strcmpi(cmd,"TIME") == 0 ) { time_t time_server; // variable for number of seconds (used with time() function) struct tm *datetime; // variable for time in structure ->tm_mday, ->tm_sec, ... @@ -297,10 +324,10 @@ void irc_privmsg_ctcp(int fd, char *cmd, char *source, char *target, char *msg) strftime(temp, sizeof(temp)-1, msg_txt(230), datetime); // Server time (normal time): %A, %B %d %Y %X. snprintf(send_string, IRC_MESSAGE_LENGTH, "NOTICE %s :\001TIME %s\001",source_nick,temp); - ircbot->send(send_string); + ircbot->send(send_string, false); } else if( strcmpi(cmd,"VERSION") == 0 ) { snprintf(send_string, IRC_MESSAGE_LENGTH, "NOTICE %s :\001VERSION Hercules.ws IRC Bridge\001",source_nick); - ircbot->send(send_string); + ircbot->send(send_string, false); #ifdef IRCBOT_DEBUG } else { ShowWarning("Unknown CTCP command received %s (%s) from %s\n",cmd,msg,source); @@ -308,10 +335,7 @@ void irc_privmsg_ctcp(int fd, char *cmd, char *source, char *target, char *msg) } } -/** - * Handler for the PRIVMSG IRC command (action depends on the message contents) - * @see irc_parse_sub - */ +/// @copydoc irc_bot_interface::privmsg() void irc_privmsg(int fd, char *cmd, char *source, char *target, char *msg) { size_t len = msg ? strlen(msg) : 0; nullpo_retv(source); @@ -322,7 +346,7 @@ void irc_privmsg(int fd, char *cmd, char *source, char *target, char *msg) { command[0] = message[0] = '\0'; sscanf(msg, "\001%499[^\001\r\n ] %499[^\r\n\001]\001", command, message); - irc_privmsg_ctcp(fd, command, source, target, message); + ircbot->privmsg_ctcp(fd, command, source, target, message); #ifdef IRCBOT_DEBUG } else if (strcmpi(target, channel->config->irc_nick) == 0) { ShowDebug("irc_privmsg: Received message from %s: '%s'\n", source ? source : "(null)", msg); @@ -349,11 +373,7 @@ void irc_privmsg(int fd, char *cmd, char *source, char *target, char *msg) { } } -/** - * Handler for the JOIN IRC command (notify an in-game channel of users joining - * the IRC channel) - * @see irc_parse_sub - */ +/// @copydoc irc_bot_interface::userjoin() void irc_userjoin(int fd, char *cmd, char *source, char *target, char *msg) { char source_nick[IRC_NICK_LENGTH], source_ident[IRC_IDENT_LENGTH], source_host[IRC_HOST_LENGTH]; @@ -369,11 +389,7 @@ void irc_userjoin(int fd, char *cmd, char *source, char *target, char *msg) { } } -/** - * Handler for the PART and QUIT IRC commands (notify an in-game channel of - * users leaving the IRC channel) - * @see irc_parse_sub - */ +/// @copydoc irc_bot_interface::userleave() void irc_userleave(int fd, char *cmd, char *source, char *target, char *msg) { char source_nick[IRC_NICK_LENGTH], source_ident[IRC_IDENT_LENGTH], source_host[IRC_HOST_LENGTH]; @@ -392,11 +408,7 @@ void irc_userleave(int fd, char *cmd, char *source, char *target, char *msg) { } } -/** - * Handler for the NICK IRC commands (notify an in-game channel of users - * changing their name while in the IRC channel) - * @see irc_parse_sub - */ +/// @copydoc irc_bot_interface::usernick() void irc_usernick(int fd, char *cmd, char *source, char *target, char *msg) { char source_nick[IRC_NICK_LENGTH], source_ident[IRC_IDENT_LENGTH], source_host[IRC_HOST_LENGTH]; @@ -412,11 +424,7 @@ void irc_usernick(int fd, char *cmd, char *source, char *target, char *msg) { } } -/** - * Relay a chat message to the irc channel the bot is connected to - * @param name Sender's name - * @param msg Message text - */ +/// @copydoc irc_bot_interface::relay() void irc_relay(const char *name, const char *msg) { if (!ircbot->isIn) @@ -428,12 +436,10 @@ void irc_relay(const char *name, const char *msg) else sprintf(send_string,"PRIVMSG %s :%s", channel->config->irc_channel, msg); - ircbot->send(send_string); + ircbot->send(send_string, false); } -/** - * IRC bot initializer - */ +/// @copydoc irc_bot_interface::init() void irc_bot_init(bool minimal) { /// Command handlers const struct irc_func irc_func_base[] = { @@ -479,22 +485,31 @@ void irc_bot_init(bool minimal) { ircbot->isOn = false; timer->add_func_list(ircbot->connect_timer, "irc_connect_timer"); + timer->add_func_list(ircbot->queue_timer, "irc_queue_timer"); + timer->add(timer->gettick() + 7000, ircbot->connect_timer, 0, 0); } -/** - * IRC bot finalizer - */ +/// @copydoc irc_bot_interface::final() void irc_bot_final(void) { int i; if (!channel->config->irc) return; if( ircbot->isOn ) { - ircbot->send("QUIT :Hercules is shutting down"); + ircbot->send("QUIT :Hercules is shutting down", true); sockt->close(ircbot->fd); } + if (ircbot->queue_tid != INVALID_TIMER) + timer->delete(ircbot->queue_tid, ircbot->queue_timer); + + while (ircbot->message_current != NULL) { + struct message_flood *next = ircbot->message_current->next; + aFree(ircbot->message_current); + ircbot->message_current = next; + } + for( i = 0; i < ircbot->funcs.size; i++ ) { aFree(ircbot->funcs.list[i]); } @@ -509,6 +524,15 @@ void ircbot_defaults(void) { ircbot->channel = NULL; + ircbot->flood_protection_enabled = true; + ircbot->flood_protection_rate = 1000; + ircbot->flood_protection_burst = 3; + ircbot->last_message_tick = INVALID_TIMER; + ircbot->queue_tid = INVALID_TIMER; + ircbot->messages_burst_count = 0; + ircbot->message_current = NULL; + ircbot->message_last = NULL; + ircbot->init = irc_bot_init; ircbot->final = irc_bot_final; @@ -522,11 +546,14 @@ void ircbot_defaults(void) { ircbot->identify_timer = irc_identify_timer; ircbot->join_timer = irc_join_timer; + ircbot->queue_timer = irc_queue_timer; + ircbot->queue = irc_queue; ircbot->send = irc_send; ircbot->relay = irc_relay; ircbot->pong = irc_pong; ircbot->privmsg = irc_privmsg; + ircbot->privmsg_ctcp = irc_privmsg_ctcp; ircbot->userjoin = irc_userjoin; ircbot->userleave = irc_userleave; diff --git a/src/map/irc-bot.h b/src/map/irc-bot.h index dc67e2fe8..f73426693 100644 --- a/src/map/irc-bot.h +++ b/src/map/irc-bot.h @@ -39,6 +39,11 @@ struct irc_func { void (*func)(int, char*, char*, char*, char*); }; +struct message_flood { + char message[IRC_MESSAGE_LENGTH]; + struct message_flood *next; +}; + struct irc_bot_interface { int fd; bool isIn, isOn; @@ -46,6 +51,15 @@ struct irc_bot_interface { unsigned char fails; uint32 ip; unsigned short port; + /* messages flood protection */ + bool flood_protection_enabled; + int flood_protection_rate; + int flood_protection_burst; + int64 last_message_tick; + int messages_burst_count; + int queue_tid; + struct message_flood *message_current; + struct message_flood *message_last; /* */ struct channel_data *channel; /* */ @@ -53,27 +67,132 @@ struct irc_bot_interface { struct irc_func **list; unsigned int size; } funcs; - /* */ + + /** + * IRC bot initializer + */ void (*init) (bool minimal); + + /** + * IRC bot finalizer + */ void (*final) (void); - /* */ + + /** + * Parser for the IRC server connection + * @see do_sockets + */ int (*parse) (int fd); + + /** + * Parse a received message from the irc server, and do the appropriate action + * for the detected command + * @param fd IRC server connection file descriptor + * @param str Raw received message + */ void (*parse_sub) (int fd, char *str); + + /** + * Parse the source from a received irc message + * @param source Source string, as reported by the server + * @param nick Pointer to a string where to return the nick (may not be NULL, + * needs to be able to fit an IRC_NICK_LENGTH long string) + * @param ident Pointer to a string where to return the ident (may not be + * NULL, needs to be able to fit an IRC_IDENT_LENGTH long string) + * @param host Pointer to a string where to return the hostname (may not be + * NULL, needs to be able to fit an IRC_HOST_LENGTH long string) + */ void (*parse_source) (char *source, char *nick, char *ident, char *host); - /* */ + + /** + * Search the handler for a given IRC received command + * @param function_name Name of the received IRC command + * @return Function pointer to the command handler, NULL in case + * of unhandled commands + */ struct irc_func* (*func_search) (char* function_name); - /* */ + + /** + * Timer callback to (re-)connect to an IRC server + * @see timer_interface::do_timer + */ int (*connect_timer) (int tid, int64 tick, int id, intptr_t data); + + /** + * Timer callback to send identification commands to an IRC server + * @see timer_interface::do_timer + */ int (*identify_timer) (int tid, int64 tick, int id, intptr_t data); + + /** + * Timer callback to join channels (and optionally send NickServ commands) + * @see timer_interface::do_timer + */ int (*join_timer) (int tid, int64 tick, int id, intptr_t data); - /* */ - void (*send)(char *str); + + /** + * Timer callback to send queued IRC Commands + * @see timer_interface::do_timer + */ + int (*queue_timer) (int tid, int64 tick, int id, intptr_t data); + + /** + * Decides if an IRC Command should be queued or not, based on the flood protection settings. + * + * @param str Command to be checked + */ + void (*queue) (char *str); + + /** + * Send a raw command to the irc server + * @param str Command to send + */ + void (*send)(char *str, bool force); + + /** + * Relay a chat message to the irc channel the bot is connected to + * @param name Sender's name + * @param msg Message text + */ void (*relay) (const char *name, const char *msg); - /* */ + + /** + * Handler for the PING IRC command (send back a PONG) + * @see irc_bot_interface::parse_sub + */ void (*pong) (int fd, char *cmd, char *source, char *target, char *msg); + + /** + * Handler for the PRIVMSG IRC command (action depends on the message contents) + * @see irc_bot_interface::parse_sub + */ void (*privmsg) (int fd, char *cmd, char *source, char *target, char *msg); + + /** + * Handler for CTCP commands received via PRIVMSG + * @see irc_bot_interface::privmsg + */ + void (*privmsg_ctcp) (int fd, char *cmd, char *source, char *target, char *msg); + + /** + * Handler for the JOIN IRC command (notify an in-game channel of users joining + * the IRC channel) + * @see irc_bot_interface::parse_sub + */ void (*userjoin) (int fd, char *cmd, char *source, char *target, char *msg); + + /** + * Handler for the PART and QUIT IRC commands (notify an in-game channel of + * users leaving the IRC channel) + * @see irc_bot_interface::parse_sub + */ void (*userleave) (int fd, char *cmd, char *source, char *target, char *msg); + + /** + * Handler for the NICK IRC commands (notify an in-game channel of users + * changing their name while in the IRC channel) + * @see irc_bot_interface::parse_sub + */ void (*usernick) (int fd, char *cmd, char *source, char *target, char *msg); }; diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 630bc4488..c59f627cc 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -49,7 +49,7 @@ struct itemdb_interface *itemdb; * name = item alias, so we should find items aliases first. if not found then look for "jname" (full name) * @see DBApply */ -int itemdb_searchname_sub(DBKey key, DBData *data, va_list ap) +int itemdb_searchname_sub(union DBKey key, struct DBData *data, va_list ap) { struct item_data *item = DB->data2ptr(data), **dst, **dst2; char *str; @@ -112,7 +112,7 @@ struct item_data* itemdb_name2id(const char *str) { /** * @see DBMatcher */ -int itemdb_searchname_array_sub(DBKey key, DBData data, va_list ap) +int itemdb_searchname_array_sub(union DBKey key, struct DBData data, va_list ap) { struct item_data *item = DB->data2ptr(&data); char *str; @@ -170,10 +170,10 @@ int itemdb_searchname_array(struct item_data** data, int size, const char *str, // search in the db if( count < size ) { - DBData *db_data[MAX_SEARCH]; + struct DBData *db_data[MAX_SEARCH]; int db_count = 0; size -= count; - db_count = itemdb->other->getall(itemdb->other, (DBData**)&db_data, size, itemdb->searchname_array_sub, str); + db_count = itemdb->other->getall(itemdb->other, (struct DBData**)&db_data, size, itemdb->searchname_array_sub, str); for (i = 0; i < db_count; i++) data[count++] = DB->data2ptr(db_data[i]); count += db_count; @@ -2094,7 +2094,7 @@ uint64 itemdb_unique_id(struct map_session_data *sd) { */ void itemdb_read(bool minimal) { int i; - DBData prev; + struct DBData prev; const char *filename[] = { DBPATH"item_db.conf", @@ -2171,7 +2171,7 @@ void destroy_item_data(struct item_data* self, int free_self) /** * @see DBApply */ -int itemdb_final_sub(DBKey key, DBData *data, va_list ap) +int itemdb_final_sub(union DBKey key, struct DBData *data, va_list ap) { struct item_data *id = DB->data2ptr(data); @@ -2307,8 +2307,9 @@ void itemdb_reload(void) { } mapit->free(iter); } -void itemdb_name_constants(void) { - DBIterator *iter = db_iterator(itemdb->names); +void itemdb_name_constants(void) +{ + struct DBIterator *iter = db_iterator(itemdb->names); struct item_data *data; #ifdef ENABLE_CASE_CHECK @@ -2343,7 +2344,7 @@ void do_init_itemdb(bool minimal) { clif->cashshop_load(); /** it failed? we disable it **/ - if( !clif->parse_roulette_db() ) + if (battle_config.feature_roulette == 1 && !clif->parse_roulette_db()) battle_config.feature_roulette = 0; } void itemdb_defaults(void) { diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 47446d617..d33805174 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -589,10 +589,10 @@ struct itemdb_interface { struct item_combo **combos; unsigned short combo_count; /* */ - DBMap *names; + struct DBMap *names; /* */ struct item_data *array[MAX_ITEMDB]; - DBMap *other;// int nameid -> struct item_data* + struct DBMap *other;// int nameid -> struct item_data* struct item_data dummy; //This is the default dummy item used for non-existant items. [Skotlex] /* */ void (*read_groups) (void); @@ -612,8 +612,8 @@ struct itemdb_interface { int (*group_item) (struct item_group *group); int (*chain_item) (unsigned short chain_id, int *rate); void (*package_item) (struct map_session_data *sd, struct item_package *package); - int (*searchname_sub) (DBKey key, DBData *data, va_list ap); - int (*searchname_array_sub) (DBKey key, DBData data, va_list ap); + int (*searchname_sub) (union DBKey key, struct DBData *data, va_list ap); + int (*searchname_array_sub) (union DBKey key, struct DBData data, va_list ap); int (*searchrandomid) (struct item_group *group); const char* (*typename) (int type); void (*jobmask2mapid) (uint64 *bclass, uint64 jobmask); @@ -647,7 +647,7 @@ struct itemdb_interface { uint64 (*unique_id) (struct map_session_data *sd); void (*read) (bool minimal); void (*destroy_item_data) (struct item_data *self, int free_self); - int (*final_sub) (DBKey key, DBData *data, va_list ap); + int (*final_sub) (union DBKey key, struct DBData *data, va_list ap); void (*clear) (bool total); struct item_combo * (*id2combo) (unsigned short id); bool (*is_item_usable) (struct item_data *item); diff --git a/src/map/log.c b/src/map/log.c index f757faf43..c19190d90 100644 --- a/src/map/log.c +++ b/src/map/log.c @@ -62,6 +62,16 @@ char log_picktype2char(e_log_pick_type type) { case LOG_TYPE_BUYING_STORE: return 'B'; // (B)uying Store case LOG_TYPE_LOOT: return 'L'; // (L)oot (consumed monster pick/drop) case LOG_TYPE_BANK: return 'K'; // Ban(K) Transactions + case LOG_TYPE_DIVORCE: return 'Y'; // Divorce + case LOG_TYPE_ROULETTE: return 'Z'; // Roulette + case LOG_TYPE_RENTAL: return 'W'; // Rental + case LOG_TYPE_CARD: return 'Q'; // Card + case LOG_TYPE_INV_INVALID: return 'J'; // Invalid in inventory + case LOG_TYPE_CART_INVALID: return 'H'; // Invalid in cart + case LOG_TYPE_EGG: return '@'; // Egg + case LOG_TYPE_QUEST: return '0'; // Quest + case LOG_TYPE_SKILL: return '1'; // Skill + case LOG_TYPE_REFINE: return '2'; // Refine case LOG_TYPE_OTHER: return 'X'; // Other } @@ -109,8 +119,9 @@ bool should_log_item(int nameid, int amount, int refine, struct item_data *id) { return false; } -void log_branch_sub_sql(struct map_session_data* sd) { - SqlStmt* stmt; +void log_branch_sub_sql(struct map_session_data* sd) +{ + struct SqlStmt *stmt; nullpo_retv(sd); stmt = SQL->StmtMalloc(logs->mysql_handle); @@ -269,15 +280,16 @@ void log_mvpdrop(struct map_session_data* sd, int monster_id, int* log_mvp) logs->mvpdrop_sub(sd,monster_id,log_mvp); } -void log_atcommand_sub_sql(struct map_session_data* sd, const char* message) { - SqlStmt* stmt; +void log_atcommand_sub_sql(struct map_session_data* sd, const char* message) +{ + struct SqlStmt *stmt; nullpo_retv(sd); nullpo_retv(message); stmt = SQL->StmtMalloc(logs->mysql_handle); if( SQL_SUCCESS != SQL->StmtPrepare(stmt, LOG_QUERY " INTO `%s` (`atcommand_date`, `account_id`, `char_id`, `char_name`, `map`, `command`) VALUES (NOW(), '%d', '%d', ?, '%s', ?)", logs->config.log_gm, sd->status.account_id, sd->status.char_id, mapindex_id2name(sd->mapindex) ) || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, sd->status.name, strnlen(sd->status.name, NAME_LENGTH)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, (char*)message, safestrnlen(message, 255)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, message, safestrnlen(message, 255)) || SQL_SUCCESS != SQL->StmtExecute(stmt) ) { SqlStmt_ShowDebug(stmt); @@ -312,17 +324,18 @@ void log_atcommand(struct map_session_data* sd, const char* message) logs->atcommand_sub(sd,message); } -void log_npc_sub_sql(struct map_session_data *sd, const char *message) { - SqlStmt* stmt; +void log_npc_sub_sql(struct map_session_data *sd, const char *message) +{ + struct SqlStmt *stmt; nullpo_retv(sd); nullpo_retv(message); stmt = SQL->StmtMalloc(logs->mysql_handle); - if( SQL_SUCCESS != SQL->StmtPrepare(stmt, LOG_QUERY " INTO `%s` (`npc_date`, `account_id`, `char_id`, `char_name`, `map`, `mes`) VALUES (NOW(), '%d', '%d', ?, '%s', ?)", logs->config.log_npc, sd->status.account_id, sd->status.char_id, mapindex_id2name(sd->mapindex) ) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, sd->status.name, strnlen(sd->status.name, NAME_LENGTH)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, (char*)message, safestrnlen(message, 255)) - || SQL_SUCCESS != SQL->StmtExecute(stmt) ) - { + if (SQL_SUCCESS != SQL->StmtPrepare(stmt, LOG_QUERY " INTO `%s` (`npc_date`, `account_id`, `char_id`, `char_name`, `map`, `mes`) VALUES (NOW(), '%d', '%d', ?, '%s', ?)", logs->config.log_npc, sd->status.account_id, sd->status.char_id, mapindex_id2name(sd->mapindex) ) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, sd->status.name, strnlen(sd->status.name, NAME_LENGTH)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, message, safestrnlen(message, 255)) + || SQL_SUCCESS != SQL->StmtExecute(stmt) + ) { SqlStmt_ShowDebug(stmt); SQL->StmtFree(stmt); return; @@ -369,14 +382,14 @@ void log_npc(struct map_session_data* sd, const char* message) */ void log_chat_sub_sql(e_log_chat_type type, int type_id, int src_charid, int src_accid, const char *mapname, int x, int y, const char *dst_charname, const char *message) { - SqlStmt* stmt; + struct SqlStmt* stmt; nullpo_retv(dst_charname); nullpo_retv(message); stmt = SQL->StmtMalloc(logs->mysql_handle); if( SQL_SUCCESS != SQL->StmtPrepare(stmt, LOG_QUERY " INTO `%s` (`time`, `type`, `type_id`, `src_charid`, `src_accountid`, `src_map`, `src_map_x`, `src_map_y`, `dst_charname`, `message`) VALUES (NOW(), '%c', '%d', '%d', '%d', '%s', '%d', '%d', ?, ?)", logs->config.log_chat, logs->chattype2char(type), type_id, src_charid, src_accid, mapname, x, y) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, (char*)dst_charname, safestrnlen(dst_charname, NAME_LENGTH)) - || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, (char*)message, safestrnlen(message, CHAT_SIZE_MAX)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, dst_charname, safestrnlen(dst_charname, NAME_LENGTH)) + || SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, message, safestrnlen(message, CHAT_SIZE_MAX)) || SQL_SUCCESS != SQL->StmtExecute(stmt) ) { SqlStmt_ShowDebug(stmt); diff --git a/src/map/log.h b/src/map/log.h index fbd0acc0e..0a5e13208 100644 --- a/src/map/log.h +++ b/src/map/log.h @@ -22,11 +22,11 @@ #define MAP_LOG_H #include "common/hercules.h" -#include "common/sql.h" /** * Declarations **/ +struct Sql; // common/sql.h struct item; struct item_data; struct map_session_data; @@ -57,29 +57,40 @@ typedef enum e_log_chat_type { } e_log_chat_type; typedef enum e_log_pick_type { - LOG_TYPE_NONE = 0, - LOG_TYPE_TRADE = 0x00001, - LOG_TYPE_VENDING = 0x00002, - LOG_TYPE_PICKDROP_PLAYER = 0x00004, - LOG_TYPE_PICKDROP_MONSTER = 0x00008, - LOG_TYPE_NPC = 0x00010, - LOG_TYPE_SCRIPT = 0x00020, - LOG_TYPE_STEAL = 0x00040, - LOG_TYPE_CONSUME = 0x00080, - LOG_TYPE_PRODUCE = 0x00100, - LOG_TYPE_MVP = 0x00200, - LOG_TYPE_COMMAND = 0x00400, - LOG_TYPE_STORAGE = 0x00800, - LOG_TYPE_GSTORAGE = 0x01000, - LOG_TYPE_MAIL = 0x02000, - LOG_TYPE_AUCTION = 0x04000, - LOG_TYPE_BUYING_STORE = 0x08000, - LOG_TYPE_OTHER = 0x10000, - LOG_TYPE_BANK = 0x20000, + LOG_TYPE_NONE = 0x00000000, + LOG_TYPE_TRADE = 0x00000001, + LOG_TYPE_VENDING = 0x00000002, + LOG_TYPE_PICKDROP_PLAYER = 0x00000004, + LOG_TYPE_PICKDROP_MONSTER = 0x00000008, + LOG_TYPE_NPC = 0x00000010, + LOG_TYPE_SCRIPT = 0x00000020, + LOG_TYPE_STEAL = 0x00000040, + LOG_TYPE_CONSUME = 0x00000080, + LOG_TYPE_PRODUCE = 0x00000100, + LOG_TYPE_MVP = 0x00000200, + LOG_TYPE_COMMAND = 0x00000400, + LOG_TYPE_STORAGE = 0x00000800, + LOG_TYPE_GSTORAGE = 0x00001000, + LOG_TYPE_MAIL = 0x00002000, + LOG_TYPE_AUCTION = 0x00004000, + LOG_TYPE_BUYING_STORE = 0x00008000, + LOG_TYPE_OTHER = 0x00010000, + LOG_TYPE_BANK = 0x00020000, + LOG_TYPE_DIVORCE = 0x00040000, + LOG_TYPE_ROULETTE = 0x00080000, + LOG_TYPE_RENTAL = 0x00100000, + LOG_TYPE_CARD = 0x00200000, + LOG_TYPE_INV_INVALID = 0x00400000, + LOG_TYPE_CART_INVALID = 0x00800000, + LOG_TYPE_EGG = 0x01000000, + LOG_TYPE_QUEST = 0x02000000, + LOG_TYPE_SKILL = 0x04000000, + LOG_TYPE_REFINE = 0x08000000, + // combinations LOG_TYPE_LOOT = LOG_TYPE_PICKDROP_MONSTER|LOG_TYPE_CONSUME, // all - LOG_TYPE_ALL = 0xFFFFF, + LOG_TYPE_ALL = 0xFFFFFFFF, } e_log_pick_type; /// filters for item logging @@ -116,7 +127,7 @@ struct log_interface { char db_id[32]; char db_pw[100]; char db_name[32]; - Sql* mysql_handle; + struct Sql *mysql_handle; /* */ void (*pick_pc) (struct map_session_data* sd, e_log_pick_type type, int amount, struct item* itm, struct item_data *data); void (*pick_mob) (struct mob_data* md, e_log_pick_type type, int amount, struct item* itm, struct item_data *data); diff --git a/src/map/map.c b/src/map/map.c index f2e47be74..3a7d752c3 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -69,6 +69,7 @@ #include "common/random.h" #include "common/showmsg.h" #include "common/socket.h" // WFIFO*() +#include "common/sql.h" #include "common/strlib.h" #include "common/timer.h" #include "common/utils.h" @@ -192,6 +193,7 @@ void map_update_cell_bl( struct block_list *bl, bool increase ) { #ifdef CELL_NOSTACK int pos; + nullpo_retv(bl); if( bl->m < 0 || bl->x < 0 || bl->x >= map->list[bl->m].xs || bl->y < 0 || bl->y >= map->list[bl->m].ys || !(bl->type&BL_CHAR) ) @@ -308,9 +310,14 @@ int map_delblock(struct block_list* bl) * (which are executed by default on BL_CHAR types) *------------------------------------------*/ int map_moveblock(struct block_list *bl, int x1, int y1, int64 tick) { - int x0 = bl->x, y0 = bl->y; struct status_change *sc = NULL; - int moveblock = ( x0/BLOCK_SIZE != x1/BLOCK_SIZE || y0/BLOCK_SIZE != y1/BLOCK_SIZE); + int x0, y0; + int moveblock; + + nullpo_ret(bl); + x0 = bl->x; + y0 = bl->y; + moveblock = ( x0/BLOCK_SIZE != x1/BLOCK_SIZE || y0/BLOCK_SIZE != y1/BLOCK_SIZE); if (!bl->prev) { //Block not in map, just update coordinates, but do naught else. @@ -476,6 +483,8 @@ struct skill_unit* map_find_skill_unit_oncell(struct block_list* target,int16 x, int16 m,bx,by; struct block_list *bl; struct skill_unit *su; + + nullpo_retr(NULL, target); m = target->m; if (x < 0 || y < 0 || (x >= map->list[m].xs) || (y >= map->list[m].ys)) @@ -853,6 +862,9 @@ static int bl_vgetall_inshootrange(struct block_list *bl, va_list args) struct block_list *center = va_arg(args, struct block_list*); #ifdef CIRCULAR_AREA int range = va_arg(args, int); + nullpo_ret(center); + nullpo_ret(bl); + if (!check_distance_bl(center, bl, range)) return 0; #endif @@ -1040,6 +1052,9 @@ static int bl_vgetall_inmovearea(struct block_list *bl, va_list args) struct block_list *center = va_arg(args, struct block_list*); int range = va_arg(args, int); + nullpo_ret(bl); + nullpo_ret(center); + if ((dx > 0 && bl->x < center->x - range + dx) || (dx < 0 && bl->x > center->x + range + dx) || (dy > 0 && bl->y < center->y - range + dy) || @@ -1202,11 +1217,15 @@ static int bl_vgetall_inpath(struct block_list *bl, va_list args) int len_limit = va_arg(args, int); int magnitude2 = va_arg(args, int); - int xi = bl->x; - int yi = bl->y; + int xi; + int yi; int xu, yu; + int k; - int k = ( xi - x0 ) * ( x1 - x0 ) + ( yi - y0 ) * ( y1 - y0 ); + nullpo_ret(bl); + xi = bl->x; + yi = bl->y; + k = ( xi - x0 ) * ( x1 - x0 ) + ( yi - y0 ) * ( y1 - y0 ); if ( k < 0 || k > len_limit ) //Since more skills use this, check for ending point as well. return 0; @@ -1421,6 +1440,9 @@ int map_searchrandfreecell(int16 m, const struct block_list *bl, int16 *x, int16 int free_cell,i,j; int free_cells[9][2]; + nullpo_ret(x); + nullpo_ret(y); + for(free_cell=0,i=-1;i<=1;i++){ if(i+*y<0 || i+*y>=map->list[m].ys) continue; @@ -1467,6 +1489,9 @@ int map_search_freecell(struct block_list *src, int16 m, int16 *x,int16 *y, int1 int rx2 = 2*rx+1; int ry2 = 2*ry+1; + nullpo_ret(x); + nullpo_ret(y); + if( !src && (!(flag&1) || flag&2) ) { ShowDebug("map_search_freecell: Incorrect usage! When src is NULL, flag has to be &1 and can't have &2\n"); @@ -1477,6 +1502,7 @@ int map_search_freecell(struct block_list *src, int16 m, int16 *x,int16 *y, int1 bx = *x; by = *y; } else { + nullpo_ret(src); bx = src->x; by = src->y; m = src->m; @@ -1533,10 +1559,15 @@ int map_search_freecell(struct block_list *src, int16 m, int16 *x,int16 *y, int1 bool map_closest_freecell(int16 m, const struct block_list *bl, int16 *x, int16 *y, int type, int flag) { uint8 dir = 6; - int16 tx = *x; - int16 ty = *y; + int16 tx; + int16 ty; int costrange = 10; + nullpo_ret(x); + nullpo_ret(y); + tx = *x; + ty = *y; + if(!map->count_oncell(m, tx, ty, type, flag)) return true; //Current cell is free @@ -1657,7 +1688,7 @@ int map_addflooritem(const struct block_list *bl, struct item *item_data, int am /** * @see DBCreateData */ -DBData create_charid2nick(DBKey key, va_list args) +struct DBData create_charid2nick(union DBKey key, va_list args) { struct charid2nick *p; CREATE(p, struct charid2nick, 1); @@ -1694,7 +1725,7 @@ void map_delnickdb(int charid, const char* name) { struct charid2nick* p; struct charid_request* req; - DBData data; + struct DBData data; if (!map->nick_db->remove(map->nick_db, DB->i2key(charid), &data) || (p = DB->data2ptr(&data)) == NULL) return; @@ -1793,6 +1824,8 @@ void map_deliddb(struct block_list *bl) int map_quit(struct map_session_data *sd) { int i; + nullpo_ret(sd); + if(!sd->state.active) { //Removing a player that is not active. struct auth_node *node = chrif->search(sd->status.account_id); if (node && node->char_id == sd->status.char_id && @@ -2166,9 +2199,9 @@ struct map_session_data * map_nick2sd(const char *nick) /*========================================== * Convext Mirror *------------------------------------------*/ -struct mob_data * map_getmob_boss(int16 m) +struct mob_data *map_getmob_boss(int16 m) { - DBIterator* iter; + struct DBIterator *iter; struct mob_data *md = NULL; bool found = false; @@ -2230,11 +2263,11 @@ uint32 map_race_id2mask(int race) /// Applies func to all the players in the db. /// Stops iterating if func returns -1. -void map_vforeachpc(int (*func)(struct map_session_data* sd, va_list args), va_list args) { - DBIterator* iter; - struct map_session_data* sd; +void map_vforeachpc(int (*func)(struct map_session_data* sd, va_list args), va_list args) +{ + struct DBIterator *iter = db_iterator(map->pc_db); + struct map_session_data *sd = NULL; - iter = db_iterator(map->pc_db); for( sd = dbi_first(iter); dbi_exists(iter); sd = dbi_next(iter) ) { va_list argscopy; @@ -2262,11 +2295,11 @@ void map_foreachpc(int (*func)(struct map_session_data* sd, va_list args), ...) /// Applies func to all the mobs in the db. /// Stops iterating if func returns -1. -void map_vforeachmob(int (*func)(struct mob_data* md, va_list args), va_list args) { - DBIterator* iter; - struct mob_data* md; +void map_vforeachmob(int (*func)(struct mob_data* md, va_list args), va_list args) +{ + struct DBIterator *iter = db_iterator(map->mobid_db); + struct mob_data *md = NULL; - iter = db_iterator(map->mobid_db); for (md = dbi_first(iter); dbi_exists(iter); md = dbi_next(iter)) { va_list argscopy; int ret; @@ -2293,11 +2326,11 @@ void map_foreachmob(int (*func)(struct mob_data* md, va_list args), ...) { /// Applies func to all the npcs in the db. /// Stops iterating if func returns -1. -void map_vforeachnpc(int (*func)(struct npc_data* nd, va_list args), va_list args) { - DBIterator* iter; - struct block_list* bl; +void map_vforeachnpc(int (*func)(struct npc_data* nd, va_list args), va_list args) +{ + struct DBIterator *iter = db_iterator(map->id_db); + struct block_list *bl = NULL; - iter = db_iterator(map->id_db); for (bl = dbi_first(iter); dbi_exists(iter); bl = dbi_next(iter)) { if (bl->type == BL_NPC) { struct npc_data *nd = BL_UCAST(BL_NPC, bl); @@ -2327,11 +2360,11 @@ void map_foreachnpc(int (*func)(struct npc_data* nd, va_list args), ...) { /// Applies func to everything in the db. /// Stops iterating gif func returns -1. -void map_vforeachregen(int (*func)(struct block_list* bl, va_list args), va_list args) { - DBIterator* iter; - struct block_list* bl; +void map_vforeachregen(int (*func)(struct block_list* bl, va_list args), va_list args) +{ + struct DBIterator *iter = db_iterator(map->regen_db); + struct block_list *bl = NULL; - iter = db_iterator(map->regen_db); for (bl = dbi_first(iter); dbi_exists(iter); bl = dbi_next(iter)) { va_list argscopy; int ret; @@ -2358,11 +2391,11 @@ void map_foreachregen(int (*func)(struct block_list* bl, va_list args), ...) { /// Applies func to everything in the db. /// Stops iterating if func returns -1. -void map_vforeachiddb(int (*func)(struct block_list* bl, va_list args), va_list args) { - DBIterator* iter; - struct block_list* bl; +void map_vforeachiddb(int (*func)(struct block_list* bl, va_list args), va_list args) +{ + struct DBIterator *iter = db_iterator(map->id_db); + struct block_list *bl = NULL; - iter = db_iterator(map->id_db); for (bl = dbi_first(iter); dbi_exists(iter); bl = dbi_next(iter)) { va_list argscopy; int ret; @@ -2389,11 +2422,10 @@ void map_foreachiddb(int (*func)(struct block_list* bl, va_list args), ...) { /// Iterator. /// Can filter by bl type. -struct s_mapiterator -{ - enum e_mapitflags flags;// flags for special behaviour - enum bl_type types;// what bl types to return - DBIterator* dbi;// database iterator +struct s_mapiterator { + enum e_mapitflags flags; ///< flags for special behaviour + enum bl_type types; ///< what bl types to return + struct DBIterator *dbi; ///< database iterator }; /// Returns true if the block_list matches the description in the iterator. @@ -2547,6 +2579,7 @@ bool map_addnpc(int16 m,struct npc_data *nd) { // Returns the index of successful, or -1 if the list was full. int map_addmobtolist(unsigned short m, struct spawn_data *spawn) { int i; + nullpo_retr(-1, spawn); ARR_FIND( 0, MAX_MOB_LIST_PER_MAP, i, map->list[m].moblist[i] == NULL ); if( i < MAX_MOB_LIST_PER_MAP ) { map->list[m].moblist[i] = spawn; @@ -2628,6 +2661,7 @@ int map_removemobs_timer(int tid, int64 tick, int id, intptr_t data) { } void map_removemobs(int16 m) { + Assert_retv(m >= 0 && m < map->count); if (map->list[m].mob_delete_timer != INVALID_TIMER) // should never happen return; //Mobs are already scheduled for removal @@ -2662,6 +2696,8 @@ int16 map_mapindex2mapid(unsigned short map_index) { int map_mapname2ipport(unsigned short name, uint32* ip, uint16* port) { struct map_data_other_server *mdos; + nullpo_retr(-1, ip); + nullpo_retr(-1, port); mdos = (struct map_data_other_server*)uidb_get(map->map_db,(unsigned int)name); if(mdos==NULL || mdos->cell) //If gat isn't null, this is a local map. return -1; @@ -2737,11 +2773,19 @@ uint8 map_calc_dir(struct block_list* src, int16 x, int16 y) *------------------------------------------*/ int map_random_dir(struct block_list *bl, int16 *x, int16 *y) { - short xi = *x-bl->x; - short yi = *y-bl->y; + short xi; + short yi; short i=0; - int dist2 = xi*xi + yi*yi; - short dist = (short)sqrt((float)dist2); + int dist2; + short dist; + + nullpo_ret(bl); + nullpo_ret(x); + nullpo_ret(y); + xi = *x-bl->x; + yi = *y-bl->y; + dist2 = xi*xi + yi*yi; + dist = (short)sqrt((float)dist2); if (dist < 1) dist =1; @@ -2794,7 +2838,10 @@ int map_cell2gat(struct mapcell cell) { return 1; // default to 'wall' } void map_cellfromcache(struct map_data *m) { - struct map_cache_map_info *info = (struct map_cache_map_info *)m->cellPos; + struct map_cache_map_info *info; + + nullpo_retv(m); + info = (struct map_cache_map_info *)m->cellPos; if (info) { char decode_buffer[MAX_MAP_SIZE]; @@ -2897,6 +2944,7 @@ int map_getcellp(struct map_data* m, const struct block_list *bl, int16 x, int16 /* [Ind/Hercules] */ int map_sub_getcellp(struct map_data* m, const struct block_list *bl, int16 x, int16 y, cell_chk cellchk) { + nullpo_ret(m); map->cellfromcache(m); m->getcellp = map->getcellp; m->setcell = map->setcell; @@ -2963,6 +3011,9 @@ void map_setgatcell(int16 m, int16 x, int16 y, int gat) { *------------------------------------------*/ void map_iwall_nextxy(int16 x, int16 y, int8 dir, int pos, int16 *x1, int16 *y1) { + nullpo_retv(x1); + nullpo_retv(y1); + if( dir == 0 || dir == 4 ) *x1 = x; // Keep X else if( dir > 0 && dir < 4 ) @@ -3022,12 +3073,15 @@ bool map_iwall_set(int16 m, int16 x, int16 y, int size, int8 dir, bool shootable return true; } -void map_iwall_get(struct map_session_data *sd) { +void map_iwall_get(struct map_session_data *sd) +{ struct iwall_data *iwall; - DBIterator* iter; + struct DBIterator *iter; int16 x1, y1; int i; + nullpo_retv(sd); + if( map->list[sd->bl.m].iwall_num < 1 ) return; @@ -3068,7 +3122,7 @@ void map_iwall_remove(const char *wall_name) /** * @see DBCreateData */ -DBData create_map_data_other_server(DBKey key, va_list args) +struct DBData create_map_data_other_server(union DBKey key, va_list args) { struct map_data_other_server *mdos; unsigned short map_index = (unsigned short)key.ui; @@ -3103,9 +3157,10 @@ int map_setipport(unsigned short map_index, uint32 ip, uint16 port) * Delete all the other maps server management * @see DBApply */ -int map_eraseallipport_sub(DBKey key, DBData *data, va_list va) +int map_eraseallipport_sub(union DBKey key, struct DBData *data, va_list va) { struct map_data_other_server *mdos = DB->data2ptr(data); + nullpo_ret(mdos); if(mdos->cell == NULL) { db_remove(map->map_db,key); aFree(mdos); @@ -3192,6 +3247,9 @@ int map_readfromcache(struct map_data *m, char *buffer) { struct map_cache_map_info *info = NULL; char *p = buffer + sizeof(struct map_cache_main_header); + nullpo_ret(m); + nullpo_ret(buffer); + for(i = 0; i < header->map_count; i++) { info = (struct map_cache_map_info *)p; @@ -3233,6 +3291,7 @@ int map_addmap(const char* mapname) { } void map_delmapid(int id) { + Assert_retv(id >= 0 && id < map->count); ShowNotice("Removing map [ %s ] from maplist"CL_CLL"\n",map->list[id].name); memmove(map->list+id, map->list+id+1, sizeof(map->list[0])*(map->count-id-1)); map->count--; @@ -3242,6 +3301,7 @@ int map_delmap(char* mapname) { int i; char map_name[MAP_NAME_LENGTH]; + nullpo_ret(mapname); if (strcmpi(mapname, "all") == 0) { map->count = 0; return 0; @@ -3263,6 +3323,8 @@ int map_delmap(char* mapname) { void map_zone_clear_single(struct map_zone_data *zone) { int i; + nullpo_retv(zone); + for(i = 0; i < zone->disabled_skills_count; i++) { aFree(zone->disabled_skills[i]); } @@ -3300,9 +3362,10 @@ void map_zone_clear_single(struct map_zone_data *zone) { /** * **/ -void map_zone_db_clear(void) { - struct map_zone_data *zone; - DBIterator *iter = db_iterator(map->zone_db); +void map_zone_db_clear(void) +{ + struct DBIterator *iter = db_iterator(map->zone_db); + struct map_zone_data *zone = NULL; for(zone = dbi_first(iter); dbi_exists(iter); zone = dbi_next(iter)) { map->zone_clear_single(zone); @@ -3319,6 +3382,7 @@ void map_zone_db_clear(void) { } void map_clean(int i) { int v; + Assert_retv(i >= 0 && i < map->count); if(map->list[i].cell && map->list[i].cell != (struct mapcell *)0xdeadbeaf) aFree(map->list[i].cell); if(map->list[i].block) aFree(map->list[i].block); if(map->list[i].block_mob) aFree(map->list[i].block_mob); @@ -3517,6 +3581,7 @@ int map_waterheight(char* mapname) char fn[256]; char *rsw, *found; + nullpo_retr(NO_WATER, mapname); //Look up for the rsw snprintf(fn, sizeof(fn), "data\\%s.rsw", mapname); @@ -3545,6 +3610,7 @@ int map_readgat (struct map_data* m) int water_height; size_t xy, off, num_cells; + nullpo_ret(m); sprintf(filename, "data\\%s.gat", m->name); gat = (uint8 *) grfio_read(filename); @@ -3582,10 +3648,12 @@ int map_readgat (struct map_data* m) * Add/Remove map to the map_db *--------------------------------------*/ void map_addmap2db(struct map_data *m) { + nullpo_retv(m); map->index2mapid[m->index] = m->m; } void map_removemapdb(struct map_data *m) { + nullpo_retv(m); map->index2mapid[m->index] = -1; } @@ -3690,6 +3758,8 @@ int map_config_read(char *cfgName) { char line[1024], w1[1024], w2[1024]; FILE *fp; + nullpo_retr(1, cfgName); + fp = fopen(cfgName,"r"); if( fp == NULL ) { ShowError("Map configuration file not found at: %s\n", cfgName); @@ -3784,6 +3854,7 @@ int map_config_read_sub(char *cfgName) { char line[1024], w1[1024], w2[1024]; FILE *fp; + nullpo_retr(1, cfgName); fp = fopen(cfgName,"r"); if (fp == NULL) { ShowError("Map configuration file not found at: %s\n", cfgName); @@ -3821,6 +3892,7 @@ void map_reloadnpc_sub(char *cfgName) { char line[1024], w1[1024], w2[1024]; FILE *fp; + nullpo_retv(cfgName); fp = fopen(cfgName,"r"); if (fp == NULL) { ShowError("Map configuration file not found at: %s\n", cfgName); @@ -3882,6 +3954,7 @@ int inter_config_read(char *cfgName) { char line[1024],w1[1024],w2[1024]; FILE *fp; + nullpo_retr(1, cfgName); if (!(fp = fopen(cfgName,"r"))) { ShowError("File not found: %s\n",cfgName); return 1; @@ -3979,6 +4052,9 @@ struct map_zone_data *map_merge_zone(struct map_zone_data *main, struct map_zone struct map_zone_data *zone = NULL; int cursor, i, j; + nullpo_retr(NULL, main); + nullpo_retr(NULL, other); + sprintf(newzone, "%s+%s",main->name,other->name); if( (zone = strdb_get(map->zone_db, newzone)) ) @@ -4072,6 +4148,7 @@ void map_zone_change2(int m, struct map_zone_data *zone) { const char *empty = ""; + Assert_retv(m >= 0 && m < map->count); if( map->list[m].zone == zone ) return; @@ -4089,6 +4166,7 @@ void map_zone_change2(int m, struct map_zone_data *zone) } /* when changing from a mapflag to another during runtime */ void map_zone_change(int m, struct map_zone_data *zone, const char* start, const char* buffer, const char* filepath) { + Assert_retv(m >= 0 && m < map->count); map->list[m].prev_zone = map->list[m].zone; if( map->list[m].zone_mf_count ) @@ -4101,6 +4179,7 @@ void map_zone_remove(int m) char flag[MAP_ZONE_MAPFLAG_LENGTH], params[MAP_ZONE_MAPFLAG_LENGTH]; unsigned short k; const char *empty = ""; + Assert_retv(m >= 0 && m < map->count); for(k = 0; k < map->list[m].zone_mf_count; k++) { size_t len = strlen(map->list[m].zone_mf[k]),j; params[0] = '\0'; @@ -4123,6 +4202,7 @@ void map_zone_remove(int m) map->list[m].zone_mf_count = 0; } static inline void map_zone_mf_cache_add(int m, char *rflag) { + Assert_retv(m >= 0 && m < map->count); RECREATE(map->list[m].zone_mf, char *, ++map->list[m].zone_mf_count); CREATE(map->list[m].zone_mf[map->list[m].zone_mf_count - 1], char, MAP_ZONE_MAPFLAG_LENGTH); safestrncpy(map->list[m].zone_mf[map->list[m].zone_mf_count - 1], rflag, MAP_ZONE_MAPFLAG_LENGTH); @@ -4133,6 +4213,10 @@ bool map_zone_mf_cache(int m, char *flag, char *params) { char rflag[MAP_ZONE_MAPFLAG_LENGTH]; int state = 1; + nullpo_retr(false, flag); + nullpo_retr(false, params); + Assert_retr(false, m >= 0 && m < map->count); + if (params[0] != '\0' && !strcmpi(params, "off")) state = 0; @@ -4829,6 +4913,8 @@ void map_zone_apply(int m, struct map_zone_data *zone, const char* start, const int i; const char *empty = ""; char flag[MAP_ZONE_MAPFLAG_LENGTH], params[MAP_ZONE_MAPFLAG_LENGTH]; + Assert_retv(m >= 0 && m < map->count); + nullpo_retv(zone); map->list[m].zone = zone; for(i = 0; i < zone->mapflags_count; i++) { size_t len = strlen(zone->mapflags[i]); @@ -4939,8 +5025,9 @@ unsigned short map_zone_str2skillid(const char *name) { enum bl_type map_zone_bl_type(const char *entry, enum map_zone_skill_subtype *subtype) { char temp[200], *parse; enum bl_type bl = BL_NUL; - *subtype = MZS_NONE; + nullpo_retr(BL_NUL, subtype); + *subtype = MZS_NONE; if( !entry ) return BL_NUL; @@ -5414,6 +5501,8 @@ int map_get_new_bonus_id (void) { void map_add_questinfo(int m, struct questinfo *qi) { unsigned short i; + nullpo_retv(qi); + Assert_retv(m >= 0 && m < map->count); /* duplicate, override */ for(i = 0; i < map->list[m].qi_count; i++) { if( map->list[m].qi_data[i].nd == qi->nd ) @@ -5429,6 +5518,7 @@ void map_add_questinfo(int m, struct questinfo *qi) { bool map_remove_questinfo(int m, struct npc_data *nd) { unsigned short i; + Assert_retr(false, m >= 0 && m < map->count); for(i = 0; i < map->list[m].qi_count; i++) { struct questinfo *qi = &map->list[m].qi_data[i]; if( qi->nd == nd ) { @@ -5445,7 +5535,8 @@ bool map_remove_questinfo(int m, struct npc_data *nd) { /** * @see DBApply */ -int map_db_final(DBKey key, DBData *data, va_list ap) { +int map_db_final(union DBKey key, struct DBData *data, va_list ap) +{ struct map_data_other_server *mdos = DB->data2ptr(data); if(mdos && iMalloc->verify_ptr(mdos) && mdos->cell == NULL) @@ -5457,7 +5548,7 @@ int map_db_final(DBKey key, DBData *data, va_list ap) { /** * @see DBApply */ -int nick_db_final(DBKey key, DBData *data, va_list args) +int nick_db_final(union DBKey key, struct DBData *data, va_list args) { struct charid2nick* p = DB->data2ptr(data); struct charid_request* req; @@ -5504,7 +5595,8 @@ int cleanup_sub(struct block_list *bl, va_list ap) { /** * @see DBApply */ -int cleanup_db_sub(DBKey key, DBData *data, va_list va) { +int cleanup_db_sub(union DBKey key, struct DBData *data, va_list va) +{ return map->cleanup_sub(DB->data2ptr(data), va); } diff --git a/src/map/map.h b/src/map/map.h index ff7ca2d38..dbd30febf 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -27,11 +27,12 @@ #include "common/db.h" #include "common/mapindex.h" #include "common/mmo.h" -#include "common/sql.h" #include <stdio.h> #include <stdarg.h> +/* Forward Declarations */ +struct Sql; // common/sql.h struct mob_data; struct npc_data; struct channel_data; @@ -398,7 +399,7 @@ struct flooritem_data { struct item item_data; }; -enum status_point_types { +enum status_point_types { //we better clean up this enum and change it name [Hemagx] SP_SPEED,SP_BASEEXP,SP_JOBEXP,SP_KARMA,SP_MANNER,SP_HP,SP_MAXHP,SP_SP, // 0-7 SP_MAXSP,SP_STATUSPOINT,SP_0a,SP_BASELEVEL,SP_SKILLPOINT,SP_STR,SP_AGI,SP_VIT, // 8-15 SP_INT,SP_DEX,SP_LUK,SP_CLASS,SP_ZENY,SP_SEX,SP_NEXTBASEEXP,SP_NEXTJOBEXP, // 16-23 @@ -993,7 +994,7 @@ struct map_interface { char server_id[32]; char server_pw[100]; char server_db[32]; - Sql* mysql_handle; + struct Sql *mysql_handle; int port; int users; @@ -1003,16 +1004,16 @@ struct map_interface { int16 index2mapid[MAX_MAPINDEX]; /* */ - DBMap* id_db; // int id -> struct block_list* - DBMap* pc_db; // int id -> struct map_session_data* - DBMap* mobid_db; // int id -> struct mob_data* - DBMap* bossid_db; // int id -> struct mob_data* (MVP db) - DBMap* map_db; // unsigned int mapindex -> struct map_data_other_server* - DBMap* nick_db; // int char_id -> struct charid2nick* (requested names of offline characters) - DBMap* charid_db; // int char_id -> struct map_session_data* - DBMap* regen_db; // int id -> struct block_list* (status_natural_heal processing) - DBMap* zone_db; // string => struct map_zone_data - DBMap* iwall_db; + struct DBMap *id_db; // int id -> struct block_list* + struct DBMap *pc_db; // int id -> struct map_session_data* + struct DBMap *mobid_db; // int id -> struct mob_data* + struct DBMap *bossid_db; // int id -> struct mob_data* (MVP db) + struct DBMap *map_db; // unsigned int mapindex -> struct map_data_other_server* + struct DBMap *nick_db; // int char_id -> struct charid2nick* (requested names of offline characters) + struct DBMap *charid_db; // int char_id -> struct map_session_data* + struct DBMap *regen_db; // int id -> struct block_list* (status_natural_heal processing) + struct DBMap *zone_db; // string => struct map_zone_data + struct DBMap *iwall_db; struct block_list **block_free; int block_free_count, block_free_lock, block_free_list_size; struct block_list **bl_list; @@ -1166,7 +1167,7 @@ END_ZEROED_BLOCK; int (*freeblock_timer) (int tid, int64 tick, int id, intptr_t data); int (*searchrandfreecell) (int16 m, const struct block_list *bl, int16 *x, int16 *y, int stack); int (*count_sub) (struct block_list *bl, va_list ap); - DBData (*create_charid2nick) (DBKey key, va_list args); + struct DBData (*create_charid2nick) (union DBKey key, va_list args); int (*removemobs_sub) (struct block_list *bl, va_list ap); struct mapcell (*gat2cell) (int gat); int (*cell2gat) (struct mapcell cell); @@ -1175,8 +1176,8 @@ END_ZEROED_BLOCK; int (*sub_getcellp) (struct map_data *m, const struct block_list *bl, int16 x, int16 y, cell_chk cellchk); void (*sub_setcell) (int16 m, int16 x, int16 y, cell_t cell, bool flag); void (*iwall_nextxy) (int16 x, int16 y, int8 dir, int pos, int16 *x1, int16 *y1); - DBData (*create_map_data_other_server) (DBKey key, va_list args); - int (*eraseallipport_sub) (DBKey key, DBData *data, va_list va); + struct DBData (*create_map_data_other_server) (union DBKey key, va_list args); + int (*eraseallipport_sub) (union DBKey key, struct DBData *data, va_list va); char* (*init_mapcache) (FILE *fp); int (*readfromcache) (struct map_data *m, char *buffer); int (*addmap) (const char *mapname); @@ -1197,9 +1198,9 @@ END_ZEROED_BLOCK; unsigned short (*zone_str2skillid) (const char *name); enum bl_type (*zone_bl_type) (const char *entry, enum map_zone_skill_subtype *subtype); void (*read_zone_db) (void); - int (*db_final) (DBKey key, DBData *data, va_list ap); - int (*nick_db_final) (DBKey key, DBData *data, va_list args); - int (*cleanup_db_sub) (DBKey key, DBData *data, va_list va); + int (*db_final) (union DBKey key, struct DBData *data, va_list ap); + int (*nick_db_final) (union DBKey key, struct DBData *data, va_list args); + int (*cleanup_db_sub) (union DBKey key, struct DBData *data, va_list va); int (*abort_sub) (struct map_session_data *sd, va_list ap); void (*update_cell_bl) (struct block_list *bl, bool increase); int (*get_new_bonus_id) (void); diff --git a/src/map/mapreg.h b/src/map/mapreg.h index dfe1dfb2d..d19b2bb80 100644 --- a/src/map/mapreg.h +++ b/src/map/mapreg.h @@ -59,7 +59,7 @@ struct mapreg_interface { void (*load) (void); void (*save) (void); int (*save_timer) (int tid, int64 tick, int id, intptr_t data); - int (*destroyreg) (DBKey key, DBData *data, va_list ap); + int (*destroyreg) (union DBKey key, struct DBData *data, va_list ap); void (*reload) (void); bool (*config_read) (const char *w1, const char *w2); }; diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c index 46962ac14..82ce39d64 100644 --- a/src/map/mapreg_sql.c +++ b/src/map/mapreg_sql.c @@ -28,6 +28,7 @@ #include "common/db.h" #include "common/ers.h" #include "common/memmgr.h" +#include "common/nullpo.h" #include "common/showmsg.h" #include "common/sql.h" #include "common/strlib.h" @@ -76,6 +77,7 @@ bool mapreg_setreg(int64 uid, int val) { unsigned int i = script_getvaridx(uid); const char* name = script->get_str(num); + nullpo_retr(true, name); if( val != 0 ) { if( (m = i64db_get(mapreg->regs.vars, uid)) ) { m->u.i = val; @@ -132,6 +134,8 @@ bool mapreg_setregstr(int64 uid, const char* str) { unsigned int i = script_getvaridx(uid); const char* name = script->get_str(num); + nullpo_retr(true, name); + if( str == NULL || *str == 0 ) { if( i ) script->array_update(&mapreg->regs, uid, true); @@ -190,7 +194,7 @@ void script_load_mapreg(void) { | varname | index | value | +-------------------------+ */ - SqlStmt* stmt = SQL->StmtMalloc(map->mysql_handle); + struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle); char varname[SCRIPT_VARNAME_LENGTH+1]; int index; char value[255+1]; @@ -236,15 +240,17 @@ void script_load_mapreg(void) { /** * Saves permanent variables to database. */ -void script_save_mapreg(void) { +void script_save_mapreg(void) +{ if (mapreg->dirty) { - DBIterator *iter = db_iterator(mapreg->regs.vars); - struct mapreg_save *m; + struct DBIterator *iter = db_iterator(mapreg->regs.vars); + struct mapreg_save *m = NULL; for (m = dbi_first(iter); dbi_exists(iter); m = dbi_next(iter)) { if (m->save) { int num = script_getvarid(m->uid); int i = script_getvaridx(m->uid); const char* name = script->get_str(num); + nullpo_retv(name); if (!m->is_string) { if( SQL_ERROR == SQL->Query(map->mysql_handle, "UPDATE `%s` SET `value`='%d' WHERE `varname`='%s' AND `index`='%d' LIMIT 1", mapreg->table, m->u.i, name, i) ) Sql_ShowDebug(map->mysql_handle); @@ -277,7 +283,8 @@ int script_autosave_mapreg(int tid, int64 tick, int id, intptr_t data) { * * @see DBApply */ -int mapreg_destroyreg(DBKey key, DBData *data, va_list ap) { +int mapreg_destroyreg(union DBKey key, struct DBData *data, va_list ap) +{ struct mapreg_save *m = NULL; if (data->type != DB_DATA_PTR) // Sanity check @@ -344,6 +351,8 @@ void mapreg_init(void) { * Loads the mapreg configuration file. */ bool mapreg_config_read(const char* w1, const char* w2) { + nullpo_retr(false, w1); + nullpo_retr(false, w2); if(!strcmpi(w1, "mapreg_db")) safestrncpy(mapreg->table, w2, sizeof(mapreg->table)); else diff --git a/src/map/mercenary.c b/src/map/mercenary.c index fa337e13b..0b055bedf 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -234,6 +234,7 @@ int mercenary_set_calls(struct mercenary_data *md, int value) int mercenary_save(struct mercenary_data *md) { + nullpo_retr(1, md); md->mercenary.hp = md->battle_status.hp; md->mercenary.sp = md->battle_status.sp; md->mercenary.life_time = mercenary->get_lifetime(md); @@ -265,7 +266,10 @@ int merc_contract_end_timer(int tid, int64 tick, int id, intptr_t data) { int merc_delete(struct mercenary_data *md, int reply) { - struct map_session_data *sd = md->master; + struct map_session_data *sd; + + nullpo_retr(0, md); + sd = md->master; md->mercenary.life_time = 0; mercenary->contract_stop(md); @@ -299,6 +303,7 @@ void merc_contract_stop(struct mercenary_data *md) void merc_contract_init(struct mercenary_data *md) { + nullpo_retv(md); if( md->contract_timer == INVALID_TIMER ) md->contract_timer = timer->add(timer->gettick() + md->mercenary.life_time, mercenary->contract_end_timer, md->master->bl.id, 0); @@ -310,8 +315,10 @@ int merc_data_received(const struct s_mercenary *merc, bool flag) struct map_session_data *sd; struct mercenary_data *md; struct s_mercenary_db *db; - int i = mercenary->search_index(merc->class_); + int i; + nullpo_ret(merc); + i = mercenary->search_index(merc->class_); if( (sd = map->charid2sd(merc->char_id)) == NULL ) return 0; if (!flag || i == INDEX_NOT_FOUND) { @@ -370,6 +377,7 @@ int merc_data_received(const struct s_mercenary *merc, bool flag) void mercenary_heal(struct mercenary_data *md, int hp, int sp) { + nullpo_retv(md); if( hp ) clif->mercenary_updatestatus(md->master, SP_HP); if( sp ) @@ -387,12 +395,14 @@ int mercenary_killbonus(struct mercenary_data *md) const enum sc_type scs[] = { SC_MER_FLEE, SC_MER_ATK, SC_MER_HP, SC_MER_SP, SC_MER_HIT }; int index = rnd() % ARRAYLENGTH(scs); + nullpo_ret(md); sc_start(NULL,&md->bl, scs[index], 100, rnd() % 5, 600000); return 0; } int mercenary_kills(struct mercenary_data *md) { + nullpo_ret(md); md->mercenary.kill_count++; md->mercenary.kill_count = cap_value(md->mercenary.kill_count, 0, INT_MAX); @@ -425,6 +435,8 @@ bool read_mercenarydb_sub(char* str[], int columns, int current) { struct s_mercenary_db *db; struct status_data *mstatus; + nullpo_retr(false, str); + Assert_retr(false, current >= 0 && current < MAX_MERCENARY_CLASS); db = &mercenary->db[current]; db->class_ = atoi(str[0]); safestrncpy(db->sprite, str[1], NAME_LENGTH); @@ -486,6 +498,7 @@ bool read_mercenary_skilldb_sub(char* str[], int columns, int current) int i, class_; uint16 skill_id, skill_lv; + nullpo_retr(false, str); class_ = atoi(str[0]); ARR_FIND(0, MAX_MERCENARY_CLASS, i, class_ == mercenary->db[i].class_); if( i == MAX_MERCENARY_CLASS ) diff --git a/src/map/mob.c b/src/map/mob.c index 8d38fead7..19fee52a5 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -114,6 +114,8 @@ struct mob_chat *mob_chat(short id) { int mobdb_searchname(const char *str) { int i; + + nullpo_ret(str); for(i=0;i<=MAX_MOB_DB;i++){ struct mob_db *monster = mob->db(i); if(monster == mob->dummy) //Skip dummy mobs. @@ -129,10 +131,13 @@ int mobdb_searchname(const char *str) return 0; } int mobdb_searchname_array_sub(struct mob_db* monster, const char *str, int flag) { + + nullpo_ret(monster); if (monster == mob->dummy) return 1; if(!monster->base_exp && !monster->job_exp && monster->spawn[0].qty < 1) return 1; // Monsters with no base/job exp and no spawn point are, by this criteria, considered "slave mobs" and excluded from search results + nullpo_ret(str); if( !flag ) { if(stristr(monster->jname,str)) return 0; @@ -156,6 +161,7 @@ void mvptomb_create(struct mob_data *md, char *killer, time_t time) { struct npc_data *nd; + nullpo_retv(md); if ( md->tomb_nid ) mob->mvptomb_destroy(md); @@ -181,6 +187,7 @@ void mvptomb_create(struct mob_data *md, char *killer, time_t time) void mvptomb_destroy(struct mob_data *md) { struct npc_data *nd; + nullpo_retv(md); if ( (nd = map->id2nd(md->tomb_nid)) ) { int16 m, i; @@ -212,6 +219,7 @@ int mobdb_searchname_array(struct mob_db** data, int size, const char *str, int { int count = 0, i; struct mob_db* monster; + nullpo_ret(data); for(i=0;i<=MAX_MOB_DB;i++){ monster = mob->db(i); if (monster == mob->dummy || mob->is_clone(i) ) //keep clones out (or you leak player stats) @@ -253,6 +261,7 @@ int mob_parse_dataset(struct spawn_data *data) { size_t len; + nullpo_ret(data); if ((!mob->db_checkid(data->class_) && !mob->is_clone(data->class_)) || !data->num) return 0; @@ -276,6 +285,7 @@ int mob_parse_dataset(struct spawn_data *data) *------------------------------------------*/ struct mob_data* mob_spawn_dataset(struct spawn_data *data) { struct mob_data *md = NULL; + nullpo_retr(NULL, data); CREATE(md, struct mob_data, 1); md->bl.id= npc->get_new_npc_id(); md->bl.type = BL_MOB; @@ -328,6 +338,7 @@ int mob_get_random_id(int type, int flag, int lv) ShowError("mob_get_random_id: Invalid type (%d) of random monster.\n", type); return 0; } + Assert_ret(type >= 0 && type < MAX_RANDOMMONSTER); do { if (type) class_ = summon[type].class_[rnd()%summon[type].qty]; @@ -410,7 +421,7 @@ bool mob_ksprotected(struct block_list *src, struct block_list *target) { if( DIFF_TICK(sd->ks_floodprotect_tick, tick) <= 0 ) { sprintf(output, "[KS Warning!! - Owner : %s]", pl_sd->status.name); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); sd->ks_floodprotect_tick = tick + 2000; } @@ -419,7 +430,7 @@ bool mob_ksprotected(struct block_list *src, struct block_list *target) { if( DIFF_TICK(pl_sd->ks_floodprotect_tick, tick) <= 0 ) { sprintf(output, "[Watch out! %s is trying to KS you!]", sd->status.name); - clif_disp_onlyself(pl_sd, output, strlen(output)); + clif_disp_onlyself(pl_sd, output); pl_sd->ks_floodprotect_tick = tick + 2000; } @@ -634,6 +645,11 @@ int mob_spawn_guardian(const char* mapname, short x, short y, const char* mobnam struct guild *g=NULL; struct guild_castle *gc; int16 m; + + nullpo_ret(mapname); + nullpo_ret(mobname); + nullpo_ret(event); + memset(&data, 0, sizeof(struct spawn_data)); data.num = 1; @@ -728,6 +744,10 @@ int mob_spawn_bg(const char* mapname, short x, short y, const char* mobname, int struct spawn_data data; int16 m; + nullpo_ret(mapname); + nullpo_ret(mobname); + nullpo_ret(event); + if( (m = map->mapname2mapid(mapname)) < 0 ) { ShowWarning("mob_spawn_bg: Map [%s] not found.\n", mapname); return 0; @@ -846,6 +866,8 @@ int mob_setdelayspawn(struct mob_data *md) uint32 mode; struct mob_db *db; + nullpo_ret(md); + if (!md->spawn) //Doesn't has respawn data! return unit->free(&md->bl,CLR_DEAD); @@ -903,6 +925,7 @@ int mob_spawn (struct mob_data *md) int64 tick = timer->gettick(); int64 c = 0; + nullpo_retr(1, md); md->last_thinktime = tick; if (md->bl.prev != NULL) unit->remove_map(&md->bl,CLR_RESPAWN,ALC_MARK); @@ -992,6 +1015,8 @@ int mob_spawn (struct mob_data *md) *------------------------------------------*/ int mob_can_changetarget(const struct mob_data *md, const struct block_list *target, uint32 mode) { + nullpo_ret(md); + nullpo_ret(target); // if the monster was provoked ignore the above rule [celest] if(md->state.provoke_flag) { @@ -1057,6 +1082,8 @@ int mob_ai_sub_hard_activesearch(struct block_list *bl, va_list ap) md=va_arg(ap,struct mob_data *); target= va_arg(ap,struct block_list**); mode = va_arg(ap, uint32); + nullpo_ret(md); + nullpo_ret(target); //If can't seek yet, not an enemy, or you can't attack it, skip. if (md->bl.id == bl->id || (*target) == bl || !status->check_skilluse(&md->bl, bl, 0, 0)) @@ -1111,8 +1138,10 @@ int mob_ai_sub_hard_changechase(struct block_list *bl,va_list ap) { struct block_list **target; nullpo_ret(bl); - md=va_arg(ap,struct mob_data *); - target= va_arg(ap,struct block_list**); + md = va_arg(ap,struct mob_data *); + target = va_arg(ap,struct block_list**); + nullpo_ret(md); + nullpo_ret(target); //If can't seek yet, not an enemy, or you can't attack it, skip. if( md->bl.id == bl->id || *target == bl @@ -1139,6 +1168,8 @@ int mob_ai_sub_hard_bg_ally(struct block_list *bl,va_list ap) { nullpo_ret(bl); md=va_arg(ap,struct mob_data *); target= va_arg(ap,struct block_list**); + nullpo_retr(1, md); + nullpo_retr(1, target); if( status->check_skilluse(&md->bl, bl, 0, 0) && battle->check_target(&md->bl,bl,BCT_ENEMY)<=0 ) { (*target) = bl; @@ -1157,6 +1188,8 @@ int mob_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap) md=va_arg(ap,struct mob_data *); target= va_arg(ap,struct block_list**); + nullpo_ret(md); + nullpo_ret(target); dist=distance_bl(&md->bl, bl); if(mob->can_reach(md,bl,dist+1, MSS_LOOT) && @@ -1177,6 +1210,9 @@ int mob_warpchase_sub(struct block_list *bl,va_list ap) { struct npc_data *nd = NULL; nullpo_ret(bl); + nullpo_ret(target); + nullpo_ret(target_nd); + nullpo_ret(min_distance); Assert_ret(bl->type == BL_NPC); nd = BL_UCAST(BL_NPC, bl); @@ -1201,6 +1237,7 @@ int mob_warpchase_sub(struct block_list *bl,va_list ap) { int mob_ai_sub_hard_slavemob(struct mob_data *md, int64 tick) { struct block_list *bl; + nullpo_ret(md); bl=map->id2bl(md->master_id); if (!bl || status->isdead(bl)) { @@ -1378,6 +1415,7 @@ int mob_warpchase(struct mob_data *md, struct block_list *target) { struct npc_data *warp = NULL; int distance = AREA_SIZE; + nullpo_ret(md); if (!(target && battle_config.mob_ai&0x40 && battle_config.mob_warp&1)) return 0; //Can't warp chase. @@ -1405,6 +1443,7 @@ bool mob_ai_sub_hard(struct mob_data *md, int64 tick) { uint32 mode; int view_range, can_move; + nullpo_retr(false, md); if(md->bl.prev == NULL || md->status.hp <= 0) return false; @@ -1702,6 +1741,7 @@ int mob_ai_sub_hard_timer(struct block_list *bl, va_list ap) *------------------------------------------*/ int mob_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) { int64 tick; + nullpo_ret(sd); tick=va_arg(ap, int64); map->foreachinrange(mob->ai_sub_hard_timer,&sd->bl, AREA_SIZE+ACTIVE_AI_RANGE, BL_MOB,tick); @@ -1810,7 +1850,10 @@ struct item_drop* mob_setdropitem(int nameid, int qty, struct item_data *data) { *------------------------------------------*/ struct item_drop* mob_setlootitem(struct item* item) { - struct item_drop *drop = ers_alloc(item_drop_ers, struct item_drop); + struct item_drop *drop ; + + nullpo_retr(NULL, item); + drop = ers_alloc(item_drop_ers, struct item_drop); memcpy(&drop->item_data, item, sizeof(struct item)); drop->next = NULL; return drop; @@ -1847,6 +1890,9 @@ void mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, struct ite { struct map_session_data *sd = NULL; + nullpo_retv(md); + nullpo_retv(dlist); + nullpo_retv(ditem); //Logs items, dropped by mobs [Lupus] logs->pick_mob(md, loot?LOG_TYPE_LOOT:LOG_TYPE_PICKDROP_MONSTER, -ditem->item_data.amount, &ditem->item_data, NULL); @@ -1932,6 +1978,9 @@ void mob_log_damage(struct mob_data *md, struct block_list *src, int damage) { int char_id = 0, flag = MDLF_NORMAL; + nullpo_retv(md); + nullpo_retv(src); + if( damage < 0 ) return; //Do nothing for absorbed damage. if( !damage && !(src->type&DEFAULT_ENEMY_TYPE(md)) ) @@ -2042,6 +2091,7 @@ void mob_log_damage(struct mob_data *md, struct block_list *src, int damage) } //Call when a mob has received damage. void mob_damage(struct mob_data *md, struct block_list *src, int damage) { + nullpo_retv(md); if (damage > 0) { //Store total damage... if (UINT_MAX - (unsigned int)damage > md->tdmg) md->tdmg+=damage; @@ -2105,12 +2155,14 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) { int id,zeny; unsigned int base_exp,job_exp; } pt[DAMAGELOG_SIZE] = { { 0 } }; - int i, temp, count, m = md->bl.m; + int i, temp, count, m; int dmgbltypes = 0; // bitfield of all bl types, that caused damage to the mob and are eligible for exp distribution unsigned int mvp_damage; int64 tick = timer->gettick(); bool rebirth, homkillonly; + nullpo_retr(3, md); + m = md->bl.m; mstatus = &md->status; if( md->guardian_data && md->guardian_data->number >= 0 && md->guardian_data->number < MAX_GUARDIANS ) @@ -2395,14 +2447,16 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) { char message[128]; sprintf (message, msg_txt(541), mvp_sd->status.name, md->name, it->jname, (float)drop_rate/100); //MSG: "'%s' won %s's %s (chance: %0.02f%%)" - intif->broadcast(message, strlen(message)+1, BC_DEFAULT); + intif->broadcast(message, (int)strlen(message)+1, BC_DEFAULT); } /* heres the thing we got the feature set up however we're still discussing how to best define the ids, * so while we discuss, for a small period of time, the list is hardcoded (yes officially only those 2 use it, * thus why we're unsure on how to best place the setting) */ /* temp, will not be hardcoded for long thudu. */ - if (it->nameid == ITEMID_GOLD_KEY77 || it->nameid == ITEMID_SILVER_KEY77) /* for when not hardcoded: add a check on mvp bonus drop as well */ + // TODO: This should be a field in the item db. + if (mvp_sd != NULL + && (it->nameid == ITEMID_GOLD_KEY77 || it->nameid == ITEMID_SILVER_KEY77)) /* for when not hardcoded: add a check on mvp bonus drop as well */ clif->item_drop_announce(mvp_sd, it->nameid, md->name); // Announce first, or else ditem will be freed. [Lance] @@ -2502,60 +2556,62 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) { pc->gainexp(mvp_sd, &md->bl, mexp,0, false); log_mvp[1] = mexp; - if( !(map->list[m].flag.nomvploot || type&1) ) { + if (!(map->list[m].flag.nomvploot || type&1)) { /* pose them randomly in the list -- so on 100% drop servers it wont always drop the same item */ - int mdrop_id[MAX_MVP_DROP]; - int mdrop_p[MAX_MVP_DROP]; - struct item item; - - memset(&mdrop_id,0,MAX_MVP_DROP*sizeof(int)); - - for(i = 0; i < MAX_MVP_DROP; i++) { - while( 1 ) { - int va = rnd()%MAX_MVP_DROP; - if( !mdrop_id[va] || !md->db->mvpitem[i].nameid ) { - mdrop_id[va] = md->db->mvpitem[i].nameid; - mdrop_p[va] = md->db->mvpitem[i].p; - break; - } - } + struct { + int nameid; + int p; + } mdrop[MAX_MVP_DROP] = { { 0 } }; + + for (i = 0; i < MAX_MVP_DROP; i++) { + int rpos; + if (md->db->mvpitem[i].nameid == 0) + continue; + do { + rpos = rnd()%MAX_MVP_DROP; + } while (mdrop[rpos].nameid != 0); + + mdrop[rpos].nameid = md->db->mvpitem[i].nameid; + mdrop[rpos].p = md->db->mvpitem[i].p; } - for(i = 0; i < MAX_MVP_DROP; i++) { - struct item_data *data; - if(mdrop_id[i] <= 0) + for (i = 0; i < MAX_MVP_DROP; i++) { + struct item_data *data = NULL; + int rate = 0; + + if (mdrop[i].nameid <= 0) continue; - if(! (data = itemdb->exists(mdrop_id[i])) ) + if ((data = itemdb->exists(mdrop[i].nameid)) == NULL) continue; - temp = mdrop_p[i]; - if(temp <= 0 && !battle_config.drop_rate0item) - temp = 1; - if(temp <= rnd()%10000+1) //if ==0, then it doesn't drop - continue; + rate = mdrop[i].p; + if (rate <= 0 && !battle_config.drop_rate0item) + rate = 1; + if (rate > rnd()%10000) { + struct item item = { 0 }; + + item.nameid = mdrop[i].nameid; + item.identify = itemdb->isidentified2(data); + clif->mvp_item(mvp_sd, item.nameid); + log_mvp[0] = item.nameid; + + //A Rare MVP Drop Global Announce by Lupus + if (rate <= battle_config.rare_drop_announce) { + char message[128]; + sprintf(message, msg_txt(541), mvp_sd->status.name, md->name, data->jname, rate/100.); + //MSG: "'%s' won %s's %s (chance: %0.02f%%)" + intif->broadcast(message, (int)strlen(message)+1, BC_DEFAULT); + } - memset(&item,0,sizeof(item)); - item.nameid=mdrop_id[i]; - item.identify= itemdb->isidentified2(data); - clif->mvp_item(mvp_sd,item.nameid); - log_mvp[0] = item.nameid; - - //A Rare MVP Drop Global Announce by Lupus - if(temp<=battle_config.rare_drop_announce) { - char message[128]; - sprintf (message, msg_txt(541), mvp_sd->status.name, md->name, data->jname, temp/100.); - //MSG: "'%s' won %s's %s (chance: %0.02f%%)" - intif->broadcast(message, strlen(message)+1, BC_DEFAULT); - } + if((temp = pc->additem(mvp_sd,&item,1,LOG_TYPE_PICKDROP_PLAYER)) != 0) { + clif->additem(mvp_sd,0,0,temp); + map->addflooritem(&md->bl, &item, 1, mvp_sd->bl.m, mvp_sd->bl.x, mvp_sd->bl.y, mvp_sd->status.char_id, (second_sd?second_sd->status.char_id : 0), (third_sd ? third_sd->status.char_id : 0), 1); + } - if((temp = pc->additem(mvp_sd,&item,1,LOG_TYPE_PICKDROP_PLAYER)) != 0) { - clif->additem(mvp_sd,0,0,temp); - map->addflooritem(&md->bl, &item, 1, mvp_sd->bl.m, mvp_sd->bl.x, mvp_sd->bl.y, mvp_sd->status.char_id, (second_sd?second_sd->status.char_id : 0), (third_sd ? third_sd->status.char_id : 0), 1); + //Logs items, MVP prizes [Lupus] + logs->pick_mob(md, LOG_TYPE_MVP, -1, &item, data); + break; } - - //Logs items, MVP prizes [Lupus] - logs->pick_mob(md, LOG_TYPE_MVP, -1, &item, data); - break; } } @@ -2661,6 +2717,8 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) { void mob_revive(struct mob_data *md, unsigned int hp) { int64 tick = timer->gettick(); + + nullpo_retv(md); md->state.skillstate = MSS_IDLE; md->last_thinktime = tick; md->next_walktime = tick+rnd()%1000+MIN_RANDOMWALKTIME; @@ -2808,6 +2866,7 @@ int mob_class_change (struct mob_data *md, int class_) { *------------------------------------------*/ void mob_heal(struct mob_data *md, unsigned int heal) { + nullpo_retv(md); if (battle_config.show_mob_info&3) clif->charnameack (0, &md->bl); #if PACKETVER >= 20131223 @@ -2842,6 +2901,7 @@ int mob_warpslave_sub(struct block_list *bl, va_list ap) range = va_arg(ap, int); nullpo_ret(bl); + nullpo_ret(master); Assert_ret(bl->type == BL_MOB); md = BL_UCAST(BL_MOB, bl); @@ -2859,6 +2919,7 @@ int mob_warpslave_sub(struct block_list *bl, va_list ap) * appear in randomly. *------------------------------------------*/ int mob_warpslave(struct block_list *bl, int range) { + nullpo_ret(bl); if (range < 1) range = 1; //Min range needed to avoid crashes and stuff. [Skotlex] @@ -2886,6 +2947,7 @@ int mob_countslave_sub(struct block_list *bl, va_list ap) * Counts the number of slaves a mob has on the map. *------------------------------------------*/ int mob_countslave(struct block_list *bl) { + nullpo_ret(bl); return map->foreachinmap(mob->countslave_sub, bl->m, BL_MOB,bl->id); } @@ -3014,6 +3076,8 @@ int mob_getfriendhprate_sub(struct block_list *bl,va_list ap) struct mob_data *md; md = va_arg(ap,struct mob_data *); + nullpo_ret(bl); + nullpo_ret(md); min_rate=va_arg(ap,int); max_rate=va_arg(ap,int); fr=va_arg(ap,struct block_list **); @@ -3324,6 +3388,8 @@ int mobskill_use(struct mob_data *md, int64 tick, int event) { int mobskill_event(struct mob_data *md, struct block_list *src, int64 tick, int flag) { int target_id, res = 0; + nullpo_ret(md); + nullpo_ret(src); if(md->bl.prev == NULL || md->status.hp <= 0) return 0; @@ -3385,7 +3451,7 @@ int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, cons return 0; ARR_FIND( MOB_CLONE_START, MOB_CLONE_END, class_, mob->db_data[class_] == NULL ); - if(class_ >= MOB_CLONE_END) + if(class_ < 0 || class_ >= MOB_CLONE_END) return 0; db = mob->db_data[class_]=(struct mob_db*)aCalloc(1, sizeof(struct mob_db)); @@ -3575,7 +3641,10 @@ int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, cons int mob_clone_delete(struct mob_data *md) { - const int class_ = md->class_; + int class_; + + nullpo_ret(md); + class_ = md->class_; if (class_ >= MOB_CLONE_START && class_ < MOB_CLONE_END && mob->db_data[class_]!=NULL) { mob->destroy_mob_db(class_); @@ -3665,6 +3734,7 @@ unsigned int mob_drop_adjust(int baserate, int rate_adjust, unsigned short rate_ */ void item_dropratio_adjust(int nameid, int mob_id, int *rate_adjust) { + nullpo_retv(rate_adjust); if( item_drop_ratio_db[nameid] ) { if( item_drop_ratio_db[nameid]->mob_id[0] ) { // only for listed mobs int i; @@ -3699,6 +3769,7 @@ static inline int mob_parse_dbrow_cap_value(int class_, int min, int max, int va void mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t) { int i32; + nullpo_retv(entry); if (mob->lookup_const(t, "Str", &i32) && i32 >= 0) { entry->status.str = mob_parse_dbrow_cap_value(entry->mob_id, UINT16_MIN, UINT16_MAX, i32); } @@ -3782,6 +3853,7 @@ void mob_read_db_mvpdrops_sub(struct mob_db *entry, struct config_setting_t *t) int idx = 0; int i32; + nullpo_retv(entry); while (idx < MAX_MVP_DROP && (drop = libconfig->setting_get_elem(t, i))) { const char *name = config_setting_name(drop); int rate_adjust = battle_config.item_rate_mvp; @@ -3839,6 +3911,7 @@ void mob_read_db_drops_sub(struct mob_db *entry, struct config_setting_t *t) int i32; int k; + nullpo_retv(entry); while (idx < MAX_MOB_DROP && (drop = libconfig->setting_get_elem(t, i))) { const char *name = config_setting_name(drop); int rate_adjust, type; @@ -3960,6 +4033,7 @@ int mob_db_validate_entry(struct mob_db *entry, int n, const char *source) { struct mob_data data; + nullpo_ret(entry); if (entry->mob_id <= 1000 || entry->mob_id > MAX_MOB_DB) { ShowError("mob_db_validate_entry: Invalid monster ID %d, must be in range %d-%d.\n", entry->mob_id, 1000, MAX_MOB_DB); return 0; @@ -4393,6 +4467,8 @@ bool mob_lookup_const(const struct config_setting_t *it, const char *name, int * bool mob_get_const(const struct config_setting_t *it, int *value) { const char *str = config_setting_get_string(it); + + nullpo_retr(false, value); if (str && *str && script->get_constant(str, value)) return true; @@ -4489,6 +4565,7 @@ bool mob_readdb_mobavail(char* str[], int columns, int current) { int class_, k; + nullpo_retr(false, str); class_=atoi(str[0]); if(mob->db(class_) == mob->dummy) { @@ -4600,6 +4677,8 @@ bool mob_parse_row_chatdb(char** str, const char* source, int line, int* last_ms int msg_id; size_t len; + nullpo_retr(false, str); + nullpo_retr(false, last_msg_id); msg_id = atoi(str[0]); if (msg_id <= 0 || msg_id > MAX_MOB_CHAT) @@ -4784,6 +4863,7 @@ bool mob_parse_row_mobskilldb(char** str, int columns, int current) int i =0, j, tmp; uint16 sidx = 0; + nullpo_retr(false, str); mob_id = atoi(str[0]); if (mob_id > 0 && mob->db(mob_id) == mob->dummy) @@ -4999,6 +5079,7 @@ bool mob_readdb_race2(char* fields[], int columns, int current) { int race, i; + nullpo_retr(false, fields); race = atoi(fields[0]); if (race < RC2_NONE || race >= RC2_MAX) { @@ -5023,6 +5104,8 @@ bool mob_readdb_race2(char* fields[], int columns, int current) bool mob_readdb_itemratio(char* str[], int columns, int current) { int nameid, ratio, i; + + nullpo_retr(false, str); nameid = atoi(str[0]); if( itemdb->exists(nameid) == NULL ) @@ -5124,7 +5207,9 @@ int do_init_mob(bool minimal) { void mob_destroy_mob_db(int index) { - struct mob_db *data = mob->db_data[index]; + struct mob_db *data; + Assert_retv(index >= 0 && index <= MAX_MOB_DB); + data = mob->db_data[index]; HPM->data_store_destroy(&data->hdata); aFree(data); mob->db_data[index] = NULL; diff --git a/src/map/npc.c b/src/map/npc.c index 2b1a541d8..6b55bf5ae 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -47,6 +47,7 @@ #include "common/nullpo.h" #include "common/showmsg.h" #include "common/socket.h" +#include "common/sql.h" #include "common/strlib.h" #include "common/timer.h" #include "common/utils.h" @@ -61,17 +62,6 @@ struct npc_interface npc_s; struct npc_interface *npc; -static int npc_id=START_NPC_NUM; -static int npc_warp=0; -static int npc_shop=0; -static int npc_script=0; -static int npc_mob=0; -static int npc_delay_mob=0; -static int npc_cache_mob=0; - -static const char *npc_last_path; -static const char *npc_last_ref; -struct npc_path_data *npc_last_npd; //For holding the view data of npc classes. [Skotlex] static struct view_data npc_viewdb[MAX_NPC_CLASS]; @@ -131,15 +121,15 @@ bool npc_db_checkid(int id) /// Returns a new npc id that isn't being used in id_db. /// Fatal error if nothing is available. int npc_get_new_npc_id(void) { - if( npc_id >= START_NPC_NUM && !map->blid_exists(npc_id) ) - return npc_id++;// available + if (npc->npc_id >= START_NPC_NUM && !map->blid_exists(npc->npc_id)) + return npc->npc_id++;// available else {// find next id - int base_id = npc_id; - while( base_id != ++npc_id ) { - if( npc_id < START_NPC_NUM ) - npc_id = START_NPC_NUM; - if( !map->blid_exists(npc_id) ) - return npc_id++;// available + int base_id = npc->npc_id; + while (base_id != ++npc->npc_id) { + if (npc->npc_id < START_NPC_NUM) + npc->npc_id = START_NPC_NUM; + if (!map->blid_exists(npc->npc_id)) + return npc->npc_id++;// available } // full loop, nothing available ShowFatalError("npc_get_new_npc_id: All ids are taken. Exiting..."); @@ -176,6 +166,7 @@ int npc_ontouch_event(struct map_session_data *sd, struct npc_data *nd) { char name[EVENT_NAME_LENGTH]; + nullpo_retr(1, nd); if( nd->touching_id ) return 0; // Attached a player already. Can't trigger on anyone else. @@ -190,6 +181,8 @@ int npc_ontouch2_event(struct map_session_data *sd, struct npc_data *nd) { char name[EVENT_NAME_LENGTH]; + nullpo_retr(1, sd); + nullpo_retr(1, nd); if (sd->areanpc_id == nd->bl.id) return 0; @@ -201,6 +194,8 @@ int npc_onuntouch_event(struct map_session_data *sd, struct npc_data *nd) { char name[EVENT_NAME_LENGTH]; + nullpo_ret(sd); + nullpo_ret(nd); if (sd->areanpc_id != nd->bl.id) return 0; @@ -366,7 +361,7 @@ int npc_event_dequeue(struct map_session_data* sd) /** * @see DBCreateData */ -DBData npc_event_export_create(DBKey key, va_list args) +struct DBData npc_event_export_create(union DBKey key, va_list args) { struct linkdb_node** head_ptr; CREATE(head_ptr, struct linkdb_node*, 1); @@ -380,8 +375,12 @@ DBData npc_event_export_create(DBKey key, va_list args) *------------------------------------------*/ int npc_event_export(struct npc_data *nd, int i) { - char* lname = nd->u.scr.label_list[i].name; - int pos = nd->u.scr.label_list[i].pos; + char* lname; + int pos; + nullpo_ret(nd); + Assert_ret(i >= 0 && i < nd->u.scr.label_list_num); + lname = nd->u.scr.label_list[i].name; + pos = nd->u.scr.label_list[i].pos; if ((lname[0] == 'O' || lname[0] == 'o') && (lname[1] == 'N' || lname[1] == 'n')) { struct event_data *ev; struct linkdb_node **label_linkdb = NULL; @@ -434,6 +433,7 @@ void npc_event_doall_sub(void *key, void *data, va_list ap) // runs the specified event (supports both single-npc and global events) int npc_event_do(const char* name) { + nullpo_ret(name); if( name[0] == ':' && name[1] == ':' ) { return npc->event_doall(name+2); // skip leading "::" } @@ -538,9 +538,12 @@ void npc_event_do_oninit( bool reload ) int npc_timerevent_export(struct npc_data *nd, int i) { int t = 0, len = 0; - char *lname = nd->u.scr.label_list[i].name; - int pos = nd->u.scr.label_list[i].pos; - if (sscanf(lname, "OnTimer%d%n", &t, &len) == 1 && lname[len] == '\0') { + char *lname; + int pos; + nullpo_ret(nd); + lname = nd->u.scr.label_list[i].name; + pos = nd->u.scr.label_list[i].pos; + if (sscanf(lname, "OnTimer%d%n", &t, &len) == 1 && len < NAME_LENGTH && lname[len] == '\0') { // Timer event struct npc_timerevent_list *te = nd->u.scr.timer_event; int j, k = nd->u.scr.timeramount; @@ -580,6 +583,8 @@ int npc_timerevent(int tid, int64 tick, int id, intptr_t data) struct timer_event_data *ted = (struct timer_event_data*)data; struct map_session_data *sd=NULL; + nullpo_ret(ted); + if( nd == NULL ) { ShowError("npc_timerevent: NPC not found??\n"); return 0; @@ -732,6 +737,7 @@ void npc_timerevent_quit(struct map_session_data* sd) struct npc_data* nd; struct timer_event_data *ted; + nullpo_retv(sd); // Check timer existence if( sd->npc_timer_id == INVALID_TIMER ) return; @@ -763,6 +769,7 @@ void npc_timerevent_quit(struct map_session_data* sd) { int old_rid,old_timer; int64 old_tick; + nullpo_retv(ted); //Set timer related info. old_rid = (nd->u.scr.rid == sd->bl.id ? 0 : nd->u.scr.rid); // Detach rid if the last attached player logged off. @@ -831,6 +838,8 @@ int npc_settimerevent_tick(struct npc_data* nd, int newtimer) int npc_event_sub(struct map_session_data* sd, struct event_data* ev, const char* eventname) { + nullpo_retr(2, sd); + nullpo_retr(2, eventname); if ( sd->npc_id != 0 ) { //Enqueue the event trigger. @@ -915,9 +924,11 @@ int npc_touch_areanpc_sub(struct block_list *bl, va_list ap) { * If not, it unsets it and searches for another player in range. *------------------------------------------*/ int npc_touchnext_areanpc(struct map_session_data* sd, bool leavemap) { - struct npc_data *nd = map->id2nd(sd->touching_id); + struct npc_data *nd; short xs, ys; + nullpo_retr(1, sd); + nd = map->id2nd(sd->touching_id); if( !nd || nd->touching_id != sd->bl.id ) return 1; @@ -949,7 +960,7 @@ int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y) int j, found_warp = 0; nullpo_retr(1, sd); - + Assert_retr(1, m >= 0 && m < map->count); #if 0 // Why not enqueue it? [Inkfish] if(sd->npc_id) return 1; @@ -1034,6 +1045,7 @@ int npc_untouch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y) { struct npc_data *nd = NULL; nullpo_retr(1, sd); + Assert_retr(1, m >= 0 && m < map->count); if (!sd->areanpc_id) return 0; @@ -1053,11 +1065,16 @@ int npc_untouch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y) // Return 1 if Warped int npc_touch_areanpc2(struct mob_data *md) { - int i, m = md->bl.m, x = md->bl.x, y = md->bl.y, id; + int i, m, x, y, id; char eventname[EVENT_NAME_LENGTH]; struct event_data* ev; int xs, ys; + nullpo_ret(md); + m = md->bl.m; + x = md->bl.x; + y = md->bl.y; + for( i = 0; i < map->list[m].npc_num; i++ ) { if( map->list[m].npc[i]->option&OPTION_INVISIBLE ) continue; @@ -1116,6 +1133,8 @@ int npc_check_areanpc(int flag, int16 m, int16 x, int16 y, int16 range) { int x0,y0,x1,y1; int xs,ys; + Assert_retr(1, m >= 0 && m < map->count); + if (range < 0) return 0; x0 = max(x-range, 0); y0 = max(y-range, 0); @@ -1187,6 +1206,7 @@ struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* b if (distance > nd->area_size) distance = nd->area_size; + nullpo_retr(NULL, bl); if (bl->m != sd->bl.m || bl->x < sd->bl.x - distance || bl->x > sd->bl.x + distance || bl->y < sd->bl.y - distance || bl->y > sd->bl.y + distance) @@ -1208,6 +1228,9 @@ int npc_globalmessage(const char* name, const char* mes) if (!nd) return 0; + nullpo_ret(name); + nullpo_ret(mes); + snprintf(temp, sizeof(temp), "%s : %s", name, mes); clif->GlobalMessage(&nd->bl,temp); @@ -1219,6 +1242,7 @@ void run_tomb(struct map_session_data* sd, struct npc_data* nd) { char buffer[200]; char time[10]; + nullpo_retv(nd); strftime(time, sizeof(time), "%H:%M", localtime(&nd->u.tomb.kill_time)); // TODO: Find exact color? @@ -1393,6 +1417,8 @@ int npc_cashshop_buylist(struct map_session_data *sd, int points, struct itemlis struct npc_item_list *shop = NULL; unsigned short shop_size = 0; + nullpo_retr(ERROR_TYPE_SYSTEM, sd); + nullpo_retr(ERROR_TYPE_SYSTEM, item_list); if( sd->state.trading ) return ERROR_TYPE_EXCHANGE; @@ -1492,6 +1518,9 @@ int npc_buylist_sub(struct map_session_data *sd, struct itemlist *item_list, str int key_nameid = 0; int key_amount = 0; + nullpo_ret(item_list); + nullpo_ret(nd); + // discard old contents script->cleararray_pc(sd, "@bought_nameid", (void*)0); script->cleararray_pc(sd, "@bought_quantity", (void*)0); @@ -1514,8 +1543,9 @@ int npc_buylist_sub(struct map_session_data *sd, struct itemlist *item_list, str /** * Loads persistent NPC Market Data from SQL **/ -void npc_market_fromsql(void) { - SqlStmt* stmt = SQL->StmtMalloc(map->mysql_handle); +void npc_market_fromsql(void) +{ + struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle); char name[NAME_LENGTH+1]; int itemid; int amount; @@ -1565,6 +1595,8 @@ void npc_market_fromsql(void) { * Saves persistent NPC Market Data into SQL **/ void npc_market_tosql(struct npc_data *nd, unsigned short index) { + nullpo_retv(nd); + Assert_retv(index < nd->u.scr.shop->items); if (SQL_ERROR == SQL->Query(map->mysql_handle, "REPLACE INTO `%s` VALUES ('%s','%d','%u')", map->npc_market_data_db, nd->exname, nd->u.scr.shop->item[index].nameid, nd->u.scr.shop->item[index].qty)) Sql_ShowDebug(map->mysql_handle); @@ -1586,12 +1618,16 @@ void npc_market_delfromsql_sub(const char *npcname, unsigned short index) { * Removes persistent NPC Market Data from SQL **/ void npc_market_delfromsql(struct npc_data *nd, unsigned short index) { + nullpo_retv(nd); + Assert_retv(index == USHRT_MAX || index < nd->u.scr.shop->items); npc->market_delfromsql_sub(nd->exname, index == USHRT_MAX ? index : nd->u.scr.shop->item[index].nameid); } /** * Judges whether to allow and spawn a trader's window. **/ bool npc_trader_open(struct map_session_data *sd, struct npc_data *nd) { + nullpo_retr(false, sd); + nullpo_retr(false, nd); if( !nd->u.scr.shop || !nd->u.scr.shop->items ) return false; @@ -1630,7 +1666,7 @@ bool npc_trader_open(struct map_session_data *sd, struct npc_data *nd) { * @param master id of the original npc **/ void npc_trader_update(int master) { - DBIterator* iter; + struct DBIterator *iter; struct block_list* bl; struct npc_data *master_nd = map->id2nd(master); @@ -1657,6 +1693,9 @@ void npc_trader_count_funds(struct npc_data *nd, struct map_session_data *sd) { char evname[EVENT_NAME_LENGTH]; struct event_data *ev = NULL; + nullpo_retv(nd); + nullpo_retv(sd); + npc->trader_funds[0] = npc->trader_funds[1] = 0;/* clear */ switch( nd->u.scr.shop->type ) { @@ -1694,6 +1733,8 @@ bool npc_trader_pay(struct npc_data *nd, struct map_session_data *sd, int price, char evname[EVENT_NAME_LENGTH]; struct event_data *ev = NULL; + nullpo_retr(false, nd); + nullpo_retr(false, sd); npc->trader_ok = false;/* clear */ snprintf(evname, EVENT_NAME_LENGTH, "%s::OnPayFunds",nd->exname); @@ -1716,6 +1757,7 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po int i, price, w; unsigned short shop_size = 0; + nullpo_retr(ERROR_TYPE_SYSTEM, sd); if( amount <= 0 ) return ERROR_TYPE_ITEM_ID; @@ -2055,6 +2097,10 @@ int npc_selllist_sub(struct map_session_data *sd, struct itemlist *item_list, st int key_identify = 0; int key_card[MAX_SLOTS]; + nullpo_ret(sd); + nullpo_ret(item_list); + nullpo_ret(nd); + // discard old contents script->cleararray_pc(sd, "@sold_nameid", (void*)0); script->cleararray_pc(sd, "@sold_quantity", (void*)0); @@ -2222,7 +2268,7 @@ int npc_remove_map(struct npc_data* nd) { /** * @see DBApply */ -int npc_unload_ev(DBKey key, DBData *data, va_list ap) +int npc_unload_ev(union DBKey key, struct DBData *data, va_list ap) { struct event_data* ev = DB->data2ptr(data); char* npcname = va_arg(ap, char *); @@ -2237,7 +2283,7 @@ int npc_unload_ev(DBKey key, DBData *data, va_list ap) /** * @see DBApply */ -int npc_unload_ev_label(DBKey key, DBData *data, va_list ap) +int npc_unload_ev_label(union DBKey key, struct DBData *data, va_list ap) { struct linkdb_node **label_linkdb = DB->data2ptr(data); struct npc_data* nd = va_arg(ap, struct npc_data *); @@ -2253,6 +2299,7 @@ int npc_unload_dup_sub(struct npc_data* nd, va_list args) { int src_id; + nullpo_ret(nd); src_id = va_arg(args, int); if (nd->src_id == src_id) npc->unload(nd, true); @@ -2261,6 +2308,7 @@ int npc_unload_dup_sub(struct npc_data* nd, va_list args) //Removes all npcs that are duplicates of the passed one. [Skotlex] void npc_unload_duplicates(struct npc_data* nd) { + nullpo_retv(nd); map->foreachnpc(npc->unload_dup_sub,nd->bl.id); } @@ -2384,6 +2432,7 @@ void npc_addsrcfile(const char* name) struct npc_src_list* file; struct npc_src_list* file_prev = NULL; + nullpo_retv(name); if( strcmpi(name, "clear") == 0 ) { npc->clearsrcfile(); @@ -2415,6 +2464,7 @@ void npc_delsrcfile(const char* name) struct npc_src_list* file = npc->src_files; struct npc_src_list* file_prev = NULL; + nullpo_retv(name); if( strcmpi(name, "all") == 0 ) { npc->clearsrcfile(); @@ -2448,10 +2498,10 @@ const char *npc_retainpathreference(const char *filepath) struct npc_path_data * npd = NULL; nullpo_ret(filepath); - if (npc_last_path == filepath) { - if (npc_last_npd != NULL) - npc_last_npd->references++; - return npc_last_ref; + if (npc->npc_last_path == filepath) { + if (npc->npc_last_npd != NULL) + npc->npc_last_npd->references++; + return npc->npc_last_ref; } if ((npd = strdb_get(npc->path_db,filepath)) == NULL) { @@ -2466,9 +2516,9 @@ const char *npc_retainpathreference(const char *filepath) npd->references++; - npc_last_npd = npd; - npc_last_ref = npd->path; - npc_last_path = filepath; + npc->npc_last_npd = npd; + npc->npc_last_ref = npd->path; + npc->npc_last_path = filepath; return npd->path; } @@ -2484,7 +2534,7 @@ void npc_releasepathreference(const char *filepath) nullpo_retv(filepath); - if (filepath != npc_last_ref) { + if (filepath != npc->npc_last_ref) { npd = strdb_get(npc->path_db, filepath); } @@ -2502,6 +2552,8 @@ void npc_parsename(struct npc_data* nd, const char* name, const char* start, con struct npc_data* dnd;// duplicate npc char newname[NAME_LENGTH]; + nullpo_retv(nd); + nullpo_retv(name); // parse name p = strstr(name,"::"); if( p ) { // <Display name>::<Unique name> @@ -2557,6 +2609,7 @@ int npc_parseview(const char* w4, const char* start, const char* buffer, const c int val = FAKE_NPC, i = 0; char viewid[1024]; // Max size of name from constants.conf, see script->read_constdb. + nullpo_retr(FAKE_NPC, w4); // Extract view ID / constant while (w4[i] != '\0') { if (ISSPACE(w4[i]) || w4[i] == '/' || w4[i] == ',') @@ -2588,6 +2641,7 @@ int npc_parseview(const char* w4, const char* start, const char* buffer, const c // Checks if given view is an ID or constant. bool npc_viewisid(const char * viewid) { + nullpo_retr(false, viewid); if (atoi(viewid) != FAKE_NPC) { // Loop through view, looking for non-numeric character. while (*viewid) { @@ -2634,6 +2688,8 @@ struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short int i, flag = 0; struct npc_data *nd; + nullpo_retr(NULL, name); + nd = npc->create_npc(WARP, from_mapid, from_x, from_y, 0, battle_config.warp_point_debug ? WARP_DEBUG_CLASS : WARP_CLASS); safestrncpy(nd->exname, name, ARRAYLENGTH(nd->exname)); @@ -2682,6 +2738,9 @@ const char *npc_parse_warp(const char *w1, const char *w2, const char *w3, const char mapname[32], to_mapname[32]; struct npc_data *nd; + nullpo_retr(strchr(start,'\n'), w1); + nullpo_retr(strchr(start,'\n'), w4); + // w1=<from map name>,<fromX>,<fromY>,<facing> // w4=<spanx>,<spany>,<to map name>,<toX>,<toY> if( sscanf(w1, "%31[^,],%d,%d", mapname, &x, &y) != 3 @@ -2715,7 +2774,7 @@ const char *npc_parse_warp(const char *w1, const char *w2, const char *w3, const nd->u.warp.y = to_y; nd->u.warp.xs = xs; nd->u.warp.ys = ys; - npc_warp++; + npc->npc_warp++; npc->add_to_location(nd); @@ -2753,6 +2812,8 @@ const char *npc_parse_shop(const char *w1, const char *w2, const char *w3, const struct npc_data *nd; enum npc_subtype type; + nullpo_retr(strchr(start,'\n'), w1); + nullpo_retr(strchr(start,'\n'), w4); if( strcmp(w1,"-") == 0 ) { // 'floating' shop x = y = dir = 0; @@ -2858,7 +2919,7 @@ const char *npc_parse_shop(const char *w1, const char *w2, const char *w3, const npc->parsename(nd, w3, start, buffer, filepath); nd->path = npc->retainpathreference(filepath); - ++npc_shop; + ++npc->npc_shop; npc->add_to_location(nd); return strchr(start,'\n');// continue @@ -2867,6 +2928,7 @@ const char *npc_parse_shop(const char *w1, const char *w2, const char *w3, const void npc_convertlabel_db(struct npc_label_list* label_list, const char *filepath) { int i; + nullpo_retv(label_list); for( i = 0; i < script->label_count; i++ ) { const char* lname = script->get_str(script->labels[i].key); int lpos = script->labels[i].pos; @@ -2993,6 +3055,7 @@ const char *npc_parse_script(const char *w1, const char *w2, const char *w3, con int label_list_num; struct npc_data* nd; + nullpo_retr(NULL, w1); if (strcmp(w1, "-") == 0) { // floating npc x = 0; @@ -3062,7 +3125,7 @@ const char *npc_parse_script(const char *w1, const char *w2, const char *w3, con if( options&NPO_TRADER ) nd->u.scr.trader = true; nd->u.scr.shop = NULL; - ++npc_script; + ++npc->npc_script; npc->add_to_location(nd); //----------------------------------------- @@ -3129,7 +3192,10 @@ bool npc_duplicate_script_sub(struct npc_data *nd, const struct npc_data *snd, i int i; bool retval = true; - ++npc_script; + nullpo_retr(false, nd); + nullpo_retr(false, snd); + + ++npc->npc_script; nd->u.scr.xs = xs; nd->u.scr.ys = ys; nd->u.scr.script = snd->u.scr.script; @@ -3173,7 +3239,10 @@ bool npc_duplicate_script_sub(struct npc_data *nd, const struct npc_data *snd, i */ bool npc_duplicate_shop_sub(struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options) { - ++npc_shop; + nullpo_retr(false, nd); + nullpo_retr(false, snd); + + ++npc->npc_shop; nd->u.shop.shop_item = snd->u.shop.shop_item; nd->u.shop.count = snd->u.shop.count; @@ -3188,7 +3257,10 @@ bool npc_duplicate_shop_sub(struct npc_data *nd, const struct npc_data *snd, int */ bool npc_duplicate_warp_sub(struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options) { - ++npc_warp; + nullpo_retr(false, nd); + nullpo_retr(false, snd); + + ++npc->npc_warp; nd->u.warp.xs = xs; nd->u.warp.ys = ys; nd->u.warp.mapindex = snd->u.warp.mapindex; @@ -3217,6 +3289,9 @@ bool npc_duplicate_warp_sub(struct npc_data *nd, const struct npc_data *snd, int */ bool npc_duplicate_sub(struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options) { + nullpo_retr(false, nd); + nullpo_retr(false, snd); + nd->src_id = snd->bl.id; switch (nd->subtype) { case SCRIPT: @@ -3282,6 +3357,8 @@ const char *npc_parse_duplicate(const char *w1, const char *w2, const char *w3, struct npc_data* dnd; end = strchr(start,'\n'); + nullpo_retr(end, w2); + nullpo_retr(end, w4); length = strlen(w2); // get the npc being duplicated @@ -3366,7 +3443,13 @@ int npc_duplicate4instance(struct npc_data *snd, int16 m) int dm = -1, im = -1, xs = -1, ys = -1; struct npc_data *nd = NULL; - if( m == -1 || map->list[m].instance_id == -1 ) + if (m == -1) + return 1; + + Assert_retr(1, m >= 0 && m < map->count); + nullpo_retr(1, snd); + + if (map->list[m].instance_id == -1) return 1; snprintf(newname, ARRAYLENGTH(newname), "dup_%d_%d", map->list[m].instance_id, snd->bl.id); @@ -3410,10 +3493,15 @@ int npc_duplicate4instance(struct npc_data *snd, int16 m) } //Set mapcell CELL_NPC to trigger event later -void npc_setcells(struct npc_data* nd) { - int16 m = nd->bl.m, x = nd->bl.x, y = nd->bl.y, xs, ys; +void npc_setcells(struct npc_data* nd) +{ + int16 m, x, y, xs, ys; int i,j; + nullpo_retv(nd); + m = nd->bl.m; + x = nd->bl.x; + y = nd->bl.y; switch(nd->subtype) { case WARP: xs = nd->u.warp.xs; @@ -3455,9 +3543,13 @@ int npc_unsetcells_sub(struct block_list *bl, va_list ap) } void npc_unsetcells(struct npc_data* nd) { - int16 m = nd->bl.m, x = nd->bl.x, y = nd->bl.y, xs, ys; + int16 m, x, y, xs, ys; int i,j, x0, x1, y0, y1; + nullpo_retv(nd); + m = nd->bl.m; + x = nd->bl.x; + y = nd->bl.y; switch(nd->subtype) { case WARP: xs = nd->u.warp.xs; @@ -3492,7 +3584,9 @@ void npc_unsetcells(struct npc_data* nd) { void npc_movenpc(struct npc_data* nd, int16 x, int16 y) { - const int16 m = nd->bl.m; + int16 m; + nullpo_retv(nd); + m = nd->bl.m; if (m < 0 || nd->bl.prev == NULL) return; //Not on a map. x = cap_value(x, 0, map->list[m].xs-1); @@ -3510,6 +3604,7 @@ void npc_movenpc(struct npc_data* nd, int16 x, int16 y) void npc_setdisplayname(struct npc_data* nd, const char* newname) { nullpo_retv(nd); + nullpo_retv(newname); safestrncpy(nd->name, newname, sizeof(nd->name)); if( map->list[nd->bl.m].users ) @@ -3544,6 +3639,7 @@ int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const c size_t len; nullpo_ret(sd); + nullpo_ret(message); if( ev == NULL || (nd = ev->nd) == NULL ) { ShowError("npc_event: event not found [%s]\n", eventname); @@ -3567,7 +3663,7 @@ int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const c } st = script->alloc_state(ev->nd->u.scr.script, ev->pos, sd->bl.id, ev->nd->bl.id); - script->setd_sub(st, NULL, ".@atcmd_command$", 0, (void *)command, NULL); + script->setd_sub(st, NULL, ".@atcmd_command$", 0, command, NULL); len = strlen(message); if (len) { @@ -3623,12 +3719,19 @@ int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const c */ const char *npc_parse_function(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { - DBMap* func_db; - DBData old_data; + struct DBMap *func_db; + struct DBData old_data; struct script_code *scriptroot; const char* end; const char* script_start; + nullpo_retr(NULL, w1); + nullpo_retr(NULL, w2); + nullpo_retr(NULL, w3); + nullpo_retr(NULL, w4); + nullpo_retr(NULL, start); + nullpo_retr(NULL, retval); + script_start = strstr(start,"\t{"); end = strchr(start,'\n'); if( *w4 != '{' || script_start == NULL || (end != NULL && script_start > end) ) { @@ -3672,6 +3775,7 @@ void npc_parse_mob2(struct spawn_data* mobspawn) { int i; + nullpo_retv(mobspawn); for( i = mobspawn->active; i < mobspawn->num; ++i ) { struct mob_data* md = mob->spawn_dataset(mobspawn); md->spawn = mobspawn; @@ -3705,6 +3809,11 @@ const char *npc_parse_mob(const char *w1, const char *w2, const char *w3, const struct spawn_data mobspawn, *data; struct mob_db* db; + nullpo_retr(strchr(start,'\n'), w1); + nullpo_retr(strchr(start,'\n'), w2); + nullpo_retr(strchr(start,'\n'), w3); + nullpo_retr(strchr(start,'\n'), w4); + memset(&mobspawn, 0, sizeof(struct spawn_data)); mobspawn.state.boss = (strcmp(w2,"boss_monster") == 0 ? 1 : 0); @@ -3847,7 +3956,7 @@ const char *npc_parse_mob(const char *w1, const char *w2, const char *w3, const // spawn / cache the new mobs if( battle_config.dynamic_mobs && map->addmobtolist(data->m, data) >= 0 ) { data->state.dynamic = true; - npc_cache_mob += data->num; + npc->npc_cache_mob += data->num; // check if target map has players // (usually shouldn't occur when map server is just starting, @@ -3858,10 +3967,10 @@ const char *npc_parse_mob(const char *w1, const char *w2, const char *w3, const } else { data->state.dynamic = false; npc->parse_mob2(data); - npc_delay_mob += data->num; + npc->npc_delay_mob += data->num; } - npc_mob++; + npc->npc_mob++; return strchr(start,'\n');// continue } @@ -3911,6 +4020,9 @@ const char *npc_parse_mapflag(const char *w1, const char *w2, const char *w3, co char mapname[32]; int state = 1; + nullpo_retr(strchr(start,'\n'), w1); + nullpo_retr(strchr(start,'\n'), w3); + // w1=<mapname> if( sscanf(w1, "%31[^,]", mapname) != 1 ) { @@ -4335,6 +4447,7 @@ const char *npc_parse_mapflag(const char *w1, const char *w2, const char *w3, co */ const char *npc_parse_unknown_object(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { + nullpo_retr(start, retval); ShowError("npc_parsesrcfile: Unable to parse, probably a missing or extra TAB in file '%s', line '%d'. Skipping line...\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4); start = strchr(start,'\n');// skip and continue *retval = EXIT_FAILURE; @@ -4359,6 +4472,8 @@ int npc_parsesrcfile(const char* filepath, bool runOnInit) { char* buffer; const char* p; + nullpo_retr(EXIT_FAILURE, filepath); + // read whole file to buffer fp = fopen(filepath, "rb"); if( fp == NULL ) { @@ -4567,11 +4682,10 @@ void npc_read_event_script(void) {"Kill NPC Event",script->config.kill_mob_event_name}, }; - for (i = 0; i < NPCE_MAX; i++) - { - DBIterator* iter; - DBKey key; - DBData *data; + for (i = 0; i < NPCE_MAX; i++) { + struct DBIterator *iter; + union DBKey key; + struct DBData *data; char name[64]="::"; safestrncpy(name+2,config[i].event_name,62); @@ -4614,9 +4728,10 @@ void npc_read_event_script(void) /** * @see DBApply */ -int npc_path_db_clear_sub(DBKey key, DBData *data, va_list args) +int npc_path_db_clear_sub(union DBKey key, struct DBData *data, va_list args) { struct npc_path_data *npd = DB->data2ptr(data); + nullpo_ret(npd); if (npd->path) aFree(npd->path); return 0; @@ -4625,7 +4740,7 @@ int npc_path_db_clear_sub(DBKey key, DBData *data, va_list args) /** * @see DBApply */ -int npc_ev_label_db_clear_sub(DBKey key, DBData *data, va_list args) +int npc_ev_label_db_clear_sub(union DBKey key, struct DBData *data, va_list args) { struct linkdb_node **label_linkdb = DB->data2ptr(data); linkdb_final(label_linkdb); // linked data (struct event_data*) is freed when clearing ev_db @@ -4652,12 +4767,12 @@ void npc_process_files( int npc_min ) { "\t-'"CL_WHITE"%d"CL_RESET"' Spawn sets\n" "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Cached\n" "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n", - npc_id - npc_min, npc_warp, npc_shop, npc_script, npc_mob, npc_cache_mob, npc_delay_mob); + npc->npc_id - npc_min, npc->npc_warp, npc->npc_shop, npc->npc_script, npc->npc_mob, npc->npc_cache_mob, npc->npc_delay_mob); } //Clear then reload npcs files int npc_reload(void) { - int npc_new_min = npc_id; + int npc_new_min = npc->npc_id; struct s_mapiterator* iter; struct block_list* bl; @@ -4673,9 +4788,9 @@ int npc_reload(void) { db_clear(npc->ev_db); npc->ev_label_db->clear(npc->ev_label_db, npc->ev_label_db_clear_sub); - npc_last_npd = NULL; - npc_last_path = NULL; - npc_last_ref = NULL; + npc->npc_last_npd = NULL; + npc->npc_last_path = NULL; + npc->npc_last_ref = NULL; //Remove all npcs/mobs. [Skotlex] iter = mapit_geteachiddb(); @@ -4715,8 +4830,8 @@ int npc_reload(void) { // clear mob spawn lookup index mob->clear_spawninfo(); - npc_warp = npc_shop = npc_script = 0; - npc_mob = npc_cache_mob = npc_delay_mob = 0; + npc->npc_warp = npc->npc_shop = npc->npc_script = 0; + npc->npc_mob = npc->npc_cache_mob = npc->npc_delay_mob = 0; // reset mapflags map->flags_init(); @@ -4754,11 +4869,14 @@ int npc_reload(void) { } //Unload all npc in the given file -bool npc_unloadfile( const char* filepath ) { - DBIterator * iter = db_iterator(npc->name_db); +bool npc_unloadfile(const char *filepath) +{ + struct DBIterator *iter = db_iterator(npc->name_db); struct npc_data* nd = NULL; bool found = false; + nullpo_retr(false, filepath); + for( nd = dbi_first(iter); dbi_exists(iter); nd = dbi_next(iter) ) { if( nd->path && strcasecmp(nd->path,filepath) == 0 ) { // FIXME: This can break in case-sensitive file systems found = true; @@ -4797,6 +4915,9 @@ int do_final_npc(void) { void npc_debug_warps_sub(struct npc_data* nd) { int16 m; + + nullpo_retv(nd); + if (nd->bl.type != BL_NPC || nd->subtype != WARP || nd->bl.m < 0) return; @@ -4833,14 +4954,8 @@ static void npc_debug_warps(void) { int do_init_npc(bool minimal) { int i; - memset(&npc->base_ud, 0, sizeof( struct unit_data) ); - npc->base_ud.bl = NULL; - npc->base_ud.walktimer = INVALID_TIMER; - npc->base_ud.skilltimer = INVALID_TIMER; - npc->base_ud.attacktimer = INVALID_TIMER; - npc->base_ud.attackabletime = - npc->base_ud.canact_tick = - npc->base_ud.canmove_tick = timer->gettick(); + unit->init_ud(&npc->base_ud); + npc->base_ud.bl = NULL; //Stock view data for normal npcs. memset(&npc_viewdb, 0, sizeof(npc_viewdb)); @@ -4856,9 +4971,9 @@ int do_init_npc(bool minimal) { npc->name_db = strdb_alloc(DB_OPT_BASE, NAME_LENGTH); npc->path_db = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, 0); - npc_last_npd = NULL; - npc_last_path = NULL; - npc_last_ref = NULL; + npc->npc_last_npd = NULL; + npc->npc_last_path = NULL; + npc->npc_last_ref = NULL; // Should be loaded before npc processing, otherwise labels could overwrite constant values // and lead to undefined behavior [Panikon] @@ -4902,7 +5017,7 @@ int do_init_npc(bool minimal) { strcpy(npc->fake_nd->name,"FAKE_NPC"); memcpy(npc->fake_nd->exname, npc->fake_nd->name, 9); - npc_script++; + npc->npc_script++; npc->fake_nd->bl.type = BL_NPC; npc->fake_nd->subtype = SCRIPT; @@ -4916,6 +5031,17 @@ int do_init_npc(bool minimal) { void npc_defaults(void) { npc = &npc_s; + npc->npc_id = START_NPC_NUM; + npc->npc_warp = 0; + npc->npc_shop = 0; + npc->npc_script = 0; + npc->npc_mob = 0; + npc->npc_delay_mob = 0; + npc->npc_cache_mob = 0; + npc->npc_last_path = NULL; + npc->npc_last_ref = NULL; + npc->npc_last_npd = NULL; + npc->motd = NULL; npc->ev_db = NULL; npc->ev_label_db = NULL; diff --git a/src/map/npc.h b/src/map/npc.h index 965a34f94..24ea9ea59 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -177,10 +177,10 @@ struct npc_path_data { struct npc_interface { /* */ struct npc_data *motd; - DBMap *ev_db; // const char* event_name -> struct event_data* - DBMap *ev_label_db; // const char* label_name (without leading "::") -> struct linkdb_node** (key: struct npc_data*; data: struct event_data*) - DBMap *name_db; // const char* npc_name -> struct npc_data* - DBMap *path_db; + struct DBMap *ev_db; // const char* event_name -> struct event_data* + struct DBMap *ev_label_db; // const char* label_name (without leading "::") -> struct linkdb_node** (key: struct npc_data*; data: struct event_data*) + struct DBMap *name_db; // const char* npc_name -> struct npc_data* + struct DBMap *path_db; struct eri *timer_event_ers; //For the npc timer data. [Skotlex] struct npc_data *fake_nd; struct npc_src_list *src_files; @@ -188,6 +188,16 @@ struct npc_interface { /* npc trader global data, for ease of transition between the script, cleared on every usage */ bool trader_ok; int trader_funds[2]; + int npc_id; + int npc_warp; + int npc_shop; + int npc_script; + int npc_mob; + int npc_delay_mob; + int npc_cache_mob; + const char *npc_last_path; + const char *npc_last_ref; + struct npc_path_data *npc_last_npd; /* */ int (*init) (bool minimal); int (*final) (void); @@ -203,7 +213,7 @@ struct npc_interface { int (*enable) (const char *name, int flag); struct npc_data* (*name2id) (const char *name); int (*event_dequeue) (struct map_session_data *sd); - DBData (*event_export_create) (DBKey key, va_list args); + struct DBData (*event_export_create) (union DBKey key, va_list args); int (*event_export) (struct npc_data *nd, int i); int (*event_sub) (struct map_session_data *sd, struct event_data *ev, const char *eventname); void (*event_doall_sub) (void *key, void *data, va_list ap); @@ -239,8 +249,8 @@ struct npc_interface { int (*selllist_sub) (struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd); int (*selllist) (struct map_session_data *sd, struct itemlist *item_list); int (*remove_map) (struct npc_data *nd); - int (*unload_ev) (DBKey key, DBData *data, va_list ap); - int (*unload_ev_label) (DBKey key, DBData *data, va_list ap); + int (*unload_ev) (union DBKey key, struct DBData *data, va_list ap); + int (*unload_ev_label) (union DBKey key, struct DBData *data, va_list ap); int (*unload_dup_sub) (struct npc_data *nd, va_list args); void (*unload_duplicates) (struct npc_data *nd); int (*unload) (struct npc_data *nd, bool single); @@ -282,8 +292,8 @@ struct npc_interface { int (*parsesrcfile) (const char *filepath, bool runOnInit); int (*script_event) (struct map_session_data *sd, enum npce_event type); void (*read_event_script) (void); - int (*path_db_clear_sub) (DBKey key, DBData *data, va_list args); - int (*ev_label_db_clear_sub) (DBKey key, DBData *data, va_list args); + int (*path_db_clear_sub) (union DBKey key, struct DBData *data, va_list args); + int (*ev_label_db_clear_sub) (union DBKey key, struct DBData *data, va_list args); int (*reload) (void); bool (*unloadfile) (const char *filepath); void (*do_clear_npc) (void); diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index f23cefb26..e461eebe9 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2016 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,11 @@ #include "common/cbasetypes.h" #include "common/mmo.h" +// Packet DB +#define MIN_PACKET_DB 0x0064 +#define MAX_PACKET_DB 0x0F00 +#define MAX_PACKET_POS 20 + /** * **/ @@ -307,134 +312,134 @@ enum packet_headers { * structs for data */ struct EQUIPSLOTINFO { - unsigned short card[4]; + uint16 card[4]; } __attribute__((packed)); struct NORMALITEM_INFO { - short index; - unsigned short ITID; - unsigned char type; + int16 index; + uint16 ITID; + uint8 type; #if PACKETVER < 20120925 uint8 IsIdentified; #endif - short count; + int16 count; #if PACKETVER >= 20120925 - unsigned int WearState; + uint32 WearState; #else - unsigned short WearState; + uint16 WearState; #endif #if PACKETVER >= 5 struct EQUIPSLOTINFO slot; #endif #if PACKETVER >= 20080102 - int HireExpireDate; + int32 HireExpireDate; #endif #if PACKETVER >= 20120925 struct { - unsigned char IsIdentified : 1; - unsigned char PlaceETCTab : 1; - unsigned char SpareBits : 6; + uint8 IsIdentified : 1; + uint8 PlaceETCTab : 1; + uint8 SpareBits : 6; } Flag; #endif } __attribute__((packed)); struct RndOptions { - short index; - short value; - unsigned char param; + int16 index; + int16 value; + uint8 param; } __attribute__((packed)); struct EQUIPITEM_INFO { - short index; - unsigned short ITID; - unsigned char type; + int16 index; + uint16 ITID; + uint8 type; #if PACKETVER < 20120925 uint8 IsIdentified; #endif #if PACKETVER >= 20120925 - unsigned int location; - unsigned int WearState; + uint32 location; + uint32 WearState; #else - unsigned short location; - unsigned short WearState; + uint16 location; + uint16 WearState; #endif #if PACKETVER < 20120925 uint8 IsDamaged; #endif - unsigned char RefiningLevel; + uint8 RefiningLevel; struct EQUIPSLOTINFO slot; #if PACKETVER >= 20071002 - int HireExpireDate; + int32 HireExpireDate; #endif #if PACKETVER >= 20080102 - unsigned short bindOnEquipType; + uint16 bindOnEquipType; #endif #if PACKETVER >= 20100629 - unsigned short wItemSpriteNumber; + uint16 wItemSpriteNumber; #endif #if PACKETVER >= 20150226 - unsigned char option_count; + uint8 option_count; struct RndOptions option_data[5]; #endif #if PACKETVER >= 20120925 struct { - unsigned char IsIdentified : 1; - unsigned char IsDamaged : 1; - unsigned char PlaceETCTab : 1; - unsigned char SpareBits : 5; + uint8 IsIdentified : 1; + uint8 IsDamaged : 1; + uint8 PlaceETCTab : 1; + uint8 SpareBits : 5; } Flag; #endif } __attribute__((packed)); struct packet_authok { - short PacketType; - unsigned int startTime; - unsigned char PosDir[3]; - unsigned char xSize; - unsigned char ySize; + int16 PacketType; + uint32 startTime; + uint8 PosDir[3]; + uint8 xSize; + uint8 ySize; #if PACKETVER >= 20080102 - short font; + int16 font; #endif #if PACKETVER >= 20141022 - unsigned char sex; + uint8 sex; #endif } __attribute__((packed)); struct packet_monster_hp { - short PacketType; - unsigned int GID; - int HP; - int MaxHP; + int16 PacketType; + uint32 GID; + int32 HP; + int32 MaxHP; } __attribute__((packed)); struct packet_sc_notick { - short PacketType; - short index; - unsigned int AID; - unsigned char state; + int16 PacketType; + int16 index; + uint32 AID; + uint8 state; } __attribute__((packed)); struct packet_additem { - short PacketType; - unsigned short Index; - unsigned short count; - unsigned short nameid; + int16 PacketType; + uint16 Index; + uint16 count; + uint16 nameid; uint8 IsIdentified; uint8 IsDamaged; - unsigned char refiningLevel; + uint8 refiningLevel; struct EQUIPSLOTINFO slot; #if PACKETVER >= 20120925 - unsigned int location; + uint32 location; #else - unsigned short location; + uint16 location; #endif - unsigned char type; - unsigned char result; + uint8 type; + uint8 result; #if PACKETVER >= 20061218 - int HireExpireDate; + int32 HireExpireDate; #endif #if PACKETVER >= 20071002 - unsigned short bindOnEquipType; + uint16 bindOnEquipType; #endif #if PACKETVER >= 20150226 struct RndOptions option_data[5]; @@ -442,51 +447,51 @@ struct packet_additem { } __attribute__((packed)); struct packet_dropflooritem { - short PacketType; - unsigned int ITAID; - unsigned short ITID; + int16 PacketType; + uint32 ITAID; + uint16 ITID; #if PACKETVER >= 20130000 /* not sure date */ - unsigned short type; + uint16 type; #endif uint8 IsIdentified; - short xPos; - short yPos; - unsigned char subX; - unsigned char subY; - short count; + int16 xPos; + int16 yPos; + uint8 subX; + uint8 subY; + int16 count; } __attribute__((packed)); struct packet_idle_unit2 { #if PACKETVER < 20091103 - short PacketType; + int16 PacketType; #if PACKETVER >= 20071106 - unsigned char objecttype; -#endif - unsigned int GID; - short speed; - short bodyState; - short healthState; - short effectState; - short job; - short head; - short weapon; - short accessory; - short shield; - short accessory2; - short accessory3; - short headpalette; - short bodypalette; - short headDir; - unsigned int GUID; - short GEmblemVer; - short honor; - short virtue; + uint8 objecttype; +#endif + uint32 GID; + int16 speed; + int16 bodyState; + int16 healthState; + int16 effectState; + int16 job; + int16 head; + int16 weapon; + int16 accessory; + int16 shield; + int16 accessory2; + int16 accessory3; + int16 headpalette; + int16 bodypalette; + int16 headDir; + uint32 GUID; + int16 GEmblemVer; + int16 honor; + int16 virtue; uint8 isPKModeON; - unsigned char sex; - unsigned char PosDir[3]; - unsigned char xSize; - unsigned char ySize; - unsigned char state; - short clevel; + uint8 sex; + uint8 PosDir[3]; + uint8 xSize; + uint8 ySize; + uint8 state; + int16 clevel; #else // ! PACKETVER < 20091103 UNAVAILABLE_STRUCT; #endif // PACKETVER < 20091103 @@ -494,470 +499,473 @@ struct packet_idle_unit2 { struct packet_spawn_unit2 { #if PACKETVER < 20091103 - short PacketType; + int16 PacketType; #if PACKETVER >= 20071106 - unsigned char objecttype; -#endif - unsigned int GID; - short speed; - short bodyState; - short healthState; - short effectState; - short head; - short weapon; - short accessory; - short job; - short shield; - short accessory2; - short accessory3; - short headpalette; - short bodypalette; - short headDir; + uint8 objecttype; +#endif + uint32 GID; + int16 speed; + int16 bodyState; + int16 healthState; + int16 effectState; + int16 head; + int16 weapon; + int16 accessory; + int16 job; + int16 shield; + int16 accessory2; + int16 accessory3; + int16 headpalette; + int16 bodypalette; + int16 headDir; uint8 isPKModeON; - unsigned char sex; - unsigned char PosDir[3]; - unsigned char xSize; - unsigned char ySize; + uint8 sex; + uint8 PosDir[3]; + uint8 xSize; + uint8 ySize; #else // ! PACKETVER < 20091103 UNAVAILABLE_STRUCT; #endif // PACKETVER < 20091103 } __attribute__((packed)); struct packet_spawn_unit { - short PacketType; + int16 PacketType; #if PACKETVER >= 20091103 - short PacketLength; - unsigned char objecttype; + int16 PacketLength; + uint8 objecttype; #endif #if PACKETVER >= 20131223 - unsigned int AID; + uint32 AID; #endif - unsigned int GID; - short speed; - short bodyState; - short healthState; + uint32 GID; + int16 speed; + int16 bodyState; + int16 healthState; #if PACKETVER < 20080102 - short effectState; + int16 effectState; #else - int effectState; + int32 effectState; #endif - short job; - short head; + int16 job; + int16 head; #if PACKETVER < 7 - short weapon; + int16 weapon; #else - int weapon; + int32 weapon; #endif - short accessory; + int16 accessory; #if PACKETVER < 7 - short shield; + int16 shield; #endif - short accessory2; - short accessory3; - short headpalette; - short bodypalette; - short headDir; + int16 accessory2; + int16 accessory3; + int16 headpalette; + int16 bodypalette; + int16 headDir; #if PACKETVER >= 20101124 - short robe; + int16 robe; #endif - unsigned int GUID; - short GEmblemVer; - short honor; + uint32 GUID; + int16 GEmblemVer; + int16 honor; #if PACKETVER > 7 - int virtue; + int32 virtue; #else - short virtue; + int16 virtue; #endif uint8 isPKModeON; - unsigned char sex; - unsigned char PosDir[3]; - unsigned char xSize; - unsigned char ySize; - short clevel; + uint8 sex; + uint8 PosDir[3]; + uint8 xSize; + uint8 ySize; + int16 clevel; #if PACKETVER >= 20080102 - short font; + int16 font; #endif #if PACKETVER >= 20120221 - int maxHP; - int HP; - unsigned char isBoss; + int32 maxHP; + int32 HP; + uint8 isBoss; #endif #if PACKETVER >= 20150513 - short body; + int16 body; + char name[NAME_LENGTH]; #endif } __attribute__((packed)); struct packet_unit_walking { - short PacketType; + int16 PacketType; #if PACKETVER >= 20091103 - short PacketLength; + int16 PacketLength; #endif #if PACKETVER > 20071106 - unsigned char objecttype; + uint8 objecttype; #endif #if PACKETVER >= 20131223 - unsigned int AID; + uint32 AID; #endif - unsigned int GID; - short speed; - short bodyState; - short healthState; + uint32 GID; + int16 speed; + int16 bodyState; + int16 healthState; #if PACKETVER < 7 - short effectState; + int16 effectState; #else - int effectState; + int32 effectState; #endif - short job; - short head; + int16 job; + int16 head; #if PACKETVER < 7 - short weapon; + int16 weapon; #else - int weapon; + int32 weapon; #endif - short accessory; - unsigned int moveStartTime; + int16 accessory; + uint32 moveStartTime; #if PACKETVER < 7 - short shield; + int16 shield; #endif - short accessory2; - short accessory3; - short headpalette; - short bodypalette; - short headDir; + int16 accessory2; + int16 accessory3; + int16 headpalette; + int16 bodypalette; + int16 headDir; #if PACKETVER >= 20101124 - short robe; + int16 robe; #endif - unsigned int GUID; - short GEmblemVer; - short honor; + uint32 GUID; + int16 GEmblemVer; + int16 honor; #if PACKETVER > 7 - int virtue; + int32 virtue; #else - short virtue; + int16 virtue; #endif uint8 isPKModeON; - unsigned char sex; - unsigned char MoveData[6]; - unsigned char xSize; - unsigned char ySize; - short clevel; + uint8 sex; + uint8 MoveData[6]; + uint8 xSize; + uint8 ySize; + int16 clevel; #if PACKETVER >= 20080102 - short font; + int16 font; #endif #if PACKETVER >= 20120221 - int maxHP; - int HP; - unsigned char isBoss; + int32 maxHP; + int32 HP; + uint8 isBoss; #endif #if PACKETVER >= 20150513 - short body; + int16 body; + char name[NAME_LENGTH]; #endif } __attribute__((packed)); struct packet_idle_unit { - short PacketType; + int16 PacketType; #if PACKETVER >= 20091103 - short PacketLength; - unsigned char objecttype; + int16 PacketLength; + uint8 objecttype; #endif #if PACKETVER >= 20131223 - unsigned int AID; + uint32 AID; #endif - unsigned int GID; - short speed; - short bodyState; - short healthState; + uint32 GID; + int16 speed; + int16 bodyState; + int16 healthState; #if PACKETVER < 20080102 - short effectState; + int16 effectState; #else - int effectState; + int32 effectState; #endif - short job; - short head; + int16 job; + int16 head; #if PACKETVER < 7 - short weapon; + int16 weapon; #else - int weapon; + int32 weapon; #endif - short accessory; + int16 accessory; #if PACKETVER < 7 - short shield; + int16 shield; #endif - short accessory2; - short accessory3; - short headpalette; - short bodypalette; - short headDir; + int16 accessory2; + int16 accessory3; + int16 headpalette; + int16 bodypalette; + int16 headDir; #if PACKETVER >= 20101124 - short robe; + int16 robe; #endif - unsigned int GUID; - short GEmblemVer; - short honor; + uint32 GUID; + int16 GEmblemVer; + int16 honor; #if PACKETVER > 7 - int virtue; + int32 virtue; #else - short virtue; + int16 virtue; #endif uint8 isPKModeON; - unsigned char sex; - unsigned char PosDir[3]; - unsigned char xSize; - unsigned char ySize; - unsigned char state; - short clevel; + uint8 sex; + uint8 PosDir[3]; + uint8 xSize; + uint8 ySize; + uint8 state; + int16 clevel; #if PACKETVER >= 20080102 - short font; + int16 font; #endif #if PACKETVER >= 20120221 - int maxHP; - int HP; - unsigned char isBoss; + int32 maxHP; + int32 HP; + uint8 isBoss; #endif #if PACKETVER >= 20150513 - short body; + int16 body; + char name[NAME_LENGTH]; #endif } __attribute__((packed)); struct packet_status_change { - short PacketType; - short index; - unsigned int AID; - unsigned char state; + int16 PacketType; + int16 index; + uint32 AID; + uint8 state; #if PACKETVER >= 20120618 - unsigned int Total; + uint32 Total; #endif #if PACKETVER >= 20090121 - unsigned int Left; - int val1; - int val2; - int val3; + uint32 Left; + int32 val1; + int32 val2; + int32 val3; #endif } __attribute__((packed)); struct packet_status_change_end { - short PacketType; - short index; - unsigned int AID; - unsigned char state; + int16 PacketType; + int16 index; + uint32 AID; + uint8 state; } __attribute__((packed)); struct packet_status_change2 { - short PacketType; - short index; - unsigned int AID; - unsigned char state; - unsigned int Left; - int val1; - int val2; - int val3; + int16 PacketType; + int16 index; + uint32 AID; + uint8 state; + uint32 Left; + int32 val1; + int32 val2; + int32 val3; } __attribute__((packed)); struct packet_maptypeproperty2 { - short PacketType; - short type; + int16 PacketType; + int16 type; struct { - unsigned int party : 1; // Show attack cursor on non-party members (PvP) - unsigned int guild : 1; // Show attack cursor on non-guild members (GvG) - unsigned int siege : 1; // Show emblem over characters' heads when in GvG (WoE castle) - unsigned int mineffect : 1; // Automatically enable /mineffect - unsigned int nolockon : 1; // TODO: What does this do? (shows attack cursor on non-party members) - unsigned int countpk : 1; /// Show the PvP counter - unsigned int nopartyformation : 1; /// Prevent party creation/modification - unsigned int bg : 1; // TODO: What does this do? Probably related to Battlegrounds, but I'm not sure on the effect - unsigned int nocostume : 1; /// Does not show costume sprite. - unsigned int usecart : 1; /// Allow opening cart inventory - unsigned int summonstarmiracle : 1; // TODO: What does this do? Related to Taekwon Masters, but I have no idea. - unsigned int SpareBits : 15; /// Currently ignored, reserved for future updates + uint32 party : 1; // Show attack cursor on non-party members (PvP) + uint32 guild : 1; // Show attack cursor on non-guild members (GvG) + uint32 siege : 1; // Show emblem over characters' heads when in GvG (WoE castle) + uint32 mineffect : 1; // Automatically enable /mineffect + uint32 nolockon : 1; // TODO: What does this do? (shows attack cursor on non-party members) + uint32 countpk : 1; /// Show the PvP counter + uint32 nopartyformation : 1; /// Prevent party creation/modification + uint32 bg : 1; // TODO: What does this do? Probably related to Battlegrounds, but I'm not sure on the effect + uint32 nocostume : 1; /// Does not show costume sprite. + uint32 usecart : 1; /// Allow opening cart inventory + uint32 summonstarmiracle : 1; // TODO: What does this do? Related to Taekwon Masters, but I have no idea. + uint32 SpareBits : 15; /// Currently ignored, reserved for future updates } flag; } __attribute__((packed)); struct packet_bgqueue_ack { - short PacketType; - unsigned char type; + int16 PacketType; + uint8 type; char bg_name[NAME_LENGTH]; } __attribute__((packed)); struct packet_bgqueue_notice_delete { - short PacketType; - unsigned char type; + int16 PacketType; + uint8 type; char bg_name[NAME_LENGTH]; } __attribute__((packed)); struct packet_bgqueue_register { - short PacketType; - short type; + int16 PacketType; + int16 type; char bg_name[NAME_LENGTH]; } __attribute__((packed)); struct packet_bgqueue_update_info { - short PacketType; + int16 PacketType; char bg_name[NAME_LENGTH]; - int position; + int32 position; } __attribute__((packed)); struct packet_bgqueue_checkstate { - short PacketType; + int16 PacketType; char bg_name[NAME_LENGTH]; } __attribute__((packed)); struct packet_bgqueue_revoke_req { - short PacketType; + int16 PacketType; char bg_name[NAME_LENGTH]; } __attribute__((packed)); struct packet_bgqueue_battlebegin_ack { - short PacketType; - unsigned char result; + int16 PacketType; + uint8 result; char bg_name[NAME_LENGTH]; char game_name[NAME_LENGTH]; } __attribute__((packed)); struct packet_bgqueue_notify_entry { - short PacketType; + int16 PacketType; char name[NAME_LENGTH]; - int position; + int32 position; } __attribute__((packed)); struct packet_bgqueue_battlebegins { - short PacketType; + int16 PacketType; char bg_name[NAME_LENGTH]; char game_name[NAME_LENGTH]; } __attribute__((packed)); struct packet_script_clear { - short PacketType; - unsigned int NpcID; + int16 PacketType; + uint32 NpcID; } __attribute__((packed)); /* made possible thanks to Yommy!! */ struct packet_package_item_announce { - short PacketType; - short PacketLength; - unsigned char type; - unsigned short ItemID; - char len; + int16 PacketType; + int16 PacketLength; + uint8 type; + uint16 ItemID; + int8 len; char Name[NAME_LENGTH]; - char unknown; - unsigned short BoxItemID; + int8 unknown; + uint16 BoxItemID; } __attribute__((packed)); /* made possible thanks to Yommy!! */ struct packet_item_drop_announce { - short PacketType; - short PacketLength; - unsigned char type; - unsigned short ItemID; - char len; + int16 PacketType; + int16 PacketLength; + uint8 type; + uint16 ItemID; + int8 len; char Name[NAME_LENGTH]; char monsterNameLen; char monsterName[NAME_LENGTH]; } __attribute__((packed)); struct packet_cart_additem_ack { - short PacketType; - char result; + int16 PacketType; + int8 result; } __attribute__((packed)); struct packet_banking_check { - short PacketType; + int16 PacketType; int64 Money; - short Reason; + int16 Reason; } __attribute__((packed)); struct packet_banking_deposit_req { - short PacketType; - unsigned int AID; - int Money; + int16 PacketType; + uint32 AID; + int32 Money; } __attribute__((packed)); struct packet_banking_withdraw_req { - short PacketType; - unsigned int AID; - int Money; + int16 PacketType; + uint32 AID; + int32 Money; } __attribute__((packed)); struct packet_banking_deposit_ack { - short PacketType; - short Reason; + int16 PacketType; + int16 Reason; int64 Money; - int Balance; + int32 Balance; } __attribute__((packed)); struct packet_banking_withdraw_ack { - short PacketType; - short Reason; + int16 PacketType; + int16 Reason; int64 Money; - int Balance; + int32 Balance; } __attribute__((packed)); /* Roulette System [Yommy/Hercules] */ struct packet_roulette_open_ack { - short PacketType; - char Result; - int Serial; - char Step; - char Idx; - short AdditionItemID; - int GoldPoint; - int SilverPoint; - int BronzePoint; + int16 PacketType; + int8 Result; + int32 Serial; + int8 Step; + int8 Idx; + int16 AdditionItemID; + int32 GoldPoint; + int32 SilverPoint; + int32 BronzePoint; } __attribute__((packed)); struct packet_roulette_info_ack { - short PacketType; - short PacketLength; - unsigned int RouletteSerial; + int16 PacketType; + int16 PacketLength; + uint32 RouletteSerial; struct { - unsigned short Row; - unsigned short Position; - unsigned short ItemId; - unsigned short Count; + uint16 Row; + uint16 Position; + uint16 ItemId; + uint16 Count; } ItemInfo[42]; } __attribute__((packed)); struct packet_roulette_close_ack { - short PacketType; - unsigned char Result; + int16 PacketType; + uint8 Result; } __attribute__((packed)); struct packet_roulette_generate_ack { - short PacketType; - unsigned char Result; - unsigned short Step; - unsigned short Idx; - unsigned short AdditionItemID; - int RemainGold; - int RemainSilver; - int RemainBronze; + int16 PacketType; + uint8 Result; + uint16 Step; + uint16 Idx; + uint16 AdditionItemID; + int32 RemainGold; + int32 RemainSilver; + int32 RemainBronze; } __attribute__((packed)); struct packet_roulette_itemrecv_req { - short PacketType; - unsigned char Condition; + int16 PacketType; + uint8 Condition; } __attribute__((packed)); struct packet_roulette_itemrecv_ack { - short PacketType; - unsigned char Result; - unsigned short AdditionItemID; + int16 PacketType; + uint8 Result; + uint16 AdditionItemID; } __attribute__((packed)); struct packet_itemlist_normal { - short PacketType; - short PacketLength; + int16 PacketType; + int16 PacketLength; struct NORMALITEM_INFO list[MAX_ITEMLIST]; } __attribute__((packed)); struct packet_itemlist_equip { - short PacketType; - short PacketLength; + int16 PacketType; + int16 PacketLength; struct EQUIPITEM_INFO list[MAX_ITEMLIST]; } __attribute__((packed)); struct packet_storelist_normal { - short PacketType; - short PacketLength; + int16 PacketType; + int16 PacketLength; #if PACKETVER >= 20120925 char name[NAME_LENGTH]; #endif @@ -965,8 +973,8 @@ struct packet_storelist_normal { } __attribute__((packed)); struct packet_storelist_equip { - short PacketType; - short PacketLength; + int16 PacketType; + int16 PacketLength; #if PACKETVER >= 20120925 char name[NAME_LENGTH]; #endif @@ -974,124 +982,124 @@ struct packet_storelist_equip { } __attribute__((packed)); struct packet_equip_item { - short PacketType; - unsigned short index; + int16 PacketType; + uint16 index; #if PACKETVER >= 20120925 - unsigned int wearLocation; + uint32 wearLocation; #else - unsigned short wearLocation; + uint16 wearLocation; #endif } __attribute__((packed)); struct packet_equipitem_ack { - short PacketType; - unsigned short index; + int16 PacketType; + uint16 index; #if PACKETVER >= 20120925 - unsigned int wearLocation; + uint32 wearLocation; #else - unsigned short wearLocation; + uint16 wearLocation; #endif #if PACKETVER >= 20100629 - unsigned short wItemSpriteNumber; + uint16 wItemSpriteNumber; #endif - unsigned char result; + uint8 result; } __attribute__((packed)); struct packet_unequipitem_ack { - short PacketType; - unsigned short index; + int16 PacketType; + uint16 index; #if PACKETVER >= 20120925 - unsigned int wearLocation; + uint32 wearLocation; #else - unsigned short wearLocation; + uint16 wearLocation; #endif - unsigned char result; + uint8 result; } __attribute__((packed)); struct packet_viewequip_ack { - short PacketType; - short PacketLength; + int16 PacketType; + int16 PacketLength; char characterName[NAME_LENGTH]; - short job; - short head; - short accessory; - short accessory2; - short accessory3; + int16 job; + int16 head; + int16 accessory; + int16 accessory2; + int16 accessory3; #if PACKETVER >= 20101124 - short robe; + int16 robe; #endif - short headpalette; - short bodypalette; - unsigned char sex; + int16 headpalette; + int16 bodypalette; + uint8 sex; struct EQUIPITEM_INFO list[MAX_INVENTORY]; } __attribute__((packed)); struct packet_notify_bounditem { - short PacketType; - unsigned short index; + int16 PacketType; + uint16 index; } __attribute__((packed)); struct packet_skill_entry { - short PacketType; + int16 PacketType; #if PACKETVER >= 20110718 - short PacketLength; + int16 PacketLength; #endif - unsigned int AID; - unsigned int creatorAID; - short xPos; - short yPos; + uint32 AID; + uint32 creatorAID; + int16 xPos; + int16 yPos; #if PACKETVER >= 20121212 - int job; + int32 job; #else - unsigned char job; + uint8 job; #endif #if PACKETVER >= 20110718 - char RadiusRange; + int8 RadiusRange; #endif - unsigned char isVisible; + uint8 isVisible; #if PACKETVER >= 20130731 - unsigned char level; + uint8 level; #endif } __attribute__((packed)); struct packet_graffiti_entry { - short PacketType; - unsigned int AID; - unsigned int creatorAID; - short xPos; - short yPos; - unsigned char job; - unsigned char isVisible; - unsigned char isContens; + int16 PacketType; + uint32 AID; + uint32 creatorAID; + int16 xPos; + int16 yPos; + uint8 job; + uint8 isVisible; + uint8 isContens; char msg[80]; } __attribute__((packed)); struct packet_damage { - short PacketType; - unsigned int GID; - unsigned int targetGID; - unsigned int startTime; - int attackMT; - int attackedMT; + int16 PacketType; + uint32 GID; + uint32 targetGID; + uint32 startTime; + int32 attackMT; + int32 attackedMT; #if PACKETVER < 20071113 - short damage; + int16 damage; #else - int damage; + int32 damage; #endif #if PACKETVER >= 20131223 - unsigned char is_sp_damaged; + uint8 is_sp_damaged; #endif - short count; - unsigned char action; + int16 count; + uint8 action; #if PACKETVER < 20071113 - short leftDamage; + int16 leftDamage; #else - int leftDamage; + int32 leftDamage; #endif } __attribute__((packed)); struct packet_gm_monster_item { - short PacketType; + int16 PacketType; #if PACKETVER >= 20131218 char str[100]; #else @@ -1100,35 +1108,35 @@ struct packet_gm_monster_item { } __attribute__((packed)); struct packet_npc_market_purchase { - short PacketType; - short PacketLength; + int16 PacketType; + int16 PacketLength; struct { - unsigned short ITID; - int qty; + uint16 ITID; + int32 qty; } list[]; // Note: We assume this should be <= MAX_INVENTORY (since you can't hold more than MAX_INVENTORY items thus cant buy that many at once). } __attribute__((packed)); struct packet_npc_market_result_ack { - short PacketType; - short PacketLength; - unsigned char result; + int16 PacketType; + int16 PacketLength; + uint8 result; struct { - unsigned short ITID; - unsigned short qty; - unsigned int price; + uint16 ITID; + uint16 qty; + uint32 price; } list[MAX_INVENTORY];/* assuming MAX_INVENTORY is max since you can't hold more than MAX_INVENTORY items thus cant buy that many at once. */ } __attribute__((packed)); struct packet_npc_market_open { - short PacketType; - short PacketLength; + int16 PacketType; + int16 PacketLength; /* inner struct figured by Ind after some annoying hour of debugging (data Thanks to Yommy) */ struct { - unsigned short nameid; - unsigned char type; - unsigned int price; - unsigned int qty; - unsigned short view; + uint16 nameid; + uint8 type; + uint32 price; + uint32 qty; + uint16 view; // It seems that the client doesn't have any hard-coded limit for this list // it's possible to send up to 1890 items without dropping a packet that's // too large [Panikon] @@ -1136,30 +1144,30 @@ struct packet_npc_market_open { } __attribute__((packed)); struct packet_wis_end { - short PacketType; - char result; + int16 PacketType; + int8 result; #if PACKETVER >= 20131223 - unsigned int unknown;/* maybe AID, not sure what for (works sending as 0) */ + uint32 unknown;/* maybe AID, not sure what for (works sending as 0) */ #endif } __attribute__((packed)); struct packet_party_leader_changed { - short PacketType; - unsigned int prev_leader_aid; - unsigned int new_leader_aid; + int16 PacketType; + uint32 prev_leader_aid; + uint32 new_leader_aid; } __attribute__((packed)); struct packet_hotkey { #ifdef HOTKEY_SAVING - short PacketType; + int16 PacketType; #if PACKETVER >= 20141022 - char Rotate; + int8 Rotate; #endif struct { - char isSkill; // 0: Item, 1:Skill - unsigned int ID; // Item/Skill ID - short count; // Item Quantity/Skill Level + int8 isSkill; // 0: Item, 1:Skill + uint32 ID; // Item/Skill ID + int16 count; // Item Quantity/Skill Level } hotkey[MAX_HOTKEYS]; #else // not HOTKEY_SAVING UNAVAILABLE_STRUCT; @@ -1207,6 +1215,19 @@ struct packet_quest_list_header { //struct packet_quest_list_info list[]; // Variable-length } __attribute__((packed)); +struct packet_chat_message { + uint16 packet_id; + int16 packet_len; + char message[]; +} __attribute__((packed)); + +struct packet_whisper_message { + uint16 packet_id; + int16 packet_len; + char name[NAME_LENGTH]; + char message[]; +} __attribute__((packed)); + #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #pragma pack(pop) #endif // not NetBSD < 6 / Solaris diff --git a/src/map/party.c b/src/map/party.c index 77f3c2b0b..dbb7b6ae2 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -122,7 +122,8 @@ struct map_session_data *party_sd_check(int party_id, int account_id, int char_i return sd; } -int party_db_final(DBKey key, DBData *data, va_list ap) { +int party_db_final(union DBKey key, struct DBData *data, va_list ap) +{ struct party_data *p; if ((p = DB->data2ptr(data))) { @@ -146,9 +147,8 @@ struct party_data* party_searchname(const char* str) { struct party_data* p; - DBIterator *iter = db_iterator(party->db); - for( p = dbi_first(iter); dbi_exists(iter); p = dbi_next(iter) ) - { + struct DBIterator *iter = db_iterator(party->db); + for (p = dbi_first(iter); dbi_exists(iter); p = dbi_next(iter)) { if( strncmpi(p->party.name,str,NAME_LENGTH) == 0 ) break; } @@ -798,12 +798,16 @@ int party_send_logout(struct map_session_data *sd) return 1; } -int party_send_message(struct map_session_data *sd,const char *mes,int len) +int party_send_message(struct map_session_data *sd, const char *mes) { - if(sd->status.party_id==0) + int len = (int)strlen(mes); + + nullpo_ret(sd); + + if (sd->status.party_id == 0) return 0; - intif->party_message(sd->status.party_id,sd->status.account_id,mes,len); - party->recv_message(sd->status.party_id,sd->status.account_id,mes,len); + intif->party_message(sd->status.party_id, sd->status.account_id, mes, len); + party->recv_message(sd->status.party_id, sd->status.account_id, mes, len); // Chat logging type 'P' / Party Chat logs->chat(LOG_CHAT_PARTY, sd->status.party_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes); @@ -871,10 +875,11 @@ int party_skill_check(struct map_session_data *sd, int party_id, uint16 skill_id return 0; } -int party_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { +int party_send_xy_timer(int tid, int64 tick, int id, intptr_t data) +{ + struct DBIterator *iter = db_iterator(party->db); struct party_data* p; - DBIterator *iter = db_iterator(party->db); // for each existing party, for( p = dbi_first(iter); dbi_exists(iter); p = dbi_next(iter) ) { @@ -1284,7 +1289,7 @@ void party_recruit_search(struct map_session_data *sd, short level, short mapid, int count = 0; struct party_booking_ad_info* result_list[PARTY_BOOKING_RESULTS]; bool more_result = false; - DBIterator* iter = db_iterator(party->booking_db); + struct DBIterator *iter = db_iterator(party->booking_db); memset(result_list, 0, sizeof(result_list)); @@ -1315,7 +1320,7 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid, int count = 0; struct party_booking_ad_info* result_list[PARTY_BOOKING_RESULTS]; bool more_result = false; - DBIterator* iter = db_iterator(party->booking_db); + struct DBIterator *iter = db_iterator(party->booking_db); memset(result_list, 0, sizeof(result_list)); diff --git a/src/map/party.h b/src/map/party.h index b66a9770c..05037eb04 100644 --- a/src/map/party.h +++ b/src/map/party.h @@ -85,8 +85,8 @@ struct party_booking_ad_info { * created by Susu *-------------------------------------*/ struct party_interface { - DBMap* db; // int party_id -> struct party_data* (releases data) - DBMap* booking_db; // int char_id -> struct party_booking_ad_info* (releases data) // Party Booking [Spiria] + struct DBMap *db; // int party_id -> struct party_data* (releases data) + struct DBMap *booking_db; // int char_id -> struct party_booking_ad_info* (releases data) // Party Booking [Spiria] unsigned int booking_nextid; /* funcs */ void (*init) (bool minimal); @@ -117,7 +117,7 @@ struct party_interface { void (*send_movemap) (struct map_session_data *sd); void (*send_levelup) (struct map_session_data *sd); int (*send_logout) (struct map_session_data *sd); - int (*send_message) (struct map_session_data *sd,const char *mes,int len); + int (*send_message) (struct map_session_data *sd, const char *mes); int (*recv_message) (int party_id,int account_id,const char *mes,int len); int (*skill_check) (struct map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv); int (*send_xy_clear) (struct party_data *p); @@ -145,7 +145,7 @@ struct party_interface { struct map_session_data *(*sd_check) (int party_id, int account_id, int char_id); void (*check_state) (struct party_data *p); struct party_booking_ad_info* (*create_booking_data) (void); - int (*db_final) (DBKey key, DBData *data, va_list ap); + int (*db_final) (union DBKey key, struct DBData *data, va_list ap); }; #ifdef HERCULES_CORE diff --git a/src/map/path.c b/src/map/path.c index 543497c33..0df9708d8 100644 --- a/src/map/path.c +++ b/src/map/path.c @@ -254,7 +254,7 @@ static int add_path(struct node_heap *heap, struct path_node *tp, int16 x, int16 *------------------------------------------*/ bool path_search(struct walkpath_data *wpd, struct block_list *bl, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, int flag, cell_chk cell) { - register int i, j, x, y, dx, dy; + register int i, x, y, dx, dy; struct map_data *md; struct walkpath_data s_wpd; @@ -315,8 +315,7 @@ bool path_search(struct walkpath_data *wpd, struct block_list *bl, int16 m, int1 } return false; // easy path unsuccessful - } - else { // !(flag&1) + } else { // !(flag&1) // A* (A-star) pathfinding // We always use A* for finding walkpaths because it is what game client uses. // Easy pathfinding cuts corners of non-walkable cells, but client always walks around it. @@ -331,6 +330,7 @@ bool path_search(struct walkpath_data *wpd, struct block_list *bl, int16 m, int1 int xs = md->xs - 1; int ys = md->ys - 1; int len = 0; + int j; memset(tp, 0, sizeof(tp)); // Start node @@ -407,7 +407,7 @@ bool path_search(struct walkpath_data *wpd, struct block_list *bl, int16 m, int1 } for (it = current; it->parent != NULL; it = it->parent, len++); - if (len > sizeof(wpd->path)) { + if (len > (int)sizeof(wpd->path)) { return false; } diff --git a/src/map/pc.c b/src/map/pc.c index 7b4d47db2..1c635e5cf 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -63,6 +63,7 @@ #include "common/random.h" #include "common/showmsg.h" #include "common/socket.h" +#include "common/sql.h" #include "common/strlib.h" // safestrncpy() #include "common/sysinfo.h" #include "common/timer.h" @@ -539,7 +540,7 @@ void pc_rental_expire(struct map_session_data *sd, int i) { } clif->rental_expired(sd->fd, i, sd->status.inventory[i].nameid); - pc->delitem(sd, i, sd->status.inventory[i].amount, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); + pc->delitem(sd, i, sd->status.inventory[i].amount, 0, DELITEM_NORMAL, LOG_TYPE_RENTAL); } void pc_inventory_rentals(struct map_session_data *sd) { @@ -1863,8 +1864,8 @@ int pc_disguise(struct map_session_data *sd, int class_) { clif->cartlist(sd); clif->updatestatus(sd,SP_CARTINFO); } - if (sd->chatID) { - struct chat_data *cd = map->id2cd(sd->chatID); + if (sd->chat_id != 0) { + struct chat_data *cd = map->id2cd(sd->chat_id); if (cd != NULL) clif->dispchat(cd,0); @@ -4136,7 +4137,7 @@ int pc_insert_card(struct map_session_data* sd, int idx_card, int idx_equip) // remember the card id to insert nameid = sd->status.inventory[idx_card].nameid; - if( pc->delitem(sd, idx_card, 1, 1, DELITEM_NORMAL, LOG_TYPE_OTHER) == 1 ) + if( pc->delitem(sd, idx_card, 1, 1, DELITEM_NORMAL, LOG_TYPE_CARD) == 1 ) {// failed clif->insert_card(sd,idx_equip,idx_card,1); } @@ -4146,9 +4147,9 @@ int pc_insert_card(struct map_session_data* sd, int idx_card, int idx_equip) ARR_FIND( 0, sd->inventory_data[idx_equip]->slot, i, sd->status.inventory[idx_equip].card[i] == 0); if (i == sd->inventory_data[idx_equip]->slot) return 0; // no free slots - logs->pick_pc(sd, LOG_TYPE_OTHER, -1, &sd->status.inventory[idx_equip],sd->inventory_data[idx_equip]); + logs->pick_pc(sd, LOG_TYPE_CARD, -1, &sd->status.inventory[idx_equip],sd->inventory_data[idx_equip]); sd->status.inventory[idx_equip].card[i] = nameid; - logs->pick_pc(sd, LOG_TYPE_OTHER, 1, &sd->status.inventory[idx_equip],sd->inventory_data[idx_equip]); + logs->pick_pc(sd, LOG_TYPE_CARD, 1, &sd->status.inventory[idx_equip],sd->inventory_data[idx_equip]); clif->insert_card(sd,idx_equip,idx_card,0); return 1; } @@ -4275,7 +4276,7 @@ int pc_payzeny(struct map_session_data *sd,int zeny, enum e_log_pick_type type, if( zeny > 0 && sd->state.showzeny ) { char output[255]; sprintf(output, "Removed %dz.", zeny); - clif_disp_onlyself(sd,output,strlen(output)); + clif_disp_onlyself(sd, output); } return 0; @@ -4317,7 +4318,7 @@ int pc_paycash(struct map_session_data *sd, int price, int points) { char output[128]; sprintf(output, msg_sd(sd,504), points, cash, sd->kafraPoints, sd->cashPoints); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); } return cash+points; } @@ -4342,7 +4343,7 @@ int pc_getcash(struct map_session_data *sd, int cash, int points) if( battle_config.cashshop_show_points ) { sprintf(output, msg_sd(sd,505), cash, sd->cashPoints); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); } return cash; } @@ -4365,7 +4366,7 @@ int pc_getcash(struct map_session_data *sd, int cash, int points) if( battle_config.cashshop_show_points ) { sprintf(output, msg_sd(sd,506), points, sd->kafraPoints); - clif_disp_onlyself(sd, output, strlen(output)); + clif_disp_onlyself(sd, output); } return points; } @@ -4403,7 +4404,7 @@ int pc_getzeny(struct map_session_data *sd,int zeny, enum e_log_pick_type type, if( zeny > 0 && sd->state.showzeny ) { char output[255]; sprintf(output, "Gained %dz.", zeny); - clif_disp_onlyself(sd,output,strlen(output)); + clif_disp_onlyself(sd, output); } return 0; @@ -5340,7 +5341,7 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, uint16 skil char message[128]; sprintf (message, msg_txt(542), sd->status.name, md->db->jname, data->jname, (float)md->db->dropitem[i].p / 100); //MSG: "'%s' stole %s's %s (chance: %0.02f%%)" - intif->broadcast(message, strlen(message)+1, BC_DEFAULT); + intif->broadcast(message, (int)strlen(message)+1, BC_DEFAULT); } return 1; } @@ -6725,7 +6726,7 @@ bool pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned in char output[256]; sprintf(output, "Experience Gained Base:%u (%.2f%%) Job:%u (%.2f%%)",base_exp,nextbp*(float)100,job_exp,nextjp*(float)100); - clif_disp_onlyself(sd,output,strlen(output)); + clif_disp_onlyself(sd, output); } return true; @@ -8990,7 +8991,7 @@ char* pc_readregstr(struct map_session_data* sd, int64 reg) { void pc_setregstr(struct map_session_data* sd, int64 reg, const char* str) { struct script_reg_str *p = NULL; unsigned int index = script_getvaridx(reg); - DBData prev; + struct DBData prev; if( str[0] ) { p = ers_alloc(pc->str_reg_ers, struct script_reg_str); @@ -9113,7 +9114,7 @@ int pc_setregistry(struct map_session_data *sd, int64 reg, int val) { if( !pc->reg_load ) p->flag.update = 1;/* either way, it will require either delete or replace */ } else if( val ) { - DBData prev; + struct DBData prev; if( index ) script->array_update(&sd->regs, reg, false); @@ -9166,7 +9167,7 @@ int pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val) if( !pc->reg_load ) p->flag.update = 1;/* either way, it will require either delete or replace */ } else if( val[0] ) { - DBData prev; + struct DBData prev; if( index ) script->array_update(&sd->regs, reg, false); @@ -9905,7 +9906,7 @@ int pc_checkitem(struct map_session_data *sd) if (!itemdb_available(id)) { ShowWarning("Removed invalid/disabled item id %d from inventory (amount=%d, char_id=%d).\n", id, sd->status.inventory[i].amount, sd->status.char_id); - pc->delitem(sd, i, sd->status.inventory[i].amount, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); + pc->delitem(sd, i, sd->status.inventory[i].amount, 0, DELITEM_NORMAL, LOG_TYPE_INV_INVALID); continue; } @@ -9921,7 +9922,7 @@ int pc_checkitem(struct map_session_data *sd) if( !itemdb_available(id) ) { ShowWarning("Removed invalid/disabled item id %d from cart (amount=%d, char_id=%d).\n", id, sd->status.cart[i].amount, sd->status.char_id); - pc->cart_delitem(sd, i, sd->status.cart[i].amount, 0, LOG_TYPE_OTHER); + pc->cart_delitem(sd, i, sd->status.cart[i].amount, 0, LOG_TYPE_CART_INVALID); continue; } @@ -10139,9 +10140,9 @@ int pc_divorce(struct map_session_data *sd) for( i = 0; i < MAX_INVENTORY; i++ ) { if( sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F ) - pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); + pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_DIVORCE); if( p_sd->status.inventory[i].nameid == WEDDING_RING_M || p_sd->status.inventory[i].nameid == WEDDING_RING_F ) - pc->delitem(p_sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); + pc->delitem(p_sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_DIVORCE); } clif->divorced(sd, p_sd->status.name); @@ -10334,7 +10335,7 @@ int map_day_timer(int tid, int64 tick, int id, intptr_t data) { map->night_flag = 0; // 0=day, 1=night [Yor] map->foreachpc(pc->daynight_timer_sub); safestrncpy(tmp_soutput, (data == 0) ? msg_txt(502) : msg_txt(60), sizeof(tmp_soutput)); // The day has arrived! - intif->broadcast(tmp_soutput, strlen(tmp_soutput) + 1, BC_DEFAULT); + intif->broadcast(tmp_soutput, (int)strlen(tmp_soutput) + 1, BC_DEFAULT); return 0; } @@ -10354,7 +10355,7 @@ int map_night_timer(int tid, int64 tick, int id, intptr_t data) { map->night_flag = 1; // 0=day, 1=night [Yor] map->foreachpc(pc->daynight_timer_sub); safestrncpy(tmp_soutput, (data == 0) ? msg_txt(503) : msg_txt(59), sizeof(tmp_soutput)); // The night has fallen... - intif->broadcast(tmp_soutput, strlen(tmp_soutput) + 1, BC_DEFAULT); + intif->broadcast(tmp_soutput, (int)strlen(tmp_soutput) + 1, BC_DEFAULT); return 0; } @@ -11013,18 +11014,18 @@ int pc_readdb(void) { ShowError("can't read %s\n", line); return 1; } - while(fgets(line, sizeof(line), fp)) - { + while (fgets(line, sizeof(line), fp)) { char *split[10]; int lv,n; - if(line[0]=='/' && line[1]=='/') + if (line[0]=='/' && line[1]=='/') continue; - for(j=0,p=line;j<3 && p;j++){ - split[j]=p; - p=strchr(p,','); - if(p) *p++=0; + for (j = 0, p = line; j < 3 && p != NULL; j++) { + split[j] = p; + p = strchr(p,','); + if (p != NULL) + *p++ = 0; } - if( j < 2 ) + if (j < 2) continue; lv=atoi(split[0]); @@ -11036,8 +11037,8 @@ int pc_readdb(void) { if(line[0]=='/' && line[1]=='/') continue; - for ( j = ELE_NEUTRAL, p = line; j<n && j<ELE_MAX && p; j++ ) { - while(*p==32 && *p>0) + for (j = ELE_NEUTRAL, p = line; j < n && j < ELE_MAX && p != NULL; j++) { + while (*p == ' ') p++; battle->attr_fix_table[lv-1][i][j]=atoi(p); #ifndef RENEWAL @@ -11045,7 +11046,8 @@ int pc_readdb(void) { battle->attr_fix_table[lv-1][i][j] = 0; #endif p=strchr(p,','); - if(p) *p++=0; + if (p != NULL) + *p++ = 0; } i++; @@ -11194,7 +11196,7 @@ void pc_scdata_received(struct map_session_data *sd) { time_t exp_time = sd->expiration_time; char tmpstr[1024]; strftime(tmpstr, sizeof(tmpstr) - 1, msg_sd(sd,501), localtime(&exp_time)); // "Your account time limit is: %d-%m-%Y %H:%M:%S." - clif->wis_message(sd->fd, map->wisp_server_name, tmpstr, strlen(tmpstr)+1); + clif->wis_message(sd->fd, map->wisp_server_name, tmpstr, (int)strlen(tmpstr)); pc->expire_check(sd); } @@ -11474,7 +11476,8 @@ void pc_autotrade_populate(struct map_session_data *sd) { /** * @see DBApply */ -int pc_autotrade_final(DBKey key, DBData *data, va_list ap) { +int pc_autotrade_final(union DBKey key, struct DBData *data, va_list ap) +{ struct autotrade_vending* at_v = DB->data2ptr(data); HPM->data_store_destroy(&at_v->hdata); return 0; @@ -11514,6 +11517,87 @@ int pc_have_magnifier(struct map_session_data *sd) return n; } +/** + * Verifies a chat message, searching for atcommands, checking if the sender + * character can chat, and updating the idle timer. + * + * @param sd The sender character. + * @param message The message text. + * @return Whether the message is a valid chat message. + */ +bool pc_process_chat_message(struct map_session_data *sd, const char *message) +{ + if (atcommand->exec(sd->fd, sd, message, true)) { + return false; + } + + if (!pc->can_talk(sd)) { + return false; + } + + if (battle_config.min_chat_delay != 0) { + if (DIFF_TICK(sd->cantalk_tick, timer->gettick()) > 0) { + return false; + } + sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay; + } + + pc->update_idle_time(sd, BCIDLE_CHAT); + + return true; +} + +/** + * Checks a chat message, scanning for the Super Novice prayer sequence. + * + * If a match is found, the angel is invoked or the counter is incremented as + * appropriate. + * + * @param sd The sender character. + * @param message The message text. + */ +void pc_check_supernovice_call(struct map_session_data *sd, const char *message) +{ + unsigned int next = pc->nextbaseexp(sd); + int percent = 0; + + if ((sd->class_&MAPID_UPPERMASK) != MAPID_SUPER_NOVICE) + return; + if (next == 0) + next = pc->thisbaseexp(sd); + if (next == 0) + return; + + // 0%, 10%, 20%, ... + percent = (int)( ( (float)sd->status.base_exp/(float)next )*1000. ); + if ((battle_config.snovice_call_type != 0 || percent != 0) && (percent%100) == 0) { + // 10.0%, 20.0%, ..., 90.0% + switch (sd->state.snovice_call_flag) { + case 0: + if (strstr(message, msg_txt(1479))) // "Dear angel, can you hear my voice?" + sd->state.snovice_call_flag = 1; + break; + case 1: + { + char buf[256]; + snprintf(buf, 256, msg_txt(1480), sd->status.name); + if (strstr(message, buf)) // "I am %s Super Novice~" + sd->state.snovice_call_flag = 2; + } + break; + case 2: + if (strstr(message, msg_txt(1481))) // "Help me out~ Please~ T_T" + sd->state.snovice_call_flag = 3; + break; + case 3: + sc_start(NULL, &sd->bl, status->skill2sc(MO_EXPLOSIONSPIRITS), 100, 17, skill->get_time(MO_EXPLOSIONSPIRITS, 5)); //Lv17-> +50 critical (noted by Poki) [Skotlex] + clif->skill_nodamage(&sd->bl, &sd->bl, MO_EXPLOSIONSPIRITS, 5, 1); // prayer always shows successful Lv5 cast and disregards noskill restrictions + sd->state.snovice_call_flag = 0; + break; + } + } +} + void do_final_pc(void) { db_destroy(pc->itemcd_db); pc->at_db->destroy(pc->at_db,pc->autotrade_final); @@ -11869,6 +11953,9 @@ void pc_defaults(void) { pc->db_checkid = pc_db_checkid; pc->validate_levels = pc_validate_levels; + pc->check_supernovice_call = pc_check_supernovice_call; + pc->process_chat_message = pc_process_chat_message; + /** * Autotrade persistency [Ind/Hercules <3] **/ diff --git a/src/map/pc.h b/src/map/pc.h index 0d2bca84d..58f7a2266 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -33,8 +33,9 @@ #include "map/status.h" // enum sc_type, OPTION_* #include "map/unit.h" // struct unit_data, struct view_data #include "map/vending.h" // struct s_vending -#include "common/hercules.h" +#include "common/db.h" #include "common/ers.h" // struct eri +#include "common/hercules.h" #include "common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus, NEW_CARTS /** @@ -257,7 +258,7 @@ struct map_session_data { struct script_state *st; char npc_str[CHATBOX_SIZE]; // for passing npc input box text to script engine int npc_timer_id; //For player attached npc timers. [Skotlex] - unsigned int chatID; + int chat_id; int64 idletime; struct { int npc_id; @@ -530,7 +531,7 @@ END_ZEROED_BLOCK; unsigned char channel_count; struct channel_data *gcbind; unsigned char fontcolor; - unsigned int fontcolor_tid; + int fontcolor_tid; int64 hchsysch_tick; /* [Ind/Hercules] */ @@ -609,15 +610,15 @@ END_ZEROED_BLOCK; #define pc_setsit(sd) ( (sd)->state.dead_sit = (sd)->vd.dead_sit = 2 ) #define pc_isdead(sd) ( (sd)->state.dead_sit == 1 ) #define pc_issit(sd) ( (sd)->vd.dead_sit == 2 ) -#define pc_isidle(sd) ( (sd)->chatID || (sd)->state.vending || (sd)->state.buyingstore || DIFF_TICK(sockt->last_tick, (sd)->idletime) >= battle->bc->idle_no_share ) +#define pc_isidle(sd) ( (sd)->chat_id != 0 || (sd)->state.vending || (sd)->state.buyingstore || DIFF_TICK(sockt->last_tick, (sd)->idletime) >= battle->bc->idle_no_share ) #define pc_istrading(sd) ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->state.trading ) -#define pc_cant_act(sd) ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->chatID || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend ) +#define pc_cant_act(sd) ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->chat_id != 0 || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend ) /* equals pc_cant_act except it doesn't check for chat rooms */ #define pc_cant_act2(sd) ( (sd)->npc_id || (sd)->state.buyingstore || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend ) #define pc_setdir(sd,b,h) ( (sd)->ud.dir = (b) ,(sd)->head_dir = (h) ) -#define pc_setchatid(sd,n) ( (sd)->chatID = n ) +#define pc_setchatid(sd,n) ( (sd)->chat_id = (n) ) #define pc_ishiding(sd) ( (sd)->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) ) #define pc_iscloaking(sd) ( !((sd)->sc.option&OPTION_CHASEWALK) && ((sd)->sc.option&OPTION_CLOAK) ) #define pc_ischasewalk(sd) ( (sd)->sc.option&OPTION_CHASEWALK ) @@ -657,7 +658,7 @@ END_ZEROED_BLOCK; #define pc_stop_attack(sd) (unit->stop_attack(&(sd)->bl)) //Weapon check considering dual wielding. -#define pc_check_weapontype(sd, type) ((type)&((sd)->status.weapon < MAX_WEAPON_TYPE? \ +#define pc_check_weapontype(sd, type) ((type)&((sd)->status.weapon < MAX_SINGLE_WEAPON_TYPE? \ 1<<(sd)->status.weapon:(1<<(sd)->weapontype1)|(1<<(sd)->weapontype2)|(1<<(sd)->status.weapon))) // clientside display macros (values to the left/right of the "+") @@ -784,9 +785,9 @@ struct autotrade_vending { struct pc_interface { /* */ - DBMap *at_db;/* char id -> struct autotrade_vending */ + struct DBMap *at_db;/* char id -> struct autotrade_vending */ /* */ - DBMap* itemcd_db; + struct DBMap *itemcd_db; /* */ int day_timer_tid; int night_timer_tid; @@ -1084,12 +1085,15 @@ END_ZEROED_BLOCK; /* End */ void (*autotrade_start) (struct map_session_data *sd); void (*autotrade_prepare) (struct map_session_data *sd); void (*autotrade_populate) (struct map_session_data *sd); - int (*autotrade_final) (DBKey key, DBData *data, va_list ap); + int (*autotrade_final) (union DBKey key, struct DBData *data, va_list ap); int (*check_job_name) (const char *name); void (*update_idle_time) (struct map_session_data* sd, enum e_battle_config_idletime type); - + int (*have_magnifier) (struct map_session_data *sd); + + bool (*process_chat_message) (struct map_session_data *sd, const char *message); + void (*check_supernovice_call) (struct map_session_data *sd, const char *message); }; #ifdef HERCULES_CORE diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c index b325a8ed7..ccda34b1c 100644 --- a/src/map/pc_groups.c +++ b/src/map/pc_groups.c @@ -75,7 +75,7 @@ static void read_config(void) { if (groups != NULL) { GroupSettings *group_settings = NULL; - DBIterator *iter = NULL; + struct DBIterator *iter = NULL; int i, loop = 0; group_count = libconfig->setting_length(groups); @@ -465,7 +465,7 @@ void do_init_pc_groups(void) { /** * @see DBApply */ -static int group_db_clear_sub(DBKey key, DBData *data, va_list args) +static int group_db_clear_sub(union DBKey key, struct DBData *data, va_list args) { GroupSettings *group = DB->data2ptr(data); if (group->name) diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h index 3f95237b7..27eac7284 100644 --- a/src/map/pc_groups.h +++ b/src/map/pc_groups.h @@ -22,9 +22,9 @@ #define MAP_PC_GROUPS_H #include "common/hercules.h" -#include "common/db.h" /* Forward Declarations */ +struct DBMap; // common/db.h struct config_setting_t; /// PC permissions @@ -91,8 +91,8 @@ struct pc_groups_new_permission { struct pc_groups_interface { /* */ - DBMap* db; // id -> GroupSettings - DBMap* name_db; // name -> GroupSettings + struct DBMap *db; // id -> GroupSettings + struct DBMap *name_db; // name -> GroupSettings /* */ struct pc_groups_permission_table *permissions; unsigned char permission_count; diff --git a/src/map/pet.c b/src/map/pet.c index 256324d29..e2b257e10 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -317,7 +317,7 @@ int pet_return_egg(struct map_session_data *sd, struct pet_data *pd) tmp_item.card[1] = GetWord(pd->pet.pet_id,0); tmp_item.card[2] = GetWord(pd->pet.pet_id,1); tmp_item.card[3] = pd->pet.rename_flag; - if((flag = pc->additem(sd,&tmp_item,1,LOG_TYPE_OTHER))) { + if((flag = pc->additem(sd,&tmp_item,1,LOG_TYPE_EGG))) { clif->additem(sd,0,0,flag); map->addflooritem(&sd->bl, &tmp_item, 1, sd->bl.m, sd->bl.x, sd->bl.y, 0, 0, 0, 0); } @@ -464,7 +464,7 @@ int pet_recv_petdata(int account_id,struct s_pet *p,int flag) { return 1; } if (!pet->birth_process(sd,p)) //Pet hatched. Delete egg. - pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); + pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_EGG); } else { pet->data_init(sd,p); if(sd->pd && sd->bl.prev != NULL) { @@ -703,7 +703,7 @@ int pet_equipitem(struct map_session_data *sd,int index) { return 1; } - pc->delitem(sd, index, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); + pc->delitem(sd, index, 1, 0, DELITEM_NORMAL, LOG_TYPE_CONSUME); pd->pet.equip = nameid; status->set_viewdata(&pd->bl, pd->pet.class_); //Updates view_data. clif->send_petdata(NULL, sd->pd, 3, sd->pd->vd.head_bottom); @@ -734,7 +734,7 @@ int pet_unequipitem(struct map_session_data *sd, struct pet_data *pd) { memset(&tmp_item,0,sizeof(tmp_item)); tmp_item.nameid = nameid; tmp_item.identify = 1; - if((flag = pc->additem(sd,&tmp_item,1,LOG_TYPE_OTHER))) { + if((flag = pc->additem(sd,&tmp_item,1,LOG_TYPE_CONSUME))) { clif->additem(sd,0,0,flag); map->addflooritem(&sd->bl, &tmp_item, 1, sd->bl.m, sd->bl.x, sd->bl.y, 0, 0, 0, 0); } diff --git a/src/map/quest.c b/src/map/quest.c index bf0a76b16..79328ae9d 100644 --- a/src/map/quest.c +++ b/src/map/quest.c @@ -316,7 +316,7 @@ void quest_update_objective(struct map_session_data *sd, int mob_id) item.nameid = dropitem->nameid; item.identify = itemdb->isidentified2(data); item.amount = 1; - if((temp = pc->additem(sd, &item, 1, LOG_TYPE_OTHER)) != 0) { // TODO: We might want a new log type here? + if((temp = pc->additem(sd, &item, 1, LOG_TYPE_QUEST)) != 0) { // TODO: We might want a new log type here? // Failed to obtain the item clif->additem(sd, 0, 0, temp); } diff --git a/src/map/script.c b/src/map/script.c index 7d5ce7d43..07b37571e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -56,6 +56,7 @@ #include "map/unit.h" #include "common/cbasetypes.h" #include "common/conf.h" +#include "common/db.h" #include "common/memmgr.h" #include "common/md5calc.h" #include "common/mmo.h" // NEW_CARTS @@ -63,6 +64,7 @@ #include "common/random.h" #include "common/showmsg.h" #include "common/socket.h" // usage: getcharip +#include "common/sql.h" #include "common/strlib.h" #include "common/sysinfo.h" #include "common/timer.h" @@ -235,9 +237,9 @@ void script_reportsrc(struct script_state *st) { break; default: if( bl->m >= 0 ) - ShowDebug("Source (Non-NPC type %u): name %s at %s (%d,%d)\n", bl->type, status->get_name(bl), map->list[bl->m].name, bl->x, bl->y); + ShowDebug("Source (Non-NPC type %u): name %s at %s (%d,%d)\n", bl->type, clif->get_bl_name(bl), map->list[bl->m].name, bl->x, bl->y); else - ShowDebug("Source (Non-NPC type %u): name %s (invisible/not on a map)\n", bl->type, status->get_name(bl)); + ShowDebug("Source (Non-NPC type %u): name %s (invisible/not on a map)\n", bl->type, clif->get_bl_name(bl)); break; } } @@ -2349,6 +2351,8 @@ void read_constdb(void) } else { value = libconfig->setting_get_int(t); } + if (is_parameter) + ShowWarning("read_constdb: Defining parameters in the constants configuration is deprecated and will no longer be possible in a future version. Parameters should be defined in source. (parameter = '%s')\n", name); script->set_constant(name, value, is_parameter, is_deprecated); } script->constdb_comment(NULL); @@ -2367,6 +2371,49 @@ void script_constdb_comment(const char *comment) (void)comment; } +void script_load_parameters(void) +{ + int i = 0; + struct { + char *name; + enum status_point_types type; + } parameters[] = { + {"BaseExp", SP_BASEEXP}, + {"JobExp", SP_JOBEXP}, + {"Karma", SP_KARMA}, + {"Manner", SP_MANNER}, + {"Hp", SP_HP}, + {"MaxHp", SP_MAXHP}, + {"Sp", SP_SP}, + {"MaxSp", SP_MAXSP}, + {"StatusPoint", SP_STATUSPOINT}, + {"BaseLevel", SP_BASELEVEL}, + {"SkillPoint", SP_SKILLPOINT}, + {"Class", SP_CLASS}, + {"Zeny", SP_ZENY}, + {"Sex", SP_SEX}, + {"NextBaseExp", SP_NEXTBASEEXP}, + {"NextJobExp", SP_NEXTJOBEXP}, + {"Weight", SP_WEIGHT}, + {"MaxWeight", SP_MAXWEIGHT}, + {"JobLevel", SP_JOBLEVEL}, + {"Upper", SP_UPPER}, + {"BaseJob", SP_BASEJOB}, + {"BaseClass", SP_BASECLASS}, + {"killerrid", SP_KILLERRID}, + {"killedrid", SP_KILLEDRID}, + {"SlotChange", SP_SLOTCHANGE}, + {"CharRename", SP_CHARRENAME}, + {"ModExp", SP_MOD_EXP}, + {"ModDrop", SP_MOD_DROP}, + {"ModDeath", SP_MOD_DEATH}, + }; + + script->constdb_comment("Parameters"); + for (i=0; i < ARRAYLENGTH(parameters); ++i) + script->set_constant(parameters[i].name, parameters[i].type, true, false); + script->constdb_comment(NULL); +} // Standard UNIX tab size is 8 #define TAB_SIZE 8 #define update_tabstop(tabstop,chars) \ @@ -2652,13 +2699,13 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o #endif #ifdef SCRIPT_DEBUG_DISASM i = 0; - while(i < script->pos) { - int j = i; - c_op op = script->get_com(script->buf,&i); + while (i < script->pos) { + c_op op = script->get_com(script->buf, &i); + int j = i; // Note: i is modified in the line above. ShowMessage("%06x %s", i, script->op2name(op)); - j = i; - switch(op) { + + switch (op) { case C_INT: ShowMessage(" %d", script->get_num(script->buf,&i)); break; @@ -2819,43 +2866,46 @@ struct script_data *get_val(struct script_state* st, struct script_data* data) { } } - if( postfix == '$' ) {// string variable + if (postfix == '$') { + // string variable + const char *str = NULL; - switch( prefix ) { + switch (prefix) { case '@': - data->u.str = pc->readregstr(sd, data->u.num); + str = pc->readregstr(sd, data->u.num); break; case '$': - data->u.str = mapreg->readregstr(data->u.num); + str = mapreg->readregstr(data->u.num); break; case '#': - if( name[1] == '#' ) - data->u.str = pc_readaccountreg2str(sd, data->u.num);// global + if (name[1] == '#') + str = pc_readaccountreg2str(sd, data->u.num);// global else - data->u.str = pc_readaccountregstr(sd, data->u.num);// local + str = pc_readaccountregstr(sd, data->u.num);// local break; case '.': if (data->ref) - data->u.str = script->get_val_ref_str(st, data->ref, data); + str = script->get_val_ref_str(st, data->ref, data); else if (name[1] == '@') - data->u.str = script->get_val_scope_str(st, &st->stack->scope, data); + str = script->get_val_scope_str(st, &st->stack->scope, data); else - data->u.str = script->get_val_npc_str(st, &st->script->local, data); + str = script->get_val_npc_str(st, &st->script->local, data); break; case '\'': - data->u.str = script->get_val_instance_str(st, name, data); + str = script->get_val_instance_str(st, name, data); break; default: - data->u.str = pc_readglobalreg_str(sd, data->u.num); + str = pc_readglobalreg_str(sd, data->u.num); break; } - if( data->u.str == NULL || data->u.str[0] == '\0' ) {// empty string + if (str == NULL || str[0] == '\0') { + // empty string data->type = C_CONSTSTR; data->u.str = ""; } else {// duplicate string data->type = C_STR; - data->u.str = aStrdup(data->u.str); + data->u.mutstr = aStrdup(str); } } else {// integer variable @@ -2912,12 +2962,16 @@ struct script_data *get_val(struct script_state* st, struct script_data* data) { * @param ref[in] the container to look up the reference into. * @return the retrieved value of the reference. */ -void* get_val2(struct script_state* st, int64 uid, struct reg_db *ref) { +const void *get_val2(struct script_state *st, int64 uid, struct reg_db *ref) +{ struct script_data* data; script->push_val(st->stack, C_NAME, uid, ref); data = script_getdatatop(st, -1); script->get_val(st, data); - return (data->type == C_INT ? (void*)h64BPTRSIZE((int32)data->u.num) : (void*)h64BPTRSIZE(data->u.str)); // u.num is int32 because it comes from script->get_val + if (data->type == C_INT) // u.num is int32 because it comes from script->get_val + return (const void *)h64BPTRSIZE((int32)data->u.num); + else + return (const void *)h64BPTRSIZE(data->u.str); } /** * Because, currently, array members with key 0 are indifferenciable from normal variables, we should ensure its actually in @@ -2934,8 +2988,8 @@ void script_array_ensure_zero(struct script_state *st, struct map_session_data * insert = true; } else { if( is_string_variable(name) ) { - char* str = (char*)script->get_val2(st, uid, ref); - if( str && *str ) + const char *str = script->get_val2(st, uid, ref); + if (str != NULL && *str != '\0') insert = true; script_removetop(st, -1, 0); } else { @@ -2999,7 +3053,8 @@ unsigned int script_array_highest_key(struct script_state *st, struct map_sessio } return 0; } -int script_free_array_db(DBKey key, DBData *data, va_list ap) { +int script_free_array_db(union DBKey key, struct DBData *data, va_list ap) +{ struct script_array *sa = DB->data2ptr(data); aFree(sa->members); ers_free(script->array_ers, sa); @@ -3306,59 +3361,59 @@ int set_var(struct map_session_data *sd, char *name, void *val) return script->set_reg(NULL, sd, reference_uid(script->add_str(name),0), name, val, NULL); } -void setd_sub(struct script_state *st, struct map_session_data *sd, const char *varname, int elem, void *value, struct reg_db *ref) +void setd_sub(struct script_state *st, struct map_session_data *sd, const char *varname, int elem, const void *value, struct reg_db *ref) { script->set_reg(st, sd, reference_uid(script->add_str(varname),elem), varname, value, ref); } /// Converts the data to a string -const char* conv_str(struct script_state* st, struct script_data* data) +const char *conv_str(struct script_state *st, struct script_data* data) { - char* p; - script->get_val(st, data); - if( data_isstring(data) ) - {// nothing to convert + if (data_isstring(data)) { + // nothing to convert + return data->u.str; } - else if( data_isint(data) ) - {// int -> string + if (data_isint(data)) { + // int -> string + char *p; CREATE(p, char, ITEM_NAME_LENGTH); snprintf(p, ITEM_NAME_LENGTH, "%"PRId64"", data->u.num); p[ITEM_NAME_LENGTH-1] = '\0'; data->type = C_STR; - data->u.str = p; + data->u.mutstr = p; + return data->u.mutstr; } - else if( data_isreference(data) ) - {// reference -> string + if (data_isreference(data)) { + // reference -> string //##TODO when does this happen (check script->get_val) [FlavioJS] data->type = C_CONSTSTR; data->u.str = reference_getname(data); - } - else - {// unsupported data type - ShowError("script:conv_str: cannot convert to string, defaulting to \"\"\n"); - script->reportdata(data); - script->reportsrc(st); - data->type = C_CONSTSTR; - data->u.str = ""; - } + return data->u.str; + } + // unsupported data type + ShowError("script:conv_str: cannot convert to string, defaulting to \"\"\n"); + script->reportdata(data); + script->reportsrc(st); + data->type = C_CONSTSTR; + data->u.str = ""; return data->u.str; } /// Converts the data to an int -int conv_num(struct script_state* st, struct script_data* data) { - char* p; +int conv_num(struct script_state *st, struct script_data *data) +{ long num; script->get_val(st, data); - if( data_isint(data) ) - {// nothing to convert + if (data_isint(data)) { + // nothing to convert + return (int)data->u.num; } - else if( data_isstring(data) ) - {// string -> int + if (data_isstring(data)) { + // string -> int // the result does not overflow or underflow, it is capped instead // ex: 999999999999 is capped to INT_MAX (2147483647) - p = data->u.str; errno = 0; num = strtol(data->u.str, NULL, 10);// change radix to 0 to support octal numbers "o377" and hex numbers "0xFF" if( errno == ERANGE @@ -3380,22 +3435,21 @@ int conv_num(struct script_state* st, struct script_data* data) { script->reportdata(data); script->reportsrc(st); } - if( data->type == C_STR ) - aFree(p); + if (data->type == C_STR) + aFree(data->u.mutstr); data->type = C_INT; data->u.num = (int)num; + return (int)data->u.num; } #if 0 + // unsupported data type // FIXME this function is being used to retrieve the position of labels and // probably other stuff [FlavioJS] - else - {// unsupported data type - ShowError("script:conv_num: cannot convert to number, defaulting to 0\n"); - script->reportdata(data); - script->reportsrc(st); - data->type = C_INT; - data->u.num = 0; - } + ShowError("script:conv_num: cannot convert to number, defaulting to 0\n"); + script->reportdata(data); + script->reportsrc(st); + data->type = C_INT; + data->u.num = 0; #endif return (int)data->u.num; } @@ -3425,11 +3479,23 @@ struct script_data* push_val(struct script_stack* stack, enum c_op type, int64 v } /// Pushes a string into the stack -struct script_data* push_str(struct script_stack* stack, enum c_op type, char* str) +struct script_data *push_str(struct script_stack *stack, char *str) { if( stack->sp >= stack->sp_max ) script->stack_expand(stack); - stack->stack_data[stack->sp].type = type; + stack->stack_data[stack->sp].type = C_STR; + stack->stack_data[stack->sp].u.mutstr = str; + stack->stack_data[stack->sp].ref = NULL; + stack->sp++; + return &stack->stack_data[stack->sp-1]; +} + +/// Pushes a constant string into the stack +struct script_data *push_conststr(struct script_stack *stack, const char *str) +{ + if( stack->sp >= stack->sp_max ) + script->stack_expand(stack); + stack->stack_data[stack->sp].type = C_CONSTSTR; stack->stack_data[stack->sp].u.str = str; stack->stack_data[stack->sp].ref = NULL; stack->sp++; @@ -3451,10 +3517,10 @@ struct script_data* push_retinfo(struct script_stack* stack, struct script_retin struct script_data* push_copy(struct script_stack* stack, int pos) { switch( stack->stack_data[pos].type ) { case C_CONSTSTR: - return script->push_str(stack, C_CONSTSTR, stack->stack_data[pos].u.str); + return script->push_conststr(stack, stack->stack_data[pos].u.str); break; case C_STR: - return script->push_str(stack, C_STR, aStrdup(stack->stack_data[pos].u.str)); + return script->push_str(stack, aStrdup(stack->stack_data[pos].u.mutstr)); break; case C_RETINFO: ShowFatalError("script:push_copy: can't create copies of C_RETINFO. Exiting...\n"); @@ -3488,8 +3554,8 @@ void pop_stack(struct script_state* st, int start, int end) { for( i = start; i < end; i++ ) { data = &stack->stack_data[i]; - if( data->type == C_STR ) - aFree(data->u.str); + if (data->type == C_STR) + aFree(data->u.mutstr); if( data->type == C_RETINFO ) { struct script_retinfo* ri = data->u.ri; @@ -3541,7 +3607,8 @@ void pop_stack(struct script_state* st, int start, int end) { /*========================================== * Release script dependent variable, dependent variable of function *------------------------------------------*/ -void script_free_vars(struct DBMap* var_storage) { +void script_free_vars(struct DBMap *var_storage) +{ if( var_storage ) { // destroy the storage construct containing the variables db_destroy(var_storage); @@ -3720,12 +3787,11 @@ void op_3(struct script_state* st, int op) data = script_getdatatop(st, -3); script->get_val(st, data); - if( data_isstring(data) ) - flag = data->u.str[0];// "" -> false - else if( data_isint(data) ) + if (data_isstring(data)) { + flag = data->u.str[0]; // "" -> false + } else if (data_isint(data)) { flag = data->u.num == 0 ? 0 : 1;// 0 -> false - else - { + } else { ShowError("script:op_3: invalid data for the ternary operator test\n"); script->reportdata(data); script->reportsrc(st); @@ -3768,7 +3834,7 @@ void op_2str(struct script_state* st, int op, const char* s1, const char* s2) pcre *compiled_regex; pcre_extra *extra_regex; const char *pcre_error, *pcre_match; - int pcre_erroroffset, offsetcount, i; + int pcre_erroroffset, offsetcount; int offsets[256*3]; // (max_capturing_groups+1)*3 compiled_regex = libpcre->compile(s2, 0, &pcre_error, &pcre_erroroffset, NULL); @@ -3809,8 +3875,9 @@ void op_2str(struct script_state* st, int op, const char* s1, const char* s2) return; } - if( op == C_RE_EQ ) { - for( i = 0; i < offsetcount; i++ ) { + if (op == C_RE_EQ) { + int i; + for (i = 0; i < offsetcount; i++) { libpcre->get_substring(s1, offsets, offsetcount, i, &pcre_match); mapreg->setregstr(reference_uid(script->add_str("$@regexmatch$"), i), pcre_match); libpcre->free_substring(pcre_match); @@ -3946,10 +4013,9 @@ void op_2(struct script_state *st, int op) script->op_2str(st, op, left->u.str, right->u.str); script_removetop(st, leftref.type == C_NOP ? -3 : -2, -1);// pop the two values before the top one - if (leftref.type != C_NOP) - { + if (leftref.type != C_NOP) { if (left->type == C_STR) // don't free C_CONSTSTR - aFree(left->u.str); + aFree(left->u.mutstr); *left = leftref; } } @@ -4198,8 +4264,9 @@ void run_script(struct script_code *rootscript, int pos, int rid, int oid) { script->run_main(st); } -void script_stop_instances(struct script_code *code) { - DBIterator *iter; +void script_stop_instances(struct script_code *code) +{ + struct DBIterator *iter; struct script_state* st; if( !script->active_scripts ) @@ -4347,7 +4414,7 @@ void run_script_main(struct script_state *st) { script->push_val(stack,c,0,NULL); break; case C_STR: - script->push_str(stack,C_CONSTSTR,(char*)(st->script->script_buf+st->pos)); + script->push_conststr(stack, (const char *)(st->script->script_buf+st->pos)); while(st->script->script_buf[st->pos++]); break; case C_LSTR: @@ -4359,7 +4426,7 @@ void run_script_main(struct script_state *st) { st->pos += sizeof(int) + sizeof(uint8); if( (!st->rid || !(lsd = map->id2sd(st->rid)) || !lsd->lang_id) && !map->default_lang_id ) - script->push_str(stack,C_CONSTSTR,script->string_list+string_id); + script->push_conststr(stack, script->string_list+string_id); else { uint8 k, wlang_id = lsd ? lsd->lang_id : map->default_lang_id; int offset = st->pos; @@ -4371,8 +4438,10 @@ void run_script_main(struct script_state *st) { break; offset += sizeof(char*); } - script->push_str(stack,C_CONSTSTR, - ( k == translations ) ? script->string_list+string_id : *(char**)(&st->script->script_buf[offset]) ); + if (k == translations) + script->push_conststr(stack, script->string_list+string_id); + else + script->push_conststr(stack, *(const char**)(&st->script->script_buf[offset]) ); } st->pos += ( ( sizeof(char*) + sizeof(uint8) ) * translations ); } @@ -4531,7 +4600,7 @@ int script_config_read(char *cfgName) { /** * @see DBApply */ -int db_script_free_code_sub(DBKey key, DBData *data, va_list ap) +int db_script_free_code_sub(union DBKey key, struct DBData *data, va_list ap) { struct script_code *code = DB->data2ptr(data); if (code) @@ -4607,7 +4676,8 @@ void script_setarray_pc(struct map_session_data* sd, const char* varname, uint32 /** * Clears persistent variables from memory **/ -int script_reg_destroy(DBKey key, DBData *data, va_list ap) { +int script_reg_destroy(union DBKey key, struct DBData *data, va_list ap) +{ struct script_reg_state *src; if( data->type != DB_DATA_PTR )/* got no need for those! */ @@ -4657,9 +4727,10 @@ void script_generic_ui_array_expand (unsigned int plus) { /*========================================== * Destructor *------------------------------------------*/ -void do_final_script(void) { +void do_final_script(void) +{ int i; - DBIterator *iter; + struct DBIterator *iter; struct script_state *st; #ifdef SCRIPT_DEBUG_HASH @@ -4850,9 +4921,8 @@ void script_load_translations(void) { libconfig->destroy(&translations_conf); if( total ) { - DBIterator *main_iter; - DBIterator *sub_iter; - DBMap *string_db; + struct DBIterator *main_iter; + struct DBMap *string_db; struct string_translation *st = NULL; uint32 j = 0; @@ -4860,9 +4930,9 @@ void script_load_translations(void) { script->translation_buf_size = total; main_iter = db_iterator(script->translation_db); - for( string_db = dbi_first(main_iter); dbi_exists(main_iter); string_db = dbi_next(main_iter) ) { - sub_iter = db_iterator(string_db); - for( st = dbi_first(sub_iter); dbi_exists(sub_iter); st = dbi_next(sub_iter) ) { + for (string_db = dbi_first(main_iter); dbi_exists(main_iter); string_db = dbi_next(main_iter)) { + struct DBIterator *sub_iter = db_iterator(string_db); + for (st = dbi_first(sub_iter); dbi_exists(sub_iter); st = dbi_next(sub_iter)) { script->translation_buf[j++] = st->buf; } dbi_destroy(sub_iter); @@ -4887,8 +4957,8 @@ void script_load_translations(void) { /** * **/ -const char * script_get_translation_file_name(const char *file) { - static char file_name[200]; +const char *script_get_translation_file_name(const char *file) +{ int i, len = (int)strlen(file), last_bar = -1, last_dot = -1; for(i = 0; i < len; i++) { @@ -4899,6 +4969,7 @@ const char * script_get_translation_file_name(const char *file) { } if( last_bar != -1 || last_dot != -1 ) { + static char file_name[200]; if( last_bar != -1 && last_dot < last_bar ) last_dot = -1; safestrncpy(file_name, file+(last_bar >= 0 ? last_bar+1 : 0), ( last_dot >= 0 ? ( last_bar >= 0 ? last_dot - last_bar : last_dot ) : sizeof(file_name) )); @@ -4915,7 +4986,7 @@ void script_load_translation(const char *file, uint8 lang_id, uint32 *total) { uint32 translations = 0; char line[1024]; char msgctxt[NAME_LENGTH*2+1] = { 0 }; - DBMap *string_db; + struct DBMap *string_db; size_t i; FILE *fp; struct script_string_buf msgid = { 0 }, msgstr = { 0 }; @@ -4930,7 +5001,7 @@ void script_load_translation(const char *file, uint8 lang_id, uint32 *total) { atcommand->expand_message_table(); while(fgets(line, sizeof(line), fp)) { - size_t len = strlen(line), cursor = 0; + size_t len = strlen(line); if( len <= 1 ) continue; @@ -4939,6 +5010,7 @@ void script_load_translation(const char *file, uint8 lang_id, uint32 *total) { continue; if( strncasecmp(line,"msgctxt \"", 9) == 0 ) { + int cursor = 0; msgctxt[0] = '\0'; for(i = 9; i < len - 2; i++) { if( line[i] == '\\' && line[i+1] == '"' ) { @@ -4946,7 +5018,7 @@ void script_load_translation(const char *file, uint8 lang_id, uint32 *total) { i++; } else msgctxt[cursor] = line[i]; - if( ++cursor >= sizeof(msgctxt) - 1 ) + if (++cursor >= (int)sizeof(msgctxt) - 1) break; } msgctxt[cursor] = '\0'; @@ -5066,12 +5138,13 @@ void script_clear_translations(bool reload) { /** * **/ -int script_translation_db_destroyer(DBKey key, DBData *data, va_list ap) { - DBMap *string_db = DB->data2ptr(data); +int script_translation_db_destroyer(union DBKey key, struct DBData *data, va_list ap) +{ + struct DBMap *string_db = DB->data2ptr(data); if( db_size(string_db) ) { struct string_translation *st = NULL; - DBIterator *iter = db_iterator(string_db); + struct DBIterator *iter = db_iterator(string_db); for( st = dbi_first(iter); dbi_exists(iter); st = dbi_next(iter) ) { aFree(st); @@ -5141,6 +5214,7 @@ void do_init_script(bool minimal) { script->parse_builtin(); script->read_constdb(); + script->load_parameters(); script->hardcoded_constants(); if (minimal) @@ -5150,9 +5224,10 @@ void do_init_script(bool minimal) { script->load_translations(); } -int script_reload(void) { +int script_reload(void) +{ int i; - DBIterator *iter; + struct DBIterator *iter; struct script_state *st; #ifdef ENABLE_CASE_CHECK @@ -6291,7 +6366,7 @@ BUILDIN(jobchange) BUILDIN(jobname) { int class_=script_getnum(st,2); - script_pushconststr(st, (char*)pc->job_name(class_)); + script_pushconststr(st, pc->job_name(class_)); return true; } @@ -6340,16 +6415,13 @@ BUILDIN(input) } else { // take received text/value and store it in the designated variable sd->state.menu_or_input = 0; - if( is_string_variable(name) ) - { + if (is_string_variable(name)) { int len = (int)strlen(sd->npc_str); - script->set_reg(st, sd, uid, name, (void*)sd->npc_str, script_getref(st,2)); + script->set_reg(st, sd, uid, name, sd->npc_str, script_getref(st,2)); script_pushint(st, (len > max ? 1 : len < min ? -1 : 0)); - } - else - { + } else { int amount = sd->npc_amount; - script->set_reg(st, sd, uid, name, (void*)h64BPTRSIZE(cap_value(amount,min,max)), script_getref(st,2)); + script->set_reg(st, sd, uid, name, (const void *)h64BPTRSIZE(cap_value(amount,min,max)), script_getref(st,2)); script_pushint(st, (amount > max ? 1 : amount < min ? -1 : 0)); } st->state = RUN; @@ -6436,9 +6508,9 @@ BUILDIN(__setr) } if (is_string_variable(name)) - script->set_reg(st,sd,num,name,(void*)script_getstr(st,3),script_getref(st,2)); + script->set_reg(st, sd, num, name, script_getstr(st, 3), script_getref(st, 2)); else - script->set_reg(st,sd,num,name,(void*)h64BPTRSIZE(script_getnum(st,3)),script_getref(st,2)); + script->set_reg(st, sd, num, name, (const void *)h64BPTRSIZE(script_getnum(st, 3)), script_getref(st, 2)); return true; } @@ -6485,15 +6557,14 @@ BUILDIN(setarray) if( end > SCRIPT_MAX_ARRAYSIZE ) end = SCRIPT_MAX_ARRAYSIZE; - if( is_string_variable(name) ) - {// string array - for( i = 3; start < end; ++start, ++i ) - script->set_reg(st, sd, reference_uid(id, start), name, (void*)script_getstr(st,i), reference_getref(data)); - } - else - {// int array - for( i = 3; start < end; ++start, ++i ) - script->set_reg(st, sd, reference_uid(id, start), name, (void*)h64BPTRSIZE(script_getnum(st,i)), reference_getref(data)); + if (is_string_variable(name)) { + // string array + for (i = 3; start < end; ++start, ++i) + script->set_reg(st, sd, reference_uid(id, start), name, script_getstr(st, i), reference_getref(data)); + } else { + // int array + for (i = 3; start < end; ++start, ++i) + script->set_reg(st, sd, reference_uid(id, start), name, (const void *)h64BPTRSIZE(script_getnum(st, i)), reference_getref(data)); } return true; } @@ -6509,7 +6580,7 @@ BUILDIN(cleararray) uint32 start; uint32 end; int32 id; - void* v; + const void *v = NULL; struct map_session_data *sd = NULL; data = script_getdata(st, 2); @@ -6532,10 +6603,10 @@ BUILDIN(cleararray) return true;// no player attached } - if( is_string_variable(name) ) - v = (void*)script_getstr(st, 3); + if (is_string_variable(name)) + v = script_getstr(st, 3); else - v = (void*)h64BPTRSIZE(script_getnum(st, 3)); + v = (const void *)h64BPTRSIZE(script_getnum(st, 3)); end = start + script_getnum(st, 4); if( end > SCRIPT_MAX_ARRAYSIZE ) @@ -6560,7 +6631,6 @@ BUILDIN(copyarray) int32 idx2; int32 id1; int32 id2; - void* v; int32 i; uint32 count; struct map_session_data *sd = NULL; @@ -6608,20 +6678,25 @@ BUILDIN(copyarray) if( is_same_reference(data1, data2) && idx1 > idx2 ) { // destination might be overlapping the source - copy in reverse order for( i = count - 1; i >= 0; --i ) { - v = script->get_val2(st, reference_uid(id2, idx2 + i), reference_getref(data2)); - script->set_reg(st, sd, reference_uid(id1, idx1 + i), name1, v, reference_getref(data1)); + const void *value = script->get_val2(st, reference_uid(id2, idx2 + i), reference_getref(data2)); + script->set_reg(st, sd, reference_uid(id1, idx1 + i), name1, value, reference_getref(data1)); script_removetop(st, -1, 0); } } else { // normal copy for( i = 0; i < count; ++i ) { if( idx2 + i < SCRIPT_MAX_ARRAYSIZE ) { - v = script->get_val2(st, reference_uid(id2, idx2 + i), reference_getref(data2)); - script->set_reg(st, sd, reference_uid(id1, idx1 + i), name1, v, reference_getref(data1)); + const void *value = script->get_val2(st, reference_uid(id2, idx2 + i), reference_getref(data2)); + script->set_reg(st, sd, reference_uid(id1, idx1 + i), name1, value, reference_getref(data1)); script_removetop(st, -1, 0); } else { // out of range - assume ""/0 - script->set_reg(st, sd, reference_uid(id1, idx1 + i), name1, (is_string_variable(name1)?(void*)"":(void*)0), reference_getref(data1)); + const void *value; + if (is_string_variable(name1)) + value = ""; + else + value = (const void *)0; + script->set_reg(st, sd, reference_uid(id1, idx1 + i), name1, value, reference_getref(data1)); } } } @@ -6650,8 +6725,9 @@ BUILDIN(getarraysize) script_pushint(st, script->array_highest_key(st,st->rid ? script->rid2sd(st) : NULL,reference_getname(data),reference_getref(data))); return true; } -int script_array_index_cmp(const void *a, const void *b) { - return ( *(const unsigned int*)a - *(const unsigned int*)b ); +int script_array_index_cmp(const void *a, const void *b) +{ + return (*(const unsigned int *)a - *(const unsigned int *)b); // FIXME: Is the unsigned difference really intended here? } /// Deletes count or all the elements in an array, from the starting index. @@ -6724,7 +6800,7 @@ BUILDIN(deletearray) // Better to iterate directly on the array, no speed-up from using sa for( ; start + count < end; ++start ) { // Compact and overwrite - void* v = script->get_val2(st, reference_uid(id, start + count), reference_getref(data)); + const void *v = script->get_val2(st, reference_uid(id, start + count), reference_getref(data)); script->set_reg(st, sd, reference_uid(id, start), name, v, reference_getref(data)); script_removetop(st, -1, 0); } @@ -6748,7 +6824,7 @@ BUILDIN(deletearray) for( ; i < size && list[i] < end; i++ ) { // Move back count positions any entries between start+count to fill the gaps - void* v = script->get_val2(st, reference_uid(id, list[i]), reference_getref(data)); + const void *v = script->get_val2(st, reference_uid(id, list[i]), reference_getref(data)); script->set_reg(st, sd, reference_uid(id, list[i]-count), name, v, reference_getref(data)); script_removetop(st, -1, 0); // Clear their originals @@ -10012,6 +10088,7 @@ int buildin_killmonsterall_sub_strip(struct block_list *bl,va_list ap) struct mob_data *md; md = BL_CAST(BL_MOB, bl); + nullpo_ret(md); if (md->npc_event[0]) md->npc_event[0] = 0; @@ -10434,7 +10511,8 @@ BUILDIN(playerattached) { /*========================================== *------------------------------------------*/ -BUILDIN(announce) { +BUILDIN(announce) +{ const char *mes = script_getstr(st,2); int flag = script_getnum(st,3); const char *fontColor = script_hasdata(st,4) ? script_getstr(st,4) : NULL; @@ -10442,6 +10520,8 @@ BUILDIN(announce) { int fontSize = script_hasdata(st,6) ? script_getnum(st,6) : 12; // default fontSize int fontAlign = script_hasdata(st,7) ? script_getnum(st,7) : 0; // default fontAlign int fontY = script_hasdata(st,8) ? script_getnum(st,8) : 0; // default fontY + size_t len = strlen(mes); + Assert_retr(false, len < INT_MAX); if( flag&(BC_TARGET_MASK|BC_SOURCE_MASK) ) { // Broadcast source or broadcast region defined @@ -10466,14 +10546,14 @@ BUILDIN(announce) { } if (fontColor) - clif->broadcast2(bl, mes, (int)strlen(mes)+1, (unsigned int)strtoul(fontColor, (char **)NULL, 0), fontType, fontSize, fontAlign, fontY, target); + clif->broadcast2(bl, mes, (int)len+1, (unsigned int)strtoul(fontColor, (char **)NULL, 0), fontType, fontSize, fontAlign, fontY, target); else - clif->broadcast(bl, mes, (int)strlen(mes)+1, flag&BC_COLOR_MASK, target); + clif->broadcast(bl, mes, (int)len+1, flag&BC_COLOR_MASK, target); } else { if (fontColor) - intif->broadcast2(mes, (int)strlen(mes)+1, (unsigned int)strtoul(fontColor, (char **)NULL, 0), fontType, fontSize, fontAlign, fontY); + intif->broadcast2(mes, (int)len+1, (unsigned int)strtoul(fontColor, (char **)NULL, 0), fontType, fontSize, fontAlign, fontY); else - intif->broadcast(mes, (int)strlen(mes)+1, flag&BC_COLOR_MASK); + intif->broadcast(mes, (int)len+1, flag&BC_COLOR_MASK); } return true; } @@ -10481,10 +10561,10 @@ BUILDIN(announce) { *------------------------------------------*/ int buildin_announce_sub(struct block_list *bl, va_list ap) { - char *mes = va_arg(ap, char *); + const char *mes = va_arg(ap, const char *); int len = va_arg(ap, int); int type = va_arg(ap, int); - char *fontColor = va_arg(ap, char *); + const char *fontColor = va_arg(ap, const char *); short fontType = (short)va_arg(ap, int); short fontSize = (short)va_arg(ap, int); short fontAlign = (short)va_arg(ap, int); @@ -10531,7 +10611,8 @@ BUILDIN(itemeffect) return true; } -BUILDIN(mapannounce) { +BUILDIN(mapannounce) +{ const char *mapname = script_getstr(st,2); const char *mes = script_getstr(st,3); int flag = script_getnum(st,4); @@ -10541,17 +10622,20 @@ BUILDIN(mapannounce) { int fontAlign = script_hasdata(st,8) ? script_getnum(st,8) : 0; // default fontAlign int fontY = script_hasdata(st,9) ? script_getnum(st,9) : 0; // default fontY int16 m; + size_t len = strlen(mes); + Assert_retr(false, len < INT_MAX); if ((m = map->mapname2mapid(mapname)) < 0) return true; map->foreachinmap(script->buildin_announce_sub, m, BL_PC, - mes, strlen(mes)+1, flag&BC_COLOR_MASK, fontColor, fontType, fontSize, fontAlign, fontY); + mes, (int)len+1, flag&BC_COLOR_MASK, fontColor, fontType, fontSize, fontAlign, fontY); return true; } /*========================================== *------------------------------------------*/ -BUILDIN(areaannounce) { +BUILDIN(areaannounce) +{ const char *mapname = script_getstr(st,2); int x0 = script_getnum(st,3); int y0 = script_getnum(st,4); @@ -10565,12 +10649,14 @@ BUILDIN(areaannounce) { int fontAlign = script_hasdata(st,12) ? script_getnum(st,12) : 0; // default fontAlign int fontY = script_hasdata(st,13) ? script_getnum(st,13) : 0; // default fontY int16 m; + size_t len = strlen(mes); + Assert_retr(false, len < INT_MAX); if ((m = map->mapname2mapid(mapname)) < 0) return true; map->foreachinarea(script->buildin_announce_sub, m, x0, y0, x1, y1, BL_PC, - mes, strlen(mes)+1, flag&BC_COLOR_MASK, fontColor, fontType, fontSize, fontAlign, fontY); + mes, (int)len+1, flag&BC_COLOR_MASK, fontColor, fontType, fontSize, fontAlign, fontY); return true; } @@ -11008,9 +11094,9 @@ BUILDIN(getstatus) case 4: script_pushint(st, sd->sc.data[id]->val4); break; case 5: { - const struct TimerData* td = (const struct TimerData*)timer->get(sd->sc.data[id]->timer); + const struct TimerData *td = timer->get(sd->sc.data[id]->timer); - if( td ) { + if (td != NULL) { // return the amount of time remaining script_pushint(st, (int)(td->tick - timer->gettick())); // TODO: change this to int64 when we'll support 64 bit script values } @@ -13585,25 +13671,27 @@ BUILDIN(npcskilleffect) { * Special effects [Valaris] *------------------------------------------*/ BUILDIN(specialeffect) { - struct block_list *bl=map->id2bl(st->oid); + struct block_list *bl = NULL; int type = script_getnum(st,2); enum send_target target = script_hasdata(st,3) ? (send_target)script_getnum(st,3) : AREA; - if(bl==NULL) - return true; - if (script_hasdata(st,4)) { struct npc_data *nd = npc->name2id(script_getstr(st,4)); if (nd != NULL) - clif->specialeffect(&nd->bl, type, target); + bl = &nd->bl; } else { - if (target == SELF) { - struct map_session_data *sd = script->rid2sd(st); - if (sd != NULL) - clif->specialeffect_single(bl,type,sd->fd); - } else { - clif->specialeffect(bl, type, target); - } + bl = map->id2bl(st->oid); + } + + if (bl == NULL) + return true; + + if (target == SELF) { + struct map_session_data *sd = script->rid2sd(st); + if (sd != NULL) + clif->specialeffect_single(bl, type, sd->fd); + } else { + clif->specialeffect(bl, type, target); } return true; @@ -13707,7 +13795,7 @@ BUILDIN(dispbottom) int color = script_getnum(st,3); clif->messagecolor_self(sd->fd, color, message); } else { - clif_disp_onlyself(sd, message, (int)strlen(message)); + clif_disp_onlyself(sd, message); } return true; @@ -14359,7 +14447,7 @@ BUILDIN(getmapxy) sd=script->rid2sd(st); else sd=NULL; - script->set_reg(st,sd,num,name,(void*)mapname,script_getref(st,2)); + script->set_reg(st, sd, num, name, mapname, script_getref(st, 2)); //Set MapX num=st->stack->stack_data[st->start+3].u.num; @@ -14370,7 +14458,7 @@ BUILDIN(getmapxy) sd=script->rid2sd(st); else sd=NULL; - script->set_reg(st,sd,num,name,(void*)h64BPTRSIZE(x),script_getref(st,3)); + script->set_reg(st, sd, num, name, (const void *)h64BPTRSIZE(x), script_getref(st, 3)); //Set MapY num=st->stack->stack_data[st->start+4].u.num; @@ -14381,7 +14469,7 @@ BUILDIN(getmapxy) sd=script->rid2sd(st); else sd=NULL; - script->set_reg(st,sd,num,name,(void*)h64BPTRSIZE(y),script_getref(st,4)); + script->set_reg(st, sd, num, name, (const void *)h64BPTRSIZE(y), script_getref(st, 4)); //Return Success value script_pushint(st,0); @@ -15041,7 +15129,7 @@ BUILDIN(explode) if (str[i] == delimiter && (int64)start + k < (int64)(SCRIPT_MAX_ARRAYSIZE-1)) { // FIXME[Haru]: SCRIPT_MAX_ARRAYSIZE should really be unsigned (and INT32_MAX) //break at delimiter but ignore after reaching last array index temp[j] = '\0'; - script->set_reg(st, sd, reference_uid(id, start + k), name, (void*)temp, reference_getref(data)); + script->set_reg(st, sd, reference_uid(id, start + k), name, temp, reference_getref(data)); k++; j = 0; } else { @@ -15050,7 +15138,7 @@ BUILDIN(explode) } //set last string temp[j] = '\0'; - script->set_reg(st, sd, reference_uid(id, start + k), name, (void*)temp, reference_getref(data)); + script->set_reg(st, sd, reference_uid(id, start + k), name, temp, reference_getref(data)); aFree(temp); @@ -15111,7 +15199,7 @@ BUILDIN(implode) size_t len = 0, glue_len = 0, k = 0; const char *glue = NULL, *temp; for(i = 0; i <= array_size; ++i) { - temp = (char*) script->get_val2(st, reference_uid(id, i), reference_getref(data)); + temp = script->get_val2(st, reference_uid(id, i), reference_getref(data)); len += strlen(temp); script_removetop(st, -1, 0); } @@ -15126,7 +15214,7 @@ BUILDIN(implode) //build output for(i = 0; i < array_size; ++i) { - temp = (char*) script->get_val2(st, reference_uid(id, i), reference_getref(data)); + temp = script->get_val2(st, reference_uid(id, i), reference_getref(data)); len = strlen(temp); memcpy(&output[k], temp, len); k += len; @@ -15136,7 +15224,7 @@ BUILDIN(implode) } script_removetop(st, -1, 0); } - temp = (char*) script->get_val2(st, reference_uid(id, array_size), reference_getref(data)); + temp = script->get_val2(st, reference_uid(id, array_size), reference_getref(data)); len = strlen(temp); memcpy(&output[k], temp, len); k += len; @@ -15370,12 +15458,12 @@ BUILDIN(sscanf) { if(sscanf(str, buf, ref_str)==0) { break; } - script->set_reg(st, sd, reference_uid( reference_getid(data), reference_getindex(data) ), buf_p, (void *)(ref_str), reference_getref(data)); + script->set_reg(st, sd, reference_uid( reference_getid(data), reference_getindex(data) ), buf_p, ref_str, reference_getref(data)); } else { // Number if(sscanf(str, buf, &ref_int)==0) { break; } - script->set_reg(st, sd, reference_uid( reference_getid(data), reference_getindex(data) ), buf_p, (void *)h64BPTRSIZE(ref_int), reference_getref(data)); + script->set_reg(st, sd, reference_uid( reference_getid(data), reference_getindex(data) ), buf_p, (const void *)h64BPTRSIZE(ref_int), reference_getref(data)); } arg++; @@ -15815,8 +15903,8 @@ BUILDIN(swap) value2 = script_getstr(st,3); if (strcmpi(value1, value2)) { - script->set_reg(st, sd, uid1, varname1, (void*)(value2), script_getref(st,3)); - script->set_reg(st, sd, uid2, varname2, (void*)(value1), script_getref(st,2)); + script->set_reg(st, sd, uid1, varname1, value2, script_getref(st,3)); + script->set_reg(st, sd, uid2, varname2, value1, script_getref(st,2)); } } else { @@ -15826,8 +15914,8 @@ BUILDIN(swap) value2 = script_getnum(st,3); if (value1 != value2) { - script->set_reg(st, sd, uid1, varname1, (void*)h64BPTRSIZE(value2), script_getref(st,3)); - script->set_reg(st, sd, uid2, varname2, (void*)h64BPTRSIZE(value1), script_getref(st,2)); + script->set_reg(st, sd, uid1, varname1, (const void *)h64BPTRSIZE(value2), script_getref(st,3)); + script->set_reg(st, sd, uid2, varname2, (const void *)h64BPTRSIZE(value1), script_getref(st,2)); } } return true; @@ -15856,16 +15944,16 @@ BUILDIN(setd) } } - if( is_string_variable(varname) ) { - script->setd_sub(st, sd, varname, elem, (void *)script_getstr(st, 3), NULL); + if (is_string_variable(varname)) { + script->setd_sub(st, sd, varname, elem, script_getstr(st, 3), NULL); } else { - script->setd_sub(st, sd, varname, elem, (void *)h64BPTRSIZE(script_getnum(st, 3)), NULL); + script->setd_sub(st, sd, varname, elem, (const void *)h64BPTRSIZE(script_getnum(st, 3)), NULL); } return true; } -int buildin_query_sql_sub(struct script_state* st, Sql* handle) +int buildin_query_sql_sub(struct script_state *st, struct Sql *handle) { int i, j; struct map_session_data *sd = NULL; @@ -16404,7 +16492,7 @@ BUILDIN(checkchatting) { sd = script->rid2sd(st); if (sd != NULL) - script_pushint(st,(sd->chatID != 0)); + script_pushint(st, (sd->chat_id != 0)); else script_pushint(st,0); @@ -16481,7 +16569,7 @@ BUILDIN(searchitem) for( i = 0; i < count; ++start, ++i ) {// Set array - void* v = (void*)h64BPTRSIZE((int)items[i]->nameid); + const void *v = (const void *)h64BPTRSIZE((int)items[i]->nameid); script->set_reg(st, sd, reference_uid(id, start), name, v, reference_getref(data)); } @@ -16770,8 +16858,12 @@ BUILDIN(unittalk) { bl = map->id2bl(unit_id); if( bl != NULL ) { struct StringBuf sbuf; + char blname[NAME_LENGTH]; StrBuf->Init(&sbuf); - StrBuf->Printf(&sbuf, "%s : %s", status->get_name(bl), message); + safestrncpy(blname, clif->get_bl_name(bl), sizeof(blname)); + if(bl->type == BL_NPC) + strtok(blname, "#"); + StrBuf->Printf(&sbuf, "%s : %s", blname, message); clif->disp_overhead(bl, StrBuf->Value(&sbuf)); StrBuf->Destroy(&sbuf); } @@ -16924,8 +17016,9 @@ BUILDIN(sleep2) { /// Awakes all the sleep timers of the target npc /// /// awake "<npc name>"; -BUILDIN(awake) { - DBIterator *iter; +BUILDIN(awake) +{ + struct DBIterator *iter; struct script_state *tst; struct npc_data* nd; @@ -17937,7 +18030,8 @@ BUILDIN(instance_init) { return true; } -BUILDIN(instance_announce) { +BUILDIN(instance_announce) +{ int instance_id = script_getnum(st,2); const char *mes = script_getstr(st,3); int flag = script_getnum(st,4); @@ -17946,8 +18040,9 @@ BUILDIN(instance_announce) { int fontSize = script_hasdata(st,7) ? script_getnum(st,7) : 12; // default fontSize int fontAlign = script_hasdata(st,8) ? script_getnum(st,8) : 0; // default fontAlign int fontY = script_hasdata(st,9) ? script_getnum(st,9) : 0; // default fontY - int i; + size_t len = strlen(mes); + Assert_retr(false, len < INT_MAX); if( instance_id == -1 ) { if( st->instance_id >= 0 ) @@ -17961,7 +18056,7 @@ BUILDIN(instance_announce) { for( i = 0; i < instance->list[instance_id].num_map; i++ ) map->foreachinmap(script->buildin_announce_sub, instance->list[instance_id].map[i], BL_PC, - mes, strlen(mes)+1, flag&BC_COLOR_MASK, fontColor, fontType, fontSize, fontAlign, fontY); + mes, (int)len+1, flag&BC_COLOR_MASK, fontColor, fontType, fontSize, fontAlign, fontY); return true; } @@ -18551,22 +18646,11 @@ BUILDIN(getcharip) { return false; } - /* check for IP */ - if (!sockt->session[sd->fd]->client_addr) { + if (sd->fd == 0 || sockt->session[sd->fd] == NULL || sockt->session[sd->fd]->client_addr == 0) { script_pushconststr(st, ""); - return true; - } - - /* return the client ip_addr converted for output */ - if (sd && sd->fd && sockt->session[sd->fd]) - { - /* initiliaze */ - const char *ip_addr = NULL; - uint32 ip; - - /* set ip, ip_addr and convert to ip and push str */ - ip = sockt->session[sd->fd]->client_addr; - ip_addr = sockt->ip2str(ip, NULL); + } else { + uint32 ip = sockt->session[sd->fd]->client_addr; + const char *ip_addr = sockt->ip2str(ip, NULL); script_pushstrcopy(st, ip_addr); } @@ -18789,68 +18873,6 @@ BUILDIN(useatcmd) { return true; } -BUILDIN(checkre) -{ - int num; - - num=script_getnum(st,2); - switch(num) { - case 0: -#ifdef RENEWAL - script_pushint(st, 1); -#else - script_pushint(st, 0); -#endif - break; - case 1: -#ifdef RENEWAL_CAST - script_pushint(st, 1); -#else - script_pushint(st, 0); -#endif - break; - case 2: -#ifdef RENEWAL_DROP - script_pushint(st, 1); -#else - script_pushint(st, 0); -#endif - break; - case 3: -#ifdef RENEWAL_EXP - script_pushint(st, 1); -#else - script_pushint(st, 0); -#endif - break; - case 4: -#ifdef RENEWAL_LVDMG - script_pushint(st, 1); -#else - script_pushint(st, 0); -#endif - break; - case 5: -#ifdef RENEWAL_EDP - script_pushint(st, 1); -#else - script_pushint(st, 0); -#endif - break; - case 6: -#ifdef RENEWAL_ASPD - script_pushint(st, 1); -#else - script_pushint(st, 0); -#endif - break; - default: - ShowWarning("buildin_checkre: unknown parameter.\n"); - break; - } - return true; -} - /* getrandgroupitem <container_item_id>,<quantity> */ BUILDIN(getrandgroupitem) { struct item_data *data = NULL; @@ -19695,9 +19717,10 @@ BUILDIN(checkbound) /* bg_match_over( arena_name {, optional canceled } ) */ /* returns 0 when successful, 1 otherwise */ -BUILDIN(bg_match_over) { +BUILDIN(bg_match_over) +{ bool canceled = script_hasdata(st,3) ? true : false; - struct bg_arena *arena = bg->name2arena((const char*)script_getstr(st, 2)); + struct bg_arena *arena = bg->name2arena(script_getstr(st, 2)); if( arena ) { bg->match_over(arena,canceled); @@ -21098,6 +21121,7 @@ void script_defaults(void) { script->get_val_npc_num = get_val_npcscope_num; script->get_val_instance_num = get_val_instance_num; script->push_str = push_str; + script->push_conststr = push_conststr; script->push_copy = push_copy; script->pop_stack = pop_stack; script->set_constant = script_set_constant; @@ -21161,6 +21185,7 @@ void script_defaults(void) { script->parse_line = parse_line; script->read_constdb = read_constdb; script->constdb_comment = script_constdb_comment; + script->load_parameters = script_load_parameters; script->print_line = script_print_line; script->errorwarning_sub = script_errorwarning_sub; script->set_reg = set_reg; diff --git a/src/map/script.h b/src/map/script.h index 351ccd02a..a1fbe31f0 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -25,7 +25,6 @@ #include "common/hercules.h" #include "common/db.h" #include "common/mmo.h" // struct item -#include "common/sql.h" // Sql #include "common/strlib.h" //StringBuf #include <errno.h> @@ -34,6 +33,7 @@ /** * Declarations **/ +struct Sql; // common/sql.h struct eri; struct item_data; @@ -94,11 +94,11 @@ struct item_data; /// Pushes an int into the stack #define script_pushint(st,val) (script->push_val((st)->stack, C_INT, (val),NULL)) /// Pushes a string into the stack (script engine frees it automatically) -#define script_pushstr(st,val) (script->push_str((st)->stack, C_STR, (val))) +#define script_pushstr(st,val) (script->push_str((st)->stack, (val))) /// Pushes a copy of a string into the stack -#define script_pushstrcopy(st,val) (script->push_str((st)->stack, C_STR, aStrdup(val))) +#define script_pushstrcopy(st,val) (script->push_str((st)->stack, aStrdup(val))) /// Pushes a constant string into the stack (must never change or be freed) -#define script_pushconststr(st,val) (script->push_str((st)->stack, C_CONSTSTR, (val))) +#define script_pushconststr(st,val) (script->push_conststr((st)->stack, (val))) /// Pushes a nil into the stack #define script_pushnil(st) (script->push_val((st)->stack, C_NOP, 0,NULL)) /// Pushes a copy of the data in the target index @@ -380,14 +380,18 @@ struct script_retinfo { int defsp; ///< default stack pointer }; +/** + * Represents a variable in the script stack. + */ struct script_data { - enum c_op type; + enum c_op type; ///< Data type union script_data_val { - int64 num; - char *str; - struct script_retinfo* ri; - } u; - struct reg_db *ref; + int64 num; ///< Numeric data + char *mutstr; ///< Mutable string + const char *str; ///< Constant string + struct script_retinfo *ri; ///< Function return information + } u; ///< Data (field depends on `type`) + struct reg_db *ref; ///< Reference to the scope's variables }; // Moved defsp from script_state to script_stack since @@ -490,8 +494,8 @@ struct script_syntax_data { int last_func; // buildin index of the last parsed function unsigned int nested_call; //Dont really know what to call this bool lang_macro_active; - DBMap *strings; // string map parsed (used when exporting strings only) - DBMap *translation_db; //non-null if this npc has any translated strings to be linked + struct DBMap *strings; // string map parsed (used when exporting strings only) + struct DBMap *translation_db; //non-null if this npc has any translated strings to be linked }; struct casecheck_data { @@ -530,7 +534,7 @@ struct string_translation { **/ struct script_interface { /* */ - DBMap *st_db; + struct DBMap *st_db; unsigned int active_scripts; unsigned int next_id; struct eri *st_ers; @@ -598,8 +602,8 @@ struct script_interface { /* */ /* Caches compiled autoscript item code. */ /* Note: This is not cleared when reloading itemdb. */ - DBMap* autobonus_db; // char* script -> char* bytecode - DBMap* userfunc_db; // const char* func_name -> struct script_code* + struct DBMap *autobonus_db; // char* script -> char* bytecode + struct DBMap *userfunc_db; // const char* func_name -> struct script_code* /* */ int potion_flag; //For use on Alchemist improved potions/Potion Pitcher. [Skotlex] int potion_hp, potion_per_hp, potion_sp, potion_per_sp; @@ -617,7 +621,7 @@ struct script_interface { int buildin_select_offset; int buildin_lang_macro_offset; /* */ - DBMap *translation_db;/* npc_name => DBMap (strings) */ + struct DBMap *translation_db;/* npc_name => DBMap (strings) */ char **translation_buf;/* */ uint32 translation_buf_size; /* */ @@ -660,9 +664,10 @@ struct script_interface { int (*get_val_scope_num) (struct script_state* st, struct reg_db *n, struct script_data* data); int (*get_val_npc_num) (struct script_state* st, struct reg_db *n, struct script_data* data); int (*get_val_instance_num) (struct script_state* st, const char* name, struct script_data* data); - void* (*get_val2) (struct script_state* st, int64 uid, struct reg_db *ref); - struct script_data* (*push_str) (struct script_stack* stack, enum c_op type, char* str); - struct script_data* (*push_copy) (struct script_stack* stack, int pos); + const void *(*get_val2) (struct script_state *st, int64 uid, struct reg_db *ref); + struct script_data *(*push_str) (struct script_stack *stack, char *str); + struct script_data *(*push_conststr) (struct script_stack *stack, const char *str); + struct script_data *(*push_copy) (struct script_stack *stack, int pos); void (*pop_stack) (struct script_state* st, int start, int end); void (*set_constant) (const char *name, int value, bool is_parameter, bool is_deprecated); void (*set_constant2) (const char *name, int value, bool is_parameter, bool is_deprecated); @@ -687,7 +692,7 @@ struct script_interface { int (*add_str) (const char* p); const char* (*get_str) (int id); int (*search_str) (const char* p); - void (*setd_sub) (struct script_state *st, struct map_session_data *sd, const char *varname, int elem, void *value, struct reg_db *ref); + void (*setd_sub) (struct script_state *st, struct map_session_data *sd, const char *varname, int elem, const void *value, struct reg_db *ref); void (*attach_state) (struct script_state* st); /* */ struct script_queue *(*queue) (int idx); @@ -725,6 +730,7 @@ struct script_interface { const char* (*parse_line) (const char *p); void (*read_constdb) (void); void (*constdb_comment) (const char *comment); + void (*load_parameters) (void); const char* (*print_line) (StringBuf *buf, const char *p, const char *mark, int line); void (*errorwarning_sub) (StringBuf *buf, const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); int (*set_reg) (struct script_state *st, struct map_session_data *sd, int64 num, const char *name, const void *value, struct reg_db *ref); @@ -745,7 +751,7 @@ struct script_interface { void (*op_1) (struct script_state *st, int op); void (*check_buildin_argtype) (struct script_state *st, int func); void (*detach_state) (struct script_state *st, bool dequeue_event); - int (*db_free_code_sub) (DBKey key, DBData *data, va_list ap); + int (*db_free_code_sub) (union DBKey key, struct DBData *data, va_list ap); void (*add_autobonus) (const char *autobonus); int (*menu_countoptions) (const char *str, int max_count, int *total); int (*buildin_areawarp_sub) (struct block_list *bl, va_list ap); @@ -767,7 +773,7 @@ struct script_interface { int (*playbgm_sub) (struct block_list *bl, va_list ap); int (*playbgm_foreachpc_sub) (struct map_session_data *sd, va_list args); int (*soundeffect_sub) (struct block_list *bl, va_list ap); - int (*buildin_query_sql_sub) (struct script_state *st, Sql *handle); + int (*buildin_query_sql_sub) (struct script_state *st, struct Sql *handle); int (*buildin_instance_warpall_sub) (struct block_list *bl, va_list ap); int (*buildin_mobuseskill_sub) (struct block_list *bl, va_list ap); int (*cleanfloor_sub) (struct block_list *bl, va_list ap); @@ -788,11 +794,11 @@ struct script_interface { void (*array_add_member) (struct script_array *sa, unsigned int idx); unsigned int (*array_size) (struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); unsigned int (*array_highest_key) (struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); - int (*array_free_db) (DBKey key, DBData *data, va_list ap); + int (*array_free_db) (union DBKey key, struct DBData *data, va_list ap); void (*array_ensure_zero) (struct script_state *st, struct map_session_data *sd, int64 uid, struct reg_db *ref); /* */ void (*reg_destroy_single) (struct map_session_data *sd, int64 reg, struct script_reg_state *data); - int (*reg_destroy) (DBKey key, DBData *data, va_list ap); + int (*reg_destroy) (union DBKey key, struct DBData *data, va_list ap); /* */ void (*generic_ui_array_expand) (unsigned int plus); unsigned int *(*array_cpy_list) (struct script_array *sa); @@ -802,7 +808,7 @@ struct script_interface { int (*string_dup) (char *str); void (*load_translations) (void); void (*load_translation) (const char *file, uint8 lang_id, uint32 *total); - int (*translation_db_destroyer) (DBKey key, DBData *data, va_list ap); + int (*translation_db_destroyer) (union DBKey key, struct DBData *data, va_list ap); void (*clear_translations) (bool reload); int (*parse_cleanup_timer) (int tid, int64 tick, int id, intptr_t data); uint8 (*add_language) (const char *name); diff --git a/src/map/skill.c b/src/map/skill.c index de5368cdf..51d0792e3 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7505,7 +7505,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin memset(&item_tmp,0,sizeof(item_tmp)); item_tmp.nameid = skill->dbs->db[su->group->skill_id].itemid[i]; item_tmp.identify = 1; - if (item_tmp.nameid && (success=pc->additem(sd,&item_tmp,skill->dbs->db[su->group->skill_id].amount[i],LOG_TYPE_OTHER)) != 0) { + if (item_tmp.nameid && (success=pc->additem(sd,&item_tmp,skill->dbs->db[su->group->skill_id].amount[i],LOG_TYPE_SKILL)) != 0) { clif->additem(sd,0,0,success); map->addflooritem(&sd->bl, &item_tmp, skill->dbs->db[su->group->skill_id].amount[i], sd->bl.m, sd->bl.x, sd->bl.y, 0, 0, 0, 0); } @@ -7517,7 +7517,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin memset(&item_tmp,0,sizeof(item_tmp)); item_tmp.nameid = su->group->item_id?su->group->item_id:ITEMID_TRAP; item_tmp.identify = 1; - if (item_tmp.nameid && (flag=pc->additem(sd,&item_tmp,1,LOG_TYPE_OTHER)) != 0) { + if (item_tmp.nameid && (flag=pc->additem(sd,&item_tmp,1,LOG_TYPE_SKILL)) != 0) { clif->additem(sd,0,0,flag); map->addflooritem(&sd->bl, &item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y, 0, 0, 0, 0); } @@ -9280,7 +9280,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin improv_skill_lv = 4 + skill_lv; clif->skill_nodamage (src, bl, skill_id, skill_lv, 1); - if (sd == NULL) { + if (sd != NULL) { sd->state.abra_flag = 2; sd->skillitem = improv_skill_id; sd->skillitemlv = improv_skill_lv; @@ -9667,7 +9667,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin if(sd) { struct mob_data *summon_md; - summon_md = mob->once_spawn_sub(src, src->m, src->x, src->y, status->get_name(src), MOBID_KO_KAGE, "", SZ_SMALL, AI_NONE); + summon_md = mob->once_spawn_sub(src, src->m, src->x, src->y, clif->get_bl_name(src), MOBID_KO_KAGE, "", SZ_SMALL, AI_NONE); if( summon_md ) { summon_md->master_id = src->id; summon_md->special_state.ai = AI_ZANZOU; @@ -9847,7 +9847,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin break; for (i = 0; i < summons[skill_lv-1].quantity; i++) { - struct mob_data *summon_md = mob->once_spawn_sub(src, src->m, src->x, src->y, status->get_name(src), + struct mob_data *summon_md = mob->once_spawn_sub(src, src->m, src->x, src->y, clif->get_bl_name(src), summons[skill_lv-1].mob_id, "", SZ_SMALL, AI_ATTACK); if (summon_md != NULL) { summon_md->master_id = src->id; @@ -10588,7 +10588,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui } // Correct info, don't change any of this! [Celest] - md = mob->once_spawn_sub(src, src->m, x, y, status->get_name(src), class_, "", SZ_SMALL, AI_NONE); + md = mob->once_spawn_sub(src, src->m, x, y, clif->get_bl_name(src), class_, "", SZ_SMALL, AI_NONE); if (md) { md->master_id = src->id; md->special_state.ai = (skill_id == AM_SPHEREMINE) ? AI_SPHERE : AI_FLORA; @@ -10833,7 +10833,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui case NC_SILVERSNIPER: { - struct mob_data *md = mob->once_spawn_sub(src, src->m, x, y, status->get_name(src), MOBID_SILVERSNIPER, "", SZ_SMALL, AI_NONE); + struct mob_data *md = mob->once_spawn_sub(src, src->m, x, y, clif->get_bl_name(src), MOBID_SILVERSNIPER, "", SZ_SMALL, AI_NONE); if (md) { md->master_id = src->id; md->special_state.ai = AI_FLORA; @@ -11716,7 +11716,7 @@ int skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int64 tick if (bl->type == BL_PC && !working) { struct map_session_data *sd = BL_UCAST(BL_PC, bl); - if ((!sd->chatID || battle_config.chat_warpportal) && sd->ud.to_x == src->bl.x && sd->ud.to_y == src->bl.y) { + if ((sd->chat_id == 0 || battle_config.chat_warpportal) && sd->ud.to_x == src->bl.x && sd->ud.to_y == src->bl.y) { int x = sg->val2>>16; int y = sg->val2&0xffff; int count = sg->val1>>16; @@ -13122,7 +13122,8 @@ int skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_id nullpo_ret(sd); - if (sd->chatID) return 0; + if (sd->chat_id != 0) + return 0; if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->skillitem != skill_id) { //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] @@ -14088,7 +14089,7 @@ int skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id, nullpo_ret(sd); - if( sd->chatID ) + if (sd->chat_id != 0) return 0; if( pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->skillitem != skill_id ) { @@ -15313,12 +15314,12 @@ void skill_weaponrefine (struct map_session_data *sd, int idx) else per += 5 * ((signed int)sd->status.job_level - 50); - pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); // FIXME: is this the correct reason flag? + pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_REFINE); // FIXME: is this the correct reason flag? if (per > rnd() % 1000) { int ep = 0; - logs->pick_pc(sd, LOG_TYPE_OTHER, -1, item, ditem); + logs->pick_pc(sd, LOG_TYPE_REFINE, -1, item, ditem); item->refine++; - logs->pick_pc(sd, LOG_TYPE_OTHER, 1, item, ditem); + logs->pick_pc(sd, LOG_TYPE_REFINE, 1, item, ditem); if(item->equip) { ep = item->equip; pc->unequipitem(sd, idx, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE); @@ -15351,7 +15352,7 @@ void skill_weaponrefine (struct map_session_data *sd, int idx) if(item->equip) pc->unequipitem(sd, idx, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE); clif->refine(sd->fd,1,idx,item->refine); - pc->delitem(sd, idx, 1, 0, DELITEM_NORMAL, LOG_TYPE_OTHER); + pc->delitem(sd, idx, 1, 0, DELITEM_NORMAL, LOG_TYPE_REFINE); clif->misceffect(&sd->bl,2); clif->emotion(&sd->bl, E_OMG); } @@ -15994,14 +15995,14 @@ int skill_enchant_elemental_end (struct block_list *bl, int type) { bool skill_check_cloaking(struct block_list *bl, struct status_change_entry *sce) { - static int dx[] = { 0, 1, 0, -1, -1, 1, 1, -1}; - static int dy[] = {-1, 0, 1, 0, -1, -1, 1, 1}; bool wall = true; if( (bl->type == BL_PC && battle_config.pc_cloak_check_type&1) || (bl->type != BL_PC && battle_config.monster_cloak_check_type&1) ) { //Check for walls. + static int dx[] = { 0, 1, 0, -1, -1, 1, 1, -1}; + static int dy[] = {-1, 0, 1, 0, -1, -1, 1, 1}; int i; ARR_FIND( 0, 8, i, map->getcell(bl->m, bl, bl->x+dx[i], bl->y+dy[i], CELL_CHKNOPASS) != 0 ); if( i == 8 ) @@ -16059,11 +16060,11 @@ int skill_check_cloaking_end(struct block_list *bl, va_list ap) bool skill_check_camouflage(struct block_list *bl, struct status_change_entry *sce) { - static int dx[] = { 0, 1, 0, -1, -1, 1, 1, -1}; - static int dy[] = {-1, 0, 1, 0, -1, -1, 1, 1}; bool wall = true; if( bl->type == BL_PC ) { //Check for walls. + static int dx[] = { 0, 1, 0, -1, -1, 1, 1, -1}; + static int dy[] = {-1, 0, 1, 0, -1, -1, 1, 1}; int i; ARR_FIND( 0, 8, i, map->getcell(bl->m, bl, bl->x+dx[i], bl->y+dy[i], CELL_CHKNOPASS) != 0 ); if( i == 8 ) @@ -16554,7 +16555,8 @@ int skill_unit_timer_sub_onplace(struct block_list* bl, va_list ap) { /** * @see DBApply */ -int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) { +int skill_unit_timer_sub(union DBKey key, struct DBData *data, va_list ap) +{ struct skill_unit* su = DB->data2ptr(data); struct skill_unit_group* group = su->group; int64 tick = va_arg(ap,int64); diff --git a/src/map/skill.h b/src/map/skill.h index fb2acfb62..35fddafa4 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -1856,12 +1856,12 @@ struct skill_interface { void (*reload) (void); void (*read_db) (bool minimal); /* */ - DBMap* cd_db; // char_id -> struct skill_cd - DBMap* name2id_db; - DBMap* unit_db; // int id -> struct skill_unit* - DBMap* usave_db; // char_id -> struct skill_unit_save - DBMap* group_db;// int group_id -> struct skill_unit_group* - DBMap* bowling_db;// int mob_id -> struct mob_data*s + struct DBMap *cd_db; // char_id -> struct skill_cd + struct DBMap *name2id_db; + struct DBMap *unit_db; // int id -> struct skill_unit* + struct DBMap *usave_db; // char_id -> struct skill_unit_save + struct DBMap *group_db;// int group_id -> struct skill_unit_group* + struct DBMap *bowling_db;// int mob_id -> struct mob_data*s /* */ struct eri *unit_ers; //For handling skill_unit's [Skotlex] struct eri *timer_ers; //For handling skill_timerskills [Skotlex] @@ -2031,7 +2031,7 @@ struct skill_interface { int (*blockmerc_end) (int tid, int64 tick, int id, intptr_t data); int (*split_atoi) (char *str, int *val); int (*unit_timer) (int tid, int64 tick, int id, intptr_t data); - int (*unit_timer_sub) (DBKey key, DBData *data, va_list ap); + int (*unit_timer_sub) (union DBKey key, struct DBData *data, va_list ap); void (*init_unit_layout) (void); bool (*parse_row_skilldb) (char* split[], int columns, int current); bool (*parse_row_requiredb) (char* split[], int columns, int current); diff --git a/src/map/status.c b/src/map/status.c index 82c427317..34bfd06b5 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2255,7 +2255,8 @@ int status_calc_pet_(struct pet_data *pd, enum e_status_calc_opt opt) return 1; } -unsigned int status_get_base_maxsp(struct map_session_data* sd, struct status_data *st) { +unsigned int status_get_base_maxsp(const struct map_session_data *sd, const struct status_data *st) +{ uint64 val = pc->class2idx(sd->status.class_); val = status->dbs->SP_table[val][sd->status.base_level]; @@ -2272,7 +2273,8 @@ unsigned int status_get_base_maxsp(struct map_session_data* sd, struct status_da return (unsigned int)cap_value(val, 0, UINT_MAX); } -unsigned int status_get_base_maxhp(struct map_session_data *sd, struct status_data *st) { +unsigned int status_get_base_maxhp(const struct map_session_data *sd, const struct status_data *st) +{ uint64 val = pc->class2idx(sd->status.class_); val = status->dbs->HP_table[val][sd->status.base_level]; @@ -2718,7 +2720,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) { // Base batk value is set on status->calc_misc // weapon-type bonus (FIXME: Why is the weapon_atk bonus applied to base attack?) - if (sd->status.weapon < MAX_WEAPON_TYPE && sd->weapon_atk[sd->status.weapon]) + if (sd->status.weapon < MAX_SINGLE_WEAPON_TYPE && sd->weapon_atk[sd->status.weapon]) bstatus->batk += sd->weapon_atk[sd->status.weapon]; // Absolute modifiers from passive skills #ifndef RENEWAL @@ -3518,10 +3520,18 @@ void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, str regen->flag &=~RGN_SP; //No natural SP regen } + + // Tension relax allows the user to recover HP while overweight + // at 1x speed. Other SC ignored? [csnv] if (sc->data[SC_TENSIONRELAX]) { - regen->rate.hp += 2; - if (regen->sregen) - regen->sregen->rate.hp += 3; + if (sc->data[SC_WEIGHTOVER50] || sc->data[SC_WEIGHTOVER90]) { + regen->flag &= ~RGN_SP; + regen->rate.hp = 1; + } else { + regen->rate.hp += 2; + if (regen->sregen) + regen->sregen->rate.hp += 3; + } } if (sc->data[SC_MAGNIFICAT]) { @@ -4189,10 +4199,10 @@ int status_base_amotion_pc(struct map_session_data *sd, struct status_data *st) float temp; int skill_lv, val = 0; amotion = status->dbs->aspd_base[pc->class2idx(sd->status.class_)][sd->weapontype1]; - if ( sd->status.weapon > MAX_WEAPON_TYPE ) + if ( sd->status.weapon > MAX_SINGLE_WEAPON_TYPE) amotion += status->dbs->aspd_base[pc->class2idx(sd->status.class_)][sd->weapontype2] / 4; if ( sd->status.shield ) - amotion += status->dbs->aspd_base[pc->class2idx(sd->status.class_)][MAX_WEAPON_TYPE]; + amotion += status->dbs->aspd_base[pc->class2idx(sd->status.class_)][MAX_SINGLE_WEAPON_TYPE]; switch ( sd->status.weapon ) { case W_BOW: case W_MUSICAL: @@ -4215,7 +4225,7 @@ int status_base_amotion_pc(struct map_session_data *sd, struct status_data *st) amotion = ((int)(temp + ((float)(status->calc_aspd(&sd->bl, &sd->sc, 1) + val) * st->agi / 200)) - min(amotion, 200)); #else // base weapon delay - amotion = (sd->status.weapon < MAX_WEAPON_TYPE) + amotion = (sd->status.weapon < MAX_SINGLE_WEAPON_TYPE) ? (status->dbs->aspd_base[pc->class2idx(sd->status.class_)][sd->status.weapon]) // single weapon : (status->dbs->aspd_base[pc->class2idx(sd->status.class_)][sd->weapontype1] + status->dbs->aspd_base[pc->class2idx(sd->status.class_)][sd->weapontype2]) * 7 / 10; // dual-wield @@ -5566,9 +5576,9 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc { int val = 0; - if( sd && sc->data[SC_HIDING] && pc->checkskill(sd,RG_TUNNELDRIVE) > 0 ) + if ( sd && sc->data[SC_HIDING] && pc->checkskill(sd,RG_TUNNELDRIVE) > 0 ) { val = 120 - 6 * pc->checkskill(sd,RG_TUNNELDRIVE); - else + } else { if( sd && sc->data[SC_CHASEWALK] && sc->data[SC_CHASEWALK]->val3 < 0 ) val = sc->data[SC_CHASEWALK]->val3; else @@ -5638,8 +5648,8 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc if( sd && sd->bonus.speed_rate + sd->bonus.speed_add_rate > 0 ) // permanent item-based speedup val = max( val, sd->bonus.speed_rate + sd->bonus.speed_add_rate ); } - - speed_rate += val; + } + speed_rate += val; } //GetMoveHasteValue1() @@ -6241,7 +6251,13 @@ uint32 status_calc_mode(const struct block_list *bl, const struct status_change return mode & MD_MASK; } -const char *status_get_name(struct block_list *bl) +/** + * Returns the name of the given bl. + * + * @param bl The requested bl. + * @return The bl's name or NULL if not available. + */ +const char *status_get_name(const struct block_list *bl) { nullpo_ret(bl); switch (bl->type) { @@ -6257,7 +6273,7 @@ const char *status_get_name(struct block_list *bl) case BL_HOM: return BL_UCCAST(BL_HOM, bl)->homunculus.name; case BL_NPC: return BL_UCCAST(BL_NPC, bl)->name; } - return "Unknown"; + return NULL; } /*========================================== @@ -6266,7 +6282,7 @@ const char *status_get_name(struct block_list *bl) * 0 = fail * class_id = success *------------------------------------------*/ -int status_get_class(struct block_list *bl) +int status_get_class(const struct block_list *bl) { nullpo_ret(bl); switch (bl->type) { @@ -6286,7 +6302,7 @@ int status_get_class(struct block_list *bl) * 1 = fail * level = success *------------------------------------------*/ -int status_get_lv(struct block_list *bl) +int status_get_lv(const struct block_list *bl) { nullpo_ret(bl); switch (bl->type) { @@ -6376,7 +6392,8 @@ unsigned short status_get_speed(struct block_list *bl) return status->get_status_data(bl)->speed; } -int status_get_party_id(struct block_list *bl) { +int status_get_party_id(const struct block_list *bl) +{ nullpo_ret(bl); switch (bl->type) { case BL_PC: @@ -6431,7 +6448,7 @@ int status_get_party_id(struct block_list *bl) { return 0; } -int status_get_guild_id(struct block_list *bl) +int status_get_guild_id(const struct block_list *bl) { nullpo_ret(bl); switch (bl->type) { @@ -6497,7 +6514,8 @@ int status_get_guild_id(struct block_list *bl) return 0; } -int status_get_emblem_id(struct block_list *bl) { +int status_get_emblem_id(const struct block_list *bl) +{ nullpo_ret(bl); switch (bl->type) { case BL_PC: @@ -6558,7 +6576,7 @@ int status_get_emblem_id(struct block_list *bl) { return 0; } -int status_get_mexp(struct block_list *bl) +int status_get_mexp(const struct block_list *bl) { nullpo_ret(bl); if (bl->type == BL_MOB) @@ -6568,7 +6586,7 @@ int status_get_mexp(struct block_list *bl) return 0; } -int status_get_race2(struct block_list *bl) +int status_get_race2(const struct block_list *bl) { nullpo_ret(bl); if (bl->type == BL_MOB) @@ -7477,8 +7495,9 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t if (tick == 1) return 1; //Minimal duration: Only strip without causing the SC break; case SC_NOEQUIPSHIELD: - if( val2 == 1 ) val2 = 0; //GX effect. Do not take shield off.. - else + if (val2 == 1) { + val2 = 0; //GX effect. Do not take shield off.. + } else { if (sd && !(flag&SCFLAG_LOADED)) { int i; if(sd->bonus.unstripable_equip&EQP_SHIELD) @@ -7488,8 +7507,10 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t return 0; pc->unequipitem(sd, i, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE); } - if (tick == 1) return 1; //Minimal duration: Only strip without causing the SC - break; + } + if (tick == 1) + return 1; //Minimal duration: Only strip without causing the SC + break; case SC_NOEQUIPARMOR: if (sd && !(flag&SCFLAG_LOADED)) { int i; @@ -11592,7 +11613,7 @@ int status_change_timer(int tid, int64 tick, int id, intptr_t data) { if( --(sce->val4) > 0 ) { struct block_list *src = map->id2bl(sce->val2); int damage; - if( !src || (src && (status->isdead(src) || src->m != bl->m || distance_bl(src, bl) >= 12)) ) + if (src == NULL || (status->isdead(src) || src->m != bl->m || distance_bl(src, bl) >= 12)) break; map->freeblock_lock(); damage = sce->val3; @@ -12432,8 +12453,10 @@ int status_natural_heal(struct block_list* bl, va_list args) { } } - if (flag && regen->state.overweight) - flag=0; + // SC_TENSIONRELAX allows HP to be recovered even when overweight. [csnv] + if (flag && regen->state.overweight && (sc == NULL || sc->data[SC_TENSIONRELAX] == NULL)) { + flag = 0; + } ud = unit->bl2ud(bl); @@ -12603,7 +12626,7 @@ void status_read_job_db_sub(int idx, const char *name, struct config_setting_t * { "FuumaShuriken", W_HUUMA }, { "TwoHandRod", W_2HSTAFF }, #ifdef RENEWAL_ASPD - { "Shield", MAX_WEAPON_TYPE } + { "Shield", MAX_SINGLE_WEAPON_TYPE } #endif }; @@ -12941,7 +12964,7 @@ int status_readdb_refine_libconfig(const char *filename) { struct config_t refine_db_conf; struct config_setting_t *r; char filepath[256]; - int i = 0, count = 0,type = 0; + int i = 0, count = 0; sprintf(filepath, "%s/%s", map->db_path, filename); if (!libconfig->load_file(&refine_db_conf, filepath)) @@ -12951,10 +12974,13 @@ int status_readdb_refine_libconfig(const char *filename) { while((r = libconfig->setting_get_elem(refine_db_conf.root,i++))) { char *name = config_setting_name(r); - if((type=status->readdb_refine_libconfig_sub(r, name, filename))) { - if( duplicate[type-1] ) { + int type = status->readdb_refine_libconfig_sub(r, name, filename); + if (type != 0) { + if (duplicate[type-1]) { ShowWarning("status_readdb_refine_libconfig: duplicate entry for %s in \"%s\", overwriting previous entry...\n", name, filename); - } else duplicate[type-1] = true; + } else { + duplicate[type-1] = true; + } count++; } } @@ -12999,10 +13025,10 @@ int status_readdb(void) memset(status->dbs->job_bonus,0,sizeof(status->dbs->job_bonus)); // Job-specific stats bonus } for ( i = 0; i < CLASS_COUNT; i++ ) { - for ( j = 0; j < MAX_WEAPON_TYPE; j++ ) + for ( j = 0; j < MAX_SINGLE_WEAPON_TYPE; j++ ) status->dbs->aspd_base[i][j] = 2000; #ifdef RENEWAL_ASPD - status->dbs->aspd_base[i][MAX_WEAPON_TYPE] = 0; + status->dbs->aspd_base[i][MAX_SINGLE_WEAPON_TYPE] = 0; #endif } diff --git a/src/map/status.h b/src/map/status.h index 4e2f1bdc0..2b932b149 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -1789,9 +1789,13 @@ enum si_type { //SI_DORAM_BUF_01 = 935, //SI_DORAM_BUF_02 = 936, //SI_SPRITEMABLE = 937, + //SI_EP16_2_BUFF_SS = 963, + //SI_EP16_2_BUFF_SC = 964, + //SI_EP16_2_BUFF_AC = 965, SI_MAX, }; + // JOINTBEAT stackable ailments enum e_joint_break { @@ -1804,7 +1808,6 @@ enum e_joint_break BREAK_FLAGS = BREAK_ANKLE | BREAK_WRIST | BREAK_KNEE | BREAK_SHOULDER | BREAK_WAIST | BREAK_NECK, }; - /** * Mob mode definitions. [Skotlex] * @@ -2159,7 +2162,7 @@ BEGIN_ZEROED_BLOCK; /* Everything within this block will be memset to 0 when sta int max_weight_base[CLASS_COUNT]; int HP_table[CLASS_COUNT][MAX_LEVEL + 1]; int SP_table[CLASS_COUNT][MAX_LEVEL + 1]; - int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1]; // +1 for RENEWAL_ASPD + int aspd_base[CLASS_COUNT][MAX_SINGLE_WEAPON_TYPE+1]; // +1 for RENEWAL_ASPD sc_type Skill2SCTable[MAX_SKILL]; // skill -> status int IconChangeTable[SC_MAX]; // status -> "icon" (icon is a bit of a misnomer, since there exist values with no icon associated) unsigned int ChangeFlagTable[SC_MAX]; // status -> flags @@ -2216,17 +2219,17 @@ struct status_interface { struct regen_data * (*get_regen_data) (struct block_list *bl); struct status_data * (*get_status_data) (struct block_list *bl); struct status_data * (*get_base_status) (struct block_list *bl); - const char * (*get_name) (struct block_list *bl); - int (*get_class) (struct block_list *bl); - int (*get_lv) (struct block_list *bl); + const char *(*get_name) (const struct block_list *bl); + int (*get_class) (const struct block_list *bl); + int (*get_lv) (const struct block_list *bl); defType (*get_def) (struct block_list *bl); unsigned short (*get_speed) (struct block_list *bl); unsigned char (*calc_attack_element) (struct block_list *bl, struct status_change *sc, int element); - int (*get_party_id) (struct block_list *bl); - int (*get_guild_id) (struct block_list *bl); - int (*get_emblem_id) (struct block_list *bl); - int (*get_mexp) (struct block_list *bl); - int (*get_race2) (struct block_list *bl); + int (*get_party_id) (const struct block_list *bl); + int (*get_guild_id) (const struct block_list *bl); + int (*get_emblem_id) (const struct block_list *bl); + int (*get_mexp) (const struct block_list *bl); + int (*get_race2) (const struct block_list *bl); struct view_data * (*get_viewdata) (struct block_list *bl); void (*set_viewdata) (struct block_list *bl, int class_); void (*change_init) (struct block_list *bl); @@ -2272,8 +2275,8 @@ struct status_interface { void (*initDummyData) (void); int (*base_amotion_pc) (struct map_session_data *sd, struct status_data *st); unsigned short (*base_atk) (const struct block_list *bl, const struct status_data *st); - unsigned int (*get_base_maxhp) (struct map_session_data *sd, struct status_data *st); - unsigned int (*get_base_maxsp) (struct map_session_data *sd, struct status_data *st); + unsigned int (*get_base_maxhp) (const struct map_session_data *sd, const struct status_data *st); + unsigned int (*get_base_maxsp) (const struct map_session_data *sd, const struct status_data *st); int (*calc_npc_) (struct npc_data *nd, enum e_status_calc_opt opt); unsigned short (*calc_str) (struct block_list *bl, struct status_change *sc, int str); unsigned short (*calc_agi) (struct block_list *bl, struct status_change *sc, int agi); diff --git a/src/map/storage.c b/src/map/storage.c index ceac85916..91b37eb19 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -52,8 +52,8 @@ struct guild_storage_interface *gstorage; *------------------------------------------*/ int storage_comp_item(const void *i1_, const void *i2_) { - const struct item *i1 = (const struct item *)i1_; - const struct item *i2 = (const struct item *)i2_; + const struct item *i1 = i1_; + const struct item *i2 = i2_; if (i1->nameid == i2->nameid) return 0; @@ -79,7 +79,7 @@ void storage_sortitem(struct item* items, unsigned int size) * Parses storage and saves 'dirty' ones upon reconnect. [Skotlex] * @see DBApply */ -int storage_reconnect_sub(DBKey key, DBData *data, va_list ap) +int storage_reconnect_sub(union DBKey key, struct DBData *data, va_list ap) { struct guild_storage *stor = DB->data2ptr(data); if (stor->dirty && stor->storage_status == 0) //Save closed storages. @@ -366,7 +366,7 @@ void storage_storage_quit(struct map_session_data* sd, int flag) { /** * @see DBCreateData */ -DBData create_guildstorage(DBKey key, va_list args) +struct DBData create_guildstorage(union DBKey key, va_list args) { struct guild_storage *gs = NULL; gs = (struct guild_storage *) aCalloc(sizeof(struct guild_storage), 1); diff --git a/src/map/storage.h b/src/map/storage.h index bddd03770..94512c456 100644 --- a/src/map/storage.h +++ b/src/map/storage.h @@ -52,11 +52,11 @@ struct storage_interface { void (*pc_quit) (struct map_session_data *sd, int flag); int (*comp_item) (const void *i1_, const void *i2_); void (*sortitem) (struct item* items, unsigned int size); - int (*reconnect_sub) (DBKey key, DBData *data, va_list ap); + int (*reconnect_sub) (union DBKey key, struct DBData *data, va_list ap); }; struct guild_storage_interface { - struct DBMap* db; // int guild_id -> struct guild_storage* + struct DBMap *db; // int guild_id -> struct guild_storage* /* */ struct guild_storage *(*ensure) (int guild_id); /* */ @@ -75,7 +75,7 @@ struct guild_storage_interface { int (*pc_quit) (struct map_session_data *sd,int flag); int (*save) (int account_id, int guild_id, int flag); int (*saved) (int guild_id); //Ack from char server that guild store was saved. - DBData (*create) (DBKey key, va_list args); + struct DBData (*create) (union DBKey key, va_list args); }; #ifdef HERCULES_CORE diff --git a/src/map/unit.c b/src/map/unit.c index 9a698b77e..ac1e3e9b5 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1220,6 +1220,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui ud = unit->bl2ud(src); if(ud == NULL) return 0; + sc = status->get_sc(src); if (sc && !sc->count) sc = NULL; //Unneeded @@ -2289,11 +2290,18 @@ int unit_skillcastcancel(struct block_list *bl,int type) // unit_data initialization process void unit_dataset(struct block_list *bl) { - struct unit_data *ud; - nullpo_retv(ud = unit->bl2ud(bl)); + struct unit_data *ud = unit->bl2ud(bl); + nullpo_retv(ud); + + unit->init_ud(ud); + ud->bl = bl; +} + +void unit_init_ud(struct unit_data *ud) +{ + nullpo_retv(ud); - memset( ud, 0, sizeof( struct unit_data) ); - ud->bl = bl; + memset (ud, 0, sizeof(struct unit_data)); ud->walktimer = INVALID_TIMER; ud->skilltimer = INVALID_TIMER; ud->attacktimer = INVALID_TIMER; @@ -2433,7 +2441,7 @@ int unit_remove_map(struct block_list *bl, clr_type clrtype, const char* file, i status_change_end(d_bl,SC__SHADOWFORM,INVALID_TIMER); } //Leave/reject all invitations. - if(sd->chatID) + if (sd->chat_id != 0) chat->leave(sd, false); if(sd->trade_partner) trade->cancel(sd); @@ -2895,6 +2903,7 @@ void unit_defaults(void) { /* */ unit->bl2ud = unit_bl2ud; unit->bl2ud2 = unit_bl2ud2; + unit->init_ud = unit_init_ud; unit->attack_timer = unit_attack_timer; unit->walktoxy_timer = unit_walktoxy_timer; unit->walktoxy_sub = unit_walktoxy_sub; diff --git a/src/map/unit.h b/src/map/unit.h index 0279d73c1..8c4c34696 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -105,6 +105,7 @@ struct unit_interface { /* */ struct unit_data* (*bl2ud) (struct block_list *bl); struct unit_data* (*bl2ud2) (struct block_list *bl); + void (*init_ud) (struct unit_data *ud); int (*attack_timer) (int tid, int64 tick, int id, intptr_t data); int (*walktoxy_timer) (int tid, int64 tick, int id, intptr_t data); int (*walktoxy_sub) (struct block_list *bl); diff --git a/src/map/vending.c b/src/map/vending.c index 2346932ba..e3a62bea7 100644 --- a/src/map/vending.c +++ b/src/map/vending.c @@ -118,7 +118,7 @@ void vending_purchasereq(struct map_session_data* sd, int aid, unsigned int uid, // some checks z = 0; // zeny counter w = 0; // weight counter - for( i = 0; i < count; i++ ) { + for (i = 0; i < count; i++) { short amount = *(const uint16*)(data + 4*i + 0); short idx = *(const uint16*)(data + 4*i + 2); idx -= 2; @@ -184,7 +184,7 @@ void vending_purchasereq(struct map_session_data* sd, int aid, unsigned int uid, z -= apply_percentrate64(z, battle_config.vending_tax, 10000); pc->getzeny(vsd, (int)z, LOG_TYPE_VENDING, sd); - for( i = 0; i < count; i++ ) { + for (i = 0; i < count; i++) { short amount = *(const uint16*)(data + 4*i + 0); short idx = *(const uint16*)(data + 4*i + 2); idx -= 2; @@ -199,7 +199,7 @@ void vending_purchasereq(struct map_session_data* sd, int aid, unsigned int uid, if( battle_config.buyer_name ) { char temp[256]; sprintf(temp, msg_sd(vsd,265), sd->status.name); - clif_disp_onlyself(vsd,temp,strlen(temp)); + clif_disp_onlyself(vsd, temp); } } @@ -265,7 +265,7 @@ void vending_openvending(struct map_session_data* sd, const char* message, const // filter out invalid items i = 0; - for( j = 0; j < count; j++ ) { + for (j = 0; j < count; j++) { short index = *(const uint16*)(data + 8*j + 0); short amount = *(const uint16*)(data + 8*j + 2); unsigned int value = *(const uint32*)(data + 8*j + 4); diff --git a/src/map/vending.h b/src/map/vending.h index 6684ed256..1d2135076 100644 --- a/src/map/vending.h +++ b/src/map/vending.h @@ -22,8 +22,9 @@ #define MAP_VENDING_H #include "common/hercules.h" -#include "common/db.h" +/* Forward Declarations */ +struct DBMap; // common/db.h struct map_session_data; struct s_search_store_search; @@ -35,7 +36,7 @@ struct s_vending { struct vending_interface { unsigned int next_id;/* next vender id */ - DBMap *db; + struct DBMap *db; /* */ void (*init) (bool minimal); void (*final) (void); diff --git a/src/plugins/HPMHooking.c b/src/plugins/HPMHooking.c index 18bfaf220..4fb7911c2 100644 --- a/src/plugins/HPMHooking.c +++ b/src/plugins/HPMHooking.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2016 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "HPMHooking.h" + #include "common/hercules.h" #include "common/db.h" #include "common/memmgr.h" @@ -29,6 +32,8 @@ #define HPM_HOOKS_INCLUDE "HPMHooking/HPMHooking_login.Hooks.inc" #define HPM_POINTS_INCLUDE "HPMHooking/HPMHooking_login.HookingPoints.inc" #define HPM_SOURCES_INCLUDE "HPMHooking/HPMHooking_login.sources.inc" +#include "login/lclif.h" +#include "login/lclif.p.h" #include "login/login.h" #elif defined (HPMHOOKING_CHAR) #define HPM_SERVER_TYPE SERVER_TYPE_CHAR @@ -128,7 +133,7 @@ HPExport struct hplugin_info pinfo = { }; #define HP_POP(x,y) #x , (void**)(&x) , (void*)y , 0 -DBMap *hp_db;/* hooking points db -- for quick lookup */ +struct DBMap *hp_db;/* hooking points db -- for quick lookup */ struct HookingPointData { char* name; diff --git a/src/plugins/HPMHooking.h b/src/plugins/HPMHooking.h new file mode 100644 index 000000000..44970863c --- /dev/null +++ b/src/plugins/HPMHooking.h @@ -0,0 +1,65 @@ +/** + * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules + * + * Copyright (C) 2016 Hercules Dev Team + * + * Hercules is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef PLUGINS_HPMHOOKING_H +#define PLUGINS_HPMHOOKING_H + +#include "common/hercules.h" + +enum HPluginHookType { + HOOK_TYPE_PRE, + HOOK_TYPE_POST, +}; + +struct HPMHooking_interface { + bool (*AddHook) (enum HPluginHookType type, const char *target, void *hook, unsigned int pID); + void (*HookStop) (const char *func, unsigned int pID); + bool (*HookStopped) (void); +}; + +#ifdef HERCULES_CORE +struct HPMHooking_core_interface { + bool enabled; + bool force_return; + bool (*addhook_sub) (enum HPluginHookType type, const char *target, void *hook, unsigned int pID); + const char *(*Hooked)(bool *fr); +}; +#else // ! HERCULES_CORE +HPExport struct HPMHooking_interface HPMHooking_s; + +#include "HPMHooking/HPMHooking.Defs.inc" + +#define addHookPre(ifname, funcname, hook) ( \ + (void)((HPMHOOK_pre_ ## ifname ## _ ## funcname)0 == (hook)), \ + HPMi->hooking->AddHook(HOOK_TYPE_PRE, #ifname "->" #funcname, (hook), HPMi->pid) \ + ) + +#define addHookPost(ifname, funcname, hook) ( \ + (void)((HPMHOOK_post_ ## ifname ## _ ## funcname)0 == (hook)), \ + HPMi->hooking->AddHook(HOOK_TYPE_POST, #ifname "->" #funcname, (hook), HPMi->pid) \ + ) + +/* need better names ;/ */ +/* will not run the original function after pre-hook processing is complete (other hooks will run) */ +#define hookStop() (HPMi->hooking->HookStop(__func__,HPMi->pid)) +#define hookStopped() (HPMi->hooking->HookStopped()) + +#endif // ! HERCULES_CORE + +#endif // PLUGINS_HPMHOOKING_H diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc new file mode 100644 index 000000000..4510bc3df --- /dev/null +++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc @@ -0,0 +1,7115 @@ +/** + * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules + * + * Copyright (C) 2013-2016 Hercules Dev Team + * + * Hercules is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/* + * NOTE: This file was auto-generated and should never be manually edited, + * as it will get overwritten. + */ + +#ifdef COMMON_UTILS_H /* HCache */ +typedef void (*HPMHOOK_pre_HCache_init) (void); +typedef void (*HPMHOOK_post_HCache_init) (void); +typedef bool (*HPMHOOK_pre_HCache_check) (const char **file); +typedef bool (*HPMHOOK_post_HCache_check) (bool retVal___, const char *file); +typedef FILE* (*HPMHOOK_pre_HCache_open) (const char **file, const char **opt); +typedef FILE* (*HPMHOOK_post_HCache_open) (FILE* retVal___, const char *file, const char *opt); +#endif // COMMON_UTILS_H +#ifdef MAP_ATCOMMAND_H /* atcommand */ +typedef void (*HPMHOOK_pre_atcommand_init) (bool *minimal); +typedef void (*HPMHOOK_post_atcommand_init) (bool minimal); +typedef void (*HPMHOOK_pre_atcommand_final) (void); +typedef void (*HPMHOOK_post_atcommand_final) (void); +typedef bool (*HPMHOOK_pre_atcommand_exec) (const int *fd, struct map_session_data **sd, const char **message, bool *player_invoked); +typedef bool (*HPMHOOK_post_atcommand_exec) (bool retVal___, const int fd, struct map_session_data *sd, const char *message, bool player_invoked); +typedef bool (*HPMHOOK_pre_atcommand_create) (char **name, AtCommandFunc *func); +typedef bool (*HPMHOOK_post_atcommand_create) (bool retVal___, char *name, AtCommandFunc func); +typedef bool (*HPMHOOK_pre_atcommand_can_use) (struct map_session_data **sd, const char **command); +typedef bool (*HPMHOOK_post_atcommand_can_use) (bool retVal___, struct map_session_data *sd, const char *command); +typedef bool (*HPMHOOK_pre_atcommand_can_use2) (struct map_session_data **sd, const char **command, AtCommandType *type); +typedef bool (*HPMHOOK_post_atcommand_can_use2) (bool retVal___, struct map_session_data *sd, const char *command, AtCommandType type); +typedef void (*HPMHOOK_pre_atcommand_load_groups) (GroupSettings ***groups, struct config_setting_t ***commands_, size_t *sz); +typedef void (*HPMHOOK_post_atcommand_load_groups) (GroupSettings **groups, struct config_setting_t **commands_, size_t sz); +typedef AtCommandInfo* (*HPMHOOK_pre_atcommand_exists) (const char **name); +typedef AtCommandInfo* (*HPMHOOK_post_atcommand_exists) (AtCommandInfo* retVal___, const char *name); +typedef bool (*HPMHOOK_pre_atcommand_msg_read) (const char **cfg_name, bool *allow_override); +typedef bool (*HPMHOOK_post_atcommand_msg_read) (bool retVal___, const char *cfg_name, bool allow_override); +typedef void (*HPMHOOK_pre_atcommand_final_msg) (void); +typedef void (*HPMHOOK_post_atcommand_final_msg) (void); +typedef struct atcmd_binding_data* (*HPMHOOK_pre_atcommand_get_bind_byname) (const char **name); +typedef struct atcmd_binding_data* (*HPMHOOK_post_atcommand_get_bind_byname) (struct atcmd_binding_data* retVal___, const char *name); +typedef AtCommandInfo* (*HPMHOOK_pre_atcommand_get_info_byname) (const char **name); +typedef AtCommandInfo* (*HPMHOOK_post_atcommand_get_info_byname) (AtCommandInfo* retVal___, const char *name); +typedef const char* (*HPMHOOK_pre_atcommand_check_alias) (const char **aliasname); +typedef const char* (*HPMHOOK_post_atcommand_check_alias) (const char* retVal___, const char *aliasname); +typedef void (*HPMHOOK_pre_atcommand_get_suggestions) (struct map_session_data **sd, const char **name, bool *is_atcmd_cmd); +typedef void (*HPMHOOK_post_atcommand_get_suggestions) (struct map_session_data *sd, const char *name, bool is_atcmd_cmd); +typedef void (*HPMHOOK_pre_atcommand_config_read) (const char **config_filename); +typedef void (*HPMHOOK_post_atcommand_config_read) (const char *config_filename); +typedef int (*HPMHOOK_pre_atcommand_stopattack) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_atcommand_stopattack) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_atcommand_pvpoff_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_atcommand_pvpoff_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_atcommand_pvpon_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_atcommand_pvpon_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_atcommand_atkillmonster_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_atcommand_atkillmonster_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_atcommand_raise_sub) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_atcommand_raise_sub) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_atcommand_get_jail_time) (int *jailtime, int **year, int **month, int **day, int **hour, int **minute); +typedef void (*HPMHOOK_post_atcommand_get_jail_time) (int jailtime, int *year, int *month, int *day, int *hour, int *minute); +typedef int (*HPMHOOK_pre_atcommand_cleanfloor_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_atcommand_cleanfloor_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_atcommand_mutearea_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_atcommand_mutearea_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_atcommand_getring) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_atcommand_getring) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_atcommand_channel_help) (int *fd, const char **command, bool *can_create); +typedef void (*HPMHOOK_post_atcommand_channel_help) (int fd, const char *command, bool can_create); +typedef void (*HPMHOOK_pre_atcommand_commands_sub) (struct map_session_data **sd, const int *fd, AtCommandType *type); +typedef void (*HPMHOOK_post_atcommand_commands_sub) (struct map_session_data *sd, const int fd, AtCommandType type); +typedef void (*HPMHOOK_pre_atcommand_cmd_db_clear) (void); +typedef void (*HPMHOOK_post_atcommand_cmd_db_clear) (void); +typedef int (*HPMHOOK_pre_atcommand_cmd_db_clear_sub) (union DBKey *key, struct DBData **data, va_list args); +typedef int (*HPMHOOK_post_atcommand_cmd_db_clear_sub) (int retVal___, union DBKey key, struct DBData *data, va_list args); +typedef void (*HPMHOOK_pre_atcommand_doload) (void); +typedef void (*HPMHOOK_post_atcommand_doload) (void); +typedef void (*HPMHOOK_pre_atcommand_base_commands) (void); +typedef void (*HPMHOOK_post_atcommand_base_commands) (void); +typedef bool (*HPMHOOK_pre_atcommand_add) (char **name, AtCommandFunc *func, bool *replace); +typedef bool (*HPMHOOK_post_atcommand_add) (bool retVal___, char *name, AtCommandFunc func, bool replace); +typedef const char* (*HPMHOOK_pre_atcommand_msg) (int *msg_number); +typedef const char* (*HPMHOOK_post_atcommand_msg) (const char* retVal___, int msg_number); +typedef void (*HPMHOOK_pre_atcommand_expand_message_table) (void); +typedef void (*HPMHOOK_post_atcommand_expand_message_table) (void); +typedef const char* (*HPMHOOK_pre_atcommand_msgfd) (int *fd, int *msg_number); +typedef const char* (*HPMHOOK_post_atcommand_msgfd) (const char* retVal___, int fd, int msg_number); +typedef const char* (*HPMHOOK_pre_atcommand_msgsd) (struct map_session_data **sd, int *msg_number); +typedef const char* (*HPMHOOK_post_atcommand_msgsd) (const char* retVal___, struct map_session_data *sd, int msg_number); +#endif // MAP_ATCOMMAND_H +#ifdef MAP_BATTLE_H /* battle */ +typedef void (*HPMHOOK_pre_battle_init) (bool *minimal); +typedef void (*HPMHOOK_post_battle_init) (bool minimal); +typedef void (*HPMHOOK_pre_battle_final) (void); +typedef void (*HPMHOOK_post_battle_final) (void); +typedef struct Damage (*HPMHOOK_pre_battle_calc_attack) (int *attack_type, struct block_list **bl, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *count); +typedef struct Damage (*HPMHOOK_post_battle_calc_attack) (struct Damage retVal___, int attack_type, struct block_list *bl, struct block_list *target, uint16 skill_id, uint16 skill_lv, int count); +typedef int64 (*HPMHOOK_pre_battle_calc_damage) (struct block_list **src, struct block_list **bl, struct Damage **d, int64 *damage, uint16 *skill_id, uint16 *skill_lv); +typedef int64 (*HPMHOOK_post_battle_calc_damage) (int64 retVal___, struct block_list *src, struct block_list *bl, struct Damage *d, int64 damage, uint16 skill_id, uint16 skill_lv); +typedef int64 (*HPMHOOK_pre_battle_calc_gvg_damage) (struct block_list **src, struct block_list **bl, int64 *damage, int *div_, uint16 *skill_id, uint16 *skill_lv, int *flag); +typedef int64 (*HPMHOOK_post_battle_calc_gvg_damage) (int64 retVal___, struct block_list *src, struct block_list *bl, int64 damage, int div_, uint16 skill_id, uint16 skill_lv, int flag); +typedef int64 (*HPMHOOK_pre_battle_calc_bg_damage) (struct block_list **src, struct block_list **bl, int64 *damage, int *div_, uint16 *skill_id, uint16 *skill_lv, int *flag); +typedef int64 (*HPMHOOK_post_battle_calc_bg_damage) (int64 retVal___, struct block_list *src, struct block_list *bl, int64 damage, int div_, uint16 skill_id, uint16 skill_lv, int flag); +typedef enum damage_lv (*HPMHOOK_pre_battle_weapon_attack) (struct block_list **bl, struct block_list **target, int64 *tick, int *flag); +typedef enum damage_lv (*HPMHOOK_post_battle_weapon_attack) (enum damage_lv retVal___, struct block_list *bl, struct block_list *target, int64 tick, int flag); +typedef struct Damage (*HPMHOOK_pre_battle_calc_weapon_attack) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *wflag); +typedef struct Damage (*HPMHOOK_post_battle_calc_weapon_attack) (struct Damage retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int wflag); +typedef int (*HPMHOOK_pre_battle_delay_damage) (int64 *tick, int *amotion, struct block_list **src, struct block_list **target, int *attack_type, uint16 *skill_id, uint16 *skill_lv, int64 *damage, enum damage_lv *dmg_lv, int *ddelay, bool *additional_effects); +typedef int (*HPMHOOK_post_battle_delay_damage) (int retVal___, int64 tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, uint16 skill_id, uint16 skill_lv, int64 damage, enum damage_lv dmg_lv, int ddelay, bool additional_effects); +typedef void (*HPMHOOK_pre_battle_drain) (struct map_session_data **sd, struct block_list **tbl, int64 *rdamage, int64 *ldamage, int *race, int *boss); +typedef void (*HPMHOOK_post_battle_drain) (struct map_session_data *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int boss); +typedef void (*HPMHOOK_pre_battle_reflect_damage) (struct block_list **target, struct block_list **src, struct Damage **wd, uint16 *skill_id); +typedef void (*HPMHOOK_post_battle_reflect_damage) (struct block_list *target, struct block_list *src, struct Damage *wd, uint16 skill_id); +typedef int (*HPMHOOK_pre_battle_attr_ratio) (int *atk_elem, int *def_type, int *def_lv); +typedef int (*HPMHOOK_post_battle_attr_ratio) (int retVal___, int atk_elem, int def_type, int def_lv); +typedef int64 (*HPMHOOK_pre_battle_attr_fix) (struct block_list **src, struct block_list **target, int64 *damage, int *atk_elem, int *def_type, int *def_lv); +typedef int64 (*HPMHOOK_post_battle_attr_fix) (int64 retVal___, struct block_list *src, struct block_list *target, int64 damage, int atk_elem, int def_type, int def_lv); +typedef int64 (*HPMHOOK_pre_battle_calc_cardfix) (int *attack_type, struct block_list **src, struct block_list **target, int *nk, int *s_ele, int *s_ele_, int64 *damage, int *left, int *flag); +typedef int64 (*HPMHOOK_post_battle_calc_cardfix) (int64 retVal___, int attack_type, struct block_list *src, struct block_list *target, int nk, int s_ele, int s_ele_, int64 damage, int left, int flag); +typedef int64 (*HPMHOOK_pre_battle_calc_cardfix2) (struct block_list **src, struct block_list **bl, int64 *damage, int *s_ele, int *nk, int *flag); +typedef int64 (*HPMHOOK_post_battle_calc_cardfix2) (int64 retVal___, struct block_list *src, struct block_list *bl, int64 damage, int s_ele, int nk, int flag); +typedef int64 (*HPMHOOK_pre_battle_calc_elefix) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *nk, int *n_ele, int *s_ele, int *s_ele_, bool *left, int *flag); +typedef int64 (*HPMHOOK_post_battle_calc_elefix) (int64 retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int nk, int n_ele, int s_ele, int s_ele_, bool left, int flag); +typedef int64 (*HPMHOOK_pre_battle_calc_masteryfix) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *div, bool *left, bool *weapon); +typedef int64 (*HPMHOOK_post_battle_calc_masteryfix) (int64 retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int div, bool left, bool weapon); +typedef int (*HPMHOOK_pre_battle_calc_chorusbonus) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_battle_calc_chorusbonus) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_battle_calc_skillratio) (int *attack_type, struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag); +typedef int (*HPMHOOK_post_battle_calc_skillratio) (int retVal___, int attack_type, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int skillratio, int flag); +typedef int64 (*HPMHOOK_pre_battle_calc_sizefix) (struct map_session_data **sd, int64 *damage, int *type, int *size, bool *ignore); +typedef int64 (*HPMHOOK_post_battle_calc_sizefix) (int64 retVal___, struct map_session_data *sd, int64 damage, int type, int size, bool ignore); +typedef int64 (*HPMHOOK_pre_battle_calc_weapon_damage) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, struct weapon_atk **watk, int *nk, bool *n_ele, short *s_ele, short *s_ele_, int *size, int *type, int *flag, int *flag2); +typedef int64 (*HPMHOOK_post_battle_calc_weapon_damage) (int64 retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, struct weapon_atk *watk, int nk, bool n_ele, short s_ele, short s_ele_, int size, int type, int flag, int flag2); +typedef int64 (*HPMHOOK_pre_battle_calc_defense) (int *attack_type, struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *flag, int *pdef); +typedef int64 (*HPMHOOK_post_battle_calc_defense) (int64 retVal___, int attack_type, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int flag, int pdef); +typedef struct block_list* (*HPMHOOK_pre_battle_get_master) (struct block_list **src); +typedef struct block_list* (*HPMHOOK_post_battle_get_master) (struct block_list* retVal___, struct block_list *src); +typedef struct block_list* (*HPMHOOK_pre_battle_get_targeted) (struct block_list **target); +typedef struct block_list* (*HPMHOOK_post_battle_get_targeted) (struct block_list* retVal___, struct block_list *target); +typedef struct block_list* (*HPMHOOK_pre_battle_get_enemy) (struct block_list **target, int *type, int *range); +typedef struct block_list* (*HPMHOOK_post_battle_get_enemy) (struct block_list* retVal___, struct block_list *target, int type, int range); +typedef int (*HPMHOOK_pre_battle_get_target) (struct block_list **bl); +typedef int (*HPMHOOK_post_battle_get_target) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_battle_get_current_skill) (struct block_list **bl); +typedef int (*HPMHOOK_post_battle_get_current_skill) (int retVal___, struct block_list *bl); +typedef bool (*HPMHOOK_pre_battle_check_undead) (int *race, int *element); +typedef bool (*HPMHOOK_post_battle_check_undead) (bool retVal___, int race, int element); +typedef int (*HPMHOOK_pre_battle_check_target) (struct block_list **src, struct block_list **target, int *flag); +typedef int (*HPMHOOK_post_battle_check_target) (int retVal___, struct block_list *src, struct block_list *target, int flag); +typedef bool (*HPMHOOK_pre_battle_check_range) (struct block_list **src, struct block_list **bl, int *range); +typedef bool (*HPMHOOK_post_battle_check_range) (bool retVal___, struct block_list *src, struct block_list *bl, int range); +typedef void (*HPMHOOK_pre_battle_consume_ammo) (struct map_session_data **sd, int *skill_id, int *lv); +typedef void (*HPMHOOK_post_battle_consume_ammo) (struct map_session_data *sd, int skill_id, int lv); +typedef int (*HPMHOOK_pre_battle_get_targeted_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_battle_get_targeted_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_battle_get_enemy_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_battle_get_enemy_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_battle_get_enemy_area_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_battle_get_enemy_area_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_battle_delay_damage_sub) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_battle_delay_damage_sub) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_battle_blewcount_bonus) (struct map_session_data **sd, uint16 *skill_id); +typedef int (*HPMHOOK_post_battle_blewcount_bonus) (int retVal___, struct map_session_data *sd, uint16 skill_id); +typedef int (*HPMHOOK_pre_battle_range_type) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_battle_range_type) (int retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv); +typedef int64 (*HPMHOOK_pre_battle_calc_base_damage) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int *nk, bool *n_ele, short *s_ele, short *s_ele_, int *type, int *flag, int *flag2); +typedef int64 (*HPMHOOK_post_battle_calc_base_damage) (int64 retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int nk, bool n_ele, short s_ele, short s_ele_, int type, int flag, int flag2); +typedef int64 (*HPMHOOK_pre_battle_calc_base_damage2) (struct status_data **st, struct weapon_atk **wa, struct status_change **sc, unsigned short *t_size, struct map_session_data **sd, int *flag); +typedef int64 (*HPMHOOK_post_battle_calc_base_damage2) (int64 retVal___, struct status_data *st, struct weapon_atk *wa, struct status_change *sc, unsigned short t_size, struct map_session_data *sd, int flag); +typedef struct Damage (*HPMHOOK_pre_battle_calc_misc_attack) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *mflag); +typedef struct Damage (*HPMHOOK_post_battle_calc_misc_attack) (struct Damage retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int mflag); +typedef struct Damage (*HPMHOOK_pre_battle_calc_magic_attack) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *mflag); +typedef struct Damage (*HPMHOOK_post_battle_calc_magic_attack) (struct Damage retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int mflag); +typedef int (*HPMHOOK_pre_battle_adjust_skill_damage) (int *m, unsigned short *skill_id); +typedef int (*HPMHOOK_post_battle_adjust_skill_damage) (int retVal___, int m, unsigned short skill_id); +typedef int64 (*HPMHOOK_pre_battle_add_mastery) (struct map_session_data **sd, struct block_list **target, int64 *dmg, int *type); +typedef int64 (*HPMHOOK_post_battle_add_mastery) (int64 retVal___, struct map_session_data *sd, struct block_list *target, int64 dmg, int type); +typedef int (*HPMHOOK_pre_battle_calc_drain) (int64 *damage, int *rate, int *per); +typedef int (*HPMHOOK_post_battle_calc_drain) (int retVal___, int64 damage, int rate, int per); +typedef int (*HPMHOOK_pre_battle_config_read) (const char **cfgName); +typedef int (*HPMHOOK_post_battle_config_read) (int retVal___, const char *cfgName); +typedef void (*HPMHOOK_pre_battle_config_set_defaults) (void); +typedef void (*HPMHOOK_post_battle_config_set_defaults) (void); +typedef int (*HPMHOOK_pre_battle_config_set_value) (const char **w1, const char **w2); +typedef int (*HPMHOOK_post_battle_config_set_value) (int retVal___, const char *w1, const char *w2); +typedef bool (*HPMHOOK_pre_battle_config_get_value) (const char **w1, int **value); +typedef bool (*HPMHOOK_post_battle_config_get_value) (bool retVal___, const char *w1, int *value); +typedef void (*HPMHOOK_pre_battle_config_adjust) (void); +typedef void (*HPMHOOK_post_battle_config_adjust) (void); +typedef struct block_list* (*HPMHOOK_pre_battle_get_enemy_area) (struct block_list **src, int *x, int *y, int *range, int *type, int *ignore_id); +typedef struct block_list* (*HPMHOOK_post_battle_get_enemy_area) (struct block_list* retVal___, struct block_list *src, int x, int y, int range, int type, int ignore_id); +typedef int (*HPMHOOK_pre_battle_damage_area) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_battle_damage_area) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_battle_calc_masteryfix_unknown) (struct block_list **src, struct block_list **target, uint16 **skill_id, uint16 **skill_lv, int64 **damage, int **div, bool **left, bool **weapon); +typedef void (*HPMHOOK_post_battle_calc_masteryfix_unknown) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *div, bool *left, bool *weapon); +typedef void (*HPMHOOK_pre_battle_calc_skillratio_magic_unknown) (int **attack_type, struct block_list **src, struct block_list **target, uint16 **skill_id, uint16 **skill_lv, int **skillratio, int **flag); +typedef void (*HPMHOOK_post_battle_calc_skillratio_magic_unknown) (int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag); +typedef void (*HPMHOOK_pre_battle_calc_skillratio_weapon_unknown) (int **attack_type, struct block_list **src, struct block_list **target, uint16 **skill_id, uint16 **skill_lv, int **skillratio, int **flag); +typedef void (*HPMHOOK_post_battle_calc_skillratio_weapon_unknown) (int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag); +typedef void (*HPMHOOK_pre_battle_calc_misc_attack_unknown) (struct block_list **src, struct block_list **target, uint16 **skill_id, uint16 **skill_lv, int **mflag, struct Damage **md); +typedef void (*HPMHOOK_post_battle_calc_misc_attack_unknown) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *mflag, struct Damage *md); +#endif // MAP_BATTLE_H +#ifdef MAP_BATTLEGROUND_H /* bg */ +typedef void (*HPMHOOK_pre_bg_init) (bool *minimal); +typedef void (*HPMHOOK_post_bg_init) (bool minimal); +typedef void (*HPMHOOK_pre_bg_final) (void); +typedef void (*HPMHOOK_post_bg_final) (void); +typedef struct bg_arena* (*HPMHOOK_pre_bg_name2arena) (const char **name); +typedef struct bg_arena* (*HPMHOOK_post_bg_name2arena) (struct bg_arena* retVal___, const char *name); +typedef void (*HPMHOOK_pre_bg_queue_add) (struct map_session_data **sd, struct bg_arena **arena, enum bg_queue_types *type); +typedef void (*HPMHOOK_post_bg_queue_add) (struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types type); +typedef enum BATTLEGROUNDS_QUEUE_ACK (*HPMHOOK_pre_bg_can_queue) (struct map_session_data **sd, struct bg_arena **arena, enum bg_queue_types *type); +typedef enum BATTLEGROUNDS_QUEUE_ACK (*HPMHOOK_post_bg_can_queue) (enum BATTLEGROUNDS_QUEUE_ACK retVal___, struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types type); +typedef int (*HPMHOOK_pre_bg_id2pos) (int *queue_id, int *account_id); +typedef int (*HPMHOOK_post_bg_id2pos) (int retVal___, int queue_id, int account_id); +typedef void (*HPMHOOK_pre_bg_queue_pc_cleanup) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_bg_queue_pc_cleanup) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_bg_begin) (struct bg_arena **arena); +typedef void (*HPMHOOK_post_bg_begin) (struct bg_arena *arena); +typedef int (*HPMHOOK_pre_bg_begin_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_bg_begin_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_bg_queue_pregame) (struct bg_arena **arena); +typedef void (*HPMHOOK_post_bg_queue_pregame) (struct bg_arena *arena); +typedef int (*HPMHOOK_pre_bg_fillup_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_bg_fillup_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_bg_queue_ready_ack) (struct bg_arena **arena, struct map_session_data **sd, bool *response); +typedef void (*HPMHOOK_post_bg_queue_ready_ack) (struct bg_arena *arena, struct map_session_data *sd, bool response); +typedef void (*HPMHOOK_pre_bg_match_over) (struct bg_arena **arena, bool *canceled); +typedef void (*HPMHOOK_post_bg_match_over) (struct bg_arena *arena, bool canceled); +typedef void (*HPMHOOK_pre_bg_queue_check) (struct bg_arena **arena); +typedef void (*HPMHOOK_post_bg_queue_check) (struct bg_arena *arena); +typedef struct battleground_data* (*HPMHOOK_pre_bg_team_search) (int *bg_id); +typedef struct battleground_data* (*HPMHOOK_post_bg_team_search) (struct battleground_data* retVal___, int bg_id); +typedef struct map_session_data* (*HPMHOOK_pre_bg_getavailablesd) (struct battleground_data **bgd); +typedef struct map_session_data* (*HPMHOOK_post_bg_getavailablesd) (struct map_session_data* retVal___, struct battleground_data *bgd); +typedef bool (*HPMHOOK_pre_bg_team_delete) (int *bg_id); +typedef bool (*HPMHOOK_post_bg_team_delete) (bool retVal___, int bg_id); +typedef bool (*HPMHOOK_pre_bg_team_warp) (int *bg_id, unsigned short *map_index, short *x, short *y); +typedef bool (*HPMHOOK_post_bg_team_warp) (bool retVal___, int bg_id, unsigned short map_index, short x, short y); +typedef void (*HPMHOOK_pre_bg_send_dot_remove) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_bg_send_dot_remove) (struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_bg_team_join) (int *bg_id, struct map_session_data **sd); +typedef bool (*HPMHOOK_post_bg_team_join) (bool retVal___, int bg_id, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_bg_team_leave) (struct map_session_data **sd, enum bg_team_leave_type *flag); +typedef int (*HPMHOOK_post_bg_team_leave) (int retVal___, struct map_session_data *sd, enum bg_team_leave_type flag); +typedef bool (*HPMHOOK_pre_bg_member_respawn) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_bg_member_respawn) (bool retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_bg_create) (unsigned short *map_index, short *rx, short *ry, const char **ev, const char **dev); +typedef int (*HPMHOOK_post_bg_create) (int retVal___, unsigned short map_index, short rx, short ry, const char *ev, const char *dev); +typedef int (*HPMHOOK_pre_bg_team_get_id) (struct block_list **bl); +typedef int (*HPMHOOK_post_bg_team_get_id) (int retVal___, struct block_list *bl); +typedef bool (*HPMHOOK_pre_bg_send_message) (struct map_session_data **sd, const char **mes); +typedef bool (*HPMHOOK_post_bg_send_message) (bool retVal___, struct map_session_data *sd, const char *mes); +typedef int (*HPMHOOK_pre_bg_send_xy_timer_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_bg_send_xy_timer_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_bg_send_xy_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_bg_send_xy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_bg_afk_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_bg_afk_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_bg_team_db_final) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_bg_team_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef enum bg_queue_types (*HPMHOOK_pre_bg_str2teamtype) (const char **str); +typedef enum bg_queue_types (*HPMHOOK_post_bg_str2teamtype) (enum bg_queue_types retVal___, const char *str); +typedef void (*HPMHOOK_pre_bg_config_read) (void); +typedef void (*HPMHOOK_post_bg_config_read) (void); +#endif // MAP_BATTLEGROUND_H +#ifdef MAP_BUYINGSTORE_H /* buyingstore */ +typedef bool (*HPMHOOK_pre_buyingstore_setup) (struct map_session_data **sd, unsigned char *slots); +typedef bool (*HPMHOOK_post_buyingstore_setup) (bool retVal___, struct map_session_data *sd, unsigned char slots); +typedef void (*HPMHOOK_pre_buyingstore_create) (struct map_session_data **sd, int *zenylimit, unsigned char *result, const char **storename, const uint8 **itemlist, unsigned int *count); +typedef void (*HPMHOOK_post_buyingstore_create) (struct map_session_data *sd, int zenylimit, unsigned char result, const char *storename, const uint8 *itemlist, unsigned int count); +typedef void (*HPMHOOK_pre_buyingstore_close) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_buyingstore_close) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_buyingstore_open) (struct map_session_data **sd, int *account_id); +typedef void (*HPMHOOK_post_buyingstore_open) (struct map_session_data *sd, int account_id); +typedef void (*HPMHOOK_pre_buyingstore_trade) (struct map_session_data **sd, int *account_id, unsigned int *buyer_id, const uint8 **itemlist, unsigned int *count); +typedef void (*HPMHOOK_post_buyingstore_trade) (struct map_session_data *sd, int account_id, unsigned int buyer_id, const uint8 *itemlist, unsigned int count); +typedef bool (*HPMHOOK_pre_buyingstore_search) (struct map_session_data **sd, unsigned short *nameid); +typedef bool (*HPMHOOK_post_buyingstore_search) (bool retVal___, struct map_session_data *sd, unsigned short nameid); +typedef bool (*HPMHOOK_pre_buyingstore_searchall) (struct map_session_data **sd, const struct s_search_store_search **s); +typedef bool (*HPMHOOK_post_buyingstore_searchall) (bool retVal___, struct map_session_data *sd, const struct s_search_store_search *s); +typedef unsigned int (*HPMHOOK_pre_buyingstore_getuid) (void); +typedef unsigned int (*HPMHOOK_post_buyingstore_getuid) (unsigned int retVal___); +#endif // MAP_BUYINGSTORE_H +#ifdef MAP_CHANNEL_H /* channel */ +typedef int (*HPMHOOK_pre_channel_init) (bool *minimal); +typedef int (*HPMHOOK_post_channel_init) (int retVal___, bool minimal); +typedef void (*HPMHOOK_pre_channel_final) (void); +typedef void (*HPMHOOK_post_channel_final) (void); +typedef struct channel_data* (*HPMHOOK_pre_channel_search) (const char **name, struct map_session_data **sd); +typedef struct channel_data* (*HPMHOOK_post_channel_search) (struct channel_data* retVal___, const char *name, struct map_session_data *sd); +typedef struct channel_data* (*HPMHOOK_pre_channel_create) (enum channel_types *type, const char **name, unsigned char *color); +typedef struct channel_data* (*HPMHOOK_post_channel_create) (struct channel_data* retVal___, enum channel_types type, const char *name, unsigned char color); +typedef void (*HPMHOOK_pre_channel_delete) (struct channel_data **chan); +typedef void (*HPMHOOK_post_channel_delete) (struct channel_data *chan); +typedef void (*HPMHOOK_pre_channel_set_password) (struct channel_data **chan, const char **password); +typedef void (*HPMHOOK_post_channel_set_password) (struct channel_data *chan, const char *password); +typedef enum channel_operation_status (*HPMHOOK_pre_channel_ban) (struct channel_data **chan, const struct map_session_data **ssd, struct map_session_data **tsd); +typedef enum channel_operation_status (*HPMHOOK_post_channel_ban) (enum channel_operation_status retVal___, struct channel_data *chan, const struct map_session_data *ssd, struct map_session_data *tsd); +typedef enum channel_operation_status (*HPMHOOK_pre_channel_unban) (struct channel_data **chan, const struct map_session_data **ssd, struct map_session_data **tsd); +typedef enum channel_operation_status (*HPMHOOK_post_channel_unban) (enum channel_operation_status retVal___, struct channel_data *chan, const struct map_session_data *ssd, struct map_session_data *tsd); +typedef void (*HPMHOOK_pre_channel_set_options) (struct channel_data **chan, unsigned int *options); +typedef void (*HPMHOOK_post_channel_set_options) (struct channel_data *chan, unsigned int options); +typedef void (*HPMHOOK_pre_channel_send) (struct channel_data **chan, struct map_session_data **sd, const char **msg); +typedef void (*HPMHOOK_post_channel_send) (struct channel_data *chan, struct map_session_data *sd, const char *msg); +typedef void (*HPMHOOK_pre_channel_join_sub) (struct channel_data **chan, struct map_session_data **sd, bool *stealth); +typedef void (*HPMHOOK_post_channel_join_sub) (struct channel_data *chan, struct map_session_data *sd, bool stealth); +typedef enum channel_operation_status (*HPMHOOK_pre_channel_join) (struct channel_data **chan, struct map_session_data **sd, const char **password, bool *silent); +typedef enum channel_operation_status (*HPMHOOK_post_channel_join) (enum channel_operation_status retVal___, struct channel_data *chan, struct map_session_data *sd, const char *password, bool silent); +typedef void (*HPMHOOK_pre_channel_leave) (struct channel_data **chan, struct map_session_data **sd); +typedef void (*HPMHOOK_post_channel_leave) (struct channel_data *chan, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_channel_leave_sub) (struct channel_data **chan, struct map_session_data **sd); +typedef void (*HPMHOOK_post_channel_leave_sub) (struct channel_data *chan, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_channel_quit) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_channel_quit) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_channel_map_join) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_channel_map_join) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_channel_guild_join_alliance) (const struct guild **g_source, const struct guild **g_ally); +typedef void (*HPMHOOK_post_channel_guild_join_alliance) (const struct guild *g_source, const struct guild *g_ally); +typedef void (*HPMHOOK_pre_channel_guild_leave_alliance) (const struct guild **g_source, const struct guild **g_ally); +typedef void (*HPMHOOK_post_channel_guild_leave_alliance) (const struct guild *g_source, const struct guild *g_ally); +typedef void (*HPMHOOK_pre_channel_quit_guild) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_channel_quit_guild) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_channel_irc_join) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_channel_irc_join) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_channel_config_read) (void); +typedef void (*HPMHOOK_post_channel_config_read) (void); +#endif // MAP_CHANNEL_H +#ifdef CHAR_CHAR_H /* chr */ +typedef int (*HPMHOOK_pre_chr_waiting_disconnect) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_chr_waiting_disconnect) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_chr_delete_char_sql) (int *char_id); +typedef int (*HPMHOOK_post_chr_delete_char_sql) (int retVal___, int char_id); +typedef struct DBData (*HPMHOOK_pre_chr_create_online_char_data) (union DBKey *key, va_list args); +typedef struct DBData (*HPMHOOK_post_chr_create_online_char_data) (struct DBData retVal___, union DBKey key, va_list args); +typedef void (*HPMHOOK_pre_chr_set_account_online) (int *account_id); +typedef void (*HPMHOOK_post_chr_set_account_online) (int account_id); +typedef void (*HPMHOOK_pre_chr_set_account_offline) (int *account_id); +typedef void (*HPMHOOK_post_chr_set_account_offline) (int account_id); +typedef void (*HPMHOOK_pre_chr_set_char_charselect) (int *account_id); +typedef void (*HPMHOOK_post_chr_set_char_charselect) (int account_id); +typedef void (*HPMHOOK_pre_chr_set_char_online) (int *map_id, int *char_id, int *account_id); +typedef void (*HPMHOOK_post_chr_set_char_online) (int map_id, int char_id, int account_id); +typedef void (*HPMHOOK_pre_chr_set_char_offline) (int *char_id, int *account_id); +typedef void (*HPMHOOK_post_chr_set_char_offline) (int char_id, int account_id); +typedef int (*HPMHOOK_pre_chr_db_setoffline) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_chr_db_setoffline) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_chr_db_kickoffline) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_chr_db_kickoffline) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_chr_set_login_all_offline) (void); +typedef void (*HPMHOOK_post_chr_set_login_all_offline) (void); +typedef void (*HPMHOOK_pre_chr_set_all_offline) (int *id); +typedef void (*HPMHOOK_post_chr_set_all_offline) (int id); +typedef void (*HPMHOOK_pre_chr_set_all_offline_sql) (void); +typedef void (*HPMHOOK_post_chr_set_all_offline_sql) (void); +typedef struct DBData (*HPMHOOK_pre_chr_create_charstatus) (union DBKey *key, va_list args); +typedef struct DBData (*HPMHOOK_post_chr_create_charstatus) (struct DBData retVal___, union DBKey key, va_list args); +typedef int (*HPMHOOK_pre_chr_mmo_char_tosql) (int *char_id, struct mmo_charstatus **p); +typedef int (*HPMHOOK_post_chr_mmo_char_tosql) (int retVal___, int char_id, struct mmo_charstatus *p); +typedef int (*HPMHOOK_pre_chr_memitemdata_to_sql) (const struct item *items[], int *max, int *id, int *tableswitch); +typedef int (*HPMHOOK_post_chr_memitemdata_to_sql) (int retVal___, const struct item items[], int max, int id, int tableswitch); +typedef int (*HPMHOOK_pre_chr_mmo_gender) (const struct char_session_data **sd, const struct mmo_charstatus **p, char *sex); +typedef int (*HPMHOOK_post_chr_mmo_gender) (int retVal___, const struct char_session_data *sd, const struct mmo_charstatus *p, char sex); +typedef int (*HPMHOOK_pre_chr_mmo_chars_fromsql) (struct char_session_data **sd, uint8 **buf); +typedef int (*HPMHOOK_post_chr_mmo_chars_fromsql) (int retVal___, struct char_session_data *sd, uint8 *buf); +typedef int (*HPMHOOK_pre_chr_mmo_char_fromsql) (int *char_id, struct mmo_charstatus **p, bool *load_everything); +typedef int (*HPMHOOK_post_chr_mmo_char_fromsql) (int retVal___, int char_id, struct mmo_charstatus *p, bool load_everything); +typedef int (*HPMHOOK_pre_chr_mmo_char_sql_init) (void); +typedef int (*HPMHOOK_post_chr_mmo_char_sql_init) (int retVal___); +typedef bool (*HPMHOOK_pre_chr_char_slotchange) (struct char_session_data **sd, int *fd, unsigned short *from, unsigned short *to); +typedef bool (*HPMHOOK_post_chr_char_slotchange) (bool retVal___, struct char_session_data *sd, int fd, unsigned short from, unsigned short to); +typedef int (*HPMHOOK_pre_chr_rename_char_sql) (struct char_session_data **sd, int *char_id); +typedef int (*HPMHOOK_post_chr_rename_char_sql) (int retVal___, struct char_session_data *sd, int char_id); +typedef int (*HPMHOOK_pre_chr_check_char_name) (char **name, char **esc_name); +typedef int (*HPMHOOK_post_chr_check_char_name) (int retVal___, char *name, char *esc_name); +typedef int (*HPMHOOK_pre_chr_make_new_char_sql) (struct char_session_data **sd, const char **name_, int *str, int *agi, int *vit, int *int_, int *dex, int *luk, int *slot, int *hair_color, int *hair_style); +typedef int (*HPMHOOK_post_chr_make_new_char_sql) (int retVal___, struct char_session_data *sd, const char *name_, int str, int agi, int vit, int int_, int dex, int luk, int slot, int hair_color, int hair_style); +typedef int (*HPMHOOK_pre_chr_divorce_char_sql) (int *partner_id1, int *partner_id2); +typedef int (*HPMHOOK_post_chr_divorce_char_sql) (int retVal___, int partner_id1, int partner_id2); +typedef int (*HPMHOOK_pre_chr_count_users) (void); +typedef int (*HPMHOOK_post_chr_count_users) (int retVal___); +typedef int (*HPMHOOK_pre_chr_mmo_char_tobuf) (uint8 **buffer, struct mmo_charstatus **p); +typedef int (*HPMHOOK_post_chr_mmo_char_tobuf) (int retVal___, uint8 *buffer, struct mmo_charstatus *p); +typedef void (*HPMHOOK_pre_chr_mmo_char_send099d) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_mmo_char_send099d) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_mmo_char_send_ban_list) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_mmo_char_send_ban_list) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_mmo_char_send_slots_info) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_mmo_char_send_slots_info) (int fd, struct char_session_data *sd); +typedef int (*HPMHOOK_pre_chr_mmo_char_send_characters) (int *fd, struct char_session_data **sd); +typedef int (*HPMHOOK_post_chr_mmo_char_send_characters) (int retVal___, int fd, struct char_session_data *sd); +typedef int (*HPMHOOK_pre_chr_char_married) (int *pl1, int *pl2); +typedef int (*HPMHOOK_post_chr_char_married) (int retVal___, int pl1, int pl2); +typedef int (*HPMHOOK_pre_chr_char_child) (int *parent_id, int *child_id); +typedef int (*HPMHOOK_post_chr_char_child) (int retVal___, int parent_id, int child_id); +typedef int (*HPMHOOK_pre_chr_char_family) (int *cid1, int *cid2, int *cid3); +typedef int (*HPMHOOK_post_chr_char_family) (int retVal___, int cid1, int cid2, int cid3); +typedef void (*HPMHOOK_pre_chr_disconnect_player) (int *account_id); +typedef void (*HPMHOOK_post_chr_disconnect_player) (int account_id); +typedef void (*HPMHOOK_pre_chr_authfail_fd) (int *fd, int *type); +typedef void (*HPMHOOK_post_chr_authfail_fd) (int fd, int type); +typedef void (*HPMHOOK_pre_chr_request_account_data) (int *account_id); +typedef void (*HPMHOOK_post_chr_request_account_data) (int account_id); +typedef void (*HPMHOOK_pre_chr_auth_ok) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_auth_ok) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_ping_login_server) (int *fd); +typedef void (*HPMHOOK_post_chr_ping_login_server) (int fd); +typedef int (*HPMHOOK_pre_chr_parse_fromlogin_connection_state) (int *fd); +typedef int (*HPMHOOK_post_chr_parse_fromlogin_connection_state) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_chr_auth_error) (int *fd, unsigned char *flag); +typedef void (*HPMHOOK_post_chr_auth_error) (int fd, unsigned char flag); +typedef void (*HPMHOOK_pre_chr_parse_fromlogin_auth_state) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_fromlogin_auth_state) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_fromlogin_account_data) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_fromlogin_account_data) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_fromlogin_login_pong) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_fromlogin_login_pong) (int fd); +typedef void (*HPMHOOK_pre_chr_changesex) (int *account_id, int *sex); +typedef void (*HPMHOOK_post_chr_changesex) (int account_id, int sex); +typedef int (*HPMHOOK_pre_chr_parse_fromlogin_changesex_reply) (int *fd); +typedef int (*HPMHOOK_post_chr_parse_fromlogin_changesex_reply) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_chr_parse_fromlogin_account_reg2) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_fromlogin_account_reg2) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_fromlogin_ban) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_fromlogin_ban) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_fromlogin_kick) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_fromlogin_kick) (int fd); +typedef void (*HPMHOOK_pre_chr_update_ip) (int *fd); +typedef void (*HPMHOOK_post_chr_update_ip) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_fromlogin_update_ip) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_fromlogin_update_ip) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_fromlogin_accinfo2_failed) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_fromlogin_accinfo2_failed) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_fromlogin_accinfo2_ok) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_fromlogin_accinfo2_ok) (int fd); +typedef int (*HPMHOOK_pre_chr_parse_fromlogin) (int *fd); +typedef int (*HPMHOOK_post_chr_parse_fromlogin) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_chr_request_accreg2) (int *account_id, int *char_id); +typedef int (*HPMHOOK_post_chr_request_accreg2) (int retVal___, int account_id, int char_id); +typedef void (*HPMHOOK_pre_chr_global_accreg_to_login_start) (int *account_id, int *char_id); +typedef void (*HPMHOOK_post_chr_global_accreg_to_login_start) (int account_id, int char_id); +typedef void (*HPMHOOK_pre_chr_global_accreg_to_login_send) (void); +typedef void (*HPMHOOK_post_chr_global_accreg_to_login_send) (void); +typedef void (*HPMHOOK_pre_chr_global_accreg_to_login_add) (const char **key, unsigned int *index, intptr_t *val, bool *is_string); +typedef void (*HPMHOOK_post_chr_global_accreg_to_login_add) (const char *key, unsigned int index, intptr_t val, bool is_string); +typedef void (*HPMHOOK_pre_chr_read_fame_list) (void); +typedef void (*HPMHOOK_post_chr_read_fame_list) (void); +typedef int (*HPMHOOK_pre_chr_send_fame_list) (int *fd); +typedef int (*HPMHOOK_post_chr_send_fame_list) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_chr_update_fame_list) (int *type, int *index, int *fame); +typedef void (*HPMHOOK_post_chr_update_fame_list) (int type, int index, int fame); +typedef int (*HPMHOOK_pre_chr_loadName) (int *char_id, char **name); +typedef int (*HPMHOOK_post_chr_loadName) (int retVal___, int char_id, char *name); +typedef void (*HPMHOOK_pre_chr_parse_frommap_datasync) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_datasync) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_skillid2idx) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_skillid2idx) (int fd); +typedef void (*HPMHOOK_pre_chr_map_received_ok) (int *fd); +typedef void (*HPMHOOK_post_chr_map_received_ok) (int fd); +typedef void (*HPMHOOK_pre_chr_send_maps) (int *fd, int *id, int *j); +typedef void (*HPMHOOK_post_chr_send_maps) (int fd, int id, int j); +typedef void (*HPMHOOK_pre_chr_parse_frommap_map_names) (int *fd, int *id); +typedef void (*HPMHOOK_post_chr_parse_frommap_map_names) (int fd, int id); +typedef void (*HPMHOOK_pre_chr_send_scdata) (int *fd, int *aid, int *cid); +typedef void (*HPMHOOK_post_chr_send_scdata) (int fd, int aid, int cid); +typedef void (*HPMHOOK_pre_chr_parse_frommap_request_scdata) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_request_scdata) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_set_users_count) (int *fd, int *id); +typedef void (*HPMHOOK_post_chr_parse_frommap_set_users_count) (int fd, int id); +typedef void (*HPMHOOK_pre_chr_parse_frommap_set_users) (int *fd, int *id); +typedef void (*HPMHOOK_post_chr_parse_frommap_set_users) (int fd, int id); +typedef void (*HPMHOOK_pre_chr_save_character_ack) (int *fd, int *aid, int *cid); +typedef void (*HPMHOOK_post_chr_save_character_ack) (int fd, int aid, int cid); +typedef void (*HPMHOOK_pre_chr_parse_frommap_save_character) (int *fd, int *id); +typedef void (*HPMHOOK_post_chr_parse_frommap_save_character) (int fd, int id); +typedef void (*HPMHOOK_pre_chr_select_ack) (int *fd, int *account_id, uint8 *flag); +typedef void (*HPMHOOK_post_chr_select_ack) (int fd, int account_id, uint8 flag); +typedef void (*HPMHOOK_pre_chr_parse_frommap_char_select_req) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_char_select_req) (int fd); +typedef void (*HPMHOOK_pre_chr_change_map_server_ack) (int *fd, const uint8 **data, bool *ok); +typedef void (*HPMHOOK_post_chr_change_map_server_ack) (int fd, const uint8 *data, bool ok); +typedef void (*HPMHOOK_pre_chr_parse_frommap_change_map_server) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_change_map_server) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_remove_friend) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_remove_friend) (int fd); +typedef void (*HPMHOOK_pre_chr_char_name_ack) (int *fd, int *char_id); +typedef void (*HPMHOOK_post_chr_char_name_ack) (int fd, int char_id); +typedef void (*HPMHOOK_pre_chr_parse_frommap_char_name_request) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_char_name_request) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_change_email) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_change_email) (int fd); +typedef void (*HPMHOOK_pre_chr_ban) (int *account_id, int *char_id, time_t **unban_time, short *year, short *month, short *day, short *hour, short *minute, short *second); +typedef void (*HPMHOOK_post_chr_ban) (int account_id, int char_id, time_t *unban_time, short year, short month, short day, short hour, short minute, short second); +typedef void (*HPMHOOK_pre_chr_unban) (int *char_id, int **result); +typedef void (*HPMHOOK_post_chr_unban) (int char_id, int *result); +typedef void (*HPMHOOK_pre_chr_ask_name_ack) (int *fd, int *acc, const char **name, int *type, int *result); +typedef void (*HPMHOOK_post_chr_ask_name_ack) (int fd, int acc, const char *name, int type, int result); +typedef int (*HPMHOOK_pre_chr_changecharsex) (int *char_id, int *sex); +typedef int (*HPMHOOK_post_chr_changecharsex) (int retVal___, int char_id, int sex); +typedef void (*HPMHOOK_pre_chr_parse_frommap_change_account) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_change_account) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_fame_list) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_fame_list) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_divorce_char) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_divorce_char) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_ragsrvinfo) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_ragsrvinfo) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_set_char_offline) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_set_char_offline) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_set_all_offline) (int *fd, int *id); +typedef void (*HPMHOOK_post_chr_parse_frommap_set_all_offline) (int fd, int id); +typedef void (*HPMHOOK_pre_chr_parse_frommap_set_char_online) (int *fd, int *id); +typedef void (*HPMHOOK_post_chr_parse_frommap_set_char_online) (int fd, int id); +typedef void (*HPMHOOK_pre_chr_parse_frommap_build_fame_list) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_build_fame_list) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_save_status_change_data) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_save_status_change_data) (int fd); +typedef void (*HPMHOOK_pre_chr_send_pong) (int *fd); +typedef void (*HPMHOOK_post_chr_send_pong) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_ping) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_ping) (int fd); +typedef void (*HPMHOOK_pre_chr_map_auth_ok) (int *fd, int *account_id, struct char_auth_node **node, struct mmo_charstatus **cd); +typedef void (*HPMHOOK_post_chr_map_auth_ok) (int fd, int account_id, struct char_auth_node *node, struct mmo_charstatus *cd); +typedef void (*HPMHOOK_pre_chr_map_auth_failed) (int *fd, int *account_id, int *char_id, int *login_id1, char *sex, uint32 *ip); +typedef void (*HPMHOOK_post_chr_map_auth_failed) (int fd, int account_id, int char_id, int login_id1, char sex, uint32 ip); +typedef void (*HPMHOOK_pre_chr_parse_frommap_auth_request) (int *fd, int *id); +typedef void (*HPMHOOK_post_chr_parse_frommap_auth_request) (int fd, int id); +typedef void (*HPMHOOK_pre_chr_parse_frommap_update_ip) (int *fd, int *id); +typedef void (*HPMHOOK_post_chr_parse_frommap_update_ip) (int fd, int id); +typedef void (*HPMHOOK_pre_chr_parse_frommap_request_stats_report) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_request_stats_report) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_scdata_update) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_scdata_update) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_frommap_scdata_delete) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_frommap_scdata_delete) (int fd); +typedef int (*HPMHOOK_pre_chr_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_chr_parse_frommap) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_chr_search_mapserver) (unsigned short *map, uint32 *ip, uint16 *port); +typedef int (*HPMHOOK_post_chr_search_mapserver) (int retVal___, unsigned short map, uint32 ip, uint16 port); +typedef int (*HPMHOOK_pre_chr_mapif_init) (int *fd); +typedef int (*HPMHOOK_post_chr_mapif_init) (int retVal___, int fd); +typedef uint32 (*HPMHOOK_pre_chr_lan_subnet_check) (uint32 *ip); +typedef uint32 (*HPMHOOK_post_chr_lan_subnet_check) (uint32 retVal___, uint32 ip); +typedef void (*HPMHOOK_pre_chr_delete2_ack) (int *fd, int *char_id, uint32 *result, time_t *delete_date); +typedef void (*HPMHOOK_post_chr_delete2_ack) (int fd, int char_id, uint32 result, time_t delete_date); +typedef void (*HPMHOOK_pre_chr_delete2_accept_actual_ack) (int *fd, int *char_id, uint32 *result); +typedef void (*HPMHOOK_post_chr_delete2_accept_actual_ack) (int fd, int char_id, uint32 result); +typedef void (*HPMHOOK_pre_chr_delete2_accept_ack) (int *fd, int *char_id, uint32 *result); +typedef void (*HPMHOOK_post_chr_delete2_accept_ack) (int fd, int char_id, uint32 result); +typedef void (*HPMHOOK_pre_chr_delete2_cancel_ack) (int *fd, int *char_id, uint32 *result); +typedef void (*HPMHOOK_post_chr_delete2_cancel_ack) (int fd, int char_id, uint32 result); +typedef void (*HPMHOOK_pre_chr_delete2_req) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_delete2_req) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_delete2_accept) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_delete2_accept) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_delete2_cancel) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_delete2_cancel) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_send_account_id) (int *fd, int *account_id); +typedef void (*HPMHOOK_post_chr_send_account_id) (int fd, int account_id); +typedef void (*HPMHOOK_pre_chr_parse_char_connect) (int *fd, struct char_session_data **sd, uint32 *ipl); +typedef void (*HPMHOOK_post_chr_parse_char_connect) (int fd, struct char_session_data *sd, uint32 ipl); +typedef void (*HPMHOOK_pre_chr_send_map_info) (int *fd, int *i, uint32 *subnet_map_ip, struct mmo_charstatus **cd); +typedef void (*HPMHOOK_post_chr_send_map_info) (int fd, int i, uint32 subnet_map_ip, struct mmo_charstatus *cd); +typedef void (*HPMHOOK_pre_chr_send_wait_char_server) (int *fd); +typedef void (*HPMHOOK_post_chr_send_wait_char_server) (int fd); +typedef int (*HPMHOOK_pre_chr_search_default_maps_mapserver) (struct mmo_charstatus **cd); +typedef int (*HPMHOOK_post_chr_search_default_maps_mapserver) (int retVal___, struct mmo_charstatus *cd); +typedef void (*HPMHOOK_pre_chr_parse_char_select) (int *fd, struct char_session_data **sd, uint32 *ipl); +typedef void (*HPMHOOK_post_chr_parse_char_select) (int fd, struct char_session_data *sd, uint32 ipl); +typedef void (*HPMHOOK_pre_chr_creation_failed) (int *fd, int *result); +typedef void (*HPMHOOK_post_chr_creation_failed) (int fd, int result); +typedef void (*HPMHOOK_pre_chr_creation_ok) (int *fd, struct mmo_charstatus **char_dat); +typedef void (*HPMHOOK_post_chr_creation_ok) (int fd, struct mmo_charstatus *char_dat); +typedef void (*HPMHOOK_pre_chr_parse_char_create_new_char) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_create_new_char) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_delete_char_failed) (int *fd, int *flag); +typedef void (*HPMHOOK_post_chr_delete_char_failed) (int fd, int flag); +typedef void (*HPMHOOK_pre_chr_delete_char_ok) (int *fd); +typedef void (*HPMHOOK_post_chr_delete_char_ok) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_char_delete_char) (int *fd, struct char_session_data **sd, unsigned short *cmd); +typedef void (*HPMHOOK_post_chr_parse_char_delete_char) (int fd, struct char_session_data *sd, unsigned short cmd); +typedef void (*HPMHOOK_pre_chr_parse_char_ping) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_char_ping) (int fd); +typedef void (*HPMHOOK_pre_chr_allow_rename) (int *fd, int *flag); +typedef void (*HPMHOOK_post_chr_allow_rename) (int fd, int flag); +typedef void (*HPMHOOK_pre_chr_parse_char_rename_char) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_rename_char) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_parse_char_rename_char2) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_rename_char2) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_rename_char_ack) (int *fd, int *flag); +typedef void (*HPMHOOK_post_chr_rename_char_ack) (int fd, int flag); +typedef void (*HPMHOOK_pre_chr_parse_char_rename_char_confirm) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_rename_char_confirm) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_captcha_notsupported) (int *fd); +typedef void (*HPMHOOK_post_chr_captcha_notsupported) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_char_request_captcha) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_char_request_captcha) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_char_check_captcha) (int *fd); +typedef void (*HPMHOOK_post_chr_parse_char_check_captcha) (int fd); +typedef void (*HPMHOOK_pre_chr_parse_char_delete2_req) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_delete2_req) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_parse_char_delete2_accept) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_delete2_accept) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_parse_char_delete2_cancel) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_delete2_cancel) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_login_map_server_ack) (int *fd, uint8 *flag); +typedef void (*HPMHOOK_post_chr_login_map_server_ack) (int fd, uint8 flag); +typedef void (*HPMHOOK_pre_chr_parse_char_login_map_server) (int *fd, uint32 *ipl); +typedef void (*HPMHOOK_post_chr_parse_char_login_map_server) (int fd, uint32 ipl); +typedef void (*HPMHOOK_pre_chr_parse_char_pincode_check) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_pincode_check) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_parse_char_pincode_window) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_pincode_window) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_parse_char_pincode_change) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_pincode_change) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_parse_char_pincode_first_pin) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_pincode_first_pin) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_parse_char_request_chars) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_request_chars) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_chr_change_character_slot_ack) (int *fd, bool *ret); +typedef void (*HPMHOOK_post_chr_change_character_slot_ack) (int fd, bool ret); +typedef void (*HPMHOOK_pre_chr_parse_char_move_character) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_chr_parse_char_move_character) (int fd, struct char_session_data *sd); +typedef int (*HPMHOOK_pre_chr_parse_char_unknown_packet) (int *fd, uint32 *ipl); +typedef int (*HPMHOOK_post_chr_parse_char_unknown_packet) (int retVal___, int fd, uint32 ipl); +typedef int (*HPMHOOK_pre_chr_parse_char) (int *fd); +typedef int (*HPMHOOK_post_chr_parse_char) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_chr_broadcast_user_count) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_chr_broadcast_user_count) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_chr_send_accounts_tologin_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_chr_send_accounts_tologin_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_chr_send_accounts_tologin) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_chr_send_accounts_tologin) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_chr_check_connect_login_server) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_chr_check_connect_login_server) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_chr_online_data_cleanup_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_chr_online_data_cleanup_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_chr_online_data_cleanup) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_chr_online_data_cleanup) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_chr_sql_config_read) (const char **cfgName); +typedef void (*HPMHOOK_post_chr_sql_config_read) (const char *cfgName); +typedef void (*HPMHOOK_pre_chr_config_dispatch) (char **w1, char **w2); +typedef void (*HPMHOOK_post_chr_config_dispatch) (char *w1, char *w2); +typedef int (*HPMHOOK_pre_chr_config_read) (const char **cfgName); +typedef int (*HPMHOOK_post_chr_config_read) (int retVal___, const char *cfgName); +#endif // CHAR_CHAR_H +#ifdef MAP_CHAT_H /* chat */ +typedef bool (*HPMHOOK_pre_chat_create_pc_chat) (struct map_session_data **sd, const char **title, const char **pass, int *limit, bool *pub); +typedef bool (*HPMHOOK_post_chat_create_pc_chat) (bool retVal___, struct map_session_data *sd, const char *title, const char *pass, int limit, bool pub); +typedef bool (*HPMHOOK_pre_chat_join) (struct map_session_data **sd, int *chatid, const char **pass); +typedef bool (*HPMHOOK_post_chat_join) (bool retVal___, struct map_session_data *sd, int chatid, const char *pass); +typedef int (*HPMHOOK_pre_chat_leave) (struct map_session_data **sd, bool *kicked); +typedef int (*HPMHOOK_post_chat_leave) (int retVal___, struct map_session_data *sd, bool kicked); +typedef bool (*HPMHOOK_pre_chat_change_owner) (struct map_session_data **sd, const char **nextownername); +typedef bool (*HPMHOOK_post_chat_change_owner) (bool retVal___, struct map_session_data *sd, const char *nextownername); +typedef bool (*HPMHOOK_pre_chat_change_status) (struct map_session_data **sd, const char **title, const char **pass, int *limit, bool *pub); +typedef bool (*HPMHOOK_post_chat_change_status) (bool retVal___, struct map_session_data *sd, const char *title, const char *pass, int limit, bool pub); +typedef bool (*HPMHOOK_pre_chat_kick) (struct map_session_data **sd, const char **kickusername); +typedef bool (*HPMHOOK_post_chat_kick) (bool retVal___, struct map_session_data *sd, const char *kickusername); +typedef bool (*HPMHOOK_pre_chat_create_npc_chat) (struct npc_data **nd, const char **title, int *limit, bool *pub, int *trigger, const char **ev, int *zeny, int *minLvl, int *maxLvl); +typedef bool (*HPMHOOK_post_chat_create_npc_chat) (bool retVal___, struct npc_data *nd, const char *title, int limit, bool pub, int trigger, const char *ev, int zeny, int minLvl, int maxLvl); +typedef bool (*HPMHOOK_pre_chat_delete_npc_chat) (struct npc_data **nd); +typedef bool (*HPMHOOK_post_chat_delete_npc_chat) (bool retVal___, struct npc_data *nd); +typedef bool (*HPMHOOK_pre_chat_enable_event) (struct chat_data **cd); +typedef bool (*HPMHOOK_post_chat_enable_event) (bool retVal___, struct chat_data *cd); +typedef bool (*HPMHOOK_pre_chat_disable_event) (struct chat_data **cd); +typedef bool (*HPMHOOK_post_chat_disable_event) (bool retVal___, struct chat_data *cd); +typedef bool (*HPMHOOK_pre_chat_npc_kick_all) (struct chat_data **cd); +typedef bool (*HPMHOOK_post_chat_npc_kick_all) (bool retVal___, struct chat_data *cd); +typedef bool (*HPMHOOK_pre_chat_trigger_event) (struct chat_data **cd); +typedef bool (*HPMHOOK_post_chat_trigger_event) (bool retVal___, struct chat_data *cd); +typedef struct chat_data* (*HPMHOOK_pre_chat_create) (struct block_list **bl, const char **title, const char **pass, int *limit, bool *pub, int *trigger, const char **ev, int *zeny, int *minLvl, int *maxLvl); +typedef struct chat_data* (*HPMHOOK_post_chat_create) (struct chat_data* retVal___, struct block_list *bl, const char *title, const char *pass, int limit, bool pub, int trigger, const char *ev, int zeny, int minLvl, int maxLvl); +#endif // MAP_CHAT_H +#ifdef MAP_CHRIF_H /* chrif */ +typedef void (*HPMHOOK_pre_chrif_init) (bool *minimal); +typedef void (*HPMHOOK_post_chrif_init) (bool minimal); +typedef void (*HPMHOOK_pre_chrif_final) (void); +typedef void (*HPMHOOK_post_chrif_final) (void); +typedef void (*HPMHOOK_pre_chrif_setuserid) (char **id); +typedef void (*HPMHOOK_post_chrif_setuserid) (char *id); +typedef void (*HPMHOOK_pre_chrif_setpasswd) (char **pwd); +typedef void (*HPMHOOK_post_chrif_setpasswd) (char *pwd); +typedef void (*HPMHOOK_pre_chrif_checkdefaultlogin) (void); +typedef void (*HPMHOOK_post_chrif_checkdefaultlogin) (void); +typedef bool (*HPMHOOK_pre_chrif_setip) (const char **ip); +typedef bool (*HPMHOOK_post_chrif_setip) (bool retVal___, const char *ip); +typedef void (*HPMHOOK_pre_chrif_setport) (uint16 *port); +typedef void (*HPMHOOK_post_chrif_setport) (uint16 port); +typedef int (*HPMHOOK_pre_chrif_isconnected) (void); +typedef int (*HPMHOOK_post_chrif_isconnected) (int retVal___); +typedef void (*HPMHOOK_pre_chrif_check_shutdown) (void); +typedef void (*HPMHOOK_post_chrif_check_shutdown) (void); +typedef struct auth_node* (*HPMHOOK_pre_chrif_search) (int *account_id); +typedef struct auth_node* (*HPMHOOK_post_chrif_search) (struct auth_node* retVal___, int account_id); +typedef struct auth_node* (*HPMHOOK_pre_chrif_auth_check) (int *account_id, int *char_id, enum sd_state *state); +typedef struct auth_node* (*HPMHOOK_post_chrif_auth_check) (struct auth_node* retVal___, int account_id, int char_id, enum sd_state state); +typedef bool (*HPMHOOK_pre_chrif_auth_delete) (int *account_id, int *char_id, enum sd_state *state); +typedef bool (*HPMHOOK_post_chrif_auth_delete) (bool retVal___, int account_id, int char_id, enum sd_state state); +typedef bool (*HPMHOOK_pre_chrif_auth_finished) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_chrif_auth_finished) (bool retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_chrif_authreq) (struct map_session_data **sd, bool *hstandalone); +typedef void (*HPMHOOK_post_chrif_authreq) (struct map_session_data *sd, bool hstandalone); +typedef void (*HPMHOOK_pre_chrif_authok) (int *fd); +typedef void (*HPMHOOK_post_chrif_authok) (int fd); +typedef bool (*HPMHOOK_pre_chrif_scdata_request) (int *account_id, int *char_id); +typedef bool (*HPMHOOK_post_chrif_scdata_request) (bool retVal___, int account_id, int char_id); +typedef bool (*HPMHOOK_pre_chrif_save) (struct map_session_data **sd, int *flag); +typedef bool (*HPMHOOK_post_chrif_save) (bool retVal___, struct map_session_data *sd, int flag); +typedef bool (*HPMHOOK_pre_chrif_charselectreq) (struct map_session_data **sd, uint32 *s_ip); +typedef bool (*HPMHOOK_post_chrif_charselectreq) (bool retVal___, struct map_session_data *sd, uint32 s_ip); +typedef bool (*HPMHOOK_pre_chrif_changemapserver) (struct map_session_data **sd, uint32 *ip, uint16 *port); +typedef bool (*HPMHOOK_post_chrif_changemapserver) (bool retVal___, struct map_session_data *sd, uint32 ip, uint16 port); +typedef bool (*HPMHOOK_pre_chrif_searchcharid) (int *char_id); +typedef bool (*HPMHOOK_post_chrif_searchcharid) (bool retVal___, int char_id); +typedef bool (*HPMHOOK_pre_chrif_changeemail) (int *id, const char **actual_email, const char **new_email); +typedef bool (*HPMHOOK_post_chrif_changeemail) (bool retVal___, int id, const char *actual_email, const char *new_email); +typedef bool (*HPMHOOK_pre_chrif_char_ask_name) (int *acc, const char **character_name, unsigned short *operation_type, int *year, int *month, int *day, int *hour, int *minute, int *second); +typedef bool (*HPMHOOK_post_chrif_char_ask_name) (bool retVal___, int acc, const char *character_name, unsigned short operation_type, int year, int month, int day, int hour, int minute, int second); +typedef int (*HPMHOOK_pre_chrif_updatefamelist) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_chrif_updatefamelist) (int retVal___, struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_chrif_buildfamelist) (void); +typedef bool (*HPMHOOK_post_chrif_buildfamelist) (bool retVal___); +typedef bool (*HPMHOOK_pre_chrif_save_scdata) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_chrif_save_scdata) (bool retVal___, struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_chrif_ragsrvinfo) (int *base_rate, int *job_rate, int *drop_rate); +typedef bool (*HPMHOOK_post_chrif_ragsrvinfo) (bool retVal___, int base_rate, int job_rate, int drop_rate); +typedef bool (*HPMHOOK_pre_chrif_char_offline_nsd) (int *account_id, int *char_id); +typedef bool (*HPMHOOK_post_chrif_char_offline_nsd) (bool retVal___, int account_id, int char_id); +typedef bool (*HPMHOOK_pre_chrif_char_reset_offline) (void); +typedef bool (*HPMHOOK_post_chrif_char_reset_offline) (bool retVal___); +typedef bool (*HPMHOOK_pre_chrif_send_users_tochar) (void); +typedef bool (*HPMHOOK_post_chrif_send_users_tochar) (bool retVal___); +typedef bool (*HPMHOOK_pre_chrif_char_online) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_chrif_char_online) (bool retVal___, struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_chrif_changesex) (struct map_session_data **sd, bool *change_account); +typedef bool (*HPMHOOK_post_chrif_changesex) (bool retVal___, struct map_session_data *sd, bool change_account); +typedef bool (*HPMHOOK_pre_chrif_divorce) (int *partner_id1, int *partner_id2); +typedef bool (*HPMHOOK_post_chrif_divorce) (bool retVal___, int partner_id1, int partner_id2); +typedef bool (*HPMHOOK_pre_chrif_removefriend) (int *char_id, int *friend_id); +typedef bool (*HPMHOOK_post_chrif_removefriend) (bool retVal___, int char_id, int friend_id); +typedef void (*HPMHOOK_pre_chrif_send_report) (char **buf, int *len); +typedef void (*HPMHOOK_post_chrif_send_report) (char *buf, int len); +typedef bool (*HPMHOOK_pre_chrif_flush) (void); +typedef bool (*HPMHOOK_post_chrif_flush) (bool retVal___); +typedef void (*HPMHOOK_pre_chrif_skillid2idx) (int *fd); +typedef void (*HPMHOOK_post_chrif_skillid2idx) (int fd); +typedef bool (*HPMHOOK_pre_chrif_sd_to_auth) (struct map_session_data **sd, enum sd_state *state); +typedef bool (*HPMHOOK_post_chrif_sd_to_auth) (bool retVal___, struct map_session_data *sd, enum sd_state state); +typedef int (*HPMHOOK_pre_chrif_check_connect_char_server) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_chrif_check_connect_char_server) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef bool (*HPMHOOK_pre_chrif_auth_logout) (struct map_session_data **sd, enum sd_state *state); +typedef bool (*HPMHOOK_post_chrif_auth_logout) (bool retVal___, struct map_session_data *sd, enum sd_state state); +typedef void (*HPMHOOK_pre_chrif_save_ack) (int *fd); +typedef void (*HPMHOOK_post_chrif_save_ack) (int fd); +typedef int (*HPMHOOK_pre_chrif_reconnect) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_chrif_reconnect) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_chrif_auth_db_cleanup_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_chrif_auth_db_cleanup_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef bool (*HPMHOOK_pre_chrif_char_ask_name_answer) (int *acc, const char **player_name, uint16 *type, uint16 *answer); +typedef bool (*HPMHOOK_post_chrif_char_ask_name_answer) (bool retVal___, int acc, const char *player_name, uint16 type, uint16 answer); +typedef int (*HPMHOOK_pre_chrif_auth_db_final) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_chrif_auth_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_chrif_send_usercount_tochar) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_chrif_send_usercount_tochar) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_chrif_auth_db_cleanup) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_chrif_auth_db_cleanup) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_chrif_connect) (int *fd); +typedef void (*HPMHOOK_post_chrif_connect) (int fd); +typedef void (*HPMHOOK_pre_chrif_connectack) (int *fd); +typedef void (*HPMHOOK_post_chrif_connectack) (int fd); +typedef void (*HPMHOOK_pre_chrif_sendmap) (int *fd); +typedef void (*HPMHOOK_post_chrif_sendmap) (int fd); +typedef void (*HPMHOOK_pre_chrif_sendmapack) (int *fd); +typedef void (*HPMHOOK_post_chrif_sendmapack) (int fd); +typedef void (*HPMHOOK_pre_chrif_recvmap) (int *fd); +typedef void (*HPMHOOK_post_chrif_recvmap) (int fd); +typedef bool (*HPMHOOK_pre_chrif_changemapserverack) (int *account_id, int *login_id1, int *login_id2, int *char_id, short *map_index, short *x, short *y, uint32 *ip, uint16 *port); +typedef bool (*HPMHOOK_post_chrif_changemapserverack) (bool retVal___, int account_id, int login_id1, int login_id2, int char_id, short map_index, short x, short y, uint32 ip, uint16 port); +typedef void (*HPMHOOK_pre_chrif_changedsex) (int *fd); +typedef void (*HPMHOOK_post_chrif_changedsex) (int fd); +typedef bool (*HPMHOOK_pre_chrif_divorceack) (int *char_id, int *partner_id); +typedef bool (*HPMHOOK_post_chrif_divorceack) (bool retVal___, int char_id, int partner_id); +typedef void (*HPMHOOK_pre_chrif_idbanned) (int *fd); +typedef void (*HPMHOOK_post_chrif_idbanned) (int fd); +typedef void (*HPMHOOK_pre_chrif_recvfamelist) (int *fd); +typedef void (*HPMHOOK_post_chrif_recvfamelist) (int fd); +typedef bool (*HPMHOOK_pre_chrif_load_scdata) (int *fd); +typedef bool (*HPMHOOK_post_chrif_load_scdata) (bool retVal___, int fd); +typedef void (*HPMHOOK_pre_chrif_update_ip) (int *fd); +typedef void (*HPMHOOK_post_chrif_update_ip) (int fd); +typedef int (*HPMHOOK_pre_chrif_disconnectplayer) (int *fd); +typedef int (*HPMHOOK_post_chrif_disconnectplayer) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_chrif_removemap) (int *fd); +typedef void (*HPMHOOK_post_chrif_removemap) (int fd); +typedef int (*HPMHOOK_pre_chrif_updatefamelist_ack) (int *fd); +typedef int (*HPMHOOK_post_chrif_updatefamelist_ack) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_chrif_keepalive) (int *fd); +typedef void (*HPMHOOK_post_chrif_keepalive) (int fd); +typedef void (*HPMHOOK_pre_chrif_keepalive_ack) (int *fd); +typedef void (*HPMHOOK_post_chrif_keepalive_ack) (int fd); +typedef void (*HPMHOOK_pre_chrif_deadopt) (int *father_id, int *mother_id, int *child_id); +typedef void (*HPMHOOK_post_chrif_deadopt) (int father_id, int mother_id, int child_id); +typedef void (*HPMHOOK_pre_chrif_authfail) (int *fd); +typedef void (*HPMHOOK_post_chrif_authfail) (int fd); +typedef void (*HPMHOOK_pre_chrif_on_ready) (void); +typedef void (*HPMHOOK_post_chrif_on_ready) (void); +typedef void (*HPMHOOK_pre_chrif_on_disconnect) (void); +typedef void (*HPMHOOK_post_chrif_on_disconnect) (void); +typedef int (*HPMHOOK_pre_chrif_parse) (int *fd); +typedef int (*HPMHOOK_post_chrif_parse) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_chrif_save_scdata_single) (int *account_id, int *char_id, short *type, struct status_change_entry **sce); +typedef void (*HPMHOOK_post_chrif_save_scdata_single) (int account_id, int char_id, short type, struct status_change_entry *sce); +typedef void (*HPMHOOK_pre_chrif_del_scdata_single) (int *account_id, int *char_id, short *type); +typedef void (*HPMHOOK_post_chrif_del_scdata_single) (int account_id, int char_id, short type); +#endif // MAP_CHRIF_H +#ifdef MAP_CLIF_H /* clif */ +typedef int (*HPMHOOK_pre_clif_init) (bool *minimal); +typedef int (*HPMHOOK_post_clif_init) (int retVal___, bool minimal); +typedef void (*HPMHOOK_pre_clif_final) (void); +typedef void (*HPMHOOK_post_clif_final) (void); +typedef bool (*HPMHOOK_pre_clif_setip) (const char **ip); +typedef bool (*HPMHOOK_post_clif_setip) (bool retVal___, const char *ip); +typedef bool (*HPMHOOK_pre_clif_setbindip) (const char **ip); +typedef bool (*HPMHOOK_post_clif_setbindip) (bool retVal___, const char *ip); +typedef void (*HPMHOOK_pre_clif_setport) (uint16 *port); +typedef void (*HPMHOOK_post_clif_setport) (uint16 port); +typedef uint32 (*HPMHOOK_pre_clif_refresh_ip) (void); +typedef uint32 (*HPMHOOK_post_clif_refresh_ip) (uint32 retVal___); +typedef bool (*HPMHOOK_pre_clif_send) (const void **buf, int *len, struct block_list **bl, enum send_target *type); +typedef bool (*HPMHOOK_post_clif_send) (bool retVal___, const void *buf, int len, struct block_list *bl, enum send_target type); +typedef int (*HPMHOOK_pre_clif_send_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_clif_send_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_clif_send_actual) (int *fd, void **buf, int *len); +typedef int (*HPMHOOK_post_clif_send_actual) (int retVal___, int fd, void *buf, int len); +typedef int (*HPMHOOK_pre_clif_parse) (int *fd); +typedef int (*HPMHOOK_post_clif_parse) (int retVal___, int fd); +typedef const struct s_packet_db* (*HPMHOOK_pre_clif_packet) (int *packet_id); +typedef const struct s_packet_db* (*HPMHOOK_post_clif_packet) (const struct s_packet_db* retVal___, int packet_id); +typedef unsigned short (*HPMHOOK_pre_clif_parse_cmd) (int *fd, struct map_session_data **sd); +typedef unsigned short (*HPMHOOK_post_clif_parse_cmd) (unsigned short retVal___, int fd, struct map_session_data *sd); +typedef unsigned short (*HPMHOOK_pre_clif_decrypt_cmd) (int *cmd, struct map_session_data **sd); +typedef unsigned short (*HPMHOOK_post_clif_decrypt_cmd) (unsigned short retVal___, int cmd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_authok) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_authok) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_authrefuse) (int *fd, uint8 *error_code); +typedef void (*HPMHOOK_post_clif_authrefuse) (int fd, uint8 error_code); +typedef void (*HPMHOOK_pre_clif_authfail_fd) (int *fd, int *type); +typedef void (*HPMHOOK_post_clif_authfail_fd) (int fd, int type); +typedef void (*HPMHOOK_pre_clif_charselectok) (int *id, uint8 *ok); +typedef void (*HPMHOOK_post_clif_charselectok) (int id, uint8 ok); +typedef void (*HPMHOOK_pre_clif_dropflooritem) (struct flooritem_data **fitem); +typedef void (*HPMHOOK_post_clif_dropflooritem) (struct flooritem_data *fitem); +typedef void (*HPMHOOK_pre_clif_clearflooritem) (struct flooritem_data **fitem, int *fd); +typedef void (*HPMHOOK_post_clif_clearflooritem) (struct flooritem_data *fitem, int fd); +typedef void (*HPMHOOK_pre_clif_additem) (struct map_session_data **sd, int *n, int *amount, int *fail); +typedef void (*HPMHOOK_post_clif_additem) (struct map_session_data *sd, int n, int amount, int fail); +typedef void (*HPMHOOK_pre_clif_dropitem) (struct map_session_data **sd, int *n, int *amount); +typedef void (*HPMHOOK_post_clif_dropitem) (struct map_session_data *sd, int n, int amount); +typedef void (*HPMHOOK_pre_clif_delitem) (struct map_session_data **sd, int *n, int *amount, short *reason); +typedef void (*HPMHOOK_post_clif_delitem) (struct map_session_data *sd, int n, int amount, short reason); +typedef void (*HPMHOOK_pre_clif_takeitem) (struct block_list **src, struct block_list **dst); +typedef void (*HPMHOOK_post_clif_takeitem) (struct block_list *src, struct block_list *dst); +typedef void (*HPMHOOK_pre_clif_item_equip) (short *idx, struct EQUIPITEM_INFO **p, struct item **i, struct item_data **id, int *eqp_pos); +typedef void (*HPMHOOK_post_clif_item_equip) (short idx, struct EQUIPITEM_INFO *p, struct item *i, struct item_data *id, int eqp_pos); +typedef void (*HPMHOOK_pre_clif_item_normal) (short *idx, struct NORMALITEM_INFO **p, struct item **i, struct item_data **id); +typedef void (*HPMHOOK_post_clif_item_normal) (short idx, struct NORMALITEM_INFO *p, struct item *i, struct item_data *id); +typedef void (*HPMHOOK_pre_clif_arrowequip) (struct map_session_data **sd, int *val); +typedef void (*HPMHOOK_post_clif_arrowequip) (struct map_session_data *sd, int val); +typedef void (*HPMHOOK_pre_clif_arrow_fail) (struct map_session_data **sd, int *type); +typedef void (*HPMHOOK_post_clif_arrow_fail) (struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_clif_use_card) (struct map_session_data **sd, int *idx); +typedef void (*HPMHOOK_post_clif_use_card) (struct map_session_data *sd, int idx); +typedef void (*HPMHOOK_pre_clif_cart_additem) (struct map_session_data **sd, int *n, int *amount, int *fail); +typedef void (*HPMHOOK_post_clif_cart_additem) (struct map_session_data *sd, int n, int amount, int fail); +typedef void (*HPMHOOK_pre_clif_cart_delitem) (struct map_session_data **sd, int *n, int *amount); +typedef void (*HPMHOOK_post_clif_cart_delitem) (struct map_session_data *sd, int n, int amount); +typedef void (*HPMHOOK_pre_clif_equipitemack) (struct map_session_data **sd, int *n, int *pos, enum e_EQUIP_ITEM_ACK *result); +typedef void (*HPMHOOK_post_clif_equipitemack) (struct map_session_data *sd, int n, int pos, enum e_EQUIP_ITEM_ACK result); +typedef void (*HPMHOOK_pre_clif_unequipitemack) (struct map_session_data **sd, int *n, int *pos, enum e_UNEQUIP_ITEM_ACK *result); +typedef void (*HPMHOOK_post_clif_unequipitemack) (struct map_session_data *sd, int n, int pos, enum e_UNEQUIP_ITEM_ACK result); +typedef void (*HPMHOOK_pre_clif_useitemack) (struct map_session_data **sd, int *index, int *amount, bool *ok); +typedef void (*HPMHOOK_post_clif_useitemack) (struct map_session_data *sd, int index, int amount, bool ok); +typedef void (*HPMHOOK_pre_clif_addcards) (unsigned char **buf, struct item **item); +typedef void (*HPMHOOK_post_clif_addcards) (unsigned char *buf, struct item *item); +typedef void (*HPMHOOK_pre_clif_addcards2) (unsigned short **cards, struct item **item); +typedef void (*HPMHOOK_post_clif_addcards2) (unsigned short *cards, struct item *item); +typedef void (*HPMHOOK_pre_clif_item_sub) (unsigned char **buf, int *n, struct item **i, struct item_data **id, int *equip); +typedef void (*HPMHOOK_post_clif_item_sub) (unsigned char *buf, int n, struct item *i, struct item_data *id, int equip); +typedef void (*HPMHOOK_pre_clif_getareachar_item) (struct map_session_data **sd, struct flooritem_data **fitem); +typedef void (*HPMHOOK_post_clif_getareachar_item) (struct map_session_data *sd, struct flooritem_data *fitem); +typedef void (*HPMHOOK_pre_clif_cart_additem_ack) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_cart_additem_ack) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_cashshop_load) (void); +typedef void (*HPMHOOK_post_clif_cashshop_load) (void); +typedef void (*HPMHOOK_pre_clif_package_announce) (struct map_session_data **sd, unsigned short *nameid, unsigned short *containerid); +typedef void (*HPMHOOK_post_clif_package_announce) (struct map_session_data *sd, unsigned short nameid, unsigned short containerid); +typedef void (*HPMHOOK_pre_clif_item_drop_announce) (struct map_session_data **sd, unsigned short *nameid, char **monsterName); +typedef void (*HPMHOOK_post_clif_item_drop_announce) (struct map_session_data *sd, unsigned short nameid, char *monsterName); +typedef void (*HPMHOOK_pre_clif_clearunit_single) (int *id, clr_type *type, int *fd); +typedef void (*HPMHOOK_post_clif_clearunit_single) (int id, clr_type type, int fd); +typedef void (*HPMHOOK_pre_clif_clearunit_area) (struct block_list **bl, clr_type *type); +typedef void (*HPMHOOK_post_clif_clearunit_area) (struct block_list *bl, clr_type type); +typedef void (*HPMHOOK_pre_clif_clearunit_delayed) (struct block_list **bl, clr_type *type, int64 *tick); +typedef void (*HPMHOOK_post_clif_clearunit_delayed) (struct block_list *bl, clr_type type, int64 tick); +typedef void (*HPMHOOK_pre_clif_walkok) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_walkok) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_move) (struct unit_data **ud); +typedef void (*HPMHOOK_post_clif_move) (struct unit_data *ud); +typedef void (*HPMHOOK_pre_clif_move2) (struct block_list **bl, struct view_data **vd, struct unit_data **ud); +typedef void (*HPMHOOK_post_clif_move2) (struct block_list *bl, struct view_data *vd, struct unit_data *ud); +typedef void (*HPMHOOK_pre_clif_blown) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_blown) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_slide) (struct block_list **bl, int *x, int *y); +typedef void (*HPMHOOK_post_clif_slide) (struct block_list *bl, int x, int y); +typedef void (*HPMHOOK_pre_clif_fixpos) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_fixpos) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_changelook) (struct block_list **bl, int *type, int *val); +typedef void (*HPMHOOK_post_clif_changelook) (struct block_list *bl, int type, int val); +typedef void (*HPMHOOK_pre_clif_changetraplook) (struct block_list **bl, int *val); +typedef void (*HPMHOOK_post_clif_changetraplook) (struct block_list *bl, int val); +typedef void (*HPMHOOK_pre_clif_refreshlook) (struct block_list **bl, int *id, int *type, int *val, enum send_target *target); +typedef void (*HPMHOOK_post_clif_refreshlook) (struct block_list *bl, int id, int type, int val, enum send_target target); +typedef void (*HPMHOOK_pre_clif_sendlook) (struct block_list **bl, int *id, int *type, int *val, int *val2, enum send_target *target); +typedef void (*HPMHOOK_post_clif_sendlook) (struct block_list *bl, int id, int type, int val, int val2, enum send_target target); +typedef void (*HPMHOOK_pre_clif_class_change) (struct block_list **bl, int *class_, int *type); +typedef void (*HPMHOOK_post_clif_class_change) (struct block_list *bl, int class_, int type); +typedef void (*HPMHOOK_pre_clif_skill_delunit) (struct skill_unit **su); +typedef void (*HPMHOOK_post_clif_skill_delunit) (struct skill_unit *su); +typedef void (*HPMHOOK_pre_clif_skillunit_update) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_skillunit_update) (struct block_list *bl); +typedef int (*HPMHOOK_pre_clif_clearunit_delayed_sub) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_clif_clearunit_delayed_sub) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_clif_set_unit_idle) (struct block_list **bl, struct map_session_data **tsd, enum send_target *target); +typedef void (*HPMHOOK_post_clif_set_unit_idle) (struct block_list *bl, struct map_session_data *tsd, enum send_target target); +typedef void (*HPMHOOK_pre_clif_spawn_unit) (struct block_list **bl, enum send_target *target); +typedef void (*HPMHOOK_post_clif_spawn_unit) (struct block_list *bl, enum send_target target); +typedef void (*HPMHOOK_pre_clif_spawn_unit2) (struct block_list **bl, enum send_target *target); +typedef void (*HPMHOOK_post_clif_spawn_unit2) (struct block_list *bl, enum send_target target); +typedef void (*HPMHOOK_pre_clif_set_unit_idle2) (struct block_list **bl, struct map_session_data **tsd, enum send_target *target); +typedef void (*HPMHOOK_post_clif_set_unit_idle2) (struct block_list *bl, struct map_session_data *tsd, enum send_target target); +typedef void (*HPMHOOK_pre_clif_set_unit_walking) (struct block_list **bl, struct map_session_data **tsd, struct unit_data **ud, enum send_target *target); +typedef void (*HPMHOOK_post_clif_set_unit_walking) (struct block_list *bl, struct map_session_data *tsd, struct unit_data *ud, enum send_target target); +typedef int (*HPMHOOK_pre_clif_calc_walkdelay) (struct block_list **bl, int *delay, int *type, int *damage, int *div_); +typedef int (*HPMHOOK_post_clif_calc_walkdelay) (int retVal___, struct block_list *bl, int delay, int type, int damage, int div_); +typedef void (*HPMHOOK_pre_clif_getareachar_skillunit) (struct block_list **bl, struct skill_unit **su, enum send_target *target); +typedef void (*HPMHOOK_post_clif_getareachar_skillunit) (struct block_list *bl, struct skill_unit *su, enum send_target target); +typedef void (*HPMHOOK_pre_clif_getareachar_unit) (struct map_session_data **sd, struct block_list **bl); +typedef void (*HPMHOOK_post_clif_getareachar_unit) (struct map_session_data *sd, struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_clearchar_skillunit) (struct skill_unit **su, int *fd); +typedef void (*HPMHOOK_post_clif_clearchar_skillunit) (struct skill_unit *su, int fd); +typedef int (*HPMHOOK_pre_clif_getareachar) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_clif_getareachar) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_clif_graffiti_entry) (struct block_list **bl, struct skill_unit **su, enum send_target *target); +typedef void (*HPMHOOK_post_clif_graffiti_entry) (struct block_list *bl, struct skill_unit *su, enum send_target target); +typedef bool (*HPMHOOK_pre_clif_spawn) (struct block_list **bl); +typedef bool (*HPMHOOK_post_clif_spawn) (bool retVal___, struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_changemap) (struct map_session_data **sd, short *m, int *x, int *y); +typedef void (*HPMHOOK_post_clif_changemap) (struct map_session_data *sd, short m, int x, int y); +typedef void (*HPMHOOK_pre_clif_changemapcell) (int *fd, int16 *m, int *x, int *y, int *type, enum send_target *target); +typedef void (*HPMHOOK_post_clif_changemapcell) (int fd, int16 m, int x, int y, int type, enum send_target target); +typedef void (*HPMHOOK_pre_clif_map_property) (struct map_session_data **sd, enum map_property *property); +typedef void (*HPMHOOK_post_clif_map_property) (struct map_session_data *sd, enum map_property property); +typedef void (*HPMHOOK_pre_clif_pvpset) (struct map_session_data **sd, int *pvprank, int *pvpnum, int *type); +typedef void (*HPMHOOK_post_clif_pvpset) (struct map_session_data *sd, int pvprank, int pvpnum, int type); +typedef void (*HPMHOOK_pre_clif_map_property_mapall) (int *mapid, enum map_property *property); +typedef void (*HPMHOOK_post_clif_map_property_mapall) (int mapid, enum map_property property); +typedef void (*HPMHOOK_pre_clif_bossmapinfo) (int *fd, struct mob_data **md, short *flag); +typedef void (*HPMHOOK_post_clif_bossmapinfo) (int fd, struct mob_data *md, short flag); +typedef void (*HPMHOOK_pre_clif_map_type) (struct map_session_data **sd, enum map_type *type); +typedef void (*HPMHOOK_post_clif_map_type) (struct map_session_data *sd, enum map_type type); +typedef void (*HPMHOOK_pre_clif_maptypeproperty2) (struct block_list **bl, enum send_target *t); +typedef void (*HPMHOOK_post_clif_maptypeproperty2) (struct block_list *bl, enum send_target t); +typedef void (*HPMHOOK_pre_clif_changemapserver) (struct map_session_data **sd, unsigned short *map_index, int *x, int *y, uint32 *ip, uint16 *port); +typedef void (*HPMHOOK_post_clif_changemapserver) (struct map_session_data *sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port); +typedef void (*HPMHOOK_pre_clif_npcbuysell) (struct map_session_data **sd, int *id); +typedef void (*HPMHOOK_post_clif_npcbuysell) (struct map_session_data *sd, int id); +typedef void (*HPMHOOK_pre_clif_buylist) (struct map_session_data **sd, struct npc_data **nd); +typedef void (*HPMHOOK_post_clif_buylist) (struct map_session_data *sd, struct npc_data *nd); +typedef void (*HPMHOOK_pre_clif_selllist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_selllist) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_cashshop_show) (struct map_session_data **sd, struct npc_data **nd); +typedef void (*HPMHOOK_post_clif_cashshop_show) (struct map_session_data *sd, struct npc_data *nd); +typedef void (*HPMHOOK_pre_clif_npc_buy_result) (struct map_session_data **sd, unsigned char *result); +typedef void (*HPMHOOK_post_clif_npc_buy_result) (struct map_session_data *sd, unsigned char result); +typedef void (*HPMHOOK_pre_clif_npc_sell_result) (struct map_session_data **sd, unsigned char *result); +typedef void (*HPMHOOK_post_clif_npc_sell_result) (struct map_session_data *sd, unsigned char result); +typedef void (*HPMHOOK_pre_clif_cashshop_ack) (struct map_session_data **sd, int *error); +typedef void (*HPMHOOK_post_clif_cashshop_ack) (struct map_session_data *sd, int error); +typedef void (*HPMHOOK_pre_clif_scriptmes) (struct map_session_data **sd, int *npcid, const char **mes); +typedef void (*HPMHOOK_post_clif_scriptmes) (struct map_session_data *sd, int npcid, const char *mes); +typedef void (*HPMHOOK_pre_clif_scriptnext) (struct map_session_data **sd, int *npcid); +typedef void (*HPMHOOK_post_clif_scriptnext) (struct map_session_data *sd, int npcid); +typedef void (*HPMHOOK_pre_clif_scriptclose) (struct map_session_data **sd, int *npcid); +typedef void (*HPMHOOK_post_clif_scriptclose) (struct map_session_data *sd, int npcid); +typedef void (*HPMHOOK_pre_clif_scriptmenu) (struct map_session_data **sd, int *npcid, const char **mes); +typedef void (*HPMHOOK_post_clif_scriptmenu) (struct map_session_data *sd, int npcid, const char *mes); +typedef void (*HPMHOOK_pre_clif_scriptinput) (struct map_session_data **sd, int *npcid); +typedef void (*HPMHOOK_post_clif_scriptinput) (struct map_session_data *sd, int npcid); +typedef void (*HPMHOOK_pre_clif_scriptinputstr) (struct map_session_data **sd, int *npcid); +typedef void (*HPMHOOK_post_clif_scriptinputstr) (struct map_session_data *sd, int npcid); +typedef void (*HPMHOOK_pre_clif_cutin) (struct map_session_data **sd, const char **image, int *type); +typedef void (*HPMHOOK_post_clif_cutin) (struct map_session_data *sd, const char *image, int type); +typedef void (*HPMHOOK_pre_clif_sendfakenpc) (struct map_session_data **sd, int *npcid); +typedef void (*HPMHOOK_post_clif_sendfakenpc) (struct map_session_data *sd, int npcid); +typedef void (*HPMHOOK_pre_clif_scriptclear) (struct map_session_data **sd, int *npcid); +typedef void (*HPMHOOK_post_clif_scriptclear) (struct map_session_data *sd, int npcid); +typedef void (*HPMHOOK_pre_clif_viewpoint) (struct map_session_data **sd, int *npc_id, int *type, int *x, int *y, int *id, int *color); +typedef void (*HPMHOOK_post_clif_viewpoint) (struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color); +typedef int (*HPMHOOK_pre_clif_damage) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); +typedef int (*HPMHOOK_post_clif_damage) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2); +typedef void (*HPMHOOK_pre_clif_sitting) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_sitting) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_standing) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_standing) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_arrow_create_list) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_arrow_create_list) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_refresh_storagewindow) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_refresh_storagewindow) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_refresh) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_refresh) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_fame_blacksmith) (struct map_session_data **sd, int *points); +typedef void (*HPMHOOK_post_clif_fame_blacksmith) (struct map_session_data *sd, int points); +typedef void (*HPMHOOK_pre_clif_fame_alchemist) (struct map_session_data **sd, int *points); +typedef void (*HPMHOOK_post_clif_fame_alchemist) (struct map_session_data *sd, int points); +typedef void (*HPMHOOK_pre_clif_fame_taekwon) (struct map_session_data **sd, int *points); +typedef void (*HPMHOOK_post_clif_fame_taekwon) (struct map_session_data *sd, int points); +typedef void (*HPMHOOK_pre_clif_ranklist) (struct map_session_data **sd, enum fame_list_type *type); +typedef void (*HPMHOOK_post_clif_ranklist) (struct map_session_data *sd, enum fame_list_type type); +typedef void (*HPMHOOK_pre_clif_update_rankingpoint) (struct map_session_data **sd, enum fame_list_type *type, int *points); +typedef void (*HPMHOOK_post_clif_update_rankingpoint) (struct map_session_data *sd, enum fame_list_type type, int points); +typedef void (*HPMHOOK_pre_clif_pRanklist) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRanklist) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_hotkeys) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_hotkeys) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_clif_insight) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_clif_insight) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_clif_outsight) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_clif_outsight) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_clif_skillcastcancel) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_skillcastcancel) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_skill_fail) (struct map_session_data **sd, uint16 *skill_id, enum useskill_fail_cause *cause, int *btype); +typedef void (*HPMHOOK_post_clif_skill_fail) (struct map_session_data *sd, uint16 skill_id, enum useskill_fail_cause cause, int btype); +typedef void (*HPMHOOK_pre_clif_skill_cooldown) (struct map_session_data **sd, uint16 *skill_id, unsigned int *duration); +typedef void (*HPMHOOK_post_clif_skill_cooldown) (struct map_session_data *sd, uint16 skill_id, unsigned int duration); +typedef void (*HPMHOOK_pre_clif_skill_memomessage) (struct map_session_data **sd, int *type); +typedef void (*HPMHOOK_post_clif_skill_memomessage) (struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_clif_skill_mapinfomessage) (struct map_session_data **sd, int *type); +typedef void (*HPMHOOK_post_clif_skill_mapinfomessage) (struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_clif_skill_produce_mix_list) (struct map_session_data **sd, int *skill_id, int *trigger); +typedef void (*HPMHOOK_post_clif_skill_produce_mix_list) (struct map_session_data *sd, int skill_id, int trigger); +typedef void (*HPMHOOK_pre_clif_cooking_list) (struct map_session_data **sd, int *trigger, uint16 *skill_id, int *qty, int *list_type); +typedef void (*HPMHOOK_post_clif_cooking_list) (struct map_session_data *sd, int trigger, uint16 skill_id, int qty, int list_type); +typedef void (*HPMHOOK_pre_clif_autospell) (struct map_session_data **sd, uint16 *skill_lv); +typedef void (*HPMHOOK_post_clif_autospell) (struct map_session_data *sd, uint16 skill_lv); +typedef void (*HPMHOOK_pre_clif_combo_delay) (struct block_list **bl, int *wait); +typedef void (*HPMHOOK_post_clif_combo_delay) (struct block_list *bl, int wait); +typedef void (*HPMHOOK_pre_clif_status_change) (struct block_list **bl, int *type, int *flag, int *tick, int *val1, int *val2, int *val3); +typedef void (*HPMHOOK_post_clif_status_change) (struct block_list *bl, int type, int flag, int tick, int val1, int val2, int val3); +typedef void (*HPMHOOK_pre_clif_insert_card) (struct map_session_data **sd, int *idx_equip, int *idx_card, int *flag); +typedef void (*HPMHOOK_post_clif_insert_card) (struct map_session_data *sd, int idx_equip, int idx_card, int flag); +typedef void (*HPMHOOK_pre_clif_inventorylist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_inventorylist) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_equiplist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_equiplist) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_cartlist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_cartlist) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_favorite_item) (struct map_session_data **sd, unsigned short *index); +typedef void (*HPMHOOK_post_clif_favorite_item) (struct map_session_data *sd, unsigned short index); +typedef void (*HPMHOOK_pre_clif_clearcart) (int *fd); +typedef void (*HPMHOOK_post_clif_clearcart) (int fd); +typedef void (*HPMHOOK_pre_clif_item_identify_list) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_item_identify_list) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_item_identified) (struct map_session_data **sd, int *idx, int *flag); +typedef void (*HPMHOOK_post_clif_item_identified) (struct map_session_data *sd, int idx, int flag); +typedef void (*HPMHOOK_pre_clif_item_repair_list) (struct map_session_data **sd, struct map_session_data **dstsd, int *lv); +typedef void (*HPMHOOK_post_clif_item_repair_list) (struct map_session_data *sd, struct map_session_data *dstsd, int lv); +typedef void (*HPMHOOK_pre_clif_item_repaireffect) (struct map_session_data **sd, int *idx, int *flag); +typedef void (*HPMHOOK_post_clif_item_repaireffect) (struct map_session_data *sd, int idx, int flag); +typedef void (*HPMHOOK_pre_clif_item_damaged) (struct map_session_data **sd, unsigned short *position); +typedef void (*HPMHOOK_post_clif_item_damaged) (struct map_session_data *sd, unsigned short position); +typedef void (*HPMHOOK_pre_clif_item_refine_list) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_item_refine_list) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_item_skill) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); +typedef void (*HPMHOOK_post_clif_item_skill) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); +typedef void (*HPMHOOK_pre_clif_mvp_item) (struct map_session_data **sd, int *nameid); +typedef void (*HPMHOOK_post_clif_mvp_item) (struct map_session_data *sd, int nameid); +typedef void (*HPMHOOK_pre_clif_mvp_exp) (struct map_session_data **sd, unsigned int *exp); +typedef void (*HPMHOOK_post_clif_mvp_exp) (struct map_session_data *sd, unsigned int exp); +typedef void (*HPMHOOK_pre_clif_mvp_noitem) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_mvp_noitem) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_changed_dir) (struct block_list **bl, enum send_target *target); +typedef void (*HPMHOOK_post_clif_changed_dir) (struct block_list *bl, enum send_target target); +typedef void (*HPMHOOK_pre_clif_charnameack) (int *fd, struct block_list **bl); +typedef void (*HPMHOOK_post_clif_charnameack) (int fd, struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_monster_hp_bar) (struct mob_data **md, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_monster_hp_bar) (struct mob_data *md, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_clif_hpmeter) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_clif_hpmeter) (int retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_hpmeter_single) (int *fd, int *id, unsigned int *hp, unsigned int *maxhp); +typedef void (*HPMHOOK_post_clif_hpmeter_single) (int fd, int id, unsigned int hp, unsigned int maxhp); +typedef int (*HPMHOOK_pre_clif_hpmeter_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_clif_hpmeter_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_clif_upgrademessage) (int *fd, int *result, int *item_id); +typedef void (*HPMHOOK_post_clif_upgrademessage) (int fd, int result, int item_id); +typedef void (*HPMHOOK_pre_clif_get_weapon_view) (struct map_session_data **sd, unsigned short **rhand, unsigned short **lhand); +typedef void (*HPMHOOK_post_clif_get_weapon_view) (struct map_session_data *sd, unsigned short *rhand, unsigned short *lhand); +typedef void (*HPMHOOK_pre_clif_gospel_info) (struct map_session_data **sd, int *type); +typedef void (*HPMHOOK_post_clif_gospel_info) (struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_clif_feel_req) (int *fd, struct map_session_data **sd, uint16 *skill_lv); +typedef void (*HPMHOOK_post_clif_feel_req) (int fd, struct map_session_data *sd, uint16 skill_lv); +typedef void (*HPMHOOK_pre_clif_starskill) (struct map_session_data **sd, const char **mapname, int *monster_id, unsigned char *star, unsigned char *result); +typedef void (*HPMHOOK_post_clif_starskill) (struct map_session_data *sd, const char *mapname, int monster_id, unsigned char star, unsigned char result); +typedef void (*HPMHOOK_pre_clif_feel_info) (struct map_session_data **sd, unsigned char *feel_level, unsigned char *type); +typedef void (*HPMHOOK_post_clif_feel_info) (struct map_session_data *sd, unsigned char feel_level, unsigned char type); +typedef void (*HPMHOOK_pre_clif_hate_info) (struct map_session_data **sd, unsigned char *hate_level, int *class_, unsigned char *type); +typedef void (*HPMHOOK_post_clif_hate_info) (struct map_session_data *sd, unsigned char hate_level, int class_, unsigned char type); +typedef void (*HPMHOOK_pre_clif_mission_info) (struct map_session_data **sd, int *mob_id, unsigned char *progress); +typedef void (*HPMHOOK_post_clif_mission_info) (struct map_session_data *sd, int mob_id, unsigned char progress); +typedef void (*HPMHOOK_pre_clif_feel_hate_reset) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_feel_hate_reset) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_partytickack) (struct map_session_data **sd, bool *flag); +typedef void (*HPMHOOK_post_clif_partytickack) (struct map_session_data *sd, bool flag); +typedef void (*HPMHOOK_pre_clif_equiptickack) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_equiptickack) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_viewequip_ack) (struct map_session_data **sd, struct map_session_data **tsd); +typedef void (*HPMHOOK_post_clif_viewequip_ack) (struct map_session_data *sd, struct map_session_data *tsd); +typedef void (*HPMHOOK_pre_clif_equpcheckbox) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_equpcheckbox) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_displayexp) (struct map_session_data **sd, unsigned int *exp, char *type, bool *is_quest); +typedef void (*HPMHOOK_post_clif_displayexp) (struct map_session_data *sd, unsigned int exp, char type, bool is_quest); +typedef void (*HPMHOOK_pre_clif_font) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_font) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_progressbar) (struct map_session_data **sd, unsigned int *color, unsigned int *second); +typedef void (*HPMHOOK_post_clif_progressbar) (struct map_session_data *sd, unsigned int color, unsigned int second); +typedef void (*HPMHOOK_pre_clif_progressbar_abort) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_progressbar_abort) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_showdigit) (struct map_session_data **sd, unsigned char *type, int *value); +typedef void (*HPMHOOK_post_clif_showdigit) (struct map_session_data *sd, unsigned char type, int value); +typedef int (*HPMHOOK_pre_clif_elementalconverter_list) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_clif_elementalconverter_list) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_clif_spellbook_list) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_clif_spellbook_list) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_clif_magicdecoy_list) (struct map_session_data **sd, uint16 *skill_lv, short *x, short *y); +typedef int (*HPMHOOK_post_clif_magicdecoy_list) (int retVal___, struct map_session_data *sd, uint16 skill_lv, short x, short y); +typedef int (*HPMHOOK_pre_clif_poison_list) (struct map_session_data **sd, uint16 *skill_lv); +typedef int (*HPMHOOK_post_clif_poison_list) (int retVal___, struct map_session_data *sd, uint16 skill_lv); +typedef int (*HPMHOOK_pre_clif_autoshadowspell_list) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_clif_autoshadowspell_list) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_clif_skill_itemlistwindow) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_clif_skill_itemlistwindow) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); +typedef void (*HPMHOOK_pre_clif_sc_load) (struct block_list **bl, int *tid, enum send_target *target, int *type, int *val1, int *val2, int *val3); +typedef void (*HPMHOOK_post_clif_sc_load) (struct block_list *bl, int tid, enum send_target target, int type, int val1, int val2, int val3); +typedef void (*HPMHOOK_pre_clif_sc_end) (struct block_list **bl, int *tid, enum send_target *target, int *type); +typedef void (*HPMHOOK_post_clif_sc_end) (struct block_list *bl, int tid, enum send_target target, int type); +typedef void (*HPMHOOK_pre_clif_initialstatus) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_initialstatus) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_cooldown_list) (int *fd, struct skill_cd **cd); +typedef void (*HPMHOOK_post_clif_cooldown_list) (int fd, struct skill_cd *cd); +typedef void (*HPMHOOK_pre_clif_updatestatus) (struct map_session_data **sd, int *type); +typedef void (*HPMHOOK_post_clif_updatestatus) (struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_clif_changestatus) (struct map_session_data **sd, int *type, int *val); +typedef void (*HPMHOOK_post_clif_changestatus) (struct map_session_data *sd, int type, int val); +typedef void (*HPMHOOK_pre_clif_statusupack) (struct map_session_data **sd, int *type, int *ok, int *val); +typedef void (*HPMHOOK_post_clif_statusupack) (struct map_session_data *sd, int type, int ok, int val); +typedef void (*HPMHOOK_pre_clif_movetoattack) (struct map_session_data **sd, struct block_list **bl); +typedef void (*HPMHOOK_post_clif_movetoattack) (struct map_session_data *sd, struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_solved_charname) (int *fd, int *charid, const char **name); +typedef void (*HPMHOOK_post_clif_solved_charname) (int fd, int charid, const char *name); +typedef void (*HPMHOOK_pre_clif_charnameupdate) (struct map_session_data **ssd); +typedef void (*HPMHOOK_post_clif_charnameupdate) (struct map_session_data *ssd); +typedef int (*HPMHOOK_pre_clif_delayquit) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_clif_delayquit) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_clif_getareachar_pc) (struct map_session_data **sd, struct map_session_data **dstsd); +typedef void (*HPMHOOK_post_clif_getareachar_pc) (struct map_session_data *sd, struct map_session_data *dstsd); +typedef void (*HPMHOOK_pre_clif_disconnect_ack) (struct map_session_data **sd, short *result); +typedef void (*HPMHOOK_post_clif_disconnect_ack) (struct map_session_data *sd, short result); +typedef void (*HPMHOOK_pre_clif_PVPInfo) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_PVPInfo) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_blacksmith) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_blacksmith) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_alchemist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_alchemist) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_taekwon) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_taekwon) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_ranking_pk) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_ranking_pk) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_quitsave) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_quitsave) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_misceffect) (struct block_list **bl, int *type); +typedef void (*HPMHOOK_post_clif_misceffect) (struct block_list *bl, int type); +typedef void (*HPMHOOK_pre_clif_changeoption) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_changeoption) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_changeoption2) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_changeoption2) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_emotion) (struct block_list **bl, int *type); +typedef void (*HPMHOOK_post_clif_emotion) (struct block_list *bl, int type); +typedef void (*HPMHOOK_pre_clif_talkiebox) (struct block_list **bl, const char **talkie); +typedef void (*HPMHOOK_post_clif_talkiebox) (struct block_list *bl, const char *talkie); +typedef void (*HPMHOOK_pre_clif_wedding_effect) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_wedding_effect) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_divorced) (struct map_session_data **sd, const char **name); +typedef void (*HPMHOOK_post_clif_divorced) (struct map_session_data *sd, const char *name); +typedef void (*HPMHOOK_pre_clif_callpartner) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_callpartner) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_clif_skill_damage) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, int *type); +typedef int (*HPMHOOK_post_clif_skill_damage) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type); +typedef int (*HPMHOOK_pre_clif_skill_nodamage) (struct block_list **src, struct block_list **dst, uint16 *skill_id, int *heal, int *fail); +typedef int (*HPMHOOK_post_clif_skill_nodamage) (int retVal___, struct block_list *src, struct block_list *dst, uint16 skill_id, int heal, int fail); +typedef void (*HPMHOOK_pre_clif_skill_poseffect) (struct block_list **src, uint16 *skill_id, int *val, int *x, int *y, int64 *tick); +typedef void (*HPMHOOK_post_clif_skill_poseffect) (struct block_list *src, uint16 skill_id, int val, int x, int y, int64 tick); +typedef void (*HPMHOOK_pre_clif_skill_estimation) (struct map_session_data **sd, struct block_list **dst); +typedef void (*HPMHOOK_post_clif_skill_estimation) (struct map_session_data *sd, struct block_list *dst); +typedef void (*HPMHOOK_pre_clif_skill_warppoint) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv, unsigned short *map1, unsigned short *map2, unsigned short *map3, unsigned short *map4); +typedef void (*HPMHOOK_post_clif_skill_warppoint) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, unsigned short map1, unsigned short map2, unsigned short map3, unsigned short map4); +typedef void (*HPMHOOK_pre_clif_skillcasting) (struct block_list **bl, int *src_id, int *dst_id, int *dst_x, int *dst_y, uint16 *skill_id, int *property, int *casttime); +typedef void (*HPMHOOK_post_clif_skillcasting) (struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, int property, int casttime); +typedef void (*HPMHOOK_pre_clif_produce_effect) (struct map_session_data **sd, int *flag, int *nameid); +typedef void (*HPMHOOK_post_clif_produce_effect) (struct map_session_data *sd, int flag, int nameid); +typedef void (*HPMHOOK_pre_clif_devotion) (struct block_list **src, struct map_session_data **tsd); +typedef void (*HPMHOOK_post_clif_devotion) (struct block_list *src, struct map_session_data *tsd); +typedef void (*HPMHOOK_pre_clif_spiritball) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_spiritball) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_spiritball_single) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_spiritball_single) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_bladestop) (struct block_list **src, int *dst_id, int *active); +typedef void (*HPMHOOK_post_clif_bladestop) (struct block_list *src, int dst_id, int active); +typedef void (*HPMHOOK_pre_clif_mvp_effect) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_mvp_effect) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_heal) (int *fd, int *type, int *val); +typedef void (*HPMHOOK_post_clif_heal) (int fd, int type, int val); +typedef void (*HPMHOOK_pre_clif_resurrection) (struct block_list **bl, int *type); +typedef void (*HPMHOOK_post_clif_resurrection) (struct block_list *bl, int type); +typedef void (*HPMHOOK_pre_clif_refine) (int *fd, int *fail, int *index, int *val); +typedef void (*HPMHOOK_post_clif_refine) (int fd, int fail, int index, int val); +typedef void (*HPMHOOK_pre_clif_weather) (int16 *m); +typedef void (*HPMHOOK_post_clif_weather) (int16 m); +typedef void (*HPMHOOK_pre_clif_specialeffect) (struct block_list **bl, int *type, enum send_target *target); +typedef void (*HPMHOOK_post_clif_specialeffect) (struct block_list *bl, int type, enum send_target target); +typedef void (*HPMHOOK_pre_clif_specialeffect_single) (struct block_list **bl, int *type, int *fd); +typedef void (*HPMHOOK_post_clif_specialeffect_single) (struct block_list *bl, int type, int fd); +typedef void (*HPMHOOK_pre_clif_specialeffect_value) (struct block_list **bl, int *effect_id, int *num, send_target *target); +typedef void (*HPMHOOK_post_clif_specialeffect_value) (struct block_list *bl, int effect_id, int num, send_target target); +typedef void (*HPMHOOK_pre_clif_millenniumshield) (struct block_list **bl, short *shields); +typedef void (*HPMHOOK_post_clif_millenniumshield) (struct block_list *bl, short shields); +typedef void (*HPMHOOK_pre_clif_spiritcharm) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_spiritcharm) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_charm_single) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_charm_single) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_snap) (struct block_list **bl, short *x, short *y); +typedef void (*HPMHOOK_post_clif_snap) (struct block_list *bl, short x, short y); +typedef void (*HPMHOOK_pre_clif_weather_check) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_weather_check) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_playBGM) (struct map_session_data **sd, const char **name); +typedef void (*HPMHOOK_post_clif_playBGM) (struct map_session_data *sd, const char *name); +typedef void (*HPMHOOK_pre_clif_soundeffect) (struct map_session_data **sd, struct block_list **bl, const char **name, int *type); +typedef void (*HPMHOOK_post_clif_soundeffect) (struct map_session_data *sd, struct block_list *bl, const char *name, int type); +typedef void (*HPMHOOK_pre_clif_soundeffectall) (struct block_list **bl, const char **name, int *type, enum send_target *coverage); +typedef void (*HPMHOOK_post_clif_soundeffectall) (struct block_list *bl, const char *name, int type, enum send_target coverage); +typedef void (*HPMHOOK_pre_clif_GlobalMessage) (struct block_list **bl, const char **message); +typedef void (*HPMHOOK_post_clif_GlobalMessage) (struct block_list *bl, const char *message); +typedef void (*HPMHOOK_pre_clif_createchat) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_createchat) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_dispchat) (struct chat_data **cd, int *fd); +typedef void (*HPMHOOK_post_clif_dispchat) (struct chat_data *cd, int fd); +typedef void (*HPMHOOK_pre_clif_joinchatfail) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_joinchatfail) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_joinchatok) (struct map_session_data **sd, struct chat_data **cd); +typedef void (*HPMHOOK_post_clif_joinchatok) (struct map_session_data *sd, struct chat_data *cd); +typedef void (*HPMHOOK_pre_clif_addchat) (struct chat_data **cd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_addchat) (struct chat_data *cd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_changechatowner) (struct chat_data **cd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_changechatowner) (struct chat_data *cd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_clearchat) (struct chat_data **cd, int *fd); +typedef void (*HPMHOOK_post_clif_clearchat) (struct chat_data *cd, int fd); +typedef void (*HPMHOOK_pre_clif_leavechat) (struct chat_data **cd, struct map_session_data **sd, bool *flag); +typedef void (*HPMHOOK_post_clif_leavechat) (struct chat_data *cd, struct map_session_data *sd, bool flag); +typedef void (*HPMHOOK_pre_clif_changechatstatus) (struct chat_data **cd); +typedef void (*HPMHOOK_post_clif_changechatstatus) (struct chat_data *cd); +typedef void (*HPMHOOK_pre_clif_wis_message) (int *fd, const char **nick, const char **mes, int *mes_len); +typedef void (*HPMHOOK_post_clif_wis_message) (int fd, const char *nick, const char *mes, int mes_len); +typedef void (*HPMHOOK_pre_clif_wis_end) (int *fd, int *flag); +typedef void (*HPMHOOK_post_clif_wis_end) (int fd, int flag); +typedef void (*HPMHOOK_pre_clif_disp_message) (struct block_list **src, const char **mes, enum send_target *target); +typedef void (*HPMHOOK_post_clif_disp_message) (struct block_list *src, const char *mes, enum send_target target); +typedef void (*HPMHOOK_pre_clif_broadcast) (struct block_list **bl, const char **mes, int *len, int *type, enum send_target *target); +typedef void (*HPMHOOK_post_clif_broadcast) (struct block_list *bl, const char *mes, int len, int type, enum send_target target); +typedef void (*HPMHOOK_pre_clif_broadcast2) (struct block_list **bl, const char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, enum send_target *target); +typedef void (*HPMHOOK_post_clif_broadcast2) (struct block_list *bl, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target); +typedef void (*HPMHOOK_pre_clif_messagecolor_self) (int *fd, uint32 *color, const char **msg); +typedef void (*HPMHOOK_post_clif_messagecolor_self) (int fd, uint32 color, const char *msg); +typedef void (*HPMHOOK_pre_clif_messagecolor) (struct block_list **bl, uint32 *color, const char **msg); +typedef void (*HPMHOOK_post_clif_messagecolor) (struct block_list *bl, uint32 color, const char *msg); +typedef void (*HPMHOOK_pre_clif_disp_overhead) (struct block_list **bl, const char **mes); +typedef void (*HPMHOOK_post_clif_disp_overhead) (struct block_list *bl, const char *mes); +typedef void (*HPMHOOK_pre_clif_msgtable) (struct map_session_data **sd, unsigned short *msg_id); +typedef void (*HPMHOOK_post_clif_msgtable) (struct map_session_data *sd, unsigned short msg_id); +typedef void (*HPMHOOK_pre_clif_msgtable_num) (struct map_session_data **sd, unsigned short *msg_id, int *value); +typedef void (*HPMHOOK_post_clif_msgtable_num) (struct map_session_data *sd, unsigned short msg_id, int value); +typedef void (*HPMHOOK_pre_clif_msgtable_skill) (struct map_session_data **sd, uint16 *skill_id, int *msg_id); +typedef void (*HPMHOOK_post_clif_msgtable_skill) (struct map_session_data *sd, uint16 skill_id, int msg_id); +typedef void (*HPMHOOK_pre_clif_message) (const int *fd, const char **mes); +typedef void (*HPMHOOK_post_clif_message) (const int fd, const char *mes); +typedef void (*HPMHOOK_pre_clif_messageln) (const int *fd, const char **mes); +typedef void (*HPMHOOK_post_clif_messageln) (const int fd, const char *mes); +typedef const char* (*HPMHOOK_pre_clif_process_chat_message) (struct map_session_data **sd, const struct packet_chat_message **packet, char **out_buf, int *out_buflen); +typedef const char* (*HPMHOOK_post_clif_process_chat_message) (const char* retVal___, struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen); +typedef bool (*HPMHOOK_pre_clif_process_whisper_message) (struct map_session_data **sd, const struct packet_whisper_message **packet, char **out_name, char **out_message, int *out_messagelen); +typedef bool (*HPMHOOK_post_clif_process_whisper_message) (bool retVal___, struct map_session_data *sd, const struct packet_whisper_message *packet, char *out_name, char *out_message, int out_messagelen); +typedef void (*HPMHOOK_pre_clif_wisexin) (struct map_session_data **sd, int *type, int *flag); +typedef void (*HPMHOOK_post_clif_wisexin) (struct map_session_data *sd, int type, int flag); +typedef void (*HPMHOOK_pre_clif_wisall) (struct map_session_data **sd, int *type, int *flag); +typedef void (*HPMHOOK_post_clif_wisall) (struct map_session_data *sd, int type, int flag); +typedef void (*HPMHOOK_pre_clif_PMIgnoreList) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_PMIgnoreList) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_ShowScript) (struct block_list **bl, const char **message); +typedef void (*HPMHOOK_post_clif_ShowScript) (struct block_list *bl, const char *message); +typedef void (*HPMHOOK_pre_clif_traderequest) (struct map_session_data **sd, const char **name); +typedef void (*HPMHOOK_post_clif_traderequest) (struct map_session_data *sd, const char *name); +typedef void (*HPMHOOK_pre_clif_tradestart) (struct map_session_data **sd, uint8 *type); +typedef void (*HPMHOOK_post_clif_tradestart) (struct map_session_data *sd, uint8 type); +typedef void (*HPMHOOK_pre_clif_tradeadditem) (struct map_session_data **sd, struct map_session_data **tsd, int *index, int *amount); +typedef void (*HPMHOOK_post_clif_tradeadditem) (struct map_session_data *sd, struct map_session_data *tsd, int index, int amount); +typedef void (*HPMHOOK_pre_clif_tradeitemok) (struct map_session_data **sd, int *index, int *fail); +typedef void (*HPMHOOK_post_clif_tradeitemok) (struct map_session_data *sd, int index, int fail); +typedef void (*HPMHOOK_pre_clif_tradedeal_lock) (struct map_session_data **sd, int *fail); +typedef void (*HPMHOOK_post_clif_tradedeal_lock) (struct map_session_data *sd, int fail); +typedef void (*HPMHOOK_pre_clif_tradecancelled) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_tradecancelled) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_tradecompleted) (struct map_session_data **sd, int *fail); +typedef void (*HPMHOOK_post_clif_tradecompleted) (struct map_session_data *sd, int fail); +typedef void (*HPMHOOK_pre_clif_tradeundo) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_tradeundo) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_openvendingreq) (struct map_session_data **sd, int *num); +typedef void (*HPMHOOK_post_clif_openvendingreq) (struct map_session_data *sd, int num); +typedef void (*HPMHOOK_pre_clif_showvendingboard) (struct block_list **bl, const char **message, int *fd); +typedef void (*HPMHOOK_post_clif_showvendingboard) (struct block_list *bl, const char *message, int fd); +typedef void (*HPMHOOK_pre_clif_closevendingboard) (struct block_list **bl, int *fd); +typedef void (*HPMHOOK_post_clif_closevendingboard) (struct block_list *bl, int fd); +typedef void (*HPMHOOK_pre_clif_vendinglist) (struct map_session_data **sd, unsigned int *id, struct s_vending **vending_list); +typedef void (*HPMHOOK_post_clif_vendinglist) (struct map_session_data *sd, unsigned int id, struct s_vending *vending_list); +typedef void (*HPMHOOK_pre_clif_buyvending) (struct map_session_data **sd, int *index, int *amount, int *fail); +typedef void (*HPMHOOK_post_clif_buyvending) (struct map_session_data *sd, int index, int amount, int fail); +typedef void (*HPMHOOK_pre_clif_openvending) (struct map_session_data **sd, int *id, struct s_vending **vending_list); +typedef void (*HPMHOOK_post_clif_openvending) (struct map_session_data *sd, int id, struct s_vending *vending_list); +typedef void (*HPMHOOK_pre_clif_vendingreport) (struct map_session_data **sd, int *index, int *amount); +typedef void (*HPMHOOK_post_clif_vendingreport) (struct map_session_data *sd, int index, int amount); +typedef void (*HPMHOOK_pre_clif_storagelist) (struct map_session_data **sd, struct item **items, int *items_length); +typedef void (*HPMHOOK_post_clif_storagelist) (struct map_session_data *sd, struct item *items, int items_length); +typedef void (*HPMHOOK_pre_clif_updatestorageamount) (struct map_session_data **sd, int *amount, int *max_amount); +typedef void (*HPMHOOK_post_clif_updatestorageamount) (struct map_session_data *sd, int amount, int max_amount); +typedef void (*HPMHOOK_pre_clif_storageitemadded) (struct map_session_data **sd, struct item **i, int *index, int *amount); +typedef void (*HPMHOOK_post_clif_storageitemadded) (struct map_session_data *sd, struct item *i, int index, int amount); +typedef void (*HPMHOOK_pre_clif_storageitemremoved) (struct map_session_data **sd, int *index, int *amount); +typedef void (*HPMHOOK_post_clif_storageitemremoved) (struct map_session_data *sd, int index, int amount); +typedef void (*HPMHOOK_pre_clif_storageclose) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_storageclose) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_skillinfoblock) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_skillinfoblock) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_skillup) (struct map_session_data **sd, uint16 *skill_id, int *skill_lv, int *flag); +typedef void (*HPMHOOK_post_clif_skillup) (struct map_session_data *sd, uint16 skill_id, int skill_lv, int flag); +typedef void (*HPMHOOK_pre_clif_skillinfo) (struct map_session_data **sd, int *skill_id, int *inf); +typedef void (*HPMHOOK_post_clif_skillinfo) (struct map_session_data *sd, int skill_id, int inf); +typedef void (*HPMHOOK_pre_clif_addskill) (struct map_session_data **sd, int *id); +typedef void (*HPMHOOK_post_clif_addskill) (struct map_session_data *sd, int id); +typedef void (*HPMHOOK_pre_clif_deleteskill) (struct map_session_data **sd, int *id); +typedef void (*HPMHOOK_post_clif_deleteskill) (struct map_session_data *sd, int id); +typedef void (*HPMHOOK_pre_clif_party_created) (struct map_session_data **sd, int *result); +typedef void (*HPMHOOK_post_clif_party_created) (struct map_session_data *sd, int result); +typedef void (*HPMHOOK_pre_clif_party_member_info) (struct party_data **p, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_party_member_info) (struct party_data *p, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_party_info) (struct party_data **p, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_party_info) (struct party_data *p, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_party_invite) (struct map_session_data **sd, struct map_session_data **tsd); +typedef void (*HPMHOOK_post_clif_party_invite) (struct map_session_data *sd, struct map_session_data *tsd); +typedef void (*HPMHOOK_pre_clif_party_inviteack) (struct map_session_data **sd, const char **nick, int *result); +typedef void (*HPMHOOK_post_clif_party_inviteack) (struct map_session_data *sd, const char *nick, int result); +typedef void (*HPMHOOK_pre_clif_party_option) (struct party_data **p, struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_party_option) (struct party_data *p, struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_party_withdraw) (struct party_data **p, struct map_session_data **sd, int *account_id, const char **name, int *flag); +typedef void (*HPMHOOK_post_clif_party_withdraw) (struct party_data *p, struct map_session_data *sd, int account_id, const char *name, int flag); +typedef void (*HPMHOOK_pre_clif_party_message) (struct party_data **p, int *account_id, const char **mes, int *len); +typedef void (*HPMHOOK_post_clif_party_message) (struct party_data *p, int account_id, const char *mes, int len); +typedef void (*HPMHOOK_pre_clif_party_xy) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_party_xy) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_party_xy_single) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_party_xy_single) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_party_hp) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_party_hp) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_party_xy_remove) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_party_xy_remove) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_party_show_picker) (struct map_session_data **sd, struct item **item_data); +typedef void (*HPMHOOK_post_clif_party_show_picker) (struct map_session_data *sd, struct item *item_data); +typedef void (*HPMHOOK_pre_clif_partyinvitationstate) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_partyinvitationstate) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_PartyLeaderChanged) (struct map_session_data **sd, int *prev_leader_aid, int *new_leader_aid); +typedef void (*HPMHOOK_post_clif_PartyLeaderChanged) (struct map_session_data *sd, int prev_leader_aid, int new_leader_aid); +typedef void (*HPMHOOK_pre_clif_guild_created) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_guild_created) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_guild_belonginfo) (struct map_session_data **sd, struct guild **g); +typedef void (*HPMHOOK_post_clif_guild_belonginfo) (struct map_session_data *sd, struct guild *g); +typedef void (*HPMHOOK_pre_clif_guild_masterormember) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_masterormember) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_basicinfo) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_basicinfo) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_allianceinfo) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_allianceinfo) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_memberlist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_memberlist) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_skillinfo) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_skillinfo) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_send_onlineinfo) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_send_onlineinfo) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_memberlogin_notice) (struct guild **g, int *idx, int *flag); +typedef void (*HPMHOOK_post_clif_guild_memberlogin_notice) (struct guild *g, int idx, int flag); +typedef void (*HPMHOOK_pre_clif_guild_invite) (struct map_session_data **sd, struct guild **g); +typedef void (*HPMHOOK_post_clif_guild_invite) (struct map_session_data *sd, struct guild *g); +typedef void (*HPMHOOK_pre_clif_guild_inviteack) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_guild_inviteack) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_guild_leave) (struct map_session_data **sd, const char **name, const char **mes); +typedef void (*HPMHOOK_post_clif_guild_leave) (struct map_session_data *sd, const char *name, const char *mes); +typedef void (*HPMHOOK_pre_clif_guild_expulsion) (struct map_session_data **sd, const char **name, const char **mes, int *account_id); +typedef void (*HPMHOOK_post_clif_guild_expulsion) (struct map_session_data *sd, const char *name, const char *mes, int account_id); +typedef void (*HPMHOOK_pre_clif_guild_positionchanged) (struct guild **g, int *idx); +typedef void (*HPMHOOK_post_clif_guild_positionchanged) (struct guild *g, int idx); +typedef void (*HPMHOOK_pre_clif_guild_memberpositionchanged) (struct guild **g, int *idx); +typedef void (*HPMHOOK_post_clif_guild_memberpositionchanged) (struct guild *g, int idx); +typedef void (*HPMHOOK_pre_clif_guild_emblem) (struct map_session_data **sd, struct guild **g); +typedef void (*HPMHOOK_post_clif_guild_emblem) (struct map_session_data *sd, struct guild *g); +typedef void (*HPMHOOK_pre_clif_guild_emblem_area) (struct block_list **bl); +typedef void (*HPMHOOK_post_clif_guild_emblem_area) (struct block_list *bl); +typedef void (*HPMHOOK_pre_clif_guild_notice) (struct map_session_data **sd, struct guild **g); +typedef void (*HPMHOOK_post_clif_guild_notice) (struct map_session_data *sd, struct guild *g); +typedef void (*HPMHOOK_pre_clif_guild_message) (struct guild **g, int *account_id, const char **mes, int *len); +typedef void (*HPMHOOK_post_clif_guild_message) (struct guild *g, int account_id, const char *mes, int len); +typedef void (*HPMHOOK_pre_clif_guild_reqalliance) (struct map_session_data **sd, int *account_id, const char **name); +typedef void (*HPMHOOK_post_clif_guild_reqalliance) (struct map_session_data *sd, int account_id, const char *name); +typedef void (*HPMHOOK_pre_clif_guild_allianceack) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_guild_allianceack) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_guild_delalliance) (struct map_session_data **sd, int *guild_id, int *flag); +typedef void (*HPMHOOK_post_clif_guild_delalliance) (struct map_session_data *sd, int guild_id, int flag); +typedef void (*HPMHOOK_pre_clif_guild_oppositionack) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_guild_oppositionack) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_guild_broken) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_guild_broken) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_guild_xy) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_xy) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_xy_single) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_xy_single) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_xy_remove) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_xy_remove) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_positionnamelist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_positionnamelist) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_positioninfolist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_positioninfolist) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_guild_expulsionlist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_guild_expulsionlist) (struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_clif_validate_emblem) (const uint8 **emblem, unsigned long *emblem_len); +typedef bool (*HPMHOOK_post_clif_validate_emblem) (bool retVal___, const uint8 *emblem, unsigned long emblem_len); +typedef void (*HPMHOOK_pre_clif_bg_hp) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_bg_hp) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_bg_xy) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_bg_xy) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_bg_xy_remove) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_bg_xy_remove) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_bg_message) (struct battleground_data **bgd, int *src_id, const char **name, const char **mes); +typedef void (*HPMHOOK_post_clif_bg_message) (struct battleground_data *bgd, int src_id, const char *name, const char *mes); +typedef void (*HPMHOOK_pre_clif_bg_updatescore) (int16 *m); +typedef void (*HPMHOOK_post_clif_bg_updatescore) (int16 m); +typedef void (*HPMHOOK_pre_clif_bg_updatescore_single) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_bg_updatescore_single) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_sendbgemblem_area) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_sendbgemblem_area) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_sendbgemblem_single) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_sendbgemblem_single) (int fd, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_clif_instance) (int *instance_id, int *type, int *flag); +typedef int (*HPMHOOK_post_clif_instance) (int retVal___, int instance_id, int type, int flag); +typedef void (*HPMHOOK_pre_clif_instance_join) (int *fd, int *instance_id); +typedef void (*HPMHOOK_post_clif_instance_join) (int fd, int instance_id); +typedef void (*HPMHOOK_pre_clif_instance_leave) (int *fd); +typedef void (*HPMHOOK_post_clif_instance_leave) (int fd); +typedef void (*HPMHOOK_pre_clif_catch_process) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_catch_process) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pet_roulette) (struct map_session_data **sd, int *data); +typedef void (*HPMHOOK_post_clif_pet_roulette) (struct map_session_data *sd, int data); +typedef void (*HPMHOOK_pre_clif_sendegg) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_sendegg) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_send_petstatus) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_send_petstatus) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_send_petdata) (struct map_session_data **sd, struct pet_data **pd, int *type, int *param); +typedef void (*HPMHOOK_post_clif_send_petdata) (struct map_session_data *sd, struct pet_data *pd, int type, int param); +typedef void (*HPMHOOK_pre_clif_pet_emotion) (struct pet_data **pd, int *param); +typedef void (*HPMHOOK_post_clif_pet_emotion) (struct pet_data *pd, int param); +typedef void (*HPMHOOK_pre_clif_pet_food) (struct map_session_data **sd, int *foodid, int *fail); +typedef void (*HPMHOOK_post_clif_pet_food) (struct map_session_data *sd, int foodid, int fail); +typedef int (*HPMHOOK_pre_clif_friendslist_toggle_sub) (struct map_session_data **sd, va_list ap); +typedef int (*HPMHOOK_post_clif_friendslist_toggle_sub) (int retVal___, struct map_session_data *sd, va_list ap); +typedef void (*HPMHOOK_pre_clif_friendslist_send) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_friendslist_send) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_friendslist_reqack) (struct map_session_data **sd, struct map_session_data **f_sd, int *type); +typedef void (*HPMHOOK_post_clif_friendslist_reqack) (struct map_session_data *sd, struct map_session_data *f_sd, int type); +typedef void (*HPMHOOK_pre_clif_friendslist_toggle) (struct map_session_data **sd, int *account_id, int *char_id, int *online); +typedef void (*HPMHOOK_post_clif_friendslist_toggle) (struct map_session_data *sd, int account_id, int char_id, int online); +typedef void (*HPMHOOK_pre_clif_friendlist_req) (struct map_session_data **sd, int *account_id, int *char_id, const char **name); +typedef void (*HPMHOOK_post_clif_friendlist_req) (struct map_session_data *sd, int account_id, int char_id, const char *name); +typedef void (*HPMHOOK_pre_clif_GM_kickack) (struct map_session_data **sd, int *result); +typedef void (*HPMHOOK_post_clif_GM_kickack) (struct map_session_data *sd, int result); +typedef void (*HPMHOOK_pre_clif_GM_kick) (struct map_session_data **sd, struct map_session_data **tsd); +typedef void (*HPMHOOK_post_clif_GM_kick) (struct map_session_data *sd, struct map_session_data *tsd); +typedef void (*HPMHOOK_pre_clif_manner_message) (struct map_session_data **sd, uint32 *type); +typedef void (*HPMHOOK_post_clif_manner_message) (struct map_session_data *sd, uint32 type); +typedef void (*HPMHOOK_pre_clif_GM_silence) (struct map_session_data **sd, struct map_session_data **tsd, uint8 *type); +typedef void (*HPMHOOK_post_clif_GM_silence) (struct map_session_data *sd, struct map_session_data *tsd, uint8 type); +typedef void (*HPMHOOK_pre_clif_account_name) (struct map_session_data **sd, int *account_id, const char **accname); +typedef void (*HPMHOOK_post_clif_account_name) (struct map_session_data *sd, int account_id, const char *accname); +typedef void (*HPMHOOK_pre_clif_check) (int *fd, struct map_session_data **pl_sd); +typedef void (*HPMHOOK_post_clif_check) (int fd, struct map_session_data *pl_sd); +typedef void (*HPMHOOK_pre_clif_hominfo) (struct map_session_data **sd, struct homun_data **hd, int *flag); +typedef void (*HPMHOOK_post_clif_hominfo) (struct map_session_data *sd, struct homun_data *hd, int flag); +typedef void (*HPMHOOK_pre_clif_homskillinfoblock) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_homskillinfoblock) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_homskillup) (struct map_session_data **sd, uint16 *skill_id); +typedef void (*HPMHOOK_post_clif_homskillup) (struct map_session_data *sd, uint16 skill_id); +typedef void (*HPMHOOK_pre_clif_hom_food) (struct map_session_data **sd, int *foodid, int *fail); +typedef void (*HPMHOOK_post_clif_hom_food) (struct map_session_data *sd, int foodid, int fail); +typedef void (*HPMHOOK_pre_clif_send_homdata) (struct map_session_data **sd, int *state, int *param); +typedef void (*HPMHOOK_post_clif_send_homdata) (struct map_session_data *sd, int state, int param); +typedef void (*HPMHOOK_pre_clif_quest_send_list) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_quest_send_list) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_quest_send_mission) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_quest_send_mission) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_quest_add) (struct map_session_data **sd, struct quest **qd); +typedef void (*HPMHOOK_post_clif_quest_add) (struct map_session_data *sd, struct quest *qd); +typedef void (*HPMHOOK_pre_clif_quest_delete) (struct map_session_data **sd, int *quest_id); +typedef void (*HPMHOOK_post_clif_quest_delete) (struct map_session_data *sd, int quest_id); +typedef void (*HPMHOOK_pre_clif_quest_update_status) (struct map_session_data **sd, int *quest_id, bool *active); +typedef void (*HPMHOOK_post_clif_quest_update_status) (struct map_session_data *sd, int quest_id, bool active); +typedef void (*HPMHOOK_pre_clif_quest_update_objective) (struct map_session_data **sd, struct quest **qd); +typedef void (*HPMHOOK_post_clif_quest_update_objective) (struct map_session_data *sd, struct quest *qd); +typedef void (*HPMHOOK_pre_clif_quest_show_event) (struct map_session_data **sd, struct block_list **bl, short *state, short *color); +typedef void (*HPMHOOK_post_clif_quest_show_event) (struct map_session_data *sd, struct block_list *bl, short state, short color); +typedef void (*HPMHOOK_pre_clif_mail_window) (int *fd, int *flag); +typedef void (*HPMHOOK_post_clif_mail_window) (int fd, int flag); +typedef void (*HPMHOOK_pre_clif_mail_read) (struct map_session_data **sd, int *mail_id); +typedef void (*HPMHOOK_post_clif_mail_read) (struct map_session_data *sd, int mail_id); +typedef void (*HPMHOOK_pre_clif_mail_delete) (int *fd, int *mail_id, short *fail); +typedef void (*HPMHOOK_post_clif_mail_delete) (int fd, int mail_id, short fail); +typedef void (*HPMHOOK_pre_clif_mail_return) (int *fd, int *mail_id, short *fail); +typedef void (*HPMHOOK_post_clif_mail_return) (int fd, int mail_id, short fail); +typedef void (*HPMHOOK_pre_clif_mail_send) (int *fd, bool *fail); +typedef void (*HPMHOOK_post_clif_mail_send) (int fd, bool fail); +typedef void (*HPMHOOK_pre_clif_mail_new) (int *fd, int *mail_id, const char **sender, const char **title); +typedef void (*HPMHOOK_post_clif_mail_new) (int fd, int mail_id, const char *sender, const char *title); +typedef void (*HPMHOOK_pre_clif_mail_refreshinbox) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_mail_refreshinbox) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_mail_getattachment) (int *fd, uint8 *flag); +typedef void (*HPMHOOK_post_clif_mail_getattachment) (int fd, uint8 flag); +typedef void (*HPMHOOK_pre_clif_mail_setattachment) (int *fd, int *index, uint8 *flag); +typedef void (*HPMHOOK_post_clif_mail_setattachment) (int fd, int index, uint8 flag); +typedef void (*HPMHOOK_pre_clif_auction_openwindow) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_auction_openwindow) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_auction_results) (struct map_session_data **sd, short *count, short *pages, const uint8 **buf); +typedef void (*HPMHOOK_post_clif_auction_results) (struct map_session_data *sd, short count, short pages, const uint8 *buf); +typedef void (*HPMHOOK_pre_clif_auction_message) (int *fd, unsigned char *flag); +typedef void (*HPMHOOK_post_clif_auction_message) (int fd, unsigned char flag); +typedef void (*HPMHOOK_pre_clif_auction_close) (int *fd, unsigned char *flag); +typedef void (*HPMHOOK_post_clif_auction_close) (int fd, unsigned char flag); +typedef void (*HPMHOOK_pre_clif_auction_setitem) (int *fd, int *index, bool *fail); +typedef void (*HPMHOOK_post_clif_auction_setitem) (int fd, int index, bool fail); +typedef void (*HPMHOOK_pre_clif_mercenary_info) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_mercenary_info) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_mercenary_skillblock) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_mercenary_skillblock) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_mercenary_message) (struct map_session_data **sd, int *message); +typedef void (*HPMHOOK_post_clif_mercenary_message) (struct map_session_data *sd, int message); +typedef void (*HPMHOOK_pre_clif_mercenary_updatestatus) (struct map_session_data **sd, int *type); +typedef void (*HPMHOOK_post_clif_mercenary_updatestatus) (struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_clif_rental_time) (int *fd, int *nameid, int *seconds); +typedef void (*HPMHOOK_post_clif_rental_time) (int fd, int nameid, int seconds); +typedef void (*HPMHOOK_pre_clif_rental_expired) (int *fd, int *index, int *nameid); +typedef void (*HPMHOOK_post_clif_rental_expired) (int fd, int index, int nameid); +typedef void (*HPMHOOK_pre_clif_PartyBookingRegisterAck) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_PartyBookingRegisterAck) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_PartyBookingDeleteAck) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_PartyBookingDeleteAck) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_PartyBookingSearchAck) (int *fd, struct party_booking_ad_info ***results, int *count, bool *more_result); +typedef void (*HPMHOOK_post_clif_PartyBookingSearchAck) (int fd, struct party_booking_ad_info **results, int count, bool more_result); +typedef void (*HPMHOOK_pre_clif_PartyBookingUpdateNotify) (struct map_session_data **sd, struct party_booking_ad_info **pb_ad); +typedef void (*HPMHOOK_post_clif_PartyBookingUpdateNotify) (struct map_session_data *sd, struct party_booking_ad_info *pb_ad); +typedef void (*HPMHOOK_pre_clif_PartyBookingDeleteNotify) (struct map_session_data **sd, int *index); +typedef void (*HPMHOOK_post_clif_PartyBookingDeleteNotify) (struct map_session_data *sd, int index); +typedef void (*HPMHOOK_pre_clif_PartyBookingInsertNotify) (struct map_session_data **sd, struct party_booking_ad_info **pb_ad); +typedef void (*HPMHOOK_post_clif_PartyBookingInsertNotify) (struct map_session_data *sd, struct party_booking_ad_info *pb_ad); +typedef void (*HPMHOOK_pre_clif_PartyRecruitRegisterAck) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_PartyRecruitRegisterAck) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_PartyRecruitDeleteAck) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_clif_PartyRecruitDeleteAck) (struct map_session_data *sd, int flag); +typedef void (*HPMHOOK_pre_clif_PartyRecruitSearchAck) (int *fd, struct party_booking_ad_info ***results, int *count, bool *more_result); +typedef void (*HPMHOOK_post_clif_PartyRecruitSearchAck) (int fd, struct party_booking_ad_info **results, int count, bool more_result); +typedef void (*HPMHOOK_pre_clif_PartyRecruitUpdateNotify) (struct map_session_data **sd, struct party_booking_ad_info **pb_ad); +typedef void (*HPMHOOK_post_clif_PartyRecruitUpdateNotify) (struct map_session_data *sd, struct party_booking_ad_info *pb_ad); +typedef void (*HPMHOOK_pre_clif_PartyRecruitDeleteNotify) (struct map_session_data **sd, int *index); +typedef void (*HPMHOOK_post_clif_PartyRecruitDeleteNotify) (struct map_session_data *sd, int index); +typedef void (*HPMHOOK_pre_clif_PartyRecruitInsertNotify) (struct map_session_data **sd, struct party_booking_ad_info **pb_ad); +typedef void (*HPMHOOK_post_clif_PartyRecruitInsertNotify) (struct map_session_data *sd, struct party_booking_ad_info *pb_ad); +typedef void (*HPMHOOK_pre_clif_PartyBookingVolunteerInfo) (int *index, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_PartyBookingVolunteerInfo) (int index, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_PartyBookingRefuseVolunteer) (unsigned int *aid, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_PartyBookingRefuseVolunteer) (unsigned int aid, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_PartyBookingCancelVolunteer) (int *index, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_PartyBookingCancelVolunteer) (int index, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_PartyBookingAddFilteringList) (int *index, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_PartyBookingAddFilteringList) (int index, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_PartyBookingSubFilteringList) (int *gid, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_PartyBookingSubFilteringList) (int gid, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_buyingstore_open) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_buyingstore_open) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_buyingstore_open_failed) (struct map_session_data **sd, unsigned short *result, unsigned int *weight); +typedef void (*HPMHOOK_post_clif_buyingstore_open_failed) (struct map_session_data *sd, unsigned short result, unsigned int weight); +typedef void (*HPMHOOK_pre_clif_buyingstore_myitemlist) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_buyingstore_myitemlist) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_buyingstore_entry) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_buyingstore_entry) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_buyingstore_entry_single) (struct map_session_data **sd, struct map_session_data **pl_sd); +typedef void (*HPMHOOK_post_clif_buyingstore_entry_single) (struct map_session_data *sd, struct map_session_data *pl_sd); +typedef void (*HPMHOOK_pre_clif_buyingstore_disappear_entry) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_buyingstore_disappear_entry) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_buyingstore_disappear_entry_single) (struct map_session_data **sd, struct map_session_data **pl_sd); +typedef void (*HPMHOOK_post_clif_buyingstore_disappear_entry_single) (struct map_session_data *sd, struct map_session_data *pl_sd); +typedef void (*HPMHOOK_pre_clif_buyingstore_itemlist) (struct map_session_data **sd, struct map_session_data **pl_sd); +typedef void (*HPMHOOK_post_clif_buyingstore_itemlist) (struct map_session_data *sd, struct map_session_data *pl_sd); +typedef void (*HPMHOOK_pre_clif_buyingstore_trade_failed_buyer) (struct map_session_data **sd, short *result); +typedef void (*HPMHOOK_post_clif_buyingstore_trade_failed_buyer) (struct map_session_data *sd, short result); +typedef void (*HPMHOOK_pre_clif_buyingstore_update_item) (struct map_session_data **sd, unsigned short *nameid, unsigned short *amount); +typedef void (*HPMHOOK_post_clif_buyingstore_update_item) (struct map_session_data *sd, unsigned short nameid, unsigned short amount); +typedef void (*HPMHOOK_pre_clif_buyingstore_delete_item) (struct map_session_data **sd, short *index, unsigned short *amount, int *price); +typedef void (*HPMHOOK_post_clif_buyingstore_delete_item) (struct map_session_data *sd, short index, unsigned short amount, int price); +typedef void (*HPMHOOK_pre_clif_buyingstore_trade_failed_seller) (struct map_session_data **sd, short *result, unsigned short *nameid); +typedef void (*HPMHOOK_post_clif_buyingstore_trade_failed_seller) (struct map_session_data *sd, short result, unsigned short nameid); +typedef void (*HPMHOOK_pre_clif_search_store_info_ack) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_search_store_info_ack) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_search_store_info_failed) (struct map_session_data **sd, unsigned char *reason); +typedef void (*HPMHOOK_post_clif_search_store_info_failed) (struct map_session_data *sd, unsigned char reason); +typedef void (*HPMHOOK_pre_clif_open_search_store_info) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_open_search_store_info) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_search_store_info_click_ack) (struct map_session_data **sd, short *x, short *y); +typedef void (*HPMHOOK_post_clif_search_store_info_click_ack) (struct map_session_data *sd, short x, short y); +typedef void (*HPMHOOK_pre_clif_elemental_info) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_elemental_info) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_elemental_updatestatus) (struct map_session_data **sd, int *type); +typedef void (*HPMHOOK_post_clif_elemental_updatestatus) (struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_clif_bgqueue_ack) (struct map_session_data **sd, enum BATTLEGROUNDS_QUEUE_ACK *response, unsigned char *arena_id); +typedef void (*HPMHOOK_post_clif_bgqueue_ack) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_ACK response, unsigned char arena_id); +typedef void (*HPMHOOK_pre_clif_bgqueue_notice_delete) (struct map_session_data **sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED *response, const char **name); +typedef void (*HPMHOOK_post_clif_bgqueue_notice_delete) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED response, const char *name); +typedef void (*HPMHOOK_pre_clif_bgqueue_update_info) (struct map_session_data **sd, unsigned char *arena_id, int *position); +typedef void (*HPMHOOK_post_clif_bgqueue_update_info) (struct map_session_data *sd, unsigned char arena_id, int position); +typedef void (*HPMHOOK_pre_clif_bgqueue_joined) (struct map_session_data **sd, int *pos); +typedef void (*HPMHOOK_post_clif_bgqueue_joined) (struct map_session_data *sd, int pos); +typedef void (*HPMHOOK_pre_clif_bgqueue_pcleft) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_bgqueue_pcleft) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_bgqueue_battlebegins) (struct map_session_data **sd, unsigned char *arena_id, enum send_target *target); +typedef void (*HPMHOOK_post_clif_bgqueue_battlebegins) (struct map_session_data *sd, unsigned char arena_id, enum send_target target); +typedef void (*HPMHOOK_pre_clif_adopt_reply) (struct map_session_data **sd, int *type); +typedef void (*HPMHOOK_post_clif_adopt_reply) (struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_clif_adopt_request) (struct map_session_data **sd, struct map_session_data **src, int *p_id); +typedef void (*HPMHOOK_post_clif_adopt_request) (struct map_session_data *sd, struct map_session_data *src, int p_id); +typedef void (*HPMHOOK_pre_clif_readbook) (int *fd, int *book_id, int *page); +typedef void (*HPMHOOK_post_clif_readbook) (int fd, int book_id, int page); +typedef void (*HPMHOOK_pre_clif_notify_time) (struct map_session_data **sd, int64 *time); +typedef void (*HPMHOOK_post_clif_notify_time) (struct map_session_data *sd, int64 time); +typedef void (*HPMHOOK_pre_clif_user_count) (struct map_session_data **sd, int *count); +typedef void (*HPMHOOK_post_clif_user_count) (struct map_session_data *sd, int count); +typedef void (*HPMHOOK_pre_clif_noask_sub) (struct map_session_data **src, struct map_session_data **target, int *type); +typedef void (*HPMHOOK_post_clif_noask_sub) (struct map_session_data *src, struct map_session_data *target, int type); +typedef void (*HPMHOOK_pre_clif_bc_ready) (void); +typedef void (*HPMHOOK_post_clif_bc_ready) (void); +typedef void (*HPMHOOK_pre_clif_channel_msg) (struct channel_data **chan, struct map_session_data **sd, char **msg); +typedef void (*HPMHOOK_post_clif_channel_msg) (struct channel_data *chan, struct map_session_data *sd, char *msg); +typedef void (*HPMHOOK_pre_clif_channel_msg2) (struct channel_data **chan, char **msg); +typedef void (*HPMHOOK_post_clif_channel_msg2) (struct channel_data *chan, char *msg); +typedef int (*HPMHOOK_pre_clif_undisguise_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_clif_undisguise_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_clif_bank_deposit) (struct map_session_data **sd, enum e_BANKING_DEPOSIT_ACK *reason); +typedef void (*HPMHOOK_post_clif_bank_deposit) (struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK reason); +typedef void (*HPMHOOK_pre_clif_bank_withdraw) (struct map_session_data **sd, enum e_BANKING_WITHDRAW_ACK *reason); +typedef void (*HPMHOOK_post_clif_bank_withdraw) (struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK reason); +typedef void (*HPMHOOK_pre_clif_show_modifiers) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_show_modifiers) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_notify_bounditem) (struct map_session_data **sd, unsigned short *index); +typedef void (*HPMHOOK_post_clif_notify_bounditem) (struct map_session_data *sd, unsigned short index); +typedef int (*HPMHOOK_pre_clif_delay_damage) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type); +typedef int (*HPMHOOK_post_clif_delay_damage) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type); +typedef int (*HPMHOOK_pre_clif_delay_damage_sub) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_clif_delay_damage_sub) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_clif_npc_market_open) (struct map_session_data **sd, struct npc_data **nd); +typedef void (*HPMHOOK_post_clif_npc_market_open) (struct map_session_data *sd, struct npc_data *nd); +typedef void (*HPMHOOK_pre_clif_npc_market_purchase_ack) (struct map_session_data **sd, const struct itemlist **item_list, unsigned char *response); +typedef void (*HPMHOOK_post_clif_npc_market_purchase_ack) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char response); +typedef bool (*HPMHOOK_pre_clif_parse_roulette_db) (void); +typedef bool (*HPMHOOK_post_clif_parse_roulette_db) (bool retVal___); +typedef void (*HPMHOOK_pre_clif_roulette_generate_ack) (struct map_session_data **sd, unsigned char *result, short *stage, short *prizeIdx, short *bonusItemID); +typedef void (*HPMHOOK_post_clif_roulette_generate_ack) (struct map_session_data *sd, unsigned char result, short stage, short prizeIdx, short bonusItemID); +typedef void (*HPMHOOK_pre_clif_openmergeitem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_openmergeitem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_cancelmergeitem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_cancelmergeitem) (int fd, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_clif_comparemergeitem) (const void **a, const void **b); +typedef int (*HPMHOOK_post_clif_comparemergeitem) (int retVal___, const void *a, const void *b); +typedef void (*HPMHOOK_pre_clif_ackmergeitems) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_ackmergeitems) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pWantToConnection) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pWantToConnection) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pLoadEndAck) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pLoadEndAck) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pTickSend) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pTickSend) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pHotkey) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pHotkey) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pProgressbar) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pProgressbar) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pWalkToXY) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pWalkToXY) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pQuitGame) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pQuitGame) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGetCharNameRequest) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGetCharNameRequest) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGlobalMessage) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGlobalMessage) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMapMove) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMapMove) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pChangeDir) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pChangeDir) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pEmotion) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pEmotion) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pHowManyConnections) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pHowManyConnections) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pActionRequest) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pActionRequest) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pActionRequest_sub) (struct map_session_data **sd, int *action_type, int *target_id, int64 *tick); +typedef void (*HPMHOOK_post_clif_pActionRequest_sub) (struct map_session_data *sd, int action_type, int target_id, int64 tick); +typedef void (*HPMHOOK_pre_clif_pRestart) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRestart) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pWisMessage) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pWisMessage) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBroadcast) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBroadcast) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pTakeItem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pTakeItem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pDropItem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pDropItem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pUseItem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pUseItem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pEquipItem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pEquipItem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pUnequipItem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pUnequipItem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNpcClicked) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNpcClicked) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNpcBuySellSelected) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNpcBuySellSelected) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNpcBuyListSend) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNpcBuyListSend) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNpcSellListSend) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNpcSellListSend) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCreateChatRoom) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCreateChatRoom) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pChatAddMember) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pChatAddMember) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pChatRoomStatusChange) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pChatRoomStatusChange) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pChangeChatOwner) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pChangeChatOwner) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pKickFromChat) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pKickFromChat) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pChatLeave) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pChatLeave) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pTradeRequest) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pTradeRequest) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pTradeAck) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pTradeAck) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pTradeAddItem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pTradeAddItem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pTradeOk) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pTradeOk) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pTradeCancel) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pTradeCancel) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pTradeCommit) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pTradeCommit) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pStopAttack) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pStopAttack) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPutItemToCart) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPutItemToCart) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGetItemFromCart) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGetItemFromCart) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRemoveOption) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRemoveOption) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pChangeCart) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pChangeCart) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pStatusUp) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pStatusUp) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSkillUp) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSkillUp) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pUseSkillToId) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pUseSkillToId) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pUseSkillToId_homun) (struct homun_data **hd, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id); +typedef void (*HPMHOOK_post_clif_pUseSkillToId_homun) (struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id); +typedef void (*HPMHOOK_pre_clif_pUseSkillToId_mercenary) (struct mercenary_data **md, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id); +typedef void (*HPMHOOK_post_clif_pUseSkillToId_mercenary) (struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id); +typedef void (*HPMHOOK_pre_clif_pUseSkillToPos) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pUseSkillToPos) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pUseSkillToPosSub) (int *fd, struct map_session_data **sd, uint16 *skill_lv, uint16 *skill_id, short *x, short *y, int *skillmoreinfo); +typedef void (*HPMHOOK_post_clif_pUseSkillToPosSub) (int fd, struct map_session_data *sd, uint16 skill_lv, uint16 skill_id, short x, short y, int skillmoreinfo); +typedef void (*HPMHOOK_pre_clif_pUseSkillToPos_homun) (struct homun_data **hd, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *skillmoreinfo); +typedef void (*HPMHOOK_post_clif_pUseSkillToPos_homun) (struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo); +typedef void (*HPMHOOK_pre_clif_pUseSkillToPos_mercenary) (struct mercenary_data **md, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *skillmoreinfo); +typedef void (*HPMHOOK_post_clif_pUseSkillToPos_mercenary) (struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo); +typedef void (*HPMHOOK_pre_clif_pUseSkillToPosMoreInfo) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pUseSkillToPosMoreInfo) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pUseSkillMap) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pUseSkillMap) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRequestMemo) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRequestMemo) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pProduceMix) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pProduceMix) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCooking) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCooking) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRepairItem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRepairItem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pWeaponRefine) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pWeaponRefine) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNpcSelectMenu) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNpcSelectMenu) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNpcNextClicked) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNpcNextClicked) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNpcAmountInput) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNpcAmountInput) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNpcStringInput) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNpcStringInput) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNpcCloseClicked) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNpcCloseClicked) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pItemIdentify) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pItemIdentify) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSelectArrow) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSelectArrow) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAutoSpell) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAutoSpell) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pUseCard) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pUseCard) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pInsertCard) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pInsertCard) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSolveCharName) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSolveCharName) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pResetChar) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pResetChar) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pLocalBroadcast) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pLocalBroadcast) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMoveToKafra) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMoveToKafra) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMoveFromKafra) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMoveFromKafra) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMoveToKafraFromCart) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMoveToKafraFromCart) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMoveFromKafraToCart) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMoveFromKafraToCart) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCloseKafra) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCloseKafra) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pStoragePassword) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pStoragePassword) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCreateParty) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCreateParty) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCreateParty2) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCreateParty2) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyInvite) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyInvite) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyInvite2) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyInvite2) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pReplyPartyInvite) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pReplyPartyInvite) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pReplyPartyInvite2) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pReplyPartyInvite2) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pLeaveParty) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pLeaveParty) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRemovePartyMember) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRemovePartyMember) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyChangeOption) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyChangeOption) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyMessage) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyMessage) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyChangeLeader) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyChangeLeader) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyBookingRegisterReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyBookingRegisterReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyBookingSearchReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyBookingSearchReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyBookingDeleteReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyBookingDeleteReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyBookingUpdateReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyBookingUpdateReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyRecruitRegisterReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyRecruitRegisterReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyRecruitSearchReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyRecruitSearchReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyRecruitDeleteReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyRecruitDeleteReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyRecruitUpdateReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyRecruitUpdateReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCloseVending) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCloseVending) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pVendingListReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pVendingListReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPurchaseReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPurchaseReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPurchaseReq2) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPurchaseReq2) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pOpenVending) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pOpenVending) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCreateGuild) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCreateGuild) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildCheckMaster) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildCheckMaster) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildRequestInfo) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildRequestInfo) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildChangePositionInfo) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildChangePositionInfo) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildChangeMemberPosition) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildChangeMemberPosition) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildRequestEmblem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildRequestEmblem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildChangeEmblem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildChangeEmblem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildChangeNotice) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildChangeNotice) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildInvite) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildInvite) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildReplyInvite) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildReplyInvite) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildLeave) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildLeave) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildExpulsion) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildExpulsion) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildMessage) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildMessage) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildRequestAlliance) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildRequestAlliance) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildReplyAlliance) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildReplyAlliance) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildDelAlliance) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildDelAlliance) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildOpposition) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildOpposition) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildBreak) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildBreak) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPetMenu) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPetMenu) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCatchPet) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCatchPet) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSelectEgg) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSelectEgg) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSendEmotion) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSendEmotion) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pChangePetName) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pChangePetName) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMKick) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMKick) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMKickAll) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMKickAll) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMShift) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMShift) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMRemove2) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMRemove2) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMRecall) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMRecall) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMRecall2) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMRecall2) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGM_Monster_Item) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGM_Monster_Item) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMHide) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMHide) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMReqNoChat) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMReqNoChat) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMRc) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMRc) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMReqAccountName) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMReqAccountName) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMChangeMapType) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMChangeMapType) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGMFullStrip) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGMFullStrip) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPMIgnore) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPMIgnore) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPMIgnoreAll) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPMIgnoreAll) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPMIgnoreList) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPMIgnoreList) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNoviceDoriDori) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNoviceDoriDori) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNoviceExplosionSpirits) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNoviceExplosionSpirits) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pFriendsListAdd) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pFriendsListAdd) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pFriendsListReply) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pFriendsListReply) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pFriendsListRemove) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pFriendsListRemove) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPVPInfo) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPVPInfo) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBlacksmith) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBlacksmith) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAlchemist) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAlchemist) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pTaekwon) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pTaekwon) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRankingPk) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRankingPk) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pFeelSaveOk) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pFeelSaveOk) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pChangeHomunculusName) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pChangeHomunculusName) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pHomMoveToMaster) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pHomMoveToMaster) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pHomMoveTo) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pHomMoveTo) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pHomAttack) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pHomAttack) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pHomMenu) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pHomMenu) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAutoRevive) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAutoRevive) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCheck) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCheck) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMail_refreshinbox) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMail_refreshinbox) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMail_read) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMail_read) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMail_getattach) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMail_getattach) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMail_delete) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMail_delete) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMail_return) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMail_return) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMail_setattach) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMail_setattach) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMail_winopen) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMail_winopen) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMail_send) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMail_send) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAuction_cancelreg) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAuction_cancelreg) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAuction_setitem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAuction_setitem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAuction_register) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAuction_register) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAuction_cancel) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAuction_cancel) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAuction_close) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAuction_close) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAuction_bid) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAuction_bid) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAuction_search) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAuction_search) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAuction_buysell) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAuction_buysell) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pcashshop_buy) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pcashshop_buy) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAdopt_request) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAdopt_request) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pAdopt_reply) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pAdopt_reply) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pViewPlayerEquip) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pViewPlayerEquip) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pEquipTick) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pEquipTick) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pquestStateAck) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pquestStateAck) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pmercenary_action) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pmercenary_action) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBattleChat) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBattleChat) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pLessEffect) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pLessEffect) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pItemListWindowSelected) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pItemListWindowSelected) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pReqOpenBuyingStore) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pReqOpenBuyingStore) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pReqCloseBuyingStore) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pReqCloseBuyingStore) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pReqClickBuyingStore) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pReqClickBuyingStore) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pReqTradeBuyingStore) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pReqTradeBuyingStore) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSearchStoreInfo) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSearchStoreInfo) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSearchStoreInfoNextPage) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSearchStoreInfoNextPage) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCloseSearchStoreInfo) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCloseSearchStoreInfo) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSearchStoreInfoListItemClick) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSearchStoreInfoListItemClick) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pDebug) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pDebug) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSkillSelectMenu) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSkillSelectMenu) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pMoveItem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pMoveItem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pDull) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pDull) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBGQueueRegister) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBGQueueRegister) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBGQueueCheckState) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBGQueueCheckState) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBGQueueRevokeReq) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBGQueueRevokeReq) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBGQueueBattleBeginAck) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBGQueueBattleBeginAck) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCashShopOpen) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCashShopOpen) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCashShopClose) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCashShopClose) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCashShopReqTab) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCashShopReqTab) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCashShopSchedule) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCashShopSchedule) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pCashShopBuy) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pCashShopBuy) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyTick) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyTick) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pGuildInvite2) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pGuildInvite2) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyBookingAddFilter) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyBookingAddFilter) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyBookingSubFilter) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyBookingSubFilter) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyBookingReqVolunteer) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyBookingReqVolunteer) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyBookingRefuseVolunteer) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyBookingRefuseVolunteer) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pPartyBookingCancelVolunteer) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pPartyBookingCancelVolunteer) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBankDeposit) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBankDeposit) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBankWithdraw) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBankWithdraw) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBankCheck) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBankCheck) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBankOpen) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBankOpen) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pBankClose) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pBankClose) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRouletteOpen) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRouletteOpen) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRouletteInfo) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRouletteInfo) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRouletteClose) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRouletteClose) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRouletteGenerate) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRouletteGenerate) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pRouletteRecvItem) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pRouletteRecvItem) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNPCShopClosed) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNPCShopClosed) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNPCMarketClosed) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNPCMarketClosed) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pNPCMarketPurchase) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pNPCMarketPurchase) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_add_random_options) (unsigned char **buf, struct item **item); +typedef void (*HPMHOOK_post_clif_add_random_options) (unsigned char *buf, struct item *item); +typedef void (*HPMHOOK_pre_clif_pHotkeyRowShift) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pHotkeyRowShift) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_dressroom_open) (struct map_session_data **sd, int *view); +typedef void (*HPMHOOK_post_clif_dressroom_open) (struct map_session_data *sd, int view); +typedef void (*HPMHOOK_pre_clif_pOneClick_ItemIdentify) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pOneClick_ItemIdentify) (int fd, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_selectcart) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_selectcart) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_clif_pSelectCart) (int *fd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_clif_pSelectCart) (int fd, struct map_session_data *sd); +typedef const char* (*HPMHOOK_pre_clif_get_bl_name) (const struct block_list **bl); +typedef const char* (*HPMHOOK_post_clif_get_bl_name) (const char* retVal___, const struct block_list *bl); +#endif // MAP_CLIF_H +#ifdef COMMON_CORE_H /* cmdline */ +typedef void (*HPMHOOK_pre_cmdline_init) (void); +typedef void (*HPMHOOK_post_cmdline_init) (void); +typedef void (*HPMHOOK_pre_cmdline_final) (void); +typedef void (*HPMHOOK_post_cmdline_final) (void); +typedef bool (*HPMHOOK_pre_cmdline_arg_add) (unsigned int *pluginID, const char **name, char *shortname, CmdlineExecFunc *func, const char **help, unsigned int *options); +typedef bool (*HPMHOOK_post_cmdline_arg_add) (bool retVal___, unsigned int pluginID, const char *name, char shortname, CmdlineExecFunc func, const char *help, unsigned int options); +typedef int (*HPMHOOK_pre_cmdline_exec) (int *argc, char ***argv, unsigned int *options); +typedef int (*HPMHOOK_post_cmdline_exec) (int retVal___, int argc, char **argv, unsigned int options); +typedef bool (*HPMHOOK_pre_cmdline_arg_next_value) (const char **name, int *current_arg, int *argc); +typedef bool (*HPMHOOK_post_cmdline_arg_next_value) (bool retVal___, const char *name, int current_arg, int argc); +typedef const char* (*HPMHOOK_pre_cmdline_arg_source) (struct CmdlineArgData **arg); +typedef const char* (*HPMHOOK_post_cmdline_arg_source) (const char* retVal___, struct CmdlineArgData *arg); +#endif // COMMON_CORE_H +#ifdef COMMON_CONSOLE_H /* console */ +typedef void (*HPMHOOK_pre_console_init) (void); +typedef void (*HPMHOOK_post_console_init) (void); +typedef void (*HPMHOOK_pre_console_final) (void); +typedef void (*HPMHOOK_post_console_final) (void); +typedef void (*HPMHOOK_pre_console_display_title) (void); +typedef void (*HPMHOOK_post_console_display_title) (void); +typedef void (*HPMHOOK_pre_console_display_gplnotice) (void); +typedef void (*HPMHOOK_post_console_display_gplnotice) (void); +#endif // COMMON_CONSOLE_H +#ifdef COMMON_CORE_H /* core */ +typedef void (*HPMHOOK_pre_core_shutdown_callback) (void); +typedef void (*HPMHOOK_post_core_shutdown_callback) (void); +#endif // COMMON_CORE_H +#ifdef COMMON_DB_H /* DB */ +typedef enum DBOptions (*HPMHOOK_pre_DB_fix_options) (enum DBType *type, enum DBOptions *options); +typedef enum DBOptions (*HPMHOOK_post_DB_fix_options) (enum DBOptions retVal___, enum DBType type, enum DBOptions options); +typedef DBComparator (*HPMHOOK_pre_DB_default_cmp) (enum DBType *type); +typedef DBComparator (*HPMHOOK_post_DB_default_cmp) (DBComparator retVal___, enum DBType type); +typedef DBHasher (*HPMHOOK_pre_DB_default_hash) (enum DBType *type); +typedef DBHasher (*HPMHOOK_post_DB_default_hash) (DBHasher retVal___, enum DBType type); +typedef DBReleaser (*HPMHOOK_pre_DB_default_release) (enum DBType *type, enum DBOptions *options); +typedef DBReleaser (*HPMHOOK_post_DB_default_release) (DBReleaser retVal___, enum DBType type, enum DBOptions options); +typedef DBReleaser (*HPMHOOK_pre_DB_custom_release) (enum DBReleaseOption *which); +typedef DBReleaser (*HPMHOOK_post_DB_custom_release) (DBReleaser retVal___, enum DBReleaseOption which); +typedef struct DBMap* (*HPMHOOK_pre_DB_alloc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); +typedef struct DBMap* (*HPMHOOK_post_DB_alloc) (struct DBMap* retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); +typedef union DBKey (*HPMHOOK_pre_DB_i2key) (int *key); +typedef union DBKey (*HPMHOOK_post_DB_i2key) (union DBKey retVal___, int key); +typedef union DBKey (*HPMHOOK_pre_DB_ui2key) (unsigned int *key); +typedef union DBKey (*HPMHOOK_post_DB_ui2key) (union DBKey retVal___, unsigned int key); +typedef union DBKey (*HPMHOOK_pre_DB_str2key) (const char **key); +typedef union DBKey (*HPMHOOK_post_DB_str2key) (union DBKey retVal___, const char *key); +typedef union DBKey (*HPMHOOK_pre_DB_i642key) (int64 *key); +typedef union DBKey (*HPMHOOK_post_DB_i642key) (union DBKey retVal___, int64 key); +typedef union DBKey (*HPMHOOK_pre_DB_ui642key) (uint64 *key); +typedef union DBKey (*HPMHOOK_post_DB_ui642key) (union DBKey retVal___, uint64 key); +typedef struct DBData (*HPMHOOK_pre_DB_i2data) (int *data); +typedef struct DBData (*HPMHOOK_post_DB_i2data) (struct DBData retVal___, int data); +typedef struct DBData (*HPMHOOK_pre_DB_ui2data) (unsigned int *data); +typedef struct DBData (*HPMHOOK_post_DB_ui2data) (struct DBData retVal___, unsigned int data); +typedef struct DBData (*HPMHOOK_pre_DB_ptr2data) (void **data); +typedef struct DBData (*HPMHOOK_post_DB_ptr2data) (struct DBData retVal___, void *data); +typedef int (*HPMHOOK_pre_DB_data2i) (struct DBData **data); +typedef int (*HPMHOOK_post_DB_data2i) (int retVal___, struct DBData *data); +typedef unsigned int (*HPMHOOK_pre_DB_data2ui) (struct DBData **data); +typedef unsigned int (*HPMHOOK_post_DB_data2ui) (unsigned int retVal___, struct DBData *data); +typedef void* (*HPMHOOK_pre_DB_data2ptr) (struct DBData **data); +typedef void* (*HPMHOOK_post_DB_data2ptr) (void* retVal___, struct DBData *data); +typedef void (*HPMHOOK_pre_DB_init) (void); +typedef void (*HPMHOOK_post_DB_init) (void); +typedef void (*HPMHOOK_pre_DB_final) (void); +typedef void (*HPMHOOK_post_DB_final) (void); +#endif // COMMON_DB_H +#ifdef MAP_DUEL_H /* duel */ +typedef int (*HPMHOOK_pre_duel_create) (struct map_session_data **sd, const unsigned int *maxpl); +typedef int (*HPMHOOK_post_duel_create) (int retVal___, struct map_session_data *sd, const unsigned int maxpl); +typedef void (*HPMHOOK_pre_duel_invite) (const unsigned int *did, struct map_session_data **sd, struct map_session_data **target_sd); +typedef void (*HPMHOOK_post_duel_invite) (const unsigned int did, struct map_session_data *sd, struct map_session_data *target_sd); +typedef void (*HPMHOOK_pre_duel_accept) (const unsigned int *did, struct map_session_data **sd); +typedef void (*HPMHOOK_post_duel_accept) (const unsigned int did, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_duel_reject) (const unsigned int *did, struct map_session_data **sd); +typedef void (*HPMHOOK_post_duel_reject) (const unsigned int did, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_duel_leave) (const unsigned int *did, struct map_session_data **sd); +typedef void (*HPMHOOK_post_duel_leave) (const unsigned int did, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_duel_showinfo) (const unsigned int *did, struct map_session_data **sd); +typedef void (*HPMHOOK_post_duel_showinfo) (const unsigned int did, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_duel_checktime) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_duel_checktime) (int retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_duel_init) (bool *minimal); +typedef void (*HPMHOOK_post_duel_init) (bool minimal); +typedef void (*HPMHOOK_pre_duel_final) (void); +typedef void (*HPMHOOK_post_duel_final) (void); +#endif // MAP_DUEL_H +#ifdef MAP_ELEMENTAL_H /* elemental */ +typedef int (*HPMHOOK_pre_elemental_init) (bool *minimal); +typedef int (*HPMHOOK_post_elemental_init) (int retVal___, bool minimal); +typedef void (*HPMHOOK_pre_elemental_final) (void); +typedef void (*HPMHOOK_post_elemental_final) (void); +typedef bool (*HPMHOOK_pre_elemental_class) (int *class_); +typedef bool (*HPMHOOK_post_elemental_class) (bool retVal___, int class_); +typedef struct view_data* (*HPMHOOK_pre_elemental_get_viewdata) (int *class_); +typedef struct view_data* (*HPMHOOK_post_elemental_get_viewdata) (struct view_data* retVal___, int class_); +typedef int (*HPMHOOK_pre_elemental_create) (struct map_session_data **sd, int *class_, unsigned int *lifetime); +typedef int (*HPMHOOK_post_elemental_create) (int retVal___, struct map_session_data *sd, int class_, unsigned int lifetime); +typedef int (*HPMHOOK_pre_elemental_data_received) (const struct s_elemental **ele, bool *flag); +typedef int (*HPMHOOK_post_elemental_data_received) (int retVal___, const struct s_elemental *ele, bool flag); +typedef int (*HPMHOOK_pre_elemental_save) (struct elemental_data **ed); +typedef int (*HPMHOOK_post_elemental_save) (int retVal___, struct elemental_data *ed); +typedef int (*HPMHOOK_pre_elemental_change_mode_ack) (struct elemental_data **ed, int *mode); +typedef int (*HPMHOOK_post_elemental_change_mode_ack) (int retVal___, struct elemental_data *ed, int mode); +typedef int (*HPMHOOK_pre_elemental_change_mode) (struct elemental_data **ed, uint32 *mode); +typedef int (*HPMHOOK_post_elemental_change_mode) (int retVal___, struct elemental_data *ed, uint32 mode); +typedef void (*HPMHOOK_pre_elemental_heal) (struct elemental_data **ed, int *hp, int *sp); +typedef void (*HPMHOOK_post_elemental_heal) (struct elemental_data *ed, int hp, int sp); +typedef int (*HPMHOOK_pre_elemental_dead) (struct elemental_data **ed); +typedef int (*HPMHOOK_post_elemental_dead) (int retVal___, struct elemental_data *ed); +typedef int (*HPMHOOK_pre_elemental_delete) (struct elemental_data **ed, int *reply); +typedef int (*HPMHOOK_post_elemental_delete) (int retVal___, struct elemental_data *ed, int reply); +typedef void (*HPMHOOK_pre_elemental_summon_stop) (struct elemental_data **ed); +typedef void (*HPMHOOK_post_elemental_summon_stop) (struct elemental_data *ed); +typedef int (*HPMHOOK_pre_elemental_get_lifetime) (struct elemental_data **ed); +typedef int (*HPMHOOK_post_elemental_get_lifetime) (int retVal___, struct elemental_data *ed); +typedef int (*HPMHOOK_pre_elemental_unlocktarget) (struct elemental_data **ed); +typedef int (*HPMHOOK_post_elemental_unlocktarget) (int retVal___, struct elemental_data *ed); +typedef int (*HPMHOOK_pre_elemental_skillnotok) (uint16 *skill_id, struct elemental_data **ed); +typedef int (*HPMHOOK_post_elemental_skillnotok) (int retVal___, uint16 skill_id, struct elemental_data *ed); +typedef int (*HPMHOOK_pre_elemental_set_target) (struct map_session_data **sd, struct block_list **bl); +typedef int (*HPMHOOK_post_elemental_set_target) (int retVal___, struct map_session_data *sd, struct block_list *bl); +typedef int (*HPMHOOK_pre_elemental_clean_single_effect) (struct elemental_data **ed, uint16 *skill_id); +typedef int (*HPMHOOK_post_elemental_clean_single_effect) (int retVal___, struct elemental_data *ed, uint16 skill_id); +typedef int (*HPMHOOK_pre_elemental_clean_effect) (struct elemental_data **ed); +typedef int (*HPMHOOK_post_elemental_clean_effect) (int retVal___, struct elemental_data *ed); +typedef int (*HPMHOOK_pre_elemental_action) (struct elemental_data **ed, struct block_list **bl, int64 *tick); +typedef int (*HPMHOOK_post_elemental_action) (int retVal___, struct elemental_data *ed, struct block_list *bl, int64 tick); +typedef struct skill_condition (*HPMHOOK_pre_elemental_skill_get_requirements) (uint16 *skill_id, uint16 *skill_lv); +typedef struct skill_condition (*HPMHOOK_post_elemental_skill_get_requirements) (struct skill_condition retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_elemental_read_skilldb) (void); +typedef int (*HPMHOOK_post_elemental_read_skilldb) (int retVal___); +typedef void (*HPMHOOK_pre_elemental_reload_db) (void); +typedef void (*HPMHOOK_post_elemental_reload_db) (void); +typedef void (*HPMHOOK_pre_elemental_reload_skilldb) (void); +typedef void (*HPMHOOK_post_elemental_reload_skilldb) (void); +typedef int (*HPMHOOK_pre_elemental_search_index) (int *class_); +typedef int (*HPMHOOK_post_elemental_search_index) (int retVal___, int class_); +typedef void (*HPMHOOK_pre_elemental_summon_init) (struct elemental_data **ed); +typedef void (*HPMHOOK_post_elemental_summon_init) (struct elemental_data *ed); +typedef int (*HPMHOOK_pre_elemental_summon_end_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_elemental_summon_end_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_elemental_ai_sub_timer_activesearch) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_elemental_ai_sub_timer_activesearch) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_elemental_ai_sub_timer) (struct elemental_data **ed, struct map_session_data **sd, int64 *tick); +typedef int (*HPMHOOK_post_elemental_ai_sub_timer) (int retVal___, struct elemental_data *ed, struct map_session_data *sd, int64 tick); +typedef int (*HPMHOOK_pre_elemental_ai_sub_foreachclient) (struct map_session_data **sd, va_list ap); +typedef int (*HPMHOOK_post_elemental_ai_sub_foreachclient) (int retVal___, struct map_session_data *sd, va_list ap); +typedef int (*HPMHOOK_pre_elemental_ai_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_elemental_ai_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_elemental_read_db) (void); +typedef int (*HPMHOOK_post_elemental_read_db) (int retVal___); +#endif // MAP_ELEMENTAL_H +#ifdef CHAR_GEOIP_H /* geoip */ +typedef const char* (*HPMHOOK_pre_geoip_getcountry) (uint32 *ipnum); +typedef const char* (*HPMHOOK_post_geoip_getcountry) (const char* retVal___, uint32 ipnum); +typedef void (*HPMHOOK_pre_geoip_final) (bool *shutdown); +typedef void (*HPMHOOK_post_geoip_final) (bool shutdown); +typedef void (*HPMHOOK_pre_geoip_init) (void); +typedef void (*HPMHOOK_post_geoip_init) (void); +#endif // CHAR_GEOIP_H +#ifdef MAP_GUILD_H /* guild */ +typedef void (*HPMHOOK_pre_guild_init) (bool *minimal); +typedef void (*HPMHOOK_post_guild_init) (bool minimal); +typedef void (*HPMHOOK_pre_guild_final) (void); +typedef void (*HPMHOOK_post_guild_final) (void); +typedef int (*HPMHOOK_pre_guild_skill_get_max) (int *id); +typedef int (*HPMHOOK_post_guild_skill_get_max) (int retVal___, int id); +typedef int (*HPMHOOK_pre_guild_checkskill) (struct guild **g, int *id); +typedef int (*HPMHOOK_post_guild_checkskill) (int retVal___, struct guild *g, int id); +typedef int (*HPMHOOK_pre_guild_check_skill_require) (struct guild **g, int *id); +typedef int (*HPMHOOK_post_guild_check_skill_require) (int retVal___, struct guild *g, int id); +typedef int (*HPMHOOK_pre_guild_checkcastles) (struct guild **g); +typedef int (*HPMHOOK_post_guild_checkcastles) (int retVal___, struct guild *g); +typedef bool (*HPMHOOK_pre_guild_isallied) (int *guild_id, int *guild_id2); +typedef bool (*HPMHOOK_post_guild_isallied) (bool retVal___, int guild_id, int guild_id2); +typedef struct guild* (*HPMHOOK_pre_guild_search) (int *guild_id); +typedef struct guild* (*HPMHOOK_post_guild_search) (struct guild* retVal___, int guild_id); +typedef struct guild* (*HPMHOOK_pre_guild_searchname) (char **str); +typedef struct guild* (*HPMHOOK_post_guild_searchname) (struct guild* retVal___, char *str); +typedef struct guild_castle* (*HPMHOOK_pre_guild_castle_search) (int *gcid); +typedef struct guild_castle* (*HPMHOOK_post_guild_castle_search) (struct guild_castle* retVal___, int gcid); +typedef struct guild_castle* (*HPMHOOK_pre_guild_mapname2gc) (const char **mapname); +typedef struct guild_castle* (*HPMHOOK_post_guild_mapname2gc) (struct guild_castle* retVal___, const char *mapname); +typedef struct guild_castle* (*HPMHOOK_pre_guild_mapindex2gc) (short *map_index); +typedef struct guild_castle* (*HPMHOOK_post_guild_mapindex2gc) (struct guild_castle* retVal___, short map_index); +typedef struct map_session_data* (*HPMHOOK_pre_guild_getavailablesd) (struct guild **g); +typedef struct map_session_data* (*HPMHOOK_post_guild_getavailablesd) (struct map_session_data* retVal___, struct guild *g); +typedef int (*HPMHOOK_pre_guild_getindex) (const struct guild **g, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_guild_getindex) (int retVal___, const struct guild *g, int account_id, int char_id); +typedef int (*HPMHOOK_pre_guild_getposition) (struct guild **g, struct map_session_data **sd); +typedef int (*HPMHOOK_post_guild_getposition) (int retVal___, struct guild *g, struct map_session_data *sd); +typedef unsigned int (*HPMHOOK_pre_guild_payexp) (struct map_session_data **sd, unsigned int *exp); +typedef unsigned int (*HPMHOOK_post_guild_payexp) (unsigned int retVal___, struct map_session_data *sd, unsigned int exp); +typedef int (*HPMHOOK_pre_guild_getexp) (struct map_session_data **sd, int *exp); +typedef int (*HPMHOOK_post_guild_getexp) (int retVal___, struct map_session_data *sd, int exp); +typedef int (*HPMHOOK_pre_guild_create) (struct map_session_data **sd, const char **name); +typedef int (*HPMHOOK_post_guild_create) (int retVal___, struct map_session_data *sd, const char *name); +typedef int (*HPMHOOK_pre_guild_created) (int *account_id, int *guild_id); +typedef int (*HPMHOOK_post_guild_created) (int retVal___, int account_id, int guild_id); +typedef int (*HPMHOOK_pre_guild_request_info) (int *guild_id); +typedef int (*HPMHOOK_post_guild_request_info) (int retVal___, int guild_id); +typedef int (*HPMHOOK_pre_guild_recv_noinfo) (int *guild_id); +typedef int (*HPMHOOK_post_guild_recv_noinfo) (int retVal___, int guild_id); +typedef int (*HPMHOOK_pre_guild_recv_info) (const struct guild **sg); +typedef int (*HPMHOOK_post_guild_recv_info) (int retVal___, const struct guild *sg); +typedef int (*HPMHOOK_pre_guild_npc_request_info) (int *guild_id, const char **ev); +typedef int (*HPMHOOK_post_guild_npc_request_info) (int retVal___, int guild_id, const char *ev); +typedef int (*HPMHOOK_pre_guild_invite) (struct map_session_data **sd, struct map_session_data **tsd); +typedef int (*HPMHOOK_post_guild_invite) (int retVal___, struct map_session_data *sd, struct map_session_data *tsd); +typedef int (*HPMHOOK_pre_guild_reply_invite) (struct map_session_data **sd, int *guild_id, int *flag); +typedef int (*HPMHOOK_post_guild_reply_invite) (int retVal___, struct map_session_data *sd, int guild_id, int flag); +typedef void (*HPMHOOK_pre_guild_member_joined) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_guild_member_joined) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_guild_member_added) (int *guild_id, int *account_id, int *char_id, int *flag); +typedef int (*HPMHOOK_post_guild_member_added) (int retVal___, int guild_id, int account_id, int char_id, int flag); +typedef int (*HPMHOOK_pre_guild_leave) (struct map_session_data **sd, int *guild_id, int *account_id, int *char_id, const char **mes); +typedef int (*HPMHOOK_post_guild_leave) (int retVal___, struct map_session_data *sd, int guild_id, int account_id, int char_id, const char *mes); +typedef int (*HPMHOOK_pre_guild_member_withdraw) (int *guild_id, int *account_id, int *char_id, int *flag, const char **name, const char **mes); +typedef int (*HPMHOOK_post_guild_member_withdraw) (int retVal___, int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes); +typedef int (*HPMHOOK_pre_guild_expulsion) (struct map_session_data **sd, int *guild_id, int *account_id, int *char_id, const char **mes); +typedef int (*HPMHOOK_post_guild_expulsion) (int retVal___, struct map_session_data *sd, int guild_id, int account_id, int char_id, const char *mes); +typedef int (*HPMHOOK_pre_guild_skillup) (struct map_session_data **sd, uint16 *skill_id); +typedef int (*HPMHOOK_post_guild_skillup) (int retVal___, struct map_session_data *sd, uint16 skill_id); +typedef void (*HPMHOOK_pre_guild_block_skill) (struct map_session_data **sd, int *time); +typedef void (*HPMHOOK_post_guild_block_skill) (struct map_session_data *sd, int time); +typedef int (*HPMHOOK_pre_guild_reqalliance) (struct map_session_data **sd, struct map_session_data **tsd); +typedef int (*HPMHOOK_post_guild_reqalliance) (int retVal___, struct map_session_data *sd, struct map_session_data *tsd); +typedef int (*HPMHOOK_pre_guild_reply_reqalliance) (struct map_session_data **sd, int *account_id, int *flag); +typedef int (*HPMHOOK_post_guild_reply_reqalliance) (int retVal___, struct map_session_data *sd, int account_id, int flag); +typedef int (*HPMHOOK_pre_guild_allianceack) (int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag, const char **name1, const char **name2); +typedef int (*HPMHOOK_post_guild_allianceack) (int retVal___, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2); +typedef int (*HPMHOOK_pre_guild_delalliance) (struct map_session_data **sd, int *guild_id, int *flag); +typedef int (*HPMHOOK_post_guild_delalliance) (int retVal___, struct map_session_data *sd, int guild_id, int flag); +typedef int (*HPMHOOK_pre_guild_opposition) (struct map_session_data **sd, struct map_session_data **tsd); +typedef int (*HPMHOOK_post_guild_opposition) (int retVal___, struct map_session_data *sd, struct map_session_data *tsd); +typedef int (*HPMHOOK_pre_guild_check_alliance) (int *guild_id1, int *guild_id2, int *flag); +typedef int (*HPMHOOK_post_guild_check_alliance) (int retVal___, int guild_id1, int guild_id2, int flag); +typedef int (*HPMHOOK_pre_guild_send_memberinfoshort) (struct map_session_data **sd, int *online); +typedef int (*HPMHOOK_post_guild_send_memberinfoshort) (int retVal___, struct map_session_data *sd, int online); +typedef int (*HPMHOOK_pre_guild_recv_memberinfoshort) (int *guild_id, int *account_id, int *char_id, int *online, int *lv, int *class_); +typedef int (*HPMHOOK_post_guild_recv_memberinfoshort) (int retVal___, int guild_id, int account_id, int char_id, int online, int lv, int class_); +typedef int (*HPMHOOK_pre_guild_change_memberposition) (int *guild_id, int *account_id, int *char_id, short *idx); +typedef int (*HPMHOOK_post_guild_change_memberposition) (int retVal___, int guild_id, int account_id, int char_id, short idx); +typedef int (*HPMHOOK_pre_guild_memberposition_changed) (struct guild **g, int *idx, int *pos); +typedef int (*HPMHOOK_post_guild_memberposition_changed) (int retVal___, struct guild *g, int idx, int pos); +typedef int (*HPMHOOK_pre_guild_change_position) (int *guild_id, int *idx, int *mode, int *exp_mode, const char **name); +typedef int (*HPMHOOK_post_guild_change_position) (int retVal___, int guild_id, int idx, int mode, int exp_mode, const char *name); +typedef int (*HPMHOOK_pre_guild_position_changed) (int *guild_id, int *idx, const struct guild_position **p); +typedef int (*HPMHOOK_post_guild_position_changed) (int retVal___, int guild_id, int idx, const struct guild_position *p); +typedef int (*HPMHOOK_pre_guild_change_notice) (struct map_session_data **sd, int *guild_id, const char **mes1, const char **mes2); +typedef int (*HPMHOOK_post_guild_change_notice) (int retVal___, struct map_session_data *sd, int guild_id, const char *mes1, const char *mes2); +typedef int (*HPMHOOK_pre_guild_notice_changed) (int *guild_id, const char **mes1, const char **mes2); +typedef int (*HPMHOOK_post_guild_notice_changed) (int retVal___, int guild_id, const char *mes1, const char *mes2); +typedef int (*HPMHOOK_pre_guild_change_emblem) (struct map_session_data **sd, int *len, const char **data); +typedef int (*HPMHOOK_post_guild_change_emblem) (int retVal___, struct map_session_data *sd, int len, const char *data); +typedef int (*HPMHOOK_pre_guild_emblem_changed) (int *len, int *guild_id, int *emblem_id, const char **data); +typedef int (*HPMHOOK_post_guild_emblem_changed) (int retVal___, int len, int guild_id, int emblem_id, const char *data); +typedef int (*HPMHOOK_pre_guild_send_message) (struct map_session_data **sd, const char **mes); +typedef int (*HPMHOOK_post_guild_send_message) (int retVal___, struct map_session_data *sd, const char *mes); +typedef int (*HPMHOOK_pre_guild_recv_message) (int *guild_id, int *account_id, const char **mes, int *len); +typedef int (*HPMHOOK_post_guild_recv_message) (int retVal___, int guild_id, int account_id, const char *mes, int len); +typedef int (*HPMHOOK_pre_guild_send_dot_remove) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_guild_send_dot_remove) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_guild_skillupack) (int *guild_id, uint16 *skill_id, int *account_id); +typedef int (*HPMHOOK_post_guild_skillupack) (int retVal___, int guild_id, uint16 skill_id, int account_id); +typedef int (*HPMHOOK_pre_guild_dobreak) (struct map_session_data **sd, const char **name); +typedef int (*HPMHOOK_post_guild_dobreak) (int retVal___, struct map_session_data *sd, const char *name); +typedef int (*HPMHOOK_pre_guild_broken) (int *guild_id, int *flag); +typedef int (*HPMHOOK_post_guild_broken) (int retVal___, int guild_id, int flag); +typedef int (*HPMHOOK_pre_guild_gm_change) (int *guild_id, struct map_session_data **sd); +typedef int (*HPMHOOK_post_guild_gm_change) (int retVal___, int guild_id, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_guild_gm_changed) (int *guild_id, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_guild_gm_changed) (int retVal___, int guild_id, int account_id, int char_id); +typedef void (*HPMHOOK_pre_guild_castle_map_init) (void); +typedef void (*HPMHOOK_post_guild_castle_map_init) (void); +typedef int (*HPMHOOK_pre_guild_castledatasave) (int *castle_id, int *index, int *value); +typedef int (*HPMHOOK_post_guild_castledatasave) (int retVal___, int castle_id, int index, int value); +typedef int (*HPMHOOK_pre_guild_castledataloadack) (int *len, const struct guild_castle **gc); +typedef int (*HPMHOOK_post_guild_castledataloadack) (int retVal___, int len, const struct guild_castle *gc); +typedef void (*HPMHOOK_pre_guild_castle_reconnect) (int *castle_id, int *index, int *value); +typedef void (*HPMHOOK_post_guild_castle_reconnect) (int castle_id, int index, int value); +typedef void (*HPMHOOK_pre_guild_agit_start) (void); +typedef void (*HPMHOOK_post_guild_agit_start) (void); +typedef void (*HPMHOOK_pre_guild_agit_end) (void); +typedef void (*HPMHOOK_post_guild_agit_end) (void); +typedef void (*HPMHOOK_pre_guild_agit2_start) (void); +typedef void (*HPMHOOK_post_guild_agit2_start) (void); +typedef void (*HPMHOOK_pre_guild_agit2_end) (void); +typedef void (*HPMHOOK_post_guild_agit2_end) (void); +typedef void (*HPMHOOK_pre_guild_flag_add) (struct npc_data **nd); +typedef void (*HPMHOOK_post_guild_flag_add) (struct npc_data *nd); +typedef void (*HPMHOOK_pre_guild_flag_remove) (struct npc_data **nd); +typedef void (*HPMHOOK_post_guild_flag_remove) (struct npc_data *nd); +typedef void (*HPMHOOK_pre_guild_flags_clear) (void); +typedef void (*HPMHOOK_post_guild_flags_clear) (void); +typedef void (*HPMHOOK_pre_guild_aura_refresh) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); +typedef void (*HPMHOOK_post_guild_aura_refresh) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); +typedef void (*HPMHOOK_pre_guild_retrieveitembound) (int *char_id, int *aid, int *guild_id); +typedef void (*HPMHOOK_post_guild_retrieveitembound) (int char_id, int aid, int guild_id); +typedef int (*HPMHOOK_pre_guild_payexp_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_guild_payexp_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef struct map_session_data* (*HPMHOOK_pre_guild_sd_check) (int *guild_id, int *account_id, int *char_id); +typedef struct map_session_data* (*HPMHOOK_post_guild_sd_check) (struct map_session_data* retVal___, int guild_id, int account_id, int char_id); +typedef bool (*HPMHOOK_pre_guild_read_guildskill_tree_db) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_guild_read_guildskill_tree_db) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_guild_read_castledb) (char **str[], int *columns, int *current); +typedef bool (*HPMHOOK_post_guild_read_castledb) (bool retVal___, char *str[], int columns, int current); +typedef int (*HPMHOOK_pre_guild_payexp_timer_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_guild_payexp_timer_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_guild_send_xy_timer_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_guild_send_xy_timer_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_guild_send_xy_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_guild_send_xy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef struct DBData (*HPMHOOK_pre_guild_create_expcache) (union DBKey *key, va_list args); +typedef struct DBData (*HPMHOOK_post_guild_create_expcache) (struct DBData retVal___, union DBKey key, va_list args); +typedef int (*HPMHOOK_pre_guild_eventlist_db_final) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_guild_eventlist_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_guild_expcache_db_final) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_guild_expcache_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_guild_castle_db_final) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_guild_castle_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_guild_broken_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_guild_broken_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_guild_castle_broken_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_guild_castle_broken_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_guild_makemember) (struct guild_member **m, struct map_session_data **sd); +typedef void (*HPMHOOK_post_guild_makemember) (struct guild_member *m, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_guild_check_member) (const struct guild **g); +typedef int (*HPMHOOK_post_guild_check_member) (int retVal___, const struct guild *g); +typedef int (*HPMHOOK_pre_guild_get_alliance_count) (struct guild **g, int *flag); +typedef int (*HPMHOOK_post_guild_get_alliance_count) (int retVal___, struct guild *g, int flag); +typedef void (*HPMHOOK_pre_guild_castle_reconnect_sub) (void **key, void **data, va_list ap); +typedef void (*HPMHOOK_post_guild_castle_reconnect_sub) (void *key, void *data, va_list ap); +#endif // MAP_GUILD_H +#ifdef MAP_STORAGE_H /* gstorage */ +typedef struct guild_storage* (*HPMHOOK_pre_gstorage_ensure) (int *guild_id); +typedef struct guild_storage* (*HPMHOOK_post_gstorage_ensure) (struct guild_storage* retVal___, int guild_id); +typedef void (*HPMHOOK_pre_gstorage_init) (bool *minimal); +typedef void (*HPMHOOK_post_gstorage_init) (bool minimal); +typedef void (*HPMHOOK_pre_gstorage_final) (void); +typedef void (*HPMHOOK_post_gstorage_final) (void); +typedef int (*HPMHOOK_pre_gstorage_delete) (int *guild_id); +typedef int (*HPMHOOK_post_gstorage_delete) (int retVal___, int guild_id); +typedef int (*HPMHOOK_pre_gstorage_open) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_gstorage_open) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_gstorage_additem) (struct map_session_data **sd, struct guild_storage **stor, struct item **item_data, int *amount); +typedef int (*HPMHOOK_post_gstorage_additem) (int retVal___, struct map_session_data *sd, struct guild_storage *stor, struct item *item_data, int amount); +typedef int (*HPMHOOK_pre_gstorage_delitem) (struct map_session_data **sd, struct guild_storage **stor, int *n, int *amount); +typedef int (*HPMHOOK_post_gstorage_delitem) (int retVal___, struct map_session_data *sd, struct guild_storage *stor, int n, int amount); +typedef int (*HPMHOOK_pre_gstorage_add) (struct map_session_data **sd, int *index, int *amount); +typedef int (*HPMHOOK_post_gstorage_add) (int retVal___, struct map_session_data *sd, int index, int amount); +typedef int (*HPMHOOK_pre_gstorage_get) (struct map_session_data **sd, int *index, int *amount); +typedef int (*HPMHOOK_post_gstorage_get) (int retVal___, struct map_session_data *sd, int index, int amount); +typedef int (*HPMHOOK_pre_gstorage_addfromcart) (struct map_session_data **sd, int *index, int *amount); +typedef int (*HPMHOOK_post_gstorage_addfromcart) (int retVal___, struct map_session_data *sd, int index, int amount); +typedef int (*HPMHOOK_pre_gstorage_gettocart) (struct map_session_data **sd, int *index, int *amount); +typedef int (*HPMHOOK_post_gstorage_gettocart) (int retVal___, struct map_session_data *sd, int index, int amount); +typedef int (*HPMHOOK_pre_gstorage_close) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_gstorage_close) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_gstorage_pc_quit) (struct map_session_data **sd, int *flag); +typedef int (*HPMHOOK_post_gstorage_pc_quit) (int retVal___, struct map_session_data *sd, int flag); +typedef int (*HPMHOOK_pre_gstorage_save) (int *account_id, int *guild_id, int *flag); +typedef int (*HPMHOOK_post_gstorage_save) (int retVal___, int account_id, int guild_id, int flag); +typedef int (*HPMHOOK_pre_gstorage_saved) (int *guild_id); +typedef int (*HPMHOOK_post_gstorage_saved) (int retVal___, int guild_id); +typedef struct DBData (*HPMHOOK_pre_gstorage_create) (union DBKey *key, va_list args); +typedef struct DBData (*HPMHOOK_post_gstorage_create) (struct DBData retVal___, union DBKey key, va_list args); +#endif // MAP_STORAGE_H +#ifdef MAP_HOMUNCULUS_H /* homun */ +typedef void (*HPMHOOK_pre_homun_init) (bool *minimal); +typedef void (*HPMHOOK_post_homun_init) (bool minimal); +typedef void (*HPMHOOK_pre_homun_final) (void); +typedef void (*HPMHOOK_post_homun_final) (void); +typedef void (*HPMHOOK_pre_homun_reload) (void); +typedef void (*HPMHOOK_post_homun_reload) (void); +typedef void (*HPMHOOK_pre_homun_reload_skill) (void); +typedef void (*HPMHOOK_post_homun_reload_skill) (void); +typedef struct view_data* (*HPMHOOK_pre_homun_get_viewdata) (int *class_); +typedef struct view_data* (*HPMHOOK_post_homun_get_viewdata) (struct view_data* retVal___, int class_); +typedef enum homun_type (*HPMHOOK_pre_homun_class2type) (int *class_); +typedef enum homun_type (*HPMHOOK_post_homun_class2type) (enum homun_type retVal___, int class_); +typedef void (*HPMHOOK_pre_homun_damaged) (struct homun_data **hd); +typedef void (*HPMHOOK_post_homun_damaged) (struct homun_data *hd); +typedef int (*HPMHOOK_pre_homun_dead) (struct homun_data **hd); +typedef int (*HPMHOOK_post_homun_dead) (int retVal___, struct homun_data *hd); +typedef int (*HPMHOOK_pre_homun_vaporize) (struct map_session_data **sd, enum homun_state *flag); +typedef int (*HPMHOOK_post_homun_vaporize) (int retVal___, struct map_session_data *sd, enum homun_state flag); +typedef int (*HPMHOOK_pre_homun_delete) (struct homun_data **hd, int *emote); +typedef int (*HPMHOOK_post_homun_delete) (int retVal___, struct homun_data *hd, int emote); +typedef int (*HPMHOOK_pre_homun_checkskill) (struct homun_data **hd, uint16 *skill_id); +typedef int (*HPMHOOK_post_homun_checkskill) (int retVal___, struct homun_data *hd, uint16 skill_id); +typedef int (*HPMHOOK_pre_homun_calc_skilltree) (struct homun_data **hd, int *flag_evolve); +typedef int (*HPMHOOK_post_homun_calc_skilltree) (int retVal___, struct homun_data *hd, int flag_evolve); +typedef int (*HPMHOOK_pre_homun_skill_tree_get_max) (int *id, int *b_class); +typedef int (*HPMHOOK_post_homun_skill_tree_get_max) (int retVal___, int id, int b_class); +typedef void (*HPMHOOK_pre_homun_skillup) (struct homun_data **hd, uint16 *skill_id); +typedef void (*HPMHOOK_post_homun_skillup) (struct homun_data *hd, uint16 skill_id); +typedef bool (*HPMHOOK_pre_homun_levelup) (struct homun_data **hd); +typedef bool (*HPMHOOK_post_homun_levelup) (bool retVal___, struct homun_data *hd); +typedef int (*HPMHOOK_pre_homun_change_class) (struct homun_data **hd, short *class_); +typedef int (*HPMHOOK_post_homun_change_class) (int retVal___, struct homun_data *hd, short class_); +typedef bool (*HPMHOOK_pre_homun_evolve) (struct homun_data **hd); +typedef bool (*HPMHOOK_post_homun_evolve) (bool retVal___, struct homun_data *hd); +typedef bool (*HPMHOOK_pre_homun_mutate) (struct homun_data **hd, int *homun_id); +typedef bool (*HPMHOOK_post_homun_mutate) (bool retVal___, struct homun_data *hd, int homun_id); +typedef int (*HPMHOOK_pre_homun_gainexp) (struct homun_data **hd, unsigned int *exp); +typedef int (*HPMHOOK_post_homun_gainexp) (int retVal___, struct homun_data *hd, unsigned int exp); +typedef unsigned int (*HPMHOOK_pre_homun_add_intimacy) (struct homun_data **hd, unsigned int *value); +typedef unsigned int (*HPMHOOK_post_homun_add_intimacy) (unsigned int retVal___, struct homun_data *hd, unsigned int value); +typedef unsigned int (*HPMHOOK_pre_homun_consume_intimacy) (struct homun_data **hd, unsigned int *value); +typedef unsigned int (*HPMHOOK_post_homun_consume_intimacy) (unsigned int retVal___, struct homun_data *hd, unsigned int value); +typedef void (*HPMHOOK_pre_homun_healed) (struct homun_data **hd); +typedef void (*HPMHOOK_post_homun_healed) (struct homun_data *hd); +typedef void (*HPMHOOK_pre_homun_save) (struct homun_data **hd); +typedef void (*HPMHOOK_post_homun_save) (struct homun_data *hd); +typedef unsigned char (*HPMHOOK_pre_homun_menu) (struct map_session_data **sd, unsigned char *menu_num); +typedef unsigned char (*HPMHOOK_post_homun_menu) (unsigned char retVal___, struct map_session_data *sd, unsigned char menu_num); +typedef bool (*HPMHOOK_pre_homun_feed) (struct map_session_data **sd, struct homun_data **hd); +typedef bool (*HPMHOOK_post_homun_feed) (bool retVal___, struct map_session_data *sd, struct homun_data *hd); +typedef int (*HPMHOOK_pre_homun_hunger_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_homun_hunger_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_homun_hunger_timer_delete) (struct homun_data **hd); +typedef void (*HPMHOOK_post_homun_hunger_timer_delete) (struct homun_data *hd); +typedef int (*HPMHOOK_pre_homun_change_name) (struct map_session_data **sd, const char **name); +typedef int (*HPMHOOK_post_homun_change_name) (int retVal___, struct map_session_data *sd, const char *name); +typedef bool (*HPMHOOK_pre_homun_change_name_ack) (struct map_session_data **sd, const char **name, int *flag); +typedef bool (*HPMHOOK_post_homun_change_name_ack) (bool retVal___, struct map_session_data *sd, const char *name, int flag); +typedef int (*HPMHOOK_pre_homun_db_search) (int *key, int *type); +typedef int (*HPMHOOK_post_homun_db_search) (int retVal___, int key, int type); +typedef bool (*HPMHOOK_pre_homun_create) (struct map_session_data **sd, const struct s_homunculus **hom); +typedef bool (*HPMHOOK_post_homun_create) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom); +typedef void (*HPMHOOK_pre_homun_init_timers) (struct homun_data **hd); +typedef void (*HPMHOOK_post_homun_init_timers) (struct homun_data *hd); +typedef bool (*HPMHOOK_pre_homun_call) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_homun_call) (bool retVal___, struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_homun_recv_data) (int *account_id, const struct s_homunculus **sh, int *flag); +typedef bool (*HPMHOOK_post_homun_recv_data) (bool retVal___, int account_id, const struct s_homunculus *sh, int flag); +typedef bool (*HPMHOOK_pre_homun_creation_request) (struct map_session_data **sd, int *class_); +typedef bool (*HPMHOOK_post_homun_creation_request) (bool retVal___, struct map_session_data *sd, int class_); +typedef bool (*HPMHOOK_pre_homun_ressurect) (struct map_session_data **sd, unsigned char *per, short *x, short *y); +typedef bool (*HPMHOOK_post_homun_ressurect) (bool retVal___, struct map_session_data *sd, unsigned char per, short x, short y); +typedef void (*HPMHOOK_pre_homun_revive) (struct homun_data **hd, unsigned int *hp, unsigned int *sp); +typedef void (*HPMHOOK_post_homun_revive) (struct homun_data *hd, unsigned int hp, unsigned int sp); +typedef void (*HPMHOOK_pre_homun_stat_reset) (struct homun_data **hd); +typedef void (*HPMHOOK_post_homun_stat_reset) (struct homun_data *hd); +typedef bool (*HPMHOOK_pre_homun_shuffle) (struct homun_data **hd); +typedef bool (*HPMHOOK_post_homun_shuffle) (bool retVal___, struct homun_data *hd); +typedef bool (*HPMHOOK_pre_homun_read_db_sub) (char **str[], int *columns, int *current); +typedef bool (*HPMHOOK_post_homun_read_db_sub) (bool retVal___, char *str[], int columns, int current); +typedef void (*HPMHOOK_pre_homun_read_db) (void); +typedef void (*HPMHOOK_post_homun_read_db) (void); +typedef bool (*HPMHOOK_pre_homun_read_skill_db_sub) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_homun_read_skill_db_sub) (bool retVal___, char *split[], int columns, int current); +typedef void (*HPMHOOK_pre_homun_skill_db_read) (void); +typedef void (*HPMHOOK_post_homun_skill_db_read) (void); +typedef void (*HPMHOOK_pre_homun_exp_db_read) (void); +typedef void (*HPMHOOK_post_homun_exp_db_read) (void); +typedef void (*HPMHOOK_pre_homun_addspiritball) (struct homun_data **hd, int *max); +typedef void (*HPMHOOK_post_homun_addspiritball) (struct homun_data *hd, int max); +typedef void (*HPMHOOK_pre_homun_delspiritball) (struct homun_data **hd, int *count, int *type); +typedef void (*HPMHOOK_post_homun_delspiritball) (struct homun_data *hd, int count, int type); +typedef int8 (*HPMHOOK_pre_homun_get_intimacy_grade) (struct homun_data **hd); +typedef int8 (*HPMHOOK_post_homun_get_intimacy_grade) (int8 retVal___, struct homun_data *hd); +#endif // MAP_HOMUNCULUS_H +#ifdef MAP_INSTANCE_H /* instance */ +typedef void (*HPMHOOK_pre_instance_init) (bool *minimal); +typedef void (*HPMHOOK_post_instance_init) (bool minimal); +typedef void (*HPMHOOK_pre_instance_final) (void); +typedef void (*HPMHOOK_post_instance_final) (void); +typedef void (*HPMHOOK_pre_instance_reload) (void); +typedef void (*HPMHOOK_post_instance_reload) (void); +typedef int (*HPMHOOK_pre_instance_create) (int *party_id, const char **name, enum instance_owner_type *type); +typedef int (*HPMHOOK_post_instance_create) (int retVal___, int party_id, const char *name, enum instance_owner_type type); +typedef int (*HPMHOOK_pre_instance_add_map) (const char **name, int *instance_id, bool *usebasename, const char **map_name); +typedef int (*HPMHOOK_post_instance_add_map) (int retVal___, const char *name, int instance_id, bool usebasename, const char *map_name); +typedef void (*HPMHOOK_pre_instance_del_map) (int16 *m); +typedef void (*HPMHOOK_post_instance_del_map) (int16 m); +typedef int (*HPMHOOK_pre_instance_map2imap) (int16 *m, int *instance_id); +typedef int (*HPMHOOK_post_instance_map2imap) (int retVal___, int16 m, int instance_id); +typedef int (*HPMHOOK_pre_instance_mapid2imapid) (int16 *m, int *instance_id); +typedef int (*HPMHOOK_post_instance_mapid2imapid) (int retVal___, int16 m, int instance_id); +typedef int (*HPMHOOK_pre_instance_mapname2imap) (const char **map_name, int *instance_id); +typedef int (*HPMHOOK_post_instance_mapname2imap) (int retVal___, const char *map_name, int instance_id); +typedef int (*HPMHOOK_pre_instance_map_npcsub) (struct block_list **bl, va_list args); +typedef int (*HPMHOOK_post_instance_map_npcsub) (int retVal___, struct block_list *bl, va_list args); +typedef int (*HPMHOOK_pre_instance_init_npc) (struct block_list **bl, va_list args); +typedef int (*HPMHOOK_post_instance_init_npc) (int retVal___, struct block_list *bl, va_list args); +typedef void (*HPMHOOK_pre_instance_destroy) (int *instance_id); +typedef void (*HPMHOOK_post_instance_destroy) (int instance_id); +typedef void (*HPMHOOK_pre_instance_start) (int *instance_id); +typedef void (*HPMHOOK_post_instance_start) (int instance_id); +typedef void (*HPMHOOK_pre_instance_check_idle) (int *instance_id); +typedef void (*HPMHOOK_post_instance_check_idle) (int instance_id); +typedef void (*HPMHOOK_pre_instance_check_kick) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_instance_check_kick) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_instance_set_timeout) (int *instance_id, unsigned int *progress_timeout, unsigned int *idle_timeout); +typedef void (*HPMHOOK_post_instance_set_timeout) (int instance_id, unsigned int progress_timeout, unsigned int idle_timeout); +typedef bool (*HPMHOOK_pre_instance_valid) (int *instance_id); +typedef bool (*HPMHOOK_post_instance_valid) (bool retVal___, int instance_id); +typedef int (*HPMHOOK_pre_instance_destroy_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_instance_destroy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +#endif // MAP_INSTANCE_H +#ifdef CHAR_INT_AUCTION_H /* inter_auction */ +typedef int (*HPMHOOK_pre_inter_auction_count) (int *char_id, bool *buy); +typedef int (*HPMHOOK_post_inter_auction_count) (int retVal___, int char_id, bool buy); +typedef void (*HPMHOOK_pre_inter_auction_save) (struct auction_data **auction); +typedef void (*HPMHOOK_post_inter_auction_save) (struct auction_data *auction); +typedef unsigned int (*HPMHOOK_pre_inter_auction_create) (struct auction_data **auction); +typedef unsigned int (*HPMHOOK_post_inter_auction_create) (unsigned int retVal___, struct auction_data *auction); +typedef int (*HPMHOOK_pre_inter_auction_end_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_inter_auction_end_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_inter_auction_delete_) (struct auction_data **auction); +typedef void (*HPMHOOK_post_inter_auction_delete_) (struct auction_data *auction); +typedef void (*HPMHOOK_pre_inter_auction_fromsql) (void); +typedef void (*HPMHOOK_post_inter_auction_fromsql) (void); +typedef int (*HPMHOOK_pre_inter_auction_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_auction_parse_frommap) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_inter_auction_sql_init) (void); +typedef int (*HPMHOOK_post_inter_auction_sql_init) (int retVal___); +typedef void (*HPMHOOK_pre_inter_auction_sql_final) (void); +typedef void (*HPMHOOK_post_inter_auction_sql_final) (void); +#endif // CHAR_INT_AUCTION_H +#ifdef CHAR_INT_ELEMENTAL_H /* inter_elemental */ +typedef void (*HPMHOOK_pre_inter_elemental_sql_init) (void); +typedef void (*HPMHOOK_post_inter_elemental_sql_init) (void); +typedef void (*HPMHOOK_pre_inter_elemental_sql_final) (void); +typedef void (*HPMHOOK_post_inter_elemental_sql_final) (void); +typedef int (*HPMHOOK_pre_inter_elemental_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_elemental_parse_frommap) (int retVal___, int fd); +#endif // CHAR_INT_ELEMENTAL_H +#ifdef CHAR_INT_GUILD_H /* inter_guild */ +typedef int (*HPMHOOK_pre_inter_guild_save_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_inter_guild_save_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_inter_guild_removemember_tosql) (int *account_id, int *char_id); +typedef int (*HPMHOOK_post_inter_guild_removemember_tosql) (int retVal___, int account_id, int char_id); +typedef int (*HPMHOOK_pre_inter_guild_tosql) (struct guild **g, int *flag); +typedef int (*HPMHOOK_post_inter_guild_tosql) (int retVal___, struct guild *g, int flag); +typedef struct guild* (*HPMHOOK_pre_inter_guild_fromsql) (int *guild_id); +typedef struct guild* (*HPMHOOK_post_inter_guild_fromsql) (struct guild* retVal___, int guild_id); +typedef int (*HPMHOOK_pre_inter_guild_castle_tosql) (struct guild_castle **gc); +typedef int (*HPMHOOK_post_inter_guild_castle_tosql) (int retVal___, struct guild_castle *gc); +typedef struct guild_castle* (*HPMHOOK_pre_inter_guild_castle_fromsql) (int *castle_id); +typedef struct guild_castle* (*HPMHOOK_post_inter_guild_castle_fromsql) (struct guild_castle* retVal___, int castle_id); +typedef bool (*HPMHOOK_pre_inter_guild_exp_parse_row) (char **split[], int *column, int *current); +typedef bool (*HPMHOOK_post_inter_guild_exp_parse_row) (bool retVal___, char *split[], int column, int current); +typedef int (*HPMHOOK_pre_inter_guild_CharOnline) (int *char_id, int *guild_id); +typedef int (*HPMHOOK_post_inter_guild_CharOnline) (int retVal___, int char_id, int guild_id); +typedef int (*HPMHOOK_pre_inter_guild_CharOffline) (int *char_id, int *guild_id); +typedef int (*HPMHOOK_post_inter_guild_CharOffline) (int retVal___, int char_id, int guild_id); +typedef int (*HPMHOOK_pre_inter_guild_sql_init) (void); +typedef int (*HPMHOOK_post_inter_guild_sql_init) (int retVal___); +typedef int (*HPMHOOK_pre_inter_guild_db_final) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_inter_guild_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_inter_guild_sql_final) (void); +typedef void (*HPMHOOK_post_inter_guild_sql_final) (void); +typedef int (*HPMHOOK_pre_inter_guild_search_guildname) (const char **str); +typedef int (*HPMHOOK_post_inter_guild_search_guildname) (int retVal___, const char *str); +typedef bool (*HPMHOOK_pre_inter_guild_check_empty) (struct guild **g); +typedef bool (*HPMHOOK_post_inter_guild_check_empty) (bool retVal___, struct guild *g); +typedef unsigned int (*HPMHOOK_pre_inter_guild_nextexp) (int *level); +typedef unsigned int (*HPMHOOK_post_inter_guild_nextexp) (unsigned int retVal___, int level); +typedef int (*HPMHOOK_pre_inter_guild_checkskill) (struct guild **g, int *id); +typedef int (*HPMHOOK_post_inter_guild_checkskill) (int retVal___, struct guild *g, int id); +typedef int (*HPMHOOK_pre_inter_guild_calcinfo) (struct guild **g); +typedef int (*HPMHOOK_post_inter_guild_calcinfo) (int retVal___, struct guild *g); +typedef int (*HPMHOOK_pre_inter_guild_sex_changed) (int *guild_id, int *account_id, int *char_id, short *gender); +typedef int (*HPMHOOK_post_inter_guild_sex_changed) (int retVal___, int guild_id, int account_id, int char_id, short gender); +typedef int (*HPMHOOK_pre_inter_guild_charname_changed) (int *guild_id, int *account_id, int *char_id, char **name); +typedef int (*HPMHOOK_post_inter_guild_charname_changed) (int retVal___, int guild_id, int account_id, int char_id, char *name); +typedef int (*HPMHOOK_pre_inter_guild_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_guild_parse_frommap) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_inter_guild_leave) (int *guild_id, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_inter_guild_leave) (int retVal___, int guild_id, int account_id, int char_id); +typedef int (*HPMHOOK_pre_inter_guild_broken) (int *guild_id); +typedef int (*HPMHOOK_post_inter_guild_broken) (int retVal___, int guild_id); +#endif // CHAR_INT_GUILD_H +#ifdef CHAR_INT_HOMUN_H /* inter_homunculus */ +typedef int (*HPMHOOK_pre_inter_homunculus_sql_init) (void); +typedef int (*HPMHOOK_post_inter_homunculus_sql_init) (int retVal___); +typedef void (*HPMHOOK_pre_inter_homunculus_sql_final) (void); +typedef void (*HPMHOOK_post_inter_homunculus_sql_final) (void); +typedef int (*HPMHOOK_pre_inter_homunculus_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_homunculus_parse_frommap) (int retVal___, int fd); +#endif // CHAR_INT_HOMUN_H +#ifdef CHAR_INTER_H /* inter */ +typedef const char* (*HPMHOOK_pre_inter_msg_txt) (int *msg_number); +typedef const char* (*HPMHOOK_post_inter_msg_txt) (const char* retVal___, int msg_number); +typedef bool (*HPMHOOK_pre_inter_msg_config_read) (const char **cfg_name, bool *allow_override); +typedef bool (*HPMHOOK_post_inter_msg_config_read) (bool retVal___, const char *cfg_name, bool allow_override); +typedef void (*HPMHOOK_pre_inter_do_final_msg) (void); +typedef void (*HPMHOOK_post_inter_do_final_msg) (void); +typedef const char* (*HPMHOOK_pre_inter_job_name) (int *class_); +typedef const char* (*HPMHOOK_post_inter_job_name) (const char* retVal___, int class_); +typedef void (*HPMHOOK_pre_inter_vmsg_to_fd) (int *fd, int *u_fd, int *aid, char **msg, va_list ap); +typedef void (*HPMHOOK_post_inter_vmsg_to_fd) (int fd, int u_fd, int aid, char *msg, va_list ap); +typedef void (*HPMHOOK_pre_inter_savereg) (int *account_id, int *char_id, const char **key, unsigned int *index, intptr_t *val, bool *is_string); +typedef void (*HPMHOOK_post_inter_savereg) (int account_id, int char_id, const char *key, unsigned int index, intptr_t val, bool is_string); +typedef int (*HPMHOOK_pre_inter_accreg_fromsql) (int *account_id, int *char_id, int *fd, int *type); +typedef int (*HPMHOOK_post_inter_accreg_fromsql) (int retVal___, int account_id, int char_id, int fd, int type); +typedef int (*HPMHOOK_pre_inter_config_read) (const char **cfgName); +typedef int (*HPMHOOK_post_inter_config_read) (int retVal___, const char *cfgName); +typedef int (*HPMHOOK_pre_inter_vlog) (char **fmt, va_list ap); +typedef int (*HPMHOOK_post_inter_vlog) (int retVal___, char *fmt, va_list ap); +typedef int (*HPMHOOK_pre_inter_init_sql) (const char **file); +typedef int (*HPMHOOK_post_inter_init_sql) (int retVal___, const char *file); +typedef int (*HPMHOOK_pre_inter_mapif_init) (int *fd); +typedef int (*HPMHOOK_post_inter_mapif_init) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_inter_check_ttl_wisdata_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_inter_check_ttl_wisdata_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_inter_check_ttl_wisdata) (void); +typedef int (*HPMHOOK_post_inter_check_ttl_wisdata) (int retVal___); +typedef int (*HPMHOOK_pre_inter_check_length) (int *fd, int *length); +typedef int (*HPMHOOK_post_inter_check_length) (int retVal___, int fd, int length); +typedef int (*HPMHOOK_pre_inter_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_parse_frommap) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_inter_final) (void); +typedef void (*HPMHOOK_post_inter_final) (void); +#endif // CHAR_INTER_H +#ifdef CHAR_INT_MAIL_H /* inter_mail */ +typedef int (*HPMHOOK_pre_inter_mail_sql_init) (void); +typedef int (*HPMHOOK_post_inter_mail_sql_init) (int retVal___); +typedef void (*HPMHOOK_pre_inter_mail_sql_final) (void); +typedef void (*HPMHOOK_post_inter_mail_sql_final) (void); +typedef int (*HPMHOOK_pre_inter_mail_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_mail_parse_frommap) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_inter_mail_fromsql) (int *char_id, struct mail_data **md); +typedef int (*HPMHOOK_post_inter_mail_fromsql) (int retVal___, int char_id, struct mail_data *md); +typedef int (*HPMHOOK_pre_inter_mail_savemessage) (struct mail_message **msg); +typedef int (*HPMHOOK_post_inter_mail_savemessage) (int retVal___, struct mail_message *msg); +typedef bool (*HPMHOOK_pre_inter_mail_loadmessage) (int *mail_id, struct mail_message **msg); +typedef bool (*HPMHOOK_post_inter_mail_loadmessage) (bool retVal___, int mail_id, struct mail_message *msg); +typedef bool (*HPMHOOK_pre_inter_mail_DeleteAttach) (int *mail_id); +typedef bool (*HPMHOOK_post_inter_mail_DeleteAttach) (bool retVal___, int mail_id); +typedef void (*HPMHOOK_pre_inter_mail_sendmail) (int *send_id, const char **send_name, int *dest_id, const char **dest_name, const char **title, const char **body, int *zeny, struct item **item); +typedef void (*HPMHOOK_post_inter_mail_sendmail) (int send_id, const char *send_name, int dest_id, const char *dest_name, const char *title, const char *body, int zeny, struct item *item); +#endif // CHAR_INT_MAIL_H +#ifdef CHAR_INT_MERCENARY_H /* inter_mercenary */ +typedef bool (*HPMHOOK_pre_inter_mercenary_owner_fromsql) (int *char_id, struct mmo_charstatus **status); +typedef bool (*HPMHOOK_post_inter_mercenary_owner_fromsql) (bool retVal___, int char_id, struct mmo_charstatus *status); +typedef bool (*HPMHOOK_pre_inter_mercenary_owner_tosql) (int *char_id, struct mmo_charstatus **status); +typedef bool (*HPMHOOK_post_inter_mercenary_owner_tosql) (bool retVal___, int char_id, struct mmo_charstatus *status); +typedef bool (*HPMHOOK_pre_inter_mercenary_owner_delete) (int *char_id); +typedef bool (*HPMHOOK_post_inter_mercenary_owner_delete) (bool retVal___, int char_id); +typedef int (*HPMHOOK_pre_inter_mercenary_sql_init) (void); +typedef int (*HPMHOOK_post_inter_mercenary_sql_init) (int retVal___); +typedef void (*HPMHOOK_pre_inter_mercenary_sql_final) (void); +typedef void (*HPMHOOK_post_inter_mercenary_sql_final) (void); +typedef int (*HPMHOOK_pre_inter_mercenary_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_mercenary_parse_frommap) (int retVal___, int fd); +#endif // CHAR_INT_MERCENARY_H +#ifdef CHAR_INT_PARTY_H /* inter_party */ +typedef int (*HPMHOOK_pre_inter_party_check_lv) (struct party_data **p); +typedef int (*HPMHOOK_post_inter_party_check_lv) (int retVal___, struct party_data *p); +typedef void (*HPMHOOK_pre_inter_party_calc_state) (struct party_data **p); +typedef void (*HPMHOOK_post_inter_party_calc_state) (struct party_data *p); +typedef int (*HPMHOOK_pre_inter_party_tosql) (struct party **p, int *flag, int *index); +typedef int (*HPMHOOK_post_inter_party_tosql) (int retVal___, struct party *p, int flag, int index); +typedef struct party_data* (*HPMHOOK_pre_inter_party_fromsql) (int *party_id); +typedef struct party_data* (*HPMHOOK_post_inter_party_fromsql) (struct party_data* retVal___, int party_id); +typedef int (*HPMHOOK_pre_inter_party_sql_init) (void); +typedef int (*HPMHOOK_post_inter_party_sql_init) (int retVal___); +typedef void (*HPMHOOK_pre_inter_party_sql_final) (void); +typedef void (*HPMHOOK_post_inter_party_sql_final) (void); +typedef struct party_data* (*HPMHOOK_pre_inter_party_search_partyname) (const char **str); +typedef struct party_data* (*HPMHOOK_post_inter_party_search_partyname) (struct party_data* retVal___, const char *str); +typedef int (*HPMHOOK_pre_inter_party_check_exp_share) (struct party_data **p); +typedef int (*HPMHOOK_post_inter_party_check_exp_share) (int retVal___, struct party_data *p); +typedef int (*HPMHOOK_pre_inter_party_check_empty) (struct party_data **p); +typedef int (*HPMHOOK_post_inter_party_check_empty) (int retVal___, struct party_data *p); +typedef int (*HPMHOOK_pre_inter_party_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_party_parse_frommap) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_inter_party_leave) (int *party_id, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_inter_party_leave) (int retVal___, int party_id, int account_id, int char_id); +typedef int (*HPMHOOK_pre_inter_party_CharOnline) (int *char_id, int *party_id); +typedef int (*HPMHOOK_post_inter_party_CharOnline) (int retVal___, int char_id, int party_id); +typedef int (*HPMHOOK_pre_inter_party_CharOffline) (int *char_id, int *party_id); +typedef int (*HPMHOOK_post_inter_party_CharOffline) (int retVal___, int char_id, int party_id); +#endif // CHAR_INT_PARTY_H +#ifdef CHAR_INT_PET_H /* inter_pet */ +typedef int (*HPMHOOK_pre_inter_pet_tosql) (const struct s_pet **p); +typedef int (*HPMHOOK_post_inter_pet_tosql) (int retVal___, const struct s_pet *p); +typedef int (*HPMHOOK_pre_inter_pet_fromsql) (int *pet_id, struct s_pet **p); +typedef int (*HPMHOOK_post_inter_pet_fromsql) (int retVal___, int pet_id, struct s_pet *p); +typedef int (*HPMHOOK_pre_inter_pet_sql_init) (void); +typedef int (*HPMHOOK_post_inter_pet_sql_init) (int retVal___); +typedef void (*HPMHOOK_pre_inter_pet_sql_final) (void); +typedef void (*HPMHOOK_post_inter_pet_sql_final) (void); +typedef int (*HPMHOOK_pre_inter_pet_delete_) (int *pet_id); +typedef int (*HPMHOOK_post_inter_pet_delete_) (int retVal___, int pet_id); +typedef int (*HPMHOOK_pre_inter_pet_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_pet_parse_frommap) (int retVal___, int fd); +#endif // CHAR_INT_PET_H +#ifdef CHAR_INT_QUEST_H /* inter_quest */ +typedef int (*HPMHOOK_pre_inter_quest_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_quest_parse_frommap) (int retVal___, int fd); +#endif // CHAR_INT_QUEST_H +#ifdef CHAR_INT_STORAGE_H /* inter_storage */ +typedef int (*HPMHOOK_pre_inter_storage_tosql) (int *account_id, struct storage_data **p); +typedef int (*HPMHOOK_post_inter_storage_tosql) (int retVal___, int account_id, struct storage_data *p); +typedef int (*HPMHOOK_pre_inter_storage_fromsql) (int *account_id, struct storage_data **p); +typedef int (*HPMHOOK_post_inter_storage_fromsql) (int retVal___, int account_id, struct storage_data *p); +typedef int (*HPMHOOK_pre_inter_storage_guild_storage_tosql) (int *guild_id, const struct guild_storage **p); +typedef int (*HPMHOOK_post_inter_storage_guild_storage_tosql) (int retVal___, int guild_id, const struct guild_storage *p); +typedef int (*HPMHOOK_pre_inter_storage_guild_storage_fromsql) (int *guild_id, struct guild_storage **p); +typedef int (*HPMHOOK_post_inter_storage_guild_storage_fromsql) (int retVal___, int guild_id, struct guild_storage *p); +typedef int (*HPMHOOK_pre_inter_storage_sql_init) (void); +typedef int (*HPMHOOK_post_inter_storage_sql_init) (int retVal___); +typedef void (*HPMHOOK_pre_inter_storage_sql_final) (void); +typedef void (*HPMHOOK_post_inter_storage_sql_final) (void); +typedef int (*HPMHOOK_pre_inter_storage_delete_) (int *account_id); +typedef int (*HPMHOOK_post_inter_storage_delete_) (int retVal___, int account_id); +typedef int (*HPMHOOK_pre_inter_storage_guild_storage_delete) (int *guild_id); +typedef int (*HPMHOOK_post_inter_storage_guild_storage_delete) (int retVal___, int guild_id); +typedef int (*HPMHOOK_pre_inter_storage_parse_frommap) (int *fd); +typedef int (*HPMHOOK_post_inter_storage_parse_frommap) (int retVal___, int fd); +#endif // CHAR_INT_STORAGE_H +#ifdef MAP_INTIF_H /* intif */ +typedef int (*HPMHOOK_pre_intif_parse) (int *fd); +typedef int (*HPMHOOK_post_intif_parse) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_intif_create_pet) (int *account_id, int *char_id, short *pet_type, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, char **pet_name); +typedef int (*HPMHOOK_post_intif_create_pet) (int retVal___, int account_id, int char_id, short pet_type, short pet_lv, short pet_egg_id, short pet_equip, short intimate, short hungry, char rename_flag, char incubate, char *pet_name); +typedef int (*HPMHOOK_pre_intif_broadcast) (const char **mes, int *len, int *type); +typedef int (*HPMHOOK_post_intif_broadcast) (int retVal___, const char *mes, int len, int type); +typedef int (*HPMHOOK_pre_intif_broadcast2) (const char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY); +typedef int (*HPMHOOK_post_intif_broadcast2) (int retVal___, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY); +typedef int (*HPMHOOK_pre_intif_main_message) (struct map_session_data **sd, const char **message); +typedef int (*HPMHOOK_post_intif_main_message) (int retVal___, struct map_session_data *sd, const char *message); +typedef int (*HPMHOOK_pre_intif_wis_message) (struct map_session_data **sd, const char **nick, const char **mes, int *mes_len); +typedef int (*HPMHOOK_post_intif_wis_message) (int retVal___, struct map_session_data *sd, const char *nick, const char *mes, int mes_len); +typedef int (*HPMHOOK_pre_intif_wis_message_to_gm) (char **Wisp_name, int *permission, char **mes); +typedef int (*HPMHOOK_post_intif_wis_message_to_gm) (int retVal___, char *Wisp_name, int permission, char *mes); +typedef int (*HPMHOOK_pre_intif_saveregistry) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_intif_saveregistry) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_intif_request_registry) (struct map_session_data **sd, int *flag); +typedef int (*HPMHOOK_post_intif_request_registry) (int retVal___, struct map_session_data *sd, int flag); +typedef int (*HPMHOOK_pre_intif_request_guild_storage) (int *account_id, int *guild_id); +typedef int (*HPMHOOK_post_intif_request_guild_storage) (int retVal___, int account_id, int guild_id); +typedef int (*HPMHOOK_pre_intif_send_guild_storage) (int *account_id, struct guild_storage **gstor); +typedef int (*HPMHOOK_post_intif_send_guild_storage) (int retVal___, int account_id, struct guild_storage *gstor); +typedef int (*HPMHOOK_pre_intif_create_party) (struct party_member **member, const char **name, int *item, int *item2); +typedef int (*HPMHOOK_post_intif_create_party) (int retVal___, struct party_member *member, const char *name, int item, int item2); +typedef int (*HPMHOOK_pre_intif_request_partyinfo) (int *party_id, int *char_id); +typedef int (*HPMHOOK_post_intif_request_partyinfo) (int retVal___, int party_id, int char_id); +typedef int (*HPMHOOK_pre_intif_party_addmember) (int *party_id, struct party_member **member); +typedef int (*HPMHOOK_post_intif_party_addmember) (int retVal___, int party_id, struct party_member *member); +typedef int (*HPMHOOK_pre_intif_party_changeoption) (int *party_id, int *account_id, int *exp, int *item); +typedef int (*HPMHOOK_post_intif_party_changeoption) (int retVal___, int party_id, int account_id, int exp, int item); +typedef int (*HPMHOOK_pre_intif_party_leave) (int *party_id, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_intif_party_leave) (int retVal___, int party_id, int account_id, int char_id); +typedef int (*HPMHOOK_pre_intif_party_changemap) (struct map_session_data **sd, int *online); +typedef int (*HPMHOOK_post_intif_party_changemap) (int retVal___, struct map_session_data *sd, int online); +typedef int (*HPMHOOK_pre_intif_break_party) (int *party_id); +typedef int (*HPMHOOK_post_intif_break_party) (int retVal___, int party_id); +typedef int (*HPMHOOK_pre_intif_party_message) (int *party_id, int *account_id, const char **mes, int *len); +typedef int (*HPMHOOK_post_intif_party_message) (int retVal___, int party_id, int account_id, const char *mes, int len); +typedef int (*HPMHOOK_pre_intif_party_leaderchange) (int *party_id, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_intif_party_leaderchange) (int retVal___, int party_id, int account_id, int char_id); +typedef int (*HPMHOOK_pre_intif_guild_create) (const char **name, const struct guild_member **master); +typedef int (*HPMHOOK_post_intif_guild_create) (int retVal___, const char *name, const struct guild_member *master); +typedef int (*HPMHOOK_pre_intif_guild_request_info) (int *guild_id); +typedef int (*HPMHOOK_post_intif_guild_request_info) (int retVal___, int guild_id); +typedef int (*HPMHOOK_pre_intif_guild_addmember) (int *guild_id, struct guild_member **m); +typedef int (*HPMHOOK_post_intif_guild_addmember) (int retVal___, int guild_id, struct guild_member *m); +typedef int (*HPMHOOK_pre_intif_guild_leave) (int *guild_id, int *account_id, int *char_id, int *flag, const char **mes); +typedef int (*HPMHOOK_post_intif_guild_leave) (int retVal___, int guild_id, int account_id, int char_id, int flag, const char *mes); +typedef int (*HPMHOOK_pre_intif_guild_memberinfoshort) (int *guild_id, int *account_id, int *char_id, int *online, int *lv, int *class_); +typedef int (*HPMHOOK_post_intif_guild_memberinfoshort) (int retVal___, int guild_id, int account_id, int char_id, int online, int lv, int class_); +typedef int (*HPMHOOK_pre_intif_guild_break) (int *guild_id); +typedef int (*HPMHOOK_post_intif_guild_break) (int retVal___, int guild_id); +typedef int (*HPMHOOK_pre_intif_guild_message) (int *guild_id, int *account_id, const char **mes, int *len); +typedef int (*HPMHOOK_post_intif_guild_message) (int retVal___, int guild_id, int account_id, const char *mes, int len); +typedef int (*HPMHOOK_pre_intif_guild_change_gm) (int *guild_id, const char **name, int *len); +typedef int (*HPMHOOK_post_intif_guild_change_gm) (int retVal___, int guild_id, const char *name, int len); +typedef int (*HPMHOOK_pre_intif_guild_change_basicinfo) (int *guild_id, int *type, const void **data, int *len); +typedef int (*HPMHOOK_post_intif_guild_change_basicinfo) (int retVal___, int guild_id, int type, const void *data, int len); +typedef int (*HPMHOOK_pre_intif_guild_change_memberinfo) (int *guild_id, int *account_id, int *char_id, int *type, const void **data, int *len); +typedef int (*HPMHOOK_post_intif_guild_change_memberinfo) (int retVal___, int guild_id, int account_id, int char_id, int type, const void *data, int len); +typedef int (*HPMHOOK_pre_intif_guild_position) (int *guild_id, int *idx, struct guild_position **p); +typedef int (*HPMHOOK_post_intif_guild_position) (int retVal___, int guild_id, int idx, struct guild_position *p); +typedef int (*HPMHOOK_pre_intif_guild_skillup) (int *guild_id, uint16 *skill_id, int *account_id, int *max); +typedef int (*HPMHOOK_post_intif_guild_skillup) (int retVal___, int guild_id, uint16 skill_id, int account_id, int max); +typedef int (*HPMHOOK_pre_intif_guild_alliance) (int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag); +typedef int (*HPMHOOK_post_intif_guild_alliance) (int retVal___, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag); +typedef int (*HPMHOOK_pre_intif_guild_notice) (int *guild_id, const char **mes1, const char **mes2); +typedef int (*HPMHOOK_post_intif_guild_notice) (int retVal___, int guild_id, const char *mes1, const char *mes2); +typedef int (*HPMHOOK_pre_intif_guild_emblem) (int *guild_id, int *len, const char **data); +typedef int (*HPMHOOK_post_intif_guild_emblem) (int retVal___, int guild_id, int len, const char *data); +typedef int (*HPMHOOK_pre_intif_guild_castle_dataload) (int *num, int **castle_ids); +typedef int (*HPMHOOK_post_intif_guild_castle_dataload) (int retVal___, int num, int *castle_ids); +typedef int (*HPMHOOK_pre_intif_guild_castle_datasave) (int *castle_id, int *index, int *value); +typedef int (*HPMHOOK_post_intif_guild_castle_datasave) (int retVal___, int castle_id, int index, int value); +typedef void (*HPMHOOK_pre_intif_itembound_req) (int *char_id, int *aid, int *guild_id); +typedef void (*HPMHOOK_post_intif_itembound_req) (int char_id, int aid, int guild_id); +typedef int (*HPMHOOK_pre_intif_request_petdata) (int *account_id, int *char_id, int *pet_id); +typedef int (*HPMHOOK_post_intif_request_petdata) (int retVal___, int account_id, int char_id, int pet_id); +typedef int (*HPMHOOK_pre_intif_save_petdata) (int *account_id, struct s_pet **p); +typedef int (*HPMHOOK_post_intif_save_petdata) (int retVal___, int account_id, struct s_pet *p); +typedef int (*HPMHOOK_pre_intif_delete_petdata) (int *pet_id); +typedef int (*HPMHOOK_post_intif_delete_petdata) (int retVal___, int pet_id); +typedef int (*HPMHOOK_pre_intif_rename) (struct map_session_data **sd, int *type, const char **name); +typedef int (*HPMHOOK_post_intif_rename) (int retVal___, struct map_session_data *sd, int type, const char *name); +typedef int (*HPMHOOK_pre_intif_homunculus_create) (int *account_id, struct s_homunculus **sh); +typedef int (*HPMHOOK_post_intif_homunculus_create) (int retVal___, int account_id, struct s_homunculus *sh); +typedef bool (*HPMHOOK_pre_intif_homunculus_requestload) (int *account_id, int *homun_id); +typedef bool (*HPMHOOK_post_intif_homunculus_requestload) (bool retVal___, int account_id, int homun_id); +typedef int (*HPMHOOK_pre_intif_homunculus_requestsave) (int *account_id, struct s_homunculus **sh); +typedef int (*HPMHOOK_post_intif_homunculus_requestsave) (int retVal___, int account_id, struct s_homunculus *sh); +typedef int (*HPMHOOK_pre_intif_homunculus_requestdelete) (int *homun_id); +typedef int (*HPMHOOK_post_intif_homunculus_requestdelete) (int retVal___, int homun_id); +typedef void (*HPMHOOK_pre_intif_request_questlog) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_intif_request_questlog) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_intif_quest_save) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_intif_quest_save) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_intif_mercenary_create) (struct s_mercenary **merc); +typedef int (*HPMHOOK_post_intif_mercenary_create) (int retVal___, struct s_mercenary *merc); +typedef int (*HPMHOOK_pre_intif_mercenary_request) (int *merc_id, int *char_id); +typedef int (*HPMHOOK_post_intif_mercenary_request) (int retVal___, int merc_id, int char_id); +typedef int (*HPMHOOK_pre_intif_mercenary_delete) (int *merc_id); +typedef int (*HPMHOOK_post_intif_mercenary_delete) (int retVal___, int merc_id); +typedef int (*HPMHOOK_pre_intif_mercenary_save) (struct s_mercenary **merc); +typedef int (*HPMHOOK_post_intif_mercenary_save) (int retVal___, struct s_mercenary *merc); +typedef int (*HPMHOOK_pre_intif_Mail_requestinbox) (int *char_id, unsigned char *flag); +typedef int (*HPMHOOK_post_intif_Mail_requestinbox) (int retVal___, int char_id, unsigned char flag); +typedef int (*HPMHOOK_pre_intif_Mail_read) (int *mail_id); +typedef int (*HPMHOOK_post_intif_Mail_read) (int retVal___, int mail_id); +typedef int (*HPMHOOK_pre_intif_Mail_getattach) (int *char_id, int *mail_id); +typedef int (*HPMHOOK_post_intif_Mail_getattach) (int retVal___, int char_id, int mail_id); +typedef int (*HPMHOOK_pre_intif_Mail_delete) (int *char_id, int *mail_id); +typedef int (*HPMHOOK_post_intif_Mail_delete) (int retVal___, int char_id, int mail_id); +typedef int (*HPMHOOK_pre_intif_Mail_return) (int *char_id, int *mail_id); +typedef int (*HPMHOOK_post_intif_Mail_return) (int retVal___, int char_id, int mail_id); +typedef int (*HPMHOOK_pre_intif_Mail_send) (int *account_id, struct mail_message **msg); +typedef int (*HPMHOOK_post_intif_Mail_send) (int retVal___, int account_id, struct mail_message *msg); +typedef int (*HPMHOOK_pre_intif_Auction_requestlist) (int *char_id, short *type, int *price, const char **searchtext, short *page); +typedef int (*HPMHOOK_post_intif_Auction_requestlist) (int retVal___, int char_id, short type, int price, const char *searchtext, short page); +typedef int (*HPMHOOK_pre_intif_Auction_register) (struct auction_data **auction); +typedef int (*HPMHOOK_post_intif_Auction_register) (int retVal___, struct auction_data *auction); +typedef int (*HPMHOOK_pre_intif_Auction_cancel) (int *char_id, unsigned int *auction_id); +typedef int (*HPMHOOK_post_intif_Auction_cancel) (int retVal___, int char_id, unsigned int auction_id); +typedef int (*HPMHOOK_pre_intif_Auction_close) (int *char_id, unsigned int *auction_id); +typedef int (*HPMHOOK_post_intif_Auction_close) (int retVal___, int char_id, unsigned int auction_id); +typedef int (*HPMHOOK_pre_intif_Auction_bid) (int *char_id, const char **name, unsigned int *auction_id, int *bid); +typedef int (*HPMHOOK_post_intif_Auction_bid) (int retVal___, int char_id, const char *name, unsigned int auction_id, int bid); +typedef int (*HPMHOOK_pre_intif_elemental_create) (struct s_elemental **ele); +typedef int (*HPMHOOK_post_intif_elemental_create) (int retVal___, struct s_elemental *ele); +typedef int (*HPMHOOK_pre_intif_elemental_request) (int *ele_id, int *char_id); +typedef int (*HPMHOOK_post_intif_elemental_request) (int retVal___, int ele_id, int char_id); +typedef int (*HPMHOOK_pre_intif_elemental_delete) (int *ele_id); +typedef int (*HPMHOOK_post_intif_elemental_delete) (int retVal___, int ele_id); +typedef int (*HPMHOOK_pre_intif_elemental_save) (struct s_elemental **ele); +typedef int (*HPMHOOK_post_intif_elemental_save) (int retVal___, struct s_elemental *ele); +typedef void (*HPMHOOK_pre_intif_request_accinfo) (int *u_fd, int *aid, int *group_lv, char **query); +typedef void (*HPMHOOK_post_intif_request_accinfo) (int u_fd, int aid, int group_lv, char *query); +typedef int (*HPMHOOK_pre_intif_CheckForCharServer) (void); +typedef int (*HPMHOOK_post_intif_CheckForCharServer) (int retVal___); +typedef void (*HPMHOOK_pre_intif_pWisMessage) (int *fd); +typedef void (*HPMHOOK_post_intif_pWisMessage) (int fd); +typedef void (*HPMHOOK_pre_intif_pWisEnd) (int *fd); +typedef void (*HPMHOOK_post_intif_pWisEnd) (int fd); +typedef int (*HPMHOOK_pre_intif_pWisToGM_sub) (struct map_session_data **sd, va_list va); +typedef int (*HPMHOOK_post_intif_pWisToGM_sub) (int retVal___, struct map_session_data *sd, va_list va); +typedef void (*HPMHOOK_pre_intif_pWisToGM) (int *fd); +typedef void (*HPMHOOK_post_intif_pWisToGM) (int fd); +typedef void (*HPMHOOK_pre_intif_pRegisters) (int *fd); +typedef void (*HPMHOOK_post_intif_pRegisters) (int fd); +typedef void (*HPMHOOK_pre_intif_pChangeNameOk) (int *fd); +typedef void (*HPMHOOK_post_intif_pChangeNameOk) (int fd); +typedef void (*HPMHOOK_pre_intif_pMessageToFD) (int *fd); +typedef void (*HPMHOOK_post_intif_pMessageToFD) (int fd); +typedef void (*HPMHOOK_pre_intif_pLoadGuildStorage) (int *fd); +typedef void (*HPMHOOK_post_intif_pLoadGuildStorage) (int fd); +typedef void (*HPMHOOK_pre_intif_pSaveGuildStorage) (int *fd); +typedef void (*HPMHOOK_post_intif_pSaveGuildStorage) (int fd); +typedef void (*HPMHOOK_pre_intif_pPartyCreated) (int *fd); +typedef void (*HPMHOOK_post_intif_pPartyCreated) (int fd); +typedef void (*HPMHOOK_pre_intif_pPartyInfo) (int *fd); +typedef void (*HPMHOOK_post_intif_pPartyInfo) (int fd); +typedef void (*HPMHOOK_pre_intif_pPartyMemberAdded) (int *fd); +typedef void (*HPMHOOK_post_intif_pPartyMemberAdded) (int fd); +typedef void (*HPMHOOK_pre_intif_pPartyOptionChanged) (int *fd); +typedef void (*HPMHOOK_post_intif_pPartyOptionChanged) (int fd); +typedef void (*HPMHOOK_pre_intif_pPartyMemberWithdraw) (int *fd); +typedef void (*HPMHOOK_post_intif_pPartyMemberWithdraw) (int fd); +typedef void (*HPMHOOK_pre_intif_pPartyMove) (int *fd); +typedef void (*HPMHOOK_post_intif_pPartyMove) (int fd); +typedef void (*HPMHOOK_pre_intif_pPartyBroken) (int *fd); +typedef void (*HPMHOOK_post_intif_pPartyBroken) (int fd); +typedef void (*HPMHOOK_pre_intif_pPartyMessage) (int *fd); +typedef void (*HPMHOOK_post_intif_pPartyMessage) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildCreated) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildCreated) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildInfo) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildInfo) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildMemberAdded) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildMemberAdded) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildMemberWithdraw) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildMemberWithdraw) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildMemberInfoShort) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildMemberInfoShort) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildBroken) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildBroken) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildMessage) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildMessage) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildBasicInfoChanged) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildBasicInfoChanged) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildMemberInfoChanged) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildMemberInfoChanged) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildPosition) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildPosition) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildSkillUp) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildSkillUp) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildAlliance) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildAlliance) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildNotice) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildNotice) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildEmblem) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildEmblem) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildCastleDataLoad) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildCastleDataLoad) (int fd); +typedef void (*HPMHOOK_pre_intif_pGuildMasterChanged) (int *fd); +typedef void (*HPMHOOK_post_intif_pGuildMasterChanged) (int fd); +typedef void (*HPMHOOK_pre_intif_pQuestLog) (int *fd); +typedef void (*HPMHOOK_post_intif_pQuestLog) (int fd); +typedef void (*HPMHOOK_pre_intif_pQuestSave) (int *fd); +typedef void (*HPMHOOK_post_intif_pQuestSave) (int fd); +typedef void (*HPMHOOK_pre_intif_pMailInboxReceived) (int *fd); +typedef void (*HPMHOOK_post_intif_pMailInboxReceived) (int fd); +typedef void (*HPMHOOK_pre_intif_pMailNew) (int *fd); +typedef void (*HPMHOOK_post_intif_pMailNew) (int fd); +typedef void (*HPMHOOK_pre_intif_pMailGetAttach) (int *fd); +typedef void (*HPMHOOK_post_intif_pMailGetAttach) (int fd); +typedef void (*HPMHOOK_pre_intif_pMailDelete) (int *fd); +typedef void (*HPMHOOK_post_intif_pMailDelete) (int fd); +typedef void (*HPMHOOK_pre_intif_pMailReturn) (int *fd); +typedef void (*HPMHOOK_post_intif_pMailReturn) (int fd); +typedef void (*HPMHOOK_pre_intif_pMailSend) (int *fd); +typedef void (*HPMHOOK_post_intif_pMailSend) (int fd); +typedef void (*HPMHOOK_pre_intif_pAuctionResults) (int *fd); +typedef void (*HPMHOOK_post_intif_pAuctionResults) (int fd); +typedef void (*HPMHOOK_pre_intif_pAuctionRegister) (int *fd); +typedef void (*HPMHOOK_post_intif_pAuctionRegister) (int fd); +typedef void (*HPMHOOK_pre_intif_pAuctionCancel) (int *fd); +typedef void (*HPMHOOK_post_intif_pAuctionCancel) (int fd); +typedef void (*HPMHOOK_pre_intif_pAuctionClose) (int *fd); +typedef void (*HPMHOOK_post_intif_pAuctionClose) (int fd); +typedef void (*HPMHOOK_pre_intif_pAuctionMessage) (int *fd); +typedef void (*HPMHOOK_post_intif_pAuctionMessage) (int fd); +typedef void (*HPMHOOK_pre_intif_pAuctionBid) (int *fd); +typedef void (*HPMHOOK_post_intif_pAuctionBid) (int fd); +typedef void (*HPMHOOK_pre_intif_pItembound_ack) (int *fd); +typedef void (*HPMHOOK_post_intif_pItembound_ack) (int fd); +typedef void (*HPMHOOK_pre_intif_pMercenaryReceived) (int *fd); +typedef void (*HPMHOOK_post_intif_pMercenaryReceived) (int fd); +typedef void (*HPMHOOK_pre_intif_pMercenaryDeleted) (int *fd); +typedef void (*HPMHOOK_post_intif_pMercenaryDeleted) (int fd); +typedef void (*HPMHOOK_pre_intif_pMercenarySaved) (int *fd); +typedef void (*HPMHOOK_post_intif_pMercenarySaved) (int fd); +typedef void (*HPMHOOK_pre_intif_pElementalReceived) (int *fd); +typedef void (*HPMHOOK_post_intif_pElementalReceived) (int fd); +typedef void (*HPMHOOK_pre_intif_pElementalDeleted) (int *fd); +typedef void (*HPMHOOK_post_intif_pElementalDeleted) (int fd); +typedef void (*HPMHOOK_pre_intif_pElementalSaved) (int *fd); +typedef void (*HPMHOOK_post_intif_pElementalSaved) (int fd); +typedef void (*HPMHOOK_pre_intif_pCreatePet) (int *fd); +typedef void (*HPMHOOK_post_intif_pCreatePet) (int fd); +typedef void (*HPMHOOK_pre_intif_pRecvPetData) (int *fd); +typedef void (*HPMHOOK_post_intif_pRecvPetData) (int fd); +typedef void (*HPMHOOK_pre_intif_pSavePetOk) (int *fd); +typedef void (*HPMHOOK_post_intif_pSavePetOk) (int fd); +typedef void (*HPMHOOK_pre_intif_pDeletePetOk) (int *fd); +typedef void (*HPMHOOK_post_intif_pDeletePetOk) (int fd); +typedef void (*HPMHOOK_pre_intif_pCreateHomunculus) (int *fd); +typedef void (*HPMHOOK_post_intif_pCreateHomunculus) (int fd); +typedef void (*HPMHOOK_pre_intif_pRecvHomunculusData) (int *fd); +typedef void (*HPMHOOK_post_intif_pRecvHomunculusData) (int fd); +typedef void (*HPMHOOK_pre_intif_pSaveHomunculusOk) (int *fd); +typedef void (*HPMHOOK_post_intif_pSaveHomunculusOk) (int fd); +typedef void (*HPMHOOK_pre_intif_pDeleteHomunculusOk) (int *fd); +typedef void (*HPMHOOK_post_intif_pDeleteHomunculusOk) (int fd); +#endif // MAP_INTIF_H +#ifdef MAP_IRC_BOT_H /* ircbot */ +typedef void (*HPMHOOK_pre_ircbot_init) (bool *minimal); +typedef void (*HPMHOOK_post_ircbot_init) (bool minimal); +typedef void (*HPMHOOK_pre_ircbot_final) (void); +typedef void (*HPMHOOK_post_ircbot_final) (void); +typedef int (*HPMHOOK_pre_ircbot_parse) (int *fd); +typedef int (*HPMHOOK_post_ircbot_parse) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_ircbot_parse_sub) (int *fd, char **str); +typedef void (*HPMHOOK_post_ircbot_parse_sub) (int fd, char *str); +typedef void (*HPMHOOK_pre_ircbot_parse_source) (char **source, char **nick, char **ident, char **host); +typedef void (*HPMHOOK_post_ircbot_parse_source) (char *source, char *nick, char *ident, char *host); +typedef struct irc_func* (*HPMHOOK_pre_ircbot_func_search) (char **function_name); +typedef struct irc_func* (*HPMHOOK_post_ircbot_func_search) (struct irc_func* retVal___, char *function_name); +typedef int (*HPMHOOK_pre_ircbot_connect_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_ircbot_connect_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_ircbot_identify_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_ircbot_identify_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_ircbot_join_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_ircbot_join_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_ircbot_queue_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_ircbot_queue_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_ircbot_queue) (char **str); +typedef void (*HPMHOOK_post_ircbot_queue) (char *str); +typedef void (*HPMHOOK_pre_ircbot_send) (char **str, bool *force); +typedef void (*HPMHOOK_post_ircbot_send) (char *str, bool force); +typedef void (*HPMHOOK_pre_ircbot_relay) (const char **name, const char **msg); +typedef void (*HPMHOOK_post_ircbot_relay) (const char *name, const char *msg); +typedef void (*HPMHOOK_pre_ircbot_pong) (int *fd, char **cmd, char **source, char **target, char **msg); +typedef void (*HPMHOOK_post_ircbot_pong) (int fd, char *cmd, char *source, char *target, char *msg); +typedef void (*HPMHOOK_pre_ircbot_privmsg) (int *fd, char **cmd, char **source, char **target, char **msg); +typedef void (*HPMHOOK_post_ircbot_privmsg) (int fd, char *cmd, char *source, char *target, char *msg); +typedef void (*HPMHOOK_pre_ircbot_privmsg_ctcp) (int *fd, char **cmd, char **source, char **target, char **msg); +typedef void (*HPMHOOK_post_ircbot_privmsg_ctcp) (int fd, char *cmd, char *source, char *target, char *msg); +typedef void (*HPMHOOK_pre_ircbot_userjoin) (int *fd, char **cmd, char **source, char **target, char **msg); +typedef void (*HPMHOOK_post_ircbot_userjoin) (int fd, char *cmd, char *source, char *target, char *msg); +typedef void (*HPMHOOK_pre_ircbot_userleave) (int *fd, char **cmd, char **source, char **target, char **msg); +typedef void (*HPMHOOK_post_ircbot_userleave) (int fd, char *cmd, char *source, char *target, char *msg); +typedef void (*HPMHOOK_pre_ircbot_usernick) (int *fd, char **cmd, char **source, char **target, char **msg); +typedef void (*HPMHOOK_post_ircbot_usernick) (int fd, char *cmd, char *source, char *target, char *msg); +#endif // MAP_IRC_BOT_H +#ifdef MAP_ITEMDB_H /* itemdb */ +typedef void (*HPMHOOK_pre_itemdb_init) (bool *minimal); +typedef void (*HPMHOOK_post_itemdb_init) (bool minimal); +typedef void (*HPMHOOK_pre_itemdb_final) (void); +typedef void (*HPMHOOK_post_itemdb_final) (void); +typedef void (*HPMHOOK_pre_itemdb_reload) (void); +typedef void (*HPMHOOK_post_itemdb_reload) (void); +typedef void (*HPMHOOK_pre_itemdb_name_constants) (void); +typedef void (*HPMHOOK_post_itemdb_name_constants) (void); +typedef void (*HPMHOOK_pre_itemdb_read_groups) (void); +typedef void (*HPMHOOK_post_itemdb_read_groups) (void); +typedef void (*HPMHOOK_pre_itemdb_read_chains) (void); +typedef void (*HPMHOOK_post_itemdb_read_chains) (void); +typedef void (*HPMHOOK_pre_itemdb_read_packages) (void); +typedef void (*HPMHOOK_post_itemdb_read_packages) (void); +typedef void (*HPMHOOK_pre_itemdb_write_cached_packages) (const char **config_filename); +typedef void (*HPMHOOK_post_itemdb_write_cached_packages) (const char *config_filename); +typedef bool (*HPMHOOK_pre_itemdb_read_cached_packages) (const char **config_filename); +typedef bool (*HPMHOOK_post_itemdb_read_cached_packages) (bool retVal___, const char *config_filename); +typedef struct item_data* (*HPMHOOK_pre_itemdb_name2id) (const char **str); +typedef struct item_data* (*HPMHOOK_post_itemdb_name2id) (struct item_data* retVal___, const char *str); +typedef struct item_data* (*HPMHOOK_pre_itemdb_search_name) (const char **name); +typedef struct item_data* (*HPMHOOK_post_itemdb_search_name) (struct item_data* retVal___, const char *name); +typedef int (*HPMHOOK_pre_itemdb_search_name_array) (struct item_data ***data, int *size, const char **str, int *flag); +typedef int (*HPMHOOK_post_itemdb_search_name_array) (int retVal___, struct item_data **data, int size, const char *str, int flag); +typedef struct item_data* (*HPMHOOK_pre_itemdb_load) (int *nameid); +typedef struct item_data* (*HPMHOOK_post_itemdb_load) (struct item_data* retVal___, int nameid); +typedef struct item_data* (*HPMHOOK_pre_itemdb_search) (int *nameid); +typedef struct item_data* (*HPMHOOK_post_itemdb_search) (struct item_data* retVal___, int nameid); +typedef struct item_data* (*HPMHOOK_pre_itemdb_exists) (int *nameid); +typedef struct item_data* (*HPMHOOK_post_itemdb_exists) (struct item_data* retVal___, int nameid); +typedef bool (*HPMHOOK_pre_itemdb_in_group) (struct item_group **group, int *nameid); +typedef bool (*HPMHOOK_post_itemdb_in_group) (bool retVal___, struct item_group *group, int nameid); +typedef int (*HPMHOOK_pre_itemdb_group_item) (struct item_group **group); +typedef int (*HPMHOOK_post_itemdb_group_item) (int retVal___, struct item_group *group); +typedef int (*HPMHOOK_pre_itemdb_chain_item) (unsigned short *chain_id, int **rate); +typedef int (*HPMHOOK_post_itemdb_chain_item) (int retVal___, unsigned short chain_id, int *rate); +typedef void (*HPMHOOK_pre_itemdb_package_item) (struct map_session_data **sd, struct item_package **package); +typedef void (*HPMHOOK_post_itemdb_package_item) (struct map_session_data *sd, struct item_package *package); +typedef int (*HPMHOOK_pre_itemdb_searchname_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_itemdb_searchname_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_itemdb_searchname_array_sub) (union DBKey *key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_post_itemdb_searchname_array_sub) (int retVal___, union DBKey key, struct DBData data, va_list ap); +typedef int (*HPMHOOK_pre_itemdb_searchrandomid) (struct item_group **group); +typedef int (*HPMHOOK_post_itemdb_searchrandomid) (int retVal___, struct item_group *group); +typedef const char* (*HPMHOOK_pre_itemdb_typename) (int *type); +typedef const char* (*HPMHOOK_post_itemdb_typename) (const char* retVal___, int type); +typedef void (*HPMHOOK_pre_itemdb_jobmask2mapid) (uint64 **bclass, uint64 *jobmask); +typedef void (*HPMHOOK_post_itemdb_jobmask2mapid) (uint64 *bclass, uint64 jobmask); +typedef void (*HPMHOOK_pre_itemdb_jobid2mapid) (uint64 **bclass, int *job_id, bool *enable); +typedef void (*HPMHOOK_post_itemdb_jobid2mapid) (uint64 *bclass, int job_id, bool enable); +typedef void (*HPMHOOK_pre_itemdb_create_dummy_data) (void); +typedef void (*HPMHOOK_post_itemdb_create_dummy_data) (void); +typedef struct item_data* (*HPMHOOK_pre_itemdb_create_item_data) (int *nameid); +typedef struct item_data* (*HPMHOOK_post_itemdb_create_item_data) (struct item_data* retVal___, int nameid); +typedef int (*HPMHOOK_pre_itemdb_isequip) (int *nameid); +typedef int (*HPMHOOK_post_itemdb_isequip) (int retVal___, int nameid); +typedef int (*HPMHOOK_pre_itemdb_isequip2) (struct item_data **data); +typedef int (*HPMHOOK_post_itemdb_isequip2) (int retVal___, struct item_data *data); +typedef int (*HPMHOOK_pre_itemdb_isstackable) (int *nameid); +typedef int (*HPMHOOK_post_itemdb_isstackable) (int retVal___, int nameid); +typedef int (*HPMHOOK_pre_itemdb_isstackable2) (struct item_data **data); +typedef int (*HPMHOOK_post_itemdb_isstackable2) (int retVal___, struct item_data *data); +typedef int (*HPMHOOK_pre_itemdb_isdropable_sub) (struct item_data **item, int *gmlv, int *unused); +typedef int (*HPMHOOK_post_itemdb_isdropable_sub) (int retVal___, struct item_data *item, int gmlv, int unused); +typedef int (*HPMHOOK_pre_itemdb_cantrade_sub) (struct item_data **item, int *gmlv, int *gmlv2); +typedef int (*HPMHOOK_post_itemdb_cantrade_sub) (int retVal___, struct item_data *item, int gmlv, int gmlv2); +typedef int (*HPMHOOK_pre_itemdb_canpartnertrade_sub) (struct item_data **item, int *gmlv, int *gmlv2); +typedef int (*HPMHOOK_post_itemdb_canpartnertrade_sub) (int retVal___, struct item_data *item, int gmlv, int gmlv2); +typedef int (*HPMHOOK_pre_itemdb_cansell_sub) (struct item_data **item, int *gmlv, int *unused); +typedef int (*HPMHOOK_post_itemdb_cansell_sub) (int retVal___, struct item_data *item, int gmlv, int unused); +typedef int (*HPMHOOK_pre_itemdb_cancartstore_sub) (struct item_data **item, int *gmlv, int *unused); +typedef int (*HPMHOOK_post_itemdb_cancartstore_sub) (int retVal___, struct item_data *item, int gmlv, int unused); +typedef int (*HPMHOOK_pre_itemdb_canstore_sub) (struct item_data **item, int *gmlv, int *unused); +typedef int (*HPMHOOK_post_itemdb_canstore_sub) (int retVal___, struct item_data *item, int gmlv, int unused); +typedef int (*HPMHOOK_pre_itemdb_canguildstore_sub) (struct item_data **item, int *gmlv, int *unused); +typedef int (*HPMHOOK_post_itemdb_canguildstore_sub) (int retVal___, struct item_data *item, int gmlv, int unused); +typedef int (*HPMHOOK_pre_itemdb_canmail_sub) (struct item_data **item, int *gmlv, int *unused); +typedef int (*HPMHOOK_post_itemdb_canmail_sub) (int retVal___, struct item_data *item, int gmlv, int unused); +typedef int (*HPMHOOK_pre_itemdb_canauction_sub) (struct item_data **item, int *gmlv, int *unused); +typedef int (*HPMHOOK_post_itemdb_canauction_sub) (int retVal___, struct item_data *item, int gmlv, int unused); +typedef int (*HPMHOOK_pre_itemdb_isrestricted) (struct item **item, int *gmlv, int *gmlv2, int ( **func ) (struct item_data *, int, int)); +typedef int (*HPMHOOK_post_itemdb_isrestricted) (int retVal___, struct item *item, int gmlv, int gmlv2, int ( *func ) (struct item_data *, int, int)); +typedef int (*HPMHOOK_pre_itemdb_isidentified) (int *nameid); +typedef int (*HPMHOOK_post_itemdb_isidentified) (int retVal___, int nameid); +typedef int (*HPMHOOK_pre_itemdb_isidentified2) (struct item_data **data); +typedef int (*HPMHOOK_post_itemdb_isidentified2) (int retVal___, struct item_data *data); +typedef int (*HPMHOOK_pre_itemdb_combo_split_atoi) (char **str, int **val); +typedef int (*HPMHOOK_post_itemdb_combo_split_atoi) (int retVal___, char *str, int *val); +typedef void (*HPMHOOK_pre_itemdb_read_combos) (void); +typedef void (*HPMHOOK_post_itemdb_read_combos) (void); +typedef int (*HPMHOOK_pre_itemdb_gendercheck) (struct item_data **id); +typedef int (*HPMHOOK_post_itemdb_gendercheck) (int retVal___, struct item_data *id); +typedef int (*HPMHOOK_pre_itemdb_validate_entry) (struct item_data **entry, int *n, const char **source); +typedef int (*HPMHOOK_post_itemdb_validate_entry) (int retVal___, struct item_data *entry, int n, const char *source); +typedef void (*HPMHOOK_pre_itemdb_readdb_additional_fields) (int *itemid, struct config_setting_t **it, int *n, const char **source); +typedef void (*HPMHOOK_post_itemdb_readdb_additional_fields) (int itemid, struct config_setting_t *it, int n, const char *source); +typedef void (*HPMHOOK_pre_itemdb_readdb_job_sub) (struct item_data **id, struct config_setting_t **t); +typedef void (*HPMHOOK_post_itemdb_readdb_job_sub) (struct item_data *id, struct config_setting_t *t); +typedef int (*HPMHOOK_pre_itemdb_readdb_libconfig_sub) (struct config_setting_t **it, int *n, const char **source); +typedef int (*HPMHOOK_post_itemdb_readdb_libconfig_sub) (int retVal___, struct config_setting_t *it, int n, const char *source); +typedef int (*HPMHOOK_pre_itemdb_readdb_libconfig) (const char **filename); +typedef int (*HPMHOOK_post_itemdb_readdb_libconfig) (int retVal___, const char *filename); +typedef uint64 (*HPMHOOK_pre_itemdb_unique_id) (struct map_session_data **sd); +typedef uint64 (*HPMHOOK_post_itemdb_unique_id) (uint64 retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_itemdb_read) (bool *minimal); +typedef void (*HPMHOOK_post_itemdb_read) (bool minimal); +typedef void (*HPMHOOK_pre_itemdb_destroy_item_data) (struct item_data **self, int *free_self); +typedef void (*HPMHOOK_post_itemdb_destroy_item_data) (struct item_data *self, int free_self); +typedef int (*HPMHOOK_pre_itemdb_final_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_itemdb_final_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_itemdb_clear) (bool *total); +typedef void (*HPMHOOK_post_itemdb_clear) (bool total); +typedef struct item_combo* (*HPMHOOK_pre_itemdb_id2combo) (unsigned short *id); +typedef struct item_combo* (*HPMHOOK_post_itemdb_id2combo) (struct item_combo* retVal___, unsigned short id); +typedef bool (*HPMHOOK_pre_itemdb_is_item_usable) (struct item_data **item); +typedef bool (*HPMHOOK_post_itemdb_is_item_usable) (bool retVal___, struct item_data *item); +typedef bool (*HPMHOOK_pre_itemdb_lookup_const) (const struct config_setting_t **it, const char **name, int **value); +typedef bool (*HPMHOOK_post_itemdb_lookup_const) (bool retVal___, const struct config_setting_t *it, const char *name, int *value); +#endif // MAP_ITEMDB_H +#ifdef LOGIN_LCLIF_H /* lclif */ +typedef void (*HPMHOOK_pre_lclif_init) (void); +typedef void (*HPMHOOK_post_lclif_init) (void); +typedef void (*HPMHOOK_pre_lclif_final) (void); +typedef void (*HPMHOOK_post_lclif_final) (void); +typedef void (*HPMHOOK_pre_lclif_connection_error) (int *fd, uint8 *error); +typedef void (*HPMHOOK_post_lclif_connection_error) (int fd, uint8 error); +typedef bool (*HPMHOOK_pre_lclif_server_list) (struct login_session_data **sd); +typedef bool (*HPMHOOK_post_lclif_server_list) (bool retVal___, struct login_session_data *sd); +typedef void (*HPMHOOK_pre_lclif_auth_failed) (int *fd, time_t *ban, uint32 *error); +typedef void (*HPMHOOK_post_lclif_auth_failed) (int fd, time_t ban, uint32 error); +typedef void (*HPMHOOK_pre_lclif_login_error) (int *fd, uint8 *error); +typedef void (*HPMHOOK_post_lclif_login_error) (int fd, uint8 error); +typedef void (*HPMHOOK_pre_lclif_coding_key) (int *fd, struct login_session_data **sd); +typedef void (*HPMHOOK_post_lclif_coding_key) (int fd, struct login_session_data *sd); +typedef const struct login_packet_db* (*HPMHOOK_pre_lclif_packet) (int16 *packet_id); +typedef const struct login_packet_db* (*HPMHOOK_post_lclif_packet) (const struct login_packet_db* retVal___, int16 packet_id); +typedef enum parsefunc_rcode (*HPMHOOK_pre_lclif_parse_packet) (const struct login_packet_db **lpd, int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_lclif_parse_packet) (enum parsefunc_rcode retVal___, const struct login_packet_db *lpd, int fd, struct login_session_data *sd); +typedef int (*HPMHOOK_pre_lclif_parse) (int *fd); +typedef int (*HPMHOOK_post_lclif_parse) (int retVal___, int fd); +#endif // LOGIN_LCLIF_H +#ifdef LOGIN_LCLIF_P_H /* PRIV__lclif */ +typedef void (*HPMHOOK_pre_PRIV__lclif_packetdb_loaddb) (void); +typedef void (*HPMHOOK_post_PRIV__lclif_packetdb_loaddb) (void); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_sub) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_sub) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_EXE_HASHCHECK) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_EXE_HASHCHECK) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_LOGIN) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_LOGIN) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_LOGIN2) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_LOGIN2) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_LOGIN3) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_LOGIN3) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_LOGIN4) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_LOGIN4) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_LOGIN_PCBANG) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_LOGIN_PCBANG) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_LOGIN_HAN) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_LOGIN_HAN) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_SSO_LOGIN_REQ) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_SSO_LOGIN_REQ) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_REQ_HASH) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_REQ_HASH) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_CHARSERVERCONNECT) (int *fd, struct login_session_data **sd); +typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_CHARSERVERCONNECT) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); +#endif // LOGIN_LCLIF_P_H +#ifdef COMMON_CONF_H /* libconfig */ +typedef int (*HPMHOOK_pre_libconfig_read) (struct config_t **config, FILE **stream); +typedef int (*HPMHOOK_post_libconfig_read) (int retVal___, struct config_t *config, FILE *stream); +typedef void (*HPMHOOK_pre_libconfig_write) (const struct config_t **config, FILE **stream); +typedef void (*HPMHOOK_post_libconfig_write) (const struct config_t *config, FILE *stream); +typedef void (*HPMHOOK_pre_libconfig_set_options) (struct config_t **config, int *options); +typedef void (*HPMHOOK_post_libconfig_set_options) (struct config_t *config, int options); +typedef int (*HPMHOOK_pre_libconfig_get_options) (const struct config_t **config); +typedef int (*HPMHOOK_post_libconfig_get_options) (int retVal___, const struct config_t *config); +typedef int (*HPMHOOK_pre_libconfig_read_string) (struct config_t **config, const char **str); +typedef int (*HPMHOOK_post_libconfig_read_string) (int retVal___, struct config_t *config, const char *str); +typedef int (*HPMHOOK_pre_libconfig_read_file_src) (struct config_t **config, const char **filename); +typedef int (*HPMHOOK_post_libconfig_read_file_src) (int retVal___, struct config_t *config, const char *filename); +typedef int (*HPMHOOK_pre_libconfig_write_file) (struct config_t **config, const char **filename); +typedef int (*HPMHOOK_post_libconfig_write_file) (int retVal___, struct config_t *config, const char *filename); +typedef void (*HPMHOOK_pre_libconfig_set_destructor) (struct config_t **config, void ( **destructor ) (void *)); +typedef void (*HPMHOOK_post_libconfig_set_destructor) (struct config_t *config, void ( *destructor ) (void *)); +typedef void (*HPMHOOK_pre_libconfig_set_include_dir) (struct config_t **config, const char **include_dir); +typedef void (*HPMHOOK_post_libconfig_set_include_dir) (struct config_t *config, const char *include_dir); +typedef void (*HPMHOOK_pre_libconfig_init) (struct config_t **config); +typedef void (*HPMHOOK_post_libconfig_init) (struct config_t *config); +typedef void (*HPMHOOK_pre_libconfig_destroy) (struct config_t **config); +typedef void (*HPMHOOK_post_libconfig_destroy) (struct config_t *config); +typedef int (*HPMHOOK_pre_libconfig_setting_get_int) (const struct config_setting_t **setting); +typedef int (*HPMHOOK_post_libconfig_setting_get_int) (int retVal___, const struct config_setting_t *setting); +typedef long long (*HPMHOOK_pre_libconfig_setting_get_int64) (const struct config_setting_t **setting); +typedef long long (*HPMHOOK_post_libconfig_setting_get_int64) (long long retVal___, const struct config_setting_t *setting); +typedef double (*HPMHOOK_pre_libconfig_setting_get_float) (const struct config_setting_t **setting); +typedef double (*HPMHOOK_post_libconfig_setting_get_float) (double retVal___, const struct config_setting_t *setting); +typedef int (*HPMHOOK_pre_libconfig_setting_get_bool) (const struct config_setting_t **setting); +typedef int (*HPMHOOK_post_libconfig_setting_get_bool) (int retVal___, const struct config_setting_t *setting); +typedef const char* (*HPMHOOK_pre_libconfig_setting_get_string) (const struct config_setting_t **setting); +typedef const char* (*HPMHOOK_post_libconfig_setting_get_string) (const char* retVal___, const struct config_setting_t *setting); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_lookup) (struct config_setting_t **setting, const char **name); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_lookup) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_int) (const struct config_setting_t **setting, const char **name, int **value); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_int) (int retVal___, const struct config_setting_t *setting, const char *name, int *value); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_int64) (const struct config_setting_t **setting, const char **name, long long **value); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_int64) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_float) (const struct config_setting_t **setting, const char **name, double **value); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_float) (int retVal___, const struct config_setting_t *setting, const char *name, double *value); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_bool) (const struct config_setting_t **setting, const char **name, int **value); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_bool) (int retVal___, const struct config_setting_t *setting, const char *name, int *value); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_string) (const struct config_setting_t **setting, const char **name, const char ***value); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_string) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value); +typedef int (*HPMHOOK_pre_libconfig_setting_set_int) (struct config_setting_t **setting, int *value); +typedef int (*HPMHOOK_post_libconfig_setting_set_int) (int retVal___, struct config_setting_t *setting, int value); +typedef int (*HPMHOOK_pre_libconfig_setting_set_int64) (struct config_setting_t **setting, long long *value); +typedef int (*HPMHOOK_post_libconfig_setting_set_int64) (int retVal___, struct config_setting_t *setting, long long value); +typedef int (*HPMHOOK_pre_libconfig_setting_set_float) (struct config_setting_t **setting, double *value); +typedef int (*HPMHOOK_post_libconfig_setting_set_float) (int retVal___, struct config_setting_t *setting, double value); +typedef int (*HPMHOOK_pre_libconfig_setting_set_bool) (struct config_setting_t **setting, int *value); +typedef int (*HPMHOOK_post_libconfig_setting_set_bool) (int retVal___, struct config_setting_t *setting, int value); +typedef int (*HPMHOOK_pre_libconfig_setting_set_string) (struct config_setting_t **setting, const char **value); +typedef int (*HPMHOOK_post_libconfig_setting_set_string) (int retVal___, struct config_setting_t *setting, const char *value); +typedef int (*HPMHOOK_pre_libconfig_setting_set_format) (struct config_setting_t **setting, short *format); +typedef int (*HPMHOOK_post_libconfig_setting_set_format) (int retVal___, struct config_setting_t *setting, short format); +typedef short (*HPMHOOK_pre_libconfig_setting_get_format) (const struct config_setting_t **setting); +typedef short (*HPMHOOK_post_libconfig_setting_get_format) (short retVal___, const struct config_setting_t *setting); +typedef int (*HPMHOOK_pre_libconfig_setting_get_int_elem) (const struct config_setting_t **setting, int *idx); +typedef int (*HPMHOOK_post_libconfig_setting_get_int_elem) (int retVal___, const struct config_setting_t *setting, int idx); +typedef long long (*HPMHOOK_pre_libconfig_setting_get_int64_elem) (const struct config_setting_t **setting, int *idx); +typedef long long (*HPMHOOK_post_libconfig_setting_get_int64_elem) (long long retVal___, const struct config_setting_t *setting, int idx); +typedef double (*HPMHOOK_pre_libconfig_setting_get_float_elem) (const struct config_setting_t **setting, int *idx); +typedef double (*HPMHOOK_post_libconfig_setting_get_float_elem) (double retVal___, const struct config_setting_t *setting, int idx); +typedef int (*HPMHOOK_pre_libconfig_setting_get_bool_elem) (const struct config_setting_t **setting, int *idx); +typedef int (*HPMHOOK_post_libconfig_setting_get_bool_elem) (int retVal___, const struct config_setting_t *setting, int idx); +typedef const char* (*HPMHOOK_pre_libconfig_setting_get_string_elem) (const struct config_setting_t **setting, int *idx); +typedef const char* (*HPMHOOK_post_libconfig_setting_get_string_elem) (const char* retVal___, const struct config_setting_t *setting, int idx); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_int_elem) (struct config_setting_t **setting, int *idx, int *value); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_int_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_int64_elem) (struct config_setting_t **setting, int *idx, long long *value); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_int64_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, long long value); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_float_elem) (struct config_setting_t **setting, int *idx, double *value); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_float_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, double value); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_bool_elem) (struct config_setting_t **setting, int *idx, int *value); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_bool_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_string_elem) (struct config_setting_t **setting, int *idx, const char **value); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_string_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, const char *value); +typedef int (*HPMHOOK_pre_libconfig_setting_index) (const struct config_setting_t **setting); +typedef int (*HPMHOOK_post_libconfig_setting_index) (int retVal___, const struct config_setting_t *setting); +typedef int (*HPMHOOK_pre_libconfig_setting_length) (const struct config_setting_t **setting); +typedef int (*HPMHOOK_post_libconfig_setting_length) (int retVal___, const struct config_setting_t *setting); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_get_elem) (const struct config_setting_t **setting, unsigned int *idx); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_get_elem) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int idx); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_get_member) (const struct config_setting_t **setting, const char **name); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_get_member) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_add) (struct config_setting_t **parent, const char **name, int *type); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_add) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int type); +typedef int (*HPMHOOK_pre_libconfig_setting_remove) (struct config_setting_t **parent, const char **name); +typedef int (*HPMHOOK_post_libconfig_setting_remove) (int retVal___, struct config_setting_t *parent, const char *name); +typedef int (*HPMHOOK_pre_libconfig_setting_remove_elem) (struct config_setting_t **parent, unsigned int *idx); +typedef int (*HPMHOOK_post_libconfig_setting_remove_elem) (int retVal___, struct config_setting_t *parent, unsigned int idx); +typedef void (*HPMHOOK_pre_libconfig_setting_set_hook) (struct config_setting_t **setting, void **hook); +typedef void (*HPMHOOK_post_libconfig_setting_set_hook) (struct config_setting_t *setting, void *hook); +typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_lookup) (const struct config_t **config, const char **filepath); +typedef struct config_setting_t* (*HPMHOOK_post_libconfig_lookup) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath); +typedef int (*HPMHOOK_pre_libconfig_lookup_int) (const struct config_t **config, const char **filepath, int **value); +typedef int (*HPMHOOK_post_libconfig_lookup_int) (int retVal___, const struct config_t *config, const char *filepath, int *value); +typedef int (*HPMHOOK_pre_libconfig_lookup_int64) (const struct config_t **config, const char **filepath, long long **value); +typedef int (*HPMHOOK_post_libconfig_lookup_int64) (int retVal___, const struct config_t *config, const char *filepath, long long *value); +typedef int (*HPMHOOK_pre_libconfig_lookup_float) (const struct config_t **config, const char **filepath, double **value); +typedef int (*HPMHOOK_post_libconfig_lookup_float) (int retVal___, const struct config_t *config, const char *filepath, double *value); +typedef int (*HPMHOOK_pre_libconfig_lookup_bool) (const struct config_t **config, const char **filepath, int **value); +typedef int (*HPMHOOK_post_libconfig_lookup_bool) (int retVal___, const struct config_t *config, const char *filepath, int *value); +typedef int (*HPMHOOK_pre_libconfig_lookup_string) (const struct config_t **config, const char **filepath, const char ***value); +typedef int (*HPMHOOK_post_libconfig_lookup_string) (int retVal___, const struct config_t *config, const char *filepath, const char **value); +typedef int (*HPMHOOK_pre_libconfig_load_file) (struct config_t **config, const char **config_filename); +typedef int (*HPMHOOK_post_libconfig_load_file) (int retVal___, struct config_t *config, const char *config_filename); +typedef void (*HPMHOOK_pre_libconfig_setting_copy_simple) (struct config_setting_t **parent, const struct config_setting_t **src); +typedef void (*HPMHOOK_post_libconfig_setting_copy_simple) (struct config_setting_t *parent, const struct config_setting_t *src); +typedef void (*HPMHOOK_pre_libconfig_setting_copy_elem) (struct config_setting_t **parent, const struct config_setting_t **src); +typedef void (*HPMHOOK_post_libconfig_setting_copy_elem) (struct config_setting_t *parent, const struct config_setting_t *src); +typedef void (*HPMHOOK_pre_libconfig_setting_copy_aggregate) (struct config_setting_t **parent, const struct config_setting_t **src); +typedef void (*HPMHOOK_post_libconfig_setting_copy_aggregate) (struct config_setting_t *parent, const struct config_setting_t *src); +typedef int (*HPMHOOK_pre_libconfig_setting_copy) (struct config_setting_t **parent, const struct config_setting_t **src); +typedef int (*HPMHOOK_post_libconfig_setting_copy) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src); +typedef bool (*HPMHOOK_pre_libconfig_setting_get_bool_real) (const struct config_setting_t **setting); +typedef bool (*HPMHOOK_post_libconfig_setting_get_bool_real) (bool retVal___, const struct config_setting_t *setting); +typedef uint32 (*HPMHOOK_pre_libconfig_setting_get_uint32) (const struct config_setting_t **setting); +typedef uint32 (*HPMHOOK_post_libconfig_setting_get_uint32) (uint32 retVal___, const struct config_setting_t *setting); +typedef uint16 (*HPMHOOK_pre_libconfig_setting_get_uint16) (const struct config_setting_t **setting); +typedef uint16 (*HPMHOOK_post_libconfig_setting_get_uint16) (uint16 retVal___, const struct config_setting_t *setting); +typedef int16 (*HPMHOOK_pre_libconfig_setting_get_int16) (const struct config_setting_t **setting); +typedef int16 (*HPMHOOK_post_libconfig_setting_get_int16) (int16 retVal___, const struct config_setting_t *setting); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_bool_real) (const struct config_setting_t **setting, const char **name, bool **value); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_bool_real) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_uint32) (const struct config_setting_t **setting, const char **name, uint32 **value); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_uint32) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_uint16) (const struct config_setting_t **setting, const char **name, uint16 **value); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_uint16) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_int16) (const struct config_setting_t **setting, const char **name, int16 **value); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_int16) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value); +typedef int (*HPMHOOK_pre_libconfig_setting_lookup_mutable_string) (const struct config_setting_t **setting, const char **name, char **out, size_t *out_size); +typedef int (*HPMHOOK_post_libconfig_setting_lookup_mutable_string) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t out_size); +typedef int (*HPMHOOK_pre_libconfig_lookup_mutable_string) (const struct config_t **config, const char **name, char **out, size_t *out_size); +typedef int (*HPMHOOK_post_libconfig_lookup_mutable_string) (int retVal___, const struct config_t *config, const char *name, char *out, size_t out_size); +#endif // COMMON_CONF_H +#ifdef MAP_LOG_H /* logs */ +typedef void (*HPMHOOK_pre_logs_pick_pc) (struct map_session_data **sd, e_log_pick_type *type, int *amount, struct item **itm, struct item_data **data); +typedef void (*HPMHOOK_post_logs_pick_pc) (struct map_session_data *sd, e_log_pick_type type, int amount, struct item *itm, struct item_data *data); +typedef void (*HPMHOOK_pre_logs_pick_mob) (struct mob_data **md, e_log_pick_type *type, int *amount, struct item **itm, struct item_data **data); +typedef void (*HPMHOOK_post_logs_pick_mob) (struct mob_data *md, e_log_pick_type type, int amount, struct item *itm, struct item_data *data); +typedef void (*HPMHOOK_pre_logs_zeny) (struct map_session_data **sd, e_log_pick_type *type, struct map_session_data **src_sd, int *amount); +typedef void (*HPMHOOK_post_logs_zeny) (struct map_session_data *sd, e_log_pick_type type, struct map_session_data *src_sd, int amount); +typedef void (*HPMHOOK_pre_logs_npc) (struct map_session_data **sd, const char **message); +typedef void (*HPMHOOK_post_logs_npc) (struct map_session_data *sd, const char *message); +typedef void (*HPMHOOK_pre_logs_chat) (e_log_chat_type *type, int *type_id, int *src_charid, int *src_accid, const char **mapname, int *x, int *y, const char **dst_charname, const char **message); +typedef void (*HPMHOOK_post_logs_chat) (e_log_chat_type type, int type_id, int src_charid, int src_accid, const char *mapname, int x, int y, const char *dst_charname, const char *message); +typedef void (*HPMHOOK_pre_logs_atcommand) (struct map_session_data **sd, const char **message); +typedef void (*HPMHOOK_post_logs_atcommand) (struct map_session_data *sd, const char *message); +typedef void (*HPMHOOK_pre_logs_branch) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_logs_branch) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_logs_mvpdrop) (struct map_session_data **sd, int *monster_id, int **log_mvp); +typedef void (*HPMHOOK_post_logs_mvpdrop) (struct map_session_data *sd, int monster_id, int *log_mvp); +typedef void (*HPMHOOK_pre_logs_pick_sub) (int *id, int16 *m, e_log_pick_type *type, int *amount, struct item **itm, struct item_data **data); +typedef void (*HPMHOOK_post_logs_pick_sub) (int id, int16 m, e_log_pick_type type, int amount, struct item *itm, struct item_data *data); +typedef void (*HPMHOOK_pre_logs_zeny_sub) (struct map_session_data **sd, e_log_pick_type *type, struct map_session_data **src_sd, int *amount); +typedef void (*HPMHOOK_post_logs_zeny_sub) (struct map_session_data *sd, e_log_pick_type type, struct map_session_data *src_sd, int amount); +typedef void (*HPMHOOK_pre_logs_npc_sub) (struct map_session_data **sd, const char **message); +typedef void (*HPMHOOK_post_logs_npc_sub) (struct map_session_data *sd, const char *message); +typedef void (*HPMHOOK_pre_logs_chat_sub) (e_log_chat_type *type, int *type_id, int *src_charid, int *src_accid, const char **mapname, int *x, int *y, const char **dst_charname, const char **message); +typedef void (*HPMHOOK_post_logs_chat_sub) (e_log_chat_type type, int type_id, int src_charid, int src_accid, const char *mapname, int x, int y, const char *dst_charname, const char *message); +typedef void (*HPMHOOK_pre_logs_atcommand_sub) (struct map_session_data **sd, const char **message); +typedef void (*HPMHOOK_post_logs_atcommand_sub) (struct map_session_data *sd, const char *message); +typedef void (*HPMHOOK_pre_logs_branch_sub) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_logs_branch_sub) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_logs_mvpdrop_sub) (struct map_session_data **sd, int *monster_id, int **log_mvp); +typedef void (*HPMHOOK_post_logs_mvpdrop_sub) (struct map_session_data *sd, int monster_id, int *log_mvp); +typedef int (*HPMHOOK_pre_logs_config_read) (const char **cfgName); +typedef int (*HPMHOOK_post_logs_config_read) (int retVal___, const char *cfgName); +typedef void (*HPMHOOK_pre_logs_config_done) (void); +typedef void (*HPMHOOK_post_logs_config_done) (void); +typedef void (*HPMHOOK_pre_logs_sql_init) (void); +typedef void (*HPMHOOK_post_logs_sql_init) (void); +typedef void (*HPMHOOK_pre_logs_sql_final) (void); +typedef void (*HPMHOOK_post_logs_sql_final) (void); +typedef char (*HPMHOOK_pre_logs_picktype2char) (e_log_pick_type *type); +typedef char (*HPMHOOK_post_logs_picktype2char) (char retVal___, e_log_pick_type type); +typedef char (*HPMHOOK_pre_logs_chattype2char) (e_log_chat_type *type); +typedef char (*HPMHOOK_post_logs_chattype2char) (char retVal___, e_log_chat_type type); +typedef bool (*HPMHOOK_pre_logs_should_log_item) (int *nameid, int *amount, int *refine, struct item_data **id); +typedef bool (*HPMHOOK_post_logs_should_log_item) (bool retVal___, int nameid, int amount, int refine, struct item_data *id); +#endif // MAP_LOG_H +#ifdef LOGIN_LOGIN_H /* login */ +typedef int (*HPMHOOK_pre_login_mmo_auth) (struct login_session_data **sd, bool *isServer); +typedef int (*HPMHOOK_post_login_mmo_auth) (int retVal___, struct login_session_data *sd, bool isServer); +typedef int (*HPMHOOK_pre_login_mmo_auth_new) (const char **userid, const char **pass, const char *sex, const char **last_ip); +typedef int (*HPMHOOK_post_login_mmo_auth_new) (int retVal___, const char *userid, const char *pass, const char sex, const char *last_ip); +typedef int (*HPMHOOK_pre_login_waiting_disconnect_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_login_waiting_disconnect_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef struct DBData (*HPMHOOK_pre_login_create_online_user) (union DBKey *key, va_list args); +typedef struct DBData (*HPMHOOK_post_login_create_online_user) (struct DBData retVal___, union DBKey key, va_list args); +typedef struct online_login_data* (*HPMHOOK_pre_login_add_online_user) (int *char_server, int *account_id); +typedef struct online_login_data* (*HPMHOOK_post_login_add_online_user) (struct online_login_data* retVal___, int char_server, int account_id); +typedef void (*HPMHOOK_pre_login_remove_online_user) (int *account_id); +typedef void (*HPMHOOK_post_login_remove_online_user) (int account_id); +typedef int (*HPMHOOK_pre_login_online_db_setoffline) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_login_online_db_setoffline) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_login_online_data_cleanup_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_login_online_data_cleanup_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_login_online_data_cleanup) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_login_online_data_cleanup) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_login_sync_ip_addresses) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_login_sync_ip_addresses) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef bool (*HPMHOOK_pre_login_check_encrypted) (const char **str1, const char **str2, const char **passwd); +typedef bool (*HPMHOOK_post_login_check_encrypted) (bool retVal___, const char *str1, const char *str2, const char *passwd); +typedef bool (*HPMHOOK_pre_login_check_password) (const char **md5key, int *passwdenc, const char **passwd, const char **refpass); +typedef bool (*HPMHOOK_post_login_check_password) (bool retVal___, const char *md5key, int passwdenc, const char *passwd, const char *refpass); +typedef uint32 (*HPMHOOK_pre_login_lan_subnet_check) (uint32 *ip); +typedef uint32 (*HPMHOOK_post_login_lan_subnet_check) (uint32 retVal___, uint32 ip); +typedef void (*HPMHOOK_pre_login_fromchar_accinfo) (int *fd, int *account_id, int *u_fd, int *u_aid, int *u_group, int *map_fd, struct mmo_account **acc); +typedef void (*HPMHOOK_post_login_fromchar_accinfo) (int fd, int account_id, int u_fd, int u_aid, int u_group, int map_fd, struct mmo_account *acc); +typedef void (*HPMHOOK_pre_login_fromchar_account) (int *fd, int *account_id, struct mmo_account **acc); +typedef void (*HPMHOOK_post_login_fromchar_account) (int fd, int account_id, struct mmo_account *acc); +typedef void (*HPMHOOK_pre_login_fromchar_account_update_other) (int *account_id, unsigned int *state); +typedef void (*HPMHOOK_post_login_fromchar_account_update_other) (int account_id, unsigned int state); +typedef void (*HPMHOOK_pre_login_fromchar_auth_ack) (int *fd, int *account_id, uint32 *login_id1, uint32 *login_id2, uint8 *sex, int *request_id, struct login_auth_node **node); +typedef void (*HPMHOOK_post_login_fromchar_auth_ack) (int fd, int account_id, uint32 login_id1, uint32 login_id2, uint8 sex, int request_id, struct login_auth_node *node); +typedef void (*HPMHOOK_pre_login_fromchar_ban) (int *account_id, time_t *timestamp); +typedef void (*HPMHOOK_post_login_fromchar_ban) (int account_id, time_t timestamp); +typedef void (*HPMHOOK_pre_login_fromchar_change_sex_other) (int *account_id, char *sex); +typedef void (*HPMHOOK_post_login_fromchar_change_sex_other) (int account_id, char sex); +typedef void (*HPMHOOK_pre_login_fromchar_pong) (int *fd); +typedef void (*HPMHOOK_post_login_fromchar_pong) (int fd); +typedef void (*HPMHOOK_pre_login_fromchar_parse_auth) (int *fd, int *id, const char **ip); +typedef void (*HPMHOOK_post_login_fromchar_parse_auth) (int fd, int id, const char *ip); +typedef void (*HPMHOOK_pre_login_fromchar_parse_update_users) (int *fd, int *id); +typedef void (*HPMHOOK_post_login_fromchar_parse_update_users) (int fd, int id); +typedef void (*HPMHOOK_pre_login_fromchar_parse_request_change_email) (int *fd, int *id, const char **ip); +typedef void (*HPMHOOK_post_login_fromchar_parse_request_change_email) (int fd, int id, const char *ip); +typedef void (*HPMHOOK_pre_login_fromchar_parse_account_data) (int *fd, int *id, const char **ip); +typedef void (*HPMHOOK_post_login_fromchar_parse_account_data) (int fd, int id, const char *ip); +typedef void (*HPMHOOK_pre_login_fromchar_parse_ping) (int *fd); +typedef void (*HPMHOOK_post_login_fromchar_parse_ping) (int fd); +typedef void (*HPMHOOK_pre_login_fromchar_parse_change_email) (int *fd, int *id, const char **ip); +typedef void (*HPMHOOK_post_login_fromchar_parse_change_email) (int fd, int id, const char *ip); +typedef void (*HPMHOOK_pre_login_fromchar_parse_account_update) (int *fd, int *id, const char **ip); +typedef void (*HPMHOOK_post_login_fromchar_parse_account_update) (int fd, int id, const char *ip); +typedef void (*HPMHOOK_pre_login_fromchar_parse_ban) (int *fd, int *id, const char **ip); +typedef void (*HPMHOOK_post_login_fromchar_parse_ban) (int fd, int id, const char *ip); +typedef void (*HPMHOOK_pre_login_fromchar_parse_change_sex) (int *fd, int *id, const char **ip); +typedef void (*HPMHOOK_post_login_fromchar_parse_change_sex) (int fd, int id, const char *ip); +typedef void (*HPMHOOK_pre_login_fromchar_parse_account_reg2) (int *fd, int *id, const char **ip); +typedef void (*HPMHOOK_post_login_fromchar_parse_account_reg2) (int fd, int id, const char *ip); +typedef void (*HPMHOOK_pre_login_fromchar_parse_unban) (int *fd, int *id, const char **ip); +typedef void (*HPMHOOK_post_login_fromchar_parse_unban) (int fd, int id, const char *ip); +typedef void (*HPMHOOK_pre_login_fromchar_parse_account_online) (int *fd, int *id); +typedef void (*HPMHOOK_post_login_fromchar_parse_account_online) (int fd, int id); +typedef void (*HPMHOOK_pre_login_fromchar_parse_account_offline) (int *fd); +typedef void (*HPMHOOK_post_login_fromchar_parse_account_offline) (int fd); +typedef void (*HPMHOOK_pre_login_fromchar_parse_online_accounts) (int *fd, int *id); +typedef void (*HPMHOOK_post_login_fromchar_parse_online_accounts) (int fd, int id); +typedef void (*HPMHOOK_pre_login_fromchar_parse_request_account_reg2) (int *fd); +typedef void (*HPMHOOK_post_login_fromchar_parse_request_account_reg2) (int fd); +typedef void (*HPMHOOK_pre_login_fromchar_parse_update_wan_ip) (int *fd, int *id); +typedef void (*HPMHOOK_post_login_fromchar_parse_update_wan_ip) (int fd, int id); +typedef void (*HPMHOOK_pre_login_fromchar_parse_all_offline) (int *fd, int *id); +typedef void (*HPMHOOK_post_login_fromchar_parse_all_offline) (int fd, int id); +typedef void (*HPMHOOK_pre_login_fromchar_parse_change_pincode) (int *fd); +typedef void (*HPMHOOK_post_login_fromchar_parse_change_pincode) (int fd); +typedef bool (*HPMHOOK_pre_login_fromchar_parse_wrong_pincode) (int *fd); +typedef bool (*HPMHOOK_post_login_fromchar_parse_wrong_pincode) (bool retVal___, int fd); +typedef void (*HPMHOOK_pre_login_fromchar_parse_accinfo) (int *fd); +typedef void (*HPMHOOK_post_login_fromchar_parse_accinfo) (int fd); +typedef int (*HPMHOOK_pre_login_parse_fromchar) (int *fd); +typedef int (*HPMHOOK_post_login_parse_fromchar) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_login_kick) (struct login_session_data **sd); +typedef void (*HPMHOOK_post_login_kick) (struct login_session_data *sd); +typedef void (*HPMHOOK_pre_login_auth_ok) (struct login_session_data **sd); +typedef void (*HPMHOOK_post_login_auth_ok) (struct login_session_data *sd); +typedef void (*HPMHOOK_pre_login_auth_failed) (struct login_session_data **sd, int *result); +typedef void (*HPMHOOK_post_login_auth_failed) (struct login_session_data *sd, int result); +typedef bool (*HPMHOOK_pre_login_client_login) (int *fd, struct login_session_data **sd); +typedef bool (*HPMHOOK_post_login_client_login) (bool retVal___, int fd, struct login_session_data *sd); +typedef void (*HPMHOOK_pre_login_char_server_connection_status) (int *fd, struct login_session_data **sd, uint8 *status); +typedef void (*HPMHOOK_post_login_char_server_connection_status) (int fd, struct login_session_data *sd, uint8 status); +typedef void (*HPMHOOK_pre_login_parse_request_connection) (int *fd, struct login_session_data **sd, const char **ip, uint32 *ipl); +typedef void (*HPMHOOK_post_login_parse_request_connection) (int fd, struct login_session_data *sd, const char *ip, uint32 ipl); +typedef void (*HPMHOOK_pre_login_config_set_defaults) (void); +typedef void (*HPMHOOK_post_login_config_set_defaults) (void); +typedef int (*HPMHOOK_pre_login_config_read) (const char **cfgName); +typedef int (*HPMHOOK_post_login_config_read) (int retVal___, const char *cfgName); +#endif // LOGIN_LOGIN_H +#ifdef CHAR_LOGINIF_H /* loginif */ +typedef void (*HPMHOOK_pre_loginif_init) (void); +typedef void (*HPMHOOK_post_loginif_init) (void); +typedef void (*HPMHOOK_pre_loginif_final) (void); +typedef void (*HPMHOOK_post_loginif_final) (void); +typedef void (*HPMHOOK_pre_loginif_reset) (void); +typedef void (*HPMHOOK_post_loginif_reset) (void); +typedef void (*HPMHOOK_pre_loginif_check_shutdown) (void); +typedef void (*HPMHOOK_post_loginif_check_shutdown) (void); +typedef void (*HPMHOOK_pre_loginif_on_disconnect) (void); +typedef void (*HPMHOOK_post_loginif_on_disconnect) (void); +typedef void (*HPMHOOK_pre_loginif_on_ready) (void); +typedef void (*HPMHOOK_post_loginif_on_ready) (void); +typedef void (*HPMHOOK_pre_loginif_block_account) (int *account_id, int *flag); +typedef void (*HPMHOOK_post_loginif_block_account) (int account_id, int flag); +typedef void (*HPMHOOK_pre_loginif_ban_account) (int *account_id, short *year, short *month, short *day, short *hour, short *minute, short *second); +typedef void (*HPMHOOK_post_loginif_ban_account) (int account_id, short year, short month, short day, short hour, short minute, short second); +typedef void (*HPMHOOK_pre_loginif_unban_account) (int *account_id); +typedef void (*HPMHOOK_post_loginif_unban_account) (int account_id); +typedef void (*HPMHOOK_pre_loginif_changesex) (int *account_id); +typedef void (*HPMHOOK_post_loginif_changesex) (int account_id); +typedef void (*HPMHOOK_pre_loginif_auth) (int *fd, struct char_session_data **sd, uint32 *ipl); +typedef void (*HPMHOOK_post_loginif_auth) (int fd, struct char_session_data *sd, uint32 ipl); +typedef void (*HPMHOOK_pre_loginif_send_users_count) (int *users); +typedef void (*HPMHOOK_post_loginif_send_users_count) (int users); +typedef void (*HPMHOOK_pre_loginif_connect_to_server) (void); +typedef void (*HPMHOOK_post_loginif_connect_to_server) (void); +#endif // CHAR_LOGINIF_H +#ifdef MAP_MAIL_H /* mail */ +typedef void (*HPMHOOK_pre_mail_clear) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_mail_clear) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_mail_removeitem) (struct map_session_data **sd, short *flag); +typedef int (*HPMHOOK_post_mail_removeitem) (int retVal___, struct map_session_data *sd, short flag); +typedef int (*HPMHOOK_pre_mail_removezeny) (struct map_session_data **sd, short *flag); +typedef int (*HPMHOOK_post_mail_removezeny) (int retVal___, struct map_session_data *sd, short flag); +typedef unsigned char (*HPMHOOK_pre_mail_setitem) (struct map_session_data **sd, int *idx, int *amount); +typedef unsigned char (*HPMHOOK_post_mail_setitem) (unsigned char retVal___, struct map_session_data *sd, int idx, int amount); +typedef bool (*HPMHOOK_pre_mail_setattachment) (struct map_session_data **sd, struct mail_message **msg); +typedef bool (*HPMHOOK_post_mail_setattachment) (bool retVal___, struct map_session_data *sd, struct mail_message *msg); +typedef void (*HPMHOOK_pre_mail_getattachment) (struct map_session_data **sd, int *zeny, struct item **item); +typedef void (*HPMHOOK_post_mail_getattachment) (struct map_session_data *sd, int zeny, struct item *item); +typedef int (*HPMHOOK_pre_mail_openmail) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_mail_openmail) (int retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_mail_deliveryfail) (struct map_session_data **sd, struct mail_message **msg); +typedef void (*HPMHOOK_post_mail_deliveryfail) (struct map_session_data *sd, struct mail_message *msg); +typedef bool (*HPMHOOK_pre_mail_invalid_operation) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_mail_invalid_operation) (bool retVal___, struct map_session_data *sd); +#endif // MAP_MAIL_H +#ifdef COMMON_MEMMGR_H /* iMalloc */ +typedef void (*HPMHOOK_pre_iMalloc_init) (void); +typedef void (*HPMHOOK_post_iMalloc_init) (void); +typedef void (*HPMHOOK_pre_iMalloc_final) (void); +typedef void (*HPMHOOK_post_iMalloc_final) (void); +typedef void* (*HPMHOOK_pre_iMalloc_malloc) (size_t *size, const char **file, int *line, const char **func); +typedef void* (*HPMHOOK_post_iMalloc_malloc) (void* retVal___, size_t size, const char *file, int line, const char *func); +typedef void* (*HPMHOOK_pre_iMalloc_calloc) (size_t *num, size_t *size, const char **file, int *line, const char **func); +typedef void* (*HPMHOOK_post_iMalloc_calloc) (void* retVal___, size_t num, size_t size, const char *file, int line, const char *func); +typedef void* (*HPMHOOK_pre_iMalloc_realloc) (void **p, size_t *size, const char **file, int *line, const char **func); +typedef void* (*HPMHOOK_post_iMalloc_realloc) (void* retVal___, void *p, size_t size, const char *file, int line, const char *func); +typedef void* (*HPMHOOK_pre_iMalloc_reallocz) (void **p, size_t *size, const char **file, int *line, const char **func); +typedef void* (*HPMHOOK_post_iMalloc_reallocz) (void* retVal___, void *p, size_t size, const char *file, int line, const char *func); +typedef char* (*HPMHOOK_pre_iMalloc_astrdup) (const char **p, const char **file, int *line, const char **func); +typedef char* (*HPMHOOK_post_iMalloc_astrdup) (char* retVal___, const char *p, const char *file, int line, const char *func); +typedef char* (*HPMHOOK_pre_iMalloc_astrndup) (const char **p, size_t *size, const char **file, int *line, const char **func); +typedef char* (*HPMHOOK_post_iMalloc_astrndup) (char* retVal___, const char *p, size_t size, const char *file, int line, const char *func); +typedef void (*HPMHOOK_pre_iMalloc_free) (void **p, const char **file, int *line, const char **func); +typedef void (*HPMHOOK_post_iMalloc_free) (void *p, const char *file, int line, const char *func); +typedef void (*HPMHOOK_pre_iMalloc_memory_check) (void); +typedef void (*HPMHOOK_post_iMalloc_memory_check) (void); +typedef bool (*HPMHOOK_pre_iMalloc_verify_ptr) (void **ptr); +typedef bool (*HPMHOOK_post_iMalloc_verify_ptr) (bool retVal___, void *ptr); +typedef size_t (*HPMHOOK_pre_iMalloc_usage) (void); +typedef size_t (*HPMHOOK_post_iMalloc_usage) (size_t retVal___); +typedef void (*HPMHOOK_pre_iMalloc_post_shutdown) (void); +typedef void (*HPMHOOK_post_iMalloc_post_shutdown) (void); +typedef void (*HPMHOOK_pre_iMalloc_init_messages) (void); +typedef void (*HPMHOOK_post_iMalloc_init_messages) (void); +#endif // COMMON_MEMMGR_H +#ifdef MAP_MAP_H /* map */ +typedef void (*HPMHOOK_pre_map_zone_init) (void); +typedef void (*HPMHOOK_post_map_zone_init) (void); +typedef void (*HPMHOOK_pre_map_zone_remove) (int *m); +typedef void (*HPMHOOK_post_map_zone_remove) (int m); +typedef void (*HPMHOOK_pre_map_zone_apply) (int *m, struct map_zone_data **zone, const char **start, const char **buffer, const char **filepath); +typedef void (*HPMHOOK_post_map_zone_apply) (int m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath); +typedef void (*HPMHOOK_pre_map_zone_change) (int *m, struct map_zone_data **zone, const char **start, const char **buffer, const char **filepath); +typedef void (*HPMHOOK_post_map_zone_change) (int m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath); +typedef void (*HPMHOOK_pre_map_zone_change2) (int *m, struct map_zone_data **zone); +typedef void (*HPMHOOK_post_map_zone_change2) (int m, struct map_zone_data *zone); +typedef int (*HPMHOOK_pre_map_getcell) (int16 *m, const struct block_list **bl, int16 *x, int16 *y, cell_chk *cellchk); +typedef int (*HPMHOOK_post_map_getcell) (int retVal___, int16 m, const struct block_list *bl, int16 x, int16 y, cell_chk cellchk); +typedef void (*HPMHOOK_pre_map_setgatcell) (int16 *m, int16 *x, int16 *y, int *gat); +typedef void (*HPMHOOK_post_map_setgatcell) (int16 m, int16 x, int16 y, int gat); +typedef void (*HPMHOOK_pre_map_cellfromcache) (struct map_data **m); +typedef void (*HPMHOOK_post_map_cellfromcache) (struct map_data *m); +typedef void (*HPMHOOK_pre_map_setusers) (int *p1); +typedef void (*HPMHOOK_post_map_setusers) (int p1); +typedef int (*HPMHOOK_pre_map_getusers) (void); +typedef int (*HPMHOOK_post_map_getusers) (int retVal___); +typedef int (*HPMHOOK_pre_map_usercount) (void); +typedef int (*HPMHOOK_post_map_usercount) (int retVal___); +typedef int (*HPMHOOK_pre_map_freeblock) (struct block_list **bl); +typedef int (*HPMHOOK_post_map_freeblock) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_map_freeblock_lock) (void); +typedef int (*HPMHOOK_post_map_freeblock_lock) (int retVal___); +typedef int (*HPMHOOK_pre_map_freeblock_unlock) (void); +typedef int (*HPMHOOK_post_map_freeblock_unlock) (int retVal___); +typedef int (*HPMHOOK_pre_map_addblock) (struct block_list **bl); +typedef int (*HPMHOOK_post_map_addblock) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_map_delblock) (struct block_list **bl); +typedef int (*HPMHOOK_post_map_delblock) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_map_moveblock) (struct block_list **bl, int *x1, int *y1, int64 *tick); +typedef int (*HPMHOOK_post_map_moveblock) (int retVal___, struct block_list *bl, int x1, int y1, int64 tick); +typedef int (*HPMHOOK_pre_map_count_oncell) (int16 *m, int16 *x, int16 *y, int *type, int *flag); +typedef int (*HPMHOOK_post_map_count_oncell) (int retVal___, int16 m, int16 x, int16 y, int type, int flag); +typedef struct skill_unit* (*HPMHOOK_pre_map_find_skill_unit_oncell) (struct block_list **target, int16 *x, int16 *y, uint16 *skill_id, struct skill_unit **out_unit, int *flag); +typedef struct skill_unit* (*HPMHOOK_post_map_find_skill_unit_oncell) (struct skill_unit* retVal___, struct block_list *target, int16 x, int16 y, uint16 skill_id, struct skill_unit *out_unit, int flag); +typedef int (*HPMHOOK_pre_map_get_new_object_id) (void); +typedef int (*HPMHOOK_post_map_get_new_object_id) (int retVal___); +typedef int (*HPMHOOK_pre_map_search_freecell) (struct block_list **src, int16 *m, int16 **x, int16 **y, int16 *rx, int16 *ry, int *flag); +typedef int (*HPMHOOK_post_map_search_freecell) (int retVal___, struct block_list *src, int16 m, int16 *x, int16 *y, int16 rx, int16 ry, int flag); +typedef bool (*HPMHOOK_pre_map_closest_freecell) (int16 *m, const struct block_list **bl, int16 **x, int16 **y, int *type, int *flag); +typedef bool (*HPMHOOK_post_map_closest_freecell) (bool retVal___, int16 m, const struct block_list *bl, int16 *x, int16 *y, int type, int flag); +typedef int (*HPMHOOK_pre_map_quit) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_map_quit) (int retVal___, struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_map_addnpc) (int16 *m, struct npc_data **nd); +typedef bool (*HPMHOOK_post_map_addnpc) (bool retVal___, int16 m, struct npc_data *nd); +typedef int (*HPMHOOK_pre_map_clearflooritem_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_map_clearflooritem_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_map_removemobs_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_map_removemobs_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_map_clearflooritem) (struct block_list **bl); +typedef void (*HPMHOOK_post_map_clearflooritem) (struct block_list *bl); +typedef int (*HPMHOOK_pre_map_addflooritem) (const struct block_list **bl, struct item **item_data, int *amount, int16 *m, int16 *x, int16 *y, int *first_charid, int *second_charid, int *third_charid, int *flags); +typedef int (*HPMHOOK_post_map_addflooritem) (int retVal___, const struct block_list *bl, struct item *item_data, int amount, int16 m, int16 x, int16 y, int first_charid, int second_charid, int third_charid, int flags); +typedef void (*HPMHOOK_pre_map_addnickdb) (int *charid, const char **nick); +typedef void (*HPMHOOK_post_map_addnickdb) (int charid, const char *nick); +typedef void (*HPMHOOK_pre_map_delnickdb) (int *charid, const char **nick); +typedef void (*HPMHOOK_post_map_delnickdb) (int charid, const char *nick); +typedef void (*HPMHOOK_pre_map_reqnickdb) (struct map_session_data **sd, int *charid); +typedef void (*HPMHOOK_post_map_reqnickdb) (struct map_session_data *sd, int charid); +typedef const char* (*HPMHOOK_pre_map_charid2nick) (int *charid); +typedef const char* (*HPMHOOK_post_map_charid2nick) (const char* retVal___, int charid); +typedef struct map_session_data* (*HPMHOOK_pre_map_charid2sd) (int *charid); +typedef struct map_session_data* (*HPMHOOK_post_map_charid2sd) (struct map_session_data* retVal___, int charid); +typedef void (*HPMHOOK_pre_map_vforeachpc) (int ( **func ) (struct map_session_data *sd, va_list args), va_list args); +typedef void (*HPMHOOK_post_map_vforeachpc) (int ( *func ) (struct map_session_data *sd, va_list args), va_list args); +typedef void (*HPMHOOK_pre_map_vforeachmob) (int ( **func ) (struct mob_data *md, va_list args), va_list args); +typedef void (*HPMHOOK_post_map_vforeachmob) (int ( *func ) (struct mob_data *md, va_list args), va_list args); +typedef void (*HPMHOOK_pre_map_vforeachnpc) (int ( **func ) (struct npc_data *nd, va_list args), va_list args); +typedef void (*HPMHOOK_post_map_vforeachnpc) (int ( *func ) (struct npc_data *nd, va_list args), va_list args); +typedef void (*HPMHOOK_pre_map_vforeachregen) (int ( **func ) (struct block_list *bl, va_list args), va_list args); +typedef void (*HPMHOOK_post_map_vforeachregen) (int ( *func ) (struct block_list *bl, va_list args), va_list args); +typedef void (*HPMHOOK_pre_map_vforeachiddb) (int ( **func ) (struct block_list *bl, va_list args), va_list args); +typedef void (*HPMHOOK_post_map_vforeachiddb) (int ( *func ) (struct block_list *bl, va_list args), va_list args); +typedef int (*HPMHOOK_pre_map_vforeachinrange) (int ( **func ) (struct block_list *, va_list), struct block_list **center, int16 *range, int *type, va_list ap); +typedef int (*HPMHOOK_post_map_vforeachinrange) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 range, int type, va_list ap); +typedef int (*HPMHOOK_pre_map_vforeachinshootrange) (int ( **func ) (struct block_list *, va_list), struct block_list **center, int16 *range, int *type, va_list ap); +typedef int (*HPMHOOK_post_map_vforeachinshootrange) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 range, int type, va_list ap); +typedef int (*HPMHOOK_pre_map_vforeachinarea) (int ( **func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *type, va_list ap); +typedef int (*HPMHOOK_post_map_vforeachinarea) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int16 x0, int16 y0, int16 x1, int16 y1, int type, va_list ap); +typedef int (*HPMHOOK_pre_map_vforcountinrange) (int ( **func ) (struct block_list *, va_list), struct block_list **center, int16 *range, int *count, int *type, va_list ap); +typedef int (*HPMHOOK_post_map_vforcountinrange) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 range, int count, int type, va_list ap); +typedef int (*HPMHOOK_pre_map_vforcountinarea) (int ( **func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *count, int *type, va_list ap); +typedef int (*HPMHOOK_post_map_vforcountinarea) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int16 x0, int16 y0, int16 x1, int16 y1, int count, int type, va_list ap); +typedef int (*HPMHOOK_pre_map_vforeachinmovearea) (int ( **func ) (struct block_list *, va_list), struct block_list **center, int16 *range, int16 *dx, int16 *dy, int *type, va_list ap); +typedef int (*HPMHOOK_post_map_vforeachinmovearea) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 range, int16 dx, int16 dy, int type, va_list ap); +typedef int (*HPMHOOK_pre_map_vforeachincell) (int ( **func ) (struct block_list *, va_list), int16 *m, int16 *x, int16 *y, int *type, va_list ap); +typedef int (*HPMHOOK_post_map_vforeachincell) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int16 x, int16 y, int type, va_list ap); +typedef int (*HPMHOOK_pre_map_vforeachinpath) (int ( **func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int16 *range, int *length, int *type, va_list ap); +typedef int (*HPMHOOK_post_map_vforeachinpath) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int16 x0, int16 y0, int16 x1, int16 y1, int16 range, int length, int type, va_list ap); +typedef int (*HPMHOOK_pre_map_vforeachinmap) (int ( **func ) (struct block_list *, va_list), int16 *m, int *type, va_list args); +typedef int (*HPMHOOK_post_map_vforeachinmap) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int type, va_list args); +typedef int (*HPMHOOK_pre_map_vforeachininstance) (int ( **func ) (struct block_list *, va_list), int16 *instance_id, int *type, va_list ap); +typedef int (*HPMHOOK_post_map_vforeachininstance) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 instance_id, int type, va_list ap); +typedef struct map_session_data* (*HPMHOOK_pre_map_id2sd) (int *id); +typedef struct map_session_data* (*HPMHOOK_post_map_id2sd) (struct map_session_data* retVal___, int id); +typedef struct npc_data* (*HPMHOOK_pre_map_id2nd) (int *id); +typedef struct npc_data* (*HPMHOOK_post_map_id2nd) (struct npc_data* retVal___, int id); +typedef struct mob_data* (*HPMHOOK_pre_map_id2md) (int *id); +typedef struct mob_data* (*HPMHOOK_post_map_id2md) (struct mob_data* retVal___, int id); +typedef struct flooritem_data* (*HPMHOOK_pre_map_id2fi) (int *id); +typedef struct flooritem_data* (*HPMHOOK_post_map_id2fi) (struct flooritem_data* retVal___, int id); +typedef struct chat_data* (*HPMHOOK_pre_map_id2cd) (int *id); +typedef struct chat_data* (*HPMHOOK_post_map_id2cd) (struct chat_data* retVal___, int id); +typedef struct skill_unit* (*HPMHOOK_pre_map_id2su) (int *id); +typedef struct skill_unit* (*HPMHOOK_post_map_id2su) (struct skill_unit* retVal___, int id); +typedef struct pet_data* (*HPMHOOK_pre_map_id2pd) (int *id); +typedef struct pet_data* (*HPMHOOK_post_map_id2pd) (struct pet_data* retVal___, int id); +typedef struct homun_data* (*HPMHOOK_pre_map_id2hd) (int *id); +typedef struct homun_data* (*HPMHOOK_post_map_id2hd) (struct homun_data* retVal___, int id); +typedef struct mercenary_data* (*HPMHOOK_pre_map_id2mc) (int *id); +typedef struct mercenary_data* (*HPMHOOK_post_map_id2mc) (struct mercenary_data* retVal___, int id); +typedef struct elemental_data* (*HPMHOOK_pre_map_id2ed) (int *id); +typedef struct elemental_data* (*HPMHOOK_post_map_id2ed) (struct elemental_data* retVal___, int id); +typedef struct block_list* (*HPMHOOK_pre_map_id2bl) (int *id); +typedef struct block_list* (*HPMHOOK_post_map_id2bl) (struct block_list* retVal___, int id); +typedef bool (*HPMHOOK_pre_map_blid_exists) (int *id); +typedef bool (*HPMHOOK_post_map_blid_exists) (bool retVal___, int id); +typedef int16 (*HPMHOOK_pre_map_mapindex2mapid) (unsigned short *map_index); +typedef int16 (*HPMHOOK_post_map_mapindex2mapid) (int16 retVal___, unsigned short map_index); +typedef int16 (*HPMHOOK_pre_map_mapname2mapid) (const char **name); +typedef int16 (*HPMHOOK_post_map_mapname2mapid) (int16 retVal___, const char *name); +typedef int (*HPMHOOK_pre_map_mapname2ipport) (unsigned short *name, uint32 **ip, uint16 **port); +typedef int (*HPMHOOK_post_map_mapname2ipport) (int retVal___, unsigned short name, uint32 *ip, uint16 *port); +typedef int (*HPMHOOK_pre_map_setipport) (unsigned short *map_index, uint32 *ip, uint16 *port); +typedef int (*HPMHOOK_post_map_setipport) (int retVal___, unsigned short map_index, uint32 ip, uint16 port); +typedef int (*HPMHOOK_pre_map_eraseipport) (unsigned short *map_index, uint32 *ip, uint16 *port); +typedef int (*HPMHOOK_post_map_eraseipport) (int retVal___, unsigned short map_index, uint32 ip, uint16 port); +typedef int (*HPMHOOK_pre_map_eraseallipport) (void); +typedef int (*HPMHOOK_post_map_eraseallipport) (int retVal___); +typedef void (*HPMHOOK_pre_map_addiddb) (struct block_list **bl); +typedef void (*HPMHOOK_post_map_addiddb) (struct block_list *bl); +typedef void (*HPMHOOK_pre_map_deliddb) (struct block_list **bl); +typedef void (*HPMHOOK_post_map_deliddb) (struct block_list *bl); +typedef struct map_session_data* (*HPMHOOK_pre_map_nick2sd) (const char **nick); +typedef struct map_session_data* (*HPMHOOK_post_map_nick2sd) (struct map_session_data* retVal___, const char *nick); +typedef struct mob_data* (*HPMHOOK_pre_map_getmob_boss) (int16 *m); +typedef struct mob_data* (*HPMHOOK_post_map_getmob_boss) (struct mob_data* retVal___, int16 m); +typedef struct mob_data* (*HPMHOOK_pre_map_id2boss) (int *id); +typedef struct mob_data* (*HPMHOOK_post_map_id2boss) (struct mob_data* retVal___, int id); +typedef uint32 (*HPMHOOK_pre_map_race_id2mask) (int *race); +typedef uint32 (*HPMHOOK_post_map_race_id2mask) (uint32 retVal___, int race); +typedef void (*HPMHOOK_pre_map_reloadnpc) (bool *clear); +typedef void (*HPMHOOK_post_map_reloadnpc) (bool clear); +typedef int (*HPMHOOK_pre_map_check_dir) (int *s_dir, int *t_dir); +typedef int (*HPMHOOK_post_map_check_dir) (int retVal___, int s_dir, int t_dir); +typedef uint8 (*HPMHOOK_pre_map_calc_dir) (struct block_list **src, int16 *x, int16 *y); +typedef uint8 (*HPMHOOK_post_map_calc_dir) (uint8 retVal___, struct block_list *src, int16 x, int16 y); +typedef int (*HPMHOOK_pre_map_random_dir) (struct block_list **bl, short **x, short **y); +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 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); +typedef bool (*HPMHOOK_post_map_iwall_set) (bool retVal___, int16 m, int16 x, int16 y, int size, int8 dir, bool shootable, const char *wall_name); +typedef void (*HPMHOOK_pre_map_iwall_get) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_map_iwall_get) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_map_iwall_remove) (const char **wall_name); +typedef void (*HPMHOOK_post_map_iwall_remove) (const char *wall_name); +typedef int (*HPMHOOK_pre_map_addmobtolist) (unsigned short *m, struct spawn_data **spawn); +typedef int (*HPMHOOK_post_map_addmobtolist) (int retVal___, unsigned short m, struct spawn_data *spawn); +typedef void (*HPMHOOK_pre_map_spawnmobs) (int16 *m); +typedef void (*HPMHOOK_post_map_spawnmobs) (int16 m); +typedef void (*HPMHOOK_pre_map_removemobs) (int16 *m); +typedef void (*HPMHOOK_post_map_removemobs) (int16 m); +typedef void (*HPMHOOK_pre_map_addmap2db) (struct map_data **m); +typedef void (*HPMHOOK_post_map_addmap2db) (struct map_data *m); +typedef void (*HPMHOOK_pre_map_removemapdb) (struct map_data **m); +typedef void (*HPMHOOK_post_map_removemapdb) (struct map_data *m); +typedef void (*HPMHOOK_pre_map_clean) (int *i); +typedef void (*HPMHOOK_post_map_clean) (int i); +typedef void (*HPMHOOK_pre_map_do_shutdown) (void); +typedef void (*HPMHOOK_post_map_do_shutdown) (void); +typedef int (*HPMHOOK_pre_map_freeblock_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_map_freeblock_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_map_searchrandfreecell) (int16 *m, const struct block_list **bl, int16 **x, int16 **y, int *stack); +typedef int (*HPMHOOK_post_map_searchrandfreecell) (int retVal___, int16 m, const struct block_list *bl, int16 *x, int16 *y, int stack); +typedef int (*HPMHOOK_pre_map_count_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_map_count_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef struct DBData (*HPMHOOK_pre_map_create_charid2nick) (union DBKey *key, va_list args); +typedef struct DBData (*HPMHOOK_post_map_create_charid2nick) (struct DBData retVal___, union DBKey key, va_list args); +typedef int (*HPMHOOK_pre_map_removemobs_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_map_removemobs_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef struct mapcell (*HPMHOOK_pre_map_gat2cell) (int *gat); +typedef struct mapcell (*HPMHOOK_post_map_gat2cell) (struct mapcell retVal___, int gat); +typedef int (*HPMHOOK_pre_map_cell2gat) (struct mapcell *cell); +typedef int (*HPMHOOK_post_map_cell2gat) (int retVal___, struct mapcell cell); +typedef int (*HPMHOOK_pre_map_getcellp) (struct map_data **m, const struct block_list **bl, int16 *x, int16 *y, cell_chk *cellchk); +typedef int (*HPMHOOK_post_map_getcellp) (int retVal___, struct map_data *m, const struct block_list *bl, int16 x, int16 y, cell_chk cellchk); +typedef void (*HPMHOOK_pre_map_setcell) (int16 *m, int16 *x, int16 *y, cell_t *cell, bool *flag); +typedef void (*HPMHOOK_post_map_setcell) (int16 m, int16 x, int16 y, cell_t cell, bool flag); +typedef int (*HPMHOOK_pre_map_sub_getcellp) (struct map_data **m, const struct block_list **bl, int16 *x, int16 *y, cell_chk *cellchk); +typedef int (*HPMHOOK_post_map_sub_getcellp) (int retVal___, struct map_data *m, const struct block_list *bl, int16 x, int16 y, cell_chk cellchk); +typedef void (*HPMHOOK_pre_map_sub_setcell) (int16 *m, int16 *x, int16 *y, cell_t *cell, bool *flag); +typedef void (*HPMHOOK_post_map_sub_setcell) (int16 m, int16 x, int16 y, cell_t cell, bool flag); +typedef void (*HPMHOOK_pre_map_iwall_nextxy) (int16 *x, int16 *y, int8 *dir, int *pos, int16 **x1, int16 **y1); +typedef void (*HPMHOOK_post_map_iwall_nextxy) (int16 x, int16 y, int8 dir, int pos, int16 *x1, int16 *y1); +typedef struct DBData (*HPMHOOK_pre_map_create_map_data_other_server) (union DBKey *key, va_list args); +typedef struct DBData (*HPMHOOK_post_map_create_map_data_other_server) (struct DBData retVal___, union DBKey key, va_list args); +typedef int (*HPMHOOK_pre_map_eraseallipport_sub) (union DBKey *key, struct DBData **data, va_list va); +typedef int (*HPMHOOK_post_map_eraseallipport_sub) (int retVal___, union DBKey key, struct DBData *data, va_list va); +typedef char* (*HPMHOOK_pre_map_init_mapcache) (FILE **fp); +typedef char* (*HPMHOOK_post_map_init_mapcache) (char* retVal___, FILE *fp); +typedef int (*HPMHOOK_pre_map_readfromcache) (struct map_data **m, char **buffer); +typedef int (*HPMHOOK_post_map_readfromcache) (int retVal___, struct map_data *m, char *buffer); +typedef int (*HPMHOOK_pre_map_addmap) (const char **mapname); +typedef int (*HPMHOOK_post_map_addmap) (int retVal___, const char *mapname); +typedef void (*HPMHOOK_pre_map_delmapid) (int *id); +typedef void (*HPMHOOK_post_map_delmapid) (int id); +typedef void (*HPMHOOK_pre_map_zone_db_clear) (void); +typedef void (*HPMHOOK_post_map_zone_db_clear) (void); +typedef void (*HPMHOOK_pre_map_list_final) (void); +typedef void (*HPMHOOK_post_map_list_final) (void); +typedef int (*HPMHOOK_pre_map_waterheight) (char **mapname); +typedef int (*HPMHOOK_post_map_waterheight) (int retVal___, char *mapname); +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 void (*HPMHOOK_pre_map_reloadnpc_sub) (char **cfgName); +typedef void (*HPMHOOK_post_map_reloadnpc_sub) (char *cfgName); +typedef int (*HPMHOOK_pre_map_inter_config_read) (char **cfgName); +typedef int (*HPMHOOK_post_map_inter_config_read) (int retVal___, char *cfgName); +typedef int (*HPMHOOK_pre_map_sql_init) (void); +typedef int (*HPMHOOK_post_map_sql_init) (int retVal___); +typedef int (*HPMHOOK_pre_map_sql_close) (void); +typedef int (*HPMHOOK_post_map_sql_close) (int retVal___); +typedef bool (*HPMHOOK_pre_map_zone_mf_cache) (int *m, char **flag, char **params); +typedef bool (*HPMHOOK_post_map_zone_mf_cache) (bool retVal___, int m, char *flag, char *params); +typedef unsigned short (*HPMHOOK_pre_map_zone_str2itemid) (const char **name); +typedef unsigned short (*HPMHOOK_post_map_zone_str2itemid) (unsigned short retVal___, const char *name); +typedef unsigned short (*HPMHOOK_pre_map_zone_str2skillid) (const char **name); +typedef unsigned short (*HPMHOOK_post_map_zone_str2skillid) (unsigned short retVal___, const char *name); +typedef enum bl_type (*HPMHOOK_pre_map_zone_bl_type) (const char **entry, enum map_zone_skill_subtype **subtype); +typedef enum bl_type (*HPMHOOK_post_map_zone_bl_type) (enum bl_type retVal___, const char *entry, enum map_zone_skill_subtype *subtype); +typedef void (*HPMHOOK_pre_map_read_zone_db) (void); +typedef void (*HPMHOOK_post_map_read_zone_db) (void); +typedef int (*HPMHOOK_pre_map_db_final) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_map_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_map_nick_db_final) (union DBKey *key, struct DBData **data, va_list args); +typedef int (*HPMHOOK_post_map_nick_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list args); +typedef int (*HPMHOOK_pre_map_cleanup_db_sub) (union DBKey *key, struct DBData **data, va_list va); +typedef int (*HPMHOOK_post_map_cleanup_db_sub) (int retVal___, union DBKey key, struct DBData *data, va_list va); +typedef int (*HPMHOOK_pre_map_abort_sub) (struct map_session_data **sd, va_list ap); +typedef int (*HPMHOOK_post_map_abort_sub) (int retVal___, struct map_session_data *sd, va_list ap); +typedef void (*HPMHOOK_pre_map_update_cell_bl) (struct block_list **bl, bool *increase); +typedef void (*HPMHOOK_post_map_update_cell_bl) (struct block_list *bl, bool increase); +typedef int (*HPMHOOK_pre_map_get_new_bonus_id) (void); +typedef int (*HPMHOOK_post_map_get_new_bonus_id) (int retVal___); +typedef void (*HPMHOOK_pre_map_add_questinfo) (int *m, struct questinfo **qi); +typedef void (*HPMHOOK_post_map_add_questinfo) (int m, struct questinfo *qi); +typedef bool (*HPMHOOK_pre_map_remove_questinfo) (int *m, struct npc_data **nd); +typedef bool (*HPMHOOK_post_map_remove_questinfo) (bool retVal___, int m, struct npc_data *nd); +typedef struct map_zone_data* (*HPMHOOK_pre_map_merge_zone) (struct map_zone_data **main, struct map_zone_data **other); +typedef struct map_zone_data* (*HPMHOOK_post_map_merge_zone) (struct map_zone_data* retVal___, struct map_zone_data *main, struct map_zone_data *other); +typedef void (*HPMHOOK_pre_map_zone_clear_single) (struct map_zone_data **zone); +typedef void (*HPMHOOK_post_map_zone_clear_single) (struct map_zone_data *zone); +#endif // MAP_MAP_H +#ifdef CHAR_MAPIF_H /* mapif */ +typedef void (*HPMHOOK_pre_mapif_ban) (int *id, unsigned int *flag, int *status); +typedef void (*HPMHOOK_post_mapif_ban) (int id, unsigned int flag, int status); +typedef void (*HPMHOOK_pre_mapif_server_init) (int *id); +typedef void (*HPMHOOK_post_mapif_server_init) (int id); +typedef void (*HPMHOOK_pre_mapif_server_destroy) (int *id); +typedef void (*HPMHOOK_post_mapif_server_destroy) (int id); +typedef void (*HPMHOOK_pre_mapif_server_reset) (int *id); +typedef void (*HPMHOOK_post_mapif_server_reset) (int id); +typedef void (*HPMHOOK_pre_mapif_on_disconnect) (int *id); +typedef void (*HPMHOOK_post_mapif_on_disconnect) (int id); +typedef void (*HPMHOOK_pre_mapif_on_parse_accinfo) (int *account_id, int *u_fd, int *u_aid, int *u_group, int *map_fd); +typedef void (*HPMHOOK_post_mapif_on_parse_accinfo) (int account_id, int u_fd, int u_aid, int u_group, int map_fd); +typedef void (*HPMHOOK_pre_mapif_char_ban) (int *char_id, time_t *timestamp); +typedef void (*HPMHOOK_post_mapif_char_ban) (int char_id, time_t timestamp); +typedef int (*HPMHOOK_pre_mapif_sendall) (const unsigned char **buf, unsigned int *len); +typedef int (*HPMHOOK_post_mapif_sendall) (int retVal___, const unsigned char *buf, unsigned int len); +typedef int (*HPMHOOK_pre_mapif_sendallwos) (int *sfd, unsigned char **buf, unsigned int *len); +typedef int (*HPMHOOK_post_mapif_sendallwos) (int retVal___, int sfd, unsigned char *buf, unsigned int len); +typedef int (*HPMHOOK_pre_mapif_send) (int *fd, unsigned char **buf, unsigned int *len); +typedef int (*HPMHOOK_post_mapif_send) (int retVal___, int fd, unsigned char *buf, unsigned int len); +typedef void (*HPMHOOK_pre_mapif_send_users_count) (int *users); +typedef void (*HPMHOOK_post_mapif_send_users_count) (int users); +typedef void (*HPMHOOK_pre_mapif_auction_message) (int *char_id, unsigned char *result); +typedef void (*HPMHOOK_post_mapif_auction_message) (int char_id, unsigned char result); +typedef void (*HPMHOOK_pre_mapif_auction_sendlist) (int *fd, int *char_id, short *count, short *pages, unsigned char **buf); +typedef void (*HPMHOOK_post_mapif_auction_sendlist) (int fd, int char_id, short count, short pages, unsigned char *buf); +typedef void (*HPMHOOK_pre_mapif_parse_auction_requestlist) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_auction_requestlist) (int fd); +typedef void (*HPMHOOK_pre_mapif_auction_register) (int *fd, struct auction_data **auction); +typedef void (*HPMHOOK_post_mapif_auction_register) (int fd, struct auction_data *auction); +typedef void (*HPMHOOK_pre_mapif_parse_auction_register) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_auction_register) (int fd); +typedef void (*HPMHOOK_pre_mapif_auction_cancel) (int *fd, int *char_id, unsigned char *result); +typedef void (*HPMHOOK_post_mapif_auction_cancel) (int fd, int char_id, unsigned char result); +typedef void (*HPMHOOK_pre_mapif_parse_auction_cancel) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_auction_cancel) (int fd); +typedef void (*HPMHOOK_pre_mapif_auction_close) (int *fd, int *char_id, unsigned char *result); +typedef void (*HPMHOOK_post_mapif_auction_close) (int fd, int char_id, unsigned char result); +typedef void (*HPMHOOK_pre_mapif_parse_auction_close) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_auction_close) (int fd); +typedef void (*HPMHOOK_pre_mapif_auction_bid) (int *fd, int *char_id, int *bid, unsigned char *result); +typedef void (*HPMHOOK_post_mapif_auction_bid) (int fd, int char_id, int bid, unsigned char result); +typedef void (*HPMHOOK_pre_mapif_parse_auction_bid) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_auction_bid) (int fd); +typedef bool (*HPMHOOK_pre_mapif_elemental_create) (struct s_elemental **ele); +typedef bool (*HPMHOOK_post_mapif_elemental_create) (bool retVal___, struct s_elemental *ele); +typedef bool (*HPMHOOK_pre_mapif_elemental_save) (const struct s_elemental **ele); +typedef bool (*HPMHOOK_post_mapif_elemental_save) (bool retVal___, const struct s_elemental *ele); +typedef bool (*HPMHOOK_pre_mapif_elemental_load) (int *ele_id, int *char_id, struct s_elemental **ele); +typedef bool (*HPMHOOK_post_mapif_elemental_load) (bool retVal___, int ele_id, int char_id, struct s_elemental *ele); +typedef bool (*HPMHOOK_pre_mapif_elemental_delete) (int *ele_id); +typedef bool (*HPMHOOK_post_mapif_elemental_delete) (bool retVal___, int ele_id); +typedef void (*HPMHOOK_pre_mapif_elemental_send) (int *fd, struct s_elemental **ele, unsigned char *flag); +typedef void (*HPMHOOK_post_mapif_elemental_send) (int fd, struct s_elemental *ele, unsigned char flag); +typedef void (*HPMHOOK_pre_mapif_parse_elemental_create) (int *fd, const struct s_elemental **ele); +typedef void (*HPMHOOK_post_mapif_parse_elemental_create) (int fd, const struct s_elemental *ele); +typedef void (*HPMHOOK_pre_mapif_parse_elemental_load) (int *fd, int *ele_id, int *char_id); +typedef void (*HPMHOOK_post_mapif_parse_elemental_load) (int fd, int ele_id, int char_id); +typedef void (*HPMHOOK_pre_mapif_elemental_deleted) (int *fd, unsigned char *flag); +typedef void (*HPMHOOK_post_mapif_elemental_deleted) (int fd, unsigned char flag); +typedef void (*HPMHOOK_pre_mapif_parse_elemental_delete) (int *fd, int *ele_id); +typedef void (*HPMHOOK_post_mapif_parse_elemental_delete) (int fd, int ele_id); +typedef void (*HPMHOOK_pre_mapif_elemental_saved) (int *fd, unsigned char *flag); +typedef void (*HPMHOOK_post_mapif_elemental_saved) (int fd, unsigned char flag); +typedef void (*HPMHOOK_pre_mapif_parse_elemental_save) (int *fd, const struct s_elemental **ele); +typedef void (*HPMHOOK_post_mapif_parse_elemental_save) (int fd, const struct s_elemental *ele); +typedef int (*HPMHOOK_pre_mapif_guild_created) (int *fd, int *account_id, struct guild **g); +typedef int (*HPMHOOK_post_mapif_guild_created) (int retVal___, int fd, int account_id, struct guild *g); +typedef int (*HPMHOOK_pre_mapif_guild_noinfo) (int *fd, int *guild_id); +typedef int (*HPMHOOK_post_mapif_guild_noinfo) (int retVal___, int fd, int guild_id); +typedef int (*HPMHOOK_pre_mapif_guild_info) (int *fd, struct guild **g); +typedef int (*HPMHOOK_post_mapif_guild_info) (int retVal___, int fd, struct guild *g); +typedef int (*HPMHOOK_pre_mapif_guild_memberadded) (int *fd, int *guild_id, int *account_id, int *char_id, int *flag); +typedef int (*HPMHOOK_post_mapif_guild_memberadded) (int retVal___, int fd, int guild_id, int account_id, int char_id, int flag); +typedef int (*HPMHOOK_pre_mapif_guild_withdraw) (int *guild_id, int *account_id, int *char_id, int *flag, const char **name, const char **mes); +typedef int (*HPMHOOK_post_mapif_guild_withdraw) (int retVal___, int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes); +typedef int (*HPMHOOK_pre_mapif_guild_memberinfoshort) (struct guild **g, int *idx); +typedef int (*HPMHOOK_post_mapif_guild_memberinfoshort) (int retVal___, struct guild *g, int idx); +typedef int (*HPMHOOK_pre_mapif_guild_broken) (int *guild_id, int *flag); +typedef int (*HPMHOOK_post_mapif_guild_broken) (int retVal___, int guild_id, int flag); +typedef int (*HPMHOOK_pre_mapif_guild_message) (int *guild_id, int *account_id, const char **mes, int *len, int *sfd); +typedef int (*HPMHOOK_post_mapif_guild_message) (int retVal___, int guild_id, int account_id, const char *mes, int len, int sfd); +typedef int (*HPMHOOK_pre_mapif_guild_basicinfochanged) (int *guild_id, int *type, const void **data, int *len); +typedef int (*HPMHOOK_post_mapif_guild_basicinfochanged) (int retVal___, int guild_id, int type, const void *data, int len); +typedef int (*HPMHOOK_pre_mapif_guild_memberinfochanged) (int *guild_id, int *account_id, int *char_id, int *type, const void **data, int *len); +typedef int (*HPMHOOK_post_mapif_guild_memberinfochanged) (int retVal___, int guild_id, int account_id, int char_id, int type, const void *data, int len); +typedef int (*HPMHOOK_pre_mapif_guild_skillupack) (int *guild_id, uint16 *skill_id, int *account_id); +typedef int (*HPMHOOK_post_mapif_guild_skillupack) (int retVal___, int guild_id, uint16 skill_id, int account_id); +typedef int (*HPMHOOK_pre_mapif_guild_alliance) (int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag, const char **name1, const char **name2); +typedef int (*HPMHOOK_post_mapif_guild_alliance) (int retVal___, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2); +typedef int (*HPMHOOK_pre_mapif_guild_position) (struct guild **g, int *idx); +typedef int (*HPMHOOK_post_mapif_guild_position) (int retVal___, struct guild *g, int idx); +typedef int (*HPMHOOK_pre_mapif_guild_notice) (struct guild **g); +typedef int (*HPMHOOK_post_mapif_guild_notice) (int retVal___, struct guild *g); +typedef int (*HPMHOOK_pre_mapif_guild_emblem) (struct guild **g); +typedef int (*HPMHOOK_post_mapif_guild_emblem) (int retVal___, struct guild *g); +typedef int (*HPMHOOK_pre_mapif_guild_master_changed) (struct guild **g, int *aid, int *cid); +typedef int (*HPMHOOK_post_mapif_guild_master_changed) (int retVal___, struct guild *g, int aid, int cid); +typedef int (*HPMHOOK_pre_mapif_guild_castle_dataload) (int *fd, int *sz, const int **castle_ids); +typedef int (*HPMHOOK_post_mapif_guild_castle_dataload) (int retVal___, int fd, int sz, const int *castle_ids); +typedef int (*HPMHOOK_pre_mapif_parse_CreateGuild) (int *fd, int *account_id, const char **name, const struct guild_member **master); +typedef int (*HPMHOOK_post_mapif_parse_CreateGuild) (int retVal___, int fd, int account_id, const char *name, const struct guild_member *master); +typedef int (*HPMHOOK_pre_mapif_parse_GuildInfo) (int *fd, int *guild_id); +typedef int (*HPMHOOK_post_mapif_parse_GuildInfo) (int retVal___, int fd, int guild_id); +typedef int (*HPMHOOK_pre_mapif_parse_GuildAddMember) (int *fd, int *guild_id, const struct guild_member **m); +typedef int (*HPMHOOK_post_mapif_parse_GuildAddMember) (int retVal___, int fd, int guild_id, const struct guild_member *m); +typedef int (*HPMHOOK_pre_mapif_parse_GuildLeave) (int *fd, int *guild_id, int *account_id, int *char_id, int *flag, const char **mes); +typedef int (*HPMHOOK_post_mapif_parse_GuildLeave) (int retVal___, int fd, int guild_id, int account_id, int char_id, int flag, const char *mes); +typedef int (*HPMHOOK_pre_mapif_parse_GuildChangeMemberInfoShort) (int *fd, int *guild_id, int *account_id, int *char_id, int *online, int *lv, int *class_); +typedef int (*HPMHOOK_post_mapif_parse_GuildChangeMemberInfoShort) (int retVal___, int fd, int guild_id, int account_id, int char_id, int online, int lv, int class_); +typedef int (*HPMHOOK_pre_mapif_parse_BreakGuild) (int *fd, int *guild_id); +typedef int (*HPMHOOK_post_mapif_parse_BreakGuild) (int retVal___, int fd, int guild_id); +typedef int (*HPMHOOK_pre_mapif_parse_GuildMessage) (int *fd, int *guild_id, int *account_id, const char **mes, int *len); +typedef int (*HPMHOOK_post_mapif_parse_GuildMessage) (int retVal___, int fd, int guild_id, int account_id, const char *mes, int len); +typedef int (*HPMHOOK_pre_mapif_parse_GuildBasicInfoChange) (int *fd, int *guild_id, int *type, const void **data, int *len); +typedef int (*HPMHOOK_post_mapif_parse_GuildBasicInfoChange) (int retVal___, int fd, int guild_id, int type, const void *data, int len); +typedef int (*HPMHOOK_pre_mapif_parse_GuildMemberInfoChange) (int *fd, int *guild_id, int *account_id, int *char_id, int *type, const char **data, int *len); +typedef int (*HPMHOOK_post_mapif_parse_GuildMemberInfoChange) (int retVal___, int fd, int guild_id, int account_id, int char_id, int type, const char *data, int len); +typedef int (*HPMHOOK_pre_mapif_parse_GuildPosition) (int *fd, int *guild_id, int *idx, const struct guild_position **p); +typedef int (*HPMHOOK_post_mapif_parse_GuildPosition) (int retVal___, int fd, int guild_id, int idx, const struct guild_position *p); +typedef int (*HPMHOOK_pre_mapif_parse_GuildSkillUp) (int *fd, int *guild_id, uint16 *skill_id, int *account_id, int *max); +typedef int (*HPMHOOK_post_mapif_parse_GuildSkillUp) (int retVal___, int fd, int guild_id, uint16 skill_id, int account_id, int max); +typedef int (*HPMHOOK_pre_mapif_parse_GuildDeleteAlliance) (struct guild **g, int *guild_id, int *account_id1, int *account_id2, int *flag); +typedef int (*HPMHOOK_post_mapif_parse_GuildDeleteAlliance) (int retVal___, struct guild *g, int guild_id, int account_id1, int account_id2, int flag); +typedef int (*HPMHOOK_pre_mapif_parse_GuildAlliance) (int *fd, int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag); +typedef int (*HPMHOOK_post_mapif_parse_GuildAlliance) (int retVal___, int fd, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag); +typedef int (*HPMHOOK_pre_mapif_parse_GuildNotice) (int *fd, int *guild_id, const char **mes1, const char **mes2); +typedef int (*HPMHOOK_post_mapif_parse_GuildNotice) (int retVal___, int fd, int guild_id, const char *mes1, const char *mes2); +typedef int (*HPMHOOK_pre_mapif_parse_GuildEmblem) (int *fd, int *len, int *guild_id, int *dummy, const char **data); +typedef int (*HPMHOOK_post_mapif_parse_GuildEmblem) (int retVal___, int fd, int len, int guild_id, int dummy, const char *data); +typedef int (*HPMHOOK_pre_mapif_parse_GuildCastleDataLoad) (int *fd, int *len, const int **castle_ids); +typedef int (*HPMHOOK_post_mapif_parse_GuildCastleDataLoad) (int retVal___, int fd, int len, const int *castle_ids); +typedef int (*HPMHOOK_pre_mapif_parse_GuildCastleDataSave) (int *fd, int *castle_id, int *index, int *value); +typedef int (*HPMHOOK_post_mapif_parse_GuildCastleDataSave) (int retVal___, int fd, int castle_id, int index, int value); +typedef int (*HPMHOOK_pre_mapif_parse_GuildMasterChange) (int *fd, int *guild_id, const char **name, int *len); +typedef int (*HPMHOOK_post_mapif_parse_GuildMasterChange) (int retVal___, int fd, int guild_id, const char *name, int len); +typedef void (*HPMHOOK_pre_mapif_homunculus_created) (int *fd, int *account_id, const struct s_homunculus **sh, unsigned char *flag); +typedef void (*HPMHOOK_post_mapif_homunculus_created) (int fd, int account_id, const struct s_homunculus *sh, unsigned char flag); +typedef void (*HPMHOOK_pre_mapif_homunculus_deleted) (int *fd, int *flag); +typedef void (*HPMHOOK_post_mapif_homunculus_deleted) (int fd, int flag); +typedef void (*HPMHOOK_pre_mapif_homunculus_loaded) (int *fd, int *account_id, struct s_homunculus **hd); +typedef void (*HPMHOOK_post_mapif_homunculus_loaded) (int fd, int account_id, struct s_homunculus *hd); +typedef void (*HPMHOOK_pre_mapif_homunculus_saved) (int *fd, int *account_id, bool *flag); +typedef void (*HPMHOOK_post_mapif_homunculus_saved) (int fd, int account_id, bool flag); +typedef void (*HPMHOOK_pre_mapif_homunculus_renamed) (int *fd, int *account_id, int *char_id, unsigned char *flag, const char **name); +typedef void (*HPMHOOK_post_mapif_homunculus_renamed) (int fd, int account_id, int char_id, unsigned char flag, const char *name); +typedef bool (*HPMHOOK_pre_mapif_homunculus_create) (struct s_homunculus **hd); +typedef bool (*HPMHOOK_post_mapif_homunculus_create) (bool retVal___, struct s_homunculus *hd); +typedef bool (*HPMHOOK_pre_mapif_homunculus_save) (const struct s_homunculus **hd); +typedef bool (*HPMHOOK_post_mapif_homunculus_save) (bool retVal___, const struct s_homunculus *hd); +typedef bool (*HPMHOOK_pre_mapif_homunculus_load) (int *homun_id, struct s_homunculus **hd); +typedef bool (*HPMHOOK_post_mapif_homunculus_load) (bool retVal___, int homun_id, struct s_homunculus *hd); +typedef bool (*HPMHOOK_pre_mapif_homunculus_delete) (int *homun_id); +typedef bool (*HPMHOOK_post_mapif_homunculus_delete) (bool retVal___, int homun_id); +typedef bool (*HPMHOOK_pre_mapif_homunculus_rename) (const char **name); +typedef bool (*HPMHOOK_post_mapif_homunculus_rename) (bool retVal___, const char *name); +typedef void (*HPMHOOK_pre_mapif_parse_homunculus_create) (int *fd, int *len, int *account_id, const struct s_homunculus **phd); +typedef void (*HPMHOOK_post_mapif_parse_homunculus_create) (int fd, int len, int account_id, const struct s_homunculus *phd); +typedef void (*HPMHOOK_pre_mapif_parse_homunculus_delete) (int *fd, int *homun_id); +typedef void (*HPMHOOK_post_mapif_parse_homunculus_delete) (int fd, int homun_id); +typedef void (*HPMHOOK_pre_mapif_parse_homunculus_load) (int *fd, int *account_id, int *homun_id); +typedef void (*HPMHOOK_post_mapif_parse_homunculus_load) (int fd, int account_id, int homun_id); +typedef void (*HPMHOOK_pre_mapif_parse_homunculus_save) (int *fd, int *len, int *account_id, const struct s_homunculus **phd); +typedef void (*HPMHOOK_post_mapif_parse_homunculus_save) (int fd, int len, int account_id, const struct s_homunculus *phd); +typedef void (*HPMHOOK_pre_mapif_parse_homunculus_rename) (int *fd, int *account_id, int *char_id, const char **name); +typedef void (*HPMHOOK_post_mapif_parse_homunculus_rename) (int fd, int account_id, int char_id, const char *name); +typedef void (*HPMHOOK_pre_mapif_mail_sendinbox) (int *fd, int *char_id, unsigned char *flag, struct mail_data **md); +typedef void (*HPMHOOK_post_mapif_mail_sendinbox) (int fd, int char_id, unsigned char flag, struct mail_data *md); +typedef void (*HPMHOOK_pre_mapif_parse_mail_requestinbox) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_mail_requestinbox) (int fd); +typedef void (*HPMHOOK_pre_mapif_parse_mail_read) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_mail_read) (int fd); +typedef void (*HPMHOOK_pre_mapif_mail_sendattach) (int *fd, int *char_id, struct mail_message **msg); +typedef void (*HPMHOOK_post_mapif_mail_sendattach) (int fd, int char_id, struct mail_message *msg); +typedef void (*HPMHOOK_pre_mapif_mail_getattach) (int *fd, int *char_id, int *mail_id); +typedef void (*HPMHOOK_post_mapif_mail_getattach) (int fd, int char_id, int mail_id); +typedef void (*HPMHOOK_pre_mapif_parse_mail_getattach) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_mail_getattach) (int fd); +typedef void (*HPMHOOK_pre_mapif_mail_delete) (int *fd, int *char_id, int *mail_id, bool *failed); +typedef void (*HPMHOOK_post_mapif_mail_delete) (int fd, int char_id, int mail_id, bool failed); +typedef void (*HPMHOOK_pre_mapif_parse_mail_delete) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_mail_delete) (int fd); +typedef void (*HPMHOOK_pre_mapif_mail_new) (struct mail_message **msg); +typedef void (*HPMHOOK_post_mapif_mail_new) (struct mail_message *msg); +typedef void (*HPMHOOK_pre_mapif_mail_return) (int *fd, int *char_id, int *mail_id, int *new_mail); +typedef void (*HPMHOOK_post_mapif_mail_return) (int fd, int char_id, int mail_id, int new_mail); +typedef void (*HPMHOOK_pre_mapif_parse_mail_return) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_mail_return) (int fd); +typedef void (*HPMHOOK_pre_mapif_mail_send) (int *fd, struct mail_message **msg); +typedef void (*HPMHOOK_post_mapif_mail_send) (int fd, struct mail_message *msg); +typedef void (*HPMHOOK_pre_mapif_parse_mail_send) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_mail_send) (int fd); +typedef bool (*HPMHOOK_pre_mapif_mercenary_create) (struct s_mercenary **merc); +typedef bool (*HPMHOOK_post_mapif_mercenary_create) (bool retVal___, struct s_mercenary *merc); +typedef bool (*HPMHOOK_pre_mapif_mercenary_save) (const struct s_mercenary **merc); +typedef bool (*HPMHOOK_post_mapif_mercenary_save) (bool retVal___, const struct s_mercenary *merc); +typedef bool (*HPMHOOK_pre_mapif_mercenary_load) (int *merc_id, int *char_id, struct s_mercenary **merc); +typedef bool (*HPMHOOK_post_mapif_mercenary_load) (bool retVal___, int merc_id, int char_id, struct s_mercenary *merc); +typedef bool (*HPMHOOK_pre_mapif_mercenary_delete) (int *merc_id); +typedef bool (*HPMHOOK_post_mapif_mercenary_delete) (bool retVal___, int merc_id); +typedef void (*HPMHOOK_pre_mapif_mercenary_send) (int *fd, struct s_mercenary **merc, unsigned char *flag); +typedef void (*HPMHOOK_post_mapif_mercenary_send) (int fd, struct s_mercenary *merc, unsigned char flag); +typedef void (*HPMHOOK_pre_mapif_parse_mercenary_create) (int *fd, const struct s_mercenary **merc); +typedef void (*HPMHOOK_post_mapif_parse_mercenary_create) (int fd, const struct s_mercenary *merc); +typedef void (*HPMHOOK_pre_mapif_parse_mercenary_load) (int *fd, int *merc_id, int *char_id); +typedef void (*HPMHOOK_post_mapif_parse_mercenary_load) (int fd, int merc_id, int char_id); +typedef void (*HPMHOOK_pre_mapif_mercenary_deleted) (int *fd, unsigned char *flag); +typedef void (*HPMHOOK_post_mapif_mercenary_deleted) (int fd, unsigned char flag); +typedef void (*HPMHOOK_pre_mapif_parse_mercenary_delete) (int *fd, int *merc_id); +typedef void (*HPMHOOK_post_mapif_parse_mercenary_delete) (int fd, int merc_id); +typedef void (*HPMHOOK_pre_mapif_mercenary_saved) (int *fd, unsigned char *flag); +typedef void (*HPMHOOK_post_mapif_mercenary_saved) (int fd, unsigned char flag); +typedef void (*HPMHOOK_pre_mapif_parse_mercenary_save) (int *fd, const struct s_mercenary **merc); +typedef void (*HPMHOOK_post_mapif_parse_mercenary_save) (int fd, const struct s_mercenary *merc); +typedef int (*HPMHOOK_pre_mapif_party_created) (int *fd, int *account_id, int *char_id, struct party **p); +typedef int (*HPMHOOK_post_mapif_party_created) (int retVal___, int fd, int account_id, int char_id, struct party *p); +typedef void (*HPMHOOK_pre_mapif_party_noinfo) (int *fd, int *party_id, int *char_id); +typedef void (*HPMHOOK_post_mapif_party_noinfo) (int fd, int party_id, int char_id); +typedef void (*HPMHOOK_pre_mapif_party_info) (int *fd, struct party **p, int *char_id); +typedef void (*HPMHOOK_post_mapif_party_info) (int fd, struct party *p, int char_id); +typedef int (*HPMHOOK_pre_mapif_party_memberadded) (int *fd, int *party_id, int *account_id, int *char_id, int *flag); +typedef int (*HPMHOOK_post_mapif_party_memberadded) (int retVal___, int fd, int party_id, int account_id, int char_id, int flag); +typedef int (*HPMHOOK_pre_mapif_party_optionchanged) (int *fd, struct party **p, int *account_id, int *flag); +typedef int (*HPMHOOK_post_mapif_party_optionchanged) (int retVal___, int fd, struct party *p, int account_id, int flag); +typedef int (*HPMHOOK_pre_mapif_party_withdraw) (int *party_id, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_mapif_party_withdraw) (int retVal___, int party_id, int account_id, int char_id); +typedef int (*HPMHOOK_pre_mapif_party_membermoved) (struct party **p, int *idx); +typedef int (*HPMHOOK_post_mapif_party_membermoved) (int retVal___, struct party *p, int idx); +typedef int (*HPMHOOK_pre_mapif_party_broken) (int *party_id, int *flag); +typedef int (*HPMHOOK_post_mapif_party_broken) (int retVal___, int party_id, int flag); +typedef int (*HPMHOOK_pre_mapif_party_message) (int *party_id, int *account_id, const char **mes, int *len, int *sfd); +typedef int (*HPMHOOK_post_mapif_party_message) (int retVal___, int party_id, int account_id, const char *mes, int len, int sfd); +typedef int (*HPMHOOK_pre_mapif_parse_CreateParty) (int *fd, const char **name, int *item, int *item2, const struct party_member **leader); +typedef int (*HPMHOOK_post_mapif_parse_CreateParty) (int retVal___, int fd, const char *name, int item, int item2, const struct party_member *leader); +typedef void (*HPMHOOK_pre_mapif_parse_PartyInfo) (int *fd, int *party_id, int *char_id); +typedef void (*HPMHOOK_post_mapif_parse_PartyInfo) (int fd, int party_id, int char_id); +typedef int (*HPMHOOK_pre_mapif_parse_PartyAddMember) (int *fd, int *party_id, const struct party_member **member); +typedef int (*HPMHOOK_post_mapif_parse_PartyAddMember) (int retVal___, int fd, int party_id, const struct party_member *member); +typedef int (*HPMHOOK_pre_mapif_parse_PartyChangeOption) (int *fd, int *party_id, int *account_id, int *exp, int *item); +typedef int (*HPMHOOK_post_mapif_parse_PartyChangeOption) (int retVal___, int fd, int party_id, int account_id, int exp, int item); +typedef int (*HPMHOOK_pre_mapif_parse_PartyLeave) (int *fd, int *party_id, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_mapif_parse_PartyLeave) (int retVal___, int fd, int party_id, int account_id, int char_id); +typedef int (*HPMHOOK_pre_mapif_parse_PartyChangeMap) (int *fd, int *party_id, int *account_id, int *char_id, unsigned short *map, int *online, unsigned int *lv); +typedef int (*HPMHOOK_post_mapif_parse_PartyChangeMap) (int retVal___, int fd, int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv); +typedef int (*HPMHOOK_pre_mapif_parse_BreakParty) (int *fd, int *party_id); +typedef int (*HPMHOOK_post_mapif_parse_BreakParty) (int retVal___, int fd, int party_id); +typedef int (*HPMHOOK_pre_mapif_parse_PartyMessage) (int *fd, int *party_id, int *account_id, const char **mes, int *len); +typedef int (*HPMHOOK_post_mapif_parse_PartyMessage) (int retVal___, int fd, int party_id, int account_id, const char *mes, int len); +typedef int (*HPMHOOK_pre_mapif_parse_PartyLeaderChange) (int *fd, int *party_id, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_mapif_parse_PartyLeaderChange) (int retVal___, int fd, int party_id, int account_id, int char_id); +typedef int (*HPMHOOK_pre_mapif_pet_created) (int *fd, int *account_id, struct s_pet **p); +typedef int (*HPMHOOK_post_mapif_pet_created) (int retVal___, int fd, int account_id, struct s_pet *p); +typedef int (*HPMHOOK_pre_mapif_pet_info) (int *fd, int *account_id, struct s_pet **p); +typedef int (*HPMHOOK_post_mapif_pet_info) (int retVal___, int fd, int account_id, struct s_pet *p); +typedef int (*HPMHOOK_pre_mapif_pet_noinfo) (int *fd, int *account_id); +typedef int (*HPMHOOK_post_mapif_pet_noinfo) (int retVal___, int fd, int account_id); +typedef int (*HPMHOOK_pre_mapif_save_pet_ack) (int *fd, int *account_id, int *flag); +typedef int (*HPMHOOK_post_mapif_save_pet_ack) (int retVal___, int fd, int account_id, int flag); +typedef int (*HPMHOOK_pre_mapif_delete_pet_ack) (int *fd, int *flag); +typedef int (*HPMHOOK_post_mapif_delete_pet_ack) (int retVal___, int fd, int flag); +typedef int (*HPMHOOK_pre_mapif_create_pet) (int *fd, int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char **pet_name); +typedef int (*HPMHOOK_post_mapif_create_pet) (int retVal___, int fd, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id, short pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name); +typedef int (*HPMHOOK_pre_mapif_load_pet) (int *fd, int *account_id, int *char_id, int *pet_id); +typedef int (*HPMHOOK_post_mapif_load_pet) (int retVal___, int fd, int account_id, int char_id, int pet_id); +typedef int (*HPMHOOK_pre_mapif_save_pet) (int *fd, int *account_id, const struct s_pet **data); +typedef int (*HPMHOOK_post_mapif_save_pet) (int retVal___, int fd, int account_id, const struct s_pet *data); +typedef int (*HPMHOOK_pre_mapif_delete_pet) (int *fd, int *pet_id); +typedef int (*HPMHOOK_post_mapif_delete_pet) (int retVal___, int fd, int pet_id); +typedef int (*HPMHOOK_pre_mapif_parse_CreatePet) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_CreatePet) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_parse_LoadPet) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_LoadPet) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_parse_SavePet) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_SavePet) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_parse_DeletePet) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_DeletePet) (int retVal___, int fd); +typedef struct quest* (*HPMHOOK_pre_mapif_quests_fromsql) (int *char_id, int **count); +typedef struct quest* (*HPMHOOK_post_mapif_quests_fromsql) (struct quest* retVal___, int char_id, int *count); +typedef bool (*HPMHOOK_pre_mapif_quest_delete) (int *char_id, int *quest_id); +typedef bool (*HPMHOOK_post_mapif_quest_delete) (bool retVal___, int char_id, int quest_id); +typedef bool (*HPMHOOK_pre_mapif_quest_add) (int *char_id, struct quest *qd); +typedef bool (*HPMHOOK_post_mapif_quest_add) (bool retVal___, int char_id, struct quest qd); +typedef bool (*HPMHOOK_pre_mapif_quest_update) (int *char_id, struct quest *qd); +typedef bool (*HPMHOOK_post_mapif_quest_update) (bool retVal___, int char_id, struct quest qd); +typedef void (*HPMHOOK_pre_mapif_quest_save_ack) (int *fd, int *char_id, bool *success); +typedef void (*HPMHOOK_post_mapif_quest_save_ack) (int fd, int char_id, bool success); +typedef int (*HPMHOOK_pre_mapif_parse_quest_save) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_quest_save) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_mapif_send_quests) (int *fd, int *char_id, struct quest **tmp_questlog, int *num_quests); +typedef void (*HPMHOOK_post_mapif_send_quests) (int fd, int char_id, struct quest *tmp_questlog, int num_quests); +typedef int (*HPMHOOK_pre_mapif_parse_quest_load) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_quest_load) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_load_guild_storage) (int *fd, int *account_id, int *guild_id, char *flag); +typedef int (*HPMHOOK_post_mapif_load_guild_storage) (int retVal___, int fd, int account_id, int guild_id, char flag); +typedef int (*HPMHOOK_pre_mapif_save_guild_storage_ack) (int *fd, int *account_id, int *guild_id, int *fail); +typedef int (*HPMHOOK_post_mapif_save_guild_storage_ack) (int retVal___, int fd, int account_id, int guild_id, int fail); +typedef int (*HPMHOOK_pre_mapif_parse_LoadGuildStorage) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_LoadGuildStorage) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_parse_SaveGuildStorage) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_SaveGuildStorage) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_itembound_ack) (int *fd, int *aid, int *guild_id); +typedef int (*HPMHOOK_post_mapif_itembound_ack) (int retVal___, int fd, int aid, int guild_id); +typedef int (*HPMHOOK_pre_mapif_parse_ItemBoundRetrieve_sub) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_ItemBoundRetrieve_sub) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_mapif_parse_ItemBoundRetrieve) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_ItemBoundRetrieve) (int fd); +typedef void (*HPMHOOK_pre_mapif_parse_accinfo) (int *fd); +typedef void (*HPMHOOK_post_mapif_parse_accinfo) (int fd); +typedef void (*HPMHOOK_pre_mapif_parse_accinfo2) (bool *success, int *map_fd, int *u_fd, int *u_aid, int *account_id, const char **userid, const char **user_pass, const char **email, const char **last_ip, const char **lastlogin, const char **pin_code, const char **birthdate, int *group_id, int *logincount, int *state); +typedef void (*HPMHOOK_post_mapif_parse_accinfo2) (bool success, int map_fd, int u_fd, int u_aid, int account_id, const char *userid, const char *user_pass, const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int group_id, int logincount, int state); +typedef int (*HPMHOOK_pre_mapif_broadcast) (const unsigned char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd); +typedef int (*HPMHOOK_post_mapif_broadcast) (int retVal___, const unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd); +typedef int (*HPMHOOK_pre_mapif_wis_message) (struct WisData **wd); +typedef int (*HPMHOOK_post_mapif_wis_message) (int retVal___, struct WisData *wd); +typedef void (*HPMHOOK_pre_mapif_wis_response) (int *fd, const unsigned char **src, int *flag); +typedef void (*HPMHOOK_post_mapif_wis_response) (int fd, const unsigned char *src, int flag); +typedef int (*HPMHOOK_pre_mapif_wis_end) (struct WisData **wd, int *flag); +typedef int (*HPMHOOK_post_mapif_wis_end) (int retVal___, struct WisData *wd, int flag); +typedef int (*HPMHOOK_pre_mapif_account_reg_reply) (int *fd, int *account_id, int *char_id, int *type); +typedef int (*HPMHOOK_post_mapif_account_reg_reply) (int retVal___, int fd, int account_id, int char_id, int type); +typedef int (*HPMHOOK_pre_mapif_disconnectplayer) (int *fd, int *account_id, int *char_id, int *reason); +typedef int (*HPMHOOK_post_mapif_disconnectplayer) (int retVal___, int fd, int account_id, int char_id, int reason); +typedef int (*HPMHOOK_pre_mapif_parse_broadcast) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_broadcast) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_parse_WisRequest) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_WisRequest) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_parse_WisReply) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_WisReply) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_parse_WisToGM) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_WisToGM) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_parse_Registry) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_Registry) (int retVal___, int fd); +typedef int (*HPMHOOK_pre_mapif_parse_RegistryRequest) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_RegistryRequest) (int retVal___, int fd); +typedef void (*HPMHOOK_pre_mapif_namechange_ack) (int *fd, int *account_id, int *char_id, int *type, int *flag, const char **name); +typedef void (*HPMHOOK_post_mapif_namechange_ack) (int fd, int account_id, int char_id, int type, int flag, const char *name); +typedef int (*HPMHOOK_pre_mapif_parse_NameChangeRequest) (int *fd); +typedef int (*HPMHOOK_post_mapif_parse_NameChangeRequest) (int retVal___, int fd); +#endif // CHAR_MAPIF_H +#ifdef COMMON_MAPINDEX_H /* mapindex */ +typedef int (*HPMHOOK_pre_mapindex_init) (void); +typedef int (*HPMHOOK_post_mapindex_init) (int retVal___); +typedef void (*HPMHOOK_pre_mapindex_final) (void); +typedef void (*HPMHOOK_post_mapindex_final) (void); +typedef int (*HPMHOOK_pre_mapindex_addmap) (int *index, const char **name); +typedef int (*HPMHOOK_post_mapindex_addmap) (int retVal___, int index, const char *name); +typedef void (*HPMHOOK_pre_mapindex_removemap) (int *index); +typedef void (*HPMHOOK_post_mapindex_removemap) (int index); +typedef const char* (*HPMHOOK_pre_mapindex_getmapname) (const char **string, char **output); +typedef const char* (*HPMHOOK_post_mapindex_getmapname) (const char* retVal___, const char *string, char *output); +typedef const char* (*HPMHOOK_pre_mapindex_getmapname_ext) (const char **string, char **output); +typedef const char* (*HPMHOOK_post_mapindex_getmapname_ext) (const char* retVal___, const char *string, char *output); +typedef unsigned short (*HPMHOOK_pre_mapindex_name2id) (const char **p1); +typedef unsigned short (*HPMHOOK_post_mapindex_name2id) (unsigned short retVal___, const char *p1); +typedef const char* (*HPMHOOK_pre_mapindex_id2name) (uint16 *id, const char **file, int *line, const char **func); +typedef const char* (*HPMHOOK_post_mapindex_id2name) (const char* retVal___, uint16 id, const char *file, int line, const char *func); +typedef bool (*HPMHOOK_pre_mapindex_check_default) (void); +typedef bool (*HPMHOOK_post_mapindex_check_default) (bool retVal___); +#endif // COMMON_MAPINDEX_H +#ifdef MAP_MAP_H /* mapit */ +typedef struct s_mapiterator* (*HPMHOOK_pre_mapit_alloc) (enum e_mapitflags *flags, enum bl_type *types); +typedef struct s_mapiterator* (*HPMHOOK_post_mapit_alloc) (struct s_mapiterator* retVal___, enum e_mapitflags flags, enum bl_type types); +typedef void (*HPMHOOK_pre_mapit_free) (struct s_mapiterator **iter); +typedef void (*HPMHOOK_post_mapit_free) (struct s_mapiterator *iter); +typedef struct block_list* (*HPMHOOK_pre_mapit_first) (struct s_mapiterator **iter); +typedef struct block_list* (*HPMHOOK_post_mapit_first) (struct block_list* retVal___, struct s_mapiterator *iter); +typedef struct block_list* (*HPMHOOK_pre_mapit_last) (struct s_mapiterator **iter); +typedef struct block_list* (*HPMHOOK_post_mapit_last) (struct block_list* retVal___, struct s_mapiterator *iter); +typedef struct block_list* (*HPMHOOK_pre_mapit_next) (struct s_mapiterator **iter); +typedef struct block_list* (*HPMHOOK_post_mapit_next) (struct block_list* retVal___, struct s_mapiterator *iter); +typedef struct block_list* (*HPMHOOK_pre_mapit_prev) (struct s_mapiterator **iter); +typedef struct block_list* (*HPMHOOK_post_mapit_prev) (struct block_list* retVal___, struct s_mapiterator *iter); +typedef bool (*HPMHOOK_pre_mapit_exists) (struct s_mapiterator **iter); +typedef bool (*HPMHOOK_post_mapit_exists) (bool retVal___, struct s_mapiterator *iter); +#endif // MAP_MAP_H +#ifdef MAP_MAPREG_H /* mapreg */ +typedef void (*HPMHOOK_pre_mapreg_init) (void); +typedef void (*HPMHOOK_post_mapreg_init) (void); +typedef void (*HPMHOOK_pre_mapreg_final) (void); +typedef void (*HPMHOOK_post_mapreg_final) (void); +typedef int (*HPMHOOK_pre_mapreg_readreg) (int64 *uid); +typedef int (*HPMHOOK_post_mapreg_readreg) (int retVal___, int64 uid); +typedef char* (*HPMHOOK_pre_mapreg_readregstr) (int64 *uid); +typedef char* (*HPMHOOK_post_mapreg_readregstr) (char* retVal___, int64 uid); +typedef bool (*HPMHOOK_pre_mapreg_setreg) (int64 *uid, int *val); +typedef bool (*HPMHOOK_post_mapreg_setreg) (bool retVal___, int64 uid, int val); +typedef bool (*HPMHOOK_pre_mapreg_setregstr) (int64 *uid, const char **str); +typedef bool (*HPMHOOK_post_mapreg_setregstr) (bool retVal___, int64 uid, const char *str); +typedef void (*HPMHOOK_pre_mapreg_load) (void); +typedef void (*HPMHOOK_post_mapreg_load) (void); +typedef void (*HPMHOOK_pre_mapreg_save) (void); +typedef void (*HPMHOOK_post_mapreg_save) (void); +typedef int (*HPMHOOK_pre_mapreg_save_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_mapreg_save_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_mapreg_destroyreg) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_mapreg_destroyreg) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_mapreg_reload) (void); +typedef void (*HPMHOOK_post_mapreg_reload) (void); +typedef bool (*HPMHOOK_pre_mapreg_config_read) (const char **w1, const char **w2); +typedef bool (*HPMHOOK_post_mapreg_config_read) (bool retVal___, const char *w1, const char *w2); +#endif // MAP_MAPREG_H +#ifdef MAP_MERCENARY_H /* mercenary */ +typedef void (*HPMHOOK_pre_mercenary_init) (bool *minimal); +typedef void (*HPMHOOK_post_mercenary_init) (bool minimal); +typedef bool (*HPMHOOK_pre_mercenary_class) (int *class_); +typedef bool (*HPMHOOK_post_mercenary_class) (bool retVal___, int class_); +typedef struct view_data* (*HPMHOOK_pre_mercenary_get_viewdata) (int *class_); +typedef struct view_data* (*HPMHOOK_post_mercenary_get_viewdata) (struct view_data* retVal___, int class_); +typedef int (*HPMHOOK_pre_mercenary_create) (struct map_session_data **sd, int *class_, unsigned int *lifetime); +typedef int (*HPMHOOK_post_mercenary_create) (int retVal___, struct map_session_data *sd, int class_, unsigned int lifetime); +typedef int (*HPMHOOK_pre_mercenary_data_received) (const struct s_mercenary **merc, bool *flag); +typedef int (*HPMHOOK_post_mercenary_data_received) (int retVal___, const struct s_mercenary *merc, bool flag); +typedef int (*HPMHOOK_pre_mercenary_save) (struct mercenary_data **md); +typedef int (*HPMHOOK_post_mercenary_save) (int retVal___, struct mercenary_data *md); +typedef void (*HPMHOOK_pre_mercenary_heal) (struct mercenary_data **md, int *hp, int *sp); +typedef void (*HPMHOOK_post_mercenary_heal) (struct mercenary_data *md, int hp, int sp); +typedef int (*HPMHOOK_pre_mercenary_dead) (struct mercenary_data **md); +typedef int (*HPMHOOK_post_mercenary_dead) (int retVal___, struct mercenary_data *md); +typedef int (*HPMHOOK_pre_mercenary_delete) (struct mercenary_data **md, int *reply); +typedef int (*HPMHOOK_post_mercenary_delete) (int retVal___, struct mercenary_data *md, int reply); +typedef void (*HPMHOOK_pre_mercenary_contract_stop) (struct mercenary_data **md); +typedef void (*HPMHOOK_post_mercenary_contract_stop) (struct mercenary_data *md); +typedef int (*HPMHOOK_pre_mercenary_get_lifetime) (struct mercenary_data **md); +typedef int (*HPMHOOK_post_mercenary_get_lifetime) (int retVal___, struct mercenary_data *md); +typedef int (*HPMHOOK_pre_mercenary_get_guild) (struct mercenary_data **md); +typedef int (*HPMHOOK_post_mercenary_get_guild) (int retVal___, struct mercenary_data *md); +typedef int (*HPMHOOK_pre_mercenary_get_faith) (struct mercenary_data **md); +typedef int (*HPMHOOK_post_mercenary_get_faith) (int retVal___, struct mercenary_data *md); +typedef int (*HPMHOOK_pre_mercenary_set_faith) (struct mercenary_data **md, int *value); +typedef int (*HPMHOOK_post_mercenary_set_faith) (int retVal___, struct mercenary_data *md, int value); +typedef int (*HPMHOOK_pre_mercenary_get_calls) (struct mercenary_data **md); +typedef int (*HPMHOOK_post_mercenary_get_calls) (int retVal___, struct mercenary_data *md); +typedef int (*HPMHOOK_pre_mercenary_set_calls) (struct mercenary_data **md, int *value); +typedef int (*HPMHOOK_post_mercenary_set_calls) (int retVal___, struct mercenary_data *md, int value); +typedef int (*HPMHOOK_pre_mercenary_kills) (struct mercenary_data **md); +typedef int (*HPMHOOK_post_mercenary_kills) (int retVal___, struct mercenary_data *md); +typedef int (*HPMHOOK_pre_mercenary_checkskill) (struct mercenary_data **md, uint16 *skill_id); +typedef int (*HPMHOOK_post_mercenary_checkskill) (int retVal___, struct mercenary_data *md, uint16 skill_id); +typedef int (*HPMHOOK_pre_mercenary_read_db) (void); +typedef int (*HPMHOOK_post_mercenary_read_db) (int retVal___); +typedef int (*HPMHOOK_pre_mercenary_read_skilldb) (void); +typedef int (*HPMHOOK_post_mercenary_read_skilldb) (int retVal___); +typedef int (*HPMHOOK_pre_mercenary_killbonus) (struct mercenary_data **md); +typedef int (*HPMHOOK_post_mercenary_killbonus) (int retVal___, struct mercenary_data *md); +typedef int (*HPMHOOK_pre_mercenary_search_index) (int *class_); +typedef int (*HPMHOOK_post_mercenary_search_index) (int retVal___, int class_); +typedef int (*HPMHOOK_pre_mercenary_contract_end_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_mercenary_contract_end_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef bool (*HPMHOOK_pre_mercenary_read_db_sub) (char **str[], int *columns, int *current); +typedef bool (*HPMHOOK_post_mercenary_read_db_sub) (bool retVal___, char *str[], int columns, int current); +typedef bool (*HPMHOOK_pre_mercenary_read_skill_db_sub) (char **str[], int *columns, int *current); +typedef bool (*HPMHOOK_post_mercenary_read_skill_db_sub) (bool retVal___, char *str[], int columns, int current); +#endif // MAP_MERCENARY_H +#ifdef MAP_MOB_H /* mob */ +typedef int (*HPMHOOK_pre_mob_init) (bool *mimimal); +typedef int (*HPMHOOK_post_mob_init) (int retVal___, bool mimimal); +typedef int (*HPMHOOK_pre_mob_final) (void); +typedef int (*HPMHOOK_post_mob_final) (int retVal___); +typedef void (*HPMHOOK_pre_mob_reload) (void); +typedef void (*HPMHOOK_post_mob_reload) (void); +typedef struct mob_db* (*HPMHOOK_pre_mob_db) (int *index); +typedef struct mob_db* (*HPMHOOK_post_mob_db) (struct mob_db* retVal___, int index); +typedef struct mob_chat* (*HPMHOOK_pre_mob_chat) (short *id); +typedef struct mob_chat* (*HPMHOOK_post_mob_chat) (struct mob_chat* retVal___, short id); +typedef int (*HPMHOOK_pre_mob_makedummymobdb) (int *p1); +typedef int (*HPMHOOK_post_mob_makedummymobdb) (int retVal___, int p1); +typedef int (*HPMHOOK_pre_mob_spawn_guardian_sub) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_mob_spawn_guardian_sub) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_mob_skill_id2skill_idx) (int *class_, uint16 *skill_id); +typedef int (*HPMHOOK_post_mob_skill_id2skill_idx) (int retVal___, int class_, uint16 skill_id); +typedef int (*HPMHOOK_pre_mob_db_searchname) (const char **str); +typedef int (*HPMHOOK_post_mob_db_searchname) (int retVal___, const char *str); +typedef int (*HPMHOOK_pre_mob_db_searchname_array_sub) (struct mob_db **monster, const char **str, int *flag); +typedef int (*HPMHOOK_post_mob_db_searchname_array_sub) (int retVal___, struct mob_db *monster, const char *str, int flag); +typedef void (*HPMHOOK_pre_mob_mvptomb_create) (struct mob_data **md, char **killer, time_t *time); +typedef void (*HPMHOOK_post_mob_mvptomb_create) (struct mob_data *md, char *killer, time_t time); +typedef void (*HPMHOOK_pre_mob_mvptomb_destroy) (struct mob_data **md); +typedef void (*HPMHOOK_post_mob_mvptomb_destroy) (struct mob_data *md); +typedef int (*HPMHOOK_pre_mob_db_searchname_array) (struct mob_db ***data, int *size, const char **str, int *flag); +typedef int (*HPMHOOK_post_mob_db_searchname_array) (int retVal___, struct mob_db **data, int size, const char *str, int flag); +typedef int (*HPMHOOK_pre_mob_db_checkid) (const int *id); +typedef int (*HPMHOOK_post_mob_db_checkid) (int retVal___, const int id); +typedef struct view_data* (*HPMHOOK_pre_mob_get_viewdata) (int *class_); +typedef struct view_data* (*HPMHOOK_post_mob_get_viewdata) (struct view_data* retVal___, int class_); +typedef int (*HPMHOOK_pre_mob_parse_dataset) (struct spawn_data **data); +typedef int (*HPMHOOK_post_mob_parse_dataset) (int retVal___, struct spawn_data *data); +typedef struct mob_data* (*HPMHOOK_pre_mob_spawn_dataset) (struct spawn_data **data); +typedef struct mob_data* (*HPMHOOK_post_mob_spawn_dataset) (struct mob_data* retVal___, struct spawn_data *data); +typedef int (*HPMHOOK_pre_mob_get_random_id) (int *type, int *flag, int *lv); +typedef int (*HPMHOOK_post_mob_get_random_id) (int retVal___, int type, int flag, int lv); +typedef bool (*HPMHOOK_pre_mob_ksprotected) (struct block_list **src, struct block_list **target); +typedef bool (*HPMHOOK_post_mob_ksprotected) (bool retVal___, struct block_list *src, struct block_list *target); +typedef struct mob_data* (*HPMHOOK_pre_mob_once_spawn_sub) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai); +typedef struct mob_data* (*HPMHOOK_post_mob_once_spawn_sub) (struct mob_data* retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai); +typedef int (*HPMHOOK_pre_mob_once_spawn) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, int *amount, const char **event, unsigned int *size, unsigned int *ai); +typedef int (*HPMHOOK_post_mob_once_spawn) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y, const char *mobname, int class_, int amount, const char *event, unsigned int size, unsigned int ai); +typedef int (*HPMHOOK_pre_mob_once_spawn_area) (struct map_session_data **sd, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, const char **mobname, int *class_, int *amount, const char **event, unsigned int *size, unsigned int *ai); +typedef int (*HPMHOOK_post_mob_once_spawn_area) (int retVal___, struct map_session_data *sd, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, const char *mobname, int class_, int amount, const char *event, unsigned int size, unsigned int ai); +typedef int (*HPMHOOK_pre_mob_spawn_guardian) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, int *guardian, bool *has_index); +typedef int (*HPMHOOK_post_mob_spawn_guardian) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, int guardian, bool has_index); +typedef int (*HPMHOOK_pre_mob_spawn_bg) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, unsigned int *bg_id); +typedef int (*HPMHOOK_post_mob_spawn_bg) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, unsigned int bg_id); +typedef int (*HPMHOOK_pre_mob_can_reach) (struct mob_data **md, struct block_list **bl, int *range, int *state); +typedef int (*HPMHOOK_post_mob_can_reach) (int retVal___, struct mob_data *md, struct block_list *bl, int range, int state); +typedef int (*HPMHOOK_pre_mob_linksearch) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_linksearch) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_delayspawn) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_mob_delayspawn) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_mob_setdelayspawn) (struct mob_data **md); +typedef int (*HPMHOOK_post_mob_setdelayspawn) (int retVal___, struct mob_data *md); +typedef int (*HPMHOOK_pre_mob_count_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_count_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_spawn) (struct mob_data **md); +typedef int (*HPMHOOK_post_mob_spawn) (int retVal___, struct mob_data *md); +typedef int (*HPMHOOK_pre_mob_can_changetarget) (const struct mob_data **md, const struct block_list **target, uint32 *mode); +typedef int (*HPMHOOK_post_mob_can_changetarget) (int retVal___, const struct mob_data *md, const struct block_list *target, uint32 mode); +typedef int (*HPMHOOK_pre_mob_target) (struct mob_data **md, struct block_list **bl, int *dist); +typedef int (*HPMHOOK_post_mob_target) (int retVal___, struct mob_data *md, struct block_list *bl, int dist); +typedef int (*HPMHOOK_pre_mob_ai_sub_hard_activesearch) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_ai_sub_hard_activesearch) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_ai_sub_hard_changechase) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_ai_sub_hard_changechase) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_ai_sub_hard_bg_ally) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_ai_sub_hard_bg_ally) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_ai_sub_hard_lootsearch) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_ai_sub_hard_lootsearch) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_warpchase_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_warpchase_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_ai_sub_hard_slavemob) (struct mob_data **md, int64 *tick); +typedef int (*HPMHOOK_post_mob_ai_sub_hard_slavemob) (int retVal___, struct mob_data *md, int64 tick); +typedef int (*HPMHOOK_pre_mob_unlocktarget) (struct mob_data **md, int64 *tick); +typedef int (*HPMHOOK_post_mob_unlocktarget) (int retVal___, struct mob_data *md, int64 tick); +typedef int (*HPMHOOK_pre_mob_randomwalk) (struct mob_data **md, int64 *tick); +typedef int (*HPMHOOK_post_mob_randomwalk) (int retVal___, struct mob_data *md, int64 tick); +typedef int (*HPMHOOK_pre_mob_warpchase) (struct mob_data **md, struct block_list **target); +typedef int (*HPMHOOK_post_mob_warpchase) (int retVal___, struct mob_data *md, struct block_list *target); +typedef bool (*HPMHOOK_pre_mob_ai_sub_hard) (struct mob_data **md, int64 *tick); +typedef bool (*HPMHOOK_post_mob_ai_sub_hard) (bool retVal___, struct mob_data *md, int64 tick); +typedef int (*HPMHOOK_pre_mob_ai_sub_hard_timer) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_ai_sub_hard_timer) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_ai_sub_foreachclient) (struct map_session_data **sd, va_list ap); +typedef int (*HPMHOOK_post_mob_ai_sub_foreachclient) (int retVal___, struct map_session_data *sd, va_list ap); +typedef int (*HPMHOOK_pre_mob_ai_sub_lazy) (struct mob_data **md, va_list args); +typedef int (*HPMHOOK_post_mob_ai_sub_lazy) (int retVal___, struct mob_data *md, va_list args); +typedef int (*HPMHOOK_pre_mob_ai_lazy) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_mob_ai_lazy) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_mob_ai_hard) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_mob_ai_hard) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef struct item_drop* (*HPMHOOK_pre_mob_setdropitem) (int *nameid, int *qty, struct item_data **data); +typedef struct item_drop* (*HPMHOOK_post_mob_setdropitem) (struct item_drop* retVal___, int nameid, int qty, struct item_data *data); +typedef struct item_drop* (*HPMHOOK_pre_mob_setlootitem) (struct item **item); +typedef struct item_drop* (*HPMHOOK_post_mob_setlootitem) (struct item_drop* retVal___, struct item *item); +typedef int (*HPMHOOK_pre_mob_delay_item_drop) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_mob_delay_item_drop) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_mob_item_drop) (struct mob_data **md, struct item_drop_list **dlist, struct item_drop **ditem, int *loot, int *drop_rate, unsigned short *flag); +typedef void (*HPMHOOK_post_mob_item_drop) (struct mob_data *md, struct item_drop_list *dlist, struct item_drop *ditem, int loot, int drop_rate, unsigned short flag); +typedef int (*HPMHOOK_pre_mob_timer_delete) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_mob_timer_delete) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_mob_deleteslave_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_deleteslave_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_deleteslave) (struct mob_data **md); +typedef int (*HPMHOOK_post_mob_deleteslave) (int retVal___, struct mob_data *md); +typedef int (*HPMHOOK_pre_mob_respawn) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_mob_respawn) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_mob_log_damage) (struct mob_data **md, struct block_list **src, int *damage); +typedef void (*HPMHOOK_post_mob_log_damage) (struct mob_data *md, struct block_list *src, int damage); +typedef void (*HPMHOOK_pre_mob_damage) (struct mob_data **md, struct block_list **src, int *damage); +typedef void (*HPMHOOK_post_mob_damage) (struct mob_data *md, struct block_list *src, int damage); +typedef int (*HPMHOOK_pre_mob_dead) (struct mob_data **md, struct block_list **src, int *type); +typedef int (*HPMHOOK_post_mob_dead) (int retVal___, struct mob_data *md, struct block_list *src, int type); +typedef void (*HPMHOOK_pre_mob_revive) (struct mob_data **md, unsigned int *hp); +typedef void (*HPMHOOK_post_mob_revive) (struct mob_data *md, unsigned int hp); +typedef int (*HPMHOOK_pre_mob_guardian_guildchange) (struct mob_data **md); +typedef int (*HPMHOOK_post_mob_guardian_guildchange) (int retVal___, struct mob_data *md); +typedef int (*HPMHOOK_pre_mob_random_class) (int **value, size_t *count); +typedef int (*HPMHOOK_post_mob_random_class) (int retVal___, int *value, size_t count); +typedef int (*HPMHOOK_pre_mob_class_change) (struct mob_data **md, int *class_); +typedef int (*HPMHOOK_post_mob_class_change) (int retVal___, struct mob_data *md, int class_); +typedef void (*HPMHOOK_pre_mob_heal) (struct mob_data **md, unsigned int *heal); +typedef void (*HPMHOOK_post_mob_heal) (struct mob_data *md, unsigned int heal); +typedef int (*HPMHOOK_pre_mob_warpslave_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_warpslave_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_warpslave) (struct block_list **bl, int *range); +typedef int (*HPMHOOK_post_mob_warpslave) (int retVal___, struct block_list *bl, int range); +typedef int (*HPMHOOK_pre_mob_countslave_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_countslave_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_mob_countslave) (struct block_list **bl); +typedef int (*HPMHOOK_post_mob_countslave) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_mob_summonslave) (struct mob_data **md2, int **value, int *amount, uint16 *skill_id); +typedef int (*HPMHOOK_post_mob_summonslave) (int retVal___, struct mob_data *md2, int *value, int amount, uint16 skill_id); +typedef int (*HPMHOOK_pre_mob_getfriendhprate_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_getfriendhprate_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef struct block_list* (*HPMHOOK_pre_mob_getfriendhprate) (struct mob_data **md, int *min_rate, int *max_rate); +typedef struct block_list* (*HPMHOOK_post_mob_getfriendhprate) (struct block_list* retVal___, struct mob_data *md, int min_rate, int max_rate); +typedef struct block_list* (*HPMHOOK_pre_mob_getmasterhpltmaxrate) (struct mob_data **md, int *rate); +typedef struct block_list* (*HPMHOOK_post_mob_getmasterhpltmaxrate) (struct block_list* retVal___, struct mob_data *md, int rate); +typedef int (*HPMHOOK_pre_mob_getfriendstatus_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_mob_getfriendstatus_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef struct mob_data* (*HPMHOOK_pre_mob_getfriendstatus) (struct mob_data **md, int *cond1, int *cond2); +typedef struct mob_data* (*HPMHOOK_post_mob_getfriendstatus) (struct mob_data* retVal___, struct mob_data *md, int cond1, int cond2); +typedef int (*HPMHOOK_pre_mob_skill_use) (struct mob_data **md, int64 *tick, int *event); +typedef int (*HPMHOOK_post_mob_skill_use) (int retVal___, struct mob_data *md, int64 tick, int event); +typedef int (*HPMHOOK_pre_mob_skill_event) (struct mob_data **md, struct block_list **src, int64 *tick, int *flag); +typedef int (*HPMHOOK_post_mob_skill_event) (int retVal___, struct mob_data *md, struct block_list *src, int64 tick, int flag); +typedef int (*HPMHOOK_pre_mob_is_clone) (int *class_); +typedef int (*HPMHOOK_post_mob_is_clone) (int retVal___, int class_); +typedef int (*HPMHOOK_pre_mob_clone_spawn) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y, const char **event, int *master_id, uint32 *mode, int *flag, unsigned int *duration); +typedef int (*HPMHOOK_post_mob_clone_spawn) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, uint32 mode, int flag, unsigned int duration); +typedef int (*HPMHOOK_pre_mob_clone_delete) (struct mob_data **md); +typedef int (*HPMHOOK_post_mob_clone_delete) (int retVal___, struct mob_data *md); +typedef unsigned int (*HPMHOOK_pre_mob_drop_adjust) (int *baserate, int *rate_adjust, unsigned short *rate_min, unsigned short *rate_max); +typedef unsigned int (*HPMHOOK_post_mob_drop_adjust) (unsigned int retVal___, int baserate, int rate_adjust, unsigned short rate_min, unsigned short rate_max); +typedef void (*HPMHOOK_pre_mob_item_dropratio_adjust) (int *nameid, int *mob_id, int **rate_adjust); +typedef void (*HPMHOOK_post_mob_item_dropratio_adjust) (int nameid, int mob_id, int *rate_adjust); +typedef void (*HPMHOOK_pre_mob_readdb) (void); +typedef void (*HPMHOOK_post_mob_readdb) (void); +typedef bool (*HPMHOOK_pre_mob_lookup_const) (const struct config_setting_t **it, const char **name, int **value); +typedef bool (*HPMHOOK_post_mob_lookup_const) (bool retVal___, const struct config_setting_t *it, const char *name, int *value); +typedef bool (*HPMHOOK_pre_mob_get_const) (const struct config_setting_t **it, int **value); +typedef bool (*HPMHOOK_post_mob_get_const) (bool retVal___, const struct config_setting_t *it, int *value); +typedef int (*HPMHOOK_pre_mob_db_validate_entry) (struct mob_db **entry, int *n, const char **source); +typedef int (*HPMHOOK_post_mob_db_validate_entry) (int retVal___, struct mob_db *entry, int n, const char *source); +typedef int (*HPMHOOK_pre_mob_read_libconfig) (const char **filename, bool *ignore_missing); +typedef int (*HPMHOOK_post_mob_read_libconfig) (int retVal___, const char *filename, bool ignore_missing); +typedef void (*HPMHOOK_pre_mob_read_db_additional_fields) (struct mob_db **entry, struct config_setting_t **it, int *n, const char **source); +typedef void (*HPMHOOK_post_mob_read_db_additional_fields) (struct mob_db *entry, struct config_setting_t *it, int n, const char *source); +typedef int (*HPMHOOK_pre_mob_read_db_sub) (struct config_setting_t **mobt, int *id, const char **source); +typedef int (*HPMHOOK_post_mob_read_db_sub) (int retVal___, struct config_setting_t *mobt, int id, const char *source); +typedef void (*HPMHOOK_pre_mob_read_db_drops_sub) (struct mob_db **entry, struct config_setting_t **t); +typedef void (*HPMHOOK_post_mob_read_db_drops_sub) (struct mob_db *entry, struct config_setting_t *t); +typedef void (*HPMHOOK_pre_mob_read_db_mvpdrops_sub) (struct mob_db **entry, struct config_setting_t **t); +typedef void (*HPMHOOK_post_mob_read_db_mvpdrops_sub) (struct mob_db *entry, struct config_setting_t *t); +typedef uint32 (*HPMHOOK_pre_mob_read_db_mode_sub) (struct mob_db **entry, struct config_setting_t **t); +typedef uint32 (*HPMHOOK_post_mob_read_db_mode_sub) (uint32 retVal___, struct mob_db *entry, struct config_setting_t *t); +typedef void (*HPMHOOK_pre_mob_read_db_stats_sub) (struct mob_db **entry, struct config_setting_t **t); +typedef void (*HPMHOOK_post_mob_read_db_stats_sub) (struct mob_db *entry, struct config_setting_t *t); +typedef void (*HPMHOOK_pre_mob_name_constants) (void); +typedef void (*HPMHOOK_post_mob_name_constants) (void); +typedef bool (*HPMHOOK_pre_mob_readdb_mobavail) (char **str[], int *columns, int *current); +typedef bool (*HPMHOOK_post_mob_readdb_mobavail) (bool retVal___, char *str[], int columns, int current); +typedef int (*HPMHOOK_pre_mob_read_randommonster) (void); +typedef int (*HPMHOOK_post_mob_read_randommonster) (int retVal___); +typedef bool (*HPMHOOK_pre_mob_parse_row_chatdb) (char ***str, const char **source, int *line, int **last_msg_id); +typedef bool (*HPMHOOK_post_mob_parse_row_chatdb) (bool retVal___, char **str, const char *source, int line, int *last_msg_id); +typedef void (*HPMHOOK_pre_mob_readchatdb) (void); +typedef void (*HPMHOOK_post_mob_readchatdb) (void); +typedef bool (*HPMHOOK_pre_mob_parse_row_mobskilldb) (char ***str, int *columns, int *current); +typedef bool (*HPMHOOK_post_mob_parse_row_mobskilldb) (bool retVal___, char **str, int columns, int current); +typedef void (*HPMHOOK_pre_mob_readskilldb) (void); +typedef void (*HPMHOOK_post_mob_readskilldb) (void); +typedef bool (*HPMHOOK_pre_mob_readdb_race2) (char **fields[], int *columns, int *current); +typedef bool (*HPMHOOK_post_mob_readdb_race2) (bool retVal___, char *fields[], int columns, int current); +typedef bool (*HPMHOOK_pre_mob_readdb_itemratio) (char **str[], int *columns, int *current); +typedef bool (*HPMHOOK_post_mob_readdb_itemratio) (bool retVal___, char *str[], int columns, int current); +typedef void (*HPMHOOK_pre_mob_load) (bool *minimal); +typedef void (*HPMHOOK_post_mob_load) (bool minimal); +typedef void (*HPMHOOK_pre_mob_clear_spawninfo) (void); +typedef void (*HPMHOOK_post_mob_clear_spawninfo) (void); +typedef void (*HPMHOOK_pre_mob_destroy_mob_db) (int *index); +typedef void (*HPMHOOK_post_mob_destroy_mob_db) (int index); +#endif // MAP_MOB_H +#ifdef MAP_NPC_H /* npc_chat */ +typedef int (*HPMHOOK_pre_npc_chat_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_npc_chat_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_npc_chat_finalize) (struct npc_data **nd); +typedef void (*HPMHOOK_post_npc_chat_finalize) (struct npc_data *nd); +typedef void (*HPMHOOK_pre_npc_chat_def_pattern) (struct npc_data **nd, int *setid, const char **pattern, const char **label); +typedef void (*HPMHOOK_post_npc_chat_def_pattern) (struct npc_data *nd, int setid, const char *pattern, const char *label); +typedef struct pcrematch_entry* (*HPMHOOK_pre_npc_chat_create_pcrematch_entry) (struct pcrematch_set **set); +typedef struct pcrematch_entry* (*HPMHOOK_post_npc_chat_create_pcrematch_entry) (struct pcrematch_entry* retVal___, struct pcrematch_set *set); +typedef void (*HPMHOOK_pre_npc_chat_delete_pcreset) (struct npc_data **nd, int *setid); +typedef void (*HPMHOOK_post_npc_chat_delete_pcreset) (struct npc_data *nd, int setid); +typedef void (*HPMHOOK_pre_npc_chat_deactivate_pcreset) (struct npc_data **nd, int *setid); +typedef void (*HPMHOOK_post_npc_chat_deactivate_pcreset) (struct npc_data *nd, int setid); +typedef void (*HPMHOOK_pre_npc_chat_activate_pcreset) (struct npc_data **nd, int *setid); +typedef void (*HPMHOOK_post_npc_chat_activate_pcreset) (struct npc_data *nd, int setid); +typedef struct pcrematch_set* (*HPMHOOK_pre_npc_chat_lookup_pcreset) (struct npc_data **nd, int *setid); +typedef struct pcrematch_set* (*HPMHOOK_post_npc_chat_lookup_pcreset) (struct pcrematch_set* retVal___, struct npc_data *nd, int setid); +typedef void (*HPMHOOK_pre_npc_chat_finalize_pcrematch_entry) (struct pcrematch_entry **e); +typedef void (*HPMHOOK_post_npc_chat_finalize_pcrematch_entry) (struct pcrematch_entry *e); +#endif // MAP_NPC_H +#ifdef MAP_NPC_H /* npc */ +typedef int (*HPMHOOK_pre_npc_init) (bool *minimal); +typedef int (*HPMHOOK_post_npc_init) (int retVal___, bool minimal); +typedef int (*HPMHOOK_pre_npc_final) (void); +typedef int (*HPMHOOK_post_npc_final) (int retVal___); +typedef int (*HPMHOOK_pre_npc_get_new_npc_id) (void); +typedef int (*HPMHOOK_post_npc_get_new_npc_id) (int retVal___); +typedef struct view_data* (*HPMHOOK_pre_npc_get_viewdata) (int *class_); +typedef struct view_data* (*HPMHOOK_post_npc_get_viewdata) (struct view_data* retVal___, int class_); +typedef int (*HPMHOOK_pre_npc_isnear_sub) (struct block_list **bl, va_list args); +typedef int (*HPMHOOK_post_npc_isnear_sub) (int retVal___, struct block_list *bl, va_list args); +typedef bool (*HPMHOOK_pre_npc_isnear) (struct block_list **bl); +typedef bool (*HPMHOOK_post_npc_isnear) (bool retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_npc_ontouch_event) (struct map_session_data **sd, struct npc_data **nd); +typedef int (*HPMHOOK_post_npc_ontouch_event) (int retVal___, struct map_session_data *sd, struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_ontouch2_event) (struct map_session_data **sd, struct npc_data **nd); +typedef int (*HPMHOOK_post_npc_ontouch2_event) (int retVal___, struct map_session_data *sd, struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_onuntouch_event) (struct map_session_data **sd, struct npc_data **nd); +typedef int (*HPMHOOK_post_npc_onuntouch_event) (int retVal___, struct map_session_data *sd, struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_enable_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_npc_enable_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_npc_enable) (const char **name, int *flag); +typedef int (*HPMHOOK_post_npc_enable) (int retVal___, const char *name, int flag); +typedef struct npc_data* (*HPMHOOK_pre_npc_name2id) (const char **name); +typedef struct npc_data* (*HPMHOOK_post_npc_name2id) (struct npc_data* retVal___, const char *name); +typedef int (*HPMHOOK_pre_npc_event_dequeue) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_npc_event_dequeue) (int retVal___, struct map_session_data *sd); +typedef struct DBData (*HPMHOOK_pre_npc_event_export_create) (union DBKey *key, va_list args); +typedef struct DBData (*HPMHOOK_post_npc_event_export_create) (struct DBData retVal___, union DBKey key, va_list args); +typedef int (*HPMHOOK_pre_npc_event_export) (struct npc_data **nd, int *i); +typedef int (*HPMHOOK_post_npc_event_export) (int retVal___, struct npc_data *nd, int i); +typedef int (*HPMHOOK_pre_npc_event_sub) (struct map_session_data **sd, struct event_data **ev, const char **eventname); +typedef int (*HPMHOOK_post_npc_event_sub) (int retVal___, struct map_session_data *sd, struct event_data *ev, const char *eventname); +typedef void (*HPMHOOK_pre_npc_event_doall_sub) (void **key, void **data, va_list ap); +typedef void (*HPMHOOK_post_npc_event_doall_sub) (void *key, void *data, va_list ap); +typedef int (*HPMHOOK_pre_npc_event_do) (const char **name); +typedef int (*HPMHOOK_post_npc_event_do) (int retVal___, const char *name); +typedef int (*HPMHOOK_pre_npc_event_doall_id) (const char **name, int *rid); +typedef int (*HPMHOOK_post_npc_event_doall_id) (int retVal___, const char *name, int rid); +typedef int (*HPMHOOK_pre_npc_event_doall) (const char **name); +typedef int (*HPMHOOK_post_npc_event_doall) (int retVal___, const char *name); +typedef int (*HPMHOOK_pre_npc_event_do_clock) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_npc_event_do_clock) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_npc_event_do_oninit) (bool *reload); +typedef void (*HPMHOOK_post_npc_event_do_oninit) (bool reload); +typedef int (*HPMHOOK_pre_npc_timerevent_export) (struct npc_data **nd, int *i); +typedef int (*HPMHOOK_post_npc_timerevent_export) (int retVal___, struct npc_data *nd, int i); +typedef int (*HPMHOOK_pre_npc_timerevent) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_npc_timerevent) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_npc_timerevent_start) (struct npc_data **nd, int *rid); +typedef int (*HPMHOOK_post_npc_timerevent_start) (int retVal___, struct npc_data *nd, int rid); +typedef int (*HPMHOOK_pre_npc_timerevent_stop) (struct npc_data **nd); +typedef int (*HPMHOOK_post_npc_timerevent_stop) (int retVal___, struct npc_data *nd); +typedef void (*HPMHOOK_pre_npc_timerevent_quit) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_npc_timerevent_quit) (struct map_session_data *sd); +typedef int64 (*HPMHOOK_pre_npc_gettimerevent_tick) (struct npc_data **nd); +typedef int64 (*HPMHOOK_post_npc_gettimerevent_tick) (int64 retVal___, struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_settimerevent_tick) (struct npc_data **nd, int *newtimer); +typedef int (*HPMHOOK_post_npc_settimerevent_tick) (int retVal___, struct npc_data *nd, int newtimer); +typedef int (*HPMHOOK_pre_npc_event) (struct map_session_data **sd, const char **eventname, int *ontouch); +typedef int (*HPMHOOK_post_npc_event) (int retVal___, struct map_session_data *sd, const char *eventname, int ontouch); +typedef int (*HPMHOOK_pre_npc_touch_areanpc_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_npc_touch_areanpc_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_npc_touchnext_areanpc) (struct map_session_data **sd, bool *leavemap); +typedef int (*HPMHOOK_post_npc_touchnext_areanpc) (int retVal___, struct map_session_data *sd, bool leavemap); +typedef int (*HPMHOOK_pre_npc_touch_areanpc) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y); +typedef int (*HPMHOOK_post_npc_touch_areanpc) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y); +typedef int (*HPMHOOK_pre_npc_untouch_areanpc) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y); +typedef int (*HPMHOOK_post_npc_untouch_areanpc) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y); +typedef int (*HPMHOOK_pre_npc_touch_areanpc2) (struct mob_data **md); +typedef int (*HPMHOOK_post_npc_touch_areanpc2) (int retVal___, struct mob_data *md); +typedef int (*HPMHOOK_pre_npc_check_areanpc) (int *flag, int16 *m, int16 *x, int16 *y, int16 *range); +typedef int (*HPMHOOK_post_npc_check_areanpc) (int retVal___, int flag, int16 m, int16 x, int16 y, int16 range); +typedef struct npc_data* (*HPMHOOK_pre_npc_checknear) (struct map_session_data **sd, struct block_list **bl); +typedef struct npc_data* (*HPMHOOK_post_npc_checknear) (struct npc_data* retVal___, struct map_session_data *sd, struct block_list *bl); +typedef int (*HPMHOOK_pre_npc_globalmessage) (const char **name, const char **mes); +typedef int (*HPMHOOK_post_npc_globalmessage) (int retVal___, const char *name, const char *mes); +typedef void (*HPMHOOK_pre_npc_run_tomb) (struct map_session_data **sd, struct npc_data **nd); +typedef void (*HPMHOOK_post_npc_run_tomb) (struct map_session_data *sd, struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_click) (struct map_session_data **sd, struct npc_data **nd); +typedef int (*HPMHOOK_post_npc_click) (int retVal___, struct map_session_data *sd, struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_scriptcont) (struct map_session_data **sd, int *id, bool *closing); +typedef int (*HPMHOOK_post_npc_scriptcont) (int retVal___, struct map_session_data *sd, int id, bool closing); +typedef int (*HPMHOOK_pre_npc_buysellsel) (struct map_session_data **sd, int *id, int *type); +typedef int (*HPMHOOK_post_npc_buysellsel) (int retVal___, struct map_session_data *sd, int id, int type); +typedef int (*HPMHOOK_pre_npc_cashshop_buylist) (struct map_session_data **sd, int *points, struct itemlist **item_list); +typedef int (*HPMHOOK_post_npc_cashshop_buylist) (int retVal___, struct map_session_data *sd, int points, struct itemlist *item_list); +typedef int (*HPMHOOK_pre_npc_buylist_sub) (struct map_session_data **sd, struct itemlist **item_list, struct npc_data **nd); +typedef int (*HPMHOOK_post_npc_buylist_sub) (int retVal___, struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_cashshop_buy) (struct map_session_data **sd, int *nameid, int *amount, int *points); +typedef int (*HPMHOOK_post_npc_cashshop_buy) (int retVal___, struct map_session_data *sd, int nameid, int amount, int points); +typedef int (*HPMHOOK_pre_npc_buylist) (struct map_session_data **sd, struct itemlist **item_list); +typedef int (*HPMHOOK_post_npc_buylist) (int retVal___, struct map_session_data *sd, struct itemlist *item_list); +typedef int (*HPMHOOK_pre_npc_selllist_sub) (struct map_session_data **sd, struct itemlist **item_list, struct npc_data **nd); +typedef int (*HPMHOOK_post_npc_selllist_sub) (int retVal___, struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_selllist) (struct map_session_data **sd, struct itemlist **item_list); +typedef int (*HPMHOOK_post_npc_selllist) (int retVal___, struct map_session_data *sd, struct itemlist *item_list); +typedef int (*HPMHOOK_pre_npc_remove_map) (struct npc_data **nd); +typedef int (*HPMHOOK_post_npc_remove_map) (int retVal___, struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_unload_ev) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_npc_unload_ev) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_npc_unload_ev_label) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_npc_unload_ev_label) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_npc_unload_dup_sub) (struct npc_data **nd, va_list args); +typedef int (*HPMHOOK_post_npc_unload_dup_sub) (int retVal___, struct npc_data *nd, va_list args); +typedef void (*HPMHOOK_pre_npc_unload_duplicates) (struct npc_data **nd); +typedef void (*HPMHOOK_post_npc_unload_duplicates) (struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_unload) (struct npc_data **nd, bool *single); +typedef int (*HPMHOOK_post_npc_unload) (int retVal___, struct npc_data *nd, bool single); +typedef void (*HPMHOOK_pre_npc_clearsrcfile) (void); +typedef void (*HPMHOOK_post_npc_clearsrcfile) (void); +typedef void (*HPMHOOK_pre_npc_addsrcfile) (const char **name); +typedef void (*HPMHOOK_post_npc_addsrcfile) (const char *name); +typedef void (*HPMHOOK_pre_npc_delsrcfile) (const char **name); +typedef void (*HPMHOOK_post_npc_delsrcfile) (const char *name); +typedef const char* (*HPMHOOK_pre_npc_retainpathreference) (const char **filepath); +typedef const char* (*HPMHOOK_post_npc_retainpathreference) (const char* retVal___, const char *filepath); +typedef void (*HPMHOOK_pre_npc_releasepathreference) (const char **filepath); +typedef void (*HPMHOOK_post_npc_releasepathreference) (const char *filepath); +typedef void (*HPMHOOK_pre_npc_parsename) (struct npc_data **nd, const char **name, const char **start, const char **buffer, const char **filepath); +typedef void (*HPMHOOK_post_npc_parsename) (struct npc_data *nd, const char *name, const char *start, const char *buffer, const char *filepath); +typedef int (*HPMHOOK_pre_npc_parseview) (const char **w4, const char **start, const char **buffer, const char **filepath); +typedef int (*HPMHOOK_post_npc_parseview) (int retVal___, const char *w4, const char *start, const char *buffer, const char *filepath); +typedef bool (*HPMHOOK_pre_npc_viewisid) (const char **viewid); +typedef bool (*HPMHOOK_post_npc_viewisid) (bool retVal___, const char *viewid); +typedef struct npc_data* (*HPMHOOK_pre_npc_create_npc) (enum npc_subtype *subtype, int *m, int *x, int *y, uint8 *dir, int16 *class_); +typedef struct npc_data* (*HPMHOOK_post_npc_create_npc) (struct npc_data* retVal___, enum npc_subtype subtype, int m, int x, int y, uint8 dir, int16 class_); +typedef struct npc_data* (*HPMHOOK_pre_npc_add_warp) (char **name, short *from_mapid, short *from_x, short *from_y, short *xs, short *ys, unsigned short *to_mapindex, short *to_x, short *to_y); +typedef struct npc_data* (*HPMHOOK_post_npc_add_warp) (struct npc_data* retVal___, char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y); +typedef const char* (*HPMHOOK_pre_npc_parse_warp) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char* (*HPMHOOK_post_npc_parse_warp) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char* (*HPMHOOK_pre_npc_parse_shop) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char* (*HPMHOOK_post_npc_parse_shop) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char* (*HPMHOOK_pre_npc_parse_unknown_object) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char* (*HPMHOOK_post_npc_parse_unknown_object) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef void (*HPMHOOK_pre_npc_convertlabel_db) (struct npc_label_list **label_list, const char **filepath); +typedef void (*HPMHOOK_post_npc_convertlabel_db) (struct npc_label_list *label_list, const char *filepath); +typedef const char* (*HPMHOOK_pre_npc_skip_script) (const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char* (*HPMHOOK_post_npc_skip_script) (const char* retVal___, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char* (*HPMHOOK_pre_npc_parse_script) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); +typedef const char* (*HPMHOOK_post_npc_parse_script) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); +typedef void (*HPMHOOK_pre_npc_add_to_location) (struct npc_data **nd); +typedef void (*HPMHOOK_post_npc_add_to_location) (struct npc_data *nd); +typedef bool (*HPMHOOK_pre_npc_duplicate_script_sub) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); +typedef bool (*HPMHOOK_post_npc_duplicate_script_sub) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); +typedef bool (*HPMHOOK_pre_npc_duplicate_shop_sub) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); +typedef bool (*HPMHOOK_post_npc_duplicate_shop_sub) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); +typedef bool (*HPMHOOK_pre_npc_duplicate_warp_sub) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); +typedef bool (*HPMHOOK_post_npc_duplicate_warp_sub) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); +typedef bool (*HPMHOOK_pre_npc_duplicate_sub) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); +typedef bool (*HPMHOOK_post_npc_duplicate_sub) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); +typedef const char* (*HPMHOOK_pre_npc_parse_duplicate) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); +typedef const char* (*HPMHOOK_post_npc_parse_duplicate) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); +typedef int (*HPMHOOK_pre_npc_duplicate4instance) (struct npc_data **snd, int16 *m); +typedef int (*HPMHOOK_post_npc_duplicate4instance) (int retVal___, struct npc_data *snd, int16 m); +typedef void (*HPMHOOK_pre_npc_setcells) (struct npc_data **nd); +typedef void (*HPMHOOK_post_npc_setcells) (struct npc_data *nd); +typedef int (*HPMHOOK_pre_npc_unsetcells_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_npc_unsetcells_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_npc_unsetcells) (struct npc_data **nd); +typedef void (*HPMHOOK_post_npc_unsetcells) (struct npc_data *nd); +typedef void (*HPMHOOK_pre_npc_movenpc) (struct npc_data **nd, int16 *x, int16 *y); +typedef void (*HPMHOOK_post_npc_movenpc) (struct npc_data *nd, int16 x, int16 y); +typedef void (*HPMHOOK_pre_npc_setdisplayname) (struct npc_data **nd, const char **newname); +typedef void (*HPMHOOK_post_npc_setdisplayname) (struct npc_data *nd, const char *newname); +typedef void (*HPMHOOK_pre_npc_setclass) (struct npc_data **nd, short *class_); +typedef void (*HPMHOOK_post_npc_setclass) (struct npc_data *nd, short class_); +typedef int (*HPMHOOK_pre_npc_do_atcmd_event) (struct map_session_data **sd, const char **command, const char **message, const char **eventname); +typedef int (*HPMHOOK_post_npc_do_atcmd_event) (int retVal___, struct map_session_data *sd, const char *command, const char *message, const char *eventname); +typedef const char* (*HPMHOOK_pre_npc_parse_function) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char* (*HPMHOOK_post_npc_parse_function) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef void (*HPMHOOK_pre_npc_parse_mob2) (struct spawn_data **mobspawn); +typedef void (*HPMHOOK_post_npc_parse_mob2) (struct spawn_data *mobspawn); +typedef const char* (*HPMHOOK_pre_npc_parse_mob) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char* (*HPMHOOK_post_npc_parse_mob) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char* (*HPMHOOK_pre_npc_parse_mapflag) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char* (*HPMHOOK_post_npc_parse_mapflag) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef void (*HPMHOOK_pre_npc_parse_unknown_mapflag) (const char **name, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef void (*HPMHOOK_post_npc_parse_unknown_mapflag) (const char *name, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef int (*HPMHOOK_pre_npc_parsesrcfile) (const char **filepath, bool *runOnInit); +typedef int (*HPMHOOK_post_npc_parsesrcfile) (int retVal___, const char *filepath, bool runOnInit); +typedef int (*HPMHOOK_pre_npc_script_event) (struct map_session_data **sd, enum npce_event *type); +typedef int (*HPMHOOK_post_npc_script_event) (int retVal___, struct map_session_data *sd, enum npce_event type); +typedef void (*HPMHOOK_pre_npc_read_event_script) (void); +typedef void (*HPMHOOK_post_npc_read_event_script) (void); +typedef int (*HPMHOOK_pre_npc_path_db_clear_sub) (union DBKey *key, struct DBData **data, va_list args); +typedef int (*HPMHOOK_post_npc_path_db_clear_sub) (int retVal___, union DBKey key, struct DBData *data, va_list args); +typedef int (*HPMHOOK_pre_npc_ev_label_db_clear_sub) (union DBKey *key, struct DBData **data, va_list args); +typedef int (*HPMHOOK_post_npc_ev_label_db_clear_sub) (int retVal___, union DBKey key, struct DBData *data, va_list args); +typedef int (*HPMHOOK_pre_npc_reload) (void); +typedef int (*HPMHOOK_post_npc_reload) (int retVal___); +typedef bool (*HPMHOOK_pre_npc_unloadfile) (const char **filepath); +typedef bool (*HPMHOOK_post_npc_unloadfile) (bool retVal___, const char *filepath); +typedef void (*HPMHOOK_pre_npc_do_clear_npc) (void); +typedef void (*HPMHOOK_post_npc_do_clear_npc) (void); +typedef void (*HPMHOOK_pre_npc_debug_warps_sub) (struct npc_data **nd); +typedef void (*HPMHOOK_post_npc_debug_warps_sub) (struct npc_data *nd); +typedef void (*HPMHOOK_pre_npc_debug_warps) (void); +typedef void (*HPMHOOK_post_npc_debug_warps) (void); +typedef void (*HPMHOOK_pre_npc_trader_count_funds) (struct npc_data **nd, struct map_session_data **sd); +typedef void (*HPMHOOK_post_npc_trader_count_funds) (struct npc_data *nd, struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_npc_trader_pay) (struct npc_data **nd, struct map_session_data **sd, int *price, int *points); +typedef bool (*HPMHOOK_post_npc_trader_pay) (bool retVal___, struct npc_data *nd, struct map_session_data *sd, int price, int points); +typedef void (*HPMHOOK_pre_npc_trader_update) (int *master); +typedef void (*HPMHOOK_post_npc_trader_update) (int master); +typedef int (*HPMHOOK_pre_npc_market_buylist) (struct map_session_data **sd, struct itemlist **item_list); +typedef int (*HPMHOOK_post_npc_market_buylist) (int retVal___, struct map_session_data *sd, struct itemlist *item_list); +typedef bool (*HPMHOOK_pre_npc_trader_open) (struct map_session_data **sd, struct npc_data **nd); +typedef bool (*HPMHOOK_post_npc_trader_open) (bool retVal___, struct map_session_data *sd, struct npc_data *nd); +typedef void (*HPMHOOK_pre_npc_market_fromsql) (void); +typedef void (*HPMHOOK_post_npc_market_fromsql) (void); +typedef void (*HPMHOOK_pre_npc_market_tosql) (struct npc_data **nd, unsigned short *index); +typedef void (*HPMHOOK_post_npc_market_tosql) (struct npc_data *nd, unsigned short index); +typedef void (*HPMHOOK_pre_npc_market_delfromsql) (struct npc_data **nd, unsigned short *index); +typedef void (*HPMHOOK_post_npc_market_delfromsql) (struct npc_data *nd, unsigned short index); +typedef void (*HPMHOOK_pre_npc_market_delfromsql_sub) (const char **npcname, unsigned short *index); +typedef void (*HPMHOOK_post_npc_market_delfromsql_sub) (const char *npcname, unsigned short index); +typedef bool (*HPMHOOK_pre_npc_db_checkid) (const int *id); +typedef bool (*HPMHOOK_post_npc_db_checkid) (bool retVal___, const int id); +typedef int (*HPMHOOK_pre_npc_secure_timeout_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_npc_secure_timeout_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +#endif // MAP_NPC_H +#ifdef COMMON_NULLPO_H /* nullpo */ +typedef void (*HPMHOOK_pre_nullpo_assert_report) (const char **file, int *line, const char **func, const char **targetname, const char **title); +typedef void (*HPMHOOK_post_nullpo_assert_report) (const char *file, int line, const char *func, const char *targetname, const char *title); +#endif // COMMON_NULLPO_H +#ifdef MAP_PARTY_H /* party */ +typedef void (*HPMHOOK_pre_party_init) (bool *minimal); +typedef void (*HPMHOOK_post_party_init) (bool minimal); +typedef void (*HPMHOOK_pre_party_final) (void); +typedef void (*HPMHOOK_post_party_final) (void); +typedef struct party_data* (*HPMHOOK_pre_party_search) (int *party_id); +typedef struct party_data* (*HPMHOOK_post_party_search) (struct party_data* retVal___, int party_id); +typedef struct party_data* (*HPMHOOK_pre_party_searchname) (const char **str); +typedef struct party_data* (*HPMHOOK_post_party_searchname) (struct party_data* retVal___, const char *str); +typedef int (*HPMHOOK_pre_party_getmemberid) (struct party_data **p, struct map_session_data **sd); +typedef int (*HPMHOOK_post_party_getmemberid) (int retVal___, struct party_data *p, struct map_session_data *sd); +typedef struct map_session_data* (*HPMHOOK_pre_party_getavailablesd) (struct party_data **p); +typedef struct map_session_data* (*HPMHOOK_post_party_getavailablesd) (struct map_session_data* retVal___, struct party_data *p); +typedef int (*HPMHOOK_pre_party_create) (struct map_session_data **sd, const char **name, int *item, int *item2); +typedef int (*HPMHOOK_post_party_create) (int retVal___, struct map_session_data *sd, const char *name, int item, int item2); +typedef void (*HPMHOOK_pre_party_created) (int *account_id, int *char_id, int *fail, int *party_id, const char **name); +typedef void (*HPMHOOK_post_party_created) (int account_id, int char_id, int fail, int party_id, const char *name); +typedef int (*HPMHOOK_pre_party_request_info) (int *party_id, int *char_id); +typedef int (*HPMHOOK_post_party_request_info) (int retVal___, int party_id, int char_id); +typedef int (*HPMHOOK_pre_party_invite) (struct map_session_data **sd, struct map_session_data **tsd); +typedef int (*HPMHOOK_post_party_invite) (int retVal___, struct map_session_data *sd, struct map_session_data *tsd); +typedef void (*HPMHOOK_pre_party_member_joined) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_party_member_joined) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_party_member_added) (int *party_id, int *account_id, int *char_id, int *flag); +typedef int (*HPMHOOK_post_party_member_added) (int retVal___, int party_id, int account_id, int char_id, int flag); +typedef int (*HPMHOOK_pre_party_leave) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_party_leave) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_party_removemember) (struct map_session_data **sd, int *account_id, const char **name); +typedef int (*HPMHOOK_post_party_removemember) (int retVal___, struct map_session_data *sd, int account_id, const char *name); +typedef int (*HPMHOOK_pre_party_member_withdraw) (int *party_id, int *account_id, int *char_id); +typedef int (*HPMHOOK_post_party_member_withdraw) (int retVal___, int party_id, int account_id, int char_id); +typedef void (*HPMHOOK_pre_party_reply_invite) (struct map_session_data **sd, int *party_id, int *flag); +typedef void (*HPMHOOK_post_party_reply_invite) (struct map_session_data *sd, int party_id, int flag); +typedef int (*HPMHOOK_pre_party_recv_noinfo) (int *party_id, int *char_id); +typedef int (*HPMHOOK_post_party_recv_noinfo) (int retVal___, int party_id, int char_id); +typedef int (*HPMHOOK_pre_party_recv_info) (const struct party **sp, int *char_id); +typedef int (*HPMHOOK_post_party_recv_info) (int retVal___, const struct party *sp, int char_id); +typedef int (*HPMHOOK_pre_party_recv_movemap) (int *party_id, int *account_id, int *char_id, unsigned short *mapid, int *online, int *lv); +typedef int (*HPMHOOK_post_party_recv_movemap) (int retVal___, int party_id, int account_id, int char_id, unsigned short mapid, int online, int lv); +typedef int (*HPMHOOK_pre_party_broken) (int *party_id); +typedef int (*HPMHOOK_post_party_broken) (int retVal___, int party_id); +typedef int (*HPMHOOK_pre_party_optionchanged) (int *party_id, int *account_id, int *exp, int *item, int *flag); +typedef int (*HPMHOOK_post_party_optionchanged) (int retVal___, int party_id, int account_id, int exp, int item, int flag); +typedef int (*HPMHOOK_pre_party_changeoption) (struct map_session_data **sd, int *exp, int *item); +typedef int (*HPMHOOK_post_party_changeoption) (int retVal___, struct map_session_data *sd, int exp, int item); +typedef bool (*HPMHOOK_pre_party_changeleader) (struct map_session_data **sd, struct map_session_data **t_sd); +typedef bool (*HPMHOOK_post_party_changeleader) (bool retVal___, struct map_session_data *sd, struct map_session_data *t_sd); +typedef void (*HPMHOOK_pre_party_send_movemap) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_party_send_movemap) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_party_send_levelup) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_party_send_levelup) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_party_send_logout) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_party_send_logout) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_party_send_message) (struct map_session_data **sd, const char **mes); +typedef int (*HPMHOOK_post_party_send_message) (int retVal___, struct map_session_data *sd, const char *mes); +typedef int (*HPMHOOK_pre_party_recv_message) (int *party_id, int *account_id, const char **mes, int *len); +typedef int (*HPMHOOK_post_party_recv_message) (int retVal___, int party_id, int account_id, const char *mes, int len); +typedef int (*HPMHOOK_pre_party_skill_check) (struct map_session_data **sd, int *party_id, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_party_skill_check) (int retVal___, struct map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_party_send_xy_clear) (struct party_data **p); +typedef int (*HPMHOOK_post_party_send_xy_clear) (int retVal___, struct party_data *p); +typedef int (*HPMHOOK_pre_party_exp_share) (struct party_data **p, struct block_list **src, unsigned int *base_exp, unsigned int *job_exp, int *zeny); +typedef int (*HPMHOOK_post_party_exp_share) (int retVal___, struct party_data *p, struct block_list *src, unsigned int base_exp, unsigned int job_exp, int zeny); +typedef int (*HPMHOOK_pre_party_share_loot) (struct party_data **p, struct map_session_data **sd, struct item **item_data, int *first_charid); +typedef int (*HPMHOOK_post_party_share_loot) (int retVal___, struct party_data *p, struct map_session_data *sd, struct item *item_data, int first_charid); +typedef int (*HPMHOOK_pre_party_send_dot_remove) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_party_send_dot_remove) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_party_sub_count) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_party_sub_count) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_party_sub_count_chorus) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_party_sub_count_chorus) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_party_booking_register) (struct map_session_data **sd, short *level, short *mapid, short **job); +typedef void (*HPMHOOK_post_party_booking_register) (struct map_session_data *sd, short level, short mapid, short *job); +typedef void (*HPMHOOK_pre_party_booking_update) (struct map_session_data **sd, short **job); +typedef void (*HPMHOOK_post_party_booking_update) (struct map_session_data *sd, short *job); +typedef void (*HPMHOOK_pre_party_booking_search) (struct map_session_data **sd, short *level, short *mapid, short *job, unsigned long *lastindex, short *resultcount); +typedef void (*HPMHOOK_post_party_booking_search) (struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount); +typedef void (*HPMHOOK_pre_party_recruit_register) (struct map_session_data **sd, short *level, const char **notice); +typedef void (*HPMHOOK_post_party_recruit_register) (struct map_session_data *sd, short level, const char *notice); +typedef void (*HPMHOOK_pre_party_recruit_update) (struct map_session_data **sd, const char **notice); +typedef void (*HPMHOOK_post_party_recruit_update) (struct map_session_data *sd, const char *notice); +typedef void (*HPMHOOK_pre_party_recruit_search) (struct map_session_data **sd, short *level, short *mapid, unsigned long *lastindex, short *resultcount); +typedef void (*HPMHOOK_post_party_recruit_search) (struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount); +typedef bool (*HPMHOOK_pre_party_booking_delete) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_party_booking_delete) (bool retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_party_vforeachsamemap) (int ( **func ) (struct block_list *, va_list), struct map_session_data **sd, int *range, va_list ap); +typedef int (*HPMHOOK_post_party_vforeachsamemap) (int retVal___, int ( *func ) (struct block_list *, va_list), struct map_session_data *sd, int range, va_list ap); +typedef int (*HPMHOOK_pre_party_send_xy_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_party_send_xy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_party_fill_member) (struct party_member **member, struct map_session_data **sd, unsigned int *leader); +typedef void (*HPMHOOK_post_party_fill_member) (struct party_member *member, struct map_session_data *sd, unsigned int leader); +typedef struct map_session_data* (*HPMHOOK_pre_party_sd_check) (int *party_id, int *account_id, int *char_id); +typedef struct map_session_data* (*HPMHOOK_post_party_sd_check) (struct map_session_data* retVal___, int party_id, int account_id, int char_id); +typedef void (*HPMHOOK_pre_party_check_state) (struct party_data **p); +typedef void (*HPMHOOK_post_party_check_state) (struct party_data *p); +typedef struct party_booking_ad_info* (*HPMHOOK_pre_party_create_booking_data) (void); +typedef struct party_booking_ad_info* (*HPMHOOK_post_party_create_booking_data) (struct party_booking_ad_info* retVal___); +typedef int (*HPMHOOK_pre_party_db_final) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_party_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +#endif // MAP_PARTY_H +#ifdef MAP_PATH_H /* path */ +typedef int (*HPMHOOK_pre_path_blownpos) (struct block_list **bl, int16 *m, int16 *x0, int16 *y0, int16 *dx, int16 *dy, int *count); +typedef int (*HPMHOOK_post_path_blownpos) (int retVal___, struct block_list *bl, int16 m, int16 x0, int16 y0, int16 dx, int16 dy, int count); +typedef bool (*HPMHOOK_pre_path_search) (struct walkpath_data **wpd, struct block_list **bl, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *flag, cell_chk *cell); +typedef bool (*HPMHOOK_post_path_search) (bool retVal___, struct walkpath_data *wpd, struct block_list *bl, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, int flag, cell_chk cell); +typedef bool (*HPMHOOK_pre_path_search_long) (struct shootpath_data **spd, struct block_list **bl, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, cell_chk *cell); +typedef bool (*HPMHOOK_post_path_search_long) (bool retVal___, struct shootpath_data *spd, struct block_list *bl, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, cell_chk cell); +typedef bool (*HPMHOOK_pre_path_check_distance) (int *dx, int *dy, int *distance); +typedef bool (*HPMHOOK_post_path_check_distance) (bool retVal___, int dx, int dy, int distance); +typedef unsigned int (*HPMHOOK_pre_path_distance) (int *dx, int *dy); +typedef unsigned int (*HPMHOOK_post_path_distance) (unsigned int retVal___, int dx, int dy); +typedef bool (*HPMHOOK_pre_path_check_distance_client) (int *dx, int *dy, int *distance); +typedef bool (*HPMHOOK_post_path_check_distance_client) (bool retVal___, int dx, int dy, int distance); +typedef int (*HPMHOOK_pre_path_distance_client) (int *dx, int *dy); +typedef int (*HPMHOOK_post_path_distance_client) (int retVal___, int dx, int dy); +#endif // MAP_PATH_H +#ifdef MAP_PC_GROUPS_H /* pcg */ +typedef void (*HPMHOOK_pre_pcg_init) (void); +typedef void (*HPMHOOK_post_pcg_init) (void); +typedef void (*HPMHOOK_pre_pcg_final) (void); +typedef void (*HPMHOOK_post_pcg_final) (void); +typedef void (*HPMHOOK_pre_pcg_reload) (void); +typedef void (*HPMHOOK_post_pcg_reload) (void); +typedef GroupSettings* (*HPMHOOK_pre_pcg_get_dummy_group) (void); +typedef GroupSettings* (*HPMHOOK_post_pcg_get_dummy_group) (GroupSettings* retVal___); +typedef bool (*HPMHOOK_pre_pcg_exists) (int *group_id); +typedef bool (*HPMHOOK_post_pcg_exists) (bool retVal___, int group_id); +typedef GroupSettings* (*HPMHOOK_pre_pcg_id2group) (int *group_id); +typedef GroupSettings* (*HPMHOOK_post_pcg_id2group) (GroupSettings* retVal___, int group_id); +typedef bool (*HPMHOOK_pre_pcg_has_permission) (GroupSettings **group, unsigned int *permission); +typedef bool (*HPMHOOK_post_pcg_has_permission) (bool retVal___, GroupSettings *group, unsigned int permission); +typedef bool (*HPMHOOK_pre_pcg_should_log_commands) (GroupSettings **group); +typedef bool (*HPMHOOK_post_pcg_should_log_commands) (bool retVal___, GroupSettings *group); +typedef const char* (*HPMHOOK_pre_pcg_get_name) (GroupSettings **group); +typedef const char* (*HPMHOOK_post_pcg_get_name) (const char* retVal___, GroupSettings *group); +typedef int (*HPMHOOK_pre_pcg_get_level) (GroupSettings **group); +typedef int (*HPMHOOK_post_pcg_get_level) (int retVal___, GroupSettings *group); +typedef int (*HPMHOOK_pre_pcg_get_idx) (GroupSettings **group); +typedef int (*HPMHOOK_post_pcg_get_idx) (int retVal___, GroupSettings *group); +#endif // MAP_PC_GROUPS_H +#ifdef MAP_PC_H /* pc */ +typedef void (*HPMHOOK_pre_pc_init) (bool *minimal); +typedef void (*HPMHOOK_post_pc_init) (bool minimal); +typedef void (*HPMHOOK_pre_pc_final) (void); +typedef void (*HPMHOOK_post_pc_final) (void); +typedef struct map_session_data* (*HPMHOOK_pre_pc_get_dummy_sd) (void); +typedef struct map_session_data* (*HPMHOOK_post_pc_get_dummy_sd) (struct map_session_data* retVal___); +typedef int (*HPMHOOK_pre_pc_class2idx) (int *class_); +typedef int (*HPMHOOK_post_pc_class2idx) (int retVal___, int class_); +typedef bool (*HPMHOOK_pre_pc_can_talk) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_pc_can_talk) (bool retVal___, struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_pc_can_attack) (struct map_session_data **sd, int *target_id); +typedef bool (*HPMHOOK_post_pc_can_attack) (bool retVal___, struct map_session_data *sd, int target_id); +typedef bool (*HPMHOOK_pre_pc_can_use_command) (struct map_session_data **sd, const char **command); +typedef bool (*HPMHOOK_post_pc_can_use_command) (bool retVal___, struct map_session_data *sd, const char *command); +typedef int (*HPMHOOK_pre_pc_set_group) (struct map_session_data **sd, int *group_id); +typedef int (*HPMHOOK_post_pc_set_group) (int retVal___, struct map_session_data *sd, int group_id); +typedef bool (*HPMHOOK_pre_pc_should_log_commands) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_pc_should_log_commands) (bool retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_setrestartvalue) (struct map_session_data **sd, int *type); +typedef int (*HPMHOOK_post_pc_setrestartvalue) (int retVal___, struct map_session_data *sd, int type); +typedef int (*HPMHOOK_pre_pc_makesavestatus) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_makesavestatus) (int retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_pc_respawn) (struct map_session_data **sd, clr_type *clrtype); +typedef void (*HPMHOOK_post_pc_respawn) (struct map_session_data *sd, clr_type clrtype); +typedef int (*HPMHOOK_pre_pc_setnewpc) (struct map_session_data **sd, int *account_id, int *char_id, int *login_id1, unsigned int *client_tick, int *sex, int *fd); +typedef int (*HPMHOOK_post_pc_setnewpc) (int retVal___, struct map_session_data *sd, int account_id, int char_id, int login_id1, unsigned int client_tick, int sex, int fd); +typedef bool (*HPMHOOK_pre_pc_authok) (struct map_session_data **sd, int *login_id2, time_t *expiration_time, int *group_id, const struct mmo_charstatus **st, bool *changing_mapservers); +typedef bool (*HPMHOOK_post_pc_authok) (bool retVal___, struct map_session_data *sd, int login_id2, time_t expiration_time, int group_id, const struct mmo_charstatus *st, bool changing_mapservers); +typedef void (*HPMHOOK_pre_pc_authfail) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_authfail) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_reg_received) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_reg_received) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_isequip) (struct map_session_data **sd, int *n); +typedef int (*HPMHOOK_post_pc_isequip) (int retVal___, struct map_session_data *sd, int n); +typedef int (*HPMHOOK_pre_pc_equippoint) (struct map_session_data **sd, int *n); +typedef int (*HPMHOOK_post_pc_equippoint) (int retVal___, struct map_session_data *sd, int n); +typedef int (*HPMHOOK_pre_pc_setinventorydata) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_setinventorydata) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_checkskill) (struct map_session_data **sd, uint16 *skill_id); +typedef int (*HPMHOOK_post_pc_checkskill) (int retVal___, struct map_session_data *sd, uint16 skill_id); +typedef int (*HPMHOOK_pre_pc_checkskill2) (struct map_session_data **sd, uint16 *index); +typedef int (*HPMHOOK_post_pc_checkskill2) (int retVal___, struct map_session_data *sd, uint16 index); +typedef int (*HPMHOOK_pre_pc_checkallowskill) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_checkallowskill) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_checkequip) (struct map_session_data **sd, int *pos); +typedef int (*HPMHOOK_post_pc_checkequip) (int retVal___, struct map_session_data *sd, int pos); +typedef int (*HPMHOOK_pre_pc_calc_skilltree) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_calc_skilltree) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_calc_skilltree_normalize_job) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_calc_skilltree_normalize_job) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_clean_skilltree) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_clean_skilltree) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_setpos) (struct map_session_data **sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype); +typedef int (*HPMHOOK_post_pc_setpos) (int retVal___, struct map_session_data *sd, unsigned short map_index, int x, int y, clr_type clrtype); +typedef int (*HPMHOOK_pre_pc_setsavepoint) (struct map_session_data **sd, short *map_index, int *x, int *y); +typedef int (*HPMHOOK_post_pc_setsavepoint) (int retVal___, struct map_session_data *sd, short map_index, int x, int y); +typedef int (*HPMHOOK_pre_pc_randomwarp) (struct map_session_data **sd, clr_type *type); +typedef int (*HPMHOOK_post_pc_randomwarp) (int retVal___, struct map_session_data *sd, clr_type type); +typedef int (*HPMHOOK_pre_pc_memo) (struct map_session_data **sd, int *pos); +typedef int (*HPMHOOK_post_pc_memo) (int retVal___, struct map_session_data *sd, int pos); +typedef int (*HPMHOOK_pre_pc_checkadditem) (struct map_session_data **sd, int *nameid, int *amount); +typedef int (*HPMHOOK_post_pc_checkadditem) (int retVal___, struct map_session_data *sd, int nameid, int amount); +typedef int (*HPMHOOK_pre_pc_inventoryblank) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_inventoryblank) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_search_inventory) (struct map_session_data **sd, int *item_id); +typedef int (*HPMHOOK_post_pc_search_inventory) (int retVal___, struct map_session_data *sd, int item_id); +typedef int (*HPMHOOK_pre_pc_payzeny) (struct map_session_data **sd, int *zeny, enum e_log_pick_type *type, struct map_session_data **tsd); +typedef int (*HPMHOOK_post_pc_payzeny) (int retVal___, struct map_session_data *sd, int zeny, enum e_log_pick_type type, struct map_session_data *tsd); +typedef int (*HPMHOOK_pre_pc_additem) (struct map_session_data **sd, struct item **item_data, int *amount, e_log_pick_type *log_type); +typedef int (*HPMHOOK_post_pc_additem) (int retVal___, struct map_session_data *sd, struct item *item_data, int amount, e_log_pick_type log_type); +typedef int (*HPMHOOK_pre_pc_getzeny) (struct map_session_data **sd, int *zeny, enum e_log_pick_type *type, struct map_session_data **tsd); +typedef int (*HPMHOOK_post_pc_getzeny) (int retVal___, struct map_session_data *sd, int zeny, enum e_log_pick_type type, struct map_session_data *tsd); +typedef int (*HPMHOOK_pre_pc_delitem) (struct map_session_data **sd, int *n, int *amount, int *type, short *reason, e_log_pick_type *log_type); +typedef int (*HPMHOOK_post_pc_delitem) (int retVal___, struct map_session_data *sd, int n, int amount, int type, short reason, e_log_pick_type log_type); +typedef int (*HPMHOOK_pre_pc_paycash) (struct map_session_data **sd, int *price, int *points); +typedef int (*HPMHOOK_post_pc_paycash) (int retVal___, struct map_session_data *sd, int price, int points); +typedef int (*HPMHOOK_pre_pc_getcash) (struct map_session_data **sd, int *cash, int *points); +typedef int (*HPMHOOK_post_pc_getcash) (int retVal___, struct map_session_data *sd, int cash, int points); +typedef int (*HPMHOOK_pre_pc_cart_additem) (struct map_session_data **sd, struct item **item_data, int *amount, e_log_pick_type *log_type); +typedef int (*HPMHOOK_post_pc_cart_additem) (int retVal___, struct map_session_data *sd, struct item *item_data, int amount, e_log_pick_type log_type); +typedef int (*HPMHOOK_pre_pc_cart_delitem) (struct map_session_data **sd, int *n, int *amount, int *type, e_log_pick_type *log_type); +typedef int (*HPMHOOK_post_pc_cart_delitem) (int retVal___, struct map_session_data *sd, int n, int amount, int type, e_log_pick_type log_type); +typedef int (*HPMHOOK_pre_pc_putitemtocart) (struct map_session_data **sd, int *idx, int *amount); +typedef int (*HPMHOOK_post_pc_putitemtocart) (int retVal___, struct map_session_data *sd, int idx, int amount); +typedef int (*HPMHOOK_pre_pc_getitemfromcart) (struct map_session_data **sd, int *idx, int *amount); +typedef int (*HPMHOOK_post_pc_getitemfromcart) (int retVal___, struct map_session_data *sd, int idx, int amount); +typedef int (*HPMHOOK_pre_pc_cartitem_amount) (struct map_session_data **sd, int *idx, int *amount); +typedef int (*HPMHOOK_post_pc_cartitem_amount) (int retVal___, struct map_session_data *sd, int idx, int amount); +typedef int (*HPMHOOK_pre_pc_takeitem) (struct map_session_data **sd, struct flooritem_data **fitem); +typedef int (*HPMHOOK_post_pc_takeitem) (int retVal___, struct map_session_data *sd, struct flooritem_data *fitem); +typedef int (*HPMHOOK_pre_pc_dropitem) (struct map_session_data **sd, int *n, int *amount); +typedef int (*HPMHOOK_post_pc_dropitem) (int retVal___, struct map_session_data *sd, int n, int amount); +typedef bool (*HPMHOOK_pre_pc_isequipped) (struct map_session_data **sd, int *nameid); +typedef bool (*HPMHOOK_post_pc_isequipped) (bool retVal___, struct map_session_data *sd, int nameid); +typedef bool (*HPMHOOK_pre_pc_can_Adopt) (struct map_session_data **p1_sd, struct map_session_data **p2_sd, struct map_session_data **b_sd); +typedef bool (*HPMHOOK_post_pc_can_Adopt) (bool retVal___, struct map_session_data *p1_sd, struct map_session_data *p2_sd, struct map_session_data *b_sd); +typedef bool (*HPMHOOK_pre_pc_adoption) (struct map_session_data **p1_sd, struct map_session_data **p2_sd, struct map_session_data **b_sd); +typedef bool (*HPMHOOK_post_pc_adoption) (bool retVal___, struct map_session_data *p1_sd, struct map_session_data *p2_sd, struct map_session_data *b_sd); +typedef int (*HPMHOOK_pre_pc_updateweightstatus) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_updateweightstatus) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_addautobonus) (struct s_autobonus **bonus, char *max, const char **bonus_script, short *rate, unsigned int *dur, short *atk_type, const char **o_script, unsigned short *pos, bool *onskill); +typedef int (*HPMHOOK_post_pc_addautobonus) (int retVal___, struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short atk_type, const char *o_script, unsigned short pos, bool onskill); +typedef int (*HPMHOOK_pre_pc_exeautobonus) (struct map_session_data **sd, struct s_autobonus **bonus); +typedef int (*HPMHOOK_post_pc_exeautobonus) (int retVal___, struct map_session_data *sd, struct s_autobonus *bonus); +typedef int (*HPMHOOK_pre_pc_endautobonus) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_endautobonus) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pc_delautobonus) (struct map_session_data **sd, struct s_autobonus **bonus, char *max, bool *restore); +typedef int (*HPMHOOK_post_pc_delautobonus) (int retVal___, struct map_session_data *sd, struct s_autobonus *bonus, char max, bool restore); +typedef int (*HPMHOOK_pre_pc_bonus) (struct map_session_data **sd, int *type, int *val); +typedef int (*HPMHOOK_post_pc_bonus) (int retVal___, struct map_session_data *sd, int type, int val); +typedef int (*HPMHOOK_pre_pc_bonus2) (struct map_session_data **sd, int *type, int *type2, int *val); +typedef int (*HPMHOOK_post_pc_bonus2) (int retVal___, struct map_session_data *sd, int type, int type2, int val); +typedef int (*HPMHOOK_pre_pc_bonus3) (struct map_session_data **sd, int *type, int *type2, int *type3, int *val); +typedef int (*HPMHOOK_post_pc_bonus3) (int retVal___, struct map_session_data *sd, int type, int type2, int type3, int val); +typedef int (*HPMHOOK_pre_pc_bonus4) (struct map_session_data **sd, int *type, int *type2, int *type3, int *type4, int *val); +typedef int (*HPMHOOK_post_pc_bonus4) (int retVal___, struct map_session_data *sd, int type, int type2, int type3, int type4, int val); +typedef int (*HPMHOOK_pre_pc_bonus5) (struct map_session_data **sd, int *type, int *type2, int *type3, int *type4, int *type5, int *val); +typedef int (*HPMHOOK_post_pc_bonus5) (int retVal___, struct map_session_data *sd, int type, int type2, int type3, int type4, int type5, int val); +typedef int (*HPMHOOK_pre_pc_skill) (struct map_session_data **sd, int *id, int *level, int *flag); +typedef int (*HPMHOOK_post_pc_skill) (int retVal___, struct map_session_data *sd, int id, int level, int flag); +typedef int (*HPMHOOK_pre_pc_insert_card) (struct map_session_data **sd, int *idx_card, int *idx_equip); +typedef int (*HPMHOOK_post_pc_insert_card) (int retVal___, struct map_session_data *sd, int idx_card, int idx_equip); +typedef bool (*HPMHOOK_pre_pc_can_insert_card) (struct map_session_data **sd, int *idx_card); +typedef bool (*HPMHOOK_post_pc_can_insert_card) (bool retVal___, struct map_session_data *sd, int idx_card); +typedef bool (*HPMHOOK_pre_pc_can_insert_card_into) (struct map_session_data **sd, int *idx_card, int *idx_equip); +typedef bool (*HPMHOOK_post_pc_can_insert_card_into) (bool retVal___, struct map_session_data *sd, int idx_card, int idx_equip); +typedef int (*HPMHOOK_pre_pc_steal_item) (struct map_session_data **sd, struct block_list **bl, uint16 *skill_lv); +typedef int (*HPMHOOK_post_pc_steal_item) (int retVal___, struct map_session_data *sd, struct block_list *bl, uint16 skill_lv); +typedef int (*HPMHOOK_pre_pc_steal_coin) (struct map_session_data **sd, struct block_list **bl); +typedef int (*HPMHOOK_post_pc_steal_coin) (int retVal___, struct map_session_data *sd, struct block_list *bl); +typedef int (*HPMHOOK_pre_pc_modifybuyvalue) (struct map_session_data **sd, int *orig_value); +typedef int (*HPMHOOK_post_pc_modifybuyvalue) (int retVal___, struct map_session_data *sd, int orig_value); +typedef int (*HPMHOOK_pre_pc_modifysellvalue) (struct map_session_data **sd, int *orig_value); +typedef int (*HPMHOOK_post_pc_modifysellvalue) (int retVal___, struct map_session_data *sd, int orig_value); +typedef int (*HPMHOOK_pre_pc_follow) (struct map_session_data **sd, int *target_id); +typedef int (*HPMHOOK_post_pc_follow) (int retVal___, struct map_session_data *sd, int target_id); +typedef int (*HPMHOOK_pre_pc_stop_following) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_stop_following) (int retVal___, struct map_session_data *sd); +typedef unsigned int (*HPMHOOK_pre_pc_maxbaselv) (struct map_session_data **sd); +typedef unsigned int (*HPMHOOK_post_pc_maxbaselv) (unsigned int retVal___, struct map_session_data *sd); +typedef unsigned int (*HPMHOOK_pre_pc_maxjoblv) (struct map_session_data **sd); +typedef unsigned int (*HPMHOOK_post_pc_maxjoblv) (unsigned int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_checkbaselevelup) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_checkbaselevelup) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_checkjoblevelup) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_checkjoblevelup) (int retVal___, struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_pc_gainexp) (struct map_session_data **sd, struct block_list **src, unsigned int *base_exp, unsigned int *job_exp, bool *is_quest); +typedef bool (*HPMHOOK_post_pc_gainexp) (bool retVal___, struct map_session_data *sd, struct block_list *src, unsigned int base_exp, unsigned int job_exp, bool is_quest); +typedef unsigned int (*HPMHOOK_pre_pc_nextbaseexp) (struct map_session_data **sd); +typedef unsigned int (*HPMHOOK_post_pc_nextbaseexp) (unsigned int retVal___, struct map_session_data *sd); +typedef unsigned int (*HPMHOOK_pre_pc_thisbaseexp) (struct map_session_data **sd); +typedef unsigned int (*HPMHOOK_post_pc_thisbaseexp) (unsigned int retVal___, struct map_session_data *sd); +typedef unsigned int (*HPMHOOK_pre_pc_nextjobexp) (struct map_session_data **sd); +typedef unsigned int (*HPMHOOK_post_pc_nextjobexp) (unsigned int retVal___, struct map_session_data *sd); +typedef unsigned int (*HPMHOOK_pre_pc_thisjobexp) (struct map_session_data **sd); +typedef unsigned int (*HPMHOOK_post_pc_thisjobexp) (unsigned int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_gets_status_point) (int *level); +typedef int (*HPMHOOK_post_pc_gets_status_point) (int retVal___, int level); +typedef int (*HPMHOOK_pre_pc_need_status_point) (struct map_session_data **sd, int *type, int *val); +typedef int (*HPMHOOK_post_pc_need_status_point) (int retVal___, struct map_session_data *sd, int type, int val); +typedef int (*HPMHOOK_pre_pc_maxparameterincrease) (struct map_session_data **sd, int *type); +typedef int (*HPMHOOK_post_pc_maxparameterincrease) (int retVal___, struct map_session_data *sd, int type); +typedef bool (*HPMHOOK_pre_pc_statusup) (struct map_session_data **sd, int *type, int *increase); +typedef bool (*HPMHOOK_post_pc_statusup) (bool retVal___, struct map_session_data *sd, int type, int increase); +typedef int (*HPMHOOK_pre_pc_statusup2) (struct map_session_data **sd, int *type, int *val); +typedef int (*HPMHOOK_post_pc_statusup2) (int retVal___, struct map_session_data *sd, int type, int val); +typedef int (*HPMHOOK_pre_pc_skillup) (struct map_session_data **sd, uint16 *skill_id); +typedef int (*HPMHOOK_post_pc_skillup) (int retVal___, struct map_session_data *sd, uint16 skill_id); +typedef int (*HPMHOOK_pre_pc_allskillup) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_allskillup) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_resetlvl) (struct map_session_data **sd, int *type); +typedef int (*HPMHOOK_post_pc_resetlvl) (int retVal___, struct map_session_data *sd, int type); +typedef int (*HPMHOOK_pre_pc_resetstate) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_resetstate) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_resetskill) (struct map_session_data **sd, int *flag); +typedef int (*HPMHOOK_post_pc_resetskill) (int retVal___, struct map_session_data *sd, int flag); +typedef int (*HPMHOOK_pre_pc_resetfeel) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_resetfeel) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_resethate) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_resethate) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_equipitem) (struct map_session_data **sd, int *n, int *req_pos); +typedef int (*HPMHOOK_post_pc_equipitem) (int retVal___, struct map_session_data *sd, int n, int req_pos); +typedef void (*HPMHOOK_pre_pc_equipitem_pos) (struct map_session_data **sd, struct item_data **id, int *n, int *pos); +typedef void (*HPMHOOK_post_pc_equipitem_pos) (struct map_session_data *sd, struct item_data *id, int n, int pos); +typedef int (*HPMHOOK_pre_pc_unequipitem) (struct map_session_data **sd, int *n, int *flag); +typedef int (*HPMHOOK_post_pc_unequipitem) (int retVal___, struct map_session_data *sd, int n, int flag); +typedef void (*HPMHOOK_pre_pc_unequipitem_pos) (struct map_session_data **sd, int *n, int *pos); +typedef void (*HPMHOOK_post_pc_unequipitem_pos) (struct map_session_data *sd, int n, int pos); +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_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); +typedef int (*HPMHOOK_post_pc_skillheal_bonus) (int retVal___, struct map_session_data *sd, uint16 skill_id); +typedef int (*HPMHOOK_pre_pc_skillheal2_bonus) (struct map_session_data **sd, uint16 *skill_id); +typedef int (*HPMHOOK_post_pc_skillheal2_bonus) (int retVal___, struct map_session_data *sd, uint16 skill_id); +typedef void (*HPMHOOK_pre_pc_damage) (struct map_session_data **sd, struct block_list **src, unsigned int *hp, unsigned int *sp); +typedef void (*HPMHOOK_post_pc_damage) (struct map_session_data *sd, struct block_list *src, unsigned int hp, unsigned int sp); +typedef int (*HPMHOOK_pre_pc_dead) (struct map_session_data **sd, struct block_list **src); +typedef int (*HPMHOOK_post_pc_dead) (int retVal___, struct map_session_data *sd, struct block_list *src); +typedef void (*HPMHOOK_pre_pc_revive) (struct map_session_data **sd, unsigned int *hp, unsigned int *sp); +typedef void (*HPMHOOK_post_pc_revive) (struct map_session_data *sd, unsigned int hp, unsigned int sp); +typedef void (*HPMHOOK_pre_pc_heal) (struct map_session_data **sd, unsigned int *hp, unsigned int *sp, int *type); +typedef void (*HPMHOOK_post_pc_heal) (struct map_session_data *sd, unsigned int hp, unsigned int sp, int type); +typedef int (*HPMHOOK_pre_pc_itemheal) (struct map_session_data **sd, int *itemid, int *hp, int *sp); +typedef int (*HPMHOOK_post_pc_itemheal) (int retVal___, struct map_session_data *sd, int itemid, int hp, int sp); +typedef int (*HPMHOOK_pre_pc_percentheal) (struct map_session_data **sd, int *hp, int *sp); +typedef int (*HPMHOOK_post_pc_percentheal) (int retVal___, struct map_session_data *sd, int hp, int sp); +typedef int (*HPMHOOK_pre_pc_jobchange) (struct map_session_data **sd, int *job, int *upper); +typedef int (*HPMHOOK_post_pc_jobchange) (int retVal___, struct map_session_data *sd, int job, int upper); +typedef int (*HPMHOOK_pre_pc_setoption) (struct map_session_data **sd, int *type); +typedef int (*HPMHOOK_post_pc_setoption) (int retVal___, struct map_session_data *sd, int type); +typedef int (*HPMHOOK_pre_pc_setcart) (struct map_session_data **sd, int *type); +typedef int (*HPMHOOK_post_pc_setcart) (int retVal___, struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_pc_setfalcon) (struct map_session_data **sd, bool *flag); +typedef void (*HPMHOOK_post_pc_setfalcon) (struct map_session_data *sd, bool flag); +typedef void (*HPMHOOK_pre_pc_setridingpeco) (struct map_session_data **sd, bool *flag); +typedef void (*HPMHOOK_post_pc_setridingpeco) (struct map_session_data *sd, bool flag); +typedef void (*HPMHOOK_pre_pc_setmadogear) (struct map_session_data **sd, bool *flag); +typedef void (*HPMHOOK_post_pc_setmadogear) (struct map_session_data *sd, bool flag); +typedef void (*HPMHOOK_pre_pc_setridingdragon) (struct map_session_data **sd, unsigned int *type); +typedef void (*HPMHOOK_post_pc_setridingdragon) (struct map_session_data *sd, unsigned int type); +typedef void (*HPMHOOK_pre_pc_setridingwug) (struct map_session_data **sd, bool *flag); +typedef void (*HPMHOOK_post_pc_setridingwug) (struct map_session_data *sd, bool flag); +typedef int (*HPMHOOK_pre_pc_changelook) (struct map_session_data **sd, int *type, int *val); +typedef int (*HPMHOOK_post_pc_changelook) (int retVal___, struct map_session_data *sd, int type, int val); +typedef int (*HPMHOOK_pre_pc_equiplookall) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_equiplookall) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_readparam) (struct map_session_data **sd, int *type); +typedef int (*HPMHOOK_post_pc_readparam) (int retVal___, struct map_session_data *sd, int type); +typedef int (*HPMHOOK_pre_pc_setparam) (struct map_session_data **sd, int *type, int *val); +typedef int (*HPMHOOK_post_pc_setparam) (int retVal___, struct map_session_data *sd, int type, int val); +typedef int (*HPMHOOK_pre_pc_readreg) (struct map_session_data **sd, int64 *reg); +typedef int (*HPMHOOK_post_pc_readreg) (int retVal___, struct map_session_data *sd, int64 reg); +typedef void (*HPMHOOK_pre_pc_setreg) (struct map_session_data **sd, int64 *reg, int *val); +typedef void (*HPMHOOK_post_pc_setreg) (struct map_session_data *sd, int64 reg, int val); +typedef char* (*HPMHOOK_pre_pc_readregstr) (struct map_session_data **sd, int64 *reg); +typedef char* (*HPMHOOK_post_pc_readregstr) (char* retVal___, struct map_session_data *sd, int64 reg); +typedef void (*HPMHOOK_pre_pc_setregstr) (struct map_session_data **sd, int64 *reg, const char **str); +typedef void (*HPMHOOK_post_pc_setregstr) (struct map_session_data *sd, int64 reg, const char *str); +typedef int (*HPMHOOK_pre_pc_readregistry) (struct map_session_data **sd, int64 *reg); +typedef int (*HPMHOOK_post_pc_readregistry) (int retVal___, struct map_session_data *sd, int64 reg); +typedef int (*HPMHOOK_pre_pc_setregistry) (struct map_session_data **sd, int64 *reg, int *val); +typedef int (*HPMHOOK_post_pc_setregistry) (int retVal___, struct map_session_data *sd, int64 reg, int val); +typedef char* (*HPMHOOK_pre_pc_readregistry_str) (struct map_session_data **sd, int64 *reg); +typedef char* (*HPMHOOK_post_pc_readregistry_str) (char* retVal___, struct map_session_data *sd, int64 reg); +typedef int (*HPMHOOK_pre_pc_setregistry_str) (struct map_session_data **sd, int64 *reg, const char **val); +typedef int (*HPMHOOK_post_pc_setregistry_str) (int retVal___, struct map_session_data *sd, int64 reg, const char *val); +typedef int (*HPMHOOK_pre_pc_addeventtimer) (struct map_session_data **sd, int *tick, const char **name); +typedef int (*HPMHOOK_post_pc_addeventtimer) (int retVal___, struct map_session_data *sd, int tick, const char *name); +typedef int (*HPMHOOK_pre_pc_deleventtimer) (struct map_session_data **sd, const char **name); +typedef int (*HPMHOOK_post_pc_deleventtimer) (int retVal___, struct map_session_data *sd, const char *name); +typedef int (*HPMHOOK_pre_pc_cleareventtimer) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_cleareventtimer) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_addeventtimercount) (struct map_session_data **sd, const char **name, int *tick); +typedef int (*HPMHOOK_post_pc_addeventtimercount) (int retVal___, struct map_session_data *sd, const char *name, int tick); +typedef int (*HPMHOOK_pre_pc_calc_pvprank) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_calc_pvprank) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_calc_pvprank_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_calc_pvprank_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pc_ismarried) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_ismarried) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_marriage) (struct map_session_data **sd, struct map_session_data **dstsd); +typedef int (*HPMHOOK_post_pc_marriage) (int retVal___, struct map_session_data *sd, struct map_session_data *dstsd); +typedef int (*HPMHOOK_pre_pc_divorce) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_divorce) (int retVal___, struct map_session_data *sd); +typedef struct map_session_data* (*HPMHOOK_pre_pc_get_partner) (struct map_session_data **sd); +typedef struct map_session_data* (*HPMHOOK_post_pc_get_partner) (struct map_session_data* retVal___, struct map_session_data *sd); +typedef struct map_session_data* (*HPMHOOK_pre_pc_get_father) (struct map_session_data **sd); +typedef struct map_session_data* (*HPMHOOK_post_pc_get_father) (struct map_session_data* retVal___, struct map_session_data *sd); +typedef struct map_session_data* (*HPMHOOK_pre_pc_get_mother) (struct map_session_data **sd); +typedef struct map_session_data* (*HPMHOOK_post_pc_get_mother) (struct map_session_data* retVal___, struct map_session_data *sd); +typedef struct map_session_data* (*HPMHOOK_pre_pc_get_child) (struct map_session_data **sd); +typedef struct map_session_data* (*HPMHOOK_post_pc_get_child) (struct map_session_data* retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_pc_bleeding) (struct map_session_data **sd, unsigned int *diff_tick); +typedef void (*HPMHOOK_post_pc_bleeding) (struct map_session_data *sd, unsigned int diff_tick); +typedef void (*HPMHOOK_pre_pc_regen) (struct map_session_data **sd, unsigned int *diff_tick); +typedef void (*HPMHOOK_post_pc_regen) (struct map_session_data *sd, unsigned int diff_tick); +typedef void (*HPMHOOK_pre_pc_setstand) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_setstand) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_candrop) (struct map_session_data **sd, struct item **item); +typedef int (*HPMHOOK_post_pc_candrop) (int retVal___, struct map_session_data *sd, struct item *item); +typedef int (*HPMHOOK_pre_pc_jobid2mapid) (unsigned short *b_class); +typedef int (*HPMHOOK_post_pc_jobid2mapid) (int retVal___, unsigned short b_class); +typedef int (*HPMHOOK_pre_pc_mapid2jobid) (unsigned short *class_, int *sex); +typedef int (*HPMHOOK_post_pc_mapid2jobid) (int retVal___, unsigned short class_, int sex); +typedef const char* (*HPMHOOK_pre_pc_job_name) (int *class_); +typedef const char* (*HPMHOOK_post_pc_job_name) (const char* retVal___, int class_); +typedef void (*HPMHOOK_pre_pc_setinvincibletimer) (struct map_session_data **sd, int *val); +typedef void (*HPMHOOK_post_pc_setinvincibletimer) (struct map_session_data *sd, int val); +typedef void (*HPMHOOK_pre_pc_delinvincibletimer) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_delinvincibletimer) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_addspiritball) (struct map_session_data **sd, int *interval, int *max); +typedef int (*HPMHOOK_post_pc_addspiritball) (int retVal___, struct map_session_data *sd, int interval, int max); +typedef int (*HPMHOOK_pre_pc_delspiritball) (struct map_session_data **sd, int *count, int *type); +typedef int (*HPMHOOK_post_pc_delspiritball) (int retVal___, struct map_session_data *sd, int count, int type); +typedef int (*HPMHOOK_pre_pc_getmaxspiritball) (struct map_session_data **sd, int *min); +typedef int (*HPMHOOK_post_pc_getmaxspiritball) (int retVal___, struct map_session_data *sd, int min); +typedef void (*HPMHOOK_pre_pc_addfame) (struct map_session_data **sd, int *count); +typedef void (*HPMHOOK_post_pc_addfame) (struct map_session_data *sd, int count); +typedef unsigned char (*HPMHOOK_pre_pc_famerank) (int *char_id, int *job); +typedef unsigned char (*HPMHOOK_post_pc_famerank) (unsigned char retVal___, int char_id, int job); +typedef int (*HPMHOOK_pre_pc_set_hate_mob) (struct map_session_data **sd, int *pos, struct block_list **bl); +typedef int (*HPMHOOK_post_pc_set_hate_mob) (int retVal___, struct map_session_data *sd, int pos, struct block_list *bl); +typedef int (*HPMHOOK_pre_pc_readdb) (void); +typedef int (*HPMHOOK_post_pc_readdb) (int retVal___); +typedef int (*HPMHOOK_pre_pc_map_day_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_map_day_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pc_map_night_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_map_night_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_pc_inventory_rentals) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_inventory_rentals) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_inventory_rental_clear) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_inventory_rental_clear) (int retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_pc_inventory_rental_add) (struct map_session_data **sd, int *seconds); +typedef void (*HPMHOOK_post_pc_inventory_rental_add) (struct map_session_data *sd, int seconds); +typedef int (*HPMHOOK_pre_pc_disguise) (struct map_session_data **sd, int *class_); +typedef int (*HPMHOOK_post_pc_disguise) (int retVal___, struct map_session_data *sd, int class_); +typedef bool (*HPMHOOK_pre_pc_isautolooting) (struct map_session_data **sd, int *nameid); +typedef bool (*HPMHOOK_post_pc_isautolooting) (bool retVal___, struct map_session_data *sd, int nameid); +typedef void (*HPMHOOK_pre_pc_overheat) (struct map_session_data **sd, int *val); +typedef void (*HPMHOOK_post_pc_overheat) (struct map_session_data *sd, int val); +typedef int (*HPMHOOK_pre_pc_banding) (struct map_session_data **sd, uint16 *skill_lv); +typedef int (*HPMHOOK_post_pc_banding) (int retVal___, struct map_session_data *sd, uint16 skill_lv); +typedef void (*HPMHOOK_pre_pc_itemcd_do) (struct map_session_data **sd, bool *load); +typedef void (*HPMHOOK_post_pc_itemcd_do) (struct map_session_data *sd, bool load); +typedef int (*HPMHOOK_pre_pc_load_combo) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_load_combo) (int retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_pc_add_charm) (struct map_session_data **sd, int *interval, int *max, int *type); +typedef void (*HPMHOOK_post_pc_add_charm) (struct map_session_data *sd, int interval, int max, int type); +typedef void (*HPMHOOK_pre_pc_del_charm) (struct map_session_data **sd, int *count, int *type); +typedef void (*HPMHOOK_post_pc_del_charm) (struct map_session_data *sd, int count, int type); +typedef void (*HPMHOOK_pre_pc_baselevelchanged) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_baselevelchanged) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_level_penalty_mod) (int *diff, unsigned char *race, uint32 *mode, int *type); +typedef int (*HPMHOOK_post_pc_level_penalty_mod) (int retVal___, int diff, unsigned char race, uint32 mode, int type); +typedef int (*HPMHOOK_pre_pc_calc_skillpoint) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_calc_skillpoint) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_invincible_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_invincible_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pc_spiritball_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_spiritball_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pc_check_banding) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_pc_check_banding) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_pc_inventory_rental_end) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_inventory_rental_end) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_pc_check_skilltree) (struct map_session_data **sd, int *skill_id); +typedef void (*HPMHOOK_post_pc_check_skilltree) (struct map_session_data *sd, int skill_id); +typedef int (*HPMHOOK_pre_pc_bonus_autospell) (struct s_autospell **spell, int *max, short *id, short *lv, short *rate, short *flag, short *card_id); +typedef int (*HPMHOOK_post_pc_bonus_autospell) (int retVal___, struct s_autospell *spell, int max, short id, short lv, short rate, short flag, short card_id); +typedef int (*HPMHOOK_pre_pc_bonus_autospell_onskill) (struct s_autospell **spell, int *max, short *src_skill, short *id, short *lv, short *rate, short *card_id); +typedef int (*HPMHOOK_post_pc_bonus_autospell_onskill) (int retVal___, struct s_autospell *spell, int max, short src_skill, short id, short lv, short rate, short card_id); +typedef int (*HPMHOOK_pre_pc_bonus_addeff) (struct s_addeffect **effect, int *max, enum sc_type *id, int16 *rate, int16 *arrow_rate, uint8 *flag, uint16 *duration); +typedef int (*HPMHOOK_post_pc_bonus_addeff) (int retVal___, struct s_addeffect *effect, int max, enum sc_type id, int16 rate, int16 arrow_rate, uint8 flag, uint16 duration); +typedef int (*HPMHOOK_pre_pc_bonus_addeff_onskill) (struct s_addeffectonskill **effect, int *max, enum sc_type *id, short *rate, short *skill_id, unsigned char *target); +typedef int (*HPMHOOK_post_pc_bonus_addeff_onskill) (int retVal___, struct s_addeffectonskill *effect, int max, enum sc_type id, short rate, short skill_id, unsigned char target); +typedef int (*HPMHOOK_pre_pc_bonus_item_drop) (struct s_add_drop **drop, const short *max, short *id, short *group, int *race, int *rate); +typedef int (*HPMHOOK_post_pc_bonus_item_drop) (int retVal___, struct s_add_drop *drop, const short max, short id, short group, int race, int rate); +typedef void (*HPMHOOK_pre_pc_calcexp) (struct map_session_data **sd, unsigned int **base_exp, unsigned int **job_exp, struct block_list **src); +typedef void (*HPMHOOK_post_pc_calcexp) (struct map_session_data *sd, unsigned int *base_exp, unsigned int *job_exp, struct block_list *src); +typedef int (*HPMHOOK_pre_pc_respawn_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_respawn_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pc_jobchange_killclone) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_pc_jobchange_killclone) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_pc_getstat) (struct map_session_data **sd, int *type); +typedef int (*HPMHOOK_post_pc_getstat) (int retVal___, struct map_session_data *sd, int type); +typedef int (*HPMHOOK_pre_pc_setstat) (struct map_session_data **sd, int *type, int *val); +typedef int (*HPMHOOK_post_pc_setstat) (int retVal___, struct map_session_data *sd, int type, int val); +typedef int (*HPMHOOK_pre_pc_eventtimer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_eventtimer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pc_daynight_timer_sub) (struct map_session_data **sd, va_list ap); +typedef int (*HPMHOOK_post_pc_daynight_timer_sub) (int retVal___, struct map_session_data *sd, va_list ap); +typedef int (*HPMHOOK_pre_pc_charm_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_charm_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef bool (*HPMHOOK_pre_pc_readdb_levelpenalty) (char **fields[], int *columns, int *current); +typedef bool (*HPMHOOK_post_pc_readdb_levelpenalty) (bool retVal___, char *fields[], int columns, int current); +typedef int (*HPMHOOK_pre_pc_autosave) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_autosave) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pc_follow_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_follow_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_pc_read_skill_tree) (void); +typedef void (*HPMHOOK_post_pc_read_skill_tree) (void); +typedef void (*HPMHOOK_pre_pc_clear_skill_tree) (void); +typedef void (*HPMHOOK_post_pc_clear_skill_tree) (void); +typedef int (*HPMHOOK_pre_pc_isUseitem) (struct map_session_data **sd, int *n); +typedef int (*HPMHOOK_post_pc_isUseitem) (int retVal___, struct map_session_data *sd, int n); +typedef int (*HPMHOOK_pre_pc_show_steal) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_pc_show_steal) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_pc_checkcombo) (struct map_session_data **sd, struct item_data **data); +typedef int (*HPMHOOK_post_pc_checkcombo) (int retVal___, struct map_session_data *sd, struct item_data *data); +typedef int (*HPMHOOK_pre_pc_calcweapontype) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_calcweapontype) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_removecombo) (struct map_session_data **sd, struct item_data **data); +typedef int (*HPMHOOK_post_pc_removecombo) (int retVal___, struct map_session_data *sd, struct item_data *data); +typedef void (*HPMHOOK_pre_pc_bank_deposit) (struct map_session_data **sd, int *money); +typedef void (*HPMHOOK_post_pc_bank_deposit) (struct map_session_data *sd, int money); +typedef void (*HPMHOOK_pre_pc_bank_withdraw) (struct map_session_data **sd, int *money); +typedef void (*HPMHOOK_post_pc_bank_withdraw) (struct map_session_data *sd, int money); +typedef void (*HPMHOOK_pre_pc_rental_expire) (struct map_session_data **sd, int *i); +typedef void (*HPMHOOK_post_pc_rental_expire) (struct map_session_data *sd, int i); +typedef void (*HPMHOOK_pre_pc_scdata_received) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_scdata_received) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_pc_bound_clear) (struct map_session_data **sd, enum e_item_bound_type *type); +typedef void (*HPMHOOK_post_pc_bound_clear) (struct map_session_data *sd, enum e_item_bound_type type); +typedef int (*HPMHOOK_pre_pc_expiration_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_expiration_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pc_global_expiration_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pc_global_expiration_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_pc_expire_check) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_expire_check) (struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_pc_db_checkid) (unsigned int *class_); +typedef bool (*HPMHOOK_post_pc_db_checkid) (bool retVal___, unsigned int class_); +typedef void (*HPMHOOK_pre_pc_validate_levels) (void); +typedef void (*HPMHOOK_post_pc_validate_levels) (void); +typedef void (*HPMHOOK_pre_pc_autotrade_load) (void); +typedef void (*HPMHOOK_post_pc_autotrade_load) (void); +typedef void (*HPMHOOK_pre_pc_autotrade_update) (struct map_session_data **sd, enum e_pc_autotrade_update_action *action); +typedef void (*HPMHOOK_post_pc_autotrade_update) (struct map_session_data *sd, enum e_pc_autotrade_update_action action); +typedef void (*HPMHOOK_pre_pc_autotrade_start) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_autotrade_start) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_pc_autotrade_prepare) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_autotrade_prepare) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_pc_autotrade_populate) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_autotrade_populate) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_autotrade_final) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_pc_autotrade_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef int (*HPMHOOK_pre_pc_check_job_name) (const char **name); +typedef int (*HPMHOOK_post_pc_check_job_name) (int retVal___, const char *name); +typedef void (*HPMHOOK_pre_pc_update_idle_time) (struct map_session_data **sd, enum e_battle_config_idletime *type); +typedef void (*HPMHOOK_post_pc_update_idle_time) (struct map_session_data *sd, enum e_battle_config_idletime type); +typedef int (*HPMHOOK_pre_pc_have_magnifier) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_have_magnifier) (int retVal___, struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_pc_process_chat_message) (struct map_session_data **sd, const char **message); +typedef bool (*HPMHOOK_post_pc_process_chat_message) (bool retVal___, struct map_session_data *sd, const char *message); +typedef void (*HPMHOOK_pre_pc_check_supernovice_call) (struct map_session_data **sd, const char **message); +typedef void (*HPMHOOK_post_pc_check_supernovice_call) (struct map_session_data *sd, const char *message); +#endif // MAP_PC_H +#ifdef MAP_NPC_H /* libpcre */ +typedef pcre* (*HPMHOOK_pre_libpcre_compile) (const char **pattern, int *options, const char ***errptr, int **erroffset, const unsigned char **tableptr); +typedef pcre* (*HPMHOOK_post_libpcre_compile) (pcre* retVal___, const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr); +typedef pcre_extra* (*HPMHOOK_pre_libpcre_study) (const pcre **code, int *options, const char ***errptr); +typedef pcre_extra* (*HPMHOOK_post_libpcre_study) (pcre_extra* retVal___, const pcre *code, int options, const char **errptr); +typedef int (*HPMHOOK_pre_libpcre_exec) (const pcre **code, const pcre_extra **extra, PCRE_SPTR *subject, int *length, int *startoffset, int *options, int **ovector, int *ovecsize); +typedef int (*HPMHOOK_post_libpcre_exec) (int retVal___, const pcre *code, const pcre_extra *extra, PCRE_SPTR subject, int length, int startoffset, int options, int *ovector, int ovecsize); +typedef void (*HPMHOOK_pre_libpcre_free) (void **ptr); +typedef void (*HPMHOOK_post_libpcre_free) (void *ptr); +typedef int (*HPMHOOK_pre_libpcre_copy_substring) (const char **subject, int **ovector, int *stringcount, int *stringnumber, char **buffer, int *buffersize); +typedef int (*HPMHOOK_post_libpcre_copy_substring) (int retVal___, const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int buffersize); +typedef void (*HPMHOOK_pre_libpcre_free_substring) (const char **stringptr); +typedef void (*HPMHOOK_post_libpcre_free_substring) (const char *stringptr); +typedef int (*HPMHOOK_pre_libpcre_copy_named_substring) (const pcre **code, const char **subject, int **ovector, int *stringcount, const char **stringname, char **buffer, int *buffersize); +typedef int (*HPMHOOK_post_libpcre_copy_named_substring) (int retVal___, const pcre *code, const char *subject, int *ovector, int stringcount, const char *stringname, char *buffer, int buffersize); +typedef int (*HPMHOOK_pre_libpcre_get_substring) (const char **subject, int **ovector, int *stringcount, int *stringnumber, const char ***stringptr); +typedef int (*HPMHOOK_post_libpcre_get_substring) (int retVal___, const char *subject, int *ovector, int stringcount, int stringnumber, const char **stringptr); +#endif // MAP_NPC_H +#ifdef MAP_PET_H /* pet */ +typedef int (*HPMHOOK_pre_pet_init) (bool *minimal); +typedef int (*HPMHOOK_post_pet_init) (int retVal___, bool minimal); +typedef int (*HPMHOOK_pre_pet_final) (void); +typedef int (*HPMHOOK_post_pet_final) (int retVal___); +typedef int (*HPMHOOK_pre_pet_hungry_val) (struct pet_data **pd); +typedef int (*HPMHOOK_post_pet_hungry_val) (int retVal___, struct pet_data *pd); +typedef void (*HPMHOOK_pre_pet_set_intimate) (struct pet_data **pd, int *value); +typedef void (*HPMHOOK_post_pet_set_intimate) (struct pet_data *pd, int value); +typedef int (*HPMHOOK_pre_pet_create_egg) (struct map_session_data **sd, int *item_id); +typedef int (*HPMHOOK_post_pet_create_egg) (int retVal___, struct map_session_data *sd, int item_id); +typedef int (*HPMHOOK_pre_pet_unlocktarget) (struct pet_data **pd); +typedef int (*HPMHOOK_post_pet_unlocktarget) (int retVal___, struct pet_data *pd); +typedef int (*HPMHOOK_pre_pet_attackskill) (struct pet_data **pd, int *target_id); +typedef int (*HPMHOOK_post_pet_attackskill) (int retVal___, struct pet_data *pd, int target_id); +typedef int (*HPMHOOK_pre_pet_target_check) (struct map_session_data **sd, struct block_list **bl, int *type); +typedef int (*HPMHOOK_post_pet_target_check) (int retVal___, struct map_session_data *sd, struct block_list *bl, int type); +typedef int (*HPMHOOK_pre_pet_sc_check) (struct map_session_data **sd, int *type); +typedef int (*HPMHOOK_post_pet_sc_check) (int retVal___, struct map_session_data *sd, int type); +typedef int (*HPMHOOK_pre_pet_hungry) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pet_hungry) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pet_search_petDB_index) (int *key, int *type); +typedef int (*HPMHOOK_post_pet_search_petDB_index) (int retVal___, int key, int type); +typedef int (*HPMHOOK_pre_pet_hungry_timer_delete) (struct pet_data **pd); +typedef int (*HPMHOOK_post_pet_hungry_timer_delete) (int retVal___, struct pet_data *pd); +typedef int (*HPMHOOK_pre_pet_performance) (struct map_session_data **sd, struct pet_data **pd); +typedef int (*HPMHOOK_post_pet_performance) (int retVal___, struct map_session_data *sd, struct pet_data *pd); +typedef int (*HPMHOOK_pre_pet_return_egg) (struct map_session_data **sd, struct pet_data **pd); +typedef int (*HPMHOOK_post_pet_return_egg) (int retVal___, struct map_session_data *sd, struct pet_data *pd); +typedef int (*HPMHOOK_pre_pet_data_init) (struct map_session_data **sd, struct s_pet **petinfo); +typedef int (*HPMHOOK_post_pet_data_init) (int retVal___, struct map_session_data *sd, struct s_pet *petinfo); +typedef int (*HPMHOOK_pre_pet_birth_process) (struct map_session_data **sd, struct s_pet **petinfo); +typedef int (*HPMHOOK_post_pet_birth_process) (int retVal___, struct map_session_data *sd, struct s_pet *petinfo); +typedef int (*HPMHOOK_pre_pet_recv_petdata) (int *account_id, struct s_pet **p, int *flag); +typedef int (*HPMHOOK_post_pet_recv_petdata) (int retVal___, int account_id, struct s_pet *p, int flag); +typedef int (*HPMHOOK_pre_pet_select_egg) (struct map_session_data **sd, short *egg_index); +typedef int (*HPMHOOK_post_pet_select_egg) (int retVal___, struct map_session_data *sd, short egg_index); +typedef int (*HPMHOOK_pre_pet_catch_process1) (struct map_session_data **sd, int *target_class); +typedef int (*HPMHOOK_post_pet_catch_process1) (int retVal___, struct map_session_data *sd, int target_class); +typedef int (*HPMHOOK_pre_pet_catch_process2) (struct map_session_data **sd, int *target_id); +typedef int (*HPMHOOK_post_pet_catch_process2) (int retVal___, struct map_session_data *sd, int target_id); +typedef bool (*HPMHOOK_pre_pet_get_egg) (int *account_id, short *pet_class, int *pet_id); +typedef bool (*HPMHOOK_post_pet_get_egg) (bool retVal___, int account_id, short pet_class, int pet_id); +typedef int (*HPMHOOK_pre_pet_unequipitem) (struct map_session_data **sd, struct pet_data **pd); +typedef int (*HPMHOOK_post_pet_unequipitem) (int retVal___, struct map_session_data *sd, struct pet_data *pd); +typedef int (*HPMHOOK_pre_pet_food) (struct map_session_data **sd, struct pet_data **pd); +typedef int (*HPMHOOK_post_pet_food) (int retVal___, struct map_session_data *sd, struct pet_data *pd); +typedef int (*HPMHOOK_pre_pet_ai_sub_hard_lootsearch) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_pet_ai_sub_hard_lootsearch) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_pet_menu) (struct map_session_data **sd, int *menunum); +typedef int (*HPMHOOK_post_pet_menu) (int retVal___, struct map_session_data *sd, int menunum); +typedef int (*HPMHOOK_pre_pet_change_name) (struct map_session_data **sd, const char **name); +typedef int (*HPMHOOK_post_pet_change_name) (int retVal___, struct map_session_data *sd, const char *name); +typedef int (*HPMHOOK_pre_pet_change_name_ack) (struct map_session_data **sd, const char **name, int *flag); +typedef int (*HPMHOOK_post_pet_change_name_ack) (int retVal___, struct map_session_data *sd, const char *name, int flag); +typedef int (*HPMHOOK_pre_pet_equipitem) (struct map_session_data **sd, int *index); +typedef int (*HPMHOOK_post_pet_equipitem) (int retVal___, struct map_session_data *sd, int index); +typedef int (*HPMHOOK_pre_pet_randomwalk) (struct pet_data **pd, int64 *tick); +typedef int (*HPMHOOK_post_pet_randomwalk) (int retVal___, struct pet_data *pd, int64 tick); +typedef int (*HPMHOOK_pre_pet_ai_sub_hard) (struct pet_data **pd, struct map_session_data **sd, int64 *tick); +typedef int (*HPMHOOK_post_pet_ai_sub_hard) (int retVal___, struct pet_data *pd, struct map_session_data *sd, int64 tick); +typedef int (*HPMHOOK_pre_pet_ai_sub_foreachclient) (struct map_session_data **sd, va_list ap); +typedef int (*HPMHOOK_post_pet_ai_sub_foreachclient) (int retVal___, struct map_session_data *sd, va_list ap); +typedef int (*HPMHOOK_pre_pet_ai_hard) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pet_ai_hard) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pet_delay_item_drop) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pet_delay_item_drop) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pet_lootitem_drop) (struct pet_data **pd, struct map_session_data **sd); +typedef int (*HPMHOOK_post_pet_lootitem_drop) (int retVal___, struct pet_data *pd, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pet_skill_bonus_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pet_skill_bonus_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pet_recovery_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pet_recovery_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pet_skill_support_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_pet_skill_support_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_pet_read_db) (void); +typedef int (*HPMHOOK_post_pet_read_db) (int retVal___); +#endif // MAP_PET_H +#ifdef CHAR_PINCODE_H /* pincode */ +typedef void (*HPMHOOK_pre_pincode_handle) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_pincode_handle) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_pincode_decrypt) (unsigned int *userSeed, char **pin); +typedef void (*HPMHOOK_post_pincode_decrypt) (unsigned int userSeed, char *pin); +typedef void (*HPMHOOK_pre_pincode_error) (int *account_id); +typedef void (*HPMHOOK_post_pincode_error) (int account_id); +typedef void (*HPMHOOK_pre_pincode_update) (int *account_id, char **pin); +typedef void (*HPMHOOK_post_pincode_update) (int account_id, char *pin); +typedef void (*HPMHOOK_pre_pincode_sendstate) (int *fd, struct char_session_data **sd, uint16 *state); +typedef void (*HPMHOOK_post_pincode_sendstate) (int fd, struct char_session_data *sd, uint16 state); +typedef void (*HPMHOOK_pre_pincode_setnew) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_pincode_setnew) (int fd, struct char_session_data *sd); +typedef void (*HPMHOOK_pre_pincode_change) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_pincode_change) (int fd, struct char_session_data *sd); +typedef int (*HPMHOOK_pre_pincode_compare) (int *fd, struct char_session_data **sd, char **pin); +typedef int (*HPMHOOK_post_pincode_compare) (int retVal___, int fd, struct char_session_data *sd, char *pin); +typedef void (*HPMHOOK_pre_pincode_check) (int *fd, struct char_session_data **sd); +typedef void (*HPMHOOK_post_pincode_check) (int fd, struct char_session_data *sd); +typedef bool (*HPMHOOK_pre_pincode_config_read) (char **w1, char **w2); +typedef bool (*HPMHOOK_post_pincode_config_read) (bool retVal___, char *w1, char *w2); +#endif // CHAR_PINCODE_H +#ifdef MAP_QUEST_H /* quest */ +typedef void (*HPMHOOK_pre_quest_init) (bool *minimal); +typedef void (*HPMHOOK_post_quest_init) (bool minimal); +typedef void (*HPMHOOK_pre_quest_final) (void); +typedef void (*HPMHOOK_post_quest_final) (void); +typedef void (*HPMHOOK_pre_quest_reload) (void); +typedef void (*HPMHOOK_post_quest_reload) (void); +typedef struct quest_db* (*HPMHOOK_pre_quest_db) (int *quest_id); +typedef struct quest_db* (*HPMHOOK_post_quest_db) (struct quest_db* retVal___, int quest_id); +typedef int (*HPMHOOK_pre_quest_pc_login) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_quest_pc_login) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_quest_add) (struct map_session_data **sd, int *quest_id); +typedef int (*HPMHOOK_post_quest_add) (int retVal___, struct map_session_data *sd, int quest_id); +typedef int (*HPMHOOK_pre_quest_change) (struct map_session_data **sd, int *qid1, int *qid2); +typedef int (*HPMHOOK_post_quest_change) (int retVal___, struct map_session_data *sd, int qid1, int qid2); +typedef int (*HPMHOOK_pre_quest_delete) (struct map_session_data **sd, int *quest_id); +typedef int (*HPMHOOK_post_quest_delete) (int retVal___, struct map_session_data *sd, int quest_id); +typedef int (*HPMHOOK_pre_quest_update_objective_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_quest_update_objective_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_quest_update_objective) (struct map_session_data **sd, int *mob_id); +typedef void (*HPMHOOK_post_quest_update_objective) (struct map_session_data *sd, int mob_id); +typedef int (*HPMHOOK_pre_quest_update_status) (struct map_session_data **sd, int *quest_id, enum quest_state *qs); +typedef int (*HPMHOOK_post_quest_update_status) (int retVal___, struct map_session_data *sd, int quest_id, enum quest_state qs); +typedef int (*HPMHOOK_pre_quest_check) (struct map_session_data **sd, int *quest_id, enum quest_check_type *type); +typedef int (*HPMHOOK_post_quest_check) (int retVal___, struct map_session_data *sd, int quest_id, enum quest_check_type type); +typedef void (*HPMHOOK_pre_quest_clear) (void); +typedef void (*HPMHOOK_post_quest_clear) (void); +typedef int (*HPMHOOK_pre_quest_read_db) (void); +typedef int (*HPMHOOK_post_quest_read_db) (int retVal___); +typedef struct quest_db* (*HPMHOOK_pre_quest_read_db_sub) (struct config_setting_t **cs, int *n, const char **source); +typedef struct quest_db* (*HPMHOOK_post_quest_read_db_sub) (struct quest_db* retVal___, struct config_setting_t *cs, int n, const char *source); +#endif // MAP_QUEST_H +#ifdef MAP_SCRIPT_H /* script */ +typedef void (*HPMHOOK_pre_script_init) (bool *minimal); +typedef void (*HPMHOOK_post_script_init) (bool minimal); +typedef void (*HPMHOOK_pre_script_final) (void); +typedef void (*HPMHOOK_post_script_final) (void); +typedef int (*HPMHOOK_pre_script_reload) (void); +typedef int (*HPMHOOK_post_script_reload) (int retVal___); +typedef struct script_code* (*HPMHOOK_pre_script_parse) (const char **src, const char **file, int *line, int *options, int **retval); +typedef struct script_code* (*HPMHOOK_post_script_parse) (struct script_code* retVal___, const char *src, const char *file, int line, int options, int *retval); +typedef bool (*HPMHOOK_pre_script_add_builtin) (const struct script_function **buildin, bool *override); +typedef bool (*HPMHOOK_post_script_add_builtin) (bool retVal___, const struct script_function *buildin, bool override); +typedef void (*HPMHOOK_pre_script_parse_builtin) (void); +typedef void (*HPMHOOK_post_script_parse_builtin) (void); +typedef const char* (*HPMHOOK_pre_script_parse_subexpr) (const char **p, int *limit); +typedef const char* (*HPMHOOK_post_script_parse_subexpr) (const char* retVal___, const char *p, int limit); +typedef const char* (*HPMHOOK_pre_script_skip_space) (const char **p); +typedef const char* (*HPMHOOK_post_script_skip_space) (const char* retVal___, const char *p); +typedef void (*HPMHOOK_pre_script_error) (const char **src, const char **file, int *start_line, const char **error_msg, const char **error_pos); +typedef void (*HPMHOOK_post_script_error) (const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); +typedef void (*HPMHOOK_pre_script_warning) (const char **src, const char **file, int *start_line, const char **error_msg, const char **error_pos); +typedef void (*HPMHOOK_post_script_warning) (const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); +typedef bool (*HPMHOOK_pre_script_addScript) (char **name, char **args, bool ( **func ) (struct script_state *st), bool *isDeprecated); +typedef bool (*HPMHOOK_post_script_addScript) (bool retVal___, char *name, char *args, bool ( *func ) (struct script_state *st), bool isDeprecated); +typedef int (*HPMHOOK_pre_script_conv_num) (struct script_state **st, struct script_data **data); +typedef int (*HPMHOOK_post_script_conv_num) (int retVal___, struct script_state *st, struct script_data *data); +typedef const char* (*HPMHOOK_pre_script_conv_str) (struct script_state **st, struct script_data **data); +typedef const char* (*HPMHOOK_post_script_conv_str) (const char* retVal___, struct script_state *st, struct script_data *data); +typedef struct map_session_data* (*HPMHOOK_pre_script_rid2sd) (struct script_state **st); +typedef struct map_session_data* (*HPMHOOK_post_script_rid2sd) (struct map_session_data* retVal___, struct script_state *st); +typedef struct map_session_data* (*HPMHOOK_pre_script_id2sd) (struct script_state **st, int *account_id); +typedef struct map_session_data* (*HPMHOOK_post_script_id2sd) (struct map_session_data* retVal___, struct script_state *st, int account_id); +typedef struct map_session_data* (*HPMHOOK_pre_script_charid2sd) (struct script_state **st, int *char_id); +typedef struct map_session_data* (*HPMHOOK_post_script_charid2sd) (struct map_session_data* retVal___, struct script_state *st, int char_id); +typedef struct map_session_data* (*HPMHOOK_pre_script_nick2sd) (struct script_state **st, const char **name); +typedef struct map_session_data* (*HPMHOOK_post_script_nick2sd) (struct map_session_data* retVal___, struct script_state *st, const char *name); +typedef void (*HPMHOOK_pre_script_detach_rid) (struct script_state **st); +typedef void (*HPMHOOK_post_script_detach_rid) (struct script_state *st); +typedef struct script_data* (*HPMHOOK_pre_script_push_val) (struct script_stack **stack, enum c_op *type, int64 *val, struct reg_db **ref); +typedef struct script_data* (*HPMHOOK_post_script_push_val) (struct script_data* retVal___, struct script_stack *stack, enum c_op type, int64 val, struct reg_db *ref); +typedef struct script_data* (*HPMHOOK_pre_script_get_val) (struct script_state **st, struct script_data **data); +typedef struct script_data* (*HPMHOOK_post_script_get_val) (struct script_data* retVal___, struct script_state *st, struct script_data *data); +typedef char* (*HPMHOOK_pre_script_get_val_ref_str) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef char* (*HPMHOOK_post_script_get_val_ref_str) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef char* (*HPMHOOK_pre_script_get_val_scope_str) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef char* (*HPMHOOK_post_script_get_val_scope_str) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef char* (*HPMHOOK_pre_script_get_val_npc_str) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef char* (*HPMHOOK_post_script_get_val_npc_str) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef char* (*HPMHOOK_pre_script_get_val_instance_str) (struct script_state **st, const char **name, struct script_data **data); +typedef char* (*HPMHOOK_post_script_get_val_instance_str) (char* retVal___, struct script_state *st, const char *name, struct script_data *data); +typedef int (*HPMHOOK_pre_script_get_val_ref_num) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef int (*HPMHOOK_post_script_get_val_ref_num) (int retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef int (*HPMHOOK_pre_script_get_val_scope_num) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef int (*HPMHOOK_post_script_get_val_scope_num) (int retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef int (*HPMHOOK_pre_script_get_val_npc_num) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef int (*HPMHOOK_post_script_get_val_npc_num) (int retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef int (*HPMHOOK_pre_script_get_val_instance_num) (struct script_state **st, const char **name, struct script_data **data); +typedef int (*HPMHOOK_post_script_get_val_instance_num) (int retVal___, struct script_state *st, const char *name, struct script_data *data); +typedef const void* (*HPMHOOK_pre_script_get_val2) (struct script_state **st, int64 *uid, struct reg_db **ref); +typedef const void* (*HPMHOOK_post_script_get_val2) (const void* retVal___, struct script_state *st, int64 uid, struct reg_db *ref); +typedef struct script_data* (*HPMHOOK_pre_script_push_str) (struct script_stack **stack, char **str); +typedef struct script_data* (*HPMHOOK_post_script_push_str) (struct script_data* retVal___, struct script_stack *stack, char *str); +typedef struct script_data* (*HPMHOOK_pre_script_push_conststr) (struct script_stack **stack, const char **str); +typedef struct script_data* (*HPMHOOK_post_script_push_conststr) (struct script_data* retVal___, struct script_stack *stack, const char *str); +typedef struct script_data* (*HPMHOOK_pre_script_push_copy) (struct script_stack **stack, int *pos); +typedef struct script_data* (*HPMHOOK_post_script_push_copy) (struct script_data* retVal___, struct script_stack *stack, int pos); +typedef void (*HPMHOOK_pre_script_pop_stack) (struct script_state **st, int *start, int *end); +typedef void (*HPMHOOK_post_script_pop_stack) (struct script_state *st, int start, int end); +typedef void (*HPMHOOK_pre_script_set_constant) (const char **name, int *value, bool *is_parameter, bool *is_deprecated); +typedef void (*HPMHOOK_post_script_set_constant) (const char *name, int value, bool is_parameter, bool is_deprecated); +typedef void (*HPMHOOK_pre_script_set_constant2) (const char **name, int *value, bool *is_parameter, bool *is_deprecated); +typedef void (*HPMHOOK_post_script_set_constant2) (const char *name, int value, bool is_parameter, bool is_deprecated); +typedef bool (*HPMHOOK_pre_script_get_constant) (const char **name, int **value); +typedef bool (*HPMHOOK_post_script_get_constant) (bool retVal___, const char *name, int *value); +typedef void (*HPMHOOK_pre_script_label_add) (int *key, int *pos); +typedef void (*HPMHOOK_post_script_label_add) (int key, int pos); +typedef void (*HPMHOOK_pre_script_run) (struct script_code **rootscript, int *pos, int *rid, int *oid); +typedef void (*HPMHOOK_post_script_run) (struct script_code *rootscript, int pos, int rid, int oid); +typedef void (*HPMHOOK_pre_script_run_npc) (struct script_code **rootscript, int *pos, int *rid, int *oid); +typedef void (*HPMHOOK_post_script_run_npc) (struct script_code *rootscript, int pos, int rid, int oid); +typedef void (*HPMHOOK_pre_script_run_pet) (struct script_code **rootscript, int *pos, int *rid, int *oid); +typedef void (*HPMHOOK_post_script_run_pet) (struct script_code *rootscript, int pos, int rid, int oid); +typedef void (*HPMHOOK_pre_script_run_main) (struct script_state **st); +typedef void (*HPMHOOK_post_script_run_main) (struct script_state *st); +typedef int (*HPMHOOK_pre_script_run_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_script_run_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_script_set_var) (struct map_session_data **sd, char **name, void **val); +typedef int (*HPMHOOK_post_script_set_var) (int retVal___, struct map_session_data *sd, char *name, void *val); +typedef void (*HPMHOOK_pre_script_stop_instances) (struct script_code **code); +typedef void (*HPMHOOK_post_script_stop_instances) (struct script_code *code); +typedef void (*HPMHOOK_pre_script_free_code) (struct script_code **code); +typedef void (*HPMHOOK_post_script_free_code) (struct script_code *code); +typedef void (*HPMHOOK_pre_script_free_vars) (struct DBMap **var_storage); +typedef void (*HPMHOOK_post_script_free_vars) (struct DBMap *var_storage); +typedef struct script_state* (*HPMHOOK_pre_script_alloc_state) (struct script_code **rootscript, int *pos, int *rid, int *oid); +typedef struct script_state* (*HPMHOOK_post_script_alloc_state) (struct script_state* retVal___, struct script_code *rootscript, int pos, int rid, int oid); +typedef void (*HPMHOOK_pre_script_free_state) (struct script_state **st); +typedef void (*HPMHOOK_post_script_free_state) (struct script_state *st); +typedef void (*HPMHOOK_pre_script_add_pending_ref) (struct script_state **st, struct reg_db **ref); +typedef void (*HPMHOOK_post_script_add_pending_ref) (struct script_state *st, struct reg_db *ref); +typedef void (*HPMHOOK_pre_script_run_autobonus) (const char **autobonus, int *id, int *pos); +typedef void (*HPMHOOK_post_script_run_autobonus) (const char *autobonus, int id, int pos); +typedef void (*HPMHOOK_pre_script_cleararray_pc) (struct map_session_data **sd, const char **varname, void **value); +typedef void (*HPMHOOK_post_script_cleararray_pc) (struct map_session_data *sd, const char *varname, void *value); +typedef void (*HPMHOOK_pre_script_setarray_pc) (struct map_session_data **sd, const char **varname, uint32 *idx, void **value, int **refcache); +typedef void (*HPMHOOK_post_script_setarray_pc) (struct map_session_data *sd, const char *varname, uint32 idx, void *value, int *refcache); +typedef int (*HPMHOOK_pre_script_config_read) (char **cfgName); +typedef int (*HPMHOOK_post_script_config_read) (int retVal___, char *cfgName); +typedef int (*HPMHOOK_pre_script_add_str) (const char **p); +typedef int (*HPMHOOK_post_script_add_str) (int retVal___, const char *p); +typedef const char* (*HPMHOOK_pre_script_get_str) (int *id); +typedef const char* (*HPMHOOK_post_script_get_str) (const char* retVal___, int id); +typedef int (*HPMHOOK_pre_script_search_str) (const char **p); +typedef int (*HPMHOOK_post_script_search_str) (int retVal___, const char *p); +typedef void (*HPMHOOK_pre_script_setd_sub) (struct script_state **st, struct map_session_data **sd, const char **varname, int *elem, const void **value, struct reg_db **ref); +typedef void (*HPMHOOK_post_script_setd_sub) (struct script_state *st, struct map_session_data *sd, const char *varname, int elem, const void *value, struct reg_db *ref); +typedef void (*HPMHOOK_pre_script_attach_state) (struct script_state **st); +typedef void (*HPMHOOK_post_script_attach_state) (struct script_state *st); +typedef struct script_queue* (*HPMHOOK_pre_script_queue) (int *idx); +typedef struct script_queue* (*HPMHOOK_post_script_queue) (struct script_queue* retVal___, int idx); +typedef bool (*HPMHOOK_pre_script_queue_add) (int *idx, int *var); +typedef bool (*HPMHOOK_post_script_queue_add) (bool retVal___, int idx, int var); +typedef bool (*HPMHOOK_pre_script_queue_del) (int *idx); +typedef bool (*HPMHOOK_post_script_queue_del) (bool retVal___, int idx); +typedef bool (*HPMHOOK_pre_script_queue_remove) (int *idx, int *var); +typedef bool (*HPMHOOK_post_script_queue_remove) (bool retVal___, int idx, int var); +typedef int (*HPMHOOK_pre_script_queue_create) (void); +typedef int (*HPMHOOK_post_script_queue_create) (int retVal___); +typedef bool (*HPMHOOK_pre_script_queue_clear) (int *idx); +typedef bool (*HPMHOOK_post_script_queue_clear) (bool retVal___, int idx); +typedef const char* (*HPMHOOK_pre_script_parse_curly_close) (const char **p); +typedef const char* (*HPMHOOK_post_script_parse_curly_close) (const char* retVal___, const char *p); +typedef const char* (*HPMHOOK_pre_script_parse_syntax_close) (const char **p); +typedef const char* (*HPMHOOK_post_script_parse_syntax_close) (const char* retVal___, const char *p); +typedef const char* (*HPMHOOK_pre_script_parse_syntax_close_sub) (const char **p, int **flag); +typedef const char* (*HPMHOOK_post_script_parse_syntax_close_sub) (const char* retVal___, const char *p, int *flag); +typedef const char* (*HPMHOOK_pre_script_parse_syntax) (const char **p); +typedef const char* (*HPMHOOK_post_script_parse_syntax) (const char* retVal___, const char *p); +typedef c_op (*HPMHOOK_pre_script_get_com) (unsigned char **scriptbuf, int **pos); +typedef c_op (*HPMHOOK_post_script_get_com) (c_op retVal___, unsigned char *scriptbuf, int *pos); +typedef int (*HPMHOOK_pre_script_get_num) (unsigned char **scriptbuf, int **pos); +typedef int (*HPMHOOK_post_script_get_num) (int retVal___, unsigned char *scriptbuf, int *pos); +typedef const char* (*HPMHOOK_pre_script_op2name) (int *op); +typedef const char* (*HPMHOOK_post_script_op2name) (const char* retVal___, int op); +typedef void (*HPMHOOK_pre_script_reportsrc) (struct script_state **st); +typedef void (*HPMHOOK_post_script_reportsrc) (struct script_state *st); +typedef void (*HPMHOOK_pre_script_reportdata) (struct script_data **data); +typedef void (*HPMHOOK_post_script_reportdata) (struct script_data *data); +typedef void (*HPMHOOK_pre_script_reportfunc) (struct script_state **st); +typedef void (*HPMHOOK_post_script_reportfunc) (struct script_state *st); +typedef void (*HPMHOOK_pre_script_disp_warning_message) (const char **mes, const char **pos); +typedef void (*HPMHOOK_post_script_disp_warning_message) (const char *mes, const char *pos); +typedef void (*HPMHOOK_pre_script_check_event) (struct script_state **st, const char **evt); +typedef void (*HPMHOOK_post_script_check_event) (struct script_state *st, const char *evt); +typedef unsigned int (*HPMHOOK_pre_script_calc_hash) (const char **p); +typedef unsigned int (*HPMHOOK_post_script_calc_hash) (unsigned int retVal___, const char *p); +typedef void (*HPMHOOK_pre_script_addb) (int *a); +typedef void (*HPMHOOK_post_script_addb) (int a); +typedef void (*HPMHOOK_pre_script_addc) (int *a); +typedef void (*HPMHOOK_post_script_addc) (int a); +typedef void (*HPMHOOK_pre_script_addi) (int *a); +typedef void (*HPMHOOK_post_script_addi) (int a); +typedef void (*HPMHOOK_pre_script_addl) (int *l); +typedef void (*HPMHOOK_post_script_addl) (int l); +typedef void (*HPMHOOK_pre_script_set_label) (int *l, int *pos, const char **script_pos); +typedef void (*HPMHOOK_post_script_set_label) (int l, int pos, const char *script_pos); +typedef const char* (*HPMHOOK_pre_script_skip_word) (const char **p); +typedef const char* (*HPMHOOK_post_script_skip_word) (const char* retVal___, const char *p); +typedef int (*HPMHOOK_pre_script_add_word) (const char **p); +typedef int (*HPMHOOK_post_script_add_word) (int retVal___, const char *p); +typedef const char* (*HPMHOOK_pre_script_parse_callfunc) (const char **p, int *require_paren, int *is_custom); +typedef const char* (*HPMHOOK_post_script_parse_callfunc) (const char* retVal___, const char *p, int require_paren, int is_custom); +typedef void (*HPMHOOK_pre_script_parse_nextline) (bool *first, const char **p); +typedef void (*HPMHOOK_post_script_parse_nextline) (bool first, const char *p); +typedef const char* (*HPMHOOK_pre_script_parse_variable) (const char **p); +typedef const char* (*HPMHOOK_post_script_parse_variable) (const char* retVal___, const char *p); +typedef const char* (*HPMHOOK_pre_script_parse_simpleexpr) (const char **p); +typedef const char* (*HPMHOOK_post_script_parse_simpleexpr) (const char* retVal___, const char *p); +typedef const char* (*HPMHOOK_pre_script_parse_expr) (const char **p); +typedef const char* (*HPMHOOK_post_script_parse_expr) (const char* retVal___, const char *p); +typedef const char* (*HPMHOOK_pre_script_parse_line) (const char **p); +typedef const char* (*HPMHOOK_post_script_parse_line) (const char* retVal___, const char *p); +typedef void (*HPMHOOK_pre_script_read_constdb) (void); +typedef void (*HPMHOOK_post_script_read_constdb) (void); +typedef void (*HPMHOOK_pre_script_constdb_comment) (const char **comment); +typedef void (*HPMHOOK_post_script_constdb_comment) (const char *comment); +typedef void (*HPMHOOK_pre_script_load_parameters) (void); +typedef void (*HPMHOOK_post_script_load_parameters) (void); +typedef const char* (*HPMHOOK_pre_script_print_line) (StringBuf **buf, const char **p, const char **mark, int *line); +typedef const char* (*HPMHOOK_post_script_print_line) (const char* retVal___, StringBuf *buf, const char *p, const char *mark, int line); +typedef void (*HPMHOOK_pre_script_errorwarning_sub) (StringBuf **buf, const char **src, const char **file, int *start_line, const char **error_msg, const char **error_pos); +typedef void (*HPMHOOK_post_script_errorwarning_sub) (StringBuf *buf, const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); +typedef int (*HPMHOOK_pre_script_set_reg) (struct script_state **st, struct map_session_data **sd, int64 *num, const char **name, const void **value, struct reg_db **ref); +typedef int (*HPMHOOK_post_script_set_reg) (int retVal___, struct script_state *st, struct map_session_data *sd, int64 num, const char *name, const void *value, struct reg_db *ref); +typedef void (*HPMHOOK_pre_script_set_reg_ref_str) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, const char **str); +typedef void (*HPMHOOK_post_script_set_reg_ref_str) (struct script_state *st, struct reg_db *n, int64 num, const char *name, const char *str); +typedef void (*HPMHOOK_pre_script_set_reg_scope_str) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, const char **str); +typedef void (*HPMHOOK_post_script_set_reg_scope_str) (struct script_state *st, struct reg_db *n, int64 num, const char *name, const char *str); +typedef void (*HPMHOOK_pre_script_set_reg_npc_str) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, const char **str); +typedef void (*HPMHOOK_post_script_set_reg_npc_str) (struct script_state *st, struct reg_db *n, int64 num, const char *name, const char *str); +typedef void (*HPMHOOK_pre_script_set_reg_instance_str) (struct script_state **st, int64 *num, const char **name, const char **str); +typedef void (*HPMHOOK_post_script_set_reg_instance_str) (struct script_state *st, int64 num, const char *name, const char *str); +typedef void (*HPMHOOK_pre_script_set_reg_ref_num) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, int *val); +typedef void (*HPMHOOK_post_script_set_reg_ref_num) (struct script_state *st, struct reg_db *n, int64 num, const char *name, int val); +typedef void (*HPMHOOK_pre_script_set_reg_scope_num) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, int *val); +typedef void (*HPMHOOK_post_script_set_reg_scope_num) (struct script_state *st, struct reg_db *n, int64 num, const char *name, int val); +typedef void (*HPMHOOK_pre_script_set_reg_npc_num) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, int *val); +typedef void (*HPMHOOK_post_script_set_reg_npc_num) (struct script_state *st, struct reg_db *n, int64 num, const char *name, int val); +typedef void (*HPMHOOK_pre_script_set_reg_instance_num) (struct script_state **st, int64 *num, const char **name, int *val); +typedef void (*HPMHOOK_post_script_set_reg_instance_num) (struct script_state *st, int64 num, const char *name, int val); +typedef void (*HPMHOOK_pre_script_stack_expand) (struct script_stack **stack); +typedef void (*HPMHOOK_post_script_stack_expand) (struct script_stack *stack); +typedef struct script_data* (*HPMHOOK_pre_script_push_retinfo) (struct script_stack **stack, struct script_retinfo **ri, struct reg_db **ref); +typedef struct script_data* (*HPMHOOK_post_script_push_retinfo) (struct script_data* retVal___, struct script_stack *stack, struct script_retinfo *ri, struct reg_db *ref); +typedef void (*HPMHOOK_pre_script_op_3) (struct script_state **st, int *op); +typedef void (*HPMHOOK_post_script_op_3) (struct script_state *st, int op); +typedef void (*HPMHOOK_pre_script_op_2str) (struct script_state **st, int *op, const char **s1, const char **s2); +typedef void (*HPMHOOK_post_script_op_2str) (struct script_state *st, int op, const char *s1, const char *s2); +typedef void (*HPMHOOK_pre_script_op_2num) (struct script_state **st, int *op, int *i1, int *i2); +typedef void (*HPMHOOK_post_script_op_2num) (struct script_state *st, int op, int i1, int i2); +typedef void (*HPMHOOK_pre_script_op_2) (struct script_state **st, int *op); +typedef void (*HPMHOOK_post_script_op_2) (struct script_state *st, int op); +typedef void (*HPMHOOK_pre_script_op_1) (struct script_state **st, int *op); +typedef void (*HPMHOOK_post_script_op_1) (struct script_state *st, int op); +typedef void (*HPMHOOK_pre_script_check_buildin_argtype) (struct script_state **st, int *func); +typedef void (*HPMHOOK_post_script_check_buildin_argtype) (struct script_state *st, int func); +typedef void (*HPMHOOK_pre_script_detach_state) (struct script_state **st, bool *dequeue_event); +typedef void (*HPMHOOK_post_script_detach_state) (struct script_state *st, bool dequeue_event); +typedef int (*HPMHOOK_pre_script_db_free_code_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_script_db_free_code_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_script_add_autobonus) (const char **autobonus); +typedef void (*HPMHOOK_post_script_add_autobonus) (const char *autobonus); +typedef int (*HPMHOOK_pre_script_menu_countoptions) (const char **str, int *max_count, int **total); +typedef int (*HPMHOOK_post_script_menu_countoptions) (int retVal___, const char *str, int max_count, int *total); +typedef int (*HPMHOOK_pre_script_buildin_areawarp_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_areawarp_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_areapercentheal_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_areapercentheal_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_script_buildin_delitem_delete) (struct map_session_data **sd, int *idx, int **amount, bool *delete_items); +typedef void (*HPMHOOK_post_script_buildin_delitem_delete) (struct map_session_data *sd, int idx, int *amount, bool delete_items); +typedef bool (*HPMHOOK_pre_script_buildin_delitem_search) (struct map_session_data **sd, struct item **it, bool *exact_match); +typedef bool (*HPMHOOK_post_script_buildin_delitem_search) (bool retVal___, struct map_session_data *sd, struct item *it, bool exact_match); +typedef int (*HPMHOOK_pre_script_buildin_killmonster_sub_strip) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_killmonster_sub_strip) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_killmonster_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_killmonster_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_killmonsterall_sub_strip) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_killmonsterall_sub_strip) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_killmonsterall_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_killmonsterall_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_announce_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_announce_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_getareausers_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_getareausers_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_getareadropitem_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_getareadropitem_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_mapflag_pvp_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_mapflag_pvp_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_pvpoff_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_pvpoff_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_maprespawnguildid_sub_pc) (struct map_session_data **sd, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_maprespawnguildid_sub_pc) (int retVal___, struct map_session_data *sd, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_maprespawnguildid_sub_mob) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_maprespawnguildid_sub_mob) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_mobcount_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_mobcount_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_playbgm_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_playbgm_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_playbgm_foreachpc_sub) (struct map_session_data **sd, va_list args); +typedef int (*HPMHOOK_post_script_playbgm_foreachpc_sub) (int retVal___, struct map_session_data *sd, va_list args); +typedef int (*HPMHOOK_pre_script_soundeffect_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_soundeffect_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_query_sql_sub) (struct script_state **st, struct Sql **handle); +typedef int (*HPMHOOK_post_script_buildin_query_sql_sub) (int retVal___, struct script_state *st, struct Sql *handle); +typedef int (*HPMHOOK_pre_script_buildin_instance_warpall_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_instance_warpall_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_buildin_mobuseskill_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_buildin_mobuseskill_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_cleanfloor_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_script_cleanfloor_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_script_run_func) (struct script_state **st); +typedef int (*HPMHOOK_post_script_run_func) (int retVal___, struct script_state *st); +typedef const char* (*HPMHOOK_pre_script_getfuncname) (struct script_state **st); +typedef const char* (*HPMHOOK_post_script_getfuncname) (const char* retVal___, struct script_state *st); +typedef unsigned int (*HPMHOOK_pre_script_calc_hash_ci) (const char **p); +typedef unsigned int (*HPMHOOK_post_script_calc_hash_ci) (unsigned int retVal___, const char *p); +typedef struct reg_db* (*HPMHOOK_pre_script_array_src) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); +typedef struct reg_db* (*HPMHOOK_post_script_array_src) (struct reg_db* retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); +typedef void (*HPMHOOK_pre_script_array_update) (struct reg_db **src, int64 *num, bool *empty); +typedef void (*HPMHOOK_post_script_array_update) (struct reg_db *src, int64 num, bool empty); +typedef void (*HPMHOOK_pre_script_array_delete) (struct reg_db **src, struct script_array **sa); +typedef void (*HPMHOOK_post_script_array_delete) (struct reg_db *src, struct script_array *sa); +typedef void (*HPMHOOK_pre_script_array_remove_member) (struct reg_db **src, struct script_array **sa, unsigned int *idx); +typedef void (*HPMHOOK_post_script_array_remove_member) (struct reg_db *src, struct script_array *sa, unsigned int idx); +typedef void (*HPMHOOK_pre_script_array_add_member) (struct script_array **sa, unsigned int *idx); +typedef void (*HPMHOOK_post_script_array_add_member) (struct script_array *sa, unsigned int idx); +typedef unsigned int (*HPMHOOK_pre_script_array_size) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); +typedef unsigned int (*HPMHOOK_post_script_array_size) (unsigned int retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); +typedef unsigned int (*HPMHOOK_pre_script_array_highest_key) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); +typedef unsigned int (*HPMHOOK_post_script_array_highest_key) (unsigned int retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); +typedef int (*HPMHOOK_pre_script_array_free_db) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_script_array_free_db) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_script_array_ensure_zero) (struct script_state **st, struct map_session_data **sd, int64 *uid, struct reg_db **ref); +typedef void (*HPMHOOK_post_script_array_ensure_zero) (struct script_state *st, struct map_session_data *sd, int64 uid, struct reg_db *ref); +typedef void (*HPMHOOK_pre_script_reg_destroy_single) (struct map_session_data **sd, int64 *reg, struct script_reg_state **data); +typedef void (*HPMHOOK_post_script_reg_destroy_single) (struct map_session_data *sd, int64 reg, struct script_reg_state *data); +typedef int (*HPMHOOK_pre_script_reg_destroy) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_script_reg_destroy) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_script_generic_ui_array_expand) (unsigned int *plus); +typedef void (*HPMHOOK_post_script_generic_ui_array_expand) (unsigned int plus); +typedef unsigned int* (*HPMHOOK_pre_script_array_cpy_list) (struct script_array **sa); +typedef unsigned int* (*HPMHOOK_post_script_array_cpy_list) (unsigned int* retVal___, struct script_array *sa); +typedef void (*HPMHOOK_pre_script_hardcoded_constants) (void); +typedef void (*HPMHOOK_post_script_hardcoded_constants) (void); +typedef unsigned short (*HPMHOOK_pre_script_mapindexname2id) (struct script_state **st, const char **name); +typedef unsigned short (*HPMHOOK_post_script_mapindexname2id) (unsigned short retVal___, struct script_state *st, const char *name); +typedef int (*HPMHOOK_pre_script_string_dup) (char **str); +typedef int (*HPMHOOK_post_script_string_dup) (int retVal___, char *str); +typedef void (*HPMHOOK_pre_script_load_translations) (void); +typedef void (*HPMHOOK_post_script_load_translations) (void); +typedef void (*HPMHOOK_pre_script_load_translation) (const char **file, uint8 *lang_id, uint32 **total); +typedef void (*HPMHOOK_post_script_load_translation) (const char *file, uint8 lang_id, uint32 *total); +typedef int (*HPMHOOK_pre_script_translation_db_destroyer) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_script_translation_db_destroyer) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_script_clear_translations) (bool *reload); +typedef void (*HPMHOOK_post_script_clear_translations) (bool reload); +typedef int (*HPMHOOK_pre_script_parse_cleanup_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_script_parse_cleanup_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef uint8 (*HPMHOOK_pre_script_add_language) (const char **name); +typedef uint8 (*HPMHOOK_post_script_add_language) (uint8 retVal___, const char *name); +typedef const char* (*HPMHOOK_pre_script_get_translation_file_name) (const char **file); +typedef const char* (*HPMHOOK_post_script_get_translation_file_name) (const char* retVal___, const char *file); +typedef void (*HPMHOOK_pre_script_parser_clean_leftovers) (void); +typedef void (*HPMHOOK_post_script_parser_clean_leftovers) (void); +typedef void (*HPMHOOK_pre_script_run_use_script) (struct map_session_data **sd, struct item_data **data, int *oid); +typedef void (*HPMHOOK_post_script_run_use_script) (struct map_session_data *sd, struct item_data *data, int oid); +typedef void (*HPMHOOK_pre_script_run_item_equip_script) (struct map_session_data **sd, struct item_data **data, int *oid); +typedef void (*HPMHOOK_post_script_run_item_equip_script) (struct map_session_data *sd, struct item_data *data, int oid); +typedef void (*HPMHOOK_pre_script_run_item_unequip_script) (struct map_session_data **sd, struct item_data **data, int *oid); +typedef void (*HPMHOOK_post_script_run_item_unequip_script) (struct map_session_data *sd, struct item_data *data, int oid); +#endif // MAP_SCRIPT_H +#ifdef MAP_SEARCHSTORE_H /* searchstore */ +typedef bool (*HPMHOOK_pre_searchstore_open) (struct map_session_data **sd, unsigned int *uses, unsigned short *effect); +typedef bool (*HPMHOOK_post_searchstore_open) (bool retVal___, struct map_session_data *sd, unsigned int uses, unsigned short effect); +typedef void (*HPMHOOK_pre_searchstore_query) (struct map_session_data **sd, unsigned char *type, unsigned int *min_price, unsigned int *max_price, const unsigned short **itemlist, unsigned int *item_count, const unsigned short **cardlist, unsigned int *card_count); +typedef void (*HPMHOOK_post_searchstore_query) (struct map_session_data *sd, unsigned char type, unsigned int min_price, unsigned int max_price, const unsigned short *itemlist, unsigned int item_count, const unsigned short *cardlist, unsigned int card_count); +typedef bool (*HPMHOOK_pre_searchstore_querynext) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_searchstore_querynext) (bool retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_searchstore_next) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_searchstore_next) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_searchstore_clear) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_searchstore_clear) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_searchstore_close) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_searchstore_close) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_searchstore_click) (struct map_session_data **sd, int *account_id, int *store_id, unsigned short *nameid); +typedef void (*HPMHOOK_post_searchstore_click) (struct map_session_data *sd, int account_id, int store_id, unsigned short nameid); +typedef bool (*HPMHOOK_pre_searchstore_queryremote) (struct map_session_data **sd, int *account_id); +typedef bool (*HPMHOOK_post_searchstore_queryremote) (bool retVal___, struct map_session_data *sd, int account_id); +typedef void (*HPMHOOK_pre_searchstore_clearremote) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_searchstore_clearremote) (struct map_session_data *sd); +typedef bool (*HPMHOOK_pre_searchstore_result) (struct map_session_data **sd, unsigned int *store_id, int *account_id, const char **store_name, unsigned short *nameid, unsigned short *amount, unsigned int *price, const short **card, unsigned char *refine); +typedef bool (*HPMHOOK_post_searchstore_result) (bool retVal___, struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, unsigned short nameid, unsigned short amount, unsigned int price, const short *card, unsigned char refine); +#endif // MAP_SEARCHSTORE_H +#ifdef COMMON_SHOWMSG_H /* showmsg */ +typedef void (*HPMHOOK_pre_showmsg_init) (void); +typedef void (*HPMHOOK_post_showmsg_init) (void); +typedef void (*HPMHOOK_pre_showmsg_final) (void); +typedef void (*HPMHOOK_post_showmsg_final) (void); +typedef void (*HPMHOOK_pre_showmsg_clearScreen) (void); +typedef void (*HPMHOOK_post_showmsg_clearScreen) (void); +typedef int (*HPMHOOK_pre_showmsg_showMessageV) (const char **string, va_list ap); +typedef int (*HPMHOOK_post_showmsg_showMessageV) (int retVal___, const char *string, va_list ap); +#endif // COMMON_SHOWMSG_H +#ifdef MAP_SKILL_H /* skill */ +typedef int (*HPMHOOK_pre_skill_init) (bool *minimal); +typedef int (*HPMHOOK_post_skill_init) (int retVal___, bool minimal); +typedef int (*HPMHOOK_pre_skill_final) (void); +typedef int (*HPMHOOK_post_skill_final) (int retVal___); +typedef void (*HPMHOOK_pre_skill_reload) (void); +typedef void (*HPMHOOK_post_skill_reload) (void); +typedef void (*HPMHOOK_pre_skill_read_db) (bool *minimal); +typedef void (*HPMHOOK_post_skill_read_db) (bool minimal); +typedef int (*HPMHOOK_pre_skill_get_index) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_index) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_type) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_type) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_hit) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_hit) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_inf) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_inf) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_ele) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_ele) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_nk) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_nk) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_max) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_max) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_range) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_range) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_range2) (struct block_list **bl, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_range2) (int retVal___, struct block_list *bl, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_splash) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_splash) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_hp) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_hp) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_mhp) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_mhp) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_sp) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_sp) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_state) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_state) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_spiritball) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_spiritball) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_zeny) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_zeny) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_num) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_num) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_cast) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_cast) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_delay) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_delay) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_walkdelay) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_walkdelay) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_time) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_time) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_time2) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_time2) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_castnodex) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_castnodex) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_delaynodex) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_delaynodex) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_castdef) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_castdef) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_weapontype) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_weapontype) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_ammotype) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_ammotype) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_ammo_qty) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_ammo_qty) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_unit_id) (uint16 *skill_id, int *flag); +typedef int (*HPMHOOK_post_skill_get_unit_id) (int retVal___, uint16 skill_id, int flag); +typedef int (*HPMHOOK_pre_skill_get_inf2) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_inf2) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_castcancel) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_castcancel) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_maxcount) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_maxcount) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_blewcount) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_blewcount) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_unit_flag) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_unit_flag) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_unit_target) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_unit_target) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_unit_interval) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_unit_interval) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_unit_bl_target) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_unit_bl_target) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_unit_layout_type) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_unit_layout_type) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_unit_range) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_unit_range) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_get_cooldown) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_cooldown) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_tree_get_max) (uint16 *skill_id, int *b_class); +typedef int (*HPMHOOK_post_skill_tree_get_max) (int retVal___, uint16 skill_id, int b_class); +typedef const char* (*HPMHOOK_pre_skill_get_name) (uint16 *skill_id); +typedef const char* (*HPMHOOK_post_skill_get_name) (const char* retVal___, uint16 skill_id); +typedef const char* (*HPMHOOK_pre_skill_get_desc) (uint16 *skill_id); +typedef const char* (*HPMHOOK_post_skill_get_desc) (const char* retVal___, uint16 skill_id); +typedef void (*HPMHOOK_pre_skill_chk) (uint16 **skill_id); +typedef void (*HPMHOOK_post_skill_chk) (uint16 *skill_id); +typedef int (*HPMHOOK_pre_skill_get_casttype) (uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_get_casttype) (int retVal___, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_get_casttype2) (uint16 *index); +typedef int (*HPMHOOK_post_skill_get_casttype2) (int retVal___, uint16 index); +typedef bool (*HPMHOOK_pre_skill_is_combo) (int *skill_id); +typedef bool (*HPMHOOK_post_skill_is_combo) (bool retVal___, int skill_id); +typedef int (*HPMHOOK_pre_skill_name2id) (const char **name); +typedef int (*HPMHOOK_post_skill_name2id) (int retVal___, const char *name); +typedef int (*HPMHOOK_pre_skill_isammotype) (struct map_session_data **sd, int *skill_id); +typedef int (*HPMHOOK_post_skill_isammotype) (int retVal___, struct map_session_data *sd, int skill_id); +typedef int (*HPMHOOK_pre_skill_castend_id) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_skill_castend_id) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_skill_castend_pos) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_skill_castend_pos) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_skill_castend_map) (struct map_session_data **sd, uint16 *skill_id, const char **mapname); +typedef int (*HPMHOOK_post_skill_castend_map) (int retVal___, struct map_session_data *sd, uint16 skill_id, const char *mapname); +typedef int (*HPMHOOK_pre_skill_cleartimerskill) (struct block_list **src); +typedef int (*HPMHOOK_post_skill_cleartimerskill) (int retVal___, struct block_list *src); +typedef int (*HPMHOOK_pre_skill_addtimerskill) (struct block_list **src, int64 *tick, int *target, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int *type, int *flag); +typedef int (*HPMHOOK_post_skill_addtimerskill) (int retVal___, struct block_list *src, int64 tick, int target, int x, int y, uint16 skill_id, uint16 skill_lv, int type, int flag); +typedef int (*HPMHOOK_pre_skill_additional_effect) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int *dmg_lv, int64 *tick); +typedef int (*HPMHOOK_post_skill_additional_effect) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int dmg_lv, int64 tick); +typedef int (*HPMHOOK_pre_skill_counter_additional_effect) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int64 *tick); +typedef int (*HPMHOOK_post_skill_counter_additional_effect) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int64 tick); +typedef int (*HPMHOOK_pre_skill_blown) (struct block_list **src, struct block_list **target, int *count, int8 *dir, int *flag); +typedef int (*HPMHOOK_post_skill_blown) (int retVal___, struct block_list *src, struct block_list *target, int count, int8 dir, int flag); +typedef int (*HPMHOOK_pre_skill_break_equip) (struct block_list **bl, unsigned short *where, int *rate, int *flag); +typedef int (*HPMHOOK_post_skill_break_equip) (int retVal___, struct block_list *bl, unsigned short where, int rate, int flag); +typedef int (*HPMHOOK_pre_skill_strip_equip) (struct block_list **bl, unsigned short *where, int *rate, int *lv, int *time); +typedef int (*HPMHOOK_post_skill_strip_equip) (int retVal___, struct block_list *bl, unsigned short where, int rate, int lv, int time); +typedef struct skill_unit_group* (*HPMHOOK_pre_skill_id2group) (int *group_id); +typedef struct skill_unit_group* (*HPMHOOK_post_skill_id2group) (struct skill_unit_group* retVal___, int group_id); +typedef struct skill_unit_group* (*HPMHOOK_pre_skill_unitsetting) (struct block_list **src, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *flag); +typedef struct skill_unit_group* (*HPMHOOK_post_skill_unitsetting) (struct skill_unit_group* retVal___, struct block_list *src, uint16 skill_id, uint16 skill_lv, short x, short y, int flag); +typedef struct skill_unit* (*HPMHOOK_pre_skill_initunit) (struct skill_unit_group **group, int *idx, int *x, int *y, int *val1, int *val2); +typedef struct skill_unit* (*HPMHOOK_post_skill_initunit) (struct skill_unit* retVal___, struct skill_unit_group *group, int idx, int x, int y, int val1, int val2); +typedef int (*HPMHOOK_pre_skill_delunit) (struct skill_unit **su); +typedef int (*HPMHOOK_post_skill_delunit) (int retVal___, struct skill_unit *su); +typedef struct skill_unit_group* (*HPMHOOK_pre_skill_init_unitgroup) (struct block_list **src, int *count, uint16 *skill_id, uint16 *skill_lv, int *unit_id, int *limit, int *interval); +typedef struct skill_unit_group* (*HPMHOOK_post_skill_init_unitgroup) (struct skill_unit_group* retVal___, struct block_list *src, int count, uint16 skill_id, uint16 skill_lv, int unit_id, int limit, int interval); +typedef int (*HPMHOOK_pre_skill_del_unitgroup) (struct skill_unit_group **group, const char **file, int *line, const char **func); +typedef int (*HPMHOOK_post_skill_del_unitgroup) (int retVal___, struct skill_unit_group *group, const char *file, int line, const char *func); +typedef int (*HPMHOOK_pre_skill_clear_unitgroup) (struct block_list **src); +typedef int (*HPMHOOK_post_skill_clear_unitgroup) (int retVal___, struct block_list *src); +typedef int (*HPMHOOK_pre_skill_clear_group) (struct block_list **bl, int *flag); +typedef int (*HPMHOOK_post_skill_clear_group) (int retVal___, struct block_list *bl, int flag); +typedef int (*HPMHOOK_pre_skill_unit_onplace) (struct skill_unit **src, struct block_list **bl, int64 *tick); +typedef int (*HPMHOOK_post_skill_unit_onplace) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 tick); +typedef int (*HPMHOOK_pre_skill_unit_ondamaged) (struct skill_unit **src, struct block_list **bl, int64 *damage, int64 *tick); +typedef int (*HPMHOOK_post_skill_unit_ondamaged) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 damage, int64 tick); +typedef int (*HPMHOOK_pre_skill_cast_fix) (struct block_list **bl, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_cast_fix) (int retVal___, struct block_list *bl, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_cast_fix_sc) (struct block_list **bl, int *time); +typedef int (*HPMHOOK_post_skill_cast_fix_sc) (int retVal___, struct block_list *bl, int time); +typedef int (*HPMHOOK_pre_skill_vf_cast_fix) (struct block_list **bl, double *time, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_vf_cast_fix) (int retVal___, struct block_list *bl, double time, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_delay_fix) (struct block_list **bl, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_delay_fix) (int retVal___, struct block_list *bl, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_check_condition_castbegin) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_check_condition_castbegin) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_check_condition_castend) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_check_condition_castend) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_consume_requirement) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv, short *type); +typedef int (*HPMHOOK_post_skill_consume_requirement) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type); +typedef struct skill_condition (*HPMHOOK_pre_skill_get_requirement) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); +typedef struct skill_condition (*HPMHOOK_post_skill_get_requirement) (struct skill_condition retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_check_pc_partner) (struct map_session_data **sd, uint16 *skill_id, uint16 **skill_lv, int *range, int *cast_flag); +typedef int (*HPMHOOK_post_skill_check_pc_partner) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 *skill_lv, int range, int cast_flag); +typedef int (*HPMHOOK_pre_skill_unit_move) (struct block_list **bl, int64 *tick, int *flag); +typedef int (*HPMHOOK_post_skill_unit_move) (int retVal___, struct block_list *bl, int64 tick, int flag); +typedef int (*HPMHOOK_pre_skill_unit_onleft) (uint16 *skill_id, struct block_list **bl, int64 *tick); +typedef int (*HPMHOOK_post_skill_unit_onleft) (int retVal___, uint16 skill_id, struct block_list *bl, int64 tick); +typedef int (*HPMHOOK_pre_skill_unit_onout) (struct skill_unit **src, struct block_list **bl, int64 *tick); +typedef int (*HPMHOOK_post_skill_unit_onout) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 tick); +typedef int (*HPMHOOK_pre_skill_unit_move_unit_group) (struct skill_unit_group **group, int16 *m, int16 *dx, int16 *dy); +typedef int (*HPMHOOK_post_skill_unit_move_unit_group) (int retVal___, struct skill_unit_group *group, int16 m, int16 dx, int16 dy); +typedef int (*HPMHOOK_pre_skill_sit) (struct map_session_data **sd, int *type); +typedef int (*HPMHOOK_post_skill_sit) (int retVal___, struct map_session_data *sd, int type); +typedef void (*HPMHOOK_pre_skill_brandishspear) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef void (*HPMHOOK_post_skill_brandishspear) (struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); +typedef void (*HPMHOOK_pre_skill_repairweapon) (struct map_session_data **sd, int *idx); +typedef void (*HPMHOOK_post_skill_repairweapon) (struct map_session_data *sd, int idx); +typedef void (*HPMHOOK_pre_skill_identify) (struct map_session_data **sd, int *idx); +typedef void (*HPMHOOK_post_skill_identify) (struct map_session_data *sd, int idx); +typedef void (*HPMHOOK_pre_skill_weaponrefine) (struct map_session_data **sd, int *idx); +typedef void (*HPMHOOK_post_skill_weaponrefine) (struct map_session_data *sd, int idx); +typedef int (*HPMHOOK_pre_skill_autospell) (struct map_session_data **md, uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_autospell) (int retVal___, struct map_session_data *md, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_calc_heal) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, bool *heal); +typedef int (*HPMHOOK_post_skill_calc_heal) (int retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, bool heal); +typedef bool (*HPMHOOK_pre_skill_check_cloaking) (struct block_list **bl, struct status_change_entry **sce); +typedef bool (*HPMHOOK_post_skill_check_cloaking) (bool retVal___, struct block_list *bl, struct status_change_entry *sce); +typedef int (*HPMHOOK_pre_skill_check_cloaking_end) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_check_cloaking_end) (int retVal___, struct block_list *bl, va_list ap); +typedef bool (*HPMHOOK_pre_skill_can_cloak) (struct map_session_data **sd); +typedef bool (*HPMHOOK_post_skill_can_cloak) (bool retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_skill_enchant_elemental_end) (struct block_list **bl, int *type); +typedef int (*HPMHOOK_post_skill_enchant_elemental_end) (int retVal___, struct block_list *bl, int type); +typedef int (*HPMHOOK_pre_skill_not_ok) (uint16 *skill_id, struct map_session_data **sd); +typedef int (*HPMHOOK_post_skill_not_ok) (int retVal___, uint16 skill_id, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_skill_not_ok_hom) (uint16 *skill_id, struct homun_data **hd); +typedef int (*HPMHOOK_post_skill_not_ok_hom) (int retVal___, uint16 skill_id, struct homun_data *hd); +typedef int (*HPMHOOK_pre_skill_not_ok_mercenary) (uint16 *skill_id, struct mercenary_data **md); +typedef int (*HPMHOOK_post_skill_not_ok_mercenary) (int retVal___, uint16 skill_id, struct mercenary_data *md); +typedef int (*HPMHOOK_pre_skill_chastle_mob_changetarget) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_chastle_mob_changetarget) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_can_produce_mix) (struct map_session_data **sd, int *nameid, int *trigger, int *qty); +typedef int (*HPMHOOK_post_skill_can_produce_mix) (int retVal___, struct map_session_data *sd, int nameid, int trigger, int qty); +typedef int (*HPMHOOK_pre_skill_produce_mix) (struct map_session_data **sd, uint16 *skill_id, int *nameid, int *slot1, int *slot2, int *slot3, int *qty); +typedef int (*HPMHOOK_post_skill_produce_mix) (int retVal___, struct map_session_data *sd, uint16 skill_id, int nameid, int slot1, int slot2, int slot3, int qty); +typedef int (*HPMHOOK_pre_skill_arrow_create) (struct map_session_data **sd, int *nameid); +typedef int (*HPMHOOK_post_skill_arrow_create) (int retVal___, struct map_session_data *sd, int nameid); +typedef int (*HPMHOOK_pre_skill_castend_nodamage_id) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef int (*HPMHOOK_post_skill_castend_nodamage_id) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); +typedef int (*HPMHOOK_pre_skill_castend_damage_id) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef int (*HPMHOOK_post_skill_castend_damage_id) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); +typedef int (*HPMHOOK_pre_skill_castend_pos2) (struct block_list **src, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef int (*HPMHOOK_post_skill_castend_pos2) (int retVal___, struct block_list *src, int x, int y, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); +typedef int (*HPMHOOK_pre_skill_blockpc_start) (struct map_session_data **sd, uint16 *skill_id, int *tick); +typedef int (*HPMHOOK_post_skill_blockpc_start) (int retVal___, struct map_session_data *sd, uint16 skill_id, int tick); +typedef int (*HPMHOOK_pre_skill_blockhomun_start) (struct homun_data **hd, uint16 *skill_id, int *tick); +typedef int (*HPMHOOK_post_skill_blockhomun_start) (int retVal___, struct homun_data *hd, uint16 skill_id, int tick); +typedef int (*HPMHOOK_pre_skill_blockmerc_start) (struct mercenary_data **md, uint16 *skill_id, int *tick); +typedef int (*HPMHOOK_post_skill_blockmerc_start) (int retVal___, struct mercenary_data *md, uint16 skill_id, int tick); +typedef int (*HPMHOOK_pre_skill_attack) (int *attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef int (*HPMHOOK_post_skill_attack) (int retVal___, int attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); +typedef int (*HPMHOOK_pre_skill_attack_area) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_attack_area) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_area_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_area_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_area_sub_count) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef int (*HPMHOOK_post_skill_area_sub_count) (int retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); +typedef int (*HPMHOOK_pre_skill_check_unit_range) (struct block_list **bl, int *x, int *y, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_check_unit_range) (int retVal___, struct block_list *bl, int x, int y, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_check_unit_range_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_check_unit_range_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_check_unit_range2) (struct block_list **bl, int *x, int *y, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_check_unit_range2) (int retVal___, struct block_list *bl, int x, int y, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_check_unit_range2_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_check_unit_range2_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_skill_toggle_magicpower) (struct block_list **bl, uint16 *skill_id); +typedef void (*HPMHOOK_post_skill_toggle_magicpower) (struct block_list *bl, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_magic_reflect) (struct block_list **src, struct block_list **bl, int *type); +typedef int (*HPMHOOK_post_skill_magic_reflect) (int retVal___, struct block_list *src, struct block_list *bl, int type); +typedef int (*HPMHOOK_pre_skill_onskillusage) (struct map_session_data **sd, struct block_list **bl, uint16 *skill_id, int64 *tick); +typedef int (*HPMHOOK_post_skill_onskillusage) (int retVal___, struct map_session_data *sd, struct block_list *bl, uint16 skill_id, int64 tick); +typedef int (*HPMHOOK_pre_skill_cell_overlap) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_cell_overlap) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_timerskill) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_skill_timerskill) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_skill_trap_splash) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_trap_splash) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_check_condition_mercenary) (struct block_list **bl, int *skill_id, int *lv, int *type); +typedef int (*HPMHOOK_post_skill_check_condition_mercenary) (int retVal___, struct block_list *bl, int skill_id, int lv, int type); +typedef struct skill_unit_group* (*HPMHOOK_pre_skill_locate_element_field) (struct block_list **bl); +typedef struct skill_unit_group* (*HPMHOOK_post_skill_locate_element_field) (struct skill_unit_group* retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_skill_graffitiremover) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_graffitiremover) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_activate_reverberation) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_activate_reverberation) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_dance_overlap_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_dance_overlap_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_dance_overlap) (struct skill_unit **su, int *flag); +typedef int (*HPMHOOK_post_skill_dance_overlap) (int retVal___, struct skill_unit *su, int flag); +typedef struct s_skill_unit_layout* (*HPMHOOK_pre_skill_get_unit_layout) (uint16 *skill_id, uint16 *skill_lv, struct block_list **src, int *x, int *y); +typedef struct s_skill_unit_layout* (*HPMHOOK_post_skill_get_unit_layout) (struct s_skill_unit_layout* retVal___, uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y); +typedef int (*HPMHOOK_pre_skill_frostjoke_scream) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_frostjoke_scream) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_greed) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_greed) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_destroy_trap) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_destroy_trap) (int retVal___, struct block_list *bl, va_list ap); +typedef struct skill_unit_group_tickset* (*HPMHOOK_pre_skill_unitgrouptickset_search) (struct block_list **bl, struct skill_unit_group **group, int64 *tick); +typedef struct skill_unit_group_tickset* (*HPMHOOK_post_skill_unitgrouptickset_search) (struct skill_unit_group_tickset* retVal___, struct block_list *bl, struct skill_unit_group *group, int64 tick); +typedef bool (*HPMHOOK_pre_skill_dance_switch) (struct skill_unit **su, int *flag); +typedef bool (*HPMHOOK_post_skill_dance_switch) (bool retVal___, struct skill_unit *su, int flag); +typedef int (*HPMHOOK_pre_skill_check_condition_char_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_check_condition_char_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_check_condition_mob_master_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_check_condition_mob_master_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_skill_brandishspear_first) (struct square **tc, uint8 *dir, int16 *x, int16 *y); +typedef void (*HPMHOOK_post_skill_brandishspear_first) (struct square *tc, uint8 dir, int16 x, int16 y); +typedef void (*HPMHOOK_pre_skill_brandishspear_dir) (struct square **tc, uint8 *dir, int *are); +typedef void (*HPMHOOK_post_skill_brandishspear_dir) (struct square *tc, uint8 dir, int are); +typedef int (*HPMHOOK_pre_skill_get_fixed_cast) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_fixed_cast) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_skill_sit_count) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_sit_count) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_sit_in) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_sit_in) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_sit_out) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_sit_out) (int retVal___, struct block_list *bl, va_list ap); +typedef void (*HPMHOOK_pre_skill_unitsetmapcell) (struct skill_unit **src, uint16 *skill_id, uint16 *skill_lv, cell_t *cell, bool *flag); +typedef void (*HPMHOOK_post_skill_unitsetmapcell) (struct skill_unit *src, uint16 skill_id, uint16 skill_lv, cell_t cell, bool flag); +typedef int (*HPMHOOK_pre_skill_unit_onplace_timer) (struct skill_unit **src, struct block_list **bl, int64 *tick); +typedef int (*HPMHOOK_post_skill_unit_onplace_timer) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 tick); +typedef int (*HPMHOOK_pre_skill_unit_effect) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_unit_effect) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_unit_timer_sub_onplace) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_unit_timer_sub_onplace) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_unit_move_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_unit_move_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_skill_blockpc_end) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_skill_blockpc_end) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_skill_blockhomun_end) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_skill_blockhomun_end) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_skill_blockmerc_end) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_skill_blockmerc_end) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_skill_split_atoi) (char **str, int **val); +typedef int (*HPMHOOK_post_skill_split_atoi) (int retVal___, char *str, int *val); +typedef int (*HPMHOOK_pre_skill_unit_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_skill_unit_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_skill_unit_timer_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_skill_unit_timer_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +typedef void (*HPMHOOK_pre_skill_init_unit_layout) (void); +typedef void (*HPMHOOK_post_skill_init_unit_layout) (void); +typedef bool (*HPMHOOK_pre_skill_parse_row_skilldb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_skilldb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_requiredb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_requiredb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_castdb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_castdb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_castnodexdb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_castnodexdb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_unitdb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_unitdb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_producedb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_producedb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_createarrowdb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_createarrowdb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_abradb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_abradb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_spellbookdb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_spellbookdb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_magicmushroomdb) (char **split[], int *column, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_magicmushroomdb) (bool retVal___, char *split[], int column, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_reproducedb) (char **split[], int *column, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_reproducedb) (bool retVal___, char *split[], int column, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_improvisedb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_improvisedb) (bool retVal___, char *split[], int columns, int current); +typedef bool (*HPMHOOK_pre_skill_parse_row_changematerialdb) (char **split[], int *columns, int *current); +typedef bool (*HPMHOOK_post_skill_parse_row_changematerialdb) (bool retVal___, char *split[], int columns, int current); +typedef void (*HPMHOOK_pre_skill_usave_add) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); +typedef void (*HPMHOOK_post_skill_usave_add) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); +typedef void (*HPMHOOK_pre_skill_usave_trigger) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_skill_usave_trigger) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_skill_cooldown_load) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_skill_cooldown_load) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_skill_spellbook) (struct map_session_data **sd, int *nameid); +typedef int (*HPMHOOK_post_skill_spellbook) (int retVal___, struct map_session_data *sd, int nameid); +typedef int (*HPMHOOK_pre_skill_block_check) (struct block_list **bl, enum sc_type *type, uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_block_check) (int retVal___, struct block_list *bl, enum sc_type type, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_detonator) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_skill_detonator) (int retVal___, struct block_list *bl, va_list ap); +typedef bool (*HPMHOOK_pre_skill_check_camouflage) (struct block_list **bl, struct status_change_entry **sce); +typedef bool (*HPMHOOK_post_skill_check_camouflage) (bool retVal___, struct block_list *bl, struct status_change_entry *sce); +typedef int (*HPMHOOK_pre_skill_magicdecoy) (struct map_session_data **sd, int *nameid); +typedef int (*HPMHOOK_post_skill_magicdecoy) (int retVal___, struct map_session_data *sd, int nameid); +typedef int (*HPMHOOK_pre_skill_poisoningweapon) (struct map_session_data **sd, int *nameid); +typedef int (*HPMHOOK_post_skill_poisoningweapon) (int retVal___, struct map_session_data *sd, int nameid); +typedef int (*HPMHOOK_pre_skill_select_menu) (struct map_session_data **sd, uint16 *skill_id); +typedef int (*HPMHOOK_post_skill_select_menu) (int retVal___, struct map_session_data *sd, uint16 skill_id); +typedef int (*HPMHOOK_pre_skill_elementalanalysis) (struct map_session_data **sd, uint16 *skill_lv, const struct itemlist **item_list); +typedef int (*HPMHOOK_post_skill_elementalanalysis) (int retVal___, struct map_session_data *sd, uint16 skill_lv, const struct itemlist *item_list); +typedef int (*HPMHOOK_pre_skill_changematerial) (struct map_session_data **sd, const struct itemlist **item_list); +typedef int (*HPMHOOK_post_skill_changematerial) (int retVal___, struct map_session_data *sd, const struct itemlist *item_list); +typedef int (*HPMHOOK_pre_skill_get_elemental_type) (uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_skill_get_elemental_type) (int retVal___, uint16 skill_id, uint16 skill_lv); +typedef void (*HPMHOOK_pre_skill_cooldown_save) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_skill_cooldown_save) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_skill_get_new_group_id) (void); +typedef int (*HPMHOOK_post_skill_get_new_group_id) (int retVal___); +typedef bool (*HPMHOOK_pre_skill_check_shadowform) (struct block_list **bl, int64 *damage, int *hit); +typedef bool (*HPMHOOK_post_skill_check_shadowform) (bool retVal___, struct block_list *bl, int64 damage, int hit); +typedef bool (*HPMHOOK_pre_skill_castend_damage_id_unknown) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, struct status_data **tstatus, struct status_change **sc); +typedef bool (*HPMHOOK_post_skill_castend_damage_id_unknown) (bool retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, struct status_data *tstatus, struct status_change *sc); +typedef void (*HPMHOOK_pre_skill_additional_effect_unknown) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int **attack_type, int **dmg_lv, int64 **tick); +typedef void (*HPMHOOK_post_skill_additional_effect_unknown) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int *dmg_lv, int64 *tick); +typedef void (*HPMHOOK_pre_skill_counter_additional_effect_unknown) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int **attack_type, int64 **tick); +typedef void (*HPMHOOK_post_skill_counter_additional_effect_unknown) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int64 *tick); +typedef void (*HPMHOOK_pre_skill_attack_combo1_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, struct status_change_entry **sce, int **combo); +typedef void (*HPMHOOK_post_skill_attack_combo1_unknown) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, struct status_change_entry *sce, int *combo); +typedef void (*HPMHOOK_pre_skill_attack_combo2_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **combo); +typedef void (*HPMHOOK_post_skill_attack_combo2_unknown) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *combo); +typedef void (*HPMHOOK_pre_skill_attack_display_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **type, struct Damage **dmg, int64 **damage); +typedef void (*HPMHOOK_post_skill_attack_display_unknown) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage); +typedef int (*HPMHOOK_pre_skill_attack_copy_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); +typedef int (*HPMHOOK_post_skill_attack_copy_unknown) (int retVal___, int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef int (*HPMHOOK_pre_skill_attack_dir_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); +typedef int (*HPMHOOK_post_skill_attack_dir_unknown) (int retVal___, int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef void (*HPMHOOK_pre_skill_attack_blow_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **type, struct Damage **dmg, int64 **damage, int8 **dir); +typedef void (*HPMHOOK_post_skill_attack_blow_unknown) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, int8 *dir); +typedef void (*HPMHOOK_pre_skill_attack_post_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); +typedef void (*HPMHOOK_post_skill_attack_post_unknown) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef bool (*HPMHOOK_pre_skill_timerskill_dead_unknown) (struct block_list **src, struct unit_data **ud, struct skill_timerskill **skl); +typedef bool (*HPMHOOK_post_skill_timerskill_dead_unknown) (bool retVal___, struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl); +typedef void (*HPMHOOK_pre_skill_timerskill_target_unknown) (int *tid, int64 *tick, struct block_list **src, struct block_list **target, struct unit_data **ud, struct skill_timerskill **skl); +typedef void (*HPMHOOK_post_skill_timerskill_target_unknown) (int tid, int64 tick, struct block_list *src, struct block_list *target, struct unit_data *ud, struct skill_timerskill *skl); +typedef void (*HPMHOOK_pre_skill_timerskill_notarget_unknown) (int *tid, int64 *tick, struct block_list **src, struct unit_data **ud, struct skill_timerskill **skl); +typedef void (*HPMHOOK_post_skill_timerskill_notarget_unknown) (int tid, int64 tick, struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl); +typedef bool (*HPMHOOK_pre_skill_cleartimerskill_exception) (int *skill_id); +typedef bool (*HPMHOOK_post_skill_cleartimerskill_exception) (bool retVal___, int skill_id); +typedef bool (*HPMHOOK_pre_skill_castend_id_unknown) (struct unit_data **ud, struct block_list **src, struct block_list **target); +typedef bool (*HPMHOOK_post_skill_castend_id_unknown) (bool retVal___, struct unit_data *ud, struct block_list *src, struct block_list *target); +typedef bool (*HPMHOOK_pre_skill_castend_nodamage_id_dead_unknown) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); +typedef bool (*HPMHOOK_post_skill_castend_nodamage_id_dead_unknown) (bool retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef bool (*HPMHOOK_pre_skill_castend_nodamage_id_undead_unknown) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); +typedef bool (*HPMHOOK_post_skill_castend_nodamage_id_undead_unknown) (bool retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef bool (*HPMHOOK_pre_skill_castend_nodamage_id_mado_unknown) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); +typedef bool (*HPMHOOK_post_skill_castend_nodamage_id_mado_unknown) (bool retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef bool (*HPMHOOK_pre_skill_castend_nodamage_id_unknown) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); +typedef bool (*HPMHOOK_post_skill_castend_nodamage_id_unknown) (bool retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef void (*HPMHOOK_pre_skill_castend_pos2_effect_unknown) (struct block_list **src, int **x, int **y, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); +typedef void (*HPMHOOK_post_skill_castend_pos2_effect_unknown) (struct block_list *src, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef bool (*HPMHOOK_pre_skill_castend_pos2_unknown) (struct block_list **src, int **x, int **y, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); +typedef bool (*HPMHOOK_post_skill_castend_pos2_unknown) (bool retVal___, struct block_list *src, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); +typedef void (*HPMHOOK_pre_skill_unitsetting1_unknown) (struct block_list **src, uint16 **skill_id, uint16 **skill_lv, int16 **x, int16 **y, int **flag, int **val1, int **val2, int **val3); +typedef void (*HPMHOOK_post_skill_unitsetting1_unknown) (struct block_list *src, uint16 *skill_id, uint16 *skill_lv, int16 *x, int16 *y, int *flag, int *val1, int *val2, int *val3); +typedef void (*HPMHOOK_pre_skill_unitsetting2_unknown) (struct block_list **src, uint16 **skill_id, uint16 **skill_lv, int16 **x, int16 **y, int **flag, int **unit_flag, int **val1, int **val2, int **val3, struct skill_unit_group **group); +typedef void (*HPMHOOK_post_skill_unitsetting2_unknown) (struct block_list *src, uint16 *skill_id, uint16 *skill_lv, int16 *x, int16 *y, int *flag, int *unit_flag, int *val1, int *val2, int *val3, struct skill_unit_group *group); +typedef void (*HPMHOOK_pre_skill_unit_onplace_unknown) (struct skill_unit **src, struct block_list **bl, int64 **tick); +typedef void (*HPMHOOK_post_skill_unit_onplace_unknown) (struct skill_unit *src, struct block_list *bl, int64 *tick); +typedef int (*HPMHOOK_pre_skill_check_condition_castbegin_off_unknown) (struct status_change **sc, uint16 **skill_id); +typedef int (*HPMHOOK_post_skill_check_condition_castbegin_off_unknown) (int retVal___, struct status_change *sc, uint16 *skill_id); +typedef int (*HPMHOOK_pre_skill_check_condition_castbegin_mount_unknown) (struct status_change **sc, uint16 **skill_id); +typedef int (*HPMHOOK_post_skill_check_condition_castbegin_mount_unknown) (int retVal___, struct status_change *sc, uint16 *skill_id); +typedef int (*HPMHOOK_pre_skill_check_condition_castbegin_madogear_unknown) (struct status_change **sc, uint16 **skill_id); +typedef int (*HPMHOOK_post_skill_check_condition_castbegin_madogear_unknown) (int retVal___, struct status_change *sc, uint16 *skill_id); +typedef int (*HPMHOOK_pre_skill_check_condition_castbegin_unknown) (struct status_change **sc, uint16 **skill_id); +typedef int (*HPMHOOK_post_skill_check_condition_castbegin_unknown) (int retVal___, struct status_change *sc, uint16 *skill_id); +typedef void (*HPMHOOK_pre_skill_check_condition_castend_unknown) (struct map_session_data **sd, uint16 **skill_id, uint16 **skill_lv); +typedef void (*HPMHOOK_post_skill_check_condition_castend_unknown) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); +typedef bool (*HPMHOOK_pre_skill_get_requirement_off_unknown) (struct status_change **sc, uint16 **skill_id); +typedef bool (*HPMHOOK_post_skill_get_requirement_off_unknown) (bool retVal___, struct status_change *sc, uint16 *skill_id); +typedef bool (*HPMHOOK_pre_skill_get_requirement_item_unknown) (struct status_change **sc, struct map_session_data **sd, uint16 **skill_id, uint16 **skill_lv, uint16 **idx, int **i); +typedef bool (*HPMHOOK_post_skill_get_requirement_item_unknown) (bool retVal___, struct status_change *sc, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, uint16 *idx, int *i); +typedef void (*HPMHOOK_pre_skill_get_requirement_unknown) (struct status_change **sc, struct map_session_data **sd, uint16 **skill_id, uint16 **skill_lv, struct skill_condition **req); +typedef void (*HPMHOOK_post_skill_get_requirement_unknown) (struct status_change *sc, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, struct skill_condition *req); +#endif // MAP_SKILL_H +#ifdef COMMON_SOCKET_H /* sockt */ +typedef void (*HPMHOOK_pre_sockt_init) (void); +typedef void (*HPMHOOK_post_sockt_init) (void); +typedef void (*HPMHOOK_pre_sockt_final) (void); +typedef void (*HPMHOOK_post_sockt_final) (void); +typedef int (*HPMHOOK_pre_sockt_perform) (int *next); +typedef int (*HPMHOOK_post_sockt_perform) (int retVal___, int next); +typedef void (*HPMHOOK_pre_sockt_datasync) (int *fd, bool *send); +typedef void (*HPMHOOK_post_sockt_datasync) (int fd, bool send); +typedef int (*HPMHOOK_pre_sockt_make_listen_bind) (uint32 *ip, uint16 *port); +typedef int (*HPMHOOK_post_sockt_make_listen_bind) (int retVal___, uint32 ip, uint16 port); +typedef int (*HPMHOOK_pre_sockt_make_connection) (uint32 *ip, uint16 *port, struct hSockOpt **opt); +typedef int (*HPMHOOK_post_sockt_make_connection) (int retVal___, uint32 ip, uint16 port, struct hSockOpt *opt); +typedef int (*HPMHOOK_pre_sockt_realloc_fifo) (int *fd, unsigned int *rfifo_size, unsigned int *wfifo_size); +typedef int (*HPMHOOK_post_sockt_realloc_fifo) (int retVal___, int fd, unsigned int rfifo_size, unsigned int wfifo_size); +typedef int (*HPMHOOK_pre_sockt_realloc_writefifo) (int *fd, size_t *addition); +typedef int (*HPMHOOK_post_sockt_realloc_writefifo) (int retVal___, int fd, size_t addition); +typedef int (*HPMHOOK_pre_sockt_wfifoset) (int *fd, size_t *len); +typedef int (*HPMHOOK_post_sockt_wfifoset) (int retVal___, int fd, size_t len); +typedef int (*HPMHOOK_pre_sockt_rfifoskip) (int *fd, size_t *len); +typedef int (*HPMHOOK_post_sockt_rfifoskip) (int retVal___, int fd, size_t len); +typedef void (*HPMHOOK_pre_sockt_close) (int *fd); +typedef void (*HPMHOOK_post_sockt_close) (int fd); +typedef bool (*HPMHOOK_pre_sockt_session_is_valid) (int *fd); +typedef bool (*HPMHOOK_post_sockt_session_is_valid) (bool retVal___, int fd); +typedef bool (*HPMHOOK_pre_sockt_session_is_active) (int *fd); +typedef bool (*HPMHOOK_post_sockt_session_is_active) (bool retVal___, int fd); +typedef void (*HPMHOOK_pre_sockt_flush) (int *fd); +typedef void (*HPMHOOK_post_sockt_flush) (int fd); +typedef void (*HPMHOOK_pre_sockt_flush_fifos) (void); +typedef void (*HPMHOOK_post_sockt_flush_fifos) (void); +typedef void (*HPMHOOK_pre_sockt_set_nonblocking) (int *fd, unsigned long *yes); +typedef void (*HPMHOOK_post_sockt_set_nonblocking) (int fd, unsigned long yes); +typedef void (*HPMHOOK_pre_sockt_set_defaultparse) (ParseFunc *defaultparse); +typedef void (*HPMHOOK_post_sockt_set_defaultparse) (ParseFunc defaultparse); +typedef uint32 (*HPMHOOK_pre_sockt_host2ip) (const char **hostname); +typedef uint32 (*HPMHOOK_post_sockt_host2ip) (uint32 retVal___, const char *hostname); +typedef const char* (*HPMHOOK_pre_sockt_ip2str) (uint32 *ip, char **ip_str); +typedef const char* (*HPMHOOK_post_sockt_ip2str) (const char* retVal___, uint32 ip, char *ip_str); +typedef uint32 (*HPMHOOK_pre_sockt_str2ip) (const char **ip_str); +typedef uint32 (*HPMHOOK_post_sockt_str2ip) (uint32 retVal___, const char *ip_str); +typedef uint16 (*HPMHOOK_pre_sockt_ntows) (uint16 *netshort); +typedef uint16 (*HPMHOOK_post_sockt_ntows) (uint16 retVal___, uint16 netshort); +typedef int (*HPMHOOK_pre_sockt_getips) (uint32 **ips, int *max); +typedef int (*HPMHOOK_post_sockt_getips) (int retVal___, uint32 *ips, int max); +typedef void (*HPMHOOK_pre_sockt_eof) (int *fd); +typedef void (*HPMHOOK_post_sockt_eof) (int fd); +typedef uint32 (*HPMHOOK_pre_sockt_lan_subnet_check) (uint32 *ip, struct s_subnet **info); +typedef uint32 (*HPMHOOK_post_sockt_lan_subnet_check) (uint32 retVal___, uint32 ip, struct s_subnet *info); +typedef bool (*HPMHOOK_pre_sockt_allowed_ip_check) (uint32 *ip); +typedef bool (*HPMHOOK_post_sockt_allowed_ip_check) (bool retVal___, uint32 ip); +typedef bool (*HPMHOOK_pre_sockt_trusted_ip_check) (uint32 *ip); +typedef bool (*HPMHOOK_post_sockt_trusted_ip_check) (bool retVal___, uint32 ip); +typedef int (*HPMHOOK_pre_sockt_net_config_read_sub) (struct config_setting_t **t, struct s_subnet_vector **list, const char **filename, const char **groupname); +typedef int (*HPMHOOK_post_sockt_net_config_read_sub) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); +typedef void (*HPMHOOK_pre_sockt_net_config_read) (const char **filename); +typedef void (*HPMHOOK_post_sockt_net_config_read) (const char *filename); +#endif // COMMON_SOCKET_H +#ifdef COMMON_SQL_H /* SQL */ +typedef int (*HPMHOOK_pre_SQL_Connect) (struct Sql **self, const char **user, const char **passwd, const char **host, uint16 *port, const char **db); +typedef int (*HPMHOOK_post_SQL_Connect) (int retVal___, struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db); +typedef int (*HPMHOOK_pre_SQL_GetTimeout) (struct Sql **self, uint32 **out_timeout); +typedef int (*HPMHOOK_post_SQL_GetTimeout) (int retVal___, struct Sql *self, uint32 *out_timeout); +typedef int (*HPMHOOK_pre_SQL_GetColumnNames) (struct Sql **self, const char **table, char **out_buf, size_t *buf_len, char *sep); +typedef int (*HPMHOOK_post_SQL_GetColumnNames) (int retVal___, struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep); +typedef int (*HPMHOOK_pre_SQL_SetEncoding) (struct Sql **self, const char **encoding); +typedef int (*HPMHOOK_post_SQL_SetEncoding) (int retVal___, struct Sql *self, const char *encoding); +typedef int (*HPMHOOK_pre_SQL_Ping) (struct Sql **self); +typedef int (*HPMHOOK_post_SQL_Ping) (int retVal___, struct Sql *self); +typedef size_t (*HPMHOOK_pre_SQL_EscapeString) (struct Sql **self, char **out_to, const char **from); +typedef size_t (*HPMHOOK_post_SQL_EscapeString) (size_t retVal___, struct Sql *self, char *out_to, const char *from); +typedef size_t (*HPMHOOK_pre_SQL_EscapeStringLen) (struct Sql **self, char **out_to, const char **from, size_t *from_len); +typedef size_t (*HPMHOOK_post_SQL_EscapeStringLen) (size_t retVal___, struct Sql *self, char *out_to, const char *from, size_t from_len); +typedef int (*HPMHOOK_pre_SQL_QueryV) (struct Sql **self, const char **query, va_list args); +typedef int (*HPMHOOK_post_SQL_QueryV) (int retVal___, struct Sql *self, const char *query, va_list args); +typedef int (*HPMHOOK_pre_SQL_QueryStr) (struct Sql **self, const char **query); +typedef int (*HPMHOOK_post_SQL_QueryStr) (int retVal___, struct Sql *self, const char *query); +typedef uint64 (*HPMHOOK_pre_SQL_LastInsertId) (struct Sql **self); +typedef uint64 (*HPMHOOK_post_SQL_LastInsertId) (uint64 retVal___, struct Sql *self); +typedef uint32 (*HPMHOOK_pre_SQL_NumColumns) (struct Sql **self); +typedef uint32 (*HPMHOOK_post_SQL_NumColumns) (uint32 retVal___, struct Sql *self); +typedef uint64 (*HPMHOOK_pre_SQL_NumRows) (struct Sql **self); +typedef uint64 (*HPMHOOK_post_SQL_NumRows) (uint64 retVal___, struct Sql *self); +typedef int (*HPMHOOK_pre_SQL_NextRow) (struct Sql **self); +typedef int (*HPMHOOK_post_SQL_NextRow) (int retVal___, struct Sql *self); +typedef int (*HPMHOOK_pre_SQL_GetData) (struct Sql **self, size_t *col, char ***out_buf, size_t **out_len); +typedef int (*HPMHOOK_post_SQL_GetData) (int retVal___, struct Sql *self, size_t col, char **out_buf, size_t *out_len); +typedef void (*HPMHOOK_pre_SQL_FreeResult) (struct Sql **self); +typedef void (*HPMHOOK_post_SQL_FreeResult) (struct Sql *self); +typedef void (*HPMHOOK_pre_SQL_ShowDebug_) (struct Sql **self, const char **debug_file, const unsigned long *debug_line); +typedef void (*HPMHOOK_post_SQL_ShowDebug_) (struct Sql *self, const char *debug_file, const unsigned long debug_line); +typedef void (*HPMHOOK_pre_SQL_Free) (struct Sql **self); +typedef void (*HPMHOOK_post_SQL_Free) (struct Sql *self); +typedef struct Sql* (*HPMHOOK_pre_SQL_Malloc) (void); +typedef struct Sql* (*HPMHOOK_post_SQL_Malloc) (struct Sql* retVal___); +typedef struct SqlStmt* (*HPMHOOK_pre_SQL_StmtMalloc) (struct Sql **sql); +typedef struct SqlStmt* (*HPMHOOK_post_SQL_StmtMalloc) (struct SqlStmt* retVal___, struct Sql *sql); +typedef int (*HPMHOOK_pre_SQL_StmtPrepareV) (struct SqlStmt **self, const char **query, va_list args); +typedef int (*HPMHOOK_post_SQL_StmtPrepareV) (int retVal___, struct SqlStmt *self, const char *query, va_list args); +typedef int (*HPMHOOK_pre_SQL_StmtPrepareStr) (struct SqlStmt **self, const char **query); +typedef int (*HPMHOOK_post_SQL_StmtPrepareStr) (int retVal___, struct SqlStmt *self, const char *query); +typedef size_t (*HPMHOOK_pre_SQL_StmtNumParams) (struct SqlStmt **self); +typedef size_t (*HPMHOOK_post_SQL_StmtNumParams) (size_t retVal___, struct SqlStmt *self); +typedef int (*HPMHOOK_pre_SQL_StmtBindParam) (struct SqlStmt **self, size_t *idx, enum SqlDataType *buffer_type, const void **buffer, size_t *buffer_len); +typedef int (*HPMHOOK_post_SQL_StmtBindParam) (int retVal___, struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len); +typedef int (*HPMHOOK_pre_SQL_StmtExecute) (struct SqlStmt **self); +typedef int (*HPMHOOK_post_SQL_StmtExecute) (int retVal___, struct SqlStmt *self); +typedef uint64 (*HPMHOOK_pre_SQL_StmtLastInsertId) (struct SqlStmt **self); +typedef uint64 (*HPMHOOK_post_SQL_StmtLastInsertId) (uint64 retVal___, struct SqlStmt *self); +typedef size_t (*HPMHOOK_pre_SQL_StmtNumColumns) (struct SqlStmt **self); +typedef size_t (*HPMHOOK_post_SQL_StmtNumColumns) (size_t retVal___, struct SqlStmt *self); +typedef int (*HPMHOOK_pre_SQL_StmtBindColumn) (struct SqlStmt **self, size_t *idx, enum SqlDataType *buffer_type, void **buffer, size_t *buffer_len, uint32 **out_length, int8 **out_is_null); +typedef int (*HPMHOOK_post_SQL_StmtBindColumn) (int retVal___, struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null); +typedef uint64 (*HPMHOOK_pre_SQL_StmtNumRows) (struct SqlStmt **self); +typedef uint64 (*HPMHOOK_post_SQL_StmtNumRows) (uint64 retVal___, struct SqlStmt *self); +typedef int (*HPMHOOK_pre_SQL_StmtNextRow) (struct SqlStmt **self); +typedef int (*HPMHOOK_post_SQL_StmtNextRow) (int retVal___, struct SqlStmt *self); +typedef void (*HPMHOOK_pre_SQL_StmtFreeResult) (struct SqlStmt **self); +typedef void (*HPMHOOK_post_SQL_StmtFreeResult) (struct SqlStmt *self); +typedef void (*HPMHOOK_pre_SQL_StmtFree) (struct SqlStmt **self); +typedef void (*HPMHOOK_post_SQL_StmtFree) (struct SqlStmt *self); +typedef void (*HPMHOOK_pre_SQL_StmtShowDebug_) (struct SqlStmt **self, const char **debug_file, const unsigned long *debug_line); +typedef void (*HPMHOOK_post_SQL_StmtShowDebug_) (struct SqlStmt *self, const char *debug_file, const unsigned long debug_line); +#endif // COMMON_SQL_H +#ifdef MAP_STATUS_H /* status */ +typedef int (*HPMHOOK_pre_status_init) (bool *minimal); +typedef int (*HPMHOOK_post_status_init) (int retVal___, bool minimal); +typedef void (*HPMHOOK_pre_status_final) (void); +typedef void (*HPMHOOK_post_status_final) (void); +typedef int (*HPMHOOK_pre_status_get_refine_chance) (enum refine_type *wlv, int *refine); +typedef int (*HPMHOOK_post_status_get_refine_chance) (int retVal___, enum refine_type wlv, int refine); +typedef sc_type (*HPMHOOK_pre_status_skill2sc) (int *skill_id); +typedef sc_type (*HPMHOOK_post_status_skill2sc) (sc_type retVal___, int skill_id); +typedef int (*HPMHOOK_pre_status_sc2skill) (sc_type *sc); +typedef int (*HPMHOOK_post_status_sc2skill) (int retVal___, sc_type sc); +typedef unsigned int (*HPMHOOK_pre_status_sc2scb_flag) (sc_type *sc); +typedef unsigned int (*HPMHOOK_post_status_sc2scb_flag) (unsigned int retVal___, sc_type sc); +typedef int (*HPMHOOK_pre_status_type2relevant_bl_types) (int *type); +typedef int (*HPMHOOK_post_status_type2relevant_bl_types) (int retVal___, int type); +typedef int (*HPMHOOK_pre_status_get_sc_type) (sc_type *idx); +typedef int (*HPMHOOK_post_status_get_sc_type) (int retVal___, sc_type idx); +typedef int (*HPMHOOK_pre_status_damage) (struct block_list **src, struct block_list **target, int64 *hp, int64 *sp, int *walkdelay, int *flag); +typedef int (*HPMHOOK_post_status_damage) (int retVal___, struct block_list *src, struct block_list *target, int64 hp, int64 sp, int walkdelay, int flag); +typedef int (*HPMHOOK_pre_status_charge) (struct block_list **bl, int64 *hp, int64 *sp); +typedef int (*HPMHOOK_post_status_charge) (int retVal___, struct block_list *bl, int64 hp, int64 sp); +typedef int (*HPMHOOK_pre_status_percent_change) (struct block_list **src, struct block_list **target, signed char *hp_rate, signed char *sp_rate, int *flag); +typedef int (*HPMHOOK_post_status_percent_change) (int retVal___, struct block_list *src, struct block_list *target, signed char hp_rate, signed char sp_rate, int flag); +typedef int (*HPMHOOK_pre_status_set_hp) (struct block_list **bl, unsigned int *hp, int *flag); +typedef int (*HPMHOOK_post_status_set_hp) (int retVal___, struct block_list *bl, unsigned int hp, int flag); +typedef int (*HPMHOOK_pre_status_set_sp) (struct block_list **bl, unsigned int *sp, int *flag); +typedef int (*HPMHOOK_post_status_set_sp) (int retVal___, struct block_list *bl, unsigned int sp, int flag); +typedef int (*HPMHOOK_pre_status_heal) (struct block_list **bl, int64 *hp, int64 *sp, int *flag); +typedef int (*HPMHOOK_post_status_heal) (int retVal___, struct block_list *bl, int64 hp, int64 sp, int flag); +typedef int (*HPMHOOK_pre_status_revive) (struct block_list **bl, unsigned char *per_hp, unsigned char *per_sp); +typedef int (*HPMHOOK_post_status_revive) (int retVal___, struct block_list *bl, unsigned char per_hp, unsigned char per_sp); +typedef int (*HPMHOOK_pre_status_fixed_revive) (struct block_list **bl, unsigned int *per_hp, unsigned int *per_sp); +typedef int (*HPMHOOK_post_status_fixed_revive) (int retVal___, struct block_list *bl, unsigned int per_hp, unsigned int per_sp); +typedef struct regen_data* (*HPMHOOK_pre_status_get_regen_data) (struct block_list **bl); +typedef struct regen_data* (*HPMHOOK_post_status_get_regen_data) (struct regen_data* retVal___, struct block_list *bl); +typedef struct status_data* (*HPMHOOK_pre_status_get_status_data) (struct block_list **bl); +typedef struct status_data* (*HPMHOOK_post_status_get_status_data) (struct status_data* retVal___, struct block_list *bl); +typedef struct status_data* (*HPMHOOK_pre_status_get_base_status) (struct block_list **bl); +typedef struct status_data* (*HPMHOOK_post_status_get_base_status) (struct status_data* retVal___, struct block_list *bl); +typedef const char* (*HPMHOOK_pre_status_get_name) (const struct block_list **bl); +typedef const char* (*HPMHOOK_post_status_get_name) (const char* retVal___, const struct block_list *bl); +typedef int (*HPMHOOK_pre_status_get_class) (const struct block_list **bl); +typedef int (*HPMHOOK_post_status_get_class) (int retVal___, const struct block_list *bl); +typedef int (*HPMHOOK_pre_status_get_lv) (const struct block_list **bl); +typedef int (*HPMHOOK_post_status_get_lv) (int retVal___, const struct block_list *bl); +typedef defType (*HPMHOOK_pre_status_get_def) (struct block_list **bl); +typedef defType (*HPMHOOK_post_status_get_def) (defType retVal___, struct block_list *bl); +typedef unsigned short (*HPMHOOK_pre_status_get_speed) (struct block_list **bl); +typedef unsigned short (*HPMHOOK_post_status_get_speed) (unsigned short retVal___, struct block_list *bl); +typedef unsigned char (*HPMHOOK_pre_status_calc_attack_element) (struct block_list **bl, struct status_change **sc, int *element); +typedef unsigned char (*HPMHOOK_post_status_calc_attack_element) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int element); +typedef int (*HPMHOOK_pre_status_get_party_id) (const struct block_list **bl); +typedef int (*HPMHOOK_post_status_get_party_id) (int retVal___, const struct block_list *bl); +typedef int (*HPMHOOK_pre_status_get_guild_id) (const struct block_list **bl); +typedef int (*HPMHOOK_post_status_get_guild_id) (int retVal___, const struct block_list *bl); +typedef int (*HPMHOOK_pre_status_get_emblem_id) (const struct block_list **bl); +typedef int (*HPMHOOK_post_status_get_emblem_id) (int retVal___, const struct block_list *bl); +typedef int (*HPMHOOK_pre_status_get_mexp) (const struct block_list **bl); +typedef int (*HPMHOOK_post_status_get_mexp) (int retVal___, const struct block_list *bl); +typedef int (*HPMHOOK_pre_status_get_race2) (const struct block_list **bl); +typedef int (*HPMHOOK_post_status_get_race2) (int retVal___, const struct block_list *bl); +typedef struct view_data* (*HPMHOOK_pre_status_get_viewdata) (struct block_list **bl); +typedef struct view_data* (*HPMHOOK_post_status_get_viewdata) (struct view_data* retVal___, struct block_list *bl); +typedef void (*HPMHOOK_pre_status_set_viewdata) (struct block_list **bl, int *class_); +typedef void (*HPMHOOK_post_status_set_viewdata) (struct block_list *bl, int class_); +typedef void (*HPMHOOK_pre_status_change_init) (struct block_list **bl); +typedef void (*HPMHOOK_post_status_change_init) (struct block_list *bl); +typedef struct status_change* (*HPMHOOK_pre_status_get_sc) (struct block_list **bl); +typedef struct status_change* (*HPMHOOK_post_status_get_sc) (struct status_change* retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_status_isdead) (struct block_list **bl); +typedef int (*HPMHOOK_post_status_isdead) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_status_isimmune) (struct block_list **bl); +typedef int (*HPMHOOK_post_status_isimmune) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_status_get_sc_def) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *rate, int *tick, int *flag); +typedef int (*HPMHOOK_post_status_get_sc_def) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int tick, int flag); +typedef int (*HPMHOOK_pre_status_change_start) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag); +typedef int (*HPMHOOK_post_status_change_start) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int flag); +typedef int (*HPMHOOK_pre_status_change_end_) (struct block_list **bl, enum sc_type *type, int *tid, const char **file, int *line); +typedef int (*HPMHOOK_post_status_change_end_) (int retVal___, struct block_list *bl, enum sc_type type, int tid, const char *file, int line); +typedef int (*HPMHOOK_pre_status_kaahi_heal_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_status_kaahi_heal_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_status_change_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_status_change_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_status_change_timer_sub) (struct block_list **bl, va_list ap); +typedef int (*HPMHOOK_post_status_change_timer_sub) (int retVal___, struct block_list *bl, va_list ap); +typedef int (*HPMHOOK_pre_status_change_clear) (struct block_list **bl, int *type); +typedef int (*HPMHOOK_post_status_change_clear) (int retVal___, struct block_list *bl, int type); +typedef int (*HPMHOOK_pre_status_change_clear_buffs) (struct block_list **bl, int *type); +typedef int (*HPMHOOK_post_status_change_clear_buffs) (int retVal___, struct block_list *bl, int type); +typedef void (*HPMHOOK_pre_status_calc_bl_) (struct block_list **bl, enum scb_flag *flag, enum e_status_calc_opt *opt); +typedef void (*HPMHOOK_post_status_calc_bl_) (struct block_list *bl, enum scb_flag flag, enum e_status_calc_opt opt); +typedef int (*HPMHOOK_pre_status_calc_mob_) (struct mob_data **md, enum e_status_calc_opt *opt); +typedef int (*HPMHOOK_post_status_calc_mob_) (int retVal___, struct mob_data *md, enum e_status_calc_opt opt); +typedef int (*HPMHOOK_pre_status_calc_pet_) (struct pet_data **pd, enum e_status_calc_opt *opt); +typedef int (*HPMHOOK_post_status_calc_pet_) (int retVal___, struct pet_data *pd, enum e_status_calc_opt opt); +typedef int (*HPMHOOK_pre_status_calc_pc_) (struct map_session_data **sd, enum e_status_calc_opt *opt); +typedef int (*HPMHOOK_post_status_calc_pc_) (int retVal___, struct map_session_data *sd, enum e_status_calc_opt opt); +typedef void (*HPMHOOK_pre_status_calc_pc_additional) (struct map_session_data **sd, enum e_status_calc_opt *opt); +typedef void (*HPMHOOK_post_status_calc_pc_additional) (struct map_session_data *sd, enum e_status_calc_opt opt); +typedef int (*HPMHOOK_pre_status_calc_homunculus_) (struct homun_data **hd, enum e_status_calc_opt *opt); +typedef int (*HPMHOOK_post_status_calc_homunculus_) (int retVal___, struct homun_data *hd, enum e_status_calc_opt opt); +typedef int (*HPMHOOK_pre_status_calc_mercenary_) (struct mercenary_data **md, enum e_status_calc_opt *opt); +typedef int (*HPMHOOK_post_status_calc_mercenary_) (int retVal___, struct mercenary_data *md, enum e_status_calc_opt opt); +typedef int (*HPMHOOK_pre_status_calc_elemental_) (struct elemental_data **ed, enum e_status_calc_opt *opt); +typedef int (*HPMHOOK_post_status_calc_elemental_) (int retVal___, struct elemental_data *ed, enum e_status_calc_opt opt); +typedef void (*HPMHOOK_pre_status_calc_misc) (struct block_list **bl, struct status_data **st, int *level); +typedef void (*HPMHOOK_post_status_calc_misc) (struct block_list *bl, struct status_data *st, int level); +typedef void (*HPMHOOK_pre_status_calc_regen) (struct block_list **bl, struct status_data **st, struct regen_data **regen); +typedef void (*HPMHOOK_post_status_calc_regen) (struct block_list *bl, struct status_data *st, struct regen_data *regen); +typedef void (*HPMHOOK_pre_status_calc_regen_rate) (struct block_list **bl, struct regen_data **regen, struct status_change **sc); +typedef void (*HPMHOOK_post_status_calc_regen_rate) (struct block_list *bl, struct regen_data *regen, struct status_change *sc); +typedef int (*HPMHOOK_pre_status_check_skilluse) (struct block_list **src, struct block_list **target, uint16 *skill_id, int *flag); +typedef int (*HPMHOOK_post_status_check_skilluse) (int retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, int flag); +typedef int (*HPMHOOK_pre_status_check_visibility) (struct block_list **src, struct block_list **target); +typedef int (*HPMHOOK_post_status_check_visibility) (int retVal___, struct block_list *src, struct block_list *target); +typedef int (*HPMHOOK_pre_status_change_spread) (struct block_list **src, struct block_list **bl); +typedef int (*HPMHOOK_post_status_change_spread) (int retVal___, struct block_list *src, struct block_list *bl); +typedef defType (*HPMHOOK_pre_status_calc_def) (struct block_list **bl, struct status_change **sc, int *def, bool *viewable); +typedef defType (*HPMHOOK_post_status_calc_def) (defType retVal___, struct block_list *bl, struct status_change *sc, int def, bool viewable); +typedef short (*HPMHOOK_pre_status_calc_def2) (struct block_list **bl, struct status_change **sc, int *def2, bool *viewable); +typedef short (*HPMHOOK_post_status_calc_def2) (short retVal___, struct block_list *bl, struct status_change *sc, int def2, bool viewable); +typedef defType (*HPMHOOK_pre_status_calc_mdef) (struct block_list **bl, struct status_change **sc, int *mdef, bool *viewable); +typedef defType (*HPMHOOK_post_status_calc_mdef) (defType retVal___, struct block_list *bl, struct status_change *sc, int mdef, bool viewable); +typedef short (*HPMHOOK_pre_status_calc_mdef2) (struct block_list **bl, struct status_change **sc, int *mdef2, bool *viewable); +typedef short (*HPMHOOK_post_status_calc_mdef2) (short retVal___, struct block_list *bl, struct status_change *sc, int mdef2, bool viewable); +typedef unsigned short (*HPMHOOK_pre_status_calc_batk) (struct block_list **bl, struct status_change **sc, int *batk, bool *viewable); +typedef unsigned short (*HPMHOOK_post_status_calc_batk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int batk, bool viewable); +typedef unsigned short (*HPMHOOK_pre_status_base_matk) (struct block_list **bl, const struct status_data **st, int *level); +typedef unsigned short (*HPMHOOK_post_status_base_matk) (unsigned short retVal___, struct block_list *bl, const struct status_data *st, int level); +typedef int (*HPMHOOK_pre_status_get_weapon_atk) (struct block_list **src, struct weapon_atk **watk, int *flag); +typedef int (*HPMHOOK_post_status_get_weapon_atk) (int retVal___, struct block_list *src, struct weapon_atk *watk, int flag); +typedef int (*HPMHOOK_pre_status_get_total_mdef) (struct block_list **src); +typedef int (*HPMHOOK_post_status_get_total_mdef) (int retVal___, struct block_list *src); +typedef int (*HPMHOOK_pre_status_get_total_def) (struct block_list **src); +typedef int (*HPMHOOK_post_status_get_total_def) (int retVal___, struct block_list *src); +typedef int (*HPMHOOK_pre_status_get_matk) (struct block_list **src, int *flag); +typedef int (*HPMHOOK_post_status_get_matk) (int retVal___, struct block_list *src, int flag); +typedef void (*HPMHOOK_pre_status_update_matk) (struct block_list **bl); +typedef void (*HPMHOOK_post_status_update_matk) (struct block_list *bl); +typedef int (*HPMHOOK_pre_status_readdb) (void); +typedef int (*HPMHOOK_post_status_readdb) (int retVal___); +typedef void (*HPMHOOK_pre_status_initChangeTables) (void); +typedef void (*HPMHOOK_post_status_initChangeTables) (void); +typedef void (*HPMHOOK_pre_status_initDummyData) (void); +typedef void (*HPMHOOK_post_status_initDummyData) (void); +typedef int (*HPMHOOK_pre_status_base_amotion_pc) (struct map_session_data **sd, struct status_data **st); +typedef int (*HPMHOOK_post_status_base_amotion_pc) (int retVal___, struct map_session_data *sd, struct status_data *st); +typedef unsigned short (*HPMHOOK_pre_status_base_atk) (const struct block_list **bl, const struct status_data **st); +typedef unsigned short (*HPMHOOK_post_status_base_atk) (unsigned short retVal___, const struct block_list *bl, const struct status_data *st); +typedef unsigned int (*HPMHOOK_pre_status_get_base_maxhp) (const struct map_session_data **sd, const struct status_data **st); +typedef unsigned int (*HPMHOOK_post_status_get_base_maxhp) (unsigned int retVal___, const struct map_session_data *sd, const struct status_data *st); +typedef unsigned int (*HPMHOOK_pre_status_get_base_maxsp) (const struct map_session_data **sd, const struct status_data **st); +typedef unsigned int (*HPMHOOK_post_status_get_base_maxsp) (unsigned int retVal___, const struct map_session_data *sd, const struct status_data *st); +typedef int (*HPMHOOK_pre_status_calc_npc_) (struct npc_data **nd, enum e_status_calc_opt *opt); +typedef int (*HPMHOOK_post_status_calc_npc_) (int retVal___, struct npc_data *nd, enum e_status_calc_opt opt); +typedef unsigned short (*HPMHOOK_pre_status_calc_str) (struct block_list **bl, struct status_change **sc, int *str); +typedef unsigned short (*HPMHOOK_post_status_calc_str) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int str); +typedef unsigned short (*HPMHOOK_pre_status_calc_agi) (struct block_list **bl, struct status_change **sc, int *agi); +typedef unsigned short (*HPMHOOK_post_status_calc_agi) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int agi); +typedef unsigned short (*HPMHOOK_pre_status_calc_vit) (struct block_list **bl, struct status_change **sc, int *vit); +typedef unsigned short (*HPMHOOK_post_status_calc_vit) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int vit); +typedef unsigned short (*HPMHOOK_pre_status_calc_int) (struct block_list **bl, struct status_change **sc, int *int_); +typedef unsigned short (*HPMHOOK_post_status_calc_int) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int int_); +typedef unsigned short (*HPMHOOK_pre_status_calc_dex) (struct block_list **bl, struct status_change **sc, int *dex); +typedef unsigned short (*HPMHOOK_post_status_calc_dex) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int dex); +typedef unsigned short (*HPMHOOK_pre_status_calc_luk) (struct block_list **bl, struct status_change **sc, int *luk); +typedef unsigned short (*HPMHOOK_post_status_calc_luk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int luk); +typedef unsigned short (*HPMHOOK_pre_status_calc_watk) (struct block_list **bl, struct status_change **sc, int *watk, bool *viewable); +typedef unsigned short (*HPMHOOK_post_status_calc_watk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int watk, bool viewable); +typedef unsigned short (*HPMHOOK_pre_status_calc_matk) (struct block_list **bl, struct status_change **sc, int *matk, bool *viewable); +typedef unsigned short (*HPMHOOK_post_status_calc_matk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int matk, bool viewable); +typedef signed short (*HPMHOOK_pre_status_calc_hit) (struct block_list **bl, struct status_change **sc, int *hit, bool *viewable); +typedef signed short (*HPMHOOK_post_status_calc_hit) (signed short retVal___, struct block_list *bl, struct status_change *sc, int hit, bool viewable); +typedef signed short (*HPMHOOK_pre_status_calc_critical) (struct block_list **bl, struct status_change **sc, int *critical, bool *viewable); +typedef signed short (*HPMHOOK_post_status_calc_critical) (signed short retVal___, struct block_list *bl, struct status_change *sc, int critical, bool viewable); +typedef signed short (*HPMHOOK_pre_status_calc_flee) (struct block_list **bl, struct status_change **sc, int *flee, bool *viewable); +typedef signed short (*HPMHOOK_post_status_calc_flee) (signed short retVal___, struct block_list *bl, struct status_change *sc, int flee, bool viewable); +typedef signed short (*HPMHOOK_pre_status_calc_flee2) (struct block_list **bl, struct status_change **sc, int *flee2, bool *viewable); +typedef signed short (*HPMHOOK_post_status_calc_flee2) (signed short retVal___, struct block_list *bl, struct status_change *sc, int flee2, bool viewable); +typedef unsigned short (*HPMHOOK_pre_status_calc_speed) (struct block_list **bl, struct status_change **sc, int *speed); +typedef unsigned short (*HPMHOOK_post_status_calc_speed) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int speed); +typedef short (*HPMHOOK_pre_status_calc_aspd_rate) (struct block_list **bl, struct status_change **sc, int *aspd_rate); +typedef short (*HPMHOOK_post_status_calc_aspd_rate) (short retVal___, struct block_list *bl, struct status_change *sc, int aspd_rate); +typedef unsigned short (*HPMHOOK_pre_status_calc_dmotion) (struct block_list **bl, struct status_change **sc, int *dmotion); +typedef unsigned short (*HPMHOOK_post_status_calc_dmotion) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int dmotion); +typedef short (*HPMHOOK_pre_status_calc_aspd) (struct block_list **bl, struct status_change **sc, short *flag); +typedef short (*HPMHOOK_post_status_calc_aspd) (short retVal___, struct block_list *bl, struct status_change *sc, short flag); +typedef short (*HPMHOOK_pre_status_calc_fix_aspd) (struct block_list **bl, struct status_change **sc, int *aspd); +typedef short (*HPMHOOK_post_status_calc_fix_aspd) (short retVal___, struct block_list *bl, struct status_change *sc, int aspd); +typedef unsigned int (*HPMHOOK_pre_status_calc_maxhp) (struct block_list **bl, struct status_change **sc, uint64 *maxhp); +typedef unsigned int (*HPMHOOK_post_status_calc_maxhp) (unsigned int retVal___, struct block_list *bl, struct status_change *sc, uint64 maxhp); +typedef unsigned int (*HPMHOOK_pre_status_calc_maxsp) (struct block_list **bl, struct status_change **sc, unsigned int *maxsp); +typedef unsigned int (*HPMHOOK_post_status_calc_maxsp) (unsigned int retVal___, struct block_list *bl, struct status_change *sc, unsigned int maxsp); +typedef unsigned char (*HPMHOOK_pre_status_calc_element) (struct block_list **bl, struct status_change **sc, int *element); +typedef unsigned char (*HPMHOOK_post_status_calc_element) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int element); +typedef unsigned char (*HPMHOOK_pre_status_calc_element_lv) (struct block_list **bl, struct status_change **sc, int *lv); +typedef unsigned char (*HPMHOOK_post_status_calc_element_lv) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int lv); +typedef uint32 (*HPMHOOK_pre_status_calc_mode) (const struct block_list **bl, const struct status_change **sc, uint32 *mode); +typedef uint32 (*HPMHOOK_post_status_calc_mode) (uint32 retVal___, const struct block_list *bl, const struct status_change *sc, uint32 mode); +typedef unsigned short (*HPMHOOK_pre_status_calc_ematk) (struct block_list **bl, struct status_change **sc, int *matk); +typedef unsigned short (*HPMHOOK_post_status_calc_ematk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int matk); +typedef void (*HPMHOOK_pre_status_calc_bl_main) (struct block_list **bl, int *flag); +typedef void (*HPMHOOK_post_status_calc_bl_main) (struct block_list *bl, int flag); +typedef void (*HPMHOOK_pre_status_display_add) (struct map_session_data **sd, enum sc_type *type, int *dval1, int *dval2, int *dval3); +typedef void (*HPMHOOK_post_status_display_add) (struct map_session_data *sd, enum sc_type type, int dval1, int dval2, int dval3); +typedef void (*HPMHOOK_pre_status_display_remove) (struct map_session_data **sd, enum sc_type *type); +typedef void (*HPMHOOK_post_status_display_remove) (struct map_session_data *sd, enum sc_type type); +typedef int (*HPMHOOK_pre_status_natural_heal) (struct block_list **bl, va_list args); +typedef int (*HPMHOOK_post_status_natural_heal) (int retVal___, struct block_list *bl, va_list args); +typedef int (*HPMHOOK_pre_status_natural_heal_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_status_natural_heal_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef bool (*HPMHOOK_pre_status_readdb_job2) (char **fields[], int *columns, int *current); +typedef bool (*HPMHOOK_post_status_readdb_job2) (bool retVal___, char *fields[], int columns, int current); +typedef bool (*HPMHOOK_pre_status_readdb_sizefix) (char **fields[], int *columns, int *current); +typedef bool (*HPMHOOK_post_status_readdb_sizefix) (bool retVal___, char *fields[], int columns, int current); +typedef int (*HPMHOOK_pre_status_readdb_refine_libconfig) (const char **filename); +typedef int (*HPMHOOK_post_status_readdb_refine_libconfig) (int retVal___, const char *filename); +typedef int (*HPMHOOK_pre_status_readdb_refine_libconfig_sub) (struct config_setting_t **r, const char **name, const char **source); +typedef int (*HPMHOOK_post_status_readdb_refine_libconfig_sub) (int retVal___, struct config_setting_t *r, const char *name, const char *source); +typedef bool (*HPMHOOK_pre_status_readdb_scconfig) (char **fields[], int *columns, int *current); +typedef bool (*HPMHOOK_post_status_readdb_scconfig) (bool retVal___, char *fields[], int columns, int current); +typedef void (*HPMHOOK_pre_status_read_job_db) (void); +typedef void (*HPMHOOK_post_status_read_job_db) (void); +typedef void (*HPMHOOK_pre_status_read_job_db_sub) (int *idx, const char **name, struct config_setting_t **jdb); +typedef void (*HPMHOOK_post_status_read_job_db_sub) (int idx, const char *name, struct config_setting_t *jdb); +#endif // MAP_STATUS_H +#ifdef MAP_STORAGE_H /* storage */ +typedef void (*HPMHOOK_pre_storage_reconnect) (void); +typedef void (*HPMHOOK_post_storage_reconnect) (void); +typedef int (*HPMHOOK_pre_storage_delitem) (struct map_session_data **sd, int *n, int *amount); +typedef int (*HPMHOOK_post_storage_delitem) (int retVal___, struct map_session_data *sd, int n, int amount); +typedef int (*HPMHOOK_pre_storage_open) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_storage_open) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_storage_add) (struct map_session_data **sd, int *index, int *amount); +typedef int (*HPMHOOK_post_storage_add) (int retVal___, struct map_session_data *sd, int index, int amount); +typedef int (*HPMHOOK_pre_storage_get) (struct map_session_data **sd, int *index, int *amount); +typedef int (*HPMHOOK_post_storage_get) (int retVal___, struct map_session_data *sd, int index, int amount); +typedef int (*HPMHOOK_pre_storage_additem) (struct map_session_data **sd, struct item **item_data, int *amount); +typedef int (*HPMHOOK_post_storage_additem) (int retVal___, struct map_session_data *sd, struct item *item_data, int amount); +typedef int (*HPMHOOK_pre_storage_addfromcart) (struct map_session_data **sd, int *index, int *amount); +typedef int (*HPMHOOK_post_storage_addfromcart) (int retVal___, struct map_session_data *sd, int index, int amount); +typedef int (*HPMHOOK_pre_storage_gettocart) (struct map_session_data **sd, int *index, int *amount); +typedef int (*HPMHOOK_post_storage_gettocart) (int retVal___, struct map_session_data *sd, int index, int amount); +typedef void (*HPMHOOK_pre_storage_close) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_storage_close) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_storage_pc_quit) (struct map_session_data **sd, int *flag); +typedef void (*HPMHOOK_post_storage_pc_quit) (struct map_session_data *sd, int flag); +typedef int (*HPMHOOK_pre_storage_comp_item) (const void **i1_, const void **i2_); +typedef int (*HPMHOOK_post_storage_comp_item) (int retVal___, const void *i1_, const void *i2_); +typedef void (*HPMHOOK_pre_storage_sortitem) (struct item **items, unsigned int *size); +typedef void (*HPMHOOK_post_storage_sortitem) (struct item *items, unsigned int size); +typedef int (*HPMHOOK_pre_storage_reconnect_sub) (union DBKey *key, struct DBData **data, va_list ap); +typedef int (*HPMHOOK_post_storage_reconnect_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); +#endif // MAP_STORAGE_H +#ifdef COMMON_STRLIB_H /* StrBuf */ +typedef StringBuf* (*HPMHOOK_pre_StrBuf_Malloc) (void); +typedef StringBuf* (*HPMHOOK_post_StrBuf_Malloc) (StringBuf* retVal___); +typedef void (*HPMHOOK_pre_StrBuf_Init) (StringBuf **self); +typedef void (*HPMHOOK_post_StrBuf_Init) (StringBuf *self); +typedef int (*HPMHOOK_pre_StrBuf_Vprintf) (StringBuf **self, const char **fmt, va_list args); +typedef int (*HPMHOOK_post_StrBuf_Vprintf) (int retVal___, StringBuf *self, const char *fmt, va_list args); +typedef int (*HPMHOOK_pre_StrBuf_Append) (StringBuf **self, const StringBuf **sbuf); +typedef int (*HPMHOOK_post_StrBuf_Append) (int retVal___, StringBuf *self, const StringBuf *sbuf); +typedef int (*HPMHOOK_pre_StrBuf_AppendStr) (StringBuf **self, const char **str); +typedef int (*HPMHOOK_post_StrBuf_AppendStr) (int retVal___, StringBuf *self, const char *str); +typedef int (*HPMHOOK_pre_StrBuf_Length) (StringBuf **self); +typedef int (*HPMHOOK_post_StrBuf_Length) (int retVal___, StringBuf *self); +typedef char* (*HPMHOOK_pre_StrBuf_Value) (StringBuf **self); +typedef char* (*HPMHOOK_post_StrBuf_Value) (char* retVal___, StringBuf *self); +typedef void (*HPMHOOK_pre_StrBuf_Clear) (StringBuf **self); +typedef void (*HPMHOOK_post_StrBuf_Clear) (StringBuf *self); +typedef void (*HPMHOOK_pre_StrBuf_Destroy) (StringBuf **self); +typedef void (*HPMHOOK_post_StrBuf_Destroy) (StringBuf *self); +typedef void (*HPMHOOK_pre_StrBuf_Free) (StringBuf **self); +typedef void (*HPMHOOK_post_StrBuf_Free) (StringBuf *self); +#endif // COMMON_STRLIB_H +#ifdef COMMON_STRLIB_H /* strlib */ +typedef char* (*HPMHOOK_pre_strlib_jstrescape) (char **pt); +typedef char* (*HPMHOOK_post_strlib_jstrescape) (char* retVal___, char *pt); +typedef char* (*HPMHOOK_pre_strlib_jstrescapecpy) (char **pt, const char **spt); +typedef char* (*HPMHOOK_post_strlib_jstrescapecpy) (char* retVal___, char *pt, const char *spt); +typedef int (*HPMHOOK_pre_strlib_jmemescapecpy) (char **pt, const char **spt, int *size); +typedef int (*HPMHOOK_post_strlib_jmemescapecpy) (int retVal___, char *pt, const char *spt, int size); +typedef int (*HPMHOOK_pre_strlib_remove_control_chars_) (char **str); +typedef int (*HPMHOOK_post_strlib_remove_control_chars_) (int retVal___, char *str); +typedef char* (*HPMHOOK_pre_strlib_trim_) (char **str); +typedef char* (*HPMHOOK_post_strlib_trim_) (char* retVal___, char *str); +typedef char* (*HPMHOOK_pre_strlib_normalize_name_) (char **str, const char **delims); +typedef char* (*HPMHOOK_post_strlib_normalize_name_) (char* retVal___, char *str, const char *delims); +typedef const char* (*HPMHOOK_pre_strlib_stristr_) (const char **haystack, const char **needle); +typedef const char* (*HPMHOOK_post_strlib_stristr_) (const char* retVal___, const char *haystack, const char *needle); +typedef size_t (*HPMHOOK_pre_strlib_strnlen_) (const char **string, size_t *maxlen); +typedef size_t (*HPMHOOK_post_strlib_strnlen_) (size_t retVal___, const char *string, size_t maxlen); +typedef char* (*HPMHOOK_pre_strlib_strtok_r_) (char **s1, const char **s2, char ***lasts); +typedef char* (*HPMHOOK_post_strlib_strtok_r_) (char* retVal___, char *s1, const char *s2, char **lasts); +typedef int (*HPMHOOK_pre_strlib_e_mail_check_) (char **email); +typedef int (*HPMHOOK_post_strlib_e_mail_check_) (int retVal___, char *email); +typedef int (*HPMHOOK_pre_strlib_config_switch_) (const char **str); +typedef int (*HPMHOOK_post_strlib_config_switch_) (int retVal___, const char *str); +typedef char* (*HPMHOOK_pre_strlib_safestrncpy_) (char **dst, const char **src, size_t *n); +typedef char* (*HPMHOOK_post_strlib_safestrncpy_) (char* retVal___, char *dst, const char *src, size_t n); +typedef size_t (*HPMHOOK_pre_strlib_safestrnlen_) (const char **string, size_t *maxlen); +typedef size_t (*HPMHOOK_post_strlib_safestrnlen_) (size_t retVal___, const char *string, size_t maxlen); +typedef int (*HPMHOOK_pre_strlib_strline_) (const char **str, size_t *pos); +typedef int (*HPMHOOK_post_strlib_strline_) (int retVal___, const char *str, size_t pos); +typedef bool (*HPMHOOK_pre_strlib_bin2hex_) (char **output, const unsigned char **input, size_t *count); +typedef bool (*HPMHOOK_post_strlib_bin2hex_) (bool retVal___, char *output, const unsigned char *input, size_t count); +#endif // COMMON_STRLIB_H +#ifdef COMMON_STRLIB_H /* sv */ +typedef int (*HPMHOOK_pre_sv_parse_next) (struct s_svstate **svstate); +typedef int (*HPMHOOK_post_sv_parse_next) (int retVal___, struct s_svstate *svstate); +typedef int (*HPMHOOK_pre_sv_parse) (const char **str, int *len, int *startoff, char *delim, int **out_pos, int *npos, enum e_svopt *opt); +typedef int (*HPMHOOK_post_sv_parse) (int retVal___, const char *str, int len, int startoff, char delim, int *out_pos, int npos, enum e_svopt opt); +typedef int (*HPMHOOK_pre_sv_split) (char **str, int *len, int *startoff, char *delim, char ***out_fields, int *nfields, enum e_svopt *opt); +typedef int (*HPMHOOK_post_sv_split) (int retVal___, char *str, int len, int startoff, char delim, char **out_fields, int nfields, enum e_svopt opt); +typedef size_t (*HPMHOOK_pre_sv_escape_c) (char **out_dest, const char **src, size_t *len, const char **escapes); +typedef size_t (*HPMHOOK_post_sv_escape_c) (size_t retVal___, char *out_dest, const char *src, size_t len, const char *escapes); +typedef size_t (*HPMHOOK_pre_sv_unescape_c) (char **out_dest, const char **src, size_t *len); +typedef size_t (*HPMHOOK_post_sv_unescape_c) (size_t retVal___, char *out_dest, const char *src, size_t len); +typedef const char* (*HPMHOOK_pre_sv_skip_escaped_c) (const char **p); +typedef const char* (*HPMHOOK_post_sv_skip_escaped_c) (const char* retVal___, const char *p); +typedef bool (*HPMHOOK_pre_sv_readdb) (const char **directory, const char **filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( **parseproc ) (char *fields[], int columns, int current)); +typedef bool (*HPMHOOK_post_sv_readdb) (bool retVal___, const char *directory, const char *filename, char delim, int mincols, int maxcols, int maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); +#endif // COMMON_STRLIB_H +#ifdef COMMON_SYSINFO_H /* sysinfo */ +typedef int (*HPMHOOK_pre_sysinfo_getpagesize) (void); +typedef int (*HPMHOOK_post_sysinfo_getpagesize) (int retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_platform) (void); +typedef const char* (*HPMHOOK_post_sysinfo_platform) (const char* retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_osversion) (void); +typedef const char* (*HPMHOOK_post_sysinfo_osversion) (const char* retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_cpu) (void); +typedef const char* (*HPMHOOK_post_sysinfo_cpu) (const char* retVal___); +typedef int (*HPMHOOK_pre_sysinfo_cpucores) (void); +typedef int (*HPMHOOK_post_sysinfo_cpucores) (int retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_arch) (void); +typedef const char* (*HPMHOOK_post_sysinfo_arch) (const char* retVal___); +typedef bool (*HPMHOOK_pre_sysinfo_is64bit) (void); +typedef bool (*HPMHOOK_post_sysinfo_is64bit) (bool retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_compiler) (void); +typedef const char* (*HPMHOOK_post_sysinfo_compiler) (const char* retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_cflags) (void); +typedef const char* (*HPMHOOK_post_sysinfo_cflags) (const char* retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_time) (void); +typedef const char* (*HPMHOOK_post_sysinfo_time) (const char* retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_vcstype) (void); +typedef const char* (*HPMHOOK_post_sysinfo_vcstype) (const char* retVal___); +typedef int (*HPMHOOK_pre_sysinfo_vcstypeid) (void); +typedef int (*HPMHOOK_post_sysinfo_vcstypeid) (int retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_vcsrevision_src) (void); +typedef const char* (*HPMHOOK_post_sysinfo_vcsrevision_src) (const char* retVal___); +typedef const char* (*HPMHOOK_pre_sysinfo_vcsrevision_scripts) (void); +typedef const char* (*HPMHOOK_post_sysinfo_vcsrevision_scripts) (const char* retVal___); +typedef void (*HPMHOOK_pre_sysinfo_vcsrevision_reload) (void); +typedef void (*HPMHOOK_post_sysinfo_vcsrevision_reload) (void); +typedef bool (*HPMHOOK_pre_sysinfo_is_superuser) (void); +typedef bool (*HPMHOOK_post_sysinfo_is_superuser) (bool retVal___); +typedef void (*HPMHOOK_pre_sysinfo_init) (void); +typedef void (*HPMHOOK_post_sysinfo_init) (void); +typedef void (*HPMHOOK_pre_sysinfo_final) (void); +typedef void (*HPMHOOK_post_sysinfo_final) (void); +#endif // COMMON_SYSINFO_H +#ifdef COMMON_TIMER_H /* timer */ +typedef int64 (*HPMHOOK_pre_timer_gettick) (void); +typedef int64 (*HPMHOOK_post_timer_gettick) (int64 retVal___); +typedef int64 (*HPMHOOK_pre_timer_gettick_nocache) (void); +typedef int64 (*HPMHOOK_post_timer_gettick_nocache) (int64 retVal___); +typedef int (*HPMHOOK_pre_timer_add) (int64 *tick, TimerFunc *func, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_timer_add) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data); +typedef int (*HPMHOOK_pre_timer_add_interval) (int64 *tick, TimerFunc *func, int *id, intptr_t *data, int *interval); +typedef int (*HPMHOOK_post_timer_add_interval) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data, int interval); +typedef const struct TimerData* (*HPMHOOK_pre_timer_get) (int *tid); +typedef const struct TimerData* (*HPMHOOK_post_timer_get) (const struct TimerData* retVal___, int tid); +typedef int (*HPMHOOK_pre_timer_delete) (int *tid, TimerFunc *func); +typedef int (*HPMHOOK_post_timer_delete) (int retVal___, int tid, TimerFunc func); +typedef int64 (*HPMHOOK_pre_timer_addtick) (int *tid, int64 *tick); +typedef int64 (*HPMHOOK_post_timer_addtick) (int64 retVal___, int tid, int64 tick); +typedef int64 (*HPMHOOK_pre_timer_settick) (int *tid, int64 *tick); +typedef int64 (*HPMHOOK_post_timer_settick) (int64 retVal___, int tid, int64 tick); +typedef int (*HPMHOOK_pre_timer_add_func_list) (TimerFunc *func, char **name); +typedef int (*HPMHOOK_post_timer_add_func_list) (int retVal___, TimerFunc func, char *name); +typedef unsigned long (*HPMHOOK_pre_timer_get_uptime) (void); +typedef unsigned long (*HPMHOOK_post_timer_get_uptime) (unsigned long retVal___); +typedef int (*HPMHOOK_pre_timer_perform) (int64 *tick); +typedef int (*HPMHOOK_post_timer_perform) (int retVal___, int64 tick); +typedef void (*HPMHOOK_pre_timer_init) (void); +typedef void (*HPMHOOK_post_timer_init) (void); +typedef void (*HPMHOOK_pre_timer_final) (void); +typedef void (*HPMHOOK_post_timer_final) (void); +#endif // COMMON_TIMER_H +#ifdef MAP_TRADE_H /* trade */ +typedef void (*HPMHOOK_pre_trade_request) (struct map_session_data **sd, struct map_session_data **target_sd); +typedef void (*HPMHOOK_post_trade_request) (struct map_session_data *sd, struct map_session_data *target_sd); +typedef void (*HPMHOOK_pre_trade_ack) (struct map_session_data **sd, int *type); +typedef void (*HPMHOOK_post_trade_ack) (struct map_session_data *sd, int type); +typedef int (*HPMHOOK_pre_trade_check_impossible) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_trade_check_impossible) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_trade_check) (struct map_session_data **sd, struct map_session_data **tsd); +typedef int (*HPMHOOK_post_trade_check) (int retVal___, struct map_session_data *sd, struct map_session_data *tsd); +typedef void (*HPMHOOK_pre_trade_additem) (struct map_session_data **sd, short *index, short *amount); +typedef void (*HPMHOOK_post_trade_additem) (struct map_session_data *sd, short index, short amount); +typedef void (*HPMHOOK_pre_trade_addzeny) (struct map_session_data **sd, int *amount); +typedef void (*HPMHOOK_post_trade_addzeny) (struct map_session_data *sd, int amount); +typedef void (*HPMHOOK_pre_trade_ok) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_trade_ok) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_trade_cancel) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_trade_cancel) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_trade_commit) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_trade_commit) (struct map_session_data *sd); +#endif // MAP_TRADE_H +#ifdef MAP_UNIT_H /* unit */ +typedef int (*HPMHOOK_pre_unit_init) (bool *minimal); +typedef int (*HPMHOOK_post_unit_init) (int retVal___, bool minimal); +typedef int (*HPMHOOK_pre_unit_final) (void); +typedef int (*HPMHOOK_post_unit_final) (int retVal___); +typedef struct unit_data* (*HPMHOOK_pre_unit_bl2ud) (struct block_list **bl); +typedef struct unit_data* (*HPMHOOK_post_unit_bl2ud) (struct unit_data* retVal___, struct block_list *bl); +typedef struct unit_data* (*HPMHOOK_pre_unit_bl2ud2) (struct block_list **bl); +typedef struct unit_data* (*HPMHOOK_post_unit_bl2ud2) (struct unit_data* retVal___, struct block_list *bl); +typedef void (*HPMHOOK_pre_unit_init_ud) (struct unit_data **ud); +typedef void (*HPMHOOK_post_unit_init_ud) (struct unit_data *ud); +typedef int (*HPMHOOK_pre_unit_attack_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_unit_attack_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_unit_walktoxy_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_unit_walktoxy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_unit_walktoxy_sub) (struct block_list **bl); +typedef int (*HPMHOOK_post_unit_walktoxy_sub) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_unit_delay_walktoxy_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_unit_delay_walktoxy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_unit_walktoxy) (struct block_list **bl, short *x, short *y, int *flag); +typedef int (*HPMHOOK_post_unit_walktoxy) (int retVal___, struct block_list *bl, short x, short y, int flag); +typedef int (*HPMHOOK_pre_unit_walktobl_sub) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_unit_walktobl_sub) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_unit_walktobl) (struct block_list **bl, struct block_list **tbl, int *range, int *flag); +typedef int (*HPMHOOK_post_unit_walktobl) (int retVal___, struct block_list *bl, struct block_list *tbl, int range, int flag); +typedef bool (*HPMHOOK_pre_unit_run) (struct block_list **bl, struct map_session_data **sd, enum sc_type *type); +typedef bool (*HPMHOOK_post_unit_run) (bool retVal___, struct block_list *bl, struct map_session_data *sd, enum sc_type type); +typedef void (*HPMHOOK_pre_unit_run_hit) (struct block_list **bl, struct status_change **sc, struct map_session_data **sd, enum sc_type *type); +typedef void (*HPMHOOK_post_unit_run_hit) (struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type type); +typedef int (*HPMHOOK_pre_unit_escape) (struct block_list **bl, struct block_list **target, short *dist); +typedef int (*HPMHOOK_post_unit_escape) (int retVal___, struct block_list *bl, struct block_list *target, short dist); +typedef int (*HPMHOOK_pre_unit_movepos) (struct block_list **bl, short *dst_x, short *dst_y, int *easy, bool *checkpath); +typedef int (*HPMHOOK_post_unit_movepos) (int retVal___, struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath); +typedef int (*HPMHOOK_pre_unit_setdir) (struct block_list **bl, unsigned char *dir); +typedef int (*HPMHOOK_post_unit_setdir) (int retVal___, struct block_list *bl, unsigned char dir); +typedef uint8 (*HPMHOOK_pre_unit_getdir) (struct block_list **bl); +typedef uint8 (*HPMHOOK_post_unit_getdir) (uint8 retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_unit_blown) (struct block_list **bl, int *dx, int *dy, int *count, int *flag); +typedef int (*HPMHOOK_post_unit_blown) (int retVal___, struct block_list *bl, int dx, int dy, int count, int flag); +typedef int (*HPMHOOK_pre_unit_warp) (struct block_list **bl, short *m, short *x, short *y, clr_type *type); +typedef int (*HPMHOOK_post_unit_warp) (int retVal___, struct block_list *bl, short m, short x, short y, clr_type type); +typedef int (*HPMHOOK_pre_unit_stop_walking) (struct block_list **bl, int *type); +typedef int (*HPMHOOK_post_unit_stop_walking) (int retVal___, struct block_list *bl, int type); +typedef int (*HPMHOOK_pre_unit_skilluse_id) (struct block_list **src, int *target_id, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_unit_skilluse_id) (int retVal___, struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_unit_step_timer) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_unit_step_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef void (*HPMHOOK_pre_unit_stop_stepaction) (struct block_list **bl); +typedef void (*HPMHOOK_post_unit_stop_stepaction) (struct block_list *bl); +typedef int (*HPMHOOK_pre_unit_is_walking) (struct block_list **bl); +typedef int (*HPMHOOK_post_unit_is_walking) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_unit_can_move) (struct block_list **bl); +typedef int (*HPMHOOK_post_unit_can_move) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_unit_resume_running) (int *tid, int64 *tick, int *id, intptr_t *data); +typedef int (*HPMHOOK_post_unit_resume_running) (int retVal___, int tid, int64 tick, int id, intptr_t data); +typedef int (*HPMHOOK_pre_unit_set_walkdelay) (struct block_list **bl, int64 *tick, int *delay, int *type); +typedef int (*HPMHOOK_post_unit_set_walkdelay) (int retVal___, struct block_list *bl, int64 tick, int delay, int type); +typedef int (*HPMHOOK_pre_unit_skilluse_id2) (struct block_list **src, int *target_id, uint16 *skill_id, uint16 *skill_lv, int *casttime, int *castcancel); +typedef int (*HPMHOOK_post_unit_skilluse_id2) (int retVal___, struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel); +typedef int (*HPMHOOK_pre_unit_skilluse_pos) (struct block_list **src, short *skill_x, short *skill_y, uint16 *skill_id, uint16 *skill_lv); +typedef int (*HPMHOOK_post_unit_skilluse_pos) (int retVal___, struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv); +typedef int (*HPMHOOK_pre_unit_skilluse_pos2) (struct block_list **src, short *skill_x, short *skill_y, uint16 *skill_id, uint16 *skill_lv, int *casttime, int *castcancel); +typedef int (*HPMHOOK_post_unit_skilluse_pos2) (int retVal___, struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel); +typedef int (*HPMHOOK_pre_unit_set_target) (struct unit_data **ud, int *target_id); +typedef int (*HPMHOOK_post_unit_set_target) (int retVal___, struct unit_data *ud, int target_id); +typedef void (*HPMHOOK_pre_unit_stop_attack) (struct block_list **bl); +typedef void (*HPMHOOK_post_unit_stop_attack) (struct block_list *bl); +typedef int (*HPMHOOK_pre_unit_unattackable) (struct block_list **bl); +typedef int (*HPMHOOK_post_unit_unattackable) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_unit_attack) (struct block_list **src, int *target_id, int *continuous); +typedef int (*HPMHOOK_post_unit_attack) (int retVal___, struct block_list *src, int target_id, int continuous); +typedef int (*HPMHOOK_pre_unit_cancel_combo) (struct block_list **bl); +typedef int (*HPMHOOK_post_unit_cancel_combo) (int retVal___, struct block_list *bl); +typedef bool (*HPMHOOK_pre_unit_can_reach_pos) (struct block_list **bl, int *x, int *y, int *easy); +typedef bool (*HPMHOOK_post_unit_can_reach_pos) (bool retVal___, struct block_list *bl, int x, int y, int easy); +typedef bool (*HPMHOOK_pre_unit_can_reach_bl) (struct block_list **bl, struct block_list **tbl, int *range, int *easy, short **x, short **y); +typedef bool (*HPMHOOK_post_unit_can_reach_bl) (bool retVal___, struct block_list *bl, struct block_list *tbl, int range, int easy, short *x, short *y); +typedef int (*HPMHOOK_pre_unit_calc_pos) (struct block_list **bl, int *tx, int *ty, uint8 *dir); +typedef int (*HPMHOOK_post_unit_calc_pos) (int retVal___, struct block_list *bl, int tx, int ty, uint8 dir); +typedef int (*HPMHOOK_pre_unit_attack_timer_sub) (struct block_list **src, int *tid, int64 *tick); +typedef int (*HPMHOOK_post_unit_attack_timer_sub) (int retVal___, struct block_list *src, int tid, int64 tick); +typedef int (*HPMHOOK_pre_unit_skillcastcancel) (struct block_list **bl, int *type); +typedef int (*HPMHOOK_post_unit_skillcastcancel) (int retVal___, struct block_list *bl, int type); +typedef void (*HPMHOOK_pre_unit_dataset) (struct block_list **bl); +typedef void (*HPMHOOK_post_unit_dataset) (struct block_list *bl); +typedef int (*HPMHOOK_pre_unit_counttargeted) (struct block_list **bl); +typedef int (*HPMHOOK_post_unit_counttargeted) (int retVal___, struct block_list *bl); +typedef int (*HPMHOOK_pre_unit_fixdamage) (struct block_list **src, struct block_list **target, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); +typedef int (*HPMHOOK_post_unit_fixdamage) (int retVal___, struct block_list *src, struct block_list *target, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2); +typedef int (*HPMHOOK_pre_unit_changeviewsize) (struct block_list **bl, short *size); +typedef int (*HPMHOOK_post_unit_changeviewsize) (int retVal___, struct block_list *bl, short size); +typedef int (*HPMHOOK_pre_unit_remove_map) (struct block_list **bl, clr_type *clrtype, const char **file, int *line, const char **func); +typedef int (*HPMHOOK_post_unit_remove_map) (int retVal___, struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func); +typedef void (*HPMHOOK_pre_unit_remove_map_pc) (struct map_session_data **sd, clr_type *clrtype); +typedef void (*HPMHOOK_post_unit_remove_map_pc) (struct map_session_data *sd, clr_type clrtype); +typedef void (*HPMHOOK_pre_unit_free_pc) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_unit_free_pc) (struct map_session_data *sd); +typedef int (*HPMHOOK_pre_unit_free) (struct block_list **bl, clr_type *clrtype); +typedef int (*HPMHOOK_post_unit_free) (int retVal___, struct block_list *bl, clr_type clrtype); +#endif // MAP_UNIT_H +#ifdef MAP_VENDING_H /* vending */ +typedef void (*HPMHOOK_pre_vending_init) (bool *minimal); +typedef void (*HPMHOOK_post_vending_init) (bool minimal); +typedef void (*HPMHOOK_pre_vending_final) (void); +typedef void (*HPMHOOK_post_vending_final) (void); +typedef void (*HPMHOOK_pre_vending_close) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_vending_close) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_vending_open) (struct map_session_data **sd, const char **message, const uint8 **data, int *count); +typedef void (*HPMHOOK_post_vending_open) (struct map_session_data *sd, const char *message, const uint8 *data, int count); +typedef void (*HPMHOOK_pre_vending_list) (struct map_session_data **sd, unsigned int *id); +typedef void (*HPMHOOK_post_vending_list) (struct map_session_data *sd, unsigned int id); +typedef void (*HPMHOOK_pre_vending_purchase) (struct map_session_data **sd, int *aid, unsigned int *uid, const uint8 **data, int *count); +typedef void (*HPMHOOK_post_vending_purchase) (struct map_session_data *sd, int aid, unsigned int uid, const uint8 *data, int count); +typedef bool (*HPMHOOK_pre_vending_search) (struct map_session_data **sd, unsigned short *nameid); +typedef bool (*HPMHOOK_post_vending_search) (bool retVal___, struct map_session_data *sd, unsigned short nameid); +typedef bool (*HPMHOOK_pre_vending_searchall) (struct map_session_data **sd, const struct s_search_store_search **s); +typedef bool (*HPMHOOK_post_vending_searchall) (bool retVal___, struct map_session_data *sd, const struct s_search_store_search *s); +#endif // MAP_VENDING_H diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc index fbf332ffb..daa54e969 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc @@ -1,5 +1,6 @@ /** * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules * * Copyright (C) 2013-2016 Hercules Dev Team * @@ -23,11 +24,11 @@ */ struct HookingPointData HookingPoints[] = { -/* HCache */ +/* HCache_interface */ { HP_POP(HCache->init, HP_HCache_init) }, { HP_POP(HCache->check, HP_HCache_check) }, { HP_POP(HCache->open, HP_HCache_open) }, -/* chr */ +/* char_interface */ { HP_POP(chr->waiting_disconnect, HP_chr_waiting_disconnect) }, { HP_POP(chr->delete_char_sql, HP_chr_delete_char_sql) }, { HP_POP(chr->create_online_char_data, HP_chr_create_online_char_data) }, @@ -186,21 +187,21 @@ struct HookingPointData HookingPoints[] = { { HP_POP(chr->sql_config_read, HP_chr_sql_config_read) }, { HP_POP(chr->config_dispatch, HP_chr_config_dispatch) }, { HP_POP(chr->config_read, HP_chr_config_read) }, -/* cmdline */ +/* cmdline_interface */ { HP_POP(cmdline->init, HP_cmdline_init) }, { HP_POP(cmdline->final, HP_cmdline_final) }, { HP_POP(cmdline->arg_add, HP_cmdline_arg_add) }, { HP_POP(cmdline->exec, HP_cmdline_exec) }, { HP_POP(cmdline->arg_next_value, HP_cmdline_arg_next_value) }, { HP_POP(cmdline->arg_source, HP_cmdline_arg_source) }, -/* console */ +/* console_interface */ { HP_POP(console->init, HP_console_init) }, { HP_POP(console->final, HP_console_final) }, { HP_POP(console->display_title, HP_console_display_title) }, { HP_POP(console->display_gplnotice, HP_console_display_gplnotice) }, -/* core */ +/* core_interface */ { HP_POP(core->shutdown_callback, HP_core_shutdown_callback) }, -/* DB */ +/* db_interface */ { HP_POP(DB->fix_options, HP_DB_fix_options) }, { HP_POP(DB->default_cmp, HP_DB_default_cmp) }, { HP_POP(DB->default_hash, HP_DB_default_hash) }, @@ -220,11 +221,11 @@ struct HookingPointData HookingPoints[] = { { HP_POP(DB->data2ptr, HP_DB_data2ptr) }, { HP_POP(DB->init, HP_DB_init) }, { HP_POP(DB->final, HP_DB_final) }, -/* geoip */ +/* geoip_interface */ { HP_POP(geoip->getcountry, HP_geoip_getcountry) }, { HP_POP(geoip->final, HP_geoip_final) }, { HP_POP(geoip->init, HP_geoip_init) }, -/* inter_auction */ +/* inter_auction_interface */ { HP_POP(inter_auction->count, HP_inter_auction_count) }, { HP_POP(inter_auction->save, HP_inter_auction_save) }, { HP_POP(inter_auction->create, HP_inter_auction_create) }, @@ -234,11 +235,11 @@ struct HookingPointData HookingPoints[] = { { HP_POP(inter_auction->parse_frommap, HP_inter_auction_parse_frommap) }, { HP_POP(inter_auction->sql_init, HP_inter_auction_sql_init) }, { HP_POP(inter_auction->sql_final, HP_inter_auction_sql_final) }, -/* inter_elemental */ +/* inter_elemental_interface */ { HP_POP(inter_elemental->sql_init, HP_inter_elemental_sql_init) }, { HP_POP(inter_elemental->sql_final, HP_inter_elemental_sql_final) }, { HP_POP(inter_elemental->parse_frommap, HP_inter_elemental_parse_frommap) }, -/* inter_guild */ +/* inter_guild_interface */ { HP_POP(inter_guild->save_timer, HP_inter_guild_save_timer) }, { HP_POP(inter_guild->removemember_tosql, HP_inter_guild_removemember_tosql) }, { HP_POP(inter_guild->tosql, HP_inter_guild_tosql) }, @@ -261,11 +262,11 @@ struct HookingPointData HookingPoints[] = { { HP_POP(inter_guild->parse_frommap, HP_inter_guild_parse_frommap) }, { HP_POP(inter_guild->leave, HP_inter_guild_leave) }, { HP_POP(inter_guild->broken, HP_inter_guild_broken) }, -/* inter_homunculus */ +/* inter_homunculus_interface */ { HP_POP(inter_homunculus->sql_init, HP_inter_homunculus_sql_init) }, { HP_POP(inter_homunculus->sql_final, HP_inter_homunculus_sql_final) }, { HP_POP(inter_homunculus->parse_frommap, HP_inter_homunculus_parse_frommap) }, -/* inter */ +/* inter_interface */ { HP_POP(inter->msg_txt, HP_inter_msg_txt) }, { HP_POP(inter->msg_config_read, HP_inter_msg_config_read) }, { HP_POP(inter->do_final_msg, HP_inter_do_final_msg) }, @@ -282,7 +283,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(inter->check_length, HP_inter_check_length) }, { HP_POP(inter->parse_frommap, HP_inter_parse_frommap) }, { HP_POP(inter->final, HP_inter_final) }, -/* inter_mail */ +/* inter_mail_interface */ { HP_POP(inter_mail->sql_init, HP_inter_mail_sql_init) }, { HP_POP(inter_mail->sql_final, HP_inter_mail_sql_final) }, { HP_POP(inter_mail->parse_frommap, HP_inter_mail_parse_frommap) }, @@ -291,14 +292,14 @@ struct HookingPointData HookingPoints[] = { { HP_POP(inter_mail->loadmessage, HP_inter_mail_loadmessage) }, { HP_POP(inter_mail->DeleteAttach, HP_inter_mail_DeleteAttach) }, { HP_POP(inter_mail->sendmail, HP_inter_mail_sendmail) }, -/* inter_mercenary */ +/* inter_mercenary_interface */ { HP_POP(inter_mercenary->owner_fromsql, HP_inter_mercenary_owner_fromsql) }, { HP_POP(inter_mercenary->owner_tosql, HP_inter_mercenary_owner_tosql) }, { HP_POP(inter_mercenary->owner_delete, HP_inter_mercenary_owner_delete) }, { HP_POP(inter_mercenary->sql_init, HP_inter_mercenary_sql_init) }, { HP_POP(inter_mercenary->sql_final, HP_inter_mercenary_sql_final) }, { HP_POP(inter_mercenary->parse_frommap, HP_inter_mercenary_parse_frommap) }, -/* inter_party */ +/* inter_party_interface */ { HP_POP(inter_party->check_lv, HP_inter_party_check_lv) }, { HP_POP(inter_party->calc_state, HP_inter_party_calc_state) }, { HP_POP(inter_party->tosql, HP_inter_party_tosql) }, @@ -312,16 +313,16 @@ struct HookingPointData HookingPoints[] = { { HP_POP(inter_party->leave, HP_inter_party_leave) }, { HP_POP(inter_party->CharOnline, HP_inter_party_CharOnline) }, { HP_POP(inter_party->CharOffline, HP_inter_party_CharOffline) }, -/* inter_pet */ +/* inter_pet_interface */ { HP_POP(inter_pet->tosql, HP_inter_pet_tosql) }, { HP_POP(inter_pet->fromsql, HP_inter_pet_fromsql) }, { HP_POP(inter_pet->sql_init, HP_inter_pet_sql_init) }, { HP_POP(inter_pet->sql_final, HP_inter_pet_sql_final) }, { HP_POP(inter_pet->delete_, HP_inter_pet_delete_) }, { HP_POP(inter_pet->parse_frommap, HP_inter_pet_parse_frommap) }, -/* inter_quest */ +/* inter_quest_interface */ { HP_POP(inter_quest->parse_frommap, HP_inter_quest_parse_frommap) }, -/* inter_storage */ +/* inter_storage_interface */ { HP_POP(inter_storage->tosql, HP_inter_storage_tosql) }, { HP_POP(inter_storage->fromsql, HP_inter_storage_fromsql) }, { HP_POP(inter_storage->guild_storage_tosql, HP_inter_storage_guild_storage_tosql) }, @@ -331,7 +332,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(inter_storage->delete_, HP_inter_storage_delete_) }, { HP_POP(inter_storage->guild_storage_delete, HP_inter_storage_guild_storage_delete) }, { HP_POP(inter_storage->parse_frommap, HP_inter_storage_parse_frommap) }, -/* libconfig */ +/* libconfig_interface */ { HP_POP(libconfig->read, HP_libconfig_read) }, { HP_POP(libconfig->write, HP_libconfig_write) }, { HP_POP(libconfig->set_options, HP_libconfig_set_options) }, @@ -400,7 +401,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) }, { HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) }, { HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) }, -/* loginif */ +/* loginif_interface */ { HP_POP(loginif->init, HP_loginif_init) }, { HP_POP(loginif->final, HP_loginif_final) }, { HP_POP(loginif->reset, HP_loginif_reset) }, @@ -414,7 +415,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(loginif->auth, HP_loginif_auth) }, { HP_POP(loginif->send_users_count, HP_loginif_send_users_count) }, { HP_POP(loginif->connect_to_server, HP_loginif_connect_to_server) }, -/* iMalloc */ +/* malloc_interface */ { HP_POP(iMalloc->init, HP_iMalloc_init) }, { HP_POP(iMalloc->final, HP_iMalloc_final) }, { HP_POP(iMalloc->malloc, HP_iMalloc_malloc) }, @@ -429,7 +430,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(iMalloc->usage, HP_iMalloc_usage) }, { HP_POP(iMalloc->post_shutdown, HP_iMalloc_post_shutdown) }, { HP_POP(iMalloc->init_messages, HP_iMalloc_init_messages) }, -/* mapif */ +/* mapif_interface */ { HP_POP(mapif->ban, HP_mapif_ban) }, { HP_POP(mapif->server_init, HP_mapif_server_init) }, { HP_POP(mapif->server_destroy, HP_mapif_server_destroy) }, @@ -599,7 +600,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mapif->parse_RegistryRequest, HP_mapif_parse_RegistryRequest) }, { HP_POP(mapif->namechange_ack, HP_mapif_namechange_ack) }, { HP_POP(mapif->parse_NameChangeRequest, HP_mapif_parse_NameChangeRequest) }, -/* mapindex */ +/* mapindex_interface */ { HP_POP(mapindex->init, HP_mapindex_init) }, { HP_POP(mapindex->final, HP_mapindex_final) }, { HP_POP(mapindex->addmap, HP_mapindex_addmap) }, @@ -609,9 +610,9 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mapindex->name2id, HP_mapindex_name2id) }, { HP_POP(mapindex->id2name, HP_mapindex_id2name) }, { HP_POP(mapindex->check_default, HP_mapindex_check_default) }, -/* nullpo */ +/* nullpo_interface */ { HP_POP(nullpo->assert_report, HP_nullpo_assert_report) }, -/* pincode */ +/* pincode_interface */ { HP_POP(pincode->handle, HP_pincode_handle) }, { HP_POP(pincode->decrypt, HP_pincode_decrypt) }, { HP_POP(pincode->error, HP_pincode_error) }, @@ -622,12 +623,12 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pincode->compare, HP_pincode_compare) }, { HP_POP(pincode->check, HP_pincode_check) }, { HP_POP(pincode->config_read, HP_pincode_config_read) }, -/* showmsg */ +/* showmsg_interface */ { HP_POP(showmsg->init, HP_showmsg_init) }, { HP_POP(showmsg->final, HP_showmsg_final) }, { HP_POP(showmsg->clearScreen, HP_showmsg_clearScreen) }, { HP_POP(showmsg->showMessageV, HP_showmsg_showMessageV) }, -/* sockt */ +/* socket_interface */ { HP_POP(sockt->init, HP_sockt_init) }, { HP_POP(sockt->final, HP_sockt_final) }, { HP_POP(sockt->perform, HP_sockt_perform) }, @@ -656,7 +657,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sockt->trusted_ip_check, HP_sockt_trusted_ip_check) }, { HP_POP(sockt->net_config_read_sub, HP_sockt_net_config_read_sub) }, { HP_POP(sockt->net_config_read, HP_sockt_net_config_read) }, -/* SQL */ +/* sql_interface */ { HP_POP(SQL->Connect, HP_SQL_Connect) }, { HP_POP(SQL->GetTimeout, HP_SQL_GetTimeout) }, { HP_POP(SQL->GetColumnNames, HP_SQL_GetColumnNames) }, @@ -689,7 +690,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(SQL->StmtFreeResult, HP_SQL_StmtFreeResult) }, { HP_POP(SQL->StmtFree, HP_SQL_StmtFree) }, { HP_POP(SQL->StmtShowDebug_, HP_SQL_StmtShowDebug_) }, -/* StrBuf */ +/* stringbuf_interface */ { HP_POP(StrBuf->Malloc, HP_StrBuf_Malloc) }, { HP_POP(StrBuf->Init, HP_StrBuf_Init) }, { HP_POP(StrBuf->Vprintf, HP_StrBuf_Vprintf) }, @@ -700,7 +701,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(StrBuf->Clear, HP_StrBuf_Clear) }, { HP_POP(StrBuf->Destroy, HP_StrBuf_Destroy) }, { HP_POP(StrBuf->Free, HP_StrBuf_Free) }, -/* strlib */ +/* strlib_interface */ { HP_POP(strlib->jstrescape, HP_strlib_jstrescape) }, { HP_POP(strlib->jstrescapecpy, HP_strlib_jstrescapecpy) }, { HP_POP(strlib->jmemescapecpy, HP_strlib_jmemescapecpy) }, @@ -716,7 +717,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(strlib->safestrnlen_, HP_strlib_safestrnlen_) }, { HP_POP(strlib->strline_, HP_strlib_strline_) }, { HP_POP(strlib->bin2hex_, HP_strlib_bin2hex_) }, -/* sv */ +/* sv_interface */ { HP_POP(sv->parse_next, HP_sv_parse_next) }, { HP_POP(sv->parse, HP_sv_parse) }, { HP_POP(sv->split, HP_sv_split) }, @@ -724,7 +725,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sv->unescape_c, HP_sv_unescape_c) }, { HP_POP(sv->skip_escaped_c, HP_sv_skip_escaped_c) }, { HP_POP(sv->readdb, HP_sv_readdb) }, -/* sysinfo */ +/* sysinfo_interface */ { HP_POP(sysinfo->getpagesize, HP_sysinfo_getpagesize) }, { HP_POP(sysinfo->platform, HP_sysinfo_platform) }, { HP_POP(sysinfo->osversion, HP_sysinfo_osversion) }, @@ -743,7 +744,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sysinfo->is_superuser, HP_sysinfo_is_superuser) }, { HP_POP(sysinfo->init, HP_sysinfo_init) }, { HP_POP(sysinfo->final, HP_sysinfo_final) }, -/* timer */ +/* timer_interface */ { HP_POP(timer->gettick, HP_timer_gettick) }, { HP_POP(timer->gettick_nocache, HP_timer_gettick_nocache) }, { HP_POP(timer->add, HP_timer_add) }, diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc index 4dcc5dffb..df277f3d9 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc @@ -23,7 +23,7 @@ * as it will get overwritten. */ -/* HCache */ +/* HCache_interface */ void HP_HCache_init(void) { int hIndex = 0; if( HPMHooks.count.HP_HCache_init_pre ) { @@ -54,11 +54,11 @@ bool HP_HCache_check(const char *file) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_HCache_check_pre ) { - bool (*preHookFunc) (const char *file); + bool (*preHookFunc) (const char **file); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_HCache_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_HCache_check_pre[hIndex].func; - retVal___ = preHookFunc(file); + retVal___ = preHookFunc(&file); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -81,11 +81,11 @@ FILE* HP_HCache_open(const char *file, const char *opt) { int hIndex = 0; FILE* retVal___ = NULL; if( HPMHooks.count.HP_HCache_open_pre ) { - FILE* (*preHookFunc) (const char *file, const char *opt); + FILE* (*preHookFunc) (const char **file, const char **opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_HCache_open_pre[hIndex].func; - retVal___ = preHookFunc(file, opt); + retVal___ = preHookFunc(&file, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -104,7 +104,7 @@ FILE* HP_HCache_open(const char *file, const char *opt) { } return retVal___; } -/* chr */ +/* char_interface */ int HP_chr_waiting_disconnect(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; @@ -124,10 +124,10 @@ int HP_chr_waiting_disconnect(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.chr.waiting_disconnect(tid, tick, id, data); } if( HPMHooks.count.HP_chr_waiting_disconnect_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_waiting_disconnect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_waiting_disconnect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -151,20 +151,19 @@ int HP_chr_delete_char_sql(int char_id) { retVal___ = HPMHooks.source.chr.delete_char_sql(char_id); } if( HPMHooks.count.HP_chr_delete_char_sql_post ) { - int (*postHookFunc) (int retVal___, int *char_id); + int (*postHookFunc) (int retVal___, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete_char_sql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete_char_sql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id); + retVal___ = postHookFunc(retVal___, char_id); } } return retVal___; } -DBData HP_chr_create_online_char_data(DBKey key, va_list args) { +struct DBData HP_chr_create_online_char_data(union DBKey key, va_list args) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_chr_create_online_char_data_pre ) { - DBData (*preHookFunc) (DBKey *key, va_list args); + struct DBData (*preHookFunc) (union DBKey *key, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_create_online_char_data_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); @@ -183,11 +182,11 @@ DBData HP_chr_create_online_char_data(DBKey key, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_chr_create_online_char_data_post ) { - DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args); + struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey key, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_create_online_char_data_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_chr_create_online_char_data_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, args___copy); + retVal___ = postHookFunc(retVal___, key, args___copy); va_end(args___copy); } } @@ -211,10 +210,10 @@ void HP_chr_set_account_online(int account_id) { HPMHooks.source.chr.set_account_online(account_id); } if( HPMHooks.count.HP_chr_set_account_online_post ) { - void (*postHookFunc) (int *account_id); + void (*postHookFunc) (int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_set_account_online_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_set_account_online_post[hIndex].func; - postHookFunc(&account_id); + postHookFunc(account_id); } } return; @@ -237,10 +236,10 @@ void HP_chr_set_account_offline(int account_id) { HPMHooks.source.chr.set_account_offline(account_id); } if( HPMHooks.count.HP_chr_set_account_offline_post ) { - void (*postHookFunc) (int *account_id); + void (*postHookFunc) (int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_set_account_offline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_set_account_offline_post[hIndex].func; - postHookFunc(&account_id); + postHookFunc(account_id); } } return; @@ -263,10 +262,10 @@ void HP_chr_set_char_charselect(int account_id) { HPMHooks.source.chr.set_char_charselect(account_id); } if( HPMHooks.count.HP_chr_set_char_charselect_post ) { - void (*postHookFunc) (int *account_id); + void (*postHookFunc) (int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_set_char_charselect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_set_char_charselect_post[hIndex].func; - postHookFunc(&account_id); + postHookFunc(account_id); } } return; @@ -289,10 +288,10 @@ void HP_chr_set_char_online(int map_id, int char_id, int account_id) { HPMHooks.source.chr.set_char_online(map_id, char_id, account_id); } if( HPMHooks.count.HP_chr_set_char_online_post ) { - void (*postHookFunc) (int *map_id, int *char_id, int *account_id); + void (*postHookFunc) (int map_id, int char_id, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_set_char_online_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_set_char_online_post[hIndex].func; - postHookFunc(&map_id, &char_id, &account_id); + postHookFunc(map_id, char_id, account_id); } } return; @@ -315,24 +314,24 @@ void HP_chr_set_char_offline(int char_id, int account_id) { HPMHooks.source.chr.set_char_offline(char_id, account_id); } if( HPMHooks.count.HP_chr_set_char_offline_post ) { - void (*postHookFunc) (int *char_id, int *account_id); + void (*postHookFunc) (int char_id, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_set_char_offline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_set_char_offline_post[hIndex].func; - postHookFunc(&char_id, &account_id); + postHookFunc(char_id, account_id); } } return; } -int HP_chr_db_setoffline(DBKey key, DBData *data, va_list ap) { +int HP_chr_db_setoffline(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_db_setoffline_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_db_setoffline_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_chr_db_setoffline_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -346,26 +345,26 @@ int HP_chr_db_setoffline(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_chr_db_setoffline_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_db_setoffline_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_chr_db_setoffline_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_chr_db_kickoffline(DBKey key, DBData *data, va_list ap) { +int HP_chr_db_kickoffline(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_db_kickoffline_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_db_kickoffline_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_chr_db_kickoffline_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -379,11 +378,11 @@ int HP_chr_db_kickoffline(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_chr_db_kickoffline_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_db_kickoffline_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_chr_db_kickoffline_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -433,10 +432,10 @@ void HP_chr_set_all_offline(int id) { HPMHooks.source.chr.set_all_offline(id); } if( HPMHooks.count.HP_chr_set_all_offline_post ) { - void (*postHookFunc) (int *id); + void (*postHookFunc) (int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_set_all_offline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_set_all_offline_post[hIndex].func; - postHookFunc(&id); + postHookFunc(id); } } return; @@ -467,12 +466,11 @@ void HP_chr_set_all_offline_sql(void) { } return; } -DBData HP_chr_create_charstatus(DBKey key, va_list args) { +struct DBData HP_chr_create_charstatus(union DBKey key, va_list args) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_chr_create_charstatus_pre ) { - DBData (*preHookFunc) (DBKey *key, va_list args); + struct DBData (*preHookFunc) (union DBKey *key, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_create_charstatus_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); @@ -491,11 +489,11 @@ DBData HP_chr_create_charstatus(DBKey key, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_chr_create_charstatus_post ) { - DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args); + struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey key, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_create_charstatus_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_chr_create_charstatus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, args___copy); + retVal___ = postHookFunc(retVal___, key, args___copy); va_end(args___copy); } } @@ -505,11 +503,11 @@ int HP_chr_mmo_char_tosql(int char_id, struct mmo_charstatus *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_mmo_char_tosql_pre ) { - int (*preHookFunc) (int *char_id, struct mmo_charstatus *p); + int (*preHookFunc) (int *char_id, struct mmo_charstatus **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_mmo_char_tosql_pre[hIndex].func; - retVal___ = preHookFunc(&char_id, p); + retVal___ = preHookFunc(&char_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -520,10 +518,10 @@ int HP_chr_mmo_char_tosql(int char_id, struct mmo_charstatus *p) { retVal___ = HPMHooks.source.chr.mmo_char_tosql(char_id, p); } if( HPMHooks.count.HP_chr_mmo_char_tosql_post ) { - int (*postHookFunc) (int retVal___, int *char_id, struct mmo_charstatus *p); + int (*postHookFunc) (int retVal___, int char_id, struct mmo_charstatus *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_mmo_char_tosql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, p); + retVal___ = postHookFunc(retVal___, char_id, p); } } return retVal___; @@ -547,10 +545,10 @@ int HP_chr_memitemdata_to_sql(const struct item items[], int max, int id, int ta retVal___ = HPMHooks.source.chr.memitemdata_to_sql(items, max, id, tableswitch); } if( HPMHooks.count.HP_chr_memitemdata_to_sql_post ) { - int (*postHookFunc) (int retVal___, const struct item *items[], int *max, int *id, int *tableswitch); + int (*postHookFunc) (int retVal___, const struct item items[], int max, int id, int tableswitch); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_memitemdata_to_sql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_memitemdata_to_sql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &items, &max, &id, &tableswitch); + retVal___ = postHookFunc(retVal___, items, max, id, tableswitch); } } return retVal___; @@ -559,11 +557,11 @@ int HP_chr_mmo_gender(const struct char_session_data *sd, const struct mmo_chars int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_mmo_gender_pre ) { - int (*preHookFunc) (const struct char_session_data *sd, const struct mmo_charstatus *p, char *sex); + int (*preHookFunc) (const struct char_session_data **sd, const struct mmo_charstatus **p, char *sex); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_gender_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_mmo_gender_pre[hIndex].func; - retVal___ = preHookFunc(sd, p, &sex); + retVal___ = preHookFunc(&sd, &p, &sex); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -574,10 +572,10 @@ int HP_chr_mmo_gender(const struct char_session_data *sd, const struct mmo_chars retVal___ = HPMHooks.source.chr.mmo_gender(sd, p, sex); } if( HPMHooks.count.HP_chr_mmo_gender_post ) { - int (*postHookFunc) (int retVal___, const struct char_session_data *sd, const struct mmo_charstatus *p, char *sex); + int (*postHookFunc) (int retVal___, const struct char_session_data *sd, const struct mmo_charstatus *p, char sex); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_gender_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_mmo_gender_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, p, &sex); + retVal___ = postHookFunc(retVal___, sd, p, sex); } } return retVal___; @@ -586,11 +584,11 @@ int HP_chr_mmo_chars_fromsql(struct char_session_data *sd, uint8 *buf) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_mmo_chars_fromsql_pre ) { - int (*preHookFunc) (struct char_session_data *sd, uint8 *buf); + int (*preHookFunc) (struct char_session_data **sd, uint8 **buf); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_chars_fromsql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_mmo_chars_fromsql_pre[hIndex].func; - retVal___ = preHookFunc(sd, buf); + retVal___ = preHookFunc(&sd, &buf); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -613,11 +611,11 @@ int HP_chr_mmo_char_fromsql(int char_id, struct mmo_charstatus *p, bool load_eve int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_mmo_char_fromsql_pre ) { - int (*preHookFunc) (int *char_id, struct mmo_charstatus *p, bool *load_everything); + int (*preHookFunc) (int *char_id, struct mmo_charstatus **p, bool *load_everything); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_fromsql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_mmo_char_fromsql_pre[hIndex].func; - retVal___ = preHookFunc(&char_id, p, &load_everything); + retVal___ = preHookFunc(&char_id, &p, &load_everything); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -628,10 +626,10 @@ int HP_chr_mmo_char_fromsql(int char_id, struct mmo_charstatus *p, bool load_eve retVal___ = HPMHooks.source.chr.mmo_char_fromsql(char_id, p, load_everything); } if( HPMHooks.count.HP_chr_mmo_char_fromsql_post ) { - int (*postHookFunc) (int retVal___, int *char_id, struct mmo_charstatus *p, bool *load_everything); + int (*postHookFunc) (int retVal___, int char_id, struct mmo_charstatus *p, bool load_everything); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_mmo_char_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, p, &load_everything); + retVal___ = postHookFunc(retVal___, char_id, p, load_everything); } } return retVal___; @@ -667,11 +665,11 @@ bool HP_chr_char_slotchange(struct char_session_data *sd, int fd, unsigned short int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chr_char_slotchange_pre ) { - bool (*preHookFunc) (struct char_session_data *sd, int *fd, unsigned short *from, unsigned short *to); + bool (*preHookFunc) (struct char_session_data **sd, int *fd, unsigned short *from, unsigned short *to); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_char_slotchange_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_char_slotchange_pre[hIndex].func; - retVal___ = preHookFunc(sd, &fd, &from, &to); + retVal___ = preHookFunc(&sd, &fd, &from, &to); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -682,10 +680,10 @@ bool HP_chr_char_slotchange(struct char_session_data *sd, int fd, unsigned short retVal___ = HPMHooks.source.chr.char_slotchange(sd, fd, from, to); } if( HPMHooks.count.HP_chr_char_slotchange_post ) { - bool (*postHookFunc) (bool retVal___, struct char_session_data *sd, int *fd, unsigned short *from, unsigned short *to); + bool (*postHookFunc) (bool retVal___, struct char_session_data *sd, int fd, unsigned short from, unsigned short to); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_char_slotchange_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_char_slotchange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &fd, &from, &to); + retVal___ = postHookFunc(retVal___, sd, fd, from, to); } } return retVal___; @@ -694,11 +692,11 @@ int HP_chr_rename_char_sql(struct char_session_data *sd, int char_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_rename_char_sql_pre ) { - int (*preHookFunc) (struct char_session_data *sd, int *char_id); + int (*preHookFunc) (struct char_session_data **sd, int *char_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_rename_char_sql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_rename_char_sql_pre[hIndex].func; - retVal___ = preHookFunc(sd, &char_id); + retVal___ = preHookFunc(&sd, &char_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -709,10 +707,10 @@ int HP_chr_rename_char_sql(struct char_session_data *sd, int char_id) { retVal___ = HPMHooks.source.chr.rename_char_sql(sd, char_id); } if( HPMHooks.count.HP_chr_rename_char_sql_post ) { - int (*postHookFunc) (int retVal___, struct char_session_data *sd, int *char_id); + int (*postHookFunc) (int retVal___, struct char_session_data *sd, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_rename_char_sql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_rename_char_sql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &char_id); + retVal___ = postHookFunc(retVal___, sd, char_id); } } return retVal___; @@ -721,11 +719,11 @@ int HP_chr_check_char_name(char *name, char *esc_name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_check_char_name_pre ) { - int (*preHookFunc) (char *name, char *esc_name); + int (*preHookFunc) (char **name, char **esc_name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_check_char_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_check_char_name_pre[hIndex].func; - retVal___ = preHookFunc(name, esc_name); + retVal___ = preHookFunc(&name, &esc_name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -748,11 +746,11 @@ int HP_chr_make_new_char_sql(struct char_session_data *sd, const char *name_, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_make_new_char_sql_pre ) { - int (*preHookFunc) (struct char_session_data *sd, const char *name_, int *str, int *agi, int *vit, int *int_, int *dex, int *luk, int *slot, int *hair_color, int *hair_style); + int (*preHookFunc) (struct char_session_data **sd, const char **name_, int *str, int *agi, int *vit, int *int_, int *dex, int *luk, int *slot, int *hair_color, int *hair_style); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_make_new_char_sql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_make_new_char_sql_pre[hIndex].func; - retVal___ = preHookFunc(sd, name_, &str, &agi, &vit, &int_, &dex, &luk, &slot, &hair_color, &hair_style); + retVal___ = preHookFunc(&sd, &name_, &str, &agi, &vit, &int_, &dex, &luk, &slot, &hair_color, &hair_style); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -763,10 +761,10 @@ int HP_chr_make_new_char_sql(struct char_session_data *sd, const char *name_, in retVal___ = HPMHooks.source.chr.make_new_char_sql(sd, name_, str, agi, vit, int_, dex, luk, slot, hair_color, hair_style); } if( HPMHooks.count.HP_chr_make_new_char_sql_post ) { - int (*postHookFunc) (int retVal___, struct char_session_data *sd, const char *name_, int *str, int *agi, int *vit, int *int_, int *dex, int *luk, int *slot, int *hair_color, int *hair_style); + int (*postHookFunc) (int retVal___, struct char_session_data *sd, const char *name_, int str, int agi, int vit, int int_, int dex, int luk, int slot, int hair_color, int hair_style); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_make_new_char_sql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_make_new_char_sql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, name_, &str, &agi, &vit, &int_, &dex, &luk, &slot, &hair_color, &hair_style); + retVal___ = postHookFunc(retVal___, sd, name_, str, agi, vit, int_, dex, luk, slot, hair_color, hair_style); } } return retVal___; @@ -790,10 +788,10 @@ int HP_chr_divorce_char_sql(int partner_id1, int partner_id2) { retVal___ = HPMHooks.source.chr.divorce_char_sql(partner_id1, partner_id2); } if( HPMHooks.count.HP_chr_divorce_char_sql_post ) { - int (*postHookFunc) (int retVal___, int *partner_id1, int *partner_id2); + int (*postHookFunc) (int retVal___, int partner_id1, int partner_id2); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_divorce_char_sql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_divorce_char_sql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &partner_id1, &partner_id2); + retVal___ = postHookFunc(retVal___, partner_id1, partner_id2); } } return retVal___; @@ -829,11 +827,11 @@ int HP_chr_mmo_char_tobuf(uint8 *buffer, struct mmo_charstatus *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_mmo_char_tobuf_pre ) { - int (*preHookFunc) (uint8 *buffer, struct mmo_charstatus *p); + int (*preHookFunc) (uint8 **buffer, struct mmo_charstatus **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_tobuf_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_mmo_char_tobuf_pre[hIndex].func; - retVal___ = preHookFunc(buffer, p); + retVal___ = preHookFunc(&buffer, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -855,11 +853,11 @@ int HP_chr_mmo_char_tobuf(uint8 *buffer, struct mmo_charstatus *p) { void HP_chr_mmo_char_send099d(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_mmo_char_send099d_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send099d_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_mmo_char_send099d_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -870,10 +868,10 @@ void HP_chr_mmo_char_send099d(int fd, struct char_session_data *sd) { HPMHooks.source.chr.mmo_char_send099d(fd, sd); } if( HPMHooks.count.HP_chr_mmo_char_send099d_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send099d_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_mmo_char_send099d_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -881,11 +879,11 @@ void HP_chr_mmo_char_send099d(int fd, struct char_session_data *sd) { void HP_chr_mmo_char_send_ban_list(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_mmo_char_send_ban_list_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send_ban_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_mmo_char_send_ban_list_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -896,10 +894,10 @@ void HP_chr_mmo_char_send_ban_list(int fd, struct char_session_data *sd) { HPMHooks.source.chr.mmo_char_send_ban_list(fd, sd); } if( HPMHooks.count.HP_chr_mmo_char_send_ban_list_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send_ban_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_mmo_char_send_ban_list_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -907,11 +905,11 @@ void HP_chr_mmo_char_send_ban_list(int fd, struct char_session_data *sd) { void HP_chr_mmo_char_send_slots_info(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_mmo_char_send_slots_info_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send_slots_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_mmo_char_send_slots_info_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -922,10 +920,10 @@ void HP_chr_mmo_char_send_slots_info(int fd, struct char_session_data *sd) { HPMHooks.source.chr.mmo_char_send_slots_info(fd, sd); } if( HPMHooks.count.HP_chr_mmo_char_send_slots_info_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send_slots_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_mmo_char_send_slots_info_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -934,11 +932,11 @@ int HP_chr_mmo_char_send_characters(int fd, struct char_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_mmo_char_send_characters_pre ) { - int (*preHookFunc) (int *fd, struct char_session_data *sd); + int (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send_characters_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_mmo_char_send_characters_pre[hIndex].func; - retVal___ = preHookFunc(&fd, sd); + retVal___ = preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -949,10 +947,10 @@ int HP_chr_mmo_char_send_characters(int fd, struct char_session_data *sd) { retVal___ = HPMHooks.source.chr.mmo_char_send_characters(fd, sd); } if( HPMHooks.count.HP_chr_mmo_char_send_characters_post ) { - int (*postHookFunc) (int retVal___, int *fd, struct char_session_data *sd); + int (*postHookFunc) (int retVal___, int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send_characters_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_mmo_char_send_characters_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, sd); + retVal___ = postHookFunc(retVal___, fd, sd); } } return retVal___; @@ -976,10 +974,10 @@ int HP_chr_char_married(int pl1, int pl2) { retVal___ = HPMHooks.source.chr.char_married(pl1, pl2); } if( HPMHooks.count.HP_chr_char_married_post ) { - int (*postHookFunc) (int retVal___, int *pl1, int *pl2); + int (*postHookFunc) (int retVal___, int pl1, int pl2); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_char_married_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_char_married_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &pl1, &pl2); + retVal___ = postHookFunc(retVal___, pl1, pl2); } } return retVal___; @@ -1003,10 +1001,10 @@ int HP_chr_char_child(int parent_id, int child_id) { retVal___ = HPMHooks.source.chr.char_child(parent_id, child_id); } if( HPMHooks.count.HP_chr_char_child_post ) { - int (*postHookFunc) (int retVal___, int *parent_id, int *child_id); + int (*postHookFunc) (int retVal___, int parent_id, int child_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_char_child_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_char_child_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &parent_id, &child_id); + retVal___ = postHookFunc(retVal___, parent_id, child_id); } } return retVal___; @@ -1030,10 +1028,10 @@ int HP_chr_char_family(int cid1, int cid2, int cid3) { retVal___ = HPMHooks.source.chr.char_family(cid1, cid2, cid3); } if( HPMHooks.count.HP_chr_char_family_post ) { - int (*postHookFunc) (int retVal___, int *cid1, int *cid2, int *cid3); + int (*postHookFunc) (int retVal___, int cid1, int cid2, int cid3); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_char_family_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_char_family_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &cid1, &cid2, &cid3); + retVal___ = postHookFunc(retVal___, cid1, cid2, cid3); } } return retVal___; @@ -1056,10 +1054,10 @@ void HP_chr_disconnect_player(int account_id) { HPMHooks.source.chr.disconnect_player(account_id); } if( HPMHooks.count.HP_chr_disconnect_player_post ) { - void (*postHookFunc) (int *account_id); + void (*postHookFunc) (int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_disconnect_player_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_disconnect_player_post[hIndex].func; - postHookFunc(&account_id); + postHookFunc(account_id); } } return; @@ -1082,10 +1080,10 @@ void HP_chr_authfail_fd(int fd, int type) { HPMHooks.source.chr.authfail_fd(fd, type); } if( HPMHooks.count.HP_chr_authfail_fd_post ) { - void (*postHookFunc) (int *fd, int *type); + void (*postHookFunc) (int fd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_authfail_fd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_authfail_fd_post[hIndex].func; - postHookFunc(&fd, &type); + postHookFunc(fd, type); } } return; @@ -1108,10 +1106,10 @@ void HP_chr_request_account_data(int account_id) { HPMHooks.source.chr.request_account_data(account_id); } if( HPMHooks.count.HP_chr_request_account_data_post ) { - void (*postHookFunc) (int *account_id); + void (*postHookFunc) (int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_request_account_data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_request_account_data_post[hIndex].func; - postHookFunc(&account_id); + postHookFunc(account_id); } } return; @@ -1119,11 +1117,11 @@ void HP_chr_request_account_data(int account_id) { void HP_chr_auth_ok(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_auth_ok_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_auth_ok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_auth_ok_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1134,10 +1132,10 @@ void HP_chr_auth_ok(int fd, struct char_session_data *sd) { HPMHooks.source.chr.auth_ok(fd, sd); } if( HPMHooks.count.HP_chr_auth_ok_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_auth_ok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_auth_ok_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -1160,10 +1158,10 @@ void HP_chr_ping_login_server(int fd) { HPMHooks.source.chr.ping_login_server(fd); } if( HPMHooks.count.HP_chr_ping_login_server_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_ping_login_server_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_ping_login_server_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1187,10 +1185,10 @@ int HP_chr_parse_fromlogin_connection_state(int fd) { retVal___ = HPMHooks.source.chr.parse_fromlogin_connection_state(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_connection_state_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_connection_state_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_connection_state_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -1213,10 +1211,10 @@ void HP_chr_auth_error(int fd, unsigned char flag) { HPMHooks.source.chr.auth_error(fd, flag); } if( HPMHooks.count.HP_chr_auth_error_post ) { - void (*postHookFunc) (int *fd, unsigned char *flag); + void (*postHookFunc) (int fd, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_auth_error_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_auth_error_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -1239,10 +1237,10 @@ void HP_chr_parse_fromlogin_auth_state(int fd) { HPMHooks.source.chr.parse_fromlogin_auth_state(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_auth_state_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_auth_state_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_auth_state_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1265,10 +1263,10 @@ void HP_chr_parse_fromlogin_account_data(int fd) { HPMHooks.source.chr.parse_fromlogin_account_data(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_account_data_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_account_data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_account_data_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1291,10 +1289,10 @@ void HP_chr_parse_fromlogin_login_pong(int fd) { HPMHooks.source.chr.parse_fromlogin_login_pong(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_login_pong_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_login_pong_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_login_pong_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1317,10 +1315,10 @@ void HP_chr_changesex(int account_id, int sex) { HPMHooks.source.chr.changesex(account_id, sex); } if( HPMHooks.count.HP_chr_changesex_post ) { - void (*postHookFunc) (int *account_id, int *sex); + void (*postHookFunc) (int account_id, int sex); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_changesex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_changesex_post[hIndex].func; - postHookFunc(&account_id, &sex); + postHookFunc(account_id, sex); } } return; @@ -1344,10 +1342,10 @@ int HP_chr_parse_fromlogin_changesex_reply(int fd) { retVal___ = HPMHooks.source.chr.parse_fromlogin_changesex_reply(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_changesex_reply_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_changesex_reply_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_changesex_reply_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -1370,10 +1368,10 @@ void HP_chr_parse_fromlogin_account_reg2(int fd) { HPMHooks.source.chr.parse_fromlogin_account_reg2(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_account_reg2_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_account_reg2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_account_reg2_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1396,10 +1394,10 @@ void HP_chr_parse_fromlogin_ban(int fd) { HPMHooks.source.chr.parse_fromlogin_ban(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_ban_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_ban_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_ban_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1422,10 +1420,10 @@ void HP_chr_parse_fromlogin_kick(int fd) { HPMHooks.source.chr.parse_fromlogin_kick(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_kick_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_kick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_kick_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1448,10 +1446,10 @@ void HP_chr_update_ip(int fd) { HPMHooks.source.chr.update_ip(fd); } if( HPMHooks.count.HP_chr_update_ip_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_update_ip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_update_ip_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1474,10 +1472,10 @@ void HP_chr_parse_fromlogin_update_ip(int fd) { HPMHooks.source.chr.parse_fromlogin_update_ip(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_update_ip_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_update_ip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_update_ip_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1500,10 +1498,10 @@ void HP_chr_parse_fromlogin_accinfo2_failed(int fd) { HPMHooks.source.chr.parse_fromlogin_accinfo2_failed(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_accinfo2_failed_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_accinfo2_failed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_accinfo2_failed_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1526,10 +1524,10 @@ void HP_chr_parse_fromlogin_accinfo2_ok(int fd) { HPMHooks.source.chr.parse_fromlogin_accinfo2_ok(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_accinfo2_ok_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_accinfo2_ok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_accinfo2_ok_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1553,10 +1551,10 @@ int HP_chr_parse_fromlogin(int fd) { retVal___ = HPMHooks.source.chr.parse_fromlogin(fd); } if( HPMHooks.count.HP_chr_parse_fromlogin_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_fromlogin_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_fromlogin_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -1580,10 +1578,10 @@ int HP_chr_request_accreg2(int account_id, int char_id) { retVal___ = HPMHooks.source.chr.request_accreg2(account_id, char_id); } if( HPMHooks.count.HP_chr_request_accreg2_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_request_accreg2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_request_accreg2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, account_id, char_id); } } return retVal___; @@ -1606,10 +1604,10 @@ void HP_chr_global_accreg_to_login_start(int account_id, int char_id) { HPMHooks.source.chr.global_accreg_to_login_start(account_id, char_id); } if( HPMHooks.count.HP_chr_global_accreg_to_login_start_post ) { - void (*postHookFunc) (int *account_id, int *char_id); + void (*postHookFunc) (int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_global_accreg_to_login_start_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_global_accreg_to_login_start_post[hIndex].func; - postHookFunc(&account_id, &char_id); + postHookFunc(account_id, char_id); } } return; @@ -1643,11 +1641,11 @@ void HP_chr_global_accreg_to_login_send(void) { void HP_chr_global_accreg_to_login_add(const char *key, unsigned int index, intptr_t val, bool is_string) { int hIndex = 0; if( HPMHooks.count.HP_chr_global_accreg_to_login_add_pre ) { - void (*preHookFunc) (const char *key, unsigned int *index, intptr_t *val, bool *is_string); + void (*preHookFunc) (const char **key, unsigned int *index, intptr_t *val, bool *is_string); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_global_accreg_to_login_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_global_accreg_to_login_add_pre[hIndex].func; - preHookFunc(key, &index, &val, &is_string); + preHookFunc(&key, &index, &val, &is_string); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1658,10 +1656,10 @@ void HP_chr_global_accreg_to_login_add(const char *key, unsigned int index, intp HPMHooks.source.chr.global_accreg_to_login_add(key, index, val, is_string); } if( HPMHooks.count.HP_chr_global_accreg_to_login_add_post ) { - void (*postHookFunc) (const char *key, unsigned int *index, intptr_t *val, bool *is_string); + void (*postHookFunc) (const char *key, unsigned int index, intptr_t val, bool is_string); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_global_accreg_to_login_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_global_accreg_to_login_add_post[hIndex].func; - postHookFunc(key, &index, &val, &is_string); + postHookFunc(key, index, val, is_string); } } return; @@ -1711,10 +1709,10 @@ int HP_chr_send_fame_list(int fd) { retVal___ = HPMHooks.source.chr.send_fame_list(fd); } if( HPMHooks.count.HP_chr_send_fame_list_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_fame_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_send_fame_list_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -1737,10 +1735,10 @@ void HP_chr_update_fame_list(int type, int index, int fame) { HPMHooks.source.chr.update_fame_list(type, index, fame); } if( HPMHooks.count.HP_chr_update_fame_list_post ) { - void (*postHookFunc) (int *type, int *index, int *fame); + void (*postHookFunc) (int type, int index, int fame); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_update_fame_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_update_fame_list_post[hIndex].func; - postHookFunc(&type, &index, &fame); + postHookFunc(type, index, fame); } } return; @@ -1749,11 +1747,11 @@ int HP_chr_loadName(int char_id, char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_loadName_pre ) { - int (*preHookFunc) (int *char_id, char *name); + int (*preHookFunc) (int *char_id, char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_loadName_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_loadName_pre[hIndex].func; - retVal___ = preHookFunc(&char_id, name); + retVal___ = preHookFunc(&char_id, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1764,10 +1762,10 @@ int HP_chr_loadName(int char_id, char *name) { retVal___ = HPMHooks.source.chr.loadName(char_id, name); } if( HPMHooks.count.HP_chr_loadName_post ) { - int (*postHookFunc) (int retVal___, int *char_id, char *name); + int (*postHookFunc) (int retVal___, int char_id, char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_loadName_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_loadName_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, name); + retVal___ = postHookFunc(retVal___, char_id, name); } } return retVal___; @@ -1790,10 +1788,10 @@ void HP_chr_parse_frommap_datasync(int fd) { HPMHooks.source.chr.parse_frommap_datasync(fd); } if( HPMHooks.count.HP_chr_parse_frommap_datasync_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_datasync_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_datasync_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1816,10 +1814,10 @@ void HP_chr_parse_frommap_skillid2idx(int fd) { HPMHooks.source.chr.parse_frommap_skillid2idx(fd); } if( HPMHooks.count.HP_chr_parse_frommap_skillid2idx_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_skillid2idx_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_skillid2idx_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1842,10 +1840,10 @@ void HP_chr_map_received_ok(int fd) { HPMHooks.source.chr.map_received_ok(fd); } if( HPMHooks.count.HP_chr_map_received_ok_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_map_received_ok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_map_received_ok_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1868,10 +1866,10 @@ void HP_chr_send_maps(int fd, int id, int j) { HPMHooks.source.chr.send_maps(fd, id, j); } if( HPMHooks.count.HP_chr_send_maps_post ) { - void (*postHookFunc) (int *fd, int *id, int *j); + void (*postHookFunc) (int fd, int id, int j); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_maps_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_send_maps_post[hIndex].func; - postHookFunc(&fd, &id, &j); + postHookFunc(fd, id, j); } } return; @@ -1894,10 +1892,10 @@ void HP_chr_parse_frommap_map_names(int fd, int id) { HPMHooks.source.chr.parse_frommap_map_names(fd, id); } if( HPMHooks.count.HP_chr_parse_frommap_map_names_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_map_names_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_map_names_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -1920,10 +1918,10 @@ void HP_chr_send_scdata(int fd, int aid, int cid) { HPMHooks.source.chr.send_scdata(fd, aid, cid); } if( HPMHooks.count.HP_chr_send_scdata_post ) { - void (*postHookFunc) (int *fd, int *aid, int *cid); + void (*postHookFunc) (int fd, int aid, int cid); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_scdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_send_scdata_post[hIndex].func; - postHookFunc(&fd, &aid, &cid); + postHookFunc(fd, aid, cid); } } return; @@ -1946,10 +1944,10 @@ void HP_chr_parse_frommap_request_scdata(int fd) { HPMHooks.source.chr.parse_frommap_request_scdata(fd); } if( HPMHooks.count.HP_chr_parse_frommap_request_scdata_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_request_scdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_request_scdata_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -1972,10 +1970,10 @@ void HP_chr_parse_frommap_set_users_count(int fd, int id) { HPMHooks.source.chr.parse_frommap_set_users_count(fd, id); } if( HPMHooks.count.HP_chr_parse_frommap_set_users_count_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_set_users_count_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_set_users_count_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -1998,10 +1996,10 @@ void HP_chr_parse_frommap_set_users(int fd, int id) { HPMHooks.source.chr.parse_frommap_set_users(fd, id); } if( HPMHooks.count.HP_chr_parse_frommap_set_users_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_set_users_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_set_users_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -2024,10 +2022,10 @@ void HP_chr_save_character_ack(int fd, int aid, int cid) { HPMHooks.source.chr.save_character_ack(fd, aid, cid); } if( HPMHooks.count.HP_chr_save_character_ack_post ) { - void (*postHookFunc) (int *fd, int *aid, int *cid); + void (*postHookFunc) (int fd, int aid, int cid); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_save_character_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_save_character_ack_post[hIndex].func; - postHookFunc(&fd, &aid, &cid); + postHookFunc(fd, aid, cid); } } return; @@ -2050,10 +2048,10 @@ void HP_chr_parse_frommap_save_character(int fd, int id) { HPMHooks.source.chr.parse_frommap_save_character(fd, id); } if( HPMHooks.count.HP_chr_parse_frommap_save_character_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_save_character_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_save_character_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -2076,10 +2074,10 @@ void HP_chr_select_ack(int fd, int account_id, uint8 flag) { HPMHooks.source.chr.select_ack(fd, account_id, flag); } if( HPMHooks.count.HP_chr_select_ack_post ) { - void (*postHookFunc) (int *fd, int *account_id, uint8 *flag); + void (*postHookFunc) (int fd, int account_id, uint8 flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_select_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_select_ack_post[hIndex].func; - postHookFunc(&fd, &account_id, &flag); + postHookFunc(fd, account_id, flag); } } return; @@ -2102,10 +2100,10 @@ void HP_chr_parse_frommap_char_select_req(int fd) { HPMHooks.source.chr.parse_frommap_char_select_req(fd); } if( HPMHooks.count.HP_chr_parse_frommap_char_select_req_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_char_select_req_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_char_select_req_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2113,11 +2111,11 @@ void HP_chr_parse_frommap_char_select_req(int fd) { void HP_chr_change_map_server_ack(int fd, const uint8 *data, bool ok) { int hIndex = 0; if( HPMHooks.count.HP_chr_change_map_server_ack_pre ) { - void (*preHookFunc) (int *fd, const uint8 *data, bool *ok); + void (*preHookFunc) (int *fd, const uint8 **data, bool *ok); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_change_map_server_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_change_map_server_ack_pre[hIndex].func; - preHookFunc(&fd, data, &ok); + preHookFunc(&fd, &data, &ok); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2128,10 +2126,10 @@ void HP_chr_change_map_server_ack(int fd, const uint8 *data, bool ok) { HPMHooks.source.chr.change_map_server_ack(fd, data, ok); } if( HPMHooks.count.HP_chr_change_map_server_ack_post ) { - void (*postHookFunc) (int *fd, const uint8 *data, bool *ok); + void (*postHookFunc) (int fd, const uint8 *data, bool ok); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_change_map_server_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_change_map_server_ack_post[hIndex].func; - postHookFunc(&fd, data, &ok); + postHookFunc(fd, data, ok); } } return; @@ -2154,10 +2152,10 @@ void HP_chr_parse_frommap_change_map_server(int fd) { HPMHooks.source.chr.parse_frommap_change_map_server(fd); } if( HPMHooks.count.HP_chr_parse_frommap_change_map_server_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_change_map_server_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_change_map_server_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2180,10 +2178,10 @@ void HP_chr_parse_frommap_remove_friend(int fd) { HPMHooks.source.chr.parse_frommap_remove_friend(fd); } if( HPMHooks.count.HP_chr_parse_frommap_remove_friend_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_remove_friend_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_remove_friend_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2206,10 +2204,10 @@ void HP_chr_char_name_ack(int fd, int char_id) { HPMHooks.source.chr.char_name_ack(fd, char_id); } if( HPMHooks.count.HP_chr_char_name_ack_post ) { - void (*postHookFunc) (int *fd, int *char_id); + void (*postHookFunc) (int fd, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_char_name_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_char_name_ack_post[hIndex].func; - postHookFunc(&fd, &char_id); + postHookFunc(fd, char_id); } } return; @@ -2232,10 +2230,10 @@ void HP_chr_parse_frommap_char_name_request(int fd) { HPMHooks.source.chr.parse_frommap_char_name_request(fd); } if( HPMHooks.count.HP_chr_parse_frommap_char_name_request_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_char_name_request_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_char_name_request_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2258,10 +2256,10 @@ void HP_chr_parse_frommap_change_email(int fd) { HPMHooks.source.chr.parse_frommap_change_email(fd); } if( HPMHooks.count.HP_chr_parse_frommap_change_email_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_change_email_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_change_email_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2269,11 +2267,11 @@ void HP_chr_parse_frommap_change_email(int fd) { void HP_chr_ban(int account_id, int char_id, time_t *unban_time, short year, short month, short day, short hour, short minute, short second) { int hIndex = 0; if( HPMHooks.count.HP_chr_ban_pre ) { - void (*preHookFunc) (int *account_id, int *char_id, time_t *unban_time, short *year, short *month, short *day, short *hour, short *minute, short *second); + void (*preHookFunc) (int *account_id, int *char_id, time_t **unban_time, short *year, short *month, short *day, short *hour, short *minute, short *second); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_ban_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_ban_pre[hIndex].func; - preHookFunc(&account_id, &char_id, unban_time, &year, &month, &day, &hour, &minute, &second); + preHookFunc(&account_id, &char_id, &unban_time, &year, &month, &day, &hour, &minute, &second); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2284,10 +2282,10 @@ void HP_chr_ban(int account_id, int char_id, time_t *unban_time, short year, sho HPMHooks.source.chr.ban(account_id, char_id, unban_time, year, month, day, hour, minute, second); } if( HPMHooks.count.HP_chr_ban_post ) { - void (*postHookFunc) (int *account_id, int *char_id, time_t *unban_time, short *year, short *month, short *day, short *hour, short *minute, short *second); + void (*postHookFunc) (int account_id, int char_id, time_t *unban_time, short year, short month, short day, short hour, short minute, short second); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_ban_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_ban_post[hIndex].func; - postHookFunc(&account_id, &char_id, unban_time, &year, &month, &day, &hour, &minute, &second); + postHookFunc(account_id, char_id, unban_time, year, month, day, hour, minute, second); } } return; @@ -2295,11 +2293,11 @@ void HP_chr_ban(int account_id, int char_id, time_t *unban_time, short year, sho void HP_chr_unban(int char_id, int *result) { int hIndex = 0; if( HPMHooks.count.HP_chr_unban_pre ) { - void (*preHookFunc) (int *char_id, int *result); + void (*preHookFunc) (int *char_id, int **result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_unban_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_unban_pre[hIndex].func; - preHookFunc(&char_id, result); + preHookFunc(&char_id, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2310,10 +2308,10 @@ void HP_chr_unban(int char_id, int *result) { HPMHooks.source.chr.unban(char_id, result); } if( HPMHooks.count.HP_chr_unban_post ) { - void (*postHookFunc) (int *char_id, int *result); + void (*postHookFunc) (int char_id, int *result); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_unban_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_unban_post[hIndex].func; - postHookFunc(&char_id, result); + postHookFunc(char_id, result); } } return; @@ -2321,11 +2319,11 @@ void HP_chr_unban(int char_id, int *result) { void HP_chr_ask_name_ack(int fd, int acc, const char *name, int type, int result) { int hIndex = 0; if( HPMHooks.count.HP_chr_ask_name_ack_pre ) { - void (*preHookFunc) (int *fd, int *acc, const char *name, int *type, int *result); + void (*preHookFunc) (int *fd, int *acc, const char **name, int *type, int *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_ask_name_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_ask_name_ack_pre[hIndex].func; - preHookFunc(&fd, &acc, name, &type, &result); + preHookFunc(&fd, &acc, &name, &type, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2336,10 +2334,10 @@ void HP_chr_ask_name_ack(int fd, int acc, const char *name, int type, int result HPMHooks.source.chr.ask_name_ack(fd, acc, name, type, result); } if( HPMHooks.count.HP_chr_ask_name_ack_post ) { - void (*postHookFunc) (int *fd, int *acc, const char *name, int *type, int *result); + void (*postHookFunc) (int fd, int acc, const char *name, int type, int result); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_ask_name_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_ask_name_ack_post[hIndex].func; - postHookFunc(&fd, &acc, name, &type, &result); + postHookFunc(fd, acc, name, type, result); } } return; @@ -2363,10 +2361,10 @@ int HP_chr_changecharsex(int char_id, int sex) { retVal___ = HPMHooks.source.chr.changecharsex(char_id, sex); } if( HPMHooks.count.HP_chr_changecharsex_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *sex); + int (*postHookFunc) (int retVal___, int char_id, int sex); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_changecharsex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_changecharsex_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &sex); + retVal___ = postHookFunc(retVal___, char_id, sex); } } return retVal___; @@ -2389,10 +2387,10 @@ void HP_chr_parse_frommap_change_account(int fd) { HPMHooks.source.chr.parse_frommap_change_account(fd); } if( HPMHooks.count.HP_chr_parse_frommap_change_account_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_change_account_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_change_account_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2415,10 +2413,10 @@ void HP_chr_parse_frommap_fame_list(int fd) { HPMHooks.source.chr.parse_frommap_fame_list(fd); } if( HPMHooks.count.HP_chr_parse_frommap_fame_list_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_fame_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_fame_list_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2441,10 +2439,10 @@ void HP_chr_parse_frommap_divorce_char(int fd) { HPMHooks.source.chr.parse_frommap_divorce_char(fd); } if( HPMHooks.count.HP_chr_parse_frommap_divorce_char_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_divorce_char_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_divorce_char_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2467,10 +2465,10 @@ void HP_chr_parse_frommap_ragsrvinfo(int fd) { HPMHooks.source.chr.parse_frommap_ragsrvinfo(fd); } if( HPMHooks.count.HP_chr_parse_frommap_ragsrvinfo_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_ragsrvinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_ragsrvinfo_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2493,10 +2491,10 @@ void HP_chr_parse_frommap_set_char_offline(int fd) { HPMHooks.source.chr.parse_frommap_set_char_offline(fd); } if( HPMHooks.count.HP_chr_parse_frommap_set_char_offline_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_set_char_offline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_set_char_offline_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2519,10 +2517,10 @@ void HP_chr_parse_frommap_set_all_offline(int fd, int id) { HPMHooks.source.chr.parse_frommap_set_all_offline(fd, id); } if( HPMHooks.count.HP_chr_parse_frommap_set_all_offline_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_set_all_offline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_set_all_offline_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -2545,10 +2543,10 @@ void HP_chr_parse_frommap_set_char_online(int fd, int id) { HPMHooks.source.chr.parse_frommap_set_char_online(fd, id); } if( HPMHooks.count.HP_chr_parse_frommap_set_char_online_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_set_char_online_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_set_char_online_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -2571,10 +2569,10 @@ void HP_chr_parse_frommap_build_fame_list(int fd) { HPMHooks.source.chr.parse_frommap_build_fame_list(fd); } if( HPMHooks.count.HP_chr_parse_frommap_build_fame_list_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_build_fame_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_build_fame_list_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2597,10 +2595,10 @@ void HP_chr_parse_frommap_save_status_change_data(int fd) { HPMHooks.source.chr.parse_frommap_save_status_change_data(fd); } if( HPMHooks.count.HP_chr_parse_frommap_save_status_change_data_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_save_status_change_data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_save_status_change_data_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2623,10 +2621,10 @@ void HP_chr_send_pong(int fd) { HPMHooks.source.chr.send_pong(fd); } if( HPMHooks.count.HP_chr_send_pong_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_pong_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_send_pong_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2649,10 +2647,10 @@ void HP_chr_parse_frommap_ping(int fd) { HPMHooks.source.chr.parse_frommap_ping(fd); } if( HPMHooks.count.HP_chr_parse_frommap_ping_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_ping_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_ping_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2660,11 +2658,11 @@ void HP_chr_parse_frommap_ping(int fd) { void HP_chr_map_auth_ok(int fd, int account_id, struct char_auth_node *node, struct mmo_charstatus *cd) { int hIndex = 0; if( HPMHooks.count.HP_chr_map_auth_ok_pre ) { - void (*preHookFunc) (int *fd, int *account_id, struct char_auth_node *node, struct mmo_charstatus *cd); + void (*preHookFunc) (int *fd, int *account_id, struct char_auth_node **node, struct mmo_charstatus **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_map_auth_ok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_map_auth_ok_pre[hIndex].func; - preHookFunc(&fd, &account_id, node, cd); + preHookFunc(&fd, &account_id, &node, &cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2675,10 +2673,10 @@ void HP_chr_map_auth_ok(int fd, int account_id, struct char_auth_node *node, str HPMHooks.source.chr.map_auth_ok(fd, account_id, node, cd); } if( HPMHooks.count.HP_chr_map_auth_ok_post ) { - void (*postHookFunc) (int *fd, int *account_id, struct char_auth_node *node, struct mmo_charstatus *cd); + void (*postHookFunc) (int fd, int account_id, struct char_auth_node *node, struct mmo_charstatus *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_map_auth_ok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_map_auth_ok_post[hIndex].func; - postHookFunc(&fd, &account_id, node, cd); + postHookFunc(fd, account_id, node, cd); } } return; @@ -2701,10 +2699,10 @@ void HP_chr_map_auth_failed(int fd, int account_id, int char_id, int login_id1, HPMHooks.source.chr.map_auth_failed(fd, account_id, char_id, login_id1, sex, ip); } if( HPMHooks.count.HP_chr_map_auth_failed_post ) { - void (*postHookFunc) (int *fd, int *account_id, int *char_id, int *login_id1, char *sex, uint32 *ip); + void (*postHookFunc) (int fd, int account_id, int char_id, int login_id1, char sex, uint32 ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_map_auth_failed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_map_auth_failed_post[hIndex].func; - postHookFunc(&fd, &account_id, &char_id, &login_id1, &sex, &ip); + postHookFunc(fd, account_id, char_id, login_id1, sex, ip); } } return; @@ -2727,10 +2725,10 @@ void HP_chr_parse_frommap_auth_request(int fd, int id) { HPMHooks.source.chr.parse_frommap_auth_request(fd, id); } if( HPMHooks.count.HP_chr_parse_frommap_auth_request_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_auth_request_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_auth_request_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -2753,10 +2751,10 @@ void HP_chr_parse_frommap_update_ip(int fd, int id) { HPMHooks.source.chr.parse_frommap_update_ip(fd, id); } if( HPMHooks.count.HP_chr_parse_frommap_update_ip_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_update_ip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_update_ip_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -2779,10 +2777,10 @@ void HP_chr_parse_frommap_request_stats_report(int fd) { HPMHooks.source.chr.parse_frommap_request_stats_report(fd); } if( HPMHooks.count.HP_chr_parse_frommap_request_stats_report_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_request_stats_report_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_request_stats_report_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2805,10 +2803,10 @@ void HP_chr_parse_frommap_scdata_update(int fd) { HPMHooks.source.chr.parse_frommap_scdata_update(fd); } if( HPMHooks.count.HP_chr_parse_frommap_scdata_update_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_scdata_update_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_scdata_update_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2831,10 +2829,10 @@ void HP_chr_parse_frommap_scdata_delete(int fd) { HPMHooks.source.chr.parse_frommap_scdata_delete(fd); } if( HPMHooks.count.HP_chr_parse_frommap_scdata_delete_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_scdata_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_scdata_delete_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -2858,10 +2856,10 @@ int HP_chr_parse_frommap(int fd) { retVal___ = HPMHooks.source.chr.parse_frommap(fd); } if( HPMHooks.count.HP_chr_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -2885,10 +2883,10 @@ int HP_chr_search_mapserver(unsigned short map, uint32 ip, uint16 port) { retVal___ = HPMHooks.source.chr.search_mapserver(map, ip, port); } if( HPMHooks.count.HP_chr_search_mapserver_post ) { - int (*postHookFunc) (int retVal___, unsigned short *map, uint32 *ip, uint16 *port); + int (*postHookFunc) (int retVal___, unsigned short map, uint32 ip, uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_search_mapserver_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_search_mapserver_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &map, &ip, &port); + retVal___ = postHookFunc(retVal___, map, ip, port); } } return retVal___; @@ -2912,10 +2910,10 @@ int HP_chr_mapif_init(int fd) { retVal___ = HPMHooks.source.chr.mapif_init(fd); } if( HPMHooks.count.HP_chr_mapif_init_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_mapif_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_mapif_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -2939,10 +2937,10 @@ uint32 HP_chr_lan_subnet_check(uint32 ip) { retVal___ = HPMHooks.source.chr.lan_subnet_check(ip); } if( HPMHooks.count.HP_chr_lan_subnet_check_post ) { - uint32 (*postHookFunc) (uint32 retVal___, uint32 *ip); + uint32 (*postHookFunc) (uint32 retVal___, uint32 ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_lan_subnet_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_lan_subnet_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip); + retVal___ = postHookFunc(retVal___, ip); } } return retVal___; @@ -2965,10 +2963,10 @@ void HP_chr_delete2_ack(int fd, int char_id, uint32 result, time_t delete_date) HPMHooks.source.chr.delete2_ack(fd, char_id, result, delete_date); } if( HPMHooks.count.HP_chr_delete2_ack_post ) { - void (*postHookFunc) (int *fd, int *char_id, uint32 *result, time_t *delete_date); + void (*postHookFunc) (int fd, int char_id, uint32 result, time_t delete_date); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete2_ack_post[hIndex].func; - postHookFunc(&fd, &char_id, &result, &delete_date); + postHookFunc(fd, char_id, result, delete_date); } } return; @@ -2991,10 +2989,10 @@ void HP_chr_delete2_accept_actual_ack(int fd, int char_id, uint32 result) { HPMHooks.source.chr.delete2_accept_actual_ack(fd, char_id, result); } if( HPMHooks.count.HP_chr_delete2_accept_actual_ack_post ) { - void (*postHookFunc) (int *fd, int *char_id, uint32 *result); + void (*postHookFunc) (int fd, int char_id, uint32 result); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_accept_actual_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete2_accept_actual_ack_post[hIndex].func; - postHookFunc(&fd, &char_id, &result); + postHookFunc(fd, char_id, result); } } return; @@ -3017,10 +3015,10 @@ void HP_chr_delete2_accept_ack(int fd, int char_id, uint32 result) { HPMHooks.source.chr.delete2_accept_ack(fd, char_id, result); } if( HPMHooks.count.HP_chr_delete2_accept_ack_post ) { - void (*postHookFunc) (int *fd, int *char_id, uint32 *result); + void (*postHookFunc) (int fd, int char_id, uint32 result); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_accept_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete2_accept_ack_post[hIndex].func; - postHookFunc(&fd, &char_id, &result); + postHookFunc(fd, char_id, result); } } return; @@ -3043,10 +3041,10 @@ void HP_chr_delete2_cancel_ack(int fd, int char_id, uint32 result) { HPMHooks.source.chr.delete2_cancel_ack(fd, char_id, result); } if( HPMHooks.count.HP_chr_delete2_cancel_ack_post ) { - void (*postHookFunc) (int *fd, int *char_id, uint32 *result); + void (*postHookFunc) (int fd, int char_id, uint32 result); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_cancel_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete2_cancel_ack_post[hIndex].func; - postHookFunc(&fd, &char_id, &result); + postHookFunc(fd, char_id, result); } } return; @@ -3054,11 +3052,11 @@ void HP_chr_delete2_cancel_ack(int fd, int char_id, uint32 result) { void HP_chr_delete2_req(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_delete2_req_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_req_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_delete2_req_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3069,10 +3067,10 @@ void HP_chr_delete2_req(int fd, struct char_session_data *sd) { HPMHooks.source.chr.delete2_req(fd, sd); } if( HPMHooks.count.HP_chr_delete2_req_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_req_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete2_req_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3080,11 +3078,11 @@ void HP_chr_delete2_req(int fd, struct char_session_data *sd) { void HP_chr_delete2_accept(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_delete2_accept_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_accept_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_delete2_accept_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3095,10 +3093,10 @@ void HP_chr_delete2_accept(int fd, struct char_session_data *sd) { HPMHooks.source.chr.delete2_accept(fd, sd); } if( HPMHooks.count.HP_chr_delete2_accept_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_accept_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete2_accept_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3106,11 +3104,11 @@ void HP_chr_delete2_accept(int fd, struct char_session_data *sd) { void HP_chr_delete2_cancel(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_delete2_cancel_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_cancel_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_delete2_cancel_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3121,10 +3119,10 @@ void HP_chr_delete2_cancel(int fd, struct char_session_data *sd) { HPMHooks.source.chr.delete2_cancel(fd, sd); } if( HPMHooks.count.HP_chr_delete2_cancel_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete2_cancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete2_cancel_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3147,10 +3145,10 @@ void HP_chr_send_account_id(int fd, int account_id) { HPMHooks.source.chr.send_account_id(fd, account_id); } if( HPMHooks.count.HP_chr_send_account_id_post ) { - void (*postHookFunc) (int *fd, int *account_id); + void (*postHookFunc) (int fd, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_account_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_send_account_id_post[hIndex].func; - postHookFunc(&fd, &account_id); + postHookFunc(fd, account_id); } } return; @@ -3158,11 +3156,11 @@ void HP_chr_send_account_id(int fd, int account_id) { void HP_chr_parse_char_connect(int fd, struct char_session_data *sd, uint32 ipl) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_connect_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd, uint32 *ipl); + void (*preHookFunc) (int *fd, struct char_session_data **sd, uint32 *ipl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_connect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_connect_pre[hIndex].func; - preHookFunc(&fd, sd, &ipl); + preHookFunc(&fd, &sd, &ipl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3173,10 +3171,10 @@ void HP_chr_parse_char_connect(int fd, struct char_session_data *sd, uint32 ipl) HPMHooks.source.chr.parse_char_connect(fd, sd, ipl); } if( HPMHooks.count.HP_chr_parse_char_connect_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd, uint32 *ipl); + void (*postHookFunc) (int fd, struct char_session_data *sd, uint32 ipl); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_connect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_connect_post[hIndex].func; - postHookFunc(&fd, sd, &ipl); + postHookFunc(fd, sd, ipl); } } return; @@ -3184,11 +3182,11 @@ void HP_chr_parse_char_connect(int fd, struct char_session_data *sd, uint32 ipl) void HP_chr_send_map_info(int fd, int i, uint32 subnet_map_ip, struct mmo_charstatus *cd) { int hIndex = 0; if( HPMHooks.count.HP_chr_send_map_info_pre ) { - void (*preHookFunc) (int *fd, int *i, uint32 *subnet_map_ip, struct mmo_charstatus *cd); + void (*preHookFunc) (int *fd, int *i, uint32 *subnet_map_ip, struct mmo_charstatus **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_map_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_send_map_info_pre[hIndex].func; - preHookFunc(&fd, &i, &subnet_map_ip, cd); + preHookFunc(&fd, &i, &subnet_map_ip, &cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3199,10 +3197,10 @@ void HP_chr_send_map_info(int fd, int i, uint32 subnet_map_ip, struct mmo_charst HPMHooks.source.chr.send_map_info(fd, i, subnet_map_ip, cd); } if( HPMHooks.count.HP_chr_send_map_info_post ) { - void (*postHookFunc) (int *fd, int *i, uint32 *subnet_map_ip, struct mmo_charstatus *cd); + void (*postHookFunc) (int fd, int i, uint32 subnet_map_ip, struct mmo_charstatus *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_map_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_send_map_info_post[hIndex].func; - postHookFunc(&fd, &i, &subnet_map_ip, cd); + postHookFunc(fd, i, subnet_map_ip, cd); } } return; @@ -3225,10 +3223,10 @@ void HP_chr_send_wait_char_server(int fd) { HPMHooks.source.chr.send_wait_char_server(fd); } if( HPMHooks.count.HP_chr_send_wait_char_server_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_wait_char_server_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_send_wait_char_server_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3237,11 +3235,11 @@ int HP_chr_search_default_maps_mapserver(struct mmo_charstatus *cd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_search_default_maps_mapserver_pre ) { - int (*preHookFunc) (struct mmo_charstatus *cd); + int (*preHookFunc) (struct mmo_charstatus **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_search_default_maps_mapserver_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_search_default_maps_mapserver_pre[hIndex].func; - retVal___ = preHookFunc(cd); + retVal___ = preHookFunc(&cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3263,11 +3261,11 @@ int HP_chr_search_default_maps_mapserver(struct mmo_charstatus *cd) { void HP_chr_parse_char_select(int fd, struct char_session_data *sd, uint32 ipl) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_select_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd, uint32 *ipl); + void (*preHookFunc) (int *fd, struct char_session_data **sd, uint32 *ipl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_select_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_select_pre[hIndex].func; - preHookFunc(&fd, sd, &ipl); + preHookFunc(&fd, &sd, &ipl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3278,10 +3276,10 @@ void HP_chr_parse_char_select(int fd, struct char_session_data *sd, uint32 ipl) HPMHooks.source.chr.parse_char_select(fd, sd, ipl); } if( HPMHooks.count.HP_chr_parse_char_select_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd, uint32 *ipl); + void (*postHookFunc) (int fd, struct char_session_data *sd, uint32 ipl); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_select_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_select_post[hIndex].func; - postHookFunc(&fd, sd, &ipl); + postHookFunc(fd, sd, ipl); } } return; @@ -3304,10 +3302,10 @@ void HP_chr_creation_failed(int fd, int result) { HPMHooks.source.chr.creation_failed(fd, result); } if( HPMHooks.count.HP_chr_creation_failed_post ) { - void (*postHookFunc) (int *fd, int *result); + void (*postHookFunc) (int fd, int result); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_creation_failed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_creation_failed_post[hIndex].func; - postHookFunc(&fd, &result); + postHookFunc(fd, result); } } return; @@ -3315,11 +3313,11 @@ void HP_chr_creation_failed(int fd, int result) { void HP_chr_creation_ok(int fd, struct mmo_charstatus *char_dat) { int hIndex = 0; if( HPMHooks.count.HP_chr_creation_ok_pre ) { - void (*preHookFunc) (int *fd, struct mmo_charstatus *char_dat); + void (*preHookFunc) (int *fd, struct mmo_charstatus **char_dat); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_creation_ok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_creation_ok_pre[hIndex].func; - preHookFunc(&fd, char_dat); + preHookFunc(&fd, &char_dat); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3330,10 +3328,10 @@ void HP_chr_creation_ok(int fd, struct mmo_charstatus *char_dat) { HPMHooks.source.chr.creation_ok(fd, char_dat); } if( HPMHooks.count.HP_chr_creation_ok_post ) { - void (*postHookFunc) (int *fd, struct mmo_charstatus *char_dat); + void (*postHookFunc) (int fd, struct mmo_charstatus *char_dat); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_creation_ok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_creation_ok_post[hIndex].func; - postHookFunc(&fd, char_dat); + postHookFunc(fd, char_dat); } } return; @@ -3341,11 +3339,11 @@ void HP_chr_creation_ok(int fd, struct mmo_charstatus *char_dat) { void HP_chr_parse_char_create_new_char(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_create_new_char_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_create_new_char_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_create_new_char_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3356,10 +3354,10 @@ void HP_chr_parse_char_create_new_char(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_create_new_char(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_create_new_char_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_create_new_char_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_create_new_char_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3382,10 +3380,10 @@ void HP_chr_delete_char_failed(int fd, int flag) { HPMHooks.source.chr.delete_char_failed(fd, flag); } if( HPMHooks.count.HP_chr_delete_char_failed_post ) { - void (*postHookFunc) (int *fd, int *flag); + void (*postHookFunc) (int fd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete_char_failed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete_char_failed_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -3408,10 +3406,10 @@ void HP_chr_delete_char_ok(int fd) { HPMHooks.source.chr.delete_char_ok(fd); } if( HPMHooks.count.HP_chr_delete_char_ok_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_delete_char_ok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_delete_char_ok_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3419,11 +3417,11 @@ void HP_chr_delete_char_ok(int fd) { void HP_chr_parse_char_delete_char(int fd, struct char_session_data *sd, unsigned short cmd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_delete_char_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd, unsigned short *cmd); + void (*preHookFunc) (int *fd, struct char_session_data **sd, unsigned short *cmd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_delete_char_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_delete_char_pre[hIndex].func; - preHookFunc(&fd, sd, &cmd); + preHookFunc(&fd, &sd, &cmd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3434,10 +3432,10 @@ void HP_chr_parse_char_delete_char(int fd, struct char_session_data *sd, unsigne HPMHooks.source.chr.parse_char_delete_char(fd, sd, cmd); } if( HPMHooks.count.HP_chr_parse_char_delete_char_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd, unsigned short *cmd); + void (*postHookFunc) (int fd, struct char_session_data *sd, unsigned short cmd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_delete_char_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_delete_char_post[hIndex].func; - postHookFunc(&fd, sd, &cmd); + postHookFunc(fd, sd, cmd); } } return; @@ -3460,10 +3458,10 @@ void HP_chr_parse_char_ping(int fd) { HPMHooks.source.chr.parse_char_ping(fd); } if( HPMHooks.count.HP_chr_parse_char_ping_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_ping_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_ping_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3486,10 +3484,10 @@ void HP_chr_allow_rename(int fd, int flag) { HPMHooks.source.chr.allow_rename(fd, flag); } if( HPMHooks.count.HP_chr_allow_rename_post ) { - void (*postHookFunc) (int *fd, int *flag); + void (*postHookFunc) (int fd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_allow_rename_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_allow_rename_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -3497,11 +3495,11 @@ void HP_chr_allow_rename(int fd, int flag) { void HP_chr_parse_char_rename_char(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_rename_char_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_rename_char_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_rename_char_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3512,10 +3510,10 @@ void HP_chr_parse_char_rename_char(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_rename_char(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_rename_char_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_rename_char_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_rename_char_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3523,11 +3521,11 @@ void HP_chr_parse_char_rename_char(int fd, struct char_session_data *sd) { void HP_chr_parse_char_rename_char2(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_rename_char2_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_rename_char2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_rename_char2_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3538,10 +3536,10 @@ void HP_chr_parse_char_rename_char2(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_rename_char2(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_rename_char2_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_rename_char2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_rename_char2_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3564,10 +3562,10 @@ void HP_chr_rename_char_ack(int fd, int flag) { HPMHooks.source.chr.rename_char_ack(fd, flag); } if( HPMHooks.count.HP_chr_rename_char_ack_post ) { - void (*postHookFunc) (int *fd, int *flag); + void (*postHookFunc) (int fd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_rename_char_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_rename_char_ack_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -3575,11 +3573,11 @@ void HP_chr_rename_char_ack(int fd, int flag) { void HP_chr_parse_char_rename_char_confirm(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_rename_char_confirm_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_rename_char_confirm_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_rename_char_confirm_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3590,10 +3588,10 @@ void HP_chr_parse_char_rename_char_confirm(int fd, struct char_session_data *sd) HPMHooks.source.chr.parse_char_rename_char_confirm(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_rename_char_confirm_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_rename_char_confirm_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_rename_char_confirm_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3616,10 +3614,10 @@ void HP_chr_captcha_notsupported(int fd) { HPMHooks.source.chr.captcha_notsupported(fd); } if( HPMHooks.count.HP_chr_captcha_notsupported_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_captcha_notsupported_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_captcha_notsupported_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3642,10 +3640,10 @@ void HP_chr_parse_char_request_captcha(int fd) { HPMHooks.source.chr.parse_char_request_captcha(fd); } if( HPMHooks.count.HP_chr_parse_char_request_captcha_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_request_captcha_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_request_captcha_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3668,10 +3666,10 @@ void HP_chr_parse_char_check_captcha(int fd) { HPMHooks.source.chr.parse_char_check_captcha(fd); } if( HPMHooks.count.HP_chr_parse_char_check_captcha_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_check_captcha_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_check_captcha_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3679,11 +3677,11 @@ void HP_chr_parse_char_check_captcha(int fd) { void HP_chr_parse_char_delete2_req(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_delete2_req_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_delete2_req_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_delete2_req_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3694,10 +3692,10 @@ void HP_chr_parse_char_delete2_req(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_delete2_req(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_delete2_req_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_delete2_req_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_delete2_req_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3705,11 +3703,11 @@ void HP_chr_parse_char_delete2_req(int fd, struct char_session_data *sd) { void HP_chr_parse_char_delete2_accept(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_delete2_accept_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_delete2_accept_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_delete2_accept_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3720,10 +3718,10 @@ void HP_chr_parse_char_delete2_accept(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_delete2_accept(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_delete2_accept_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_delete2_accept_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_delete2_accept_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3731,11 +3729,11 @@ void HP_chr_parse_char_delete2_accept(int fd, struct char_session_data *sd) { void HP_chr_parse_char_delete2_cancel(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_delete2_cancel_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_delete2_cancel_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_delete2_cancel_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3746,10 +3744,10 @@ void HP_chr_parse_char_delete2_cancel(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_delete2_cancel(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_delete2_cancel_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_delete2_cancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_delete2_cancel_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3772,10 +3770,10 @@ void HP_chr_login_map_server_ack(int fd, uint8 flag) { HPMHooks.source.chr.login_map_server_ack(fd, flag); } if( HPMHooks.count.HP_chr_login_map_server_ack_post ) { - void (*postHookFunc) (int *fd, uint8 *flag); + void (*postHookFunc) (int fd, uint8 flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_login_map_server_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_login_map_server_ack_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -3798,10 +3796,10 @@ void HP_chr_parse_char_login_map_server(int fd, uint32 ipl) { HPMHooks.source.chr.parse_char_login_map_server(fd, ipl); } if( HPMHooks.count.HP_chr_parse_char_login_map_server_post ) { - void (*postHookFunc) (int *fd, uint32 *ipl); + void (*postHookFunc) (int fd, uint32 ipl); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_login_map_server_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_login_map_server_post[hIndex].func; - postHookFunc(&fd, &ipl); + postHookFunc(fd, ipl); } } return; @@ -3809,11 +3807,11 @@ void HP_chr_parse_char_login_map_server(int fd, uint32 ipl) { void HP_chr_parse_char_pincode_check(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_pincode_check_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_pincode_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_pincode_check_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3824,10 +3822,10 @@ void HP_chr_parse_char_pincode_check(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_pincode_check(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_pincode_check_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_pincode_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_pincode_check_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3835,11 +3833,11 @@ void HP_chr_parse_char_pincode_check(int fd, struct char_session_data *sd) { void HP_chr_parse_char_pincode_window(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_pincode_window_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_pincode_window_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_pincode_window_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3850,10 +3848,10 @@ void HP_chr_parse_char_pincode_window(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_pincode_window(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_pincode_window_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_pincode_window_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_pincode_window_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3861,11 +3859,11 @@ void HP_chr_parse_char_pincode_window(int fd, struct char_session_data *sd) { void HP_chr_parse_char_pincode_change(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_pincode_change_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_pincode_change_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_pincode_change_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3876,10 +3874,10 @@ void HP_chr_parse_char_pincode_change(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_pincode_change(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_pincode_change_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_pincode_change_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_pincode_change_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3887,11 +3885,11 @@ void HP_chr_parse_char_pincode_change(int fd, struct char_session_data *sd) { void HP_chr_parse_char_pincode_first_pin(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_pincode_first_pin_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_pincode_first_pin_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_pincode_first_pin_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3902,10 +3900,10 @@ void HP_chr_parse_char_pincode_first_pin(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_pincode_first_pin(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_pincode_first_pin_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_pincode_first_pin_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_pincode_first_pin_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3913,11 +3911,11 @@ void HP_chr_parse_char_pincode_first_pin(int fd, struct char_session_data *sd) { void HP_chr_parse_char_request_chars(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_request_chars_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_request_chars_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_request_chars_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3928,10 +3926,10 @@ void HP_chr_parse_char_request_chars(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_request_chars(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_request_chars_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_request_chars_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_request_chars_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -3954,10 +3952,10 @@ void HP_chr_change_character_slot_ack(int fd, bool ret) { HPMHooks.source.chr.change_character_slot_ack(fd, ret); } if( HPMHooks.count.HP_chr_change_character_slot_ack_post ) { - void (*postHookFunc) (int *fd, bool *ret); + void (*postHookFunc) (int fd, bool ret); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_change_character_slot_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_change_character_slot_ack_post[hIndex].func; - postHookFunc(&fd, &ret); + postHookFunc(fd, ret); } } return; @@ -3965,11 +3963,11 @@ void HP_chr_change_character_slot_ack(int fd, bool ret) { void HP_chr_parse_char_move_character(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_chr_parse_char_move_character_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_move_character_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_parse_char_move_character_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3980,10 +3978,10 @@ void HP_chr_parse_char_move_character(int fd, struct char_session_data *sd) { HPMHooks.source.chr.parse_char_move_character(fd, sd); } if( HPMHooks.count.HP_chr_parse_char_move_character_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_move_character_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_move_character_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -4007,10 +4005,10 @@ int HP_chr_parse_char_unknown_packet(int fd, uint32 ipl) { retVal___ = HPMHooks.source.chr.parse_char_unknown_packet(fd, ipl); } if( HPMHooks.count.HP_chr_parse_char_unknown_packet_post ) { - int (*postHookFunc) (int retVal___, int *fd, uint32 *ipl); + int (*postHookFunc) (int retVal___, int fd, uint32 ipl); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_unknown_packet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_unknown_packet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &ipl); + retVal___ = postHookFunc(retVal___, fd, ipl); } } return retVal___; @@ -4034,10 +4032,10 @@ int HP_chr_parse_char(int fd) { retVal___ = HPMHooks.source.chr.parse_char(fd); } if( HPMHooks.count.HP_chr_parse_char_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_parse_char_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_parse_char_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -4061,24 +4059,24 @@ int HP_chr_broadcast_user_count(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.chr.broadcast_user_count(tid, tick, id, data); } if( HPMHooks.count.HP_chr_broadcast_user_count_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_broadcast_user_count_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_broadcast_user_count_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -int HP_chr_send_accounts_tologin_sub(DBKey key, DBData *data, va_list ap) { +int HP_chr_send_accounts_tologin_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_send_accounts_tologin_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_accounts_tologin_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_chr_send_accounts_tologin_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -4092,11 +4090,11 @@ int HP_chr_send_accounts_tologin_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_chr_send_accounts_tologin_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_accounts_tologin_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_chr_send_accounts_tologin_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -4121,10 +4119,10 @@ int HP_chr_send_accounts_tologin(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.chr.send_accounts_tologin(tid, tick, id, data); } if( HPMHooks.count.HP_chr_send_accounts_tologin_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_accounts_tologin_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_send_accounts_tologin_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -4148,24 +4146,24 @@ int HP_chr_check_connect_login_server(int tid, int64 tick, int id, intptr_t data retVal___ = HPMHooks.source.chr.check_connect_login_server(tid, tick, id, data); } if( HPMHooks.count.HP_chr_check_connect_login_server_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_check_connect_login_server_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_check_connect_login_server_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -int HP_chr_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap) { +int HP_chr_online_data_cleanup_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_online_data_cleanup_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_online_data_cleanup_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_chr_online_data_cleanup_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -4179,11 +4177,11 @@ int HP_chr_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_chr_online_data_cleanup_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_online_data_cleanup_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_chr_online_data_cleanup_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -4208,10 +4206,10 @@ int HP_chr_online_data_cleanup(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.chr.online_data_cleanup(tid, tick, id, data); } if( HPMHooks.count.HP_chr_online_data_cleanup_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_online_data_cleanup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_online_data_cleanup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -4219,11 +4217,11 @@ int HP_chr_online_data_cleanup(int tid, int64 tick, int id, intptr_t data) { void HP_chr_sql_config_read(const char *cfgName) { int hIndex = 0; if( HPMHooks.count.HP_chr_sql_config_read_pre ) { - void (*preHookFunc) (const char *cfgName); + void (*preHookFunc) (const char **cfgName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_sql_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_sql_config_read_pre[hIndex].func; - preHookFunc(cfgName); + preHookFunc(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4245,11 +4243,11 @@ void HP_chr_sql_config_read(const char *cfgName) { void HP_chr_config_dispatch(char *w1, char *w2) { int hIndex = 0; if( HPMHooks.count.HP_chr_config_dispatch_pre ) { - void (*preHookFunc) (char *w1, char *w2); + void (*preHookFunc) (char **w1, char **w2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_config_dispatch_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_config_dispatch_pre[hIndex].func; - preHookFunc(w1, w2); + preHookFunc(&w1, &w2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4272,11 +4270,11 @@ int HP_chr_config_read(const char *cfgName) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_config_read_pre ) { - int (*preHookFunc) (const char *cfgName); + int (*preHookFunc) (const char **cfgName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_config_read_pre[hIndex].func; - retVal___ = preHookFunc(cfgName); + retVal___ = preHookFunc(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4295,7 +4293,7 @@ int HP_chr_config_read(const char *cfgName) { } return retVal___; } -/* cmdline */ +/* cmdline_interface */ void HP_cmdline_init(void) { int hIndex = 0; if( HPMHooks.count.HP_cmdline_init_pre ) { @@ -4352,11 +4350,11 @@ bool HP_cmdline_arg_add(unsigned int pluginID, const char *name, char shortname, int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_cmdline_arg_add_pre ) { - bool (*preHookFunc) (unsigned int *pluginID, const char *name, char *shortname, CmdlineExecFunc *func, const char *help, unsigned int *options); + bool (*preHookFunc) (unsigned int *pluginID, const char **name, char *shortname, CmdlineExecFunc *func, const char **help, unsigned int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_arg_add_pre[hIndex].func; - retVal___ = preHookFunc(&pluginID, name, &shortname, &func, help, &options); + retVal___ = preHookFunc(&pluginID, &name, &shortname, &func, &help, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4367,10 +4365,10 @@ bool HP_cmdline_arg_add(unsigned int pluginID, const char *name, char shortname, retVal___ = HPMHooks.source.cmdline.arg_add(pluginID, name, shortname, func, help, options); } if( HPMHooks.count.HP_cmdline_arg_add_post ) { - bool (*postHookFunc) (bool retVal___, unsigned int *pluginID, const char *name, char *shortname, CmdlineExecFunc *func, const char *help, unsigned int *options); + bool (*postHookFunc) (bool retVal___, unsigned int pluginID, const char *name, char shortname, CmdlineExecFunc func, const char *help, unsigned int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_cmdline_arg_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &pluginID, name, &shortname, &func, help, &options); + retVal___ = postHookFunc(retVal___, pluginID, name, shortname, func, help, options); } } return retVal___; @@ -4379,11 +4377,11 @@ int HP_cmdline_exec(int argc, char **argv, unsigned int options) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_cmdline_exec_pre ) { - int (*preHookFunc) (int *argc, char **argv, unsigned int *options); + int (*preHookFunc) (int *argc, char ***argv, unsigned int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_exec_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_exec_pre[hIndex].func; - retVal___ = preHookFunc(&argc, argv, &options); + retVal___ = preHookFunc(&argc, &argv, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4394,10 +4392,10 @@ int HP_cmdline_exec(int argc, char **argv, unsigned int options) { retVal___ = HPMHooks.source.cmdline.exec(argc, argv, options); } if( HPMHooks.count.HP_cmdline_exec_post ) { - int (*postHookFunc) (int retVal___, int *argc, char **argv, unsigned int *options); + int (*postHookFunc) (int retVal___, int argc, char **argv, unsigned int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_exec_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_cmdline_exec_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &argc, argv, &options); + retVal___ = postHookFunc(retVal___, argc, argv, options); } } return retVal___; @@ -4406,11 +4404,11 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_cmdline_arg_next_value_pre ) { - bool (*preHookFunc) (const char *name, int *current_arg, int *argc); + bool (*preHookFunc) (const char **name, int *current_arg, int *argc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_next_value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_arg_next_value_pre[hIndex].func; - retVal___ = preHookFunc(name, ¤t_arg, &argc); + retVal___ = preHookFunc(&name, ¤t_arg, &argc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4421,10 +4419,10 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { retVal___ = HPMHooks.source.cmdline.arg_next_value(name, current_arg, argc); } if( HPMHooks.count.HP_cmdline_arg_next_value_post ) { - bool (*postHookFunc) (bool retVal___, const char *name, int *current_arg, int *argc); + bool (*postHookFunc) (bool retVal___, const char *name, int current_arg, int argc); for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_next_value_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_cmdline_arg_next_value_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, ¤t_arg, &argc); + retVal___ = postHookFunc(retVal___, name, current_arg, argc); } } return retVal___; @@ -4433,11 +4431,11 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_cmdline_arg_source_pre ) { - const char* (*preHookFunc) (struct CmdlineArgData *arg); + const char* (*preHookFunc) (struct CmdlineArgData **arg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_arg_source_pre[hIndex].func; - retVal___ = preHookFunc(arg); + retVal___ = preHookFunc(&arg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4456,7 +4454,7 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { } return retVal___; } -/* console */ +/* console_interface */ void HP_console_init(void) { int hIndex = 0; if( HPMHooks.count.HP_console_init_pre ) { @@ -4561,7 +4559,7 @@ void HP_console_display_gplnotice(void) { } return; } -/* core */ +/* core_interface */ void HP_core_shutdown_callback(void) { int hIndex = 0; if( HPMHooks.count.HP_core_shutdown_callback_pre ) { @@ -4588,12 +4586,12 @@ void HP_core_shutdown_callback(void) { } return; } -/* DB */ -DBOptions HP_DB_fix_options(DBType type, DBOptions options) { +/* db_interface */ +enum DBOptions HP_DB_fix_options(enum DBType type, enum DBOptions options) { int hIndex = 0; - DBOptions retVal___ = DB_OPT_BASE; + enum DBOptions retVal___ = DB_OPT_BASE; if( HPMHooks.count.HP_DB_fix_options_pre ) { - DBOptions (*preHookFunc) (DBType *type, DBOptions *options); + enum DBOptions (*preHookFunc) (enum DBType *type, enum DBOptions *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_fix_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_fix_options_pre[hIndex].func; @@ -4608,19 +4606,19 @@ DBOptions HP_DB_fix_options(DBType type, DBOptions options) { retVal___ = HPMHooks.source.DB.fix_options(type, options); } if( HPMHooks.count.HP_DB_fix_options_post ) { - DBOptions (*postHookFunc) (DBOptions retVal___, DBType *type, DBOptions *options); + enum DBOptions (*postHookFunc) (enum DBOptions retVal___, enum DBType type, enum DBOptions options); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_fix_options_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_fix_options_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type, &options); + retVal___ = postHookFunc(retVal___, type, options); } } return retVal___; } -DBComparator HP_DB_default_cmp(DBType type) { +DBComparator HP_DB_default_cmp(enum DBType type) { int hIndex = 0; DBComparator retVal___ = NULL; if( HPMHooks.count.HP_DB_default_cmp_pre ) { - DBComparator (*preHookFunc) (DBType *type); + DBComparator (*preHookFunc) (enum DBType *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_cmp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_default_cmp_pre[hIndex].func; @@ -4635,19 +4633,19 @@ DBComparator HP_DB_default_cmp(DBType type) { retVal___ = HPMHooks.source.DB.default_cmp(type); } if( HPMHooks.count.HP_DB_default_cmp_post ) { - DBComparator (*postHookFunc) (DBComparator retVal___, DBType *type); + DBComparator (*postHookFunc) (DBComparator retVal___, enum DBType type); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_cmp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_default_cmp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; } -DBHasher HP_DB_default_hash(DBType type) { +DBHasher HP_DB_default_hash(enum DBType type) { int hIndex = 0; DBHasher retVal___ = NULL; if( HPMHooks.count.HP_DB_default_hash_pre ) { - DBHasher (*preHookFunc) (DBType *type); + DBHasher (*preHookFunc) (enum DBType *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_hash_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_default_hash_pre[hIndex].func; @@ -4662,19 +4660,19 @@ DBHasher HP_DB_default_hash(DBType type) { retVal___ = HPMHooks.source.DB.default_hash(type); } if( HPMHooks.count.HP_DB_default_hash_post ) { - DBHasher (*postHookFunc) (DBHasher retVal___, DBType *type); + DBHasher (*postHookFunc) (DBHasher retVal___, enum DBType type); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_hash_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_default_hash_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; } -DBReleaser HP_DB_default_release(DBType type, DBOptions options) { +DBReleaser HP_DB_default_release(enum DBType type, enum DBOptions options) { int hIndex = 0; DBReleaser retVal___ = NULL; if( HPMHooks.count.HP_DB_default_release_pre ) { - DBReleaser (*preHookFunc) (DBType *type, DBOptions *options); + DBReleaser (*preHookFunc) (enum DBType *type, enum DBOptions *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_release_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_default_release_pre[hIndex].func; @@ -4689,19 +4687,19 @@ DBReleaser HP_DB_default_release(DBType type, DBOptions options) { retVal___ = HPMHooks.source.DB.default_release(type, options); } if( HPMHooks.count.HP_DB_default_release_post ) { - DBReleaser (*postHookFunc) (DBReleaser retVal___, DBType *type, DBOptions *options); + DBReleaser (*postHookFunc) (DBReleaser retVal___, enum DBType type, enum DBOptions options); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_release_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_default_release_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type, &options); + retVal___ = postHookFunc(retVal___, type, options); } } return retVal___; } -DBReleaser HP_DB_custom_release(DBRelease which) { +DBReleaser HP_DB_custom_release(enum DBReleaseOption which) { int hIndex = 0; DBReleaser retVal___ = NULL; if( HPMHooks.count.HP_DB_custom_release_pre ) { - DBReleaser (*preHookFunc) (DBRelease *which); + DBReleaser (*preHookFunc) (enum DBReleaseOption *which); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_custom_release_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_custom_release_pre[hIndex].func; @@ -4716,23 +4714,23 @@ DBReleaser HP_DB_custom_release(DBRelease which) { retVal___ = HPMHooks.source.DB.custom_release(which); } if( HPMHooks.count.HP_DB_custom_release_post ) { - DBReleaser (*postHookFunc) (DBReleaser retVal___, DBRelease *which); + DBReleaser (*postHookFunc) (DBReleaser retVal___, enum DBReleaseOption which); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_custom_release_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_custom_release_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &which); + retVal___ = postHookFunc(retVal___, which); } } return retVal___; } -DBMap* HP_DB_alloc(const char *file, const char *func, int line, DBType type, DBOptions options, unsigned short maxlen) { +struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { int hIndex = 0; - DBMap* retVal___ = NULL; + struct DBMap* retVal___ = NULL; if( HPMHooks.count.HP_DB_alloc_pre ) { - DBMap* (*preHookFunc) (const char *file, const char *func, int *line, DBType *type, DBOptions *options, unsigned short *maxlen); + struct DBMap* (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_alloc_pre[hIndex].func; - retVal___ = preHookFunc(file, func, &line, &type, &options, &maxlen); + retVal___ = preHookFunc(&file, &func, &line, &type, &options, &maxlen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4743,20 +4741,19 @@ DBMap* HP_DB_alloc(const char *file, const char *func, int line, DBType type, DB retVal___ = HPMHooks.source.DB.alloc(file, func, line, type, options, maxlen); } if( HPMHooks.count.HP_DB_alloc_post ) { - DBMap* (*postHookFunc) (DBMap* retVal___, const char *file, const char *func, int *line, DBType *type, DBOptions *options, unsigned short *maxlen); + struct DBMap* (*postHookFunc) (struct DBMap* retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_alloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, file, func, &line, &type, &options, &maxlen); + retVal___ = postHookFunc(retVal___, file, func, line, type, options, maxlen); } } return retVal___; } -DBKey HP_DB_i2key(int key) { +union DBKey HP_DB_i2key(int key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_i2key_pre ) { - DBKey (*preHookFunc) (int *key); + union DBKey (*preHookFunc) (int *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_i2key_pre[hIndex].func; @@ -4771,20 +4768,19 @@ DBKey HP_DB_i2key(int key) { retVal___ = HPMHooks.source.DB.i2key(key); } if( HPMHooks.count.HP_DB_i2key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, int *key); + union DBKey (*postHookFunc) (union DBKey retVal___, int key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_i2key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBKey HP_DB_ui2key(unsigned int key) { +union DBKey HP_DB_ui2key(unsigned int key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ui2key_pre ) { - DBKey (*preHookFunc) (unsigned int *key); + union DBKey (*preHookFunc) (unsigned int *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ui2key_pre[hIndex].func; @@ -4799,24 +4795,23 @@ DBKey HP_DB_ui2key(unsigned int key) { retVal___ = HPMHooks.source.DB.ui2key(key); } if( HPMHooks.count.HP_DB_ui2key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, unsigned int *key); + union DBKey (*postHookFunc) (union DBKey retVal___, unsigned int key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ui2key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBKey HP_DB_str2key(const char *key) { +union DBKey HP_DB_str2key(const char *key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_str2key_pre ) { - DBKey (*preHookFunc) (const char *key); + union DBKey (*preHookFunc) (const char **key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_str2key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_str2key_pre[hIndex].func; - retVal___ = preHookFunc(key); + retVal___ = preHookFunc(&key); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4827,7 +4822,7 @@ DBKey HP_DB_str2key(const char *key) { retVal___ = HPMHooks.source.DB.str2key(key); } if( HPMHooks.count.HP_DB_str2key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, const char *key); + union DBKey (*postHookFunc) (union DBKey retVal___, const char *key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_str2key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_str2key_post[hIndex].func; retVal___ = postHookFunc(retVal___, key); @@ -4835,12 +4830,11 @@ DBKey HP_DB_str2key(const char *key) { } return retVal___; } -DBKey HP_DB_i642key(int64 key) { +union DBKey HP_DB_i642key(int64 key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_i642key_pre ) { - DBKey (*preHookFunc) (int64 *key); + union DBKey (*preHookFunc) (int64 *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i642key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_i642key_pre[hIndex].func; @@ -4855,20 +4849,19 @@ DBKey HP_DB_i642key(int64 key) { retVal___ = HPMHooks.source.DB.i642key(key); } if( HPMHooks.count.HP_DB_i642key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, int64 *key); + union DBKey (*postHookFunc) (union DBKey retVal___, int64 key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i642key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_i642key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBKey HP_DB_ui642key(uint64 key) { +union DBKey HP_DB_ui642key(uint64 key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ui642key_pre ) { - DBKey (*preHookFunc) (uint64 *key); + union DBKey (*preHookFunc) (uint64 *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui642key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ui642key_pre[hIndex].func; @@ -4883,20 +4876,19 @@ DBKey HP_DB_ui642key(uint64 key) { retVal___ = HPMHooks.source.DB.ui642key(key); } if( HPMHooks.count.HP_DB_ui642key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, uint64 *key); + union DBKey (*postHookFunc) (union DBKey retVal___, uint64 key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui642key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ui642key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBData HP_DB_i2data(int data) { +struct DBData HP_DB_i2data(int data) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_DB_i2data_pre ) { - DBData (*preHookFunc) (int *data); + struct DBData (*preHookFunc) (int *data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_i2data_pre[hIndex].func; @@ -4911,20 +4903,19 @@ DBData HP_DB_i2data(int data) { retVal___ = HPMHooks.source.DB.i2data(data); } if( HPMHooks.count.HP_DB_i2data_post ) { - DBData (*postHookFunc) (DBData retVal___, int *data); + struct DBData (*postHookFunc) (struct DBData retVal___, int data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_i2data_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &data); + retVal___ = postHookFunc(retVal___, data); } } return retVal___; } -DBData HP_DB_ui2data(unsigned int data) { +struct DBData HP_DB_ui2data(unsigned int data) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ui2data_pre ) { - DBData (*preHookFunc) (unsigned int *data); + struct DBData (*preHookFunc) (unsigned int *data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ui2data_pre[hIndex].func; @@ -4939,24 +4930,23 @@ DBData HP_DB_ui2data(unsigned int data) { retVal___ = HPMHooks.source.DB.ui2data(data); } if( HPMHooks.count.HP_DB_ui2data_post ) { - DBData (*postHookFunc) (DBData retVal___, unsigned int *data); + struct DBData (*postHookFunc) (struct DBData retVal___, unsigned int data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ui2data_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &data); + retVal___ = postHookFunc(retVal___, data); } } return retVal___; } -DBData HP_DB_ptr2data(void *data) { +struct DBData HP_DB_ptr2data(void *data) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ptr2data_pre ) { - DBData (*preHookFunc) (void *data); + struct DBData (*preHookFunc) (void **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ptr2data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ptr2data_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4967,7 +4957,7 @@ DBData HP_DB_ptr2data(void *data) { retVal___ = HPMHooks.source.DB.ptr2data(data); } if( HPMHooks.count.HP_DB_ptr2data_post ) { - DBData (*postHookFunc) (DBData retVal___, void *data); + struct DBData (*postHookFunc) (struct DBData retVal___, void *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ptr2data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ptr2data_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -4975,15 +4965,15 @@ DBData HP_DB_ptr2data(void *data) { } return retVal___; } -int HP_DB_data2i(DBData *data) { +int HP_DB_data2i(struct DBData *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_DB_data2i_pre ) { - int (*preHookFunc) (DBData *data); + int (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2i_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_data2i_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4994,7 +4984,7 @@ int HP_DB_data2i(DBData *data) { retVal___ = HPMHooks.source.DB.data2i(data); } if( HPMHooks.count.HP_DB_data2i_post ) { - int (*postHookFunc) (int retVal___, DBData *data); + int (*postHookFunc) (int retVal___, struct DBData *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2i_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_data2i_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -5002,15 +4992,15 @@ int HP_DB_data2i(DBData *data) { } return retVal___; } -unsigned int HP_DB_data2ui(DBData *data) { +unsigned int HP_DB_data2ui(struct DBData *data) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_DB_data2ui_pre ) { - unsigned int (*preHookFunc) (DBData *data); + unsigned int (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ui_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_data2ui_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5021,7 +5011,7 @@ unsigned int HP_DB_data2ui(DBData *data) { retVal___ = HPMHooks.source.DB.data2ui(data); } if( HPMHooks.count.HP_DB_data2ui_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, DBData *data); + unsigned int (*postHookFunc) (unsigned int retVal___, struct DBData *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ui_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_data2ui_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -5029,15 +5019,15 @@ unsigned int HP_DB_data2ui(DBData *data) { } return retVal___; } -void* HP_DB_data2ptr(DBData *data) { +void* HP_DB_data2ptr(struct DBData *data) { int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_DB_data2ptr_pre ) { - void* (*preHookFunc) (DBData *data); + void* (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_data2ptr_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5048,7 +5038,7 @@ void* HP_DB_data2ptr(DBData *data) { retVal___ = HPMHooks.source.DB.data2ptr(data); } if( HPMHooks.count.HP_DB_data2ptr_post ) { - void* (*postHookFunc) (void* retVal___, DBData *data); + void* (*postHookFunc) (void* retVal___, struct DBData *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_data2ptr_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -5108,7 +5098,7 @@ void HP_DB_final(void) { } return; } -/* geoip */ +/* geoip_interface */ const char* HP_geoip_getcountry(uint32 ipnum) { int hIndex = 0; const char* retVal___ = NULL; @@ -5128,10 +5118,10 @@ const char* HP_geoip_getcountry(uint32 ipnum) { retVal___ = HPMHooks.source.geoip.getcountry(ipnum); } if( HPMHooks.count.HP_geoip_getcountry_post ) { - const char* (*postHookFunc) (const char* retVal___, uint32 *ipnum); + const char* (*postHookFunc) (const char* retVal___, uint32 ipnum); for(hIndex = 0; hIndex < HPMHooks.count.HP_geoip_getcountry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_geoip_getcountry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ipnum); + retVal___ = postHookFunc(retVal___, ipnum); } } return retVal___; @@ -5154,10 +5144,10 @@ void HP_geoip_final(bool shutdown) { HPMHooks.source.geoip.final(shutdown); } if( HPMHooks.count.HP_geoip_final_post ) { - void (*postHookFunc) (bool *shutdown); + void (*postHookFunc) (bool shutdown); for(hIndex = 0; hIndex < HPMHooks.count.HP_geoip_final_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_geoip_final_post[hIndex].func; - postHookFunc(&shutdown); + postHookFunc(shutdown); } } return; @@ -5188,7 +5178,7 @@ void HP_geoip_init(void) { } return; } -/* inter_auction */ +/* inter_auction_interface */ int HP_inter_auction_count(int char_id, bool buy) { int hIndex = 0; int retVal___ = 0; @@ -5208,10 +5198,10 @@ int HP_inter_auction_count(int char_id, bool buy) { retVal___ = HPMHooks.source.inter_auction.count(char_id, buy); } if( HPMHooks.count.HP_inter_auction_count_post ) { - int (*postHookFunc) (int retVal___, int *char_id, bool *buy); + int (*postHookFunc) (int retVal___, int char_id, bool buy); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_auction_count_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_auction_count_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &buy); + retVal___ = postHookFunc(retVal___, char_id, buy); } } return retVal___; @@ -5219,11 +5209,11 @@ int HP_inter_auction_count(int char_id, bool buy) { void HP_inter_auction_save(struct auction_data *auction) { int hIndex = 0; if( HPMHooks.count.HP_inter_auction_save_pre ) { - void (*preHookFunc) (struct auction_data *auction); + void (*preHookFunc) (struct auction_data **auction); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_auction_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_auction_save_pre[hIndex].func; - preHookFunc(auction); + preHookFunc(&auction); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5246,11 +5236,11 @@ unsigned int HP_inter_auction_create(struct auction_data *auction) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_inter_auction_create_pre ) { - unsigned int (*preHookFunc) (struct auction_data *auction); + unsigned int (*preHookFunc) (struct auction_data **auction); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_auction_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_auction_create_pre[hIndex].func; - retVal___ = preHookFunc(auction); + retVal___ = preHookFunc(&auction); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5288,10 +5278,10 @@ int HP_inter_auction_end_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.inter_auction.end_timer(tid, tick, id, data); } if( HPMHooks.count.HP_inter_auction_end_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_auction_end_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_auction_end_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -5299,11 +5289,11 @@ int HP_inter_auction_end_timer(int tid, int64 tick, int id, intptr_t data) { void HP_inter_auction_delete_(struct auction_data *auction) { int hIndex = 0; if( HPMHooks.count.HP_inter_auction_delete__pre ) { - void (*preHookFunc) (struct auction_data *auction); + void (*preHookFunc) (struct auction_data **auction); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_auction_delete__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_auction_delete__pre[hIndex].func; - preHookFunc(auction); + preHookFunc(&auction); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5367,10 +5357,10 @@ int HP_inter_auction_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_auction.parse_frommap(fd); } if( HPMHooks.count.HP_inter_auction_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_auction_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_auction_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -5428,7 +5418,7 @@ void HP_inter_auction_sql_final(void) { } return; } -/* inter_elemental */ +/* inter_elemental_interface */ void HP_inter_elemental_sql_init(void) { int hIndex = 0; if( HPMHooks.count.HP_inter_elemental_sql_init_pre ) { @@ -5500,15 +5490,15 @@ int HP_inter_elemental_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_elemental.parse_frommap(fd); } if( HPMHooks.count.HP_inter_elemental_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_elemental_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_elemental_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; } -/* inter_guild */ +/* inter_guild_interface */ int HP_inter_guild_save_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; @@ -5528,10 +5518,10 @@ int HP_inter_guild_save_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.inter_guild.save_timer(tid, tick, id, data); } if( HPMHooks.count.HP_inter_guild_save_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_save_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_save_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -5555,10 +5545,10 @@ int HP_inter_guild_removemember_tosql(int account_id, int char_id) { retVal___ = HPMHooks.source.inter_guild.removemember_tosql(account_id, char_id); } if( HPMHooks.count.HP_inter_guild_removemember_tosql_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_removemember_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_removemember_tosql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, account_id, char_id); } } return retVal___; @@ -5567,11 +5557,11 @@ int HP_inter_guild_tosql(struct guild *g, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_guild_tosql_pre ) { - int (*preHookFunc) (struct guild *g, int *flag); + int (*preHookFunc) (struct guild **g, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_guild_tosql_pre[hIndex].func; - retVal___ = preHookFunc(g, &flag); + retVal___ = preHookFunc(&g, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5582,10 +5572,10 @@ int HP_inter_guild_tosql(struct guild *g, int flag) { retVal___ = HPMHooks.source.inter_guild.tosql(g, flag); } if( HPMHooks.count.HP_inter_guild_tosql_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *flag); + int (*postHookFunc) (int retVal___, struct guild *g, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_tosql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &flag); + retVal___ = postHookFunc(retVal___, g, flag); } } return retVal___; @@ -5609,10 +5599,10 @@ struct guild* HP_inter_guild_fromsql(int guild_id) { retVal___ = HPMHooks.source.inter_guild.fromsql(guild_id); } if( HPMHooks.count.HP_inter_guild_fromsql_post ) { - struct guild* (*postHookFunc) (struct guild* retVal___, int *guild_id); + struct guild* (*postHookFunc) (struct guild* retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; @@ -5621,11 +5611,11 @@ int HP_inter_guild_castle_tosql(struct guild_castle *gc) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_guild_castle_tosql_pre ) { - int (*preHookFunc) (struct guild_castle *gc); + int (*preHookFunc) (struct guild_castle **gc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_castle_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_guild_castle_tosql_pre[hIndex].func; - retVal___ = preHookFunc(gc); + retVal___ = preHookFunc(&gc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5663,10 +5653,10 @@ struct guild_castle* HP_inter_guild_castle_fromsql(int castle_id) { retVal___ = HPMHooks.source.inter_guild.castle_fromsql(castle_id); } if( HPMHooks.count.HP_inter_guild_castle_fromsql_post ) { - struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, int *castle_id); + struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, int castle_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_castle_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_castle_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &castle_id); + retVal___ = postHookFunc(retVal___, castle_id); } } return retVal___; @@ -5675,11 +5665,11 @@ bool HP_inter_guild_exp_parse_row(char *split[], int column, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_inter_guild_exp_parse_row_pre ) { - bool (*preHookFunc) (char *split[], int *column, int *current); + bool (*preHookFunc) (char **split[], int *column, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_exp_parse_row_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_guild_exp_parse_row_pre[hIndex].func; - retVal___ = preHookFunc(split, &column, ¤t); + retVal___ = preHookFunc(&split, &column, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5690,10 +5680,10 @@ bool HP_inter_guild_exp_parse_row(char *split[], int column, int current) { retVal___ = HPMHooks.source.inter_guild.exp_parse_row(split, column, current); } if( HPMHooks.count.HP_inter_guild_exp_parse_row_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *column, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int column, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_exp_parse_row_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_exp_parse_row_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &column, ¤t); + retVal___ = postHookFunc(retVal___, split, column, current); } } return retVal___; @@ -5717,10 +5707,10 @@ int HP_inter_guild_CharOnline(int char_id, int guild_id) { retVal___ = HPMHooks.source.inter_guild.CharOnline(char_id, guild_id); } if( HPMHooks.count.HP_inter_guild_CharOnline_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *guild_id); + int (*postHookFunc) (int retVal___, int char_id, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_CharOnline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_CharOnline_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &guild_id); + retVal___ = postHookFunc(retVal___, char_id, guild_id); } } return retVal___; @@ -5744,10 +5734,10 @@ int HP_inter_guild_CharOffline(int char_id, int guild_id) { retVal___ = HPMHooks.source.inter_guild.CharOffline(char_id, guild_id); } if( HPMHooks.count.HP_inter_guild_CharOffline_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *guild_id); + int (*postHookFunc) (int retVal___, int char_id, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_CharOffline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_CharOffline_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &guild_id); + retVal___ = postHookFunc(retVal___, char_id, guild_id); } } return retVal___; @@ -5779,16 +5769,16 @@ int HP_inter_guild_sql_init(void) { } return retVal___; } -int HP_inter_guild_db_final(DBKey key, DBData *data, va_list ap) { +int HP_inter_guild_db_final(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_guild_db_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_db_final_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_inter_guild_db_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -5802,11 +5792,11 @@ int HP_inter_guild_db_final(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_inter_guild_db_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_db_final_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_inter_guild_db_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -5842,11 +5832,11 @@ int HP_inter_guild_search_guildname(const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_guild_search_guildname_pre ) { - int (*preHookFunc) (const char *str); + int (*preHookFunc) (const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_search_guildname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_guild_search_guildname_pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5869,11 +5859,11 @@ bool HP_inter_guild_check_empty(struct guild *g) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_inter_guild_check_empty_pre ) { - bool (*preHookFunc) (struct guild *g); + bool (*preHookFunc) (struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_check_empty_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_guild_check_empty_pre[hIndex].func; - retVal___ = preHookFunc(g); + retVal___ = preHookFunc(&g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5911,10 +5901,10 @@ unsigned int HP_inter_guild_nextexp(int level) { retVal___ = HPMHooks.source.inter_guild.nextexp(level); } if( HPMHooks.count.HP_inter_guild_nextexp_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, int *level); + unsigned int (*postHookFunc) (unsigned int retVal___, int level); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_nextexp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_nextexp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &level); + retVal___ = postHookFunc(retVal___, level); } } return retVal___; @@ -5923,11 +5913,11 @@ int HP_inter_guild_checkskill(struct guild *g, int id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_guild_checkskill_pre ) { - int (*preHookFunc) (struct guild *g, int *id); + int (*preHookFunc) (struct guild **g, int *id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_checkskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_guild_checkskill_pre[hIndex].func; - retVal___ = preHookFunc(g, &id); + retVal___ = preHookFunc(&g, &id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5938,10 +5928,10 @@ int HP_inter_guild_checkskill(struct guild *g, int id) { retVal___ = HPMHooks.source.inter_guild.checkskill(g, id); } if( HPMHooks.count.HP_inter_guild_checkskill_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *id); + int (*postHookFunc) (int retVal___, struct guild *g, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_checkskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_checkskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &id); + retVal___ = postHookFunc(retVal___, g, id); } } return retVal___; @@ -5950,11 +5940,11 @@ int HP_inter_guild_calcinfo(struct guild *g) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_guild_calcinfo_pre ) { - int (*preHookFunc) (struct guild *g); + int (*preHookFunc) (struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_calcinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_guild_calcinfo_pre[hIndex].func; - retVal___ = preHookFunc(g); + retVal___ = preHookFunc(&g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5992,10 +5982,10 @@ int HP_inter_guild_sex_changed(int guild_id, int account_id, int char_id, short retVal___ = HPMHooks.source.inter_guild.sex_changed(guild_id, account_id, char_id, gender); } if( HPMHooks.count.HP_inter_guild_sex_changed_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, short *gender); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, short gender); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_sex_changed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_sex_changed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &gender); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, gender); } } return retVal___; @@ -6004,11 +5994,11 @@ int HP_inter_guild_charname_changed(int guild_id, int account_id, int char_id, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_guild_charname_changed_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, char *name); + int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_charname_changed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_guild_charname_changed_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &account_id, &char_id, name); + retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6019,10 +6009,10 @@ int HP_inter_guild_charname_changed(int guild_id, int account_id, int char_id, c retVal___ = HPMHooks.source.inter_guild.charname_changed(guild_id, account_id, char_id, name); } if( HPMHooks.count.HP_inter_guild_charname_changed_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, char *name); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_charname_changed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_charname_changed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, name); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, name); } } return retVal___; @@ -6046,10 +6036,10 @@ int HP_inter_guild_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_guild.parse_frommap(fd); } if( HPMHooks.count.HP_inter_guild_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -6073,10 +6063,10 @@ int HP_inter_guild_leave(int guild_id, int account_id, int char_id) { retVal___ = HPMHooks.source.inter_guild.leave(guild_id, account_id, char_id); } if( HPMHooks.count.HP_inter_guild_leave_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_leave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_leave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id); } } return retVal___; @@ -6100,15 +6090,15 @@ int HP_inter_guild_broken(int guild_id) { retVal___ = HPMHooks.source.inter_guild.broken(guild_id); } if( HPMHooks.count.HP_inter_guild_broken_post ) { - int (*postHookFunc) (int retVal___, int *guild_id); + int (*postHookFunc) (int retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_broken_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_broken_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; } -/* inter_homunculus */ +/* inter_homunculus_interface */ int HP_inter_homunculus_sql_init(void) { int hIndex = 0; int retVal___ = 0; @@ -6181,15 +6171,15 @@ int HP_inter_homunculus_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_homunculus.parse_frommap(fd); } if( HPMHooks.count.HP_inter_homunculus_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_homunculus_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_homunculus_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; } -/* inter */ +/* inter_interface */ const char* HP_inter_msg_txt(int msg_number) { int hIndex = 0; const char* retVal___ = NULL; @@ -6209,10 +6199,10 @@ const char* HP_inter_msg_txt(int msg_number) { retVal___ = HPMHooks.source.inter.msg_txt(msg_number); } if( HPMHooks.count.HP_inter_msg_txt_post ) { - const char* (*postHookFunc) (const char* retVal___, int *msg_number); + const char* (*postHookFunc) (const char* retVal___, int msg_number); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_msg_txt_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_msg_txt_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &msg_number); + retVal___ = postHookFunc(retVal___, msg_number); } } return retVal___; @@ -6221,11 +6211,11 @@ bool HP_inter_msg_config_read(const char *cfg_name, bool allow_override) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_inter_msg_config_read_pre ) { - bool (*preHookFunc) (const char *cfg_name, bool *allow_override); + bool (*preHookFunc) (const char **cfg_name, bool *allow_override); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_msg_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_msg_config_read_pre[hIndex].func; - retVal___ = preHookFunc(cfg_name, &allow_override); + retVal___ = preHookFunc(&cfg_name, &allow_override); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6236,10 +6226,10 @@ bool HP_inter_msg_config_read(const char *cfg_name, bool allow_override) { retVal___ = HPMHooks.source.inter.msg_config_read(cfg_name, allow_override); } if( HPMHooks.count.HP_inter_msg_config_read_post ) { - bool (*postHookFunc) (bool retVal___, const char *cfg_name, bool *allow_override); + bool (*postHookFunc) (bool retVal___, const char *cfg_name, bool allow_override); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_msg_config_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_msg_config_read_post[hIndex].func; - retVal___ = postHookFunc(retVal___, cfg_name, &allow_override); + retVal___ = postHookFunc(retVal___, cfg_name, allow_override); } } return retVal___; @@ -6289,10 +6279,10 @@ const char* HP_inter_job_name(int class_) { retVal___ = HPMHooks.source.inter.job_name(class_); } if( HPMHooks.count.HP_inter_job_name_post ) { - const char* (*postHookFunc) (const char* retVal___, int *class_); + const char* (*postHookFunc) (const char* retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_job_name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_job_name_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -6300,12 +6290,12 @@ const char* HP_inter_job_name(int class_) { void HP_inter_vmsg_to_fd(int fd, int u_fd, int aid, char *msg, va_list ap) { int hIndex = 0; if( HPMHooks.count.HP_inter_vmsg_to_fd_pre ) { - void (*preHookFunc) (int *fd, int *u_fd, int *aid, char *msg, va_list ap); + void (*preHookFunc) (int *fd, int *u_fd, int *aid, char **msg, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_vmsg_to_fd_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_inter_vmsg_to_fd_pre[hIndex].func; - preHookFunc(&fd, &u_fd, &aid, msg, ap___copy); + preHookFunc(&fd, &u_fd, &aid, &msg, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -6319,11 +6309,11 @@ void HP_inter_vmsg_to_fd(int fd, int u_fd, int aid, char *msg, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_inter_vmsg_to_fd_post ) { - void (*postHookFunc) (int *fd, int *u_fd, int *aid, char *msg, va_list ap); + void (*postHookFunc) (int fd, int u_fd, int aid, char *msg, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_vmsg_to_fd_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_inter_vmsg_to_fd_post[hIndex].func; - postHookFunc(&fd, &u_fd, &aid, msg, ap___copy); + postHookFunc(fd, u_fd, aid, msg, ap___copy); va_end(ap___copy); } } @@ -6332,11 +6322,11 @@ void HP_inter_vmsg_to_fd(int fd, int u_fd, int aid, char *msg, va_list ap) { void HP_inter_savereg(int account_id, int char_id, const char *key, unsigned int index, intptr_t val, bool is_string) { int hIndex = 0; if( HPMHooks.count.HP_inter_savereg_pre ) { - void (*preHookFunc) (int *account_id, int *char_id, const char *key, unsigned int *index, intptr_t *val, bool *is_string); + void (*preHookFunc) (int *account_id, int *char_id, const char **key, unsigned int *index, intptr_t *val, bool *is_string); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_savereg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_savereg_pre[hIndex].func; - preHookFunc(&account_id, &char_id, key, &index, &val, &is_string); + preHookFunc(&account_id, &char_id, &key, &index, &val, &is_string); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6347,10 +6337,10 @@ void HP_inter_savereg(int account_id, int char_id, const char *key, unsigned int HPMHooks.source.inter.savereg(account_id, char_id, key, index, val, is_string); } if( HPMHooks.count.HP_inter_savereg_post ) { - void (*postHookFunc) (int *account_id, int *char_id, const char *key, unsigned int *index, intptr_t *val, bool *is_string); + void (*postHookFunc) (int account_id, int char_id, const char *key, unsigned int index, intptr_t val, bool is_string); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_savereg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_savereg_post[hIndex].func; - postHookFunc(&account_id, &char_id, key, &index, &val, &is_string); + postHookFunc(account_id, char_id, key, index, val, is_string); } } return; @@ -6374,10 +6364,10 @@ int HP_inter_accreg_fromsql(int account_id, int char_id, int fd, int type) { retVal___ = HPMHooks.source.inter.accreg_fromsql(account_id, char_id, fd, type); } if( HPMHooks.count.HP_inter_accreg_fromsql_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *char_id, int *fd, int *type); + int (*postHookFunc) (int retVal___, int account_id, int char_id, int fd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_accreg_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_accreg_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &char_id, &fd, &type); + retVal___ = postHookFunc(retVal___, account_id, char_id, fd, type); } } return retVal___; @@ -6386,11 +6376,11 @@ int HP_inter_config_read(const char *cfgName) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_config_read_pre ) { - int (*preHookFunc) (const char *cfgName); + int (*preHookFunc) (const char **cfgName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_config_read_pre[hIndex].func; - retVal___ = preHookFunc(cfgName); + retVal___ = preHookFunc(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6413,12 +6403,12 @@ int HP_inter_vlog(char *fmt, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_vlog_pre ) { - int (*preHookFunc) (char *fmt, va_list ap); + int (*preHookFunc) (char **fmt, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_vlog_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_inter_vlog_pre[hIndex].func; - retVal___ = preHookFunc(fmt, ap___copy); + retVal___ = preHookFunc(&fmt, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -6446,11 +6436,11 @@ int HP_inter_init_sql(const char *file) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_init_sql_pre ) { - int (*preHookFunc) (const char *file); + int (*preHookFunc) (const char **file); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_init_sql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_init_sql_pre[hIndex].func; - retVal___ = preHookFunc(file); + retVal___ = preHookFunc(&file); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6488,24 +6478,24 @@ int HP_inter_mapif_init(int fd) { retVal___ = HPMHooks.source.inter.mapif_init(fd); } if( HPMHooks.count.HP_inter_mapif_init_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mapif_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mapif_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; } -int HP_inter_check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap) { +int HP_inter_check_ttl_wisdata_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_check_ttl_wisdata_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_check_ttl_wisdata_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_inter_check_ttl_wisdata_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -6519,11 +6509,11 @@ int HP_inter_check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_inter_check_ttl_wisdata_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_check_ttl_wisdata_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_inter_check_ttl_wisdata_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -6575,10 +6565,10 @@ int HP_inter_check_length(int fd, int length) { retVal___ = HPMHooks.source.inter.check_length(fd, length); } if( HPMHooks.count.HP_inter_check_length_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *length); + int (*postHookFunc) (int retVal___, int fd, int length); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_check_length_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_check_length_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &length); + retVal___ = postHookFunc(retVal___, fd, length); } } return retVal___; @@ -6602,10 +6592,10 @@ int HP_inter_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter.parse_frommap(fd); } if( HPMHooks.count.HP_inter_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -6636,7 +6626,7 @@ void HP_inter_final(void) { } return; } -/* inter_mail */ +/* inter_mail_interface */ int HP_inter_mail_sql_init(void) { int hIndex = 0; int retVal___ = 0; @@ -6709,10 +6699,10 @@ int HP_inter_mail_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_mail.parse_frommap(fd); } if( HPMHooks.count.HP_inter_mail_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mail_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mail_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -6721,11 +6711,11 @@ int HP_inter_mail_fromsql(int char_id, struct mail_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_mail_fromsql_pre ) { - int (*preHookFunc) (int *char_id, struct mail_data *md); + int (*preHookFunc) (int *char_id, struct mail_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mail_fromsql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_mail_fromsql_pre[hIndex].func; - retVal___ = preHookFunc(&char_id, md); + retVal___ = preHookFunc(&char_id, &md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6736,10 +6726,10 @@ int HP_inter_mail_fromsql(int char_id, struct mail_data *md) { retVal___ = HPMHooks.source.inter_mail.fromsql(char_id, md); } if( HPMHooks.count.HP_inter_mail_fromsql_post ) { - int (*postHookFunc) (int retVal___, int *char_id, struct mail_data *md); + int (*postHookFunc) (int retVal___, int char_id, struct mail_data *md); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mail_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mail_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, md); + retVal___ = postHookFunc(retVal___, char_id, md); } } return retVal___; @@ -6748,11 +6738,11 @@ int HP_inter_mail_savemessage(struct mail_message *msg) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_mail_savemessage_pre ) { - int (*preHookFunc) (struct mail_message *msg); + int (*preHookFunc) (struct mail_message **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mail_savemessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_mail_savemessage_pre[hIndex].func; - retVal___ = preHookFunc(msg); + retVal___ = preHookFunc(&msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6775,11 +6765,11 @@ bool HP_inter_mail_loadmessage(int mail_id, struct mail_message *msg) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_inter_mail_loadmessage_pre ) { - bool (*preHookFunc) (int *mail_id, struct mail_message *msg); + bool (*preHookFunc) (int *mail_id, struct mail_message **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mail_loadmessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_mail_loadmessage_pre[hIndex].func; - retVal___ = preHookFunc(&mail_id, msg); + retVal___ = preHookFunc(&mail_id, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6790,10 +6780,10 @@ bool HP_inter_mail_loadmessage(int mail_id, struct mail_message *msg) { retVal___ = HPMHooks.source.inter_mail.loadmessage(mail_id, msg); } if( HPMHooks.count.HP_inter_mail_loadmessage_post ) { - bool (*postHookFunc) (bool retVal___, int *mail_id, struct mail_message *msg); + bool (*postHookFunc) (bool retVal___, int mail_id, struct mail_message *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mail_loadmessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mail_loadmessage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &mail_id, msg); + retVal___ = postHookFunc(retVal___, mail_id, msg); } } return retVal___; @@ -6817,10 +6807,10 @@ bool HP_inter_mail_DeleteAttach(int mail_id) { retVal___ = HPMHooks.source.inter_mail.DeleteAttach(mail_id); } if( HPMHooks.count.HP_inter_mail_DeleteAttach_post ) { - bool (*postHookFunc) (bool retVal___, int *mail_id); + bool (*postHookFunc) (bool retVal___, int mail_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mail_DeleteAttach_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mail_DeleteAttach_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &mail_id); + retVal___ = postHookFunc(retVal___, mail_id); } } return retVal___; @@ -6828,11 +6818,11 @@ bool HP_inter_mail_DeleteAttach(int mail_id) { void HP_inter_mail_sendmail(int send_id, const char *send_name, int dest_id, const char *dest_name, const char *title, const char *body, int zeny, struct item *item) { int hIndex = 0; if( HPMHooks.count.HP_inter_mail_sendmail_pre ) { - void (*preHookFunc) (int *send_id, const char *send_name, int *dest_id, const char *dest_name, const char *title, const char *body, int *zeny, struct item *item); + void (*preHookFunc) (int *send_id, const char **send_name, int *dest_id, const char **dest_name, const char **title, const char **body, int *zeny, struct item **item); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mail_sendmail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_mail_sendmail_pre[hIndex].func; - preHookFunc(&send_id, send_name, &dest_id, dest_name, title, body, &zeny, item); + preHookFunc(&send_id, &send_name, &dest_id, &dest_name, &title, &body, &zeny, &item); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6843,24 +6833,24 @@ void HP_inter_mail_sendmail(int send_id, const char *send_name, int dest_id, con HPMHooks.source.inter_mail.sendmail(send_id, send_name, dest_id, dest_name, title, body, zeny, item); } if( HPMHooks.count.HP_inter_mail_sendmail_post ) { - void (*postHookFunc) (int *send_id, const char *send_name, int *dest_id, const char *dest_name, const char *title, const char *body, int *zeny, struct item *item); + void (*postHookFunc) (int send_id, const char *send_name, int dest_id, const char *dest_name, const char *title, const char *body, int zeny, struct item *item); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mail_sendmail_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mail_sendmail_post[hIndex].func; - postHookFunc(&send_id, send_name, &dest_id, dest_name, title, body, &zeny, item); + postHookFunc(send_id, send_name, dest_id, dest_name, title, body, zeny, item); } } return; } -/* inter_mercenary */ +/* inter_mercenary_interface */ bool HP_inter_mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_inter_mercenary_owner_fromsql_pre ) { - bool (*preHookFunc) (int *char_id, struct mmo_charstatus *status); + bool (*preHookFunc) (int *char_id, struct mmo_charstatus **status); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mercenary_owner_fromsql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_mercenary_owner_fromsql_pre[hIndex].func; - retVal___ = preHookFunc(&char_id, status); + retVal___ = preHookFunc(&char_id, &status); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6871,10 +6861,10 @@ bool HP_inter_mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status retVal___ = HPMHooks.source.inter_mercenary.owner_fromsql(char_id, status); } if( HPMHooks.count.HP_inter_mercenary_owner_fromsql_post ) { - bool (*postHookFunc) (bool retVal___, int *char_id, struct mmo_charstatus *status); + bool (*postHookFunc) (bool retVal___, int char_id, struct mmo_charstatus *status); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mercenary_owner_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mercenary_owner_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, status); + retVal___ = postHookFunc(retVal___, char_id, status); } } return retVal___; @@ -6883,11 +6873,11 @@ bool HP_inter_mercenary_owner_tosql(int char_id, struct mmo_charstatus *status) int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_inter_mercenary_owner_tosql_pre ) { - bool (*preHookFunc) (int *char_id, struct mmo_charstatus *status); + bool (*preHookFunc) (int *char_id, struct mmo_charstatus **status); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mercenary_owner_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_mercenary_owner_tosql_pre[hIndex].func; - retVal___ = preHookFunc(&char_id, status); + retVal___ = preHookFunc(&char_id, &status); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6898,10 +6888,10 @@ bool HP_inter_mercenary_owner_tosql(int char_id, struct mmo_charstatus *status) retVal___ = HPMHooks.source.inter_mercenary.owner_tosql(char_id, status); } if( HPMHooks.count.HP_inter_mercenary_owner_tosql_post ) { - bool (*postHookFunc) (bool retVal___, int *char_id, struct mmo_charstatus *status); + bool (*postHookFunc) (bool retVal___, int char_id, struct mmo_charstatus *status); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mercenary_owner_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mercenary_owner_tosql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, status); + retVal___ = postHookFunc(retVal___, char_id, status); } } return retVal___; @@ -6925,10 +6915,10 @@ bool HP_inter_mercenary_owner_delete(int char_id) { retVal___ = HPMHooks.source.inter_mercenary.owner_delete(char_id); } if( HPMHooks.count.HP_inter_mercenary_owner_delete_post ) { - bool (*postHookFunc) (bool retVal___, int *char_id); + bool (*postHookFunc) (bool retVal___, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mercenary_owner_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mercenary_owner_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id); + retVal___ = postHookFunc(retVal___, char_id); } } return retVal___; @@ -7005,24 +6995,24 @@ int HP_inter_mercenary_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_mercenary.parse_frommap(fd); } if( HPMHooks.count.HP_inter_mercenary_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_mercenary_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_mercenary_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; } -/* inter_party */ +/* inter_party_interface */ int HP_inter_party_check_lv(struct party_data *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_party_check_lv_pre ) { - int (*preHookFunc) (struct party_data *p); + int (*preHookFunc) (struct party_data **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_check_lv_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_party_check_lv_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7044,11 +7034,11 @@ int HP_inter_party_check_lv(struct party_data *p) { void HP_inter_party_calc_state(struct party_data *p) { int hIndex = 0; if( HPMHooks.count.HP_inter_party_calc_state_pre ) { - void (*preHookFunc) (struct party_data *p); + void (*preHookFunc) (struct party_data **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_calc_state_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_party_calc_state_pre[hIndex].func; - preHookFunc(p); + preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7071,11 +7061,11 @@ int HP_inter_party_tosql(struct party *p, int flag, int index) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_party_tosql_pre ) { - int (*preHookFunc) (struct party *p, int *flag, int *index); + int (*preHookFunc) (struct party **p, int *flag, int *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_party_tosql_pre[hIndex].func; - retVal___ = preHookFunc(p, &flag, &index); + retVal___ = preHookFunc(&p, &flag, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7086,10 +7076,10 @@ int HP_inter_party_tosql(struct party *p, int flag, int index) { retVal___ = HPMHooks.source.inter_party.tosql(p, flag, index); } if( HPMHooks.count.HP_inter_party_tosql_post ) { - int (*postHookFunc) (int retVal___, struct party *p, int *flag, int *index); + int (*postHookFunc) (int retVal___, struct party *p, int flag, int index); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_party_tosql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &flag, &index); + retVal___ = postHookFunc(retVal___, p, flag, index); } } return retVal___; @@ -7113,10 +7103,10 @@ struct party_data* HP_inter_party_fromsql(int party_id) { retVal___ = HPMHooks.source.inter_party.fromsql(party_id); } if( HPMHooks.count.HP_inter_party_fromsql_post ) { - struct party_data* (*postHookFunc) (struct party_data* retVal___, int *party_id); + struct party_data* (*postHookFunc) (struct party_data* retVal___, int party_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_party_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id); + retVal___ = postHookFunc(retVal___, party_id); } } return retVal___; @@ -7178,11 +7168,11 @@ struct party_data* HP_inter_party_search_partyname(const char *str) { int hIndex = 0; struct party_data* retVal___ = NULL; if( HPMHooks.count.HP_inter_party_search_partyname_pre ) { - struct party_data* (*preHookFunc) (const char *str); + struct party_data* (*preHookFunc) (const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_search_partyname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_party_search_partyname_pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7205,11 +7195,11 @@ int HP_inter_party_check_exp_share(struct party_data *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_party_check_exp_share_pre ) { - int (*preHookFunc) (struct party_data *p); + int (*preHookFunc) (struct party_data **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_check_exp_share_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_party_check_exp_share_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7232,11 +7222,11 @@ int HP_inter_party_check_empty(struct party_data *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_party_check_empty_pre ) { - int (*preHookFunc) (struct party_data *p); + int (*preHookFunc) (struct party_data **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_check_empty_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_party_check_empty_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7274,10 +7264,10 @@ int HP_inter_party_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_party.parse_frommap(fd); } if( HPMHooks.count.HP_inter_party_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_party_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -7301,10 +7291,10 @@ int HP_inter_party_leave(int party_id, int account_id, int char_id) { retVal___ = HPMHooks.source.inter_party.leave(party_id, account_id, char_id); } if( HPMHooks.count.HP_inter_party_leave_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int party_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_leave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_party_leave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, party_id, account_id, char_id); } } return retVal___; @@ -7328,10 +7318,10 @@ int HP_inter_party_CharOnline(int char_id, int party_id) { retVal___ = HPMHooks.source.inter_party.CharOnline(char_id, party_id); } if( HPMHooks.count.HP_inter_party_CharOnline_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *party_id); + int (*postHookFunc) (int retVal___, int char_id, int party_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_CharOnline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_party_CharOnline_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &party_id); + retVal___ = postHookFunc(retVal___, char_id, party_id); } } return retVal___; @@ -7355,24 +7345,24 @@ int HP_inter_party_CharOffline(int char_id, int party_id) { retVal___ = HPMHooks.source.inter_party.CharOffline(char_id, party_id); } if( HPMHooks.count.HP_inter_party_CharOffline_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *party_id); + int (*postHookFunc) (int retVal___, int char_id, int party_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_CharOffline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_party_CharOffline_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &party_id); + retVal___ = postHookFunc(retVal___, char_id, party_id); } } return retVal___; } -/* inter_pet */ +/* inter_pet_interface */ int HP_inter_pet_tosql(const struct s_pet *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_pet_tosql_pre ) { - int (*preHookFunc) (const struct s_pet *p); + int (*preHookFunc) (const struct s_pet **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_pet_tosql_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7395,11 +7385,11 @@ int HP_inter_pet_fromsql(int pet_id, struct s_pet *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_pet_fromsql_pre ) { - int (*preHookFunc) (int *pet_id, struct s_pet *p); + int (*preHookFunc) (int *pet_id, struct s_pet **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_fromsql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_pet_fromsql_pre[hIndex].func; - retVal___ = preHookFunc(&pet_id, p); + retVal___ = preHookFunc(&pet_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7410,10 +7400,10 @@ int HP_inter_pet_fromsql(int pet_id, struct s_pet *p) { retVal___ = HPMHooks.source.inter_pet.fromsql(pet_id, p); } if( HPMHooks.count.HP_inter_pet_fromsql_post ) { - int (*postHookFunc) (int retVal___, int *pet_id, struct s_pet *p); + int (*postHookFunc) (int retVal___, int pet_id, struct s_pet *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_pet_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &pet_id, p); + retVal___ = postHookFunc(retVal___, pet_id, p); } } return retVal___; @@ -7490,10 +7480,10 @@ int HP_inter_pet_delete_(int pet_id) { retVal___ = HPMHooks.source.inter_pet.delete_(pet_id); } if( HPMHooks.count.HP_inter_pet_delete__post ) { - int (*postHookFunc) (int retVal___, int *pet_id); + int (*postHookFunc) (int retVal___, int pet_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_delete__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_pet_delete__post[hIndex].func; - retVal___ = postHookFunc(retVal___, &pet_id); + retVal___ = postHookFunc(retVal___, pet_id); } } return retVal___; @@ -7517,15 +7507,15 @@ int HP_inter_pet_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_pet.parse_frommap(fd); } if( HPMHooks.count.HP_inter_pet_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_pet_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; } -/* inter_quest */ +/* inter_quest_interface */ int HP_inter_quest_parse_frommap(int fd) { int hIndex = 0; int retVal___ = 0; @@ -7545,24 +7535,24 @@ int HP_inter_quest_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_quest.parse_frommap(fd); } if( HPMHooks.count.HP_inter_quest_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_quest_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_quest_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; } -/* inter_storage */ +/* inter_storage_interface */ int HP_inter_storage_tosql(int account_id, struct storage_data *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_storage_tosql_pre ) { - int (*preHookFunc) (int *account_id, struct storage_data *p); + int (*preHookFunc) (int *account_id, struct storage_data **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_storage_tosql_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, p); + retVal___ = preHookFunc(&account_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7573,10 +7563,10 @@ int HP_inter_storage_tosql(int account_id, struct storage_data *p) { retVal___ = HPMHooks.source.inter_storage.tosql(account_id, p); } if( HPMHooks.count.HP_inter_storage_tosql_post ) { - int (*postHookFunc) (int retVal___, int *account_id, struct storage_data *p); + int (*postHookFunc) (int retVal___, int account_id, struct storage_data *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_storage_tosql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, p); + retVal___ = postHookFunc(retVal___, account_id, p); } } return retVal___; @@ -7585,11 +7575,11 @@ int HP_inter_storage_fromsql(int account_id, struct storage_data *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_storage_fromsql_pre ) { - int (*preHookFunc) (int *account_id, struct storage_data *p); + int (*preHookFunc) (int *account_id, struct storage_data **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_fromsql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_storage_fromsql_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, p); + retVal___ = preHookFunc(&account_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7600,10 +7590,10 @@ int HP_inter_storage_fromsql(int account_id, struct storage_data *p) { retVal___ = HPMHooks.source.inter_storage.fromsql(account_id, p); } if( HPMHooks.count.HP_inter_storage_fromsql_post ) { - int (*postHookFunc) (int retVal___, int *account_id, struct storage_data *p); + int (*postHookFunc) (int retVal___, int account_id, struct storage_data *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_storage_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, p); + retVal___ = postHookFunc(retVal___, account_id, p); } } return retVal___; @@ -7612,11 +7602,11 @@ int HP_inter_storage_guild_storage_tosql(int guild_id, const struct guild_storag int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_storage_guild_storage_tosql_pre ) { - int (*preHookFunc) (int *guild_id, const struct guild_storage *p); + int (*preHookFunc) (int *guild_id, const struct guild_storage **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_guild_storage_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_storage_guild_storage_tosql_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, p); + retVal___ = preHookFunc(&guild_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7627,10 +7617,10 @@ int HP_inter_storage_guild_storage_tosql(int guild_id, const struct guild_storag retVal___ = HPMHooks.source.inter_storage.guild_storage_tosql(guild_id, p); } if( HPMHooks.count.HP_inter_storage_guild_storage_tosql_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, const struct guild_storage *p); + int (*postHookFunc) (int retVal___, int guild_id, const struct guild_storage *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_guild_storage_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_storage_guild_storage_tosql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, p); + retVal___ = postHookFunc(retVal___, guild_id, p); } } return retVal___; @@ -7639,11 +7629,11 @@ int HP_inter_storage_guild_storage_fromsql(int guild_id, struct guild_storage *p int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_storage_guild_storage_fromsql_pre ) { - int (*preHookFunc) (int *guild_id, struct guild_storage *p); + int (*preHookFunc) (int *guild_id, struct guild_storage **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_guild_storage_fromsql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_storage_guild_storage_fromsql_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, p); + retVal___ = preHookFunc(&guild_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7654,10 +7644,10 @@ int HP_inter_storage_guild_storage_fromsql(int guild_id, struct guild_storage *p retVal___ = HPMHooks.source.inter_storage.guild_storage_fromsql(guild_id, p); } if( HPMHooks.count.HP_inter_storage_guild_storage_fromsql_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, struct guild_storage *p); + int (*postHookFunc) (int retVal___, int guild_id, struct guild_storage *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_guild_storage_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_storage_guild_storage_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, p); + retVal___ = postHookFunc(retVal___, guild_id, p); } } return retVal___; @@ -7734,10 +7724,10 @@ int HP_inter_storage_delete_(int account_id) { retVal___ = HPMHooks.source.inter_storage.delete_(account_id); } if( HPMHooks.count.HP_inter_storage_delete__post ) { - int (*postHookFunc) (int retVal___, int *account_id); + int (*postHookFunc) (int retVal___, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_delete__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_storage_delete__post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id); + retVal___ = postHookFunc(retVal___, account_id); } } return retVal___; @@ -7761,10 +7751,10 @@ int HP_inter_storage_guild_storage_delete(int guild_id) { retVal___ = HPMHooks.source.inter_storage.guild_storage_delete(guild_id); } if( HPMHooks.count.HP_inter_storage_guild_storage_delete_post ) { - int (*postHookFunc) (int retVal___, int *guild_id); + int (*postHookFunc) (int retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_guild_storage_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_storage_guild_storage_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; @@ -7788,24 +7778,24 @@ int HP_inter_storage_parse_frommap(int fd) { retVal___ = HPMHooks.source.inter_storage.parse_frommap(fd); } if( HPMHooks.count.HP_inter_storage_parse_frommap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_parse_frommap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_storage_parse_frommap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; } -/* libconfig */ +/* libconfig_interface */ int HP_libconfig_read(struct config_t *config, FILE *stream) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_pre ) { - int (*preHookFunc) (struct config_t *config, FILE *stream); + int (*preHookFunc) (struct config_t **config, FILE **stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func; - retVal___ = preHookFunc(config, stream); + retVal___ = preHookFunc(&config, &stream); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7827,11 +7817,11 @@ int HP_libconfig_read(struct config_t *config, FILE *stream) { void HP_libconfig_write(const struct config_t *config, FILE *stream) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_write_pre ) { - void (*preHookFunc) (const struct config_t *config, FILE *stream); + void (*preHookFunc) (const struct config_t **config, FILE **stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func; - preHookFunc(config, stream); + preHookFunc(&config, &stream); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7853,11 +7843,11 @@ void HP_libconfig_write(const struct config_t *config, FILE *stream) { void HP_libconfig_set_options(struct config_t *config, int options) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_options_pre ) { - void (*preHookFunc) (struct config_t *config, int *options); + void (*preHookFunc) (struct config_t **config, int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func; - preHookFunc(config, &options); + preHookFunc(&config, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7868,10 +7858,10 @@ void HP_libconfig_set_options(struct config_t *config, int options) { HPMHooks.source.libconfig.set_options(config, options); } if( HPMHooks.count.HP_libconfig_set_options_post ) { - void (*postHookFunc) (struct config_t *config, int *options); + void (*postHookFunc) (struct config_t *config, int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func; - postHookFunc(config, &options); + postHookFunc(config, options); } } return; @@ -7880,11 +7870,11 @@ int HP_libconfig_get_options(const struct config_t *config) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_get_options_pre ) { - int (*preHookFunc) (const struct config_t *config); + int (*preHookFunc) (const struct config_t **config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func; - retVal___ = preHookFunc(config); + retVal___ = preHookFunc(&config); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7907,11 +7897,11 @@ int HP_libconfig_read_string(struct config_t *config, const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_string_pre ) { - int (*preHookFunc) (struct config_t *config, const char *str); + int (*preHookFunc) (struct config_t **config, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func; - retVal___ = preHookFunc(config, str); + retVal___ = preHookFunc(&config, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7934,11 +7924,11 @@ int HP_libconfig_read_file_src(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_file_src_pre ) { - int (*preHookFunc) (struct config_t *config, const char *filename); + int (*preHookFunc) (struct config_t **config, const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func; - retVal___ = preHookFunc(config, filename); + retVal___ = preHookFunc(&config, &filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7961,11 +7951,11 @@ int HP_libconfig_write_file(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_write_file_pre ) { - int (*preHookFunc) (struct config_t *config, const char *filename); + int (*preHookFunc) (struct config_t **config, const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func; - retVal___ = preHookFunc(config, filename); + retVal___ = preHookFunc(&config, &filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7987,11 +7977,11 @@ int HP_libconfig_write_file(struct config_t *config, const char *filename) { void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_destructor_pre ) { - void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *)); + void (*preHookFunc) (struct config_t **config, void ( **destructor ) (void *)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func; - preHookFunc(config, destructor); + preHookFunc(&config, &destructor); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8013,11 +8003,11 @@ void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) ( void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) { - void (*preHookFunc) (struct config_t *config, const char *include_dir); + void (*preHookFunc) (struct config_t **config, const char **include_dir); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func; - preHookFunc(config, include_dir); + preHookFunc(&config, &include_dir); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8039,11 +8029,11 @@ void HP_libconfig_set_include_dir(struct config_t *config, const char *include_d void HP_libconfig_init(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_init_pre ) { - void (*preHookFunc) (struct config_t *config); + void (*preHookFunc) (struct config_t **config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func; - preHookFunc(config); + preHookFunc(&config); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8065,11 +8055,11 @@ void HP_libconfig_init(struct config_t *config) { void HP_libconfig_destroy(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_destroy_pre ) { - void (*preHookFunc) (struct config_t *config); + void (*preHookFunc) (struct config_t **config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func; - preHookFunc(config); + preHookFunc(&config); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8092,11 +8082,11 @@ int HP_libconfig_setting_get_int(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8119,11 +8109,11 @@ long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) { - long long (*preHookFunc) (const struct config_setting_t *setting); + long long (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8146,11 +8136,11 @@ double HP_libconfig_setting_get_float(const struct config_setting_t *setting) { int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) { - double (*preHookFunc) (const struct config_setting_t *setting); + double (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8173,11 +8163,11 @@ int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8200,11 +8190,11 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) { - const char* (*preHookFunc) (const struct config_setting_t *setting); + const char* (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8227,11 +8217,11 @@ struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *se int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; - retVal___ = preHookFunc(setting, name); + retVal___ = preHookFunc(&setting, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8254,11 +8244,11 @@ int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, cons int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8281,11 +8271,11 @@ int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, long long **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8308,11 +8298,11 @@ int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, double **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8335,11 +8325,11 @@ int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, con int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8362,11 +8352,11 @@ int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, const char ***value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8389,11 +8379,11 @@ int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t **setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8404,10 +8394,10 @@ int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -8416,11 +8406,11 @@ int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long v int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, long long *value); + int (*preHookFunc) (struct config_setting_t **setting, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8431,10 +8421,10 @@ int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long v retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -8443,11 +8433,11 @@ int HP_libconfig_setting_set_float(struct config_setting_t *setting, double valu int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, double *value); + int (*preHookFunc) (struct config_setting_t **setting, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8458,10 +8448,10 @@ int HP_libconfig_setting_set_float(struct config_setting_t *setting, double valu retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -8470,11 +8460,11 @@ int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t **setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8485,10 +8475,10 @@ int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -8497,11 +8487,11 @@ int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, const char *value); + int (*preHookFunc) (struct config_setting_t **setting, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func; - retVal___ = preHookFunc(setting, value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8524,11 +8514,11 @@ int HP_libconfig_setting_set_format(struct config_setting_t *setting, short form int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, short *format); + int (*preHookFunc) (struct config_setting_t **setting, short *format); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func; - retVal___ = preHookFunc(setting, &format); + retVal___ = preHookFunc(&setting, &format); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8539,10 +8529,10 @@ int HP_libconfig_setting_set_format(struct config_setting_t *setting, short form retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format); } if( HPMHooks.count.HP_libconfig_setting_set_format_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short format); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &format); + retVal___ = postHookFunc(retVal___, setting, format); } } return retVal___; @@ -8551,11 +8541,11 @@ short HP_libconfig_setting_get_format(const struct config_setting_t *setting) { int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) { - short (*preHookFunc) (const struct config_setting_t *setting); + short (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8578,11 +8568,11 @@ int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8593,10 +8583,10 @@ int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, in retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) { - int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -8605,11 +8595,11 @@ long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *set int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) { - long long (*preHookFunc) (const struct config_setting_t *setting, int *idx); + long long (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8620,10 +8610,10 @@ long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *set retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) { - long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx); + long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -8632,11 +8622,11 @@ double HP_libconfig_setting_get_float_elem(const struct config_setting_t *settin int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) { - double (*preHookFunc) (const struct config_setting_t *setting, int *idx); + double (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8647,10 +8637,10 @@ double HP_libconfig_setting_get_float_elem(const struct config_setting_t *settin retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) { - double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx); + double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -8659,11 +8649,11 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8674,10 +8664,10 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) { - int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -8686,11 +8676,11 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) { - const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx); + const char* (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8701,10 +8691,10 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx); + const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -8713,11 +8703,11 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8728,10 +8718,10 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -8740,11 +8730,11 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8755,10 +8745,10 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, long long value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -8767,11 +8757,11 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8782,10 +8772,10 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, double value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -8794,11 +8784,11 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8809,10 +8799,10 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -8821,11 +8811,11 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8836,10 +8826,10 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, const char *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -8848,11 +8838,11 @@ int HP_libconfig_setting_index(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_index_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8875,11 +8865,11 @@ int HP_libconfig_setting_length(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_length_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8902,11 +8892,11 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8917,10 +8907,10 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -8929,11 +8919,11 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; - retVal___ = preHookFunc(setting, name); + retVal___ = preHookFunc(&setting, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8956,11 +8946,11 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_add_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; - retVal___ = preHookFunc(parent, name, &type); + retVal___ = preHookFunc(&parent, &name, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8971,10 +8961,10 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if( HPMHooks.count.HP_libconfig_setting_add_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, parent, name, &type); + retVal___ = postHookFunc(retVal___, parent, name, type); } } return retVal___; @@ -8983,11 +8973,11 @@ int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *nam int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_pre ) { - int (*preHookFunc) (struct config_setting_t *parent, const char *name); + int (*preHookFunc) (struct config_setting_t **parent, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func; - retVal___ = preHookFunc(parent, name); + retVal___ = preHookFunc(&parent, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9010,11 +9000,11 @@ int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) { - int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx); + int (*preHookFunc) (struct config_setting_t **parent, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func; - retVal___ = preHookFunc(parent, &idx); + retVal___ = preHookFunc(&parent, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9025,10 +9015,10 @@ int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned i retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx); } if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, parent, &idx); + retVal___ = postHookFunc(retVal___, parent, idx); } } return retVal___; @@ -9036,11 +9026,11 @@ int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned i void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) { - void (*preHookFunc) (struct config_setting_t *setting, void *hook); + void (*preHookFunc) (struct config_setting_t **setting, void **hook); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func; - preHookFunc(setting, hook); + preHookFunc(&setting, &hook); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9063,11 +9053,11 @@ struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, cons int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_lookup_pre ) { - struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath); + struct config_setting_t* (*preHookFunc) (const struct config_t **config, const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath); + retVal___ = preHookFunc(&config, &filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9090,11 +9080,11 @@ int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9117,11 +9107,11 @@ int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepat int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, long long **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9144,11 +9134,11 @@ int HP_libconfig_lookup_float(const struct config_t *config, const char *filepat int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_float_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, double **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9171,11 +9161,11 @@ int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9198,11 +9188,11 @@ int HP_libconfig_lookup_string(const struct config_t *config, const char *filepa int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_string_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, const char ***value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9225,11 +9215,11 @@ int HP_libconfig_load_file(struct config_t *config, const char *config_filename) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_load_file_pre ) { - int (*preHookFunc) (struct config_t *config, const char *config_filename); + int (*preHookFunc) (struct config_t **config, const char **config_filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func; - retVal___ = preHookFunc(config, config_filename); + retVal___ = preHookFunc(&config, &config_filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9251,11 +9241,11 @@ int HP_libconfig_load_file(struct config_t *config, const char *config_filename) void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) { - void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func; - preHookFunc(parent, src); + preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9277,11 +9267,11 @@ void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const str void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) { - void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func; - preHookFunc(parent, src); + preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9303,11 +9293,11 @@ void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struc void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) { - void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func; - preHookFunc(parent, src); + preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9330,11 +9320,11 @@ int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct conf int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_copy_pre ) { - int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + int (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func; - retVal___ = preHookFunc(parent, src); + retVal___ = preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9357,11 +9347,11 @@ bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) { - bool (*preHookFunc) (const struct config_setting_t *setting); + bool (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9384,11 +9374,11 @@ uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) { - uint32 (*preHookFunc) (const struct config_setting_t *setting); + uint32 (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9411,11 +9401,11 @@ uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) { int hIndex = 0; uint16 retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) { - uint16 (*preHookFunc) (const struct config_setting_t *setting); + uint16 (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9438,11 +9428,11 @@ int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) { int hIndex = 0; int16 retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) { - int16 (*preHookFunc) (const struct config_setting_t *setting); + int16 (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9465,11 +9455,11 @@ int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, bool **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9492,11 +9482,11 @@ int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, uint32 **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9519,11 +9509,11 @@ int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, uint16 **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9546,11 +9536,11 @@ int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, int16 **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9573,11 +9563,11 @@ int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *se int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, char **out, size_t *out_size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, out, &out_size); + retVal___ = preHookFunc(&setting, &name, &out, &out_size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9588,10 +9578,10 @@ int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *se retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size); } if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) { - int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t out_size); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, name, out, &out_size); + retVal___ = postHookFunc(retVal___, setting, name, out, out_size); } } return retVal___; @@ -9600,11 +9590,11 @@ int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size); + int (*preHookFunc) (const struct config_t **config, const char **name, char **out, size_t *out_size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func; - retVal___ = preHookFunc(config, name, out, &out_size); + retVal___ = preHookFunc(&config, &name, &out, &out_size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9615,15 +9605,15 @@ int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size); } if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) { - int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t out_size); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func; - retVal___ = postHookFunc(retVal___, config, name, out, &out_size); + retVal___ = postHookFunc(retVal___, config, name, out, out_size); } } return retVal___; } -/* loginif */ +/* loginif_interface */ void HP_loginif_init(void) { int hIndex = 0; if( HPMHooks.count.HP_loginif_init_pre ) { @@ -9798,10 +9788,10 @@ void HP_loginif_block_account(int account_id, int flag) { HPMHooks.source.loginif.block_account(account_id, flag); } if( HPMHooks.count.HP_loginif_block_account_post ) { - void (*postHookFunc) (int *account_id, int *flag); + void (*postHookFunc) (int account_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_loginif_block_account_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_loginif_block_account_post[hIndex].func; - postHookFunc(&account_id, &flag); + postHookFunc(account_id, flag); } } return; @@ -9824,10 +9814,10 @@ void HP_loginif_ban_account(int account_id, short year, short month, short day, HPMHooks.source.loginif.ban_account(account_id, year, month, day, hour, minute, second); } if( HPMHooks.count.HP_loginif_ban_account_post ) { - void (*postHookFunc) (int *account_id, short *year, short *month, short *day, short *hour, short *minute, short *second); + void (*postHookFunc) (int account_id, short year, short month, short day, short hour, short minute, short second); for(hIndex = 0; hIndex < HPMHooks.count.HP_loginif_ban_account_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_loginif_ban_account_post[hIndex].func; - postHookFunc(&account_id, &year, &month, &day, &hour, &minute, &second); + postHookFunc(account_id, year, month, day, hour, minute, second); } } return; @@ -9850,10 +9840,10 @@ void HP_loginif_unban_account(int account_id) { HPMHooks.source.loginif.unban_account(account_id); } if( HPMHooks.count.HP_loginif_unban_account_post ) { - void (*postHookFunc) (int *account_id); + void (*postHookFunc) (int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_loginif_unban_account_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_loginif_unban_account_post[hIndex].func; - postHookFunc(&account_id); + postHookFunc(account_id); } } return; @@ -9876,10 +9866,10 @@ void HP_loginif_changesex(int account_id) { HPMHooks.source.loginif.changesex(account_id); } if( HPMHooks.count.HP_loginif_changesex_post ) { - void (*postHookFunc) (int *account_id); + void (*postHookFunc) (int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_loginif_changesex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_loginif_changesex_post[hIndex].func; - postHookFunc(&account_id); + postHookFunc(account_id); } } return; @@ -9887,11 +9877,11 @@ void HP_loginif_changesex(int account_id) { void HP_loginif_auth(int fd, struct char_session_data *sd, uint32 ipl) { int hIndex = 0; if( HPMHooks.count.HP_loginif_auth_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd, uint32 *ipl); + void (*preHookFunc) (int *fd, struct char_session_data **sd, uint32 *ipl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_loginif_auth_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_loginif_auth_pre[hIndex].func; - preHookFunc(&fd, sd, &ipl); + preHookFunc(&fd, &sd, &ipl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9902,10 +9892,10 @@ void HP_loginif_auth(int fd, struct char_session_data *sd, uint32 ipl) { HPMHooks.source.loginif.auth(fd, sd, ipl); } if( HPMHooks.count.HP_loginif_auth_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd, uint32 *ipl); + void (*postHookFunc) (int fd, struct char_session_data *sd, uint32 ipl); for(hIndex = 0; hIndex < HPMHooks.count.HP_loginif_auth_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_loginif_auth_post[hIndex].func; - postHookFunc(&fd, sd, &ipl); + postHookFunc(fd, sd, ipl); } } return; @@ -9928,10 +9918,10 @@ void HP_loginif_send_users_count(int users) { HPMHooks.source.loginif.send_users_count(users); } if( HPMHooks.count.HP_loginif_send_users_count_post ) { - void (*postHookFunc) (int *users); + void (*postHookFunc) (int users); for(hIndex = 0; hIndex < HPMHooks.count.HP_loginif_send_users_count_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_loginif_send_users_count_post[hIndex].func; - postHookFunc(&users); + postHookFunc(users); } } return; @@ -9962,7 +9952,7 @@ void HP_loginif_connect_to_server(void) { } return; } -/* iMalloc */ +/* malloc_interface */ void HP_iMalloc_init(void) { int hIndex = 0; if( HPMHooks.count.HP_iMalloc_init_pre ) { @@ -10019,11 +10009,11 @@ void* HP_iMalloc_malloc(size_t size, const char *file, int line, const char *fun int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_malloc_pre ) { - void* (*preHookFunc) (size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_malloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_malloc_pre[hIndex].func; - retVal___ = preHookFunc(&size, file, &line, func); + retVal___ = preHookFunc(&size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10034,10 +10024,10 @@ void* HP_iMalloc_malloc(size_t size, const char *file, int line, const char *fun retVal___ = HPMHooks.source.iMalloc.malloc(size, file, line, func); } if( HPMHooks.count.HP_iMalloc_malloc_post ) { - void* (*postHookFunc) (void* retVal___, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_malloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_malloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, size, file, line, func); } } return retVal___; @@ -10046,11 +10036,11 @@ void* HP_iMalloc_calloc(size_t num, size_t size, const char *file, int line, con int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_calloc_pre ) { - void* (*preHookFunc) (size_t *num, size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (size_t *num, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_calloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_calloc_pre[hIndex].func; - retVal___ = preHookFunc(&num, &size, file, &line, func); + retVal___ = preHookFunc(&num, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10061,10 +10051,10 @@ void* HP_iMalloc_calloc(size_t num, size_t size, const char *file, int line, con retVal___ = HPMHooks.source.iMalloc.calloc(num, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_calloc_post ) { - void* (*postHookFunc) (void* retVal___, size_t *num, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, size_t num, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_calloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_calloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &num, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, num, size, file, line, func); } } return retVal___; @@ -10073,11 +10063,11 @@ void* HP_iMalloc_realloc(void *p, size_t size, const char *file, int line, const int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_realloc_pre ) { - void* (*preHookFunc) (void *p, size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (void **p, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_realloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_realloc_pre[hIndex].func; - retVal___ = preHookFunc(p, &size, file, &line, func); + retVal___ = preHookFunc(&p, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10088,10 +10078,10 @@ void* HP_iMalloc_realloc(void *p, size_t size, const char *file, int line, const retVal___ = HPMHooks.source.iMalloc.realloc(p, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_realloc_post ) { - void* (*postHookFunc) (void* retVal___, void *p, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, void *p, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_realloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_realloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, p, size, file, line, func); } } return retVal___; @@ -10100,11 +10090,11 @@ void* HP_iMalloc_reallocz(void *p, size_t size, const char *file, int line, cons int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_reallocz_pre ) { - void* (*preHookFunc) (void *p, size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (void **p, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_reallocz_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_reallocz_pre[hIndex].func; - retVal___ = preHookFunc(p, &size, file, &line, func); + retVal___ = preHookFunc(&p, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10115,10 +10105,10 @@ void* HP_iMalloc_reallocz(void *p, size_t size, const char *file, int line, cons retVal___ = HPMHooks.source.iMalloc.reallocz(p, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_reallocz_post ) { - void* (*postHookFunc) (void* retVal___, void *p, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, void *p, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_reallocz_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_reallocz_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, p, size, file, line, func); } } return retVal___; @@ -10127,11 +10117,11 @@ char* HP_iMalloc_astrdup(const char *p, const char *file, int line, const char * int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_astrdup_pre ) { - char* (*preHookFunc) (const char *p, const char *file, int *line, const char *func); + char* (*preHookFunc) (const char **p, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrdup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_astrdup_pre[hIndex].func; - retVal___ = preHookFunc(p, file, &line, func); + retVal___ = preHookFunc(&p, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10142,10 +10132,10 @@ char* HP_iMalloc_astrdup(const char *p, const char *file, int line, const char * retVal___ = HPMHooks.source.iMalloc.astrdup(p, file, line, func); } if( HPMHooks.count.HP_iMalloc_astrdup_post ) { - char* (*postHookFunc) (char* retVal___, const char *p, const char *file, int *line, const char *func); + char* (*postHookFunc) (char* retVal___, const char *p, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrdup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_astrdup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, file, &line, func); + retVal___ = postHookFunc(retVal___, p, file, line, func); } } return retVal___; @@ -10154,11 +10144,11 @@ char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_astrndup_pre ) { - char* (*preHookFunc) (const char *p, size_t *size, const char *file, int *line, const char *func); + char* (*preHookFunc) (const char **p, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_astrndup_pre[hIndex].func; - retVal___ = preHookFunc(p, &size, file, &line, func); + retVal___ = preHookFunc(&p, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10169,10 +10159,10 @@ char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line retVal___ = HPMHooks.source.iMalloc.astrndup(p, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_astrndup_post ) { - char* (*postHookFunc) (char* retVal___, const char *p, size_t *size, const char *file, int *line, const char *func); + char* (*postHookFunc) (char* retVal___, const char *p, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_astrndup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, p, size, file, line, func); } } return retVal___; @@ -10180,11 +10170,11 @@ char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line void HP_iMalloc_free(void *p, const char *file, int line, const char *func) { int hIndex = 0; if( HPMHooks.count.HP_iMalloc_free_pre ) { - void (*preHookFunc) (void *p, const char *file, int *line, const char *func); + void (*preHookFunc) (void **p, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_free_pre[hIndex].func; - preHookFunc(p, file, &line, func); + preHookFunc(&p, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10195,10 +10185,10 @@ void HP_iMalloc_free(void *p, const char *file, int line, const char *func) { HPMHooks.source.iMalloc.free(p, file, line, func); } if( HPMHooks.count.HP_iMalloc_free_post ) { - void (*postHookFunc) (void *p, const char *file, int *line, const char *func); + void (*postHookFunc) (void *p, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_free_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_free_post[hIndex].func; - postHookFunc(p, file, &line, func); + postHookFunc(p, file, line, func); } } return; @@ -10233,11 +10223,11 @@ bool HP_iMalloc_verify_ptr(void *ptr) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_iMalloc_verify_ptr_pre ) { - bool (*preHookFunc) (void *ptr); + bool (*preHookFunc) (void **ptr); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_verify_ptr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_verify_ptr_pre[hIndex].func; - retVal___ = preHookFunc(ptr); + retVal___ = preHookFunc(&ptr); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10335,7 +10325,7 @@ void HP_iMalloc_init_messages(void) { } return; } -/* mapif */ +/* mapif_interface */ void HP_mapif_ban(int id, unsigned int flag, int status) { int hIndex = 0; if( HPMHooks.count.HP_mapif_ban_pre ) { @@ -10354,10 +10344,10 @@ void HP_mapif_ban(int id, unsigned int flag, int status) { HPMHooks.source.mapif.ban(id, flag, status); } if( HPMHooks.count.HP_mapif_ban_post ) { - void (*postHookFunc) (int *id, unsigned int *flag, int *status); + void (*postHookFunc) (int id, unsigned int flag, int status); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_ban_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_ban_post[hIndex].func; - postHookFunc(&id, &flag, &status); + postHookFunc(id, flag, status); } } return; @@ -10380,10 +10370,10 @@ void HP_mapif_server_init(int id) { HPMHooks.source.mapif.server_init(id); } if( HPMHooks.count.HP_mapif_server_init_post ) { - void (*postHookFunc) (int *id); + void (*postHookFunc) (int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_server_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_server_init_post[hIndex].func; - postHookFunc(&id); + postHookFunc(id); } } return; @@ -10406,10 +10396,10 @@ void HP_mapif_server_destroy(int id) { HPMHooks.source.mapif.server_destroy(id); } if( HPMHooks.count.HP_mapif_server_destroy_post ) { - void (*postHookFunc) (int *id); + void (*postHookFunc) (int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_server_destroy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_server_destroy_post[hIndex].func; - postHookFunc(&id); + postHookFunc(id); } } return; @@ -10432,10 +10422,10 @@ void HP_mapif_server_reset(int id) { HPMHooks.source.mapif.server_reset(id); } if( HPMHooks.count.HP_mapif_server_reset_post ) { - void (*postHookFunc) (int *id); + void (*postHookFunc) (int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_server_reset_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_server_reset_post[hIndex].func; - postHookFunc(&id); + postHookFunc(id); } } return; @@ -10458,10 +10448,10 @@ void HP_mapif_on_disconnect(int id) { HPMHooks.source.mapif.on_disconnect(id); } if( HPMHooks.count.HP_mapif_on_disconnect_post ) { - void (*postHookFunc) (int *id); + void (*postHookFunc) (int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_on_disconnect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_on_disconnect_post[hIndex].func; - postHookFunc(&id); + postHookFunc(id); } } return; @@ -10484,10 +10474,10 @@ void HP_mapif_on_parse_accinfo(int account_id, int u_fd, int u_aid, int u_group, HPMHooks.source.mapif.on_parse_accinfo(account_id, u_fd, u_aid, u_group, map_fd); } if( HPMHooks.count.HP_mapif_on_parse_accinfo_post ) { - void (*postHookFunc) (int *account_id, int *u_fd, int *u_aid, int *u_group, int *map_fd); + void (*postHookFunc) (int account_id, int u_fd, int u_aid, int u_group, int map_fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_on_parse_accinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_on_parse_accinfo_post[hIndex].func; - postHookFunc(&account_id, &u_fd, &u_aid, &u_group, &map_fd); + postHookFunc(account_id, u_fd, u_aid, u_group, map_fd); } } return; @@ -10510,10 +10500,10 @@ void HP_mapif_char_ban(int char_id, time_t timestamp) { HPMHooks.source.mapif.char_ban(char_id, timestamp); } if( HPMHooks.count.HP_mapif_char_ban_post ) { - void (*postHookFunc) (int *char_id, time_t *timestamp); + void (*postHookFunc) (int char_id, time_t timestamp); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_char_ban_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_char_ban_post[hIndex].func; - postHookFunc(&char_id, ×tamp); + postHookFunc(char_id, timestamp); } } return; @@ -10522,11 +10512,11 @@ int HP_mapif_sendall(const unsigned char *buf, unsigned int len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_sendall_pre ) { - int (*preHookFunc) (const unsigned char *buf, unsigned int *len); + int (*preHookFunc) (const unsigned char **buf, unsigned int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_sendall_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_sendall_pre[hIndex].func; - retVal___ = preHookFunc(buf, &len); + retVal___ = preHookFunc(&buf, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10537,10 +10527,10 @@ int HP_mapif_sendall(const unsigned char *buf, unsigned int len) { retVal___ = HPMHooks.source.mapif.sendall(buf, len); } if( HPMHooks.count.HP_mapif_sendall_post ) { - int (*postHookFunc) (int retVal___, const unsigned char *buf, unsigned int *len); + int (*postHookFunc) (int retVal___, const unsigned char *buf, unsigned int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_sendall_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_sendall_post[hIndex].func; - retVal___ = postHookFunc(retVal___, buf, &len); + retVal___ = postHookFunc(retVal___, buf, len); } } return retVal___; @@ -10549,11 +10539,11 @@ int HP_mapif_sendallwos(int sfd, unsigned char *buf, unsigned int len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_sendallwos_pre ) { - int (*preHookFunc) (int *sfd, unsigned char *buf, unsigned int *len); + int (*preHookFunc) (int *sfd, unsigned char **buf, unsigned int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_sendallwos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_sendallwos_pre[hIndex].func; - retVal___ = preHookFunc(&sfd, buf, &len); + retVal___ = preHookFunc(&sfd, &buf, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10564,10 +10554,10 @@ int HP_mapif_sendallwos(int sfd, unsigned char *buf, unsigned int len) { retVal___ = HPMHooks.source.mapif.sendallwos(sfd, buf, len); } if( HPMHooks.count.HP_mapif_sendallwos_post ) { - int (*postHookFunc) (int retVal___, int *sfd, unsigned char *buf, unsigned int *len); + int (*postHookFunc) (int retVal___, int sfd, unsigned char *buf, unsigned int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_sendallwos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_sendallwos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &sfd, buf, &len); + retVal___ = postHookFunc(retVal___, sfd, buf, len); } } return retVal___; @@ -10576,11 +10566,11 @@ int HP_mapif_send(int fd, unsigned char *buf, unsigned int len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_send_pre ) { - int (*preHookFunc) (int *fd, unsigned char *buf, unsigned int *len); + int (*preHookFunc) (int *fd, unsigned char **buf, unsigned int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_send_pre[hIndex].func; - retVal___ = preHookFunc(&fd, buf, &len); + retVal___ = preHookFunc(&fd, &buf, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10591,10 +10581,10 @@ int HP_mapif_send(int fd, unsigned char *buf, unsigned int len) { retVal___ = HPMHooks.source.mapif.send(fd, buf, len); } if( HPMHooks.count.HP_mapif_send_post ) { - int (*postHookFunc) (int retVal___, int *fd, unsigned char *buf, unsigned int *len); + int (*postHookFunc) (int retVal___, int fd, unsigned char *buf, unsigned int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_send_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, buf, &len); + retVal___ = postHookFunc(retVal___, fd, buf, len); } } return retVal___; @@ -10617,10 +10607,10 @@ void HP_mapif_send_users_count(int users) { HPMHooks.source.mapif.send_users_count(users); } if( HPMHooks.count.HP_mapif_send_users_count_post ) { - void (*postHookFunc) (int *users); + void (*postHookFunc) (int users); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_send_users_count_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_send_users_count_post[hIndex].func; - postHookFunc(&users); + postHookFunc(users); } } return; @@ -10643,10 +10633,10 @@ void HP_mapif_auction_message(int char_id, unsigned char result) { HPMHooks.source.mapif.auction_message(char_id, result); } if( HPMHooks.count.HP_mapif_auction_message_post ) { - void (*postHookFunc) (int *char_id, unsigned char *result); + void (*postHookFunc) (int char_id, unsigned char result); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_auction_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_auction_message_post[hIndex].func; - postHookFunc(&char_id, &result); + postHookFunc(char_id, result); } } return; @@ -10654,11 +10644,11 @@ void HP_mapif_auction_message(int char_id, unsigned char result) { void HP_mapif_auction_sendlist(int fd, int char_id, short count, short pages, unsigned char *buf) { int hIndex = 0; if( HPMHooks.count.HP_mapif_auction_sendlist_pre ) { - void (*preHookFunc) (int *fd, int *char_id, short *count, short *pages, unsigned char *buf); + void (*preHookFunc) (int *fd, int *char_id, short *count, short *pages, unsigned char **buf); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_auction_sendlist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_auction_sendlist_pre[hIndex].func; - preHookFunc(&fd, &char_id, &count, &pages, buf); + preHookFunc(&fd, &char_id, &count, &pages, &buf); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10669,10 +10659,10 @@ void HP_mapif_auction_sendlist(int fd, int char_id, short count, short pages, un HPMHooks.source.mapif.auction_sendlist(fd, char_id, count, pages, buf); } if( HPMHooks.count.HP_mapif_auction_sendlist_post ) { - void (*postHookFunc) (int *fd, int *char_id, short *count, short *pages, unsigned char *buf); + void (*postHookFunc) (int fd, int char_id, short count, short pages, unsigned char *buf); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_auction_sendlist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_auction_sendlist_post[hIndex].func; - postHookFunc(&fd, &char_id, &count, &pages, buf); + postHookFunc(fd, char_id, count, pages, buf); } } return; @@ -10695,10 +10685,10 @@ void HP_mapif_parse_auction_requestlist(int fd) { HPMHooks.source.mapif.parse_auction_requestlist(fd); } if( HPMHooks.count.HP_mapif_parse_auction_requestlist_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_auction_requestlist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_auction_requestlist_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -10706,11 +10696,11 @@ void HP_mapif_parse_auction_requestlist(int fd) { void HP_mapif_auction_register(int fd, struct auction_data *auction) { int hIndex = 0; if( HPMHooks.count.HP_mapif_auction_register_pre ) { - void (*preHookFunc) (int *fd, struct auction_data *auction); + void (*preHookFunc) (int *fd, struct auction_data **auction); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_auction_register_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_auction_register_pre[hIndex].func; - preHookFunc(&fd, auction); + preHookFunc(&fd, &auction); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10721,10 +10711,10 @@ void HP_mapif_auction_register(int fd, struct auction_data *auction) { HPMHooks.source.mapif.auction_register(fd, auction); } if( HPMHooks.count.HP_mapif_auction_register_post ) { - void (*postHookFunc) (int *fd, struct auction_data *auction); + void (*postHookFunc) (int fd, struct auction_data *auction); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_auction_register_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_auction_register_post[hIndex].func; - postHookFunc(&fd, auction); + postHookFunc(fd, auction); } } return; @@ -10747,10 +10737,10 @@ void HP_mapif_parse_auction_register(int fd) { HPMHooks.source.mapif.parse_auction_register(fd); } if( HPMHooks.count.HP_mapif_parse_auction_register_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_auction_register_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_auction_register_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -10773,10 +10763,10 @@ void HP_mapif_auction_cancel(int fd, int char_id, unsigned char result) { HPMHooks.source.mapif.auction_cancel(fd, char_id, result); } if( HPMHooks.count.HP_mapif_auction_cancel_post ) { - void (*postHookFunc) (int *fd, int *char_id, unsigned char *result); + void (*postHookFunc) (int fd, int char_id, unsigned char result); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_auction_cancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_auction_cancel_post[hIndex].func; - postHookFunc(&fd, &char_id, &result); + postHookFunc(fd, char_id, result); } } return; @@ -10799,10 +10789,10 @@ void HP_mapif_parse_auction_cancel(int fd) { HPMHooks.source.mapif.parse_auction_cancel(fd); } if( HPMHooks.count.HP_mapif_parse_auction_cancel_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_auction_cancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_auction_cancel_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -10825,10 +10815,10 @@ void HP_mapif_auction_close(int fd, int char_id, unsigned char result) { HPMHooks.source.mapif.auction_close(fd, char_id, result); } if( HPMHooks.count.HP_mapif_auction_close_post ) { - void (*postHookFunc) (int *fd, int *char_id, unsigned char *result); + void (*postHookFunc) (int fd, int char_id, unsigned char result); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_auction_close_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_auction_close_post[hIndex].func; - postHookFunc(&fd, &char_id, &result); + postHookFunc(fd, char_id, result); } } return; @@ -10851,10 +10841,10 @@ void HP_mapif_parse_auction_close(int fd) { HPMHooks.source.mapif.parse_auction_close(fd); } if( HPMHooks.count.HP_mapif_parse_auction_close_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_auction_close_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_auction_close_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -10877,10 +10867,10 @@ void HP_mapif_auction_bid(int fd, int char_id, int bid, unsigned char result) { HPMHooks.source.mapif.auction_bid(fd, char_id, bid, result); } if( HPMHooks.count.HP_mapif_auction_bid_post ) { - void (*postHookFunc) (int *fd, int *char_id, int *bid, unsigned char *result); + void (*postHookFunc) (int fd, int char_id, int bid, unsigned char result); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_auction_bid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_auction_bid_post[hIndex].func; - postHookFunc(&fd, &char_id, &bid, &result); + postHookFunc(fd, char_id, bid, result); } } return; @@ -10903,10 +10893,10 @@ void HP_mapif_parse_auction_bid(int fd) { HPMHooks.source.mapif.parse_auction_bid(fd); } if( HPMHooks.count.HP_mapif_parse_auction_bid_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_auction_bid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_auction_bid_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -10915,11 +10905,11 @@ bool HP_mapif_elemental_create(struct s_elemental *ele) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_elemental_create_pre ) { - bool (*preHookFunc) (struct s_elemental *ele); + bool (*preHookFunc) (struct s_elemental **ele); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_elemental_create_pre[hIndex].func; - retVal___ = preHookFunc(ele); + retVal___ = preHookFunc(&ele); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10942,11 +10932,11 @@ bool HP_mapif_elemental_save(const struct s_elemental *ele) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_elemental_save_pre ) { - bool (*preHookFunc) (const struct s_elemental *ele); + bool (*preHookFunc) (const struct s_elemental **ele); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_elemental_save_pre[hIndex].func; - retVal___ = preHookFunc(ele); + retVal___ = preHookFunc(&ele); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10969,11 +10959,11 @@ bool HP_mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_elemental_load_pre ) { - bool (*preHookFunc) (int *ele_id, int *char_id, struct s_elemental *ele); + bool (*preHookFunc) (int *ele_id, int *char_id, struct s_elemental **ele); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_load_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_elemental_load_pre[hIndex].func; - retVal___ = preHookFunc(&ele_id, &char_id, ele); + retVal___ = preHookFunc(&ele_id, &char_id, &ele); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10984,10 +10974,10 @@ bool HP_mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele) { retVal___ = HPMHooks.source.mapif.elemental_load(ele_id, char_id, ele); } if( HPMHooks.count.HP_mapif_elemental_load_post ) { - bool (*postHookFunc) (bool retVal___, int *ele_id, int *char_id, struct s_elemental *ele); + bool (*postHookFunc) (bool retVal___, int ele_id, int char_id, struct s_elemental *ele); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_elemental_load_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ele_id, &char_id, ele); + retVal___ = postHookFunc(retVal___, ele_id, char_id, ele); } } return retVal___; @@ -11011,10 +11001,10 @@ bool HP_mapif_elemental_delete(int ele_id) { retVal___ = HPMHooks.source.mapif.elemental_delete(ele_id); } if( HPMHooks.count.HP_mapif_elemental_delete_post ) { - bool (*postHookFunc) (bool retVal___, int *ele_id); + bool (*postHookFunc) (bool retVal___, int ele_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_elemental_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ele_id); + retVal___ = postHookFunc(retVal___, ele_id); } } return retVal___; @@ -11022,11 +11012,11 @@ bool HP_mapif_elemental_delete(int ele_id) { void HP_mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag) { int hIndex = 0; if( HPMHooks.count.HP_mapif_elemental_send_pre ) { - void (*preHookFunc) (int *fd, struct s_elemental *ele, unsigned char *flag); + void (*preHookFunc) (int *fd, struct s_elemental **ele, unsigned char *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_elemental_send_pre[hIndex].func; - preHookFunc(&fd, ele, &flag); + preHookFunc(&fd, &ele, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11037,10 +11027,10 @@ void HP_mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag HPMHooks.source.mapif.elemental_send(fd, ele, flag); } if( HPMHooks.count.HP_mapif_elemental_send_post ) { - void (*postHookFunc) (int *fd, struct s_elemental *ele, unsigned char *flag); + void (*postHookFunc) (int fd, struct s_elemental *ele, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_elemental_send_post[hIndex].func; - postHookFunc(&fd, ele, &flag); + postHookFunc(fd, ele, flag); } } return; @@ -11048,11 +11038,11 @@ void HP_mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag void HP_mapif_parse_elemental_create(int fd, const struct s_elemental *ele) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_elemental_create_pre ) { - void (*preHookFunc) (int *fd, const struct s_elemental *ele); + void (*preHookFunc) (int *fd, const struct s_elemental **ele); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_elemental_create_pre[hIndex].func; - preHookFunc(&fd, ele); + preHookFunc(&fd, &ele); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11063,10 +11053,10 @@ void HP_mapif_parse_elemental_create(int fd, const struct s_elemental *ele) { HPMHooks.source.mapif.parse_elemental_create(fd, ele); } if( HPMHooks.count.HP_mapif_parse_elemental_create_post ) { - void (*postHookFunc) (int *fd, const struct s_elemental *ele); + void (*postHookFunc) (int fd, const struct s_elemental *ele); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_elemental_create_post[hIndex].func; - postHookFunc(&fd, ele); + postHookFunc(fd, ele); } } return; @@ -11089,10 +11079,10 @@ void HP_mapif_parse_elemental_load(int fd, int ele_id, int char_id) { HPMHooks.source.mapif.parse_elemental_load(fd, ele_id, char_id); } if( HPMHooks.count.HP_mapif_parse_elemental_load_post ) { - void (*postHookFunc) (int *fd, int *ele_id, int *char_id); + void (*postHookFunc) (int fd, int ele_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_elemental_load_post[hIndex].func; - postHookFunc(&fd, &ele_id, &char_id); + postHookFunc(fd, ele_id, char_id); } } return; @@ -11115,10 +11105,10 @@ void HP_mapif_elemental_deleted(int fd, unsigned char flag) { HPMHooks.source.mapif.elemental_deleted(fd, flag); } if( HPMHooks.count.HP_mapif_elemental_deleted_post ) { - void (*postHookFunc) (int *fd, unsigned char *flag); + void (*postHookFunc) (int fd, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_deleted_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_elemental_deleted_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -11141,10 +11131,10 @@ void HP_mapif_parse_elemental_delete(int fd, int ele_id) { HPMHooks.source.mapif.parse_elemental_delete(fd, ele_id); } if( HPMHooks.count.HP_mapif_parse_elemental_delete_post ) { - void (*postHookFunc) (int *fd, int *ele_id); + void (*postHookFunc) (int fd, int ele_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_elemental_delete_post[hIndex].func; - postHookFunc(&fd, &ele_id); + postHookFunc(fd, ele_id); } } return; @@ -11167,10 +11157,10 @@ void HP_mapif_elemental_saved(int fd, unsigned char flag) { HPMHooks.source.mapif.elemental_saved(fd, flag); } if( HPMHooks.count.HP_mapif_elemental_saved_post ) { - void (*postHookFunc) (int *fd, unsigned char *flag); + void (*postHookFunc) (int fd, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_saved_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_elemental_saved_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -11178,11 +11168,11 @@ void HP_mapif_elemental_saved(int fd, unsigned char flag) { void HP_mapif_parse_elemental_save(int fd, const struct s_elemental *ele) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_elemental_save_pre ) { - void (*preHookFunc) (int *fd, const struct s_elemental *ele); + void (*preHookFunc) (int *fd, const struct s_elemental **ele); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_elemental_save_pre[hIndex].func; - preHookFunc(&fd, ele); + preHookFunc(&fd, &ele); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11193,10 +11183,10 @@ void HP_mapif_parse_elemental_save(int fd, const struct s_elemental *ele) { HPMHooks.source.mapif.parse_elemental_save(fd, ele); } if( HPMHooks.count.HP_mapif_parse_elemental_save_post ) { - void (*postHookFunc) (int *fd, const struct s_elemental *ele); + void (*postHookFunc) (int fd, const struct s_elemental *ele); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_elemental_save_post[hIndex].func; - postHookFunc(&fd, ele); + postHookFunc(fd, ele); } } return; @@ -11205,11 +11195,11 @@ int HP_mapif_guild_created(int fd, int account_id, struct guild *g) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_created_pre ) { - int (*preHookFunc) (int *fd, int *account_id, struct guild *g); + int (*preHookFunc) (int *fd, int *account_id, struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_created_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_created_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &account_id, g); + retVal___ = preHookFunc(&fd, &account_id, &g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11220,10 +11210,10 @@ int HP_mapif_guild_created(int fd, int account_id, struct guild *g) { retVal___ = HPMHooks.source.mapif.guild_created(fd, account_id, g); } if( HPMHooks.count.HP_mapif_guild_created_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, struct guild *g); + int (*postHookFunc) (int retVal___, int fd, int account_id, struct guild *g); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_created_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, g); + retVal___ = postHookFunc(retVal___, fd, account_id, g); } } return retVal___; @@ -11247,10 +11237,10 @@ int HP_mapif_guild_noinfo(int fd, int guild_id) { retVal___ = HPMHooks.source.mapif.guild_noinfo(fd, guild_id); } if( HPMHooks.count.HP_mapif_guild_noinfo_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id); + int (*postHookFunc) (int retVal___, int fd, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_noinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_noinfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id); + retVal___ = postHookFunc(retVal___, fd, guild_id); } } return retVal___; @@ -11259,11 +11249,11 @@ int HP_mapif_guild_info(int fd, struct guild *g) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_info_pre ) { - int (*preHookFunc) (int *fd, struct guild *g); + int (*preHookFunc) (int *fd, struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_info_pre[hIndex].func; - retVal___ = preHookFunc(&fd, g); + retVal___ = preHookFunc(&fd, &g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11274,10 +11264,10 @@ int HP_mapif_guild_info(int fd, struct guild *g) { retVal___ = HPMHooks.source.mapif.guild_info(fd, g); } if( HPMHooks.count.HP_mapif_guild_info_post ) { - int (*postHookFunc) (int retVal___, int *fd, struct guild *g); + int (*postHookFunc) (int retVal___, int fd, struct guild *g); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_info_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, g); + retVal___ = postHookFunc(retVal___, fd, g); } } return retVal___; @@ -11301,10 +11291,10 @@ int HP_mapif_guild_memberadded(int fd, int guild_id, int account_id, int char_id retVal___ = HPMHooks.source.mapif.guild_memberadded(fd, guild_id, account_id, char_id, flag); } if( HPMHooks.count.HP_mapif_guild_memberadded_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *account_id, int *char_id, int *flag); + int (*postHookFunc) (int retVal___, int fd, int guild_id, int account_id, int char_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_memberadded_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_memberadded_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, &account_id, &char_id, &flag); + retVal___ = postHookFunc(retVal___, fd, guild_id, account_id, char_id, flag); } } return retVal___; @@ -11313,11 +11303,11 @@ int HP_mapif_guild_withdraw(int guild_id, int account_id, int char_id, int flag, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_withdraw_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *flag, const char *name, const char *mes); + int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *flag, const char **name, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_withdraw_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_withdraw_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &flag, name, mes); + retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &flag, &name, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11328,10 +11318,10 @@ int HP_mapif_guild_withdraw(int guild_id, int account_id, int char_id, int flag, retVal___ = HPMHooks.source.mapif.guild_withdraw(guild_id, account_id, char_id, flag, name, mes); } if( HPMHooks.count.HP_mapif_guild_withdraw_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, int *flag, const char *name, const char *mes); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_withdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_withdraw_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &flag, name, mes); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, flag, name, mes); } } return retVal___; @@ -11340,11 +11330,11 @@ int HP_mapif_guild_memberinfoshort(struct guild *g, int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_memberinfoshort_pre ) { - int (*preHookFunc) (struct guild *g, int *idx); + int (*preHookFunc) (struct guild **g, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_memberinfoshort_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_memberinfoshort_pre[hIndex].func; - retVal___ = preHookFunc(g, &idx); + retVal___ = preHookFunc(&g, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11355,10 +11345,10 @@ int HP_mapif_guild_memberinfoshort(struct guild *g, int idx) { retVal___ = HPMHooks.source.mapif.guild_memberinfoshort(g, idx); } if( HPMHooks.count.HP_mapif_guild_memberinfoshort_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *idx); + int (*postHookFunc) (int retVal___, struct guild *g, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_memberinfoshort_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_memberinfoshort_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &idx); + retVal___ = postHookFunc(retVal___, g, idx); } } return retVal___; @@ -11382,10 +11372,10 @@ int HP_mapif_guild_broken(int guild_id, int flag) { retVal___ = HPMHooks.source.mapif.guild_broken(guild_id, flag); } if( HPMHooks.count.HP_mapif_guild_broken_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *flag); + int (*postHookFunc) (int retVal___, int guild_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_broken_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_broken_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &flag); + retVal___ = postHookFunc(retVal___, guild_id, flag); } } return retVal___; @@ -11394,11 +11384,11 @@ int HP_mapif_guild_message(int guild_id, int account_id, const char *mes, int le int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_message_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, const char *mes, int *len, int *sfd); + int (*preHookFunc) (int *guild_id, int *account_id, const char **mes, int *len, int *sfd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_message_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &account_id, mes, &len, &sfd); + retVal___ = preHookFunc(&guild_id, &account_id, &mes, &len, &sfd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11409,10 +11399,10 @@ int HP_mapif_guild_message(int guild_id, int account_id, const char *mes, int le retVal___ = HPMHooks.source.mapif.guild_message(guild_id, account_id, mes, len, sfd); } if( HPMHooks.count.HP_mapif_guild_message_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, const char *mes, int *len, int *sfd); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, const char *mes, int len, int sfd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, mes, &len, &sfd); + retVal___ = postHookFunc(retVal___, guild_id, account_id, mes, len, sfd); } } return retVal___; @@ -11421,11 +11411,11 @@ int HP_mapif_guild_basicinfochanged(int guild_id, int type, const void *data, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_basicinfochanged_pre ) { - int (*preHookFunc) (int *guild_id, int *type, const void *data, int *len); + int (*preHookFunc) (int *guild_id, int *type, const void **data, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_basicinfochanged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_basicinfochanged_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &type, data, &len); + retVal___ = preHookFunc(&guild_id, &type, &data, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11436,10 +11426,10 @@ int HP_mapif_guild_basicinfochanged(int guild_id, int type, const void *data, in retVal___ = HPMHooks.source.mapif.guild_basicinfochanged(guild_id, type, data, len); } if( HPMHooks.count.HP_mapif_guild_basicinfochanged_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *type, const void *data, int *len); + int (*postHookFunc) (int retVal___, int guild_id, int type, const void *data, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_basicinfochanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_basicinfochanged_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &type, data, &len); + retVal___ = postHookFunc(retVal___, guild_id, type, data, len); } } return retVal___; @@ -11448,11 +11438,11 @@ int HP_mapif_guild_memberinfochanged(int guild_id, int account_id, int char_id, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_memberinfochanged_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *type, const void *data, int *len); + int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *type, const void **data, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_memberinfochanged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_memberinfochanged_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &type, data, &len); + retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &type, &data, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11463,10 +11453,10 @@ int HP_mapif_guild_memberinfochanged(int guild_id, int account_id, int char_id, retVal___ = HPMHooks.source.mapif.guild_memberinfochanged(guild_id, account_id, char_id, type, data, len); } if( HPMHooks.count.HP_mapif_guild_memberinfochanged_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, int *type, const void *data, int *len); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, int type, const void *data, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_memberinfochanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_memberinfochanged_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &type, data, &len); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, type, data, len); } } return retVal___; @@ -11490,10 +11480,10 @@ int HP_mapif_guild_skillupack(int guild_id, uint16 skill_id, int account_id) { retVal___ = HPMHooks.source.mapif.guild_skillupack(guild_id, skill_id, account_id); } if( HPMHooks.count.HP_mapif_guild_skillupack_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, uint16 *skill_id, int *account_id); + int (*postHookFunc) (int retVal___, int guild_id, uint16 skill_id, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_skillupack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_skillupack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &skill_id, &account_id); + retVal___ = postHookFunc(retVal___, guild_id, skill_id, account_id); } } return retVal___; @@ -11502,11 +11492,11 @@ int HP_mapif_guild_alliance(int guild_id1, int guild_id2, int account_id1, int a int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_alliance_pre ) { - int (*preHookFunc) (int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag, const char *name1, const char *name2); + int (*preHookFunc) (int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag, const char **name1, const char **name2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_alliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_alliance_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id1, &guild_id2, &account_id1, &account_id2, &flag, name1, name2); + retVal___ = preHookFunc(&guild_id1, &guild_id2, &account_id1, &account_id2, &flag, &name1, &name2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11517,10 +11507,10 @@ int HP_mapif_guild_alliance(int guild_id1, int guild_id2, int account_id1, int a retVal___ = HPMHooks.source.mapif.guild_alliance(guild_id1, guild_id2, account_id1, account_id2, flag, name1, name2); } if( HPMHooks.count.HP_mapif_guild_alliance_post ) { - int (*postHookFunc) (int retVal___, int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag, const char *name1, const char *name2); + int (*postHookFunc) (int retVal___, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_alliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_alliance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id1, &guild_id2, &account_id1, &account_id2, &flag, name1, name2); + retVal___ = postHookFunc(retVal___, guild_id1, guild_id2, account_id1, account_id2, flag, name1, name2); } } return retVal___; @@ -11529,11 +11519,11 @@ int HP_mapif_guild_position(struct guild *g, int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_position_pre ) { - int (*preHookFunc) (struct guild *g, int *idx); + int (*preHookFunc) (struct guild **g, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_position_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_position_pre[hIndex].func; - retVal___ = preHookFunc(g, &idx); + retVal___ = preHookFunc(&g, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11544,10 +11534,10 @@ int HP_mapif_guild_position(struct guild *g, int idx) { retVal___ = HPMHooks.source.mapif.guild_position(g, idx); } if( HPMHooks.count.HP_mapif_guild_position_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *idx); + int (*postHookFunc) (int retVal___, struct guild *g, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_position_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_position_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &idx); + retVal___ = postHookFunc(retVal___, g, idx); } } return retVal___; @@ -11556,11 +11546,11 @@ int HP_mapif_guild_notice(struct guild *g) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_notice_pre ) { - int (*preHookFunc) (struct guild *g); + int (*preHookFunc) (struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_notice_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_notice_pre[hIndex].func; - retVal___ = preHookFunc(g); + retVal___ = preHookFunc(&g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11583,11 +11573,11 @@ int HP_mapif_guild_emblem(struct guild *g) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_emblem_pre ) { - int (*preHookFunc) (struct guild *g); + int (*preHookFunc) (struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_emblem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_emblem_pre[hIndex].func; - retVal___ = preHookFunc(g); + retVal___ = preHookFunc(&g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11610,11 +11600,11 @@ int HP_mapif_guild_master_changed(struct guild *g, int aid, int cid) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_master_changed_pre ) { - int (*preHookFunc) (struct guild *g, int *aid, int *cid); + int (*preHookFunc) (struct guild **g, int *aid, int *cid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_master_changed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_master_changed_pre[hIndex].func; - retVal___ = preHookFunc(g, &aid, &cid); + retVal___ = preHookFunc(&g, &aid, &cid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11625,10 +11615,10 @@ int HP_mapif_guild_master_changed(struct guild *g, int aid, int cid) { retVal___ = HPMHooks.source.mapif.guild_master_changed(g, aid, cid); } if( HPMHooks.count.HP_mapif_guild_master_changed_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *aid, int *cid); + int (*postHookFunc) (int retVal___, struct guild *g, int aid, int cid); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_master_changed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_master_changed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &aid, &cid); + retVal___ = postHookFunc(retVal___, g, aid, cid); } } return retVal___; @@ -11637,11 +11627,11 @@ int HP_mapif_guild_castle_dataload(int fd, int sz, const int *castle_ids) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_castle_dataload_pre ) { - int (*preHookFunc) (int *fd, int *sz, const int *castle_ids); + int (*preHookFunc) (int *fd, int *sz, const int **castle_ids); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_castle_dataload_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_castle_dataload_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &sz, castle_ids); + retVal___ = preHookFunc(&fd, &sz, &castle_ids); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11652,10 +11642,10 @@ int HP_mapif_guild_castle_dataload(int fd, int sz, const int *castle_ids) { retVal___ = HPMHooks.source.mapif.guild_castle_dataload(fd, sz, castle_ids); } if( HPMHooks.count.HP_mapif_guild_castle_dataload_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *sz, const int *castle_ids); + int (*postHookFunc) (int retVal___, int fd, int sz, const int *castle_ids); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_castle_dataload_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_castle_dataload_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &sz, castle_ids); + retVal___ = postHookFunc(retVal___, fd, sz, castle_ids); } } return retVal___; @@ -11664,11 +11654,11 @@ int HP_mapif_parse_CreateGuild(int fd, int account_id, const char *name, const s int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_CreateGuild_pre ) { - int (*preHookFunc) (int *fd, int *account_id, const char *name, const struct guild_member *master); + int (*preHookFunc) (int *fd, int *account_id, const char **name, const struct guild_member **master); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_CreateGuild_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_CreateGuild_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &account_id, name, master); + retVal___ = preHookFunc(&fd, &account_id, &name, &master); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11679,10 +11669,10 @@ int HP_mapif_parse_CreateGuild(int fd, int account_id, const char *name, const s retVal___ = HPMHooks.source.mapif.parse_CreateGuild(fd, account_id, name, master); } if( HPMHooks.count.HP_mapif_parse_CreateGuild_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, const char *name, const struct guild_member *master); + int (*postHookFunc) (int retVal___, int fd, int account_id, const char *name, const struct guild_member *master); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_CreateGuild_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_CreateGuild_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, name, master); + retVal___ = postHookFunc(retVal___, fd, account_id, name, master); } } return retVal___; @@ -11706,10 +11696,10 @@ int HP_mapif_parse_GuildInfo(int fd, int guild_id) { retVal___ = HPMHooks.source.mapif.parse_GuildInfo(fd, guild_id); } if( HPMHooks.count.HP_mapif_parse_GuildInfo_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id); + int (*postHookFunc) (int retVal___, int fd, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildInfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id); + retVal___ = postHookFunc(retVal___, fd, guild_id); } } return retVal___; @@ -11718,11 +11708,11 @@ int HP_mapif_parse_GuildAddMember(int fd, int guild_id, const struct guild_membe int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildAddMember_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, const struct guild_member *m); + int (*preHookFunc) (int *fd, int *guild_id, const struct guild_member **m); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildAddMember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildAddMember_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &guild_id, m); + retVal___ = preHookFunc(&fd, &guild_id, &m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11733,10 +11723,10 @@ int HP_mapif_parse_GuildAddMember(int fd, int guild_id, const struct guild_membe retVal___ = HPMHooks.source.mapif.parse_GuildAddMember(fd, guild_id, m); } if( HPMHooks.count.HP_mapif_parse_GuildAddMember_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, const struct guild_member *m); + int (*postHookFunc) (int retVal___, int fd, int guild_id, const struct guild_member *m); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildAddMember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildAddMember_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, m); + retVal___ = postHookFunc(retVal___, fd, guild_id, m); } } return retVal___; @@ -11745,11 +11735,11 @@ int HP_mapif_parse_GuildLeave(int fd, int guild_id, int account_id, int char_id, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildLeave_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, int *account_id, int *char_id, int *flag, const char *mes); + int (*preHookFunc) (int *fd, int *guild_id, int *account_id, int *char_id, int *flag, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildLeave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildLeave_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &guild_id, &account_id, &char_id, &flag, mes); + retVal___ = preHookFunc(&fd, &guild_id, &account_id, &char_id, &flag, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11760,10 +11750,10 @@ int HP_mapif_parse_GuildLeave(int fd, int guild_id, int account_id, int char_id, retVal___ = HPMHooks.source.mapif.parse_GuildLeave(fd, guild_id, account_id, char_id, flag, mes); } if( HPMHooks.count.HP_mapif_parse_GuildLeave_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *account_id, int *char_id, int *flag, const char *mes); + int (*postHookFunc) (int retVal___, int fd, int guild_id, int account_id, int char_id, int flag, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildLeave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildLeave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, &account_id, &char_id, &flag, mes); + retVal___ = postHookFunc(retVal___, fd, guild_id, account_id, char_id, flag, mes); } } return retVal___; @@ -11787,10 +11777,10 @@ int HP_mapif_parse_GuildChangeMemberInfoShort(int fd, int guild_id, int account_ retVal___ = HPMHooks.source.mapif.parse_GuildChangeMemberInfoShort(fd, guild_id, account_id, char_id, online, lv, class_); } if( HPMHooks.count.HP_mapif_parse_GuildChangeMemberInfoShort_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *account_id, int *char_id, int *online, int *lv, int *class_); + int (*postHookFunc) (int retVal___, int fd, int guild_id, int account_id, int char_id, int online, int lv, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildChangeMemberInfoShort_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildChangeMemberInfoShort_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, &account_id, &char_id, &online, &lv, &class_); + retVal___ = postHookFunc(retVal___, fd, guild_id, account_id, char_id, online, lv, class_); } } return retVal___; @@ -11814,10 +11804,10 @@ int HP_mapif_parse_BreakGuild(int fd, int guild_id) { retVal___ = HPMHooks.source.mapif.parse_BreakGuild(fd, guild_id); } if( HPMHooks.count.HP_mapif_parse_BreakGuild_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id); + int (*postHookFunc) (int retVal___, int fd, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_BreakGuild_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_BreakGuild_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id); + retVal___ = postHookFunc(retVal___, fd, guild_id); } } return retVal___; @@ -11826,11 +11816,11 @@ int HP_mapif_parse_GuildMessage(int fd, int guild_id, int account_id, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildMessage_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, int *account_id, const char *mes, int *len); + int (*preHookFunc) (int *fd, int *guild_id, int *account_id, const char **mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildMessage_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &guild_id, &account_id, mes, &len); + retVal___ = preHookFunc(&fd, &guild_id, &account_id, &mes, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11841,10 +11831,10 @@ int HP_mapif_parse_GuildMessage(int fd, int guild_id, int account_id, const char retVal___ = HPMHooks.source.mapif.parse_GuildMessage(fd, guild_id, account_id, mes, len); } if( HPMHooks.count.HP_mapif_parse_GuildMessage_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *account_id, const char *mes, int *len); + int (*postHookFunc) (int retVal___, int fd, int guild_id, int account_id, const char *mes, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildMessage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, &account_id, mes, &len); + retVal___ = postHookFunc(retVal___, fd, guild_id, account_id, mes, len); } } return retVal___; @@ -11853,11 +11843,11 @@ int HP_mapif_parse_GuildBasicInfoChange(int fd, int guild_id, int type, const vo int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildBasicInfoChange_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, int *type, const void *data, int *len); + int (*preHookFunc) (int *fd, int *guild_id, int *type, const void **data, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildBasicInfoChange_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildBasicInfoChange_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &guild_id, &type, data, &len); + retVal___ = preHookFunc(&fd, &guild_id, &type, &data, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11868,10 +11858,10 @@ int HP_mapif_parse_GuildBasicInfoChange(int fd, int guild_id, int type, const vo retVal___ = HPMHooks.source.mapif.parse_GuildBasicInfoChange(fd, guild_id, type, data, len); } if( HPMHooks.count.HP_mapif_parse_GuildBasicInfoChange_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *type, const void *data, int *len); + int (*postHookFunc) (int retVal___, int fd, int guild_id, int type, const void *data, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildBasicInfoChange_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildBasicInfoChange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, &type, data, &len); + retVal___ = postHookFunc(retVal___, fd, guild_id, type, data, len); } } return retVal___; @@ -11880,11 +11870,11 @@ int HP_mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildMemberInfoChange_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, int *account_id, int *char_id, int *type, const char *data, int *len); + int (*preHookFunc) (int *fd, int *guild_id, int *account_id, int *char_id, int *type, const char **data, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMemberInfoChange_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildMemberInfoChange_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &guild_id, &account_id, &char_id, &type, data, &len); + retVal___ = preHookFunc(&fd, &guild_id, &account_id, &char_id, &type, &data, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11895,10 +11885,10 @@ int HP_mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, i retVal___ = HPMHooks.source.mapif.parse_GuildMemberInfoChange(fd, guild_id, account_id, char_id, type, data, len); } if( HPMHooks.count.HP_mapif_parse_GuildMemberInfoChange_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *account_id, int *char_id, int *type, const char *data, int *len); + int (*postHookFunc) (int retVal___, int fd, int guild_id, int account_id, int char_id, int type, const char *data, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMemberInfoChange_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildMemberInfoChange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, &account_id, &char_id, &type, data, &len); + retVal___ = postHookFunc(retVal___, fd, guild_id, account_id, char_id, type, data, len); } } return retVal___; @@ -11907,11 +11897,11 @@ int HP_mapif_parse_GuildPosition(int fd, int guild_id, int idx, const struct gui int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildPosition_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, int *idx, const struct guild_position *p); + int (*preHookFunc) (int *fd, int *guild_id, int *idx, const struct guild_position **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildPosition_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildPosition_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &guild_id, &idx, p); + retVal___ = preHookFunc(&fd, &guild_id, &idx, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11922,10 +11912,10 @@ int HP_mapif_parse_GuildPosition(int fd, int guild_id, int idx, const struct gui retVal___ = HPMHooks.source.mapif.parse_GuildPosition(fd, guild_id, idx, p); } if( HPMHooks.count.HP_mapif_parse_GuildPosition_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *idx, const struct guild_position *p); + int (*postHookFunc) (int retVal___, int fd, int guild_id, int idx, const struct guild_position *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildPosition_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildPosition_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, &idx, p); + retVal___ = postHookFunc(retVal___, fd, guild_id, idx, p); } } return retVal___; @@ -11949,10 +11939,10 @@ int HP_mapif_parse_GuildSkillUp(int fd, int guild_id, uint16 skill_id, int accou retVal___ = HPMHooks.source.mapif.parse_GuildSkillUp(fd, guild_id, skill_id, account_id, max); } if( HPMHooks.count.HP_mapif_parse_GuildSkillUp_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, uint16 *skill_id, int *account_id, int *max); + int (*postHookFunc) (int retVal___, int fd, int guild_id, uint16 skill_id, int account_id, int max); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildSkillUp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildSkillUp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, &skill_id, &account_id, &max); + retVal___ = postHookFunc(retVal___, fd, guild_id, skill_id, account_id, max); } } return retVal___; @@ -11961,11 +11951,11 @@ int HP_mapif_parse_GuildDeleteAlliance(struct guild *g, int guild_id, int accoun int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildDeleteAlliance_pre ) { - int (*preHookFunc) (struct guild *g, int *guild_id, int *account_id1, int *account_id2, int *flag); + int (*preHookFunc) (struct guild **g, int *guild_id, int *account_id1, int *account_id2, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildDeleteAlliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildDeleteAlliance_pre[hIndex].func; - retVal___ = preHookFunc(g, &guild_id, &account_id1, &account_id2, &flag); + retVal___ = preHookFunc(&g, &guild_id, &account_id1, &account_id2, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11976,10 +11966,10 @@ int HP_mapif_parse_GuildDeleteAlliance(struct guild *g, int guild_id, int accoun retVal___ = HPMHooks.source.mapif.parse_GuildDeleteAlliance(g, guild_id, account_id1, account_id2, flag); } if( HPMHooks.count.HP_mapif_parse_GuildDeleteAlliance_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *guild_id, int *account_id1, int *account_id2, int *flag); + int (*postHookFunc) (int retVal___, struct guild *g, int guild_id, int account_id1, int account_id2, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildDeleteAlliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildDeleteAlliance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &guild_id, &account_id1, &account_id2, &flag); + retVal___ = postHookFunc(retVal___, g, guild_id, account_id1, account_id2, flag); } } return retVal___; @@ -12003,10 +11993,10 @@ int HP_mapif_parse_GuildAlliance(int fd, int guild_id1, int guild_id2, int accou retVal___ = HPMHooks.source.mapif.parse_GuildAlliance(fd, guild_id1, guild_id2, account_id1, account_id2, flag); } if( HPMHooks.count.HP_mapif_parse_GuildAlliance_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag); + int (*postHookFunc) (int retVal___, int fd, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildAlliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildAlliance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id1, &guild_id2, &account_id1, &account_id2, &flag); + retVal___ = postHookFunc(retVal___, fd, guild_id1, guild_id2, account_id1, account_id2, flag); } } return retVal___; @@ -12015,11 +12005,11 @@ int HP_mapif_parse_GuildNotice(int fd, int guild_id, const char *mes1, const cha int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildNotice_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, const char *mes1, const char *mes2); + int (*preHookFunc) (int *fd, int *guild_id, const char **mes1, const char **mes2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildNotice_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildNotice_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &guild_id, mes1, mes2); + retVal___ = preHookFunc(&fd, &guild_id, &mes1, &mes2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12030,10 +12020,10 @@ int HP_mapif_parse_GuildNotice(int fd, int guild_id, const char *mes1, const cha retVal___ = HPMHooks.source.mapif.parse_GuildNotice(fd, guild_id, mes1, mes2); } if( HPMHooks.count.HP_mapif_parse_GuildNotice_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, const char *mes1, const char *mes2); + int (*postHookFunc) (int retVal___, int fd, int guild_id, const char *mes1, const char *mes2); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildNotice_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildNotice_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, mes1, mes2); + retVal___ = postHookFunc(retVal___, fd, guild_id, mes1, mes2); } } return retVal___; @@ -12042,11 +12032,11 @@ int HP_mapif_parse_GuildEmblem(int fd, int len, int guild_id, int dummy, const c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildEmblem_pre ) { - int (*preHookFunc) (int *fd, int *len, int *guild_id, int *dummy, const char *data); + int (*preHookFunc) (int *fd, int *len, int *guild_id, int *dummy, const char **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildEmblem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildEmblem_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &len, &guild_id, &dummy, data); + retVal___ = preHookFunc(&fd, &len, &guild_id, &dummy, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12057,10 +12047,10 @@ int HP_mapif_parse_GuildEmblem(int fd, int len, int guild_id, int dummy, const c retVal___ = HPMHooks.source.mapif.parse_GuildEmblem(fd, len, guild_id, dummy, data); } if( HPMHooks.count.HP_mapif_parse_GuildEmblem_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *len, int *guild_id, int *dummy, const char *data); + int (*postHookFunc) (int retVal___, int fd, int len, int guild_id, int dummy, const char *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildEmblem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildEmblem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &len, &guild_id, &dummy, data); + retVal___ = postHookFunc(retVal___, fd, len, guild_id, dummy, data); } } return retVal___; @@ -12069,11 +12059,11 @@ int HP_mapif_parse_GuildCastleDataLoad(int fd, int len, const int *castle_ids) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildCastleDataLoad_pre ) { - int (*preHookFunc) (int *fd, int *len, const int *castle_ids); + int (*preHookFunc) (int *fd, int *len, const int **castle_ids); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildCastleDataLoad_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildCastleDataLoad_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &len, castle_ids); + retVal___ = preHookFunc(&fd, &len, &castle_ids); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12084,10 +12074,10 @@ int HP_mapif_parse_GuildCastleDataLoad(int fd, int len, const int *castle_ids) { retVal___ = HPMHooks.source.mapif.parse_GuildCastleDataLoad(fd, len, castle_ids); } if( HPMHooks.count.HP_mapif_parse_GuildCastleDataLoad_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *len, const int *castle_ids); + int (*postHookFunc) (int retVal___, int fd, int len, const int *castle_ids); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildCastleDataLoad_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildCastleDataLoad_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &len, castle_ids); + retVal___ = postHookFunc(retVal___, fd, len, castle_ids); } } return retVal___; @@ -12111,10 +12101,10 @@ int HP_mapif_parse_GuildCastleDataSave(int fd, int castle_id, int index, int val retVal___ = HPMHooks.source.mapif.parse_GuildCastleDataSave(fd, castle_id, index, value); } if( HPMHooks.count.HP_mapif_parse_GuildCastleDataSave_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *castle_id, int *index, int *value); + int (*postHookFunc) (int retVal___, int fd, int castle_id, int index, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildCastleDataSave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildCastleDataSave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &castle_id, &index, &value); + retVal___ = postHookFunc(retVal___, fd, castle_id, index, value); } } return retVal___; @@ -12123,11 +12113,11 @@ int HP_mapif_parse_GuildMasterChange(int fd, int guild_id, const char *name, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildMasterChange_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, const char *name, int *len); + int (*preHookFunc) (int *fd, int *guild_id, const char **name, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMasterChange_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildMasterChange_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &guild_id, name, &len); + retVal___ = preHookFunc(&fd, &guild_id, &name, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12138,10 +12128,10 @@ int HP_mapif_parse_GuildMasterChange(int fd, int guild_id, const char *name, int retVal___ = HPMHooks.source.mapif.parse_GuildMasterChange(fd, guild_id, name, len); } if( HPMHooks.count.HP_mapif_parse_GuildMasterChange_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, const char *name, int *len); + int (*postHookFunc) (int retVal___, int fd, int guild_id, const char *name, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMasterChange_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildMasterChange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &guild_id, name, &len); + retVal___ = postHookFunc(retVal___, fd, guild_id, name, len); } } return retVal___; @@ -12149,11 +12139,11 @@ int HP_mapif_parse_GuildMasterChange(int fd, int guild_id, const char *name, int void HP_mapif_homunculus_created(int fd, int account_id, const struct s_homunculus *sh, unsigned char flag) { int hIndex = 0; if( HPMHooks.count.HP_mapif_homunculus_created_pre ) { - void (*preHookFunc) (int *fd, int *account_id, const struct s_homunculus *sh, unsigned char *flag); + void (*preHookFunc) (int *fd, int *account_id, const struct s_homunculus **sh, unsigned char *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_created_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_created_pre[hIndex].func; - preHookFunc(&fd, &account_id, sh, &flag); + preHookFunc(&fd, &account_id, &sh, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12164,10 +12154,10 @@ void HP_mapif_homunculus_created(int fd, int account_id, const struct s_homuncul HPMHooks.source.mapif.homunculus_created(fd, account_id, sh, flag); } if( HPMHooks.count.HP_mapif_homunculus_created_post ) { - void (*postHookFunc) (int *fd, int *account_id, const struct s_homunculus *sh, unsigned char *flag); + void (*postHookFunc) (int fd, int account_id, const struct s_homunculus *sh, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_created_post[hIndex].func; - postHookFunc(&fd, &account_id, sh, &flag); + postHookFunc(fd, account_id, sh, flag); } } return; @@ -12190,10 +12180,10 @@ void HP_mapif_homunculus_deleted(int fd, int flag) { HPMHooks.source.mapif.homunculus_deleted(fd, flag); } if( HPMHooks.count.HP_mapif_homunculus_deleted_post ) { - void (*postHookFunc) (int *fd, int *flag); + void (*postHookFunc) (int fd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_deleted_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_deleted_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -12201,11 +12191,11 @@ void HP_mapif_homunculus_deleted(int fd, int flag) { void HP_mapif_homunculus_loaded(int fd, int account_id, struct s_homunculus *hd) { int hIndex = 0; if( HPMHooks.count.HP_mapif_homunculus_loaded_pre ) { - void (*preHookFunc) (int *fd, int *account_id, struct s_homunculus *hd); + void (*preHookFunc) (int *fd, int *account_id, struct s_homunculus **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_loaded_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_loaded_pre[hIndex].func; - preHookFunc(&fd, &account_id, hd); + preHookFunc(&fd, &account_id, &hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12216,10 +12206,10 @@ void HP_mapif_homunculus_loaded(int fd, int account_id, struct s_homunculus *hd) HPMHooks.source.mapif.homunculus_loaded(fd, account_id, hd); } if( HPMHooks.count.HP_mapif_homunculus_loaded_post ) { - void (*postHookFunc) (int *fd, int *account_id, struct s_homunculus *hd); + void (*postHookFunc) (int fd, int account_id, struct s_homunculus *hd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_loaded_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_loaded_post[hIndex].func; - postHookFunc(&fd, &account_id, hd); + postHookFunc(fd, account_id, hd); } } return; @@ -12242,10 +12232,10 @@ void HP_mapif_homunculus_saved(int fd, int account_id, bool flag) { HPMHooks.source.mapif.homunculus_saved(fd, account_id, flag); } if( HPMHooks.count.HP_mapif_homunculus_saved_post ) { - void (*postHookFunc) (int *fd, int *account_id, bool *flag); + void (*postHookFunc) (int fd, int account_id, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_saved_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_saved_post[hIndex].func; - postHookFunc(&fd, &account_id, &flag); + postHookFunc(fd, account_id, flag); } } return; @@ -12253,11 +12243,11 @@ void HP_mapif_homunculus_saved(int fd, int account_id, bool flag) { void HP_mapif_homunculus_renamed(int fd, int account_id, int char_id, unsigned char flag, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_mapif_homunculus_renamed_pre ) { - void (*preHookFunc) (int *fd, int *account_id, int *char_id, unsigned char *flag, const char *name); + void (*preHookFunc) (int *fd, int *account_id, int *char_id, unsigned char *flag, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_renamed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_renamed_pre[hIndex].func; - preHookFunc(&fd, &account_id, &char_id, &flag, name); + preHookFunc(&fd, &account_id, &char_id, &flag, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12268,10 +12258,10 @@ void HP_mapif_homunculus_renamed(int fd, int account_id, int char_id, unsigned c HPMHooks.source.mapif.homunculus_renamed(fd, account_id, char_id, flag, name); } if( HPMHooks.count.HP_mapif_homunculus_renamed_post ) { - void (*postHookFunc) (int *fd, int *account_id, int *char_id, unsigned char *flag, const char *name); + void (*postHookFunc) (int fd, int account_id, int char_id, unsigned char flag, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_renamed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_renamed_post[hIndex].func; - postHookFunc(&fd, &account_id, &char_id, &flag, name); + postHookFunc(fd, account_id, char_id, flag, name); } } return; @@ -12280,11 +12270,11 @@ bool HP_mapif_homunculus_create(struct s_homunculus *hd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_homunculus_create_pre ) { - bool (*preHookFunc) (struct s_homunculus *hd); + bool (*preHookFunc) (struct s_homunculus **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_create_pre[hIndex].func; - retVal___ = preHookFunc(hd); + retVal___ = preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12307,11 +12297,11 @@ bool HP_mapif_homunculus_save(const struct s_homunculus *hd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_homunculus_save_pre ) { - bool (*preHookFunc) (const struct s_homunculus *hd); + bool (*preHookFunc) (const struct s_homunculus **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_save_pre[hIndex].func; - retVal___ = preHookFunc(hd); + retVal___ = preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12334,11 +12324,11 @@ bool HP_mapif_homunculus_load(int homun_id, struct s_homunculus *hd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_homunculus_load_pre ) { - bool (*preHookFunc) (int *homun_id, struct s_homunculus *hd); + bool (*preHookFunc) (int *homun_id, struct s_homunculus **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_load_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_load_pre[hIndex].func; - retVal___ = preHookFunc(&homun_id, hd); + retVal___ = preHookFunc(&homun_id, &hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12349,10 +12339,10 @@ bool HP_mapif_homunculus_load(int homun_id, struct s_homunculus *hd) { retVal___ = HPMHooks.source.mapif.homunculus_load(homun_id, hd); } if( HPMHooks.count.HP_mapif_homunculus_load_post ) { - bool (*postHookFunc) (bool retVal___, int *homun_id, struct s_homunculus *hd); + bool (*postHookFunc) (bool retVal___, int homun_id, struct s_homunculus *hd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_load_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &homun_id, hd); + retVal___ = postHookFunc(retVal___, homun_id, hd); } } return retVal___; @@ -12376,10 +12366,10 @@ bool HP_mapif_homunculus_delete(int homun_id) { retVal___ = HPMHooks.source.mapif.homunculus_delete(homun_id); } if( HPMHooks.count.HP_mapif_homunculus_delete_post ) { - bool (*postHookFunc) (bool retVal___, int *homun_id); + bool (*postHookFunc) (bool retVal___, int homun_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &homun_id); + retVal___ = postHookFunc(retVal___, homun_id); } } return retVal___; @@ -12388,11 +12378,11 @@ bool HP_mapif_homunculus_rename(const char *name) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_homunculus_rename_pre ) { - bool (*preHookFunc) (const char *name); + bool (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_rename_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_rename_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12414,11 +12404,11 @@ bool HP_mapif_homunculus_rename(const char *name) { void HP_mapif_parse_homunculus_create(int fd, int len, int account_id, const struct s_homunculus *phd) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_homunculus_create_pre ) { - void (*preHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus *phd); + void (*preHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus **phd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_create_pre[hIndex].func; - preHookFunc(&fd, &len, &account_id, phd); + preHookFunc(&fd, &len, &account_id, &phd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12429,10 +12419,10 @@ void HP_mapif_parse_homunculus_create(int fd, int len, int account_id, const str HPMHooks.source.mapif.parse_homunculus_create(fd, len, account_id, phd); } if( HPMHooks.count.HP_mapif_parse_homunculus_create_post ) { - void (*postHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus *phd); + void (*postHookFunc) (int fd, int len, int account_id, const struct s_homunculus *phd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_create_post[hIndex].func; - postHookFunc(&fd, &len, &account_id, phd); + postHookFunc(fd, len, account_id, phd); } } return; @@ -12455,10 +12445,10 @@ void HP_mapif_parse_homunculus_delete(int fd, int homun_id) { HPMHooks.source.mapif.parse_homunculus_delete(fd, homun_id); } if( HPMHooks.count.HP_mapif_parse_homunculus_delete_post ) { - void (*postHookFunc) (int *fd, int *homun_id); + void (*postHookFunc) (int fd, int homun_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_delete_post[hIndex].func; - postHookFunc(&fd, &homun_id); + postHookFunc(fd, homun_id); } } return; @@ -12481,10 +12471,10 @@ void HP_mapif_parse_homunculus_load(int fd, int account_id, int homun_id) { HPMHooks.source.mapif.parse_homunculus_load(fd, account_id, homun_id); } if( HPMHooks.count.HP_mapif_parse_homunculus_load_post ) { - void (*postHookFunc) (int *fd, int *account_id, int *homun_id); + void (*postHookFunc) (int fd, int account_id, int homun_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_load_post[hIndex].func; - postHookFunc(&fd, &account_id, &homun_id); + postHookFunc(fd, account_id, homun_id); } } return; @@ -12492,11 +12482,11 @@ void HP_mapif_parse_homunculus_load(int fd, int account_id, int homun_id) { void HP_mapif_parse_homunculus_save(int fd, int len, int account_id, const struct s_homunculus *phd) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_homunculus_save_pre ) { - void (*preHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus *phd); + void (*preHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus **phd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_save_pre[hIndex].func; - preHookFunc(&fd, &len, &account_id, phd); + preHookFunc(&fd, &len, &account_id, &phd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12507,10 +12497,10 @@ void HP_mapif_parse_homunculus_save(int fd, int len, int account_id, const struc HPMHooks.source.mapif.parse_homunculus_save(fd, len, account_id, phd); } if( HPMHooks.count.HP_mapif_parse_homunculus_save_post ) { - void (*postHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus *phd); + void (*postHookFunc) (int fd, int len, int account_id, const struct s_homunculus *phd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_save_post[hIndex].func; - postHookFunc(&fd, &len, &account_id, phd); + postHookFunc(fd, len, account_id, phd); } } return; @@ -12518,11 +12508,11 @@ void HP_mapif_parse_homunculus_save(int fd, int len, int account_id, const struc void HP_mapif_parse_homunculus_rename(int fd, int account_id, int char_id, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_homunculus_rename_pre ) { - void (*preHookFunc) (int *fd, int *account_id, int *char_id, const char *name); + void (*preHookFunc) (int *fd, int *account_id, int *char_id, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_rename_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_rename_pre[hIndex].func; - preHookFunc(&fd, &account_id, &char_id, name); + preHookFunc(&fd, &account_id, &char_id, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12533,10 +12523,10 @@ void HP_mapif_parse_homunculus_rename(int fd, int account_id, int char_id, const HPMHooks.source.mapif.parse_homunculus_rename(fd, account_id, char_id, name); } if( HPMHooks.count.HP_mapif_parse_homunculus_rename_post ) { - void (*postHookFunc) (int *fd, int *account_id, int *char_id, const char *name); + void (*postHookFunc) (int fd, int account_id, int char_id, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_rename_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_rename_post[hIndex].func; - postHookFunc(&fd, &account_id, &char_id, name); + postHookFunc(fd, account_id, char_id, name); } } return; @@ -12544,11 +12534,11 @@ void HP_mapif_parse_homunculus_rename(int fd, int account_id, int char_id, const void HP_mapif_mail_sendinbox(int fd, int char_id, unsigned char flag, struct mail_data *md) { int hIndex = 0; if( HPMHooks.count.HP_mapif_mail_sendinbox_pre ) { - void (*preHookFunc) (int *fd, int *char_id, unsigned char *flag, struct mail_data *md); + void (*preHookFunc) (int *fd, int *char_id, unsigned char *flag, struct mail_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_sendinbox_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_mail_sendinbox_pre[hIndex].func; - preHookFunc(&fd, &char_id, &flag, md); + preHookFunc(&fd, &char_id, &flag, &md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12559,10 +12549,10 @@ void HP_mapif_mail_sendinbox(int fd, int char_id, unsigned char flag, struct mai HPMHooks.source.mapif.mail_sendinbox(fd, char_id, flag, md); } if( HPMHooks.count.HP_mapif_mail_sendinbox_post ) { - void (*postHookFunc) (int *fd, int *char_id, unsigned char *flag, struct mail_data *md); + void (*postHookFunc) (int fd, int char_id, unsigned char flag, struct mail_data *md); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_sendinbox_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mail_sendinbox_post[hIndex].func; - postHookFunc(&fd, &char_id, &flag, md); + postHookFunc(fd, char_id, flag, md); } } return; @@ -12585,10 +12575,10 @@ void HP_mapif_parse_mail_requestinbox(int fd) { HPMHooks.source.mapif.parse_mail_requestinbox(fd); } if( HPMHooks.count.HP_mapif_parse_mail_requestinbox_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mail_requestinbox_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mail_requestinbox_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -12611,10 +12601,10 @@ void HP_mapif_parse_mail_read(int fd) { HPMHooks.source.mapif.parse_mail_read(fd); } if( HPMHooks.count.HP_mapif_parse_mail_read_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mail_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mail_read_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -12622,11 +12612,11 @@ void HP_mapif_parse_mail_read(int fd) { void HP_mapif_mail_sendattach(int fd, int char_id, struct mail_message *msg) { int hIndex = 0; if( HPMHooks.count.HP_mapif_mail_sendattach_pre ) { - void (*preHookFunc) (int *fd, int *char_id, struct mail_message *msg); + void (*preHookFunc) (int *fd, int *char_id, struct mail_message **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_sendattach_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_mail_sendattach_pre[hIndex].func; - preHookFunc(&fd, &char_id, msg); + preHookFunc(&fd, &char_id, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12637,10 +12627,10 @@ void HP_mapif_mail_sendattach(int fd, int char_id, struct mail_message *msg) { HPMHooks.source.mapif.mail_sendattach(fd, char_id, msg); } if( HPMHooks.count.HP_mapif_mail_sendattach_post ) { - void (*postHookFunc) (int *fd, int *char_id, struct mail_message *msg); + void (*postHookFunc) (int fd, int char_id, struct mail_message *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_sendattach_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mail_sendattach_post[hIndex].func; - postHookFunc(&fd, &char_id, msg); + postHookFunc(fd, char_id, msg); } } return; @@ -12663,10 +12653,10 @@ void HP_mapif_mail_getattach(int fd, int char_id, int mail_id) { HPMHooks.source.mapif.mail_getattach(fd, char_id, mail_id); } if( HPMHooks.count.HP_mapif_mail_getattach_post ) { - void (*postHookFunc) (int *fd, int *char_id, int *mail_id); + void (*postHookFunc) (int fd, int char_id, int mail_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_getattach_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mail_getattach_post[hIndex].func; - postHookFunc(&fd, &char_id, &mail_id); + postHookFunc(fd, char_id, mail_id); } } return; @@ -12689,10 +12679,10 @@ void HP_mapif_parse_mail_getattach(int fd) { HPMHooks.source.mapif.parse_mail_getattach(fd); } if( HPMHooks.count.HP_mapif_parse_mail_getattach_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mail_getattach_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mail_getattach_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -12715,10 +12705,10 @@ void HP_mapif_mail_delete(int fd, int char_id, int mail_id, bool failed) { HPMHooks.source.mapif.mail_delete(fd, char_id, mail_id, failed); } if( HPMHooks.count.HP_mapif_mail_delete_post ) { - void (*postHookFunc) (int *fd, int *char_id, int *mail_id, bool *failed); + void (*postHookFunc) (int fd, int char_id, int mail_id, bool failed); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mail_delete_post[hIndex].func; - postHookFunc(&fd, &char_id, &mail_id, &failed); + postHookFunc(fd, char_id, mail_id, failed); } } return; @@ -12741,10 +12731,10 @@ void HP_mapif_parse_mail_delete(int fd) { HPMHooks.source.mapif.parse_mail_delete(fd); } if( HPMHooks.count.HP_mapif_parse_mail_delete_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mail_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mail_delete_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -12752,11 +12742,11 @@ void HP_mapif_parse_mail_delete(int fd) { void HP_mapif_mail_new(struct mail_message *msg) { int hIndex = 0; if( HPMHooks.count.HP_mapif_mail_new_pre ) { - void (*preHookFunc) (struct mail_message *msg); + void (*preHookFunc) (struct mail_message **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_new_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_mail_new_pre[hIndex].func; - preHookFunc(msg); + preHookFunc(&msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12793,10 +12783,10 @@ void HP_mapif_mail_return(int fd, int char_id, int mail_id, int new_mail) { HPMHooks.source.mapif.mail_return(fd, char_id, mail_id, new_mail); } if( HPMHooks.count.HP_mapif_mail_return_post ) { - void (*postHookFunc) (int *fd, int *char_id, int *mail_id, int *new_mail); + void (*postHookFunc) (int fd, int char_id, int mail_id, int new_mail); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_return_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mail_return_post[hIndex].func; - postHookFunc(&fd, &char_id, &mail_id, &new_mail); + postHookFunc(fd, char_id, mail_id, new_mail); } } return; @@ -12819,10 +12809,10 @@ void HP_mapif_parse_mail_return(int fd) { HPMHooks.source.mapif.parse_mail_return(fd); } if( HPMHooks.count.HP_mapif_parse_mail_return_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mail_return_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mail_return_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -12830,11 +12820,11 @@ void HP_mapif_parse_mail_return(int fd) { void HP_mapif_mail_send(int fd, struct mail_message *msg) { int hIndex = 0; if( HPMHooks.count.HP_mapif_mail_send_pre ) { - void (*preHookFunc) (int *fd, struct mail_message *msg); + void (*preHookFunc) (int *fd, struct mail_message **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_mail_send_pre[hIndex].func; - preHookFunc(&fd, msg); + preHookFunc(&fd, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12845,10 +12835,10 @@ void HP_mapif_mail_send(int fd, struct mail_message *msg) { HPMHooks.source.mapif.mail_send(fd, msg); } if( HPMHooks.count.HP_mapif_mail_send_post ) { - void (*postHookFunc) (int *fd, struct mail_message *msg); + void (*postHookFunc) (int fd, struct mail_message *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mail_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mail_send_post[hIndex].func; - postHookFunc(&fd, msg); + postHookFunc(fd, msg); } } return; @@ -12871,10 +12861,10 @@ void HP_mapif_parse_mail_send(int fd) { HPMHooks.source.mapif.parse_mail_send(fd); } if( HPMHooks.count.HP_mapif_parse_mail_send_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mail_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mail_send_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -12883,11 +12873,11 @@ bool HP_mapif_mercenary_create(struct s_mercenary *merc) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_mercenary_create_pre ) { - bool (*preHookFunc) (struct s_mercenary *merc); + bool (*preHookFunc) (struct s_mercenary **merc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_mercenary_create_pre[hIndex].func; - retVal___ = preHookFunc(merc); + retVal___ = preHookFunc(&merc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12910,11 +12900,11 @@ bool HP_mapif_mercenary_save(const struct s_mercenary *merc) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_mercenary_save_pre ) { - bool (*preHookFunc) (const struct s_mercenary *merc); + bool (*preHookFunc) (const struct s_mercenary **merc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_mercenary_save_pre[hIndex].func; - retVal___ = preHookFunc(merc); + retVal___ = preHookFunc(&merc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12937,11 +12927,11 @@ bool HP_mapif_mercenary_load(int merc_id, int char_id, struct s_mercenary *merc) int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_mercenary_load_pre ) { - bool (*preHookFunc) (int *merc_id, int *char_id, struct s_mercenary *merc); + bool (*preHookFunc) (int *merc_id, int *char_id, struct s_mercenary **merc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_load_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_mercenary_load_pre[hIndex].func; - retVal___ = preHookFunc(&merc_id, &char_id, merc); + retVal___ = preHookFunc(&merc_id, &char_id, &merc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12952,10 +12942,10 @@ bool HP_mapif_mercenary_load(int merc_id, int char_id, struct s_mercenary *merc) retVal___ = HPMHooks.source.mapif.mercenary_load(merc_id, char_id, merc); } if( HPMHooks.count.HP_mapif_mercenary_load_post ) { - bool (*postHookFunc) (bool retVal___, int *merc_id, int *char_id, struct s_mercenary *merc); + bool (*postHookFunc) (bool retVal___, int merc_id, int char_id, struct s_mercenary *merc); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mercenary_load_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &merc_id, &char_id, merc); + retVal___ = postHookFunc(retVal___, merc_id, char_id, merc); } } return retVal___; @@ -12979,10 +12969,10 @@ bool HP_mapif_mercenary_delete(int merc_id) { retVal___ = HPMHooks.source.mapif.mercenary_delete(merc_id); } if( HPMHooks.count.HP_mapif_mercenary_delete_post ) { - bool (*postHookFunc) (bool retVal___, int *merc_id); + bool (*postHookFunc) (bool retVal___, int merc_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mercenary_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &merc_id); + retVal___ = postHookFunc(retVal___, merc_id); } } return retVal___; @@ -12990,11 +12980,11 @@ bool HP_mapif_mercenary_delete(int merc_id) { void HP_mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag) { int hIndex = 0; if( HPMHooks.count.HP_mapif_mercenary_send_pre ) { - void (*preHookFunc) (int *fd, struct s_mercenary *merc, unsigned char *flag); + void (*preHookFunc) (int *fd, struct s_mercenary **merc, unsigned char *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_mercenary_send_pre[hIndex].func; - preHookFunc(&fd, merc, &flag); + preHookFunc(&fd, &merc, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13005,10 +12995,10 @@ void HP_mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char fla HPMHooks.source.mapif.mercenary_send(fd, merc, flag); } if( HPMHooks.count.HP_mapif_mercenary_send_post ) { - void (*postHookFunc) (int *fd, struct s_mercenary *merc, unsigned char *flag); + void (*postHookFunc) (int fd, struct s_mercenary *merc, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mercenary_send_post[hIndex].func; - postHookFunc(&fd, merc, &flag); + postHookFunc(fd, merc, flag); } } return; @@ -13016,11 +13006,11 @@ void HP_mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char fla void HP_mapif_parse_mercenary_create(int fd, const struct s_mercenary *merc) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_mercenary_create_pre ) { - void (*preHookFunc) (int *fd, const struct s_mercenary *merc); + void (*preHookFunc) (int *fd, const struct s_mercenary **merc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_create_pre[hIndex].func; - preHookFunc(&fd, merc); + preHookFunc(&fd, &merc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13031,10 +13021,10 @@ void HP_mapif_parse_mercenary_create(int fd, const struct s_mercenary *merc) { HPMHooks.source.mapif.parse_mercenary_create(fd, merc); } if( HPMHooks.count.HP_mapif_parse_mercenary_create_post ) { - void (*postHookFunc) (int *fd, const struct s_mercenary *merc); + void (*postHookFunc) (int fd, const struct s_mercenary *merc); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_create_post[hIndex].func; - postHookFunc(&fd, merc); + postHookFunc(fd, merc); } } return; @@ -13057,10 +13047,10 @@ void HP_mapif_parse_mercenary_load(int fd, int merc_id, int char_id) { HPMHooks.source.mapif.parse_mercenary_load(fd, merc_id, char_id); } if( HPMHooks.count.HP_mapif_parse_mercenary_load_post ) { - void (*postHookFunc) (int *fd, int *merc_id, int *char_id); + void (*postHookFunc) (int fd, int merc_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_load_post[hIndex].func; - postHookFunc(&fd, &merc_id, &char_id); + postHookFunc(fd, merc_id, char_id); } } return; @@ -13083,10 +13073,10 @@ void HP_mapif_mercenary_deleted(int fd, unsigned char flag) { HPMHooks.source.mapif.mercenary_deleted(fd, flag); } if( HPMHooks.count.HP_mapif_mercenary_deleted_post ) { - void (*postHookFunc) (int *fd, unsigned char *flag); + void (*postHookFunc) (int fd, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_deleted_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mercenary_deleted_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -13109,10 +13099,10 @@ void HP_mapif_parse_mercenary_delete(int fd, int merc_id) { HPMHooks.source.mapif.parse_mercenary_delete(fd, merc_id); } if( HPMHooks.count.HP_mapif_parse_mercenary_delete_post ) { - void (*postHookFunc) (int *fd, int *merc_id); + void (*postHookFunc) (int fd, int merc_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_delete_post[hIndex].func; - postHookFunc(&fd, &merc_id); + postHookFunc(fd, merc_id); } } return; @@ -13135,10 +13125,10 @@ void HP_mapif_mercenary_saved(int fd, unsigned char flag) { HPMHooks.source.mapif.mercenary_saved(fd, flag); } if( HPMHooks.count.HP_mapif_mercenary_saved_post ) { - void (*postHookFunc) (int *fd, unsigned char *flag); + void (*postHookFunc) (int fd, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_saved_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mercenary_saved_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -13146,11 +13136,11 @@ void HP_mapif_mercenary_saved(int fd, unsigned char flag) { void HP_mapif_parse_mercenary_save(int fd, const struct s_mercenary *merc) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_mercenary_save_pre ) { - void (*preHookFunc) (int *fd, const struct s_mercenary *merc); + void (*preHookFunc) (int *fd, const struct s_mercenary **merc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_save_pre[hIndex].func; - preHookFunc(&fd, merc); + preHookFunc(&fd, &merc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13161,10 +13151,10 @@ void HP_mapif_parse_mercenary_save(int fd, const struct s_mercenary *merc) { HPMHooks.source.mapif.parse_mercenary_save(fd, merc); } if( HPMHooks.count.HP_mapif_parse_mercenary_save_post ) { - void (*postHookFunc) (int *fd, const struct s_mercenary *merc); + void (*postHookFunc) (int fd, const struct s_mercenary *merc); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_save_post[hIndex].func; - postHookFunc(&fd, merc); + postHookFunc(fd, merc); } } return; @@ -13173,11 +13163,11 @@ int HP_mapif_party_created(int fd, int account_id, int char_id, struct party *p) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_party_created_pre ) { - int (*preHookFunc) (int *fd, int *account_id, int *char_id, struct party *p); + int (*preHookFunc) (int *fd, int *account_id, int *char_id, struct party **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_created_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_party_created_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &account_id, &char_id, p); + retVal___ = preHookFunc(&fd, &account_id, &char_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13188,10 +13178,10 @@ int HP_mapif_party_created(int fd, int account_id, int char_id, struct party *p) retVal___ = HPMHooks.source.mapif.party_created(fd, account_id, char_id, p); } if( HPMHooks.count.HP_mapif_party_created_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *char_id, struct party *p); + int (*postHookFunc) (int retVal___, int fd, int account_id, int char_id, struct party *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_created_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, &char_id, p); + retVal___ = postHookFunc(retVal___, fd, account_id, char_id, p); } } return retVal___; @@ -13214,10 +13204,10 @@ void HP_mapif_party_noinfo(int fd, int party_id, int char_id) { HPMHooks.source.mapif.party_noinfo(fd, party_id, char_id); } if( HPMHooks.count.HP_mapif_party_noinfo_post ) { - void (*postHookFunc) (int *fd, int *party_id, int *char_id); + void (*postHookFunc) (int fd, int party_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_noinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_noinfo_post[hIndex].func; - postHookFunc(&fd, &party_id, &char_id); + postHookFunc(fd, party_id, char_id); } } return; @@ -13225,11 +13215,11 @@ void HP_mapif_party_noinfo(int fd, int party_id, int char_id) { void HP_mapif_party_info(int fd, struct party *p, int char_id) { int hIndex = 0; if( HPMHooks.count.HP_mapif_party_info_pre ) { - void (*preHookFunc) (int *fd, struct party *p, int *char_id); + void (*preHookFunc) (int *fd, struct party **p, int *char_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_party_info_pre[hIndex].func; - preHookFunc(&fd, p, &char_id); + preHookFunc(&fd, &p, &char_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13240,10 +13230,10 @@ void HP_mapif_party_info(int fd, struct party *p, int char_id) { HPMHooks.source.mapif.party_info(fd, p, char_id); } if( HPMHooks.count.HP_mapif_party_info_post ) { - void (*postHookFunc) (int *fd, struct party *p, int *char_id); + void (*postHookFunc) (int fd, struct party *p, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_info_post[hIndex].func; - postHookFunc(&fd, p, &char_id); + postHookFunc(fd, p, char_id); } } return; @@ -13267,10 +13257,10 @@ int HP_mapif_party_memberadded(int fd, int party_id, int account_id, int char_id retVal___ = HPMHooks.source.mapif.party_memberadded(fd, party_id, account_id, char_id, flag); } if( HPMHooks.count.HP_mapif_party_memberadded_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id, int *account_id, int *char_id, int *flag); + int (*postHookFunc) (int retVal___, int fd, int party_id, int account_id, int char_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_memberadded_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_memberadded_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &party_id, &account_id, &char_id, &flag); + retVal___ = postHookFunc(retVal___, fd, party_id, account_id, char_id, flag); } } return retVal___; @@ -13279,11 +13269,11 @@ int HP_mapif_party_optionchanged(int fd, struct party *p, int account_id, int fl int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_party_optionchanged_pre ) { - int (*preHookFunc) (int *fd, struct party *p, int *account_id, int *flag); + int (*preHookFunc) (int *fd, struct party **p, int *account_id, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_optionchanged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_party_optionchanged_pre[hIndex].func; - retVal___ = preHookFunc(&fd, p, &account_id, &flag); + retVal___ = preHookFunc(&fd, &p, &account_id, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13294,10 +13284,10 @@ int HP_mapif_party_optionchanged(int fd, struct party *p, int account_id, int fl retVal___ = HPMHooks.source.mapif.party_optionchanged(fd, p, account_id, flag); } if( HPMHooks.count.HP_mapif_party_optionchanged_post ) { - int (*postHookFunc) (int retVal___, int *fd, struct party *p, int *account_id, int *flag); + int (*postHookFunc) (int retVal___, int fd, struct party *p, int account_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_optionchanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_optionchanged_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, p, &account_id, &flag); + retVal___ = postHookFunc(retVal___, fd, p, account_id, flag); } } return retVal___; @@ -13321,10 +13311,10 @@ int HP_mapif_party_withdraw(int party_id, int account_id, int char_id) { retVal___ = HPMHooks.source.mapif.party_withdraw(party_id, account_id, char_id); } if( HPMHooks.count.HP_mapif_party_withdraw_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int party_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_withdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_withdraw_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, party_id, account_id, char_id); } } return retVal___; @@ -13333,11 +13323,11 @@ int HP_mapif_party_membermoved(struct party *p, int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_party_membermoved_pre ) { - int (*preHookFunc) (struct party *p, int *idx); + int (*preHookFunc) (struct party **p, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_membermoved_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_party_membermoved_pre[hIndex].func; - retVal___ = preHookFunc(p, &idx); + retVal___ = preHookFunc(&p, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13348,10 +13338,10 @@ int HP_mapif_party_membermoved(struct party *p, int idx) { retVal___ = HPMHooks.source.mapif.party_membermoved(p, idx); } if( HPMHooks.count.HP_mapif_party_membermoved_post ) { - int (*postHookFunc) (int retVal___, struct party *p, int *idx); + int (*postHookFunc) (int retVal___, struct party *p, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_membermoved_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_membermoved_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &idx); + retVal___ = postHookFunc(retVal___, p, idx); } } return retVal___; @@ -13375,10 +13365,10 @@ int HP_mapif_party_broken(int party_id, int flag) { retVal___ = HPMHooks.source.mapif.party_broken(party_id, flag); } if( HPMHooks.count.HP_mapif_party_broken_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *flag); + int (*postHookFunc) (int retVal___, int party_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_broken_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_broken_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &flag); + retVal___ = postHookFunc(retVal___, party_id, flag); } } return retVal___; @@ -13387,11 +13377,11 @@ int HP_mapif_party_message(int party_id, int account_id, const char *mes, int le int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_party_message_pre ) { - int (*preHookFunc) (int *party_id, int *account_id, const char *mes, int *len, int *sfd); + int (*preHookFunc) (int *party_id, int *account_id, const char **mes, int *len, int *sfd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_party_message_pre[hIndex].func; - retVal___ = preHookFunc(&party_id, &account_id, mes, &len, &sfd); + retVal___ = preHookFunc(&party_id, &account_id, &mes, &len, &sfd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13402,10 +13392,10 @@ int HP_mapif_party_message(int party_id, int account_id, const char *mes, int le retVal___ = HPMHooks.source.mapif.party_message(party_id, account_id, mes, len, sfd); } if( HPMHooks.count.HP_mapif_party_message_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, const char *mes, int *len, int *sfd); + int (*postHookFunc) (int retVal___, int party_id, int account_id, const char *mes, int len, int sfd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, mes, &len, &sfd); + retVal___ = postHookFunc(retVal___, party_id, account_id, mes, len, sfd); } } return retVal___; @@ -13414,11 +13404,11 @@ int HP_mapif_parse_CreateParty(int fd, const char *name, int item, int item2, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_CreateParty_pre ) { - int (*preHookFunc) (int *fd, const char *name, int *item, int *item2, const struct party_member *leader); + int (*preHookFunc) (int *fd, const char **name, int *item, int *item2, const struct party_member **leader); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_CreateParty_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_CreateParty_pre[hIndex].func; - retVal___ = preHookFunc(&fd, name, &item, &item2, leader); + retVal___ = preHookFunc(&fd, &name, &item, &item2, &leader); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13429,10 +13419,10 @@ int HP_mapif_parse_CreateParty(int fd, const char *name, int item, int item2, co retVal___ = HPMHooks.source.mapif.parse_CreateParty(fd, name, item, item2, leader); } if( HPMHooks.count.HP_mapif_parse_CreateParty_post ) { - int (*postHookFunc) (int retVal___, int *fd, const char *name, int *item, int *item2, const struct party_member *leader); + int (*postHookFunc) (int retVal___, int fd, const char *name, int item, int item2, const struct party_member *leader); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_CreateParty_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_CreateParty_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, name, &item, &item2, leader); + retVal___ = postHookFunc(retVal___, fd, name, item, item2, leader); } } return retVal___; @@ -13455,10 +13445,10 @@ void HP_mapif_parse_PartyInfo(int fd, int party_id, int char_id) { HPMHooks.source.mapif.parse_PartyInfo(fd, party_id, char_id); } if( HPMHooks.count.HP_mapif_parse_PartyInfo_post ) { - void (*postHookFunc) (int *fd, int *party_id, int *char_id); + void (*postHookFunc) (int fd, int party_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_PartyInfo_post[hIndex].func; - postHookFunc(&fd, &party_id, &char_id); + postHookFunc(fd, party_id, char_id); } } return; @@ -13467,11 +13457,11 @@ int HP_mapif_parse_PartyAddMember(int fd, int party_id, const struct party_membe int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_PartyAddMember_pre ) { - int (*preHookFunc) (int *fd, int *party_id, const struct party_member *member); + int (*preHookFunc) (int *fd, int *party_id, const struct party_member **member); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyAddMember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_PartyAddMember_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &party_id, member); + retVal___ = preHookFunc(&fd, &party_id, &member); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13482,10 +13472,10 @@ int HP_mapif_parse_PartyAddMember(int fd, int party_id, const struct party_membe retVal___ = HPMHooks.source.mapif.parse_PartyAddMember(fd, party_id, member); } if( HPMHooks.count.HP_mapif_parse_PartyAddMember_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id, const struct party_member *member); + int (*postHookFunc) (int retVal___, int fd, int party_id, const struct party_member *member); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyAddMember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_PartyAddMember_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &party_id, member); + retVal___ = postHookFunc(retVal___, fd, party_id, member); } } return retVal___; @@ -13509,10 +13499,10 @@ int HP_mapif_parse_PartyChangeOption(int fd, int party_id, int account_id, int e retVal___ = HPMHooks.source.mapif.parse_PartyChangeOption(fd, party_id, account_id, exp, item); } if( HPMHooks.count.HP_mapif_parse_PartyChangeOption_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id, int *account_id, int *exp, int *item); + int (*postHookFunc) (int retVal___, int fd, int party_id, int account_id, int exp, int item); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyChangeOption_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_PartyChangeOption_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &party_id, &account_id, &exp, &item); + retVal___ = postHookFunc(retVal___, fd, party_id, account_id, exp, item); } } return retVal___; @@ -13536,10 +13526,10 @@ int HP_mapif_parse_PartyLeave(int fd, int party_id, int account_id, int char_id) retVal___ = HPMHooks.source.mapif.parse_PartyLeave(fd, party_id, account_id, char_id); } if( HPMHooks.count.HP_mapif_parse_PartyLeave_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int fd, int party_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyLeave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_PartyLeave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &party_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, fd, party_id, account_id, char_id); } } return retVal___; @@ -13563,10 +13553,10 @@ int HP_mapif_parse_PartyChangeMap(int fd, int party_id, int account_id, int char retVal___ = HPMHooks.source.mapif.parse_PartyChangeMap(fd, party_id, account_id, char_id, map, online, lv); } if( HPMHooks.count.HP_mapif_parse_PartyChangeMap_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id, int *account_id, int *char_id, unsigned short *map, int *online, unsigned int *lv); + int (*postHookFunc) (int retVal___, int fd, int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyChangeMap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_PartyChangeMap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &party_id, &account_id, &char_id, &map, &online, &lv); + retVal___ = postHookFunc(retVal___, fd, party_id, account_id, char_id, map, online, lv); } } return retVal___; @@ -13590,10 +13580,10 @@ int HP_mapif_parse_BreakParty(int fd, int party_id) { retVal___ = HPMHooks.source.mapif.parse_BreakParty(fd, party_id); } if( HPMHooks.count.HP_mapif_parse_BreakParty_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id); + int (*postHookFunc) (int retVal___, int fd, int party_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_BreakParty_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_BreakParty_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &party_id); + retVal___ = postHookFunc(retVal___, fd, party_id); } } return retVal___; @@ -13602,11 +13592,11 @@ int HP_mapif_parse_PartyMessage(int fd, int party_id, int account_id, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_PartyMessage_pre ) { - int (*preHookFunc) (int *fd, int *party_id, int *account_id, const char *mes, int *len); + int (*preHookFunc) (int *fd, int *party_id, int *account_id, const char **mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyMessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_PartyMessage_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &party_id, &account_id, mes, &len); + retVal___ = preHookFunc(&fd, &party_id, &account_id, &mes, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13617,10 +13607,10 @@ int HP_mapif_parse_PartyMessage(int fd, int party_id, int account_id, const char retVal___ = HPMHooks.source.mapif.parse_PartyMessage(fd, party_id, account_id, mes, len); } if( HPMHooks.count.HP_mapif_parse_PartyMessage_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id, int *account_id, const char *mes, int *len); + int (*postHookFunc) (int retVal___, int fd, int party_id, int account_id, const char *mes, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_PartyMessage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &party_id, &account_id, mes, &len); + retVal___ = postHookFunc(retVal___, fd, party_id, account_id, mes, len); } } return retVal___; @@ -13644,10 +13634,10 @@ int HP_mapif_parse_PartyLeaderChange(int fd, int party_id, int account_id, int c retVal___ = HPMHooks.source.mapif.parse_PartyLeaderChange(fd, party_id, account_id, char_id); } if( HPMHooks.count.HP_mapif_parse_PartyLeaderChange_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int fd, int party_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyLeaderChange_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_PartyLeaderChange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &party_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, fd, party_id, account_id, char_id); } } return retVal___; @@ -13656,11 +13646,11 @@ int HP_mapif_pet_created(int fd, int account_id, struct s_pet *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_pet_created_pre ) { - int (*preHookFunc) (int *fd, int *account_id, struct s_pet *p); + int (*preHookFunc) (int *fd, int *account_id, struct s_pet **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_pet_created_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_pet_created_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &account_id, p); + retVal___ = preHookFunc(&fd, &account_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13671,10 +13661,10 @@ int HP_mapif_pet_created(int fd, int account_id, struct s_pet *p) { retVal___ = HPMHooks.source.mapif.pet_created(fd, account_id, p); } if( HPMHooks.count.HP_mapif_pet_created_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, struct s_pet *p); + int (*postHookFunc) (int retVal___, int fd, int account_id, struct s_pet *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_pet_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_pet_created_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, p); + retVal___ = postHookFunc(retVal___, fd, account_id, p); } } return retVal___; @@ -13683,11 +13673,11 @@ int HP_mapif_pet_info(int fd, int account_id, struct s_pet *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_pet_info_pre ) { - int (*preHookFunc) (int *fd, int *account_id, struct s_pet *p); + int (*preHookFunc) (int *fd, int *account_id, struct s_pet **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_pet_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_pet_info_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &account_id, p); + retVal___ = preHookFunc(&fd, &account_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13698,10 +13688,10 @@ int HP_mapif_pet_info(int fd, int account_id, struct s_pet *p) { retVal___ = HPMHooks.source.mapif.pet_info(fd, account_id, p); } if( HPMHooks.count.HP_mapif_pet_info_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, struct s_pet *p); + int (*postHookFunc) (int retVal___, int fd, int account_id, struct s_pet *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_pet_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_pet_info_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, p); + retVal___ = postHookFunc(retVal___, fd, account_id, p); } } return retVal___; @@ -13725,10 +13715,10 @@ int HP_mapif_pet_noinfo(int fd, int account_id) { retVal___ = HPMHooks.source.mapif.pet_noinfo(fd, account_id); } if( HPMHooks.count.HP_mapif_pet_noinfo_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id); + int (*postHookFunc) (int retVal___, int fd, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_pet_noinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_pet_noinfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id); + retVal___ = postHookFunc(retVal___, fd, account_id); } } return retVal___; @@ -13752,10 +13742,10 @@ int HP_mapif_save_pet_ack(int fd, int account_id, int flag) { retVal___ = HPMHooks.source.mapif.save_pet_ack(fd, account_id, flag); } if( HPMHooks.count.HP_mapif_save_pet_ack_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *flag); + int (*postHookFunc) (int retVal___, int fd, int account_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_save_pet_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_save_pet_ack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, &flag); + retVal___ = postHookFunc(retVal___, fd, account_id, flag); } } return retVal___; @@ -13779,10 +13769,10 @@ int HP_mapif_delete_pet_ack(int fd, int flag) { retVal___ = HPMHooks.source.mapif.delete_pet_ack(fd, flag); } if( HPMHooks.count.HP_mapif_delete_pet_ack_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *flag); + int (*postHookFunc) (int retVal___, int fd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_delete_pet_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_delete_pet_ack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &flag); + retVal___ = postHookFunc(retVal___, fd, flag); } } return retVal___; @@ -13791,11 +13781,11 @@ int HP_mapif_create_pet(int fd, int account_id, int char_id, short pet_class, sh int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_create_pet_pre ) { - int (*preHookFunc) (int *fd, int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char *pet_name); + int (*preHookFunc) (int *fd, int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char **pet_name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_create_pet_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_create_pet_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &account_id, &char_id, &pet_class, &pet_lv, &pet_egg_id, &pet_equip, &intimate, &hungry, &rename_flag, &incubate, pet_name); + retVal___ = preHookFunc(&fd, &account_id, &char_id, &pet_class, &pet_lv, &pet_egg_id, &pet_equip, &intimate, &hungry, &rename_flag, &incubate, &pet_name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13806,10 +13796,10 @@ int HP_mapif_create_pet(int fd, int account_id, int char_id, short pet_class, sh retVal___ = HPMHooks.source.mapif.create_pet(fd, account_id, char_id, pet_class, pet_lv, pet_egg_id, pet_equip, intimate, hungry, rename_flag, incubate, pet_name); } if( HPMHooks.count.HP_mapif_create_pet_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char *pet_name); + int (*postHookFunc) (int retVal___, int fd, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id, short pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_create_pet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_create_pet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, &char_id, &pet_class, &pet_lv, &pet_egg_id, &pet_equip, &intimate, &hungry, &rename_flag, &incubate, pet_name); + retVal___ = postHookFunc(retVal___, fd, account_id, char_id, pet_class, pet_lv, pet_egg_id, pet_equip, intimate, hungry, rename_flag, incubate, pet_name); } } return retVal___; @@ -13833,10 +13823,10 @@ int HP_mapif_load_pet(int fd, int account_id, int char_id, int pet_id) { retVal___ = HPMHooks.source.mapif.load_pet(fd, account_id, char_id, pet_id); } if( HPMHooks.count.HP_mapif_load_pet_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *char_id, int *pet_id); + int (*postHookFunc) (int retVal___, int fd, int account_id, int char_id, int pet_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_load_pet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_load_pet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, &char_id, &pet_id); + retVal___ = postHookFunc(retVal___, fd, account_id, char_id, pet_id); } } return retVal___; @@ -13845,11 +13835,11 @@ int HP_mapif_save_pet(int fd, int account_id, const struct s_pet *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_save_pet_pre ) { - int (*preHookFunc) (int *fd, int *account_id, const struct s_pet *data); + int (*preHookFunc) (int *fd, int *account_id, const struct s_pet **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_save_pet_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_save_pet_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &account_id, data); + retVal___ = preHookFunc(&fd, &account_id, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13860,10 +13850,10 @@ int HP_mapif_save_pet(int fd, int account_id, const struct s_pet *data) { retVal___ = HPMHooks.source.mapif.save_pet(fd, account_id, data); } if( HPMHooks.count.HP_mapif_save_pet_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, const struct s_pet *data); + int (*postHookFunc) (int retVal___, int fd, int account_id, const struct s_pet *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_save_pet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_save_pet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, data); + retVal___ = postHookFunc(retVal___, fd, account_id, data); } } return retVal___; @@ -13887,10 +13877,10 @@ int HP_mapif_delete_pet(int fd, int pet_id) { retVal___ = HPMHooks.source.mapif.delete_pet(fd, pet_id); } if( HPMHooks.count.HP_mapif_delete_pet_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *pet_id); + int (*postHookFunc) (int retVal___, int fd, int pet_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_delete_pet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_delete_pet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &pet_id); + retVal___ = postHookFunc(retVal___, fd, pet_id); } } return retVal___; @@ -13914,10 +13904,10 @@ int HP_mapif_parse_CreatePet(int fd) { retVal___ = HPMHooks.source.mapif.parse_CreatePet(fd); } if( HPMHooks.count.HP_mapif_parse_CreatePet_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_CreatePet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_CreatePet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -13941,10 +13931,10 @@ int HP_mapif_parse_LoadPet(int fd) { retVal___ = HPMHooks.source.mapif.parse_LoadPet(fd); } if( HPMHooks.count.HP_mapif_parse_LoadPet_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_LoadPet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_LoadPet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -13968,10 +13958,10 @@ int HP_mapif_parse_SavePet(int fd) { retVal___ = HPMHooks.source.mapif.parse_SavePet(fd); } if( HPMHooks.count.HP_mapif_parse_SavePet_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_SavePet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_SavePet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -13995,10 +13985,10 @@ int HP_mapif_parse_DeletePet(int fd) { retVal___ = HPMHooks.source.mapif.parse_DeletePet(fd); } if( HPMHooks.count.HP_mapif_parse_DeletePet_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_DeletePet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_DeletePet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14007,11 +13997,11 @@ struct quest* HP_mapif_quests_fromsql(int char_id, int *count) { int hIndex = 0; struct quest* retVal___ = NULL; if( HPMHooks.count.HP_mapif_quests_fromsql_pre ) { - struct quest* (*preHookFunc) (int *char_id, int *count); + struct quest* (*preHookFunc) (int *char_id, int **count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_quests_fromsql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_quests_fromsql_pre[hIndex].func; - retVal___ = preHookFunc(&char_id, count); + retVal___ = preHookFunc(&char_id, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14022,10 +14012,10 @@ struct quest* HP_mapif_quests_fromsql(int char_id, int *count) { retVal___ = HPMHooks.source.mapif.quests_fromsql(char_id, count); } if( HPMHooks.count.HP_mapif_quests_fromsql_post ) { - struct quest* (*postHookFunc) (struct quest* retVal___, int *char_id, int *count); + struct quest* (*postHookFunc) (struct quest* retVal___, int char_id, int *count); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_quests_fromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_quests_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, count); + retVal___ = postHookFunc(retVal___, char_id, count); } } return retVal___; @@ -14049,10 +14039,10 @@ bool HP_mapif_quest_delete(int char_id, int quest_id) { retVal___ = HPMHooks.source.mapif.quest_delete(char_id, quest_id); } if( HPMHooks.count.HP_mapif_quest_delete_post ) { - bool (*postHookFunc) (bool retVal___, int *char_id, int *quest_id); + bool (*postHookFunc) (bool retVal___, int char_id, int quest_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_quest_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_quest_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &quest_id); + retVal___ = postHookFunc(retVal___, char_id, quest_id); } } return retVal___; @@ -14076,10 +14066,10 @@ bool HP_mapif_quest_add(int char_id, struct quest qd) { retVal___ = HPMHooks.source.mapif.quest_add(char_id, qd); } if( HPMHooks.count.HP_mapif_quest_add_post ) { - bool (*postHookFunc) (bool retVal___, int *char_id, struct quest *qd); + bool (*postHookFunc) (bool retVal___, int char_id, struct quest qd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_quest_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_quest_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &qd); + retVal___ = postHookFunc(retVal___, char_id, qd); } } return retVal___; @@ -14103,10 +14093,10 @@ bool HP_mapif_quest_update(int char_id, struct quest qd) { retVal___ = HPMHooks.source.mapif.quest_update(char_id, qd); } if( HPMHooks.count.HP_mapif_quest_update_post ) { - bool (*postHookFunc) (bool retVal___, int *char_id, struct quest *qd); + bool (*postHookFunc) (bool retVal___, int char_id, struct quest qd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_quest_update_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_quest_update_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &qd); + retVal___ = postHookFunc(retVal___, char_id, qd); } } return retVal___; @@ -14129,10 +14119,10 @@ void HP_mapif_quest_save_ack(int fd, int char_id, bool success) { HPMHooks.source.mapif.quest_save_ack(fd, char_id, success); } if( HPMHooks.count.HP_mapif_quest_save_ack_post ) { - void (*postHookFunc) (int *fd, int *char_id, bool *success); + void (*postHookFunc) (int fd, int char_id, bool success); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_quest_save_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_quest_save_ack_post[hIndex].func; - postHookFunc(&fd, &char_id, &success); + postHookFunc(fd, char_id, success); } } return; @@ -14156,10 +14146,10 @@ int HP_mapif_parse_quest_save(int fd) { retVal___ = HPMHooks.source.mapif.parse_quest_save(fd); } if( HPMHooks.count.HP_mapif_parse_quest_save_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_quest_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_quest_save_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14167,11 +14157,11 @@ int HP_mapif_parse_quest_save(int fd) { void HP_mapif_send_quests(int fd, int char_id, struct quest *tmp_questlog, int num_quests) { int hIndex = 0; if( HPMHooks.count.HP_mapif_send_quests_pre ) { - void (*preHookFunc) (int *fd, int *char_id, struct quest *tmp_questlog, int *num_quests); + void (*preHookFunc) (int *fd, int *char_id, struct quest **tmp_questlog, int *num_quests); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_send_quests_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_send_quests_pre[hIndex].func; - preHookFunc(&fd, &char_id, tmp_questlog, &num_quests); + preHookFunc(&fd, &char_id, &tmp_questlog, &num_quests); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14182,10 +14172,10 @@ void HP_mapif_send_quests(int fd, int char_id, struct quest *tmp_questlog, int n HPMHooks.source.mapif.send_quests(fd, char_id, tmp_questlog, num_quests); } if( HPMHooks.count.HP_mapif_send_quests_post ) { - void (*postHookFunc) (int *fd, int *char_id, struct quest *tmp_questlog, int *num_quests); + void (*postHookFunc) (int fd, int char_id, struct quest *tmp_questlog, int num_quests); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_send_quests_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_send_quests_post[hIndex].func; - postHookFunc(&fd, &char_id, tmp_questlog, &num_quests); + postHookFunc(fd, char_id, tmp_questlog, num_quests); } } return; @@ -14209,10 +14199,10 @@ int HP_mapif_parse_quest_load(int fd) { retVal___ = HPMHooks.source.mapif.parse_quest_load(fd); } if( HPMHooks.count.HP_mapif_parse_quest_load_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_quest_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_quest_load_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14236,10 +14226,10 @@ int HP_mapif_load_guild_storage(int fd, int account_id, int guild_id, char flag) retVal___ = HPMHooks.source.mapif.load_guild_storage(fd, account_id, guild_id, flag); } if( HPMHooks.count.HP_mapif_load_guild_storage_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *guild_id, char *flag); + int (*postHookFunc) (int retVal___, int fd, int account_id, int guild_id, char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_load_guild_storage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_load_guild_storage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, &guild_id, &flag); + retVal___ = postHookFunc(retVal___, fd, account_id, guild_id, flag); } } return retVal___; @@ -14263,10 +14253,10 @@ int HP_mapif_save_guild_storage_ack(int fd, int account_id, int guild_id, int fa retVal___ = HPMHooks.source.mapif.save_guild_storage_ack(fd, account_id, guild_id, fail); } if( HPMHooks.count.HP_mapif_save_guild_storage_ack_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *guild_id, int *fail); + int (*postHookFunc) (int retVal___, int fd, int account_id, int guild_id, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_save_guild_storage_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_save_guild_storage_ack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, &guild_id, &fail); + retVal___ = postHookFunc(retVal___, fd, account_id, guild_id, fail); } } return retVal___; @@ -14290,10 +14280,10 @@ int HP_mapif_parse_LoadGuildStorage(int fd) { retVal___ = HPMHooks.source.mapif.parse_LoadGuildStorage(fd); } if( HPMHooks.count.HP_mapif_parse_LoadGuildStorage_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_LoadGuildStorage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_LoadGuildStorage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14317,10 +14307,10 @@ int HP_mapif_parse_SaveGuildStorage(int fd) { retVal___ = HPMHooks.source.mapif.parse_SaveGuildStorage(fd); } if( HPMHooks.count.HP_mapif_parse_SaveGuildStorage_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_SaveGuildStorage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_SaveGuildStorage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14344,10 +14334,10 @@ int HP_mapif_itembound_ack(int fd, int aid, int guild_id) { retVal___ = HPMHooks.source.mapif.itembound_ack(fd, aid, guild_id); } if( HPMHooks.count.HP_mapif_itembound_ack_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *aid, int *guild_id); + int (*postHookFunc) (int retVal___, int fd, int aid, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_itembound_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_itembound_ack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &aid, &guild_id); + retVal___ = postHookFunc(retVal___, fd, aid, guild_id); } } return retVal___; @@ -14371,10 +14361,10 @@ int HP_mapif_parse_ItemBoundRetrieve_sub(int fd) { retVal___ = HPMHooks.source.mapif.parse_ItemBoundRetrieve_sub(fd); } if( HPMHooks.count.HP_mapif_parse_ItemBoundRetrieve_sub_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_ItemBoundRetrieve_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_ItemBoundRetrieve_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14397,10 +14387,10 @@ void HP_mapif_parse_ItemBoundRetrieve(int fd) { HPMHooks.source.mapif.parse_ItemBoundRetrieve(fd); } if( HPMHooks.count.HP_mapif_parse_ItemBoundRetrieve_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_ItemBoundRetrieve_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_ItemBoundRetrieve_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -14423,10 +14413,10 @@ void HP_mapif_parse_accinfo(int fd) { HPMHooks.source.mapif.parse_accinfo(fd); } if( HPMHooks.count.HP_mapif_parse_accinfo_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_accinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_accinfo_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -14434,11 +14424,11 @@ void HP_mapif_parse_accinfo(int fd) { void HP_mapif_parse_accinfo2(bool success, int map_fd, int u_fd, int u_aid, int account_id, const char *userid, const char *user_pass, const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int group_id, int logincount, int state) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_accinfo2_pre ) { - void (*preHookFunc) (bool *success, int *map_fd, int *u_fd, int *u_aid, int *account_id, const char *userid, const char *user_pass, const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int *group_id, int *logincount, int *state); + void (*preHookFunc) (bool *success, int *map_fd, int *u_fd, int *u_aid, int *account_id, const char **userid, const char **user_pass, const char **email, const char **last_ip, const char **lastlogin, const char **pin_code, const char **birthdate, int *group_id, int *logincount, int *state); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_accinfo2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_accinfo2_pre[hIndex].func; - preHookFunc(&success, &map_fd, &u_fd, &u_aid, &account_id, userid, user_pass, email, last_ip, lastlogin, pin_code, birthdate, &group_id, &logincount, &state); + preHookFunc(&success, &map_fd, &u_fd, &u_aid, &account_id, &userid, &user_pass, &email, &last_ip, &lastlogin, &pin_code, &birthdate, &group_id, &logincount, &state); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14449,10 +14439,10 @@ void HP_mapif_parse_accinfo2(bool success, int map_fd, int u_fd, int u_aid, int HPMHooks.source.mapif.parse_accinfo2(success, map_fd, u_fd, u_aid, account_id, userid, user_pass, email, last_ip, lastlogin, pin_code, birthdate, group_id, logincount, state); } if( HPMHooks.count.HP_mapif_parse_accinfo2_post ) { - void (*postHookFunc) (bool *success, int *map_fd, int *u_fd, int *u_aid, int *account_id, const char *userid, const char *user_pass, const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int *group_id, int *logincount, int *state); + void (*postHookFunc) (bool success, int map_fd, int u_fd, int u_aid, int account_id, const char *userid, const char *user_pass, const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int group_id, int logincount, int state); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_accinfo2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_accinfo2_post[hIndex].func; - postHookFunc(&success, &map_fd, &u_fd, &u_aid, &account_id, userid, user_pass, email, last_ip, lastlogin, pin_code, birthdate, &group_id, &logincount, &state); + postHookFunc(success, map_fd, u_fd, u_aid, account_id, userid, user_pass, email, last_ip, lastlogin, pin_code, birthdate, group_id, logincount, state); } } return; @@ -14461,11 +14451,11 @@ int HP_mapif_broadcast(const unsigned char *mes, int len, unsigned int fontColor int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_broadcast_pre ) { - int (*preHookFunc) (const unsigned char *mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd); + int (*preHookFunc) (const unsigned char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_broadcast_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_broadcast_pre[hIndex].func; - retVal___ = preHookFunc(mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &sfd); + retVal___ = preHookFunc(&mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &sfd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14476,10 +14466,10 @@ int HP_mapif_broadcast(const unsigned char *mes, int len, unsigned int fontColor retVal___ = HPMHooks.source.mapif.broadcast(mes, len, fontColor, fontType, fontSize, fontAlign, fontY, sfd); } if( HPMHooks.count.HP_mapif_broadcast_post ) { - int (*postHookFunc) (int retVal___, const unsigned char *mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd); + int (*postHookFunc) (int retVal___, const unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_broadcast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_broadcast_post[hIndex].func; - retVal___ = postHookFunc(retVal___, mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &sfd); + retVal___ = postHookFunc(retVal___, mes, len, fontColor, fontType, fontSize, fontAlign, fontY, sfd); } } return retVal___; @@ -14488,11 +14478,11 @@ int HP_mapif_wis_message(struct WisData *wd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_wis_message_pre ) { - int (*preHookFunc) (struct WisData *wd); + int (*preHookFunc) (struct WisData **wd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_wis_message_pre[hIndex].func; - retVal___ = preHookFunc(wd); + retVal___ = preHookFunc(&wd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14514,11 +14504,11 @@ int HP_mapif_wis_message(struct WisData *wd) { void HP_mapif_wis_response(int fd, const unsigned char *src, int flag) { int hIndex = 0; if( HPMHooks.count.HP_mapif_wis_response_pre ) { - void (*preHookFunc) (int *fd, const unsigned char *src, int *flag); + void (*preHookFunc) (int *fd, const unsigned char **src, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_response_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_wis_response_pre[hIndex].func; - preHookFunc(&fd, src, &flag); + preHookFunc(&fd, &src, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14529,10 +14519,10 @@ void HP_mapif_wis_response(int fd, const unsigned char *src, int flag) { HPMHooks.source.mapif.wis_response(fd, src, flag); } if( HPMHooks.count.HP_mapif_wis_response_post ) { - void (*postHookFunc) (int *fd, const unsigned char *src, int *flag); + void (*postHookFunc) (int fd, const unsigned char *src, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_response_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_wis_response_post[hIndex].func; - postHookFunc(&fd, src, &flag); + postHookFunc(fd, src, flag); } } return; @@ -14541,11 +14531,11 @@ int HP_mapif_wis_end(struct WisData *wd, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_wis_end_pre ) { - int (*preHookFunc) (struct WisData *wd, int *flag); + int (*preHookFunc) (struct WisData **wd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_end_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_wis_end_pre[hIndex].func; - retVal___ = preHookFunc(wd, &flag); + retVal___ = preHookFunc(&wd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14556,10 +14546,10 @@ int HP_mapif_wis_end(struct WisData *wd, int flag) { retVal___ = HPMHooks.source.mapif.wis_end(wd, flag); } if( HPMHooks.count.HP_mapif_wis_end_post ) { - int (*postHookFunc) (int retVal___, struct WisData *wd, int *flag); + int (*postHookFunc) (int retVal___, struct WisData *wd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_end_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_wis_end_post[hIndex].func; - retVal___ = postHookFunc(retVal___, wd, &flag); + retVal___ = postHookFunc(retVal___, wd, flag); } } return retVal___; @@ -14583,10 +14573,10 @@ int HP_mapif_account_reg_reply(int fd, int account_id, int char_id, int type) { retVal___ = HPMHooks.source.mapif.account_reg_reply(fd, account_id, char_id, type); } if( HPMHooks.count.HP_mapif_account_reg_reply_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *char_id, int *type); + int (*postHookFunc) (int retVal___, int fd, int account_id, int char_id, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_account_reg_reply_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_account_reg_reply_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, &char_id, &type); + retVal___ = postHookFunc(retVal___, fd, account_id, char_id, type); } } return retVal___; @@ -14610,10 +14600,10 @@ int HP_mapif_disconnectplayer(int fd, int account_id, int char_id, int reason) { retVal___ = HPMHooks.source.mapif.disconnectplayer(fd, account_id, char_id, reason); } if( HPMHooks.count.HP_mapif_disconnectplayer_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *char_id, int *reason); + int (*postHookFunc) (int retVal___, int fd, int account_id, int char_id, int reason); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_disconnectplayer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_disconnectplayer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &account_id, &char_id, &reason); + retVal___ = postHookFunc(retVal___, fd, account_id, char_id, reason); } } return retVal___; @@ -14637,10 +14627,10 @@ int HP_mapif_parse_broadcast(int fd) { retVal___ = HPMHooks.source.mapif.parse_broadcast(fd); } if( HPMHooks.count.HP_mapif_parse_broadcast_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_broadcast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_broadcast_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14664,10 +14654,10 @@ int HP_mapif_parse_WisRequest(int fd) { retVal___ = HPMHooks.source.mapif.parse_WisRequest(fd); } if( HPMHooks.count.HP_mapif_parse_WisRequest_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_WisRequest_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_WisRequest_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14691,10 +14681,10 @@ int HP_mapif_parse_WisReply(int fd) { retVal___ = HPMHooks.source.mapif.parse_WisReply(fd); } if( HPMHooks.count.HP_mapif_parse_WisReply_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_WisReply_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_WisReply_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14718,10 +14708,10 @@ int HP_mapif_parse_WisToGM(int fd) { retVal___ = HPMHooks.source.mapif.parse_WisToGM(fd); } if( HPMHooks.count.HP_mapif_parse_WisToGM_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_WisToGM_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_WisToGM_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14745,10 +14735,10 @@ int HP_mapif_parse_Registry(int fd) { retVal___ = HPMHooks.source.mapif.parse_Registry(fd); } if( HPMHooks.count.HP_mapif_parse_Registry_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_Registry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_Registry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14772,10 +14762,10 @@ int HP_mapif_parse_RegistryRequest(int fd) { retVal___ = HPMHooks.source.mapif.parse_RegistryRequest(fd); } if( HPMHooks.count.HP_mapif_parse_RegistryRequest_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_RegistryRequest_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_RegistryRequest_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -14783,11 +14773,11 @@ int HP_mapif_parse_RegistryRequest(int fd) { void HP_mapif_namechange_ack(int fd, int account_id, int char_id, int type, int flag, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_mapif_namechange_ack_pre ) { - void (*preHookFunc) (int *fd, int *account_id, int *char_id, int *type, int *flag, const char *name); + void (*preHookFunc) (int *fd, int *account_id, int *char_id, int *type, int *flag, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_namechange_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_namechange_ack_pre[hIndex].func; - preHookFunc(&fd, &account_id, &char_id, &type, &flag, name); + preHookFunc(&fd, &account_id, &char_id, &type, &flag, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14798,10 +14788,10 @@ void HP_mapif_namechange_ack(int fd, int account_id, int char_id, int type, int HPMHooks.source.mapif.namechange_ack(fd, account_id, char_id, type, flag, name); } if( HPMHooks.count.HP_mapif_namechange_ack_post ) { - void (*postHookFunc) (int *fd, int *account_id, int *char_id, int *type, int *flag, const char *name); + void (*postHookFunc) (int fd, int account_id, int char_id, int type, int flag, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_namechange_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_namechange_ack_post[hIndex].func; - postHookFunc(&fd, &account_id, &char_id, &type, &flag, name); + postHookFunc(fd, account_id, char_id, type, flag, name); } } return; @@ -14825,15 +14815,15 @@ int HP_mapif_parse_NameChangeRequest(int fd) { retVal___ = HPMHooks.source.mapif.parse_NameChangeRequest(fd); } if( HPMHooks.count.HP_mapif_parse_NameChangeRequest_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_NameChangeRequest_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_NameChangeRequest_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; } -/* mapindex */ +/* mapindex_interface */ int HP_mapindex_init(void) { int hIndex = 0; int retVal___ = 0; @@ -14891,11 +14881,11 @@ int HP_mapindex_addmap(int index, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapindex_addmap_pre ) { - int (*preHookFunc) (int *index, const char *name); + int (*preHookFunc) (int *index, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_addmap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_addmap_pre[hIndex].func; - retVal___ = preHookFunc(&index, name); + retVal___ = preHookFunc(&index, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14906,10 +14896,10 @@ int HP_mapindex_addmap(int index, const char *name) { retVal___ = HPMHooks.source.mapindex.addmap(index, name); } if( HPMHooks.count.HP_mapindex_addmap_post ) { - int (*postHookFunc) (int retVal___, int *index, const char *name); + int (*postHookFunc) (int retVal___, int index, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_addmap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapindex_addmap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &index, name); + retVal___ = postHookFunc(retVal___, index, name); } } return retVal___; @@ -14932,10 +14922,10 @@ void HP_mapindex_removemap(int index) { HPMHooks.source.mapindex.removemap(index); } if( HPMHooks.count.HP_mapindex_removemap_post ) { - void (*postHookFunc) (int *index); + void (*postHookFunc) (int index); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_removemap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapindex_removemap_post[hIndex].func; - postHookFunc(&index); + postHookFunc(index); } } return; @@ -14944,11 +14934,11 @@ const char* HP_mapindex_getmapname(const char *string, char *output) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_mapindex_getmapname_pre ) { - const char* (*preHookFunc) (const char *string, char *output); + const char* (*preHookFunc) (const char **string, char **output); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_getmapname_pre[hIndex].func; - retVal___ = preHookFunc(string, output); + retVal___ = preHookFunc(&string, &output); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14971,11 +14961,11 @@ const char* HP_mapindex_getmapname_ext(const char *string, char *output) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_mapindex_getmapname_ext_pre ) { - const char* (*preHookFunc) (const char *string, char *output); + const char* (*preHookFunc) (const char **string, char **output); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_ext_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_getmapname_ext_pre[hIndex].func; - retVal___ = preHookFunc(string, output); + retVal___ = preHookFunc(&string, &output); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14998,11 +14988,11 @@ unsigned short HP_mapindex_name2id(const char *p1) { int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_mapindex_name2id_pre ) { - unsigned short (*preHookFunc) (const char *p1); + unsigned short (*preHookFunc) (const char **p1); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_name2id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_name2id_pre[hIndex].func; - retVal___ = preHookFunc(p1); + retVal___ = preHookFunc(&p1); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15025,11 +15015,11 @@ const char* HP_mapindex_id2name(uint16 id, const char *file, int line, const cha int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_mapindex_id2name_pre ) { - const char* (*preHookFunc) (uint16 *id, const char *file, int *line, const char *func); + const char* (*preHookFunc) (uint16 *id, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_id2name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_id2name_pre[hIndex].func; - retVal___ = preHookFunc(&id, file, &line, func); + retVal___ = preHookFunc(&id, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15040,10 +15030,10 @@ const char* HP_mapindex_id2name(uint16 id, const char *file, int line, const cha retVal___ = HPMHooks.source.mapindex.id2name(id, file, line, func); } if( HPMHooks.count.HP_mapindex_id2name_post ) { - const char* (*postHookFunc) (const char* retVal___, uint16 *id, const char *file, int *line, const char *func); + const char* (*postHookFunc) (const char* retVal___, uint16 id, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_id2name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapindex_id2name_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id, file, &line, func); + retVal___ = postHookFunc(retVal___, id, file, line, func); } } return retVal___; @@ -15075,15 +15065,15 @@ bool HP_mapindex_check_default(void) { } return retVal___; } -/* nullpo */ +/* nullpo_interface */ void HP_nullpo_assert_report(const char *file, int line, const char *func, const char *targetname, const char *title) { int hIndex = 0; if( HPMHooks.count.HP_nullpo_assert_report_pre ) { - void (*preHookFunc) (const char *file, int *line, const char *func, const char *targetname, const char *title); + void (*preHookFunc) (const char **file, int *line, const char **func, const char **targetname, const char **title); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_assert_report_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_nullpo_assert_report_pre[hIndex].func; - preHookFunc(file, &line, func, targetname, title); + preHookFunc(&file, &line, &func, &targetname, &title); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15094,23 +15084,23 @@ void HP_nullpo_assert_report(const char *file, int line, const char *func, const HPMHooks.source.nullpo.assert_report(file, line, func, targetname, title); } if( HPMHooks.count.HP_nullpo_assert_report_post ) { - void (*postHookFunc) (const char *file, int *line, const char *func, const char *targetname, const char *title); + void (*postHookFunc) (const char *file, int line, const char *func, const char *targetname, const char *title); for(hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_assert_report_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_nullpo_assert_report_post[hIndex].func; - postHookFunc(file, &line, func, targetname, title); + postHookFunc(file, line, func, targetname, title); } } return; } -/* pincode */ +/* pincode_interface */ void HP_pincode_handle(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pincode_handle_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_handle_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pincode_handle_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15121,10 +15111,10 @@ void HP_pincode_handle(int fd, struct char_session_data *sd) { HPMHooks.source.pincode.handle(fd, sd); } if( HPMHooks.count.HP_pincode_handle_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_handle_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pincode_handle_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -15132,11 +15122,11 @@ void HP_pincode_handle(int fd, struct char_session_data *sd) { void HP_pincode_decrypt(unsigned int userSeed, char *pin) { int hIndex = 0; if( HPMHooks.count.HP_pincode_decrypt_pre ) { - void (*preHookFunc) (unsigned int *userSeed, char *pin); + void (*preHookFunc) (unsigned int *userSeed, char **pin); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_decrypt_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pincode_decrypt_pre[hIndex].func; - preHookFunc(&userSeed, pin); + preHookFunc(&userSeed, &pin); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15147,10 +15137,10 @@ void HP_pincode_decrypt(unsigned int userSeed, char *pin) { HPMHooks.source.pincode.decrypt(userSeed, pin); } if( HPMHooks.count.HP_pincode_decrypt_post ) { - void (*postHookFunc) (unsigned int *userSeed, char *pin); + void (*postHookFunc) (unsigned int userSeed, char *pin); for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_decrypt_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pincode_decrypt_post[hIndex].func; - postHookFunc(&userSeed, pin); + postHookFunc(userSeed, pin); } } return; @@ -15173,10 +15163,10 @@ void HP_pincode_error(int account_id) { HPMHooks.source.pincode.error(account_id); } if( HPMHooks.count.HP_pincode_error_post ) { - void (*postHookFunc) (int *account_id); + void (*postHookFunc) (int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_error_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pincode_error_post[hIndex].func; - postHookFunc(&account_id); + postHookFunc(account_id); } } return; @@ -15184,11 +15174,11 @@ void HP_pincode_error(int account_id) { void HP_pincode_update(int account_id, char *pin) { int hIndex = 0; if( HPMHooks.count.HP_pincode_update_pre ) { - void (*preHookFunc) (int *account_id, char *pin); + void (*preHookFunc) (int *account_id, char **pin); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_update_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pincode_update_pre[hIndex].func; - preHookFunc(&account_id, pin); + preHookFunc(&account_id, &pin); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15199,10 +15189,10 @@ void HP_pincode_update(int account_id, char *pin) { HPMHooks.source.pincode.update(account_id, pin); } if( HPMHooks.count.HP_pincode_update_post ) { - void (*postHookFunc) (int *account_id, char *pin); + void (*postHookFunc) (int account_id, char *pin); for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_update_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pincode_update_post[hIndex].func; - postHookFunc(&account_id, pin); + postHookFunc(account_id, pin); } } return; @@ -15210,11 +15200,11 @@ void HP_pincode_update(int account_id, char *pin) { void HP_pincode_sendstate(int fd, struct char_session_data *sd, uint16 state) { int hIndex = 0; if( HPMHooks.count.HP_pincode_sendstate_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd, uint16 *state); + void (*preHookFunc) (int *fd, struct char_session_data **sd, uint16 *state); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_sendstate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pincode_sendstate_pre[hIndex].func; - preHookFunc(&fd, sd, &state); + preHookFunc(&fd, &sd, &state); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15225,10 +15215,10 @@ void HP_pincode_sendstate(int fd, struct char_session_data *sd, uint16 state) { HPMHooks.source.pincode.sendstate(fd, sd, state); } if( HPMHooks.count.HP_pincode_sendstate_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd, uint16 *state); + void (*postHookFunc) (int fd, struct char_session_data *sd, uint16 state); for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_sendstate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pincode_sendstate_post[hIndex].func; - postHookFunc(&fd, sd, &state); + postHookFunc(fd, sd, state); } } return; @@ -15236,11 +15226,11 @@ void HP_pincode_sendstate(int fd, struct char_session_data *sd, uint16 state) { void HP_pincode_setnew(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pincode_setnew_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_setnew_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pincode_setnew_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15251,10 +15241,10 @@ void HP_pincode_setnew(int fd, struct char_session_data *sd) { HPMHooks.source.pincode.setnew(fd, sd); } if( HPMHooks.count.HP_pincode_setnew_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_setnew_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pincode_setnew_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -15262,11 +15252,11 @@ void HP_pincode_setnew(int fd, struct char_session_data *sd) { void HP_pincode_change(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pincode_change_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_change_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pincode_change_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15277,10 +15267,10 @@ void HP_pincode_change(int fd, struct char_session_data *sd) { HPMHooks.source.pincode.change(fd, sd); } if( HPMHooks.count.HP_pincode_change_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_change_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pincode_change_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -15289,11 +15279,11 @@ int HP_pincode_compare(int fd, struct char_session_data *sd, char *pin) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pincode_compare_pre ) { - int (*preHookFunc) (int *fd, struct char_session_data *sd, char *pin); + int (*preHookFunc) (int *fd, struct char_session_data **sd, char **pin); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_compare_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pincode_compare_pre[hIndex].func; - retVal___ = preHookFunc(&fd, sd, pin); + retVal___ = preHookFunc(&fd, &sd, &pin); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15304,10 +15294,10 @@ int HP_pincode_compare(int fd, struct char_session_data *sd, char *pin) { retVal___ = HPMHooks.source.pincode.compare(fd, sd, pin); } if( HPMHooks.count.HP_pincode_compare_post ) { - int (*postHookFunc) (int retVal___, int *fd, struct char_session_data *sd, char *pin); + int (*postHookFunc) (int retVal___, int fd, struct char_session_data *sd, char *pin); for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_compare_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pincode_compare_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, sd, pin); + retVal___ = postHookFunc(retVal___, fd, sd, pin); } } return retVal___; @@ -15315,11 +15305,11 @@ int HP_pincode_compare(int fd, struct char_session_data *sd, char *pin) { void HP_pincode_check(int fd, struct char_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pincode_check_pre ) { - void (*preHookFunc) (int *fd, struct char_session_data *sd); + void (*preHookFunc) (int *fd, struct char_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pincode_check_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15330,10 +15320,10 @@ void HP_pincode_check(int fd, struct char_session_data *sd) { HPMHooks.source.pincode.check(fd, sd); } if( HPMHooks.count.HP_pincode_check_post ) { - void (*postHookFunc) (int *fd, struct char_session_data *sd); + void (*postHookFunc) (int fd, struct char_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pincode_check_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -15342,11 +15332,11 @@ bool HP_pincode_config_read(char *w1, char *w2) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pincode_config_read_pre ) { - bool (*preHookFunc) (char *w1, char *w2); + bool (*preHookFunc) (char **w1, char **w2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pincode_config_read_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2); + retVal___ = preHookFunc(&w1, &w2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15365,7 +15355,7 @@ bool HP_pincode_config_read(char *w1, char *w2) { } return retVal___; } -/* showmsg */ +/* showmsg_interface */ void HP_showmsg_init(void) { int hIndex = 0; if( HPMHooks.count.HP_showmsg_init_pre ) { @@ -15448,12 +15438,12 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_showmsg_showMessageV_pre ) { - int (*preHookFunc) (const char *string, va_list ap); + int (*preHookFunc) (const char **string, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_showMessageV_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_showmsg_showMessageV_pre[hIndex].func; - retVal___ = preHookFunc(string, ap___copy); + retVal___ = preHookFunc(&string, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -15477,7 +15467,7 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { } return retVal___; } -/* sockt */ +/* socket_interface */ void HP_sockt_init(void) { int hIndex = 0; if( HPMHooks.count.HP_sockt_init_pre ) { @@ -15549,10 +15539,10 @@ int HP_sockt_perform(int next) { retVal___ = HPMHooks.source.sockt.perform(next); } if( HPMHooks.count.HP_sockt_perform_post ) { - int (*postHookFunc) (int retVal___, int *next); + int (*postHookFunc) (int retVal___, int next); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_perform_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_perform_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &next); + retVal___ = postHookFunc(retVal___, next); } } return retVal___; @@ -15575,10 +15565,10 @@ void HP_sockt_datasync(int fd, bool send) { HPMHooks.source.sockt.datasync(fd, send); } if( HPMHooks.count.HP_sockt_datasync_post ) { - void (*postHookFunc) (int *fd, bool *send); + void (*postHookFunc) (int fd, bool send); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_datasync_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_datasync_post[hIndex].func; - postHookFunc(&fd, &send); + postHookFunc(fd, send); } } return; @@ -15602,10 +15592,10 @@ int HP_sockt_make_listen_bind(uint32 ip, uint16 port) { retVal___ = HPMHooks.source.sockt.make_listen_bind(ip, port); } if( HPMHooks.count.HP_sockt_make_listen_bind_post ) { - int (*postHookFunc) (int retVal___, uint32 *ip, uint16 *port); + int (*postHookFunc) (int retVal___, uint32 ip, uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_make_listen_bind_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_make_listen_bind_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, &port); + retVal___ = postHookFunc(retVal___, ip, port); } } return retVal___; @@ -15614,11 +15604,11 @@ int HP_sockt_make_connection(uint32 ip, uint16 port, struct hSockOpt *opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_make_connection_pre ) { - int (*preHookFunc) (uint32 *ip, uint16 *port, struct hSockOpt *opt); + int (*preHookFunc) (uint32 *ip, uint16 *port, struct hSockOpt **opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_make_connection_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_make_connection_pre[hIndex].func; - retVal___ = preHookFunc(&ip, &port, opt); + retVal___ = preHookFunc(&ip, &port, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15629,10 +15619,10 @@ int HP_sockt_make_connection(uint32 ip, uint16 port, struct hSockOpt *opt) { retVal___ = HPMHooks.source.sockt.make_connection(ip, port, opt); } if( HPMHooks.count.HP_sockt_make_connection_post ) { - int (*postHookFunc) (int retVal___, uint32 *ip, uint16 *port, struct hSockOpt *opt); + int (*postHookFunc) (int retVal___, uint32 ip, uint16 port, struct hSockOpt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_make_connection_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_make_connection_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, &port, opt); + retVal___ = postHookFunc(retVal___, ip, port, opt); } } return retVal___; @@ -15656,10 +15646,10 @@ int HP_sockt_realloc_fifo(int fd, unsigned int rfifo_size, unsigned int wfifo_si retVal___ = HPMHooks.source.sockt.realloc_fifo(fd, rfifo_size, wfifo_size); } if( HPMHooks.count.HP_sockt_realloc_fifo_post ) { - int (*postHookFunc) (int retVal___, int *fd, unsigned int *rfifo_size, unsigned int *wfifo_size); + int (*postHookFunc) (int retVal___, int fd, unsigned int rfifo_size, unsigned int wfifo_size); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_realloc_fifo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_realloc_fifo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &rfifo_size, &wfifo_size); + retVal___ = postHookFunc(retVal___, fd, rfifo_size, wfifo_size); } } return retVal___; @@ -15683,10 +15673,10 @@ int HP_sockt_realloc_writefifo(int fd, size_t addition) { retVal___ = HPMHooks.source.sockt.realloc_writefifo(fd, addition); } if( HPMHooks.count.HP_sockt_realloc_writefifo_post ) { - int (*postHookFunc) (int retVal___, int *fd, size_t *addition); + int (*postHookFunc) (int retVal___, int fd, size_t addition); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_realloc_writefifo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_realloc_writefifo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &addition); + retVal___ = postHookFunc(retVal___, fd, addition); } } return retVal___; @@ -15710,10 +15700,10 @@ int HP_sockt_wfifoset(int fd, size_t len) { retVal___ = HPMHooks.source.sockt.wfifoset(fd, len); } if( HPMHooks.count.HP_sockt_wfifoset_post ) { - int (*postHookFunc) (int retVal___, int *fd, size_t *len); + int (*postHookFunc) (int retVal___, int fd, size_t len); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_wfifoset_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_wfifoset_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &len); + retVal___ = postHookFunc(retVal___, fd, len); } } return retVal___; @@ -15737,10 +15727,10 @@ int HP_sockt_rfifoskip(int fd, size_t len) { retVal___ = HPMHooks.source.sockt.rfifoskip(fd, len); } if( HPMHooks.count.HP_sockt_rfifoskip_post ) { - int (*postHookFunc) (int retVal___, int *fd, size_t *len); + int (*postHookFunc) (int retVal___, int fd, size_t len); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_rfifoskip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_rfifoskip_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &len); + retVal___ = postHookFunc(retVal___, fd, len); } } return retVal___; @@ -15763,10 +15753,10 @@ void HP_sockt_close(int fd) { HPMHooks.source.sockt.close(fd); } if( HPMHooks.count.HP_sockt_close_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_close_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_close_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -15790,10 +15780,10 @@ bool HP_sockt_session_is_valid(int fd) { retVal___ = HPMHooks.source.sockt.session_is_valid(fd); } if( HPMHooks.count.HP_sockt_session_is_valid_post ) { - bool (*postHookFunc) (bool retVal___, int *fd); + bool (*postHookFunc) (bool retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_session_is_valid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_session_is_valid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -15817,10 +15807,10 @@ bool HP_sockt_session_is_active(int fd) { retVal___ = HPMHooks.source.sockt.session_is_active(fd); } if( HPMHooks.count.HP_sockt_session_is_active_post ) { - bool (*postHookFunc) (bool retVal___, int *fd); + bool (*postHookFunc) (bool retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_session_is_active_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_session_is_active_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -15843,10 +15833,10 @@ void HP_sockt_flush(int fd) { HPMHooks.source.sockt.flush(fd); } if( HPMHooks.count.HP_sockt_flush_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_flush_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_flush_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -15895,10 +15885,10 @@ void HP_sockt_set_nonblocking(int fd, unsigned long yes) { HPMHooks.source.sockt.set_nonblocking(fd, yes); } if( HPMHooks.count.HP_sockt_set_nonblocking_post ) { - void (*postHookFunc) (int *fd, unsigned long *yes); + void (*postHookFunc) (int fd, unsigned long yes); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_set_nonblocking_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_set_nonblocking_post[hIndex].func; - postHookFunc(&fd, &yes); + postHookFunc(fd, yes); } } return; @@ -15921,10 +15911,10 @@ void HP_sockt_set_defaultparse(ParseFunc defaultparse) { HPMHooks.source.sockt.set_defaultparse(defaultparse); } if( HPMHooks.count.HP_sockt_set_defaultparse_post ) { - void (*postHookFunc) (ParseFunc *defaultparse); + void (*postHookFunc) (ParseFunc defaultparse); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_set_defaultparse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_set_defaultparse_post[hIndex].func; - postHookFunc(&defaultparse); + postHookFunc(defaultparse); } } return; @@ -15933,11 +15923,11 @@ uint32 HP_sockt_host2ip(const char *hostname) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_sockt_host2ip_pre ) { - uint32 (*preHookFunc) (const char *hostname); + uint32 (*preHookFunc) (const char **hostname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_host2ip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_host2ip_pre[hIndex].func; - retVal___ = preHookFunc(hostname); + retVal___ = preHookFunc(&hostname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15960,11 +15950,11 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_sockt_ip2str_pre ) { - const char* (*preHookFunc) (uint32 *ip, char *ip_str); + const char* (*preHookFunc) (uint32 *ip, char **ip_str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_ip2str_pre[hIndex].func; - retVal___ = preHookFunc(&ip, ip_str); + retVal___ = preHookFunc(&ip, &ip_str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15975,10 +15965,10 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { retVal___ = HPMHooks.source.sockt.ip2str(ip, ip_str); } if( HPMHooks.count.HP_sockt_ip2str_post ) { - const char* (*postHookFunc) (const char* retVal___, uint32 *ip, char *ip_str); + const char* (*postHookFunc) (const char* retVal___, uint32 ip, char *ip_str); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_ip2str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, ip_str); + retVal___ = postHookFunc(retVal___, ip, ip_str); } } return retVal___; @@ -15987,11 +15977,11 @@ uint32 HP_sockt_str2ip(const char *ip_str) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_sockt_str2ip_pre ) { - uint32 (*preHookFunc) (const char *ip_str); + uint32 (*preHookFunc) (const char **ip_str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_str2ip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_str2ip_pre[hIndex].func; - retVal___ = preHookFunc(ip_str); + retVal___ = preHookFunc(&ip_str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16029,10 +16019,10 @@ uint16 HP_sockt_ntows(uint16 netshort) { retVal___ = HPMHooks.source.sockt.ntows(netshort); } if( HPMHooks.count.HP_sockt_ntows_post ) { - uint16 (*postHookFunc) (uint16 retVal___, uint16 *netshort); + uint16 (*postHookFunc) (uint16 retVal___, uint16 netshort); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ntows_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_ntows_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &netshort); + retVal___ = postHookFunc(retVal___, netshort); } } return retVal___; @@ -16041,11 +16031,11 @@ int HP_sockt_getips(uint32 *ips, int max) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_getips_pre ) { - int (*preHookFunc) (uint32 *ips, int *max); + int (*preHookFunc) (uint32 **ips, int *max); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_getips_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_getips_pre[hIndex].func; - retVal___ = preHookFunc(ips, &max); + retVal___ = preHookFunc(&ips, &max); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16056,10 +16046,10 @@ int HP_sockt_getips(uint32 *ips, int max) { retVal___ = HPMHooks.source.sockt.getips(ips, max); } if( HPMHooks.count.HP_sockt_getips_post ) { - int (*postHookFunc) (int retVal___, uint32 *ips, int *max); + int (*postHookFunc) (int retVal___, uint32 *ips, int max); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_getips_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_getips_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ips, &max); + retVal___ = postHookFunc(retVal___, ips, max); } } return retVal___; @@ -16082,10 +16072,10 @@ void HP_sockt_eof(int fd) { HPMHooks.source.sockt.eof(fd); } if( HPMHooks.count.HP_sockt_eof_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_eof_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_eof_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -16094,11 +16084,11 @@ uint32 HP_sockt_lan_subnet_check(uint32 ip, struct s_subnet *info) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_sockt_lan_subnet_check_pre ) { - uint32 (*preHookFunc) (uint32 *ip, struct s_subnet *info); + uint32 (*preHookFunc) (uint32 *ip, struct s_subnet **info); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_lan_subnet_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_lan_subnet_check_pre[hIndex].func; - retVal___ = preHookFunc(&ip, info); + retVal___ = preHookFunc(&ip, &info); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16109,10 +16099,10 @@ uint32 HP_sockt_lan_subnet_check(uint32 ip, struct s_subnet *info) { retVal___ = HPMHooks.source.sockt.lan_subnet_check(ip, info); } if( HPMHooks.count.HP_sockt_lan_subnet_check_post ) { - uint32 (*postHookFunc) (uint32 retVal___, uint32 *ip, struct s_subnet *info); + uint32 (*postHookFunc) (uint32 retVal___, uint32 ip, struct s_subnet *info); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_lan_subnet_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_lan_subnet_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, info); + retVal___ = postHookFunc(retVal___, ip, info); } } return retVal___; @@ -16136,10 +16126,10 @@ bool HP_sockt_allowed_ip_check(uint32 ip) { retVal___ = HPMHooks.source.sockt.allowed_ip_check(ip); } if( HPMHooks.count.HP_sockt_allowed_ip_check_post ) { - bool (*postHookFunc) (bool retVal___, uint32 *ip); + bool (*postHookFunc) (bool retVal___, uint32 ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_allowed_ip_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_allowed_ip_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip); + retVal___ = postHookFunc(retVal___, ip); } } return retVal___; @@ -16163,10 +16153,10 @@ bool HP_sockt_trusted_ip_check(uint32 ip) { retVal___ = HPMHooks.source.sockt.trusted_ip_check(ip); } if( HPMHooks.count.HP_sockt_trusted_ip_check_post ) { - bool (*postHookFunc) (bool retVal___, uint32 *ip); + bool (*postHookFunc) (bool retVal___, uint32 ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_trusted_ip_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_trusted_ip_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip); + retVal___ = postHookFunc(retVal___, ip); } } return retVal___; @@ -16175,11 +16165,11 @@ int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vec int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) { - int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*preHookFunc) (struct config_setting_t **t, struct s_subnet_vector **list, const char **filename, const char **groupname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func; - retVal___ = preHookFunc(t, list, filename, groupname); + retVal___ = preHookFunc(&t, &list, &filename, &groupname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16201,11 +16191,11 @@ int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vec void HP_sockt_net_config_read(const char *filename) { int hIndex = 0; if( HPMHooks.count.HP_sockt_net_config_read_pre ) { - void (*preHookFunc) (const char *filename); + void (*preHookFunc) (const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_net_config_read_pre[hIndex].func; - preHookFunc(filename); + preHookFunc(&filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16224,16 +16214,16 @@ void HP_sockt_net_config_read(const char *filename) { } return; } -/* SQL */ -int HP_SQL_Connect(Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db) { +/* sql_interface */ +int HP_SQL_Connect(struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_Connect_pre ) { - int (*preHookFunc) (Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db); + int (*preHookFunc) (struct Sql **self, const char **user, const char **passwd, const char **host, uint16 *port, const char **db); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Connect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_Connect_pre[hIndex].func; - retVal___ = preHookFunc(self, user, passwd, host, &port, db); + retVal___ = preHookFunc(&self, &user, &passwd, &host, &port, &db); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16244,23 +16234,23 @@ int HP_SQL_Connect(Sql *self, const char *user, const char *passwd, const char * retVal___ = HPMHooks.source.SQL.Connect(self, user, passwd, host, port, db); } if( HPMHooks.count.HP_SQL_Connect_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Connect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_Connect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, user, passwd, host, &port, db); + retVal___ = postHookFunc(retVal___, self, user, passwd, host, port, db); } } return retVal___; } -int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) { +int HP_SQL_GetTimeout(struct Sql *self, uint32 *out_timeout) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_GetTimeout_pre ) { - int (*preHookFunc) (Sql *self, uint32 *out_timeout); + int (*preHookFunc) (struct Sql **self, uint32 **out_timeout); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetTimeout_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_GetTimeout_pre[hIndex].func; - retVal___ = preHookFunc(self, out_timeout); + retVal___ = preHookFunc(&self, &out_timeout); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16271,7 +16261,7 @@ int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) { retVal___ = HPMHooks.source.SQL.GetTimeout(self, out_timeout); } if( HPMHooks.count.HP_SQL_GetTimeout_post ) { - int (*postHookFunc) (int retVal___, Sql *self, uint32 *out_timeout); + int (*postHookFunc) (int retVal___, struct Sql *self, uint32 *out_timeout); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetTimeout_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_GetTimeout_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, out_timeout); @@ -16279,15 +16269,15 @@ int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) { } return retVal___; } -int HP_SQL_GetColumnNames(Sql *self, const char *table, char *out_buf, size_t buf_len, char sep) { +int HP_SQL_GetColumnNames(struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_GetColumnNames_pre ) { - int (*preHookFunc) (Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep); + int (*preHookFunc) (struct Sql **self, const char **table, char **out_buf, size_t *buf_len, char *sep); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetColumnNames_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_GetColumnNames_pre[hIndex].func; - retVal___ = preHookFunc(self, table, out_buf, &buf_len, &sep); + retVal___ = preHookFunc(&self, &table, &out_buf, &buf_len, &sep); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16298,23 +16288,23 @@ int HP_SQL_GetColumnNames(Sql *self, const char *table, char *out_buf, size_t bu retVal___ = HPMHooks.source.SQL.GetColumnNames(self, table, out_buf, buf_len, sep); } if( HPMHooks.count.HP_SQL_GetColumnNames_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetColumnNames_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_GetColumnNames_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, table, out_buf, &buf_len, &sep); + retVal___ = postHookFunc(retVal___, self, table, out_buf, buf_len, sep); } } return retVal___; } -int HP_SQL_SetEncoding(Sql *self, const char *encoding) { +int HP_SQL_SetEncoding(struct Sql *self, const char *encoding) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_SetEncoding_pre ) { - int (*preHookFunc) (Sql *self, const char *encoding); + int (*preHookFunc) (struct Sql **self, const char **encoding); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_SetEncoding_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_SetEncoding_pre[hIndex].func; - retVal___ = preHookFunc(self, encoding); + retVal___ = preHookFunc(&self, &encoding); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16325,7 +16315,7 @@ int HP_SQL_SetEncoding(Sql *self, const char *encoding) { retVal___ = HPMHooks.source.SQL.SetEncoding(self, encoding); } if( HPMHooks.count.HP_SQL_SetEncoding_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *encoding); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *encoding); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_SetEncoding_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_SetEncoding_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, encoding); @@ -16333,15 +16323,15 @@ int HP_SQL_SetEncoding(Sql *self, const char *encoding) { } return retVal___; } -int HP_SQL_Ping(Sql *self) { +int HP_SQL_Ping(struct Sql *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_Ping_pre ) { - int (*preHookFunc) (Sql *self); + int (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Ping_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_Ping_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16352,7 +16342,7 @@ int HP_SQL_Ping(Sql *self) { retVal___ = HPMHooks.source.SQL.Ping(self); } if( HPMHooks.count.HP_SQL_Ping_post ) { - int (*postHookFunc) (int retVal___, Sql *self); + int (*postHookFunc) (int retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Ping_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_Ping_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16360,15 +16350,15 @@ int HP_SQL_Ping(Sql *self) { } return retVal___; } -size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) { +size_t HP_SQL_EscapeString(struct Sql *self, char *out_to, const char *from) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_EscapeString_pre ) { - size_t (*preHookFunc) (Sql *self, char *out_to, const char *from); + size_t (*preHookFunc) (struct Sql **self, char **out_to, const char **from); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeString_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_EscapeString_pre[hIndex].func; - retVal___ = preHookFunc(self, out_to, from); + retVal___ = preHookFunc(&self, &out_to, &from); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16379,7 +16369,7 @@ size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) { retVal___ = HPMHooks.source.SQL.EscapeString(self, out_to, from); } if( HPMHooks.count.HP_SQL_EscapeString_post ) { - size_t (*postHookFunc) (size_t retVal___, Sql *self, char *out_to, const char *from); + size_t (*postHookFunc) (size_t retVal___, struct Sql *self, char *out_to, const char *from); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeString_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_EscapeString_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, out_to, from); @@ -16387,15 +16377,15 @@ size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) { } return retVal___; } -size_t HP_SQL_EscapeStringLen(Sql *self, char *out_to, const char *from, size_t from_len) { +size_t HP_SQL_EscapeStringLen(struct Sql *self, char *out_to, const char *from, size_t from_len) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_EscapeStringLen_pre ) { - size_t (*preHookFunc) (Sql *self, char *out_to, const char *from, size_t *from_len); + size_t (*preHookFunc) (struct Sql **self, char **out_to, const char **from, size_t *from_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeStringLen_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_EscapeStringLen_pre[hIndex].func; - retVal___ = preHookFunc(self, out_to, from, &from_len); + retVal___ = preHookFunc(&self, &out_to, &from, &from_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16406,24 +16396,24 @@ size_t HP_SQL_EscapeStringLen(Sql *self, char *out_to, const char *from, size_t retVal___ = HPMHooks.source.SQL.EscapeStringLen(self, out_to, from, from_len); } if( HPMHooks.count.HP_SQL_EscapeStringLen_post ) { - size_t (*postHookFunc) (size_t retVal___, Sql *self, char *out_to, const char *from, size_t *from_len); + size_t (*postHookFunc) (size_t retVal___, struct Sql *self, char *out_to, const char *from, size_t from_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeStringLen_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_EscapeStringLen_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, out_to, from, &from_len); + retVal___ = postHookFunc(retVal___, self, out_to, from, from_len); } } return retVal___; } -int HP_SQL_QueryV(Sql *self, const char *query, va_list args) { +int HP_SQL_QueryV(struct Sql *self, const char *query, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_QueryV_pre ) { - int (*preHookFunc) (Sql *self, const char *query, va_list args); + int (*preHookFunc) (struct Sql **self, const char **query, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryV_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_SQL_QueryV_pre[hIndex].func; - retVal___ = preHookFunc(self, query, args___copy); + retVal___ = preHookFunc(&self, &query, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -16437,7 +16427,7 @@ int HP_SQL_QueryV(Sql *self, const char *query, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_SQL_QueryV_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *query, va_list args); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *query, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryV_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_SQL_QueryV_post[hIndex].func; @@ -16447,15 +16437,15 @@ int HP_SQL_QueryV(Sql *self, const char *query, va_list args) { } return retVal___; } -int HP_SQL_QueryStr(Sql *self, const char *query) { +int HP_SQL_QueryStr(struct Sql *self, const char *query) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_QueryStr_pre ) { - int (*preHookFunc) (Sql *self, const char *query); + int (*preHookFunc) (struct Sql **self, const char **query); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryStr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_QueryStr_pre[hIndex].func; - retVal___ = preHookFunc(self, query); + retVal___ = preHookFunc(&self, &query); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16466,7 +16456,7 @@ int HP_SQL_QueryStr(Sql *self, const char *query) { retVal___ = HPMHooks.source.SQL.QueryStr(self, query); } if( HPMHooks.count.HP_SQL_QueryStr_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *query); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *query); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryStr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_QueryStr_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, query); @@ -16474,15 +16464,15 @@ int HP_SQL_QueryStr(Sql *self, const char *query) { } return retVal___; } -uint64 HP_SQL_LastInsertId(Sql *self) { +uint64 HP_SQL_LastInsertId(struct Sql *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_LastInsertId_pre ) { - uint64 (*preHookFunc) (Sql *self); + uint64 (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_LastInsertId_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_LastInsertId_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16493,7 +16483,7 @@ uint64 HP_SQL_LastInsertId(Sql *self) { retVal___ = HPMHooks.source.SQL.LastInsertId(self); } if( HPMHooks.count.HP_SQL_LastInsertId_post ) { - uint64 (*postHookFunc) (uint64 retVal___, Sql *self); + uint64 (*postHookFunc) (uint64 retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_LastInsertId_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_LastInsertId_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16501,15 +16491,15 @@ uint64 HP_SQL_LastInsertId(Sql *self) { } return retVal___; } -uint32 HP_SQL_NumColumns(Sql *self) { +uint32 HP_SQL_NumColumns(struct Sql *self) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_SQL_NumColumns_pre ) { - uint32 (*preHookFunc) (Sql *self); + uint32 (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumColumns_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_NumColumns_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16520,7 +16510,7 @@ uint32 HP_SQL_NumColumns(Sql *self) { retVal___ = HPMHooks.source.SQL.NumColumns(self); } if( HPMHooks.count.HP_SQL_NumColumns_post ) { - uint32 (*postHookFunc) (uint32 retVal___, Sql *self); + uint32 (*postHookFunc) (uint32 retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumColumns_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_NumColumns_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16528,15 +16518,15 @@ uint32 HP_SQL_NumColumns(Sql *self) { } return retVal___; } -uint64 HP_SQL_NumRows(Sql *self) { +uint64 HP_SQL_NumRows(struct Sql *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_NumRows_pre ) { - uint64 (*preHookFunc) (Sql *self); + uint64 (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumRows_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_NumRows_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16547,7 +16537,7 @@ uint64 HP_SQL_NumRows(Sql *self) { retVal___ = HPMHooks.source.SQL.NumRows(self); } if( HPMHooks.count.HP_SQL_NumRows_post ) { - uint64 (*postHookFunc) (uint64 retVal___, Sql *self); + uint64 (*postHookFunc) (uint64 retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumRows_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_NumRows_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16555,15 +16545,15 @@ uint64 HP_SQL_NumRows(Sql *self) { } return retVal___; } -int HP_SQL_NextRow(Sql *self) { +int HP_SQL_NextRow(struct Sql *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_NextRow_pre ) { - int (*preHookFunc) (Sql *self); + int (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NextRow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_NextRow_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16574,7 +16564,7 @@ int HP_SQL_NextRow(Sql *self) { retVal___ = HPMHooks.source.SQL.NextRow(self); } if( HPMHooks.count.HP_SQL_NextRow_post ) { - int (*postHookFunc) (int retVal___, Sql *self); + int (*postHookFunc) (int retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NextRow_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_NextRow_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16582,15 +16572,15 @@ int HP_SQL_NextRow(Sql *self) { } return retVal___; } -int HP_SQL_GetData(Sql *self, size_t col, char **out_buf, size_t *out_len) { +int HP_SQL_GetData(struct Sql *self, size_t col, char **out_buf, size_t *out_len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_GetData_pre ) { - int (*preHookFunc) (Sql *self, size_t *col, char **out_buf, size_t *out_len); + int (*preHookFunc) (struct Sql **self, size_t *col, char ***out_buf, size_t **out_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetData_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_GetData_pre[hIndex].func; - retVal___ = preHookFunc(self, &col, out_buf, out_len); + retVal___ = preHookFunc(&self, &col, &out_buf, &out_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16601,22 +16591,22 @@ int HP_SQL_GetData(Sql *self, size_t col, char **out_buf, size_t *out_len) { retVal___ = HPMHooks.source.SQL.GetData(self, col, out_buf, out_len); } if( HPMHooks.count.HP_SQL_GetData_post ) { - int (*postHookFunc) (int retVal___, Sql *self, size_t *col, char **out_buf, size_t *out_len); + int (*postHookFunc) (int retVal___, struct Sql *self, size_t col, char **out_buf, size_t *out_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetData_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_GetData_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, &col, out_buf, out_len); + retVal___ = postHookFunc(retVal___, self, col, out_buf, out_len); } } return retVal___; } -void HP_SQL_FreeResult(Sql *self) { +void HP_SQL_FreeResult(struct Sql *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_FreeResult_pre ) { - void (*preHookFunc) (Sql *self); + void (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_FreeResult_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_FreeResult_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16627,7 +16617,7 @@ void HP_SQL_FreeResult(Sql *self) { HPMHooks.source.SQL.FreeResult(self); } if( HPMHooks.count.HP_SQL_FreeResult_post ) { - void (*postHookFunc) (Sql *self); + void (*postHookFunc) (struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_FreeResult_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_FreeResult_post[hIndex].func; postHookFunc(self); @@ -16635,14 +16625,14 @@ void HP_SQL_FreeResult(Sql *self) { } return; } -void HP_SQL_ShowDebug_(Sql *self, const char *debug_file, const unsigned long debug_line) { +void HP_SQL_ShowDebug_(struct Sql *self, const char *debug_file, const unsigned long debug_line) { int hIndex = 0; if( HPMHooks.count.HP_SQL_ShowDebug__pre ) { - void (*preHookFunc) (Sql *self, const char *debug_file, const unsigned long *debug_line); + void (*preHookFunc) (struct Sql **self, const char **debug_file, const unsigned long *debug_line); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_ShowDebug__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_ShowDebug__pre[hIndex].func; - preHookFunc(self, debug_file, &debug_line); + preHookFunc(&self, &debug_file, &debug_line); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16653,22 +16643,22 @@ void HP_SQL_ShowDebug_(Sql *self, const char *debug_file, const unsigned long de HPMHooks.source.SQL.ShowDebug_(self, debug_file, debug_line); } if( HPMHooks.count.HP_SQL_ShowDebug__post ) { - void (*postHookFunc) (Sql *self, const char *debug_file, const unsigned long *debug_line); + void (*postHookFunc) (struct Sql *self, const char *debug_file, const unsigned long debug_line); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_ShowDebug__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_ShowDebug__post[hIndex].func; - postHookFunc(self, debug_file, &debug_line); + postHookFunc(self, debug_file, debug_line); } } return; } -void HP_SQL_Free(Sql *self) { +void HP_SQL_Free(struct Sql *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_Free_pre ) { - void (*preHookFunc) (Sql *self); + void (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_Free_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16679,7 +16669,7 @@ void HP_SQL_Free(Sql *self) { HPMHooks.source.SQL.Free(self); } if( HPMHooks.count.HP_SQL_Free_post ) { - void (*postHookFunc) (Sql *self); + void (*postHookFunc) (struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Free_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_Free_post[hIndex].func; postHookFunc(self); @@ -16714,15 +16704,15 @@ struct Sql* HP_SQL_Malloc(void) { } return retVal___; } -struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) { +struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { int hIndex = 0; struct SqlStmt* retVal___ = NULL; if( HPMHooks.count.HP_SQL_StmtMalloc_pre ) { - struct SqlStmt* (*preHookFunc) (Sql *sql); + struct SqlStmt* (*preHookFunc) (struct Sql **sql); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_pre[hIndex].func; - retVal___ = preHookFunc(sql); + retVal___ = preHookFunc(&sql); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16733,7 +16723,7 @@ struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) { retVal___ = HPMHooks.source.SQL.StmtMalloc(sql); } if( HPMHooks.count.HP_SQL_StmtMalloc_post ) { - struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, Sql *sql); + struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, struct Sql *sql); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, sql); @@ -16741,16 +16731,16 @@ struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) { } return retVal___; } -int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) { +int HP_SQL_StmtPrepareV(struct SqlStmt *self, const char *query, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtPrepareV_pre ) { - int (*preHookFunc) (SqlStmt *self, const char *query, va_list args); + int (*preHookFunc) (struct SqlStmt **self, const char **query, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareV_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_SQL_StmtPrepareV_pre[hIndex].func; - retVal___ = preHookFunc(self, query, args___copy); + retVal___ = preHookFunc(&self, &query, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -16764,7 +16754,7 @@ int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_SQL_StmtPrepareV_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, const char *query, va_list args); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, const char *query, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareV_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_SQL_StmtPrepareV_post[hIndex].func; @@ -16774,15 +16764,15 @@ int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) { } return retVal___; } -int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) { +int HP_SQL_StmtPrepareStr(struct SqlStmt *self, const char *query) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtPrepareStr_pre ) { - int (*preHookFunc) (SqlStmt *self, const char *query); + int (*preHookFunc) (struct SqlStmt **self, const char **query); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareStr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtPrepareStr_pre[hIndex].func; - retVal___ = preHookFunc(self, query); + retVal___ = preHookFunc(&self, &query); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16793,7 +16783,7 @@ int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) { retVal___ = HPMHooks.source.SQL.StmtPrepareStr(self, query); } if( HPMHooks.count.HP_SQL_StmtPrepareStr_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, const char *query); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, const char *query); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareStr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtPrepareStr_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, query); @@ -16801,15 +16791,15 @@ int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) { } return retVal___; } -size_t HP_SQL_StmtNumParams(SqlStmt *self) { +size_t HP_SQL_StmtNumParams(struct SqlStmt *self) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNumParams_pre ) { - size_t (*preHookFunc) (SqlStmt *self); + size_t (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumParams_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNumParams_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16820,7 +16810,7 @@ size_t HP_SQL_StmtNumParams(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNumParams(self); } if( HPMHooks.count.HP_SQL_StmtNumParams_post ) { - size_t (*postHookFunc) (size_t retVal___, SqlStmt *self); + size_t (*postHookFunc) (size_t retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumParams_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNumParams_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16828,15 +16818,15 @@ size_t HP_SQL_StmtNumParams(SqlStmt *self) { } return retVal___; } -int HP_SQL_StmtBindParam(SqlStmt *self, size_t idx, SqlDataType buffer_type, void *buffer, size_t buffer_len) { +int HP_SQL_StmtBindParam(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtBindParam_pre ) { - int (*preHookFunc) (SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len); + int (*preHookFunc) (struct SqlStmt **self, size_t *idx, enum SqlDataType *buffer_type, const void **buffer, size_t *buffer_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindParam_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtBindParam_pre[hIndex].func; - retVal___ = preHookFunc(self, &idx, &buffer_type, buffer, &buffer_len); + retVal___ = preHookFunc(&self, &idx, &buffer_type, &buffer, &buffer_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16847,23 +16837,23 @@ int HP_SQL_StmtBindParam(SqlStmt *self, size_t idx, SqlDataType buffer_type, voi retVal___ = HPMHooks.source.SQL.StmtBindParam(self, idx, buffer_type, buffer, buffer_len); } if( HPMHooks.count.HP_SQL_StmtBindParam_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindParam_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtBindParam_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, &idx, &buffer_type, buffer, &buffer_len); + retVal___ = postHookFunc(retVal___, self, idx, buffer_type, buffer, buffer_len); } } return retVal___; } -int HP_SQL_StmtExecute(SqlStmt *self) { +int HP_SQL_StmtExecute(struct SqlStmt *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtExecute_pre ) { - int (*preHookFunc) (SqlStmt *self); + int (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtExecute_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtExecute_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16874,7 +16864,7 @@ int HP_SQL_StmtExecute(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtExecute(self); } if( HPMHooks.count.HP_SQL_StmtExecute_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self); + int (*postHookFunc) (int retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtExecute_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtExecute_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16882,15 +16872,15 @@ int HP_SQL_StmtExecute(SqlStmt *self) { } return retVal___; } -uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) { +uint64 HP_SQL_StmtLastInsertId(struct SqlStmt *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtLastInsertId_pre ) { - uint64 (*preHookFunc) (SqlStmt *self); + uint64 (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtLastInsertId_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtLastInsertId_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16901,7 +16891,7 @@ uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtLastInsertId(self); } if( HPMHooks.count.HP_SQL_StmtLastInsertId_post ) { - uint64 (*postHookFunc) (uint64 retVal___, SqlStmt *self); + uint64 (*postHookFunc) (uint64 retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtLastInsertId_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtLastInsertId_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16909,15 +16899,15 @@ uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) { } return retVal___; } -size_t HP_SQL_StmtNumColumns(SqlStmt *self) { +size_t HP_SQL_StmtNumColumns(struct SqlStmt *self) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNumColumns_pre ) { - size_t (*preHookFunc) (SqlStmt *self); + size_t (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumColumns_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNumColumns_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16928,7 +16918,7 @@ size_t HP_SQL_StmtNumColumns(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNumColumns(self); } if( HPMHooks.count.HP_SQL_StmtNumColumns_post ) { - size_t (*postHookFunc) (size_t retVal___, SqlStmt *self); + size_t (*postHookFunc) (size_t retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumColumns_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNumColumns_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16936,15 +16926,15 @@ size_t HP_SQL_StmtNumColumns(SqlStmt *self) { } return retVal___; } -int HP_SQL_StmtBindColumn(SqlStmt *self, size_t idx, SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) { +int HP_SQL_StmtBindColumn(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtBindColumn_pre ) { - int (*preHookFunc) (SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null); + int (*preHookFunc) (struct SqlStmt **self, size_t *idx, enum SqlDataType *buffer_type, void **buffer, size_t *buffer_len, uint32 **out_length, int8 **out_is_null); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindColumn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtBindColumn_pre[hIndex].func; - retVal___ = preHookFunc(self, &idx, &buffer_type, buffer, &buffer_len, out_length, out_is_null); + retVal___ = preHookFunc(&self, &idx, &buffer_type, &buffer, &buffer_len, &out_length, &out_is_null); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16955,23 +16945,23 @@ int HP_SQL_StmtBindColumn(SqlStmt *self, size_t idx, SqlDataType buffer_type, vo retVal___ = HPMHooks.source.SQL.StmtBindColumn(self, idx, buffer_type, buffer, buffer_len, out_length, out_is_null); } if( HPMHooks.count.HP_SQL_StmtBindColumn_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindColumn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtBindColumn_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, &idx, &buffer_type, buffer, &buffer_len, out_length, out_is_null); + retVal___ = postHookFunc(retVal___, self, idx, buffer_type, buffer, buffer_len, out_length, out_is_null); } } return retVal___; } -uint64 HP_SQL_StmtNumRows(SqlStmt *self) { +uint64 HP_SQL_StmtNumRows(struct SqlStmt *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNumRows_pre ) { - uint64 (*preHookFunc) (SqlStmt *self); + uint64 (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumRows_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNumRows_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16982,7 +16972,7 @@ uint64 HP_SQL_StmtNumRows(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNumRows(self); } if( HPMHooks.count.HP_SQL_StmtNumRows_post ) { - uint64 (*postHookFunc) (uint64 retVal___, SqlStmt *self); + uint64 (*postHookFunc) (uint64 retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumRows_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNumRows_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -16990,15 +16980,15 @@ uint64 HP_SQL_StmtNumRows(SqlStmt *self) { } return retVal___; } -int HP_SQL_StmtNextRow(SqlStmt *self) { +int HP_SQL_StmtNextRow(struct SqlStmt *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNextRow_pre ) { - int (*preHookFunc) (SqlStmt *self); + int (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNextRow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNextRow_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17009,7 +16999,7 @@ int HP_SQL_StmtNextRow(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNextRow(self); } if( HPMHooks.count.HP_SQL_StmtNextRow_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self); + int (*postHookFunc) (int retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNextRow_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNextRow_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -17017,14 +17007,14 @@ int HP_SQL_StmtNextRow(SqlStmt *self) { } return retVal___; } -void HP_SQL_StmtFreeResult(SqlStmt *self) { +void HP_SQL_StmtFreeResult(struct SqlStmt *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_StmtFreeResult_pre ) { - void (*preHookFunc) (SqlStmt *self); + void (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFreeResult_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtFreeResult_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17035,7 +17025,7 @@ void HP_SQL_StmtFreeResult(SqlStmt *self) { HPMHooks.source.SQL.StmtFreeResult(self); } if( HPMHooks.count.HP_SQL_StmtFreeResult_post ) { - void (*postHookFunc) (SqlStmt *self); + void (*postHookFunc) (struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFreeResult_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtFreeResult_post[hIndex].func; postHookFunc(self); @@ -17043,14 +17033,14 @@ void HP_SQL_StmtFreeResult(SqlStmt *self) { } return; } -void HP_SQL_StmtFree(SqlStmt *self) { +void HP_SQL_StmtFree(struct SqlStmt *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_StmtFree_pre ) { - void (*preHookFunc) (SqlStmt *self); + void (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFree_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtFree_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17061,7 +17051,7 @@ void HP_SQL_StmtFree(SqlStmt *self) { HPMHooks.source.SQL.StmtFree(self); } if( HPMHooks.count.HP_SQL_StmtFree_post ) { - void (*postHookFunc) (SqlStmt *self); + void (*postHookFunc) (struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFree_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtFree_post[hIndex].func; postHookFunc(self); @@ -17069,14 +17059,14 @@ void HP_SQL_StmtFree(SqlStmt *self) { } return; } -void HP_SQL_StmtShowDebug_(SqlStmt *self, const char *debug_file, const unsigned long debug_line) { +void HP_SQL_StmtShowDebug_(struct SqlStmt *self, const char *debug_file, const unsigned long debug_line) { int hIndex = 0; if( HPMHooks.count.HP_SQL_StmtShowDebug__pre ) { - void (*preHookFunc) (SqlStmt *self, const char *debug_file, const unsigned long *debug_line); + void (*preHookFunc) (struct SqlStmt **self, const char **debug_file, const unsigned long *debug_line); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtShowDebug__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtShowDebug__pre[hIndex].func; - preHookFunc(self, debug_file, &debug_line); + preHookFunc(&self, &debug_file, &debug_line); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17087,15 +17077,15 @@ void HP_SQL_StmtShowDebug_(SqlStmt *self, const char *debug_file, const unsigned HPMHooks.source.SQL.StmtShowDebug_(self, debug_file, debug_line); } if( HPMHooks.count.HP_SQL_StmtShowDebug__post ) { - void (*postHookFunc) (SqlStmt *self, const char *debug_file, const unsigned long *debug_line); + void (*postHookFunc) (struct SqlStmt *self, const char *debug_file, const unsigned long debug_line); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtShowDebug__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtShowDebug__post[hIndex].func; - postHookFunc(self, debug_file, &debug_line); + postHookFunc(self, debug_file, debug_line); } } return; } -/* StrBuf */ +/* stringbuf_interface */ StringBuf* HP_StrBuf_Malloc(void) { int hIndex = 0; StringBuf* retVal___ = NULL; @@ -17126,11 +17116,11 @@ StringBuf* HP_StrBuf_Malloc(void) { void HP_StrBuf_Init(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Init_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Init_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17153,12 +17143,12 @@ int HP_StrBuf_Vprintf(StringBuf *self, const char *fmt, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_Vprintf_pre ) { - int (*preHookFunc) (StringBuf *self, const char *fmt, va_list args); + int (*preHookFunc) (StringBuf **self, const char **fmt, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Vprintf_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_StrBuf_Vprintf_pre[hIndex].func; - retVal___ = preHookFunc(self, fmt, args___copy); + retVal___ = preHookFunc(&self, &fmt, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -17186,11 +17176,11 @@ int HP_StrBuf_Append(StringBuf *self, const StringBuf *sbuf) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_Append_pre ) { - int (*preHookFunc) (StringBuf *self, const StringBuf *sbuf); + int (*preHookFunc) (StringBuf **self, const StringBuf **sbuf); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Append_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Append_pre[hIndex].func; - retVal___ = preHookFunc(self, sbuf); + retVal___ = preHookFunc(&self, &sbuf); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17213,11 +17203,11 @@ int HP_StrBuf_AppendStr(StringBuf *self, const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_AppendStr_pre ) { - int (*preHookFunc) (StringBuf *self, const char *str); + int (*preHookFunc) (StringBuf **self, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_AppendStr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_AppendStr_pre[hIndex].func; - retVal___ = preHookFunc(self, str); + retVal___ = preHookFunc(&self, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17240,11 +17230,11 @@ int HP_StrBuf_Length(StringBuf *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_Length_pre ) { - int (*preHookFunc) (StringBuf *self); + int (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Length_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Length_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17267,11 +17257,11 @@ char* HP_StrBuf_Value(StringBuf *self) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_StrBuf_Value_pre ) { - char* (*preHookFunc) (StringBuf *self); + char* (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Value_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17293,11 +17283,11 @@ char* HP_StrBuf_Value(StringBuf *self) { void HP_StrBuf_Clear(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Clear_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Clear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Clear_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17319,11 +17309,11 @@ void HP_StrBuf_Clear(StringBuf *self) { void HP_StrBuf_Destroy(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Destroy_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Destroy_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17345,11 +17335,11 @@ void HP_StrBuf_Destroy(StringBuf *self) { void HP_StrBuf_Free(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Free_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Free_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17368,16 +17358,16 @@ void HP_StrBuf_Free(StringBuf *self) { } return; } -/* strlib */ +/* strlib_interface */ char* HP_strlib_jstrescape(char *pt) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_jstrescape_pre ) { - char* (*preHookFunc) (char *pt); + char* (*preHookFunc) (char **pt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_jstrescape_pre[hIndex].func; - retVal___ = preHookFunc(pt); + retVal___ = preHookFunc(&pt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17400,11 +17390,11 @@ char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_jstrescapecpy_pre ) { - char* (*preHookFunc) (char *pt, const char *spt); + char* (*preHookFunc) (char **pt, const char **spt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_pre[hIndex].func; - retVal___ = preHookFunc(pt, spt); + retVal___ = preHookFunc(&pt, &spt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17427,11 +17417,11 @@ int HP_strlib_jmemescapecpy(char *pt, const char *spt, int size) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_jmemescapecpy_pre ) { - int (*preHookFunc) (char *pt, const char *spt, int *size); + int (*preHookFunc) (char **pt, const char **spt, int *size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jmemescapecpy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_jmemescapecpy_pre[hIndex].func; - retVal___ = preHookFunc(pt, spt, &size); + retVal___ = preHookFunc(&pt, &spt, &size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17442,10 +17432,10 @@ int HP_strlib_jmemescapecpy(char *pt, const char *spt, int size) { retVal___ = HPMHooks.source.strlib.jmemescapecpy(pt, spt, size); } if( HPMHooks.count.HP_strlib_jmemescapecpy_post ) { - int (*postHookFunc) (int retVal___, char *pt, const char *spt, int *size); + int (*postHookFunc) (int retVal___, char *pt, const char *spt, int size); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jmemescapecpy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_jmemescapecpy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, pt, spt, &size); + retVal___ = postHookFunc(retVal___, pt, spt, size); } } return retVal___; @@ -17454,11 +17444,11 @@ int HP_strlib_remove_control_chars_(char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_remove_control_chars__pre ) { - int (*preHookFunc) (char *str); + int (*preHookFunc) (char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_remove_control_chars__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_remove_control_chars__pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17481,11 +17471,11 @@ char* HP_strlib_trim_(char *str) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_trim__pre ) { - char* (*preHookFunc) (char *str); + char* (*preHookFunc) (char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_trim__pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17508,11 +17498,11 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_normalize_name__pre ) { - char* (*preHookFunc) (char *str, const char *delims); + char* (*preHookFunc) (char **str, const char **delims); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_normalize_name__pre[hIndex].func; - retVal___ = preHookFunc(str, delims); + retVal___ = preHookFunc(&str, &delims); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17535,11 +17525,11 @@ const char* HP_strlib_stristr_(const char *haystack, const char *needle) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_stristr__pre ) { - const char* (*preHookFunc) (const char *haystack, const char *needle); + const char* (*preHookFunc) (const char **haystack, const char **needle); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_stristr__pre[hIndex].func; - retVal___ = preHookFunc(haystack, needle); + retVal___ = preHookFunc(&haystack, &needle); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17562,11 +17552,11 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_strlib_strnlen__pre ) { - size_t (*preHookFunc) (const char *string, size_t *maxlen); + size_t (*preHookFunc) (const char **string, size_t *maxlen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strnlen__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_strnlen__pre[hIndex].func; - retVal___ = preHookFunc(string, &maxlen); + retVal___ = preHookFunc(&string, &maxlen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17577,10 +17567,10 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { retVal___ = HPMHooks.source.strlib.strnlen_(string, maxlen); } if( HPMHooks.count.HP_strlib_strnlen__post ) { - size_t (*postHookFunc) (size_t retVal___, const char *string, size_t *maxlen); + size_t (*postHookFunc) (size_t retVal___, const char *string, size_t maxlen); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strnlen__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_strnlen__post[hIndex].func; - retVal___ = postHookFunc(retVal___, string, &maxlen); + retVal___ = postHookFunc(retVal___, string, maxlen); } } return retVal___; @@ -17589,11 +17579,11 @@ char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_strtok_r__pre ) { - char* (*preHookFunc) (char *s1, const char *s2, char **lasts); + char* (*preHookFunc) (char **s1, const char **s2, char ***lasts); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_strtok_r__pre[hIndex].func; - retVal___ = preHookFunc(s1, s2, lasts); + retVal___ = preHookFunc(&s1, &s2, &lasts); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17616,11 +17606,11 @@ int HP_strlib_e_mail_check_(char *email) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_e_mail_check__pre ) { - int (*preHookFunc) (char *email); + int (*preHookFunc) (char **email); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_e_mail_check__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_e_mail_check__pre[hIndex].func; - retVal___ = preHookFunc(email); + retVal___ = preHookFunc(&email); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17643,11 +17633,11 @@ int HP_strlib_config_switch_(const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_config_switch__pre ) { - int (*preHookFunc) (const char *str); + int (*preHookFunc) (const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_config_switch__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_config_switch__pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17670,11 +17660,11 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_safestrncpy__pre ) { - char* (*preHookFunc) (char *dst, const char *src, size_t *n); + char* (*preHookFunc) (char **dst, const char **src, size_t *n); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_safestrncpy__pre[hIndex].func; - retVal___ = preHookFunc(dst, src, &n); + retVal___ = preHookFunc(&dst, &src, &n); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17685,10 +17675,10 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { retVal___ = HPMHooks.source.strlib.safestrncpy_(dst, src, n); } if( HPMHooks.count.HP_strlib_safestrncpy__post ) { - char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t *n); + char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t n); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_safestrncpy__post[hIndex].func; - retVal___ = postHookFunc(retVal___, dst, src, &n); + retVal___ = postHookFunc(retVal___, dst, src, n); } } return retVal___; @@ -17697,11 +17687,11 @@ size_t HP_strlib_safestrnlen_(const char *string, size_t maxlen) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_strlib_safestrnlen__pre ) { - size_t (*preHookFunc) (const char *string, size_t *maxlen); + size_t (*preHookFunc) (const char **string, size_t *maxlen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrnlen__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_safestrnlen__pre[hIndex].func; - retVal___ = preHookFunc(string, &maxlen); + retVal___ = preHookFunc(&string, &maxlen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17712,10 +17702,10 @@ size_t HP_strlib_safestrnlen_(const char *string, size_t maxlen) { retVal___ = HPMHooks.source.strlib.safestrnlen_(string, maxlen); } if( HPMHooks.count.HP_strlib_safestrnlen__post ) { - size_t (*postHookFunc) (size_t retVal___, const char *string, size_t *maxlen); + size_t (*postHookFunc) (size_t retVal___, const char *string, size_t maxlen); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrnlen__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_safestrnlen__post[hIndex].func; - retVal___ = postHookFunc(retVal___, string, &maxlen); + retVal___ = postHookFunc(retVal___, string, maxlen); } } return retVal___; @@ -17724,11 +17714,11 @@ int HP_strlib_strline_(const char *str, size_t pos) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_strline__pre ) { - int (*preHookFunc) (const char *str, size_t *pos); + int (*preHookFunc) (const char **str, size_t *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strline__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_strline__pre[hIndex].func; - retVal___ = preHookFunc(str, &pos); + retVal___ = preHookFunc(&str, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17739,23 +17729,23 @@ int HP_strlib_strline_(const char *str, size_t pos) { retVal___ = HPMHooks.source.strlib.strline_(str, pos); } if( HPMHooks.count.HP_strlib_strline__post ) { - int (*postHookFunc) (int retVal___, const char *str, size_t *pos); + int (*postHookFunc) (int retVal___, const char *str, size_t pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strline__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_strline__post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &pos); + retVal___ = postHookFunc(retVal___, str, pos); } } return retVal___; } -bool HP_strlib_bin2hex_(char *output, unsigned char *input, size_t count) { +bool HP_strlib_bin2hex_(char *output, const unsigned char *input, size_t count) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_strlib_bin2hex__pre ) { - bool (*preHookFunc) (char *output, unsigned char *input, size_t *count); + bool (*preHookFunc) (char **output, const unsigned char **input, size_t *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_bin2hex__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_bin2hex__pre[hIndex].func; - retVal___ = preHookFunc(output, input, &count); + retVal___ = preHookFunc(&output, &input, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17766,24 +17756,24 @@ bool HP_strlib_bin2hex_(char *output, unsigned char *input, size_t count) { retVal___ = HPMHooks.source.strlib.bin2hex_(output, input, count); } if( HPMHooks.count.HP_strlib_bin2hex__post ) { - bool (*postHookFunc) (bool retVal___, char *output, unsigned char *input, size_t *count); + bool (*postHookFunc) (bool retVal___, char *output, const unsigned char *input, size_t count); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_bin2hex__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_bin2hex__post[hIndex].func; - retVal___ = postHookFunc(retVal___, output, input, &count); + retVal___ = postHookFunc(retVal___, output, input, count); } } return retVal___; } -/* sv */ +/* sv_interface */ int HP_sv_parse_next(struct s_svstate *svstate) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sv_parse_next_pre ) { - int (*preHookFunc) (struct s_svstate *svstate); + int (*preHookFunc) (struct s_svstate **svstate); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_parse_next_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_parse_next_pre[hIndex].func; - retVal___ = preHookFunc(svstate); + retVal___ = preHookFunc(&svstate); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17806,11 +17796,11 @@ int HP_sv_parse(const char *str, int len, int startoff, char delim, int *out_pos int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sv_parse_pre ) { - int (*preHookFunc) (const char *str, int *len, int *startoff, char *delim, int *out_pos, int *npos, enum e_svopt *opt); + int (*preHookFunc) (const char **str, int *len, int *startoff, char *delim, int **out_pos, int *npos, enum e_svopt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_parse_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_parse_pre[hIndex].func; - retVal___ = preHookFunc(str, &len, &startoff, &delim, out_pos, &npos, &opt); + retVal___ = preHookFunc(&str, &len, &startoff, &delim, &out_pos, &npos, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17821,10 +17811,10 @@ int HP_sv_parse(const char *str, int len, int startoff, char delim, int *out_pos retVal___ = HPMHooks.source.sv.parse(str, len, startoff, delim, out_pos, npos, opt); } if( HPMHooks.count.HP_sv_parse_post ) { - int (*postHookFunc) (int retVal___, const char *str, int *len, int *startoff, char *delim, int *out_pos, int *npos, enum e_svopt *opt); + int (*postHookFunc) (int retVal___, const char *str, int len, int startoff, char delim, int *out_pos, int npos, enum e_svopt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_parse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_parse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &len, &startoff, &delim, out_pos, &npos, &opt); + retVal___ = postHookFunc(retVal___, str, len, startoff, delim, out_pos, npos, opt); } } return retVal___; @@ -17833,11 +17823,11 @@ int HP_sv_split(char *str, int len, int startoff, char delim, char **out_fields, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sv_split_pre ) { - int (*preHookFunc) (char *str, int *len, int *startoff, char *delim, char **out_fields, int *nfields, enum e_svopt *opt); + int (*preHookFunc) (char **str, int *len, int *startoff, char *delim, char ***out_fields, int *nfields, enum e_svopt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_split_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_split_pre[hIndex].func; - retVal___ = preHookFunc(str, &len, &startoff, &delim, out_fields, &nfields, &opt); + retVal___ = preHookFunc(&str, &len, &startoff, &delim, &out_fields, &nfields, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17848,10 +17838,10 @@ int HP_sv_split(char *str, int len, int startoff, char delim, char **out_fields, retVal___ = HPMHooks.source.sv.split(str, len, startoff, delim, out_fields, nfields, opt); } if( HPMHooks.count.HP_sv_split_post ) { - int (*postHookFunc) (int retVal___, char *str, int *len, int *startoff, char *delim, char **out_fields, int *nfields, enum e_svopt *opt); + int (*postHookFunc) (int retVal___, char *str, int len, int startoff, char delim, char **out_fields, int nfields, enum e_svopt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_split_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_split_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &len, &startoff, &delim, out_fields, &nfields, &opt); + retVal___ = postHookFunc(retVal___, str, len, startoff, delim, out_fields, nfields, opt); } } return retVal___; @@ -17860,11 +17850,11 @@ size_t HP_sv_escape_c(char *out_dest, const char *src, size_t len, const char *e int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_sv_escape_c_pre ) { - size_t (*preHookFunc) (char *out_dest, const char *src, size_t *len, const char *escapes); + size_t (*preHookFunc) (char **out_dest, const char **src, size_t *len, const char **escapes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_escape_c_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_escape_c_pre[hIndex].func; - retVal___ = preHookFunc(out_dest, src, &len, escapes); + retVal___ = preHookFunc(&out_dest, &src, &len, &escapes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17875,10 +17865,10 @@ size_t HP_sv_escape_c(char *out_dest, const char *src, size_t len, const char *e retVal___ = HPMHooks.source.sv.escape_c(out_dest, src, len, escapes); } if( HPMHooks.count.HP_sv_escape_c_post ) { - size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t *len, const char *escapes); + size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t len, const char *escapes); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_escape_c_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_escape_c_post[hIndex].func; - retVal___ = postHookFunc(retVal___, out_dest, src, &len, escapes); + retVal___ = postHookFunc(retVal___, out_dest, src, len, escapes); } } return retVal___; @@ -17887,11 +17877,11 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_sv_unescape_c_pre ) { - size_t (*preHookFunc) (char *out_dest, const char *src, size_t *len); + size_t (*preHookFunc) (char **out_dest, const char **src, size_t *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_unescape_c_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_unescape_c_pre[hIndex].func; - retVal___ = preHookFunc(out_dest, src, &len); + retVal___ = preHookFunc(&out_dest, &src, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17902,10 +17892,10 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { retVal___ = HPMHooks.source.sv.unescape_c(out_dest, src, len); } if( HPMHooks.count.HP_sv_unescape_c_post ) { - size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t *len); + size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t len); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_unescape_c_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_unescape_c_post[hIndex].func; - retVal___ = postHookFunc(retVal___, out_dest, src, &len); + retVal___ = postHookFunc(retVal___, out_dest, src, len); } } return retVal___; @@ -17914,11 +17904,11 @@ const char* HP_sv_skip_escaped_c(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_sv_skip_escaped_c_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17941,11 +17931,11 @@ bool HP_sv_readdb(const char *directory, const char *filename, char delim, int m int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_sv_readdb_pre ) { - bool (*preHookFunc) (const char *directory, const char *filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); + bool (*preHookFunc) (const char **directory, const char **filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( **parseproc ) (char *fields[], int columns, int current)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_readdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_readdb_pre[hIndex].func; - retVal___ = preHookFunc(directory, filename, &delim, &mincols, &maxcols, &maxrows, parseproc); + retVal___ = preHookFunc(&directory, &filename, &delim, &mincols, &maxcols, &maxrows, &parseproc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17956,15 +17946,15 @@ bool HP_sv_readdb(const char *directory, const char *filename, char delim, int m retVal___ = HPMHooks.source.sv.readdb(directory, filename, delim, mincols, maxcols, maxrows, parseproc); } if( HPMHooks.count.HP_sv_readdb_post ) { - bool (*postHookFunc) (bool retVal___, const char *directory, const char *filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); + bool (*postHookFunc) (bool retVal___, const char *directory, const char *filename, char delim, int mincols, int maxcols, int maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_readdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_readdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, directory, filename, &delim, &mincols, &maxcols, &maxrows, parseproc); + retVal___ = postHookFunc(retVal___, directory, filename, delim, mincols, maxcols, maxrows, parseproc); } } return retVal___; } -/* sysinfo */ +/* sysinfo_interface */ int HP_sysinfo_getpagesize(void) { int hIndex = 0; int retVal___ = 0; @@ -18448,7 +18438,7 @@ void HP_sysinfo_final(void) { } return; } -/* timer */ +/* timer_interface */ int64 HP_timer_gettick(void) { int hIndex = 0; int64 retVal___ = 0; @@ -18522,10 +18512,10 @@ int HP_timer_add(int64 tick, TimerFunc func, int id, intptr_t data) { retVal___ = HPMHooks.source.timer.add(tick, func, id, data); } if( HPMHooks.count.HP_timer_add_post ) { - int (*postHookFunc) (int retVal___, int64 *tick, TimerFunc *func, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick, &func, &id, &data); + retVal___ = postHookFunc(retVal___, tick, func, id, data); } } return retVal___; @@ -18549,10 +18539,10 @@ int HP_timer_add_interval(int64 tick, TimerFunc func, int id, intptr_t data, int retVal___ = HPMHooks.source.timer.add_interval(tick, func, id, data, interval); } if( HPMHooks.count.HP_timer_add_interval_post ) { - int (*postHookFunc) (int retVal___, int64 *tick, TimerFunc *func, int *id, intptr_t *data, int *interval); + int (*postHookFunc) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data, int interval); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_interval_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_add_interval_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick, &func, &id, &data, &interval); + retVal___ = postHookFunc(retVal___, tick, func, id, data, interval); } } return retVal___; @@ -18576,10 +18566,10 @@ const struct TimerData* HP_timer_get(int tid) { retVal___ = HPMHooks.source.timer.get(tid); } if( HPMHooks.count.HP_timer_get_post ) { - const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int *tid); + const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int tid); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_get_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid); + retVal___ = postHookFunc(retVal___, tid); } } return retVal___; @@ -18603,10 +18593,10 @@ int HP_timer_delete(int tid, TimerFunc func) { retVal___ = HPMHooks.source.timer.delete(tid, func); } if( HPMHooks.count.HP_timer_delete_post ) { - int (*postHookFunc) (int retVal___, int *tid, TimerFunc *func); + int (*postHookFunc) (int retVal___, int tid, TimerFunc func); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &func); + retVal___ = postHookFunc(retVal___, tid, func); } } return retVal___; @@ -18630,10 +18620,10 @@ int64 HP_timer_addtick(int tid, int64 tick) { retVal___ = HPMHooks.source.timer.addtick(tid, tick); } if( HPMHooks.count.HP_timer_addtick_post ) { - int64 (*postHookFunc) (int64 retVal___, int *tid, int64 *tick); + int64 (*postHookFunc) (int64 retVal___, int tid, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_addtick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_addtick_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick); + retVal___ = postHookFunc(retVal___, tid, tick); } } return retVal___; @@ -18657,10 +18647,10 @@ int64 HP_timer_settick(int tid, int64 tick) { retVal___ = HPMHooks.source.timer.settick(tid, tick); } if( HPMHooks.count.HP_timer_settick_post ) { - int64 (*postHookFunc) (int64 retVal___, int *tid, int64 *tick); + int64 (*postHookFunc) (int64 retVal___, int tid, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_settick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_settick_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick); + retVal___ = postHookFunc(retVal___, tid, tick); } } return retVal___; @@ -18669,11 +18659,11 @@ int HP_timer_add_func_list(TimerFunc func, char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_timer_add_func_list_pre ) { - int (*preHookFunc) (TimerFunc *func, char *name); + int (*preHookFunc) (TimerFunc *func, char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_func_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_timer_add_func_list_pre[hIndex].func; - retVal___ = preHookFunc(&func, name); + retVal___ = preHookFunc(&func, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18684,10 +18674,10 @@ int HP_timer_add_func_list(TimerFunc func, char *name) { retVal___ = HPMHooks.source.timer.add_func_list(func, name); } if( HPMHooks.count.HP_timer_add_func_list_post ) { - int (*postHookFunc) (int retVal___, TimerFunc *func, char *name); + int (*postHookFunc) (int retVal___, TimerFunc func, char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_func_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_add_func_list_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &func, name); + retVal___ = postHookFunc(retVal___, func, name); } } return retVal___; @@ -18738,10 +18728,10 @@ int HP_timer_perform(int64 tick) { retVal___ = HPMHooks.source.timer.perform(tick); } if( HPMHooks.count.HP_timer_perform_post ) { - int (*postHookFunc) (int retVal___, int64 *tick); + int (*postHookFunc) (int retVal___, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_perform_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_perform_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick); + retVal___ = postHookFunc(retVal___, tick); } } return retVal___; diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc index 67257883f..88e4f51dd 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc @@ -90,6 +90,52 @@ struct { struct HPMHookPoint *HP_DB_init_post; struct HPMHookPoint *HP_DB_final_pre; struct HPMHookPoint *HP_DB_final_post; + struct HPMHookPoint *HP_lclif_init_pre; + struct HPMHookPoint *HP_lclif_init_post; + struct HPMHookPoint *HP_lclif_final_pre; + struct HPMHookPoint *HP_lclif_final_post; + struct HPMHookPoint *HP_lclif_connection_error_pre; + struct HPMHookPoint *HP_lclif_connection_error_post; + struct HPMHookPoint *HP_lclif_server_list_pre; + struct HPMHookPoint *HP_lclif_server_list_post; + struct HPMHookPoint *HP_lclif_auth_failed_pre; + struct HPMHookPoint *HP_lclif_auth_failed_post; + struct HPMHookPoint *HP_lclif_login_error_pre; + struct HPMHookPoint *HP_lclif_login_error_post; + struct HPMHookPoint *HP_lclif_coding_key_pre; + struct HPMHookPoint *HP_lclif_coding_key_post; + struct HPMHookPoint *HP_lclif_packet_pre; + struct HPMHookPoint *HP_lclif_packet_post; + struct HPMHookPoint *HP_lclif_parse_packet_pre; + struct HPMHookPoint *HP_lclif_parse_packet_post; + struct HPMHookPoint *HP_lclif_parse_pre; + struct HPMHookPoint *HP_lclif_parse_post; + struct HPMHookPoint *HP_PRIV__lclif_packetdb_loaddb_pre; + struct HPMHookPoint *HP_PRIV__lclif_packetdb_loaddb_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_sub_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_sub_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN2_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN2_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN3_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN3_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN4_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN4_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN_HAN_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_LOGIN_HAN_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_REQ_HASH_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_REQ_HASH_post; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_pre; + struct HPMHookPoint *HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_post; struct HPMHookPoint *HP_libconfig_read_pre; struct HPMHookPoint *HP_libconfig_read_post; struct HPMHookPoint *HP_libconfig_write_pre; @@ -308,32 +354,18 @@ struct { struct HPMHookPoint *HP_login_fromchar_parse_accinfo_post; struct HPMHookPoint *HP_login_parse_fromchar_pre; struct HPMHookPoint *HP_login_parse_fromchar_post; - struct HPMHookPoint *HP_login_connection_problem_pre; - struct HPMHookPoint *HP_login_connection_problem_post; struct HPMHookPoint *HP_login_kick_pre; struct HPMHookPoint *HP_login_kick_post; struct HPMHookPoint *HP_login_auth_ok_pre; struct HPMHookPoint *HP_login_auth_ok_post; struct HPMHookPoint *HP_login_auth_failed_pre; struct HPMHookPoint *HP_login_auth_failed_post; - struct HPMHookPoint *HP_login_login_error_pre; - struct HPMHookPoint *HP_login_login_error_post; - struct HPMHookPoint *HP_login_parse_ping_pre; - struct HPMHookPoint *HP_login_parse_ping_post; - struct HPMHookPoint *HP_login_parse_client_md5_pre; - struct HPMHookPoint *HP_login_parse_client_md5_post; - struct HPMHookPoint *HP_login_parse_client_login_pre; - struct HPMHookPoint *HP_login_parse_client_login_post; - struct HPMHookPoint *HP_login_send_coding_key_pre; - struct HPMHookPoint *HP_login_send_coding_key_post; - struct HPMHookPoint *HP_login_parse_request_coding_key_pre; - struct HPMHookPoint *HP_login_parse_request_coding_key_post; + struct HPMHookPoint *HP_login_client_login_pre; + struct HPMHookPoint *HP_login_client_login_post; struct HPMHookPoint *HP_login_char_server_connection_status_pre; struct HPMHookPoint *HP_login_char_server_connection_status_post; struct HPMHookPoint *HP_login_parse_request_connection_pre; struct HPMHookPoint *HP_login_parse_request_connection_post; - struct HPMHookPoint *HP_login_parse_login_pre; - struct HPMHookPoint *HP_login_parse_login_post; struct HPMHookPoint *HP_login_config_set_defaults_pre; struct HPMHookPoint *HP_login_config_set_defaults_post; struct HPMHookPoint *HP_login_config_read_pre; @@ -691,6 +723,52 @@ struct { int HP_DB_init_post; int HP_DB_final_pre; int HP_DB_final_post; + int HP_lclif_init_pre; + int HP_lclif_init_post; + int HP_lclif_final_pre; + int HP_lclif_final_post; + int HP_lclif_connection_error_pre; + int HP_lclif_connection_error_post; + int HP_lclif_server_list_pre; + int HP_lclif_server_list_post; + int HP_lclif_auth_failed_pre; + int HP_lclif_auth_failed_post; + int HP_lclif_login_error_pre; + int HP_lclif_login_error_post; + int HP_lclif_coding_key_pre; + int HP_lclif_coding_key_post; + int HP_lclif_packet_pre; + int HP_lclif_packet_post; + int HP_lclif_parse_packet_pre; + int HP_lclif_parse_packet_post; + int HP_lclif_parse_pre; + int HP_lclif_parse_post; + int HP_PRIV__lclif_packetdb_loaddb_pre; + int HP_PRIV__lclif_packetdb_loaddb_post; + int HP_PRIV__lclif_parse_sub_pre; + int HP_PRIV__lclif_parse_sub_post; + int HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_pre; + int HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_post; + int HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_pre; + int HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_post; + int HP_PRIV__lclif_parse_CA_LOGIN_pre; + int HP_PRIV__lclif_parse_CA_LOGIN_post; + int HP_PRIV__lclif_parse_CA_LOGIN2_pre; + int HP_PRIV__lclif_parse_CA_LOGIN2_post; + int HP_PRIV__lclif_parse_CA_LOGIN3_pre; + int HP_PRIV__lclif_parse_CA_LOGIN3_post; + int HP_PRIV__lclif_parse_CA_LOGIN4_pre; + int HP_PRIV__lclif_parse_CA_LOGIN4_post; + int HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_pre; + int HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_post; + int HP_PRIV__lclif_parse_CA_LOGIN_HAN_pre; + int HP_PRIV__lclif_parse_CA_LOGIN_HAN_post; + int HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_pre; + int HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_post; + int HP_PRIV__lclif_parse_CA_REQ_HASH_pre; + int HP_PRIV__lclif_parse_CA_REQ_HASH_post; + int HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_pre; + int HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_post; int HP_libconfig_read_pre; int HP_libconfig_read_post; int HP_libconfig_write_pre; @@ -909,32 +987,18 @@ struct { int HP_login_fromchar_parse_accinfo_post; int HP_login_parse_fromchar_pre; int HP_login_parse_fromchar_post; - int HP_login_connection_problem_pre; - int HP_login_connection_problem_post; int HP_login_kick_pre; int HP_login_kick_post; int HP_login_auth_ok_pre; int HP_login_auth_ok_post; int HP_login_auth_failed_pre; int HP_login_auth_failed_post; - int HP_login_login_error_pre; - int HP_login_login_error_post; - int HP_login_parse_ping_pre; - int HP_login_parse_ping_post; - int HP_login_parse_client_md5_pre; - int HP_login_parse_client_md5_post; - int HP_login_parse_client_login_pre; - int HP_login_parse_client_login_post; - int HP_login_send_coding_key_pre; - int HP_login_send_coding_key_post; - int HP_login_parse_request_coding_key_pre; - int HP_login_parse_request_coding_key_post; + int HP_login_client_login_pre; + int HP_login_client_login_post; int HP_login_char_server_connection_status_pre; int HP_login_char_server_connection_status_post; int HP_login_parse_request_connection_pre; int HP_login_parse_request_connection_post; - int HP_login_parse_login_pre; - int HP_login_parse_login_post; int HP_login_config_set_defaults_pre; int HP_login_config_set_defaults_post; int HP_login_config_read_pre; @@ -1231,6 +1295,8 @@ struct { struct console_interface console; struct core_interface core; struct db_interface DB; + struct lclif_interface lclif; + struct lclif_interface_private PRIV__lclif; struct libconfig_interface libconfig; struct login_interface login; struct malloc_interface iMalloc; diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc index 0460f4ca4..21ca25355 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc @@ -1,5 +1,6 @@ /** * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules * * Copyright (C) 2013-2016 Hercules Dev Team * @@ -23,25 +24,25 @@ */ struct HookingPointData HookingPoints[] = { -/* HCache */ +/* HCache_interface */ { HP_POP(HCache->init, HP_HCache_init) }, { HP_POP(HCache->check, HP_HCache_check) }, { HP_POP(HCache->open, HP_HCache_open) }, -/* cmdline */ +/* cmdline_interface */ { HP_POP(cmdline->init, HP_cmdline_init) }, { HP_POP(cmdline->final, HP_cmdline_final) }, { HP_POP(cmdline->arg_add, HP_cmdline_arg_add) }, { HP_POP(cmdline->exec, HP_cmdline_exec) }, { HP_POP(cmdline->arg_next_value, HP_cmdline_arg_next_value) }, { HP_POP(cmdline->arg_source, HP_cmdline_arg_source) }, -/* console */ +/* console_interface */ { HP_POP(console->init, HP_console_init) }, { HP_POP(console->final, HP_console_final) }, { HP_POP(console->display_title, HP_console_display_title) }, { HP_POP(console->display_gplnotice, HP_console_display_gplnotice) }, -/* core */ +/* core_interface */ { HP_POP(core->shutdown_callback, HP_core_shutdown_callback) }, -/* DB */ +/* db_interface */ { HP_POP(DB->fix_options, HP_DB_fix_options) }, { HP_POP(DB->default_cmp, HP_DB_default_cmp) }, { HP_POP(DB->default_hash, HP_DB_default_hash) }, @@ -61,7 +62,32 @@ struct HookingPointData HookingPoints[] = { { HP_POP(DB->data2ptr, HP_DB_data2ptr) }, { HP_POP(DB->init, HP_DB_init) }, { HP_POP(DB->final, HP_DB_final) }, -/* libconfig */ +/* lclif_interface */ + { HP_POP(lclif->init, HP_lclif_init) }, + { HP_POP(lclif->final, HP_lclif_final) }, + { HP_POP(lclif->connection_error, HP_lclif_connection_error) }, + { HP_POP(lclif->server_list, HP_lclif_server_list) }, + { HP_POP(lclif->auth_failed, HP_lclif_auth_failed) }, + { HP_POP(lclif->login_error, HP_lclif_login_error) }, + { HP_POP(lclif->coding_key, HP_lclif_coding_key) }, + { HP_POP(lclif->packet, HP_lclif_packet) }, + { HP_POP(lclif->parse_packet, HP_lclif_parse_packet) }, + { HP_POP(lclif->parse, HP_lclif_parse) }, +/* lclif_interface_private */ + { HP_POP(lclif->p->packetdb_loaddb, HP_PRIV__lclif_packetdb_loaddb) }, + { HP_POP(lclif->p->parse_sub, HP_PRIV__lclif_parse_sub) }, + { HP_POP(lclif->p->parse_CA_CONNECT_INFO_CHANGED, HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED) }, + { HP_POP(lclif->p->parse_CA_EXE_HASHCHECK, HP_PRIV__lclif_parse_CA_EXE_HASHCHECK) }, + { HP_POP(lclif->p->parse_CA_LOGIN, HP_PRIV__lclif_parse_CA_LOGIN) }, + { HP_POP(lclif->p->parse_CA_LOGIN2, HP_PRIV__lclif_parse_CA_LOGIN2) }, + { HP_POP(lclif->p->parse_CA_LOGIN3, HP_PRIV__lclif_parse_CA_LOGIN3) }, + { HP_POP(lclif->p->parse_CA_LOGIN4, HP_PRIV__lclif_parse_CA_LOGIN4) }, + { HP_POP(lclif->p->parse_CA_LOGIN_PCBANG, HP_PRIV__lclif_parse_CA_LOGIN_PCBANG) }, + { HP_POP(lclif->p->parse_CA_LOGIN_HAN, HP_PRIV__lclif_parse_CA_LOGIN_HAN) }, + { HP_POP(lclif->p->parse_CA_SSO_LOGIN_REQ, HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ) }, + { HP_POP(lclif->p->parse_CA_REQ_HASH, HP_PRIV__lclif_parse_CA_REQ_HASH) }, + { HP_POP(lclif->p->parse_CA_CHARSERVERCONNECT, HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT) }, +/* libconfig_interface */ { HP_POP(libconfig->read, HP_libconfig_read) }, { HP_POP(libconfig->write, HP_libconfig_write) }, { HP_POP(libconfig->set_options, HP_libconfig_set_options) }, @@ -130,7 +156,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) }, { HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) }, { HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) }, -/* login */ +/* login_interface */ { HP_POP(login->mmo_auth, HP_login_mmo_auth) }, { HP_POP(login->mmo_auth_new, HP_login_mmo_auth_new) }, { HP_POP(login->waiting_disconnect_timer, HP_login_waiting_disconnect_timer) }, @@ -172,22 +198,15 @@ struct HookingPointData HookingPoints[] = { { HP_POP(login->fromchar_parse_wrong_pincode, HP_login_fromchar_parse_wrong_pincode) }, { HP_POP(login->fromchar_parse_accinfo, HP_login_fromchar_parse_accinfo) }, { HP_POP(login->parse_fromchar, HP_login_parse_fromchar) }, - { HP_POP(login->connection_problem, HP_login_connection_problem) }, { HP_POP(login->kick, HP_login_kick) }, { HP_POP(login->auth_ok, HP_login_auth_ok) }, { HP_POP(login->auth_failed, HP_login_auth_failed) }, - { HP_POP(login->login_error, HP_login_login_error) }, - { HP_POP(login->parse_ping, HP_login_parse_ping) }, - { HP_POP(login->parse_client_md5, HP_login_parse_client_md5) }, - { HP_POP(login->parse_client_login, HP_login_parse_client_login) }, - { HP_POP(login->send_coding_key, HP_login_send_coding_key) }, - { HP_POP(login->parse_request_coding_key, HP_login_parse_request_coding_key) }, + { HP_POP(login->client_login, HP_login_client_login) }, { HP_POP(login->char_server_connection_status, HP_login_char_server_connection_status) }, { HP_POP(login->parse_request_connection, HP_login_parse_request_connection) }, - { HP_POP(login->parse_login, HP_login_parse_login) }, { HP_POP(login->config_set_defaults, HP_login_config_set_defaults) }, { HP_POP(login->config_read, HP_login_config_read) }, -/* iMalloc */ +/* malloc_interface */ { HP_POP(iMalloc->init, HP_iMalloc_init) }, { HP_POP(iMalloc->final, HP_iMalloc_final) }, { HP_POP(iMalloc->malloc, HP_iMalloc_malloc) }, @@ -202,14 +221,14 @@ struct HookingPointData HookingPoints[] = { { HP_POP(iMalloc->usage, HP_iMalloc_usage) }, { HP_POP(iMalloc->post_shutdown, HP_iMalloc_post_shutdown) }, { HP_POP(iMalloc->init_messages, HP_iMalloc_init_messages) }, -/* nullpo */ +/* nullpo_interface */ { HP_POP(nullpo->assert_report, HP_nullpo_assert_report) }, -/* showmsg */ +/* showmsg_interface */ { HP_POP(showmsg->init, HP_showmsg_init) }, { HP_POP(showmsg->final, HP_showmsg_final) }, { HP_POP(showmsg->clearScreen, HP_showmsg_clearScreen) }, { HP_POP(showmsg->showMessageV, HP_showmsg_showMessageV) }, -/* sockt */ +/* socket_interface */ { HP_POP(sockt->init, HP_sockt_init) }, { HP_POP(sockt->final, HP_sockt_final) }, { HP_POP(sockt->perform, HP_sockt_perform) }, @@ -238,7 +257,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sockt->trusted_ip_check, HP_sockt_trusted_ip_check) }, { HP_POP(sockt->net_config_read_sub, HP_sockt_net_config_read_sub) }, { HP_POP(sockt->net_config_read, HP_sockt_net_config_read) }, -/* SQL */ +/* sql_interface */ { HP_POP(SQL->Connect, HP_SQL_Connect) }, { HP_POP(SQL->GetTimeout, HP_SQL_GetTimeout) }, { HP_POP(SQL->GetColumnNames, HP_SQL_GetColumnNames) }, @@ -271,7 +290,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(SQL->StmtFreeResult, HP_SQL_StmtFreeResult) }, { HP_POP(SQL->StmtFree, HP_SQL_StmtFree) }, { HP_POP(SQL->StmtShowDebug_, HP_SQL_StmtShowDebug_) }, -/* StrBuf */ +/* stringbuf_interface */ { HP_POP(StrBuf->Malloc, HP_StrBuf_Malloc) }, { HP_POP(StrBuf->Init, HP_StrBuf_Init) }, { HP_POP(StrBuf->Vprintf, HP_StrBuf_Vprintf) }, @@ -282,7 +301,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(StrBuf->Clear, HP_StrBuf_Clear) }, { HP_POP(StrBuf->Destroy, HP_StrBuf_Destroy) }, { HP_POP(StrBuf->Free, HP_StrBuf_Free) }, -/* strlib */ +/* strlib_interface */ { HP_POP(strlib->jstrescape, HP_strlib_jstrescape) }, { HP_POP(strlib->jstrescapecpy, HP_strlib_jstrescapecpy) }, { HP_POP(strlib->jmemescapecpy, HP_strlib_jmemescapecpy) }, @@ -298,7 +317,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(strlib->safestrnlen_, HP_strlib_safestrnlen_) }, { HP_POP(strlib->strline_, HP_strlib_strline_) }, { HP_POP(strlib->bin2hex_, HP_strlib_bin2hex_) }, -/* sv */ +/* sv_interface */ { HP_POP(sv->parse_next, HP_sv_parse_next) }, { HP_POP(sv->parse, HP_sv_parse) }, { HP_POP(sv->split, HP_sv_split) }, @@ -306,7 +325,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sv->unescape_c, HP_sv_unescape_c) }, { HP_POP(sv->skip_escaped_c, HP_sv_skip_escaped_c) }, { HP_POP(sv->readdb, HP_sv_readdb) }, -/* sysinfo */ +/* sysinfo_interface */ { HP_POP(sysinfo->getpagesize, HP_sysinfo_getpagesize) }, { HP_POP(sysinfo->platform, HP_sysinfo_platform) }, { HP_POP(sysinfo->osversion, HP_sysinfo_osversion) }, @@ -325,7 +344,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sysinfo->is_superuser, HP_sysinfo_is_superuser) }, { HP_POP(sysinfo->init, HP_sysinfo_init) }, { HP_POP(sysinfo->final, HP_sysinfo_final) }, -/* timer */ +/* timer_interface */ { HP_POP(timer->gettick, HP_timer_gettick) }, { HP_POP(timer->gettick_nocache, HP_timer_gettick_nocache) }, { HP_POP(timer->add, HP_timer_add) }, diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc index c647ca3e1..3c31062b8 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc @@ -23,7 +23,7 @@ * as it will get overwritten. */ -/* HCache */ +/* HCache_interface */ void HP_HCache_init(void) { int hIndex = 0; if( HPMHooks.count.HP_HCache_init_pre ) { @@ -54,11 +54,11 @@ bool HP_HCache_check(const char *file) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_HCache_check_pre ) { - bool (*preHookFunc) (const char *file); + bool (*preHookFunc) (const char **file); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_HCache_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_HCache_check_pre[hIndex].func; - retVal___ = preHookFunc(file); + retVal___ = preHookFunc(&file); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -81,11 +81,11 @@ FILE* HP_HCache_open(const char *file, const char *opt) { int hIndex = 0; FILE* retVal___ = NULL; if( HPMHooks.count.HP_HCache_open_pre ) { - FILE* (*preHookFunc) (const char *file, const char *opt); + FILE* (*preHookFunc) (const char **file, const char **opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_HCache_open_pre[hIndex].func; - retVal___ = preHookFunc(file, opt); + retVal___ = preHookFunc(&file, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -104,7 +104,7 @@ FILE* HP_HCache_open(const char *file, const char *opt) { } return retVal___; } -/* cmdline */ +/* cmdline_interface */ void HP_cmdline_init(void) { int hIndex = 0; if( HPMHooks.count.HP_cmdline_init_pre ) { @@ -161,11 +161,11 @@ bool HP_cmdline_arg_add(unsigned int pluginID, const char *name, char shortname, int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_cmdline_arg_add_pre ) { - bool (*preHookFunc) (unsigned int *pluginID, const char *name, char *shortname, CmdlineExecFunc *func, const char *help, unsigned int *options); + bool (*preHookFunc) (unsigned int *pluginID, const char **name, char *shortname, CmdlineExecFunc *func, const char **help, unsigned int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_arg_add_pre[hIndex].func; - retVal___ = preHookFunc(&pluginID, name, &shortname, &func, help, &options); + retVal___ = preHookFunc(&pluginID, &name, &shortname, &func, &help, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -176,10 +176,10 @@ bool HP_cmdline_arg_add(unsigned int pluginID, const char *name, char shortname, retVal___ = HPMHooks.source.cmdline.arg_add(pluginID, name, shortname, func, help, options); } if( HPMHooks.count.HP_cmdline_arg_add_post ) { - bool (*postHookFunc) (bool retVal___, unsigned int *pluginID, const char *name, char *shortname, CmdlineExecFunc *func, const char *help, unsigned int *options); + bool (*postHookFunc) (bool retVal___, unsigned int pluginID, const char *name, char shortname, CmdlineExecFunc func, const char *help, unsigned int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_cmdline_arg_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &pluginID, name, &shortname, &func, help, &options); + retVal___ = postHookFunc(retVal___, pluginID, name, shortname, func, help, options); } } return retVal___; @@ -188,11 +188,11 @@ int HP_cmdline_exec(int argc, char **argv, unsigned int options) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_cmdline_exec_pre ) { - int (*preHookFunc) (int *argc, char **argv, unsigned int *options); + int (*preHookFunc) (int *argc, char ***argv, unsigned int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_exec_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_exec_pre[hIndex].func; - retVal___ = preHookFunc(&argc, argv, &options); + retVal___ = preHookFunc(&argc, &argv, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -203,10 +203,10 @@ int HP_cmdline_exec(int argc, char **argv, unsigned int options) { retVal___ = HPMHooks.source.cmdline.exec(argc, argv, options); } if( HPMHooks.count.HP_cmdline_exec_post ) { - int (*postHookFunc) (int retVal___, int *argc, char **argv, unsigned int *options); + int (*postHookFunc) (int retVal___, int argc, char **argv, unsigned int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_exec_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_cmdline_exec_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &argc, argv, &options); + retVal___ = postHookFunc(retVal___, argc, argv, options); } } return retVal___; @@ -215,11 +215,11 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_cmdline_arg_next_value_pre ) { - bool (*preHookFunc) (const char *name, int *current_arg, int *argc); + bool (*preHookFunc) (const char **name, int *current_arg, int *argc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_next_value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_arg_next_value_pre[hIndex].func; - retVal___ = preHookFunc(name, ¤t_arg, &argc); + retVal___ = preHookFunc(&name, ¤t_arg, &argc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -230,10 +230,10 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { retVal___ = HPMHooks.source.cmdline.arg_next_value(name, current_arg, argc); } if( HPMHooks.count.HP_cmdline_arg_next_value_post ) { - bool (*postHookFunc) (bool retVal___, const char *name, int *current_arg, int *argc); + bool (*postHookFunc) (bool retVal___, const char *name, int current_arg, int argc); for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_next_value_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_cmdline_arg_next_value_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, ¤t_arg, &argc); + retVal___ = postHookFunc(retVal___, name, current_arg, argc); } } return retVal___; @@ -242,11 +242,11 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_cmdline_arg_source_pre ) { - const char* (*preHookFunc) (struct CmdlineArgData *arg); + const char* (*preHookFunc) (struct CmdlineArgData **arg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_arg_source_pre[hIndex].func; - retVal___ = preHookFunc(arg); + retVal___ = preHookFunc(&arg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -265,7 +265,7 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { } return retVal___; } -/* console */ +/* console_interface */ void HP_console_init(void) { int hIndex = 0; if( HPMHooks.count.HP_console_init_pre ) { @@ -370,7 +370,7 @@ void HP_console_display_gplnotice(void) { } return; } -/* core */ +/* core_interface */ void HP_core_shutdown_callback(void) { int hIndex = 0; if( HPMHooks.count.HP_core_shutdown_callback_pre ) { @@ -397,12 +397,12 @@ void HP_core_shutdown_callback(void) { } return; } -/* DB */ -DBOptions HP_DB_fix_options(DBType type, DBOptions options) { +/* db_interface */ +enum DBOptions HP_DB_fix_options(enum DBType type, enum DBOptions options) { int hIndex = 0; - DBOptions retVal___ = DB_OPT_BASE; + enum DBOptions retVal___ = DB_OPT_BASE; if( HPMHooks.count.HP_DB_fix_options_pre ) { - DBOptions (*preHookFunc) (DBType *type, DBOptions *options); + enum DBOptions (*preHookFunc) (enum DBType *type, enum DBOptions *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_fix_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_fix_options_pre[hIndex].func; @@ -417,19 +417,19 @@ DBOptions HP_DB_fix_options(DBType type, DBOptions options) { retVal___ = HPMHooks.source.DB.fix_options(type, options); } if( HPMHooks.count.HP_DB_fix_options_post ) { - DBOptions (*postHookFunc) (DBOptions retVal___, DBType *type, DBOptions *options); + enum DBOptions (*postHookFunc) (enum DBOptions retVal___, enum DBType type, enum DBOptions options); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_fix_options_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_fix_options_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type, &options); + retVal___ = postHookFunc(retVal___, type, options); } } return retVal___; } -DBComparator HP_DB_default_cmp(DBType type) { +DBComparator HP_DB_default_cmp(enum DBType type) { int hIndex = 0; DBComparator retVal___ = NULL; if( HPMHooks.count.HP_DB_default_cmp_pre ) { - DBComparator (*preHookFunc) (DBType *type); + DBComparator (*preHookFunc) (enum DBType *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_cmp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_default_cmp_pre[hIndex].func; @@ -444,19 +444,19 @@ DBComparator HP_DB_default_cmp(DBType type) { retVal___ = HPMHooks.source.DB.default_cmp(type); } if( HPMHooks.count.HP_DB_default_cmp_post ) { - DBComparator (*postHookFunc) (DBComparator retVal___, DBType *type); + DBComparator (*postHookFunc) (DBComparator retVal___, enum DBType type); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_cmp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_default_cmp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; } -DBHasher HP_DB_default_hash(DBType type) { +DBHasher HP_DB_default_hash(enum DBType type) { int hIndex = 0; DBHasher retVal___ = NULL; if( HPMHooks.count.HP_DB_default_hash_pre ) { - DBHasher (*preHookFunc) (DBType *type); + DBHasher (*preHookFunc) (enum DBType *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_hash_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_default_hash_pre[hIndex].func; @@ -471,19 +471,19 @@ DBHasher HP_DB_default_hash(DBType type) { retVal___ = HPMHooks.source.DB.default_hash(type); } if( HPMHooks.count.HP_DB_default_hash_post ) { - DBHasher (*postHookFunc) (DBHasher retVal___, DBType *type); + DBHasher (*postHookFunc) (DBHasher retVal___, enum DBType type); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_hash_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_default_hash_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; } -DBReleaser HP_DB_default_release(DBType type, DBOptions options) { +DBReleaser HP_DB_default_release(enum DBType type, enum DBOptions options) { int hIndex = 0; DBReleaser retVal___ = NULL; if( HPMHooks.count.HP_DB_default_release_pre ) { - DBReleaser (*preHookFunc) (DBType *type, DBOptions *options); + DBReleaser (*preHookFunc) (enum DBType *type, enum DBOptions *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_release_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_default_release_pre[hIndex].func; @@ -498,19 +498,19 @@ DBReleaser HP_DB_default_release(DBType type, DBOptions options) { retVal___ = HPMHooks.source.DB.default_release(type, options); } if( HPMHooks.count.HP_DB_default_release_post ) { - DBReleaser (*postHookFunc) (DBReleaser retVal___, DBType *type, DBOptions *options); + DBReleaser (*postHookFunc) (DBReleaser retVal___, enum DBType type, enum DBOptions options); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_release_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_default_release_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type, &options); + retVal___ = postHookFunc(retVal___, type, options); } } return retVal___; } -DBReleaser HP_DB_custom_release(DBRelease which) { +DBReleaser HP_DB_custom_release(enum DBReleaseOption which) { int hIndex = 0; DBReleaser retVal___ = NULL; if( HPMHooks.count.HP_DB_custom_release_pre ) { - DBReleaser (*preHookFunc) (DBRelease *which); + DBReleaser (*preHookFunc) (enum DBReleaseOption *which); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_custom_release_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_custom_release_pre[hIndex].func; @@ -525,23 +525,23 @@ DBReleaser HP_DB_custom_release(DBRelease which) { retVal___ = HPMHooks.source.DB.custom_release(which); } if( HPMHooks.count.HP_DB_custom_release_post ) { - DBReleaser (*postHookFunc) (DBReleaser retVal___, DBRelease *which); + DBReleaser (*postHookFunc) (DBReleaser retVal___, enum DBReleaseOption which); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_custom_release_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_custom_release_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &which); + retVal___ = postHookFunc(retVal___, which); } } return retVal___; } -DBMap* HP_DB_alloc(const char *file, const char *func, int line, DBType type, DBOptions options, unsigned short maxlen) { +struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { int hIndex = 0; - DBMap* retVal___ = NULL; + struct DBMap* retVal___ = NULL; if( HPMHooks.count.HP_DB_alloc_pre ) { - DBMap* (*preHookFunc) (const char *file, const char *func, int *line, DBType *type, DBOptions *options, unsigned short *maxlen); + struct DBMap* (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_alloc_pre[hIndex].func; - retVal___ = preHookFunc(file, func, &line, &type, &options, &maxlen); + retVal___ = preHookFunc(&file, &func, &line, &type, &options, &maxlen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -552,20 +552,19 @@ DBMap* HP_DB_alloc(const char *file, const char *func, int line, DBType type, DB retVal___ = HPMHooks.source.DB.alloc(file, func, line, type, options, maxlen); } if( HPMHooks.count.HP_DB_alloc_post ) { - DBMap* (*postHookFunc) (DBMap* retVal___, const char *file, const char *func, int *line, DBType *type, DBOptions *options, unsigned short *maxlen); + struct DBMap* (*postHookFunc) (struct DBMap* retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_alloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, file, func, &line, &type, &options, &maxlen); + retVal___ = postHookFunc(retVal___, file, func, line, type, options, maxlen); } } return retVal___; } -DBKey HP_DB_i2key(int key) { +union DBKey HP_DB_i2key(int key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_i2key_pre ) { - DBKey (*preHookFunc) (int *key); + union DBKey (*preHookFunc) (int *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_i2key_pre[hIndex].func; @@ -580,20 +579,19 @@ DBKey HP_DB_i2key(int key) { retVal___ = HPMHooks.source.DB.i2key(key); } if( HPMHooks.count.HP_DB_i2key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, int *key); + union DBKey (*postHookFunc) (union DBKey retVal___, int key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_i2key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBKey HP_DB_ui2key(unsigned int key) { +union DBKey HP_DB_ui2key(unsigned int key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ui2key_pre ) { - DBKey (*preHookFunc) (unsigned int *key); + union DBKey (*preHookFunc) (unsigned int *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ui2key_pre[hIndex].func; @@ -608,24 +606,23 @@ DBKey HP_DB_ui2key(unsigned int key) { retVal___ = HPMHooks.source.DB.ui2key(key); } if( HPMHooks.count.HP_DB_ui2key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, unsigned int *key); + union DBKey (*postHookFunc) (union DBKey retVal___, unsigned int key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ui2key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBKey HP_DB_str2key(const char *key) { +union DBKey HP_DB_str2key(const char *key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_str2key_pre ) { - DBKey (*preHookFunc) (const char *key); + union DBKey (*preHookFunc) (const char **key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_str2key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_str2key_pre[hIndex].func; - retVal___ = preHookFunc(key); + retVal___ = preHookFunc(&key); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -636,7 +633,7 @@ DBKey HP_DB_str2key(const char *key) { retVal___ = HPMHooks.source.DB.str2key(key); } if( HPMHooks.count.HP_DB_str2key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, const char *key); + union DBKey (*postHookFunc) (union DBKey retVal___, const char *key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_str2key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_str2key_post[hIndex].func; retVal___ = postHookFunc(retVal___, key); @@ -644,12 +641,11 @@ DBKey HP_DB_str2key(const char *key) { } return retVal___; } -DBKey HP_DB_i642key(int64 key) { +union DBKey HP_DB_i642key(int64 key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_i642key_pre ) { - DBKey (*preHookFunc) (int64 *key); + union DBKey (*preHookFunc) (int64 *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i642key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_i642key_pre[hIndex].func; @@ -664,20 +660,19 @@ DBKey HP_DB_i642key(int64 key) { retVal___ = HPMHooks.source.DB.i642key(key); } if( HPMHooks.count.HP_DB_i642key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, int64 *key); + union DBKey (*postHookFunc) (union DBKey retVal___, int64 key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i642key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_i642key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBKey HP_DB_ui642key(uint64 key) { +union DBKey HP_DB_ui642key(uint64 key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ui642key_pre ) { - DBKey (*preHookFunc) (uint64 *key); + union DBKey (*preHookFunc) (uint64 *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui642key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ui642key_pre[hIndex].func; @@ -692,20 +687,19 @@ DBKey HP_DB_ui642key(uint64 key) { retVal___ = HPMHooks.source.DB.ui642key(key); } if( HPMHooks.count.HP_DB_ui642key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, uint64 *key); + union DBKey (*postHookFunc) (union DBKey retVal___, uint64 key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui642key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ui642key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBData HP_DB_i2data(int data) { +struct DBData HP_DB_i2data(int data) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_DB_i2data_pre ) { - DBData (*preHookFunc) (int *data); + struct DBData (*preHookFunc) (int *data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_i2data_pre[hIndex].func; @@ -720,20 +714,19 @@ DBData HP_DB_i2data(int data) { retVal___ = HPMHooks.source.DB.i2data(data); } if( HPMHooks.count.HP_DB_i2data_post ) { - DBData (*postHookFunc) (DBData retVal___, int *data); + struct DBData (*postHookFunc) (struct DBData retVal___, int data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_i2data_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &data); + retVal___ = postHookFunc(retVal___, data); } } return retVal___; } -DBData HP_DB_ui2data(unsigned int data) { +struct DBData HP_DB_ui2data(unsigned int data) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ui2data_pre ) { - DBData (*preHookFunc) (unsigned int *data); + struct DBData (*preHookFunc) (unsigned int *data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ui2data_pre[hIndex].func; @@ -748,24 +741,23 @@ DBData HP_DB_ui2data(unsigned int data) { retVal___ = HPMHooks.source.DB.ui2data(data); } if( HPMHooks.count.HP_DB_ui2data_post ) { - DBData (*postHookFunc) (DBData retVal___, unsigned int *data); + struct DBData (*postHookFunc) (struct DBData retVal___, unsigned int data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ui2data_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &data); + retVal___ = postHookFunc(retVal___, data); } } return retVal___; } -DBData HP_DB_ptr2data(void *data) { +struct DBData HP_DB_ptr2data(void *data) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ptr2data_pre ) { - DBData (*preHookFunc) (void *data); + struct DBData (*preHookFunc) (void **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ptr2data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ptr2data_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -776,7 +768,7 @@ DBData HP_DB_ptr2data(void *data) { retVal___ = HPMHooks.source.DB.ptr2data(data); } if( HPMHooks.count.HP_DB_ptr2data_post ) { - DBData (*postHookFunc) (DBData retVal___, void *data); + struct DBData (*postHookFunc) (struct DBData retVal___, void *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ptr2data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ptr2data_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -784,15 +776,15 @@ DBData HP_DB_ptr2data(void *data) { } return retVal___; } -int HP_DB_data2i(DBData *data) { +int HP_DB_data2i(struct DBData *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_DB_data2i_pre ) { - int (*preHookFunc) (DBData *data); + int (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2i_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_data2i_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -803,7 +795,7 @@ int HP_DB_data2i(DBData *data) { retVal___ = HPMHooks.source.DB.data2i(data); } if( HPMHooks.count.HP_DB_data2i_post ) { - int (*postHookFunc) (int retVal___, DBData *data); + int (*postHookFunc) (int retVal___, struct DBData *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2i_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_data2i_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -811,15 +803,15 @@ int HP_DB_data2i(DBData *data) { } return retVal___; } -unsigned int HP_DB_data2ui(DBData *data) { +unsigned int HP_DB_data2ui(struct DBData *data) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_DB_data2ui_pre ) { - unsigned int (*preHookFunc) (DBData *data); + unsigned int (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ui_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_data2ui_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -830,7 +822,7 @@ unsigned int HP_DB_data2ui(DBData *data) { retVal___ = HPMHooks.source.DB.data2ui(data); } if( HPMHooks.count.HP_DB_data2ui_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, DBData *data); + unsigned int (*postHookFunc) (unsigned int retVal___, struct DBData *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ui_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_data2ui_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -838,15 +830,15 @@ unsigned int HP_DB_data2ui(DBData *data) { } return retVal___; } -void* HP_DB_data2ptr(DBData *data) { +void* HP_DB_data2ptr(struct DBData *data) { int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_DB_data2ptr_pre ) { - void* (*preHookFunc) (DBData *data); + void* (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_data2ptr_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -857,7 +849,7 @@ void* HP_DB_data2ptr(DBData *data) { retVal___ = HPMHooks.source.DB.data2ptr(data); } if( HPMHooks.count.HP_DB_data2ptr_post ) { - void* (*postHookFunc) (void* retVal___, DBData *data); + void* (*postHookFunc) (void* retVal___, struct DBData *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_data2ptr_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -917,16 +909,632 @@ void HP_DB_final(void) { } return; } -/* libconfig */ +/* lclif_interface */ +void HP_lclif_init(void) { + int hIndex = 0; + if( HPMHooks.count.HP_lclif_init_pre ) { + void (*preHookFunc) (void); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_init_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_init_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.lclif.init(); + } + if( HPMHooks.count.HP_lclif_init_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_init_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_init_post[hIndex].func; + postHookFunc(); + } + } + return; +} +void HP_lclif_final(void) { + int hIndex = 0; + if( HPMHooks.count.HP_lclif_final_pre ) { + void (*preHookFunc) (void); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_final_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_final_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.lclif.final(); + } + if( HPMHooks.count.HP_lclif_final_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_final_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_final_post[hIndex].func; + postHookFunc(); + } + } + return; +} +void HP_lclif_connection_error(int fd, uint8 error) { + int hIndex = 0; + if( HPMHooks.count.HP_lclif_connection_error_pre ) { + void (*preHookFunc) (int *fd, uint8 *error); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_connection_error_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_connection_error_pre[hIndex].func; + preHookFunc(&fd, &error); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.lclif.connection_error(fd, error); + } + if( HPMHooks.count.HP_lclif_connection_error_post ) { + void (*postHookFunc) (int fd, uint8 error); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_connection_error_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_connection_error_post[hIndex].func; + postHookFunc(fd, error); + } + } + return; +} +bool HP_lclif_server_list(struct login_session_data *sd) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_lclif_server_list_pre ) { + bool (*preHookFunc) (struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_server_list_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_server_list_pre[hIndex].func; + retVal___ = preHookFunc(&sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.lclif.server_list(sd); + } + if( HPMHooks.count.HP_lclif_server_list_post ) { + bool (*postHookFunc) (bool retVal___, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_server_list_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_server_list_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sd); + } + } + return retVal___; +} +void HP_lclif_auth_failed(int fd, time_t ban, uint32 error) { + int hIndex = 0; + if( HPMHooks.count.HP_lclif_auth_failed_pre ) { + void (*preHookFunc) (int *fd, time_t *ban, uint32 *error); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_auth_failed_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_auth_failed_pre[hIndex].func; + preHookFunc(&fd, &ban, &error); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.lclif.auth_failed(fd, ban, error); + } + if( HPMHooks.count.HP_lclif_auth_failed_post ) { + void (*postHookFunc) (int fd, time_t ban, uint32 error); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_auth_failed_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_auth_failed_post[hIndex].func; + postHookFunc(fd, ban, error); + } + } + return; +} +void HP_lclif_login_error(int fd, uint8 error) { + int hIndex = 0; + if( HPMHooks.count.HP_lclif_login_error_pre ) { + void (*preHookFunc) (int *fd, uint8 *error); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_login_error_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_login_error_pre[hIndex].func; + preHookFunc(&fd, &error); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.lclif.login_error(fd, error); + } + if( HPMHooks.count.HP_lclif_login_error_post ) { + void (*postHookFunc) (int fd, uint8 error); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_login_error_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_login_error_post[hIndex].func; + postHookFunc(fd, error); + } + } + return; +} +void HP_lclif_coding_key(int fd, struct login_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_lclif_coding_key_pre ) { + void (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_coding_key_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_coding_key_pre[hIndex].func; + preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.lclif.coding_key(fd, sd); + } + if( HPMHooks.count.HP_lclif_coding_key_post ) { + void (*postHookFunc) (int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_coding_key_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_coding_key_post[hIndex].func; + postHookFunc(fd, sd); + } + } + return; +} +const struct login_packet_db* HP_lclif_packet(int16 packet_id) { + int hIndex = 0; + const struct login_packet_db* retVal___ = NULL; + if( HPMHooks.count.HP_lclif_packet_pre ) { + const struct login_packet_db* (*preHookFunc) (int16 *packet_id); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_packet_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_packet_pre[hIndex].func; + retVal___ = preHookFunc(&packet_id); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.lclif.packet(packet_id); + } + if( HPMHooks.count.HP_lclif_packet_post ) { + const struct login_packet_db* (*postHookFunc) (const struct login_packet_db* retVal___, int16 packet_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_packet_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_packet_post[hIndex].func; + retVal___ = postHookFunc(retVal___, packet_id); + } + } + return retVal___; +} +enum parsefunc_rcode HP_lclif_parse_packet(const struct login_packet_db *lpd, int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_lclif_parse_packet_pre ) { + enum parsefunc_rcode (*preHookFunc) (const struct login_packet_db **lpd, int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_parse_packet_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_parse_packet_pre[hIndex].func; + retVal___ = preHookFunc(&lpd, &fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.lclif.parse_packet(lpd, fd, sd); + } + if( HPMHooks.count.HP_lclif_parse_packet_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, const struct login_packet_db *lpd, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_parse_packet_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_parse_packet_post[hIndex].func; + retVal___ = postHookFunc(retVal___, lpd, fd, sd); + } + } + return retVal___; +} +int HP_lclif_parse(int fd) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_lclif_parse_pre ) { + int (*preHookFunc) (int *fd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_parse_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_lclif_parse_pre[hIndex].func; + retVal___ = preHookFunc(&fd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.lclif.parse(fd); + } + if( HPMHooks.count.HP_lclif_parse_post ) { + int (*postHookFunc) (int retVal___, int fd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_lclif_parse_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_lclif_parse_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd); + } + } + return retVal___; +} +/* lclif_interface_private */ +void HP_PRIV__lclif_packetdb_loaddb(void) { + int hIndex = 0; + if( HPMHooks.count.HP_PRIV__lclif_packetdb_loaddb_pre ) { + void (*preHookFunc) (void); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_packetdb_loaddb_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_packetdb_loaddb_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.PRIV__lclif.packetdb_loaddb(); + } + if( HPMHooks.count.HP_PRIV__lclif_packetdb_loaddb_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_packetdb_loaddb_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_packetdb_loaddb_post[hIndex].func; + postHookFunc(); + } + } + return; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_sub(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_sub_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_sub_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_sub_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_sub(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_sub_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_sub_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_sub_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_CONNECT_INFO_CHANGED(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_CONNECT_INFO_CHANGED_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_EXE_HASHCHECK(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_EXE_HASHCHECK(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_EXE_HASHCHECK_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_LOGIN(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_LOGIN(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_LOGIN2(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN2_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN2_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN2_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_LOGIN2(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN2_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN2_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN2_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_LOGIN3(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN3_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN3_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN3_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_LOGIN3(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN3_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN3_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN3_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_LOGIN4(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN4_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN4_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN4_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_LOGIN4(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN4_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN4_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN4_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_LOGIN_PCBANG(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_LOGIN_PCBANG(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN_PCBANG_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_LOGIN_HAN(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_HAN_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_HAN_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN_HAN_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_LOGIN_HAN(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_HAN_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_LOGIN_HAN_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_LOGIN_HAN_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_SSO_LOGIN_REQ(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_SSO_LOGIN_REQ_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_REQ_HASH(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_REQ_HASH_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_REQ_HASH_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_REQ_HASH_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_REQ_HASH(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_REQ_HASH_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_REQ_HASH_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_REQ_HASH_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +enum parsefunc_rcode HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT(int fd, struct login_session_data *sd) { + int hIndex = 0; + enum parsefunc_rcode retVal___ = PACKET_UNKNOWN; + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_pre ) { + enum parsefunc_rcode (*preHookFunc) (int *fd, struct login_session_data **sd); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.PRIV__lclif.parse_CA_CHARSERVERCONNECT(fd, sd); + } + if( HPMHooks.count.HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_post ) { + enum parsefunc_rcode (*postHookFunc) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); + } + } + return retVal___; +} +/* libconfig_interface */ int HP_libconfig_read(struct config_t *config, FILE *stream) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_pre ) { - int (*preHookFunc) (struct config_t *config, FILE *stream); + int (*preHookFunc) (struct config_t **config, FILE **stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func; - retVal___ = preHookFunc(config, stream); + retVal___ = preHookFunc(&config, &stream); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -948,11 +1556,11 @@ int HP_libconfig_read(struct config_t *config, FILE *stream) { void HP_libconfig_write(const struct config_t *config, FILE *stream) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_write_pre ) { - void (*preHookFunc) (const struct config_t *config, FILE *stream); + void (*preHookFunc) (const struct config_t **config, FILE **stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func; - preHookFunc(config, stream); + preHookFunc(&config, &stream); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -974,11 +1582,11 @@ void HP_libconfig_write(const struct config_t *config, FILE *stream) { void HP_libconfig_set_options(struct config_t *config, int options) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_options_pre ) { - void (*preHookFunc) (struct config_t *config, int *options); + void (*preHookFunc) (struct config_t **config, int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func; - preHookFunc(config, &options); + preHookFunc(&config, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -989,10 +1597,10 @@ void HP_libconfig_set_options(struct config_t *config, int options) { HPMHooks.source.libconfig.set_options(config, options); } if( HPMHooks.count.HP_libconfig_set_options_post ) { - void (*postHookFunc) (struct config_t *config, int *options); + void (*postHookFunc) (struct config_t *config, int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func; - postHookFunc(config, &options); + postHookFunc(config, options); } } return; @@ -1001,11 +1609,11 @@ int HP_libconfig_get_options(const struct config_t *config) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_get_options_pre ) { - int (*preHookFunc) (const struct config_t *config); + int (*preHookFunc) (const struct config_t **config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func; - retVal___ = preHookFunc(config); + retVal___ = preHookFunc(&config); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1028,11 +1636,11 @@ int HP_libconfig_read_string(struct config_t *config, const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_string_pre ) { - int (*preHookFunc) (struct config_t *config, const char *str); + int (*preHookFunc) (struct config_t **config, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func; - retVal___ = preHookFunc(config, str); + retVal___ = preHookFunc(&config, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1055,11 +1663,11 @@ int HP_libconfig_read_file_src(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_file_src_pre ) { - int (*preHookFunc) (struct config_t *config, const char *filename); + int (*preHookFunc) (struct config_t **config, const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func; - retVal___ = preHookFunc(config, filename); + retVal___ = preHookFunc(&config, &filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1082,11 +1690,11 @@ int HP_libconfig_write_file(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_write_file_pre ) { - int (*preHookFunc) (struct config_t *config, const char *filename); + int (*preHookFunc) (struct config_t **config, const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func; - retVal___ = preHookFunc(config, filename); + retVal___ = preHookFunc(&config, &filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1108,11 +1716,11 @@ int HP_libconfig_write_file(struct config_t *config, const char *filename) { void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_destructor_pre ) { - void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *)); + void (*preHookFunc) (struct config_t **config, void ( **destructor ) (void *)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func; - preHookFunc(config, destructor); + preHookFunc(&config, &destructor); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1134,11 +1742,11 @@ void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) ( void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) { - void (*preHookFunc) (struct config_t *config, const char *include_dir); + void (*preHookFunc) (struct config_t **config, const char **include_dir); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func; - preHookFunc(config, include_dir); + preHookFunc(&config, &include_dir); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1160,11 +1768,11 @@ void HP_libconfig_set_include_dir(struct config_t *config, const char *include_d void HP_libconfig_init(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_init_pre ) { - void (*preHookFunc) (struct config_t *config); + void (*preHookFunc) (struct config_t **config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func; - preHookFunc(config); + preHookFunc(&config); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1186,11 +1794,11 @@ void HP_libconfig_init(struct config_t *config) { void HP_libconfig_destroy(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_destroy_pre ) { - void (*preHookFunc) (struct config_t *config); + void (*preHookFunc) (struct config_t **config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func; - preHookFunc(config); + preHookFunc(&config); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1213,11 +1821,11 @@ int HP_libconfig_setting_get_int(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1240,11 +1848,11 @@ long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) { - long long (*preHookFunc) (const struct config_setting_t *setting); + long long (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1267,11 +1875,11 @@ double HP_libconfig_setting_get_float(const struct config_setting_t *setting) { int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) { - double (*preHookFunc) (const struct config_setting_t *setting); + double (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1294,11 +1902,11 @@ int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1321,11 +1929,11 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) { - const char* (*preHookFunc) (const struct config_setting_t *setting); + const char* (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1348,11 +1956,11 @@ struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *se int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; - retVal___ = preHookFunc(setting, name); + retVal___ = preHookFunc(&setting, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1375,11 +1983,11 @@ int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, cons int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1402,11 +2010,11 @@ int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, long long **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1429,11 +2037,11 @@ int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, double **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1456,11 +2064,11 @@ int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, con int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1483,11 +2091,11 @@ int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, const char ***value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1510,11 +2118,11 @@ int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t **setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1525,10 +2133,10 @@ int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -1537,11 +2145,11 @@ int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long v int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, long long *value); + int (*preHookFunc) (struct config_setting_t **setting, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1552,10 +2160,10 @@ int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long v retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -1564,11 +2172,11 @@ int HP_libconfig_setting_set_float(struct config_setting_t *setting, double valu int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, double *value); + int (*preHookFunc) (struct config_setting_t **setting, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1579,10 +2187,10 @@ int HP_libconfig_setting_set_float(struct config_setting_t *setting, double valu retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -1591,11 +2199,11 @@ int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t **setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1606,10 +2214,10 @@ int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -1618,11 +2226,11 @@ int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, const char *value); + int (*preHookFunc) (struct config_setting_t **setting, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func; - retVal___ = preHookFunc(setting, value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1645,11 +2253,11 @@ int HP_libconfig_setting_set_format(struct config_setting_t *setting, short form int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, short *format); + int (*preHookFunc) (struct config_setting_t **setting, short *format); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func; - retVal___ = preHookFunc(setting, &format); + retVal___ = preHookFunc(&setting, &format); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1660,10 +2268,10 @@ int HP_libconfig_setting_set_format(struct config_setting_t *setting, short form retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format); } if( HPMHooks.count.HP_libconfig_setting_set_format_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short format); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &format); + retVal___ = postHookFunc(retVal___, setting, format); } } return retVal___; @@ -1672,11 +2280,11 @@ short HP_libconfig_setting_get_format(const struct config_setting_t *setting) { int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) { - short (*preHookFunc) (const struct config_setting_t *setting); + short (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1699,11 +2307,11 @@ int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1714,10 +2322,10 @@ int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, in retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) { - int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -1726,11 +2334,11 @@ long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *set int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) { - long long (*preHookFunc) (const struct config_setting_t *setting, int *idx); + long long (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1741,10 +2349,10 @@ long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *set retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) { - long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx); + long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -1753,11 +2361,11 @@ double HP_libconfig_setting_get_float_elem(const struct config_setting_t *settin int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) { - double (*preHookFunc) (const struct config_setting_t *setting, int *idx); + double (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1768,10 +2376,10 @@ double HP_libconfig_setting_get_float_elem(const struct config_setting_t *settin retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) { - double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx); + double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -1780,11 +2388,11 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1795,10 +2403,10 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) { - int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -1807,11 +2415,11 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) { - const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx); + const char* (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1822,10 +2430,10 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx); + const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -1834,11 +2442,11 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1849,10 +2457,10 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -1861,11 +2469,11 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1876,10 +2484,10 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, long long value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -1888,11 +2496,11 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1903,10 +2511,10 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, double value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -1915,11 +2523,11 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1930,10 +2538,10 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -1942,11 +2550,11 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1957,10 +2565,10 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, const char *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -1969,11 +2577,11 @@ int HP_libconfig_setting_index(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_index_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1996,11 +2604,11 @@ int HP_libconfig_setting_length(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_length_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2023,11 +2631,11 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2038,10 +2646,10 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -2050,11 +2658,11 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; - retVal___ = preHookFunc(setting, name); + retVal___ = preHookFunc(&setting, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2077,11 +2685,11 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_add_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; - retVal___ = preHookFunc(parent, name, &type); + retVal___ = preHookFunc(&parent, &name, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2092,10 +2700,10 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if( HPMHooks.count.HP_libconfig_setting_add_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, parent, name, &type); + retVal___ = postHookFunc(retVal___, parent, name, type); } } return retVal___; @@ -2104,11 +2712,11 @@ int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *nam int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_pre ) { - int (*preHookFunc) (struct config_setting_t *parent, const char *name); + int (*preHookFunc) (struct config_setting_t **parent, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func; - retVal___ = preHookFunc(parent, name); + retVal___ = preHookFunc(&parent, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2131,11 +2739,11 @@ int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) { - int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx); + int (*preHookFunc) (struct config_setting_t **parent, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func; - retVal___ = preHookFunc(parent, &idx); + retVal___ = preHookFunc(&parent, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2146,10 +2754,10 @@ int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned i retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx); } if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, parent, &idx); + retVal___ = postHookFunc(retVal___, parent, idx); } } return retVal___; @@ -2157,11 +2765,11 @@ int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned i void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) { - void (*preHookFunc) (struct config_setting_t *setting, void *hook); + void (*preHookFunc) (struct config_setting_t **setting, void **hook); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func; - preHookFunc(setting, hook); + preHookFunc(&setting, &hook); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2184,11 +2792,11 @@ struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, cons int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_lookup_pre ) { - struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath); + struct config_setting_t* (*preHookFunc) (const struct config_t **config, const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath); + retVal___ = preHookFunc(&config, &filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2211,11 +2819,11 @@ int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2238,11 +2846,11 @@ int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepat int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, long long **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2265,11 +2873,11 @@ int HP_libconfig_lookup_float(const struct config_t *config, const char *filepat int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_float_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, double **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2292,11 +2900,11 @@ int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2319,11 +2927,11 @@ int HP_libconfig_lookup_string(const struct config_t *config, const char *filepa int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_string_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, const char ***value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2346,11 +2954,11 @@ int HP_libconfig_load_file(struct config_t *config, const char *config_filename) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_load_file_pre ) { - int (*preHookFunc) (struct config_t *config, const char *config_filename); + int (*preHookFunc) (struct config_t **config, const char **config_filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func; - retVal___ = preHookFunc(config, config_filename); + retVal___ = preHookFunc(&config, &config_filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2372,11 +2980,11 @@ int HP_libconfig_load_file(struct config_t *config, const char *config_filename) void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) { - void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func; - preHookFunc(parent, src); + preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2398,11 +3006,11 @@ void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const str void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) { - void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func; - preHookFunc(parent, src); + preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2424,11 +3032,11 @@ void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struc void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) { - void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func; - preHookFunc(parent, src); + preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2451,11 +3059,11 @@ int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct conf int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_copy_pre ) { - int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + int (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func; - retVal___ = preHookFunc(parent, src); + retVal___ = preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2478,11 +3086,11 @@ bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) { - bool (*preHookFunc) (const struct config_setting_t *setting); + bool (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2505,11 +3113,11 @@ uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) { - uint32 (*preHookFunc) (const struct config_setting_t *setting); + uint32 (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2532,11 +3140,11 @@ uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) { int hIndex = 0; uint16 retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) { - uint16 (*preHookFunc) (const struct config_setting_t *setting); + uint16 (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2559,11 +3167,11 @@ int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) { int hIndex = 0; int16 retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) { - int16 (*preHookFunc) (const struct config_setting_t *setting); + int16 (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2586,11 +3194,11 @@ int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, bool **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2613,11 +3221,11 @@ int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, uint32 **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2640,11 +3248,11 @@ int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, uint16 **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2667,11 +3275,11 @@ int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, int16 **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2694,11 +3302,11 @@ int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *se int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, char **out, size_t *out_size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, out, &out_size); + retVal___ = preHookFunc(&setting, &name, &out, &out_size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2709,10 +3317,10 @@ int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *se retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size); } if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) { - int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t out_size); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, name, out, &out_size); + retVal___ = postHookFunc(retVal___, setting, name, out, out_size); } } return retVal___; @@ -2721,11 +3329,11 @@ int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size); + int (*preHookFunc) (const struct config_t **config, const char **name, char **out, size_t *out_size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func; - retVal___ = preHookFunc(config, name, out, &out_size); + retVal___ = preHookFunc(&config, &name, &out, &out_size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2736,24 +3344,24 @@ int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size); } if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) { - int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t out_size); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func; - retVal___ = postHookFunc(retVal___, config, name, out, &out_size); + retVal___ = postHookFunc(retVal___, config, name, out, out_size); } } return retVal___; } -/* login */ +/* login_interface */ int HP_login_mmo_auth(struct login_session_data *sd, bool isServer) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_login_mmo_auth_pre ) { - int (*preHookFunc) (struct login_session_data *sd, bool *isServer); + int (*preHookFunc) (struct login_session_data **sd, bool *isServer); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_mmo_auth_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_mmo_auth_pre[hIndex].func; - retVal___ = preHookFunc(sd, &isServer); + retVal___ = preHookFunc(&sd, &isServer); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2764,10 +3372,10 @@ int HP_login_mmo_auth(struct login_session_data *sd, bool isServer) { retVal___ = HPMHooks.source.login.mmo_auth(sd, isServer); } if( HPMHooks.count.HP_login_mmo_auth_post ) { - int (*postHookFunc) (int retVal___, struct login_session_data *sd, bool *isServer); + int (*postHookFunc) (int retVal___, struct login_session_data *sd, bool isServer); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_mmo_auth_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_mmo_auth_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &isServer); + retVal___ = postHookFunc(retVal___, sd, isServer); } } return retVal___; @@ -2776,11 +3384,11 @@ int HP_login_mmo_auth_new(const char *userid, const char *pass, const char sex, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_login_mmo_auth_new_pre ) { - int (*preHookFunc) (const char *userid, const char *pass, const char *sex, const char *last_ip); + int (*preHookFunc) (const char **userid, const char **pass, const char *sex, const char **last_ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_mmo_auth_new_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_mmo_auth_new_pre[hIndex].func; - retVal___ = preHookFunc(userid, pass, &sex, last_ip); + retVal___ = preHookFunc(&userid, &pass, &sex, &last_ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2791,10 +3399,10 @@ int HP_login_mmo_auth_new(const char *userid, const char *pass, const char sex, retVal___ = HPMHooks.source.login.mmo_auth_new(userid, pass, sex, last_ip); } if( HPMHooks.count.HP_login_mmo_auth_new_post ) { - int (*postHookFunc) (int retVal___, const char *userid, const char *pass, const char *sex, const char *last_ip); + int (*postHookFunc) (int retVal___, const char *userid, const char *pass, const char sex, const char *last_ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_mmo_auth_new_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_mmo_auth_new_post[hIndex].func; - retVal___ = postHookFunc(retVal___, userid, pass, &sex, last_ip); + retVal___ = postHookFunc(retVal___, userid, pass, sex, last_ip); } } return retVal___; @@ -2818,20 +3426,19 @@ int HP_login_waiting_disconnect_timer(int tid, int64 tick, int id, intptr_t data retVal___ = HPMHooks.source.login.waiting_disconnect_timer(tid, tick, id, data); } if( HPMHooks.count.HP_login_waiting_disconnect_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_waiting_disconnect_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_waiting_disconnect_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -DBData HP_login_create_online_user(DBKey key, va_list args) { +struct DBData HP_login_create_online_user(union DBKey key, va_list args) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_login_create_online_user_pre ) { - DBData (*preHookFunc) (DBKey *key, va_list args); + struct DBData (*preHookFunc) (union DBKey *key, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_create_online_user_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); @@ -2850,11 +3457,11 @@ DBData HP_login_create_online_user(DBKey key, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_login_create_online_user_post ) { - DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args); + struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey key, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_create_online_user_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_login_create_online_user_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, args___copy); + retVal___ = postHookFunc(retVal___, key, args___copy); va_end(args___copy); } } @@ -2879,10 +3486,10 @@ struct online_login_data* HP_login_add_online_user(int char_server, int account_ retVal___ = HPMHooks.source.login.add_online_user(char_server, account_id); } if( HPMHooks.count.HP_login_add_online_user_post ) { - struct online_login_data* (*postHookFunc) (struct online_login_data* retVal___, int *char_server, int *account_id); + struct online_login_data* (*postHookFunc) (struct online_login_data* retVal___, int char_server, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_add_online_user_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_add_online_user_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_server, &account_id); + retVal___ = postHookFunc(retVal___, char_server, account_id); } } return retVal___; @@ -2905,24 +3512,24 @@ void HP_login_remove_online_user(int account_id) { HPMHooks.source.login.remove_online_user(account_id); } if( HPMHooks.count.HP_login_remove_online_user_post ) { - void (*postHookFunc) (int *account_id); + void (*postHookFunc) (int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_remove_online_user_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_remove_online_user_post[hIndex].func; - postHookFunc(&account_id); + postHookFunc(account_id); } } return; } -int HP_login_online_db_setoffline(DBKey key, DBData *data, va_list ap) { +int HP_login_online_db_setoffline(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_login_online_db_setoffline_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_online_db_setoffline_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_login_online_db_setoffline_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -2936,26 +3543,26 @@ int HP_login_online_db_setoffline(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_login_online_db_setoffline_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_online_db_setoffline_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_login_online_db_setoffline_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_login_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap) { +int HP_login_online_data_cleanup_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_login_online_data_cleanup_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_online_data_cleanup_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_login_online_data_cleanup_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -2969,11 +3576,11 @@ int HP_login_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_login_online_data_cleanup_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_online_data_cleanup_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_login_online_data_cleanup_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -2998,10 +3605,10 @@ int HP_login_online_data_cleanup(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.login.online_data_cleanup(tid, tick, id, data); } if( HPMHooks.count.HP_login_online_data_cleanup_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_online_data_cleanup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_online_data_cleanup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -3025,10 +3632,10 @@ int HP_login_sync_ip_addresses(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.login.sync_ip_addresses(tid, tick, id, data); } if( HPMHooks.count.HP_login_sync_ip_addresses_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_sync_ip_addresses_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_sync_ip_addresses_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -3037,11 +3644,11 @@ bool HP_login_check_encrypted(const char *str1, const char *str2, const char *pa int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_login_check_encrypted_pre ) { - bool (*preHookFunc) (const char *str1, const char *str2, const char *passwd); + bool (*preHookFunc) (const char **str1, const char **str2, const char **passwd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_check_encrypted_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_check_encrypted_pre[hIndex].func; - retVal___ = preHookFunc(str1, str2, passwd); + retVal___ = preHookFunc(&str1, &str2, &passwd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3064,11 +3671,11 @@ bool HP_login_check_password(const char *md5key, int passwdenc, const char *pass int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_login_check_password_pre ) { - bool (*preHookFunc) (const char *md5key, int *passwdenc, const char *passwd, const char *refpass); + bool (*preHookFunc) (const char **md5key, int *passwdenc, const char **passwd, const char **refpass); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_check_password_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_check_password_pre[hIndex].func; - retVal___ = preHookFunc(md5key, &passwdenc, passwd, refpass); + retVal___ = preHookFunc(&md5key, &passwdenc, &passwd, &refpass); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3079,10 +3686,10 @@ bool HP_login_check_password(const char *md5key, int passwdenc, const char *pass retVal___ = HPMHooks.source.login.check_password(md5key, passwdenc, passwd, refpass); } if( HPMHooks.count.HP_login_check_password_post ) { - bool (*postHookFunc) (bool retVal___, const char *md5key, int *passwdenc, const char *passwd, const char *refpass); + bool (*postHookFunc) (bool retVal___, const char *md5key, int passwdenc, const char *passwd, const char *refpass); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_check_password_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_check_password_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md5key, &passwdenc, passwd, refpass); + retVal___ = postHookFunc(retVal___, md5key, passwdenc, passwd, refpass); } } return retVal___; @@ -3106,10 +3713,10 @@ uint32 HP_login_lan_subnet_check(uint32 ip) { retVal___ = HPMHooks.source.login.lan_subnet_check(ip); } if( HPMHooks.count.HP_login_lan_subnet_check_post ) { - uint32 (*postHookFunc) (uint32 retVal___, uint32 *ip); + uint32 (*postHookFunc) (uint32 retVal___, uint32 ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_lan_subnet_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_lan_subnet_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip); + retVal___ = postHookFunc(retVal___, ip); } } return retVal___; @@ -3117,11 +3724,11 @@ uint32 HP_login_lan_subnet_check(uint32 ip) { void HP_login_fromchar_accinfo(int fd, int account_id, int u_fd, int u_aid, int u_group, int map_fd, struct mmo_account *acc) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_accinfo_pre ) { - void (*preHookFunc) (int *fd, int *account_id, int *u_fd, int *u_aid, int *u_group, int *map_fd, struct mmo_account *acc); + void (*preHookFunc) (int *fd, int *account_id, int *u_fd, int *u_aid, int *u_group, int *map_fd, struct mmo_account **acc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_accinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_accinfo_pre[hIndex].func; - preHookFunc(&fd, &account_id, &u_fd, &u_aid, &u_group, &map_fd, acc); + preHookFunc(&fd, &account_id, &u_fd, &u_aid, &u_group, &map_fd, &acc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3132,10 +3739,10 @@ void HP_login_fromchar_accinfo(int fd, int account_id, int u_fd, int u_aid, int HPMHooks.source.login.fromchar_accinfo(fd, account_id, u_fd, u_aid, u_group, map_fd, acc); } if( HPMHooks.count.HP_login_fromchar_accinfo_post ) { - void (*postHookFunc) (int *fd, int *account_id, int *u_fd, int *u_aid, int *u_group, int *map_fd, struct mmo_account *acc); + void (*postHookFunc) (int fd, int account_id, int u_fd, int u_aid, int u_group, int map_fd, struct mmo_account *acc); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_accinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_accinfo_post[hIndex].func; - postHookFunc(&fd, &account_id, &u_fd, &u_aid, &u_group, &map_fd, acc); + postHookFunc(fd, account_id, u_fd, u_aid, u_group, map_fd, acc); } } return; @@ -3143,11 +3750,11 @@ void HP_login_fromchar_accinfo(int fd, int account_id, int u_fd, int u_aid, int void HP_login_fromchar_account(int fd, int account_id, struct mmo_account *acc) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_account_pre ) { - void (*preHookFunc) (int *fd, int *account_id, struct mmo_account *acc); + void (*preHookFunc) (int *fd, int *account_id, struct mmo_account **acc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_account_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_account_pre[hIndex].func; - preHookFunc(&fd, &account_id, acc); + preHookFunc(&fd, &account_id, &acc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3158,10 +3765,10 @@ void HP_login_fromchar_account(int fd, int account_id, struct mmo_account *acc) HPMHooks.source.login.fromchar_account(fd, account_id, acc); } if( HPMHooks.count.HP_login_fromchar_account_post ) { - void (*postHookFunc) (int *fd, int *account_id, struct mmo_account *acc); + void (*postHookFunc) (int fd, int account_id, struct mmo_account *acc); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_account_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_account_post[hIndex].func; - postHookFunc(&fd, &account_id, acc); + postHookFunc(fd, account_id, acc); } } return; @@ -3184,10 +3791,10 @@ void HP_login_fromchar_account_update_other(int account_id, unsigned int state) HPMHooks.source.login.fromchar_account_update_other(account_id, state); } if( HPMHooks.count.HP_login_fromchar_account_update_other_post ) { - void (*postHookFunc) (int *account_id, unsigned int *state); + void (*postHookFunc) (int account_id, unsigned int state); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_account_update_other_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_account_update_other_post[hIndex].func; - postHookFunc(&account_id, &state); + postHookFunc(account_id, state); } } return; @@ -3195,11 +3802,11 @@ void HP_login_fromchar_account_update_other(int account_id, unsigned int state) void HP_login_fromchar_auth_ack(int fd, int account_id, uint32 login_id1, uint32 login_id2, uint8 sex, int request_id, struct login_auth_node *node) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_auth_ack_pre ) { - void (*preHookFunc) (int *fd, int *account_id, uint32 *login_id1, uint32 *login_id2, uint8 *sex, int *request_id, struct login_auth_node *node); + void (*preHookFunc) (int *fd, int *account_id, uint32 *login_id1, uint32 *login_id2, uint8 *sex, int *request_id, struct login_auth_node **node); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_auth_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_auth_ack_pre[hIndex].func; - preHookFunc(&fd, &account_id, &login_id1, &login_id2, &sex, &request_id, node); + preHookFunc(&fd, &account_id, &login_id1, &login_id2, &sex, &request_id, &node); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3210,10 +3817,10 @@ void HP_login_fromchar_auth_ack(int fd, int account_id, uint32 login_id1, uint32 HPMHooks.source.login.fromchar_auth_ack(fd, account_id, login_id1, login_id2, sex, request_id, node); } if( HPMHooks.count.HP_login_fromchar_auth_ack_post ) { - void (*postHookFunc) (int *fd, int *account_id, uint32 *login_id1, uint32 *login_id2, uint8 *sex, int *request_id, struct login_auth_node *node); + void (*postHookFunc) (int fd, int account_id, uint32 login_id1, uint32 login_id2, uint8 sex, int request_id, struct login_auth_node *node); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_auth_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_auth_ack_post[hIndex].func; - postHookFunc(&fd, &account_id, &login_id1, &login_id2, &sex, &request_id, node); + postHookFunc(fd, account_id, login_id1, login_id2, sex, request_id, node); } } return; @@ -3236,10 +3843,10 @@ void HP_login_fromchar_ban(int account_id, time_t timestamp) { HPMHooks.source.login.fromchar_ban(account_id, timestamp); } if( HPMHooks.count.HP_login_fromchar_ban_post ) { - void (*postHookFunc) (int *account_id, time_t *timestamp); + void (*postHookFunc) (int account_id, time_t timestamp); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_ban_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_ban_post[hIndex].func; - postHookFunc(&account_id, ×tamp); + postHookFunc(account_id, timestamp); } } return; @@ -3262,10 +3869,10 @@ void HP_login_fromchar_change_sex_other(int account_id, char sex) { HPMHooks.source.login.fromchar_change_sex_other(account_id, sex); } if( HPMHooks.count.HP_login_fromchar_change_sex_other_post ) { - void (*postHookFunc) (int *account_id, char *sex); + void (*postHookFunc) (int account_id, char sex); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_change_sex_other_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_change_sex_other_post[hIndex].func; - postHookFunc(&account_id, &sex); + postHookFunc(account_id, sex); } } return; @@ -3288,10 +3895,10 @@ void HP_login_fromchar_pong(int fd) { HPMHooks.source.login.fromchar_pong(fd); } if( HPMHooks.count.HP_login_fromchar_pong_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_pong_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_pong_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3299,11 +3906,11 @@ void HP_login_fromchar_pong(int fd) { void HP_login_fromchar_parse_auth(int fd, int id, const char *ip) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_parse_auth_pre ) { - void (*preHookFunc) (int *fd, int *id, const char *ip); + void (*preHookFunc) (int *fd, int *id, const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_auth_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_parse_auth_pre[hIndex].func; - preHookFunc(&fd, &id, ip); + preHookFunc(&fd, &id, &ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3314,10 +3921,10 @@ void HP_login_fromchar_parse_auth(int fd, int id, const char *ip) { HPMHooks.source.login.fromchar_parse_auth(fd, id, ip); } if( HPMHooks.count.HP_login_fromchar_parse_auth_post ) { - void (*postHookFunc) (int *fd, int *id, const char *ip); + void (*postHookFunc) (int fd, int id, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_auth_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_auth_post[hIndex].func; - postHookFunc(&fd, &id, ip); + postHookFunc(fd, id, ip); } } return; @@ -3340,10 +3947,10 @@ void HP_login_fromchar_parse_update_users(int fd, int id) { HPMHooks.source.login.fromchar_parse_update_users(fd, id); } if( HPMHooks.count.HP_login_fromchar_parse_update_users_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_update_users_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_update_users_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -3351,11 +3958,11 @@ void HP_login_fromchar_parse_update_users(int fd, int id) { void HP_login_fromchar_parse_request_change_email(int fd, int id, const char *ip) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_parse_request_change_email_pre ) { - void (*preHookFunc) (int *fd, int *id, const char *ip); + void (*preHookFunc) (int *fd, int *id, const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_request_change_email_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_parse_request_change_email_pre[hIndex].func; - preHookFunc(&fd, &id, ip); + preHookFunc(&fd, &id, &ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3366,10 +3973,10 @@ void HP_login_fromchar_parse_request_change_email(int fd, int id, const char *ip HPMHooks.source.login.fromchar_parse_request_change_email(fd, id, ip); } if( HPMHooks.count.HP_login_fromchar_parse_request_change_email_post ) { - void (*postHookFunc) (int *fd, int *id, const char *ip); + void (*postHookFunc) (int fd, int id, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_request_change_email_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_request_change_email_post[hIndex].func; - postHookFunc(&fd, &id, ip); + postHookFunc(fd, id, ip); } } return; @@ -3377,11 +3984,11 @@ void HP_login_fromchar_parse_request_change_email(int fd, int id, const char *ip void HP_login_fromchar_parse_account_data(int fd, int id, const char *ip) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_parse_account_data_pre ) { - void (*preHookFunc) (int *fd, int *id, const char *ip); + void (*preHookFunc) (int *fd, int *id, const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_account_data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_parse_account_data_pre[hIndex].func; - preHookFunc(&fd, &id, ip); + preHookFunc(&fd, &id, &ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3392,10 +3999,10 @@ void HP_login_fromchar_parse_account_data(int fd, int id, const char *ip) { HPMHooks.source.login.fromchar_parse_account_data(fd, id, ip); } if( HPMHooks.count.HP_login_fromchar_parse_account_data_post ) { - void (*postHookFunc) (int *fd, int *id, const char *ip); + void (*postHookFunc) (int fd, int id, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_account_data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_account_data_post[hIndex].func; - postHookFunc(&fd, &id, ip); + postHookFunc(fd, id, ip); } } return; @@ -3418,10 +4025,10 @@ void HP_login_fromchar_parse_ping(int fd) { HPMHooks.source.login.fromchar_parse_ping(fd); } if( HPMHooks.count.HP_login_fromchar_parse_ping_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_ping_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_ping_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3429,11 +4036,11 @@ void HP_login_fromchar_parse_ping(int fd) { void HP_login_fromchar_parse_change_email(int fd, int id, const char *ip) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_parse_change_email_pre ) { - void (*preHookFunc) (int *fd, int *id, const char *ip); + void (*preHookFunc) (int *fd, int *id, const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_change_email_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_parse_change_email_pre[hIndex].func; - preHookFunc(&fd, &id, ip); + preHookFunc(&fd, &id, &ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3444,10 +4051,10 @@ void HP_login_fromchar_parse_change_email(int fd, int id, const char *ip) { HPMHooks.source.login.fromchar_parse_change_email(fd, id, ip); } if( HPMHooks.count.HP_login_fromchar_parse_change_email_post ) { - void (*postHookFunc) (int *fd, int *id, const char *ip); + void (*postHookFunc) (int fd, int id, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_change_email_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_change_email_post[hIndex].func; - postHookFunc(&fd, &id, ip); + postHookFunc(fd, id, ip); } } return; @@ -3455,11 +4062,11 @@ void HP_login_fromchar_parse_change_email(int fd, int id, const char *ip) { void HP_login_fromchar_parse_account_update(int fd, int id, const char *ip) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_parse_account_update_pre ) { - void (*preHookFunc) (int *fd, int *id, const char *ip); + void (*preHookFunc) (int *fd, int *id, const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_account_update_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_parse_account_update_pre[hIndex].func; - preHookFunc(&fd, &id, ip); + preHookFunc(&fd, &id, &ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3470,10 +4077,10 @@ void HP_login_fromchar_parse_account_update(int fd, int id, const char *ip) { HPMHooks.source.login.fromchar_parse_account_update(fd, id, ip); } if( HPMHooks.count.HP_login_fromchar_parse_account_update_post ) { - void (*postHookFunc) (int *fd, int *id, const char *ip); + void (*postHookFunc) (int fd, int id, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_account_update_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_account_update_post[hIndex].func; - postHookFunc(&fd, &id, ip); + postHookFunc(fd, id, ip); } } return; @@ -3481,11 +4088,11 @@ void HP_login_fromchar_parse_account_update(int fd, int id, const char *ip) { void HP_login_fromchar_parse_ban(int fd, int id, const char *ip) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_parse_ban_pre ) { - void (*preHookFunc) (int *fd, int *id, const char *ip); + void (*preHookFunc) (int *fd, int *id, const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_ban_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_parse_ban_pre[hIndex].func; - preHookFunc(&fd, &id, ip); + preHookFunc(&fd, &id, &ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3496,10 +4103,10 @@ void HP_login_fromchar_parse_ban(int fd, int id, const char *ip) { HPMHooks.source.login.fromchar_parse_ban(fd, id, ip); } if( HPMHooks.count.HP_login_fromchar_parse_ban_post ) { - void (*postHookFunc) (int *fd, int *id, const char *ip); + void (*postHookFunc) (int fd, int id, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_ban_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_ban_post[hIndex].func; - postHookFunc(&fd, &id, ip); + postHookFunc(fd, id, ip); } } return; @@ -3507,11 +4114,11 @@ void HP_login_fromchar_parse_ban(int fd, int id, const char *ip) { void HP_login_fromchar_parse_change_sex(int fd, int id, const char *ip) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_parse_change_sex_pre ) { - void (*preHookFunc) (int *fd, int *id, const char *ip); + void (*preHookFunc) (int *fd, int *id, const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_change_sex_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_parse_change_sex_pre[hIndex].func; - preHookFunc(&fd, &id, ip); + preHookFunc(&fd, &id, &ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3522,10 +4129,10 @@ void HP_login_fromchar_parse_change_sex(int fd, int id, const char *ip) { HPMHooks.source.login.fromchar_parse_change_sex(fd, id, ip); } if( HPMHooks.count.HP_login_fromchar_parse_change_sex_post ) { - void (*postHookFunc) (int *fd, int *id, const char *ip); + void (*postHookFunc) (int fd, int id, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_change_sex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_change_sex_post[hIndex].func; - postHookFunc(&fd, &id, ip); + postHookFunc(fd, id, ip); } } return; @@ -3533,11 +4140,11 @@ void HP_login_fromchar_parse_change_sex(int fd, int id, const char *ip) { void HP_login_fromchar_parse_account_reg2(int fd, int id, const char *ip) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_parse_account_reg2_pre ) { - void (*preHookFunc) (int *fd, int *id, const char *ip); + void (*preHookFunc) (int *fd, int *id, const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_account_reg2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_parse_account_reg2_pre[hIndex].func; - preHookFunc(&fd, &id, ip); + preHookFunc(&fd, &id, &ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3548,10 +4155,10 @@ void HP_login_fromchar_parse_account_reg2(int fd, int id, const char *ip) { HPMHooks.source.login.fromchar_parse_account_reg2(fd, id, ip); } if( HPMHooks.count.HP_login_fromchar_parse_account_reg2_post ) { - void (*postHookFunc) (int *fd, int *id, const char *ip); + void (*postHookFunc) (int fd, int id, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_account_reg2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_account_reg2_post[hIndex].func; - postHookFunc(&fd, &id, ip); + postHookFunc(fd, id, ip); } } return; @@ -3559,11 +4166,11 @@ void HP_login_fromchar_parse_account_reg2(int fd, int id, const char *ip) { void HP_login_fromchar_parse_unban(int fd, int id, const char *ip) { int hIndex = 0; if( HPMHooks.count.HP_login_fromchar_parse_unban_pre ) { - void (*preHookFunc) (int *fd, int *id, const char *ip); + void (*preHookFunc) (int *fd, int *id, const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_unban_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_fromchar_parse_unban_pre[hIndex].func; - preHookFunc(&fd, &id, ip); + preHookFunc(&fd, &id, &ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3574,10 +4181,10 @@ void HP_login_fromchar_parse_unban(int fd, int id, const char *ip) { HPMHooks.source.login.fromchar_parse_unban(fd, id, ip); } if( HPMHooks.count.HP_login_fromchar_parse_unban_post ) { - void (*postHookFunc) (int *fd, int *id, const char *ip); + void (*postHookFunc) (int fd, int id, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_unban_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_unban_post[hIndex].func; - postHookFunc(&fd, &id, ip); + postHookFunc(fd, id, ip); } } return; @@ -3600,10 +4207,10 @@ void HP_login_fromchar_parse_account_online(int fd, int id) { HPMHooks.source.login.fromchar_parse_account_online(fd, id); } if( HPMHooks.count.HP_login_fromchar_parse_account_online_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_account_online_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_account_online_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -3626,10 +4233,10 @@ void HP_login_fromchar_parse_account_offline(int fd) { HPMHooks.source.login.fromchar_parse_account_offline(fd); } if( HPMHooks.count.HP_login_fromchar_parse_account_offline_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_account_offline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_account_offline_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3652,10 +4259,10 @@ void HP_login_fromchar_parse_online_accounts(int fd, int id) { HPMHooks.source.login.fromchar_parse_online_accounts(fd, id); } if( HPMHooks.count.HP_login_fromchar_parse_online_accounts_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_online_accounts_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_online_accounts_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -3678,10 +4285,10 @@ void HP_login_fromchar_parse_request_account_reg2(int fd) { HPMHooks.source.login.fromchar_parse_request_account_reg2(fd); } if( HPMHooks.count.HP_login_fromchar_parse_request_account_reg2_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_request_account_reg2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_request_account_reg2_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3704,10 +4311,10 @@ void HP_login_fromchar_parse_update_wan_ip(int fd, int id) { HPMHooks.source.login.fromchar_parse_update_wan_ip(fd, id); } if( HPMHooks.count.HP_login_fromchar_parse_update_wan_ip_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_update_wan_ip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_update_wan_ip_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -3730,10 +4337,10 @@ void HP_login_fromchar_parse_all_offline(int fd, int id) { HPMHooks.source.login.fromchar_parse_all_offline(fd, id); } if( HPMHooks.count.HP_login_fromchar_parse_all_offline_post ) { - void (*postHookFunc) (int *fd, int *id); + void (*postHookFunc) (int fd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_all_offline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_all_offline_post[hIndex].func; - postHookFunc(&fd, &id); + postHookFunc(fd, id); } } return; @@ -3756,10 +4363,10 @@ void HP_login_fromchar_parse_change_pincode(int fd) { HPMHooks.source.login.fromchar_parse_change_pincode(fd); } if( HPMHooks.count.HP_login_fromchar_parse_change_pincode_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_change_pincode_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_change_pincode_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3783,10 +4390,10 @@ bool HP_login_fromchar_parse_wrong_pincode(int fd) { retVal___ = HPMHooks.source.login.fromchar_parse_wrong_pincode(fd); } if( HPMHooks.count.HP_login_fromchar_parse_wrong_pincode_post ) { - bool (*postHookFunc) (bool retVal___, int *fd); + bool (*postHookFunc) (bool retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_wrong_pincode_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_wrong_pincode_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -3809,10 +4416,10 @@ void HP_login_fromchar_parse_accinfo(int fd) { HPMHooks.source.login.fromchar_parse_accinfo(fd); } if( HPMHooks.count.HP_login_fromchar_parse_accinfo_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_fromchar_parse_accinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_fromchar_parse_accinfo_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -3836,48 +4443,22 @@ int HP_login_parse_fromchar(int fd) { retVal___ = HPMHooks.source.login.parse_fromchar(fd); } if( HPMHooks.count.HP_login_parse_fromchar_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_fromchar_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_parse_fromchar_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; } -void HP_login_connection_problem(int fd, uint8 status) { - int hIndex = 0; - if( HPMHooks.count.HP_login_connection_problem_pre ) { - void (*preHookFunc) (int *fd, uint8 *status); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_connection_problem_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_login_connection_problem_pre[hIndex].func; - preHookFunc(&fd, &status); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.login.connection_problem(fd, status); - } - if( HPMHooks.count.HP_login_connection_problem_post ) { - void (*postHookFunc) (int *fd, uint8 *status); - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_connection_problem_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_login_connection_problem_post[hIndex].func; - postHookFunc(&fd, &status); - } - } - return; -} void HP_login_kick(struct login_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_login_kick_pre ) { - void (*preHookFunc) (struct login_session_data *sd); + void (*preHookFunc) (struct login_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_kick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_kick_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3899,11 +4480,11 @@ void HP_login_kick(struct login_session_data *sd) { void HP_login_auth_ok(struct login_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_login_auth_ok_pre ) { - void (*preHookFunc) (struct login_session_data *sd); + void (*preHookFunc) (struct login_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_auth_ok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_auth_ok_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3925,11 +4506,11 @@ void HP_login_auth_ok(struct login_session_data *sd) { void HP_login_auth_failed(struct login_session_data *sd, int result) { int hIndex = 0; if( HPMHooks.count.HP_login_auth_failed_pre ) { - void (*preHookFunc) (struct login_session_data *sd, int *result); + void (*preHookFunc) (struct login_session_data **sd, int *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_auth_failed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_auth_failed_pre[hIndex].func; - preHookFunc(sd, &result); + preHookFunc(&sd, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3940,101 +4521,23 @@ void HP_login_auth_failed(struct login_session_data *sd, int result) { HPMHooks.source.login.auth_failed(sd, result); } if( HPMHooks.count.HP_login_auth_failed_post ) { - void (*postHookFunc) (struct login_session_data *sd, int *result); + void (*postHookFunc) (struct login_session_data *sd, int result); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_auth_failed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_auth_failed_post[hIndex].func; - postHookFunc(sd, &result); + postHookFunc(sd, result); } } return; } -void HP_login_login_error(int fd, uint8 status) { - int hIndex = 0; - if( HPMHooks.count.HP_login_login_error_pre ) { - void (*preHookFunc) (int *fd, uint8 *status); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_login_error_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_login_login_error_pre[hIndex].func; - preHookFunc(&fd, &status); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.login.login_error(fd, status); - } - if( HPMHooks.count.HP_login_login_error_post ) { - void (*postHookFunc) (int *fd, uint8 *status); - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_login_error_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_login_login_error_post[hIndex].func; - postHookFunc(&fd, &status); - } - } - return; -} -void HP_login_parse_ping(int fd, struct login_session_data *sd) { - int hIndex = 0; - if( HPMHooks.count.HP_login_parse_ping_pre ) { - void (*preHookFunc) (int *fd, struct login_session_data *sd); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_ping_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_login_parse_ping_pre[hIndex].func; - preHookFunc(&fd, sd); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.login.parse_ping(fd, sd); - } - if( HPMHooks.count.HP_login_parse_ping_post ) { - void (*postHookFunc) (int *fd, struct login_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_ping_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_login_parse_ping_post[hIndex].func; - postHookFunc(&fd, sd); - } - } - return; -} -void HP_login_parse_client_md5(int fd, struct login_session_data *sd) { - int hIndex = 0; - if( HPMHooks.count.HP_login_parse_client_md5_pre ) { - void (*preHookFunc) (int *fd, struct login_session_data *sd); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_client_md5_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_login_parse_client_md5_pre[hIndex].func; - preHookFunc(&fd, sd); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.login.parse_client_md5(fd, sd); - } - if( HPMHooks.count.HP_login_parse_client_md5_post ) { - void (*postHookFunc) (int *fd, struct login_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_client_md5_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_login_parse_client_md5_post[hIndex].func; - postHookFunc(&fd, sd); - } - } - return; -} -bool HP_login_parse_client_login(int fd, struct login_session_data *sd, const char *ip) { +bool HP_login_client_login(int fd, struct login_session_data *sd) { int hIndex = 0; bool retVal___ = false; - if( HPMHooks.count.HP_login_parse_client_login_pre ) { - bool (*preHookFunc) (int *fd, struct login_session_data *sd, const char *ip); + if( HPMHooks.count.HP_login_client_login_pre ) { + bool (*preHookFunc) (int *fd, struct login_session_data **sd); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_client_login_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_login_parse_client_login_pre[hIndex].func; - retVal___ = preHookFunc(&fd, sd, ip); + for(hIndex = 0; hIndex < HPMHooks.count.HP_login_client_login_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_login_client_login_pre[hIndex].func; + retVal___ = preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4042,77 +4545,25 @@ bool HP_login_parse_client_login(int fd, struct login_session_data *sd, const ch } } { - retVal___ = HPMHooks.source.login.parse_client_login(fd, sd, ip); + retVal___ = HPMHooks.source.login.client_login(fd, sd); } - if( HPMHooks.count.HP_login_parse_client_login_post ) { - bool (*postHookFunc) (bool retVal___, int *fd, struct login_session_data *sd, const char *ip); - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_client_login_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_login_parse_client_login_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, sd, ip); + if( HPMHooks.count.HP_login_client_login_post ) { + bool (*postHookFunc) (bool retVal___, int fd, struct login_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_login_client_login_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_login_client_login_post[hIndex].func; + retVal___ = postHookFunc(retVal___, fd, sd); } } return retVal___; } -void HP_login_send_coding_key(int fd, struct login_session_data *sd) { - int hIndex = 0; - if( HPMHooks.count.HP_login_send_coding_key_pre ) { - void (*preHookFunc) (int *fd, struct login_session_data *sd); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_send_coding_key_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_login_send_coding_key_pre[hIndex].func; - preHookFunc(&fd, sd); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.login.send_coding_key(fd, sd); - } - if( HPMHooks.count.HP_login_send_coding_key_post ) { - void (*postHookFunc) (int *fd, struct login_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_send_coding_key_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_login_send_coding_key_post[hIndex].func; - postHookFunc(&fd, sd); - } - } - return; -} -void HP_login_parse_request_coding_key(int fd, struct login_session_data *sd) { - int hIndex = 0; - if( HPMHooks.count.HP_login_parse_request_coding_key_pre ) { - void (*preHookFunc) (int *fd, struct login_session_data *sd); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_request_coding_key_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_login_parse_request_coding_key_pre[hIndex].func; - preHookFunc(&fd, sd); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.login.parse_request_coding_key(fd, sd); - } - if( HPMHooks.count.HP_login_parse_request_coding_key_post ) { - void (*postHookFunc) (int *fd, struct login_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_request_coding_key_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_login_parse_request_coding_key_post[hIndex].func; - postHookFunc(&fd, sd); - } - } - return; -} void HP_login_char_server_connection_status(int fd, struct login_session_data *sd, uint8 status) { int hIndex = 0; if( HPMHooks.count.HP_login_char_server_connection_status_pre ) { - void (*preHookFunc) (int *fd, struct login_session_data *sd, uint8 *status); + void (*preHookFunc) (int *fd, struct login_session_data **sd, uint8 *status); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_char_server_connection_status_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_char_server_connection_status_pre[hIndex].func; - preHookFunc(&fd, sd, &status); + preHookFunc(&fd, &sd, &status); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4123,10 +4574,10 @@ void HP_login_char_server_connection_status(int fd, struct login_session_data *s HPMHooks.source.login.char_server_connection_status(fd, sd, status); } if( HPMHooks.count.HP_login_char_server_connection_status_post ) { - void (*postHookFunc) (int *fd, struct login_session_data *sd, uint8 *status); + void (*postHookFunc) (int fd, struct login_session_data *sd, uint8 status); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_char_server_connection_status_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_char_server_connection_status_post[hIndex].func; - postHookFunc(&fd, sd, &status); + postHookFunc(fd, sd, status); } } return; @@ -4134,11 +4585,11 @@ void HP_login_char_server_connection_status(int fd, struct login_session_data *s void HP_login_parse_request_connection(int fd, struct login_session_data *sd, const char *ip, uint32 ipl) { int hIndex = 0; if( HPMHooks.count.HP_login_parse_request_connection_pre ) { - void (*preHookFunc) (int *fd, struct login_session_data *sd, const char *ip, uint32 *ipl); + void (*preHookFunc) (int *fd, struct login_session_data **sd, const char **ip, uint32 *ipl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_request_connection_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_parse_request_connection_pre[hIndex].func; - preHookFunc(&fd, sd, ip, &ipl); + preHookFunc(&fd, &sd, &ip, &ipl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4149,41 +4600,14 @@ void HP_login_parse_request_connection(int fd, struct login_session_data *sd, co HPMHooks.source.login.parse_request_connection(fd, sd, ip, ipl); } if( HPMHooks.count.HP_login_parse_request_connection_post ) { - void (*postHookFunc) (int *fd, struct login_session_data *sd, const char *ip, uint32 *ipl); + void (*postHookFunc) (int fd, struct login_session_data *sd, const char *ip, uint32 ipl); for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_request_connection_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_login_parse_request_connection_post[hIndex].func; - postHookFunc(&fd, sd, ip, &ipl); + postHookFunc(fd, sd, ip, ipl); } } return; } -int HP_login_parse_login(int fd) { - int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_login_parse_login_pre ) { - int (*preHookFunc) (int *fd); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_login_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_login_parse_login_pre[hIndex].func; - retVal___ = preHookFunc(&fd); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.login.parse_login(fd); - } - if( HPMHooks.count.HP_login_parse_login_post ) { - int (*postHookFunc) (int retVal___, int *fd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_login_parse_login_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_login_parse_login_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); - } - } - return retVal___; -} void HP_login_config_set_defaults(void) { int hIndex = 0; if( HPMHooks.count.HP_login_config_set_defaults_pre ) { @@ -4214,11 +4638,11 @@ int HP_login_config_read(const char *cfgName) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_login_config_read_pre ) { - int (*preHookFunc) (const char *cfgName); + int (*preHookFunc) (const char **cfgName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_login_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_login_config_read_pre[hIndex].func; - retVal___ = preHookFunc(cfgName); + retVal___ = preHookFunc(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4237,7 +4661,7 @@ int HP_login_config_read(const char *cfgName) { } return retVal___; } -/* iMalloc */ +/* malloc_interface */ void HP_iMalloc_init(void) { int hIndex = 0; if( HPMHooks.count.HP_iMalloc_init_pre ) { @@ -4294,11 +4718,11 @@ void* HP_iMalloc_malloc(size_t size, const char *file, int line, const char *fun int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_malloc_pre ) { - void* (*preHookFunc) (size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_malloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_malloc_pre[hIndex].func; - retVal___ = preHookFunc(&size, file, &line, func); + retVal___ = preHookFunc(&size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4309,10 +4733,10 @@ void* HP_iMalloc_malloc(size_t size, const char *file, int line, const char *fun retVal___ = HPMHooks.source.iMalloc.malloc(size, file, line, func); } if( HPMHooks.count.HP_iMalloc_malloc_post ) { - void* (*postHookFunc) (void* retVal___, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_malloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_malloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, size, file, line, func); } } return retVal___; @@ -4321,11 +4745,11 @@ void* HP_iMalloc_calloc(size_t num, size_t size, const char *file, int line, con int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_calloc_pre ) { - void* (*preHookFunc) (size_t *num, size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (size_t *num, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_calloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_calloc_pre[hIndex].func; - retVal___ = preHookFunc(&num, &size, file, &line, func); + retVal___ = preHookFunc(&num, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4336,10 +4760,10 @@ void* HP_iMalloc_calloc(size_t num, size_t size, const char *file, int line, con retVal___ = HPMHooks.source.iMalloc.calloc(num, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_calloc_post ) { - void* (*postHookFunc) (void* retVal___, size_t *num, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, size_t num, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_calloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_calloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &num, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, num, size, file, line, func); } } return retVal___; @@ -4348,11 +4772,11 @@ void* HP_iMalloc_realloc(void *p, size_t size, const char *file, int line, const int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_realloc_pre ) { - void* (*preHookFunc) (void *p, size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (void **p, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_realloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_realloc_pre[hIndex].func; - retVal___ = preHookFunc(p, &size, file, &line, func); + retVal___ = preHookFunc(&p, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4363,10 +4787,10 @@ void* HP_iMalloc_realloc(void *p, size_t size, const char *file, int line, const retVal___ = HPMHooks.source.iMalloc.realloc(p, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_realloc_post ) { - void* (*postHookFunc) (void* retVal___, void *p, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, void *p, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_realloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_realloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, p, size, file, line, func); } } return retVal___; @@ -4375,11 +4799,11 @@ void* HP_iMalloc_reallocz(void *p, size_t size, const char *file, int line, cons int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_reallocz_pre ) { - void* (*preHookFunc) (void *p, size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (void **p, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_reallocz_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_reallocz_pre[hIndex].func; - retVal___ = preHookFunc(p, &size, file, &line, func); + retVal___ = preHookFunc(&p, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4390,10 +4814,10 @@ void* HP_iMalloc_reallocz(void *p, size_t size, const char *file, int line, cons retVal___ = HPMHooks.source.iMalloc.reallocz(p, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_reallocz_post ) { - void* (*postHookFunc) (void* retVal___, void *p, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, void *p, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_reallocz_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_reallocz_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, p, size, file, line, func); } } return retVal___; @@ -4402,11 +4826,11 @@ char* HP_iMalloc_astrdup(const char *p, const char *file, int line, const char * int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_astrdup_pre ) { - char* (*preHookFunc) (const char *p, const char *file, int *line, const char *func); + char* (*preHookFunc) (const char **p, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrdup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_astrdup_pre[hIndex].func; - retVal___ = preHookFunc(p, file, &line, func); + retVal___ = preHookFunc(&p, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4417,10 +4841,10 @@ char* HP_iMalloc_astrdup(const char *p, const char *file, int line, const char * retVal___ = HPMHooks.source.iMalloc.astrdup(p, file, line, func); } if( HPMHooks.count.HP_iMalloc_astrdup_post ) { - char* (*postHookFunc) (char* retVal___, const char *p, const char *file, int *line, const char *func); + char* (*postHookFunc) (char* retVal___, const char *p, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrdup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_astrdup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, file, &line, func); + retVal___ = postHookFunc(retVal___, p, file, line, func); } } return retVal___; @@ -4429,11 +4853,11 @@ char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_astrndup_pre ) { - char* (*preHookFunc) (const char *p, size_t *size, const char *file, int *line, const char *func); + char* (*preHookFunc) (const char **p, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_astrndup_pre[hIndex].func; - retVal___ = preHookFunc(p, &size, file, &line, func); + retVal___ = preHookFunc(&p, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4444,10 +4868,10 @@ char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line retVal___ = HPMHooks.source.iMalloc.astrndup(p, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_astrndup_post ) { - char* (*postHookFunc) (char* retVal___, const char *p, size_t *size, const char *file, int *line, const char *func); + char* (*postHookFunc) (char* retVal___, const char *p, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_astrndup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, p, size, file, line, func); } } return retVal___; @@ -4455,11 +4879,11 @@ char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line void HP_iMalloc_free(void *p, const char *file, int line, const char *func) { int hIndex = 0; if( HPMHooks.count.HP_iMalloc_free_pre ) { - void (*preHookFunc) (void *p, const char *file, int *line, const char *func); + void (*preHookFunc) (void **p, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_free_pre[hIndex].func; - preHookFunc(p, file, &line, func); + preHookFunc(&p, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4470,10 +4894,10 @@ void HP_iMalloc_free(void *p, const char *file, int line, const char *func) { HPMHooks.source.iMalloc.free(p, file, line, func); } if( HPMHooks.count.HP_iMalloc_free_post ) { - void (*postHookFunc) (void *p, const char *file, int *line, const char *func); + void (*postHookFunc) (void *p, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_free_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_free_post[hIndex].func; - postHookFunc(p, file, &line, func); + postHookFunc(p, file, line, func); } } return; @@ -4508,11 +4932,11 @@ bool HP_iMalloc_verify_ptr(void *ptr) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_iMalloc_verify_ptr_pre ) { - bool (*preHookFunc) (void *ptr); + bool (*preHookFunc) (void **ptr); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_verify_ptr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_verify_ptr_pre[hIndex].func; - retVal___ = preHookFunc(ptr); + retVal___ = preHookFunc(&ptr); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4610,15 +5034,15 @@ void HP_iMalloc_init_messages(void) { } return; } -/* nullpo */ +/* nullpo_interface */ void HP_nullpo_assert_report(const char *file, int line, const char *func, const char *targetname, const char *title) { int hIndex = 0; if( HPMHooks.count.HP_nullpo_assert_report_pre ) { - void (*preHookFunc) (const char *file, int *line, const char *func, const char *targetname, const char *title); + void (*preHookFunc) (const char **file, int *line, const char **func, const char **targetname, const char **title); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_assert_report_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_nullpo_assert_report_pre[hIndex].func; - preHookFunc(file, &line, func, targetname, title); + preHookFunc(&file, &line, &func, &targetname, &title); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4629,15 +5053,15 @@ void HP_nullpo_assert_report(const char *file, int line, const char *func, const HPMHooks.source.nullpo.assert_report(file, line, func, targetname, title); } if( HPMHooks.count.HP_nullpo_assert_report_post ) { - void (*postHookFunc) (const char *file, int *line, const char *func, const char *targetname, const char *title); + void (*postHookFunc) (const char *file, int line, const char *func, const char *targetname, const char *title); for(hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_assert_report_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_nullpo_assert_report_post[hIndex].func; - postHookFunc(file, &line, func, targetname, title); + postHookFunc(file, line, func, targetname, title); } } return; } -/* showmsg */ +/* showmsg_interface */ void HP_showmsg_init(void) { int hIndex = 0; if( HPMHooks.count.HP_showmsg_init_pre ) { @@ -4720,12 +5144,12 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_showmsg_showMessageV_pre ) { - int (*preHookFunc) (const char *string, va_list ap); + int (*preHookFunc) (const char **string, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_showMessageV_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_showmsg_showMessageV_pre[hIndex].func; - retVal___ = preHookFunc(string, ap___copy); + retVal___ = preHookFunc(&string, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -4749,7 +5173,7 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { } return retVal___; } -/* sockt */ +/* socket_interface */ void HP_sockt_init(void) { int hIndex = 0; if( HPMHooks.count.HP_sockt_init_pre ) { @@ -4821,10 +5245,10 @@ int HP_sockt_perform(int next) { retVal___ = HPMHooks.source.sockt.perform(next); } if( HPMHooks.count.HP_sockt_perform_post ) { - int (*postHookFunc) (int retVal___, int *next); + int (*postHookFunc) (int retVal___, int next); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_perform_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_perform_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &next); + retVal___ = postHookFunc(retVal___, next); } } return retVal___; @@ -4847,10 +5271,10 @@ void HP_sockt_datasync(int fd, bool send) { HPMHooks.source.sockt.datasync(fd, send); } if( HPMHooks.count.HP_sockt_datasync_post ) { - void (*postHookFunc) (int *fd, bool *send); + void (*postHookFunc) (int fd, bool send); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_datasync_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_datasync_post[hIndex].func; - postHookFunc(&fd, &send); + postHookFunc(fd, send); } } return; @@ -4874,10 +5298,10 @@ int HP_sockt_make_listen_bind(uint32 ip, uint16 port) { retVal___ = HPMHooks.source.sockt.make_listen_bind(ip, port); } if( HPMHooks.count.HP_sockt_make_listen_bind_post ) { - int (*postHookFunc) (int retVal___, uint32 *ip, uint16 *port); + int (*postHookFunc) (int retVal___, uint32 ip, uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_make_listen_bind_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_make_listen_bind_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, &port); + retVal___ = postHookFunc(retVal___, ip, port); } } return retVal___; @@ -4886,11 +5310,11 @@ int HP_sockt_make_connection(uint32 ip, uint16 port, struct hSockOpt *opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_make_connection_pre ) { - int (*preHookFunc) (uint32 *ip, uint16 *port, struct hSockOpt *opt); + int (*preHookFunc) (uint32 *ip, uint16 *port, struct hSockOpt **opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_make_connection_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_make_connection_pre[hIndex].func; - retVal___ = preHookFunc(&ip, &port, opt); + retVal___ = preHookFunc(&ip, &port, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4901,10 +5325,10 @@ int HP_sockt_make_connection(uint32 ip, uint16 port, struct hSockOpt *opt) { retVal___ = HPMHooks.source.sockt.make_connection(ip, port, opt); } if( HPMHooks.count.HP_sockt_make_connection_post ) { - int (*postHookFunc) (int retVal___, uint32 *ip, uint16 *port, struct hSockOpt *opt); + int (*postHookFunc) (int retVal___, uint32 ip, uint16 port, struct hSockOpt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_make_connection_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_make_connection_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, &port, opt); + retVal___ = postHookFunc(retVal___, ip, port, opt); } } return retVal___; @@ -4928,10 +5352,10 @@ int HP_sockt_realloc_fifo(int fd, unsigned int rfifo_size, unsigned int wfifo_si retVal___ = HPMHooks.source.sockt.realloc_fifo(fd, rfifo_size, wfifo_size); } if( HPMHooks.count.HP_sockt_realloc_fifo_post ) { - int (*postHookFunc) (int retVal___, int *fd, unsigned int *rfifo_size, unsigned int *wfifo_size); + int (*postHookFunc) (int retVal___, int fd, unsigned int rfifo_size, unsigned int wfifo_size); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_realloc_fifo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_realloc_fifo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &rfifo_size, &wfifo_size); + retVal___ = postHookFunc(retVal___, fd, rfifo_size, wfifo_size); } } return retVal___; @@ -4955,10 +5379,10 @@ int HP_sockt_realloc_writefifo(int fd, size_t addition) { retVal___ = HPMHooks.source.sockt.realloc_writefifo(fd, addition); } if( HPMHooks.count.HP_sockt_realloc_writefifo_post ) { - int (*postHookFunc) (int retVal___, int *fd, size_t *addition); + int (*postHookFunc) (int retVal___, int fd, size_t addition); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_realloc_writefifo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_realloc_writefifo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &addition); + retVal___ = postHookFunc(retVal___, fd, addition); } } return retVal___; @@ -4982,10 +5406,10 @@ int HP_sockt_wfifoset(int fd, size_t len) { retVal___ = HPMHooks.source.sockt.wfifoset(fd, len); } if( HPMHooks.count.HP_sockt_wfifoset_post ) { - int (*postHookFunc) (int retVal___, int *fd, size_t *len); + int (*postHookFunc) (int retVal___, int fd, size_t len); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_wfifoset_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_wfifoset_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &len); + retVal___ = postHookFunc(retVal___, fd, len); } } return retVal___; @@ -5009,10 +5433,10 @@ int HP_sockt_rfifoskip(int fd, size_t len) { retVal___ = HPMHooks.source.sockt.rfifoskip(fd, len); } if( HPMHooks.count.HP_sockt_rfifoskip_post ) { - int (*postHookFunc) (int retVal___, int *fd, size_t *len); + int (*postHookFunc) (int retVal___, int fd, size_t len); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_rfifoskip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_rfifoskip_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &len); + retVal___ = postHookFunc(retVal___, fd, len); } } return retVal___; @@ -5035,10 +5459,10 @@ void HP_sockt_close(int fd) { HPMHooks.source.sockt.close(fd); } if( HPMHooks.count.HP_sockt_close_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_close_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_close_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5062,10 +5486,10 @@ bool HP_sockt_session_is_valid(int fd) { retVal___ = HPMHooks.source.sockt.session_is_valid(fd); } if( HPMHooks.count.HP_sockt_session_is_valid_post ) { - bool (*postHookFunc) (bool retVal___, int *fd); + bool (*postHookFunc) (bool retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_session_is_valid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_session_is_valid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -5089,10 +5513,10 @@ bool HP_sockt_session_is_active(int fd) { retVal___ = HPMHooks.source.sockt.session_is_active(fd); } if( HPMHooks.count.HP_sockt_session_is_active_post ) { - bool (*postHookFunc) (bool retVal___, int *fd); + bool (*postHookFunc) (bool retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_session_is_active_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_session_is_active_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -5115,10 +5539,10 @@ void HP_sockt_flush(int fd) { HPMHooks.source.sockt.flush(fd); } if( HPMHooks.count.HP_sockt_flush_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_flush_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_flush_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5167,10 +5591,10 @@ void HP_sockt_set_nonblocking(int fd, unsigned long yes) { HPMHooks.source.sockt.set_nonblocking(fd, yes); } if( HPMHooks.count.HP_sockt_set_nonblocking_post ) { - void (*postHookFunc) (int *fd, unsigned long *yes); + void (*postHookFunc) (int fd, unsigned long yes); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_set_nonblocking_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_set_nonblocking_post[hIndex].func; - postHookFunc(&fd, &yes); + postHookFunc(fd, yes); } } return; @@ -5193,10 +5617,10 @@ void HP_sockt_set_defaultparse(ParseFunc defaultparse) { HPMHooks.source.sockt.set_defaultparse(defaultparse); } if( HPMHooks.count.HP_sockt_set_defaultparse_post ) { - void (*postHookFunc) (ParseFunc *defaultparse); + void (*postHookFunc) (ParseFunc defaultparse); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_set_defaultparse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_set_defaultparse_post[hIndex].func; - postHookFunc(&defaultparse); + postHookFunc(defaultparse); } } return; @@ -5205,11 +5629,11 @@ uint32 HP_sockt_host2ip(const char *hostname) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_sockt_host2ip_pre ) { - uint32 (*preHookFunc) (const char *hostname); + uint32 (*preHookFunc) (const char **hostname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_host2ip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_host2ip_pre[hIndex].func; - retVal___ = preHookFunc(hostname); + retVal___ = preHookFunc(&hostname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5232,11 +5656,11 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_sockt_ip2str_pre ) { - const char* (*preHookFunc) (uint32 *ip, char *ip_str); + const char* (*preHookFunc) (uint32 *ip, char **ip_str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_ip2str_pre[hIndex].func; - retVal___ = preHookFunc(&ip, ip_str); + retVal___ = preHookFunc(&ip, &ip_str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5247,10 +5671,10 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { retVal___ = HPMHooks.source.sockt.ip2str(ip, ip_str); } if( HPMHooks.count.HP_sockt_ip2str_post ) { - const char* (*postHookFunc) (const char* retVal___, uint32 *ip, char *ip_str); + const char* (*postHookFunc) (const char* retVal___, uint32 ip, char *ip_str); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_ip2str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, ip_str); + retVal___ = postHookFunc(retVal___, ip, ip_str); } } return retVal___; @@ -5259,11 +5683,11 @@ uint32 HP_sockt_str2ip(const char *ip_str) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_sockt_str2ip_pre ) { - uint32 (*preHookFunc) (const char *ip_str); + uint32 (*preHookFunc) (const char **ip_str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_str2ip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_str2ip_pre[hIndex].func; - retVal___ = preHookFunc(ip_str); + retVal___ = preHookFunc(&ip_str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5301,10 +5725,10 @@ uint16 HP_sockt_ntows(uint16 netshort) { retVal___ = HPMHooks.source.sockt.ntows(netshort); } if( HPMHooks.count.HP_sockt_ntows_post ) { - uint16 (*postHookFunc) (uint16 retVal___, uint16 *netshort); + uint16 (*postHookFunc) (uint16 retVal___, uint16 netshort); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ntows_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_ntows_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &netshort); + retVal___ = postHookFunc(retVal___, netshort); } } return retVal___; @@ -5313,11 +5737,11 @@ int HP_sockt_getips(uint32 *ips, int max) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_getips_pre ) { - int (*preHookFunc) (uint32 *ips, int *max); + int (*preHookFunc) (uint32 **ips, int *max); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_getips_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_getips_pre[hIndex].func; - retVal___ = preHookFunc(ips, &max); + retVal___ = preHookFunc(&ips, &max); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5328,10 +5752,10 @@ int HP_sockt_getips(uint32 *ips, int max) { retVal___ = HPMHooks.source.sockt.getips(ips, max); } if( HPMHooks.count.HP_sockt_getips_post ) { - int (*postHookFunc) (int retVal___, uint32 *ips, int *max); + int (*postHookFunc) (int retVal___, uint32 *ips, int max); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_getips_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_getips_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ips, &max); + retVal___ = postHookFunc(retVal___, ips, max); } } return retVal___; @@ -5354,10 +5778,10 @@ void HP_sockt_eof(int fd) { HPMHooks.source.sockt.eof(fd); } if( HPMHooks.count.HP_sockt_eof_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_eof_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_eof_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5366,11 +5790,11 @@ uint32 HP_sockt_lan_subnet_check(uint32 ip, struct s_subnet *info) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_sockt_lan_subnet_check_pre ) { - uint32 (*preHookFunc) (uint32 *ip, struct s_subnet *info); + uint32 (*preHookFunc) (uint32 *ip, struct s_subnet **info); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_lan_subnet_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_lan_subnet_check_pre[hIndex].func; - retVal___ = preHookFunc(&ip, info); + retVal___ = preHookFunc(&ip, &info); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5381,10 +5805,10 @@ uint32 HP_sockt_lan_subnet_check(uint32 ip, struct s_subnet *info) { retVal___ = HPMHooks.source.sockt.lan_subnet_check(ip, info); } if( HPMHooks.count.HP_sockt_lan_subnet_check_post ) { - uint32 (*postHookFunc) (uint32 retVal___, uint32 *ip, struct s_subnet *info); + uint32 (*postHookFunc) (uint32 retVal___, uint32 ip, struct s_subnet *info); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_lan_subnet_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_lan_subnet_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, info); + retVal___ = postHookFunc(retVal___, ip, info); } } return retVal___; @@ -5408,10 +5832,10 @@ bool HP_sockt_allowed_ip_check(uint32 ip) { retVal___ = HPMHooks.source.sockt.allowed_ip_check(ip); } if( HPMHooks.count.HP_sockt_allowed_ip_check_post ) { - bool (*postHookFunc) (bool retVal___, uint32 *ip); + bool (*postHookFunc) (bool retVal___, uint32 ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_allowed_ip_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_allowed_ip_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip); + retVal___ = postHookFunc(retVal___, ip); } } return retVal___; @@ -5435,10 +5859,10 @@ bool HP_sockt_trusted_ip_check(uint32 ip) { retVal___ = HPMHooks.source.sockt.trusted_ip_check(ip); } if( HPMHooks.count.HP_sockt_trusted_ip_check_post ) { - bool (*postHookFunc) (bool retVal___, uint32 *ip); + bool (*postHookFunc) (bool retVal___, uint32 ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_trusted_ip_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_trusted_ip_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip); + retVal___ = postHookFunc(retVal___, ip); } } return retVal___; @@ -5447,11 +5871,11 @@ int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vec int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) { - int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*preHookFunc) (struct config_setting_t **t, struct s_subnet_vector **list, const char **filename, const char **groupname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func; - retVal___ = preHookFunc(t, list, filename, groupname); + retVal___ = preHookFunc(&t, &list, &filename, &groupname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5473,11 +5897,11 @@ int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vec void HP_sockt_net_config_read(const char *filename) { int hIndex = 0; if( HPMHooks.count.HP_sockt_net_config_read_pre ) { - void (*preHookFunc) (const char *filename); + void (*preHookFunc) (const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_net_config_read_pre[hIndex].func; - preHookFunc(filename); + preHookFunc(&filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5496,16 +5920,16 @@ void HP_sockt_net_config_read(const char *filename) { } return; } -/* SQL */ -int HP_SQL_Connect(Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db) { +/* sql_interface */ +int HP_SQL_Connect(struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_Connect_pre ) { - int (*preHookFunc) (Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db); + int (*preHookFunc) (struct Sql **self, const char **user, const char **passwd, const char **host, uint16 *port, const char **db); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Connect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_Connect_pre[hIndex].func; - retVal___ = preHookFunc(self, user, passwd, host, &port, db); + retVal___ = preHookFunc(&self, &user, &passwd, &host, &port, &db); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5516,23 +5940,23 @@ int HP_SQL_Connect(Sql *self, const char *user, const char *passwd, const char * retVal___ = HPMHooks.source.SQL.Connect(self, user, passwd, host, port, db); } if( HPMHooks.count.HP_SQL_Connect_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Connect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_Connect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, user, passwd, host, &port, db); + retVal___ = postHookFunc(retVal___, self, user, passwd, host, port, db); } } return retVal___; } -int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) { +int HP_SQL_GetTimeout(struct Sql *self, uint32 *out_timeout) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_GetTimeout_pre ) { - int (*preHookFunc) (Sql *self, uint32 *out_timeout); + int (*preHookFunc) (struct Sql **self, uint32 **out_timeout); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetTimeout_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_GetTimeout_pre[hIndex].func; - retVal___ = preHookFunc(self, out_timeout); + retVal___ = preHookFunc(&self, &out_timeout); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5543,7 +5967,7 @@ int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) { retVal___ = HPMHooks.source.SQL.GetTimeout(self, out_timeout); } if( HPMHooks.count.HP_SQL_GetTimeout_post ) { - int (*postHookFunc) (int retVal___, Sql *self, uint32 *out_timeout); + int (*postHookFunc) (int retVal___, struct Sql *self, uint32 *out_timeout); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetTimeout_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_GetTimeout_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, out_timeout); @@ -5551,15 +5975,15 @@ int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) { } return retVal___; } -int HP_SQL_GetColumnNames(Sql *self, const char *table, char *out_buf, size_t buf_len, char sep) { +int HP_SQL_GetColumnNames(struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_GetColumnNames_pre ) { - int (*preHookFunc) (Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep); + int (*preHookFunc) (struct Sql **self, const char **table, char **out_buf, size_t *buf_len, char *sep); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetColumnNames_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_GetColumnNames_pre[hIndex].func; - retVal___ = preHookFunc(self, table, out_buf, &buf_len, &sep); + retVal___ = preHookFunc(&self, &table, &out_buf, &buf_len, &sep); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5570,23 +5994,23 @@ int HP_SQL_GetColumnNames(Sql *self, const char *table, char *out_buf, size_t bu retVal___ = HPMHooks.source.SQL.GetColumnNames(self, table, out_buf, buf_len, sep); } if( HPMHooks.count.HP_SQL_GetColumnNames_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetColumnNames_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_GetColumnNames_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, table, out_buf, &buf_len, &sep); + retVal___ = postHookFunc(retVal___, self, table, out_buf, buf_len, sep); } } return retVal___; } -int HP_SQL_SetEncoding(Sql *self, const char *encoding) { +int HP_SQL_SetEncoding(struct Sql *self, const char *encoding) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_SetEncoding_pre ) { - int (*preHookFunc) (Sql *self, const char *encoding); + int (*preHookFunc) (struct Sql **self, const char **encoding); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_SetEncoding_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_SetEncoding_pre[hIndex].func; - retVal___ = preHookFunc(self, encoding); + retVal___ = preHookFunc(&self, &encoding); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5597,7 +6021,7 @@ int HP_SQL_SetEncoding(Sql *self, const char *encoding) { retVal___ = HPMHooks.source.SQL.SetEncoding(self, encoding); } if( HPMHooks.count.HP_SQL_SetEncoding_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *encoding); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *encoding); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_SetEncoding_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_SetEncoding_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, encoding); @@ -5605,15 +6029,15 @@ int HP_SQL_SetEncoding(Sql *self, const char *encoding) { } return retVal___; } -int HP_SQL_Ping(Sql *self) { +int HP_SQL_Ping(struct Sql *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_Ping_pre ) { - int (*preHookFunc) (Sql *self); + int (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Ping_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_Ping_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5624,7 +6048,7 @@ int HP_SQL_Ping(Sql *self) { retVal___ = HPMHooks.source.SQL.Ping(self); } if( HPMHooks.count.HP_SQL_Ping_post ) { - int (*postHookFunc) (int retVal___, Sql *self); + int (*postHookFunc) (int retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Ping_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_Ping_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -5632,15 +6056,15 @@ int HP_SQL_Ping(Sql *self) { } return retVal___; } -size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) { +size_t HP_SQL_EscapeString(struct Sql *self, char *out_to, const char *from) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_EscapeString_pre ) { - size_t (*preHookFunc) (Sql *self, char *out_to, const char *from); + size_t (*preHookFunc) (struct Sql **self, char **out_to, const char **from); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeString_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_EscapeString_pre[hIndex].func; - retVal___ = preHookFunc(self, out_to, from); + retVal___ = preHookFunc(&self, &out_to, &from); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5651,7 +6075,7 @@ size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) { retVal___ = HPMHooks.source.SQL.EscapeString(self, out_to, from); } if( HPMHooks.count.HP_SQL_EscapeString_post ) { - size_t (*postHookFunc) (size_t retVal___, Sql *self, char *out_to, const char *from); + size_t (*postHookFunc) (size_t retVal___, struct Sql *self, char *out_to, const char *from); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeString_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_EscapeString_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, out_to, from); @@ -5659,15 +6083,15 @@ size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) { } return retVal___; } -size_t HP_SQL_EscapeStringLen(Sql *self, char *out_to, const char *from, size_t from_len) { +size_t HP_SQL_EscapeStringLen(struct Sql *self, char *out_to, const char *from, size_t from_len) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_EscapeStringLen_pre ) { - size_t (*preHookFunc) (Sql *self, char *out_to, const char *from, size_t *from_len); + size_t (*preHookFunc) (struct Sql **self, char **out_to, const char **from, size_t *from_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeStringLen_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_EscapeStringLen_pre[hIndex].func; - retVal___ = preHookFunc(self, out_to, from, &from_len); + retVal___ = preHookFunc(&self, &out_to, &from, &from_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5678,24 +6102,24 @@ size_t HP_SQL_EscapeStringLen(Sql *self, char *out_to, const char *from, size_t retVal___ = HPMHooks.source.SQL.EscapeStringLen(self, out_to, from, from_len); } if( HPMHooks.count.HP_SQL_EscapeStringLen_post ) { - size_t (*postHookFunc) (size_t retVal___, Sql *self, char *out_to, const char *from, size_t *from_len); + size_t (*postHookFunc) (size_t retVal___, struct Sql *self, char *out_to, const char *from, size_t from_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeStringLen_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_EscapeStringLen_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, out_to, from, &from_len); + retVal___ = postHookFunc(retVal___, self, out_to, from, from_len); } } return retVal___; } -int HP_SQL_QueryV(Sql *self, const char *query, va_list args) { +int HP_SQL_QueryV(struct Sql *self, const char *query, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_QueryV_pre ) { - int (*preHookFunc) (Sql *self, const char *query, va_list args); + int (*preHookFunc) (struct Sql **self, const char **query, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryV_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_SQL_QueryV_pre[hIndex].func; - retVal___ = preHookFunc(self, query, args___copy); + retVal___ = preHookFunc(&self, &query, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -5709,7 +6133,7 @@ int HP_SQL_QueryV(Sql *self, const char *query, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_SQL_QueryV_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *query, va_list args); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *query, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryV_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_SQL_QueryV_post[hIndex].func; @@ -5719,15 +6143,15 @@ int HP_SQL_QueryV(Sql *self, const char *query, va_list args) { } return retVal___; } -int HP_SQL_QueryStr(Sql *self, const char *query) { +int HP_SQL_QueryStr(struct Sql *self, const char *query) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_QueryStr_pre ) { - int (*preHookFunc) (Sql *self, const char *query); + int (*preHookFunc) (struct Sql **self, const char **query); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryStr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_QueryStr_pre[hIndex].func; - retVal___ = preHookFunc(self, query); + retVal___ = preHookFunc(&self, &query); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5738,7 +6162,7 @@ int HP_SQL_QueryStr(Sql *self, const char *query) { retVal___ = HPMHooks.source.SQL.QueryStr(self, query); } if( HPMHooks.count.HP_SQL_QueryStr_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *query); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *query); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryStr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_QueryStr_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, query); @@ -5746,15 +6170,15 @@ int HP_SQL_QueryStr(Sql *self, const char *query) { } return retVal___; } -uint64 HP_SQL_LastInsertId(Sql *self) { +uint64 HP_SQL_LastInsertId(struct Sql *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_LastInsertId_pre ) { - uint64 (*preHookFunc) (Sql *self); + uint64 (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_LastInsertId_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_LastInsertId_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5765,7 +6189,7 @@ uint64 HP_SQL_LastInsertId(Sql *self) { retVal___ = HPMHooks.source.SQL.LastInsertId(self); } if( HPMHooks.count.HP_SQL_LastInsertId_post ) { - uint64 (*postHookFunc) (uint64 retVal___, Sql *self); + uint64 (*postHookFunc) (uint64 retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_LastInsertId_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_LastInsertId_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -5773,15 +6197,15 @@ uint64 HP_SQL_LastInsertId(Sql *self) { } return retVal___; } -uint32 HP_SQL_NumColumns(Sql *self) { +uint32 HP_SQL_NumColumns(struct Sql *self) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_SQL_NumColumns_pre ) { - uint32 (*preHookFunc) (Sql *self); + uint32 (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumColumns_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_NumColumns_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5792,7 +6216,7 @@ uint32 HP_SQL_NumColumns(Sql *self) { retVal___ = HPMHooks.source.SQL.NumColumns(self); } if( HPMHooks.count.HP_SQL_NumColumns_post ) { - uint32 (*postHookFunc) (uint32 retVal___, Sql *self); + uint32 (*postHookFunc) (uint32 retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumColumns_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_NumColumns_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -5800,15 +6224,15 @@ uint32 HP_SQL_NumColumns(Sql *self) { } return retVal___; } -uint64 HP_SQL_NumRows(Sql *self) { +uint64 HP_SQL_NumRows(struct Sql *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_NumRows_pre ) { - uint64 (*preHookFunc) (Sql *self); + uint64 (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumRows_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_NumRows_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5819,7 +6243,7 @@ uint64 HP_SQL_NumRows(Sql *self) { retVal___ = HPMHooks.source.SQL.NumRows(self); } if( HPMHooks.count.HP_SQL_NumRows_post ) { - uint64 (*postHookFunc) (uint64 retVal___, Sql *self); + uint64 (*postHookFunc) (uint64 retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumRows_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_NumRows_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -5827,15 +6251,15 @@ uint64 HP_SQL_NumRows(Sql *self) { } return retVal___; } -int HP_SQL_NextRow(Sql *self) { +int HP_SQL_NextRow(struct Sql *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_NextRow_pre ) { - int (*preHookFunc) (Sql *self); + int (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NextRow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_NextRow_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5846,7 +6270,7 @@ int HP_SQL_NextRow(Sql *self) { retVal___ = HPMHooks.source.SQL.NextRow(self); } if( HPMHooks.count.HP_SQL_NextRow_post ) { - int (*postHookFunc) (int retVal___, Sql *self); + int (*postHookFunc) (int retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NextRow_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_NextRow_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -5854,15 +6278,15 @@ int HP_SQL_NextRow(Sql *self) { } return retVal___; } -int HP_SQL_GetData(Sql *self, size_t col, char **out_buf, size_t *out_len) { +int HP_SQL_GetData(struct Sql *self, size_t col, char **out_buf, size_t *out_len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_GetData_pre ) { - int (*preHookFunc) (Sql *self, size_t *col, char **out_buf, size_t *out_len); + int (*preHookFunc) (struct Sql **self, size_t *col, char ***out_buf, size_t **out_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetData_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_GetData_pre[hIndex].func; - retVal___ = preHookFunc(self, &col, out_buf, out_len); + retVal___ = preHookFunc(&self, &col, &out_buf, &out_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5873,22 +6297,22 @@ int HP_SQL_GetData(Sql *self, size_t col, char **out_buf, size_t *out_len) { retVal___ = HPMHooks.source.SQL.GetData(self, col, out_buf, out_len); } if( HPMHooks.count.HP_SQL_GetData_post ) { - int (*postHookFunc) (int retVal___, Sql *self, size_t *col, char **out_buf, size_t *out_len); + int (*postHookFunc) (int retVal___, struct Sql *self, size_t col, char **out_buf, size_t *out_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetData_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_GetData_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, &col, out_buf, out_len); + retVal___ = postHookFunc(retVal___, self, col, out_buf, out_len); } } return retVal___; } -void HP_SQL_FreeResult(Sql *self) { +void HP_SQL_FreeResult(struct Sql *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_FreeResult_pre ) { - void (*preHookFunc) (Sql *self); + void (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_FreeResult_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_FreeResult_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5899,7 +6323,7 @@ void HP_SQL_FreeResult(Sql *self) { HPMHooks.source.SQL.FreeResult(self); } if( HPMHooks.count.HP_SQL_FreeResult_post ) { - void (*postHookFunc) (Sql *self); + void (*postHookFunc) (struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_FreeResult_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_FreeResult_post[hIndex].func; postHookFunc(self); @@ -5907,14 +6331,14 @@ void HP_SQL_FreeResult(Sql *self) { } return; } -void HP_SQL_ShowDebug_(Sql *self, const char *debug_file, const unsigned long debug_line) { +void HP_SQL_ShowDebug_(struct Sql *self, const char *debug_file, const unsigned long debug_line) { int hIndex = 0; if( HPMHooks.count.HP_SQL_ShowDebug__pre ) { - void (*preHookFunc) (Sql *self, const char *debug_file, const unsigned long *debug_line); + void (*preHookFunc) (struct Sql **self, const char **debug_file, const unsigned long *debug_line); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_ShowDebug__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_ShowDebug__pre[hIndex].func; - preHookFunc(self, debug_file, &debug_line); + preHookFunc(&self, &debug_file, &debug_line); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5925,22 +6349,22 @@ void HP_SQL_ShowDebug_(Sql *self, const char *debug_file, const unsigned long de HPMHooks.source.SQL.ShowDebug_(self, debug_file, debug_line); } if( HPMHooks.count.HP_SQL_ShowDebug__post ) { - void (*postHookFunc) (Sql *self, const char *debug_file, const unsigned long *debug_line); + void (*postHookFunc) (struct Sql *self, const char *debug_file, const unsigned long debug_line); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_ShowDebug__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_ShowDebug__post[hIndex].func; - postHookFunc(self, debug_file, &debug_line); + postHookFunc(self, debug_file, debug_line); } } return; } -void HP_SQL_Free(Sql *self) { +void HP_SQL_Free(struct Sql *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_Free_pre ) { - void (*preHookFunc) (Sql *self); + void (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_Free_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5951,7 +6375,7 @@ void HP_SQL_Free(Sql *self) { HPMHooks.source.SQL.Free(self); } if( HPMHooks.count.HP_SQL_Free_post ) { - void (*postHookFunc) (Sql *self); + void (*postHookFunc) (struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Free_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_Free_post[hIndex].func; postHookFunc(self); @@ -5986,15 +6410,15 @@ struct Sql* HP_SQL_Malloc(void) { } return retVal___; } -struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) { +struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { int hIndex = 0; struct SqlStmt* retVal___ = NULL; if( HPMHooks.count.HP_SQL_StmtMalloc_pre ) { - struct SqlStmt* (*preHookFunc) (Sql *sql); + struct SqlStmt* (*preHookFunc) (struct Sql **sql); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_pre[hIndex].func; - retVal___ = preHookFunc(sql); + retVal___ = preHookFunc(&sql); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6005,7 +6429,7 @@ struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) { retVal___ = HPMHooks.source.SQL.StmtMalloc(sql); } if( HPMHooks.count.HP_SQL_StmtMalloc_post ) { - struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, Sql *sql); + struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, struct Sql *sql); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, sql); @@ -6013,16 +6437,16 @@ struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) { } return retVal___; } -int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) { +int HP_SQL_StmtPrepareV(struct SqlStmt *self, const char *query, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtPrepareV_pre ) { - int (*preHookFunc) (SqlStmt *self, const char *query, va_list args); + int (*preHookFunc) (struct SqlStmt **self, const char **query, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareV_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_SQL_StmtPrepareV_pre[hIndex].func; - retVal___ = preHookFunc(self, query, args___copy); + retVal___ = preHookFunc(&self, &query, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -6036,7 +6460,7 @@ int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_SQL_StmtPrepareV_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, const char *query, va_list args); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, const char *query, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareV_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_SQL_StmtPrepareV_post[hIndex].func; @@ -6046,15 +6470,15 @@ int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) { } return retVal___; } -int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) { +int HP_SQL_StmtPrepareStr(struct SqlStmt *self, const char *query) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtPrepareStr_pre ) { - int (*preHookFunc) (SqlStmt *self, const char *query); + int (*preHookFunc) (struct SqlStmt **self, const char **query); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareStr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtPrepareStr_pre[hIndex].func; - retVal___ = preHookFunc(self, query); + retVal___ = preHookFunc(&self, &query); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6065,7 +6489,7 @@ int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) { retVal___ = HPMHooks.source.SQL.StmtPrepareStr(self, query); } if( HPMHooks.count.HP_SQL_StmtPrepareStr_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, const char *query); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, const char *query); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareStr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtPrepareStr_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, query); @@ -6073,15 +6497,15 @@ int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) { } return retVal___; } -size_t HP_SQL_StmtNumParams(SqlStmt *self) { +size_t HP_SQL_StmtNumParams(struct SqlStmt *self) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNumParams_pre ) { - size_t (*preHookFunc) (SqlStmt *self); + size_t (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumParams_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNumParams_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6092,7 +6516,7 @@ size_t HP_SQL_StmtNumParams(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNumParams(self); } if( HPMHooks.count.HP_SQL_StmtNumParams_post ) { - size_t (*postHookFunc) (size_t retVal___, SqlStmt *self); + size_t (*postHookFunc) (size_t retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumParams_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNumParams_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -6100,15 +6524,15 @@ size_t HP_SQL_StmtNumParams(SqlStmt *self) { } return retVal___; } -int HP_SQL_StmtBindParam(SqlStmt *self, size_t idx, SqlDataType buffer_type, void *buffer, size_t buffer_len) { +int HP_SQL_StmtBindParam(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtBindParam_pre ) { - int (*preHookFunc) (SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len); + int (*preHookFunc) (struct SqlStmt **self, size_t *idx, enum SqlDataType *buffer_type, const void **buffer, size_t *buffer_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindParam_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtBindParam_pre[hIndex].func; - retVal___ = preHookFunc(self, &idx, &buffer_type, buffer, &buffer_len); + retVal___ = preHookFunc(&self, &idx, &buffer_type, &buffer, &buffer_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6119,23 +6543,23 @@ int HP_SQL_StmtBindParam(SqlStmt *self, size_t idx, SqlDataType buffer_type, voi retVal___ = HPMHooks.source.SQL.StmtBindParam(self, idx, buffer_type, buffer, buffer_len); } if( HPMHooks.count.HP_SQL_StmtBindParam_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindParam_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtBindParam_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, &idx, &buffer_type, buffer, &buffer_len); + retVal___ = postHookFunc(retVal___, self, idx, buffer_type, buffer, buffer_len); } } return retVal___; } -int HP_SQL_StmtExecute(SqlStmt *self) { +int HP_SQL_StmtExecute(struct SqlStmt *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtExecute_pre ) { - int (*preHookFunc) (SqlStmt *self); + int (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtExecute_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtExecute_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6146,7 +6570,7 @@ int HP_SQL_StmtExecute(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtExecute(self); } if( HPMHooks.count.HP_SQL_StmtExecute_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self); + int (*postHookFunc) (int retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtExecute_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtExecute_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -6154,15 +6578,15 @@ int HP_SQL_StmtExecute(SqlStmt *self) { } return retVal___; } -uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) { +uint64 HP_SQL_StmtLastInsertId(struct SqlStmt *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtLastInsertId_pre ) { - uint64 (*preHookFunc) (SqlStmt *self); + uint64 (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtLastInsertId_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtLastInsertId_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6173,7 +6597,7 @@ uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtLastInsertId(self); } if( HPMHooks.count.HP_SQL_StmtLastInsertId_post ) { - uint64 (*postHookFunc) (uint64 retVal___, SqlStmt *self); + uint64 (*postHookFunc) (uint64 retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtLastInsertId_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtLastInsertId_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -6181,15 +6605,15 @@ uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) { } return retVal___; } -size_t HP_SQL_StmtNumColumns(SqlStmt *self) { +size_t HP_SQL_StmtNumColumns(struct SqlStmt *self) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNumColumns_pre ) { - size_t (*preHookFunc) (SqlStmt *self); + size_t (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumColumns_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNumColumns_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6200,7 +6624,7 @@ size_t HP_SQL_StmtNumColumns(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNumColumns(self); } if( HPMHooks.count.HP_SQL_StmtNumColumns_post ) { - size_t (*postHookFunc) (size_t retVal___, SqlStmt *self); + size_t (*postHookFunc) (size_t retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumColumns_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNumColumns_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -6208,15 +6632,15 @@ size_t HP_SQL_StmtNumColumns(SqlStmt *self) { } return retVal___; } -int HP_SQL_StmtBindColumn(SqlStmt *self, size_t idx, SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) { +int HP_SQL_StmtBindColumn(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtBindColumn_pre ) { - int (*preHookFunc) (SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null); + int (*preHookFunc) (struct SqlStmt **self, size_t *idx, enum SqlDataType *buffer_type, void **buffer, size_t *buffer_len, uint32 **out_length, int8 **out_is_null); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindColumn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtBindColumn_pre[hIndex].func; - retVal___ = preHookFunc(self, &idx, &buffer_type, buffer, &buffer_len, out_length, out_is_null); + retVal___ = preHookFunc(&self, &idx, &buffer_type, &buffer, &buffer_len, &out_length, &out_is_null); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6227,23 +6651,23 @@ int HP_SQL_StmtBindColumn(SqlStmt *self, size_t idx, SqlDataType buffer_type, vo retVal___ = HPMHooks.source.SQL.StmtBindColumn(self, idx, buffer_type, buffer, buffer_len, out_length, out_is_null); } if( HPMHooks.count.HP_SQL_StmtBindColumn_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindColumn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtBindColumn_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, &idx, &buffer_type, buffer, &buffer_len, out_length, out_is_null); + retVal___ = postHookFunc(retVal___, self, idx, buffer_type, buffer, buffer_len, out_length, out_is_null); } } return retVal___; } -uint64 HP_SQL_StmtNumRows(SqlStmt *self) { +uint64 HP_SQL_StmtNumRows(struct SqlStmt *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNumRows_pre ) { - uint64 (*preHookFunc) (SqlStmt *self); + uint64 (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumRows_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNumRows_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6254,7 +6678,7 @@ uint64 HP_SQL_StmtNumRows(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNumRows(self); } if( HPMHooks.count.HP_SQL_StmtNumRows_post ) { - uint64 (*postHookFunc) (uint64 retVal___, SqlStmt *self); + uint64 (*postHookFunc) (uint64 retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumRows_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNumRows_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -6262,15 +6686,15 @@ uint64 HP_SQL_StmtNumRows(SqlStmt *self) { } return retVal___; } -int HP_SQL_StmtNextRow(SqlStmt *self) { +int HP_SQL_StmtNextRow(struct SqlStmt *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNextRow_pre ) { - int (*preHookFunc) (SqlStmt *self); + int (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNextRow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNextRow_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6281,7 +6705,7 @@ int HP_SQL_StmtNextRow(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNextRow(self); } if( HPMHooks.count.HP_SQL_StmtNextRow_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self); + int (*postHookFunc) (int retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNextRow_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNextRow_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -6289,14 +6713,14 @@ int HP_SQL_StmtNextRow(SqlStmt *self) { } return retVal___; } -void HP_SQL_StmtFreeResult(SqlStmt *self) { +void HP_SQL_StmtFreeResult(struct SqlStmt *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_StmtFreeResult_pre ) { - void (*preHookFunc) (SqlStmt *self); + void (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFreeResult_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtFreeResult_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6307,7 +6731,7 @@ void HP_SQL_StmtFreeResult(SqlStmt *self) { HPMHooks.source.SQL.StmtFreeResult(self); } if( HPMHooks.count.HP_SQL_StmtFreeResult_post ) { - void (*postHookFunc) (SqlStmt *self); + void (*postHookFunc) (struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFreeResult_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtFreeResult_post[hIndex].func; postHookFunc(self); @@ -6315,14 +6739,14 @@ void HP_SQL_StmtFreeResult(SqlStmt *self) { } return; } -void HP_SQL_StmtFree(SqlStmt *self) { +void HP_SQL_StmtFree(struct SqlStmt *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_StmtFree_pre ) { - void (*preHookFunc) (SqlStmt *self); + void (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFree_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtFree_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6333,7 +6757,7 @@ void HP_SQL_StmtFree(SqlStmt *self) { HPMHooks.source.SQL.StmtFree(self); } if( HPMHooks.count.HP_SQL_StmtFree_post ) { - void (*postHookFunc) (SqlStmt *self); + void (*postHookFunc) (struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFree_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtFree_post[hIndex].func; postHookFunc(self); @@ -6341,14 +6765,14 @@ void HP_SQL_StmtFree(SqlStmt *self) { } return; } -void HP_SQL_StmtShowDebug_(SqlStmt *self, const char *debug_file, const unsigned long debug_line) { +void HP_SQL_StmtShowDebug_(struct SqlStmt *self, const char *debug_file, const unsigned long debug_line) { int hIndex = 0; if( HPMHooks.count.HP_SQL_StmtShowDebug__pre ) { - void (*preHookFunc) (SqlStmt *self, const char *debug_file, const unsigned long *debug_line); + void (*preHookFunc) (struct SqlStmt **self, const char **debug_file, const unsigned long *debug_line); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtShowDebug__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtShowDebug__pre[hIndex].func; - preHookFunc(self, debug_file, &debug_line); + preHookFunc(&self, &debug_file, &debug_line); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6359,15 +6783,15 @@ void HP_SQL_StmtShowDebug_(SqlStmt *self, const char *debug_file, const unsigned HPMHooks.source.SQL.StmtShowDebug_(self, debug_file, debug_line); } if( HPMHooks.count.HP_SQL_StmtShowDebug__post ) { - void (*postHookFunc) (SqlStmt *self, const char *debug_file, const unsigned long *debug_line); + void (*postHookFunc) (struct SqlStmt *self, const char *debug_file, const unsigned long debug_line); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtShowDebug__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtShowDebug__post[hIndex].func; - postHookFunc(self, debug_file, &debug_line); + postHookFunc(self, debug_file, debug_line); } } return; } -/* StrBuf */ +/* stringbuf_interface */ StringBuf* HP_StrBuf_Malloc(void) { int hIndex = 0; StringBuf* retVal___ = NULL; @@ -6398,11 +6822,11 @@ StringBuf* HP_StrBuf_Malloc(void) { void HP_StrBuf_Init(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Init_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Init_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6425,12 +6849,12 @@ int HP_StrBuf_Vprintf(StringBuf *self, const char *fmt, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_Vprintf_pre ) { - int (*preHookFunc) (StringBuf *self, const char *fmt, va_list args); + int (*preHookFunc) (StringBuf **self, const char **fmt, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Vprintf_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_StrBuf_Vprintf_pre[hIndex].func; - retVal___ = preHookFunc(self, fmt, args___copy); + retVal___ = preHookFunc(&self, &fmt, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -6458,11 +6882,11 @@ int HP_StrBuf_Append(StringBuf *self, const StringBuf *sbuf) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_Append_pre ) { - int (*preHookFunc) (StringBuf *self, const StringBuf *sbuf); + int (*preHookFunc) (StringBuf **self, const StringBuf **sbuf); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Append_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Append_pre[hIndex].func; - retVal___ = preHookFunc(self, sbuf); + retVal___ = preHookFunc(&self, &sbuf); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6485,11 +6909,11 @@ int HP_StrBuf_AppendStr(StringBuf *self, const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_AppendStr_pre ) { - int (*preHookFunc) (StringBuf *self, const char *str); + int (*preHookFunc) (StringBuf **self, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_AppendStr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_AppendStr_pre[hIndex].func; - retVal___ = preHookFunc(self, str); + retVal___ = preHookFunc(&self, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6512,11 +6936,11 @@ int HP_StrBuf_Length(StringBuf *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_Length_pre ) { - int (*preHookFunc) (StringBuf *self); + int (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Length_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Length_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6539,11 +6963,11 @@ char* HP_StrBuf_Value(StringBuf *self) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_StrBuf_Value_pre ) { - char* (*preHookFunc) (StringBuf *self); + char* (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Value_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6565,11 +6989,11 @@ char* HP_StrBuf_Value(StringBuf *self) { void HP_StrBuf_Clear(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Clear_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Clear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Clear_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6591,11 +7015,11 @@ void HP_StrBuf_Clear(StringBuf *self) { void HP_StrBuf_Destroy(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Destroy_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Destroy_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6617,11 +7041,11 @@ void HP_StrBuf_Destroy(StringBuf *self) { void HP_StrBuf_Free(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Free_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Free_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6640,16 +7064,16 @@ void HP_StrBuf_Free(StringBuf *self) { } return; } -/* strlib */ +/* strlib_interface */ char* HP_strlib_jstrescape(char *pt) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_jstrescape_pre ) { - char* (*preHookFunc) (char *pt); + char* (*preHookFunc) (char **pt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_jstrescape_pre[hIndex].func; - retVal___ = preHookFunc(pt); + retVal___ = preHookFunc(&pt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6672,11 +7096,11 @@ char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_jstrescapecpy_pre ) { - char* (*preHookFunc) (char *pt, const char *spt); + char* (*preHookFunc) (char **pt, const char **spt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_pre[hIndex].func; - retVal___ = preHookFunc(pt, spt); + retVal___ = preHookFunc(&pt, &spt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6699,11 +7123,11 @@ int HP_strlib_jmemescapecpy(char *pt, const char *spt, int size) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_jmemescapecpy_pre ) { - int (*preHookFunc) (char *pt, const char *spt, int *size); + int (*preHookFunc) (char **pt, const char **spt, int *size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jmemescapecpy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_jmemescapecpy_pre[hIndex].func; - retVal___ = preHookFunc(pt, spt, &size); + retVal___ = preHookFunc(&pt, &spt, &size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6714,10 +7138,10 @@ int HP_strlib_jmemescapecpy(char *pt, const char *spt, int size) { retVal___ = HPMHooks.source.strlib.jmemescapecpy(pt, spt, size); } if( HPMHooks.count.HP_strlib_jmemescapecpy_post ) { - int (*postHookFunc) (int retVal___, char *pt, const char *spt, int *size); + int (*postHookFunc) (int retVal___, char *pt, const char *spt, int size); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jmemescapecpy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_jmemescapecpy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, pt, spt, &size); + retVal___ = postHookFunc(retVal___, pt, spt, size); } } return retVal___; @@ -6726,11 +7150,11 @@ int HP_strlib_remove_control_chars_(char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_remove_control_chars__pre ) { - int (*preHookFunc) (char *str); + int (*preHookFunc) (char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_remove_control_chars__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_remove_control_chars__pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6753,11 +7177,11 @@ char* HP_strlib_trim_(char *str) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_trim__pre ) { - char* (*preHookFunc) (char *str); + char* (*preHookFunc) (char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_trim__pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6780,11 +7204,11 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_normalize_name__pre ) { - char* (*preHookFunc) (char *str, const char *delims); + char* (*preHookFunc) (char **str, const char **delims); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_normalize_name__pre[hIndex].func; - retVal___ = preHookFunc(str, delims); + retVal___ = preHookFunc(&str, &delims); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6807,11 +7231,11 @@ const char* HP_strlib_stristr_(const char *haystack, const char *needle) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_stristr__pre ) { - const char* (*preHookFunc) (const char *haystack, const char *needle); + const char* (*preHookFunc) (const char **haystack, const char **needle); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_stristr__pre[hIndex].func; - retVal___ = preHookFunc(haystack, needle); + retVal___ = preHookFunc(&haystack, &needle); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6834,11 +7258,11 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_strlib_strnlen__pre ) { - size_t (*preHookFunc) (const char *string, size_t *maxlen); + size_t (*preHookFunc) (const char **string, size_t *maxlen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strnlen__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_strnlen__pre[hIndex].func; - retVal___ = preHookFunc(string, &maxlen); + retVal___ = preHookFunc(&string, &maxlen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6849,10 +7273,10 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { retVal___ = HPMHooks.source.strlib.strnlen_(string, maxlen); } if( HPMHooks.count.HP_strlib_strnlen__post ) { - size_t (*postHookFunc) (size_t retVal___, const char *string, size_t *maxlen); + size_t (*postHookFunc) (size_t retVal___, const char *string, size_t maxlen); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strnlen__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_strnlen__post[hIndex].func; - retVal___ = postHookFunc(retVal___, string, &maxlen); + retVal___ = postHookFunc(retVal___, string, maxlen); } } return retVal___; @@ -6861,11 +7285,11 @@ char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_strtok_r__pre ) { - char* (*preHookFunc) (char *s1, const char *s2, char **lasts); + char* (*preHookFunc) (char **s1, const char **s2, char ***lasts); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_strtok_r__pre[hIndex].func; - retVal___ = preHookFunc(s1, s2, lasts); + retVal___ = preHookFunc(&s1, &s2, &lasts); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6888,11 +7312,11 @@ int HP_strlib_e_mail_check_(char *email) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_e_mail_check__pre ) { - int (*preHookFunc) (char *email); + int (*preHookFunc) (char **email); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_e_mail_check__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_e_mail_check__pre[hIndex].func; - retVal___ = preHookFunc(email); + retVal___ = preHookFunc(&email); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6915,11 +7339,11 @@ int HP_strlib_config_switch_(const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_config_switch__pre ) { - int (*preHookFunc) (const char *str); + int (*preHookFunc) (const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_config_switch__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_config_switch__pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6942,11 +7366,11 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_safestrncpy__pre ) { - char* (*preHookFunc) (char *dst, const char *src, size_t *n); + char* (*preHookFunc) (char **dst, const char **src, size_t *n); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_safestrncpy__pre[hIndex].func; - retVal___ = preHookFunc(dst, src, &n); + retVal___ = preHookFunc(&dst, &src, &n); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6957,10 +7381,10 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { retVal___ = HPMHooks.source.strlib.safestrncpy_(dst, src, n); } if( HPMHooks.count.HP_strlib_safestrncpy__post ) { - char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t *n); + char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t n); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_safestrncpy__post[hIndex].func; - retVal___ = postHookFunc(retVal___, dst, src, &n); + retVal___ = postHookFunc(retVal___, dst, src, n); } } return retVal___; @@ -6969,11 +7393,11 @@ size_t HP_strlib_safestrnlen_(const char *string, size_t maxlen) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_strlib_safestrnlen__pre ) { - size_t (*preHookFunc) (const char *string, size_t *maxlen); + size_t (*preHookFunc) (const char **string, size_t *maxlen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrnlen__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_safestrnlen__pre[hIndex].func; - retVal___ = preHookFunc(string, &maxlen); + retVal___ = preHookFunc(&string, &maxlen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6984,10 +7408,10 @@ size_t HP_strlib_safestrnlen_(const char *string, size_t maxlen) { retVal___ = HPMHooks.source.strlib.safestrnlen_(string, maxlen); } if( HPMHooks.count.HP_strlib_safestrnlen__post ) { - size_t (*postHookFunc) (size_t retVal___, const char *string, size_t *maxlen); + size_t (*postHookFunc) (size_t retVal___, const char *string, size_t maxlen); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrnlen__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_safestrnlen__post[hIndex].func; - retVal___ = postHookFunc(retVal___, string, &maxlen); + retVal___ = postHookFunc(retVal___, string, maxlen); } } return retVal___; @@ -6996,11 +7420,11 @@ int HP_strlib_strline_(const char *str, size_t pos) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_strline__pre ) { - int (*preHookFunc) (const char *str, size_t *pos); + int (*preHookFunc) (const char **str, size_t *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strline__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_strline__pre[hIndex].func; - retVal___ = preHookFunc(str, &pos); + retVal___ = preHookFunc(&str, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7011,23 +7435,23 @@ int HP_strlib_strline_(const char *str, size_t pos) { retVal___ = HPMHooks.source.strlib.strline_(str, pos); } if( HPMHooks.count.HP_strlib_strline__post ) { - int (*postHookFunc) (int retVal___, const char *str, size_t *pos); + int (*postHookFunc) (int retVal___, const char *str, size_t pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strline__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_strline__post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &pos); + retVal___ = postHookFunc(retVal___, str, pos); } } return retVal___; } -bool HP_strlib_bin2hex_(char *output, unsigned char *input, size_t count) { +bool HP_strlib_bin2hex_(char *output, const unsigned char *input, size_t count) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_strlib_bin2hex__pre ) { - bool (*preHookFunc) (char *output, unsigned char *input, size_t *count); + bool (*preHookFunc) (char **output, const unsigned char **input, size_t *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_bin2hex__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_bin2hex__pre[hIndex].func; - retVal___ = preHookFunc(output, input, &count); + retVal___ = preHookFunc(&output, &input, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7038,24 +7462,24 @@ bool HP_strlib_bin2hex_(char *output, unsigned char *input, size_t count) { retVal___ = HPMHooks.source.strlib.bin2hex_(output, input, count); } if( HPMHooks.count.HP_strlib_bin2hex__post ) { - bool (*postHookFunc) (bool retVal___, char *output, unsigned char *input, size_t *count); + bool (*postHookFunc) (bool retVal___, char *output, const unsigned char *input, size_t count); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_bin2hex__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_bin2hex__post[hIndex].func; - retVal___ = postHookFunc(retVal___, output, input, &count); + retVal___ = postHookFunc(retVal___, output, input, count); } } return retVal___; } -/* sv */ +/* sv_interface */ int HP_sv_parse_next(struct s_svstate *svstate) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sv_parse_next_pre ) { - int (*preHookFunc) (struct s_svstate *svstate); + int (*preHookFunc) (struct s_svstate **svstate); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_parse_next_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_parse_next_pre[hIndex].func; - retVal___ = preHookFunc(svstate); + retVal___ = preHookFunc(&svstate); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7078,11 +7502,11 @@ int HP_sv_parse(const char *str, int len, int startoff, char delim, int *out_pos int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sv_parse_pre ) { - int (*preHookFunc) (const char *str, int *len, int *startoff, char *delim, int *out_pos, int *npos, enum e_svopt *opt); + int (*preHookFunc) (const char **str, int *len, int *startoff, char *delim, int **out_pos, int *npos, enum e_svopt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_parse_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_parse_pre[hIndex].func; - retVal___ = preHookFunc(str, &len, &startoff, &delim, out_pos, &npos, &opt); + retVal___ = preHookFunc(&str, &len, &startoff, &delim, &out_pos, &npos, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7093,10 +7517,10 @@ int HP_sv_parse(const char *str, int len, int startoff, char delim, int *out_pos retVal___ = HPMHooks.source.sv.parse(str, len, startoff, delim, out_pos, npos, opt); } if( HPMHooks.count.HP_sv_parse_post ) { - int (*postHookFunc) (int retVal___, const char *str, int *len, int *startoff, char *delim, int *out_pos, int *npos, enum e_svopt *opt); + int (*postHookFunc) (int retVal___, const char *str, int len, int startoff, char delim, int *out_pos, int npos, enum e_svopt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_parse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_parse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &len, &startoff, &delim, out_pos, &npos, &opt); + retVal___ = postHookFunc(retVal___, str, len, startoff, delim, out_pos, npos, opt); } } return retVal___; @@ -7105,11 +7529,11 @@ int HP_sv_split(char *str, int len, int startoff, char delim, char **out_fields, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sv_split_pre ) { - int (*preHookFunc) (char *str, int *len, int *startoff, char *delim, char **out_fields, int *nfields, enum e_svopt *opt); + int (*preHookFunc) (char **str, int *len, int *startoff, char *delim, char ***out_fields, int *nfields, enum e_svopt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_split_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_split_pre[hIndex].func; - retVal___ = preHookFunc(str, &len, &startoff, &delim, out_fields, &nfields, &opt); + retVal___ = preHookFunc(&str, &len, &startoff, &delim, &out_fields, &nfields, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7120,10 +7544,10 @@ int HP_sv_split(char *str, int len, int startoff, char delim, char **out_fields, retVal___ = HPMHooks.source.sv.split(str, len, startoff, delim, out_fields, nfields, opt); } if( HPMHooks.count.HP_sv_split_post ) { - int (*postHookFunc) (int retVal___, char *str, int *len, int *startoff, char *delim, char **out_fields, int *nfields, enum e_svopt *opt); + int (*postHookFunc) (int retVal___, char *str, int len, int startoff, char delim, char **out_fields, int nfields, enum e_svopt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_split_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_split_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &len, &startoff, &delim, out_fields, &nfields, &opt); + retVal___ = postHookFunc(retVal___, str, len, startoff, delim, out_fields, nfields, opt); } } return retVal___; @@ -7132,11 +7556,11 @@ size_t HP_sv_escape_c(char *out_dest, const char *src, size_t len, const char *e int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_sv_escape_c_pre ) { - size_t (*preHookFunc) (char *out_dest, const char *src, size_t *len, const char *escapes); + size_t (*preHookFunc) (char **out_dest, const char **src, size_t *len, const char **escapes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_escape_c_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_escape_c_pre[hIndex].func; - retVal___ = preHookFunc(out_dest, src, &len, escapes); + retVal___ = preHookFunc(&out_dest, &src, &len, &escapes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7147,10 +7571,10 @@ size_t HP_sv_escape_c(char *out_dest, const char *src, size_t len, const char *e retVal___ = HPMHooks.source.sv.escape_c(out_dest, src, len, escapes); } if( HPMHooks.count.HP_sv_escape_c_post ) { - size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t *len, const char *escapes); + size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t len, const char *escapes); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_escape_c_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_escape_c_post[hIndex].func; - retVal___ = postHookFunc(retVal___, out_dest, src, &len, escapes); + retVal___ = postHookFunc(retVal___, out_dest, src, len, escapes); } } return retVal___; @@ -7159,11 +7583,11 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_sv_unescape_c_pre ) { - size_t (*preHookFunc) (char *out_dest, const char *src, size_t *len); + size_t (*preHookFunc) (char **out_dest, const char **src, size_t *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_unescape_c_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_unescape_c_pre[hIndex].func; - retVal___ = preHookFunc(out_dest, src, &len); + retVal___ = preHookFunc(&out_dest, &src, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7174,10 +7598,10 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { retVal___ = HPMHooks.source.sv.unescape_c(out_dest, src, len); } if( HPMHooks.count.HP_sv_unescape_c_post ) { - size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t *len); + size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t len); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_unescape_c_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_unescape_c_post[hIndex].func; - retVal___ = postHookFunc(retVal___, out_dest, src, &len); + retVal___ = postHookFunc(retVal___, out_dest, src, len); } } return retVal___; @@ -7186,11 +7610,11 @@ const char* HP_sv_skip_escaped_c(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_sv_skip_escaped_c_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7213,11 +7637,11 @@ bool HP_sv_readdb(const char *directory, const char *filename, char delim, int m int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_sv_readdb_pre ) { - bool (*preHookFunc) (const char *directory, const char *filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); + bool (*preHookFunc) (const char **directory, const char **filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( **parseproc ) (char *fields[], int columns, int current)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_readdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_readdb_pre[hIndex].func; - retVal___ = preHookFunc(directory, filename, &delim, &mincols, &maxcols, &maxrows, parseproc); + retVal___ = preHookFunc(&directory, &filename, &delim, &mincols, &maxcols, &maxrows, &parseproc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7228,15 +7652,15 @@ bool HP_sv_readdb(const char *directory, const char *filename, char delim, int m retVal___ = HPMHooks.source.sv.readdb(directory, filename, delim, mincols, maxcols, maxrows, parseproc); } if( HPMHooks.count.HP_sv_readdb_post ) { - bool (*postHookFunc) (bool retVal___, const char *directory, const char *filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); + bool (*postHookFunc) (bool retVal___, const char *directory, const char *filename, char delim, int mincols, int maxcols, int maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_readdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_readdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, directory, filename, &delim, &mincols, &maxcols, &maxrows, parseproc); + retVal___ = postHookFunc(retVal___, directory, filename, delim, mincols, maxcols, maxrows, parseproc); } } return retVal___; } -/* sysinfo */ +/* sysinfo_interface */ int HP_sysinfo_getpagesize(void) { int hIndex = 0; int retVal___ = 0; @@ -7720,7 +8144,7 @@ void HP_sysinfo_final(void) { } return; } -/* timer */ +/* timer_interface */ int64 HP_timer_gettick(void) { int hIndex = 0; int64 retVal___ = 0; @@ -7794,10 +8218,10 @@ int HP_timer_add(int64 tick, TimerFunc func, int id, intptr_t data) { retVal___ = HPMHooks.source.timer.add(tick, func, id, data); } if( HPMHooks.count.HP_timer_add_post ) { - int (*postHookFunc) (int retVal___, int64 *tick, TimerFunc *func, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick, &func, &id, &data); + retVal___ = postHookFunc(retVal___, tick, func, id, data); } } return retVal___; @@ -7821,10 +8245,10 @@ int HP_timer_add_interval(int64 tick, TimerFunc func, int id, intptr_t data, int retVal___ = HPMHooks.source.timer.add_interval(tick, func, id, data, interval); } if( HPMHooks.count.HP_timer_add_interval_post ) { - int (*postHookFunc) (int retVal___, int64 *tick, TimerFunc *func, int *id, intptr_t *data, int *interval); + int (*postHookFunc) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data, int interval); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_interval_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_add_interval_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick, &func, &id, &data, &interval); + retVal___ = postHookFunc(retVal___, tick, func, id, data, interval); } } return retVal___; @@ -7848,10 +8272,10 @@ const struct TimerData* HP_timer_get(int tid) { retVal___ = HPMHooks.source.timer.get(tid); } if( HPMHooks.count.HP_timer_get_post ) { - const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int *tid); + const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int tid); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_get_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid); + retVal___ = postHookFunc(retVal___, tid); } } return retVal___; @@ -7875,10 +8299,10 @@ int HP_timer_delete(int tid, TimerFunc func) { retVal___ = HPMHooks.source.timer.delete(tid, func); } if( HPMHooks.count.HP_timer_delete_post ) { - int (*postHookFunc) (int retVal___, int *tid, TimerFunc *func); + int (*postHookFunc) (int retVal___, int tid, TimerFunc func); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &func); + retVal___ = postHookFunc(retVal___, tid, func); } } return retVal___; @@ -7902,10 +8326,10 @@ int64 HP_timer_addtick(int tid, int64 tick) { retVal___ = HPMHooks.source.timer.addtick(tid, tick); } if( HPMHooks.count.HP_timer_addtick_post ) { - int64 (*postHookFunc) (int64 retVal___, int *tid, int64 *tick); + int64 (*postHookFunc) (int64 retVal___, int tid, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_addtick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_addtick_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick); + retVal___ = postHookFunc(retVal___, tid, tick); } } return retVal___; @@ -7929,10 +8353,10 @@ int64 HP_timer_settick(int tid, int64 tick) { retVal___ = HPMHooks.source.timer.settick(tid, tick); } if( HPMHooks.count.HP_timer_settick_post ) { - int64 (*postHookFunc) (int64 retVal___, int *tid, int64 *tick); + int64 (*postHookFunc) (int64 retVal___, int tid, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_settick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_settick_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick); + retVal___ = postHookFunc(retVal___, tid, tick); } } return retVal___; @@ -7941,11 +8365,11 @@ int HP_timer_add_func_list(TimerFunc func, char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_timer_add_func_list_pre ) { - int (*preHookFunc) (TimerFunc *func, char *name); + int (*preHookFunc) (TimerFunc *func, char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_func_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_timer_add_func_list_pre[hIndex].func; - retVal___ = preHookFunc(&func, name); + retVal___ = preHookFunc(&func, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7956,10 +8380,10 @@ int HP_timer_add_func_list(TimerFunc func, char *name) { retVal___ = HPMHooks.source.timer.add_func_list(func, name); } if( HPMHooks.count.HP_timer_add_func_list_post ) { - int (*postHookFunc) (int retVal___, TimerFunc *func, char *name); + int (*postHookFunc) (int retVal___, TimerFunc func, char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_func_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_add_func_list_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &func, name); + retVal___ = postHookFunc(retVal___, func, name); } } return retVal___; @@ -8010,10 +8434,10 @@ int HP_timer_perform(int64 tick) { retVal___ = HPMHooks.source.timer.perform(tick); } if( HPMHooks.count.HP_timer_perform_post ) { - int (*postHookFunc) (int retVal___, int64 *tick); + int (*postHookFunc) (int retVal___, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_perform_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_perform_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick); + retVal___ = postHookFunc(retVal___, tick); } } return retVal___; diff --git a/src/plugins/HPMHooking/HPMHooking_login.sources.inc b/src/plugins/HPMHooking/HPMHooking_login.sources.inc index bbc1cecbc..1c1927619 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.sources.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.sources.inc @@ -28,6 +28,8 @@ memcpy(&HPMHooks.source.cmdline, cmdline, sizeof(struct cmdline_interface)); memcpy(&HPMHooks.source.console, console, sizeof(struct console_interface)); memcpy(&HPMHooks.source.core, core, sizeof(struct core_interface)); memcpy(&HPMHooks.source.DB, DB, sizeof(struct db_interface)); +memcpy(&HPMHooks.source.lclif, lclif, sizeof(struct lclif_interface)); +memcpy(&HPMHooks.source.PRIV__lclif, lclif->p, sizeof(struct lclif_interface_private)); memcpy(&HPMHooks.source.libconfig, libconfig, sizeof(struct libconfig_interface)); memcpy(&HPMHooks.source.login, login, sizeof(struct login_interface)); memcpy(&HPMHooks.source.iMalloc, iMalloc, sizeof(struct malloc_interface)); diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index e5457e47c..1de0b6077 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -984,8 +984,10 @@ struct { struct HPMHookPoint *HP_clif_message_post; struct HPMHookPoint *HP_clif_messageln_pre; struct HPMHookPoint *HP_clif_messageln_post; - struct HPMHookPoint *HP_clif_process_message_pre; - struct HPMHookPoint *HP_clif_process_message_post; + struct HPMHookPoint *HP_clif_process_chat_message_pre; + struct HPMHookPoint *HP_clif_process_chat_message_post; + struct HPMHookPoint *HP_clif_process_whisper_message_pre; + struct HPMHookPoint *HP_clif_process_whisper_message_post; struct HPMHookPoint *HP_clif_wisexin_pre; struct HPMHookPoint *HP_clif_wisexin_post; struct HPMHookPoint *HP_clif_wisall_pre; @@ -1854,6 +1856,8 @@ struct { struct HPMHookPoint *HP_clif_selectcart_post; struct HPMHookPoint *HP_clif_pSelectCart_pre; struct HPMHookPoint *HP_clif_pSelectCart_post; + struct HPMHookPoint *HP_clif_get_bl_name_pre; + struct HPMHookPoint *HP_clif_get_bl_name_post; struct HPMHookPoint *HP_cmdline_init_pre; struct HPMHookPoint *HP_cmdline_init_post; struct HPMHookPoint *HP_cmdline_final_pre; @@ -2610,6 +2614,10 @@ struct { struct HPMHookPoint *HP_ircbot_identify_timer_post; struct HPMHookPoint *HP_ircbot_join_timer_pre; struct HPMHookPoint *HP_ircbot_join_timer_post; + struct HPMHookPoint *HP_ircbot_queue_timer_pre; + struct HPMHookPoint *HP_ircbot_queue_timer_post; + struct HPMHookPoint *HP_ircbot_queue_pre; + struct HPMHookPoint *HP_ircbot_queue_post; struct HPMHookPoint *HP_ircbot_send_pre; struct HPMHookPoint *HP_ircbot_send_post; struct HPMHookPoint *HP_ircbot_relay_pre; @@ -2618,6 +2626,8 @@ struct { struct HPMHookPoint *HP_ircbot_pong_post; struct HPMHookPoint *HP_ircbot_privmsg_pre; struct HPMHookPoint *HP_ircbot_privmsg_post; + struct HPMHookPoint *HP_ircbot_privmsg_ctcp_pre; + struct HPMHookPoint *HP_ircbot_privmsg_ctcp_post; struct HPMHookPoint *HP_ircbot_userjoin_pre; struct HPMHookPoint *HP_ircbot_userjoin_post; struct HPMHookPoint *HP_ircbot_userleave_pre; @@ -4354,6 +4364,10 @@ struct { struct HPMHookPoint *HP_pc_update_idle_time_post; struct HPMHookPoint *HP_pc_have_magnifier_pre; struct HPMHookPoint *HP_pc_have_magnifier_post; + struct HPMHookPoint *HP_pc_process_chat_message_pre; + struct HPMHookPoint *HP_pc_process_chat_message_post; + struct HPMHookPoint *HP_pc_check_supernovice_call_pre; + struct HPMHookPoint *HP_pc_check_supernovice_call_post; struct HPMHookPoint *HP_libpcre_compile_pre; struct HPMHookPoint *HP_libpcre_compile_post; struct HPMHookPoint *HP_libpcre_study_pre; @@ -4536,6 +4550,8 @@ struct { struct HPMHookPoint *HP_script_get_val2_post; struct HPMHookPoint *HP_script_push_str_pre; struct HPMHookPoint *HP_script_push_str_post; + struct HPMHookPoint *HP_script_push_conststr_pre; + struct HPMHookPoint *HP_script_push_conststr_post; struct HPMHookPoint *HP_script_push_copy_pre; struct HPMHookPoint *HP_script_push_copy_post; struct HPMHookPoint *HP_script_pop_stack_pre; @@ -4658,6 +4674,8 @@ struct { struct HPMHookPoint *HP_script_read_constdb_post; struct HPMHookPoint *HP_script_constdb_comment_pre; struct HPMHookPoint *HP_script_constdb_comment_post; + struct HPMHookPoint *HP_script_load_parameters_pre; + struct HPMHookPoint *HP_script_load_parameters_post; struct HPMHookPoint *HP_script_print_line_pre; struct HPMHookPoint *HP_script_print_line_post; struct HPMHookPoint *HP_script_errorwarning_sub_pre; @@ -5794,6 +5812,8 @@ struct { struct HPMHookPoint *HP_unit_bl2ud_post; struct HPMHookPoint *HP_unit_bl2ud2_pre; struct HPMHookPoint *HP_unit_bl2ud2_post; + struct HPMHookPoint *HP_unit_init_ud_pre; + struct HPMHookPoint *HP_unit_init_ud_post; struct HPMHookPoint *HP_unit_attack_timer_pre; struct HPMHookPoint *HP_unit_attack_timer_post; struct HPMHookPoint *HP_unit_walktoxy_timer_pre; @@ -6861,8 +6881,10 @@ struct { int HP_clif_message_post; int HP_clif_messageln_pre; int HP_clif_messageln_post; - int HP_clif_process_message_pre; - int HP_clif_process_message_post; + int HP_clif_process_chat_message_pre; + int HP_clif_process_chat_message_post; + int HP_clif_process_whisper_message_pre; + int HP_clif_process_whisper_message_post; int HP_clif_wisexin_pre; int HP_clif_wisexin_post; int HP_clif_wisall_pre; @@ -7731,6 +7753,8 @@ struct { int HP_clif_selectcart_post; int HP_clif_pSelectCart_pre; int HP_clif_pSelectCart_post; + int HP_clif_get_bl_name_pre; + int HP_clif_get_bl_name_post; int HP_cmdline_init_pre; int HP_cmdline_init_post; int HP_cmdline_final_pre; @@ -8487,6 +8511,10 @@ struct { int HP_ircbot_identify_timer_post; int HP_ircbot_join_timer_pre; int HP_ircbot_join_timer_post; + int HP_ircbot_queue_timer_pre; + int HP_ircbot_queue_timer_post; + int HP_ircbot_queue_pre; + int HP_ircbot_queue_post; int HP_ircbot_send_pre; int HP_ircbot_send_post; int HP_ircbot_relay_pre; @@ -8495,6 +8523,8 @@ struct { int HP_ircbot_pong_post; int HP_ircbot_privmsg_pre; int HP_ircbot_privmsg_post; + int HP_ircbot_privmsg_ctcp_pre; + int HP_ircbot_privmsg_ctcp_post; int HP_ircbot_userjoin_pre; int HP_ircbot_userjoin_post; int HP_ircbot_userleave_pre; @@ -10231,6 +10261,10 @@ struct { int HP_pc_update_idle_time_post; int HP_pc_have_magnifier_pre; int HP_pc_have_magnifier_post; + int HP_pc_process_chat_message_pre; + int HP_pc_process_chat_message_post; + int HP_pc_check_supernovice_call_pre; + int HP_pc_check_supernovice_call_post; int HP_libpcre_compile_pre; int HP_libpcre_compile_post; int HP_libpcre_study_pre; @@ -10413,6 +10447,8 @@ struct { int HP_script_get_val2_post; int HP_script_push_str_pre; int HP_script_push_str_post; + int HP_script_push_conststr_pre; + int HP_script_push_conststr_post; int HP_script_push_copy_pre; int HP_script_push_copy_post; int HP_script_pop_stack_pre; @@ -10535,6 +10571,8 @@ struct { int HP_script_read_constdb_post; int HP_script_constdb_comment_pre; int HP_script_constdb_comment_post; + int HP_script_load_parameters_pre; + int HP_script_load_parameters_post; int HP_script_print_line_pre; int HP_script_print_line_post; int HP_script_errorwarning_sub_pre; @@ -11671,6 +11709,8 @@ struct { int HP_unit_bl2ud_post; int HP_unit_bl2ud2_pre; int HP_unit_bl2ud2_post; + int HP_unit_init_ud_pre; + int HP_unit_init_ud_post; int HP_unit_attack_timer_pre; int HP_unit_attack_timer_post; int HP_unit_walktoxy_timer_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index 365bda5da..b18d11d66 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -1,5 +1,6 @@ /** * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules * * Copyright (C) 2013-2016 Hercules Dev Team * @@ -23,11 +24,11 @@ */ struct HookingPointData HookingPoints[] = { -/* HCache */ +/* HCache_interface */ { HP_POP(HCache->init, HP_HCache_init) }, { HP_POP(HCache->check, HP_HCache_check) }, { HP_POP(HCache->open, HP_HCache_open) }, -/* atcommand */ +/* atcommand_interface */ { HP_POP(atcommand->init, HP_atcommand_init) }, { HP_POP(atcommand->final, HP_atcommand_final) }, { HP_POP(atcommand->exec, HP_atcommand_exec) }, @@ -63,7 +64,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(atcommand->expand_message_table, HP_atcommand_expand_message_table) }, { HP_POP(atcommand->msgfd, HP_atcommand_msgfd) }, { HP_POP(atcommand->msgsd, HP_atcommand_msgsd) }, -/* battle */ +/* battle_interface */ { HP_POP(battle->init, HP_battle_init) }, { HP_POP(battle->final, HP_battle_final) }, { HP_POP(battle->calc_attack, HP_battle_calc_attack) }, @@ -119,7 +120,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(battle->calc_skillratio_magic_unknown, HP_battle_calc_skillratio_magic_unknown) }, { HP_POP(battle->calc_skillratio_weapon_unknown, HP_battle_calc_skillratio_weapon_unknown) }, { HP_POP(battle->calc_misc_attack_unknown, HP_battle_calc_misc_attack_unknown) }, -/* bg */ +/* battleground_interface */ { HP_POP(bg->init, HP_bg_init) }, { HP_POP(bg->final, HP_bg_final) }, { HP_POP(bg->name2arena, HP_bg_name2arena) }, @@ -151,7 +152,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(bg->team_db_final, HP_bg_team_db_final) }, { HP_POP(bg->str2teamtype, HP_bg_str2teamtype) }, { HP_POP(bg->config_read, HP_bg_config_read) }, -/* buyingstore */ +/* buyingstore_interface */ { HP_POP(buyingstore->setup, HP_buyingstore_setup) }, { HP_POP(buyingstore->create, HP_buyingstore_create) }, { HP_POP(buyingstore->close, HP_buyingstore_close) }, @@ -160,7 +161,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(buyingstore->search, HP_buyingstore_search) }, { HP_POP(buyingstore->searchall, HP_buyingstore_searchall) }, { HP_POP(buyingstore->getuid, HP_buyingstore_getuid) }, -/* channel */ +/* channel_interface */ { HP_POP(channel->init, HP_channel_init) }, { HP_POP(channel->final, HP_channel_final) }, { HP_POP(channel->search, HP_channel_search) }, @@ -182,7 +183,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(channel->quit_guild, HP_channel_quit_guild) }, { HP_POP(channel->irc_join, HP_channel_irc_join) }, { HP_POP(channel->config_read, HP_channel_config_read) }, -/* chat */ +/* chat_interface */ { HP_POP(chat->create_pc_chat, HP_chat_create_pc_chat) }, { HP_POP(chat->join, HP_chat_join) }, { HP_POP(chat->leave, HP_chat_leave) }, @@ -196,7 +197,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(chat->npc_kick_all, HP_chat_npc_kick_all) }, { HP_POP(chat->trigger_event, HP_chat_trigger_event) }, { HP_POP(chat->create, HP_chat_create) }, -/* chrif */ +/* chrif_interface */ { HP_POP(chrif->init, HP_chrif_init) }, { HP_POP(chrif->final, HP_chrif_final) }, { HP_POP(chrif->setuserid, HP_chrif_setuserid) }, @@ -267,7 +268,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(chrif->parse, HP_chrif_parse) }, { HP_POP(chrif->save_scdata_single, HP_chrif_save_scdata_single) }, { HP_POP(chrif->del_scdata_single, HP_chrif_del_scdata_single) }, -/* clif */ +/* clif_interface */ { HP_POP(clif->init, HP_clif_init) }, { HP_POP(clif->final, HP_clif_final) }, { HP_POP(clif->setip, HP_clif_setip) }, @@ -512,7 +513,8 @@ struct HookingPointData HookingPoints[] = { { HP_POP(clif->msgtable_skill, HP_clif_msgtable_skill) }, { HP_POP(clif->message, HP_clif_message) }, { HP_POP(clif->messageln, HP_clif_messageln) }, - { HP_POP(clif->process_message, HP_clif_process_message) }, + { HP_POP(clif->process_chat_message, HP_clif_process_chat_message) }, + { HP_POP(clif->process_whisper_message, HP_clif_process_whisper_message) }, { HP_POP(clif->wisexin, HP_clif_wisexin) }, { HP_POP(clif->wisall, HP_clif_wisall) }, { HP_POP(clif->PMIgnoreList, HP_clif_PMIgnoreList) }, @@ -947,21 +949,22 @@ struct HookingPointData HookingPoints[] = { { HP_POP(clif->pOneClick_ItemIdentify, HP_clif_pOneClick_ItemIdentify) }, { HP_POP(clif->selectcart, HP_clif_selectcart) }, { HP_POP(clif->pSelectCart, HP_clif_pSelectCart) }, -/* cmdline */ + { HP_POP(clif->get_bl_name, HP_clif_get_bl_name) }, +/* cmdline_interface */ { HP_POP(cmdline->init, HP_cmdline_init) }, { HP_POP(cmdline->final, HP_cmdline_final) }, { HP_POP(cmdline->arg_add, HP_cmdline_arg_add) }, { HP_POP(cmdline->exec, HP_cmdline_exec) }, { HP_POP(cmdline->arg_next_value, HP_cmdline_arg_next_value) }, { HP_POP(cmdline->arg_source, HP_cmdline_arg_source) }, -/* console */ +/* console_interface */ { HP_POP(console->init, HP_console_init) }, { HP_POP(console->final, HP_console_final) }, { HP_POP(console->display_title, HP_console_display_title) }, { HP_POP(console->display_gplnotice, HP_console_display_gplnotice) }, -/* core */ +/* core_interface */ { HP_POP(core->shutdown_callback, HP_core_shutdown_callback) }, -/* DB */ +/* db_interface */ { HP_POP(DB->fix_options, HP_DB_fix_options) }, { HP_POP(DB->default_cmp, HP_DB_default_cmp) }, { HP_POP(DB->default_hash, HP_DB_default_hash) }, @@ -981,7 +984,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(DB->data2ptr, HP_DB_data2ptr) }, { HP_POP(DB->init, HP_DB_init) }, { HP_POP(DB->final, HP_DB_final) }, -/* duel */ +/* duel_interface */ { HP_POP(duel->create, HP_duel_create) }, { HP_POP(duel->invite, HP_duel_invite) }, { HP_POP(duel->accept, HP_duel_accept) }, @@ -991,7 +994,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(duel->checktime, HP_duel_checktime) }, { HP_POP(duel->init, HP_duel_init) }, { HP_POP(duel->final, HP_duel_final) }, -/* elemental */ +/* elemental_interface */ { HP_POP(elemental->init, HP_elemental_init) }, { HP_POP(elemental->final, HP_elemental_final) }, { HP_POP(elemental->class, HP_elemental_class) }, @@ -1024,7 +1027,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(elemental->ai_sub_foreachclient, HP_elemental_ai_sub_foreachclient) }, { HP_POP(elemental->ai_timer, HP_elemental_ai_timer) }, { HP_POP(elemental->read_db, HP_elemental_read_db) }, -/* guild */ +/* guild_interface */ { HP_POP(guild->init, HP_guild_init) }, { HP_POP(guild->final, HP_guild_final) }, { HP_POP(guild->skill_get_max, HP_guild_skill_get_max) }, @@ -1111,7 +1114,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(guild->check_member, HP_guild_check_member) }, { HP_POP(guild->get_alliance_count, HP_guild_get_alliance_count) }, { HP_POP(guild->castle_reconnect_sub, HP_guild_castle_reconnect_sub) }, -/* gstorage */ +/* guild_storage_interface */ { HP_POP(gstorage->ensure, HP_gstorage_ensure) }, { HP_POP(gstorage->init, HP_gstorage_init) }, { HP_POP(gstorage->final, HP_gstorage_final) }, @@ -1128,7 +1131,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(gstorage->save, HP_gstorage_save) }, { HP_POP(gstorage->saved, HP_gstorage_saved) }, { HP_POP(gstorage->create, HP_gstorage_create) }, -/* homun */ +/* homunculus_interface */ { HP_POP(homun->init, HP_homun_init) }, { HP_POP(homun->final, HP_homun_final) }, { HP_POP(homun->reload, HP_homun_reload) }, @@ -1176,7 +1179,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(homun->addspiritball, HP_homun_addspiritball) }, { HP_POP(homun->delspiritball, HP_homun_delspiritball) }, { HP_POP(homun->get_intimacy_grade, HP_homun_get_intimacy_grade) }, -/* instance */ +/* instance_interface */ { HP_POP(instance->init, HP_instance_init) }, { HP_POP(instance->final, HP_instance_final) }, { HP_POP(instance->reload, HP_instance_reload) }, @@ -1195,7 +1198,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(instance->set_timeout, HP_instance_set_timeout) }, { HP_POP(instance->valid, HP_instance_valid) }, { HP_POP(instance->destroy_timer, HP_instance_destroy_timer) }, -/* intif */ +/* intif_interface */ { HP_POP(intif->parse, HP_intif_parse) }, { HP_POP(intif->create_pet, HP_intif_create_pet) }, { HP_POP(intif->broadcast, HP_intif_broadcast) }, @@ -1327,7 +1330,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(intif->pRecvHomunculusData, HP_intif_pRecvHomunculusData) }, { HP_POP(intif->pSaveHomunculusOk, HP_intif_pSaveHomunculusOk) }, { HP_POP(intif->pDeleteHomunculusOk, HP_intif_pDeleteHomunculusOk) }, -/* ircbot */ +/* irc_bot_interface */ { HP_POP(ircbot->init, HP_ircbot_init) }, { HP_POP(ircbot->final, HP_ircbot_final) }, { HP_POP(ircbot->parse, HP_ircbot_parse) }, @@ -1337,14 +1340,17 @@ struct HookingPointData HookingPoints[] = { { HP_POP(ircbot->connect_timer, HP_ircbot_connect_timer) }, { HP_POP(ircbot->identify_timer, HP_ircbot_identify_timer) }, { HP_POP(ircbot->join_timer, HP_ircbot_join_timer) }, + { HP_POP(ircbot->queue_timer, HP_ircbot_queue_timer) }, + { HP_POP(ircbot->queue, HP_ircbot_queue) }, { HP_POP(ircbot->send, HP_ircbot_send) }, { HP_POP(ircbot->relay, HP_ircbot_relay) }, { HP_POP(ircbot->pong, HP_ircbot_pong) }, { HP_POP(ircbot->privmsg, HP_ircbot_privmsg) }, + { HP_POP(ircbot->privmsg_ctcp, HP_ircbot_privmsg_ctcp) }, { HP_POP(ircbot->userjoin, HP_ircbot_userjoin) }, { HP_POP(ircbot->userleave, HP_ircbot_userleave) }, { HP_POP(ircbot->usernick, HP_ircbot_usernick) }, -/* itemdb */ +/* itemdb_interface */ { HP_POP(itemdb->init, HP_itemdb_init) }, { HP_POP(itemdb->final, HP_itemdb_final) }, { HP_POP(itemdb->reload, HP_itemdb_reload) }, @@ -1404,7 +1410,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(itemdb->id2combo, HP_itemdb_id2combo) }, { HP_POP(itemdb->is_item_usable, HP_itemdb_is_item_usable) }, { HP_POP(itemdb->lookup_const, HP_itemdb_lookup_const) }, -/* libconfig */ +/* libconfig_interface */ { HP_POP(libconfig->read, HP_libconfig_read) }, { HP_POP(libconfig->write, HP_libconfig_write) }, { HP_POP(libconfig->set_options, HP_libconfig_set_options) }, @@ -1473,7 +1479,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) }, { HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) }, { HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) }, -/* logs */ +/* log_interface */ { HP_POP(logs->pick_pc, HP_logs_pick_pc) }, { HP_POP(logs->pick_mob, HP_logs_pick_mob) }, { HP_POP(logs->zeny, HP_logs_zeny) }, @@ -1496,7 +1502,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(logs->picktype2char, HP_logs_picktype2char) }, { HP_POP(logs->chattype2char, HP_logs_chattype2char) }, { HP_POP(logs->should_log_item, HP_logs_should_log_item) }, -/* mail */ +/* mail_interface */ { HP_POP(mail->clear, HP_mail_clear) }, { HP_POP(mail->removeitem, HP_mail_removeitem) }, { HP_POP(mail->removezeny, HP_mail_removezeny) }, @@ -1506,7 +1512,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mail->openmail, HP_mail_openmail) }, { HP_POP(mail->deliveryfail, HP_mail_deliveryfail) }, { HP_POP(mail->invalid_operation, HP_mail_invalid_operation) }, -/* iMalloc */ +/* malloc_interface */ { HP_POP(iMalloc->init, HP_iMalloc_init) }, { HP_POP(iMalloc->final, HP_iMalloc_final) }, { HP_POP(iMalloc->malloc, HP_iMalloc_malloc) }, @@ -1521,7 +1527,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(iMalloc->usage, HP_iMalloc_usage) }, { HP_POP(iMalloc->post_shutdown, HP_iMalloc_post_shutdown) }, { HP_POP(iMalloc->init_messages, HP_iMalloc_init_messages) }, -/* map */ +/* map_interface */ { HP_POP(map->zone_init, HP_map_zone_init) }, { HP_POP(map->zone_remove, HP_map_zone_remove) }, { HP_POP(map->zone_apply, HP_map_zone_apply) }, @@ -1655,7 +1661,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(map->remove_questinfo, HP_map_remove_questinfo) }, { HP_POP(map->merge_zone, HP_map_merge_zone) }, { HP_POP(map->zone_clear_single, HP_map_zone_clear_single) }, -/* mapindex */ +/* mapindex_interface */ { HP_POP(mapindex->init, HP_mapindex_init) }, { HP_POP(mapindex->final, HP_mapindex_final) }, { HP_POP(mapindex->addmap, HP_mapindex_addmap) }, @@ -1665,7 +1671,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mapindex->name2id, HP_mapindex_name2id) }, { HP_POP(mapindex->id2name, HP_mapindex_id2name) }, { HP_POP(mapindex->check_default, HP_mapindex_check_default) }, -/* mapit */ +/* mapit_interface */ { HP_POP(mapit->alloc, HP_mapit_alloc) }, { HP_POP(mapit->free, HP_mapit_free) }, { HP_POP(mapit->first, HP_mapit_first) }, @@ -1673,7 +1679,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mapit->next, HP_mapit_next) }, { HP_POP(mapit->prev, HP_mapit_prev) }, { HP_POP(mapit->exists, HP_mapit_exists) }, -/* mapreg */ +/* mapreg_interface */ { HP_POP(mapreg->init, HP_mapreg_init) }, { HP_POP(mapreg->final, HP_mapreg_final) }, { HP_POP(mapreg->readreg, HP_mapreg_readreg) }, @@ -1686,7 +1692,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mapreg->destroyreg, HP_mapreg_destroyreg) }, { HP_POP(mapreg->reload, HP_mapreg_reload) }, { HP_POP(mapreg->config_read, HP_mapreg_config_read) }, -/* mercenary */ +/* mercenary_interface */ { HP_POP(mercenary->init, HP_mercenary_init) }, { HP_POP(mercenary->class, HP_mercenary_class) }, { HP_POP(mercenary->get_viewdata, HP_mercenary_get_viewdata) }, @@ -1712,7 +1718,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mercenary->contract_end_timer, HP_mercenary_contract_end_timer) }, { HP_POP(mercenary->read_db_sub, HP_mercenary_read_db_sub) }, { HP_POP(mercenary->read_skill_db_sub, HP_mercenary_read_skill_db_sub) }, -/* mob */ +/* mob_interface */ { HP_POP(mob->init, HP_mob_init) }, { HP_POP(mob->final, HP_mob_final) }, { HP_POP(mob->reload, HP_mob_reload) }, @@ -1816,7 +1822,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mob->load, HP_mob_load) }, { HP_POP(mob->clear_spawninfo, HP_mob_clear_spawninfo) }, { HP_POP(mob->destroy_mob_db, HP_mob_destroy_mob_db) }, -/* npc_chat */ +/* npc_chat_interface */ { HP_POP(npc_chat->sub, HP_npc_chat_sub) }, { HP_POP(npc_chat->finalize, HP_npc_chat_finalize) }, { HP_POP(npc_chat->def_pattern, HP_npc_chat_def_pattern) }, @@ -1826,7 +1832,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(npc_chat->activate_pcreset, HP_npc_chat_activate_pcreset) }, { HP_POP(npc_chat->lookup_pcreset, HP_npc_chat_lookup_pcreset) }, { HP_POP(npc_chat->finalize_pcrematch_entry, HP_npc_chat_finalize_pcrematch_entry) }, -/* npc */ +/* npc_interface */ { HP_POP(npc->init, HP_npc_init) }, { HP_POP(npc->final, HP_npc_final) }, { HP_POP(npc->get_new_npc_id, HP_npc_get_new_npc_id) }, @@ -1937,9 +1943,9 @@ struct HookingPointData HookingPoints[] = { { HP_POP(npc->market_delfromsql_sub, HP_npc_market_delfromsql_sub) }, { HP_POP(npc->db_checkid, HP_npc_db_checkid) }, { HP_POP(npc->secure_timeout_timer, HP_npc_secure_timeout_timer) }, -/* nullpo */ +/* nullpo_interface */ { HP_POP(nullpo->assert_report, HP_nullpo_assert_report) }, -/* party */ +/* party_interface */ { HP_POP(party->init, HP_party_init) }, { HP_POP(party->final, HP_party_final) }, { HP_POP(party->search, HP_party_search) }, @@ -1989,7 +1995,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(party->check_state, HP_party_check_state) }, { HP_POP(party->create_booking_data, HP_party_create_booking_data) }, { HP_POP(party->db_final, HP_party_db_final) }, -/* path */ +/* path_interface */ { HP_POP(path->blownpos, HP_path_blownpos) }, { HP_POP(path->search, HP_path_search) }, { HP_POP(path->search_long, HP_path_search_long) }, @@ -1997,7 +2003,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(path->distance, HP_path_distance) }, { HP_POP(path->check_distance_client, HP_path_check_distance_client) }, { HP_POP(path->distance_client, HP_path_distance_client) }, -/* pcg */ +/* pc_groups_interface */ { HP_POP(pcg->init, HP_pcg_init) }, { HP_POP(pcg->final, HP_pcg_final) }, { HP_POP(pcg->reload, HP_pcg_reload) }, @@ -2009,7 +2015,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pcg->get_name, HP_pcg_get_name) }, { HP_POP(pcg->get_level, HP_pcg_get_level) }, { HP_POP(pcg->get_idx, HP_pcg_get_idx) }, -/* pc */ +/* pc_interface */ { HP_POP(pc->init, HP_pc_init) }, { HP_POP(pc->final, HP_pc_final) }, { HP_POP(pc->get_dummy_sd, HP_pc_get_dummy_sd) }, @@ -2227,7 +2233,9 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pc->check_job_name, HP_pc_check_job_name) }, { HP_POP(pc->update_idle_time, HP_pc_update_idle_time) }, { HP_POP(pc->have_magnifier, HP_pc_have_magnifier) }, -/* libpcre */ + { HP_POP(pc->process_chat_message, HP_pc_process_chat_message) }, + { HP_POP(pc->check_supernovice_call, HP_pc_check_supernovice_call) }, +/* pcre_interface */ { HP_POP(libpcre->compile, HP_libpcre_compile) }, { HP_POP(libpcre->study, HP_libpcre_study) }, { HP_POP(libpcre->exec, HP_libpcre_exec) }, @@ -2236,7 +2244,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libpcre->free_substring, HP_libpcre_free_substring) }, { HP_POP(libpcre->copy_named_substring, HP_libpcre_copy_named_substring) }, { HP_POP(libpcre->get_substring, HP_libpcre_get_substring) }, -/* pet */ +/* pet_interface */ { HP_POP(pet->init, HP_pet_init) }, { HP_POP(pet->final, HP_pet_final) }, { HP_POP(pet->hungry_val, HP_pet_hungry_val) }, @@ -2275,7 +2283,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pet->recovery_timer, HP_pet_recovery_timer) }, { HP_POP(pet->skill_support_timer, HP_pet_skill_support_timer) }, { HP_POP(pet->read_db, HP_pet_read_db) }, -/* quest */ +/* quest_interface */ { HP_POP(quest->init, HP_quest_init) }, { HP_POP(quest->final, HP_quest_final) }, { HP_POP(quest->reload, HP_quest_reload) }, @@ -2291,7 +2299,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(quest->clear, HP_quest_clear) }, { HP_POP(quest->read_db, HP_quest_read_db) }, { HP_POP(quest->read_db_sub, HP_quest_read_db_sub) }, -/* script */ +/* script_interface */ { HP_POP(script->init, HP_script_init) }, { HP_POP(script->final, HP_script_final) }, { HP_POP(script->reload, HP_script_reload) }, @@ -2322,6 +2330,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(script->get_val_instance_num, HP_script_get_val_instance_num) }, { HP_POP(script->get_val2, HP_script_get_val2) }, { HP_POP(script->push_str, HP_script_push_str) }, + { HP_POP(script->push_conststr, HP_script_push_conststr) }, { HP_POP(script->push_copy, HP_script_push_copy) }, { HP_POP(script->pop_stack, HP_script_pop_stack) }, { HP_POP(script->set_constant, HP_script_set_constant) }, @@ -2383,6 +2392,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(script->parse_line, HP_script_parse_line) }, { HP_POP(script->read_constdb, HP_script_read_constdb) }, { HP_POP(script->constdb_comment, HP_script_constdb_comment) }, + { HP_POP(script->load_parameters, HP_script_load_parameters) }, { HP_POP(script->print_line, HP_script_print_line) }, { HP_POP(script->errorwarning_sub, HP_script_errorwarning_sub) }, { HP_POP(script->set_reg, HP_script_set_reg) }, @@ -2459,7 +2469,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(script->run_use_script, HP_script_run_use_script) }, { HP_POP(script->run_item_equip_script, HP_script_run_item_equip_script) }, { HP_POP(script->run_item_unequip_script, HP_script_run_item_unequip_script) }, -/* searchstore */ +/* searchstore_interface */ { HP_POP(searchstore->open, HP_searchstore_open) }, { HP_POP(searchstore->query, HP_searchstore_query) }, { HP_POP(searchstore->querynext, HP_searchstore_querynext) }, @@ -2470,12 +2480,12 @@ struct HookingPointData HookingPoints[] = { { HP_POP(searchstore->queryremote, HP_searchstore_queryremote) }, { HP_POP(searchstore->clearremote, HP_searchstore_clearremote) }, { HP_POP(searchstore->result, HP_searchstore_result) }, -/* showmsg */ +/* showmsg_interface */ { HP_POP(showmsg->init, HP_showmsg_init) }, { HP_POP(showmsg->final, HP_showmsg_final) }, { HP_POP(showmsg->clearScreen, HP_showmsg_clearScreen) }, { HP_POP(showmsg->showMessageV, HP_showmsg_showMessageV) }, -/* skill */ +/* skill_interface */ { HP_POP(skill->init, HP_skill_init) }, { HP_POP(skill->final, HP_skill_final) }, { HP_POP(skill->reload, HP_skill_reload) }, @@ -2693,7 +2703,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(skill->get_requirement_off_unknown, HP_skill_get_requirement_off_unknown) }, { HP_POP(skill->get_requirement_item_unknown, HP_skill_get_requirement_item_unknown) }, { HP_POP(skill->get_requirement_unknown, HP_skill_get_requirement_unknown) }, -/* sockt */ +/* socket_interface */ { HP_POP(sockt->init, HP_sockt_init) }, { HP_POP(sockt->final, HP_sockt_final) }, { HP_POP(sockt->perform, HP_sockt_perform) }, @@ -2722,7 +2732,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sockt->trusted_ip_check, HP_sockt_trusted_ip_check) }, { HP_POP(sockt->net_config_read_sub, HP_sockt_net_config_read_sub) }, { HP_POP(sockt->net_config_read, HP_sockt_net_config_read) }, -/* SQL */ +/* sql_interface */ { HP_POP(SQL->Connect, HP_SQL_Connect) }, { HP_POP(SQL->GetTimeout, HP_SQL_GetTimeout) }, { HP_POP(SQL->GetColumnNames, HP_SQL_GetColumnNames) }, @@ -2755,7 +2765,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(SQL->StmtFreeResult, HP_SQL_StmtFreeResult) }, { HP_POP(SQL->StmtFree, HP_SQL_StmtFree) }, { HP_POP(SQL->StmtShowDebug_, HP_SQL_StmtShowDebug_) }, -/* status */ +/* status_interface */ { HP_POP(status->init, HP_status_init) }, { HP_POP(status->final, HP_status_final) }, { HP_POP(status->get_refine_chance, HP_status_get_refine_chance) }, @@ -2868,7 +2878,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(status->readdb_scconfig, HP_status_readdb_scconfig) }, { HP_POP(status->read_job_db, HP_status_read_job_db) }, { HP_POP(status->read_job_db_sub, HP_status_read_job_db_sub) }, -/* storage */ +/* storage_interface */ { HP_POP(storage->reconnect, HP_storage_reconnect) }, { HP_POP(storage->delitem, HP_storage_delitem) }, { HP_POP(storage->open, HP_storage_open) }, @@ -2882,7 +2892,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(storage->comp_item, HP_storage_comp_item) }, { HP_POP(storage->sortitem, HP_storage_sortitem) }, { HP_POP(storage->reconnect_sub, HP_storage_reconnect_sub) }, -/* StrBuf */ +/* stringbuf_interface */ { HP_POP(StrBuf->Malloc, HP_StrBuf_Malloc) }, { HP_POP(StrBuf->Init, HP_StrBuf_Init) }, { HP_POP(StrBuf->Vprintf, HP_StrBuf_Vprintf) }, @@ -2893,7 +2903,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(StrBuf->Clear, HP_StrBuf_Clear) }, { HP_POP(StrBuf->Destroy, HP_StrBuf_Destroy) }, { HP_POP(StrBuf->Free, HP_StrBuf_Free) }, -/* strlib */ +/* strlib_interface */ { HP_POP(strlib->jstrescape, HP_strlib_jstrescape) }, { HP_POP(strlib->jstrescapecpy, HP_strlib_jstrescapecpy) }, { HP_POP(strlib->jmemescapecpy, HP_strlib_jmemescapecpy) }, @@ -2909,7 +2919,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(strlib->safestrnlen_, HP_strlib_safestrnlen_) }, { HP_POP(strlib->strline_, HP_strlib_strline_) }, { HP_POP(strlib->bin2hex_, HP_strlib_bin2hex_) }, -/* sv */ +/* sv_interface */ { HP_POP(sv->parse_next, HP_sv_parse_next) }, { HP_POP(sv->parse, HP_sv_parse) }, { HP_POP(sv->split, HP_sv_split) }, @@ -2917,7 +2927,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sv->unescape_c, HP_sv_unescape_c) }, { HP_POP(sv->skip_escaped_c, HP_sv_skip_escaped_c) }, { HP_POP(sv->readdb, HP_sv_readdb) }, -/* sysinfo */ +/* sysinfo_interface */ { HP_POP(sysinfo->getpagesize, HP_sysinfo_getpagesize) }, { HP_POP(sysinfo->platform, HP_sysinfo_platform) }, { HP_POP(sysinfo->osversion, HP_sysinfo_osversion) }, @@ -2936,7 +2946,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sysinfo->is_superuser, HP_sysinfo_is_superuser) }, { HP_POP(sysinfo->init, HP_sysinfo_init) }, { HP_POP(sysinfo->final, HP_sysinfo_final) }, -/* timer */ +/* timer_interface */ { HP_POP(timer->gettick, HP_timer_gettick) }, { HP_POP(timer->gettick_nocache, HP_timer_gettick_nocache) }, { HP_POP(timer->add, HP_timer_add) }, @@ -2950,7 +2960,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(timer->perform, HP_timer_perform) }, { HP_POP(timer->init, HP_timer_init) }, { HP_POP(timer->final, HP_timer_final) }, -/* trade */ +/* trade_interface */ { HP_POP(trade->request, HP_trade_request) }, { HP_POP(trade->ack, HP_trade_ack) }, { HP_POP(trade->check_impossible, HP_trade_check_impossible) }, @@ -2960,11 +2970,12 @@ struct HookingPointData HookingPoints[] = { { HP_POP(trade->ok, HP_trade_ok) }, { HP_POP(trade->cancel, HP_trade_cancel) }, { HP_POP(trade->commit, HP_trade_commit) }, -/* unit */ +/* unit_interface */ { HP_POP(unit->init, HP_unit_init) }, { HP_POP(unit->final, HP_unit_final) }, { HP_POP(unit->bl2ud, HP_unit_bl2ud) }, { HP_POP(unit->bl2ud2, HP_unit_bl2ud2) }, + { HP_POP(unit->init_ud, HP_unit_init_ud) }, { HP_POP(unit->attack_timer, HP_unit_attack_timer) }, { HP_POP(unit->walktoxy_timer, HP_unit_walktoxy_timer) }, { HP_POP(unit->walktoxy_sub, HP_unit_walktoxy_sub) }, @@ -3009,7 +3020,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(unit->remove_map_pc, HP_unit_remove_map_pc) }, { HP_POP(unit->free_pc, HP_unit_free_pc) }, { HP_POP(unit->free, HP_unit_free) }, -/* vending */ +/* vending_interface */ { HP_POP(vending->init, HP_vending_init) }, { HP_POP(vending->final, HP_vending_final) }, { HP_POP(vending->close, HP_vending_close) }, diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index f8d5193e1..ab2def6cd 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -23,7 +23,7 @@ * as it will get overwritten. */ -/* HCache */ +/* HCache_interface */ void HP_HCache_init(void) { int hIndex = 0; if( HPMHooks.count.HP_HCache_init_pre ) { @@ -54,11 +54,11 @@ bool HP_HCache_check(const char *file) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_HCache_check_pre ) { - bool (*preHookFunc) (const char *file); + bool (*preHookFunc) (const char **file); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_HCache_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_HCache_check_pre[hIndex].func; - retVal___ = preHookFunc(file); + retVal___ = preHookFunc(&file); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -81,11 +81,11 @@ FILE* HP_HCache_open(const char *file, const char *opt) { int hIndex = 0; FILE* retVal___ = NULL; if( HPMHooks.count.HP_HCache_open_pre ) { - FILE* (*preHookFunc) (const char *file, const char *opt); + FILE* (*preHookFunc) (const char **file, const char **opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_HCache_open_pre[hIndex].func; - retVal___ = preHookFunc(file, opt); + retVal___ = preHookFunc(&file, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -104,7 +104,7 @@ FILE* HP_HCache_open(const char *file, const char *opt) { } return retVal___; } -/* atcommand */ +/* atcommand_interface */ void HP_atcommand_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_init_pre ) { @@ -123,10 +123,10 @@ void HP_atcommand_init(bool minimal) { HPMHooks.source.atcommand.init(minimal); } if( HPMHooks.count.HP_atcommand_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -161,11 +161,11 @@ bool HP_atcommand_exec(const int fd, struct map_session_data *sd, const char *me int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_atcommand_exec_pre ) { - bool (*preHookFunc) (const int *fd, struct map_session_data *sd, const char *message, bool *player_invoked); + bool (*preHookFunc) (const int *fd, struct map_session_data **sd, const char **message, bool *player_invoked); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_exec_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_exec_pre[hIndex].func; - retVal___ = preHookFunc(&fd, sd, message, &player_invoked); + retVal___ = preHookFunc(&fd, &sd, &message, &player_invoked); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -176,10 +176,10 @@ bool HP_atcommand_exec(const int fd, struct map_session_data *sd, const char *me retVal___ = HPMHooks.source.atcommand.exec(fd, sd, message, player_invoked); } if( HPMHooks.count.HP_atcommand_exec_post ) { - bool (*postHookFunc) (bool retVal___, const int *fd, struct map_session_data *sd, const char *message, bool *player_invoked); + bool (*postHookFunc) (bool retVal___, const int fd, struct map_session_data *sd, const char *message, bool player_invoked); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_exec_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_exec_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, sd, message, &player_invoked); + retVal___ = postHookFunc(retVal___, fd, sd, message, player_invoked); } } return retVal___; @@ -188,11 +188,11 @@ bool HP_atcommand_create(char *name, AtCommandFunc func) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_atcommand_create_pre ) { - bool (*preHookFunc) (char *name, AtCommandFunc *func); + bool (*preHookFunc) (char **name, AtCommandFunc *func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_create_pre[hIndex].func; - retVal___ = preHookFunc(name, &func); + retVal___ = preHookFunc(&name, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -203,10 +203,10 @@ bool HP_atcommand_create(char *name, AtCommandFunc func) { retVal___ = HPMHooks.source.atcommand.create(name, func); } if( HPMHooks.count.HP_atcommand_create_post ) { - bool (*postHookFunc) (bool retVal___, char *name, AtCommandFunc *func); + bool (*postHookFunc) (bool retVal___, char *name, AtCommandFunc func); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, &func); + retVal___ = postHookFunc(retVal___, name, func); } } return retVal___; @@ -215,11 +215,11 @@ bool HP_atcommand_can_use(struct map_session_data *sd, const char *command) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_atcommand_can_use_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const char *command); + bool (*preHookFunc) (struct map_session_data **sd, const char **command); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_can_use_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_can_use_pre[hIndex].func; - retVal___ = preHookFunc(sd, command); + retVal___ = preHookFunc(&sd, &command); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -242,11 +242,11 @@ bool HP_atcommand_can_use2(struct map_session_data *sd, const char *command, AtC int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_atcommand_can_use2_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const char *command, AtCommandType *type); + bool (*preHookFunc) (struct map_session_data **sd, const char **command, AtCommandType *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_can_use2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_can_use2_pre[hIndex].func; - retVal___ = preHookFunc(sd, command, &type); + retVal___ = preHookFunc(&sd, &command, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -257,10 +257,10 @@ bool HP_atcommand_can_use2(struct map_session_data *sd, const char *command, AtC retVal___ = HPMHooks.source.atcommand.can_use2(sd, command, type); } if( HPMHooks.count.HP_atcommand_can_use2_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *command, AtCommandType *type); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *command, AtCommandType type); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_can_use2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_can_use2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, command, &type); + retVal___ = postHookFunc(retVal___, sd, command, type); } } return retVal___; @@ -268,11 +268,11 @@ bool HP_atcommand_can_use2(struct map_session_data *sd, const char *command, AtC void HP_atcommand_load_groups(GroupSettings **groups, struct config_setting_t **commands_, size_t sz) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_load_groups_pre ) { - void (*preHookFunc) (GroupSettings **groups, struct config_setting_t **commands_, size_t *sz); + void (*preHookFunc) (GroupSettings ***groups, struct config_setting_t ***commands_, size_t *sz); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_load_groups_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_load_groups_pre[hIndex].func; - preHookFunc(groups, commands_, &sz); + preHookFunc(&groups, &commands_, &sz); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -283,10 +283,10 @@ void HP_atcommand_load_groups(GroupSettings **groups, struct config_setting_t ** HPMHooks.source.atcommand.load_groups(groups, commands_, sz); } if( HPMHooks.count.HP_atcommand_load_groups_post ) { - void (*postHookFunc) (GroupSettings **groups, struct config_setting_t **commands_, size_t *sz); + void (*postHookFunc) (GroupSettings **groups, struct config_setting_t **commands_, size_t sz); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_load_groups_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_load_groups_post[hIndex].func; - postHookFunc(groups, commands_, &sz); + postHookFunc(groups, commands_, sz); } } return; @@ -295,11 +295,11 @@ AtCommandInfo* HP_atcommand_exists(const char *name) { int hIndex = 0; AtCommandInfo* retVal___ = NULL; if( HPMHooks.count.HP_atcommand_exists_pre ) { - AtCommandInfo* (*preHookFunc) (const char *name); + AtCommandInfo* (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_exists_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_exists_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -322,11 +322,11 @@ bool HP_atcommand_msg_read(const char *cfg_name, bool allow_override) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_atcommand_msg_read_pre ) { - bool (*preHookFunc) (const char *cfg_name, bool *allow_override); + bool (*preHookFunc) (const char **cfg_name, bool *allow_override); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msg_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_msg_read_pre[hIndex].func; - retVal___ = preHookFunc(cfg_name, &allow_override); + retVal___ = preHookFunc(&cfg_name, &allow_override); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -337,10 +337,10 @@ bool HP_atcommand_msg_read(const char *cfg_name, bool allow_override) { retVal___ = HPMHooks.source.atcommand.msg_read(cfg_name, allow_override); } if( HPMHooks.count.HP_atcommand_msg_read_post ) { - bool (*postHookFunc) (bool retVal___, const char *cfg_name, bool *allow_override); + bool (*postHookFunc) (bool retVal___, const char *cfg_name, bool allow_override); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msg_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_msg_read_post[hIndex].func; - retVal___ = postHookFunc(retVal___, cfg_name, &allow_override); + retVal___ = postHookFunc(retVal___, cfg_name, allow_override); } } return retVal___; @@ -375,11 +375,11 @@ struct atcmd_binding_data* HP_atcommand_get_bind_byname(const char *name) { int hIndex = 0; struct atcmd_binding_data* retVal___ = NULL; if( HPMHooks.count.HP_atcommand_get_bind_byname_pre ) { - struct atcmd_binding_data* (*preHookFunc) (const char *name); + struct atcmd_binding_data* (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_bind_byname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_get_bind_byname_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -402,11 +402,11 @@ AtCommandInfo* HP_atcommand_get_info_byname(const char *name) { int hIndex = 0; AtCommandInfo* retVal___ = NULL; if( HPMHooks.count.HP_atcommand_get_info_byname_pre ) { - AtCommandInfo* (*preHookFunc) (const char *name); + AtCommandInfo* (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_info_byname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_get_info_byname_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -429,11 +429,11 @@ const char* HP_atcommand_check_alias(const char *aliasname) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_atcommand_check_alias_pre ) { - const char* (*preHookFunc) (const char *aliasname); + const char* (*preHookFunc) (const char **aliasname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_check_alias_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_check_alias_pre[hIndex].func; - retVal___ = preHookFunc(aliasname); + retVal___ = preHookFunc(&aliasname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -455,11 +455,11 @@ const char* HP_atcommand_check_alias(const char *aliasname) { void HP_atcommand_get_suggestions(struct map_session_data *sd, const char *name, bool is_atcmd_cmd) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_get_suggestions_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *name, bool *is_atcmd_cmd); + void (*preHookFunc) (struct map_session_data **sd, const char **name, bool *is_atcmd_cmd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_suggestions_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_get_suggestions_pre[hIndex].func; - preHookFunc(sd, name, &is_atcmd_cmd); + preHookFunc(&sd, &name, &is_atcmd_cmd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -470,10 +470,10 @@ void HP_atcommand_get_suggestions(struct map_session_data *sd, const char *name, HPMHooks.source.atcommand.get_suggestions(sd, name, is_atcmd_cmd); } if( HPMHooks.count.HP_atcommand_get_suggestions_post ) { - void (*postHookFunc) (struct map_session_data *sd, const char *name, bool *is_atcmd_cmd); + void (*postHookFunc) (struct map_session_data *sd, const char *name, bool is_atcmd_cmd); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_suggestions_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_get_suggestions_post[hIndex].func; - postHookFunc(sd, name, &is_atcmd_cmd); + postHookFunc(sd, name, is_atcmd_cmd); } } return; @@ -481,11 +481,11 @@ void HP_atcommand_get_suggestions(struct map_session_data *sd, const char *name, void HP_atcommand_config_read(const char *config_filename) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_config_read_pre ) { - void (*preHookFunc) (const char *config_filename); + void (*preHookFunc) (const char **config_filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_config_read_pre[hIndex].func; - preHookFunc(config_filename); + preHookFunc(&config_filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -508,12 +508,12 @@ int HP_atcommand_stopattack(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_atcommand_stopattack_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_stopattack_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_atcommand_stopattack_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -541,12 +541,12 @@ int HP_atcommand_pvpoff_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_atcommand_pvpoff_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_pvpoff_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_atcommand_pvpoff_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -574,12 +574,12 @@ int HP_atcommand_pvpon_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_atcommand_pvpon_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_pvpon_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_atcommand_pvpon_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -607,12 +607,12 @@ int HP_atcommand_atkillmonster_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_atcommand_atkillmonster_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_atkillmonster_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_atcommand_atkillmonster_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -639,11 +639,11 @@ int HP_atcommand_atkillmonster_sub(struct block_list *bl, va_list ap) { void HP_atcommand_raise_sub(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_raise_sub_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_raise_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_raise_sub_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -665,11 +665,11 @@ void HP_atcommand_raise_sub(struct map_session_data *sd) { void HP_atcommand_get_jail_time(int jailtime, int *year, int *month, int *day, int *hour, int *minute) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_get_jail_time_pre ) { - void (*preHookFunc) (int *jailtime, int *year, int *month, int *day, int *hour, int *minute); + void (*preHookFunc) (int *jailtime, int **year, int **month, int **day, int **hour, int **minute); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_jail_time_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_get_jail_time_pre[hIndex].func; - preHookFunc(&jailtime, year, month, day, hour, minute); + preHookFunc(&jailtime, &year, &month, &day, &hour, &minute); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -680,10 +680,10 @@ void HP_atcommand_get_jail_time(int jailtime, int *year, int *month, int *day, i HPMHooks.source.atcommand.get_jail_time(jailtime, year, month, day, hour, minute); } if( HPMHooks.count.HP_atcommand_get_jail_time_post ) { - void (*postHookFunc) (int *jailtime, int *year, int *month, int *day, int *hour, int *minute); + void (*postHookFunc) (int jailtime, int *year, int *month, int *day, int *hour, int *minute); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_jail_time_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_get_jail_time_post[hIndex].func; - postHookFunc(&jailtime, year, month, day, hour, minute); + postHookFunc(jailtime, year, month, day, hour, minute); } } return; @@ -692,12 +692,12 @@ int HP_atcommand_cleanfloor_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_atcommand_cleanfloor_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_cleanfloor_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_atcommand_cleanfloor_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -725,12 +725,12 @@ int HP_atcommand_mutearea_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_atcommand_mutearea_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_mutearea_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_atcommand_mutearea_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -757,11 +757,11 @@ int HP_atcommand_mutearea_sub(struct block_list *bl, va_list ap) { void HP_atcommand_getring(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_getring_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_getring_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_getring_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -783,11 +783,11 @@ void HP_atcommand_getring(struct map_session_data *sd) { void HP_atcommand_channel_help(int fd, const char *command, bool can_create) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_channel_help_pre ) { - void (*preHookFunc) (int *fd, const char *command, bool *can_create); + void (*preHookFunc) (int *fd, const char **command, bool *can_create); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_channel_help_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_channel_help_pre[hIndex].func; - preHookFunc(&fd, command, &can_create); + preHookFunc(&fd, &command, &can_create); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -798,10 +798,10 @@ void HP_atcommand_channel_help(int fd, const char *command, bool can_create) { HPMHooks.source.atcommand.channel_help(fd, command, can_create); } if( HPMHooks.count.HP_atcommand_channel_help_post ) { - void (*postHookFunc) (int *fd, const char *command, bool *can_create); + void (*postHookFunc) (int fd, const char *command, bool can_create); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_channel_help_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_channel_help_post[hIndex].func; - postHookFunc(&fd, command, &can_create); + postHookFunc(fd, command, can_create); } } return; @@ -809,11 +809,11 @@ void HP_atcommand_channel_help(int fd, const char *command, bool can_create) { void HP_atcommand_commands_sub(struct map_session_data *sd, const int fd, AtCommandType type) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_commands_sub_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const int *fd, AtCommandType *type); + void (*preHookFunc) (struct map_session_data **sd, const int *fd, AtCommandType *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_commands_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_commands_sub_pre[hIndex].func; - preHookFunc(sd, &fd, &type); + preHookFunc(&sd, &fd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -824,10 +824,10 @@ void HP_atcommand_commands_sub(struct map_session_data *sd, const int fd, AtComm HPMHooks.source.atcommand.commands_sub(sd, fd, type); } if( HPMHooks.count.HP_atcommand_commands_sub_post ) { - void (*postHookFunc) (struct map_session_data *sd, const int *fd, AtCommandType *type); + void (*postHookFunc) (struct map_session_data *sd, const int fd, AtCommandType type); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_commands_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_commands_sub_post[hIndex].func; - postHookFunc(sd, &fd, &type); + postHookFunc(sd, fd, type); } } return; @@ -858,16 +858,16 @@ void HP_atcommand_cmd_db_clear(void) { } return; } -int HP_atcommand_cmd_db_clear_sub(DBKey key, DBData *data, va_list args) { +int HP_atcommand_cmd_db_clear_sub(union DBKey key, struct DBData *data, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_atcommand_cmd_db_clear_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list args); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_cmd_db_clear_sub_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_atcommand_cmd_db_clear_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, args___copy); + retVal___ = preHookFunc(&key, &data, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -881,11 +881,11 @@ int HP_atcommand_cmd_db_clear_sub(DBKey key, DBData *data, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_atcommand_cmd_db_clear_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list args); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_cmd_db_clear_sub_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_atcommand_cmd_db_clear_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, args___copy); + retVal___ = postHookFunc(retVal___, key, data, args___copy); va_end(args___copy); } } @@ -947,11 +947,11 @@ bool HP_atcommand_add(char *name, AtCommandFunc func, bool replace) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_atcommand_add_pre ) { - bool (*preHookFunc) (char *name, AtCommandFunc *func, bool *replace); + bool (*preHookFunc) (char **name, AtCommandFunc *func, bool *replace); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_add_pre[hIndex].func; - retVal___ = preHookFunc(name, &func, &replace); + retVal___ = preHookFunc(&name, &func, &replace); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -962,10 +962,10 @@ bool HP_atcommand_add(char *name, AtCommandFunc func, bool replace) { retVal___ = HPMHooks.source.atcommand.add(name, func, replace); } if( HPMHooks.count.HP_atcommand_add_post ) { - bool (*postHookFunc) (bool retVal___, char *name, AtCommandFunc *func, bool *replace); + bool (*postHookFunc) (bool retVal___, char *name, AtCommandFunc func, bool replace); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, &func, &replace); + retVal___ = postHookFunc(retVal___, name, func, replace); } } return retVal___; @@ -989,10 +989,10 @@ const char* HP_atcommand_msg(int msg_number) { retVal___ = HPMHooks.source.atcommand.msg(msg_number); } if( HPMHooks.count.HP_atcommand_msg_post ) { - const char* (*postHookFunc) (const char* retVal___, int *msg_number); + const char* (*postHookFunc) (const char* retVal___, int msg_number); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_msg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &msg_number); + retVal___ = postHookFunc(retVal___, msg_number); } } return retVal___; @@ -1042,10 +1042,10 @@ const char* HP_atcommand_msgfd(int fd, int msg_number) { retVal___ = HPMHooks.source.atcommand.msgfd(fd, msg_number); } if( HPMHooks.count.HP_atcommand_msgfd_post ) { - const char* (*postHookFunc) (const char* retVal___, int *fd, int *msg_number); + const char* (*postHookFunc) (const char* retVal___, int fd, int msg_number); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msgfd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_msgfd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &msg_number); + retVal___ = postHookFunc(retVal___, fd, msg_number); } } return retVal___; @@ -1054,11 +1054,11 @@ const char* HP_atcommand_msgsd(struct map_session_data *sd, int msg_number) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_atcommand_msgsd_pre ) { - const char* (*preHookFunc) (struct map_session_data *sd, int *msg_number); + const char* (*preHookFunc) (struct map_session_data **sd, int *msg_number); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msgsd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_msgsd_pre[hIndex].func; - retVal___ = preHookFunc(sd, &msg_number); + retVal___ = preHookFunc(&sd, &msg_number); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1069,15 +1069,15 @@ const char* HP_atcommand_msgsd(struct map_session_data *sd, int msg_number) { retVal___ = HPMHooks.source.atcommand.msgsd(sd, msg_number); } if( HPMHooks.count.HP_atcommand_msgsd_post ) { - const char* (*postHookFunc) (const char* retVal___, struct map_session_data *sd, int *msg_number); + const char* (*postHookFunc) (const char* retVal___, struct map_session_data *sd, int msg_number); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msgsd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_msgsd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &msg_number); + retVal___ = postHookFunc(retVal___, sd, msg_number); } } return retVal___; } -/* battle */ +/* battle_interface */ void HP_battle_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_battle_init_pre ) { @@ -1096,10 +1096,10 @@ void HP_battle_init(bool minimal) { HPMHooks.source.battle.init(minimal); } if( HPMHooks.count.HP_battle_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -1132,14 +1132,13 @@ void HP_battle_final(void) { } struct Damage HP_battle_calc_attack(int attack_type, struct block_list *bl, struct block_list *target, uint16 skill_id, uint16 skill_lv, int count) { int hIndex = 0; - struct Damage retVal___; - memset(&retVal___, '\0', sizeof(struct Damage)); + struct Damage retVal___ = { 0 }; if( HPMHooks.count.HP_battle_calc_attack_pre ) { - struct Damage (*preHookFunc) (int *attack_type, struct block_list *bl, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *count); + struct Damage (*preHookFunc) (int *attack_type, struct block_list **bl, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_attack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_attack_pre[hIndex].func; - retVal___ = preHookFunc(&attack_type, bl, target, &skill_id, &skill_lv, &count); + retVal___ = preHookFunc(&attack_type, &bl, &target, &skill_id, &skill_lv, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1150,10 +1149,10 @@ struct Damage HP_battle_calc_attack(int attack_type, struct block_list *bl, stru retVal___ = HPMHooks.source.battle.calc_attack(attack_type, bl, target, skill_id, skill_lv, count); } if( HPMHooks.count.HP_battle_calc_attack_post ) { - struct Damage (*postHookFunc) (struct Damage retVal___, int *attack_type, struct block_list *bl, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *count); + struct Damage (*postHookFunc) (struct Damage retVal___, int attack_type, struct block_list *bl, struct block_list *target, uint16 skill_id, uint16 skill_lv, int count); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_attack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_attack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &attack_type, bl, target, &skill_id, &skill_lv, &count); + retVal___ = postHookFunc(retVal___, attack_type, bl, target, skill_id, skill_lv, count); } } return retVal___; @@ -1162,11 +1161,11 @@ int64 HP_battle_calc_damage(struct block_list *src, struct block_list *bl, struc int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_damage_pre ) { - int64 (*preHookFunc) (struct block_list *src, struct block_list *bl, struct Damage *d, int64 *damage, uint16 *skill_id, uint16 *skill_lv); + int64 (*preHookFunc) (struct block_list **src, struct block_list **bl, struct Damage **d, int64 *damage, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_damage_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, d, &damage, &skill_id, &skill_lv); + retVal___ = preHookFunc(&src, &bl, &d, &damage, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1177,10 +1176,10 @@ int64 HP_battle_calc_damage(struct block_list *src, struct block_list *bl, struc retVal___ = HPMHooks.source.battle.calc_damage(src, bl, d, damage, skill_id, skill_lv); } if( HPMHooks.count.HP_battle_calc_damage_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, struct Damage *d, int64 *damage, uint16 *skill_id, uint16 *skill_lv); + int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, struct Damage *d, int64 damage, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, d, &damage, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, src, bl, d, damage, skill_id, skill_lv); } } return retVal___; @@ -1189,11 +1188,11 @@ int64 HP_battle_calc_gvg_damage(struct block_list *src, struct block_list *bl, i int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_gvg_damage_pre ) { - int64 (*preHookFunc) (struct block_list *src, struct block_list *bl, int64 *damage, int *div_, uint16 *skill_id, uint16 *skill_lv, int *flag); + int64 (*preHookFunc) (struct block_list **src, struct block_list **bl, int64 *damage, int *div_, uint16 *skill_id, uint16 *skill_lv, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_gvg_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_gvg_damage_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &damage, &div_, &skill_id, &skill_lv, &flag); + retVal___ = preHookFunc(&src, &bl, &damage, &div_, &skill_id, &skill_lv, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1204,10 +1203,10 @@ int64 HP_battle_calc_gvg_damage(struct block_list *src, struct block_list *bl, i retVal___ = HPMHooks.source.battle.calc_gvg_damage(src, bl, damage, div_, skill_id, skill_lv, flag); } if( HPMHooks.count.HP_battle_calc_gvg_damage_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, int64 *damage, int *div_, uint16 *skill_id, uint16 *skill_lv, int *flag); + int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, int64 damage, int div_, uint16 skill_id, uint16 skill_lv, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_gvg_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_gvg_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &damage, &div_, &skill_id, &skill_lv, &flag); + retVal___ = postHookFunc(retVal___, src, bl, damage, div_, skill_id, skill_lv, flag); } } return retVal___; @@ -1216,11 +1215,11 @@ int64 HP_battle_calc_bg_damage(struct block_list *src, struct block_list *bl, in int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_bg_damage_pre ) { - int64 (*preHookFunc) (struct block_list *src, struct block_list *bl, int64 *damage, int *div_, uint16 *skill_id, uint16 *skill_lv, int *flag); + int64 (*preHookFunc) (struct block_list **src, struct block_list **bl, int64 *damage, int *div_, uint16 *skill_id, uint16 *skill_lv, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_bg_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_bg_damage_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &damage, &div_, &skill_id, &skill_lv, &flag); + retVal___ = preHookFunc(&src, &bl, &damage, &div_, &skill_id, &skill_lv, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1231,10 +1230,10 @@ int64 HP_battle_calc_bg_damage(struct block_list *src, struct block_list *bl, in retVal___ = HPMHooks.source.battle.calc_bg_damage(src, bl, damage, div_, skill_id, skill_lv, flag); } if( HPMHooks.count.HP_battle_calc_bg_damage_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, int64 *damage, int *div_, uint16 *skill_id, uint16 *skill_lv, int *flag); + int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, int64 damage, int div_, uint16 skill_id, uint16 skill_lv, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_bg_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_bg_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &damage, &div_, &skill_id, &skill_lv, &flag); + retVal___ = postHookFunc(retVal___, src, bl, damage, div_, skill_id, skill_lv, flag); } } return retVal___; @@ -1243,11 +1242,11 @@ enum damage_lv HP_battle_weapon_attack(struct block_list *bl, struct block_list int hIndex = 0; enum damage_lv retVal___ = ATK_NONE; if( HPMHooks.count.HP_battle_weapon_attack_pre ) { - enum damage_lv (*preHookFunc) (struct block_list *bl, struct block_list *target, int64 *tick, int *flag); + enum damage_lv (*preHookFunc) (struct block_list **bl, struct block_list **target, int64 *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_weapon_attack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_weapon_attack_pre[hIndex].func; - retVal___ = preHookFunc(bl, target, &tick, &flag); + retVal___ = preHookFunc(&bl, &target, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1258,24 +1257,23 @@ enum damage_lv HP_battle_weapon_attack(struct block_list *bl, struct block_list retVal___ = HPMHooks.source.battle.weapon_attack(bl, target, tick, flag); } if( HPMHooks.count.HP_battle_weapon_attack_post ) { - enum damage_lv (*postHookFunc) (enum damage_lv retVal___, struct block_list *bl, struct block_list *target, int64 *tick, int *flag); + enum damage_lv (*postHookFunc) (enum damage_lv retVal___, struct block_list *bl, struct block_list *target, int64 tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_weapon_attack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_weapon_attack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, target, &tick, &flag); + retVal___ = postHookFunc(retVal___, bl, target, tick, flag); } } return retVal___; } struct Damage HP_battle_calc_weapon_attack(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int wflag) { int hIndex = 0; - struct Damage retVal___; - memset(&retVal___, '\0', sizeof(struct Damage)); + struct Damage retVal___ = { 0 }; if( HPMHooks.count.HP_battle_calc_weapon_attack_pre ) { - struct Damage (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *wflag); + struct Damage (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *wflag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_weapon_attack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_weapon_attack_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &skill_id, &skill_lv, &wflag); + retVal___ = preHookFunc(&src, &target, &skill_id, &skill_lv, &wflag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1286,10 +1284,10 @@ struct Damage HP_battle_calc_weapon_attack(struct block_list *src, struct block_ retVal___ = HPMHooks.source.battle.calc_weapon_attack(src, target, skill_id, skill_lv, wflag); } if( HPMHooks.count.HP_battle_calc_weapon_attack_post ) { - struct Damage (*postHookFunc) (struct Damage retVal___, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *wflag); + struct Damage (*postHookFunc) (struct Damage retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int wflag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_weapon_attack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_weapon_attack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &skill_id, &skill_lv, &wflag); + retVal___ = postHookFunc(retVal___, src, target, skill_id, skill_lv, wflag); } } return retVal___; @@ -1298,11 +1296,11 @@ int HP_battle_delay_damage(int64 tick, int amotion, struct block_list *src, stru int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_delay_damage_pre ) { - int (*preHookFunc) (int64 *tick, int *amotion, struct block_list *src, struct block_list *target, int *attack_type, uint16 *skill_id, uint16 *skill_lv, int64 *damage, enum damage_lv *dmg_lv, int *ddelay, bool *additional_effects); + int (*preHookFunc) (int64 *tick, int *amotion, struct block_list **src, struct block_list **target, int *attack_type, uint16 *skill_id, uint16 *skill_lv, int64 *damage, enum damage_lv *dmg_lv, int *ddelay, bool *additional_effects); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_delay_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_delay_damage_pre[hIndex].func; - retVal___ = preHookFunc(&tick, &amotion, src, target, &attack_type, &skill_id, &skill_lv, &damage, &dmg_lv, &ddelay, &additional_effects); + retVal___ = preHookFunc(&tick, &amotion, &src, &target, &attack_type, &skill_id, &skill_lv, &damage, &dmg_lv, &ddelay, &additional_effects); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1313,10 +1311,10 @@ int HP_battle_delay_damage(int64 tick, int amotion, struct block_list *src, stru retVal___ = HPMHooks.source.battle.delay_damage(tick, amotion, src, target, attack_type, skill_id, skill_lv, damage, dmg_lv, ddelay, additional_effects); } if( HPMHooks.count.HP_battle_delay_damage_post ) { - int (*postHookFunc) (int retVal___, int64 *tick, int *amotion, struct block_list *src, struct block_list *target, int *attack_type, uint16 *skill_id, uint16 *skill_lv, int64 *damage, enum damage_lv *dmg_lv, int *ddelay, bool *additional_effects); + int (*postHookFunc) (int retVal___, int64 tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, uint16 skill_id, uint16 skill_lv, int64 damage, enum damage_lv dmg_lv, int ddelay, bool additional_effects); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_delay_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_delay_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick, &amotion, src, target, &attack_type, &skill_id, &skill_lv, &damage, &dmg_lv, &ddelay, &additional_effects); + retVal___ = postHookFunc(retVal___, tick, amotion, src, target, attack_type, skill_id, skill_lv, damage, dmg_lv, ddelay, additional_effects); } } return retVal___; @@ -1324,11 +1322,11 @@ int HP_battle_delay_damage(int64 tick, int amotion, struct block_list *src, stru void HP_battle_drain(struct map_session_data *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int boss) { int hIndex = 0; if( HPMHooks.count.HP_battle_drain_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct block_list *tbl, int64 *rdamage, int64 *ldamage, int *race, int *boss); + void (*preHookFunc) (struct map_session_data **sd, struct block_list **tbl, int64 *rdamage, int64 *ldamage, int *race, int *boss); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_drain_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_drain_pre[hIndex].func; - preHookFunc(sd, tbl, &rdamage, &ldamage, &race, &boss); + preHookFunc(&sd, &tbl, &rdamage, &ldamage, &race, &boss); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1339,10 +1337,10 @@ void HP_battle_drain(struct map_session_data *sd, struct block_list *tbl, int64 HPMHooks.source.battle.drain(sd, tbl, rdamage, ldamage, race, boss); } if( HPMHooks.count.HP_battle_drain_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct block_list *tbl, int64 *rdamage, int64 *ldamage, int *race, int *boss); + void (*postHookFunc) (struct map_session_data *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int boss); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_drain_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_drain_post[hIndex].func; - postHookFunc(sd, tbl, &rdamage, &ldamage, &race, &boss); + postHookFunc(sd, tbl, rdamage, ldamage, race, boss); } } return; @@ -1350,11 +1348,11 @@ void HP_battle_drain(struct map_session_data *sd, struct block_list *tbl, int64 void HP_battle_reflect_damage(struct block_list *target, struct block_list *src, struct Damage *wd, uint16 skill_id) { int hIndex = 0; if( HPMHooks.count.HP_battle_reflect_damage_pre ) { - void (*preHookFunc) (struct block_list *target, struct block_list *src, struct Damage *wd, uint16 *skill_id); + void (*preHookFunc) (struct block_list **target, struct block_list **src, struct Damage **wd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_reflect_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_reflect_damage_pre[hIndex].func; - preHookFunc(target, src, wd, &skill_id); + preHookFunc(&target, &src, &wd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1365,10 +1363,10 @@ void HP_battle_reflect_damage(struct block_list *target, struct block_list *src, HPMHooks.source.battle.reflect_damage(target, src, wd, skill_id); } if( HPMHooks.count.HP_battle_reflect_damage_post ) { - void (*postHookFunc) (struct block_list *target, struct block_list *src, struct Damage *wd, uint16 *skill_id); + void (*postHookFunc) (struct block_list *target, struct block_list *src, struct Damage *wd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_reflect_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_reflect_damage_post[hIndex].func; - postHookFunc(target, src, wd, &skill_id); + postHookFunc(target, src, wd, skill_id); } } return; @@ -1392,10 +1390,10 @@ int HP_battle_attr_ratio(int atk_elem, int def_type, int def_lv) { retVal___ = HPMHooks.source.battle.attr_ratio(atk_elem, def_type, def_lv); } if( HPMHooks.count.HP_battle_attr_ratio_post ) { - int (*postHookFunc) (int retVal___, int *atk_elem, int *def_type, int *def_lv); + int (*postHookFunc) (int retVal___, int atk_elem, int def_type, int def_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_attr_ratio_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_attr_ratio_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &atk_elem, &def_type, &def_lv); + retVal___ = postHookFunc(retVal___, atk_elem, def_type, def_lv); } } return retVal___; @@ -1404,11 +1402,11 @@ int64 HP_battle_attr_fix(struct block_list *src, struct block_list *target, int6 int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_attr_fix_pre ) { - int64 (*preHookFunc) (struct block_list *src, struct block_list *target, int64 *damage, int *atk_elem, int *def_type, int *def_lv); + int64 (*preHookFunc) (struct block_list **src, struct block_list **target, int64 *damage, int *atk_elem, int *def_type, int *def_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_attr_fix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_attr_fix_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &damage, &atk_elem, &def_type, &def_lv); + retVal___ = preHookFunc(&src, &target, &damage, &atk_elem, &def_type, &def_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1419,10 +1417,10 @@ int64 HP_battle_attr_fix(struct block_list *src, struct block_list *target, int6 retVal___ = HPMHooks.source.battle.attr_fix(src, target, damage, atk_elem, def_type, def_lv); } if( HPMHooks.count.HP_battle_attr_fix_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *target, int64 *damage, int *atk_elem, int *def_type, int *def_lv); + int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *target, int64 damage, int atk_elem, int def_type, int def_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_attr_fix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_attr_fix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &damage, &atk_elem, &def_type, &def_lv); + retVal___ = postHookFunc(retVal___, src, target, damage, atk_elem, def_type, def_lv); } } return retVal___; @@ -1431,11 +1429,11 @@ int64 HP_battle_calc_cardfix(int attack_type, struct block_list *src, struct blo int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_cardfix_pre ) { - int64 (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *target, int *nk, int *s_ele, int *s_ele_, int64 *damage, int *left, int *flag); + int64 (*preHookFunc) (int *attack_type, struct block_list **src, struct block_list **target, int *nk, int *s_ele, int *s_ele_, int64 *damage, int *left, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_cardfix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_cardfix_pre[hIndex].func; - retVal___ = preHookFunc(&attack_type, src, target, &nk, &s_ele, &s_ele_, &damage, &left, &flag); + retVal___ = preHookFunc(&attack_type, &src, &target, &nk, &s_ele, &s_ele_, &damage, &left, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1446,10 +1444,10 @@ int64 HP_battle_calc_cardfix(int attack_type, struct block_list *src, struct blo retVal___ = HPMHooks.source.battle.calc_cardfix(attack_type, src, target, nk, s_ele, s_ele_, damage, left, flag); } if( HPMHooks.count.HP_battle_calc_cardfix_post ) { - int64 (*postHookFunc) (int64 retVal___, int *attack_type, struct block_list *src, struct block_list *target, int *nk, int *s_ele, int *s_ele_, int64 *damage, int *left, int *flag); + int64 (*postHookFunc) (int64 retVal___, int attack_type, struct block_list *src, struct block_list *target, int nk, int s_ele, int s_ele_, int64 damage, int left, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_cardfix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_cardfix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &attack_type, src, target, &nk, &s_ele, &s_ele_, &damage, &left, &flag); + retVal___ = postHookFunc(retVal___, attack_type, src, target, nk, s_ele, s_ele_, damage, left, flag); } } return retVal___; @@ -1458,11 +1456,11 @@ int64 HP_battle_calc_cardfix2(struct block_list *src, struct block_list *bl, int int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_cardfix2_pre ) { - int64 (*preHookFunc) (struct block_list *src, struct block_list *bl, int64 *damage, int *s_ele, int *nk, int *flag); + int64 (*preHookFunc) (struct block_list **src, struct block_list **bl, int64 *damage, int *s_ele, int *nk, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_cardfix2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_cardfix2_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &damage, &s_ele, &nk, &flag); + retVal___ = preHookFunc(&src, &bl, &damage, &s_ele, &nk, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1473,10 +1471,10 @@ int64 HP_battle_calc_cardfix2(struct block_list *src, struct block_list *bl, int retVal___ = HPMHooks.source.battle.calc_cardfix2(src, bl, damage, s_ele, nk, flag); } if( HPMHooks.count.HP_battle_calc_cardfix2_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, int64 *damage, int *s_ele, int *nk, int *flag); + int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, int64 damage, int s_ele, int nk, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_cardfix2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_cardfix2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &damage, &s_ele, &nk, &flag); + retVal___ = postHookFunc(retVal___, src, bl, damage, s_ele, nk, flag); } } return retVal___; @@ -1485,11 +1483,11 @@ int64 HP_battle_calc_elefix(struct block_list *src, struct block_list *target, u int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_elefix_pre ) { - int64 (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *nk, int *n_ele, int *s_ele, int *s_ele_, bool *left, int *flag); + int64 (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *nk, int *n_ele, int *s_ele, int *s_ele_, bool *left, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_elefix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_elefix_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &skill_id, &skill_lv, &damage, &nk, &n_ele, &s_ele, &s_ele_, &left, &flag); + retVal___ = preHookFunc(&src, &target, &skill_id, &skill_lv, &damage, &nk, &n_ele, &s_ele, &s_ele_, &left, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1500,10 +1498,10 @@ int64 HP_battle_calc_elefix(struct block_list *src, struct block_list *target, u retVal___ = HPMHooks.source.battle.calc_elefix(src, target, skill_id, skill_lv, damage, nk, n_ele, s_ele, s_ele_, left, flag); } if( HPMHooks.count.HP_battle_calc_elefix_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *nk, int *n_ele, int *s_ele, int *s_ele_, bool *left, int *flag); + int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int nk, int n_ele, int s_ele, int s_ele_, bool left, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_elefix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_elefix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &skill_id, &skill_lv, &damage, &nk, &n_ele, &s_ele, &s_ele_, &left, &flag); + retVal___ = postHookFunc(retVal___, src, target, skill_id, skill_lv, damage, nk, n_ele, s_ele, s_ele_, left, flag); } } return retVal___; @@ -1512,11 +1510,11 @@ int64 HP_battle_calc_masteryfix(struct block_list *src, struct block_list *targe int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_masteryfix_pre ) { - int64 (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *div, bool *left, bool *weapon); + int64 (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *div, bool *left, bool *weapon); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_masteryfix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_masteryfix_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &skill_id, &skill_lv, &damage, &div, &left, &weapon); + retVal___ = preHookFunc(&src, &target, &skill_id, &skill_lv, &damage, &div, &left, &weapon); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1527,10 +1525,10 @@ int64 HP_battle_calc_masteryfix(struct block_list *src, struct block_list *targe retVal___ = HPMHooks.source.battle.calc_masteryfix(src, target, skill_id, skill_lv, damage, div, left, weapon); } if( HPMHooks.count.HP_battle_calc_masteryfix_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *div, bool *left, bool *weapon); + int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int div, bool left, bool weapon); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_masteryfix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_masteryfix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &skill_id, &skill_lv, &damage, &div, &left, &weapon); + retVal___ = postHookFunc(retVal___, src, target, skill_id, skill_lv, damage, div, left, weapon); } } return retVal___; @@ -1539,11 +1537,11 @@ int HP_battle_calc_chorusbonus(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_calc_chorusbonus_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_chorusbonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_chorusbonus_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1566,11 +1564,11 @@ int HP_battle_calc_skillratio(int attack_type, struct block_list *src, struct bl int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_calc_skillratio_pre ) { - int (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag); + int (*preHookFunc) (int *attack_type, struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_skillratio_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_skillratio_pre[hIndex].func; - retVal___ = preHookFunc(&attack_type, src, target, &skill_id, &skill_lv, &skillratio, &flag); + retVal___ = preHookFunc(&attack_type, &src, &target, &skill_id, &skill_lv, &skillratio, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1581,10 +1579,10 @@ int HP_battle_calc_skillratio(int attack_type, struct block_list *src, struct bl retVal___ = HPMHooks.source.battle.calc_skillratio(attack_type, src, target, skill_id, skill_lv, skillratio, flag); } if( HPMHooks.count.HP_battle_calc_skillratio_post ) { - int (*postHookFunc) (int retVal___, int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag); + int (*postHookFunc) (int retVal___, int attack_type, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int skillratio, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_skillratio_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_skillratio_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &attack_type, src, target, &skill_id, &skill_lv, &skillratio, &flag); + retVal___ = postHookFunc(retVal___, attack_type, src, target, skill_id, skill_lv, skillratio, flag); } } return retVal___; @@ -1593,11 +1591,11 @@ int64 HP_battle_calc_sizefix(struct map_session_data *sd, int64 damage, int type int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_sizefix_pre ) { - int64 (*preHookFunc) (struct map_session_data *sd, int64 *damage, int *type, int *size, bool *ignore); + int64 (*preHookFunc) (struct map_session_data **sd, int64 *damage, int *type, int *size, bool *ignore); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_sizefix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_sizefix_pre[hIndex].func; - retVal___ = preHookFunc(sd, &damage, &type, &size, &ignore); + retVal___ = preHookFunc(&sd, &damage, &type, &size, &ignore); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1608,10 +1606,10 @@ int64 HP_battle_calc_sizefix(struct map_session_data *sd, int64 damage, int type retVal___ = HPMHooks.source.battle.calc_sizefix(sd, damage, type, size, ignore); } if( HPMHooks.count.HP_battle_calc_sizefix_post ) { - int64 (*postHookFunc) (int64 retVal___, struct map_session_data *sd, int64 *damage, int *type, int *size, bool *ignore); + int64 (*postHookFunc) (int64 retVal___, struct map_session_data *sd, int64 damage, int type, int size, bool ignore); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_sizefix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_sizefix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &damage, &type, &size, &ignore); + retVal___ = postHookFunc(retVal___, sd, damage, type, size, ignore); } } return retVal___; @@ -1620,11 +1618,11 @@ int64 HP_battle_calc_weapon_damage(struct block_list *src, struct block_list *bl int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_weapon_damage_pre ) { - int64 (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, struct weapon_atk *watk, int *nk, bool *n_ele, short *s_ele, short *s_ele_, int *size, int *type, int *flag, int *flag2); + int64 (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, struct weapon_atk **watk, int *nk, bool *n_ele, short *s_ele, short *s_ele_, int *size, int *type, int *flag, int *flag2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_weapon_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_weapon_damage_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &skill_id, &skill_lv, watk, &nk, &n_ele, &s_ele, &s_ele_, &size, &type, &flag, &flag2); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &watk, &nk, &n_ele, &s_ele, &s_ele_, &size, &type, &flag, &flag2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1635,10 +1633,10 @@ int64 HP_battle_calc_weapon_damage(struct block_list *src, struct block_list *bl retVal___ = HPMHooks.source.battle.calc_weapon_damage(src, bl, skill_id, skill_lv, watk, nk, n_ele, s_ele, s_ele_, size, type, flag, flag2); } if( HPMHooks.count.HP_battle_calc_weapon_damage_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, struct weapon_atk *watk, int *nk, bool *n_ele, short *s_ele, short *s_ele_, int *size, int *type, int *flag, int *flag2); + int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, struct weapon_atk *watk, int nk, bool n_ele, short s_ele, short s_ele_, int size, int type, int flag, int flag2); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_weapon_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_weapon_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &skill_id, &skill_lv, watk, &nk, &n_ele, &s_ele, &s_ele_, &size, &type, &flag, &flag2); + retVal___ = postHookFunc(retVal___, src, bl, skill_id, skill_lv, watk, nk, n_ele, s_ele, s_ele_, size, type, flag, flag2); } } return retVal___; @@ -1647,11 +1645,11 @@ int64 HP_battle_calc_defense(int attack_type, struct block_list *src, struct blo int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_defense_pre ) { - int64 (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *flag, int *pdef); + int64 (*preHookFunc) (int *attack_type, struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *flag, int *pdef); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_defense_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_defense_pre[hIndex].func; - retVal___ = preHookFunc(&attack_type, src, target, &skill_id, &skill_lv, &damage, &flag, &pdef); + retVal___ = preHookFunc(&attack_type, &src, &target, &skill_id, &skill_lv, &damage, &flag, &pdef); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1662,10 +1660,10 @@ int64 HP_battle_calc_defense(int attack_type, struct block_list *src, struct blo retVal___ = HPMHooks.source.battle.calc_defense(attack_type, src, target, skill_id, skill_lv, damage, flag, pdef); } if( HPMHooks.count.HP_battle_calc_defense_post ) { - int64 (*postHookFunc) (int64 retVal___, int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *flag, int *pdef); + int64 (*postHookFunc) (int64 retVal___, int attack_type, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int flag, int pdef); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_defense_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_defense_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &attack_type, src, target, &skill_id, &skill_lv, &damage, &flag, &pdef); + retVal___ = postHookFunc(retVal___, attack_type, src, target, skill_id, skill_lv, damage, flag, pdef); } } return retVal___; @@ -1674,11 +1672,11 @@ struct block_list* HP_battle_get_master(struct block_list *src) { int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_battle_get_master_pre ) { - struct block_list* (*preHookFunc) (struct block_list *src); + struct block_list* (*preHookFunc) (struct block_list **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_master_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_get_master_pre[hIndex].func; - retVal___ = preHookFunc(src); + retVal___ = preHookFunc(&src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1701,11 +1699,11 @@ struct block_list* HP_battle_get_targeted(struct block_list *target) { int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_battle_get_targeted_pre ) { - struct block_list* (*preHookFunc) (struct block_list *target); + struct block_list* (*preHookFunc) (struct block_list **target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_targeted_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_get_targeted_pre[hIndex].func; - retVal___ = preHookFunc(target); + retVal___ = preHookFunc(&target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1728,11 +1726,11 @@ struct block_list* HP_battle_get_enemy(struct block_list *target, int type, int int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_battle_get_enemy_pre ) { - struct block_list* (*preHookFunc) (struct block_list *target, int *type, int *range); + struct block_list* (*preHookFunc) (struct block_list **target, int *type, int *range); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_get_enemy_pre[hIndex].func; - retVal___ = preHookFunc(target, &type, &range); + retVal___ = preHookFunc(&target, &type, &range); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1743,10 +1741,10 @@ struct block_list* HP_battle_get_enemy(struct block_list *target, int type, int retVal___ = HPMHooks.source.battle.get_enemy(target, type, range); } if( HPMHooks.count.HP_battle_get_enemy_post ) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct block_list *target, int *type, int *range); + struct block_list* (*postHookFunc) (struct block_list* retVal___, struct block_list *target, int type, int range); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_get_enemy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, target, &type, &range); + retVal___ = postHookFunc(retVal___, target, type, range); } } return retVal___; @@ -1755,11 +1753,11 @@ int HP_battle_get_target(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_get_target_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_target_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_get_target_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1782,11 +1780,11 @@ int HP_battle_get_current_skill(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_get_current_skill_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_current_skill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_get_current_skill_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1824,10 +1822,10 @@ bool HP_battle_check_undead(int race, int element) { retVal___ = HPMHooks.source.battle.check_undead(race, element); } if( HPMHooks.count.HP_battle_check_undead_post ) { - bool (*postHookFunc) (bool retVal___, int *race, int *element); + bool (*postHookFunc) (bool retVal___, int race, int element); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_check_undead_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_check_undead_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &race, &element); + retVal___ = postHookFunc(retVal___, race, element); } } return retVal___; @@ -1836,11 +1834,11 @@ int HP_battle_check_target(struct block_list *src, struct block_list *target, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_check_target_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **target, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_check_target_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_check_target_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &flag); + retVal___ = preHookFunc(&src, &target, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1851,10 +1849,10 @@ int HP_battle_check_target(struct block_list *src, struct block_list *target, in retVal___ = HPMHooks.source.battle.check_target(src, target, flag); } if( HPMHooks.count.HP_battle_check_target_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_check_target_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_check_target_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &flag); + retVal___ = postHookFunc(retVal___, src, target, flag); } } return retVal___; @@ -1863,11 +1861,11 @@ bool HP_battle_check_range(struct block_list *src, struct block_list *bl, int ra int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_battle_check_range_pre ) { - bool (*preHookFunc) (struct block_list *src, struct block_list *bl, int *range); + bool (*preHookFunc) (struct block_list **src, struct block_list **bl, int *range); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_check_range_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_check_range_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &range); + retVal___ = preHookFunc(&src, &bl, &range); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1878,10 +1876,10 @@ bool HP_battle_check_range(struct block_list *src, struct block_list *bl, int ra retVal___ = HPMHooks.source.battle.check_range(src, bl, range); } if( HPMHooks.count.HP_battle_check_range_post ) { - bool (*postHookFunc) (bool retVal___, struct block_list *src, struct block_list *bl, int *range); + bool (*postHookFunc) (bool retVal___, struct block_list *src, struct block_list *bl, int range); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_check_range_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_check_range_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &range); + retVal___ = postHookFunc(retVal___, src, bl, range); } } return retVal___; @@ -1889,11 +1887,11 @@ bool HP_battle_check_range(struct block_list *src, struct block_list *bl, int ra void HP_battle_consume_ammo(struct map_session_data *sd, int skill_id, int lv) { int hIndex = 0; if( HPMHooks.count.HP_battle_consume_ammo_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *skill_id, int *lv); + void (*preHookFunc) (struct map_session_data **sd, int *skill_id, int *lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_consume_ammo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_consume_ammo_pre[hIndex].func; - preHookFunc(sd, &skill_id, &lv); + preHookFunc(&sd, &skill_id, &lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -1904,10 +1902,10 @@ void HP_battle_consume_ammo(struct map_session_data *sd, int skill_id, int lv) { HPMHooks.source.battle.consume_ammo(sd, skill_id, lv); } if( HPMHooks.count.HP_battle_consume_ammo_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *skill_id, int *lv); + void (*postHookFunc) (struct map_session_data *sd, int skill_id, int lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_consume_ammo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_consume_ammo_post[hIndex].func; - postHookFunc(sd, &skill_id, &lv); + postHookFunc(sd, skill_id, lv); } } return; @@ -1916,12 +1914,12 @@ int HP_battle_get_targeted_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_get_targeted_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_targeted_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_battle_get_targeted_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -1949,12 +1947,12 @@ int HP_battle_get_enemy_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_get_enemy_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_battle_get_enemy_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -1982,12 +1980,12 @@ int HP_battle_get_enemy_area_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_get_enemy_area_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_area_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_battle_get_enemy_area_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -2030,10 +2028,10 @@ int HP_battle_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.battle.delay_damage_sub(tid, tick, id, data); } if( HPMHooks.count.HP_battle_delay_damage_sub_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_delay_damage_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_delay_damage_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -2042,11 +2040,11 @@ int HP_battle_blewcount_bonus(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_blewcount_bonus_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_blewcount_bonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_blewcount_bonus_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id); + retVal___ = preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2057,10 +2055,10 @@ int HP_battle_blewcount_bonus(struct map_session_data *sd, uint16 skill_id) { retVal___ = HPMHooks.source.battle.blewcount_bonus(sd, skill_id); } if( HPMHooks.count.HP_battle_blewcount_bonus_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_blewcount_bonus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_blewcount_bonus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id); + retVal___ = postHookFunc(retVal___, sd, skill_id); } } return retVal___; @@ -2069,11 +2067,11 @@ int HP_battle_range_type(struct block_list *src, struct block_list *target, uint int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_range_type_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_range_type_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_range_type_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &skill_id, &skill_lv); + retVal___ = preHookFunc(&src, &target, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2084,10 +2082,10 @@ int HP_battle_range_type(struct block_list *src, struct block_list *target, uint retVal___ = HPMHooks.source.battle.range_type(src, target, skill_id, skill_lv); } if( HPMHooks.count.HP_battle_range_type_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_range_type_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_range_type_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, src, target, skill_id, skill_lv); } } return retVal___; @@ -2096,11 +2094,11 @@ int64 HP_battle_calc_base_damage(struct block_list *src, struct block_list *bl, int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_base_damage_pre ) { - int64 (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *nk, bool *n_ele, short *s_ele, short *s_ele_, int *type, int *flag, int *flag2); + int64 (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int *nk, bool *n_ele, short *s_ele, short *s_ele_, int *type, int *flag, int *flag2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_base_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_base_damage_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &skill_id, &skill_lv, &nk, &n_ele, &s_ele, &s_ele_, &type, &flag, &flag2); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &nk, &n_ele, &s_ele, &s_ele_, &type, &flag, &flag2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2111,10 +2109,10 @@ int64 HP_battle_calc_base_damage(struct block_list *src, struct block_list *bl, retVal___ = HPMHooks.source.battle.calc_base_damage(src, bl, skill_id, skill_lv, nk, n_ele, s_ele, s_ele_, type, flag, flag2); } if( HPMHooks.count.HP_battle_calc_base_damage_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *nk, bool *n_ele, short *s_ele, short *s_ele_, int *type, int *flag, int *flag2); + int64 (*postHookFunc) (int64 retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int nk, bool n_ele, short s_ele, short s_ele_, int type, int flag, int flag2); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_base_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_base_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &skill_id, &skill_lv, &nk, &n_ele, &s_ele, &s_ele_, &type, &flag, &flag2); + retVal___ = postHookFunc(retVal___, src, bl, skill_id, skill_lv, nk, n_ele, s_ele, s_ele_, type, flag, flag2); } } return retVal___; @@ -2123,11 +2121,11 @@ int64 HP_battle_calc_base_damage2(struct status_data *st, struct weapon_atk *wa, int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_calc_base_damage2_pre ) { - int64 (*preHookFunc) (struct status_data *st, struct weapon_atk *wa, struct status_change *sc, unsigned short *t_size, struct map_session_data *sd, int *flag); + int64 (*preHookFunc) (struct status_data **st, struct weapon_atk **wa, struct status_change **sc, unsigned short *t_size, struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_base_damage2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_base_damage2_pre[hIndex].func; - retVal___ = preHookFunc(st, wa, sc, &t_size, sd, &flag); + retVal___ = preHookFunc(&st, &wa, &sc, &t_size, &sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2138,24 +2136,23 @@ int64 HP_battle_calc_base_damage2(struct status_data *st, struct weapon_atk *wa, retVal___ = HPMHooks.source.battle.calc_base_damage2(st, wa, sc, t_size, sd, flag); } if( HPMHooks.count.HP_battle_calc_base_damage2_post ) { - int64 (*postHookFunc) (int64 retVal___, struct status_data *st, struct weapon_atk *wa, struct status_change *sc, unsigned short *t_size, struct map_session_data *sd, int *flag); + int64 (*postHookFunc) (int64 retVal___, struct status_data *st, struct weapon_atk *wa, struct status_change *sc, unsigned short t_size, struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_base_damage2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_base_damage2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, st, wa, sc, &t_size, sd, &flag); + retVal___ = postHookFunc(retVal___, st, wa, sc, t_size, sd, flag); } } return retVal___; } struct Damage HP_battle_calc_misc_attack(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int mflag) { int hIndex = 0; - struct Damage retVal___; - memset(&retVal___, '\0', sizeof(struct Damage)); + struct Damage retVal___ = { 0 }; if( HPMHooks.count.HP_battle_calc_misc_attack_pre ) { - struct Damage (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *mflag); + struct Damage (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *mflag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_misc_attack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_misc_attack_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &skill_id, &skill_lv, &mflag); + retVal___ = preHookFunc(&src, &target, &skill_id, &skill_lv, &mflag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2166,24 +2163,23 @@ struct Damage HP_battle_calc_misc_attack(struct block_list *src, struct block_li retVal___ = HPMHooks.source.battle.calc_misc_attack(src, target, skill_id, skill_lv, mflag); } if( HPMHooks.count.HP_battle_calc_misc_attack_post ) { - struct Damage (*postHookFunc) (struct Damage retVal___, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *mflag); + struct Damage (*postHookFunc) (struct Damage retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int mflag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_misc_attack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_misc_attack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &skill_id, &skill_lv, &mflag); + retVal___ = postHookFunc(retVal___, src, target, skill_id, skill_lv, mflag); } } return retVal___; } struct Damage HP_battle_calc_magic_attack(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int mflag) { int hIndex = 0; - struct Damage retVal___; - memset(&retVal___, '\0', sizeof(struct Damage)); + struct Damage retVal___ = { 0 }; if( HPMHooks.count.HP_battle_calc_magic_attack_pre ) { - struct Damage (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *mflag); + struct Damage (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int *mflag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_magic_attack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_magic_attack_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &skill_id, &skill_lv, &mflag); + retVal___ = preHookFunc(&src, &target, &skill_id, &skill_lv, &mflag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2194,10 +2190,10 @@ struct Damage HP_battle_calc_magic_attack(struct block_list *src, struct block_l retVal___ = HPMHooks.source.battle.calc_magic_attack(src, target, skill_id, skill_lv, mflag); } if( HPMHooks.count.HP_battle_calc_magic_attack_post ) { - struct Damage (*postHookFunc) (struct Damage retVal___, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *mflag); + struct Damage (*postHookFunc) (struct Damage retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int mflag); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_magic_attack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_magic_attack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &skill_id, &skill_lv, &mflag); + retVal___ = postHookFunc(retVal___, src, target, skill_id, skill_lv, mflag); } } return retVal___; @@ -2221,10 +2217,10 @@ int HP_battle_adjust_skill_damage(int m, unsigned short skill_id) { retVal___ = HPMHooks.source.battle.adjust_skill_damage(m, skill_id); } if( HPMHooks.count.HP_battle_adjust_skill_damage_post ) { - int (*postHookFunc) (int retVal___, int *m, unsigned short *skill_id); + int (*postHookFunc) (int retVal___, int m, unsigned short skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_adjust_skill_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_adjust_skill_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, &skill_id); + retVal___ = postHookFunc(retVal___, m, skill_id); } } return retVal___; @@ -2233,11 +2229,11 @@ int64 HP_battle_add_mastery(struct map_session_data *sd, struct block_list *targ int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_battle_add_mastery_pre ) { - int64 (*preHookFunc) (struct map_session_data *sd, struct block_list *target, int64 *dmg, int *type); + int64 (*preHookFunc) (struct map_session_data **sd, struct block_list **target, int64 *dmg, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_add_mastery_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_add_mastery_pre[hIndex].func; - retVal___ = preHookFunc(sd, target, &dmg, &type); + retVal___ = preHookFunc(&sd, &target, &dmg, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2248,10 +2244,10 @@ int64 HP_battle_add_mastery(struct map_session_data *sd, struct block_list *targ retVal___ = HPMHooks.source.battle.add_mastery(sd, target, dmg, type); } if( HPMHooks.count.HP_battle_add_mastery_post ) { - int64 (*postHookFunc) (int64 retVal___, struct map_session_data *sd, struct block_list *target, int64 *dmg, int *type); + int64 (*postHookFunc) (int64 retVal___, struct map_session_data *sd, struct block_list *target, int64 dmg, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_add_mastery_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_add_mastery_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, target, &dmg, &type); + retVal___ = postHookFunc(retVal___, sd, target, dmg, type); } } return retVal___; @@ -2275,10 +2271,10 @@ int HP_battle_calc_drain(int64 damage, int rate, int per) { retVal___ = HPMHooks.source.battle.calc_drain(damage, rate, per); } if( HPMHooks.count.HP_battle_calc_drain_post ) { - int (*postHookFunc) (int retVal___, int64 *damage, int *rate, int *per); + int (*postHookFunc) (int retVal___, int64 damage, int rate, int per); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_drain_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_calc_drain_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &damage, &rate, &per); + retVal___ = postHookFunc(retVal___, damage, rate, per); } } return retVal___; @@ -2287,11 +2283,11 @@ int HP_battle_config_read(const char *cfgName) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_config_read_pre ) { - int (*preHookFunc) (const char *cfgName); + int (*preHookFunc) (const char **cfgName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_config_read_pre[hIndex].func; - retVal___ = preHookFunc(cfgName); + retVal___ = preHookFunc(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2340,11 +2336,11 @@ int HP_battle_config_set_value(const char *w1, const char *w2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_config_set_value_pre ) { - int (*preHookFunc) (const char *w1, const char *w2); + int (*preHookFunc) (const char **w1, const char **w2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_config_set_value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_config_set_value_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2); + retVal___ = preHookFunc(&w1, &w2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2367,11 +2363,11 @@ bool HP_battle_config_get_value(const char *w1, int *value) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_battle_config_get_value_pre ) { - bool (*preHookFunc) (const char *w1, int *value); + bool (*preHookFunc) (const char **w1, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_config_get_value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_config_get_value_pre[hIndex].func; - retVal___ = preHookFunc(w1, value); + retVal___ = preHookFunc(&w1, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2420,11 +2416,11 @@ struct block_list* HP_battle_get_enemy_area(struct block_list *src, int x, int y int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_battle_get_enemy_area_pre ) { - struct block_list* (*preHookFunc) (struct block_list *src, int *x, int *y, int *range, int *type, int *ignore_id); + struct block_list* (*preHookFunc) (struct block_list **src, int *x, int *y, int *range, int *type, int *ignore_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_area_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_get_enemy_area_pre[hIndex].func; - retVal___ = preHookFunc(src, &x, &y, &range, &type, &ignore_id); + retVal___ = preHookFunc(&src, &x, &y, &range, &type, &ignore_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2435,10 +2431,10 @@ struct block_list* HP_battle_get_enemy_area(struct block_list *src, int x, int y retVal___ = HPMHooks.source.battle.get_enemy_area(src, x, y, range, type, ignore_id); } if( HPMHooks.count.HP_battle_get_enemy_area_post ) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct block_list *src, int *x, int *y, int *range, int *type, int *ignore_id); + struct block_list* (*postHookFunc) (struct block_list* retVal___, struct block_list *src, int x, int y, int range, int type, int ignore_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_area_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_get_enemy_area_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &x, &y, &range, &type, &ignore_id); + retVal___ = postHookFunc(retVal___, src, x, y, range, type, ignore_id); } } return retVal___; @@ -2447,12 +2443,12 @@ int HP_battle_damage_area(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_damage_area_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_damage_area_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_battle_damage_area_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -2479,11 +2475,11 @@ int HP_battle_damage_area(struct block_list *bl, va_list ap) { void HP_battle_calc_masteryfix_unknown(struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *div, bool *left, bool *weapon) { int hIndex = 0; if( HPMHooks.count.HP_battle_calc_masteryfix_unknown_pre ) { - void (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *div, bool *left, bool *weapon); + void (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 **skill_id, uint16 **skill_lv, int64 **damage, int **div, bool **left, bool **weapon); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_masteryfix_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_masteryfix_unknown_pre[hIndex].func; - preHookFunc(src, target, skill_id, skill_lv, damage, div, left, weapon); + preHookFunc(&src, &target, &skill_id, &skill_lv, &damage, &div, &left, &weapon); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2505,11 +2501,11 @@ void HP_battle_calc_masteryfix_unknown(struct block_list *src, struct block_list void HP_battle_calc_skillratio_magic_unknown(int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag) { int hIndex = 0; if( HPMHooks.count.HP_battle_calc_skillratio_magic_unknown_pre ) { - void (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag); + void (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **target, uint16 **skill_id, uint16 **skill_lv, int **skillratio, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_skillratio_magic_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_skillratio_magic_unknown_pre[hIndex].func; - preHookFunc(attack_type, src, target, skill_id, skill_lv, skillratio, flag); + preHookFunc(&attack_type, &src, &target, &skill_id, &skill_lv, &skillratio, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2531,11 +2527,11 @@ void HP_battle_calc_skillratio_magic_unknown(int *attack_type, struct block_list void HP_battle_calc_skillratio_weapon_unknown(int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag) { int hIndex = 0; if( HPMHooks.count.HP_battle_calc_skillratio_weapon_unknown_pre ) { - void (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *skillratio, int *flag); + void (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **target, uint16 **skill_id, uint16 **skill_lv, int **skillratio, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_skillratio_weapon_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_skillratio_weapon_unknown_pre[hIndex].func; - preHookFunc(attack_type, src, target, skill_id, skill_lv, skillratio, flag); + preHookFunc(&attack_type, &src, &target, &skill_id, &skill_lv, &skillratio, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2557,11 +2553,11 @@ void HP_battle_calc_skillratio_weapon_unknown(int *attack_type, struct block_lis void HP_battle_calc_misc_attack_unknown(struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *mflag, struct Damage *md) { int hIndex = 0; if( HPMHooks.count.HP_battle_calc_misc_attack_unknown_pre ) { - void (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int *mflag, struct Damage *md); + void (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 **skill_id, uint16 **skill_lv, int **mflag, struct Damage **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_misc_attack_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_calc_misc_attack_unknown_pre[hIndex].func; - preHookFunc(src, target, skill_id, skill_lv, mflag, md); + preHookFunc(&src, &target, &skill_id, &skill_lv, &mflag, &md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2580,7 +2576,7 @@ void HP_battle_calc_misc_attack_unknown(struct block_list *src, struct block_lis } return; } -/* bg */ +/* battleground_interface */ void HP_bg_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_bg_init_pre ) { @@ -2599,10 +2595,10 @@ void HP_bg_init(bool minimal) { HPMHooks.source.bg.init(minimal); } if( HPMHooks.count.HP_bg_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -2637,11 +2633,11 @@ struct bg_arena* HP_bg_name2arena(const char *name) { int hIndex = 0; struct bg_arena* retVal___ = NULL; if( HPMHooks.count.HP_bg_name2arena_pre ) { - struct bg_arena* (*preHookFunc) (const char *name); + struct bg_arena* (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_name2arena_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_name2arena_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2663,11 +2659,11 @@ struct bg_arena* HP_bg_name2arena(const char *name) { void HP_bg_queue_add(struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types type) { int hIndex = 0; if( HPMHooks.count.HP_bg_queue_add_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types *type); + void (*preHookFunc) (struct map_session_data **sd, struct bg_arena **arena, enum bg_queue_types *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_queue_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_queue_add_pre[hIndex].func; - preHookFunc(sd, arena, &type); + preHookFunc(&sd, &arena, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2678,10 +2674,10 @@ void HP_bg_queue_add(struct map_session_data *sd, struct bg_arena *arena, enum b HPMHooks.source.bg.queue_add(sd, arena, type); } if( HPMHooks.count.HP_bg_queue_add_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types *type); + void (*postHookFunc) (struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types type); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_queue_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_queue_add_post[hIndex].func; - postHookFunc(sd, arena, &type); + postHookFunc(sd, arena, type); } } return; @@ -2690,11 +2686,11 @@ enum BATTLEGROUNDS_QUEUE_ACK HP_bg_can_queue(struct map_session_data *sd, struct int hIndex = 0; enum BATTLEGROUNDS_QUEUE_ACK retVal___ = BGQA_SUCCESS; if( HPMHooks.count.HP_bg_can_queue_pre ) { - enum BATTLEGROUNDS_QUEUE_ACK (*preHookFunc) (struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types *type); + enum BATTLEGROUNDS_QUEUE_ACK (*preHookFunc) (struct map_session_data **sd, struct bg_arena **arena, enum bg_queue_types *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_can_queue_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_can_queue_pre[hIndex].func; - retVal___ = preHookFunc(sd, arena, &type); + retVal___ = preHookFunc(&sd, &arena, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2705,10 +2701,10 @@ enum BATTLEGROUNDS_QUEUE_ACK HP_bg_can_queue(struct map_session_data *sd, struct retVal___ = HPMHooks.source.bg.can_queue(sd, arena, type); } if( HPMHooks.count.HP_bg_can_queue_post ) { - enum BATTLEGROUNDS_QUEUE_ACK (*postHookFunc) (enum BATTLEGROUNDS_QUEUE_ACK retVal___, struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types *type); + enum BATTLEGROUNDS_QUEUE_ACK (*postHookFunc) (enum BATTLEGROUNDS_QUEUE_ACK retVal___, struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types type); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_can_queue_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_can_queue_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, arena, &type); + retVal___ = postHookFunc(retVal___, sd, arena, type); } } return retVal___; @@ -2732,10 +2728,10 @@ int HP_bg_id2pos(int queue_id, int account_id) { retVal___ = HPMHooks.source.bg.id2pos(queue_id, account_id); } if( HPMHooks.count.HP_bg_id2pos_post ) { - int (*postHookFunc) (int retVal___, int *queue_id, int *account_id); + int (*postHookFunc) (int retVal___, int queue_id, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_id2pos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_id2pos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &queue_id, &account_id); + retVal___ = postHookFunc(retVal___, queue_id, account_id); } } return retVal___; @@ -2743,11 +2739,11 @@ int HP_bg_id2pos(int queue_id, int account_id) { void HP_bg_queue_pc_cleanup(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_bg_queue_pc_cleanup_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_queue_pc_cleanup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_queue_pc_cleanup_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2769,11 +2765,11 @@ void HP_bg_queue_pc_cleanup(struct map_session_data *sd) { void HP_bg_begin(struct bg_arena *arena) { int hIndex = 0; if( HPMHooks.count.HP_bg_begin_pre ) { - void (*preHookFunc) (struct bg_arena *arena); + void (*preHookFunc) (struct bg_arena **arena); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_begin_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_begin_pre[hIndex].func; - preHookFunc(arena); + preHookFunc(&arena); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2811,10 +2807,10 @@ int HP_bg_begin_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.bg.begin_timer(tid, tick, id, data); } if( HPMHooks.count.HP_bg_begin_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_begin_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_begin_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -2822,11 +2818,11 @@ int HP_bg_begin_timer(int tid, int64 tick, int id, intptr_t data) { void HP_bg_queue_pregame(struct bg_arena *arena) { int hIndex = 0; if( HPMHooks.count.HP_bg_queue_pregame_pre ) { - void (*preHookFunc) (struct bg_arena *arena); + void (*preHookFunc) (struct bg_arena **arena); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_queue_pregame_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_queue_pregame_pre[hIndex].func; - preHookFunc(arena); + preHookFunc(&arena); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2864,10 +2860,10 @@ int HP_bg_fillup_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.bg.fillup_timer(tid, tick, id, data); } if( HPMHooks.count.HP_bg_fillup_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_fillup_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_fillup_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -2875,11 +2871,11 @@ int HP_bg_fillup_timer(int tid, int64 tick, int id, intptr_t data) { void HP_bg_queue_ready_ack(struct bg_arena *arena, struct map_session_data *sd, bool response) { int hIndex = 0; if( HPMHooks.count.HP_bg_queue_ready_ack_pre ) { - void (*preHookFunc) (struct bg_arena *arena, struct map_session_data *sd, bool *response); + void (*preHookFunc) (struct bg_arena **arena, struct map_session_data **sd, bool *response); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_queue_ready_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_queue_ready_ack_pre[hIndex].func; - preHookFunc(arena, sd, &response); + preHookFunc(&arena, &sd, &response); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2890,10 +2886,10 @@ void HP_bg_queue_ready_ack(struct bg_arena *arena, struct map_session_data *sd, HPMHooks.source.bg.queue_ready_ack(arena, sd, response); } if( HPMHooks.count.HP_bg_queue_ready_ack_post ) { - void (*postHookFunc) (struct bg_arena *arena, struct map_session_data *sd, bool *response); + void (*postHookFunc) (struct bg_arena *arena, struct map_session_data *sd, bool response); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_queue_ready_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_queue_ready_ack_post[hIndex].func; - postHookFunc(arena, sd, &response); + postHookFunc(arena, sd, response); } } return; @@ -2901,11 +2897,11 @@ void HP_bg_queue_ready_ack(struct bg_arena *arena, struct map_session_data *sd, void HP_bg_match_over(struct bg_arena *arena, bool canceled) { int hIndex = 0; if( HPMHooks.count.HP_bg_match_over_pre ) { - void (*preHookFunc) (struct bg_arena *arena, bool *canceled); + void (*preHookFunc) (struct bg_arena **arena, bool *canceled); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_match_over_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_match_over_pre[hIndex].func; - preHookFunc(arena, &canceled); + preHookFunc(&arena, &canceled); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2916,10 +2912,10 @@ void HP_bg_match_over(struct bg_arena *arena, bool canceled) { HPMHooks.source.bg.match_over(arena, canceled); } if( HPMHooks.count.HP_bg_match_over_post ) { - void (*postHookFunc) (struct bg_arena *arena, bool *canceled); + void (*postHookFunc) (struct bg_arena *arena, bool canceled); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_match_over_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_match_over_post[hIndex].func; - postHookFunc(arena, &canceled); + postHookFunc(arena, canceled); } } return; @@ -2927,11 +2923,11 @@ void HP_bg_match_over(struct bg_arena *arena, bool canceled) { void HP_bg_queue_check(struct bg_arena *arena) { int hIndex = 0; if( HPMHooks.count.HP_bg_queue_check_pre ) { - void (*preHookFunc) (struct bg_arena *arena); + void (*preHookFunc) (struct bg_arena **arena); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_queue_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_queue_check_pre[hIndex].func; - preHookFunc(arena); + preHookFunc(&arena); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2969,10 +2965,10 @@ struct battleground_data* HP_bg_team_search(int bg_id) { retVal___ = HPMHooks.source.bg.team_search(bg_id); } if( HPMHooks.count.HP_bg_team_search_post ) { - struct battleground_data* (*postHookFunc) (struct battleground_data* retVal___, int *bg_id); + struct battleground_data* (*postHookFunc) (struct battleground_data* retVal___, int bg_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_team_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &bg_id); + retVal___ = postHookFunc(retVal___, bg_id); } } return retVal___; @@ -2981,11 +2977,11 @@ struct map_session_data* HP_bg_getavailablesd(struct battleground_data *bgd) { int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_bg_getavailablesd_pre ) { - struct map_session_data* (*preHookFunc) (struct battleground_data *bgd); + struct map_session_data* (*preHookFunc) (struct battleground_data **bgd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_getavailablesd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_getavailablesd_pre[hIndex].func; - retVal___ = preHookFunc(bgd); + retVal___ = preHookFunc(&bgd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3023,10 +3019,10 @@ bool HP_bg_team_delete(int bg_id) { retVal___ = HPMHooks.source.bg.team_delete(bg_id); } if( HPMHooks.count.HP_bg_team_delete_post ) { - bool (*postHookFunc) (bool retVal___, int *bg_id); + bool (*postHookFunc) (bool retVal___, int bg_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_team_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &bg_id); + retVal___ = postHookFunc(retVal___, bg_id); } } return retVal___; @@ -3050,10 +3046,10 @@ bool HP_bg_team_warp(int bg_id, unsigned short map_index, short x, short y) { retVal___ = HPMHooks.source.bg.team_warp(bg_id, map_index, x, y); } if( HPMHooks.count.HP_bg_team_warp_post ) { - bool (*postHookFunc) (bool retVal___, int *bg_id, unsigned short *map_index, short *x, short *y); + bool (*postHookFunc) (bool retVal___, int bg_id, unsigned short map_index, short x, short y); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_warp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_team_warp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &bg_id, &map_index, &x, &y); + retVal___ = postHookFunc(retVal___, bg_id, map_index, x, y); } } return retVal___; @@ -3061,11 +3057,11 @@ bool HP_bg_team_warp(int bg_id, unsigned short map_index, short x, short y) { void HP_bg_send_dot_remove(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_bg_send_dot_remove_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_dot_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_send_dot_remove_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3088,11 +3084,11 @@ bool HP_bg_team_join(int bg_id, struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_bg_team_join_pre ) { - bool (*preHookFunc) (int *bg_id, struct map_session_data *sd); + bool (*preHookFunc) (int *bg_id, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_join_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_team_join_pre[hIndex].func; - retVal___ = preHookFunc(&bg_id, sd); + retVal___ = preHookFunc(&bg_id, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3103,10 +3099,10 @@ bool HP_bg_team_join(int bg_id, struct map_session_data *sd) { retVal___ = HPMHooks.source.bg.team_join(bg_id, sd); } if( HPMHooks.count.HP_bg_team_join_post ) { - bool (*postHookFunc) (bool retVal___, int *bg_id, struct map_session_data *sd); + bool (*postHookFunc) (bool retVal___, int bg_id, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_join_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_team_join_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &bg_id, sd); + retVal___ = postHookFunc(retVal___, bg_id, sd); } } return retVal___; @@ -3115,11 +3111,11 @@ int HP_bg_team_leave(struct map_session_data *sd, enum bg_team_leave_type flag) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_bg_team_leave_pre ) { - int (*preHookFunc) (struct map_session_data *sd, enum bg_team_leave_type *flag); + int (*preHookFunc) (struct map_session_data **sd, enum bg_team_leave_type *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_leave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_team_leave_pre[hIndex].func; - retVal___ = preHookFunc(sd, &flag); + retVal___ = preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3130,10 +3126,10 @@ int HP_bg_team_leave(struct map_session_data *sd, enum bg_team_leave_type flag) retVal___ = HPMHooks.source.bg.team_leave(sd, flag); } if( HPMHooks.count.HP_bg_team_leave_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum bg_team_leave_type *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum bg_team_leave_type flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_leave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_team_leave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &flag); + retVal___ = postHookFunc(retVal___, sd, flag); } } return retVal___; @@ -3142,11 +3138,11 @@ bool HP_bg_member_respawn(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_bg_member_respawn_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_member_respawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_member_respawn_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3169,11 +3165,11 @@ int HP_bg_create(unsigned short map_index, short rx, short ry, const char *ev, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_bg_create_pre ) { - int (*preHookFunc) (unsigned short *map_index, short *rx, short *ry, const char *ev, const char *dev); + int (*preHookFunc) (unsigned short *map_index, short *rx, short *ry, const char **ev, const char **dev); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_create_pre[hIndex].func; - retVal___ = preHookFunc(&map_index, &rx, &ry, ev, dev); + retVal___ = preHookFunc(&map_index, &rx, &ry, &ev, &dev); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3184,10 +3180,10 @@ int HP_bg_create(unsigned short map_index, short rx, short ry, const char *ev, c retVal___ = HPMHooks.source.bg.create(map_index, rx, ry, ev, dev); } if( HPMHooks.count.HP_bg_create_post ) { - int (*postHookFunc) (int retVal___, unsigned short *map_index, short *rx, short *ry, const char *ev, const char *dev); + int (*postHookFunc) (int retVal___, unsigned short map_index, short rx, short ry, const char *ev, const char *dev); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &map_index, &rx, &ry, ev, dev); + retVal___ = postHookFunc(retVal___, map_index, rx, ry, ev, dev); } } return retVal___; @@ -3196,11 +3192,11 @@ int HP_bg_team_get_id(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_bg_team_get_id_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_get_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_team_get_id_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3219,15 +3215,15 @@ int HP_bg_team_get_id(struct block_list *bl) { } return retVal___; } -bool HP_bg_send_message(struct map_session_data *sd, const char *mes, int len) { +bool HP_bg_send_message(struct map_session_data *sd, const char *mes) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_bg_send_message_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const char *mes, int *len); + bool (*preHookFunc) (struct map_session_data **sd, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_send_message_pre[hIndex].func; - retVal___ = preHookFunc(sd, mes, &len); + retVal___ = preHookFunc(&sd, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3235,27 +3231,27 @@ bool HP_bg_send_message(struct map_session_data *sd, const char *mes, int len) { } } { - retVal___ = HPMHooks.source.bg.send_message(sd, mes, len); + retVal___ = HPMHooks.source.bg.send_message(sd, mes); } if( HPMHooks.count.HP_bg_send_message_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *mes, int *len); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_send_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, mes, &len); + retVal___ = postHookFunc(retVal___, sd, mes); } } return retVal___; } -int HP_bg_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) { +int HP_bg_send_xy_timer_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_bg_send_xy_timer_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_xy_timer_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_bg_send_xy_timer_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -3269,11 +3265,11 @@ int HP_bg_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_bg_send_xy_timer_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_xy_timer_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_bg_send_xy_timer_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -3298,10 +3294,10 @@ int HP_bg_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.bg.send_xy_timer(tid, tick, id, data); } if( HPMHooks.count.HP_bg_send_xy_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_xy_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_send_xy_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -3325,24 +3321,24 @@ int HP_bg_afk_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.bg.afk_timer(tid, tick, id, data); } if( HPMHooks.count.HP_bg_afk_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_afk_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_afk_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -int HP_bg_team_db_final(DBKey key, DBData *data, va_list ap) { +int HP_bg_team_db_final(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_bg_team_db_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_db_final_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_bg_team_db_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -3356,11 +3352,11 @@ int HP_bg_team_db_final(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_bg_team_db_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_db_final_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_bg_team_db_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -3370,11 +3366,11 @@ enum bg_queue_types HP_bg_str2teamtype(const char *str) { int hIndex = 0; enum bg_queue_types retVal___ = BGQT_INVALID; if( HPMHooks.count.HP_bg_str2teamtype_pre ) { - enum bg_queue_types (*preHookFunc) (const char *str); + enum bg_queue_types (*preHookFunc) (const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_str2teamtype_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_str2teamtype_pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3419,16 +3415,16 @@ void HP_bg_config_read(void) { } return; } -/* buyingstore */ +/* buyingstore_interface */ bool HP_buyingstore_setup(struct map_session_data *sd, unsigned char slots) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_buyingstore_setup_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, unsigned char *slots); + bool (*preHookFunc) (struct map_session_data **sd, unsigned char *slots); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_setup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_buyingstore_setup_pre[hIndex].func; - retVal___ = preHookFunc(sd, &slots); + retVal___ = preHookFunc(&sd, &slots); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3439,10 +3435,10 @@ bool HP_buyingstore_setup(struct map_session_data *sd, unsigned char slots) { retVal___ = HPMHooks.source.buyingstore.setup(sd, slots); } if( HPMHooks.count.HP_buyingstore_setup_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned char *slots); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned char slots); for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_setup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_buyingstore_setup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &slots); + retVal___ = postHookFunc(retVal___, sd, slots); } } return retVal___; @@ -3450,11 +3446,11 @@ bool HP_buyingstore_setup(struct map_session_data *sd, unsigned char slots) { void HP_buyingstore_create(struct map_session_data *sd, int zenylimit, unsigned char result, const char *storename, const uint8 *itemlist, unsigned int count) { int hIndex = 0; if( HPMHooks.count.HP_buyingstore_create_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *zenylimit, unsigned char *result, const char *storename, const uint8 *itemlist, unsigned int *count); + void (*preHookFunc) (struct map_session_data **sd, int *zenylimit, unsigned char *result, const char **storename, const uint8 **itemlist, unsigned int *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_buyingstore_create_pre[hIndex].func; - preHookFunc(sd, &zenylimit, &result, storename, itemlist, &count); + preHookFunc(&sd, &zenylimit, &result, &storename, &itemlist, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3465,10 +3461,10 @@ void HP_buyingstore_create(struct map_session_data *sd, int zenylimit, unsigned HPMHooks.source.buyingstore.create(sd, zenylimit, result, storename, itemlist, count); } if( HPMHooks.count.HP_buyingstore_create_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *zenylimit, unsigned char *result, const char *storename, const uint8 *itemlist, unsigned int *count); + void (*postHookFunc) (struct map_session_data *sd, int zenylimit, unsigned char result, const char *storename, const uint8 *itemlist, unsigned int count); for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_buyingstore_create_post[hIndex].func; - postHookFunc(sd, &zenylimit, &result, storename, itemlist, &count); + postHookFunc(sd, zenylimit, result, storename, itemlist, count); } } return; @@ -3476,11 +3472,11 @@ void HP_buyingstore_create(struct map_session_data *sd, int zenylimit, unsigned void HP_buyingstore_close(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_buyingstore_close_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_close_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_buyingstore_close_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3502,11 +3498,11 @@ void HP_buyingstore_close(struct map_session_data *sd) { void HP_buyingstore_open(struct map_session_data *sd, int account_id) { int hIndex = 0; if( HPMHooks.count.HP_buyingstore_open_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *account_id); + void (*preHookFunc) (struct map_session_data **sd, int *account_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_buyingstore_open_pre[hIndex].func; - preHookFunc(sd, &account_id); + preHookFunc(&sd, &account_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3517,10 +3513,10 @@ void HP_buyingstore_open(struct map_session_data *sd, int account_id) { HPMHooks.source.buyingstore.open(sd, account_id); } if( HPMHooks.count.HP_buyingstore_open_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *account_id); + void (*postHookFunc) (struct map_session_data *sd, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_open_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_buyingstore_open_post[hIndex].func; - postHookFunc(sd, &account_id); + postHookFunc(sd, account_id); } } return; @@ -3528,11 +3524,11 @@ void HP_buyingstore_open(struct map_session_data *sd, int account_id) { void HP_buyingstore_trade(struct map_session_data *sd, int account_id, unsigned int buyer_id, const uint8 *itemlist, unsigned int count) { int hIndex = 0; if( HPMHooks.count.HP_buyingstore_trade_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *account_id, unsigned int *buyer_id, const uint8 *itemlist, unsigned int *count); + void (*preHookFunc) (struct map_session_data **sd, int *account_id, unsigned int *buyer_id, const uint8 **itemlist, unsigned int *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_trade_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_buyingstore_trade_pre[hIndex].func; - preHookFunc(sd, &account_id, &buyer_id, itemlist, &count); + preHookFunc(&sd, &account_id, &buyer_id, &itemlist, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3543,10 +3539,10 @@ void HP_buyingstore_trade(struct map_session_data *sd, int account_id, unsigned HPMHooks.source.buyingstore.trade(sd, account_id, buyer_id, itemlist, count); } if( HPMHooks.count.HP_buyingstore_trade_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *account_id, unsigned int *buyer_id, const uint8 *itemlist, unsigned int *count); + void (*postHookFunc) (struct map_session_data *sd, int account_id, unsigned int buyer_id, const uint8 *itemlist, unsigned int count); for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_trade_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_buyingstore_trade_post[hIndex].func; - postHookFunc(sd, &account_id, &buyer_id, itemlist, &count); + postHookFunc(sd, account_id, buyer_id, itemlist, count); } } return; @@ -3555,11 +3551,11 @@ bool HP_buyingstore_search(struct map_session_data *sd, unsigned short nameid) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_buyingstore_search_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, unsigned short *nameid); + bool (*preHookFunc) (struct map_session_data **sd, unsigned short *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_buyingstore_search_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid); + retVal___ = preHookFunc(&sd, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3570,10 +3566,10 @@ bool HP_buyingstore_search(struct map_session_data *sd, unsigned short nameid) { retVal___ = HPMHooks.source.buyingstore.search(sd, nameid); } if( HPMHooks.count.HP_buyingstore_search_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned short *nameid); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned short nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_buyingstore_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid); + retVal___ = postHookFunc(retVal___, sd, nameid); } } return retVal___; @@ -3582,11 +3578,11 @@ bool HP_buyingstore_searchall(struct map_session_data *sd, const struct s_search int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_buyingstore_searchall_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const struct s_search_store_search *s); + bool (*preHookFunc) (struct map_session_data **sd, const struct s_search_store_search **s); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_buyingstore_searchall_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_buyingstore_searchall_pre[hIndex].func; - retVal___ = preHookFunc(sd, s); + retVal___ = preHookFunc(&sd, &s); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3632,7 +3628,7 @@ unsigned int HP_buyingstore_getuid(void) { } return retVal___; } -/* channel */ +/* channel_interface */ int HP_channel_init(bool minimal) { int hIndex = 0; int retVal___ = 0; @@ -3652,10 +3648,10 @@ int HP_channel_init(bool minimal) { retVal___ = HPMHooks.source.channel.init(minimal); } if( HPMHooks.count.HP_channel_init_post ) { - int (*postHookFunc) (int retVal___, bool *minimal); + int (*postHookFunc) (int retVal___, bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_channel_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &minimal); + retVal___ = postHookFunc(retVal___, minimal); } } return retVal___; @@ -3690,11 +3686,11 @@ struct channel_data* HP_channel_search(const char *name, struct map_session_data int hIndex = 0; struct channel_data* retVal___ = NULL; if( HPMHooks.count.HP_channel_search_pre ) { - struct channel_data* (*preHookFunc) (const char *name, struct map_session_data *sd); + struct channel_data* (*preHookFunc) (const char **name, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_search_pre[hIndex].func; - retVal___ = preHookFunc(name, sd); + retVal___ = preHookFunc(&name, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3717,11 +3713,11 @@ struct channel_data* HP_channel_create(enum channel_types type, const char *name int hIndex = 0; struct channel_data* retVal___ = NULL; if( HPMHooks.count.HP_channel_create_pre ) { - struct channel_data* (*preHookFunc) (enum channel_types *type, const char *name, unsigned char *color); + struct channel_data* (*preHookFunc) (enum channel_types *type, const char **name, unsigned char *color); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_create_pre[hIndex].func; - retVal___ = preHookFunc(&type, name, &color); + retVal___ = preHookFunc(&type, &name, &color); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3732,10 +3728,10 @@ struct channel_data* HP_channel_create(enum channel_types type, const char *name retVal___ = HPMHooks.source.channel.create(type, name, color); } if( HPMHooks.count.HP_channel_create_post ) { - struct channel_data* (*postHookFunc) (struct channel_data* retVal___, enum channel_types *type, const char *name, unsigned char *color); + struct channel_data* (*postHookFunc) (struct channel_data* retVal___, enum channel_types type, const char *name, unsigned char color); for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_channel_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type, name, &color); + retVal___ = postHookFunc(retVal___, type, name, color); } } return retVal___; @@ -3743,11 +3739,11 @@ struct channel_data* HP_channel_create(enum channel_types type, const char *name void HP_channel_delete(struct channel_data *chan) { int hIndex = 0; if( HPMHooks.count.HP_channel_delete_pre ) { - void (*preHookFunc) (struct channel_data *chan); + void (*preHookFunc) (struct channel_data **chan); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_delete_pre[hIndex].func; - preHookFunc(chan); + preHookFunc(&chan); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3769,11 +3765,11 @@ void HP_channel_delete(struct channel_data *chan) { void HP_channel_set_password(struct channel_data *chan, const char *password) { int hIndex = 0; if( HPMHooks.count.HP_channel_set_password_pre ) { - void (*preHookFunc) (struct channel_data *chan, const char *password); + void (*preHookFunc) (struct channel_data **chan, const char **password); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_set_password_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_set_password_pre[hIndex].func; - preHookFunc(chan, password); + preHookFunc(&chan, &password); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3796,11 +3792,11 @@ enum channel_operation_status HP_channel_ban(struct channel_data *chan, const st int hIndex = 0; enum channel_operation_status retVal___ = HCS_STATUS_FAIL; if( HPMHooks.count.HP_channel_ban_pre ) { - enum channel_operation_status (*preHookFunc) (struct channel_data *chan, const struct map_session_data *ssd, struct map_session_data *tsd); + enum channel_operation_status (*preHookFunc) (struct channel_data **chan, const struct map_session_data **ssd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_ban_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_ban_pre[hIndex].func; - retVal___ = preHookFunc(chan, ssd, tsd); + retVal___ = preHookFunc(&chan, &ssd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3823,11 +3819,11 @@ enum channel_operation_status HP_channel_unban(struct channel_data *chan, const int hIndex = 0; enum channel_operation_status retVal___ = HCS_STATUS_FAIL; if( HPMHooks.count.HP_channel_unban_pre ) { - enum channel_operation_status (*preHookFunc) (struct channel_data *chan, const struct map_session_data *ssd, struct map_session_data *tsd); + enum channel_operation_status (*preHookFunc) (struct channel_data **chan, const struct map_session_data **ssd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_unban_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_unban_pre[hIndex].func; - retVal___ = preHookFunc(chan, ssd, tsd); + retVal___ = preHookFunc(&chan, &ssd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3849,11 +3845,11 @@ enum channel_operation_status HP_channel_unban(struct channel_data *chan, const void HP_channel_set_options(struct channel_data *chan, unsigned int options) { int hIndex = 0; if( HPMHooks.count.HP_channel_set_options_pre ) { - void (*preHookFunc) (struct channel_data *chan, unsigned int *options); + void (*preHookFunc) (struct channel_data **chan, unsigned int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_set_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_set_options_pre[hIndex].func; - preHookFunc(chan, &options); + preHookFunc(&chan, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3864,10 +3860,10 @@ void HP_channel_set_options(struct channel_data *chan, unsigned int options) { HPMHooks.source.channel.set_options(chan, options); } if( HPMHooks.count.HP_channel_set_options_post ) { - void (*postHookFunc) (struct channel_data *chan, unsigned int *options); + void (*postHookFunc) (struct channel_data *chan, unsigned int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_set_options_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_channel_set_options_post[hIndex].func; - postHookFunc(chan, &options); + postHookFunc(chan, options); } } return; @@ -3875,11 +3871,11 @@ void HP_channel_set_options(struct channel_data *chan, unsigned int options) { void HP_channel_send(struct channel_data *chan, struct map_session_data *sd, const char *msg) { int hIndex = 0; if( HPMHooks.count.HP_channel_send_pre ) { - void (*preHookFunc) (struct channel_data *chan, struct map_session_data *sd, const char *msg); + void (*preHookFunc) (struct channel_data **chan, struct map_session_data **sd, const char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_send_pre[hIndex].func; - preHookFunc(chan, sd, msg); + preHookFunc(&chan, &sd, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3901,11 +3897,11 @@ void HP_channel_send(struct channel_data *chan, struct map_session_data *sd, con void HP_channel_join_sub(struct channel_data *chan, struct map_session_data *sd, bool stealth) { int hIndex = 0; if( HPMHooks.count.HP_channel_join_sub_pre ) { - void (*preHookFunc) (struct channel_data *chan, struct map_session_data *sd, bool *stealth); + void (*preHookFunc) (struct channel_data **chan, struct map_session_data **sd, bool *stealth); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_join_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_join_sub_pre[hIndex].func; - preHookFunc(chan, sd, &stealth); + preHookFunc(&chan, &sd, &stealth); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3916,10 +3912,10 @@ void HP_channel_join_sub(struct channel_data *chan, struct map_session_data *sd, HPMHooks.source.channel.join_sub(chan, sd, stealth); } if( HPMHooks.count.HP_channel_join_sub_post ) { - void (*postHookFunc) (struct channel_data *chan, struct map_session_data *sd, bool *stealth); + void (*postHookFunc) (struct channel_data *chan, struct map_session_data *sd, bool stealth); for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_join_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_channel_join_sub_post[hIndex].func; - postHookFunc(chan, sd, &stealth); + postHookFunc(chan, sd, stealth); } } return; @@ -3928,11 +3924,11 @@ enum channel_operation_status HP_channel_join(struct channel_data *chan, struct int hIndex = 0; enum channel_operation_status retVal___ = HCS_STATUS_FAIL; if( HPMHooks.count.HP_channel_join_pre ) { - enum channel_operation_status (*preHookFunc) (struct channel_data *chan, struct map_session_data *sd, const char *password, bool *silent); + enum channel_operation_status (*preHookFunc) (struct channel_data **chan, struct map_session_data **sd, const char **password, bool *silent); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_join_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_join_pre[hIndex].func; - retVal___ = preHookFunc(chan, sd, password, &silent); + retVal___ = preHookFunc(&chan, &sd, &password, &silent); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3943,10 +3939,10 @@ enum channel_operation_status HP_channel_join(struct channel_data *chan, struct retVal___ = HPMHooks.source.channel.join(chan, sd, password, silent); } if( HPMHooks.count.HP_channel_join_post ) { - enum channel_operation_status (*postHookFunc) (enum channel_operation_status retVal___, struct channel_data *chan, struct map_session_data *sd, const char *password, bool *silent); + enum channel_operation_status (*postHookFunc) (enum channel_operation_status retVal___, struct channel_data *chan, struct map_session_data *sd, const char *password, bool silent); for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_join_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_channel_join_post[hIndex].func; - retVal___ = postHookFunc(retVal___, chan, sd, password, &silent); + retVal___ = postHookFunc(retVal___, chan, sd, password, silent); } } return retVal___; @@ -3954,11 +3950,11 @@ enum channel_operation_status HP_channel_join(struct channel_data *chan, struct void HP_channel_leave(struct channel_data *chan, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_channel_leave_pre ) { - void (*preHookFunc) (struct channel_data *chan, struct map_session_data *sd); + void (*preHookFunc) (struct channel_data **chan, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_leave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_leave_pre[hIndex].func; - preHookFunc(chan, sd); + preHookFunc(&chan, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3980,11 +3976,11 @@ void HP_channel_leave(struct channel_data *chan, struct map_session_data *sd) { void HP_channel_leave_sub(struct channel_data *chan, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_channel_leave_sub_pre ) { - void (*preHookFunc) (struct channel_data *chan, struct map_session_data *sd); + void (*preHookFunc) (struct channel_data **chan, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_leave_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_leave_sub_pre[hIndex].func; - preHookFunc(chan, sd); + preHookFunc(&chan, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4006,11 +4002,11 @@ void HP_channel_leave_sub(struct channel_data *chan, struct map_session_data *sd void HP_channel_quit(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_channel_quit_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_quit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_quit_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4032,11 +4028,11 @@ void HP_channel_quit(struct map_session_data *sd) { void HP_channel_map_join(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_channel_map_join_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_map_join_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_map_join_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4058,11 +4054,11 @@ void HP_channel_map_join(struct map_session_data *sd) { void HP_channel_guild_join_alliance(const struct guild *g_source, const struct guild *g_ally) { int hIndex = 0; if( HPMHooks.count.HP_channel_guild_join_alliance_pre ) { - void (*preHookFunc) (const struct guild *g_source, const struct guild *g_ally); + void (*preHookFunc) (const struct guild **g_source, const struct guild **g_ally); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_guild_join_alliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_guild_join_alliance_pre[hIndex].func; - preHookFunc(g_source, g_ally); + preHookFunc(&g_source, &g_ally); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4084,11 +4080,11 @@ void HP_channel_guild_join_alliance(const struct guild *g_source, const struct g void HP_channel_guild_leave_alliance(const struct guild *g_source, const struct guild *g_ally) { int hIndex = 0; if( HPMHooks.count.HP_channel_guild_leave_alliance_pre ) { - void (*preHookFunc) (const struct guild *g_source, const struct guild *g_ally); + void (*preHookFunc) (const struct guild **g_source, const struct guild **g_ally); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_guild_leave_alliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_guild_leave_alliance_pre[hIndex].func; - preHookFunc(g_source, g_ally); + preHookFunc(&g_source, &g_ally); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4110,11 +4106,11 @@ void HP_channel_guild_leave_alliance(const struct guild *g_source, const struct void HP_channel_quit_guild(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_channel_quit_guild_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_quit_guild_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_quit_guild_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4136,11 +4132,11 @@ void HP_channel_quit_guild(struct map_session_data *sd) { void HP_channel_irc_join(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_channel_irc_join_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_channel_irc_join_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_channel_irc_join_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4185,16 +4181,16 @@ void HP_channel_config_read(void) { } return; } -/* chat */ +/* chat_interface */ bool HP_chat_create_pc_chat(struct map_session_data *sd, const char *title, const char *pass, int limit, bool pub) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_create_pc_chat_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); + bool (*preHookFunc) (struct map_session_data **sd, const char **title, const char **pass, int *limit, bool *pub); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_pc_chat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_create_pc_chat_pre[hIndex].func; - retVal___ = preHookFunc(sd, title, pass, &limit, &pub); + retVal___ = preHookFunc(&sd, &title, &pass, &limit, &pub); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4205,10 +4201,10 @@ bool HP_chat_create_pc_chat(struct map_session_data *sd, const char *title, cons retVal___ = HPMHooks.source.chat.create_pc_chat(sd, title, pass, limit, pub); } if( HPMHooks.count.HP_chat_create_pc_chat_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *title, const char *pass, int limit, bool pub); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_pc_chat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_create_pc_chat_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, title, pass, &limit, &pub); + retVal___ = postHookFunc(retVal___, sd, title, pass, limit, pub); } } return retVal___; @@ -4217,11 +4213,11 @@ bool HP_chat_join(struct map_session_data *sd, int chatid, const char *pass) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_join_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *chatid, const char *pass); + bool (*preHookFunc) (struct map_session_data **sd, int *chatid, const char **pass); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_join_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_join_pre[hIndex].func; - retVal___ = preHookFunc(sd, &chatid, pass); + retVal___ = preHookFunc(&sd, &chatid, &pass); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4232,10 +4228,10 @@ bool HP_chat_join(struct map_session_data *sd, int chatid, const char *pass) { retVal___ = HPMHooks.source.chat.join(sd, chatid, pass); } if( HPMHooks.count.HP_chat_join_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *chatid, const char *pass); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int chatid, const char *pass); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_join_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_join_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &chatid, pass); + retVal___ = postHookFunc(retVal___, sd, chatid, pass); } } return retVal___; @@ -4244,11 +4240,11 @@ int HP_chat_leave(struct map_session_data *sd, bool kicked) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chat_leave_pre ) { - int (*preHookFunc) (struct map_session_data *sd, bool *kicked); + int (*preHookFunc) (struct map_session_data **sd, bool *kicked); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_leave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_leave_pre[hIndex].func; - retVal___ = preHookFunc(sd, &kicked); + retVal___ = preHookFunc(&sd, &kicked); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4259,10 +4255,10 @@ int HP_chat_leave(struct map_session_data *sd, bool kicked) { retVal___ = HPMHooks.source.chat.leave(sd, kicked); } if( HPMHooks.count.HP_chat_leave_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, bool *kicked); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, bool kicked); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_leave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_leave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &kicked); + retVal___ = postHookFunc(retVal___, sd, kicked); } } return retVal___; @@ -4271,11 +4267,11 @@ bool HP_chat_change_owner(struct map_session_data *sd, const char *nextownername int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_change_owner_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const char *nextownername); + bool (*preHookFunc) (struct map_session_data **sd, const char **nextownername); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_change_owner_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_change_owner_pre[hIndex].func; - retVal___ = preHookFunc(sd, nextownername); + retVal___ = preHookFunc(&sd, &nextownername); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4298,11 +4294,11 @@ bool HP_chat_change_status(struct map_session_data *sd, const char *title, const int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_change_status_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); + bool (*preHookFunc) (struct map_session_data **sd, const char **title, const char **pass, int *limit, bool *pub); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_change_status_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_change_status_pre[hIndex].func; - retVal___ = preHookFunc(sd, title, pass, &limit, &pub); + retVal___ = preHookFunc(&sd, &title, &pass, &limit, &pub); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4313,10 +4309,10 @@ bool HP_chat_change_status(struct map_session_data *sd, const char *title, const retVal___ = HPMHooks.source.chat.change_status(sd, title, pass, limit, pub); } if( HPMHooks.count.HP_chat_change_status_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *title, const char *pass, int limit, bool pub); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_change_status_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_change_status_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, title, pass, &limit, &pub); + retVal___ = postHookFunc(retVal___, sd, title, pass, limit, pub); } } return retVal___; @@ -4325,11 +4321,11 @@ bool HP_chat_kick(struct map_session_data *sd, const char *kickusername) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_kick_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const char *kickusername); + bool (*preHookFunc) (struct map_session_data **sd, const char **kickusername); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_kick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_kick_pre[hIndex].func; - retVal___ = preHookFunc(sd, kickusername); + retVal___ = preHookFunc(&sd, &kickusername); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4352,11 +4348,11 @@ bool HP_chat_create_npc_chat(struct npc_data *nd, const char *title, int limit, int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_create_npc_chat_pre ) { - bool (*preHookFunc) (struct npc_data *nd, const char *title, int *limit, bool *pub, int *trigger, const char *ev, int *zeny, int *minLvl, int *maxLvl); + bool (*preHookFunc) (struct npc_data **nd, const char **title, int *limit, bool *pub, int *trigger, const char **ev, int *zeny, int *minLvl, int *maxLvl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_npc_chat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_create_npc_chat_pre[hIndex].func; - retVal___ = preHookFunc(nd, title, &limit, &pub, &trigger, ev, &zeny, &minLvl, &maxLvl); + retVal___ = preHookFunc(&nd, &title, &limit, &pub, &trigger, &ev, &zeny, &minLvl, &maxLvl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4367,10 +4363,10 @@ bool HP_chat_create_npc_chat(struct npc_data *nd, const char *title, int limit, retVal___ = HPMHooks.source.chat.create_npc_chat(nd, title, limit, pub, trigger, ev, zeny, minLvl, maxLvl); } if( HPMHooks.count.HP_chat_create_npc_chat_post ) { - bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const char *title, int *limit, bool *pub, int *trigger, const char *ev, int *zeny, int *minLvl, int *maxLvl); + bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const char *title, int limit, bool pub, int trigger, const char *ev, int zeny, int minLvl, int maxLvl); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_npc_chat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_create_npc_chat_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, title, &limit, &pub, &trigger, ev, &zeny, &minLvl, &maxLvl); + retVal___ = postHookFunc(retVal___, nd, title, limit, pub, trigger, ev, zeny, minLvl, maxLvl); } } return retVal___; @@ -4379,11 +4375,11 @@ bool HP_chat_delete_npc_chat(struct npc_data *nd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_delete_npc_chat_pre ) { - bool (*preHookFunc) (struct npc_data *nd); + bool (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_delete_npc_chat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_delete_npc_chat_pre[hIndex].func; - retVal___ = preHookFunc(nd); + retVal___ = preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4406,11 +4402,11 @@ bool HP_chat_enable_event(struct chat_data *cd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_enable_event_pre ) { - bool (*preHookFunc) (struct chat_data *cd); + bool (*preHookFunc) (struct chat_data **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_enable_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_enable_event_pre[hIndex].func; - retVal___ = preHookFunc(cd); + retVal___ = preHookFunc(&cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4433,11 +4429,11 @@ bool HP_chat_disable_event(struct chat_data *cd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_disable_event_pre ) { - bool (*preHookFunc) (struct chat_data *cd); + bool (*preHookFunc) (struct chat_data **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_disable_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_disable_event_pre[hIndex].func; - retVal___ = preHookFunc(cd); + retVal___ = preHookFunc(&cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4460,11 +4456,11 @@ bool HP_chat_npc_kick_all(struct chat_data *cd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_npc_kick_all_pre ) { - bool (*preHookFunc) (struct chat_data *cd); + bool (*preHookFunc) (struct chat_data **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_npc_kick_all_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_npc_kick_all_pre[hIndex].func; - retVal___ = preHookFunc(cd); + retVal___ = preHookFunc(&cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4487,11 +4483,11 @@ bool HP_chat_trigger_event(struct chat_data *cd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chat_trigger_event_pre ) { - bool (*preHookFunc) (struct chat_data *cd); + bool (*preHookFunc) (struct chat_data **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_trigger_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_trigger_event_pre[hIndex].func; - retVal___ = preHookFunc(cd); + retVal___ = preHookFunc(&cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4514,11 +4510,11 @@ struct chat_data* HP_chat_create(struct block_list *bl, const char *title, const int hIndex = 0; struct chat_data* retVal___ = NULL; if( HPMHooks.count.HP_chat_create_pre ) { - struct chat_data* (*preHookFunc) (struct block_list *bl, const char *title, const char *pass, int *limit, bool *pub, int *trigger, const char *ev, int *zeny, int *minLvl, int *maxLvl); + struct chat_data* (*preHookFunc) (struct block_list **bl, const char **title, const char **pass, int *limit, bool *pub, int *trigger, const char **ev, int *zeny, int *minLvl, int *maxLvl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_create_pre[hIndex].func; - retVal___ = preHookFunc(bl, title, pass, &limit, &pub, &trigger, ev, &zeny, &minLvl, &maxLvl); + retVal___ = preHookFunc(&bl, &title, &pass, &limit, &pub, &trigger, &ev, &zeny, &minLvl, &maxLvl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4529,15 +4525,15 @@ struct chat_data* HP_chat_create(struct block_list *bl, const char *title, const retVal___ = HPMHooks.source.chat.create(bl, title, pass, limit, pub, trigger, ev, zeny, minLvl, maxLvl); } if( HPMHooks.count.HP_chat_create_post ) { - struct chat_data* (*postHookFunc) (struct chat_data* retVal___, struct block_list *bl, const char *title, const char *pass, int *limit, bool *pub, int *trigger, const char *ev, int *zeny, int *minLvl, int *maxLvl); + struct chat_data* (*postHookFunc) (struct chat_data* retVal___, struct block_list *bl, const char *title, const char *pass, int limit, bool pub, int trigger, const char *ev, int zeny, int minLvl, int maxLvl); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, title, pass, &limit, &pub, &trigger, ev, &zeny, &minLvl, &maxLvl); + retVal___ = postHookFunc(retVal___, bl, title, pass, limit, pub, trigger, ev, zeny, minLvl, maxLvl); } } return retVal___; } -/* chrif */ +/* chrif_interface */ void HP_chrif_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_chrif_init_pre ) { @@ -4556,10 +4552,10 @@ void HP_chrif_init(bool minimal) { HPMHooks.source.chrif.init(minimal); } if( HPMHooks.count.HP_chrif_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -4593,11 +4589,11 @@ void HP_chrif_final(void) { void HP_chrif_setuserid(char *id) { int hIndex = 0; if( HPMHooks.count.HP_chrif_setuserid_pre ) { - void (*preHookFunc) (char *id); + void (*preHookFunc) (char **id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_setuserid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_setuserid_pre[hIndex].func; - preHookFunc(id); + preHookFunc(&id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4619,11 +4615,11 @@ void HP_chrif_setuserid(char *id) { void HP_chrif_setpasswd(char *pwd) { int hIndex = 0; if( HPMHooks.count.HP_chrif_setpasswd_pre ) { - void (*preHookFunc) (char *pwd); + void (*preHookFunc) (char **pwd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_setpasswd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_setpasswd_pre[hIndex].func; - preHookFunc(pwd); + preHookFunc(&pwd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4672,11 +4668,11 @@ bool HP_chrif_setip(const char *ip) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_setip_pre ) { - bool (*preHookFunc) (const char *ip); + bool (*preHookFunc) (const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_setip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_setip_pre[hIndex].func; - retVal___ = preHookFunc(ip); + retVal___ = preHookFunc(&ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4713,10 +4709,10 @@ void HP_chrif_setport(uint16 port) { HPMHooks.source.chrif.setport(port); } if( HPMHooks.count.HP_chrif_setport_post ) { - void (*postHookFunc) (uint16 *port); + void (*postHookFunc) (uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_setport_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_setport_post[hIndex].func; - postHookFunc(&port); + postHookFunc(port); } } return; @@ -4793,10 +4789,10 @@ struct auth_node* HP_chrif_search(int account_id) { retVal___ = HPMHooks.source.chrif.search(account_id); } if( HPMHooks.count.HP_chrif_search_post ) { - struct auth_node* (*postHookFunc) (struct auth_node* retVal___, int *account_id); + struct auth_node* (*postHookFunc) (struct auth_node* retVal___, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id); + retVal___ = postHookFunc(retVal___, account_id); } } return retVal___; @@ -4820,10 +4816,10 @@ struct auth_node* HP_chrif_auth_check(int account_id, int char_id, enum sd_state retVal___ = HPMHooks.source.chrif.auth_check(account_id, char_id, state); } if( HPMHooks.count.HP_chrif_auth_check_post ) { - struct auth_node* (*postHookFunc) (struct auth_node* retVal___, int *account_id, int *char_id, enum sd_state *state); + struct auth_node* (*postHookFunc) (struct auth_node* retVal___, int account_id, int char_id, enum sd_state state); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_auth_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &char_id, &state); + retVal___ = postHookFunc(retVal___, account_id, char_id, state); } } return retVal___; @@ -4847,10 +4843,10 @@ bool HP_chrif_auth_delete(int account_id, int char_id, enum sd_state state) { retVal___ = HPMHooks.source.chrif.auth_delete(account_id, char_id, state); } if( HPMHooks.count.HP_chrif_auth_delete_post ) { - bool (*postHookFunc) (bool retVal___, int *account_id, int *char_id, enum sd_state *state); + bool (*postHookFunc) (bool retVal___, int account_id, int char_id, enum sd_state state); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_auth_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &char_id, &state); + retVal___ = postHookFunc(retVal___, account_id, char_id, state); } } return retVal___; @@ -4859,11 +4855,11 @@ bool HP_chrif_auth_finished(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_auth_finished_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_finished_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_auth_finished_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4885,11 +4881,11 @@ bool HP_chrif_auth_finished(struct map_session_data *sd) { void HP_chrif_authreq(struct map_session_data *sd, bool hstandalone) { int hIndex = 0; if( HPMHooks.count.HP_chrif_authreq_pre ) { - void (*preHookFunc) (struct map_session_data *sd, bool *hstandalone); + void (*preHookFunc) (struct map_session_data **sd, bool *hstandalone); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_authreq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_authreq_pre[hIndex].func; - preHookFunc(sd, &hstandalone); + preHookFunc(&sd, &hstandalone); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4900,10 +4896,10 @@ void HP_chrif_authreq(struct map_session_data *sd, bool hstandalone) { HPMHooks.source.chrif.authreq(sd, hstandalone); } if( HPMHooks.count.HP_chrif_authreq_post ) { - void (*postHookFunc) (struct map_session_data *sd, bool *hstandalone); + void (*postHookFunc) (struct map_session_data *sd, bool hstandalone); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_authreq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_authreq_post[hIndex].func; - postHookFunc(sd, &hstandalone); + postHookFunc(sd, hstandalone); } } return; @@ -4926,10 +4922,10 @@ void HP_chrif_authok(int fd) { HPMHooks.source.chrif.authok(fd); } if( HPMHooks.count.HP_chrif_authok_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_authok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_authok_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -4953,10 +4949,10 @@ bool HP_chrif_scdata_request(int account_id, int char_id) { retVal___ = HPMHooks.source.chrif.scdata_request(account_id, char_id); } if( HPMHooks.count.HP_chrif_scdata_request_post ) { - bool (*postHookFunc) (bool retVal___, int *account_id, int *char_id); + bool (*postHookFunc) (bool retVal___, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_scdata_request_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_scdata_request_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, account_id, char_id); } } return retVal___; @@ -4965,11 +4961,11 @@ bool HP_chrif_save(struct map_session_data *sd, int flag) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_save_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *flag); + bool (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_save_pre[hIndex].func; - retVal___ = preHookFunc(sd, &flag); + retVal___ = preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -4980,10 +4976,10 @@ bool HP_chrif_save(struct map_session_data *sd, int flag) { retVal___ = HPMHooks.source.chrif.save(sd, flag); } if( HPMHooks.count.HP_chrif_save_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *flag); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_save_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &flag); + retVal___ = postHookFunc(retVal___, sd, flag); } } return retVal___; @@ -4992,11 +4988,11 @@ bool HP_chrif_charselectreq(struct map_session_data *sd, uint32 s_ip) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_charselectreq_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, uint32 *s_ip); + bool (*preHookFunc) (struct map_session_data **sd, uint32 *s_ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_charselectreq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_charselectreq_pre[hIndex].func; - retVal___ = preHookFunc(sd, &s_ip); + retVal___ = preHookFunc(&sd, &s_ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5007,10 +5003,10 @@ bool HP_chrif_charselectreq(struct map_session_data *sd, uint32 s_ip) { retVal___ = HPMHooks.source.chrif.charselectreq(sd, s_ip); } if( HPMHooks.count.HP_chrif_charselectreq_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, uint32 *s_ip); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, uint32 s_ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_charselectreq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_charselectreq_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &s_ip); + retVal___ = postHookFunc(retVal___, sd, s_ip); } } return retVal___; @@ -5019,11 +5015,11 @@ bool HP_chrif_changemapserver(struct map_session_data *sd, uint32 ip, uint16 por int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_changemapserver_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, uint32 *ip, uint16 *port); + bool (*preHookFunc) (struct map_session_data **sd, uint32 *ip, uint16 *port); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changemapserver_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_changemapserver_pre[hIndex].func; - retVal___ = preHookFunc(sd, &ip, &port); + retVal___ = preHookFunc(&sd, &ip, &port); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5034,10 +5030,10 @@ bool HP_chrif_changemapserver(struct map_session_data *sd, uint32 ip, uint16 por retVal___ = HPMHooks.source.chrif.changemapserver(sd, ip, port); } if( HPMHooks.count.HP_chrif_changemapserver_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, uint32 *ip, uint16 *port); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, uint32 ip, uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changemapserver_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changemapserver_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &ip, &port); + retVal___ = postHookFunc(retVal___, sd, ip, port); } } return retVal___; @@ -5061,10 +5057,10 @@ bool HP_chrif_searchcharid(int char_id) { retVal___ = HPMHooks.source.chrif.searchcharid(char_id); } if( HPMHooks.count.HP_chrif_searchcharid_post ) { - bool (*postHookFunc) (bool retVal___, int *char_id); + bool (*postHookFunc) (bool retVal___, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_searchcharid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_searchcharid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id); + retVal___ = postHookFunc(retVal___, char_id); } } return retVal___; @@ -5073,11 +5069,11 @@ bool HP_chrif_changeemail(int id, const char *actual_email, const char *new_emai int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_changeemail_pre ) { - bool (*preHookFunc) (int *id, const char *actual_email, const char *new_email); + bool (*preHookFunc) (int *id, const char **actual_email, const char **new_email); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changeemail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_changeemail_pre[hIndex].func; - retVal___ = preHookFunc(&id, actual_email, new_email); + retVal___ = preHookFunc(&id, &actual_email, &new_email); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5088,10 +5084,10 @@ bool HP_chrif_changeemail(int id, const char *actual_email, const char *new_emai retVal___ = HPMHooks.source.chrif.changeemail(id, actual_email, new_email); } if( HPMHooks.count.HP_chrif_changeemail_post ) { - bool (*postHookFunc) (bool retVal___, int *id, const char *actual_email, const char *new_email); + bool (*postHookFunc) (bool retVal___, int id, const char *actual_email, const char *new_email); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changeemail_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changeemail_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id, actual_email, new_email); + retVal___ = postHookFunc(retVal___, id, actual_email, new_email); } } return retVal___; @@ -5100,11 +5096,11 @@ bool HP_chrif_char_ask_name(int acc, const char *character_name, unsigned short int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_char_ask_name_pre ) { - bool (*preHookFunc) (int *acc, const char *character_name, unsigned short *operation_type, int *year, int *month, int *day, int *hour, int *minute, int *second); + bool (*preHookFunc) (int *acc, const char **character_name, unsigned short *operation_type, int *year, int *month, int *day, int *hour, int *minute, int *second); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_ask_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_char_ask_name_pre[hIndex].func; - retVal___ = preHookFunc(&acc, character_name, &operation_type, &year, &month, &day, &hour, &minute, &second); + retVal___ = preHookFunc(&acc, &character_name, &operation_type, &year, &month, &day, &hour, &minute, &second); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5115,10 +5111,10 @@ bool HP_chrif_char_ask_name(int acc, const char *character_name, unsigned short retVal___ = HPMHooks.source.chrif.char_ask_name(acc, character_name, operation_type, year, month, day, hour, minute, second); } if( HPMHooks.count.HP_chrif_char_ask_name_post ) { - bool (*postHookFunc) (bool retVal___, int *acc, const char *character_name, unsigned short *operation_type, int *year, int *month, int *day, int *hour, int *minute, int *second); + bool (*postHookFunc) (bool retVal___, int acc, const char *character_name, unsigned short operation_type, int year, int month, int day, int hour, int minute, int second); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_ask_name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_char_ask_name_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &acc, character_name, &operation_type, &year, &month, &day, &hour, &minute, &second); + retVal___ = postHookFunc(retVal___, acc, character_name, operation_type, year, month, day, hour, minute, second); } } return retVal___; @@ -5127,11 +5123,11 @@ int HP_chrif_updatefamelist(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chrif_updatefamelist_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_updatefamelist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_updatefamelist_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5181,11 +5177,11 @@ bool HP_chrif_save_scdata(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_save_scdata_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_scdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_save_scdata_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5223,10 +5219,10 @@ bool HP_chrif_ragsrvinfo(int base_rate, int job_rate, int drop_rate) { retVal___ = HPMHooks.source.chrif.ragsrvinfo(base_rate, job_rate, drop_rate); } if( HPMHooks.count.HP_chrif_ragsrvinfo_post ) { - bool (*postHookFunc) (bool retVal___, int *base_rate, int *job_rate, int *drop_rate); + bool (*postHookFunc) (bool retVal___, int base_rate, int job_rate, int drop_rate); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_ragsrvinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_ragsrvinfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &base_rate, &job_rate, &drop_rate); + retVal___ = postHookFunc(retVal___, base_rate, job_rate, drop_rate); } } return retVal___; @@ -5250,10 +5246,10 @@ bool HP_chrif_char_offline_nsd(int account_id, int char_id) { retVal___ = HPMHooks.source.chrif.char_offline_nsd(account_id, char_id); } if( HPMHooks.count.HP_chrif_char_offline_nsd_post ) { - bool (*postHookFunc) (bool retVal___, int *account_id, int *char_id); + bool (*postHookFunc) (bool retVal___, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_offline_nsd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_char_offline_nsd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, account_id, char_id); } } return retVal___; @@ -5316,11 +5312,11 @@ bool HP_chrif_char_online(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_char_online_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_online_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_char_online_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5343,11 +5339,11 @@ bool HP_chrif_changesex(struct map_session_data *sd, bool change_account) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_changesex_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, bool *change_account); + bool (*preHookFunc) (struct map_session_data **sd, bool *change_account); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changesex_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_changesex_pre[hIndex].func; - retVal___ = preHookFunc(sd, &change_account); + retVal___ = preHookFunc(&sd, &change_account); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5358,10 +5354,10 @@ bool HP_chrif_changesex(struct map_session_data *sd, bool change_account) { retVal___ = HPMHooks.source.chrif.changesex(sd, change_account); } if( HPMHooks.count.HP_chrif_changesex_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, bool *change_account); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, bool change_account); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changesex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changesex_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &change_account); + retVal___ = postHookFunc(retVal___, sd, change_account); } } return retVal___; @@ -5385,10 +5381,10 @@ bool HP_chrif_divorce(int partner_id1, int partner_id2) { retVal___ = HPMHooks.source.chrif.divorce(partner_id1, partner_id2); } if( HPMHooks.count.HP_chrif_divorce_post ) { - bool (*postHookFunc) (bool retVal___, int *partner_id1, int *partner_id2); + bool (*postHookFunc) (bool retVal___, int partner_id1, int partner_id2); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_divorce_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_divorce_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &partner_id1, &partner_id2); + retVal___ = postHookFunc(retVal___, partner_id1, partner_id2); } } return retVal___; @@ -5412,10 +5408,10 @@ bool HP_chrif_removefriend(int char_id, int friend_id) { retVal___ = HPMHooks.source.chrif.removefriend(char_id, friend_id); } if( HPMHooks.count.HP_chrif_removefriend_post ) { - bool (*postHookFunc) (bool retVal___, int *char_id, int *friend_id); + bool (*postHookFunc) (bool retVal___, int char_id, int friend_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_removefriend_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_removefriend_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &friend_id); + retVal___ = postHookFunc(retVal___, char_id, friend_id); } } return retVal___; @@ -5423,11 +5419,11 @@ bool HP_chrif_removefriend(int char_id, int friend_id) { void HP_chrif_send_report(char *buf, int len) { int hIndex = 0; if( HPMHooks.count.HP_chrif_send_report_pre ) { - void (*preHookFunc) (char *buf, int *len); + void (*preHookFunc) (char **buf, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_send_report_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_send_report_pre[hIndex].func; - preHookFunc(buf, &len); + preHookFunc(&buf, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5438,10 +5434,10 @@ void HP_chrif_send_report(char *buf, int len) { HPMHooks.source.chrif.send_report(buf, len); } if( HPMHooks.count.HP_chrif_send_report_post ) { - void (*postHookFunc) (char *buf, int *len); + void (*postHookFunc) (char *buf, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_send_report_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_send_report_post[hIndex].func; - postHookFunc(buf, &len); + postHookFunc(buf, len); } } return; @@ -5491,10 +5487,10 @@ void HP_chrif_skillid2idx(int fd) { HPMHooks.source.chrif.skillid2idx(fd); } if( HPMHooks.count.HP_chrif_skillid2idx_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_skillid2idx_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_skillid2idx_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5503,11 +5499,11 @@ bool HP_chrif_sd_to_auth(struct map_session_data *sd, enum sd_state state) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_sd_to_auth_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, enum sd_state *state); + bool (*preHookFunc) (struct map_session_data **sd, enum sd_state *state); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_sd_to_auth_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_sd_to_auth_pre[hIndex].func; - retVal___ = preHookFunc(sd, &state); + retVal___ = preHookFunc(&sd, &state); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5518,10 +5514,10 @@ bool HP_chrif_sd_to_auth(struct map_session_data *sd, enum sd_state state) { retVal___ = HPMHooks.source.chrif.sd_to_auth(sd, state); } if( HPMHooks.count.HP_chrif_sd_to_auth_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, enum sd_state *state); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, enum sd_state state); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_sd_to_auth_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_sd_to_auth_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &state); + retVal___ = postHookFunc(retVal___, sd, state); } } return retVal___; @@ -5545,10 +5541,10 @@ int HP_chrif_check_connect_char_server(int tid, int64 tick, int id, intptr_t dat retVal___ = HPMHooks.source.chrif.check_connect_char_server(tid, tick, id, data); } if( HPMHooks.count.HP_chrif_check_connect_char_server_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_check_connect_char_server_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_check_connect_char_server_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -5557,11 +5553,11 @@ bool HP_chrif_auth_logout(struct map_session_data *sd, enum sd_state state) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_auth_logout_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, enum sd_state *state); + bool (*preHookFunc) (struct map_session_data **sd, enum sd_state *state); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_logout_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_auth_logout_pre[hIndex].func; - retVal___ = preHookFunc(sd, &state); + retVal___ = preHookFunc(&sd, &state); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5572,10 +5568,10 @@ bool HP_chrif_auth_logout(struct map_session_data *sd, enum sd_state state) { retVal___ = HPMHooks.source.chrif.auth_logout(sd, state); } if( HPMHooks.count.HP_chrif_auth_logout_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, enum sd_state *state); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, enum sd_state state); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_logout_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_auth_logout_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &state); + retVal___ = postHookFunc(retVal___, sd, state); } } return retVal___; @@ -5598,24 +5594,24 @@ void HP_chrif_save_ack(int fd) { HPMHooks.source.chrif.save_ack(fd); } if( HPMHooks.count.HP_chrif_save_ack_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_save_ack_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; } -int HP_chrif_reconnect(DBKey key, DBData *data, va_list ap) { +int HP_chrif_reconnect(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chrif_reconnect_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_reconnect_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_chrif_reconnect_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -5629,26 +5625,26 @@ int HP_chrif_reconnect(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_chrif_reconnect_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_reconnect_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_chrif_reconnect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_chrif_auth_db_cleanup_sub(DBKey key, DBData *data, va_list ap) { +int HP_chrif_auth_db_cleanup_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chrif_auth_db_cleanup_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_db_cleanup_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_chrif_auth_db_cleanup_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -5662,11 +5658,11 @@ int HP_chrif_auth_db_cleanup_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_chrif_auth_db_cleanup_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_db_cleanup_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_chrif_auth_db_cleanup_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -5676,11 +5672,11 @@ bool HP_chrif_char_ask_name_answer(int acc, const char *player_name, uint16 type int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_chrif_char_ask_name_answer_pre ) { - bool (*preHookFunc) (int *acc, const char *player_name, uint16 *type, uint16 *answer); + bool (*preHookFunc) (int *acc, const char **player_name, uint16 *type, uint16 *answer); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_ask_name_answer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_char_ask_name_answer_pre[hIndex].func; - retVal___ = preHookFunc(&acc, player_name, &type, &answer); + retVal___ = preHookFunc(&acc, &player_name, &type, &answer); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5691,24 +5687,24 @@ bool HP_chrif_char_ask_name_answer(int acc, const char *player_name, uint16 type retVal___ = HPMHooks.source.chrif.char_ask_name_answer(acc, player_name, type, answer); } if( HPMHooks.count.HP_chrif_char_ask_name_answer_post ) { - bool (*postHookFunc) (bool retVal___, int *acc, const char *player_name, uint16 *type, uint16 *answer); + bool (*postHookFunc) (bool retVal___, int acc, const char *player_name, uint16 type, uint16 answer); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_ask_name_answer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_char_ask_name_answer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &acc, player_name, &type, &answer); + retVal___ = postHookFunc(retVal___, acc, player_name, type, answer); } } return retVal___; } -int HP_chrif_auth_db_final(DBKey key, DBData *data, va_list ap) { +int HP_chrif_auth_db_final(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chrif_auth_db_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_db_final_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_chrif_auth_db_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -5722,11 +5718,11 @@ int HP_chrif_auth_db_final(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_chrif_auth_db_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_db_final_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_chrif_auth_db_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -5751,10 +5747,10 @@ int HP_chrif_send_usercount_tochar(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.chrif.send_usercount_tochar(tid, tick, id, data); } if( HPMHooks.count.HP_chrif_send_usercount_tochar_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_send_usercount_tochar_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_send_usercount_tochar_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -5778,10 +5774,10 @@ int HP_chrif_auth_db_cleanup(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.chrif.auth_db_cleanup(tid, tick, id, data); } if( HPMHooks.count.HP_chrif_auth_db_cleanup_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_db_cleanup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_auth_db_cleanup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -5804,10 +5800,10 @@ void HP_chrif_connect(int fd) { HPMHooks.source.chrif.connect(fd); } if( HPMHooks.count.HP_chrif_connect_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_connect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_connect_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5830,10 +5826,10 @@ void HP_chrif_connectack(int fd) { HPMHooks.source.chrif.connectack(fd); } if( HPMHooks.count.HP_chrif_connectack_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_connectack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_connectack_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5856,10 +5852,10 @@ void HP_chrif_sendmap(int fd) { HPMHooks.source.chrif.sendmap(fd); } if( HPMHooks.count.HP_chrif_sendmap_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_sendmap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_sendmap_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5882,10 +5878,10 @@ void HP_chrif_sendmapack(int fd) { HPMHooks.source.chrif.sendmapack(fd); } if( HPMHooks.count.HP_chrif_sendmapack_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_sendmapack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_sendmapack_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5908,10 +5904,10 @@ void HP_chrif_recvmap(int fd) { HPMHooks.source.chrif.recvmap(fd); } if( HPMHooks.count.HP_chrif_recvmap_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_recvmap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_recvmap_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5935,10 +5931,10 @@ bool HP_chrif_changemapserverack(int account_id, int login_id1, int login_id2, i retVal___ = HPMHooks.source.chrif.changemapserverack(account_id, login_id1, login_id2, char_id, map_index, x, y, ip, port); } if( HPMHooks.count.HP_chrif_changemapserverack_post ) { - bool (*postHookFunc) (bool retVal___, int *account_id, int *login_id1, int *login_id2, int *char_id, short *map_index, short *x, short *y, uint32 *ip, uint16 *port); + bool (*postHookFunc) (bool retVal___, int account_id, int login_id1, int login_id2, int char_id, short map_index, short x, short y, uint32 ip, uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changemapserverack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changemapserverack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &login_id1, &login_id2, &char_id, &map_index, &x, &y, &ip, &port); + retVal___ = postHookFunc(retVal___, account_id, login_id1, login_id2, char_id, map_index, x, y, ip, port); } } return retVal___; @@ -5961,10 +5957,10 @@ void HP_chrif_changedsex(int fd) { HPMHooks.source.chrif.changedsex(fd); } if( HPMHooks.count.HP_chrif_changedsex_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changedsex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changedsex_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -5988,10 +5984,10 @@ bool HP_chrif_divorceack(int char_id, int partner_id) { retVal___ = HPMHooks.source.chrif.divorceack(char_id, partner_id); } if( HPMHooks.count.HP_chrif_divorceack_post ) { - bool (*postHookFunc) (bool retVal___, int *char_id, int *partner_id); + bool (*postHookFunc) (bool retVal___, int char_id, int partner_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_divorceack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_divorceack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &partner_id); + retVal___ = postHookFunc(retVal___, char_id, partner_id); } } return retVal___; @@ -6014,10 +6010,10 @@ void HP_chrif_idbanned(int fd) { HPMHooks.source.chrif.idbanned(fd); } if( HPMHooks.count.HP_chrif_idbanned_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_idbanned_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_idbanned_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -6040,10 +6036,10 @@ void HP_chrif_recvfamelist(int fd) { HPMHooks.source.chrif.recvfamelist(fd); } if( HPMHooks.count.HP_chrif_recvfamelist_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_recvfamelist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_recvfamelist_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -6067,10 +6063,10 @@ bool HP_chrif_load_scdata(int fd) { retVal___ = HPMHooks.source.chrif.load_scdata(fd); } if( HPMHooks.count.HP_chrif_load_scdata_post ) { - bool (*postHookFunc) (bool retVal___, int *fd); + bool (*postHookFunc) (bool retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_load_scdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_load_scdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -6093,10 +6089,10 @@ void HP_chrif_update_ip(int fd) { HPMHooks.source.chrif.update_ip(fd); } if( HPMHooks.count.HP_chrif_update_ip_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_update_ip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_update_ip_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -6120,10 +6116,10 @@ int HP_chrif_disconnectplayer(int fd) { retVal___ = HPMHooks.source.chrif.disconnectplayer(fd); } if( HPMHooks.count.HP_chrif_disconnectplayer_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_disconnectplayer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_disconnectplayer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -6146,10 +6142,10 @@ void HP_chrif_removemap(int fd) { HPMHooks.source.chrif.removemap(fd); } if( HPMHooks.count.HP_chrif_removemap_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_removemap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_removemap_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -6173,10 +6169,10 @@ int HP_chrif_updatefamelist_ack(int fd) { retVal___ = HPMHooks.source.chrif.updatefamelist_ack(fd); } if( HPMHooks.count.HP_chrif_updatefamelist_ack_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_updatefamelist_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_updatefamelist_ack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -6199,10 +6195,10 @@ void HP_chrif_keepalive(int fd) { HPMHooks.source.chrif.keepalive(fd); } if( HPMHooks.count.HP_chrif_keepalive_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_keepalive_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_keepalive_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -6225,10 +6221,10 @@ void HP_chrif_keepalive_ack(int fd) { HPMHooks.source.chrif.keepalive_ack(fd); } if( HPMHooks.count.HP_chrif_keepalive_ack_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_keepalive_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_keepalive_ack_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -6251,10 +6247,10 @@ void HP_chrif_deadopt(int father_id, int mother_id, int child_id) { HPMHooks.source.chrif.deadopt(father_id, mother_id, child_id); } if( HPMHooks.count.HP_chrif_deadopt_post ) { - void (*postHookFunc) (int *father_id, int *mother_id, int *child_id); + void (*postHookFunc) (int father_id, int mother_id, int child_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_deadopt_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_deadopt_post[hIndex].func; - postHookFunc(&father_id, &mother_id, &child_id); + postHookFunc(father_id, mother_id, child_id); } } return; @@ -6277,10 +6273,10 @@ void HP_chrif_authfail(int fd) { HPMHooks.source.chrif.authfail(fd); } if( HPMHooks.count.HP_chrif_authfail_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_authfail_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_authfail_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -6356,10 +6352,10 @@ int HP_chrif_parse(int fd) { retVal___ = HPMHooks.source.chrif.parse(fd); } if( HPMHooks.count.HP_chrif_parse_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_parse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_parse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -6367,11 +6363,11 @@ int HP_chrif_parse(int fd) { void HP_chrif_save_scdata_single(int account_id, int char_id, short type, struct status_change_entry *sce) { int hIndex = 0; if( HPMHooks.count.HP_chrif_save_scdata_single_pre ) { - void (*preHookFunc) (int *account_id, int *char_id, short *type, struct status_change_entry *sce); + void (*preHookFunc) (int *account_id, int *char_id, short *type, struct status_change_entry **sce); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_scdata_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_save_scdata_single_pre[hIndex].func; - preHookFunc(&account_id, &char_id, &type, sce); + preHookFunc(&account_id, &char_id, &type, &sce); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6382,10 +6378,10 @@ void HP_chrif_save_scdata_single(int account_id, int char_id, short type, struct HPMHooks.source.chrif.save_scdata_single(account_id, char_id, type, sce); } if( HPMHooks.count.HP_chrif_save_scdata_single_post ) { - void (*postHookFunc) (int *account_id, int *char_id, short *type, struct status_change_entry *sce); + void (*postHookFunc) (int account_id, int char_id, short type, struct status_change_entry *sce); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_scdata_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_save_scdata_single_post[hIndex].func; - postHookFunc(&account_id, &char_id, &type, sce); + postHookFunc(account_id, char_id, type, sce); } } return; @@ -6408,15 +6404,15 @@ void HP_chrif_del_scdata_single(int account_id, int char_id, short type) { HPMHooks.source.chrif.del_scdata_single(account_id, char_id, type); } if( HPMHooks.count.HP_chrif_del_scdata_single_post ) { - void (*postHookFunc) (int *account_id, int *char_id, short *type); + void (*postHookFunc) (int account_id, int char_id, short type); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_del_scdata_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_del_scdata_single_post[hIndex].func; - postHookFunc(&account_id, &char_id, &type); + postHookFunc(account_id, char_id, type); } } return; } -/* clif */ +/* clif_interface */ int HP_clif_init(bool minimal) { int hIndex = 0; int retVal___ = 0; @@ -6436,10 +6432,10 @@ int HP_clif_init(bool minimal) { retVal___ = HPMHooks.source.clif.init(minimal); } if( HPMHooks.count.HP_clif_init_post ) { - int (*postHookFunc) (int retVal___, bool *minimal); + int (*postHookFunc) (int retVal___, bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &minimal); + retVal___ = postHookFunc(retVal___, minimal); } } return retVal___; @@ -6474,11 +6470,11 @@ bool HP_clif_setip(const char *ip) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_clif_setip_pre ) { - bool (*preHookFunc) (const char *ip); + bool (*preHookFunc) (const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_setip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_setip_pre[hIndex].func; - retVal___ = preHookFunc(ip); + retVal___ = preHookFunc(&ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6501,11 +6497,11 @@ bool HP_clif_setbindip(const char *ip) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_clif_setbindip_pre ) { - bool (*preHookFunc) (const char *ip); + bool (*preHookFunc) (const char **ip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_setbindip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_setbindip_pre[hIndex].func; - retVal___ = preHookFunc(ip); + retVal___ = preHookFunc(&ip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6542,10 +6538,10 @@ void HP_clif_setport(uint16 port) { HPMHooks.source.clif.setport(port); } if( HPMHooks.count.HP_clif_setport_post ) { - void (*postHookFunc) (uint16 *port); + void (*postHookFunc) (uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_setport_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_setport_post[hIndex].func; - postHookFunc(&port); + postHookFunc(port); } } return; @@ -6581,11 +6577,11 @@ bool HP_clif_send(const void *buf, int len, struct block_list *bl, enum send_tar int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_clif_send_pre ) { - bool (*preHookFunc) (const void *buf, int *len, struct block_list *bl, enum send_target *type); + bool (*preHookFunc) (const void **buf, int *len, struct block_list **bl, enum send_target *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_send_pre[hIndex].func; - retVal___ = preHookFunc(buf, &len, bl, &type); + retVal___ = preHookFunc(&buf, &len, &bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6596,10 +6592,10 @@ bool HP_clif_send(const void *buf, int len, struct block_list *bl, enum send_tar retVal___ = HPMHooks.source.clif.send(buf, len, bl, type); } if( HPMHooks.count.HP_clif_send_post ) { - bool (*postHookFunc) (bool retVal___, const void *buf, int *len, struct block_list *bl, enum send_target *type); + bool (*postHookFunc) (bool retVal___, const void *buf, int len, struct block_list *bl, enum send_target type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_send_post[hIndex].func; - retVal___ = postHookFunc(retVal___, buf, &len, bl, &type); + retVal___ = postHookFunc(retVal___, buf, len, bl, type); } } return retVal___; @@ -6608,12 +6604,12 @@ int HP_clif_send_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_send_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_clif_send_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -6641,11 +6637,11 @@ int HP_clif_send_actual(int fd, void *buf, int len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_send_actual_pre ) { - int (*preHookFunc) (int *fd, void *buf, int *len); + int (*preHookFunc) (int *fd, void **buf, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_actual_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_send_actual_pre[hIndex].func; - retVal___ = preHookFunc(&fd, buf, &len); + retVal___ = preHookFunc(&fd, &buf, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6656,10 +6652,10 @@ int HP_clif_send_actual(int fd, void *buf, int len) { retVal___ = HPMHooks.source.clif.send_actual(fd, buf, len); } if( HPMHooks.count.HP_clif_send_actual_post ) { - int (*postHookFunc) (int retVal___, int *fd, void *buf, int *len); + int (*postHookFunc) (int retVal___, int fd, void *buf, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_actual_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_send_actual_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, buf, &len); + retVal___ = postHookFunc(retVal___, fd, buf, len); } } return retVal___; @@ -6683,10 +6679,10 @@ int HP_clif_parse(int fd) { retVal___ = HPMHooks.source.clif.parse(fd); } if( HPMHooks.count.HP_clif_parse_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_parse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_parse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -6710,10 +6706,10 @@ const struct s_packet_db* HP_clif_packet(int packet_id) { retVal___ = HPMHooks.source.clif.packet(packet_id); } if( HPMHooks.count.HP_clif_packet_post ) { - const struct s_packet_db* (*postHookFunc) (const struct s_packet_db* retVal___, int *packet_id); + const struct s_packet_db* (*postHookFunc) (const struct s_packet_db* retVal___, int packet_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_packet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_packet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &packet_id); + retVal___ = postHookFunc(retVal___, packet_id); } } return retVal___; @@ -6722,11 +6718,11 @@ unsigned short HP_clif_parse_cmd(int fd, struct map_session_data *sd) { int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_clif_parse_cmd_pre ) { - unsigned short (*preHookFunc) (int *fd, struct map_session_data *sd); + unsigned short (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_parse_cmd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_parse_cmd_pre[hIndex].func; - retVal___ = preHookFunc(&fd, sd); + retVal___ = preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6737,10 +6733,10 @@ unsigned short HP_clif_parse_cmd(int fd, struct map_session_data *sd) { retVal___ = HPMHooks.source.clif.parse_cmd(fd, sd); } if( HPMHooks.count.HP_clif_parse_cmd_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, int *fd, struct map_session_data *sd); + unsigned short (*postHookFunc) (unsigned short retVal___, int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_parse_cmd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_parse_cmd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, sd); + retVal___ = postHookFunc(retVal___, fd, sd); } } return retVal___; @@ -6749,11 +6745,11 @@ unsigned short HP_clif_decrypt_cmd(int cmd, struct map_session_data *sd) { int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_clif_decrypt_cmd_pre ) { - unsigned short (*preHookFunc) (int *cmd, struct map_session_data *sd); + unsigned short (*preHookFunc) (int *cmd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_decrypt_cmd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_decrypt_cmd_pre[hIndex].func; - retVal___ = preHookFunc(&cmd, sd); + retVal___ = preHookFunc(&cmd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6764,10 +6760,10 @@ unsigned short HP_clif_decrypt_cmd(int cmd, struct map_session_data *sd) { retVal___ = HPMHooks.source.clif.decrypt_cmd(cmd, sd); } if( HPMHooks.count.HP_clif_decrypt_cmd_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, int *cmd, struct map_session_data *sd); + unsigned short (*postHookFunc) (unsigned short retVal___, int cmd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_decrypt_cmd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_decrypt_cmd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &cmd, sd); + retVal___ = postHookFunc(retVal___, cmd, sd); } } return retVal___; @@ -6775,11 +6771,11 @@ unsigned short HP_clif_decrypt_cmd(int cmd, struct map_session_data *sd) { void HP_clif_authok(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_authok_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_authok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_authok_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6816,10 +6812,10 @@ void HP_clif_authrefuse(int fd, uint8 error_code) { HPMHooks.source.clif.authrefuse(fd, error_code); } if( HPMHooks.count.HP_clif_authrefuse_post ) { - void (*postHookFunc) (int *fd, uint8 *error_code); + void (*postHookFunc) (int fd, uint8 error_code); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_authrefuse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_authrefuse_post[hIndex].func; - postHookFunc(&fd, &error_code); + postHookFunc(fd, error_code); } } return; @@ -6842,10 +6838,10 @@ void HP_clif_authfail_fd(int fd, int type) { HPMHooks.source.clif.authfail_fd(fd, type); } if( HPMHooks.count.HP_clif_authfail_fd_post ) { - void (*postHookFunc) (int *fd, int *type); + void (*postHookFunc) (int fd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_authfail_fd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_authfail_fd_post[hIndex].func; - postHookFunc(&fd, &type); + postHookFunc(fd, type); } } return; @@ -6868,10 +6864,10 @@ void HP_clif_charselectok(int id, uint8 ok) { HPMHooks.source.clif.charselectok(id, ok); } if( HPMHooks.count.HP_clif_charselectok_post ) { - void (*postHookFunc) (int *id, uint8 *ok); + void (*postHookFunc) (int id, uint8 ok); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_charselectok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_charselectok_post[hIndex].func; - postHookFunc(&id, &ok); + postHookFunc(id, ok); } } return; @@ -6879,11 +6875,11 @@ void HP_clif_charselectok(int id, uint8 ok) { void HP_clif_dropflooritem(struct flooritem_data *fitem) { int hIndex = 0; if( HPMHooks.count.HP_clif_dropflooritem_pre ) { - void (*preHookFunc) (struct flooritem_data *fitem); + void (*preHookFunc) (struct flooritem_data **fitem); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_dropflooritem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_dropflooritem_pre[hIndex].func; - preHookFunc(fitem); + preHookFunc(&fitem); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6905,11 +6901,11 @@ void HP_clif_dropflooritem(struct flooritem_data *fitem) { void HP_clif_clearflooritem(struct flooritem_data *fitem, int fd) { int hIndex = 0; if( HPMHooks.count.HP_clif_clearflooritem_pre ) { - void (*preHookFunc) (struct flooritem_data *fitem, int *fd); + void (*preHookFunc) (struct flooritem_data **fitem, int *fd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearflooritem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_clearflooritem_pre[hIndex].func; - preHookFunc(fitem, &fd); + preHookFunc(&fitem, &fd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6920,10 +6916,10 @@ void HP_clif_clearflooritem(struct flooritem_data *fitem, int fd) { HPMHooks.source.clif.clearflooritem(fitem, fd); } if( HPMHooks.count.HP_clif_clearflooritem_post ) { - void (*postHookFunc) (struct flooritem_data *fitem, int *fd); + void (*postHookFunc) (struct flooritem_data *fitem, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearflooritem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_clearflooritem_post[hIndex].func; - postHookFunc(fitem, &fd); + postHookFunc(fitem, fd); } } return; @@ -6931,11 +6927,11 @@ void HP_clif_clearflooritem(struct flooritem_data *fitem, int fd) { void HP_clif_additem(struct map_session_data *sd, int n, int amount, int fail) { int hIndex = 0; if( HPMHooks.count.HP_clif_additem_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *n, int *amount, int *fail); + void (*preHookFunc) (struct map_session_data **sd, int *n, int *amount, int *fail); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_additem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_additem_pre[hIndex].func; - preHookFunc(sd, &n, &amount, &fail); + preHookFunc(&sd, &n, &amount, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6946,10 +6942,10 @@ void HP_clif_additem(struct map_session_data *sd, int n, int amount, int fail) { HPMHooks.source.clif.additem(sd, n, amount, fail); } if( HPMHooks.count.HP_clif_additem_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *n, int *amount, int *fail); + void (*postHookFunc) (struct map_session_data *sd, int n, int amount, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_additem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_additem_post[hIndex].func; - postHookFunc(sd, &n, &amount, &fail); + postHookFunc(sd, n, amount, fail); } } return; @@ -6957,11 +6953,11 @@ void HP_clif_additem(struct map_session_data *sd, int n, int amount, int fail) { void HP_clif_dropitem(struct map_session_data *sd, int n, int amount) { int hIndex = 0; if( HPMHooks.count.HP_clif_dropitem_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *n, int *amount); + void (*preHookFunc) (struct map_session_data **sd, int *n, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_dropitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_dropitem_pre[hIndex].func; - preHookFunc(sd, &n, &amount); + preHookFunc(&sd, &n, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6972,10 +6968,10 @@ void HP_clif_dropitem(struct map_session_data *sd, int n, int amount) { HPMHooks.source.clif.dropitem(sd, n, amount); } if( HPMHooks.count.HP_clif_dropitem_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *n, int *amount); + void (*postHookFunc) (struct map_session_data *sd, int n, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_dropitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_dropitem_post[hIndex].func; - postHookFunc(sd, &n, &amount); + postHookFunc(sd, n, amount); } } return; @@ -6983,11 +6979,11 @@ void HP_clif_dropitem(struct map_session_data *sd, int n, int amount) { void HP_clif_delitem(struct map_session_data *sd, int n, int amount, short reason) { int hIndex = 0; if( HPMHooks.count.HP_clif_delitem_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *n, int *amount, short *reason); + void (*preHookFunc) (struct map_session_data **sd, int *n, int *amount, short *reason); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_delitem_pre[hIndex].func; - preHookFunc(sd, &n, &amount, &reason); + preHookFunc(&sd, &n, &amount, &reason); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6998,10 +6994,10 @@ void HP_clif_delitem(struct map_session_data *sd, int n, int amount, short reaso HPMHooks.source.clif.delitem(sd, n, amount, reason); } if( HPMHooks.count.HP_clif_delitem_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *n, int *amount, short *reason); + void (*postHookFunc) (struct map_session_data *sd, int n, int amount, short reason); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_delitem_post[hIndex].func; - postHookFunc(sd, &n, &amount, &reason); + postHookFunc(sd, n, amount, reason); } } return; @@ -7009,11 +7005,11 @@ void HP_clif_delitem(struct map_session_data *sd, int n, int amount, short reaso void HP_clif_takeitem(struct block_list *src, struct block_list *dst) { int hIndex = 0; if( HPMHooks.count.HP_clif_takeitem_pre ) { - void (*preHookFunc) (struct block_list *src, struct block_list *dst); + void (*preHookFunc) (struct block_list **src, struct block_list **dst); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_takeitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_takeitem_pre[hIndex].func; - preHookFunc(src, dst); + preHookFunc(&src, &dst); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7035,11 +7031,11 @@ void HP_clif_takeitem(struct block_list *src, struct block_list *dst) { void HP_clif_item_equip(short idx, struct EQUIPITEM_INFO *p, struct item *i, struct item_data *id, int eqp_pos) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_equip_pre ) { - void (*preHookFunc) (short *idx, struct EQUIPITEM_INFO *p, struct item *i, struct item_data *id, int *eqp_pos); + void (*preHookFunc) (short *idx, struct EQUIPITEM_INFO **p, struct item **i, struct item_data **id, int *eqp_pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_equip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_equip_pre[hIndex].func; - preHookFunc(&idx, p, i, id, &eqp_pos); + preHookFunc(&idx, &p, &i, &id, &eqp_pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7050,10 +7046,10 @@ void HP_clif_item_equip(short idx, struct EQUIPITEM_INFO *p, struct item *i, str HPMHooks.source.clif.item_equip(idx, p, i, id, eqp_pos); } if( HPMHooks.count.HP_clif_item_equip_post ) { - void (*postHookFunc) (short *idx, struct EQUIPITEM_INFO *p, struct item *i, struct item_data *id, int *eqp_pos); + void (*postHookFunc) (short idx, struct EQUIPITEM_INFO *p, struct item *i, struct item_data *id, int eqp_pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_equip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_item_equip_post[hIndex].func; - postHookFunc(&idx, p, i, id, &eqp_pos); + postHookFunc(idx, p, i, id, eqp_pos); } } return; @@ -7061,11 +7057,11 @@ void HP_clif_item_equip(short idx, struct EQUIPITEM_INFO *p, struct item *i, str void HP_clif_item_normal(short idx, struct NORMALITEM_INFO *p, struct item *i, struct item_data *id) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_normal_pre ) { - void (*preHookFunc) (short *idx, struct NORMALITEM_INFO *p, struct item *i, struct item_data *id); + void (*preHookFunc) (short *idx, struct NORMALITEM_INFO **p, struct item **i, struct item_data **id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_normal_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_normal_pre[hIndex].func; - preHookFunc(&idx, p, i, id); + preHookFunc(&idx, &p, &i, &id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7076,10 +7072,10 @@ void HP_clif_item_normal(short idx, struct NORMALITEM_INFO *p, struct item *i, s HPMHooks.source.clif.item_normal(idx, p, i, id); } if( HPMHooks.count.HP_clif_item_normal_post ) { - void (*postHookFunc) (short *idx, struct NORMALITEM_INFO *p, struct item *i, struct item_data *id); + void (*postHookFunc) (short idx, struct NORMALITEM_INFO *p, struct item *i, struct item_data *id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_normal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_item_normal_post[hIndex].func; - postHookFunc(&idx, p, i, id); + postHookFunc(idx, p, i, id); } } return; @@ -7087,11 +7083,11 @@ void HP_clif_item_normal(short idx, struct NORMALITEM_INFO *p, struct item *i, s void HP_clif_arrowequip(struct map_session_data *sd, int val) { int hIndex = 0; if( HPMHooks.count.HP_clif_arrowequip_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *val); + void (*preHookFunc) (struct map_session_data **sd, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_arrowequip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_arrowequip_pre[hIndex].func; - preHookFunc(sd, &val); + preHookFunc(&sd, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7102,10 +7098,10 @@ void HP_clif_arrowequip(struct map_session_data *sd, int val) { HPMHooks.source.clif.arrowequip(sd, val); } if( HPMHooks.count.HP_clif_arrowequip_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *val); + void (*postHookFunc) (struct map_session_data *sd, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_arrowequip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_arrowequip_post[hIndex].func; - postHookFunc(sd, &val); + postHookFunc(sd, val); } } return; @@ -7113,11 +7109,11 @@ void HP_clif_arrowequip(struct map_session_data *sd, int val) { void HP_clif_arrow_fail(struct map_session_data *sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_arrow_fail_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_arrow_fail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_arrow_fail_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7128,10 +7124,10 @@ void HP_clif_arrow_fail(struct map_session_data *sd, int type) { HPMHooks.source.clif.arrow_fail(sd, type); } if( HPMHooks.count.HP_clif_arrow_fail_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_arrow_fail_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_arrow_fail_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -7139,11 +7135,11 @@ void HP_clif_arrow_fail(struct map_session_data *sd, int type) { void HP_clif_use_card(struct map_session_data *sd, int idx) { int hIndex = 0; if( HPMHooks.count.HP_clif_use_card_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *idx); + void (*preHookFunc) (struct map_session_data **sd, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_use_card_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_use_card_pre[hIndex].func; - preHookFunc(sd, &idx); + preHookFunc(&sd, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7154,10 +7150,10 @@ void HP_clif_use_card(struct map_session_data *sd, int idx) { HPMHooks.source.clif.use_card(sd, idx); } if( HPMHooks.count.HP_clif_use_card_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *idx); + void (*postHookFunc) (struct map_session_data *sd, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_use_card_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_use_card_post[hIndex].func; - postHookFunc(sd, &idx); + postHookFunc(sd, idx); } } return; @@ -7165,11 +7161,11 @@ void HP_clif_use_card(struct map_session_data *sd, int idx) { void HP_clif_cart_additem(struct map_session_data *sd, int n, int amount, int fail) { int hIndex = 0; if( HPMHooks.count.HP_clif_cart_additem_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *n, int *amount, int *fail); + void (*preHookFunc) (struct map_session_data **sd, int *n, int *amount, int *fail); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cart_additem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cart_additem_pre[hIndex].func; - preHookFunc(sd, &n, &amount, &fail); + preHookFunc(&sd, &n, &amount, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7180,10 +7176,10 @@ void HP_clif_cart_additem(struct map_session_data *sd, int n, int amount, int fa HPMHooks.source.clif.cart_additem(sd, n, amount, fail); } if( HPMHooks.count.HP_clif_cart_additem_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *n, int *amount, int *fail); + void (*postHookFunc) (struct map_session_data *sd, int n, int amount, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cart_additem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_cart_additem_post[hIndex].func; - postHookFunc(sd, &n, &amount, &fail); + postHookFunc(sd, n, amount, fail); } } return; @@ -7191,11 +7187,11 @@ void HP_clif_cart_additem(struct map_session_data *sd, int n, int amount, int fa void HP_clif_cart_delitem(struct map_session_data *sd, int n, int amount) { int hIndex = 0; if( HPMHooks.count.HP_clif_cart_delitem_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *n, int *amount); + void (*preHookFunc) (struct map_session_data **sd, int *n, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cart_delitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cart_delitem_pre[hIndex].func; - preHookFunc(sd, &n, &amount); + preHookFunc(&sd, &n, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7206,10 +7202,10 @@ void HP_clif_cart_delitem(struct map_session_data *sd, int n, int amount) { HPMHooks.source.clif.cart_delitem(sd, n, amount); } if( HPMHooks.count.HP_clif_cart_delitem_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *n, int *amount); + void (*postHookFunc) (struct map_session_data *sd, int n, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cart_delitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_cart_delitem_post[hIndex].func; - postHookFunc(sd, &n, &amount); + postHookFunc(sd, n, amount); } } return; @@ -7217,11 +7213,11 @@ void HP_clif_cart_delitem(struct map_session_data *sd, int n, int amount) { void HP_clif_equipitemack(struct map_session_data *sd, int n, int pos, enum e_EQUIP_ITEM_ACK result) { int hIndex = 0; if( HPMHooks.count.HP_clif_equipitemack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *n, int *pos, enum e_EQUIP_ITEM_ACK *result); + void (*preHookFunc) (struct map_session_data **sd, int *n, int *pos, enum e_EQUIP_ITEM_ACK *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_equipitemack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_equipitemack_pre[hIndex].func; - preHookFunc(sd, &n, &pos, &result); + preHookFunc(&sd, &n, &pos, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7232,10 +7228,10 @@ void HP_clif_equipitemack(struct map_session_data *sd, int n, int pos, enum e_EQ HPMHooks.source.clif.equipitemack(sd, n, pos, result); } if( HPMHooks.count.HP_clif_equipitemack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *n, int *pos, enum e_EQUIP_ITEM_ACK *result); + void (*postHookFunc) (struct map_session_data *sd, int n, int pos, enum e_EQUIP_ITEM_ACK result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_equipitemack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_equipitemack_post[hIndex].func; - postHookFunc(sd, &n, &pos, &result); + postHookFunc(sd, n, pos, result); } } return; @@ -7243,11 +7239,11 @@ void HP_clif_equipitemack(struct map_session_data *sd, int n, int pos, enum e_EQ void HP_clif_unequipitemack(struct map_session_data *sd, int n, int pos, enum e_UNEQUIP_ITEM_ACK result) { int hIndex = 0; if( HPMHooks.count.HP_clif_unequipitemack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *n, int *pos, enum e_UNEQUIP_ITEM_ACK *result); + void (*preHookFunc) (struct map_session_data **sd, int *n, int *pos, enum e_UNEQUIP_ITEM_ACK *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_unequipitemack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_unequipitemack_pre[hIndex].func; - preHookFunc(sd, &n, &pos, &result); + preHookFunc(&sd, &n, &pos, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7258,10 +7254,10 @@ void HP_clif_unequipitemack(struct map_session_data *sd, int n, int pos, enum e_ HPMHooks.source.clif.unequipitemack(sd, n, pos, result); } if( HPMHooks.count.HP_clif_unequipitemack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *n, int *pos, enum e_UNEQUIP_ITEM_ACK *result); + void (*postHookFunc) (struct map_session_data *sd, int n, int pos, enum e_UNEQUIP_ITEM_ACK result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_unequipitemack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_unequipitemack_post[hIndex].func; - postHookFunc(sd, &n, &pos, &result); + postHookFunc(sd, n, pos, result); } } return; @@ -7269,11 +7265,11 @@ void HP_clif_unequipitemack(struct map_session_data *sd, int n, int pos, enum e_ void HP_clif_useitemack(struct map_session_data *sd, int index, int amount, bool ok) { int hIndex = 0; if( HPMHooks.count.HP_clif_useitemack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *index, int *amount, bool *ok); + void (*preHookFunc) (struct map_session_data **sd, int *index, int *amount, bool *ok); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_useitemack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_useitemack_pre[hIndex].func; - preHookFunc(sd, &index, &amount, &ok); + preHookFunc(&sd, &index, &amount, &ok); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7284,10 +7280,10 @@ void HP_clif_useitemack(struct map_session_data *sd, int index, int amount, bool HPMHooks.source.clif.useitemack(sd, index, amount, ok); } if( HPMHooks.count.HP_clif_useitemack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *index, int *amount, bool *ok); + void (*postHookFunc) (struct map_session_data *sd, int index, int amount, bool ok); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_useitemack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_useitemack_post[hIndex].func; - postHookFunc(sd, &index, &amount, &ok); + postHookFunc(sd, index, amount, ok); } } return; @@ -7295,11 +7291,11 @@ void HP_clif_useitemack(struct map_session_data *sd, int index, int amount, bool void HP_clif_addcards(unsigned char *buf, struct item *item) { int hIndex = 0; if( HPMHooks.count.HP_clif_addcards_pre ) { - void (*preHookFunc) (unsigned char *buf, struct item *item); + void (*preHookFunc) (unsigned char **buf, struct item **item); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_addcards_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_addcards_pre[hIndex].func; - preHookFunc(buf, item); + preHookFunc(&buf, &item); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7321,11 +7317,11 @@ void HP_clif_addcards(unsigned char *buf, struct item *item) { void HP_clif_addcards2(unsigned short *cards, struct item *item) { int hIndex = 0; if( HPMHooks.count.HP_clif_addcards2_pre ) { - void (*preHookFunc) (unsigned short *cards, struct item *item); + void (*preHookFunc) (unsigned short **cards, struct item **item); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_addcards2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_addcards2_pre[hIndex].func; - preHookFunc(cards, item); + preHookFunc(&cards, &item); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7347,11 +7343,11 @@ void HP_clif_addcards2(unsigned short *cards, struct item *item) { void HP_clif_item_sub(unsigned char *buf, int n, struct item *i, struct item_data *id, int equip) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_sub_pre ) { - void (*preHookFunc) (unsigned char *buf, int *n, struct item *i, struct item_data *id, int *equip); + void (*preHookFunc) (unsigned char **buf, int *n, struct item **i, struct item_data **id, int *equip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_sub_pre[hIndex].func; - preHookFunc(buf, &n, i, id, &equip); + preHookFunc(&buf, &n, &i, &id, &equip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7362,10 +7358,10 @@ void HP_clif_item_sub(unsigned char *buf, int n, struct item *i, struct item_dat HPMHooks.source.clif.item_sub(buf, n, i, id, equip); } if( HPMHooks.count.HP_clif_item_sub_post ) { - void (*postHookFunc) (unsigned char *buf, int *n, struct item *i, struct item_data *id, int *equip); + void (*postHookFunc) (unsigned char *buf, int n, struct item *i, struct item_data *id, int equip); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_item_sub_post[hIndex].func; - postHookFunc(buf, &n, i, id, &equip); + postHookFunc(buf, n, i, id, equip); } } return; @@ -7373,11 +7369,11 @@ void HP_clif_item_sub(unsigned char *buf, int n, struct item *i, struct item_dat void HP_clif_getareachar_item(struct map_session_data *sd, struct flooritem_data *fitem) { int hIndex = 0; if( HPMHooks.count.HP_clif_getareachar_item_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct flooritem_data *fitem); + void (*preHookFunc) (struct map_session_data **sd, struct flooritem_data **fitem); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_getareachar_item_pre[hIndex].func; - preHookFunc(sd, fitem); + preHookFunc(&sd, &fitem); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7399,11 +7395,11 @@ void HP_clif_getareachar_item(struct map_session_data *sd, struct flooritem_data void HP_clif_cart_additem_ack(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_cart_additem_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cart_additem_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cart_additem_ack_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7414,10 +7410,10 @@ void HP_clif_cart_additem_ack(struct map_session_data *sd, int flag) { HPMHooks.source.clif.cart_additem_ack(sd, flag); } if( HPMHooks.count.HP_clif_cart_additem_ack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cart_additem_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_cart_additem_ack_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -7451,11 +7447,11 @@ void HP_clif_cashshop_load(void) { void HP_clif_package_announce(struct map_session_data *sd, unsigned short nameid, unsigned short containerid) { int hIndex = 0; if( HPMHooks.count.HP_clif_package_announce_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *nameid, unsigned short *containerid); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *nameid, unsigned short *containerid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_package_announce_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_package_announce_pre[hIndex].func; - preHookFunc(sd, &nameid, &containerid); + preHookFunc(&sd, &nameid, &containerid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7466,10 +7462,10 @@ void HP_clif_package_announce(struct map_session_data *sd, unsigned short nameid HPMHooks.source.clif.package_announce(sd, nameid, containerid); } if( HPMHooks.count.HP_clif_package_announce_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *nameid, unsigned short *containerid); + void (*postHookFunc) (struct map_session_data *sd, unsigned short nameid, unsigned short containerid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_package_announce_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_package_announce_post[hIndex].func; - postHookFunc(sd, &nameid, &containerid); + postHookFunc(sd, nameid, containerid); } } return; @@ -7477,11 +7473,11 @@ void HP_clif_package_announce(struct map_session_data *sd, unsigned short nameid void HP_clif_item_drop_announce(struct map_session_data *sd, unsigned short nameid, char *monsterName) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_drop_announce_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *nameid, char *monsterName); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *nameid, char **monsterName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_drop_announce_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_drop_announce_pre[hIndex].func; - preHookFunc(sd, &nameid, monsterName); + preHookFunc(&sd, &nameid, &monsterName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7492,10 +7488,10 @@ void HP_clif_item_drop_announce(struct map_session_data *sd, unsigned short name HPMHooks.source.clif.item_drop_announce(sd, nameid, monsterName); } if( HPMHooks.count.HP_clif_item_drop_announce_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *nameid, char *monsterName); + void (*postHookFunc) (struct map_session_data *sd, unsigned short nameid, char *monsterName); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_drop_announce_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_item_drop_announce_post[hIndex].func; - postHookFunc(sd, &nameid, monsterName); + postHookFunc(sd, nameid, monsterName); } } return; @@ -7518,10 +7514,10 @@ void HP_clif_clearunit_single(int id, clr_type type, int fd) { HPMHooks.source.clif.clearunit_single(id, type, fd); } if( HPMHooks.count.HP_clif_clearunit_single_post ) { - void (*postHookFunc) (int *id, clr_type *type, int *fd); + void (*postHookFunc) (int id, clr_type type, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_clearunit_single_post[hIndex].func; - postHookFunc(&id, &type, &fd); + postHookFunc(id, type, fd); } } return; @@ -7529,11 +7525,11 @@ void HP_clif_clearunit_single(int id, clr_type type, int fd) { void HP_clif_clearunit_area(struct block_list *bl, clr_type type) { int hIndex = 0; if( HPMHooks.count.HP_clif_clearunit_area_pre ) { - void (*preHookFunc) (struct block_list *bl, clr_type *type); + void (*preHookFunc) (struct block_list **bl, clr_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_area_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_clearunit_area_pre[hIndex].func; - preHookFunc(bl, &type); + preHookFunc(&bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7544,10 +7540,10 @@ void HP_clif_clearunit_area(struct block_list *bl, clr_type type) { HPMHooks.source.clif.clearunit_area(bl, type); } if( HPMHooks.count.HP_clif_clearunit_area_post ) { - void (*postHookFunc) (struct block_list *bl, clr_type *type); + void (*postHookFunc) (struct block_list *bl, clr_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_area_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_clearunit_area_post[hIndex].func; - postHookFunc(bl, &type); + postHookFunc(bl, type); } } return; @@ -7555,11 +7551,11 @@ void HP_clif_clearunit_area(struct block_list *bl, clr_type type) { void HP_clif_clearunit_delayed(struct block_list *bl, clr_type type, int64 tick) { int hIndex = 0; if( HPMHooks.count.HP_clif_clearunit_delayed_pre ) { - void (*preHookFunc) (struct block_list *bl, clr_type *type, int64 *tick); + void (*preHookFunc) (struct block_list **bl, clr_type *type, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_delayed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_clearunit_delayed_pre[hIndex].func; - preHookFunc(bl, &type, &tick); + preHookFunc(&bl, &type, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7570,10 +7566,10 @@ void HP_clif_clearunit_delayed(struct block_list *bl, clr_type type, int64 tick) HPMHooks.source.clif.clearunit_delayed(bl, type, tick); } if( HPMHooks.count.HP_clif_clearunit_delayed_post ) { - void (*postHookFunc) (struct block_list *bl, clr_type *type, int64 *tick); + void (*postHookFunc) (struct block_list *bl, clr_type type, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_delayed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_clearunit_delayed_post[hIndex].func; - postHookFunc(bl, &type, &tick); + postHookFunc(bl, type, tick); } } return; @@ -7581,11 +7577,11 @@ void HP_clif_clearunit_delayed(struct block_list *bl, clr_type type, int64 tick) void HP_clif_walkok(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_walkok_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_walkok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_walkok_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7607,11 +7603,11 @@ void HP_clif_walkok(struct map_session_data *sd) { void HP_clif_move(struct unit_data *ud) { int hIndex = 0; if( HPMHooks.count.HP_clif_move_pre ) { - void (*preHookFunc) (struct unit_data *ud); + void (*preHookFunc) (struct unit_data **ud); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_move_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_move_pre[hIndex].func; - preHookFunc(ud); + preHookFunc(&ud); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7633,11 +7629,11 @@ void HP_clif_move(struct unit_data *ud) { void HP_clif_move2(struct block_list *bl, struct view_data *vd, struct unit_data *ud) { int hIndex = 0; if( HPMHooks.count.HP_clif_move2_pre ) { - void (*preHookFunc) (struct block_list *bl, struct view_data *vd, struct unit_data *ud); + void (*preHookFunc) (struct block_list **bl, struct view_data **vd, struct unit_data **ud); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_move2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_move2_pre[hIndex].func; - preHookFunc(bl, vd, ud); + preHookFunc(&bl, &vd, &ud); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7659,11 +7655,11 @@ void HP_clif_move2(struct block_list *bl, struct view_data *vd, struct unit_data void HP_clif_blown(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_blown_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_blown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_blown_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7685,11 +7681,11 @@ void HP_clif_blown(struct block_list *bl) { void HP_clif_slide(struct block_list *bl, int x, int y) { int hIndex = 0; if( HPMHooks.count.HP_clif_slide_pre ) { - void (*preHookFunc) (struct block_list *bl, int *x, int *y); + void (*preHookFunc) (struct block_list **bl, int *x, int *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_slide_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_slide_pre[hIndex].func; - preHookFunc(bl, &x, &y); + preHookFunc(&bl, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7700,10 +7696,10 @@ void HP_clif_slide(struct block_list *bl, int x, int y) { HPMHooks.source.clif.slide(bl, x, y); } if( HPMHooks.count.HP_clif_slide_post ) { - void (*postHookFunc) (struct block_list *bl, int *x, int *y); + void (*postHookFunc) (struct block_list *bl, int x, int y); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_slide_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_slide_post[hIndex].func; - postHookFunc(bl, &x, &y); + postHookFunc(bl, x, y); } } return; @@ -7711,11 +7707,11 @@ void HP_clif_slide(struct block_list *bl, int x, int y) { void HP_clif_fixpos(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_fixpos_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_fixpos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_fixpos_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7737,11 +7733,11 @@ void HP_clif_fixpos(struct block_list *bl) { void HP_clif_changelook(struct block_list *bl, int type, int val) { int hIndex = 0; if( HPMHooks.count.HP_clif_changelook_pre ) { - void (*preHookFunc) (struct block_list *bl, int *type, int *val); + void (*preHookFunc) (struct block_list **bl, int *type, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changelook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changelook_pre[hIndex].func; - preHookFunc(bl, &type, &val); + preHookFunc(&bl, &type, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7752,10 +7748,10 @@ void HP_clif_changelook(struct block_list *bl, int type, int val) { HPMHooks.source.clif.changelook(bl, type, val); } if( HPMHooks.count.HP_clif_changelook_post ) { - void (*postHookFunc) (struct block_list *bl, int *type, int *val); + void (*postHookFunc) (struct block_list *bl, int type, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changelook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_changelook_post[hIndex].func; - postHookFunc(bl, &type, &val); + postHookFunc(bl, type, val); } } return; @@ -7763,11 +7759,11 @@ void HP_clif_changelook(struct block_list *bl, int type, int val) { void HP_clif_changetraplook(struct block_list *bl, int val) { int hIndex = 0; if( HPMHooks.count.HP_clif_changetraplook_pre ) { - void (*preHookFunc) (struct block_list *bl, int *val); + void (*preHookFunc) (struct block_list **bl, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changetraplook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changetraplook_pre[hIndex].func; - preHookFunc(bl, &val); + preHookFunc(&bl, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7778,10 +7774,10 @@ void HP_clif_changetraplook(struct block_list *bl, int val) { HPMHooks.source.clif.changetraplook(bl, val); } if( HPMHooks.count.HP_clif_changetraplook_post ) { - void (*postHookFunc) (struct block_list *bl, int *val); + void (*postHookFunc) (struct block_list *bl, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changetraplook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_changetraplook_post[hIndex].func; - postHookFunc(bl, &val); + postHookFunc(bl, val); } } return; @@ -7789,11 +7785,11 @@ void HP_clif_changetraplook(struct block_list *bl, int val) { void HP_clif_refreshlook(struct block_list *bl, int id, int type, int val, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_refreshlook_pre ) { - void (*preHookFunc) (struct block_list *bl, int *id, int *type, int *val, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, int *id, int *type, int *val, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_refreshlook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_refreshlook_pre[hIndex].func; - preHookFunc(bl, &id, &type, &val, &target); + preHookFunc(&bl, &id, &type, &val, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7804,10 +7800,10 @@ void HP_clif_refreshlook(struct block_list *bl, int id, int type, int val, enum HPMHooks.source.clif.refreshlook(bl, id, type, val, target); } if( HPMHooks.count.HP_clif_refreshlook_post ) { - void (*postHookFunc) (struct block_list *bl, int *id, int *type, int *val, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, int id, int type, int val, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_refreshlook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_refreshlook_post[hIndex].func; - postHookFunc(bl, &id, &type, &val, &target); + postHookFunc(bl, id, type, val, target); } } return; @@ -7815,11 +7811,11 @@ void HP_clif_refreshlook(struct block_list *bl, int id, int type, int val, enum void HP_clif_sendlook(struct block_list *bl, int id, int type, int val, int val2, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_sendlook_pre ) { - void (*preHookFunc) (struct block_list *bl, int *id, int *type, int *val, int *val2, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, int *id, int *type, int *val, int *val2, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendlook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_sendlook_pre[hIndex].func; - preHookFunc(bl, &id, &type, &val, &val2, &target); + preHookFunc(&bl, &id, &type, &val, &val2, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7830,10 +7826,10 @@ void HP_clif_sendlook(struct block_list *bl, int id, int type, int val, int val2 HPMHooks.source.clif.sendlook(bl, id, type, val, val2, target); } if( HPMHooks.count.HP_clif_sendlook_post ) { - void (*postHookFunc) (struct block_list *bl, int *id, int *type, int *val, int *val2, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, int id, int type, int val, int val2, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendlook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_sendlook_post[hIndex].func; - postHookFunc(bl, &id, &type, &val, &val2, &target); + postHookFunc(bl, id, type, val, val2, target); } } return; @@ -7841,11 +7837,11 @@ void HP_clif_sendlook(struct block_list *bl, int id, int type, int val, int val2 void HP_clif_class_change(struct block_list *bl, int class_, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_class_change_pre ) { - void (*preHookFunc) (struct block_list *bl, int *class_, int *type); + void (*preHookFunc) (struct block_list **bl, int *class_, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_class_change_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_class_change_pre[hIndex].func; - preHookFunc(bl, &class_, &type); + preHookFunc(&bl, &class_, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7856,10 +7852,10 @@ void HP_clif_class_change(struct block_list *bl, int class_, int type) { HPMHooks.source.clif.class_change(bl, class_, type); } if( HPMHooks.count.HP_clif_class_change_post ) { - void (*postHookFunc) (struct block_list *bl, int *class_, int *type); + void (*postHookFunc) (struct block_list *bl, int class_, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_class_change_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_class_change_post[hIndex].func; - postHookFunc(bl, &class_, &type); + postHookFunc(bl, class_, type); } } return; @@ -7867,11 +7863,11 @@ void HP_clif_class_change(struct block_list *bl, int class_, int type) { void HP_clif_skill_delunit(struct skill_unit *su) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_delunit_pre ) { - void (*preHookFunc) (struct skill_unit *su); + void (*preHookFunc) (struct skill_unit **su); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_delunit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_delunit_pre[hIndex].func; - preHookFunc(su); + preHookFunc(&su); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7893,11 +7889,11 @@ void HP_clif_skill_delunit(struct skill_unit *su) { void HP_clif_skillunit_update(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_skillunit_update_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillunit_update_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skillunit_update_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7935,10 +7931,10 @@ int HP_clif_clearunit_delayed_sub(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.clif.clearunit_delayed_sub(tid, tick, id, data); } if( HPMHooks.count.HP_clif_clearunit_delayed_sub_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_delayed_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_clearunit_delayed_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -7946,11 +7942,11 @@ int HP_clif_clearunit_delayed_sub(int tid, int64 tick, int id, intptr_t data) { void HP_clif_set_unit_idle(struct block_list *bl, struct map_session_data *tsd, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_set_unit_idle_pre ) { - void (*preHookFunc) (struct block_list *bl, struct map_session_data *tsd, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, struct map_session_data **tsd, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_set_unit_idle_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_set_unit_idle_pre[hIndex].func; - preHookFunc(bl, tsd, &target); + preHookFunc(&bl, &tsd, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7961,10 +7957,10 @@ void HP_clif_set_unit_idle(struct block_list *bl, struct map_session_data *tsd, HPMHooks.source.clif.set_unit_idle(bl, tsd, target); } if( HPMHooks.count.HP_clif_set_unit_idle_post ) { - void (*postHookFunc) (struct block_list *bl, struct map_session_data *tsd, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, struct map_session_data *tsd, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_set_unit_idle_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_set_unit_idle_post[hIndex].func; - postHookFunc(bl, tsd, &target); + postHookFunc(bl, tsd, target); } } return; @@ -7972,11 +7968,11 @@ void HP_clif_set_unit_idle(struct block_list *bl, struct map_session_data *tsd, void HP_clif_spawn_unit(struct block_list *bl, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_spawn_unit_pre ) { - void (*preHookFunc) (struct block_list *bl, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spawn_unit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_spawn_unit_pre[hIndex].func; - preHookFunc(bl, &target); + preHookFunc(&bl, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7987,10 +7983,10 @@ void HP_clif_spawn_unit(struct block_list *bl, enum send_target target) { HPMHooks.source.clif.spawn_unit(bl, target); } if( HPMHooks.count.HP_clif_spawn_unit_post ) { - void (*postHookFunc) (struct block_list *bl, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spawn_unit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_spawn_unit_post[hIndex].func; - postHookFunc(bl, &target); + postHookFunc(bl, target); } } return; @@ -7998,11 +7994,11 @@ void HP_clif_spawn_unit(struct block_list *bl, enum send_target target) { void HP_clif_spawn_unit2(struct block_list *bl, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_spawn_unit2_pre ) { - void (*preHookFunc) (struct block_list *bl, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spawn_unit2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_spawn_unit2_pre[hIndex].func; - preHookFunc(bl, &target); + preHookFunc(&bl, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8013,10 +8009,10 @@ void HP_clif_spawn_unit2(struct block_list *bl, enum send_target target) { HPMHooks.source.clif.spawn_unit2(bl, target); } if( HPMHooks.count.HP_clif_spawn_unit2_post ) { - void (*postHookFunc) (struct block_list *bl, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spawn_unit2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_spawn_unit2_post[hIndex].func; - postHookFunc(bl, &target); + postHookFunc(bl, target); } } return; @@ -8024,11 +8020,11 @@ void HP_clif_spawn_unit2(struct block_list *bl, enum send_target target) { void HP_clif_set_unit_idle2(struct block_list *bl, struct map_session_data *tsd, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_set_unit_idle2_pre ) { - void (*preHookFunc) (struct block_list *bl, struct map_session_data *tsd, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, struct map_session_data **tsd, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_set_unit_idle2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_set_unit_idle2_pre[hIndex].func; - preHookFunc(bl, tsd, &target); + preHookFunc(&bl, &tsd, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8039,10 +8035,10 @@ void HP_clif_set_unit_idle2(struct block_list *bl, struct map_session_data *tsd, HPMHooks.source.clif.set_unit_idle2(bl, tsd, target); } if( HPMHooks.count.HP_clif_set_unit_idle2_post ) { - void (*postHookFunc) (struct block_list *bl, struct map_session_data *tsd, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, struct map_session_data *tsd, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_set_unit_idle2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_set_unit_idle2_post[hIndex].func; - postHookFunc(bl, tsd, &target); + postHookFunc(bl, tsd, target); } } return; @@ -8050,11 +8046,11 @@ void HP_clif_set_unit_idle2(struct block_list *bl, struct map_session_data *tsd, void HP_clif_set_unit_walking(struct block_list *bl, struct map_session_data *tsd, struct unit_data *ud, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_set_unit_walking_pre ) { - void (*preHookFunc) (struct block_list *bl, struct map_session_data *tsd, struct unit_data *ud, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, struct map_session_data **tsd, struct unit_data **ud, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_set_unit_walking_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_set_unit_walking_pre[hIndex].func; - preHookFunc(bl, tsd, ud, &target); + preHookFunc(&bl, &tsd, &ud, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8065,10 +8061,10 @@ void HP_clif_set_unit_walking(struct block_list *bl, struct map_session_data *ts HPMHooks.source.clif.set_unit_walking(bl, tsd, ud, target); } if( HPMHooks.count.HP_clif_set_unit_walking_post ) { - void (*postHookFunc) (struct block_list *bl, struct map_session_data *tsd, struct unit_data *ud, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, struct map_session_data *tsd, struct unit_data *ud, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_set_unit_walking_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_set_unit_walking_post[hIndex].func; - postHookFunc(bl, tsd, ud, &target); + postHookFunc(bl, tsd, ud, target); } } return; @@ -8077,11 +8073,11 @@ int HP_clif_calc_walkdelay(struct block_list *bl, int delay, int type, int damag int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_calc_walkdelay_pre ) { - int (*preHookFunc) (struct block_list *bl, int *delay, int *type, int *damage, int *div_); + int (*preHookFunc) (struct block_list **bl, int *delay, int *type, int *damage, int *div_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_calc_walkdelay_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_calc_walkdelay_pre[hIndex].func; - retVal___ = preHookFunc(bl, &delay, &type, &damage, &div_); + retVal___ = preHookFunc(&bl, &delay, &type, &damage, &div_); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8092,10 +8088,10 @@ int HP_clif_calc_walkdelay(struct block_list *bl, int delay, int type, int damag retVal___ = HPMHooks.source.clif.calc_walkdelay(bl, delay, type, damage, div_); } if( HPMHooks.count.HP_clif_calc_walkdelay_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *delay, int *type, int *damage, int *div_); + int (*postHookFunc) (int retVal___, struct block_list *bl, int delay, int type, int damage, int div_); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_calc_walkdelay_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_calc_walkdelay_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &delay, &type, &damage, &div_); + retVal___ = postHookFunc(retVal___, bl, delay, type, damage, div_); } } return retVal___; @@ -8103,11 +8099,11 @@ int HP_clif_calc_walkdelay(struct block_list *bl, int delay, int type, int damag void HP_clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *su, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_getareachar_skillunit_pre ) { - void (*preHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, struct skill_unit **su, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_skillunit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_getareachar_skillunit_pre[hIndex].func; - preHookFunc(bl, su, &target); + preHookFunc(&bl, &su, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8118,10 +8114,10 @@ void HP_clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *su, HPMHooks.source.clif.getareachar_skillunit(bl, su, target); } if( HPMHooks.count.HP_clif_getareachar_skillunit_post ) { - void (*postHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_skillunit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_getareachar_skillunit_post[hIndex].func; - postHookFunc(bl, su, &target); + postHookFunc(bl, su, target); } } return; @@ -8129,11 +8125,11 @@ void HP_clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *su, void HP_clif_getareachar_unit(struct map_session_data *sd, struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_getareachar_unit_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct block_list *bl); + void (*preHookFunc) (struct map_session_data **sd, struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_unit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_getareachar_unit_pre[hIndex].func; - preHookFunc(sd, bl); + preHookFunc(&sd, &bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8155,11 +8151,11 @@ void HP_clif_getareachar_unit(struct map_session_data *sd, struct block_list *bl void HP_clif_clearchar_skillunit(struct skill_unit *su, int fd) { int hIndex = 0; if( HPMHooks.count.HP_clif_clearchar_skillunit_pre ) { - void (*preHookFunc) (struct skill_unit *su, int *fd); + void (*preHookFunc) (struct skill_unit **su, int *fd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearchar_skillunit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_clearchar_skillunit_pre[hIndex].func; - preHookFunc(su, &fd); + preHookFunc(&su, &fd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8170,10 +8166,10 @@ void HP_clif_clearchar_skillunit(struct skill_unit *su, int fd) { HPMHooks.source.clif.clearchar_skillunit(su, fd); } if( HPMHooks.count.HP_clif_clearchar_skillunit_post ) { - void (*postHookFunc) (struct skill_unit *su, int *fd); + void (*postHookFunc) (struct skill_unit *su, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearchar_skillunit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_clearchar_skillunit_post[hIndex].func; - postHookFunc(su, &fd); + postHookFunc(su, fd); } } return; @@ -8182,12 +8178,12 @@ int HP_clif_getareachar(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_getareachar_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_clif_getareachar_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -8214,11 +8210,11 @@ int HP_clif_getareachar(struct block_list *bl, va_list ap) { void HP_clif_graffiti_entry(struct block_list *bl, struct skill_unit *su, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_graffiti_entry_pre ) { - void (*preHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, struct skill_unit **su, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_graffiti_entry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_graffiti_entry_pre[hIndex].func; - preHookFunc(bl, su, &target); + preHookFunc(&bl, &su, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8229,10 +8225,10 @@ void HP_clif_graffiti_entry(struct block_list *bl, struct skill_unit *su, enum s HPMHooks.source.clif.graffiti_entry(bl, su, target); } if( HPMHooks.count.HP_clif_graffiti_entry_post ) { - void (*postHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_graffiti_entry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_graffiti_entry_post[hIndex].func; - postHookFunc(bl, su, &target); + postHookFunc(bl, su, target); } } return; @@ -8241,11 +8237,11 @@ bool HP_clif_spawn(struct block_list *bl) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_clif_spawn_pre ) { - bool (*preHookFunc) (struct block_list *bl); + bool (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_spawn_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8267,11 +8263,11 @@ bool HP_clif_spawn(struct block_list *bl) { void HP_clif_changemap(struct map_session_data *sd, short m, int x, int y) { int hIndex = 0; if( HPMHooks.count.HP_clif_changemap_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *m, int *x, int *y); + void (*preHookFunc) (struct map_session_data **sd, short *m, int *x, int *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changemap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changemap_pre[hIndex].func; - preHookFunc(sd, &m, &x, &y); + preHookFunc(&sd, &m, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8282,10 +8278,10 @@ void HP_clif_changemap(struct map_session_data *sd, short m, int x, int y) { HPMHooks.source.clif.changemap(sd, m, x, y); } if( HPMHooks.count.HP_clif_changemap_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *m, int *x, int *y); + void (*postHookFunc) (struct map_session_data *sd, short m, int x, int y); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changemap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_changemap_post[hIndex].func; - postHookFunc(sd, &m, &x, &y); + postHookFunc(sd, m, x, y); } } return; @@ -8308,10 +8304,10 @@ void HP_clif_changemapcell(int fd, int16 m, int x, int y, int type, enum send_ta HPMHooks.source.clif.changemapcell(fd, m, x, y, type, target); } if( HPMHooks.count.HP_clif_changemapcell_post ) { - void (*postHookFunc) (int *fd, int16 *m, int *x, int *y, int *type, enum send_target *target); + void (*postHookFunc) (int fd, int16 m, int x, int y, int type, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changemapcell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_changemapcell_post[hIndex].func; - postHookFunc(&fd, &m, &x, &y, &type, &target); + postHookFunc(fd, m, x, y, type, target); } } return; @@ -8319,11 +8315,11 @@ void HP_clif_changemapcell(int fd, int16 m, int x, int y, int type, enum send_ta void HP_clif_map_property(struct map_session_data *sd, enum map_property property) { int hIndex = 0; if( HPMHooks.count.HP_clif_map_property_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum map_property *property); + void (*preHookFunc) (struct map_session_data **sd, enum map_property *property); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_map_property_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_map_property_pre[hIndex].func; - preHookFunc(sd, &property); + preHookFunc(&sd, &property); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8334,10 +8330,10 @@ void HP_clif_map_property(struct map_session_data *sd, enum map_property propert HPMHooks.source.clif.map_property(sd, property); } if( HPMHooks.count.HP_clif_map_property_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum map_property *property); + void (*postHookFunc) (struct map_session_data *sd, enum map_property property); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_map_property_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_map_property_post[hIndex].func; - postHookFunc(sd, &property); + postHookFunc(sd, property); } } return; @@ -8345,11 +8341,11 @@ void HP_clif_map_property(struct map_session_data *sd, enum map_property propert void HP_clif_pvpset(struct map_session_data *sd, int pvprank, int pvpnum, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_pvpset_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *pvprank, int *pvpnum, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *pvprank, int *pvpnum, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pvpset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pvpset_pre[hIndex].func; - preHookFunc(sd, &pvprank, &pvpnum, &type); + preHookFunc(&sd, &pvprank, &pvpnum, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8360,10 +8356,10 @@ void HP_clif_pvpset(struct map_session_data *sd, int pvprank, int pvpnum, int ty HPMHooks.source.clif.pvpset(sd, pvprank, pvpnum, type); } if( HPMHooks.count.HP_clif_pvpset_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *pvprank, int *pvpnum, int *type); + void (*postHookFunc) (struct map_session_data *sd, int pvprank, int pvpnum, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pvpset_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pvpset_post[hIndex].func; - postHookFunc(sd, &pvprank, &pvpnum, &type); + postHookFunc(sd, pvprank, pvpnum, type); } } return; @@ -8386,10 +8382,10 @@ void HP_clif_map_property_mapall(int mapid, enum map_property property) { HPMHooks.source.clif.map_property_mapall(mapid, property); } if( HPMHooks.count.HP_clif_map_property_mapall_post ) { - void (*postHookFunc) (int *mapid, enum map_property *property); + void (*postHookFunc) (int mapid, enum map_property property); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_map_property_mapall_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_map_property_mapall_post[hIndex].func; - postHookFunc(&mapid, &property); + postHookFunc(mapid, property); } } return; @@ -8397,11 +8393,11 @@ void HP_clif_map_property_mapall(int mapid, enum map_property property) { void HP_clif_bossmapinfo(int fd, struct mob_data *md, short flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_bossmapinfo_pre ) { - void (*preHookFunc) (int *fd, struct mob_data *md, short *flag); + void (*preHookFunc) (int *fd, struct mob_data **md, short *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bossmapinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bossmapinfo_pre[hIndex].func; - preHookFunc(&fd, md, &flag); + preHookFunc(&fd, &md, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8412,10 +8408,10 @@ void HP_clif_bossmapinfo(int fd, struct mob_data *md, short flag) { HPMHooks.source.clif.bossmapinfo(fd, md, flag); } if( HPMHooks.count.HP_clif_bossmapinfo_post ) { - void (*postHookFunc) (int *fd, struct mob_data *md, short *flag); + void (*postHookFunc) (int fd, struct mob_data *md, short flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bossmapinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bossmapinfo_post[hIndex].func; - postHookFunc(&fd, md, &flag); + postHookFunc(fd, md, flag); } } return; @@ -8423,11 +8419,11 @@ void HP_clif_bossmapinfo(int fd, struct mob_data *md, short flag) { void HP_clif_map_type(struct map_session_data *sd, enum map_type type) { int hIndex = 0; if( HPMHooks.count.HP_clif_map_type_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum map_type *type); + void (*preHookFunc) (struct map_session_data **sd, enum map_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_map_type_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_map_type_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8438,10 +8434,10 @@ void HP_clif_map_type(struct map_session_data *sd, enum map_type type) { HPMHooks.source.clif.map_type(sd, type); } if( HPMHooks.count.HP_clif_map_type_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum map_type *type); + void (*postHookFunc) (struct map_session_data *sd, enum map_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_map_type_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_map_type_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -8449,11 +8445,11 @@ void HP_clif_map_type(struct map_session_data *sd, enum map_type type) { void HP_clif_maptypeproperty2(struct block_list *bl, enum send_target t) { int hIndex = 0; if( HPMHooks.count.HP_clif_maptypeproperty2_pre ) { - void (*preHookFunc) (struct block_list *bl, enum send_target *t); + void (*preHookFunc) (struct block_list **bl, enum send_target *t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_maptypeproperty2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_maptypeproperty2_pre[hIndex].func; - preHookFunc(bl, &t); + preHookFunc(&bl, &t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8464,10 +8460,10 @@ void HP_clif_maptypeproperty2(struct block_list *bl, enum send_target t) { HPMHooks.source.clif.maptypeproperty2(bl, t); } if( HPMHooks.count.HP_clif_maptypeproperty2_post ) { - void (*postHookFunc) (struct block_list *bl, enum send_target *t); + void (*postHookFunc) (struct block_list *bl, enum send_target t); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_maptypeproperty2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_maptypeproperty2_post[hIndex].func; - postHookFunc(bl, &t); + postHookFunc(bl, t); } } return; @@ -8475,11 +8471,11 @@ void HP_clif_maptypeproperty2(struct block_list *bl, enum send_target t) { void HP_clif_changemapserver(struct map_session_data *sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port) { int hIndex = 0; if( HPMHooks.count.HP_clif_changemapserver_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *map_index, int *x, int *y, uint32 *ip, uint16 *port); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *map_index, int *x, int *y, uint32 *ip, uint16 *port); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changemapserver_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changemapserver_pre[hIndex].func; - preHookFunc(sd, &map_index, &x, &y, &ip, &port); + preHookFunc(&sd, &map_index, &x, &y, &ip, &port); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8490,10 +8486,10 @@ void HP_clif_changemapserver(struct map_session_data *sd, unsigned short map_ind HPMHooks.source.clif.changemapserver(sd, map_index, x, y, ip, port); } if( HPMHooks.count.HP_clif_changemapserver_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *map_index, int *x, int *y, uint32 *ip, uint16 *port); + void (*postHookFunc) (struct map_session_data *sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changemapserver_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_changemapserver_post[hIndex].func; - postHookFunc(sd, &map_index, &x, &y, &ip, &port); + postHookFunc(sd, map_index, x, y, ip, port); } } return; @@ -8501,11 +8497,11 @@ void HP_clif_changemapserver(struct map_session_data *sd, unsigned short map_ind void HP_clif_npcbuysell(struct map_session_data *sd, int id) { int hIndex = 0; if( HPMHooks.count.HP_clif_npcbuysell_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *id); + void (*preHookFunc) (struct map_session_data **sd, int *id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npcbuysell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_npcbuysell_pre[hIndex].func; - preHookFunc(sd, &id); + preHookFunc(&sd, &id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8516,10 +8512,10 @@ void HP_clif_npcbuysell(struct map_session_data *sd, int id) { HPMHooks.source.clif.npcbuysell(sd, id); } if( HPMHooks.count.HP_clif_npcbuysell_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *id); + void (*postHookFunc) (struct map_session_data *sd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npcbuysell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_npcbuysell_post[hIndex].func; - postHookFunc(sd, &id); + postHookFunc(sd, id); } } return; @@ -8527,11 +8523,11 @@ void HP_clif_npcbuysell(struct map_session_data *sd, int id) { void HP_clif_buylist(struct map_session_data *sd, struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_clif_buylist_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + void (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buylist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buylist_pre[hIndex].func; - preHookFunc(sd, nd); + preHookFunc(&sd, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8553,11 +8549,11 @@ void HP_clif_buylist(struct map_session_data *sd, struct npc_data *nd) { void HP_clif_selllist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_selllist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_selllist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_selllist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8579,11 +8575,11 @@ void HP_clif_selllist(struct map_session_data *sd) { void HP_clif_cashshop_show(struct map_session_data *sd, struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_clif_cashshop_show_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + void (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cashshop_show_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cashshop_show_pre[hIndex].func; - preHookFunc(sd, nd); + preHookFunc(&sd, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8605,11 +8601,11 @@ void HP_clif_cashshop_show(struct map_session_data *sd, struct npc_data *nd) { void HP_clif_npc_buy_result(struct map_session_data *sd, unsigned char result) { int hIndex = 0; if( HPMHooks.count.HP_clif_npc_buy_result_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *result); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_buy_result_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_npc_buy_result_pre[hIndex].func; - preHookFunc(sd, &result); + preHookFunc(&sd, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8620,10 +8616,10 @@ void HP_clif_npc_buy_result(struct map_session_data *sd, unsigned char result) { HPMHooks.source.clif.npc_buy_result(sd, result); } if( HPMHooks.count.HP_clif_npc_buy_result_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *result); + void (*postHookFunc) (struct map_session_data *sd, unsigned char result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_buy_result_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_npc_buy_result_post[hIndex].func; - postHookFunc(sd, &result); + postHookFunc(sd, result); } } return; @@ -8631,11 +8627,11 @@ void HP_clif_npc_buy_result(struct map_session_data *sd, unsigned char result) { void HP_clif_npc_sell_result(struct map_session_data *sd, unsigned char result) { int hIndex = 0; if( HPMHooks.count.HP_clif_npc_sell_result_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *result); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_sell_result_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_npc_sell_result_pre[hIndex].func; - preHookFunc(sd, &result); + preHookFunc(&sd, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8646,10 +8642,10 @@ void HP_clif_npc_sell_result(struct map_session_data *sd, unsigned char result) HPMHooks.source.clif.npc_sell_result(sd, result); } if( HPMHooks.count.HP_clif_npc_sell_result_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *result); + void (*postHookFunc) (struct map_session_data *sd, unsigned char result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_sell_result_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_npc_sell_result_post[hIndex].func; - postHookFunc(sd, &result); + postHookFunc(sd, result); } } return; @@ -8657,11 +8653,11 @@ void HP_clif_npc_sell_result(struct map_session_data *sd, unsigned char result) void HP_clif_cashshop_ack(struct map_session_data *sd, int error) { int hIndex = 0; if( HPMHooks.count.HP_clif_cashshop_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *error); + void (*preHookFunc) (struct map_session_data **sd, int *error); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cashshop_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cashshop_ack_pre[hIndex].func; - preHookFunc(sd, &error); + preHookFunc(&sd, &error); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8672,10 +8668,10 @@ void HP_clif_cashshop_ack(struct map_session_data *sd, int error) { HPMHooks.source.clif.cashshop_ack(sd, error); } if( HPMHooks.count.HP_clif_cashshop_ack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *error); + void (*postHookFunc) (struct map_session_data *sd, int error); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cashshop_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_cashshop_ack_post[hIndex].func; - postHookFunc(sd, &error); + postHookFunc(sd, error); } } return; @@ -8683,11 +8679,11 @@ void HP_clif_cashshop_ack(struct map_session_data *sd, int error) { void HP_clif_scriptmes(struct map_session_data *sd, int npcid, const char *mes) { int hIndex = 0; if( HPMHooks.count.HP_clif_scriptmes_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *npcid, const char *mes); + void (*preHookFunc) (struct map_session_data **sd, int *npcid, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptmes_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_scriptmes_pre[hIndex].func; - preHookFunc(sd, &npcid, mes); + preHookFunc(&sd, &npcid, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8698,10 +8694,10 @@ void HP_clif_scriptmes(struct map_session_data *sd, int npcid, const char *mes) HPMHooks.source.clif.scriptmes(sd, npcid, mes); } if( HPMHooks.count.HP_clif_scriptmes_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *npcid, const char *mes); + void (*postHookFunc) (struct map_session_data *sd, int npcid, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptmes_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_scriptmes_post[hIndex].func; - postHookFunc(sd, &npcid, mes); + postHookFunc(sd, npcid, mes); } } return; @@ -8709,11 +8705,11 @@ void HP_clif_scriptmes(struct map_session_data *sd, int npcid, const char *mes) void HP_clif_scriptnext(struct map_session_data *sd, int npcid) { int hIndex = 0; if( HPMHooks.count.HP_clif_scriptnext_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *npcid); + void (*preHookFunc) (struct map_session_data **sd, int *npcid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptnext_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_scriptnext_pre[hIndex].func; - preHookFunc(sd, &npcid); + preHookFunc(&sd, &npcid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8724,10 +8720,10 @@ void HP_clif_scriptnext(struct map_session_data *sd, int npcid) { HPMHooks.source.clif.scriptnext(sd, npcid); } if( HPMHooks.count.HP_clif_scriptnext_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *npcid); + void (*postHookFunc) (struct map_session_data *sd, int npcid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptnext_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_scriptnext_post[hIndex].func; - postHookFunc(sd, &npcid); + postHookFunc(sd, npcid); } } return; @@ -8735,11 +8731,11 @@ void HP_clif_scriptnext(struct map_session_data *sd, int npcid) { void HP_clif_scriptclose(struct map_session_data *sd, int npcid) { int hIndex = 0; if( HPMHooks.count.HP_clif_scriptclose_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *npcid); + void (*preHookFunc) (struct map_session_data **sd, int *npcid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptclose_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_scriptclose_pre[hIndex].func; - preHookFunc(sd, &npcid); + preHookFunc(&sd, &npcid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8750,10 +8746,10 @@ void HP_clif_scriptclose(struct map_session_data *sd, int npcid) { HPMHooks.source.clif.scriptclose(sd, npcid); } if( HPMHooks.count.HP_clif_scriptclose_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *npcid); + void (*postHookFunc) (struct map_session_data *sd, int npcid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptclose_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_scriptclose_post[hIndex].func; - postHookFunc(sd, &npcid); + postHookFunc(sd, npcid); } } return; @@ -8761,11 +8757,11 @@ void HP_clif_scriptclose(struct map_session_data *sd, int npcid) { void HP_clif_scriptmenu(struct map_session_data *sd, int npcid, const char *mes) { int hIndex = 0; if( HPMHooks.count.HP_clif_scriptmenu_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *npcid, const char *mes); + void (*preHookFunc) (struct map_session_data **sd, int *npcid, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptmenu_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_scriptmenu_pre[hIndex].func; - preHookFunc(sd, &npcid, mes); + preHookFunc(&sd, &npcid, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8776,10 +8772,10 @@ void HP_clif_scriptmenu(struct map_session_data *sd, int npcid, const char *mes) HPMHooks.source.clif.scriptmenu(sd, npcid, mes); } if( HPMHooks.count.HP_clif_scriptmenu_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *npcid, const char *mes); + void (*postHookFunc) (struct map_session_data *sd, int npcid, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptmenu_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_scriptmenu_post[hIndex].func; - postHookFunc(sd, &npcid, mes); + postHookFunc(sd, npcid, mes); } } return; @@ -8787,11 +8783,11 @@ void HP_clif_scriptmenu(struct map_session_data *sd, int npcid, const char *mes) void HP_clif_scriptinput(struct map_session_data *sd, int npcid) { int hIndex = 0; if( HPMHooks.count.HP_clif_scriptinput_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *npcid); + void (*preHookFunc) (struct map_session_data **sd, int *npcid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptinput_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_scriptinput_pre[hIndex].func; - preHookFunc(sd, &npcid); + preHookFunc(&sd, &npcid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8802,10 +8798,10 @@ void HP_clif_scriptinput(struct map_session_data *sd, int npcid) { HPMHooks.source.clif.scriptinput(sd, npcid); } if( HPMHooks.count.HP_clif_scriptinput_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *npcid); + void (*postHookFunc) (struct map_session_data *sd, int npcid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptinput_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_scriptinput_post[hIndex].func; - postHookFunc(sd, &npcid); + postHookFunc(sd, npcid); } } return; @@ -8813,11 +8809,11 @@ void HP_clif_scriptinput(struct map_session_data *sd, int npcid) { void HP_clif_scriptinputstr(struct map_session_data *sd, int npcid) { int hIndex = 0; if( HPMHooks.count.HP_clif_scriptinputstr_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *npcid); + void (*preHookFunc) (struct map_session_data **sd, int *npcid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptinputstr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_scriptinputstr_pre[hIndex].func; - preHookFunc(sd, &npcid); + preHookFunc(&sd, &npcid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8828,10 +8824,10 @@ void HP_clif_scriptinputstr(struct map_session_data *sd, int npcid) { HPMHooks.source.clif.scriptinputstr(sd, npcid); } if( HPMHooks.count.HP_clif_scriptinputstr_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *npcid); + void (*postHookFunc) (struct map_session_data *sd, int npcid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptinputstr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_scriptinputstr_post[hIndex].func; - postHookFunc(sd, &npcid); + postHookFunc(sd, npcid); } } return; @@ -8839,11 +8835,11 @@ void HP_clif_scriptinputstr(struct map_session_data *sd, int npcid) { void HP_clif_cutin(struct map_session_data *sd, const char *image, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_cutin_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *image, int *type); + void (*preHookFunc) (struct map_session_data **sd, const char **image, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cutin_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cutin_pre[hIndex].func; - preHookFunc(sd, image, &type); + preHookFunc(&sd, &image, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8854,10 +8850,10 @@ void HP_clif_cutin(struct map_session_data *sd, const char *image, int type) { HPMHooks.source.clif.cutin(sd, image, type); } if( HPMHooks.count.HP_clif_cutin_post ) { - void (*postHookFunc) (struct map_session_data *sd, const char *image, int *type); + void (*postHookFunc) (struct map_session_data *sd, const char *image, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cutin_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_cutin_post[hIndex].func; - postHookFunc(sd, image, &type); + postHookFunc(sd, image, type); } } return; @@ -8865,11 +8861,11 @@ void HP_clif_cutin(struct map_session_data *sd, const char *image, int type) { void HP_clif_sendfakenpc(struct map_session_data *sd, int npcid) { int hIndex = 0; if( HPMHooks.count.HP_clif_sendfakenpc_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *npcid); + void (*preHookFunc) (struct map_session_data **sd, int *npcid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendfakenpc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_sendfakenpc_pre[hIndex].func; - preHookFunc(sd, &npcid); + preHookFunc(&sd, &npcid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8880,10 +8876,10 @@ void HP_clif_sendfakenpc(struct map_session_data *sd, int npcid) { HPMHooks.source.clif.sendfakenpc(sd, npcid); } if( HPMHooks.count.HP_clif_sendfakenpc_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *npcid); + void (*postHookFunc) (struct map_session_data *sd, int npcid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendfakenpc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_sendfakenpc_post[hIndex].func; - postHookFunc(sd, &npcid); + postHookFunc(sd, npcid); } } return; @@ -8891,11 +8887,11 @@ void HP_clif_sendfakenpc(struct map_session_data *sd, int npcid) { void HP_clif_scriptclear(struct map_session_data *sd, int npcid) { int hIndex = 0; if( HPMHooks.count.HP_clif_scriptclear_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *npcid); + void (*preHookFunc) (struct map_session_data **sd, int *npcid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptclear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_scriptclear_pre[hIndex].func; - preHookFunc(sd, &npcid); + preHookFunc(&sd, &npcid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8906,10 +8902,10 @@ void HP_clif_scriptclear(struct map_session_data *sd, int npcid) { HPMHooks.source.clif.scriptclear(sd, npcid); } if( HPMHooks.count.HP_clif_scriptclear_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *npcid); + void (*postHookFunc) (struct map_session_data *sd, int npcid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_scriptclear_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_scriptclear_post[hIndex].func; - postHookFunc(sd, &npcid); + postHookFunc(sd, npcid); } } return; @@ -8917,11 +8913,11 @@ void HP_clif_scriptclear(struct map_session_data *sd, int npcid) { void HP_clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color) { int hIndex = 0; if( HPMHooks.count.HP_clif_viewpoint_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *npc_id, int *type, int *x, int *y, int *id, int *color); + void (*preHookFunc) (struct map_session_data **sd, int *npc_id, int *type, int *x, int *y, int *id, int *color); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_viewpoint_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_viewpoint_pre[hIndex].func; - preHookFunc(sd, &npc_id, &type, &x, &y, &id, &color); + preHookFunc(&sd, &npc_id, &type, &x, &y, &id, &color); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8932,10 +8928,10 @@ void HP_clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x, HPMHooks.source.clif.viewpoint(sd, npc_id, type, x, y, id, color); } if( HPMHooks.count.HP_clif_viewpoint_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *npc_id, int *type, int *x, int *y, int *id, int *color); + void (*postHookFunc) (struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_viewpoint_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_viewpoint_post[hIndex].func; - postHookFunc(sd, &npc_id, &type, &x, &y, &id, &color); + postHookFunc(sd, npc_id, type, x, y, id, color); } } return; @@ -8944,11 +8940,11 @@ int HP_clif_damage(struct block_list *src, struct block_list *dst, int sdelay, i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_damage_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *dst, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); + int (*preHookFunc) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_damage_pre[hIndex].func; - retVal___ = preHookFunc(src, dst, &sdelay, &ddelay, &damage, &div, &type, &damage2); + retVal___ = preHookFunc(&src, &dst, &sdelay, &ddelay, &damage, &div, &type, &damage2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8959,10 +8955,10 @@ int HP_clif_damage(struct block_list *src, struct block_list *dst, int sdelay, i retVal___ = HPMHooks.source.clif.damage(src, dst, sdelay, ddelay, damage, div, type, damage2); } if( HPMHooks.count.HP_clif_damage_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, dst, &sdelay, &ddelay, &damage, &div, &type, &damage2); + retVal___ = postHookFunc(retVal___, src, dst, sdelay, ddelay, damage, div, type, damage2); } } return retVal___; @@ -8970,11 +8966,11 @@ int HP_clif_damage(struct block_list *src, struct block_list *dst, int sdelay, i void HP_clif_sitting(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_sitting_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sitting_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_sitting_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -8996,11 +8992,11 @@ void HP_clif_sitting(struct block_list *bl) { void HP_clif_standing(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_standing_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_standing_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_standing_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9022,11 +9018,11 @@ void HP_clif_standing(struct block_list *bl) { void HP_clif_arrow_create_list(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_arrow_create_list_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_arrow_create_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_arrow_create_list_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9048,11 +9044,11 @@ void HP_clif_arrow_create_list(struct map_session_data *sd) { void HP_clif_refresh_storagewindow(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_refresh_storagewindow_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_refresh_storagewindow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_refresh_storagewindow_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9074,11 +9070,11 @@ void HP_clif_refresh_storagewindow(struct map_session_data *sd) { void HP_clif_refresh(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_refresh_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_refresh_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_refresh_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9100,11 +9096,11 @@ void HP_clif_refresh(struct map_session_data *sd) { void HP_clif_fame_blacksmith(struct map_session_data *sd, int points) { int hIndex = 0; if( HPMHooks.count.HP_clif_fame_blacksmith_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *points); + void (*preHookFunc) (struct map_session_data **sd, int *points); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_fame_blacksmith_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_fame_blacksmith_pre[hIndex].func; - preHookFunc(sd, &points); + preHookFunc(&sd, &points); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9115,10 +9111,10 @@ void HP_clif_fame_blacksmith(struct map_session_data *sd, int points) { HPMHooks.source.clif.fame_blacksmith(sd, points); } if( HPMHooks.count.HP_clif_fame_blacksmith_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *points); + void (*postHookFunc) (struct map_session_data *sd, int points); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_fame_blacksmith_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_fame_blacksmith_post[hIndex].func; - postHookFunc(sd, &points); + postHookFunc(sd, points); } } return; @@ -9126,11 +9122,11 @@ void HP_clif_fame_blacksmith(struct map_session_data *sd, int points) { void HP_clif_fame_alchemist(struct map_session_data *sd, int points) { int hIndex = 0; if( HPMHooks.count.HP_clif_fame_alchemist_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *points); + void (*preHookFunc) (struct map_session_data **sd, int *points); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_fame_alchemist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_fame_alchemist_pre[hIndex].func; - preHookFunc(sd, &points); + preHookFunc(&sd, &points); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9141,10 +9137,10 @@ void HP_clif_fame_alchemist(struct map_session_data *sd, int points) { HPMHooks.source.clif.fame_alchemist(sd, points); } if( HPMHooks.count.HP_clif_fame_alchemist_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *points); + void (*postHookFunc) (struct map_session_data *sd, int points); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_fame_alchemist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_fame_alchemist_post[hIndex].func; - postHookFunc(sd, &points); + postHookFunc(sd, points); } } return; @@ -9152,11 +9148,11 @@ void HP_clif_fame_alchemist(struct map_session_data *sd, int points) { void HP_clif_fame_taekwon(struct map_session_data *sd, int points) { int hIndex = 0; if( HPMHooks.count.HP_clif_fame_taekwon_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *points); + void (*preHookFunc) (struct map_session_data **sd, int *points); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_fame_taekwon_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_fame_taekwon_pre[hIndex].func; - preHookFunc(sd, &points); + preHookFunc(&sd, &points); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9167,10 +9163,10 @@ void HP_clif_fame_taekwon(struct map_session_data *sd, int points) { HPMHooks.source.clif.fame_taekwon(sd, points); } if( HPMHooks.count.HP_clif_fame_taekwon_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *points); + void (*postHookFunc) (struct map_session_data *sd, int points); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_fame_taekwon_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_fame_taekwon_post[hIndex].func; - postHookFunc(sd, &points); + postHookFunc(sd, points); } } return; @@ -9178,11 +9174,11 @@ void HP_clif_fame_taekwon(struct map_session_data *sd, int points) { void HP_clif_ranklist(struct map_session_data *sd, enum fame_list_type type) { int hIndex = 0; if( HPMHooks.count.HP_clif_ranklist_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum fame_list_type *type); + void (*preHookFunc) (struct map_session_data **sd, enum fame_list_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_ranklist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_ranklist_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9193,10 +9189,10 @@ void HP_clif_ranklist(struct map_session_data *sd, enum fame_list_type type) { HPMHooks.source.clif.ranklist(sd, type); } if( HPMHooks.count.HP_clif_ranklist_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum fame_list_type *type); + void (*postHookFunc) (struct map_session_data *sd, enum fame_list_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_ranklist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_ranklist_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -9204,11 +9200,11 @@ void HP_clif_ranklist(struct map_session_data *sd, enum fame_list_type type) { void HP_clif_update_rankingpoint(struct map_session_data *sd, enum fame_list_type type, int points) { int hIndex = 0; if( HPMHooks.count.HP_clif_update_rankingpoint_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum fame_list_type *type, int *points); + void (*preHookFunc) (struct map_session_data **sd, enum fame_list_type *type, int *points); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_update_rankingpoint_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_update_rankingpoint_pre[hIndex].func; - preHookFunc(sd, &type, &points); + preHookFunc(&sd, &type, &points); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9219,10 +9215,10 @@ void HP_clif_update_rankingpoint(struct map_session_data *sd, enum fame_list_typ HPMHooks.source.clif.update_rankingpoint(sd, type, points); } if( HPMHooks.count.HP_clif_update_rankingpoint_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum fame_list_type *type, int *points); + void (*postHookFunc) (struct map_session_data *sd, enum fame_list_type type, int points); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_update_rankingpoint_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_update_rankingpoint_post[hIndex].func; - postHookFunc(sd, &type, &points); + postHookFunc(sd, type, points); } } return; @@ -9230,11 +9226,11 @@ void HP_clif_update_rankingpoint(struct map_session_data *sd, enum fame_list_typ void HP_clif_pRanklist(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRanklist_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRanklist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRanklist_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9245,10 +9241,10 @@ void HP_clif_pRanklist(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRanklist(fd, sd); } if( HPMHooks.count.HP_clif_pRanklist_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRanklist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRanklist_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -9256,11 +9252,11 @@ void HP_clif_pRanklist(int fd, struct map_session_data *sd) { void HP_clif_hotkeys(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_hotkeys_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hotkeys_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_hotkeys_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9283,12 +9279,12 @@ int HP_clif_insight(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_insight_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_insight_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_clif_insight_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -9316,12 +9312,12 @@ int HP_clif_outsight(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_outsight_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_outsight_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_clif_outsight_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -9348,11 +9344,11 @@ int HP_clif_outsight(struct block_list *bl, va_list ap) { void HP_clif_skillcastcancel(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_skillcastcancel_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillcastcancel_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skillcastcancel_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9374,11 +9370,11 @@ void HP_clif_skillcastcancel(struct block_list *bl) { void HP_clif_skill_fail(struct map_session_data *sd, uint16 skill_id, enum useskill_fail_cause cause, int btype) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_fail_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, enum useskill_fail_cause *cause, int *btype); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, enum useskill_fail_cause *cause, int *btype); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_fail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_fail_pre[hIndex].func; - preHookFunc(sd, &skill_id, &cause, &btype); + preHookFunc(&sd, &skill_id, &cause, &btype); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9389,10 +9385,10 @@ void HP_clif_skill_fail(struct map_session_data *sd, uint16 skill_id, enum usesk HPMHooks.source.clif.skill_fail(sd, skill_id, cause, btype); } if( HPMHooks.count.HP_clif_skill_fail_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id, enum useskill_fail_cause *cause, int *btype); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_id, enum useskill_fail_cause cause, int btype); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_fail_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_fail_post[hIndex].func; - postHookFunc(sd, &skill_id, &cause, &btype); + postHookFunc(sd, skill_id, cause, btype); } } return; @@ -9400,11 +9396,11 @@ void HP_clif_skill_fail(struct map_session_data *sd, uint16 skill_id, enum usesk void HP_clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned int duration) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_cooldown_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, unsigned int *duration); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, unsigned int *duration); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_cooldown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_cooldown_pre[hIndex].func; - preHookFunc(sd, &skill_id, &duration); + preHookFunc(&sd, &skill_id, &duration); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9415,10 +9411,10 @@ void HP_clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsign HPMHooks.source.clif.skill_cooldown(sd, skill_id, duration); } if( HPMHooks.count.HP_clif_skill_cooldown_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id, unsigned int *duration); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_id, unsigned int duration); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_cooldown_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_cooldown_post[hIndex].func; - postHookFunc(sd, &skill_id, &duration); + postHookFunc(sd, skill_id, duration); } } return; @@ -9426,11 +9422,11 @@ void HP_clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsign void HP_clif_skill_memomessage(struct map_session_data *sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_memomessage_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_memomessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_memomessage_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9441,10 +9437,10 @@ void HP_clif_skill_memomessage(struct map_session_data *sd, int type) { HPMHooks.source.clif.skill_memomessage(sd, type); } if( HPMHooks.count.HP_clif_skill_memomessage_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_memomessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_memomessage_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -9452,11 +9448,11 @@ void HP_clif_skill_memomessage(struct map_session_data *sd, int type) { void HP_clif_skill_mapinfomessage(struct map_session_data *sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_mapinfomessage_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_mapinfomessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_mapinfomessage_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9467,10 +9463,10 @@ void HP_clif_skill_mapinfomessage(struct map_session_data *sd, int type) { HPMHooks.source.clif.skill_mapinfomessage(sd, type); } if( HPMHooks.count.HP_clif_skill_mapinfomessage_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_mapinfomessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_mapinfomessage_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -9478,11 +9474,11 @@ void HP_clif_skill_mapinfomessage(struct map_session_data *sd, int type) { void HP_clif_skill_produce_mix_list(struct map_session_data *sd, int skill_id, int trigger) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_produce_mix_list_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *skill_id, int *trigger); + void (*preHookFunc) (struct map_session_data **sd, int *skill_id, int *trigger); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_produce_mix_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_produce_mix_list_pre[hIndex].func; - preHookFunc(sd, &skill_id, &trigger); + preHookFunc(&sd, &skill_id, &trigger); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9493,10 +9489,10 @@ void HP_clif_skill_produce_mix_list(struct map_session_data *sd, int skill_id, i HPMHooks.source.clif.skill_produce_mix_list(sd, skill_id, trigger); } if( HPMHooks.count.HP_clif_skill_produce_mix_list_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *skill_id, int *trigger); + void (*postHookFunc) (struct map_session_data *sd, int skill_id, int trigger); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_produce_mix_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_produce_mix_list_post[hIndex].func; - postHookFunc(sd, &skill_id, &trigger); + postHookFunc(sd, skill_id, trigger); } } return; @@ -9504,11 +9500,11 @@ void HP_clif_skill_produce_mix_list(struct map_session_data *sd, int skill_id, i void HP_clif_cooking_list(struct map_session_data *sd, int trigger, uint16 skill_id, int qty, int list_type) { int hIndex = 0; if( HPMHooks.count.HP_clif_cooking_list_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *trigger, uint16 *skill_id, int *qty, int *list_type); + void (*preHookFunc) (struct map_session_data **sd, int *trigger, uint16 *skill_id, int *qty, int *list_type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cooking_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cooking_list_pre[hIndex].func; - preHookFunc(sd, &trigger, &skill_id, &qty, &list_type); + preHookFunc(&sd, &trigger, &skill_id, &qty, &list_type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9519,10 +9515,10 @@ void HP_clif_cooking_list(struct map_session_data *sd, int trigger, uint16 skill HPMHooks.source.clif.cooking_list(sd, trigger, skill_id, qty, list_type); } if( HPMHooks.count.HP_clif_cooking_list_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *trigger, uint16 *skill_id, int *qty, int *list_type); + void (*postHookFunc) (struct map_session_data *sd, int trigger, uint16 skill_id, int qty, int list_type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cooking_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_cooking_list_post[hIndex].func; - postHookFunc(sd, &trigger, &skill_id, &qty, &list_type); + postHookFunc(sd, trigger, skill_id, qty, list_type); } } return; @@ -9530,11 +9526,11 @@ void HP_clif_cooking_list(struct map_session_data *sd, int trigger, uint16 skill void HP_clif_autospell(struct map_session_data *sd, uint16 skill_lv) { int hIndex = 0; if( HPMHooks.count.HP_clif_autospell_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_lv); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_autospell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_autospell_pre[hIndex].func; - preHookFunc(sd, &skill_lv); + preHookFunc(&sd, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9545,10 +9541,10 @@ void HP_clif_autospell(struct map_session_data *sd, uint16 skill_lv) { HPMHooks.source.clif.autospell(sd, skill_lv); } if( HPMHooks.count.HP_clif_autospell_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_lv); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_autospell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_autospell_post[hIndex].func; - postHookFunc(sd, &skill_lv); + postHookFunc(sd, skill_lv); } } return; @@ -9556,11 +9552,11 @@ void HP_clif_autospell(struct map_session_data *sd, uint16 skill_lv) { void HP_clif_combo_delay(struct block_list *bl, int wait) { int hIndex = 0; if( HPMHooks.count.HP_clif_combo_delay_pre ) { - void (*preHookFunc) (struct block_list *bl, int *wait); + void (*preHookFunc) (struct block_list **bl, int *wait); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_combo_delay_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_combo_delay_pre[hIndex].func; - preHookFunc(bl, &wait); + preHookFunc(&bl, &wait); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9571,10 +9567,10 @@ void HP_clif_combo_delay(struct block_list *bl, int wait) { HPMHooks.source.clif.combo_delay(bl, wait); } if( HPMHooks.count.HP_clif_combo_delay_post ) { - void (*postHookFunc) (struct block_list *bl, int *wait); + void (*postHookFunc) (struct block_list *bl, int wait); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_combo_delay_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_combo_delay_post[hIndex].func; - postHookFunc(bl, &wait); + postHookFunc(bl, wait); } } return; @@ -9582,11 +9578,11 @@ void HP_clif_combo_delay(struct block_list *bl, int wait) { void HP_clif_status_change(struct block_list *bl, int type, int flag, int tick, int val1, int val2, int val3) { int hIndex = 0; if( HPMHooks.count.HP_clif_status_change_pre ) { - void (*preHookFunc) (struct block_list *bl, int *type, int *flag, int *tick, int *val1, int *val2, int *val3); + void (*preHookFunc) (struct block_list **bl, int *type, int *flag, int *tick, int *val1, int *val2, int *val3); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_status_change_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_status_change_pre[hIndex].func; - preHookFunc(bl, &type, &flag, &tick, &val1, &val2, &val3); + preHookFunc(&bl, &type, &flag, &tick, &val1, &val2, &val3); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9597,10 +9593,10 @@ void HP_clif_status_change(struct block_list *bl, int type, int flag, int tick, HPMHooks.source.clif.status_change(bl, type, flag, tick, val1, val2, val3); } if( HPMHooks.count.HP_clif_status_change_post ) { - void (*postHookFunc) (struct block_list *bl, int *type, int *flag, int *tick, int *val1, int *val2, int *val3); + void (*postHookFunc) (struct block_list *bl, int type, int flag, int tick, int val1, int val2, int val3); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_status_change_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_status_change_post[hIndex].func; - postHookFunc(bl, &type, &flag, &tick, &val1, &val2, &val3); + postHookFunc(bl, type, flag, tick, val1, val2, val3); } } return; @@ -9608,11 +9604,11 @@ void HP_clif_status_change(struct block_list *bl, int type, int flag, int tick, void HP_clif_insert_card(struct map_session_data *sd, int idx_equip, int idx_card, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_insert_card_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *idx_equip, int *idx_card, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *idx_equip, int *idx_card, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_insert_card_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_insert_card_pre[hIndex].func; - preHookFunc(sd, &idx_equip, &idx_card, &flag); + preHookFunc(&sd, &idx_equip, &idx_card, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9623,10 +9619,10 @@ void HP_clif_insert_card(struct map_session_data *sd, int idx_equip, int idx_car HPMHooks.source.clif.insert_card(sd, idx_equip, idx_card, flag); } if( HPMHooks.count.HP_clif_insert_card_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *idx_equip, int *idx_card, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int idx_equip, int idx_card, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_insert_card_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_insert_card_post[hIndex].func; - postHookFunc(sd, &idx_equip, &idx_card, &flag); + postHookFunc(sd, idx_equip, idx_card, flag); } } return; @@ -9634,11 +9630,11 @@ void HP_clif_insert_card(struct map_session_data *sd, int idx_equip, int idx_car void HP_clif_inventorylist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_inventorylist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventorylist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_inventorylist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9660,11 +9656,11 @@ void HP_clif_inventorylist(struct map_session_data *sd) { void HP_clif_equiplist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_equiplist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_equiplist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_equiplist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9686,11 +9682,11 @@ void HP_clif_equiplist(struct map_session_data *sd) { void HP_clif_cartlist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_cartlist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cartlist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cartlist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9712,11 +9708,11 @@ void HP_clif_cartlist(struct map_session_data *sd) { void HP_clif_favorite_item(struct map_session_data *sd, unsigned short index) { int hIndex = 0; if( HPMHooks.count.HP_clif_favorite_item_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *index); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_favorite_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_favorite_item_pre[hIndex].func; - preHookFunc(sd, &index); + preHookFunc(&sd, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9727,10 +9723,10 @@ void HP_clif_favorite_item(struct map_session_data *sd, unsigned short index) { HPMHooks.source.clif.favorite_item(sd, index); } if( HPMHooks.count.HP_clif_favorite_item_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *index); + void (*postHookFunc) (struct map_session_data *sd, unsigned short index); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_favorite_item_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_favorite_item_post[hIndex].func; - postHookFunc(sd, &index); + postHookFunc(sd, index); } } return; @@ -9753,10 +9749,10 @@ void HP_clif_clearcart(int fd) { HPMHooks.source.clif.clearcart(fd); } if( HPMHooks.count.HP_clif_clearcart_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearcart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_clearcart_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -9764,11 +9760,11 @@ void HP_clif_clearcart(int fd) { void HP_clif_item_identify_list(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_identify_list_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_identify_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_identify_list_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9790,11 +9786,11 @@ void HP_clif_item_identify_list(struct map_session_data *sd) { void HP_clif_item_identified(struct map_session_data *sd, int idx, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_identified_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *idx, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *idx, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_identified_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_identified_pre[hIndex].func; - preHookFunc(sd, &idx, &flag); + preHookFunc(&sd, &idx, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9805,10 +9801,10 @@ void HP_clif_item_identified(struct map_session_data *sd, int idx, int flag) { HPMHooks.source.clif.item_identified(sd, idx, flag); } if( HPMHooks.count.HP_clif_item_identified_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *idx, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int idx, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_identified_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_item_identified_post[hIndex].func; - postHookFunc(sd, &idx, &flag); + postHookFunc(sd, idx, flag); } } return; @@ -9816,11 +9812,11 @@ void HP_clif_item_identified(struct map_session_data *sd, int idx, int flag) { void HP_clif_item_repair_list(struct map_session_data *sd, struct map_session_data *dstsd, int lv) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_repair_list_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *dstsd, int *lv); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **dstsd, int *lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_repair_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_repair_list_pre[hIndex].func; - preHookFunc(sd, dstsd, &lv); + preHookFunc(&sd, &dstsd, &lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9831,10 +9827,10 @@ void HP_clif_item_repair_list(struct map_session_data *sd, struct map_session_da HPMHooks.source.clif.item_repair_list(sd, dstsd, lv); } if( HPMHooks.count.HP_clif_item_repair_list_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *dstsd, int *lv); + void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *dstsd, int lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_repair_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_item_repair_list_post[hIndex].func; - postHookFunc(sd, dstsd, &lv); + postHookFunc(sd, dstsd, lv); } } return; @@ -9842,11 +9838,11 @@ void HP_clif_item_repair_list(struct map_session_data *sd, struct map_session_da void HP_clif_item_repaireffect(struct map_session_data *sd, int idx, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_repaireffect_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *idx, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *idx, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_repaireffect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_repaireffect_pre[hIndex].func; - preHookFunc(sd, &idx, &flag); + preHookFunc(&sd, &idx, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9857,10 +9853,10 @@ void HP_clif_item_repaireffect(struct map_session_data *sd, int idx, int flag) { HPMHooks.source.clif.item_repaireffect(sd, idx, flag); } if( HPMHooks.count.HP_clif_item_repaireffect_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *idx, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int idx, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_repaireffect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_item_repaireffect_post[hIndex].func; - postHookFunc(sd, &idx, &flag); + postHookFunc(sd, idx, flag); } } return; @@ -9868,11 +9864,11 @@ void HP_clif_item_repaireffect(struct map_session_data *sd, int idx, int flag) { void HP_clif_item_damaged(struct map_session_data *sd, unsigned short position) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_damaged_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *position); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *position); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_damaged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_damaged_pre[hIndex].func; - preHookFunc(sd, &position); + preHookFunc(&sd, &position); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9883,10 +9879,10 @@ void HP_clif_item_damaged(struct map_session_data *sd, unsigned short position) HPMHooks.source.clif.item_damaged(sd, position); } if( HPMHooks.count.HP_clif_item_damaged_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *position); + void (*postHookFunc) (struct map_session_data *sd, unsigned short position); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_damaged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_item_damaged_post[hIndex].func; - postHookFunc(sd, &position); + postHookFunc(sd, position); } } return; @@ -9894,11 +9890,11 @@ void HP_clif_item_damaged(struct map_session_data *sd, unsigned short position) void HP_clif_item_refine_list(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_refine_list_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_refine_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_refine_list_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9920,11 +9916,11 @@ void HP_clif_item_refine_list(struct map_session_data *sd) { void HP_clif_item_skill(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) { int hIndex = 0; if( HPMHooks.count.HP_clif_item_skill_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_skill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_item_skill_pre[hIndex].func; - preHookFunc(sd, &skill_id, &skill_lv); + preHookFunc(&sd, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9935,10 +9931,10 @@ void HP_clif_item_skill(struct map_session_data *sd, uint16 skill_id, uint16 ski HPMHooks.source.clif.item_skill(sd, skill_id, skill_lv); } if( HPMHooks.count.HP_clif_item_skill_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_skill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_item_skill_post[hIndex].func; - postHookFunc(sd, &skill_id, &skill_lv); + postHookFunc(sd, skill_id, skill_lv); } } return; @@ -9946,11 +9942,11 @@ void HP_clif_item_skill(struct map_session_data *sd, uint16 skill_id, uint16 ski void HP_clif_mvp_item(struct map_session_data *sd, int nameid) { int hIndex = 0; if( HPMHooks.count.HP_clif_mvp_item_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *nameid); + void (*preHookFunc) (struct map_session_data **sd, int *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mvp_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mvp_item_pre[hIndex].func; - preHookFunc(sd, &nameid); + preHookFunc(&sd, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9961,10 +9957,10 @@ void HP_clif_mvp_item(struct map_session_data *sd, int nameid) { HPMHooks.source.clif.mvp_item(sd, nameid); } if( HPMHooks.count.HP_clif_mvp_item_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *nameid); + void (*postHookFunc) (struct map_session_data *sd, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mvp_item_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mvp_item_post[hIndex].func; - postHookFunc(sd, &nameid); + postHookFunc(sd, nameid); } } return; @@ -9972,11 +9968,11 @@ void HP_clif_mvp_item(struct map_session_data *sd, int nameid) { void HP_clif_mvp_exp(struct map_session_data *sd, unsigned int exp) { int hIndex = 0; if( HPMHooks.count.HP_clif_mvp_exp_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *exp); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *exp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mvp_exp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mvp_exp_pre[hIndex].func; - preHookFunc(sd, &exp); + preHookFunc(&sd, &exp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -9987,10 +9983,10 @@ void HP_clif_mvp_exp(struct map_session_data *sd, unsigned int exp) { HPMHooks.source.clif.mvp_exp(sd, exp); } if( HPMHooks.count.HP_clif_mvp_exp_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *exp); + void (*postHookFunc) (struct map_session_data *sd, unsigned int exp); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mvp_exp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mvp_exp_post[hIndex].func; - postHookFunc(sd, &exp); + postHookFunc(sd, exp); } } return; @@ -9998,11 +9994,11 @@ void HP_clif_mvp_exp(struct map_session_data *sd, unsigned int exp) { void HP_clif_mvp_noitem(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_mvp_noitem_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mvp_noitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mvp_noitem_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10024,11 +10020,11 @@ void HP_clif_mvp_noitem(struct map_session_data *sd) { void HP_clif_changed_dir(struct block_list *bl, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_changed_dir_pre ) { - void (*preHookFunc) (struct block_list *bl, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changed_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changed_dir_pre[hIndex].func; - preHookFunc(bl, &target); + preHookFunc(&bl, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10039,10 +10035,10 @@ void HP_clif_changed_dir(struct block_list *bl, enum send_target target) { HPMHooks.source.clif.changed_dir(bl, target); } if( HPMHooks.count.HP_clif_changed_dir_post ) { - void (*postHookFunc) (struct block_list *bl, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changed_dir_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_changed_dir_post[hIndex].func; - postHookFunc(bl, &target); + postHookFunc(bl, target); } } return; @@ -10050,11 +10046,11 @@ void HP_clif_changed_dir(struct block_list *bl, enum send_target target) { void HP_clif_charnameack(int fd, struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_charnameack_pre ) { - void (*preHookFunc) (int *fd, struct block_list *bl); + void (*preHookFunc) (int *fd, struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_charnameack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_charnameack_pre[hIndex].func; - preHookFunc(&fd, bl); + preHookFunc(&fd, &bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10065,10 +10061,10 @@ void HP_clif_charnameack(int fd, struct block_list *bl) { HPMHooks.source.clif.charnameack(fd, bl); } if( HPMHooks.count.HP_clif_charnameack_post ) { - void (*postHookFunc) (int *fd, struct block_list *bl); + void (*postHookFunc) (int fd, struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_charnameack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_charnameack_post[hIndex].func; - postHookFunc(&fd, bl); + postHookFunc(fd, bl); } } return; @@ -10076,11 +10072,11 @@ void HP_clif_charnameack(int fd, struct block_list *bl) { void HP_clif_monster_hp_bar(struct mob_data *md, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_monster_hp_bar_pre ) { - void (*preHookFunc) (struct mob_data *md, struct map_session_data *sd); + void (*preHookFunc) (struct mob_data **md, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_monster_hp_bar_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_monster_hp_bar_pre[hIndex].func; - preHookFunc(md, sd); + preHookFunc(&md, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10103,11 +10099,11 @@ int HP_clif_hpmeter(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_hpmeter_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hpmeter_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_hpmeter_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10144,10 +10140,10 @@ void HP_clif_hpmeter_single(int fd, int id, unsigned int hp, unsigned int maxhp) HPMHooks.source.clif.hpmeter_single(fd, id, hp, maxhp); } if( HPMHooks.count.HP_clif_hpmeter_single_post ) { - void (*postHookFunc) (int *fd, int *id, unsigned int *hp, unsigned int *maxhp); + void (*postHookFunc) (int fd, int id, unsigned int hp, unsigned int maxhp); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hpmeter_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_hpmeter_single_post[hIndex].func; - postHookFunc(&fd, &id, &hp, &maxhp); + postHookFunc(fd, id, hp, maxhp); } } return; @@ -10156,12 +10152,12 @@ int HP_clif_hpmeter_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_hpmeter_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hpmeter_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_clif_hpmeter_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -10203,10 +10199,10 @@ void HP_clif_upgrademessage(int fd, int result, int item_id) { HPMHooks.source.clif.upgrademessage(fd, result, item_id); } if( HPMHooks.count.HP_clif_upgrademessage_post ) { - void (*postHookFunc) (int *fd, int *result, int *item_id); + void (*postHookFunc) (int fd, int result, int item_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_upgrademessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_upgrademessage_post[hIndex].func; - postHookFunc(&fd, &result, &item_id); + postHookFunc(fd, result, item_id); } } return; @@ -10214,11 +10210,11 @@ void HP_clif_upgrademessage(int fd, int result, int item_id) { void HP_clif_get_weapon_view(struct map_session_data *sd, unsigned short *rhand, unsigned short *lhand) { int hIndex = 0; if( HPMHooks.count.HP_clif_get_weapon_view_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *rhand, unsigned short *lhand); + void (*preHookFunc) (struct map_session_data **sd, unsigned short **rhand, unsigned short **lhand); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_get_weapon_view_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_get_weapon_view_pre[hIndex].func; - preHookFunc(sd, rhand, lhand); + preHookFunc(&sd, &rhand, &lhand); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10240,11 +10236,11 @@ void HP_clif_get_weapon_view(struct map_session_data *sd, unsigned short *rhand, void HP_clif_gospel_info(struct map_session_data *sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_gospel_info_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_gospel_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_gospel_info_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10255,10 +10251,10 @@ void HP_clif_gospel_info(struct map_session_data *sd, int type) { HPMHooks.source.clif.gospel_info(sd, type); } if( HPMHooks.count.HP_clif_gospel_info_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_gospel_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_gospel_info_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -10266,11 +10262,11 @@ void HP_clif_gospel_info(struct map_session_data *sd, int type) { void HP_clif_feel_req(int fd, struct map_session_data *sd, uint16 skill_lv) { int hIndex = 0; if( HPMHooks.count.HP_clif_feel_req_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd, uint16 *skill_lv); + void (*preHookFunc) (int *fd, struct map_session_data **sd, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_feel_req_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_feel_req_pre[hIndex].func; - preHookFunc(&fd, sd, &skill_lv); + preHookFunc(&fd, &sd, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10281,10 +10277,10 @@ void HP_clif_feel_req(int fd, struct map_session_data *sd, uint16 skill_lv) { HPMHooks.source.clif.feel_req(fd, sd, skill_lv); } if( HPMHooks.count.HP_clif_feel_req_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd, uint16 *skill_lv); + void (*postHookFunc) (int fd, struct map_session_data *sd, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_feel_req_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_feel_req_post[hIndex].func; - postHookFunc(&fd, sd, &skill_lv); + postHookFunc(fd, sd, skill_lv); } } return; @@ -10292,11 +10288,11 @@ void HP_clif_feel_req(int fd, struct map_session_data *sd, uint16 skill_lv) { void HP_clif_starskill(struct map_session_data *sd, const char *mapname, int monster_id, unsigned char star, unsigned char result) { int hIndex = 0; if( HPMHooks.count.HP_clif_starskill_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *mapname, int *monster_id, unsigned char *star, unsigned char *result); + void (*preHookFunc) (struct map_session_data **sd, const char **mapname, int *monster_id, unsigned char *star, unsigned char *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_starskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_starskill_pre[hIndex].func; - preHookFunc(sd, mapname, &monster_id, &star, &result); + preHookFunc(&sd, &mapname, &monster_id, &star, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10307,10 +10303,10 @@ void HP_clif_starskill(struct map_session_data *sd, const char *mapname, int mon HPMHooks.source.clif.starskill(sd, mapname, monster_id, star, result); } if( HPMHooks.count.HP_clif_starskill_post ) { - void (*postHookFunc) (struct map_session_data *sd, const char *mapname, int *monster_id, unsigned char *star, unsigned char *result); + void (*postHookFunc) (struct map_session_data *sd, const char *mapname, int monster_id, unsigned char star, unsigned char result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_starskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_starskill_post[hIndex].func; - postHookFunc(sd, mapname, &monster_id, &star, &result); + postHookFunc(sd, mapname, monster_id, star, result); } } return; @@ -10318,11 +10314,11 @@ void HP_clif_starskill(struct map_session_data *sd, const char *mapname, int mon void HP_clif_feel_info(struct map_session_data *sd, unsigned char feel_level, unsigned char type) { int hIndex = 0; if( HPMHooks.count.HP_clif_feel_info_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *feel_level, unsigned char *type); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *feel_level, unsigned char *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_feel_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_feel_info_pre[hIndex].func; - preHookFunc(sd, &feel_level, &type); + preHookFunc(&sd, &feel_level, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10333,10 +10329,10 @@ void HP_clif_feel_info(struct map_session_data *sd, unsigned char feel_level, un HPMHooks.source.clif.feel_info(sd, feel_level, type); } if( HPMHooks.count.HP_clif_feel_info_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *feel_level, unsigned char *type); + void (*postHookFunc) (struct map_session_data *sd, unsigned char feel_level, unsigned char type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_feel_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_feel_info_post[hIndex].func; - postHookFunc(sd, &feel_level, &type); + postHookFunc(sd, feel_level, type); } } return; @@ -10344,11 +10340,11 @@ void HP_clif_feel_info(struct map_session_data *sd, unsigned char feel_level, un void HP_clif_hate_info(struct map_session_data *sd, unsigned char hate_level, int class_, unsigned char type) { int hIndex = 0; if( HPMHooks.count.HP_clif_hate_info_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *hate_level, int *class_, unsigned char *type); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *hate_level, int *class_, unsigned char *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hate_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_hate_info_pre[hIndex].func; - preHookFunc(sd, &hate_level, &class_, &type); + preHookFunc(&sd, &hate_level, &class_, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10359,10 +10355,10 @@ void HP_clif_hate_info(struct map_session_data *sd, unsigned char hate_level, in HPMHooks.source.clif.hate_info(sd, hate_level, class_, type); } if( HPMHooks.count.HP_clif_hate_info_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *hate_level, int *class_, unsigned char *type); + void (*postHookFunc) (struct map_session_data *sd, unsigned char hate_level, int class_, unsigned char type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hate_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_hate_info_post[hIndex].func; - postHookFunc(sd, &hate_level, &class_, &type); + postHookFunc(sd, hate_level, class_, type); } } return; @@ -10370,11 +10366,11 @@ void HP_clif_hate_info(struct map_session_data *sd, unsigned char hate_level, in void HP_clif_mission_info(struct map_session_data *sd, int mob_id, unsigned char progress) { int hIndex = 0; if( HPMHooks.count.HP_clif_mission_info_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *mob_id, unsigned char *progress); + void (*preHookFunc) (struct map_session_data **sd, int *mob_id, unsigned char *progress); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mission_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mission_info_pre[hIndex].func; - preHookFunc(sd, &mob_id, &progress); + preHookFunc(&sd, &mob_id, &progress); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10385,10 +10381,10 @@ void HP_clif_mission_info(struct map_session_data *sd, int mob_id, unsigned char HPMHooks.source.clif.mission_info(sd, mob_id, progress); } if( HPMHooks.count.HP_clif_mission_info_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *mob_id, unsigned char *progress); + void (*postHookFunc) (struct map_session_data *sd, int mob_id, unsigned char progress); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mission_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mission_info_post[hIndex].func; - postHookFunc(sd, &mob_id, &progress); + postHookFunc(sd, mob_id, progress); } } return; @@ -10396,11 +10392,11 @@ void HP_clif_mission_info(struct map_session_data *sd, int mob_id, unsigned char void HP_clif_feel_hate_reset(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_feel_hate_reset_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_feel_hate_reset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_feel_hate_reset_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10422,11 +10418,11 @@ void HP_clif_feel_hate_reset(struct map_session_data *sd) { void HP_clif_partytickack(struct map_session_data *sd, bool flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_partytickack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, bool *flag); + void (*preHookFunc) (struct map_session_data **sd, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_partytickack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_partytickack_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10437,10 +10433,10 @@ void HP_clif_partytickack(struct map_session_data *sd, bool flag) { HPMHooks.source.clif.partytickack(sd, flag); } if( HPMHooks.count.HP_clif_partytickack_post ) { - void (*postHookFunc) (struct map_session_data *sd, bool *flag); + void (*postHookFunc) (struct map_session_data *sd, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_partytickack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_partytickack_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -10448,11 +10444,11 @@ void HP_clif_partytickack(struct map_session_data *sd, bool flag) { void HP_clif_equiptickack(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_equiptickack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_equiptickack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_equiptickack_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10463,10 +10459,10 @@ void HP_clif_equiptickack(struct map_session_data *sd, int flag) { HPMHooks.source.clif.equiptickack(sd, flag); } if( HPMHooks.count.HP_clif_equiptickack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_equiptickack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_equiptickack_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -10474,11 +10470,11 @@ void HP_clif_equiptickack(struct map_session_data *sd, int flag) { void HP_clif_viewequip_ack(struct map_session_data *sd, struct map_session_data *tsd) { int hIndex = 0; if( HPMHooks.count.HP_clif_viewequip_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_viewequip_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_viewequip_ack_pre[hIndex].func; - preHookFunc(sd, tsd); + preHookFunc(&sd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10500,11 +10496,11 @@ void HP_clif_viewequip_ack(struct map_session_data *sd, struct map_session_data void HP_clif_equpcheckbox(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_equpcheckbox_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_equpcheckbox_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_equpcheckbox_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10526,11 +10522,11 @@ void HP_clif_equpcheckbox(struct map_session_data *sd) { void HP_clif_displayexp(struct map_session_data *sd, unsigned int exp, char type, bool is_quest) { int hIndex = 0; if( HPMHooks.count.HP_clif_displayexp_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *exp, char *type, bool *is_quest); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *exp, char *type, bool *is_quest); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_displayexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_displayexp_pre[hIndex].func; - preHookFunc(sd, &exp, &type, &is_quest); + preHookFunc(&sd, &exp, &type, &is_quest); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10541,10 +10537,10 @@ void HP_clif_displayexp(struct map_session_data *sd, unsigned int exp, char type HPMHooks.source.clif.displayexp(sd, exp, type, is_quest); } if( HPMHooks.count.HP_clif_displayexp_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *exp, char *type, bool *is_quest); + void (*postHookFunc) (struct map_session_data *sd, unsigned int exp, char type, bool is_quest); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_displayexp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_displayexp_post[hIndex].func; - postHookFunc(sd, &exp, &type, &is_quest); + postHookFunc(sd, exp, type, is_quest); } } return; @@ -10552,11 +10548,11 @@ void HP_clif_displayexp(struct map_session_data *sd, unsigned int exp, char type void HP_clif_font(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_font_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_font_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_font_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10578,11 +10574,11 @@ void HP_clif_font(struct map_session_data *sd) { void HP_clif_progressbar(struct map_session_data *sd, unsigned int color, unsigned int second) { int hIndex = 0; if( HPMHooks.count.HP_clif_progressbar_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *color, unsigned int *second); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *color, unsigned int *second); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_progressbar_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_progressbar_pre[hIndex].func; - preHookFunc(sd, &color, &second); + preHookFunc(&sd, &color, &second); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10593,10 +10589,10 @@ void HP_clif_progressbar(struct map_session_data *sd, unsigned int color, unsign HPMHooks.source.clif.progressbar(sd, color, second); } if( HPMHooks.count.HP_clif_progressbar_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *color, unsigned int *second); + void (*postHookFunc) (struct map_session_data *sd, unsigned int color, unsigned int second); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_progressbar_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_progressbar_post[hIndex].func; - postHookFunc(sd, &color, &second); + postHookFunc(sd, color, second); } } return; @@ -10604,11 +10600,11 @@ void HP_clif_progressbar(struct map_session_data *sd, unsigned int color, unsign void HP_clif_progressbar_abort(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_progressbar_abort_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_progressbar_abort_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_progressbar_abort_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10630,11 +10626,11 @@ void HP_clif_progressbar_abort(struct map_session_data *sd) { void HP_clif_showdigit(struct map_session_data *sd, unsigned char type, int value) { int hIndex = 0; if( HPMHooks.count.HP_clif_showdigit_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *type, int *value); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *type, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_showdigit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_showdigit_pre[hIndex].func; - preHookFunc(sd, &type, &value); + preHookFunc(&sd, &type, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10645,10 +10641,10 @@ void HP_clif_showdigit(struct map_session_data *sd, unsigned char type, int valu HPMHooks.source.clif.showdigit(sd, type, value); } if( HPMHooks.count.HP_clif_showdigit_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *type, int *value); + void (*postHookFunc) (struct map_session_data *sd, unsigned char type, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_showdigit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_showdigit_post[hIndex].func; - postHookFunc(sd, &type, &value); + postHookFunc(sd, type, value); } } return; @@ -10657,11 +10653,11 @@ int HP_clif_elementalconverter_list(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_elementalconverter_list_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_elementalconverter_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_elementalconverter_list_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10684,11 +10680,11 @@ int HP_clif_spellbook_list(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_spellbook_list_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spellbook_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_spellbook_list_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10711,11 +10707,11 @@ int HP_clif_magicdecoy_list(struct map_session_data *sd, uint16 skill_lv, short int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_magicdecoy_list_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_lv, short *x, short *y); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_lv, short *x, short *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_magicdecoy_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_magicdecoy_list_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_lv, &x, &y); + retVal___ = preHookFunc(&sd, &skill_lv, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10726,10 +10722,10 @@ int HP_clif_magicdecoy_list(struct map_session_data *sd, uint16 skill_lv, short retVal___ = HPMHooks.source.clif.magicdecoy_list(sd, skill_lv, x, y); } if( HPMHooks.count.HP_clif_magicdecoy_list_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_lv, short *x, short *y); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_lv, short x, short y); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_magicdecoy_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_magicdecoy_list_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_lv, &x, &y); + retVal___ = postHookFunc(retVal___, sd, skill_lv, x, y); } } return retVal___; @@ -10738,11 +10734,11 @@ int HP_clif_poison_list(struct map_session_data *sd, uint16 skill_lv) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_poison_list_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_lv); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_poison_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_poison_list_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_lv); + retVal___ = preHookFunc(&sd, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10753,10 +10749,10 @@ int HP_clif_poison_list(struct map_session_data *sd, uint16 skill_lv) { retVal___ = HPMHooks.source.clif.poison_list(sd, skill_lv); } if( HPMHooks.count.HP_clif_poison_list_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_poison_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_poison_list_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_lv); + retVal___ = postHookFunc(retVal___, sd, skill_lv); } } return retVal___; @@ -10765,11 +10761,11 @@ int HP_clif_autoshadowspell_list(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_autoshadowspell_list_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_autoshadowspell_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_autoshadowspell_list_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10792,11 +10788,11 @@ int HP_clif_skill_itemlistwindow(struct map_session_data *sd, uint16 skill_id, u int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_skill_itemlistwindow_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_itemlistwindow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_itemlistwindow_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, &skill_lv); + retVal___ = preHookFunc(&sd, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10807,10 +10803,10 @@ int HP_clif_skill_itemlistwindow(struct map_session_data *sd, uint16 skill_id, u retVal___ = HPMHooks.source.clif.skill_itemlistwindow(sd, skill_id, skill_lv); } if( HPMHooks.count.HP_clif_skill_itemlistwindow_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_itemlistwindow_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_itemlistwindow_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, sd, skill_id, skill_lv); } } return retVal___; @@ -10818,11 +10814,11 @@ int HP_clif_skill_itemlistwindow(struct map_session_data *sd, uint16 skill_id, u void HP_clif_sc_load(struct block_list *bl, int tid, enum send_target target, int type, int val1, int val2, int val3) { int hIndex = 0; if( HPMHooks.count.HP_clif_sc_load_pre ) { - void (*preHookFunc) (struct block_list *bl, int *tid, enum send_target *target, int *type, int *val1, int *val2, int *val3); + void (*preHookFunc) (struct block_list **bl, int *tid, enum send_target *target, int *type, int *val1, int *val2, int *val3); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sc_load_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_sc_load_pre[hIndex].func; - preHookFunc(bl, &tid, &target, &type, &val1, &val2, &val3); + preHookFunc(&bl, &tid, &target, &type, &val1, &val2, &val3); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10833,10 +10829,10 @@ void HP_clif_sc_load(struct block_list *bl, int tid, enum send_target target, in HPMHooks.source.clif.sc_load(bl, tid, target, type, val1, val2, val3); } if( HPMHooks.count.HP_clif_sc_load_post ) { - void (*postHookFunc) (struct block_list *bl, int *tid, enum send_target *target, int *type, int *val1, int *val2, int *val3); + void (*postHookFunc) (struct block_list *bl, int tid, enum send_target target, int type, int val1, int val2, int val3); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sc_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_sc_load_post[hIndex].func; - postHookFunc(bl, &tid, &target, &type, &val1, &val2, &val3); + postHookFunc(bl, tid, target, type, val1, val2, val3); } } return; @@ -10844,11 +10840,11 @@ void HP_clif_sc_load(struct block_list *bl, int tid, enum send_target target, in void HP_clif_sc_end(struct block_list *bl, int tid, enum send_target target, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_sc_end_pre ) { - void (*preHookFunc) (struct block_list *bl, int *tid, enum send_target *target, int *type); + void (*preHookFunc) (struct block_list **bl, int *tid, enum send_target *target, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sc_end_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_sc_end_pre[hIndex].func; - preHookFunc(bl, &tid, &target, &type); + preHookFunc(&bl, &tid, &target, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10859,10 +10855,10 @@ void HP_clif_sc_end(struct block_list *bl, int tid, enum send_target target, int HPMHooks.source.clif.sc_end(bl, tid, target, type); } if( HPMHooks.count.HP_clif_sc_end_post ) { - void (*postHookFunc) (struct block_list *bl, int *tid, enum send_target *target, int *type); + void (*postHookFunc) (struct block_list *bl, int tid, enum send_target target, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sc_end_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_sc_end_post[hIndex].func; - postHookFunc(bl, &tid, &target, &type); + postHookFunc(bl, tid, target, type); } } return; @@ -10870,11 +10866,11 @@ void HP_clif_sc_end(struct block_list *bl, int tid, enum send_target target, int void HP_clif_initialstatus(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_initialstatus_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_initialstatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_initialstatus_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10896,11 +10892,11 @@ void HP_clif_initialstatus(struct map_session_data *sd) { void HP_clif_cooldown_list(int fd, struct skill_cd *cd) { int hIndex = 0; if( HPMHooks.count.HP_clif_cooldown_list_pre ) { - void (*preHookFunc) (int *fd, struct skill_cd *cd); + void (*preHookFunc) (int *fd, struct skill_cd **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cooldown_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cooldown_list_pre[hIndex].func; - preHookFunc(&fd, cd); + preHookFunc(&fd, &cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10911,10 +10907,10 @@ void HP_clif_cooldown_list(int fd, struct skill_cd *cd) { HPMHooks.source.clif.cooldown_list(fd, cd); } if( HPMHooks.count.HP_clif_cooldown_list_post ) { - void (*postHookFunc) (int *fd, struct skill_cd *cd); + void (*postHookFunc) (int fd, struct skill_cd *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cooldown_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_cooldown_list_post[hIndex].func; - postHookFunc(&fd, cd); + postHookFunc(fd, cd); } } return; @@ -10922,11 +10918,11 @@ void HP_clif_cooldown_list(int fd, struct skill_cd *cd) { void HP_clif_updatestatus(struct map_session_data *sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_updatestatus_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_updatestatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_updatestatus_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10937,10 +10933,10 @@ void HP_clif_updatestatus(struct map_session_data *sd, int type) { HPMHooks.source.clif.updatestatus(sd, type); } if( HPMHooks.count.HP_clif_updatestatus_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_updatestatus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_updatestatus_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -10948,11 +10944,11 @@ void HP_clif_updatestatus(struct map_session_data *sd, int type) { void HP_clif_changestatus(struct map_session_data *sd, int type, int val) { int hIndex = 0; if( HPMHooks.count.HP_clif_changestatus_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type, int *val); + void (*preHookFunc) (struct map_session_data **sd, int *type, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changestatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changestatus_pre[hIndex].func; - preHookFunc(sd, &type, &val); + preHookFunc(&sd, &type, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10963,10 +10959,10 @@ void HP_clif_changestatus(struct map_session_data *sd, int type, int val) { HPMHooks.source.clif.changestatus(sd, type, val); } if( HPMHooks.count.HP_clif_changestatus_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type, int *val); + void (*postHookFunc) (struct map_session_data *sd, int type, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changestatus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_changestatus_post[hIndex].func; - postHookFunc(sd, &type, &val); + postHookFunc(sd, type, val); } } return; @@ -10974,11 +10970,11 @@ void HP_clif_changestatus(struct map_session_data *sd, int type, int val) { void HP_clif_statusupack(struct map_session_data *sd, int type, int ok, int val) { int hIndex = 0; if( HPMHooks.count.HP_clif_statusupack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type, int *ok, int *val); + void (*preHookFunc) (struct map_session_data **sd, int *type, int *ok, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_statusupack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_statusupack_pre[hIndex].func; - preHookFunc(sd, &type, &ok, &val); + preHookFunc(&sd, &type, &ok, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10989,10 +10985,10 @@ void HP_clif_statusupack(struct map_session_data *sd, int type, int ok, int val) HPMHooks.source.clif.statusupack(sd, type, ok, val); } if( HPMHooks.count.HP_clif_statusupack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type, int *ok, int *val); + void (*postHookFunc) (struct map_session_data *sd, int type, int ok, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_statusupack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_statusupack_post[hIndex].func; - postHookFunc(sd, &type, &ok, &val); + postHookFunc(sd, type, ok, val); } } return; @@ -11000,11 +10996,11 @@ void HP_clif_statusupack(struct map_session_data *sd, int type, int ok, int val) void HP_clif_movetoattack(struct map_session_data *sd, struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_movetoattack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct block_list *bl); + void (*preHookFunc) (struct map_session_data **sd, struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_movetoattack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_movetoattack_pre[hIndex].func; - preHookFunc(sd, bl); + preHookFunc(&sd, &bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11026,11 +11022,11 @@ void HP_clif_movetoattack(struct map_session_data *sd, struct block_list *bl) { void HP_clif_solved_charname(int fd, int charid, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_solved_charname_pre ) { - void (*preHookFunc) (int *fd, int *charid, const char *name); + void (*preHookFunc) (int *fd, int *charid, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_solved_charname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_solved_charname_pre[hIndex].func; - preHookFunc(&fd, &charid, name); + preHookFunc(&fd, &charid, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11041,10 +11037,10 @@ void HP_clif_solved_charname(int fd, int charid, const char *name) { HPMHooks.source.clif.solved_charname(fd, charid, name); } if( HPMHooks.count.HP_clif_solved_charname_post ) { - void (*postHookFunc) (int *fd, int *charid, const char *name); + void (*postHookFunc) (int fd, int charid, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_solved_charname_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_solved_charname_post[hIndex].func; - postHookFunc(&fd, &charid, name); + postHookFunc(fd, charid, name); } } return; @@ -11052,11 +11048,11 @@ void HP_clif_solved_charname(int fd, int charid, const char *name) { void HP_clif_charnameupdate(struct map_session_data *ssd) { int hIndex = 0; if( HPMHooks.count.HP_clif_charnameupdate_pre ) { - void (*preHookFunc) (struct map_session_data *ssd); + void (*preHookFunc) (struct map_session_data **ssd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_charnameupdate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_charnameupdate_pre[hIndex].func; - preHookFunc(ssd); + preHookFunc(&ssd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11094,10 +11090,10 @@ int HP_clif_delayquit(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.clif.delayquit(tid, tick, id, data); } if( HPMHooks.count.HP_clif_delayquit_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delayquit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_delayquit_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -11105,11 +11101,11 @@ int HP_clif_delayquit(int tid, int64 tick, int id, intptr_t data) { void HP_clif_getareachar_pc(struct map_session_data *sd, struct map_session_data *dstsd) { int hIndex = 0; if( HPMHooks.count.HP_clif_getareachar_pc_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *dstsd); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **dstsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_pc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_getareachar_pc_pre[hIndex].func; - preHookFunc(sd, dstsd); + preHookFunc(&sd, &dstsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11131,11 +11127,11 @@ void HP_clif_getareachar_pc(struct map_session_data *sd, struct map_session_data void HP_clif_disconnect_ack(struct map_session_data *sd, short result) { int hIndex = 0; if( HPMHooks.count.HP_clif_disconnect_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *result); + void (*preHookFunc) (struct map_session_data **sd, short *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_disconnect_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_disconnect_ack_pre[hIndex].func; - preHookFunc(sd, &result); + preHookFunc(&sd, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11146,10 +11142,10 @@ void HP_clif_disconnect_ack(struct map_session_data *sd, short result) { HPMHooks.source.clif.disconnect_ack(sd, result); } if( HPMHooks.count.HP_clif_disconnect_ack_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *result); + void (*postHookFunc) (struct map_session_data *sd, short result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_disconnect_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_disconnect_ack_post[hIndex].func; - postHookFunc(sd, &result); + postHookFunc(sd, result); } } return; @@ -11157,11 +11153,11 @@ void HP_clif_disconnect_ack(struct map_session_data *sd, short result) { void HP_clif_PVPInfo(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_PVPInfo_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PVPInfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PVPInfo_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11183,11 +11179,11 @@ void HP_clif_PVPInfo(struct map_session_data *sd) { void HP_clif_blacksmith(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_blacksmith_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_blacksmith_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_blacksmith_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11209,11 +11205,11 @@ void HP_clif_blacksmith(struct map_session_data *sd) { void HP_clif_alchemist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_alchemist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_alchemist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_alchemist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11235,11 +11231,11 @@ void HP_clif_alchemist(struct map_session_data *sd) { void HP_clif_taekwon(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_taekwon_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_taekwon_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_taekwon_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11261,11 +11257,11 @@ void HP_clif_taekwon(struct map_session_data *sd) { void HP_clif_ranking_pk(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_ranking_pk_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_ranking_pk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_ranking_pk_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11287,11 +11283,11 @@ void HP_clif_ranking_pk(struct map_session_data *sd) { void HP_clif_quitsave(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_quitsave_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quitsave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quitsave_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11302,10 +11298,10 @@ void HP_clif_quitsave(int fd, struct map_session_data *sd) { HPMHooks.source.clif.quitsave(fd, sd); } if( HPMHooks.count.HP_clif_quitsave_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quitsave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_quitsave_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -11313,11 +11309,11 @@ void HP_clif_quitsave(int fd, struct map_session_data *sd) { void HP_clif_misceffect(struct block_list *bl, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_misceffect_pre ) { - void (*preHookFunc) (struct block_list *bl, int *type); + void (*preHookFunc) (struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_misceffect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_misceffect_pre[hIndex].func; - preHookFunc(bl, &type); + preHookFunc(&bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11328,10 +11324,10 @@ void HP_clif_misceffect(struct block_list *bl, int type) { HPMHooks.source.clif.misceffect(bl, type); } if( HPMHooks.count.HP_clif_misceffect_post ) { - void (*postHookFunc) (struct block_list *bl, int *type); + void (*postHookFunc) (struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_misceffect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_misceffect_post[hIndex].func; - postHookFunc(bl, &type); + postHookFunc(bl, type); } } return; @@ -11339,11 +11335,11 @@ void HP_clif_misceffect(struct block_list *bl, int type) { void HP_clif_changeoption(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_changeoption_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changeoption_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changeoption_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11365,11 +11361,11 @@ void HP_clif_changeoption(struct block_list *bl) { void HP_clif_changeoption2(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_changeoption2_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changeoption2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changeoption2_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11391,11 +11387,11 @@ void HP_clif_changeoption2(struct block_list *bl) { void HP_clif_emotion(struct block_list *bl, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_emotion_pre ) { - void (*preHookFunc) (struct block_list *bl, int *type); + void (*preHookFunc) (struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_emotion_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_emotion_pre[hIndex].func; - preHookFunc(bl, &type); + preHookFunc(&bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11406,10 +11402,10 @@ void HP_clif_emotion(struct block_list *bl, int type) { HPMHooks.source.clif.emotion(bl, type); } if( HPMHooks.count.HP_clif_emotion_post ) { - void (*postHookFunc) (struct block_list *bl, int *type); + void (*postHookFunc) (struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_emotion_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_emotion_post[hIndex].func; - postHookFunc(bl, &type); + postHookFunc(bl, type); } } return; @@ -11417,11 +11413,11 @@ void HP_clif_emotion(struct block_list *bl, int type) { void HP_clif_talkiebox(struct block_list *bl, const char *talkie) { int hIndex = 0; if( HPMHooks.count.HP_clif_talkiebox_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *talkie); + void (*preHookFunc) (struct block_list **bl, const char **talkie); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_talkiebox_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_talkiebox_pre[hIndex].func; - preHookFunc(bl, talkie); + preHookFunc(&bl, &talkie); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11443,11 +11439,11 @@ void HP_clif_talkiebox(struct block_list *bl, const char *talkie) { void HP_clif_wedding_effect(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_wedding_effect_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wedding_effect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_wedding_effect_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11469,11 +11465,11 @@ void HP_clif_wedding_effect(struct block_list *bl) { void HP_clif_divorced(struct map_session_data *sd, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_divorced_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *name); + void (*preHookFunc) (struct map_session_data **sd, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_divorced_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_divorced_pre[hIndex].func; - preHookFunc(sd, name); + preHookFunc(&sd, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11495,11 +11491,11 @@ void HP_clif_divorced(struct map_session_data *sd, const char *name) { void HP_clif_callpartner(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_callpartner_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_callpartner_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_callpartner_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11522,11 +11518,11 @@ int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, int64 t int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_skill_damage_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, int *type); + int (*preHookFunc) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_damage_pre[hIndex].func; - retVal___ = preHookFunc(src, dst, &tick, &sdelay, &ddelay, &damage, &div, &skill_id, &skill_lv, &type); + retVal___ = preHookFunc(&src, &dst, &tick, &sdelay, &ddelay, &damage, &div, &skill_id, &skill_lv, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11537,10 +11533,10 @@ int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, int64 t retVal___ = HPMHooks.source.clif.skill_damage(src, dst, tick, sdelay, ddelay, damage, div, skill_id, skill_lv, type); } if( HPMHooks.count.HP_clif_skill_damage_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, int *type); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, dst, &tick, &sdelay, &ddelay, &damage, &div, &skill_id, &skill_lv, &type); + retVal___ = postHookFunc(retVal___, src, dst, tick, sdelay, ddelay, damage, div, skill_id, skill_lv, type); } } return retVal___; @@ -11549,11 +11545,11 @@ int HP_clif_skill_nodamage(struct block_list *src, struct block_list *dst, uint1 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_skill_nodamage_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *dst, uint16 *skill_id, int *heal, int *fail); + int (*preHookFunc) (struct block_list **src, struct block_list **dst, uint16 *skill_id, int *heal, int *fail); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_nodamage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_nodamage_pre[hIndex].func; - retVal___ = preHookFunc(src, dst, &skill_id, &heal, &fail); + retVal___ = preHookFunc(&src, &dst, &skill_id, &heal, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11564,10 +11560,10 @@ int HP_clif_skill_nodamage(struct block_list *src, struct block_list *dst, uint1 retVal___ = HPMHooks.source.clif.skill_nodamage(src, dst, skill_id, heal, fail); } if( HPMHooks.count.HP_clif_skill_nodamage_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, uint16 *skill_id, int *heal, int *fail); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, uint16 skill_id, int heal, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_nodamage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_nodamage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, dst, &skill_id, &heal, &fail); + retVal___ = postHookFunc(retVal___, src, dst, skill_id, heal, fail); } } return retVal___; @@ -11575,11 +11571,11 @@ int HP_clif_skill_nodamage(struct block_list *src, struct block_list *dst, uint1 void HP_clif_skill_poseffect(struct block_list *src, uint16 skill_id, int val, int x, int y, int64 tick) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_poseffect_pre ) { - void (*preHookFunc) (struct block_list *src, uint16 *skill_id, int *val, int *x, int *y, int64 *tick); + void (*preHookFunc) (struct block_list **src, uint16 *skill_id, int *val, int *x, int *y, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_poseffect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_poseffect_pre[hIndex].func; - preHookFunc(src, &skill_id, &val, &x, &y, &tick); + preHookFunc(&src, &skill_id, &val, &x, &y, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11590,10 +11586,10 @@ void HP_clif_skill_poseffect(struct block_list *src, uint16 skill_id, int val, i HPMHooks.source.clif.skill_poseffect(src, skill_id, val, x, y, tick); } if( HPMHooks.count.HP_clif_skill_poseffect_post ) { - void (*postHookFunc) (struct block_list *src, uint16 *skill_id, int *val, int *x, int *y, int64 *tick); + void (*postHookFunc) (struct block_list *src, uint16 skill_id, int val, int x, int y, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_poseffect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_poseffect_post[hIndex].func; - postHookFunc(src, &skill_id, &val, &x, &y, &tick); + postHookFunc(src, skill_id, val, x, y, tick); } } return; @@ -11601,11 +11597,11 @@ void HP_clif_skill_poseffect(struct block_list *src, uint16 skill_id, int val, i void HP_clif_skill_estimation(struct map_session_data *sd, struct block_list *dst) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_estimation_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct block_list *dst); + void (*preHookFunc) (struct map_session_data **sd, struct block_list **dst); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_estimation_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_estimation_pre[hIndex].func; - preHookFunc(sd, dst); + preHookFunc(&sd, &dst); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11627,11 +11623,11 @@ void HP_clif_skill_estimation(struct map_session_data *sd, struct block_list *ds void HP_clif_skill_warppoint(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, unsigned short map1, unsigned short map2, unsigned short map3, unsigned short map4) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_warppoint_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, unsigned short *map1, unsigned short *map2, unsigned short *map3, unsigned short *map4); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv, unsigned short *map1, unsigned short *map2, unsigned short *map3, unsigned short *map4); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_warppoint_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_warppoint_pre[hIndex].func; - preHookFunc(sd, &skill_id, &skill_lv, &map1, &map2, &map3, &map4); + preHookFunc(&sd, &skill_id, &skill_lv, &map1, &map2, &map3, &map4); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11642,10 +11638,10 @@ void HP_clif_skill_warppoint(struct map_session_data *sd, uint16 skill_id, uint1 HPMHooks.source.clif.skill_warppoint(sd, skill_id, skill_lv, map1, map2, map3, map4); } if( HPMHooks.count.HP_clif_skill_warppoint_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, unsigned short *map1, unsigned short *map2, unsigned short *map3, unsigned short *map4); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, unsigned short map1, unsigned short map2, unsigned short map3, unsigned short map4); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_warppoint_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skill_warppoint_post[hIndex].func; - postHookFunc(sd, &skill_id, &skill_lv, &map1, &map2, &map3, &map4); + postHookFunc(sd, skill_id, skill_lv, map1, map2, map3, map4); } } return; @@ -11653,11 +11649,11 @@ void HP_clif_skill_warppoint(struct map_session_data *sd, uint16 skill_id, uint1 void HP_clif_skillcasting(struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, int property, int casttime) { int hIndex = 0; if( HPMHooks.count.HP_clif_skillcasting_pre ) { - void (*preHookFunc) (struct block_list *bl, int *src_id, int *dst_id, int *dst_x, int *dst_y, uint16 *skill_id, int *property, int *casttime); + void (*preHookFunc) (struct block_list **bl, int *src_id, int *dst_id, int *dst_x, int *dst_y, uint16 *skill_id, int *property, int *casttime); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillcasting_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skillcasting_pre[hIndex].func; - preHookFunc(bl, &src_id, &dst_id, &dst_x, &dst_y, &skill_id, &property, &casttime); + preHookFunc(&bl, &src_id, &dst_id, &dst_x, &dst_y, &skill_id, &property, &casttime); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11668,10 +11664,10 @@ void HP_clif_skillcasting(struct block_list *bl, int src_id, int dst_id, int dst HPMHooks.source.clif.skillcasting(bl, src_id, dst_id, dst_x, dst_y, skill_id, property, casttime); } if( HPMHooks.count.HP_clif_skillcasting_post ) { - void (*postHookFunc) (struct block_list *bl, int *src_id, int *dst_id, int *dst_x, int *dst_y, uint16 *skill_id, int *property, int *casttime); + void (*postHookFunc) (struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, int property, int casttime); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillcasting_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skillcasting_post[hIndex].func; - postHookFunc(bl, &src_id, &dst_id, &dst_x, &dst_y, &skill_id, &property, &casttime); + postHookFunc(bl, src_id, dst_id, dst_x, dst_y, skill_id, property, casttime); } } return; @@ -11679,11 +11675,11 @@ void HP_clif_skillcasting(struct block_list *bl, int src_id, int dst_id, int dst void HP_clif_produce_effect(struct map_session_data *sd, int flag, int nameid) { int hIndex = 0; if( HPMHooks.count.HP_clif_produce_effect_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag, int *nameid); + void (*preHookFunc) (struct map_session_data **sd, int *flag, int *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_produce_effect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_produce_effect_pre[hIndex].func; - preHookFunc(sd, &flag, &nameid); + preHookFunc(&sd, &flag, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11694,10 +11690,10 @@ void HP_clif_produce_effect(struct map_session_data *sd, int flag, int nameid) { HPMHooks.source.clif.produce_effect(sd, flag, nameid); } if( HPMHooks.count.HP_clif_produce_effect_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag, int *nameid); + void (*postHookFunc) (struct map_session_data *sd, int flag, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_produce_effect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_produce_effect_post[hIndex].func; - postHookFunc(sd, &flag, &nameid); + postHookFunc(sd, flag, nameid); } } return; @@ -11705,11 +11701,11 @@ void HP_clif_produce_effect(struct map_session_data *sd, int flag, int nameid) { void HP_clif_devotion(struct block_list *src, struct map_session_data *tsd) { int hIndex = 0; if( HPMHooks.count.HP_clif_devotion_pre ) { - void (*preHookFunc) (struct block_list *src, struct map_session_data *tsd); + void (*preHookFunc) (struct block_list **src, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_devotion_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_devotion_pre[hIndex].func; - preHookFunc(src, tsd); + preHookFunc(&src, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11731,11 +11727,11 @@ void HP_clif_devotion(struct block_list *src, struct map_session_data *tsd) { void HP_clif_spiritball(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_spiritball_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spiritball_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_spiritball_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11757,11 +11753,11 @@ void HP_clif_spiritball(struct block_list *bl) { void HP_clif_spiritball_single(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_spiritball_single_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spiritball_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_spiritball_single_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11772,10 +11768,10 @@ void HP_clif_spiritball_single(int fd, struct map_session_data *sd) { HPMHooks.source.clif.spiritball_single(fd, sd); } if( HPMHooks.count.HP_clif_spiritball_single_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spiritball_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_spiritball_single_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -11783,11 +11779,11 @@ void HP_clif_spiritball_single(int fd, struct map_session_data *sd) { void HP_clif_bladestop(struct block_list *src, int dst_id, int active) { int hIndex = 0; if( HPMHooks.count.HP_clif_bladestop_pre ) { - void (*preHookFunc) (struct block_list *src, int *dst_id, int *active); + void (*preHookFunc) (struct block_list **src, int *dst_id, int *active); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bladestop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bladestop_pre[hIndex].func; - preHookFunc(src, &dst_id, &active); + preHookFunc(&src, &dst_id, &active); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11798,10 +11794,10 @@ void HP_clif_bladestop(struct block_list *src, int dst_id, int active) { HPMHooks.source.clif.bladestop(src, dst_id, active); } if( HPMHooks.count.HP_clif_bladestop_post ) { - void (*postHookFunc) (struct block_list *src, int *dst_id, int *active); + void (*postHookFunc) (struct block_list *src, int dst_id, int active); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bladestop_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bladestop_post[hIndex].func; - postHookFunc(src, &dst_id, &active); + postHookFunc(src, dst_id, active); } } return; @@ -11809,11 +11805,11 @@ void HP_clif_bladestop(struct block_list *src, int dst_id, int active) { void HP_clif_mvp_effect(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_mvp_effect_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mvp_effect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mvp_effect_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11850,10 +11846,10 @@ void HP_clif_heal(int fd, int type, int val) { HPMHooks.source.clif.heal(fd, type, val); } if( HPMHooks.count.HP_clif_heal_post ) { - void (*postHookFunc) (int *fd, int *type, int *val); + void (*postHookFunc) (int fd, int type, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_heal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_heal_post[hIndex].func; - postHookFunc(&fd, &type, &val); + postHookFunc(fd, type, val); } } return; @@ -11861,11 +11857,11 @@ void HP_clif_heal(int fd, int type, int val) { void HP_clif_resurrection(struct block_list *bl, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_resurrection_pre ) { - void (*preHookFunc) (struct block_list *bl, int *type); + void (*preHookFunc) (struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_resurrection_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_resurrection_pre[hIndex].func; - preHookFunc(bl, &type); + preHookFunc(&bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11876,10 +11872,10 @@ void HP_clif_resurrection(struct block_list *bl, int type) { HPMHooks.source.clif.resurrection(bl, type); } if( HPMHooks.count.HP_clif_resurrection_post ) { - void (*postHookFunc) (struct block_list *bl, int *type); + void (*postHookFunc) (struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_resurrection_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_resurrection_post[hIndex].func; - postHookFunc(bl, &type); + postHookFunc(bl, type); } } return; @@ -11902,10 +11898,10 @@ void HP_clif_refine(int fd, int fail, int index, int val) { HPMHooks.source.clif.refine(fd, fail, index, val); } if( HPMHooks.count.HP_clif_refine_post ) { - void (*postHookFunc) (int *fd, int *fail, int *index, int *val); + void (*postHookFunc) (int fd, int fail, int index, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_refine_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_refine_post[hIndex].func; - postHookFunc(&fd, &fail, &index, &val); + postHookFunc(fd, fail, index, val); } } return; @@ -11928,10 +11924,10 @@ void HP_clif_weather(int16 m) { HPMHooks.source.clif.weather(m); } if( HPMHooks.count.HP_clif_weather_post ) { - void (*postHookFunc) (int16 *m); + void (*postHookFunc) (int16 m); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_weather_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_weather_post[hIndex].func; - postHookFunc(&m); + postHookFunc(m); } } return; @@ -11939,11 +11935,11 @@ void HP_clif_weather(int16 m) { void HP_clif_specialeffect(struct block_list *bl, int type, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_specialeffect_pre ) { - void (*preHookFunc) (struct block_list *bl, int *type, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, int *type, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_specialeffect_pre[hIndex].func; - preHookFunc(bl, &type, &target); + preHookFunc(&bl, &type, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11954,10 +11950,10 @@ void HP_clif_specialeffect(struct block_list *bl, int type, enum send_target tar HPMHooks.source.clif.specialeffect(bl, type, target); } if( HPMHooks.count.HP_clif_specialeffect_post ) { - void (*postHookFunc) (struct block_list *bl, int *type, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, int type, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_specialeffect_post[hIndex].func; - postHookFunc(bl, &type, &target); + postHookFunc(bl, type, target); } } return; @@ -11965,11 +11961,11 @@ void HP_clif_specialeffect(struct block_list *bl, int type, enum send_target tar void HP_clif_specialeffect_single(struct block_list *bl, int type, int fd) { int hIndex = 0; if( HPMHooks.count.HP_clif_specialeffect_single_pre ) { - void (*preHookFunc) (struct block_list *bl, int *type, int *fd); + void (*preHookFunc) (struct block_list **bl, int *type, int *fd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_specialeffect_single_pre[hIndex].func; - preHookFunc(bl, &type, &fd); + preHookFunc(&bl, &type, &fd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11980,10 +11976,10 @@ void HP_clif_specialeffect_single(struct block_list *bl, int type, int fd) { HPMHooks.source.clif.specialeffect_single(bl, type, fd); } if( HPMHooks.count.HP_clif_specialeffect_single_post ) { - void (*postHookFunc) (struct block_list *bl, int *type, int *fd); + void (*postHookFunc) (struct block_list *bl, int type, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_specialeffect_single_post[hIndex].func; - postHookFunc(bl, &type, &fd); + postHookFunc(bl, type, fd); } } return; @@ -11991,11 +11987,11 @@ void HP_clif_specialeffect_single(struct block_list *bl, int type, int fd) { void HP_clif_specialeffect_value(struct block_list *bl, int effect_id, int num, send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_specialeffect_value_pre ) { - void (*preHookFunc) (struct block_list *bl, int *effect_id, int *num, send_target *target); + void (*preHookFunc) (struct block_list **bl, int *effect_id, int *num, send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_specialeffect_value_pre[hIndex].func; - preHookFunc(bl, &effect_id, &num, &target); + preHookFunc(&bl, &effect_id, &num, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12006,10 +12002,10 @@ void HP_clif_specialeffect_value(struct block_list *bl, int effect_id, int num, HPMHooks.source.clif.specialeffect_value(bl, effect_id, num, target); } if( HPMHooks.count.HP_clif_specialeffect_value_post ) { - void (*postHookFunc) (struct block_list *bl, int *effect_id, int *num, send_target *target); + void (*postHookFunc) (struct block_list *bl, int effect_id, int num, send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_value_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_specialeffect_value_post[hIndex].func; - postHookFunc(bl, &effect_id, &num, &target); + postHookFunc(bl, effect_id, num, target); } } return; @@ -12017,11 +12013,11 @@ void HP_clif_specialeffect_value(struct block_list *bl, int effect_id, int num, void HP_clif_millenniumshield(struct block_list *bl, short shields) { int hIndex = 0; if( HPMHooks.count.HP_clif_millenniumshield_pre ) { - void (*preHookFunc) (struct block_list *bl, short *shields); + void (*preHookFunc) (struct block_list **bl, short *shields); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_millenniumshield_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_millenniumshield_pre[hIndex].func; - preHookFunc(bl, &shields); + preHookFunc(&bl, &shields); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12032,10 +12028,10 @@ void HP_clif_millenniumshield(struct block_list *bl, short shields) { HPMHooks.source.clif.millenniumshield(bl, shields); } if( HPMHooks.count.HP_clif_millenniumshield_post ) { - void (*postHookFunc) (struct block_list *bl, short *shields); + void (*postHookFunc) (struct block_list *bl, short shields); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_millenniumshield_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_millenniumshield_post[hIndex].func; - postHookFunc(bl, &shields); + postHookFunc(bl, shields); } } return; @@ -12043,11 +12039,11 @@ void HP_clif_millenniumshield(struct block_list *bl, short shields) { void HP_clif_spiritcharm(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_spiritcharm_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spiritcharm_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_spiritcharm_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12069,11 +12065,11 @@ void HP_clif_spiritcharm(struct map_session_data *sd) { void HP_clif_charm_single(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_charm_single_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_charm_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_charm_single_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12084,10 +12080,10 @@ void HP_clif_charm_single(int fd, struct map_session_data *sd) { HPMHooks.source.clif.charm_single(fd, sd); } if( HPMHooks.count.HP_clif_charm_single_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_charm_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_charm_single_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -12095,11 +12091,11 @@ void HP_clif_charm_single(int fd, struct map_session_data *sd) { void HP_clif_snap(struct block_list *bl, short x, short y) { int hIndex = 0; if( HPMHooks.count.HP_clif_snap_pre ) { - void (*preHookFunc) (struct block_list *bl, short *x, short *y); + void (*preHookFunc) (struct block_list **bl, short *x, short *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_snap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_snap_pre[hIndex].func; - preHookFunc(bl, &x, &y); + preHookFunc(&bl, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12110,10 +12106,10 @@ void HP_clif_snap(struct block_list *bl, short x, short y) { HPMHooks.source.clif.snap(bl, x, y); } if( HPMHooks.count.HP_clif_snap_post ) { - void (*postHookFunc) (struct block_list *bl, short *x, short *y); + void (*postHookFunc) (struct block_list *bl, short x, short y); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_snap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_snap_post[hIndex].func; - postHookFunc(bl, &x, &y); + postHookFunc(bl, x, y); } } return; @@ -12121,11 +12117,11 @@ void HP_clif_snap(struct block_list *bl, short x, short y) { void HP_clif_weather_check(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_weather_check_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_weather_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_weather_check_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12147,11 +12143,11 @@ void HP_clif_weather_check(struct map_session_data *sd) { void HP_clif_playBGM(struct map_session_data *sd, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_playBGM_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *name); + void (*preHookFunc) (struct map_session_data **sd, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_playBGM_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_playBGM_pre[hIndex].func; - preHookFunc(sd, name); + preHookFunc(&sd, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12173,11 +12169,11 @@ void HP_clif_playBGM(struct map_session_data *sd, const char *name) { void HP_clif_soundeffect(struct map_session_data *sd, struct block_list *bl, const char *name, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_soundeffect_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct block_list *bl, const char *name, int *type); + void (*preHookFunc) (struct map_session_data **sd, struct block_list **bl, const char **name, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_soundeffect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_soundeffect_pre[hIndex].func; - preHookFunc(sd, bl, name, &type); + preHookFunc(&sd, &bl, &name, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12188,10 +12184,10 @@ void HP_clif_soundeffect(struct map_session_data *sd, struct block_list *bl, con HPMHooks.source.clif.soundeffect(sd, bl, name, type); } if( HPMHooks.count.HP_clif_soundeffect_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct block_list *bl, const char *name, int *type); + void (*postHookFunc) (struct map_session_data *sd, struct block_list *bl, const char *name, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_soundeffect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_soundeffect_post[hIndex].func; - postHookFunc(sd, bl, name, &type); + postHookFunc(sd, bl, name, type); } } return; @@ -12199,11 +12195,11 @@ void HP_clif_soundeffect(struct map_session_data *sd, struct block_list *bl, con void HP_clif_soundeffectall(struct block_list *bl, const char *name, int type, enum send_target coverage) { int hIndex = 0; if( HPMHooks.count.HP_clif_soundeffectall_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *name, int *type, enum send_target *coverage); + void (*preHookFunc) (struct block_list **bl, const char **name, int *type, enum send_target *coverage); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_soundeffectall_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_soundeffectall_pre[hIndex].func; - preHookFunc(bl, name, &type, &coverage); + preHookFunc(&bl, &name, &type, &coverage); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12214,10 +12210,10 @@ void HP_clif_soundeffectall(struct block_list *bl, const char *name, int type, e HPMHooks.source.clif.soundeffectall(bl, name, type, coverage); } if( HPMHooks.count.HP_clif_soundeffectall_post ) { - void (*postHookFunc) (struct block_list *bl, const char *name, int *type, enum send_target *coverage); + void (*postHookFunc) (struct block_list *bl, const char *name, int type, enum send_target coverage); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_soundeffectall_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_soundeffectall_post[hIndex].func; - postHookFunc(bl, name, &type, &coverage); + postHookFunc(bl, name, type, coverage); } } return; @@ -12225,11 +12221,11 @@ void HP_clif_soundeffectall(struct block_list *bl, const char *name, int type, e void HP_clif_GlobalMessage(struct block_list *bl, const char *message) { int hIndex = 0; if( HPMHooks.count.HP_clif_GlobalMessage_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *message); + void (*preHookFunc) (struct block_list **bl, const char **message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_GlobalMessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_GlobalMessage_pre[hIndex].func; - preHookFunc(bl, message); + preHookFunc(&bl, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12251,11 +12247,11 @@ void HP_clif_GlobalMessage(struct block_list *bl, const char *message) { void HP_clif_createchat(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_createchat_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_createchat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_createchat_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12266,10 +12262,10 @@ void HP_clif_createchat(struct map_session_data *sd, int flag) { HPMHooks.source.clif.createchat(sd, flag); } if( HPMHooks.count.HP_clif_createchat_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_createchat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_createchat_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -12277,11 +12273,11 @@ void HP_clif_createchat(struct map_session_data *sd, int flag) { void HP_clif_dispchat(struct chat_data *cd, int fd) { int hIndex = 0; if( HPMHooks.count.HP_clif_dispchat_pre ) { - void (*preHookFunc) (struct chat_data *cd, int *fd); + void (*preHookFunc) (struct chat_data **cd, int *fd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_dispchat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_dispchat_pre[hIndex].func; - preHookFunc(cd, &fd); + preHookFunc(&cd, &fd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12292,10 +12288,10 @@ void HP_clif_dispchat(struct chat_data *cd, int fd) { HPMHooks.source.clif.dispchat(cd, fd); } if( HPMHooks.count.HP_clif_dispchat_post ) { - void (*postHookFunc) (struct chat_data *cd, int *fd); + void (*postHookFunc) (struct chat_data *cd, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_dispchat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_dispchat_post[hIndex].func; - postHookFunc(cd, &fd); + postHookFunc(cd, fd); } } return; @@ -12303,11 +12299,11 @@ void HP_clif_dispchat(struct chat_data *cd, int fd) { void HP_clif_joinchatfail(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_joinchatfail_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_joinchatfail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_joinchatfail_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12318,10 +12314,10 @@ void HP_clif_joinchatfail(struct map_session_data *sd, int flag) { HPMHooks.source.clif.joinchatfail(sd, flag); } if( HPMHooks.count.HP_clif_joinchatfail_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_joinchatfail_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_joinchatfail_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -12329,11 +12325,11 @@ void HP_clif_joinchatfail(struct map_session_data *sd, int flag) { void HP_clif_joinchatok(struct map_session_data *sd, struct chat_data *cd) { int hIndex = 0; if( HPMHooks.count.HP_clif_joinchatok_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct chat_data *cd); + void (*preHookFunc) (struct map_session_data **sd, struct chat_data **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_joinchatok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_joinchatok_pre[hIndex].func; - preHookFunc(sd, cd); + preHookFunc(&sd, &cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12355,11 +12351,11 @@ void HP_clif_joinchatok(struct map_session_data *sd, struct chat_data *cd) { void HP_clif_addchat(struct chat_data *cd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_addchat_pre ) { - void (*preHookFunc) (struct chat_data *cd, struct map_session_data *sd); + void (*preHookFunc) (struct chat_data **cd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_addchat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_addchat_pre[hIndex].func; - preHookFunc(cd, sd); + preHookFunc(&cd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12381,11 +12377,11 @@ void HP_clif_addchat(struct chat_data *cd, struct map_session_data *sd) { void HP_clif_changechatowner(struct chat_data *cd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_changechatowner_pre ) { - void (*preHookFunc) (struct chat_data *cd, struct map_session_data *sd); + void (*preHookFunc) (struct chat_data **cd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changechatowner_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changechatowner_pre[hIndex].func; - preHookFunc(cd, sd); + preHookFunc(&cd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12407,11 +12403,11 @@ void HP_clif_changechatowner(struct chat_data *cd, struct map_session_data *sd) void HP_clif_clearchat(struct chat_data *cd, int fd) { int hIndex = 0; if( HPMHooks.count.HP_clif_clearchat_pre ) { - void (*preHookFunc) (struct chat_data *cd, int *fd); + void (*preHookFunc) (struct chat_data **cd, int *fd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearchat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_clearchat_pre[hIndex].func; - preHookFunc(cd, &fd); + preHookFunc(&cd, &fd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12422,10 +12418,10 @@ void HP_clif_clearchat(struct chat_data *cd, int fd) { HPMHooks.source.clif.clearchat(cd, fd); } if( HPMHooks.count.HP_clif_clearchat_post ) { - void (*postHookFunc) (struct chat_data *cd, int *fd); + void (*postHookFunc) (struct chat_data *cd, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearchat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_clearchat_post[hIndex].func; - postHookFunc(cd, &fd); + postHookFunc(cd, fd); } } return; @@ -12433,11 +12429,11 @@ void HP_clif_clearchat(struct chat_data *cd, int fd) { void HP_clif_leavechat(struct chat_data *cd, struct map_session_data *sd, bool flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_leavechat_pre ) { - void (*preHookFunc) (struct chat_data *cd, struct map_session_data *sd, bool *flag); + void (*preHookFunc) (struct chat_data **cd, struct map_session_data **sd, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_leavechat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_leavechat_pre[hIndex].func; - preHookFunc(cd, sd, &flag); + preHookFunc(&cd, &sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12448,10 +12444,10 @@ void HP_clif_leavechat(struct chat_data *cd, struct map_session_data *sd, bool f HPMHooks.source.clif.leavechat(cd, sd, flag); } if( HPMHooks.count.HP_clif_leavechat_post ) { - void (*postHookFunc) (struct chat_data *cd, struct map_session_data *sd, bool *flag); + void (*postHookFunc) (struct chat_data *cd, struct map_session_data *sd, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_leavechat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_leavechat_post[hIndex].func; - postHookFunc(cd, sd, &flag); + postHookFunc(cd, sd, flag); } } return; @@ -12459,11 +12455,11 @@ void HP_clif_leavechat(struct chat_data *cd, struct map_session_data *sd, bool f void HP_clif_changechatstatus(struct chat_data *cd) { int hIndex = 0; if( HPMHooks.count.HP_clif_changechatstatus_pre ) { - void (*preHookFunc) (struct chat_data *cd); + void (*preHookFunc) (struct chat_data **cd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_changechatstatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_changechatstatus_pre[hIndex].func; - preHookFunc(cd); + preHookFunc(&cd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12482,14 +12478,14 @@ void HP_clif_changechatstatus(struct chat_data *cd) { } return; } -void HP_clif_wis_message(int fd, const char *nick, const char *mes, size_t mes_len) { +void HP_clif_wis_message(int fd, const char *nick, const char *mes, int mes_len) { int hIndex = 0; if( HPMHooks.count.HP_clif_wis_message_pre ) { - void (*preHookFunc) (int *fd, const char *nick, const char *mes, size_t *mes_len); + void (*preHookFunc) (int *fd, const char **nick, const char **mes, int *mes_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wis_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_wis_message_pre[hIndex].func; - preHookFunc(&fd, nick, mes, &mes_len); + preHookFunc(&fd, &nick, &mes, &mes_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12500,10 +12496,10 @@ void HP_clif_wis_message(int fd, const char *nick, const char *mes, size_t mes_l HPMHooks.source.clif.wis_message(fd, nick, mes, mes_len); } if( HPMHooks.count.HP_clif_wis_message_post ) { - void (*postHookFunc) (int *fd, const char *nick, const char *mes, size_t *mes_len); + void (*postHookFunc) (int fd, const char *nick, const char *mes, int mes_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wis_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_wis_message_post[hIndex].func; - postHookFunc(&fd, nick, mes, &mes_len); + postHookFunc(fd, nick, mes, mes_len); } } return; @@ -12526,22 +12522,22 @@ void HP_clif_wis_end(int fd, int flag) { HPMHooks.source.clif.wis_end(fd, flag); } if( HPMHooks.count.HP_clif_wis_end_post ) { - void (*postHookFunc) (int *fd, int *flag); + void (*postHookFunc) (int fd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wis_end_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_wis_end_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; } -void HP_clif_disp_message(struct block_list *src, const char *mes, size_t len, enum send_target target) { +void HP_clif_disp_message(struct block_list *src, const char *mes, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_disp_message_pre ) { - void (*preHookFunc) (struct block_list *src, const char *mes, size_t *len, enum send_target *target); + void (*preHookFunc) (struct block_list **src, const char **mes, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_disp_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_disp_message_pre[hIndex].func; - preHookFunc(src, mes, &len, &target); + preHookFunc(&src, &mes, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12549,25 +12545,25 @@ void HP_clif_disp_message(struct block_list *src, const char *mes, size_t len, e } } { - HPMHooks.source.clif.disp_message(src, mes, len, target); + HPMHooks.source.clif.disp_message(src, mes, target); } if( HPMHooks.count.HP_clif_disp_message_post ) { - void (*postHookFunc) (struct block_list *src, const char *mes, size_t *len, enum send_target *target); + void (*postHookFunc) (struct block_list *src, const char *mes, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_disp_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_disp_message_post[hIndex].func; - postHookFunc(src, mes, &len, &target); + postHookFunc(src, mes, target); } } return; } -void HP_clif_broadcast(struct block_list *bl, const char *mes, size_t len, int type, enum send_target target) { +void HP_clif_broadcast(struct block_list *bl, const char *mes, int len, int type, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_broadcast_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *mes, size_t *len, int *type, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, const char **mes, int *len, int *type, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_broadcast_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_broadcast_pre[hIndex].func; - preHookFunc(bl, mes, &len, &type, &target); + preHookFunc(&bl, &mes, &len, &type, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12578,22 +12574,22 @@ void HP_clif_broadcast(struct block_list *bl, const char *mes, size_t len, int t HPMHooks.source.clif.broadcast(bl, mes, len, type, target); } if( HPMHooks.count.HP_clif_broadcast_post ) { - void (*postHookFunc) (struct block_list *bl, const char *mes, size_t *len, int *type, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, const char *mes, int len, int type, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_broadcast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_broadcast_post[hIndex].func; - postHookFunc(bl, mes, &len, &type, &target); + postHookFunc(bl, mes, len, type, target); } } return; } -void HP_clif_broadcast2(struct block_list *bl, const char *mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target) { +void HP_clif_broadcast2(struct block_list *bl, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_broadcast2_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *mes, size_t *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, enum send_target *target); + void (*preHookFunc) (struct block_list **bl, const char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_broadcast2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_broadcast2_pre[hIndex].func; - preHookFunc(bl, mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &target); + preHookFunc(&bl, &mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12604,10 +12600,10 @@ void HP_clif_broadcast2(struct block_list *bl, const char *mes, size_t len, unsi HPMHooks.source.clif.broadcast2(bl, mes, len, fontColor, fontType, fontSize, fontAlign, fontY, target); } if( HPMHooks.count.HP_clif_broadcast2_post ) { - void (*postHookFunc) (struct block_list *bl, const char *mes, size_t *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_broadcast2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_broadcast2_post[hIndex].func; - postHookFunc(bl, mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &target); + postHookFunc(bl, mes, len, fontColor, fontType, fontSize, fontAlign, fontY, target); } } return; @@ -12615,11 +12611,11 @@ void HP_clif_broadcast2(struct block_list *bl, const char *mes, size_t len, unsi void HP_clif_messagecolor_self(int fd, uint32 color, const char *msg) { int hIndex = 0; if( HPMHooks.count.HP_clif_messagecolor_self_pre ) { - void (*preHookFunc) (int *fd, uint32 *color, const char *msg); + void (*preHookFunc) (int *fd, uint32 *color, const char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_messagecolor_self_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_messagecolor_self_pre[hIndex].func; - preHookFunc(&fd, &color, msg); + preHookFunc(&fd, &color, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12630,10 +12626,10 @@ void HP_clif_messagecolor_self(int fd, uint32 color, const char *msg) { HPMHooks.source.clif.messagecolor_self(fd, color, msg); } if( HPMHooks.count.HP_clif_messagecolor_self_post ) { - void (*postHookFunc) (int *fd, uint32 *color, const char *msg); + void (*postHookFunc) (int fd, uint32 color, const char *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_messagecolor_self_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_messagecolor_self_post[hIndex].func; - postHookFunc(&fd, &color, msg); + postHookFunc(fd, color, msg); } } return; @@ -12641,11 +12637,11 @@ void HP_clif_messagecolor_self(int fd, uint32 color, const char *msg) { void HP_clif_messagecolor(struct block_list *bl, uint32 color, const char *msg) { int hIndex = 0; if( HPMHooks.count.HP_clif_messagecolor_pre ) { - void (*preHookFunc) (struct block_list *bl, uint32 *color, const char *msg); + void (*preHookFunc) (struct block_list **bl, uint32 *color, const char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_messagecolor_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_messagecolor_pre[hIndex].func; - preHookFunc(bl, &color, msg); + preHookFunc(&bl, &color, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12656,10 +12652,10 @@ void HP_clif_messagecolor(struct block_list *bl, uint32 color, const char *msg) HPMHooks.source.clif.messagecolor(bl, color, msg); } if( HPMHooks.count.HP_clif_messagecolor_post ) { - void (*postHookFunc) (struct block_list *bl, uint32 *color, const char *msg); + void (*postHookFunc) (struct block_list *bl, uint32 color, const char *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_messagecolor_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_messagecolor_post[hIndex].func; - postHookFunc(bl, &color, msg); + postHookFunc(bl, color, msg); } } return; @@ -12667,11 +12663,11 @@ void HP_clif_messagecolor(struct block_list *bl, uint32 color, const char *msg) void HP_clif_disp_overhead(struct block_list *bl, const char *mes) { int hIndex = 0; if( HPMHooks.count.HP_clif_disp_overhead_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *mes); + void (*preHookFunc) (struct block_list **bl, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_disp_overhead_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_disp_overhead_pre[hIndex].func; - preHookFunc(bl, mes); + preHookFunc(&bl, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12693,11 +12689,11 @@ void HP_clif_disp_overhead(struct block_list *bl, const char *mes) { void HP_clif_msgtable(struct map_session_data *sd, unsigned short msg_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_msgtable_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *msg_id); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *msg_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_msgtable_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_msgtable_pre[hIndex].func; - preHookFunc(sd, &msg_id); + preHookFunc(&sd, &msg_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12708,10 +12704,10 @@ void HP_clif_msgtable(struct map_session_data *sd, unsigned short msg_id) { HPMHooks.source.clif.msgtable(sd, msg_id); } if( HPMHooks.count.HP_clif_msgtable_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *msg_id); + void (*postHookFunc) (struct map_session_data *sd, unsigned short msg_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_msgtable_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_msgtable_post[hIndex].func; - postHookFunc(sd, &msg_id); + postHookFunc(sd, msg_id); } } return; @@ -12719,11 +12715,11 @@ void HP_clif_msgtable(struct map_session_data *sd, unsigned short msg_id) { void HP_clif_msgtable_num(struct map_session_data *sd, unsigned short msg_id, int value) { int hIndex = 0; if( HPMHooks.count.HP_clif_msgtable_num_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *msg_id, int *value); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *msg_id, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_msgtable_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_msgtable_num_pre[hIndex].func; - preHookFunc(sd, &msg_id, &value); + preHookFunc(&sd, &msg_id, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12734,10 +12730,10 @@ void HP_clif_msgtable_num(struct map_session_data *sd, unsigned short msg_id, in HPMHooks.source.clif.msgtable_num(sd, msg_id, value); } if( HPMHooks.count.HP_clif_msgtable_num_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *msg_id, int *value); + void (*postHookFunc) (struct map_session_data *sd, unsigned short msg_id, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_msgtable_num_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_msgtable_num_post[hIndex].func; - postHookFunc(sd, &msg_id, &value); + postHookFunc(sd, msg_id, value); } } return; @@ -12745,11 +12741,11 @@ void HP_clif_msgtable_num(struct map_session_data *sd, unsigned short msg_id, in void HP_clif_msgtable_skill(struct map_session_data *sd, uint16 skill_id, int msg_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_msgtable_skill_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *msg_id); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, int *msg_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_msgtable_skill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_msgtable_skill_pre[hIndex].func; - preHookFunc(sd, &skill_id, &msg_id); + preHookFunc(&sd, &skill_id, &msg_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12760,10 +12756,10 @@ void HP_clif_msgtable_skill(struct map_session_data *sd, uint16 skill_id, int ms HPMHooks.source.clif.msgtable_skill(sd, skill_id, msg_id); } if( HPMHooks.count.HP_clif_msgtable_skill_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *msg_id); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_id, int msg_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_msgtable_skill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_msgtable_skill_post[hIndex].func; - postHookFunc(sd, &skill_id, &msg_id); + postHookFunc(sd, skill_id, msg_id); } } return; @@ -12771,11 +12767,11 @@ void HP_clif_msgtable_skill(struct map_session_data *sd, uint16 skill_id, int ms void HP_clif_message(const int fd, const char *mes) { int hIndex = 0; if( HPMHooks.count.HP_clif_message_pre ) { - void (*preHookFunc) (const int *fd, const char *mes); + void (*preHookFunc) (const int *fd, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_message_pre[hIndex].func; - preHookFunc(&fd, mes); + preHookFunc(&fd, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12786,10 +12782,10 @@ void HP_clif_message(const int fd, const char *mes) { HPMHooks.source.clif.message(fd, mes); } if( HPMHooks.count.HP_clif_message_post ) { - void (*postHookFunc) (const int *fd, const char *mes); + void (*postHookFunc) (const int fd, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_message_post[hIndex].func; - postHookFunc(&fd, mes); + postHookFunc(fd, mes); } } return; @@ -12797,11 +12793,11 @@ void HP_clif_message(const int fd, const char *mes) { void HP_clif_messageln(const int fd, const char *mes) { int hIndex = 0; if( HPMHooks.count.HP_clif_messageln_pre ) { - void (*preHookFunc) (const int *fd, const char *mes); + void (*preHookFunc) (const int *fd, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_messageln_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_messageln_pre[hIndex].func; - preHookFunc(&fd, mes); + preHookFunc(&fd, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12812,23 +12808,50 @@ void HP_clif_messageln(const int fd, const char *mes) { HPMHooks.source.clif.messageln(fd, mes); } if( HPMHooks.count.HP_clif_messageln_post ) { - void (*postHookFunc) (const int *fd, const char *mes); + void (*postHookFunc) (const int fd, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_messageln_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_messageln_post[hIndex].func; - postHookFunc(&fd, mes); + postHookFunc(fd, mes); } } return; } -bool HP_clif_process_message(struct map_session_data *sd, int format, const char **name_, size_t *namelen_, const char **message_, size_t *messagelen_) { +const char* HP_clif_process_chat_message(struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen) { + int hIndex = 0; + const char* retVal___ = NULL; + if( HPMHooks.count.HP_clif_process_chat_message_pre ) { + const char* (*preHookFunc) (struct map_session_data **sd, const struct packet_chat_message **packet, char **out_buf, int *out_buflen); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_chat_message_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_process_chat_message_pre[hIndex].func; + retVal___ = preHookFunc(&sd, &packet, &out_buf, &out_buflen); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.clif.process_chat_message(sd, packet, out_buf, out_buflen); + } + if( HPMHooks.count.HP_clif_process_chat_message_post ) { + const char* (*postHookFunc) (const char* retVal___, struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_chat_message_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_process_chat_message_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sd, packet, out_buf, out_buflen); + } + } + return retVal___; +} +bool HP_clif_process_whisper_message(struct map_session_data *sd, const struct packet_whisper_message *packet, char *out_name, char *out_message, int out_messagelen) { int hIndex = 0; bool retVal___ = false; - if( HPMHooks.count.HP_clif_process_message_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *format, const char **name_, size_t *namelen_, const char **message_, size_t *messagelen_); + if( HPMHooks.count.HP_clif_process_whisper_message_pre ) { + bool (*preHookFunc) (struct map_session_data **sd, const struct packet_whisper_message **packet, char **out_name, char **out_message, int *out_messagelen); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_message_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_clif_process_message_pre[hIndex].func; - retVal___ = preHookFunc(sd, &format, name_, namelen_, message_, messagelen_); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_whisper_message_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_process_whisper_message_pre[hIndex].func; + retVal___ = preHookFunc(&sd, &packet, &out_name, &out_message, &out_messagelen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12836,13 +12859,13 @@ bool HP_clif_process_message(struct map_session_data *sd, int format, const char } } { - retVal___ = HPMHooks.source.clif.process_message(sd, format, name_, namelen_, message_, messagelen_); + retVal___ = HPMHooks.source.clif.process_whisper_message(sd, packet, out_name, out_message, out_messagelen); } - if( HPMHooks.count.HP_clif_process_message_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *format, const char **name_, size_t *namelen_, const char **message_, size_t *messagelen_); - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_message_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_clif_process_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &format, name_, namelen_, message_, messagelen_); + if( HPMHooks.count.HP_clif_process_whisper_message_post ) { + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const struct packet_whisper_message *packet, char *out_name, char *out_message, int out_messagelen); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_whisper_message_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_process_whisper_message_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sd, packet, out_name, out_message, out_messagelen); } } return retVal___; @@ -12850,11 +12873,11 @@ bool HP_clif_process_message(struct map_session_data *sd, int format, const char void HP_clif_wisexin(struct map_session_data *sd, int type, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_wisexin_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *type, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wisexin_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_wisexin_pre[hIndex].func; - preHookFunc(sd, &type, &flag); + preHookFunc(&sd, &type, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12865,10 +12888,10 @@ void HP_clif_wisexin(struct map_session_data *sd, int type, int flag) { HPMHooks.source.clif.wisexin(sd, type, flag); } if( HPMHooks.count.HP_clif_wisexin_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int type, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wisexin_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_wisexin_post[hIndex].func; - postHookFunc(sd, &type, &flag); + postHookFunc(sd, type, flag); } } return; @@ -12876,11 +12899,11 @@ void HP_clif_wisexin(struct map_session_data *sd, int type, int flag) { void HP_clif_wisall(struct map_session_data *sd, int type, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_wisall_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *type, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wisall_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_wisall_pre[hIndex].func; - preHookFunc(sd, &type, &flag); + preHookFunc(&sd, &type, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12891,10 +12914,10 @@ void HP_clif_wisall(struct map_session_data *sd, int type, int flag) { HPMHooks.source.clif.wisall(sd, type, flag); } if( HPMHooks.count.HP_clif_wisall_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int type, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wisall_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_wisall_post[hIndex].func; - postHookFunc(sd, &type, &flag); + postHookFunc(sd, type, flag); } } return; @@ -12902,11 +12925,11 @@ void HP_clif_wisall(struct map_session_data *sd, int type, int flag) { void HP_clif_PMIgnoreList(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_PMIgnoreList_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PMIgnoreList_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PMIgnoreList_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12928,11 +12951,11 @@ void HP_clif_PMIgnoreList(struct map_session_data *sd) { void HP_clif_ShowScript(struct block_list *bl, const char *message) { int hIndex = 0; if( HPMHooks.count.HP_clif_ShowScript_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *message); + void (*preHookFunc) (struct block_list **bl, const char **message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_ShowScript_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_ShowScript_pre[hIndex].func; - preHookFunc(bl, message); + preHookFunc(&bl, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12954,11 +12977,11 @@ void HP_clif_ShowScript(struct block_list *bl, const char *message) { void HP_clif_traderequest(struct map_session_data *sd, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_traderequest_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *name); + void (*preHookFunc) (struct map_session_data **sd, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_traderequest_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_traderequest_pre[hIndex].func; - preHookFunc(sd, name); + preHookFunc(&sd, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12980,11 +13003,11 @@ void HP_clif_traderequest(struct map_session_data *sd, const char *name) { void HP_clif_tradestart(struct map_session_data *sd, uint8 type) { int hIndex = 0; if( HPMHooks.count.HP_clif_tradestart_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint8 *type); + void (*preHookFunc) (struct map_session_data **sd, uint8 *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradestart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_tradestart_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -12995,10 +13018,10 @@ void HP_clif_tradestart(struct map_session_data *sd, uint8 type) { HPMHooks.source.clif.tradestart(sd, type); } if( HPMHooks.count.HP_clif_tradestart_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint8 *type); + void (*postHookFunc) (struct map_session_data *sd, uint8 type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradestart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_tradestart_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -13006,11 +13029,11 @@ void HP_clif_tradestart(struct map_session_data *sd, uint8 type) { void HP_clif_tradeadditem(struct map_session_data *sd, struct map_session_data *tsd, int index, int amount) { int hIndex = 0; if( HPMHooks.count.HP_clif_tradeadditem_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd, int *index, int *amount); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradeadditem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_tradeadditem_pre[hIndex].func; - preHookFunc(sd, tsd, &index, &amount); + preHookFunc(&sd, &tsd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13021,10 +13044,10 @@ void HP_clif_tradeadditem(struct map_session_data *sd, struct map_session_data * HPMHooks.source.clif.tradeadditem(sd, tsd, index, amount); } if( HPMHooks.count.HP_clif_tradeadditem_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *tsd, int *index, int *amount); + void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *tsd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradeadditem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_tradeadditem_post[hIndex].func; - postHookFunc(sd, tsd, &index, &amount); + postHookFunc(sd, tsd, index, amount); } } return; @@ -13032,11 +13055,11 @@ void HP_clif_tradeadditem(struct map_session_data *sd, struct map_session_data * void HP_clif_tradeitemok(struct map_session_data *sd, int index, int fail) { int hIndex = 0; if( HPMHooks.count.HP_clif_tradeitemok_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *index, int *fail); + void (*preHookFunc) (struct map_session_data **sd, int *index, int *fail); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradeitemok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_tradeitemok_pre[hIndex].func; - preHookFunc(sd, &index, &fail); + preHookFunc(&sd, &index, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13047,10 +13070,10 @@ void HP_clif_tradeitemok(struct map_session_data *sd, int index, int fail) { HPMHooks.source.clif.tradeitemok(sd, index, fail); } if( HPMHooks.count.HP_clif_tradeitemok_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *index, int *fail); + void (*postHookFunc) (struct map_session_data *sd, int index, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradeitemok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_tradeitemok_post[hIndex].func; - postHookFunc(sd, &index, &fail); + postHookFunc(sd, index, fail); } } return; @@ -13058,11 +13081,11 @@ void HP_clif_tradeitemok(struct map_session_data *sd, int index, int fail) { void HP_clif_tradedeal_lock(struct map_session_data *sd, int fail) { int hIndex = 0; if( HPMHooks.count.HP_clif_tradedeal_lock_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *fail); + void (*preHookFunc) (struct map_session_data **sd, int *fail); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradedeal_lock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_tradedeal_lock_pre[hIndex].func; - preHookFunc(sd, &fail); + preHookFunc(&sd, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13073,10 +13096,10 @@ void HP_clif_tradedeal_lock(struct map_session_data *sd, int fail) { HPMHooks.source.clif.tradedeal_lock(sd, fail); } if( HPMHooks.count.HP_clif_tradedeal_lock_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *fail); + void (*postHookFunc) (struct map_session_data *sd, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradedeal_lock_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_tradedeal_lock_post[hIndex].func; - postHookFunc(sd, &fail); + postHookFunc(sd, fail); } } return; @@ -13084,11 +13107,11 @@ void HP_clif_tradedeal_lock(struct map_session_data *sd, int fail) { void HP_clif_tradecancelled(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_tradecancelled_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradecancelled_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_tradecancelled_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13110,11 +13133,11 @@ void HP_clif_tradecancelled(struct map_session_data *sd) { void HP_clif_tradecompleted(struct map_session_data *sd, int fail) { int hIndex = 0; if( HPMHooks.count.HP_clif_tradecompleted_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *fail); + void (*preHookFunc) (struct map_session_data **sd, int *fail); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradecompleted_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_tradecompleted_pre[hIndex].func; - preHookFunc(sd, &fail); + preHookFunc(&sd, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13125,10 +13148,10 @@ void HP_clif_tradecompleted(struct map_session_data *sd, int fail) { HPMHooks.source.clif.tradecompleted(sd, fail); } if( HPMHooks.count.HP_clif_tradecompleted_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *fail); + void (*postHookFunc) (struct map_session_data *sd, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradecompleted_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_tradecompleted_post[hIndex].func; - postHookFunc(sd, &fail); + postHookFunc(sd, fail); } } return; @@ -13136,11 +13159,11 @@ void HP_clif_tradecompleted(struct map_session_data *sd, int fail) { void HP_clif_tradeundo(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_tradeundo_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_tradeundo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_tradeundo_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13162,11 +13185,11 @@ void HP_clif_tradeundo(struct map_session_data *sd) { void HP_clif_openvendingreq(struct map_session_data *sd, int num) { int hIndex = 0; if( HPMHooks.count.HP_clif_openvendingreq_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *num); + void (*preHookFunc) (struct map_session_data **sd, int *num); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_openvendingreq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_openvendingreq_pre[hIndex].func; - preHookFunc(sd, &num); + preHookFunc(&sd, &num); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13177,10 +13200,10 @@ void HP_clif_openvendingreq(struct map_session_data *sd, int num) { HPMHooks.source.clif.openvendingreq(sd, num); } if( HPMHooks.count.HP_clif_openvendingreq_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *num); + void (*postHookFunc) (struct map_session_data *sd, int num); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_openvendingreq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_openvendingreq_post[hIndex].func; - postHookFunc(sd, &num); + postHookFunc(sd, num); } } return; @@ -13188,11 +13211,11 @@ void HP_clif_openvendingreq(struct map_session_data *sd, int num) { void HP_clif_showvendingboard(struct block_list *bl, const char *message, int fd) { int hIndex = 0; if( HPMHooks.count.HP_clif_showvendingboard_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *message, int *fd); + void (*preHookFunc) (struct block_list **bl, const char **message, int *fd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_showvendingboard_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_showvendingboard_pre[hIndex].func; - preHookFunc(bl, message, &fd); + preHookFunc(&bl, &message, &fd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13203,10 +13226,10 @@ void HP_clif_showvendingboard(struct block_list *bl, const char *message, int fd HPMHooks.source.clif.showvendingboard(bl, message, fd); } if( HPMHooks.count.HP_clif_showvendingboard_post ) { - void (*postHookFunc) (struct block_list *bl, const char *message, int *fd); + void (*postHookFunc) (struct block_list *bl, const char *message, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_showvendingboard_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_showvendingboard_post[hIndex].func; - postHookFunc(bl, message, &fd); + postHookFunc(bl, message, fd); } } return; @@ -13214,11 +13237,11 @@ void HP_clif_showvendingboard(struct block_list *bl, const char *message, int fd void HP_clif_closevendingboard(struct block_list *bl, int fd) { int hIndex = 0; if( HPMHooks.count.HP_clif_closevendingboard_pre ) { - void (*preHookFunc) (struct block_list *bl, int *fd); + void (*preHookFunc) (struct block_list **bl, int *fd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_closevendingboard_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_closevendingboard_pre[hIndex].func; - preHookFunc(bl, &fd); + preHookFunc(&bl, &fd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13229,10 +13252,10 @@ void HP_clif_closevendingboard(struct block_list *bl, int fd) { HPMHooks.source.clif.closevendingboard(bl, fd); } if( HPMHooks.count.HP_clif_closevendingboard_post ) { - void (*postHookFunc) (struct block_list *bl, int *fd); + void (*postHookFunc) (struct block_list *bl, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_closevendingboard_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_closevendingboard_post[hIndex].func; - postHookFunc(bl, &fd); + postHookFunc(bl, fd); } } return; @@ -13240,11 +13263,11 @@ void HP_clif_closevendingboard(struct block_list *bl, int fd) { void HP_clif_vendinglist(struct map_session_data *sd, unsigned int id, struct s_vending *vending_list) { int hIndex = 0; if( HPMHooks.count.HP_clif_vendinglist_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *id, struct s_vending *vending_list); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *id, struct s_vending **vending_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_vendinglist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_vendinglist_pre[hIndex].func; - preHookFunc(sd, &id, vending_list); + preHookFunc(&sd, &id, &vending_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13255,10 +13278,10 @@ void HP_clif_vendinglist(struct map_session_data *sd, unsigned int id, struct s_ HPMHooks.source.clif.vendinglist(sd, id, vending_list); } if( HPMHooks.count.HP_clif_vendinglist_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *id, struct s_vending *vending_list); + void (*postHookFunc) (struct map_session_data *sd, unsigned int id, struct s_vending *vending_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_vendinglist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_vendinglist_post[hIndex].func; - postHookFunc(sd, &id, vending_list); + postHookFunc(sd, id, vending_list); } } return; @@ -13266,11 +13289,11 @@ void HP_clif_vendinglist(struct map_session_data *sd, unsigned int id, struct s_ void HP_clif_buyvending(struct map_session_data *sd, int index, int amount, int fail) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyvending_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *index, int *amount, int *fail); + void (*preHookFunc) (struct map_session_data **sd, int *index, int *amount, int *fail); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyvending_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyvending_pre[hIndex].func; - preHookFunc(sd, &index, &amount, &fail); + preHookFunc(&sd, &index, &amount, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13281,10 +13304,10 @@ void HP_clif_buyvending(struct map_session_data *sd, int index, int amount, int HPMHooks.source.clif.buyvending(sd, index, amount, fail); } if( HPMHooks.count.HP_clif_buyvending_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *index, int *amount, int *fail); + void (*postHookFunc) (struct map_session_data *sd, int index, int amount, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyvending_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_buyvending_post[hIndex].func; - postHookFunc(sd, &index, &amount, &fail); + postHookFunc(sd, index, amount, fail); } } return; @@ -13292,11 +13315,11 @@ void HP_clif_buyvending(struct map_session_data *sd, int index, int amount, int void HP_clif_openvending(struct map_session_data *sd, int id, struct s_vending *vending_list) { int hIndex = 0; if( HPMHooks.count.HP_clif_openvending_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *id, struct s_vending *vending_list); + void (*preHookFunc) (struct map_session_data **sd, int *id, struct s_vending **vending_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_openvending_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_openvending_pre[hIndex].func; - preHookFunc(sd, &id, vending_list); + preHookFunc(&sd, &id, &vending_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13307,10 +13330,10 @@ void HP_clif_openvending(struct map_session_data *sd, int id, struct s_vending * HPMHooks.source.clif.openvending(sd, id, vending_list); } if( HPMHooks.count.HP_clif_openvending_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *id, struct s_vending *vending_list); + void (*postHookFunc) (struct map_session_data *sd, int id, struct s_vending *vending_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_openvending_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_openvending_post[hIndex].func; - postHookFunc(sd, &id, vending_list); + postHookFunc(sd, id, vending_list); } } return; @@ -13318,11 +13341,11 @@ void HP_clif_openvending(struct map_session_data *sd, int id, struct s_vending * void HP_clif_vendingreport(struct map_session_data *sd, int index, int amount) { int hIndex = 0; if( HPMHooks.count.HP_clif_vendingreport_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + void (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_vendingreport_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_vendingreport_pre[hIndex].func; - preHookFunc(sd, &index, &amount); + preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13333,10 +13356,10 @@ void HP_clif_vendingreport(struct map_session_data *sd, int index, int amount) { HPMHooks.source.clif.vendingreport(sd, index, amount); } if( HPMHooks.count.HP_clif_vendingreport_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *index, int *amount); + void (*postHookFunc) (struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_vendingreport_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_vendingreport_post[hIndex].func; - postHookFunc(sd, &index, &amount); + postHookFunc(sd, index, amount); } } return; @@ -13344,11 +13367,11 @@ void HP_clif_vendingreport(struct map_session_data *sd, int index, int amount) { void HP_clif_storagelist(struct map_session_data *sd, struct item *items, int items_length) { int hIndex = 0; if( HPMHooks.count.HP_clif_storagelist_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct item *items, int *items_length); + void (*preHookFunc) (struct map_session_data **sd, struct item **items, int *items_length); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_storagelist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_storagelist_pre[hIndex].func; - preHookFunc(sd, items, &items_length); + preHookFunc(&sd, &items, &items_length); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13359,10 +13382,10 @@ void HP_clif_storagelist(struct map_session_data *sd, struct item *items, int it HPMHooks.source.clif.storagelist(sd, items, items_length); } if( HPMHooks.count.HP_clif_storagelist_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct item *items, int *items_length); + void (*postHookFunc) (struct map_session_data *sd, struct item *items, int items_length); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_storagelist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_storagelist_post[hIndex].func; - postHookFunc(sd, items, &items_length); + postHookFunc(sd, items, items_length); } } return; @@ -13370,11 +13393,11 @@ void HP_clif_storagelist(struct map_session_data *sd, struct item *items, int it void HP_clif_updatestorageamount(struct map_session_data *sd, int amount, int max_amount) { int hIndex = 0; if( HPMHooks.count.HP_clif_updatestorageamount_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *amount, int *max_amount); + void (*preHookFunc) (struct map_session_data **sd, int *amount, int *max_amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_updatestorageamount_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_updatestorageamount_pre[hIndex].func; - preHookFunc(sd, &amount, &max_amount); + preHookFunc(&sd, &amount, &max_amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13385,10 +13408,10 @@ void HP_clif_updatestorageamount(struct map_session_data *sd, int amount, int ma HPMHooks.source.clif.updatestorageamount(sd, amount, max_amount); } if( HPMHooks.count.HP_clif_updatestorageamount_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *amount, int *max_amount); + void (*postHookFunc) (struct map_session_data *sd, int amount, int max_amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_updatestorageamount_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_updatestorageamount_post[hIndex].func; - postHookFunc(sd, &amount, &max_amount); + postHookFunc(sd, amount, max_amount); } } return; @@ -13396,11 +13419,11 @@ void HP_clif_updatestorageamount(struct map_session_data *sd, int amount, int ma void HP_clif_storageitemadded(struct map_session_data *sd, struct item *i, int index, int amount) { int hIndex = 0; if( HPMHooks.count.HP_clif_storageitemadded_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct item *i, int *index, int *amount); + void (*preHookFunc) (struct map_session_data **sd, struct item **i, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageitemadded_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_storageitemadded_pre[hIndex].func; - preHookFunc(sd, i, &index, &amount); + preHookFunc(&sd, &i, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13411,10 +13434,10 @@ void HP_clif_storageitemadded(struct map_session_data *sd, struct item *i, int i HPMHooks.source.clif.storageitemadded(sd, i, index, amount); } if( HPMHooks.count.HP_clif_storageitemadded_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct item *i, int *index, int *amount); + void (*postHookFunc) (struct map_session_data *sd, struct item *i, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageitemadded_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_storageitemadded_post[hIndex].func; - postHookFunc(sd, i, &index, &amount); + postHookFunc(sd, i, index, amount); } } return; @@ -13422,11 +13445,11 @@ void HP_clif_storageitemadded(struct map_session_data *sd, struct item *i, int i void HP_clif_storageitemremoved(struct map_session_data *sd, int index, int amount) { int hIndex = 0; if( HPMHooks.count.HP_clif_storageitemremoved_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + void (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageitemremoved_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_storageitemremoved_pre[hIndex].func; - preHookFunc(sd, &index, &amount); + preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13437,10 +13460,10 @@ void HP_clif_storageitemremoved(struct map_session_data *sd, int index, int amou HPMHooks.source.clif.storageitemremoved(sd, index, amount); } if( HPMHooks.count.HP_clif_storageitemremoved_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *index, int *amount); + void (*postHookFunc) (struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageitemremoved_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_storageitemremoved_post[hIndex].func; - postHookFunc(sd, &index, &amount); + postHookFunc(sd, index, amount); } } return; @@ -13448,11 +13471,11 @@ void HP_clif_storageitemremoved(struct map_session_data *sd, int index, int amou void HP_clif_storageclose(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_storageclose_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageclose_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_storageclose_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13474,11 +13497,11 @@ void HP_clif_storageclose(struct map_session_data *sd) { void HP_clif_skillinfoblock(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_skillinfoblock_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillinfoblock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skillinfoblock_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13500,11 +13523,11 @@ void HP_clif_skillinfoblock(struct map_session_data *sd) { void HP_clif_skillup(struct map_session_data *sd, uint16 skill_id, int skill_lv, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_skillup_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *skill_lv, int *flag); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, int *skill_lv, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skillup_pre[hIndex].func; - preHookFunc(sd, &skill_id, &skill_lv, &flag); + preHookFunc(&sd, &skill_id, &skill_lv, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13515,10 +13538,10 @@ void HP_clif_skillup(struct map_session_data *sd, uint16 skill_id, int skill_lv, HPMHooks.source.clif.skillup(sd, skill_id, skill_lv, flag); } if( HPMHooks.count.HP_clif_skillup_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *skill_lv, int *flag); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_id, int skill_lv, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skillup_post[hIndex].func; - postHookFunc(sd, &skill_id, &skill_lv, &flag); + postHookFunc(sd, skill_id, skill_lv, flag); } } return; @@ -13526,11 +13549,11 @@ void HP_clif_skillup(struct map_session_data *sd, uint16 skill_id, int skill_lv, void HP_clif_skillinfo(struct map_session_data *sd, int skill_id, int inf) { int hIndex = 0; if( HPMHooks.count.HP_clif_skillinfo_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *skill_id, int *inf); + void (*preHookFunc) (struct map_session_data **sd, int *skill_id, int *inf); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skillinfo_pre[hIndex].func; - preHookFunc(sd, &skill_id, &inf); + preHookFunc(&sd, &skill_id, &inf); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13541,10 +13564,10 @@ void HP_clif_skillinfo(struct map_session_data *sd, int skill_id, int inf) { HPMHooks.source.clif.skillinfo(sd, skill_id, inf); } if( HPMHooks.count.HP_clif_skillinfo_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *skill_id, int *inf); + void (*postHookFunc) (struct map_session_data *sd, int skill_id, int inf); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skillinfo_post[hIndex].func; - postHookFunc(sd, &skill_id, &inf); + postHookFunc(sd, skill_id, inf); } } return; @@ -13552,11 +13575,11 @@ void HP_clif_skillinfo(struct map_session_data *sd, int skill_id, int inf) { void HP_clif_addskill(struct map_session_data *sd, int id) { int hIndex = 0; if( HPMHooks.count.HP_clif_addskill_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *id); + void (*preHookFunc) (struct map_session_data **sd, int *id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_addskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_addskill_pre[hIndex].func; - preHookFunc(sd, &id); + preHookFunc(&sd, &id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13567,10 +13590,10 @@ void HP_clif_addskill(struct map_session_data *sd, int id) { HPMHooks.source.clif.addskill(sd, id); } if( HPMHooks.count.HP_clif_addskill_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *id); + void (*postHookFunc) (struct map_session_data *sd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_addskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_addskill_post[hIndex].func; - postHookFunc(sd, &id); + postHookFunc(sd, id); } } return; @@ -13578,11 +13601,11 @@ void HP_clif_addskill(struct map_session_data *sd, int id) { void HP_clif_deleteskill(struct map_session_data *sd, int id) { int hIndex = 0; if( HPMHooks.count.HP_clif_deleteskill_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *id); + void (*preHookFunc) (struct map_session_data **sd, int *id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_deleteskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_deleteskill_pre[hIndex].func; - preHookFunc(sd, &id); + preHookFunc(&sd, &id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13593,10 +13616,10 @@ void HP_clif_deleteskill(struct map_session_data *sd, int id) { HPMHooks.source.clif.deleteskill(sd, id); } if( HPMHooks.count.HP_clif_deleteskill_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *id); + void (*postHookFunc) (struct map_session_data *sd, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_deleteskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_deleteskill_post[hIndex].func; - postHookFunc(sd, &id); + postHookFunc(sd, id); } } return; @@ -13604,11 +13627,11 @@ void HP_clif_deleteskill(struct map_session_data *sd, int id) { void HP_clif_party_created(struct map_session_data *sd, int result) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_created_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *result); + void (*preHookFunc) (struct map_session_data **sd, int *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_created_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_created_pre[hIndex].func; - preHookFunc(sd, &result); + preHookFunc(&sd, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13619,10 +13642,10 @@ void HP_clif_party_created(struct map_session_data *sd, int result) { HPMHooks.source.clif.party_created(sd, result); } if( HPMHooks.count.HP_clif_party_created_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *result); + void (*postHookFunc) (struct map_session_data *sd, int result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_party_created_post[hIndex].func; - postHookFunc(sd, &result); + postHookFunc(sd, result); } } return; @@ -13630,11 +13653,11 @@ void HP_clif_party_created(struct map_session_data *sd, int result) { void HP_clif_party_member_info(struct party_data *p, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_member_info_pre ) { - void (*preHookFunc) (struct party_data *p, struct map_session_data *sd); + void (*preHookFunc) (struct party_data **p, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_member_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_member_info_pre[hIndex].func; - preHookFunc(p, sd); + preHookFunc(&p, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13656,11 +13679,11 @@ void HP_clif_party_member_info(struct party_data *p, struct map_session_data *sd void HP_clif_party_info(struct party_data *p, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_info_pre ) { - void (*preHookFunc) (struct party_data *p, struct map_session_data *sd); + void (*preHookFunc) (struct party_data **p, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_info_pre[hIndex].func; - preHookFunc(p, sd); + preHookFunc(&p, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13682,11 +13705,11 @@ void HP_clif_party_info(struct party_data *p, struct map_session_data *sd) { void HP_clif_party_invite(struct map_session_data *sd, struct map_session_data *tsd) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_invite_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_invite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_invite_pre[hIndex].func; - preHookFunc(sd, tsd); + preHookFunc(&sd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13708,11 +13731,11 @@ void HP_clif_party_invite(struct map_session_data *sd, struct map_session_data * void HP_clif_party_inviteack(struct map_session_data *sd, const char *nick, int result) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_inviteack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *nick, int *result); + void (*preHookFunc) (struct map_session_data **sd, const char **nick, int *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_inviteack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_inviteack_pre[hIndex].func; - preHookFunc(sd, nick, &result); + preHookFunc(&sd, &nick, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13723,10 +13746,10 @@ void HP_clif_party_inviteack(struct map_session_data *sd, const char *nick, int HPMHooks.source.clif.party_inviteack(sd, nick, result); } if( HPMHooks.count.HP_clif_party_inviteack_post ) { - void (*postHookFunc) (struct map_session_data *sd, const char *nick, int *result); + void (*postHookFunc) (struct map_session_data *sd, const char *nick, int result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_inviteack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_party_inviteack_post[hIndex].func; - postHookFunc(sd, nick, &result); + postHookFunc(sd, nick, result); } } return; @@ -13734,11 +13757,11 @@ void HP_clif_party_inviteack(struct map_session_data *sd, const char *nick, int void HP_clif_party_option(struct party_data *p, struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_option_pre ) { - void (*preHookFunc) (struct party_data *p, struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct party_data **p, struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_option_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_option_pre[hIndex].func; - preHookFunc(p, sd, &flag); + preHookFunc(&p, &sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13749,10 +13772,10 @@ void HP_clif_party_option(struct party_data *p, struct map_session_data *sd, int HPMHooks.source.clif.party_option(p, sd, flag); } if( HPMHooks.count.HP_clif_party_option_post ) { - void (*postHookFunc) (struct party_data *p, struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct party_data *p, struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_option_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_party_option_post[hIndex].func; - postHookFunc(p, sd, &flag); + postHookFunc(p, sd, flag); } } return; @@ -13760,11 +13783,11 @@ void HP_clif_party_option(struct party_data *p, struct map_session_data *sd, int void HP_clif_party_withdraw(struct party_data *p, struct map_session_data *sd, int account_id, const char *name, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_withdraw_pre ) { - void (*preHookFunc) (struct party_data *p, struct map_session_data *sd, int *account_id, const char *name, int *flag); + void (*preHookFunc) (struct party_data **p, struct map_session_data **sd, int *account_id, const char **name, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_withdraw_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_withdraw_pre[hIndex].func; - preHookFunc(p, sd, &account_id, name, &flag); + preHookFunc(&p, &sd, &account_id, &name, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13775,10 +13798,10 @@ void HP_clif_party_withdraw(struct party_data *p, struct map_session_data *sd, i HPMHooks.source.clif.party_withdraw(p, sd, account_id, name, flag); } if( HPMHooks.count.HP_clif_party_withdraw_post ) { - void (*postHookFunc) (struct party_data *p, struct map_session_data *sd, int *account_id, const char *name, int *flag); + void (*postHookFunc) (struct party_data *p, struct map_session_data *sd, int account_id, const char *name, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_withdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_party_withdraw_post[hIndex].func; - postHookFunc(p, sd, &account_id, name, &flag); + postHookFunc(p, sd, account_id, name, flag); } } return; @@ -13786,11 +13809,11 @@ void HP_clif_party_withdraw(struct party_data *p, struct map_session_data *sd, i void HP_clif_party_message(struct party_data *p, int account_id, const char *mes, int len) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_message_pre ) { - void (*preHookFunc) (struct party_data *p, int *account_id, const char *mes, int *len); + void (*preHookFunc) (struct party_data **p, int *account_id, const char **mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_message_pre[hIndex].func; - preHookFunc(p, &account_id, mes, &len); + preHookFunc(&p, &account_id, &mes, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13801,10 +13824,10 @@ void HP_clif_party_message(struct party_data *p, int account_id, const char *mes HPMHooks.source.clif.party_message(p, account_id, mes, len); } if( HPMHooks.count.HP_clif_party_message_post ) { - void (*postHookFunc) (struct party_data *p, int *account_id, const char *mes, int *len); + void (*postHookFunc) (struct party_data *p, int account_id, const char *mes, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_party_message_post[hIndex].func; - postHookFunc(p, &account_id, mes, &len); + postHookFunc(p, account_id, mes, len); } } return; @@ -13812,11 +13835,11 @@ void HP_clif_party_message(struct party_data *p, int account_id, const char *mes void HP_clif_party_xy(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_xy_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_xy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_xy_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13838,11 +13861,11 @@ void HP_clif_party_xy(struct map_session_data *sd) { void HP_clif_party_xy_single(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_xy_single_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_xy_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_xy_single_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13853,10 +13876,10 @@ void HP_clif_party_xy_single(int fd, struct map_session_data *sd) { HPMHooks.source.clif.party_xy_single(fd, sd); } if( HPMHooks.count.HP_clif_party_xy_single_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_xy_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_party_xy_single_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -13864,11 +13887,11 @@ void HP_clif_party_xy_single(int fd, struct map_session_data *sd) { void HP_clif_party_hp(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_hp_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_hp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_hp_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13890,11 +13913,11 @@ void HP_clif_party_hp(struct map_session_data *sd) { void HP_clif_party_xy_remove(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_xy_remove_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_xy_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_xy_remove_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13916,11 +13939,11 @@ void HP_clif_party_xy_remove(struct map_session_data *sd) { void HP_clif_party_show_picker(struct map_session_data *sd, struct item *item_data) { int hIndex = 0; if( HPMHooks.count.HP_clif_party_show_picker_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct item *item_data); + void (*preHookFunc) (struct map_session_data **sd, struct item **item_data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_party_show_picker_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_party_show_picker_pre[hIndex].func; - preHookFunc(sd, item_data); + preHookFunc(&sd, &item_data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13942,11 +13965,11 @@ void HP_clif_party_show_picker(struct map_session_data *sd, struct item *item_da void HP_clif_partyinvitationstate(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_partyinvitationstate_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_partyinvitationstate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_partyinvitationstate_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13968,11 +13991,11 @@ void HP_clif_partyinvitationstate(struct map_session_data *sd) { void HP_clif_PartyLeaderChanged(struct map_session_data *sd, int prev_leader_aid, int new_leader_aid) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyLeaderChanged_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *prev_leader_aid, int *new_leader_aid); + void (*preHookFunc) (struct map_session_data **sd, int *prev_leader_aid, int *new_leader_aid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyLeaderChanged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyLeaderChanged_pre[hIndex].func; - preHookFunc(sd, &prev_leader_aid, &new_leader_aid); + preHookFunc(&sd, &prev_leader_aid, &new_leader_aid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -13983,10 +14006,10 @@ void HP_clif_PartyLeaderChanged(struct map_session_data *sd, int prev_leader_aid HPMHooks.source.clif.PartyLeaderChanged(sd, prev_leader_aid, new_leader_aid); } if( HPMHooks.count.HP_clif_PartyLeaderChanged_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *prev_leader_aid, int *new_leader_aid); + void (*postHookFunc) (struct map_session_data *sd, int prev_leader_aid, int new_leader_aid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyLeaderChanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyLeaderChanged_post[hIndex].func; - postHookFunc(sd, &prev_leader_aid, &new_leader_aid); + postHookFunc(sd, prev_leader_aid, new_leader_aid); } } return; @@ -13994,11 +14017,11 @@ void HP_clif_PartyLeaderChanged(struct map_session_data *sd, int prev_leader_aid void HP_clif_guild_created(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_created_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_created_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_created_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14009,10 +14032,10 @@ void HP_clif_guild_created(struct map_session_data *sd, int flag) { HPMHooks.source.clif.guild_created(sd, flag); } if( HPMHooks.count.HP_clif_guild_created_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_created_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -14020,11 +14043,11 @@ void HP_clif_guild_created(struct map_session_data *sd, int flag) { void HP_clif_guild_belonginfo(struct map_session_data *sd, struct guild *g) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_belonginfo_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct guild *g); + void (*preHookFunc) (struct map_session_data **sd, struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_belonginfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_belonginfo_pre[hIndex].func; - preHookFunc(sd, g); + preHookFunc(&sd, &g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14046,11 +14069,11 @@ void HP_clif_guild_belonginfo(struct map_session_data *sd, struct guild *g) { void HP_clif_guild_masterormember(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_masterormember_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_masterormember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_masterormember_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14072,11 +14095,11 @@ void HP_clif_guild_masterormember(struct map_session_data *sd) { void HP_clif_guild_basicinfo(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_basicinfo_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_basicinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_basicinfo_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14098,11 +14121,11 @@ void HP_clif_guild_basicinfo(struct map_session_data *sd) { void HP_clif_guild_allianceinfo(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_allianceinfo_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_allianceinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_allianceinfo_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14124,11 +14147,11 @@ void HP_clif_guild_allianceinfo(struct map_session_data *sd) { void HP_clif_guild_memberlist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_memberlist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_memberlist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_memberlist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14150,11 +14173,11 @@ void HP_clif_guild_memberlist(struct map_session_data *sd) { void HP_clif_guild_skillinfo(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_skillinfo_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_skillinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_skillinfo_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14176,11 +14199,11 @@ void HP_clif_guild_skillinfo(struct map_session_data *sd) { void HP_clif_guild_send_onlineinfo(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_send_onlineinfo_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_send_onlineinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_send_onlineinfo_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14202,11 +14225,11 @@ void HP_clif_guild_send_onlineinfo(struct map_session_data *sd) { void HP_clif_guild_memberlogin_notice(struct guild *g, int idx, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_memberlogin_notice_pre ) { - void (*preHookFunc) (struct guild *g, int *idx, int *flag); + void (*preHookFunc) (struct guild **g, int *idx, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_memberlogin_notice_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_memberlogin_notice_pre[hIndex].func; - preHookFunc(g, &idx, &flag); + preHookFunc(&g, &idx, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14217,10 +14240,10 @@ void HP_clif_guild_memberlogin_notice(struct guild *g, int idx, int flag) { HPMHooks.source.clif.guild_memberlogin_notice(g, idx, flag); } if( HPMHooks.count.HP_clif_guild_memberlogin_notice_post ) { - void (*postHookFunc) (struct guild *g, int *idx, int *flag); + void (*postHookFunc) (struct guild *g, int idx, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_memberlogin_notice_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_memberlogin_notice_post[hIndex].func; - postHookFunc(g, &idx, &flag); + postHookFunc(g, idx, flag); } } return; @@ -14228,11 +14251,11 @@ void HP_clif_guild_memberlogin_notice(struct guild *g, int idx, int flag) { void HP_clif_guild_invite(struct map_session_data *sd, struct guild *g) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_invite_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct guild *g); + void (*preHookFunc) (struct map_session_data **sd, struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_invite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_invite_pre[hIndex].func; - preHookFunc(sd, g); + preHookFunc(&sd, &g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14254,11 +14277,11 @@ void HP_clif_guild_invite(struct map_session_data *sd, struct guild *g) { void HP_clif_guild_inviteack(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_inviteack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_inviteack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_inviteack_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14269,10 +14292,10 @@ void HP_clif_guild_inviteack(struct map_session_data *sd, int flag) { HPMHooks.source.clif.guild_inviteack(sd, flag); } if( HPMHooks.count.HP_clif_guild_inviteack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_inviteack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_inviteack_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -14280,11 +14303,11 @@ void HP_clif_guild_inviteack(struct map_session_data *sd, int flag) { void HP_clif_guild_leave(struct map_session_data *sd, const char *name, const char *mes) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_leave_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *name, const char *mes); + void (*preHookFunc) (struct map_session_data **sd, const char **name, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_leave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_leave_pre[hIndex].func; - preHookFunc(sd, name, mes); + preHookFunc(&sd, &name, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14306,11 +14329,11 @@ void HP_clif_guild_leave(struct map_session_data *sd, const char *name, const ch void HP_clif_guild_expulsion(struct map_session_data *sd, const char *name, const char *mes, int account_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_expulsion_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *name, const char *mes, int *account_id); + void (*preHookFunc) (struct map_session_data **sd, const char **name, const char **mes, int *account_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_expulsion_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_expulsion_pre[hIndex].func; - preHookFunc(sd, name, mes, &account_id); + preHookFunc(&sd, &name, &mes, &account_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14321,10 +14344,10 @@ void HP_clif_guild_expulsion(struct map_session_data *sd, const char *name, cons HPMHooks.source.clif.guild_expulsion(sd, name, mes, account_id); } if( HPMHooks.count.HP_clif_guild_expulsion_post ) { - void (*postHookFunc) (struct map_session_data *sd, const char *name, const char *mes, int *account_id); + void (*postHookFunc) (struct map_session_data *sd, const char *name, const char *mes, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_expulsion_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_expulsion_post[hIndex].func; - postHookFunc(sd, name, mes, &account_id); + postHookFunc(sd, name, mes, account_id); } } return; @@ -14332,11 +14355,11 @@ void HP_clif_guild_expulsion(struct map_session_data *sd, const char *name, cons void HP_clif_guild_positionchanged(struct guild *g, int idx) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_positionchanged_pre ) { - void (*preHookFunc) (struct guild *g, int *idx); + void (*preHookFunc) (struct guild **g, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_positionchanged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_positionchanged_pre[hIndex].func; - preHookFunc(g, &idx); + preHookFunc(&g, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14347,10 +14370,10 @@ void HP_clif_guild_positionchanged(struct guild *g, int idx) { HPMHooks.source.clif.guild_positionchanged(g, idx); } if( HPMHooks.count.HP_clif_guild_positionchanged_post ) { - void (*postHookFunc) (struct guild *g, int *idx); + void (*postHookFunc) (struct guild *g, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_positionchanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_positionchanged_post[hIndex].func; - postHookFunc(g, &idx); + postHookFunc(g, idx); } } return; @@ -14358,11 +14381,11 @@ void HP_clif_guild_positionchanged(struct guild *g, int idx) { void HP_clif_guild_memberpositionchanged(struct guild *g, int idx) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_memberpositionchanged_pre ) { - void (*preHookFunc) (struct guild *g, int *idx); + void (*preHookFunc) (struct guild **g, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_memberpositionchanged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_memberpositionchanged_pre[hIndex].func; - preHookFunc(g, &idx); + preHookFunc(&g, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14373,10 +14396,10 @@ void HP_clif_guild_memberpositionchanged(struct guild *g, int idx) { HPMHooks.source.clif.guild_memberpositionchanged(g, idx); } if( HPMHooks.count.HP_clif_guild_memberpositionchanged_post ) { - void (*postHookFunc) (struct guild *g, int *idx); + void (*postHookFunc) (struct guild *g, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_memberpositionchanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_memberpositionchanged_post[hIndex].func; - postHookFunc(g, &idx); + postHookFunc(g, idx); } } return; @@ -14384,11 +14407,11 @@ void HP_clif_guild_memberpositionchanged(struct guild *g, int idx) { void HP_clif_guild_emblem(struct map_session_data *sd, struct guild *g) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_emblem_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct guild *g); + void (*preHookFunc) (struct map_session_data **sd, struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_emblem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_emblem_pre[hIndex].func; - preHookFunc(sd, g); + preHookFunc(&sd, &g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14410,11 +14433,11 @@ void HP_clif_guild_emblem(struct map_session_data *sd, struct guild *g) { void HP_clif_guild_emblem_area(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_emblem_area_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_emblem_area_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_emblem_area_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14436,11 +14459,11 @@ void HP_clif_guild_emblem_area(struct block_list *bl) { void HP_clif_guild_notice(struct map_session_data *sd, struct guild *g) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_notice_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct guild *g); + void (*preHookFunc) (struct map_session_data **sd, struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_notice_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_notice_pre[hIndex].func; - preHookFunc(sd, g); + preHookFunc(&sd, &g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14462,11 +14485,11 @@ void HP_clif_guild_notice(struct map_session_data *sd, struct guild *g) { void HP_clif_guild_message(struct guild *g, int account_id, const char *mes, int len) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_message_pre ) { - void (*preHookFunc) (struct guild *g, int *account_id, const char *mes, int *len); + void (*preHookFunc) (struct guild **g, int *account_id, const char **mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_message_pre[hIndex].func; - preHookFunc(g, &account_id, mes, &len); + preHookFunc(&g, &account_id, &mes, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14477,10 +14500,10 @@ void HP_clif_guild_message(struct guild *g, int account_id, const char *mes, int HPMHooks.source.clif.guild_message(g, account_id, mes, len); } if( HPMHooks.count.HP_clif_guild_message_post ) { - void (*postHookFunc) (struct guild *g, int *account_id, const char *mes, int *len); + void (*postHookFunc) (struct guild *g, int account_id, const char *mes, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_message_post[hIndex].func; - postHookFunc(g, &account_id, mes, &len); + postHookFunc(g, account_id, mes, len); } } return; @@ -14488,11 +14511,11 @@ void HP_clif_guild_message(struct guild *g, int account_id, const char *mes, int void HP_clif_guild_reqalliance(struct map_session_data *sd, int account_id, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_reqalliance_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *account_id, const char *name); + void (*preHookFunc) (struct map_session_data **sd, int *account_id, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_reqalliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_reqalliance_pre[hIndex].func; - preHookFunc(sd, &account_id, name); + preHookFunc(&sd, &account_id, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14503,10 +14526,10 @@ void HP_clif_guild_reqalliance(struct map_session_data *sd, int account_id, cons HPMHooks.source.clif.guild_reqalliance(sd, account_id, name); } if( HPMHooks.count.HP_clif_guild_reqalliance_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *account_id, const char *name); + void (*postHookFunc) (struct map_session_data *sd, int account_id, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_reqalliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_reqalliance_post[hIndex].func; - postHookFunc(sd, &account_id, name); + postHookFunc(sd, account_id, name); } } return; @@ -14514,11 +14537,11 @@ void HP_clif_guild_reqalliance(struct map_session_data *sd, int account_id, cons void HP_clif_guild_allianceack(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_allianceack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_allianceack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_allianceack_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14529,10 +14552,10 @@ void HP_clif_guild_allianceack(struct map_session_data *sd, int flag) { HPMHooks.source.clif.guild_allianceack(sd, flag); } if( HPMHooks.count.HP_clif_guild_allianceack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_allianceack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_allianceack_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -14540,11 +14563,11 @@ void HP_clif_guild_allianceack(struct map_session_data *sd, int flag) { void HP_clif_guild_delalliance(struct map_session_data *sd, int guild_id, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_delalliance_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *guild_id, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *guild_id, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_delalliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_delalliance_pre[hIndex].func; - preHookFunc(sd, &guild_id, &flag); + preHookFunc(&sd, &guild_id, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14555,10 +14578,10 @@ void HP_clif_guild_delalliance(struct map_session_data *sd, int guild_id, int fl HPMHooks.source.clif.guild_delalliance(sd, guild_id, flag); } if( HPMHooks.count.HP_clif_guild_delalliance_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *guild_id, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int guild_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_delalliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_delalliance_post[hIndex].func; - postHookFunc(sd, &guild_id, &flag); + postHookFunc(sd, guild_id, flag); } } return; @@ -14566,11 +14589,11 @@ void HP_clif_guild_delalliance(struct map_session_data *sd, int guild_id, int fl void HP_clif_guild_oppositionack(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_oppositionack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_oppositionack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_oppositionack_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14581,10 +14604,10 @@ void HP_clif_guild_oppositionack(struct map_session_data *sd, int flag) { HPMHooks.source.clif.guild_oppositionack(sd, flag); } if( HPMHooks.count.HP_clif_guild_oppositionack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_oppositionack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_oppositionack_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -14592,11 +14615,11 @@ void HP_clif_guild_oppositionack(struct map_session_data *sd, int flag) { void HP_clif_guild_broken(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_broken_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_broken_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_broken_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14607,10 +14630,10 @@ void HP_clif_guild_broken(struct map_session_data *sd, int flag) { HPMHooks.source.clif.guild_broken(sd, flag); } if( HPMHooks.count.HP_clif_guild_broken_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_broken_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_broken_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -14618,11 +14641,11 @@ void HP_clif_guild_broken(struct map_session_data *sd, int flag) { void HP_clif_guild_xy(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_xy_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_xy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_xy_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14644,11 +14667,11 @@ void HP_clif_guild_xy(struct map_session_data *sd) { void HP_clif_guild_xy_single(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_xy_single_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_xy_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_xy_single_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14659,10 +14682,10 @@ void HP_clif_guild_xy_single(int fd, struct map_session_data *sd) { HPMHooks.source.clif.guild_xy_single(fd, sd); } if( HPMHooks.count.HP_clif_guild_xy_single_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_xy_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_guild_xy_single_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -14670,11 +14693,11 @@ void HP_clif_guild_xy_single(int fd, struct map_session_data *sd) { void HP_clif_guild_xy_remove(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_xy_remove_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_xy_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_xy_remove_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14696,11 +14719,11 @@ void HP_clif_guild_xy_remove(struct map_session_data *sd) { void HP_clif_guild_positionnamelist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_positionnamelist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_positionnamelist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_positionnamelist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14722,11 +14745,11 @@ void HP_clif_guild_positionnamelist(struct map_session_data *sd) { void HP_clif_guild_positioninfolist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_positioninfolist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_positioninfolist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_positioninfolist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14748,11 +14771,11 @@ void HP_clif_guild_positioninfolist(struct map_session_data *sd) { void HP_clif_guild_expulsionlist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_expulsionlist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_expulsionlist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_guild_expulsionlist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14775,11 +14798,11 @@ bool HP_clif_validate_emblem(const uint8 *emblem, unsigned long emblem_len) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_clif_validate_emblem_pre ) { - bool (*preHookFunc) (const uint8 *emblem, unsigned long *emblem_len); + bool (*preHookFunc) (const uint8 **emblem, unsigned long *emblem_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_validate_emblem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_validate_emblem_pre[hIndex].func; - retVal___ = preHookFunc(emblem, &emblem_len); + retVal___ = preHookFunc(&emblem, &emblem_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14790,10 +14813,10 @@ bool HP_clif_validate_emblem(const uint8 *emblem, unsigned long emblem_len) { retVal___ = HPMHooks.source.clif.validate_emblem(emblem, emblem_len); } if( HPMHooks.count.HP_clif_validate_emblem_post ) { - bool (*postHookFunc) (bool retVal___, const uint8 *emblem, unsigned long *emblem_len); + bool (*postHookFunc) (bool retVal___, const uint8 *emblem, unsigned long emblem_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_validate_emblem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_validate_emblem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, emblem, &emblem_len); + retVal___ = postHookFunc(retVal___, emblem, emblem_len); } } return retVal___; @@ -14801,11 +14824,11 @@ bool HP_clif_validate_emblem(const uint8 *emblem, unsigned long emblem_len) { void HP_clif_bg_hp(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_bg_hp_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bg_hp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bg_hp_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14827,11 +14850,11 @@ void HP_clif_bg_hp(struct map_session_data *sd) { void HP_clif_bg_xy(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_bg_xy_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bg_xy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bg_xy_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14853,11 +14876,11 @@ void HP_clif_bg_xy(struct map_session_data *sd) { void HP_clif_bg_xy_remove(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_bg_xy_remove_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bg_xy_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bg_xy_remove_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14876,14 +14899,14 @@ void HP_clif_bg_xy_remove(struct map_session_data *sd) { } return; } -void HP_clif_bg_message(struct battleground_data *bgd, int src_id, const char *name, const char *mes, size_t len) { +void HP_clif_bg_message(struct battleground_data *bgd, int src_id, const char *name, const char *mes) { int hIndex = 0; if( HPMHooks.count.HP_clif_bg_message_pre ) { - void (*preHookFunc) (struct battleground_data *bgd, int *src_id, const char *name, const char *mes, size_t *len); + void (*preHookFunc) (struct battleground_data **bgd, int *src_id, const char **name, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bg_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bg_message_pre[hIndex].func; - preHookFunc(bgd, &src_id, name, mes, &len); + preHookFunc(&bgd, &src_id, &name, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14891,13 +14914,13 @@ void HP_clif_bg_message(struct battleground_data *bgd, int src_id, const char *n } } { - HPMHooks.source.clif.bg_message(bgd, src_id, name, mes, len); + HPMHooks.source.clif.bg_message(bgd, src_id, name, mes); } if( HPMHooks.count.HP_clif_bg_message_post ) { - void (*postHookFunc) (struct battleground_data *bgd, int *src_id, const char *name, const char *mes, size_t *len); + void (*postHookFunc) (struct battleground_data *bgd, int src_id, const char *name, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bg_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bg_message_post[hIndex].func; - postHookFunc(bgd, &src_id, name, mes, &len); + postHookFunc(bgd, src_id, name, mes); } } return; @@ -14920,10 +14943,10 @@ void HP_clif_bg_updatescore(int16 m) { HPMHooks.source.clif.bg_updatescore(m); } if( HPMHooks.count.HP_clif_bg_updatescore_post ) { - void (*postHookFunc) (int16 *m); + void (*postHookFunc) (int16 m); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bg_updatescore_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bg_updatescore_post[hIndex].func; - postHookFunc(&m); + postHookFunc(m); } } return; @@ -14931,11 +14954,11 @@ void HP_clif_bg_updatescore(int16 m) { void HP_clif_bg_updatescore_single(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_bg_updatescore_single_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bg_updatescore_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bg_updatescore_single_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14957,11 +14980,11 @@ void HP_clif_bg_updatescore_single(struct map_session_data *sd) { void HP_clif_sendbgemblem_area(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_sendbgemblem_area_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendbgemblem_area_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_sendbgemblem_area_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14983,11 +15006,11 @@ void HP_clif_sendbgemblem_area(struct map_session_data *sd) { void HP_clif_sendbgemblem_single(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_sendbgemblem_single_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendbgemblem_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_sendbgemblem_single_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14998,10 +15021,10 @@ void HP_clif_sendbgemblem_single(int fd, struct map_session_data *sd) { HPMHooks.source.clif.sendbgemblem_single(fd, sd); } if( HPMHooks.count.HP_clif_sendbgemblem_single_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendbgemblem_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_sendbgemblem_single_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -15025,10 +15048,10 @@ int HP_clif_instance(int instance_id, int type, int flag) { retVal___ = HPMHooks.source.clif.instance(instance_id, type, flag); } if( HPMHooks.count.HP_clif_instance_post ) { - int (*postHookFunc) (int retVal___, int *instance_id, int *type, int *flag); + int (*postHookFunc) (int retVal___, int instance_id, int type, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_instance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_instance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &instance_id, &type, &flag); + retVal___ = postHookFunc(retVal___, instance_id, type, flag); } } return retVal___; @@ -15051,10 +15074,10 @@ void HP_clif_instance_join(int fd, int instance_id) { HPMHooks.source.clif.instance_join(fd, instance_id); } if( HPMHooks.count.HP_clif_instance_join_post ) { - void (*postHookFunc) (int *fd, int *instance_id); + void (*postHookFunc) (int fd, int instance_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_instance_join_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_instance_join_post[hIndex].func; - postHookFunc(&fd, &instance_id); + postHookFunc(fd, instance_id); } } return; @@ -15077,10 +15100,10 @@ void HP_clif_instance_leave(int fd) { HPMHooks.source.clif.instance_leave(fd); } if( HPMHooks.count.HP_clif_instance_leave_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_instance_leave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_instance_leave_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -15088,11 +15111,11 @@ void HP_clif_instance_leave(int fd) { void HP_clif_catch_process(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_catch_process_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_catch_process_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_catch_process_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15114,11 +15137,11 @@ void HP_clif_catch_process(struct map_session_data *sd) { void HP_clif_pet_roulette(struct map_session_data *sd, int data) { int hIndex = 0; if( HPMHooks.count.HP_clif_pet_roulette_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *data); + void (*preHookFunc) (struct map_session_data **sd, int *data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pet_roulette_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pet_roulette_pre[hIndex].func; - preHookFunc(sd, &data); + preHookFunc(&sd, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15129,10 +15152,10 @@ void HP_clif_pet_roulette(struct map_session_data *sd, int data) { HPMHooks.source.clif.pet_roulette(sd, data); } if( HPMHooks.count.HP_clif_pet_roulette_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *data); + void (*postHookFunc) (struct map_session_data *sd, int data); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pet_roulette_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pet_roulette_post[hIndex].func; - postHookFunc(sd, &data); + postHookFunc(sd, data); } } return; @@ -15140,11 +15163,11 @@ void HP_clif_pet_roulette(struct map_session_data *sd, int data) { void HP_clif_sendegg(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_sendegg_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendegg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_sendegg_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15166,11 +15189,11 @@ void HP_clif_sendegg(struct map_session_data *sd) { void HP_clif_send_petstatus(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_send_petstatus_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_petstatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_send_petstatus_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15192,11 +15215,11 @@ void HP_clif_send_petstatus(struct map_session_data *sd) { void HP_clif_send_petdata(struct map_session_data *sd, struct pet_data *pd, int type, int param) { int hIndex = 0; if( HPMHooks.count.HP_clif_send_petdata_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct pet_data *pd, int *type, int *param); + void (*preHookFunc) (struct map_session_data **sd, struct pet_data **pd, int *type, int *param); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_petdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_send_petdata_pre[hIndex].func; - preHookFunc(sd, pd, &type, ¶m); + preHookFunc(&sd, &pd, &type, ¶m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15207,10 +15230,10 @@ void HP_clif_send_petdata(struct map_session_data *sd, struct pet_data *pd, int HPMHooks.source.clif.send_petdata(sd, pd, type, param); } if( HPMHooks.count.HP_clif_send_petdata_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct pet_data *pd, int *type, int *param); + void (*postHookFunc) (struct map_session_data *sd, struct pet_data *pd, int type, int param); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_petdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_send_petdata_post[hIndex].func; - postHookFunc(sd, pd, &type, ¶m); + postHookFunc(sd, pd, type, param); } } return; @@ -15218,11 +15241,11 @@ void HP_clif_send_petdata(struct map_session_data *sd, struct pet_data *pd, int void HP_clif_pet_emotion(struct pet_data *pd, int param) { int hIndex = 0; if( HPMHooks.count.HP_clif_pet_emotion_pre ) { - void (*preHookFunc) (struct pet_data *pd, int *param); + void (*preHookFunc) (struct pet_data **pd, int *param); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pet_emotion_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pet_emotion_pre[hIndex].func; - preHookFunc(pd, ¶m); + preHookFunc(&pd, ¶m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15233,10 +15256,10 @@ void HP_clif_pet_emotion(struct pet_data *pd, int param) { HPMHooks.source.clif.pet_emotion(pd, param); } if( HPMHooks.count.HP_clif_pet_emotion_post ) { - void (*postHookFunc) (struct pet_data *pd, int *param); + void (*postHookFunc) (struct pet_data *pd, int param); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pet_emotion_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pet_emotion_post[hIndex].func; - postHookFunc(pd, ¶m); + postHookFunc(pd, param); } } return; @@ -15244,11 +15267,11 @@ void HP_clif_pet_emotion(struct pet_data *pd, int param) { void HP_clif_pet_food(struct map_session_data *sd, int foodid, int fail) { int hIndex = 0; if( HPMHooks.count.HP_clif_pet_food_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *foodid, int *fail); + void (*preHookFunc) (struct map_session_data **sd, int *foodid, int *fail); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pet_food_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pet_food_pre[hIndex].func; - preHookFunc(sd, &foodid, &fail); + preHookFunc(&sd, &foodid, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15259,10 +15282,10 @@ void HP_clif_pet_food(struct map_session_data *sd, int foodid, int fail) { HPMHooks.source.clif.pet_food(sd, foodid, fail); } if( HPMHooks.count.HP_clif_pet_food_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *foodid, int *fail); + void (*postHookFunc) (struct map_session_data *sd, int foodid, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pet_food_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pet_food_post[hIndex].func; - postHookFunc(sd, &foodid, &fail); + postHookFunc(sd, foodid, fail); } } return; @@ -15271,12 +15294,12 @@ int HP_clif_friendslist_toggle_sub(struct map_session_data *sd, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_friendslist_toggle_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, va_list ap); + int (*preHookFunc) (struct map_session_data **sd, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_friendslist_toggle_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_clif_friendslist_toggle_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, ap___copy); + retVal___ = preHookFunc(&sd, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -15303,11 +15326,11 @@ int HP_clif_friendslist_toggle_sub(struct map_session_data *sd, va_list ap) { void HP_clif_friendslist_send(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_friendslist_send_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_friendslist_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_friendslist_send_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15329,11 +15352,11 @@ void HP_clif_friendslist_send(struct map_session_data *sd) { void HP_clif_friendslist_reqack(struct map_session_data *sd, struct map_session_data *f_sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_friendslist_reqack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *f_sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **f_sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_friendslist_reqack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_friendslist_reqack_pre[hIndex].func; - preHookFunc(sd, f_sd, &type); + preHookFunc(&sd, &f_sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15344,10 +15367,10 @@ void HP_clif_friendslist_reqack(struct map_session_data *sd, struct map_session_ HPMHooks.source.clif.friendslist_reqack(sd, f_sd, type); } if( HPMHooks.count.HP_clif_friendslist_reqack_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *f_sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *f_sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_friendslist_reqack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_friendslist_reqack_post[hIndex].func; - postHookFunc(sd, f_sd, &type); + postHookFunc(sd, f_sd, type); } } return; @@ -15355,11 +15378,11 @@ void HP_clif_friendslist_reqack(struct map_session_data *sd, struct map_session_ void HP_clif_friendslist_toggle(struct map_session_data *sd, int account_id, int char_id, int online) { int hIndex = 0; if( HPMHooks.count.HP_clif_friendslist_toggle_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *account_id, int *char_id, int *online); + void (*preHookFunc) (struct map_session_data **sd, int *account_id, int *char_id, int *online); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_friendslist_toggle_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_friendslist_toggle_pre[hIndex].func; - preHookFunc(sd, &account_id, &char_id, &online); + preHookFunc(&sd, &account_id, &char_id, &online); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15370,10 +15393,10 @@ void HP_clif_friendslist_toggle(struct map_session_data *sd, int account_id, int HPMHooks.source.clif.friendslist_toggle(sd, account_id, char_id, online); } if( HPMHooks.count.HP_clif_friendslist_toggle_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *account_id, int *char_id, int *online); + void (*postHookFunc) (struct map_session_data *sd, int account_id, int char_id, int online); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_friendslist_toggle_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_friendslist_toggle_post[hIndex].func; - postHookFunc(sd, &account_id, &char_id, &online); + postHookFunc(sd, account_id, char_id, online); } } return; @@ -15381,11 +15404,11 @@ void HP_clif_friendslist_toggle(struct map_session_data *sd, int account_id, int void HP_clif_friendlist_req(struct map_session_data *sd, int account_id, int char_id, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_friendlist_req_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *account_id, int *char_id, const char *name); + void (*preHookFunc) (struct map_session_data **sd, int *account_id, int *char_id, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_friendlist_req_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_friendlist_req_pre[hIndex].func; - preHookFunc(sd, &account_id, &char_id, name); + preHookFunc(&sd, &account_id, &char_id, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15396,10 +15419,10 @@ void HP_clif_friendlist_req(struct map_session_data *sd, int account_id, int cha HPMHooks.source.clif.friendlist_req(sd, account_id, char_id, name); } if( HPMHooks.count.HP_clif_friendlist_req_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *account_id, int *char_id, const char *name); + void (*postHookFunc) (struct map_session_data *sd, int account_id, int char_id, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_friendlist_req_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_friendlist_req_post[hIndex].func; - postHookFunc(sd, &account_id, &char_id, name); + postHookFunc(sd, account_id, char_id, name); } } return; @@ -15407,11 +15430,11 @@ void HP_clif_friendlist_req(struct map_session_data *sd, int account_id, int cha void HP_clif_GM_kickack(struct map_session_data *sd, int result) { int hIndex = 0; if( HPMHooks.count.HP_clif_GM_kickack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *result); + void (*preHookFunc) (struct map_session_data **sd, int *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_GM_kickack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_GM_kickack_pre[hIndex].func; - preHookFunc(sd, &result); + preHookFunc(&sd, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15422,10 +15445,10 @@ void HP_clif_GM_kickack(struct map_session_data *sd, int result) { HPMHooks.source.clif.GM_kickack(sd, result); } if( HPMHooks.count.HP_clif_GM_kickack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *result); + void (*postHookFunc) (struct map_session_data *sd, int result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_GM_kickack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_GM_kickack_post[hIndex].func; - postHookFunc(sd, &result); + postHookFunc(sd, result); } } return; @@ -15433,11 +15456,11 @@ void HP_clif_GM_kickack(struct map_session_data *sd, int result) { void HP_clif_GM_kick(struct map_session_data *sd, struct map_session_data *tsd) { int hIndex = 0; if( HPMHooks.count.HP_clif_GM_kick_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_GM_kick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_GM_kick_pre[hIndex].func; - preHookFunc(sd, tsd); + preHookFunc(&sd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15459,11 +15482,11 @@ void HP_clif_GM_kick(struct map_session_data *sd, struct map_session_data *tsd) void HP_clif_manner_message(struct map_session_data *sd, uint32 type) { int hIndex = 0; if( HPMHooks.count.HP_clif_manner_message_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint32 *type); + void (*preHookFunc) (struct map_session_data **sd, uint32 *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_manner_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_manner_message_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15474,10 +15497,10 @@ void HP_clif_manner_message(struct map_session_data *sd, uint32 type) { HPMHooks.source.clif.manner_message(sd, type); } if( HPMHooks.count.HP_clif_manner_message_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint32 *type); + void (*postHookFunc) (struct map_session_data *sd, uint32 type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_manner_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_manner_message_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -15485,11 +15508,11 @@ void HP_clif_manner_message(struct map_session_data *sd, uint32 type) { void HP_clif_GM_silence(struct map_session_data *sd, struct map_session_data *tsd, uint8 type) { int hIndex = 0; if( HPMHooks.count.HP_clif_GM_silence_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd, uint8 *type); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd, uint8 *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_GM_silence_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_GM_silence_pre[hIndex].func; - preHookFunc(sd, tsd, &type); + preHookFunc(&sd, &tsd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15500,10 +15523,10 @@ void HP_clif_GM_silence(struct map_session_data *sd, struct map_session_data *ts HPMHooks.source.clif.GM_silence(sd, tsd, type); } if( HPMHooks.count.HP_clif_GM_silence_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *tsd, uint8 *type); + void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *tsd, uint8 type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_GM_silence_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_GM_silence_post[hIndex].func; - postHookFunc(sd, tsd, &type); + postHookFunc(sd, tsd, type); } } return; @@ -15511,11 +15534,11 @@ void HP_clif_GM_silence(struct map_session_data *sd, struct map_session_data *ts void HP_clif_account_name(struct map_session_data *sd, int account_id, const char *accname) { int hIndex = 0; if( HPMHooks.count.HP_clif_account_name_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *account_id, const char *accname); + void (*preHookFunc) (struct map_session_data **sd, int *account_id, const char **accname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_account_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_account_name_pre[hIndex].func; - preHookFunc(sd, &account_id, accname); + preHookFunc(&sd, &account_id, &accname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15526,10 +15549,10 @@ void HP_clif_account_name(struct map_session_data *sd, int account_id, const cha HPMHooks.source.clif.account_name(sd, account_id, accname); } if( HPMHooks.count.HP_clif_account_name_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *account_id, const char *accname); + void (*postHookFunc) (struct map_session_data *sd, int account_id, const char *accname); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_account_name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_account_name_post[hIndex].func; - postHookFunc(sd, &account_id, accname); + postHookFunc(sd, account_id, accname); } } return; @@ -15537,11 +15560,11 @@ void HP_clif_account_name(struct map_session_data *sd, int account_id, const cha void HP_clif_check(int fd, struct map_session_data *pl_sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_check_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *pl_sd); + void (*preHookFunc) (int *fd, struct map_session_data **pl_sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_check_pre[hIndex].func; - preHookFunc(&fd, pl_sd); + preHookFunc(&fd, &pl_sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15552,10 +15575,10 @@ void HP_clif_check(int fd, struct map_session_data *pl_sd) { HPMHooks.source.clif.check(fd, pl_sd); } if( HPMHooks.count.HP_clif_check_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *pl_sd); + void (*postHookFunc) (int fd, struct map_session_data *pl_sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_check_post[hIndex].func; - postHookFunc(&fd, pl_sd); + postHookFunc(fd, pl_sd); } } return; @@ -15563,11 +15586,11 @@ void HP_clif_check(int fd, struct map_session_data *pl_sd) { void HP_clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_hominfo_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct homun_data *hd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, struct homun_data **hd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hominfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_hominfo_pre[hIndex].func; - preHookFunc(sd, hd, &flag); + preHookFunc(&sd, &hd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15578,10 +15601,10 @@ void HP_clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int fla HPMHooks.source.clif.hominfo(sd, hd, flag); } if( HPMHooks.count.HP_clif_hominfo_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct homun_data *hd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, struct homun_data *hd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hominfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_hominfo_post[hIndex].func; - postHookFunc(sd, hd, &flag); + postHookFunc(sd, hd, flag); } } return; @@ -15589,11 +15612,11 @@ void HP_clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int fla void HP_clif_homskillinfoblock(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_homskillinfoblock_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_homskillinfoblock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_homskillinfoblock_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15615,11 +15638,11 @@ void HP_clif_homskillinfoblock(struct map_session_data *sd) { void HP_clif_homskillup(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_homskillup_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_homskillup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_homskillup_pre[hIndex].func; - preHookFunc(sd, &skill_id); + preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15630,10 +15653,10 @@ void HP_clif_homskillup(struct map_session_data *sd, uint16 skill_id) { HPMHooks.source.clif.homskillup(sd, skill_id); } if( HPMHooks.count.HP_clif_homskillup_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_homskillup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_homskillup_post[hIndex].func; - postHookFunc(sd, &skill_id); + postHookFunc(sd, skill_id); } } return; @@ -15641,11 +15664,11 @@ void HP_clif_homskillup(struct map_session_data *sd, uint16 skill_id) { void HP_clif_hom_food(struct map_session_data *sd, int foodid, int fail) { int hIndex = 0; if( HPMHooks.count.HP_clif_hom_food_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *foodid, int *fail); + void (*preHookFunc) (struct map_session_data **sd, int *foodid, int *fail); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hom_food_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_hom_food_pre[hIndex].func; - preHookFunc(sd, &foodid, &fail); + preHookFunc(&sd, &foodid, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15656,10 +15679,10 @@ void HP_clif_hom_food(struct map_session_data *sd, int foodid, int fail) { HPMHooks.source.clif.hom_food(sd, foodid, fail); } if( HPMHooks.count.HP_clif_hom_food_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *foodid, int *fail); + void (*postHookFunc) (struct map_session_data *sd, int foodid, int fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hom_food_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_hom_food_post[hIndex].func; - postHookFunc(sd, &foodid, &fail); + postHookFunc(sd, foodid, fail); } } return; @@ -15667,11 +15690,11 @@ void HP_clif_hom_food(struct map_session_data *sd, int foodid, int fail) { void HP_clif_send_homdata(struct map_session_data *sd, int state, int param) { int hIndex = 0; if( HPMHooks.count.HP_clif_send_homdata_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *state, int *param); + void (*preHookFunc) (struct map_session_data **sd, int *state, int *param); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_homdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_send_homdata_pre[hIndex].func; - preHookFunc(sd, &state, ¶m); + preHookFunc(&sd, &state, ¶m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15682,10 +15705,10 @@ void HP_clif_send_homdata(struct map_session_data *sd, int state, int param) { HPMHooks.source.clif.send_homdata(sd, state, param); } if( HPMHooks.count.HP_clif_send_homdata_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *state, int *param); + void (*postHookFunc) (struct map_session_data *sd, int state, int param); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_homdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_send_homdata_post[hIndex].func; - postHookFunc(sd, &state, ¶m); + postHookFunc(sd, state, param); } } return; @@ -15693,11 +15716,11 @@ void HP_clif_send_homdata(struct map_session_data *sd, int state, int param) { void HP_clif_quest_send_list(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_quest_send_list_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_send_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quest_send_list_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15719,11 +15742,11 @@ void HP_clif_quest_send_list(struct map_session_data *sd) { void HP_clif_quest_send_mission(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_quest_send_mission_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_send_mission_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quest_send_mission_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15745,11 +15768,11 @@ void HP_clif_quest_send_mission(struct map_session_data *sd) { void HP_clif_quest_add(struct map_session_data *sd, struct quest *qd) { int hIndex = 0; if( HPMHooks.count.HP_clif_quest_add_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct quest *qd); + void (*preHookFunc) (struct map_session_data **sd, struct quest **qd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quest_add_pre[hIndex].func; - preHookFunc(sd, qd); + preHookFunc(&sd, &qd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15771,11 +15794,11 @@ void HP_clif_quest_add(struct map_session_data *sd, struct quest *qd) { void HP_clif_quest_delete(struct map_session_data *sd, int quest_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_quest_delete_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *quest_id); + void (*preHookFunc) (struct map_session_data **sd, int *quest_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quest_delete_pre[hIndex].func; - preHookFunc(sd, &quest_id); + preHookFunc(&sd, &quest_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15786,10 +15809,10 @@ void HP_clif_quest_delete(struct map_session_data *sd, int quest_id) { HPMHooks.source.clif.quest_delete(sd, quest_id); } if( HPMHooks.count.HP_clif_quest_delete_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *quest_id); + void (*postHookFunc) (struct map_session_data *sd, int quest_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_quest_delete_post[hIndex].func; - postHookFunc(sd, &quest_id); + postHookFunc(sd, quest_id); } } return; @@ -15797,11 +15820,11 @@ void HP_clif_quest_delete(struct map_session_data *sd, int quest_id) { void HP_clif_quest_update_status(struct map_session_data *sd, int quest_id, bool active) { int hIndex = 0; if( HPMHooks.count.HP_clif_quest_update_status_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *quest_id, bool *active); + void (*preHookFunc) (struct map_session_data **sd, int *quest_id, bool *active); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_update_status_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quest_update_status_pre[hIndex].func; - preHookFunc(sd, &quest_id, &active); + preHookFunc(&sd, &quest_id, &active); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15812,10 +15835,10 @@ void HP_clif_quest_update_status(struct map_session_data *sd, int quest_id, bool HPMHooks.source.clif.quest_update_status(sd, quest_id, active); } if( HPMHooks.count.HP_clif_quest_update_status_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *quest_id, bool *active); + void (*postHookFunc) (struct map_session_data *sd, int quest_id, bool active); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_update_status_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_quest_update_status_post[hIndex].func; - postHookFunc(sd, &quest_id, &active); + postHookFunc(sd, quest_id, active); } } return; @@ -15823,11 +15846,11 @@ void HP_clif_quest_update_status(struct map_session_data *sd, int quest_id, bool void HP_clif_quest_update_objective(struct map_session_data *sd, struct quest *qd) { int hIndex = 0; if( HPMHooks.count.HP_clif_quest_update_objective_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct quest *qd); + void (*preHookFunc) (struct map_session_data **sd, struct quest **qd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_update_objective_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quest_update_objective_pre[hIndex].func; - preHookFunc(sd, qd); + preHookFunc(&sd, &qd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15849,11 +15872,11 @@ void HP_clif_quest_update_objective(struct map_session_data *sd, struct quest *q void HP_clif_quest_show_event(struct map_session_data *sd, struct block_list *bl, short state, short color) { int hIndex = 0; if( HPMHooks.count.HP_clif_quest_show_event_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct block_list *bl, short *state, short *color); + void (*preHookFunc) (struct map_session_data **sd, struct block_list **bl, short *state, short *color); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_show_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quest_show_event_pre[hIndex].func; - preHookFunc(sd, bl, &state, &color); + preHookFunc(&sd, &bl, &state, &color); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15864,10 +15887,10 @@ void HP_clif_quest_show_event(struct map_session_data *sd, struct block_list *bl HPMHooks.source.clif.quest_show_event(sd, bl, state, color); } if( HPMHooks.count.HP_clif_quest_show_event_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct block_list *bl, short *state, short *color); + void (*postHookFunc) (struct map_session_data *sd, struct block_list *bl, short state, short color); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_show_event_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_quest_show_event_post[hIndex].func; - postHookFunc(sd, bl, &state, &color); + postHookFunc(sd, bl, state, color); } } return; @@ -15890,10 +15913,10 @@ void HP_clif_mail_window(int fd, int flag) { HPMHooks.source.clif.mail_window(fd, flag); } if( HPMHooks.count.HP_clif_mail_window_post ) { - void (*postHookFunc) (int *fd, int *flag); + void (*postHookFunc) (int fd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_window_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mail_window_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -15901,11 +15924,11 @@ void HP_clif_mail_window(int fd, int flag) { void HP_clif_mail_read(struct map_session_data *sd, int mail_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_mail_read_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *mail_id); + void (*preHookFunc) (struct map_session_data **sd, int *mail_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mail_read_pre[hIndex].func; - preHookFunc(sd, &mail_id); + preHookFunc(&sd, &mail_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -15916,10 +15939,10 @@ void HP_clif_mail_read(struct map_session_data *sd, int mail_id) { HPMHooks.source.clif.mail_read(sd, mail_id); } if( HPMHooks.count.HP_clif_mail_read_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *mail_id); + void (*postHookFunc) (struct map_session_data *sd, int mail_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mail_read_post[hIndex].func; - postHookFunc(sd, &mail_id); + postHookFunc(sd, mail_id); } } return; @@ -15942,10 +15965,10 @@ void HP_clif_mail_delete(int fd, int mail_id, short fail) { HPMHooks.source.clif.mail_delete(fd, mail_id, fail); } if( HPMHooks.count.HP_clif_mail_delete_post ) { - void (*postHookFunc) (int *fd, int *mail_id, short *fail); + void (*postHookFunc) (int fd, int mail_id, short fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mail_delete_post[hIndex].func; - postHookFunc(&fd, &mail_id, &fail); + postHookFunc(fd, mail_id, fail); } } return; @@ -15968,10 +15991,10 @@ void HP_clif_mail_return(int fd, int mail_id, short fail) { HPMHooks.source.clif.mail_return(fd, mail_id, fail); } if( HPMHooks.count.HP_clif_mail_return_post ) { - void (*postHookFunc) (int *fd, int *mail_id, short *fail); + void (*postHookFunc) (int fd, int mail_id, short fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_return_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mail_return_post[hIndex].func; - postHookFunc(&fd, &mail_id, &fail); + postHookFunc(fd, mail_id, fail); } } return; @@ -15994,10 +16017,10 @@ void HP_clif_mail_send(int fd, bool fail) { HPMHooks.source.clif.mail_send(fd, fail); } if( HPMHooks.count.HP_clif_mail_send_post ) { - void (*postHookFunc) (int *fd, bool *fail); + void (*postHookFunc) (int fd, bool fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mail_send_post[hIndex].func; - postHookFunc(&fd, &fail); + postHookFunc(fd, fail); } } return; @@ -16005,11 +16028,11 @@ void HP_clif_mail_send(int fd, bool fail) { void HP_clif_mail_new(int fd, int mail_id, const char *sender, const char *title) { int hIndex = 0; if( HPMHooks.count.HP_clif_mail_new_pre ) { - void (*preHookFunc) (int *fd, int *mail_id, const char *sender, const char *title); + void (*preHookFunc) (int *fd, int *mail_id, const char **sender, const char **title); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_new_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mail_new_pre[hIndex].func; - preHookFunc(&fd, &mail_id, sender, title); + preHookFunc(&fd, &mail_id, &sender, &title); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16020,10 +16043,10 @@ void HP_clif_mail_new(int fd, int mail_id, const char *sender, const char *title HPMHooks.source.clif.mail_new(fd, mail_id, sender, title); } if( HPMHooks.count.HP_clif_mail_new_post ) { - void (*postHookFunc) (int *fd, int *mail_id, const char *sender, const char *title); + void (*postHookFunc) (int fd, int mail_id, const char *sender, const char *title); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_new_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mail_new_post[hIndex].func; - postHookFunc(&fd, &mail_id, sender, title); + postHookFunc(fd, mail_id, sender, title); } } return; @@ -16031,11 +16054,11 @@ void HP_clif_mail_new(int fd, int mail_id, const char *sender, const char *title void HP_clif_mail_refreshinbox(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_mail_refreshinbox_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_refreshinbox_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mail_refreshinbox_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16072,10 +16095,10 @@ void HP_clif_mail_getattachment(int fd, uint8 flag) { HPMHooks.source.clif.mail_getattachment(fd, flag); } if( HPMHooks.count.HP_clif_mail_getattachment_post ) { - void (*postHookFunc) (int *fd, uint8 *flag); + void (*postHookFunc) (int fd, uint8 flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_getattachment_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mail_getattachment_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -16098,10 +16121,10 @@ void HP_clif_mail_setattachment(int fd, int index, uint8 flag) { HPMHooks.source.clif.mail_setattachment(fd, index, flag); } if( HPMHooks.count.HP_clif_mail_setattachment_post ) { - void (*postHookFunc) (int *fd, int *index, uint8 *flag); + void (*postHookFunc) (int fd, int index, uint8 flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mail_setattachment_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mail_setattachment_post[hIndex].func; - postHookFunc(&fd, &index, &flag); + postHookFunc(fd, index, flag); } } return; @@ -16109,11 +16132,11 @@ void HP_clif_mail_setattachment(int fd, int index, uint8 flag) { void HP_clif_auction_openwindow(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_auction_openwindow_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_auction_openwindow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_auction_openwindow_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16135,11 +16158,11 @@ void HP_clif_auction_openwindow(struct map_session_data *sd) { void HP_clif_auction_results(struct map_session_data *sd, short count, short pages, const uint8 *buf) { int hIndex = 0; if( HPMHooks.count.HP_clif_auction_results_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *count, short *pages, const uint8 *buf); + void (*preHookFunc) (struct map_session_data **sd, short *count, short *pages, const uint8 **buf); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_auction_results_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_auction_results_pre[hIndex].func; - preHookFunc(sd, &count, &pages, buf); + preHookFunc(&sd, &count, &pages, &buf); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16150,10 +16173,10 @@ void HP_clif_auction_results(struct map_session_data *sd, short count, short pag HPMHooks.source.clif.auction_results(sd, count, pages, buf); } if( HPMHooks.count.HP_clif_auction_results_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *count, short *pages, const uint8 *buf); + void (*postHookFunc) (struct map_session_data *sd, short count, short pages, const uint8 *buf); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_auction_results_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_auction_results_post[hIndex].func; - postHookFunc(sd, &count, &pages, buf); + postHookFunc(sd, count, pages, buf); } } return; @@ -16176,10 +16199,10 @@ void HP_clif_auction_message(int fd, unsigned char flag) { HPMHooks.source.clif.auction_message(fd, flag); } if( HPMHooks.count.HP_clif_auction_message_post ) { - void (*postHookFunc) (int *fd, unsigned char *flag); + void (*postHookFunc) (int fd, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_auction_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_auction_message_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -16202,10 +16225,10 @@ void HP_clif_auction_close(int fd, unsigned char flag) { HPMHooks.source.clif.auction_close(fd, flag); } if( HPMHooks.count.HP_clif_auction_close_post ) { - void (*postHookFunc) (int *fd, unsigned char *flag); + void (*postHookFunc) (int fd, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_auction_close_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_auction_close_post[hIndex].func; - postHookFunc(&fd, &flag); + postHookFunc(fd, flag); } } return; @@ -16228,10 +16251,10 @@ void HP_clif_auction_setitem(int fd, int index, bool fail) { HPMHooks.source.clif.auction_setitem(fd, index, fail); } if( HPMHooks.count.HP_clif_auction_setitem_post ) { - void (*postHookFunc) (int *fd, int *index, bool *fail); + void (*postHookFunc) (int fd, int index, bool fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_auction_setitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_auction_setitem_post[hIndex].func; - postHookFunc(&fd, &index, &fail); + postHookFunc(fd, index, fail); } } return; @@ -16239,11 +16262,11 @@ void HP_clif_auction_setitem(int fd, int index, bool fail) { void HP_clif_mercenary_info(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_mercenary_info_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mercenary_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mercenary_info_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16265,11 +16288,11 @@ void HP_clif_mercenary_info(struct map_session_data *sd) { void HP_clif_mercenary_skillblock(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_mercenary_skillblock_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mercenary_skillblock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mercenary_skillblock_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16291,11 +16314,11 @@ void HP_clif_mercenary_skillblock(struct map_session_data *sd) { void HP_clif_mercenary_message(struct map_session_data *sd, int message) { int hIndex = 0; if( HPMHooks.count.HP_clif_mercenary_message_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *message); + void (*preHookFunc) (struct map_session_data **sd, int *message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mercenary_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mercenary_message_pre[hIndex].func; - preHookFunc(sd, &message); + preHookFunc(&sd, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16306,10 +16329,10 @@ void HP_clif_mercenary_message(struct map_session_data *sd, int message) { HPMHooks.source.clif.mercenary_message(sd, message); } if( HPMHooks.count.HP_clif_mercenary_message_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *message); + void (*postHookFunc) (struct map_session_data *sd, int message); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mercenary_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mercenary_message_post[hIndex].func; - postHookFunc(sd, &message); + postHookFunc(sd, message); } } return; @@ -16317,11 +16340,11 @@ void HP_clif_mercenary_message(struct map_session_data *sd, int message) { void HP_clif_mercenary_updatestatus(struct map_session_data *sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_mercenary_updatestatus_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mercenary_updatestatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_mercenary_updatestatus_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16332,10 +16355,10 @@ void HP_clif_mercenary_updatestatus(struct map_session_data *sd, int type) { HPMHooks.source.clif.mercenary_updatestatus(sd, type); } if( HPMHooks.count.HP_clif_mercenary_updatestatus_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_mercenary_updatestatus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_mercenary_updatestatus_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -16358,10 +16381,10 @@ void HP_clif_rental_time(int fd, int nameid, int seconds) { HPMHooks.source.clif.rental_time(fd, nameid, seconds); } if( HPMHooks.count.HP_clif_rental_time_post ) { - void (*postHookFunc) (int *fd, int *nameid, int *seconds); + void (*postHookFunc) (int fd, int nameid, int seconds); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_rental_time_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_rental_time_post[hIndex].func; - postHookFunc(&fd, &nameid, &seconds); + postHookFunc(fd, nameid, seconds); } } return; @@ -16384,10 +16407,10 @@ void HP_clif_rental_expired(int fd, int index, int nameid) { HPMHooks.source.clif.rental_expired(fd, index, nameid); } if( HPMHooks.count.HP_clif_rental_expired_post ) { - void (*postHookFunc) (int *fd, int *index, int *nameid); + void (*postHookFunc) (int fd, int index, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_rental_expired_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_rental_expired_post[hIndex].func; - postHookFunc(&fd, &index, &nameid); + postHookFunc(fd, index, nameid); } } return; @@ -16395,11 +16418,11 @@ void HP_clif_rental_expired(int fd, int index, int nameid) { void HP_clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingRegisterAck_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingRegisterAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingRegisterAck_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16410,10 +16433,10 @@ void HP_clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag) { HPMHooks.source.clif.PartyBookingRegisterAck(sd, flag); } if( HPMHooks.count.HP_clif_PartyBookingRegisterAck_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingRegisterAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingRegisterAck_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -16421,11 +16444,11 @@ void HP_clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag) { void HP_clif_PartyBookingDeleteAck(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingDeleteAck_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingDeleteAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingDeleteAck_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16436,10 +16459,10 @@ void HP_clif_PartyBookingDeleteAck(struct map_session_data *sd, int flag) { HPMHooks.source.clif.PartyBookingDeleteAck(sd, flag); } if( HPMHooks.count.HP_clif_PartyBookingDeleteAck_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingDeleteAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingDeleteAck_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -16447,11 +16470,11 @@ void HP_clif_PartyBookingDeleteAck(struct map_session_data *sd, int flag) { void HP_clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info **results, int count, bool more_result) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingSearchAck_pre ) { - void (*preHookFunc) (int *fd, struct party_booking_ad_info **results, int *count, bool *more_result); + void (*preHookFunc) (int *fd, struct party_booking_ad_info ***results, int *count, bool *more_result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingSearchAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingSearchAck_pre[hIndex].func; - preHookFunc(&fd, results, &count, &more_result); + preHookFunc(&fd, &results, &count, &more_result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16462,10 +16485,10 @@ void HP_clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info **result HPMHooks.source.clif.PartyBookingSearchAck(fd, results, count, more_result); } if( HPMHooks.count.HP_clif_PartyBookingSearchAck_post ) { - void (*postHookFunc) (int *fd, struct party_booking_ad_info **results, int *count, bool *more_result); + void (*postHookFunc) (int fd, struct party_booking_ad_info **results, int count, bool more_result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingSearchAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingSearchAck_post[hIndex].func; - postHookFunc(&fd, results, &count, &more_result); + postHookFunc(fd, results, count, more_result); } } return; @@ -16473,11 +16496,11 @@ void HP_clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info **result void HP_clif_PartyBookingUpdateNotify(struct map_session_data *sd, struct party_booking_ad_info *pb_ad) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingUpdateNotify_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct party_booking_ad_info *pb_ad); + void (*preHookFunc) (struct map_session_data **sd, struct party_booking_ad_info **pb_ad); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingUpdateNotify_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingUpdateNotify_pre[hIndex].func; - preHookFunc(sd, pb_ad); + preHookFunc(&sd, &pb_ad); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16499,11 +16522,11 @@ void HP_clif_PartyBookingUpdateNotify(struct map_session_data *sd, struct party_ void HP_clif_PartyBookingDeleteNotify(struct map_session_data *sd, int index) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingDeleteNotify_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *index); + void (*preHookFunc) (struct map_session_data **sd, int *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingDeleteNotify_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingDeleteNotify_pre[hIndex].func; - preHookFunc(sd, &index); + preHookFunc(&sd, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16514,10 +16537,10 @@ void HP_clif_PartyBookingDeleteNotify(struct map_session_data *sd, int index) { HPMHooks.source.clif.PartyBookingDeleteNotify(sd, index); } if( HPMHooks.count.HP_clif_PartyBookingDeleteNotify_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *index); + void (*postHookFunc) (struct map_session_data *sd, int index); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingDeleteNotify_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingDeleteNotify_post[hIndex].func; - postHookFunc(sd, &index); + postHookFunc(sd, index); } } return; @@ -16525,11 +16548,11 @@ void HP_clif_PartyBookingDeleteNotify(struct map_session_data *sd, int index) { void HP_clif_PartyBookingInsertNotify(struct map_session_data *sd, struct party_booking_ad_info *pb_ad) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingInsertNotify_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct party_booking_ad_info *pb_ad); + void (*preHookFunc) (struct map_session_data **sd, struct party_booking_ad_info **pb_ad); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingInsertNotify_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingInsertNotify_pre[hIndex].func; - preHookFunc(sd, pb_ad); + preHookFunc(&sd, &pb_ad); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16551,11 +16574,11 @@ void HP_clif_PartyBookingInsertNotify(struct map_session_data *sd, struct party_ void HP_clif_PartyRecruitRegisterAck(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyRecruitRegisterAck_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitRegisterAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyRecruitRegisterAck_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16566,10 +16589,10 @@ void HP_clif_PartyRecruitRegisterAck(struct map_session_data *sd, int flag) { HPMHooks.source.clif.PartyRecruitRegisterAck(sd, flag); } if( HPMHooks.count.HP_clif_PartyRecruitRegisterAck_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitRegisterAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyRecruitRegisterAck_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -16577,11 +16600,11 @@ void HP_clif_PartyRecruitRegisterAck(struct map_session_data *sd, int flag) { void HP_clif_PartyRecruitDeleteAck(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyRecruitDeleteAck_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitDeleteAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyRecruitDeleteAck_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16592,10 +16615,10 @@ void HP_clif_PartyRecruitDeleteAck(struct map_session_data *sd, int flag) { HPMHooks.source.clif.PartyRecruitDeleteAck(sd, flag); } if( HPMHooks.count.HP_clif_PartyRecruitDeleteAck_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitDeleteAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyRecruitDeleteAck_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -16603,11 +16626,11 @@ void HP_clif_PartyRecruitDeleteAck(struct map_session_data *sd, int flag) { void HP_clif_PartyRecruitSearchAck(int fd, struct party_booking_ad_info **results, int count, bool more_result) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyRecruitSearchAck_pre ) { - void (*preHookFunc) (int *fd, struct party_booking_ad_info **results, int *count, bool *more_result); + void (*preHookFunc) (int *fd, struct party_booking_ad_info ***results, int *count, bool *more_result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitSearchAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyRecruitSearchAck_pre[hIndex].func; - preHookFunc(&fd, results, &count, &more_result); + preHookFunc(&fd, &results, &count, &more_result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16618,10 +16641,10 @@ void HP_clif_PartyRecruitSearchAck(int fd, struct party_booking_ad_info **result HPMHooks.source.clif.PartyRecruitSearchAck(fd, results, count, more_result); } if( HPMHooks.count.HP_clif_PartyRecruitSearchAck_post ) { - void (*postHookFunc) (int *fd, struct party_booking_ad_info **results, int *count, bool *more_result); + void (*postHookFunc) (int fd, struct party_booking_ad_info **results, int count, bool more_result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitSearchAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyRecruitSearchAck_post[hIndex].func; - postHookFunc(&fd, results, &count, &more_result); + postHookFunc(fd, results, count, more_result); } } return; @@ -16629,11 +16652,11 @@ void HP_clif_PartyRecruitSearchAck(int fd, struct party_booking_ad_info **result void HP_clif_PartyRecruitUpdateNotify(struct map_session_data *sd, struct party_booking_ad_info *pb_ad) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyRecruitUpdateNotify_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct party_booking_ad_info *pb_ad); + void (*preHookFunc) (struct map_session_data **sd, struct party_booking_ad_info **pb_ad); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitUpdateNotify_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyRecruitUpdateNotify_pre[hIndex].func; - preHookFunc(sd, pb_ad); + preHookFunc(&sd, &pb_ad); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16655,11 +16678,11 @@ void HP_clif_PartyRecruitUpdateNotify(struct map_session_data *sd, struct party_ void HP_clif_PartyRecruitDeleteNotify(struct map_session_data *sd, int index) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyRecruitDeleteNotify_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *index); + void (*preHookFunc) (struct map_session_data **sd, int *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitDeleteNotify_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyRecruitDeleteNotify_pre[hIndex].func; - preHookFunc(sd, &index); + preHookFunc(&sd, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16670,10 +16693,10 @@ void HP_clif_PartyRecruitDeleteNotify(struct map_session_data *sd, int index) { HPMHooks.source.clif.PartyRecruitDeleteNotify(sd, index); } if( HPMHooks.count.HP_clif_PartyRecruitDeleteNotify_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *index); + void (*postHookFunc) (struct map_session_data *sd, int index); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitDeleteNotify_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyRecruitDeleteNotify_post[hIndex].func; - postHookFunc(sd, &index); + postHookFunc(sd, index); } } return; @@ -16681,11 +16704,11 @@ void HP_clif_PartyRecruitDeleteNotify(struct map_session_data *sd, int index) { void HP_clif_PartyRecruitInsertNotify(struct map_session_data *sd, struct party_booking_ad_info *pb_ad) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyRecruitInsertNotify_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct party_booking_ad_info *pb_ad); + void (*preHookFunc) (struct map_session_data **sd, struct party_booking_ad_info **pb_ad); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyRecruitInsertNotify_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyRecruitInsertNotify_pre[hIndex].func; - preHookFunc(sd, pb_ad); + preHookFunc(&sd, &pb_ad); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16707,11 +16730,11 @@ void HP_clif_PartyRecruitInsertNotify(struct map_session_data *sd, struct party_ void HP_clif_PartyBookingVolunteerInfo(int index, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingVolunteerInfo_pre ) { - void (*preHookFunc) (int *index, struct map_session_data *sd); + void (*preHookFunc) (int *index, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingVolunteerInfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingVolunteerInfo_pre[hIndex].func; - preHookFunc(&index, sd); + preHookFunc(&index, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16722,10 +16745,10 @@ void HP_clif_PartyBookingVolunteerInfo(int index, struct map_session_data *sd) { HPMHooks.source.clif.PartyBookingVolunteerInfo(index, sd); } if( HPMHooks.count.HP_clif_PartyBookingVolunteerInfo_post ) { - void (*postHookFunc) (int *index, struct map_session_data *sd); + void (*postHookFunc) (int index, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingVolunteerInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingVolunteerInfo_post[hIndex].func; - postHookFunc(&index, sd); + postHookFunc(index, sd); } } return; @@ -16733,11 +16756,11 @@ void HP_clif_PartyBookingVolunteerInfo(int index, struct map_session_data *sd) { void HP_clif_PartyBookingRefuseVolunteer(unsigned int aid, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingRefuseVolunteer_pre ) { - void (*preHookFunc) (unsigned int *aid, struct map_session_data *sd); + void (*preHookFunc) (unsigned int *aid, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingRefuseVolunteer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingRefuseVolunteer_pre[hIndex].func; - preHookFunc(&aid, sd); + preHookFunc(&aid, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16748,10 +16771,10 @@ void HP_clif_PartyBookingRefuseVolunteer(unsigned int aid, struct map_session_da HPMHooks.source.clif.PartyBookingRefuseVolunteer(aid, sd); } if( HPMHooks.count.HP_clif_PartyBookingRefuseVolunteer_post ) { - void (*postHookFunc) (unsigned int *aid, struct map_session_data *sd); + void (*postHookFunc) (unsigned int aid, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingRefuseVolunteer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingRefuseVolunteer_post[hIndex].func; - postHookFunc(&aid, sd); + postHookFunc(aid, sd); } } return; @@ -16759,11 +16782,11 @@ void HP_clif_PartyBookingRefuseVolunteer(unsigned int aid, struct map_session_da void HP_clif_PartyBookingCancelVolunteer(int index, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingCancelVolunteer_pre ) { - void (*preHookFunc) (int *index, struct map_session_data *sd); + void (*preHookFunc) (int *index, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingCancelVolunteer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingCancelVolunteer_pre[hIndex].func; - preHookFunc(&index, sd); + preHookFunc(&index, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16774,10 +16797,10 @@ void HP_clif_PartyBookingCancelVolunteer(int index, struct map_session_data *sd) HPMHooks.source.clif.PartyBookingCancelVolunteer(index, sd); } if( HPMHooks.count.HP_clif_PartyBookingCancelVolunteer_post ) { - void (*postHookFunc) (int *index, struct map_session_data *sd); + void (*postHookFunc) (int index, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingCancelVolunteer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingCancelVolunteer_post[hIndex].func; - postHookFunc(&index, sd); + postHookFunc(index, sd); } } return; @@ -16785,11 +16808,11 @@ void HP_clif_PartyBookingCancelVolunteer(int index, struct map_session_data *sd) void HP_clif_PartyBookingAddFilteringList(int index, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingAddFilteringList_pre ) { - void (*preHookFunc) (int *index, struct map_session_data *sd); + void (*preHookFunc) (int *index, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingAddFilteringList_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingAddFilteringList_pre[hIndex].func; - preHookFunc(&index, sd); + preHookFunc(&index, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16800,10 +16823,10 @@ void HP_clif_PartyBookingAddFilteringList(int index, struct map_session_data *sd HPMHooks.source.clif.PartyBookingAddFilteringList(index, sd); } if( HPMHooks.count.HP_clif_PartyBookingAddFilteringList_post ) { - void (*postHookFunc) (int *index, struct map_session_data *sd); + void (*postHookFunc) (int index, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingAddFilteringList_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingAddFilteringList_post[hIndex].func; - postHookFunc(&index, sd); + postHookFunc(index, sd); } } return; @@ -16811,11 +16834,11 @@ void HP_clif_PartyBookingAddFilteringList(int index, struct map_session_data *sd void HP_clif_PartyBookingSubFilteringList(int gid, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingSubFilteringList_pre ) { - void (*preHookFunc) (int *gid, struct map_session_data *sd); + void (*preHookFunc) (int *gid, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingSubFilteringList_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingSubFilteringList_pre[hIndex].func; - preHookFunc(&gid, sd); + preHookFunc(&gid, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16826,10 +16849,10 @@ void HP_clif_PartyBookingSubFilteringList(int gid, struct map_session_data *sd) HPMHooks.source.clif.PartyBookingSubFilteringList(gid, sd); } if( HPMHooks.count.HP_clif_PartyBookingSubFilteringList_post ) { - void (*postHookFunc) (int *gid, struct map_session_data *sd); + void (*postHookFunc) (int gid, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingSubFilteringList_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingSubFilteringList_post[hIndex].func; - postHookFunc(&gid, sd); + postHookFunc(gid, sd); } } return; @@ -16837,11 +16860,11 @@ void HP_clif_PartyBookingSubFilteringList(int gid, struct map_session_data *sd) void HP_clif_buyingstore_open(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_open_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_open_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16863,11 +16886,11 @@ void HP_clif_buyingstore_open(struct map_session_data *sd) { void HP_clif_buyingstore_open_failed(struct map_session_data *sd, unsigned short result, unsigned int weight) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_open_failed_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *result, unsigned int *weight); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *result, unsigned int *weight); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_open_failed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_open_failed_pre[hIndex].func; - preHookFunc(sd, &result, &weight); + preHookFunc(&sd, &result, &weight); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16878,10 +16901,10 @@ void HP_clif_buyingstore_open_failed(struct map_session_data *sd, unsigned short HPMHooks.source.clif.buyingstore_open_failed(sd, result, weight); } if( HPMHooks.count.HP_clif_buyingstore_open_failed_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *result, unsigned int *weight); + void (*postHookFunc) (struct map_session_data *sd, unsigned short result, unsigned int weight); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_open_failed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_buyingstore_open_failed_post[hIndex].func; - postHookFunc(sd, &result, &weight); + postHookFunc(sd, result, weight); } } return; @@ -16889,11 +16912,11 @@ void HP_clif_buyingstore_open_failed(struct map_session_data *sd, unsigned short void HP_clif_buyingstore_myitemlist(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_myitemlist_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_myitemlist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_myitemlist_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16915,11 +16938,11 @@ void HP_clif_buyingstore_myitemlist(struct map_session_data *sd) { void HP_clif_buyingstore_entry(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_entry_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_entry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_entry_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16941,11 +16964,11 @@ void HP_clif_buyingstore_entry(struct map_session_data *sd) { void HP_clif_buyingstore_entry_single(struct map_session_data *sd, struct map_session_data *pl_sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_entry_single_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *pl_sd); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **pl_sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_entry_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_entry_single_pre[hIndex].func; - preHookFunc(sd, pl_sd); + preHookFunc(&sd, &pl_sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16967,11 +16990,11 @@ void HP_clif_buyingstore_entry_single(struct map_session_data *sd, struct map_se void HP_clif_buyingstore_disappear_entry(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_disappear_entry_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_disappear_entry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_disappear_entry_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -16993,11 +17016,11 @@ void HP_clif_buyingstore_disappear_entry(struct map_session_data *sd) { void HP_clif_buyingstore_disappear_entry_single(struct map_session_data *sd, struct map_session_data *pl_sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_disappear_entry_single_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *pl_sd); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **pl_sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_disappear_entry_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_disappear_entry_single_pre[hIndex].func; - preHookFunc(sd, pl_sd); + preHookFunc(&sd, &pl_sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17019,11 +17042,11 @@ void HP_clif_buyingstore_disappear_entry_single(struct map_session_data *sd, str void HP_clif_buyingstore_itemlist(struct map_session_data *sd, struct map_session_data *pl_sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_itemlist_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *pl_sd); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **pl_sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_itemlist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_itemlist_pre[hIndex].func; - preHookFunc(sd, pl_sd); + preHookFunc(&sd, &pl_sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17045,11 +17068,11 @@ void HP_clif_buyingstore_itemlist(struct map_session_data *sd, struct map_sessio void HP_clif_buyingstore_trade_failed_buyer(struct map_session_data *sd, short result) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_trade_failed_buyer_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *result); + void (*preHookFunc) (struct map_session_data **sd, short *result); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_trade_failed_buyer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_trade_failed_buyer_pre[hIndex].func; - preHookFunc(sd, &result); + preHookFunc(&sd, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17060,10 +17083,10 @@ void HP_clif_buyingstore_trade_failed_buyer(struct map_session_data *sd, short r HPMHooks.source.clif.buyingstore_trade_failed_buyer(sd, result); } if( HPMHooks.count.HP_clif_buyingstore_trade_failed_buyer_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *result); + void (*postHookFunc) (struct map_session_data *sd, short result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_trade_failed_buyer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_buyingstore_trade_failed_buyer_post[hIndex].func; - postHookFunc(sd, &result); + postHookFunc(sd, result); } } return; @@ -17071,11 +17094,11 @@ void HP_clif_buyingstore_trade_failed_buyer(struct map_session_data *sd, short r void HP_clif_buyingstore_update_item(struct map_session_data *sd, unsigned short nameid, unsigned short amount) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_update_item_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *nameid, unsigned short *amount); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *nameid, unsigned short *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_update_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_update_item_pre[hIndex].func; - preHookFunc(sd, &nameid, &amount); + preHookFunc(&sd, &nameid, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17086,10 +17109,10 @@ void HP_clif_buyingstore_update_item(struct map_session_data *sd, unsigned short HPMHooks.source.clif.buyingstore_update_item(sd, nameid, amount); } if( HPMHooks.count.HP_clif_buyingstore_update_item_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *nameid, unsigned short *amount); + void (*postHookFunc) (struct map_session_data *sd, unsigned short nameid, unsigned short amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_update_item_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_buyingstore_update_item_post[hIndex].func; - postHookFunc(sd, &nameid, &amount); + postHookFunc(sd, nameid, amount); } } return; @@ -17097,11 +17120,11 @@ void HP_clif_buyingstore_update_item(struct map_session_data *sd, unsigned short void HP_clif_buyingstore_delete_item(struct map_session_data *sd, short index, unsigned short amount, int price) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_delete_item_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *index, unsigned short *amount, int *price); + void (*preHookFunc) (struct map_session_data **sd, short *index, unsigned short *amount, int *price); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_delete_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_delete_item_pre[hIndex].func; - preHookFunc(sd, &index, &amount, &price); + preHookFunc(&sd, &index, &amount, &price); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17112,10 +17135,10 @@ void HP_clif_buyingstore_delete_item(struct map_session_data *sd, short index, u HPMHooks.source.clif.buyingstore_delete_item(sd, index, amount, price); } if( HPMHooks.count.HP_clif_buyingstore_delete_item_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *index, unsigned short *amount, int *price); + void (*postHookFunc) (struct map_session_data *sd, short index, unsigned short amount, int price); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_delete_item_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_buyingstore_delete_item_post[hIndex].func; - postHookFunc(sd, &index, &amount, &price); + postHookFunc(sd, index, amount, price); } } return; @@ -17123,11 +17146,11 @@ void HP_clif_buyingstore_delete_item(struct map_session_data *sd, short index, u void HP_clif_buyingstore_trade_failed_seller(struct map_session_data *sd, short result, unsigned short nameid) { int hIndex = 0; if( HPMHooks.count.HP_clif_buyingstore_trade_failed_seller_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *result, unsigned short *nameid); + void (*preHookFunc) (struct map_session_data **sd, short *result, unsigned short *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_trade_failed_seller_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_buyingstore_trade_failed_seller_pre[hIndex].func; - preHookFunc(sd, &result, &nameid); + preHookFunc(&sd, &result, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17138,10 +17161,10 @@ void HP_clif_buyingstore_trade_failed_seller(struct map_session_data *sd, short HPMHooks.source.clif.buyingstore_trade_failed_seller(sd, result, nameid); } if( HPMHooks.count.HP_clif_buyingstore_trade_failed_seller_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *result, unsigned short *nameid); + void (*postHookFunc) (struct map_session_data *sd, short result, unsigned short nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_buyingstore_trade_failed_seller_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_buyingstore_trade_failed_seller_post[hIndex].func; - postHookFunc(sd, &result, &nameid); + postHookFunc(sd, result, nameid); } } return; @@ -17149,11 +17172,11 @@ void HP_clif_buyingstore_trade_failed_seller(struct map_session_data *sd, short void HP_clif_search_store_info_ack(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_search_store_info_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_search_store_info_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_search_store_info_ack_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17175,11 +17198,11 @@ void HP_clif_search_store_info_ack(struct map_session_data *sd) { void HP_clif_search_store_info_failed(struct map_session_data *sd, unsigned char reason) { int hIndex = 0; if( HPMHooks.count.HP_clif_search_store_info_failed_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *reason); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *reason); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_search_store_info_failed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_search_store_info_failed_pre[hIndex].func; - preHookFunc(sd, &reason); + preHookFunc(&sd, &reason); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17190,10 +17213,10 @@ void HP_clif_search_store_info_failed(struct map_session_data *sd, unsigned char HPMHooks.source.clif.search_store_info_failed(sd, reason); } if( HPMHooks.count.HP_clif_search_store_info_failed_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *reason); + void (*postHookFunc) (struct map_session_data *sd, unsigned char reason); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_search_store_info_failed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_search_store_info_failed_post[hIndex].func; - postHookFunc(sd, &reason); + postHookFunc(sd, reason); } } return; @@ -17201,11 +17224,11 @@ void HP_clif_search_store_info_failed(struct map_session_data *sd, unsigned char void HP_clif_open_search_store_info(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_open_search_store_info_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_open_search_store_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_open_search_store_info_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17227,11 +17250,11 @@ void HP_clif_open_search_store_info(struct map_session_data *sd) { void HP_clif_search_store_info_click_ack(struct map_session_data *sd, short x, short y) { int hIndex = 0; if( HPMHooks.count.HP_clif_search_store_info_click_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *x, short *y); + void (*preHookFunc) (struct map_session_data **sd, short *x, short *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_search_store_info_click_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_search_store_info_click_ack_pre[hIndex].func; - preHookFunc(sd, &x, &y); + preHookFunc(&sd, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17242,10 +17265,10 @@ void HP_clif_search_store_info_click_ack(struct map_session_data *sd, short x, s HPMHooks.source.clif.search_store_info_click_ack(sd, x, y); } if( HPMHooks.count.HP_clif_search_store_info_click_ack_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *x, short *y); + void (*postHookFunc) (struct map_session_data *sd, short x, short y); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_search_store_info_click_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_search_store_info_click_ack_post[hIndex].func; - postHookFunc(sd, &x, &y); + postHookFunc(sd, x, y); } } return; @@ -17253,11 +17276,11 @@ void HP_clif_search_store_info_click_ack(struct map_session_data *sd, short x, s void HP_clif_elemental_info(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_elemental_info_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_elemental_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_elemental_info_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17279,11 +17302,11 @@ void HP_clif_elemental_info(struct map_session_data *sd) { void HP_clif_elemental_updatestatus(struct map_session_data *sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_elemental_updatestatus_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_elemental_updatestatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_elemental_updatestatus_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17294,10 +17317,10 @@ void HP_clif_elemental_updatestatus(struct map_session_data *sd, int type) { HPMHooks.source.clif.elemental_updatestatus(sd, type); } if( HPMHooks.count.HP_clif_elemental_updatestatus_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_elemental_updatestatus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_elemental_updatestatus_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -17305,11 +17328,11 @@ void HP_clif_elemental_updatestatus(struct map_session_data *sd, int type) { void HP_clif_bgqueue_ack(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_ACK response, unsigned char arena_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_bgqueue_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_ACK *response, unsigned char *arena_id); + void (*preHookFunc) (struct map_session_data **sd, enum BATTLEGROUNDS_QUEUE_ACK *response, unsigned char *arena_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bgqueue_ack_pre[hIndex].func; - preHookFunc(sd, &response, &arena_id); + preHookFunc(&sd, &response, &arena_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17320,10 +17343,10 @@ void HP_clif_bgqueue_ack(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_A HPMHooks.source.clif.bgqueue_ack(sd, response, arena_id); } if( HPMHooks.count.HP_clif_bgqueue_ack_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_ACK *response, unsigned char *arena_id); + void (*postHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_ACK response, unsigned char arena_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bgqueue_ack_post[hIndex].func; - postHookFunc(sd, &response, &arena_id); + postHookFunc(sd, response, arena_id); } } return; @@ -17331,11 +17354,11 @@ void HP_clif_bgqueue_ack(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_A void HP_clif_bgqueue_notice_delete(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED response, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_bgqueue_notice_delete_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED *response, const char *name); + void (*preHookFunc) (struct map_session_data **sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED *response, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_notice_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bgqueue_notice_delete_pre[hIndex].func; - preHookFunc(sd, &response, name); + preHookFunc(&sd, &response, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17346,10 +17369,10 @@ void HP_clif_bgqueue_notice_delete(struct map_session_data *sd, enum BATTLEGROUN HPMHooks.source.clif.bgqueue_notice_delete(sd, response, name); } if( HPMHooks.count.HP_clif_bgqueue_notice_delete_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED *response, const char *name); + void (*postHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED response, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_notice_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bgqueue_notice_delete_post[hIndex].func; - postHookFunc(sd, &response, name); + postHookFunc(sd, response, name); } } return; @@ -17357,11 +17380,11 @@ void HP_clif_bgqueue_notice_delete(struct map_session_data *sd, enum BATTLEGROUN void HP_clif_bgqueue_update_info(struct map_session_data *sd, unsigned char arena_id, int position) { int hIndex = 0; if( HPMHooks.count.HP_clif_bgqueue_update_info_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *arena_id, int *position); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *arena_id, int *position); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_update_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bgqueue_update_info_pre[hIndex].func; - preHookFunc(sd, &arena_id, &position); + preHookFunc(&sd, &arena_id, &position); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17372,10 +17395,10 @@ void HP_clif_bgqueue_update_info(struct map_session_data *sd, unsigned char aren HPMHooks.source.clif.bgqueue_update_info(sd, arena_id, position); } if( HPMHooks.count.HP_clif_bgqueue_update_info_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *arena_id, int *position); + void (*postHookFunc) (struct map_session_data *sd, unsigned char arena_id, int position); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_update_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bgqueue_update_info_post[hIndex].func; - postHookFunc(sd, &arena_id, &position); + postHookFunc(sd, arena_id, position); } } return; @@ -17383,11 +17406,11 @@ void HP_clif_bgqueue_update_info(struct map_session_data *sd, unsigned char aren void HP_clif_bgqueue_joined(struct map_session_data *sd, int pos) { int hIndex = 0; if( HPMHooks.count.HP_clif_bgqueue_joined_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *pos); + void (*preHookFunc) (struct map_session_data **sd, int *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_joined_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bgqueue_joined_pre[hIndex].func; - preHookFunc(sd, &pos); + preHookFunc(&sd, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17398,10 +17421,10 @@ void HP_clif_bgqueue_joined(struct map_session_data *sd, int pos) { HPMHooks.source.clif.bgqueue_joined(sd, pos); } if( HPMHooks.count.HP_clif_bgqueue_joined_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *pos); + void (*postHookFunc) (struct map_session_data *sd, int pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_joined_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bgqueue_joined_post[hIndex].func; - postHookFunc(sd, &pos); + postHookFunc(sd, pos); } } return; @@ -17409,11 +17432,11 @@ void HP_clif_bgqueue_joined(struct map_session_data *sd, int pos) { void HP_clif_bgqueue_pcleft(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_bgqueue_pcleft_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_pcleft_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bgqueue_pcleft_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17435,11 +17458,11 @@ void HP_clif_bgqueue_pcleft(struct map_session_data *sd) { void HP_clif_bgqueue_battlebegins(struct map_session_data *sd, unsigned char arena_id, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_bgqueue_battlebegins_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *arena_id, enum send_target *target); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *arena_id, enum send_target *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_battlebegins_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bgqueue_battlebegins_pre[hIndex].func; - preHookFunc(sd, &arena_id, &target); + preHookFunc(&sd, &arena_id, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17450,10 +17473,10 @@ void HP_clif_bgqueue_battlebegins(struct map_session_data *sd, unsigned char are HPMHooks.source.clif.bgqueue_battlebegins(sd, arena_id, target); } if( HPMHooks.count.HP_clif_bgqueue_battlebegins_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *arena_id, enum send_target *target); + void (*postHookFunc) (struct map_session_data *sd, unsigned char arena_id, enum send_target target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_battlebegins_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bgqueue_battlebegins_post[hIndex].func; - postHookFunc(sd, &arena_id, &target); + postHookFunc(sd, arena_id, target); } } return; @@ -17461,11 +17484,11 @@ void HP_clif_bgqueue_battlebegins(struct map_session_data *sd, unsigned char are void HP_clif_adopt_reply(struct map_session_data *sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_adopt_reply_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_adopt_reply_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_adopt_reply_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17476,10 +17499,10 @@ void HP_clif_adopt_reply(struct map_session_data *sd, int type) { HPMHooks.source.clif.adopt_reply(sd, type); } if( HPMHooks.count.HP_clif_adopt_reply_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_adopt_reply_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_adopt_reply_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -17487,11 +17510,11 @@ void HP_clif_adopt_reply(struct map_session_data *sd, int type) { void HP_clif_adopt_request(struct map_session_data *sd, struct map_session_data *src, int p_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_adopt_request_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *src, int *p_id); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **src, int *p_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_adopt_request_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_adopt_request_pre[hIndex].func; - preHookFunc(sd, src, &p_id); + preHookFunc(&sd, &src, &p_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17502,10 +17525,10 @@ void HP_clif_adopt_request(struct map_session_data *sd, struct map_session_data HPMHooks.source.clif.adopt_request(sd, src, p_id); } if( HPMHooks.count.HP_clif_adopt_request_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *src, int *p_id); + void (*postHookFunc) (struct map_session_data *sd, struct map_session_data *src, int p_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_adopt_request_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_adopt_request_post[hIndex].func; - postHookFunc(sd, src, &p_id); + postHookFunc(sd, src, p_id); } } return; @@ -17528,10 +17551,10 @@ void HP_clif_readbook(int fd, int book_id, int page) { HPMHooks.source.clif.readbook(fd, book_id, page); } if( HPMHooks.count.HP_clif_readbook_post ) { - void (*postHookFunc) (int *fd, int *book_id, int *page); + void (*postHookFunc) (int fd, int book_id, int page); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_readbook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_readbook_post[hIndex].func; - postHookFunc(&fd, &book_id, &page); + postHookFunc(fd, book_id, page); } } return; @@ -17539,11 +17562,11 @@ void HP_clif_readbook(int fd, int book_id, int page) { void HP_clif_notify_time(struct map_session_data *sd, int64 time) { int hIndex = 0; if( HPMHooks.count.HP_clif_notify_time_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int64 *time); + void (*preHookFunc) (struct map_session_data **sd, int64 *time); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_notify_time_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_notify_time_pre[hIndex].func; - preHookFunc(sd, &time); + preHookFunc(&sd, &time); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17554,10 +17577,10 @@ void HP_clif_notify_time(struct map_session_data *sd, int64 time) { HPMHooks.source.clif.notify_time(sd, time); } if( HPMHooks.count.HP_clif_notify_time_post ) { - void (*postHookFunc) (struct map_session_data *sd, int64 *time); + void (*postHookFunc) (struct map_session_data *sd, int64 time); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_notify_time_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_notify_time_post[hIndex].func; - postHookFunc(sd, &time); + postHookFunc(sd, time); } } return; @@ -17565,11 +17588,11 @@ void HP_clif_notify_time(struct map_session_data *sd, int64 time) { void HP_clif_user_count(struct map_session_data *sd, int count) { int hIndex = 0; if( HPMHooks.count.HP_clif_user_count_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *count); + void (*preHookFunc) (struct map_session_data **sd, int *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_user_count_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_user_count_pre[hIndex].func; - preHookFunc(sd, &count); + preHookFunc(&sd, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17580,10 +17603,10 @@ void HP_clif_user_count(struct map_session_data *sd, int count) { HPMHooks.source.clif.user_count(sd, count); } if( HPMHooks.count.HP_clif_user_count_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *count); + void (*postHookFunc) (struct map_session_data *sd, int count); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_user_count_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_user_count_post[hIndex].func; - postHookFunc(sd, &count); + postHookFunc(sd, count); } } return; @@ -17591,11 +17614,11 @@ void HP_clif_user_count(struct map_session_data *sd, int count) { void HP_clif_noask_sub(struct map_session_data *src, struct map_session_data *target, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_noask_sub_pre ) { - void (*preHookFunc) (struct map_session_data *src, struct map_session_data *target, int *type); + void (*preHookFunc) (struct map_session_data **src, struct map_session_data **target, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_noask_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_noask_sub_pre[hIndex].func; - preHookFunc(src, target, &type); + preHookFunc(&src, &target, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17606,10 +17629,10 @@ void HP_clif_noask_sub(struct map_session_data *src, struct map_session_data *ta HPMHooks.source.clif.noask_sub(src, target, type); } if( HPMHooks.count.HP_clif_noask_sub_post ) { - void (*postHookFunc) (struct map_session_data *src, struct map_session_data *target, int *type); + void (*postHookFunc) (struct map_session_data *src, struct map_session_data *target, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_noask_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_noask_sub_post[hIndex].func; - postHookFunc(src, target, &type); + postHookFunc(src, target, type); } } return; @@ -17643,11 +17666,11 @@ void HP_clif_bc_ready(void) { void HP_clif_channel_msg(struct channel_data *chan, struct map_session_data *sd, char *msg) { int hIndex = 0; if( HPMHooks.count.HP_clif_channel_msg_pre ) { - void (*preHookFunc) (struct channel_data *chan, struct map_session_data *sd, char *msg); + void (*preHookFunc) (struct channel_data **chan, struct map_session_data **sd, char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_channel_msg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_channel_msg_pre[hIndex].func; - preHookFunc(chan, sd, msg); + preHookFunc(&chan, &sd, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17669,11 +17692,11 @@ void HP_clif_channel_msg(struct channel_data *chan, struct map_session_data *sd, void HP_clif_channel_msg2(struct channel_data *chan, char *msg) { int hIndex = 0; if( HPMHooks.count.HP_clif_channel_msg2_pre ) { - void (*preHookFunc) (struct channel_data *chan, char *msg); + void (*preHookFunc) (struct channel_data **chan, char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_channel_msg2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_channel_msg2_pre[hIndex].func; - preHookFunc(chan, msg); + preHookFunc(&chan, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17711,10 +17734,10 @@ int HP_clif_undisguise_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.clif.undisguise_timer(tid, tick, id, data); } if( HPMHooks.count.HP_clif_undisguise_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_undisguise_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_undisguise_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -17722,11 +17745,11 @@ int HP_clif_undisguise_timer(int tid, int64 tick, int id, intptr_t data) { void HP_clif_bank_deposit(struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK reason) { int hIndex = 0; if( HPMHooks.count.HP_clif_bank_deposit_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK *reason); + void (*preHookFunc) (struct map_session_data **sd, enum e_BANKING_DEPOSIT_ACK *reason); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_deposit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bank_deposit_pre[hIndex].func; - preHookFunc(sd, &reason); + preHookFunc(&sd, &reason); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17737,10 +17760,10 @@ void HP_clif_bank_deposit(struct map_session_data *sd, enum e_BANKING_DEPOSIT_AC HPMHooks.source.clif.bank_deposit(sd, reason); } if( HPMHooks.count.HP_clif_bank_deposit_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK *reason); + void (*postHookFunc) (struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK reason); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_deposit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bank_deposit_post[hIndex].func; - postHookFunc(sd, &reason); + postHookFunc(sd, reason); } } return; @@ -17748,11 +17771,11 @@ void HP_clif_bank_deposit(struct map_session_data *sd, enum e_BANKING_DEPOSIT_AC void HP_clif_bank_withdraw(struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK reason) { int hIndex = 0; if( HPMHooks.count.HP_clif_bank_withdraw_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK *reason); + void (*preHookFunc) (struct map_session_data **sd, enum e_BANKING_WITHDRAW_ACK *reason); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_withdraw_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bank_withdraw_pre[hIndex].func; - preHookFunc(sd, &reason); + preHookFunc(&sd, &reason); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17763,10 +17786,10 @@ void HP_clif_bank_withdraw(struct map_session_data *sd, enum e_BANKING_WITHDRAW_ HPMHooks.source.clif.bank_withdraw(sd, reason); } if( HPMHooks.count.HP_clif_bank_withdraw_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK *reason); + void (*postHookFunc) (struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK reason); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_withdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bank_withdraw_post[hIndex].func; - postHookFunc(sd, &reason); + postHookFunc(sd, reason); } } return; @@ -17774,11 +17797,11 @@ void HP_clif_bank_withdraw(struct map_session_data *sd, enum e_BANKING_WITHDRAW_ void HP_clif_show_modifiers(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_show_modifiers_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_show_modifiers_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_show_modifiers_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17800,11 +17823,11 @@ void HP_clif_show_modifiers(struct map_session_data *sd) { void HP_clif_notify_bounditem(struct map_session_data *sd, unsigned short index) { int hIndex = 0; if( HPMHooks.count.HP_clif_notify_bounditem_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned short *index); + void (*preHookFunc) (struct map_session_data **sd, unsigned short *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_notify_bounditem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_notify_bounditem_pre[hIndex].func; - preHookFunc(sd, &index); + preHookFunc(&sd, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17815,10 +17838,10 @@ void HP_clif_notify_bounditem(struct map_session_data *sd, unsigned short index) HPMHooks.source.clif.notify_bounditem(sd, index); } if( HPMHooks.count.HP_clif_notify_bounditem_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned short *index); + void (*postHookFunc) (struct map_session_data *sd, unsigned short index); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_notify_bounditem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_notify_bounditem_post[hIndex].func; - postHookFunc(sd, &index); + postHookFunc(sd, index); } } return; @@ -17827,11 +17850,11 @@ int HP_clif_delay_damage(int64 tick, struct block_list *src, struct block_list * int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_delay_damage_pre ) { - int (*preHookFunc) (int64 *tick, struct block_list *src, struct block_list *dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type); + int (*preHookFunc) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_delay_damage_pre[hIndex].func; - retVal___ = preHookFunc(&tick, src, dst, &sdelay, &ddelay, &in_damage, &div, &type); + retVal___ = preHookFunc(&tick, &src, &dst, &sdelay, &ddelay, &in_damage, &div, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17842,10 +17865,10 @@ int HP_clif_delay_damage(int64 tick, struct block_list *src, struct block_list * retVal___ = HPMHooks.source.clif.delay_damage(tick, src, dst, sdelay, ddelay, in_damage, div, type); } if( HPMHooks.count.HP_clif_delay_damage_post ) { - int (*postHookFunc) (int retVal___, int64 *tick, struct block_list *src, struct block_list *dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type); + int (*postHookFunc) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_delay_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick, src, dst, &sdelay, &ddelay, &in_damage, &div, &type); + retVal___ = postHookFunc(retVal___, tick, src, dst, sdelay, ddelay, in_damage, div, type); } } return retVal___; @@ -17869,10 +17892,10 @@ int HP_clif_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.clif.delay_damage_sub(tid, tick, id, data); } if( HPMHooks.count.HP_clif_delay_damage_sub_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_delay_damage_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -17880,11 +17903,11 @@ int HP_clif_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) { void HP_clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_clif_npc_market_open_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + void (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_npc_market_open_pre[hIndex].func; - preHookFunc(sd, nd); + preHookFunc(&sd, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17906,11 +17929,11 @@ void HP_clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) { void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, const struct itemlist *item_list, unsigned char response) { int hIndex = 0; if( HPMHooks.count.HP_clif_npc_market_purchase_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char *response); + void (*preHookFunc) (struct map_session_data **sd, const struct itemlist **item_list, unsigned char *response); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_pre[hIndex].func; - preHookFunc(sd, item_list, &response); + preHookFunc(&sd, &item_list, &response); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17921,10 +17944,10 @@ void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, const struct i HPMHooks.source.clif.npc_market_purchase_ack(sd, item_list, response); } if( HPMHooks.count.HP_clif_npc_market_purchase_ack_post ) { - void (*postHookFunc) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char *response); + void (*postHookFunc) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char response); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_post[hIndex].func; - postHookFunc(sd, item_list, &response); + postHookFunc(sd, item_list, response); } } return; @@ -17959,11 +17982,11 @@ bool HP_clif_parse_roulette_db(void) { void HP_clif_roulette_generate_ack(struct map_session_data *sd, unsigned char result, short stage, short prizeIdx, short bonusItemID) { int hIndex = 0; if( HPMHooks.count.HP_clif_roulette_generate_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *result, short *stage, short *prizeIdx, short *bonusItemID); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *result, short *stage, short *prizeIdx, short *bonusItemID); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_roulette_generate_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_roulette_generate_ack_pre[hIndex].func; - preHookFunc(sd, &result, &stage, &prizeIdx, &bonusItemID); + preHookFunc(&sd, &result, &stage, &prizeIdx, &bonusItemID); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17974,10 +17997,10 @@ void HP_clif_roulette_generate_ack(struct map_session_data *sd, unsigned char re HPMHooks.source.clif.roulette_generate_ack(sd, result, stage, prizeIdx, bonusItemID); } if( HPMHooks.count.HP_clif_roulette_generate_ack_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *result, short *stage, short *prizeIdx, short *bonusItemID); + void (*postHookFunc) (struct map_session_data *sd, unsigned char result, short stage, short prizeIdx, short bonusItemID); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_roulette_generate_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_roulette_generate_ack_post[hIndex].func; - postHookFunc(sd, &result, &stage, &prizeIdx, &bonusItemID); + postHookFunc(sd, result, stage, prizeIdx, bonusItemID); } } return; @@ -17985,11 +18008,11 @@ void HP_clif_roulette_generate_ack(struct map_session_data *sd, unsigned char re void HP_clif_openmergeitem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_openmergeitem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_openmergeitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_openmergeitem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18000,10 +18023,10 @@ void HP_clif_openmergeitem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.openmergeitem(fd, sd); } if( HPMHooks.count.HP_clif_openmergeitem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_openmergeitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_openmergeitem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18011,11 +18034,11 @@ void HP_clif_openmergeitem(int fd, struct map_session_data *sd) { void HP_clif_cancelmergeitem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_cancelmergeitem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cancelmergeitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_cancelmergeitem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18026,10 +18049,10 @@ void HP_clif_cancelmergeitem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.cancelmergeitem(fd, sd); } if( HPMHooks.count.HP_clif_cancelmergeitem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_cancelmergeitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_cancelmergeitem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18038,11 +18061,11 @@ int HP_clif_comparemergeitem(const void *a, const void *b) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_comparemergeitem_pre ) { - int (*preHookFunc) (const void *a, const void *b); + int (*preHookFunc) (const void **a, const void **b); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_comparemergeitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_comparemergeitem_pre[hIndex].func; - retVal___ = preHookFunc(a, b); + retVal___ = preHookFunc(&a, &b); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18064,11 +18087,11 @@ int HP_clif_comparemergeitem(const void *a, const void *b) { void HP_clif_ackmergeitems(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_ackmergeitems_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_ackmergeitems_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_ackmergeitems_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18079,10 +18102,10 @@ void HP_clif_ackmergeitems(int fd, struct map_session_data *sd) { HPMHooks.source.clif.ackmergeitems(fd, sd); } if( HPMHooks.count.HP_clif_ackmergeitems_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_ackmergeitems_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_ackmergeitems_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18090,11 +18113,11 @@ void HP_clif_ackmergeitems(int fd, struct map_session_data *sd) { void HP_clif_pWantToConnection(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pWantToConnection_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pWantToConnection_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pWantToConnection_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18105,10 +18128,10 @@ void HP_clif_pWantToConnection(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pWantToConnection(fd, sd); } if( HPMHooks.count.HP_clif_pWantToConnection_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pWantToConnection_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pWantToConnection_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18116,11 +18139,11 @@ void HP_clif_pWantToConnection(int fd, struct map_session_data *sd) { void HP_clif_pLoadEndAck(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pLoadEndAck_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLoadEndAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pLoadEndAck_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18131,10 +18154,10 @@ void HP_clif_pLoadEndAck(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pLoadEndAck(fd, sd); } if( HPMHooks.count.HP_clif_pLoadEndAck_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLoadEndAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pLoadEndAck_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18142,11 +18165,11 @@ void HP_clif_pLoadEndAck(int fd, struct map_session_data *sd) { void HP_clif_pTickSend(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pTickSend_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTickSend_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pTickSend_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18157,10 +18180,10 @@ void HP_clif_pTickSend(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pTickSend(fd, sd); } if( HPMHooks.count.HP_clif_pTickSend_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTickSend_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pTickSend_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18168,11 +18191,11 @@ void HP_clif_pTickSend(int fd, struct map_session_data *sd) { void HP_clif_pHotkey(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pHotkey_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pHotkey_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18183,10 +18206,10 @@ void HP_clif_pHotkey(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pHotkey(fd, sd); } if( HPMHooks.count.HP_clif_pHotkey_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pHotkey_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18194,11 +18217,11 @@ void HP_clif_pHotkey(int fd, struct map_session_data *sd) { void HP_clif_pProgressbar(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pProgressbar_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pProgressbar_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pProgressbar_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18209,10 +18232,10 @@ void HP_clif_pProgressbar(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pProgressbar(fd, sd); } if( HPMHooks.count.HP_clif_pProgressbar_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pProgressbar_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pProgressbar_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18220,11 +18243,11 @@ void HP_clif_pProgressbar(int fd, struct map_session_data *sd) { void HP_clif_pWalkToXY(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pWalkToXY_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pWalkToXY_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pWalkToXY_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18235,10 +18258,10 @@ void HP_clif_pWalkToXY(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pWalkToXY(fd, sd); } if( HPMHooks.count.HP_clif_pWalkToXY_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pWalkToXY_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pWalkToXY_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18246,11 +18269,11 @@ void HP_clif_pWalkToXY(int fd, struct map_session_data *sd) { void HP_clif_pQuitGame(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pQuitGame_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pQuitGame_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pQuitGame_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18261,10 +18284,10 @@ void HP_clif_pQuitGame(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pQuitGame(fd, sd); } if( HPMHooks.count.HP_clif_pQuitGame_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pQuitGame_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pQuitGame_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18272,11 +18295,11 @@ void HP_clif_pQuitGame(int fd, struct map_session_data *sd) { void HP_clif_pGetCharNameRequest(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGetCharNameRequest_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGetCharNameRequest_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGetCharNameRequest_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18287,10 +18310,10 @@ void HP_clif_pGetCharNameRequest(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGetCharNameRequest(fd, sd); } if( HPMHooks.count.HP_clif_pGetCharNameRequest_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGetCharNameRequest_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGetCharNameRequest_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18298,11 +18321,11 @@ void HP_clif_pGetCharNameRequest(int fd, struct map_session_data *sd) { void HP_clif_pGlobalMessage(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGlobalMessage_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGlobalMessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGlobalMessage_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18313,10 +18336,10 @@ void HP_clif_pGlobalMessage(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGlobalMessage(fd, sd); } if( HPMHooks.count.HP_clif_pGlobalMessage_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGlobalMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGlobalMessage_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18324,11 +18347,11 @@ void HP_clif_pGlobalMessage(int fd, struct map_session_data *sd) { void HP_clif_pMapMove(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMapMove_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMapMove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMapMove_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18339,10 +18362,10 @@ void HP_clif_pMapMove(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMapMove(fd, sd); } if( HPMHooks.count.HP_clif_pMapMove_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMapMove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMapMove_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18350,11 +18373,11 @@ void HP_clif_pMapMove(int fd, struct map_session_data *sd) { void HP_clif_pChangeDir(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pChangeDir_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangeDir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pChangeDir_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18365,10 +18388,10 @@ void HP_clif_pChangeDir(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pChangeDir(fd, sd); } if( HPMHooks.count.HP_clif_pChangeDir_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangeDir_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pChangeDir_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18376,11 +18399,11 @@ void HP_clif_pChangeDir(int fd, struct map_session_data *sd) { void HP_clif_pEmotion(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pEmotion_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEmotion_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pEmotion_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18391,10 +18414,10 @@ void HP_clif_pEmotion(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pEmotion(fd, sd); } if( HPMHooks.count.HP_clif_pEmotion_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEmotion_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pEmotion_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18402,11 +18425,11 @@ void HP_clif_pEmotion(int fd, struct map_session_data *sd) { void HP_clif_pHowManyConnections(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pHowManyConnections_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHowManyConnections_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pHowManyConnections_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18417,10 +18440,10 @@ void HP_clif_pHowManyConnections(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pHowManyConnections(fd, sd); } if( HPMHooks.count.HP_clif_pHowManyConnections_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHowManyConnections_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pHowManyConnections_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18428,11 +18451,11 @@ void HP_clif_pHowManyConnections(int fd, struct map_session_data *sd) { void HP_clif_pActionRequest(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pActionRequest_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pActionRequest_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pActionRequest_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18443,10 +18466,10 @@ void HP_clif_pActionRequest(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pActionRequest(fd, sd); } if( HPMHooks.count.HP_clif_pActionRequest_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pActionRequest_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pActionRequest_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18454,11 +18477,11 @@ void HP_clif_pActionRequest(int fd, struct map_session_data *sd) { void HP_clif_pActionRequest_sub(struct map_session_data *sd, int action_type, int target_id, int64 tick) { int hIndex = 0; if( HPMHooks.count.HP_clif_pActionRequest_sub_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *action_type, int *target_id, int64 *tick); + void (*preHookFunc) (struct map_session_data **sd, int *action_type, int *target_id, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pActionRequest_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pActionRequest_sub_pre[hIndex].func; - preHookFunc(sd, &action_type, &target_id, &tick); + preHookFunc(&sd, &action_type, &target_id, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18469,10 +18492,10 @@ void HP_clif_pActionRequest_sub(struct map_session_data *sd, int action_type, in HPMHooks.source.clif.pActionRequest_sub(sd, action_type, target_id, tick); } if( HPMHooks.count.HP_clif_pActionRequest_sub_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *action_type, int *target_id, int64 *tick); + void (*postHookFunc) (struct map_session_data *sd, int action_type, int target_id, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pActionRequest_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pActionRequest_sub_post[hIndex].func; - postHookFunc(sd, &action_type, &target_id, &tick); + postHookFunc(sd, action_type, target_id, tick); } } return; @@ -18480,11 +18503,11 @@ void HP_clif_pActionRequest_sub(struct map_session_data *sd, int action_type, in void HP_clif_pRestart(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRestart_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRestart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRestart_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18495,10 +18518,10 @@ void HP_clif_pRestart(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRestart(fd, sd); } if( HPMHooks.count.HP_clif_pRestart_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRestart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRestart_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18506,11 +18529,11 @@ void HP_clif_pRestart(int fd, struct map_session_data *sd) { void HP_clif_pWisMessage(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pWisMessage_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pWisMessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pWisMessage_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18521,10 +18544,10 @@ void HP_clif_pWisMessage(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pWisMessage(fd, sd); } if( HPMHooks.count.HP_clif_pWisMessage_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pWisMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pWisMessage_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18532,11 +18555,11 @@ void HP_clif_pWisMessage(int fd, struct map_session_data *sd) { void HP_clif_pBroadcast(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBroadcast_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBroadcast_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBroadcast_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18547,10 +18570,10 @@ void HP_clif_pBroadcast(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBroadcast(fd, sd); } if( HPMHooks.count.HP_clif_pBroadcast_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBroadcast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBroadcast_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18558,11 +18581,11 @@ void HP_clif_pBroadcast(int fd, struct map_session_data *sd) { void HP_clif_pTakeItem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pTakeItem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTakeItem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pTakeItem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18573,10 +18596,10 @@ void HP_clif_pTakeItem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pTakeItem(fd, sd); } if( HPMHooks.count.HP_clif_pTakeItem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTakeItem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pTakeItem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18584,11 +18607,11 @@ void HP_clif_pTakeItem(int fd, struct map_session_data *sd) { void HP_clif_pDropItem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pDropItem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pDropItem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pDropItem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18599,10 +18622,10 @@ void HP_clif_pDropItem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pDropItem(fd, sd); } if( HPMHooks.count.HP_clif_pDropItem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pDropItem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pDropItem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18610,11 +18633,11 @@ void HP_clif_pDropItem(int fd, struct map_session_data *sd) { void HP_clif_pUseItem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseItem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseItem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseItem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18625,10 +18648,10 @@ void HP_clif_pUseItem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pUseItem(fd, sd); } if( HPMHooks.count.HP_clif_pUseItem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseItem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseItem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18636,11 +18659,11 @@ void HP_clif_pUseItem(int fd, struct map_session_data *sd) { void HP_clif_pEquipItem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pEquipItem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEquipItem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pEquipItem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18651,10 +18674,10 @@ void HP_clif_pEquipItem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pEquipItem(fd, sd); } if( HPMHooks.count.HP_clif_pEquipItem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEquipItem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pEquipItem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18662,11 +18685,11 @@ void HP_clif_pEquipItem(int fd, struct map_session_data *sd) { void HP_clif_pUnequipItem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUnequipItem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUnequipItem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUnequipItem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18677,10 +18700,10 @@ void HP_clif_pUnequipItem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pUnequipItem(fd, sd); } if( HPMHooks.count.HP_clif_pUnequipItem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUnequipItem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUnequipItem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18688,11 +18711,11 @@ void HP_clif_pUnequipItem(int fd, struct map_session_data *sd) { void HP_clif_pNpcClicked(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNpcClicked_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcClicked_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNpcClicked_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18703,10 +18726,10 @@ void HP_clif_pNpcClicked(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNpcClicked(fd, sd); } if( HPMHooks.count.HP_clif_pNpcClicked_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcClicked_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNpcClicked_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18714,11 +18737,11 @@ void HP_clif_pNpcClicked(int fd, struct map_session_data *sd) { void HP_clif_pNpcBuySellSelected(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNpcBuySellSelected_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcBuySellSelected_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNpcBuySellSelected_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18729,10 +18752,10 @@ void HP_clif_pNpcBuySellSelected(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNpcBuySellSelected(fd, sd); } if( HPMHooks.count.HP_clif_pNpcBuySellSelected_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcBuySellSelected_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNpcBuySellSelected_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18740,11 +18763,11 @@ void HP_clif_pNpcBuySellSelected(int fd, struct map_session_data *sd) { void HP_clif_pNpcBuyListSend(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNpcBuyListSend_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcBuyListSend_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNpcBuyListSend_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18755,10 +18778,10 @@ void HP_clif_pNpcBuyListSend(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNpcBuyListSend(fd, sd); } if( HPMHooks.count.HP_clif_pNpcBuyListSend_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcBuyListSend_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNpcBuyListSend_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18766,11 +18789,11 @@ void HP_clif_pNpcBuyListSend(int fd, struct map_session_data *sd) { void HP_clif_pNpcSellListSend(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNpcSellListSend_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcSellListSend_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNpcSellListSend_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18781,10 +18804,10 @@ void HP_clif_pNpcSellListSend(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNpcSellListSend(fd, sd); } if( HPMHooks.count.HP_clif_pNpcSellListSend_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcSellListSend_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNpcSellListSend_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18792,11 +18815,11 @@ void HP_clif_pNpcSellListSend(int fd, struct map_session_data *sd) { void HP_clif_pCreateChatRoom(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCreateChatRoom_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCreateChatRoom_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCreateChatRoom_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18807,10 +18830,10 @@ void HP_clif_pCreateChatRoom(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCreateChatRoom(fd, sd); } if( HPMHooks.count.HP_clif_pCreateChatRoom_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCreateChatRoom_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCreateChatRoom_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18818,11 +18841,11 @@ void HP_clif_pCreateChatRoom(int fd, struct map_session_data *sd) { void HP_clif_pChatAddMember(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pChatAddMember_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChatAddMember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pChatAddMember_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18833,10 +18856,10 @@ void HP_clif_pChatAddMember(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pChatAddMember(fd, sd); } if( HPMHooks.count.HP_clif_pChatAddMember_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChatAddMember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pChatAddMember_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18844,11 +18867,11 @@ void HP_clif_pChatAddMember(int fd, struct map_session_data *sd) { void HP_clif_pChatRoomStatusChange(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pChatRoomStatusChange_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChatRoomStatusChange_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pChatRoomStatusChange_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18859,10 +18882,10 @@ void HP_clif_pChatRoomStatusChange(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pChatRoomStatusChange(fd, sd); } if( HPMHooks.count.HP_clif_pChatRoomStatusChange_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChatRoomStatusChange_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pChatRoomStatusChange_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18870,11 +18893,11 @@ void HP_clif_pChatRoomStatusChange(int fd, struct map_session_data *sd) { void HP_clif_pChangeChatOwner(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pChangeChatOwner_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangeChatOwner_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pChangeChatOwner_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18885,10 +18908,10 @@ void HP_clif_pChangeChatOwner(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pChangeChatOwner(fd, sd); } if( HPMHooks.count.HP_clif_pChangeChatOwner_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangeChatOwner_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pChangeChatOwner_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18896,11 +18919,11 @@ void HP_clif_pChangeChatOwner(int fd, struct map_session_data *sd) { void HP_clif_pKickFromChat(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pKickFromChat_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pKickFromChat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pKickFromChat_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18911,10 +18934,10 @@ void HP_clif_pKickFromChat(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pKickFromChat(fd, sd); } if( HPMHooks.count.HP_clif_pKickFromChat_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pKickFromChat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pKickFromChat_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18922,11 +18945,11 @@ void HP_clif_pKickFromChat(int fd, struct map_session_data *sd) { void HP_clif_pChatLeave(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pChatLeave_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChatLeave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pChatLeave_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18937,10 +18960,10 @@ void HP_clif_pChatLeave(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pChatLeave(fd, sd); } if( HPMHooks.count.HP_clif_pChatLeave_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChatLeave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pChatLeave_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18948,11 +18971,11 @@ void HP_clif_pChatLeave(int fd, struct map_session_data *sd) { void HP_clif_pTradeRequest(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pTradeRequest_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeRequest_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pTradeRequest_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18963,10 +18986,10 @@ void HP_clif_pTradeRequest(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pTradeRequest(fd, sd); } if( HPMHooks.count.HP_clif_pTradeRequest_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeRequest_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pTradeRequest_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -18974,11 +18997,11 @@ void HP_clif_pTradeRequest(int fd, struct map_session_data *sd) { void HP_clif_pTradeAck(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pTradeAck_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pTradeAck_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -18989,10 +19012,10 @@ void HP_clif_pTradeAck(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pTradeAck(fd, sd); } if( HPMHooks.count.HP_clif_pTradeAck_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pTradeAck_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19000,11 +19023,11 @@ void HP_clif_pTradeAck(int fd, struct map_session_data *sd) { void HP_clif_pTradeAddItem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pTradeAddItem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeAddItem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pTradeAddItem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19015,10 +19038,10 @@ void HP_clif_pTradeAddItem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pTradeAddItem(fd, sd); } if( HPMHooks.count.HP_clif_pTradeAddItem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeAddItem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pTradeAddItem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19026,11 +19049,11 @@ void HP_clif_pTradeAddItem(int fd, struct map_session_data *sd) { void HP_clif_pTradeOk(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pTradeOk_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeOk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pTradeOk_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19041,10 +19064,10 @@ void HP_clif_pTradeOk(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pTradeOk(fd, sd); } if( HPMHooks.count.HP_clif_pTradeOk_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeOk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pTradeOk_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19052,11 +19075,11 @@ void HP_clif_pTradeOk(int fd, struct map_session_data *sd) { void HP_clif_pTradeCancel(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pTradeCancel_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeCancel_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pTradeCancel_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19067,10 +19090,10 @@ void HP_clif_pTradeCancel(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pTradeCancel(fd, sd); } if( HPMHooks.count.HP_clif_pTradeCancel_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeCancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pTradeCancel_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19078,11 +19101,11 @@ void HP_clif_pTradeCancel(int fd, struct map_session_data *sd) { void HP_clif_pTradeCommit(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pTradeCommit_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeCommit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pTradeCommit_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19093,10 +19116,10 @@ void HP_clif_pTradeCommit(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pTradeCommit(fd, sd); } if( HPMHooks.count.HP_clif_pTradeCommit_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTradeCommit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pTradeCommit_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19104,11 +19127,11 @@ void HP_clif_pTradeCommit(int fd, struct map_session_data *sd) { void HP_clif_pStopAttack(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pStopAttack_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStopAttack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pStopAttack_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19119,10 +19142,10 @@ void HP_clif_pStopAttack(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pStopAttack(fd, sd); } if( HPMHooks.count.HP_clif_pStopAttack_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStopAttack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pStopAttack_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19130,11 +19153,11 @@ void HP_clif_pStopAttack(int fd, struct map_session_data *sd) { void HP_clif_pPutItemToCart(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPutItemToCart_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPutItemToCart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPutItemToCart_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19145,10 +19168,10 @@ void HP_clif_pPutItemToCart(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPutItemToCart(fd, sd); } if( HPMHooks.count.HP_clif_pPutItemToCart_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPutItemToCart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPutItemToCart_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19156,11 +19179,11 @@ void HP_clif_pPutItemToCart(int fd, struct map_session_data *sd) { void HP_clif_pGetItemFromCart(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGetItemFromCart_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGetItemFromCart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGetItemFromCart_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19171,10 +19194,10 @@ void HP_clif_pGetItemFromCart(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGetItemFromCart(fd, sd); } if( HPMHooks.count.HP_clif_pGetItemFromCart_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGetItemFromCart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGetItemFromCart_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19182,11 +19205,11 @@ void HP_clif_pGetItemFromCart(int fd, struct map_session_data *sd) { void HP_clif_pRemoveOption(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRemoveOption_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRemoveOption_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRemoveOption_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19197,10 +19220,10 @@ void HP_clif_pRemoveOption(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRemoveOption(fd, sd); } if( HPMHooks.count.HP_clif_pRemoveOption_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRemoveOption_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRemoveOption_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19208,11 +19231,11 @@ void HP_clif_pRemoveOption(int fd, struct map_session_data *sd) { void HP_clif_pChangeCart(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pChangeCart_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangeCart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pChangeCart_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19223,10 +19246,10 @@ void HP_clif_pChangeCart(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pChangeCart(fd, sd); } if( HPMHooks.count.HP_clif_pChangeCart_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangeCart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pChangeCart_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19234,11 +19257,11 @@ void HP_clif_pChangeCart(int fd, struct map_session_data *sd) { void HP_clif_pStatusUp(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pStatusUp_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStatusUp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pStatusUp_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19249,10 +19272,10 @@ void HP_clif_pStatusUp(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pStatusUp(fd, sd); } if( HPMHooks.count.HP_clif_pStatusUp_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStatusUp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pStatusUp_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19260,11 +19283,11 @@ void HP_clif_pStatusUp(int fd, struct map_session_data *sd) { void HP_clif_pSkillUp(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSkillUp_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSkillUp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSkillUp_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19275,10 +19298,10 @@ void HP_clif_pSkillUp(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pSkillUp(fd, sd); } if( HPMHooks.count.HP_clif_pSkillUp_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSkillUp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSkillUp_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19286,11 +19309,11 @@ void HP_clif_pSkillUp(int fd, struct map_session_data *sd) { void HP_clif_pUseSkillToId(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseSkillToId_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToId_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseSkillToId_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19301,10 +19324,10 @@ void HP_clif_pUseSkillToId(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pUseSkillToId(fd, sd); } if( HPMHooks.count.HP_clif_pUseSkillToId_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToId_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseSkillToId_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19312,11 +19335,11 @@ void HP_clif_pUseSkillToId(int fd, struct map_session_data *sd) { void HP_clif_pUseSkillToId_homun(struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseSkillToId_homun_pre ) { - void (*preHookFunc) (struct homun_data *hd, struct map_session_data *sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id); + void (*preHookFunc) (struct homun_data **hd, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToId_homun_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseSkillToId_homun_pre[hIndex].func; - preHookFunc(hd, sd, &tick, &skill_id, &skill_lv, &target_id); + preHookFunc(&hd, &sd, &tick, &skill_id, &skill_lv, &target_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19327,10 +19350,10 @@ void HP_clif_pUseSkillToId_homun(struct homun_data *hd, struct map_session_data HPMHooks.source.clif.pUseSkillToId_homun(hd, sd, tick, skill_id, skill_lv, target_id); } if( HPMHooks.count.HP_clif_pUseSkillToId_homun_post ) { - void (*postHookFunc) (struct homun_data *hd, struct map_session_data *sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id); + void (*postHookFunc) (struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToId_homun_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseSkillToId_homun_post[hIndex].func; - postHookFunc(hd, sd, &tick, &skill_id, &skill_lv, &target_id); + postHookFunc(hd, sd, tick, skill_id, skill_lv, target_id); } } return; @@ -19338,11 +19361,11 @@ void HP_clif_pUseSkillToId_homun(struct homun_data *hd, struct map_session_data void HP_clif_pUseSkillToId_mercenary(struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseSkillToId_mercenary_pre ) { - void (*preHookFunc) (struct mercenary_data *md, struct map_session_data *sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id); + void (*preHookFunc) (struct mercenary_data **md, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToId_mercenary_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseSkillToId_mercenary_pre[hIndex].func; - preHookFunc(md, sd, &tick, &skill_id, &skill_lv, &target_id); + preHookFunc(&md, &sd, &tick, &skill_id, &skill_lv, &target_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19353,10 +19376,10 @@ void HP_clif_pUseSkillToId_mercenary(struct mercenary_data *md, struct map_sessi HPMHooks.source.clif.pUseSkillToId_mercenary(md, sd, tick, skill_id, skill_lv, target_id); } if( HPMHooks.count.HP_clif_pUseSkillToId_mercenary_post ) { - void (*postHookFunc) (struct mercenary_data *md, struct map_session_data *sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id); + void (*postHookFunc) (struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToId_mercenary_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseSkillToId_mercenary_post[hIndex].func; - postHookFunc(md, sd, &tick, &skill_id, &skill_lv, &target_id); + postHookFunc(md, sd, tick, skill_id, skill_lv, target_id); } } return; @@ -19364,11 +19387,11 @@ void HP_clif_pUseSkillToId_mercenary(struct mercenary_data *md, struct map_sessi void HP_clif_pUseSkillToPos(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseSkillToPos_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseSkillToPos_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19379,10 +19402,10 @@ void HP_clif_pUseSkillToPos(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pUseSkillToPos(fd, sd); } if( HPMHooks.count.HP_clif_pUseSkillToPos_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseSkillToPos_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19390,11 +19413,11 @@ void HP_clif_pUseSkillToPos(int fd, struct map_session_data *sd) { void HP_clif_pUseSkillToPosSub(int fd, struct map_session_data *sd, uint16 skill_lv, uint16 skill_id, short x, short y, int skillmoreinfo) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseSkillToPosSub_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd, uint16 *skill_lv, uint16 *skill_id, short *x, short *y, int *skillmoreinfo); + void (*preHookFunc) (int *fd, struct map_session_data **sd, uint16 *skill_lv, uint16 *skill_id, short *x, short *y, int *skillmoreinfo); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPosSub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseSkillToPosSub_pre[hIndex].func; - preHookFunc(&fd, sd, &skill_lv, &skill_id, &x, &y, &skillmoreinfo); + preHookFunc(&fd, &sd, &skill_lv, &skill_id, &x, &y, &skillmoreinfo); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19405,10 +19428,10 @@ void HP_clif_pUseSkillToPosSub(int fd, struct map_session_data *sd, uint16 skill HPMHooks.source.clif.pUseSkillToPosSub(fd, sd, skill_lv, skill_id, x, y, skillmoreinfo); } if( HPMHooks.count.HP_clif_pUseSkillToPosSub_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd, uint16 *skill_lv, uint16 *skill_id, short *x, short *y, int *skillmoreinfo); + void (*postHookFunc) (int fd, struct map_session_data *sd, uint16 skill_lv, uint16 skill_id, short x, short y, int skillmoreinfo); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPosSub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseSkillToPosSub_post[hIndex].func; - postHookFunc(&fd, sd, &skill_lv, &skill_id, &x, &y, &skillmoreinfo); + postHookFunc(fd, sd, skill_lv, skill_id, x, y, skillmoreinfo); } } return; @@ -19416,11 +19439,11 @@ void HP_clif_pUseSkillToPosSub(int fd, struct map_session_data *sd, uint16 skill void HP_clif_pUseSkillToPos_homun(struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseSkillToPos_homun_pre ) { - void (*preHookFunc) (struct homun_data *hd, struct map_session_data *sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *skillmoreinfo); + void (*preHookFunc) (struct homun_data **hd, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *skillmoreinfo); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPos_homun_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseSkillToPos_homun_pre[hIndex].func; - preHookFunc(hd, sd, &tick, &skill_id, &skill_lv, &x, &y, &skillmoreinfo); + preHookFunc(&hd, &sd, &tick, &skill_id, &skill_lv, &x, &y, &skillmoreinfo); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19431,10 +19454,10 @@ void HP_clif_pUseSkillToPos_homun(struct homun_data *hd, struct map_session_data HPMHooks.source.clif.pUseSkillToPos_homun(hd, sd, tick, skill_id, skill_lv, x, y, skillmoreinfo); } if( HPMHooks.count.HP_clif_pUseSkillToPos_homun_post ) { - void (*postHookFunc) (struct homun_data *hd, struct map_session_data *sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *skillmoreinfo); + void (*postHookFunc) (struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPos_homun_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseSkillToPos_homun_post[hIndex].func; - postHookFunc(hd, sd, &tick, &skill_id, &skill_lv, &x, &y, &skillmoreinfo); + postHookFunc(hd, sd, tick, skill_id, skill_lv, x, y, skillmoreinfo); } } return; @@ -19442,11 +19465,11 @@ void HP_clif_pUseSkillToPos_homun(struct homun_data *hd, struct map_session_data void HP_clif_pUseSkillToPos_mercenary(struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseSkillToPos_mercenary_pre ) { - void (*preHookFunc) (struct mercenary_data *md, struct map_session_data *sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *skillmoreinfo); + void (*preHookFunc) (struct mercenary_data **md, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *skillmoreinfo); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPos_mercenary_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseSkillToPos_mercenary_pre[hIndex].func; - preHookFunc(md, sd, &tick, &skill_id, &skill_lv, &x, &y, &skillmoreinfo); + preHookFunc(&md, &sd, &tick, &skill_id, &skill_lv, &x, &y, &skillmoreinfo); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19457,10 +19480,10 @@ void HP_clif_pUseSkillToPos_mercenary(struct mercenary_data *md, struct map_sess HPMHooks.source.clif.pUseSkillToPos_mercenary(md, sd, tick, skill_id, skill_lv, x, y, skillmoreinfo); } if( HPMHooks.count.HP_clif_pUseSkillToPos_mercenary_post ) { - void (*postHookFunc) (struct mercenary_data *md, struct map_session_data *sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *skillmoreinfo); + void (*postHookFunc) (struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPos_mercenary_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseSkillToPos_mercenary_post[hIndex].func; - postHookFunc(md, sd, &tick, &skill_id, &skill_lv, &x, &y, &skillmoreinfo); + postHookFunc(md, sd, tick, skill_id, skill_lv, x, y, skillmoreinfo); } } return; @@ -19468,11 +19491,11 @@ void HP_clif_pUseSkillToPos_mercenary(struct mercenary_data *md, struct map_sess void HP_clif_pUseSkillToPosMoreInfo(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseSkillToPosMoreInfo_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPosMoreInfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseSkillToPosMoreInfo_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19483,10 +19506,10 @@ void HP_clif_pUseSkillToPosMoreInfo(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pUseSkillToPosMoreInfo(fd, sd); } if( HPMHooks.count.HP_clif_pUseSkillToPosMoreInfo_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillToPosMoreInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseSkillToPosMoreInfo_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19494,11 +19517,11 @@ void HP_clif_pUseSkillToPosMoreInfo(int fd, struct map_session_data *sd) { void HP_clif_pUseSkillMap(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseSkillMap_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillMap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseSkillMap_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19509,10 +19532,10 @@ void HP_clif_pUseSkillMap(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pUseSkillMap(fd, sd); } if( HPMHooks.count.HP_clif_pUseSkillMap_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseSkillMap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseSkillMap_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19520,11 +19543,11 @@ void HP_clif_pUseSkillMap(int fd, struct map_session_data *sd) { void HP_clif_pRequestMemo(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRequestMemo_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRequestMemo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRequestMemo_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19535,10 +19558,10 @@ void HP_clif_pRequestMemo(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRequestMemo(fd, sd); } if( HPMHooks.count.HP_clif_pRequestMemo_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRequestMemo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRequestMemo_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19546,11 +19569,11 @@ void HP_clif_pRequestMemo(int fd, struct map_session_data *sd) { void HP_clif_pProduceMix(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pProduceMix_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pProduceMix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pProduceMix_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19561,10 +19584,10 @@ void HP_clif_pProduceMix(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pProduceMix(fd, sd); } if( HPMHooks.count.HP_clif_pProduceMix_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pProduceMix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pProduceMix_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19572,11 +19595,11 @@ void HP_clif_pProduceMix(int fd, struct map_session_data *sd) { void HP_clif_pCooking(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCooking_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCooking_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCooking_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19587,10 +19610,10 @@ void HP_clif_pCooking(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCooking(fd, sd); } if( HPMHooks.count.HP_clif_pCooking_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCooking_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCooking_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19598,11 +19621,11 @@ void HP_clif_pCooking(int fd, struct map_session_data *sd) { void HP_clif_pRepairItem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRepairItem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRepairItem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRepairItem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19613,10 +19636,10 @@ void HP_clif_pRepairItem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRepairItem(fd, sd); } if( HPMHooks.count.HP_clif_pRepairItem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRepairItem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRepairItem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19624,11 +19647,11 @@ void HP_clif_pRepairItem(int fd, struct map_session_data *sd) { void HP_clif_pWeaponRefine(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pWeaponRefine_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pWeaponRefine_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pWeaponRefine_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19639,10 +19662,10 @@ void HP_clif_pWeaponRefine(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pWeaponRefine(fd, sd); } if( HPMHooks.count.HP_clif_pWeaponRefine_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pWeaponRefine_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pWeaponRefine_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19650,11 +19673,11 @@ void HP_clif_pWeaponRefine(int fd, struct map_session_data *sd) { void HP_clif_pNpcSelectMenu(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNpcSelectMenu_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcSelectMenu_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNpcSelectMenu_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19665,10 +19688,10 @@ void HP_clif_pNpcSelectMenu(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNpcSelectMenu(fd, sd); } if( HPMHooks.count.HP_clif_pNpcSelectMenu_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcSelectMenu_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNpcSelectMenu_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19676,11 +19699,11 @@ void HP_clif_pNpcSelectMenu(int fd, struct map_session_data *sd) { void HP_clif_pNpcNextClicked(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNpcNextClicked_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcNextClicked_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNpcNextClicked_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19691,10 +19714,10 @@ void HP_clif_pNpcNextClicked(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNpcNextClicked(fd, sd); } if( HPMHooks.count.HP_clif_pNpcNextClicked_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcNextClicked_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNpcNextClicked_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19702,11 +19725,11 @@ void HP_clif_pNpcNextClicked(int fd, struct map_session_data *sd) { void HP_clif_pNpcAmountInput(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNpcAmountInput_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcAmountInput_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNpcAmountInput_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19717,10 +19740,10 @@ void HP_clif_pNpcAmountInput(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNpcAmountInput(fd, sd); } if( HPMHooks.count.HP_clif_pNpcAmountInput_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcAmountInput_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNpcAmountInput_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19728,11 +19751,11 @@ void HP_clif_pNpcAmountInput(int fd, struct map_session_data *sd) { void HP_clif_pNpcStringInput(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNpcStringInput_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcStringInput_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNpcStringInput_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19743,10 +19766,10 @@ void HP_clif_pNpcStringInput(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNpcStringInput(fd, sd); } if( HPMHooks.count.HP_clif_pNpcStringInput_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcStringInput_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNpcStringInput_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19754,11 +19777,11 @@ void HP_clif_pNpcStringInput(int fd, struct map_session_data *sd) { void HP_clif_pNpcCloseClicked(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNpcCloseClicked_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcCloseClicked_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNpcCloseClicked_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19769,10 +19792,10 @@ void HP_clif_pNpcCloseClicked(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNpcCloseClicked(fd, sd); } if( HPMHooks.count.HP_clif_pNpcCloseClicked_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNpcCloseClicked_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNpcCloseClicked_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19780,11 +19803,11 @@ void HP_clif_pNpcCloseClicked(int fd, struct map_session_data *sd) { void HP_clif_pItemIdentify(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pItemIdentify_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pItemIdentify_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pItemIdentify_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19795,10 +19818,10 @@ void HP_clif_pItemIdentify(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pItemIdentify(fd, sd); } if( HPMHooks.count.HP_clif_pItemIdentify_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pItemIdentify_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pItemIdentify_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19806,11 +19829,11 @@ void HP_clif_pItemIdentify(int fd, struct map_session_data *sd) { void HP_clif_pSelectArrow(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSelectArrow_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSelectArrow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSelectArrow_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19821,10 +19844,10 @@ void HP_clif_pSelectArrow(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pSelectArrow(fd, sd); } if( HPMHooks.count.HP_clif_pSelectArrow_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSelectArrow_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSelectArrow_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19832,11 +19855,11 @@ void HP_clif_pSelectArrow(int fd, struct map_session_data *sd) { void HP_clif_pAutoSpell(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAutoSpell_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAutoSpell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAutoSpell_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19847,10 +19870,10 @@ void HP_clif_pAutoSpell(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAutoSpell(fd, sd); } if( HPMHooks.count.HP_clif_pAutoSpell_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAutoSpell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAutoSpell_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19858,11 +19881,11 @@ void HP_clif_pAutoSpell(int fd, struct map_session_data *sd) { void HP_clif_pUseCard(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pUseCard_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseCard_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pUseCard_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19873,10 +19896,10 @@ void HP_clif_pUseCard(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pUseCard(fd, sd); } if( HPMHooks.count.HP_clif_pUseCard_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pUseCard_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pUseCard_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19884,11 +19907,11 @@ void HP_clif_pUseCard(int fd, struct map_session_data *sd) { void HP_clif_pInsertCard(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pInsertCard_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pInsertCard_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pInsertCard_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19899,10 +19922,10 @@ void HP_clif_pInsertCard(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pInsertCard(fd, sd); } if( HPMHooks.count.HP_clif_pInsertCard_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pInsertCard_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pInsertCard_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19910,11 +19933,11 @@ void HP_clif_pInsertCard(int fd, struct map_session_data *sd) { void HP_clif_pSolveCharName(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSolveCharName_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSolveCharName_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSolveCharName_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19925,10 +19948,10 @@ void HP_clif_pSolveCharName(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pSolveCharName(fd, sd); } if( HPMHooks.count.HP_clif_pSolveCharName_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSolveCharName_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSolveCharName_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19936,11 +19959,11 @@ void HP_clif_pSolveCharName(int fd, struct map_session_data *sd) { void HP_clif_pResetChar(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pResetChar_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pResetChar_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pResetChar_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19951,10 +19974,10 @@ void HP_clif_pResetChar(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pResetChar(fd, sd); } if( HPMHooks.count.HP_clif_pResetChar_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pResetChar_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pResetChar_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19962,11 +19985,11 @@ void HP_clif_pResetChar(int fd, struct map_session_data *sd) { void HP_clif_pLocalBroadcast(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pLocalBroadcast_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLocalBroadcast_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pLocalBroadcast_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19977,10 +20000,10 @@ void HP_clif_pLocalBroadcast(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pLocalBroadcast(fd, sd); } if( HPMHooks.count.HP_clif_pLocalBroadcast_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLocalBroadcast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pLocalBroadcast_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -19988,11 +20011,11 @@ void HP_clif_pLocalBroadcast(int fd, struct map_session_data *sd) { void HP_clif_pMoveToKafra(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMoveToKafra_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveToKafra_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMoveToKafra_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20003,10 +20026,10 @@ void HP_clif_pMoveToKafra(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMoveToKafra(fd, sd); } if( HPMHooks.count.HP_clif_pMoveToKafra_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveToKafra_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMoveToKafra_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20014,11 +20037,11 @@ void HP_clif_pMoveToKafra(int fd, struct map_session_data *sd) { void HP_clif_pMoveFromKafra(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMoveFromKafra_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveFromKafra_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMoveFromKafra_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20029,10 +20052,10 @@ void HP_clif_pMoveFromKafra(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMoveFromKafra(fd, sd); } if( HPMHooks.count.HP_clif_pMoveFromKafra_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveFromKafra_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMoveFromKafra_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20040,11 +20063,11 @@ void HP_clif_pMoveFromKafra(int fd, struct map_session_data *sd) { void HP_clif_pMoveToKafraFromCart(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMoveToKafraFromCart_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveToKafraFromCart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMoveToKafraFromCart_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20055,10 +20078,10 @@ void HP_clif_pMoveToKafraFromCart(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMoveToKafraFromCart(fd, sd); } if( HPMHooks.count.HP_clif_pMoveToKafraFromCart_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveToKafraFromCart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMoveToKafraFromCart_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20066,11 +20089,11 @@ void HP_clif_pMoveToKafraFromCart(int fd, struct map_session_data *sd) { void HP_clif_pMoveFromKafraToCart(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMoveFromKafraToCart_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveFromKafraToCart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMoveFromKafraToCart_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20081,10 +20104,10 @@ void HP_clif_pMoveFromKafraToCart(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMoveFromKafraToCart(fd, sd); } if( HPMHooks.count.HP_clif_pMoveFromKafraToCart_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveFromKafraToCart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMoveFromKafraToCart_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20092,11 +20115,11 @@ void HP_clif_pMoveFromKafraToCart(int fd, struct map_session_data *sd) { void HP_clif_pCloseKafra(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCloseKafra_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCloseKafra_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCloseKafra_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20107,10 +20130,10 @@ void HP_clif_pCloseKafra(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCloseKafra(fd, sd); } if( HPMHooks.count.HP_clif_pCloseKafra_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCloseKafra_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCloseKafra_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20118,11 +20141,11 @@ void HP_clif_pCloseKafra(int fd, struct map_session_data *sd) { void HP_clif_pStoragePassword(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pStoragePassword_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStoragePassword_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pStoragePassword_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20133,10 +20156,10 @@ void HP_clif_pStoragePassword(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pStoragePassword(fd, sd); } if( HPMHooks.count.HP_clif_pStoragePassword_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStoragePassword_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pStoragePassword_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20144,11 +20167,11 @@ void HP_clif_pStoragePassword(int fd, struct map_session_data *sd) { void HP_clif_pCreateParty(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCreateParty_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCreateParty_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCreateParty_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20159,10 +20182,10 @@ void HP_clif_pCreateParty(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCreateParty(fd, sd); } if( HPMHooks.count.HP_clif_pCreateParty_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCreateParty_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCreateParty_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20170,11 +20193,11 @@ void HP_clif_pCreateParty(int fd, struct map_session_data *sd) { void HP_clif_pCreateParty2(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCreateParty2_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCreateParty2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCreateParty2_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20185,10 +20208,10 @@ void HP_clif_pCreateParty2(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCreateParty2(fd, sd); } if( HPMHooks.count.HP_clif_pCreateParty2_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCreateParty2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCreateParty2_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20196,11 +20219,11 @@ void HP_clif_pCreateParty2(int fd, struct map_session_data *sd) { void HP_clif_pPartyInvite(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyInvite_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyInvite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyInvite_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20211,10 +20234,10 @@ void HP_clif_pPartyInvite(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyInvite(fd, sd); } if( HPMHooks.count.HP_clif_pPartyInvite_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyInvite_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyInvite_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20222,11 +20245,11 @@ void HP_clif_pPartyInvite(int fd, struct map_session_data *sd) { void HP_clif_pPartyInvite2(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyInvite2_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyInvite2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyInvite2_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20237,10 +20260,10 @@ void HP_clif_pPartyInvite2(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyInvite2(fd, sd); } if( HPMHooks.count.HP_clif_pPartyInvite2_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyInvite2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyInvite2_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20248,11 +20271,11 @@ void HP_clif_pPartyInvite2(int fd, struct map_session_data *sd) { void HP_clif_pReplyPartyInvite(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pReplyPartyInvite_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReplyPartyInvite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pReplyPartyInvite_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20263,10 +20286,10 @@ void HP_clif_pReplyPartyInvite(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pReplyPartyInvite(fd, sd); } if( HPMHooks.count.HP_clif_pReplyPartyInvite_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReplyPartyInvite_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pReplyPartyInvite_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20274,11 +20297,11 @@ void HP_clif_pReplyPartyInvite(int fd, struct map_session_data *sd) { void HP_clif_pReplyPartyInvite2(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pReplyPartyInvite2_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReplyPartyInvite2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pReplyPartyInvite2_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20289,10 +20312,10 @@ void HP_clif_pReplyPartyInvite2(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pReplyPartyInvite2(fd, sd); } if( HPMHooks.count.HP_clif_pReplyPartyInvite2_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReplyPartyInvite2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pReplyPartyInvite2_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20300,11 +20323,11 @@ void HP_clif_pReplyPartyInvite2(int fd, struct map_session_data *sd) { void HP_clif_pLeaveParty(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pLeaveParty_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLeaveParty_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pLeaveParty_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20315,10 +20338,10 @@ void HP_clif_pLeaveParty(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pLeaveParty(fd, sd); } if( HPMHooks.count.HP_clif_pLeaveParty_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLeaveParty_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pLeaveParty_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20326,11 +20349,11 @@ void HP_clif_pLeaveParty(int fd, struct map_session_data *sd) { void HP_clif_pRemovePartyMember(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRemovePartyMember_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRemovePartyMember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRemovePartyMember_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20341,10 +20364,10 @@ void HP_clif_pRemovePartyMember(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRemovePartyMember(fd, sd); } if( HPMHooks.count.HP_clif_pRemovePartyMember_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRemovePartyMember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRemovePartyMember_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20352,11 +20375,11 @@ void HP_clif_pRemovePartyMember(int fd, struct map_session_data *sd) { void HP_clif_pPartyChangeOption(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyChangeOption_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyChangeOption_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyChangeOption_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20367,10 +20390,10 @@ void HP_clif_pPartyChangeOption(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyChangeOption(fd, sd); } if( HPMHooks.count.HP_clif_pPartyChangeOption_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyChangeOption_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyChangeOption_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20378,11 +20401,11 @@ void HP_clif_pPartyChangeOption(int fd, struct map_session_data *sd) { void HP_clif_pPartyMessage(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyMessage_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyMessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyMessage_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20393,10 +20416,10 @@ void HP_clif_pPartyMessage(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyMessage(fd, sd); } if( HPMHooks.count.HP_clif_pPartyMessage_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyMessage_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20404,11 +20427,11 @@ void HP_clif_pPartyMessage(int fd, struct map_session_data *sd) { void HP_clif_pPartyChangeLeader(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyChangeLeader_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyChangeLeader_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyChangeLeader_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20419,10 +20442,10 @@ void HP_clif_pPartyChangeLeader(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyChangeLeader(fd, sd); } if( HPMHooks.count.HP_clif_pPartyChangeLeader_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyChangeLeader_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyChangeLeader_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20430,11 +20453,11 @@ void HP_clif_pPartyChangeLeader(int fd, struct map_session_data *sd) { void HP_clif_pPartyBookingRegisterReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyBookingRegisterReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingRegisterReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyBookingRegisterReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20445,10 +20468,10 @@ void HP_clif_pPartyBookingRegisterReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyBookingRegisterReq(fd, sd); } if( HPMHooks.count.HP_clif_pPartyBookingRegisterReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingRegisterReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyBookingRegisterReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20456,11 +20479,11 @@ void HP_clif_pPartyBookingRegisterReq(int fd, struct map_session_data *sd) { void HP_clif_pPartyBookingSearchReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyBookingSearchReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingSearchReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyBookingSearchReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20471,10 +20494,10 @@ void HP_clif_pPartyBookingSearchReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyBookingSearchReq(fd, sd); } if( HPMHooks.count.HP_clif_pPartyBookingSearchReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingSearchReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyBookingSearchReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20482,11 +20505,11 @@ void HP_clif_pPartyBookingSearchReq(int fd, struct map_session_data *sd) { void HP_clif_pPartyBookingDeleteReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyBookingDeleteReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingDeleteReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyBookingDeleteReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20497,10 +20520,10 @@ void HP_clif_pPartyBookingDeleteReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyBookingDeleteReq(fd, sd); } if( HPMHooks.count.HP_clif_pPartyBookingDeleteReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingDeleteReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyBookingDeleteReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20508,11 +20531,11 @@ void HP_clif_pPartyBookingDeleteReq(int fd, struct map_session_data *sd) { void HP_clif_pPartyBookingUpdateReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyBookingUpdateReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingUpdateReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyBookingUpdateReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20523,10 +20546,10 @@ void HP_clif_pPartyBookingUpdateReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyBookingUpdateReq(fd, sd); } if( HPMHooks.count.HP_clif_pPartyBookingUpdateReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingUpdateReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyBookingUpdateReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20534,11 +20557,11 @@ void HP_clif_pPartyBookingUpdateReq(int fd, struct map_session_data *sd) { void HP_clif_pPartyRecruitRegisterReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyRecruitRegisterReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyRecruitRegisterReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyRecruitRegisterReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20549,10 +20572,10 @@ void HP_clif_pPartyRecruitRegisterReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyRecruitRegisterReq(fd, sd); } if( HPMHooks.count.HP_clif_pPartyRecruitRegisterReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyRecruitRegisterReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyRecruitRegisterReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20560,11 +20583,11 @@ void HP_clif_pPartyRecruitRegisterReq(int fd, struct map_session_data *sd) { void HP_clif_pPartyRecruitSearchReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyRecruitSearchReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyRecruitSearchReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyRecruitSearchReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20575,10 +20598,10 @@ void HP_clif_pPartyRecruitSearchReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyRecruitSearchReq(fd, sd); } if( HPMHooks.count.HP_clif_pPartyRecruitSearchReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyRecruitSearchReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyRecruitSearchReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20586,11 +20609,11 @@ void HP_clif_pPartyRecruitSearchReq(int fd, struct map_session_data *sd) { void HP_clif_pPartyRecruitDeleteReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyRecruitDeleteReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyRecruitDeleteReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyRecruitDeleteReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20601,10 +20624,10 @@ void HP_clif_pPartyRecruitDeleteReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyRecruitDeleteReq(fd, sd); } if( HPMHooks.count.HP_clif_pPartyRecruitDeleteReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyRecruitDeleteReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyRecruitDeleteReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20612,11 +20635,11 @@ void HP_clif_pPartyRecruitDeleteReq(int fd, struct map_session_data *sd) { void HP_clif_pPartyRecruitUpdateReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyRecruitUpdateReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyRecruitUpdateReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyRecruitUpdateReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20627,10 +20650,10 @@ void HP_clif_pPartyRecruitUpdateReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyRecruitUpdateReq(fd, sd); } if( HPMHooks.count.HP_clif_pPartyRecruitUpdateReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyRecruitUpdateReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyRecruitUpdateReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20638,11 +20661,11 @@ void HP_clif_pPartyRecruitUpdateReq(int fd, struct map_session_data *sd) { void HP_clif_pCloseVending(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCloseVending_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCloseVending_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCloseVending_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20653,10 +20676,10 @@ void HP_clif_pCloseVending(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCloseVending(fd, sd); } if( HPMHooks.count.HP_clif_pCloseVending_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCloseVending_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCloseVending_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20664,11 +20687,11 @@ void HP_clif_pCloseVending(int fd, struct map_session_data *sd) { void HP_clif_pVendingListReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pVendingListReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pVendingListReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pVendingListReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20679,10 +20702,10 @@ void HP_clif_pVendingListReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pVendingListReq(fd, sd); } if( HPMHooks.count.HP_clif_pVendingListReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pVendingListReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pVendingListReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20690,11 +20713,11 @@ void HP_clif_pVendingListReq(int fd, struct map_session_data *sd) { void HP_clif_pPurchaseReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPurchaseReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPurchaseReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPurchaseReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20705,10 +20728,10 @@ void HP_clif_pPurchaseReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPurchaseReq(fd, sd); } if( HPMHooks.count.HP_clif_pPurchaseReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPurchaseReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPurchaseReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20716,11 +20739,11 @@ void HP_clif_pPurchaseReq(int fd, struct map_session_data *sd) { void HP_clif_pPurchaseReq2(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPurchaseReq2_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPurchaseReq2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPurchaseReq2_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20731,10 +20754,10 @@ void HP_clif_pPurchaseReq2(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPurchaseReq2(fd, sd); } if( HPMHooks.count.HP_clif_pPurchaseReq2_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPurchaseReq2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPurchaseReq2_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20742,11 +20765,11 @@ void HP_clif_pPurchaseReq2(int fd, struct map_session_data *sd) { void HP_clif_pOpenVending(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pOpenVending_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pOpenVending_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pOpenVending_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20757,10 +20780,10 @@ void HP_clif_pOpenVending(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pOpenVending(fd, sd); } if( HPMHooks.count.HP_clif_pOpenVending_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pOpenVending_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pOpenVending_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20768,11 +20791,11 @@ void HP_clif_pOpenVending(int fd, struct map_session_data *sd) { void HP_clif_pCreateGuild(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCreateGuild_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCreateGuild_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCreateGuild_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20783,10 +20806,10 @@ void HP_clif_pCreateGuild(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCreateGuild(fd, sd); } if( HPMHooks.count.HP_clif_pCreateGuild_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCreateGuild_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCreateGuild_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20794,11 +20817,11 @@ void HP_clif_pCreateGuild(int fd, struct map_session_data *sd) { void HP_clif_pGuildCheckMaster(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildCheckMaster_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildCheckMaster_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildCheckMaster_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20809,10 +20832,10 @@ void HP_clif_pGuildCheckMaster(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildCheckMaster(fd, sd); } if( HPMHooks.count.HP_clif_pGuildCheckMaster_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildCheckMaster_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildCheckMaster_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20820,11 +20843,11 @@ void HP_clif_pGuildCheckMaster(int fd, struct map_session_data *sd) { void HP_clif_pGuildRequestInfo(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildRequestInfo_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildRequestInfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildRequestInfo_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20835,10 +20858,10 @@ void HP_clif_pGuildRequestInfo(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildRequestInfo(fd, sd); } if( HPMHooks.count.HP_clif_pGuildRequestInfo_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildRequestInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildRequestInfo_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20846,11 +20869,11 @@ void HP_clif_pGuildRequestInfo(int fd, struct map_session_data *sd) { void HP_clif_pGuildChangePositionInfo(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildChangePositionInfo_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildChangePositionInfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildChangePositionInfo_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20861,10 +20884,10 @@ void HP_clif_pGuildChangePositionInfo(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildChangePositionInfo(fd, sd); } if( HPMHooks.count.HP_clif_pGuildChangePositionInfo_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildChangePositionInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildChangePositionInfo_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20872,11 +20895,11 @@ void HP_clif_pGuildChangePositionInfo(int fd, struct map_session_data *sd) { void HP_clif_pGuildChangeMemberPosition(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildChangeMemberPosition_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildChangeMemberPosition_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildChangeMemberPosition_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20887,10 +20910,10 @@ void HP_clif_pGuildChangeMemberPosition(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildChangeMemberPosition(fd, sd); } if( HPMHooks.count.HP_clif_pGuildChangeMemberPosition_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildChangeMemberPosition_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildChangeMemberPosition_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20898,11 +20921,11 @@ void HP_clif_pGuildChangeMemberPosition(int fd, struct map_session_data *sd) { void HP_clif_pGuildRequestEmblem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildRequestEmblem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildRequestEmblem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildRequestEmblem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20913,10 +20936,10 @@ void HP_clif_pGuildRequestEmblem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildRequestEmblem(fd, sd); } if( HPMHooks.count.HP_clif_pGuildRequestEmblem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildRequestEmblem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildRequestEmblem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20924,11 +20947,11 @@ void HP_clif_pGuildRequestEmblem(int fd, struct map_session_data *sd) { void HP_clif_pGuildChangeEmblem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildChangeEmblem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildChangeEmblem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildChangeEmblem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20939,10 +20962,10 @@ void HP_clif_pGuildChangeEmblem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildChangeEmblem(fd, sd); } if( HPMHooks.count.HP_clif_pGuildChangeEmblem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildChangeEmblem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildChangeEmblem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20950,11 +20973,11 @@ void HP_clif_pGuildChangeEmblem(int fd, struct map_session_data *sd) { void HP_clif_pGuildChangeNotice(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildChangeNotice_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildChangeNotice_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildChangeNotice_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20965,10 +20988,10 @@ void HP_clif_pGuildChangeNotice(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildChangeNotice(fd, sd); } if( HPMHooks.count.HP_clif_pGuildChangeNotice_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildChangeNotice_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildChangeNotice_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -20976,11 +20999,11 @@ void HP_clif_pGuildChangeNotice(int fd, struct map_session_data *sd) { void HP_clif_pGuildInvite(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildInvite_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildInvite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildInvite_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -20991,10 +21014,10 @@ void HP_clif_pGuildInvite(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildInvite(fd, sd); } if( HPMHooks.count.HP_clif_pGuildInvite_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildInvite_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildInvite_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21002,11 +21025,11 @@ void HP_clif_pGuildInvite(int fd, struct map_session_data *sd) { void HP_clif_pGuildReplyInvite(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildReplyInvite_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildReplyInvite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildReplyInvite_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21017,10 +21040,10 @@ void HP_clif_pGuildReplyInvite(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildReplyInvite(fd, sd); } if( HPMHooks.count.HP_clif_pGuildReplyInvite_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildReplyInvite_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildReplyInvite_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21028,11 +21051,11 @@ void HP_clif_pGuildReplyInvite(int fd, struct map_session_data *sd) { void HP_clif_pGuildLeave(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildLeave_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildLeave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildLeave_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21043,10 +21066,10 @@ void HP_clif_pGuildLeave(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildLeave(fd, sd); } if( HPMHooks.count.HP_clif_pGuildLeave_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildLeave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildLeave_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21054,11 +21077,11 @@ void HP_clif_pGuildLeave(int fd, struct map_session_data *sd) { void HP_clif_pGuildExpulsion(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildExpulsion_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildExpulsion_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildExpulsion_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21069,10 +21092,10 @@ void HP_clif_pGuildExpulsion(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildExpulsion(fd, sd); } if( HPMHooks.count.HP_clif_pGuildExpulsion_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildExpulsion_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildExpulsion_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21080,11 +21103,11 @@ void HP_clif_pGuildExpulsion(int fd, struct map_session_data *sd) { void HP_clif_pGuildMessage(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildMessage_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildMessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildMessage_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21095,10 +21118,10 @@ void HP_clif_pGuildMessage(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildMessage(fd, sd); } if( HPMHooks.count.HP_clif_pGuildMessage_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildMessage_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21106,11 +21129,11 @@ void HP_clif_pGuildMessage(int fd, struct map_session_data *sd) { void HP_clif_pGuildRequestAlliance(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildRequestAlliance_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildRequestAlliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildRequestAlliance_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21121,10 +21144,10 @@ void HP_clif_pGuildRequestAlliance(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildRequestAlliance(fd, sd); } if( HPMHooks.count.HP_clif_pGuildRequestAlliance_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildRequestAlliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildRequestAlliance_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21132,11 +21155,11 @@ void HP_clif_pGuildRequestAlliance(int fd, struct map_session_data *sd) { void HP_clif_pGuildReplyAlliance(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildReplyAlliance_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildReplyAlliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildReplyAlliance_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21147,10 +21170,10 @@ void HP_clif_pGuildReplyAlliance(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildReplyAlliance(fd, sd); } if( HPMHooks.count.HP_clif_pGuildReplyAlliance_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildReplyAlliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildReplyAlliance_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21158,11 +21181,11 @@ void HP_clif_pGuildReplyAlliance(int fd, struct map_session_data *sd) { void HP_clif_pGuildDelAlliance(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildDelAlliance_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildDelAlliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildDelAlliance_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21173,10 +21196,10 @@ void HP_clif_pGuildDelAlliance(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildDelAlliance(fd, sd); } if( HPMHooks.count.HP_clif_pGuildDelAlliance_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildDelAlliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildDelAlliance_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21184,11 +21207,11 @@ void HP_clif_pGuildDelAlliance(int fd, struct map_session_data *sd) { void HP_clif_pGuildOpposition(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildOpposition_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildOpposition_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildOpposition_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21199,10 +21222,10 @@ void HP_clif_pGuildOpposition(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildOpposition(fd, sd); } if( HPMHooks.count.HP_clif_pGuildOpposition_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildOpposition_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildOpposition_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21210,11 +21233,11 @@ void HP_clif_pGuildOpposition(int fd, struct map_session_data *sd) { void HP_clif_pGuildBreak(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildBreak_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildBreak_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildBreak_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21225,10 +21248,10 @@ void HP_clif_pGuildBreak(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildBreak(fd, sd); } if( HPMHooks.count.HP_clif_pGuildBreak_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildBreak_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildBreak_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21236,11 +21259,11 @@ void HP_clif_pGuildBreak(int fd, struct map_session_data *sd) { void HP_clif_pPetMenu(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPetMenu_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPetMenu_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPetMenu_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21251,10 +21274,10 @@ void HP_clif_pPetMenu(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPetMenu(fd, sd); } if( HPMHooks.count.HP_clif_pPetMenu_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPetMenu_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPetMenu_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21262,11 +21285,11 @@ void HP_clif_pPetMenu(int fd, struct map_session_data *sd) { void HP_clif_pCatchPet(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCatchPet_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCatchPet_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCatchPet_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21277,10 +21300,10 @@ void HP_clif_pCatchPet(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCatchPet(fd, sd); } if( HPMHooks.count.HP_clif_pCatchPet_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCatchPet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCatchPet_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21288,11 +21311,11 @@ void HP_clif_pCatchPet(int fd, struct map_session_data *sd) { void HP_clif_pSelectEgg(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSelectEgg_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSelectEgg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSelectEgg_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21303,10 +21326,10 @@ void HP_clif_pSelectEgg(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pSelectEgg(fd, sd); } if( HPMHooks.count.HP_clif_pSelectEgg_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSelectEgg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSelectEgg_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21314,11 +21337,11 @@ void HP_clif_pSelectEgg(int fd, struct map_session_data *sd) { void HP_clif_pSendEmotion(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSendEmotion_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSendEmotion_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSendEmotion_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21329,10 +21352,10 @@ void HP_clif_pSendEmotion(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pSendEmotion(fd, sd); } if( HPMHooks.count.HP_clif_pSendEmotion_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSendEmotion_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSendEmotion_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21340,11 +21363,11 @@ void HP_clif_pSendEmotion(int fd, struct map_session_data *sd) { void HP_clif_pChangePetName(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pChangePetName_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangePetName_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pChangePetName_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21355,10 +21378,10 @@ void HP_clif_pChangePetName(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pChangePetName(fd, sd); } if( HPMHooks.count.HP_clif_pChangePetName_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangePetName_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pChangePetName_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21366,11 +21389,11 @@ void HP_clif_pChangePetName(int fd, struct map_session_data *sd) { void HP_clif_pGMKick(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMKick_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMKick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMKick_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21381,10 +21404,10 @@ void HP_clif_pGMKick(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMKick(fd, sd); } if( HPMHooks.count.HP_clif_pGMKick_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMKick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMKick_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21392,11 +21415,11 @@ void HP_clif_pGMKick(int fd, struct map_session_data *sd) { void HP_clif_pGMKickAll(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMKickAll_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMKickAll_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMKickAll_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21407,10 +21430,10 @@ void HP_clif_pGMKickAll(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMKickAll(fd, sd); } if( HPMHooks.count.HP_clif_pGMKickAll_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMKickAll_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMKickAll_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21418,11 +21441,11 @@ void HP_clif_pGMKickAll(int fd, struct map_session_data *sd) { void HP_clif_pGMShift(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMShift_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMShift_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMShift_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21433,10 +21456,10 @@ void HP_clif_pGMShift(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMShift(fd, sd); } if( HPMHooks.count.HP_clif_pGMShift_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMShift_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMShift_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21444,11 +21467,11 @@ void HP_clif_pGMShift(int fd, struct map_session_data *sd) { void HP_clif_pGMRemove2(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMRemove2_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMRemove2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMRemove2_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21459,10 +21482,10 @@ void HP_clif_pGMRemove2(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMRemove2(fd, sd); } if( HPMHooks.count.HP_clif_pGMRemove2_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMRemove2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMRemove2_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21470,11 +21493,11 @@ void HP_clif_pGMRemove2(int fd, struct map_session_data *sd) { void HP_clif_pGMRecall(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMRecall_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMRecall_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMRecall_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21485,10 +21508,10 @@ void HP_clif_pGMRecall(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMRecall(fd, sd); } if( HPMHooks.count.HP_clif_pGMRecall_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMRecall_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMRecall_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21496,11 +21519,11 @@ void HP_clif_pGMRecall(int fd, struct map_session_data *sd) { void HP_clif_pGMRecall2(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMRecall2_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMRecall2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMRecall2_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21511,10 +21534,10 @@ void HP_clif_pGMRecall2(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMRecall2(fd, sd); } if( HPMHooks.count.HP_clif_pGMRecall2_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMRecall2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMRecall2_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21522,11 +21545,11 @@ void HP_clif_pGMRecall2(int fd, struct map_session_data *sd) { void HP_clif_pGM_Monster_Item(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGM_Monster_Item_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGM_Monster_Item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGM_Monster_Item_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21537,10 +21560,10 @@ void HP_clif_pGM_Monster_Item(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGM_Monster_Item(fd, sd); } if( HPMHooks.count.HP_clif_pGM_Monster_Item_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGM_Monster_Item_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGM_Monster_Item_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21548,11 +21571,11 @@ void HP_clif_pGM_Monster_Item(int fd, struct map_session_data *sd) { void HP_clif_pGMHide(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMHide_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMHide_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMHide_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21563,10 +21586,10 @@ void HP_clif_pGMHide(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMHide(fd, sd); } if( HPMHooks.count.HP_clif_pGMHide_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMHide_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMHide_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21574,11 +21597,11 @@ void HP_clif_pGMHide(int fd, struct map_session_data *sd) { void HP_clif_pGMReqNoChat(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMReqNoChat_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMReqNoChat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMReqNoChat_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21589,10 +21612,10 @@ void HP_clif_pGMReqNoChat(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMReqNoChat(fd, sd); } if( HPMHooks.count.HP_clif_pGMReqNoChat_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMReqNoChat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMReqNoChat_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21600,11 +21623,11 @@ void HP_clif_pGMReqNoChat(int fd, struct map_session_data *sd) { void HP_clif_pGMRc(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMRc_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMRc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMRc_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21615,10 +21638,10 @@ void HP_clif_pGMRc(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMRc(fd, sd); } if( HPMHooks.count.HP_clif_pGMRc_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMRc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMRc_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21626,11 +21649,11 @@ void HP_clif_pGMRc(int fd, struct map_session_data *sd) { void HP_clif_pGMReqAccountName(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMReqAccountName_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMReqAccountName_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMReqAccountName_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21641,10 +21664,10 @@ void HP_clif_pGMReqAccountName(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMReqAccountName(fd, sd); } if( HPMHooks.count.HP_clif_pGMReqAccountName_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMReqAccountName_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMReqAccountName_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21652,11 +21675,11 @@ void HP_clif_pGMReqAccountName(int fd, struct map_session_data *sd) { void HP_clif_pGMChangeMapType(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMChangeMapType_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMChangeMapType_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMChangeMapType_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21667,10 +21690,10 @@ void HP_clif_pGMChangeMapType(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMChangeMapType(fd, sd); } if( HPMHooks.count.HP_clif_pGMChangeMapType_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMChangeMapType_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMChangeMapType_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21678,11 +21701,11 @@ void HP_clif_pGMChangeMapType(int fd, struct map_session_data *sd) { void HP_clif_pGMFullStrip(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGMFullStrip_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMFullStrip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGMFullStrip_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21693,10 +21716,10 @@ void HP_clif_pGMFullStrip(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGMFullStrip(fd, sd); } if( HPMHooks.count.HP_clif_pGMFullStrip_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMFullStrip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGMFullStrip_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21704,11 +21727,11 @@ void HP_clif_pGMFullStrip(int fd, struct map_session_data *sd) { void HP_clif_pPMIgnore(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPMIgnore_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPMIgnore_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPMIgnore_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21719,10 +21742,10 @@ void HP_clif_pPMIgnore(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPMIgnore(fd, sd); } if( HPMHooks.count.HP_clif_pPMIgnore_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPMIgnore_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPMIgnore_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21730,11 +21753,11 @@ void HP_clif_pPMIgnore(int fd, struct map_session_data *sd) { void HP_clif_pPMIgnoreAll(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPMIgnoreAll_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPMIgnoreAll_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPMIgnoreAll_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21745,10 +21768,10 @@ void HP_clif_pPMIgnoreAll(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPMIgnoreAll(fd, sd); } if( HPMHooks.count.HP_clif_pPMIgnoreAll_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPMIgnoreAll_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPMIgnoreAll_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21756,11 +21779,11 @@ void HP_clif_pPMIgnoreAll(int fd, struct map_session_data *sd) { void HP_clif_pPMIgnoreList(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPMIgnoreList_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPMIgnoreList_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPMIgnoreList_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21771,10 +21794,10 @@ void HP_clif_pPMIgnoreList(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPMIgnoreList(fd, sd); } if( HPMHooks.count.HP_clif_pPMIgnoreList_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPMIgnoreList_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPMIgnoreList_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21782,11 +21805,11 @@ void HP_clif_pPMIgnoreList(int fd, struct map_session_data *sd) { void HP_clif_pNoviceDoriDori(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNoviceDoriDori_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNoviceDoriDori_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNoviceDoriDori_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21797,10 +21820,10 @@ void HP_clif_pNoviceDoriDori(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNoviceDoriDori(fd, sd); } if( HPMHooks.count.HP_clif_pNoviceDoriDori_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNoviceDoriDori_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNoviceDoriDori_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21808,11 +21831,11 @@ void HP_clif_pNoviceDoriDori(int fd, struct map_session_data *sd) { void HP_clif_pNoviceExplosionSpirits(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNoviceExplosionSpirits_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNoviceExplosionSpirits_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNoviceExplosionSpirits_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21823,10 +21846,10 @@ void HP_clif_pNoviceExplosionSpirits(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNoviceExplosionSpirits(fd, sd); } if( HPMHooks.count.HP_clif_pNoviceExplosionSpirits_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNoviceExplosionSpirits_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNoviceExplosionSpirits_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21834,11 +21857,11 @@ void HP_clif_pNoviceExplosionSpirits(int fd, struct map_session_data *sd) { void HP_clif_pFriendsListAdd(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pFriendsListAdd_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pFriendsListAdd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pFriendsListAdd_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21849,10 +21872,10 @@ void HP_clif_pFriendsListAdd(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pFriendsListAdd(fd, sd); } if( HPMHooks.count.HP_clif_pFriendsListAdd_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pFriendsListAdd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pFriendsListAdd_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21860,11 +21883,11 @@ void HP_clif_pFriendsListAdd(int fd, struct map_session_data *sd) { void HP_clif_pFriendsListReply(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pFriendsListReply_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pFriendsListReply_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pFriendsListReply_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21875,10 +21898,10 @@ void HP_clif_pFriendsListReply(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pFriendsListReply(fd, sd); } if( HPMHooks.count.HP_clif_pFriendsListReply_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pFriendsListReply_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pFriendsListReply_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21886,11 +21909,11 @@ void HP_clif_pFriendsListReply(int fd, struct map_session_data *sd) { void HP_clif_pFriendsListRemove(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pFriendsListRemove_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pFriendsListRemove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pFriendsListRemove_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21901,10 +21924,10 @@ void HP_clif_pFriendsListRemove(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pFriendsListRemove(fd, sd); } if( HPMHooks.count.HP_clif_pFriendsListRemove_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pFriendsListRemove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pFriendsListRemove_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21912,11 +21935,11 @@ void HP_clif_pFriendsListRemove(int fd, struct map_session_data *sd) { void HP_clif_pPVPInfo(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPVPInfo_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPVPInfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPVPInfo_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21927,10 +21950,10 @@ void HP_clif_pPVPInfo(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPVPInfo(fd, sd); } if( HPMHooks.count.HP_clif_pPVPInfo_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPVPInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPVPInfo_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21938,11 +21961,11 @@ void HP_clif_pPVPInfo(int fd, struct map_session_data *sd) { void HP_clif_pBlacksmith(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBlacksmith_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBlacksmith_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBlacksmith_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21953,10 +21976,10 @@ void HP_clif_pBlacksmith(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBlacksmith(fd, sd); } if( HPMHooks.count.HP_clif_pBlacksmith_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBlacksmith_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBlacksmith_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21964,11 +21987,11 @@ void HP_clif_pBlacksmith(int fd, struct map_session_data *sd) { void HP_clif_pAlchemist(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAlchemist_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAlchemist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAlchemist_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21979,10 +22002,10 @@ void HP_clif_pAlchemist(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAlchemist(fd, sd); } if( HPMHooks.count.HP_clif_pAlchemist_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAlchemist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAlchemist_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -21990,11 +22013,11 @@ void HP_clif_pAlchemist(int fd, struct map_session_data *sd) { void HP_clif_pTaekwon(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pTaekwon_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTaekwon_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pTaekwon_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22005,10 +22028,10 @@ void HP_clif_pTaekwon(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pTaekwon(fd, sd); } if( HPMHooks.count.HP_clif_pTaekwon_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pTaekwon_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pTaekwon_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22016,11 +22039,11 @@ void HP_clif_pTaekwon(int fd, struct map_session_data *sd) { void HP_clif_pRankingPk(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRankingPk_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRankingPk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRankingPk_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22031,10 +22054,10 @@ void HP_clif_pRankingPk(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRankingPk(fd, sd); } if( HPMHooks.count.HP_clif_pRankingPk_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRankingPk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRankingPk_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22042,11 +22065,11 @@ void HP_clif_pRankingPk(int fd, struct map_session_data *sd) { void HP_clif_pFeelSaveOk(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pFeelSaveOk_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pFeelSaveOk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pFeelSaveOk_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22057,10 +22080,10 @@ void HP_clif_pFeelSaveOk(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pFeelSaveOk(fd, sd); } if( HPMHooks.count.HP_clif_pFeelSaveOk_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pFeelSaveOk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pFeelSaveOk_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22068,11 +22091,11 @@ void HP_clif_pFeelSaveOk(int fd, struct map_session_data *sd) { void HP_clif_pChangeHomunculusName(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pChangeHomunculusName_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangeHomunculusName_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pChangeHomunculusName_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22083,10 +22106,10 @@ void HP_clif_pChangeHomunculusName(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pChangeHomunculusName(fd, sd); } if( HPMHooks.count.HP_clif_pChangeHomunculusName_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pChangeHomunculusName_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pChangeHomunculusName_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22094,11 +22117,11 @@ void HP_clif_pChangeHomunculusName(int fd, struct map_session_data *sd) { void HP_clif_pHomMoveToMaster(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pHomMoveToMaster_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHomMoveToMaster_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pHomMoveToMaster_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22109,10 +22132,10 @@ void HP_clif_pHomMoveToMaster(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pHomMoveToMaster(fd, sd); } if( HPMHooks.count.HP_clif_pHomMoveToMaster_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHomMoveToMaster_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pHomMoveToMaster_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22120,11 +22143,11 @@ void HP_clif_pHomMoveToMaster(int fd, struct map_session_data *sd) { void HP_clif_pHomMoveTo(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pHomMoveTo_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHomMoveTo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pHomMoveTo_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22135,10 +22158,10 @@ void HP_clif_pHomMoveTo(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pHomMoveTo(fd, sd); } if( HPMHooks.count.HP_clif_pHomMoveTo_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHomMoveTo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pHomMoveTo_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22146,11 +22169,11 @@ void HP_clif_pHomMoveTo(int fd, struct map_session_data *sd) { void HP_clif_pHomAttack(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pHomAttack_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHomAttack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pHomAttack_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22161,10 +22184,10 @@ void HP_clif_pHomAttack(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pHomAttack(fd, sd); } if( HPMHooks.count.HP_clif_pHomAttack_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHomAttack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pHomAttack_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22172,11 +22195,11 @@ void HP_clif_pHomAttack(int fd, struct map_session_data *sd) { void HP_clif_pHomMenu(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pHomMenu_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHomMenu_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pHomMenu_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22187,10 +22210,10 @@ void HP_clif_pHomMenu(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pHomMenu(fd, sd); } if( HPMHooks.count.HP_clif_pHomMenu_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHomMenu_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pHomMenu_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22198,11 +22221,11 @@ void HP_clif_pHomMenu(int fd, struct map_session_data *sd) { void HP_clif_pAutoRevive(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAutoRevive_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAutoRevive_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAutoRevive_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22213,10 +22236,10 @@ void HP_clif_pAutoRevive(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAutoRevive(fd, sd); } if( HPMHooks.count.HP_clif_pAutoRevive_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAutoRevive_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAutoRevive_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22224,11 +22247,11 @@ void HP_clif_pAutoRevive(int fd, struct map_session_data *sd) { void HP_clif_pCheck(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCheck_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCheck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCheck_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22239,10 +22262,10 @@ void HP_clif_pCheck(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCheck(fd, sd); } if( HPMHooks.count.HP_clif_pCheck_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCheck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCheck_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22250,11 +22273,11 @@ void HP_clif_pCheck(int fd, struct map_session_data *sd) { void HP_clif_pMail_refreshinbox(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMail_refreshinbox_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_refreshinbox_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMail_refreshinbox_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22265,10 +22288,10 @@ void HP_clif_pMail_refreshinbox(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMail_refreshinbox(fd, sd); } if( HPMHooks.count.HP_clif_pMail_refreshinbox_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_refreshinbox_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMail_refreshinbox_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22276,11 +22299,11 @@ void HP_clif_pMail_refreshinbox(int fd, struct map_session_data *sd) { void HP_clif_pMail_read(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMail_read_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMail_read_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22291,10 +22314,10 @@ void HP_clif_pMail_read(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMail_read(fd, sd); } if( HPMHooks.count.HP_clif_pMail_read_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMail_read_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22302,11 +22325,11 @@ void HP_clif_pMail_read(int fd, struct map_session_data *sd) { void HP_clif_pMail_getattach(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMail_getattach_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_getattach_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMail_getattach_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22317,10 +22340,10 @@ void HP_clif_pMail_getattach(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMail_getattach(fd, sd); } if( HPMHooks.count.HP_clif_pMail_getattach_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_getattach_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMail_getattach_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22328,11 +22351,11 @@ void HP_clif_pMail_getattach(int fd, struct map_session_data *sd) { void HP_clif_pMail_delete(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMail_delete_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMail_delete_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22343,10 +22366,10 @@ void HP_clif_pMail_delete(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMail_delete(fd, sd); } if( HPMHooks.count.HP_clif_pMail_delete_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMail_delete_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22354,11 +22377,11 @@ void HP_clif_pMail_delete(int fd, struct map_session_data *sd) { void HP_clif_pMail_return(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMail_return_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_return_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMail_return_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22369,10 +22392,10 @@ void HP_clif_pMail_return(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMail_return(fd, sd); } if( HPMHooks.count.HP_clif_pMail_return_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_return_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMail_return_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22380,11 +22403,11 @@ void HP_clif_pMail_return(int fd, struct map_session_data *sd) { void HP_clif_pMail_setattach(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMail_setattach_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_setattach_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMail_setattach_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22395,10 +22418,10 @@ void HP_clif_pMail_setattach(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMail_setattach(fd, sd); } if( HPMHooks.count.HP_clif_pMail_setattach_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_setattach_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMail_setattach_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22406,11 +22429,11 @@ void HP_clif_pMail_setattach(int fd, struct map_session_data *sd) { void HP_clif_pMail_winopen(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMail_winopen_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_winopen_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMail_winopen_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22421,10 +22444,10 @@ void HP_clif_pMail_winopen(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMail_winopen(fd, sd); } if( HPMHooks.count.HP_clif_pMail_winopen_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_winopen_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMail_winopen_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22432,11 +22455,11 @@ void HP_clif_pMail_winopen(int fd, struct map_session_data *sd) { void HP_clif_pMail_send(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMail_send_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMail_send_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22447,10 +22470,10 @@ void HP_clif_pMail_send(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMail_send(fd, sd); } if( HPMHooks.count.HP_clif_pMail_send_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMail_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMail_send_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22458,11 +22481,11 @@ void HP_clif_pMail_send(int fd, struct map_session_data *sd) { void HP_clif_pAuction_cancelreg(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAuction_cancelreg_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_cancelreg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAuction_cancelreg_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22473,10 +22496,10 @@ void HP_clif_pAuction_cancelreg(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAuction_cancelreg(fd, sd); } if( HPMHooks.count.HP_clif_pAuction_cancelreg_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_cancelreg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAuction_cancelreg_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22484,11 +22507,11 @@ void HP_clif_pAuction_cancelreg(int fd, struct map_session_data *sd) { void HP_clif_pAuction_setitem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAuction_setitem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_setitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAuction_setitem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22499,10 +22522,10 @@ void HP_clif_pAuction_setitem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAuction_setitem(fd, sd); } if( HPMHooks.count.HP_clif_pAuction_setitem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_setitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAuction_setitem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22510,11 +22533,11 @@ void HP_clif_pAuction_setitem(int fd, struct map_session_data *sd) { void HP_clif_pAuction_register(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAuction_register_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_register_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAuction_register_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22525,10 +22548,10 @@ void HP_clif_pAuction_register(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAuction_register(fd, sd); } if( HPMHooks.count.HP_clif_pAuction_register_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_register_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAuction_register_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22536,11 +22559,11 @@ void HP_clif_pAuction_register(int fd, struct map_session_data *sd) { void HP_clif_pAuction_cancel(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAuction_cancel_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_cancel_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAuction_cancel_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22551,10 +22574,10 @@ void HP_clif_pAuction_cancel(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAuction_cancel(fd, sd); } if( HPMHooks.count.HP_clif_pAuction_cancel_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_cancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAuction_cancel_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22562,11 +22585,11 @@ void HP_clif_pAuction_cancel(int fd, struct map_session_data *sd) { void HP_clif_pAuction_close(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAuction_close_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_close_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAuction_close_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22577,10 +22600,10 @@ void HP_clif_pAuction_close(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAuction_close(fd, sd); } if( HPMHooks.count.HP_clif_pAuction_close_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_close_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAuction_close_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22588,11 +22611,11 @@ void HP_clif_pAuction_close(int fd, struct map_session_data *sd) { void HP_clif_pAuction_bid(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAuction_bid_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_bid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAuction_bid_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22603,10 +22626,10 @@ void HP_clif_pAuction_bid(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAuction_bid(fd, sd); } if( HPMHooks.count.HP_clif_pAuction_bid_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_bid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAuction_bid_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22614,11 +22637,11 @@ void HP_clif_pAuction_bid(int fd, struct map_session_data *sd) { void HP_clif_pAuction_search(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAuction_search_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAuction_search_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22629,10 +22652,10 @@ void HP_clif_pAuction_search(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAuction_search(fd, sd); } if( HPMHooks.count.HP_clif_pAuction_search_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAuction_search_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22640,11 +22663,11 @@ void HP_clif_pAuction_search(int fd, struct map_session_data *sd) { void HP_clif_pAuction_buysell(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAuction_buysell_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_buysell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAuction_buysell_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22655,10 +22678,10 @@ void HP_clif_pAuction_buysell(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAuction_buysell(fd, sd); } if( HPMHooks.count.HP_clif_pAuction_buysell_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAuction_buysell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAuction_buysell_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22666,11 +22689,11 @@ void HP_clif_pAuction_buysell(int fd, struct map_session_data *sd) { void HP_clif_pcashshop_buy(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pcashshop_buy_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pcashshop_buy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pcashshop_buy_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22681,10 +22704,10 @@ void HP_clif_pcashshop_buy(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pcashshop_buy(fd, sd); } if( HPMHooks.count.HP_clif_pcashshop_buy_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pcashshop_buy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pcashshop_buy_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22692,11 +22715,11 @@ void HP_clif_pcashshop_buy(int fd, struct map_session_data *sd) { void HP_clif_pAdopt_request(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAdopt_request_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAdopt_request_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAdopt_request_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22707,10 +22730,10 @@ void HP_clif_pAdopt_request(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAdopt_request(fd, sd); } if( HPMHooks.count.HP_clif_pAdopt_request_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAdopt_request_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAdopt_request_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22718,11 +22741,11 @@ void HP_clif_pAdopt_request(int fd, struct map_session_data *sd) { void HP_clif_pAdopt_reply(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pAdopt_reply_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAdopt_reply_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pAdopt_reply_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22733,10 +22756,10 @@ void HP_clif_pAdopt_reply(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pAdopt_reply(fd, sd); } if( HPMHooks.count.HP_clif_pAdopt_reply_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAdopt_reply_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pAdopt_reply_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22744,11 +22767,11 @@ void HP_clif_pAdopt_reply(int fd, struct map_session_data *sd) { void HP_clif_pViewPlayerEquip(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pViewPlayerEquip_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pViewPlayerEquip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pViewPlayerEquip_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22759,10 +22782,10 @@ void HP_clif_pViewPlayerEquip(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pViewPlayerEquip(fd, sd); } if( HPMHooks.count.HP_clif_pViewPlayerEquip_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pViewPlayerEquip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pViewPlayerEquip_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22770,11 +22793,11 @@ void HP_clif_pViewPlayerEquip(int fd, struct map_session_data *sd) { void HP_clif_pEquipTick(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pEquipTick_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEquipTick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pEquipTick_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22785,10 +22808,10 @@ void HP_clif_pEquipTick(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pEquipTick(fd, sd); } if( HPMHooks.count.HP_clif_pEquipTick_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEquipTick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pEquipTick_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22796,11 +22819,11 @@ void HP_clif_pEquipTick(int fd, struct map_session_data *sd) { void HP_clif_pquestStateAck(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pquestStateAck_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pquestStateAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pquestStateAck_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22811,10 +22834,10 @@ void HP_clif_pquestStateAck(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pquestStateAck(fd, sd); } if( HPMHooks.count.HP_clif_pquestStateAck_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pquestStateAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pquestStateAck_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22822,11 +22845,11 @@ void HP_clif_pquestStateAck(int fd, struct map_session_data *sd) { void HP_clif_pmercenary_action(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pmercenary_action_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pmercenary_action_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pmercenary_action_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22837,10 +22860,10 @@ void HP_clif_pmercenary_action(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pmercenary_action(fd, sd); } if( HPMHooks.count.HP_clif_pmercenary_action_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pmercenary_action_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pmercenary_action_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22848,11 +22871,11 @@ void HP_clif_pmercenary_action(int fd, struct map_session_data *sd) { void HP_clif_pBattleChat(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBattleChat_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBattleChat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBattleChat_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22863,10 +22886,10 @@ void HP_clif_pBattleChat(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBattleChat(fd, sd); } if( HPMHooks.count.HP_clif_pBattleChat_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBattleChat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBattleChat_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22874,11 +22897,11 @@ void HP_clif_pBattleChat(int fd, struct map_session_data *sd) { void HP_clif_pLessEffect(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pLessEffect_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLessEffect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pLessEffect_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22889,10 +22912,10 @@ void HP_clif_pLessEffect(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pLessEffect(fd, sd); } if( HPMHooks.count.HP_clif_pLessEffect_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLessEffect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pLessEffect_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22900,11 +22923,11 @@ void HP_clif_pLessEffect(int fd, struct map_session_data *sd) { void HP_clif_pItemListWindowSelected(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pItemListWindowSelected_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pItemListWindowSelected_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pItemListWindowSelected_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22915,10 +22938,10 @@ void HP_clif_pItemListWindowSelected(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pItemListWindowSelected(fd, sd); } if( HPMHooks.count.HP_clif_pItemListWindowSelected_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pItemListWindowSelected_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pItemListWindowSelected_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22926,11 +22949,11 @@ void HP_clif_pItemListWindowSelected(int fd, struct map_session_data *sd) { void HP_clif_pReqOpenBuyingStore(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pReqOpenBuyingStore_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqOpenBuyingStore_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pReqOpenBuyingStore_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22941,10 +22964,10 @@ void HP_clif_pReqOpenBuyingStore(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pReqOpenBuyingStore(fd, sd); } if( HPMHooks.count.HP_clif_pReqOpenBuyingStore_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqOpenBuyingStore_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pReqOpenBuyingStore_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22952,11 +22975,11 @@ void HP_clif_pReqOpenBuyingStore(int fd, struct map_session_data *sd) { void HP_clif_pReqCloseBuyingStore(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pReqCloseBuyingStore_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqCloseBuyingStore_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pReqCloseBuyingStore_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22967,10 +22990,10 @@ void HP_clif_pReqCloseBuyingStore(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pReqCloseBuyingStore(fd, sd); } if( HPMHooks.count.HP_clif_pReqCloseBuyingStore_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqCloseBuyingStore_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pReqCloseBuyingStore_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -22978,11 +23001,11 @@ void HP_clif_pReqCloseBuyingStore(int fd, struct map_session_data *sd) { void HP_clif_pReqClickBuyingStore(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pReqClickBuyingStore_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqClickBuyingStore_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pReqClickBuyingStore_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22993,10 +23016,10 @@ void HP_clif_pReqClickBuyingStore(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pReqClickBuyingStore(fd, sd); } if( HPMHooks.count.HP_clif_pReqClickBuyingStore_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqClickBuyingStore_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pReqClickBuyingStore_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23004,11 +23027,11 @@ void HP_clif_pReqClickBuyingStore(int fd, struct map_session_data *sd) { void HP_clif_pReqTradeBuyingStore(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pReqTradeBuyingStore_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqTradeBuyingStore_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pReqTradeBuyingStore_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23019,10 +23042,10 @@ void HP_clif_pReqTradeBuyingStore(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pReqTradeBuyingStore(fd, sd); } if( HPMHooks.count.HP_clif_pReqTradeBuyingStore_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqTradeBuyingStore_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pReqTradeBuyingStore_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23030,11 +23053,11 @@ void HP_clif_pReqTradeBuyingStore(int fd, struct map_session_data *sd) { void HP_clif_pSearchStoreInfo(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSearchStoreInfo_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSearchStoreInfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSearchStoreInfo_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23045,10 +23068,10 @@ void HP_clif_pSearchStoreInfo(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pSearchStoreInfo(fd, sd); } if( HPMHooks.count.HP_clif_pSearchStoreInfo_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSearchStoreInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSearchStoreInfo_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23056,11 +23079,11 @@ void HP_clif_pSearchStoreInfo(int fd, struct map_session_data *sd) { void HP_clif_pSearchStoreInfoNextPage(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSearchStoreInfoNextPage_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSearchStoreInfoNextPage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSearchStoreInfoNextPage_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23071,10 +23094,10 @@ void HP_clif_pSearchStoreInfoNextPage(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pSearchStoreInfoNextPage(fd, sd); } if( HPMHooks.count.HP_clif_pSearchStoreInfoNextPage_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSearchStoreInfoNextPage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSearchStoreInfoNextPage_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23082,11 +23105,11 @@ void HP_clif_pSearchStoreInfoNextPage(int fd, struct map_session_data *sd) { void HP_clif_pCloseSearchStoreInfo(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCloseSearchStoreInfo_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCloseSearchStoreInfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCloseSearchStoreInfo_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23097,10 +23120,10 @@ void HP_clif_pCloseSearchStoreInfo(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCloseSearchStoreInfo(fd, sd); } if( HPMHooks.count.HP_clif_pCloseSearchStoreInfo_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCloseSearchStoreInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCloseSearchStoreInfo_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23108,11 +23131,11 @@ void HP_clif_pCloseSearchStoreInfo(int fd, struct map_session_data *sd) { void HP_clif_pSearchStoreInfoListItemClick(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSearchStoreInfoListItemClick_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSearchStoreInfoListItemClick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSearchStoreInfoListItemClick_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23123,10 +23146,10 @@ void HP_clif_pSearchStoreInfoListItemClick(int fd, struct map_session_data *sd) HPMHooks.source.clif.pSearchStoreInfoListItemClick(fd, sd); } if( HPMHooks.count.HP_clif_pSearchStoreInfoListItemClick_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSearchStoreInfoListItemClick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSearchStoreInfoListItemClick_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23134,11 +23157,11 @@ void HP_clif_pSearchStoreInfoListItemClick(int fd, struct map_session_data *sd) void HP_clif_pDebug(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pDebug_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pDebug_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pDebug_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23149,10 +23172,10 @@ void HP_clif_pDebug(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pDebug(fd, sd); } if( HPMHooks.count.HP_clif_pDebug_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pDebug_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pDebug_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23160,11 +23183,11 @@ void HP_clif_pDebug(int fd, struct map_session_data *sd) { void HP_clif_pSkillSelectMenu(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSkillSelectMenu_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSkillSelectMenu_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSkillSelectMenu_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23175,10 +23198,10 @@ void HP_clif_pSkillSelectMenu(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pSkillSelectMenu(fd, sd); } if( HPMHooks.count.HP_clif_pSkillSelectMenu_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSkillSelectMenu_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSkillSelectMenu_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23186,11 +23209,11 @@ void HP_clif_pSkillSelectMenu(int fd, struct map_session_data *sd) { void HP_clif_pMoveItem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pMoveItem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveItem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pMoveItem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23201,10 +23224,10 @@ void HP_clif_pMoveItem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pMoveItem(fd, sd); } if( HPMHooks.count.HP_clif_pMoveItem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMoveItem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pMoveItem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23212,11 +23235,11 @@ void HP_clif_pMoveItem(int fd, struct map_session_data *sd) { void HP_clif_pDull(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pDull_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pDull_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pDull_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23227,10 +23250,10 @@ void HP_clif_pDull(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pDull(fd, sd); } if( HPMHooks.count.HP_clif_pDull_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pDull_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pDull_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23238,11 +23261,11 @@ void HP_clif_pDull(int fd, struct map_session_data *sd) { void HP_clif_pBGQueueRegister(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBGQueueRegister_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBGQueueRegister_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBGQueueRegister_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23253,10 +23276,10 @@ void HP_clif_pBGQueueRegister(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBGQueueRegister(fd, sd); } if( HPMHooks.count.HP_clif_pBGQueueRegister_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBGQueueRegister_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBGQueueRegister_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23264,11 +23287,11 @@ void HP_clif_pBGQueueRegister(int fd, struct map_session_data *sd) { void HP_clif_pBGQueueCheckState(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBGQueueCheckState_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBGQueueCheckState_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBGQueueCheckState_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23279,10 +23302,10 @@ void HP_clif_pBGQueueCheckState(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBGQueueCheckState(fd, sd); } if( HPMHooks.count.HP_clif_pBGQueueCheckState_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBGQueueCheckState_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBGQueueCheckState_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23290,11 +23313,11 @@ void HP_clif_pBGQueueCheckState(int fd, struct map_session_data *sd) { void HP_clif_pBGQueueRevokeReq(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBGQueueRevokeReq_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBGQueueRevokeReq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBGQueueRevokeReq_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23305,10 +23328,10 @@ void HP_clif_pBGQueueRevokeReq(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBGQueueRevokeReq(fd, sd); } if( HPMHooks.count.HP_clif_pBGQueueRevokeReq_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBGQueueRevokeReq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBGQueueRevokeReq_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23316,11 +23339,11 @@ void HP_clif_pBGQueueRevokeReq(int fd, struct map_session_data *sd) { void HP_clif_pBGQueueBattleBeginAck(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBGQueueBattleBeginAck_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBGQueueBattleBeginAck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBGQueueBattleBeginAck_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23331,10 +23354,10 @@ void HP_clif_pBGQueueBattleBeginAck(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBGQueueBattleBeginAck(fd, sd); } if( HPMHooks.count.HP_clif_pBGQueueBattleBeginAck_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBGQueueBattleBeginAck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBGQueueBattleBeginAck_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23342,11 +23365,11 @@ void HP_clif_pBGQueueBattleBeginAck(int fd, struct map_session_data *sd) { void HP_clif_pCashShopOpen(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCashShopOpen_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopOpen_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCashShopOpen_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23357,10 +23380,10 @@ void HP_clif_pCashShopOpen(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCashShopOpen(fd, sd); } if( HPMHooks.count.HP_clif_pCashShopOpen_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopOpen_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCashShopOpen_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23368,11 +23391,11 @@ void HP_clif_pCashShopOpen(int fd, struct map_session_data *sd) { void HP_clif_pCashShopClose(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCashShopClose_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopClose_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCashShopClose_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23383,10 +23406,10 @@ void HP_clif_pCashShopClose(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCashShopClose(fd, sd); } if( HPMHooks.count.HP_clif_pCashShopClose_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopClose_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCashShopClose_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23394,11 +23417,11 @@ void HP_clif_pCashShopClose(int fd, struct map_session_data *sd) { void HP_clif_pCashShopReqTab(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCashShopReqTab_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopReqTab_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCashShopReqTab_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23409,10 +23432,10 @@ void HP_clif_pCashShopReqTab(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCashShopReqTab(fd, sd); } if( HPMHooks.count.HP_clif_pCashShopReqTab_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopReqTab_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCashShopReqTab_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23420,11 +23443,11 @@ void HP_clif_pCashShopReqTab(int fd, struct map_session_data *sd) { void HP_clif_pCashShopSchedule(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCashShopSchedule_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopSchedule_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCashShopSchedule_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23435,10 +23458,10 @@ void HP_clif_pCashShopSchedule(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCashShopSchedule(fd, sd); } if( HPMHooks.count.HP_clif_pCashShopSchedule_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopSchedule_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCashShopSchedule_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23446,11 +23469,11 @@ void HP_clif_pCashShopSchedule(int fd, struct map_session_data *sd) { void HP_clif_pCashShopBuy(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pCashShopBuy_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopBuy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pCashShopBuy_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23461,10 +23484,10 @@ void HP_clif_pCashShopBuy(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pCashShopBuy(fd, sd); } if( HPMHooks.count.HP_clif_pCashShopBuy_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopBuy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pCashShopBuy_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23472,11 +23495,11 @@ void HP_clif_pCashShopBuy(int fd, struct map_session_data *sd) { void HP_clif_pPartyTick(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyTick_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyTick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyTick_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23487,10 +23510,10 @@ void HP_clif_pPartyTick(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyTick(fd, sd); } if( HPMHooks.count.HP_clif_pPartyTick_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyTick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyTick_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23498,11 +23521,11 @@ void HP_clif_pPartyTick(int fd, struct map_session_data *sd) { void HP_clif_pGuildInvite2(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pGuildInvite2_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildInvite2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pGuildInvite2_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23513,10 +23536,10 @@ void HP_clif_pGuildInvite2(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pGuildInvite2(fd, sd); } if( HPMHooks.count.HP_clif_pGuildInvite2_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildInvite2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pGuildInvite2_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23524,11 +23547,11 @@ void HP_clif_pGuildInvite2(int fd, struct map_session_data *sd) { void HP_clif_pPartyBookingAddFilter(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyBookingAddFilter_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingAddFilter_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyBookingAddFilter_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23539,10 +23562,10 @@ void HP_clif_pPartyBookingAddFilter(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyBookingAddFilter(fd, sd); } if( HPMHooks.count.HP_clif_pPartyBookingAddFilter_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingAddFilter_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyBookingAddFilter_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23550,11 +23573,11 @@ void HP_clif_pPartyBookingAddFilter(int fd, struct map_session_data *sd) { void HP_clif_pPartyBookingSubFilter(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyBookingSubFilter_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingSubFilter_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyBookingSubFilter_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23565,10 +23588,10 @@ void HP_clif_pPartyBookingSubFilter(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyBookingSubFilter(fd, sd); } if( HPMHooks.count.HP_clif_pPartyBookingSubFilter_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingSubFilter_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyBookingSubFilter_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23576,11 +23599,11 @@ void HP_clif_pPartyBookingSubFilter(int fd, struct map_session_data *sd) { void HP_clif_pPartyBookingReqVolunteer(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyBookingReqVolunteer_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingReqVolunteer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyBookingReqVolunteer_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23591,10 +23614,10 @@ void HP_clif_pPartyBookingReqVolunteer(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyBookingReqVolunteer(fd, sd); } if( HPMHooks.count.HP_clif_pPartyBookingReqVolunteer_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingReqVolunteer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyBookingReqVolunteer_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23602,11 +23625,11 @@ void HP_clif_pPartyBookingReqVolunteer(int fd, struct map_session_data *sd) { void HP_clif_pPartyBookingRefuseVolunteer(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyBookingRefuseVolunteer_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingRefuseVolunteer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyBookingRefuseVolunteer_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23617,10 +23640,10 @@ void HP_clif_pPartyBookingRefuseVolunteer(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyBookingRefuseVolunteer(fd, sd); } if( HPMHooks.count.HP_clif_pPartyBookingRefuseVolunteer_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingRefuseVolunteer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyBookingRefuseVolunteer_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23628,11 +23651,11 @@ void HP_clif_pPartyBookingRefuseVolunteer(int fd, struct map_session_data *sd) { void HP_clif_pPartyBookingCancelVolunteer(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPartyBookingCancelVolunteer_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingCancelVolunteer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pPartyBookingCancelVolunteer_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23643,10 +23666,10 @@ void HP_clif_pPartyBookingCancelVolunteer(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pPartyBookingCancelVolunteer(fd, sd); } if( HPMHooks.count.HP_clif_pPartyBookingCancelVolunteer_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPartyBookingCancelVolunteer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pPartyBookingCancelVolunteer_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23654,11 +23677,11 @@ void HP_clif_pPartyBookingCancelVolunteer(int fd, struct map_session_data *sd) { void HP_clif_pBankDeposit(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBankDeposit_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankDeposit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBankDeposit_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23669,10 +23692,10 @@ void HP_clif_pBankDeposit(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBankDeposit(fd, sd); } if( HPMHooks.count.HP_clif_pBankDeposit_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankDeposit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBankDeposit_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23680,11 +23703,11 @@ void HP_clif_pBankDeposit(int fd, struct map_session_data *sd) { void HP_clif_pBankWithdraw(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBankWithdraw_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankWithdraw_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBankWithdraw_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23695,10 +23718,10 @@ void HP_clif_pBankWithdraw(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBankWithdraw(fd, sd); } if( HPMHooks.count.HP_clif_pBankWithdraw_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankWithdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBankWithdraw_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23706,11 +23729,11 @@ void HP_clif_pBankWithdraw(int fd, struct map_session_data *sd) { void HP_clif_pBankCheck(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBankCheck_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankCheck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBankCheck_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23721,10 +23744,10 @@ void HP_clif_pBankCheck(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBankCheck(fd, sd); } if( HPMHooks.count.HP_clif_pBankCheck_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankCheck_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBankCheck_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23732,11 +23755,11 @@ void HP_clif_pBankCheck(int fd, struct map_session_data *sd) { void HP_clif_pBankOpen(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBankOpen_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankOpen_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBankOpen_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23747,10 +23770,10 @@ void HP_clif_pBankOpen(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBankOpen(fd, sd); } if( HPMHooks.count.HP_clif_pBankOpen_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankOpen_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBankOpen_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23758,11 +23781,11 @@ void HP_clif_pBankOpen(int fd, struct map_session_data *sd) { void HP_clif_pBankClose(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pBankClose_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankClose_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pBankClose_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23773,10 +23796,10 @@ void HP_clif_pBankClose(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pBankClose(fd, sd); } if( HPMHooks.count.HP_clif_pBankClose_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankClose_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pBankClose_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23784,11 +23807,11 @@ void HP_clif_pBankClose(int fd, struct map_session_data *sd) { void HP_clif_pRouletteOpen(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRouletteOpen_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteOpen_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRouletteOpen_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23799,10 +23822,10 @@ void HP_clif_pRouletteOpen(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRouletteOpen(fd, sd); } if( HPMHooks.count.HP_clif_pRouletteOpen_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteOpen_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRouletteOpen_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23810,11 +23833,11 @@ void HP_clif_pRouletteOpen(int fd, struct map_session_data *sd) { void HP_clif_pRouletteInfo(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRouletteInfo_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteInfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRouletteInfo_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23825,10 +23848,10 @@ void HP_clif_pRouletteInfo(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRouletteInfo(fd, sd); } if( HPMHooks.count.HP_clif_pRouletteInfo_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRouletteInfo_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23836,11 +23859,11 @@ void HP_clif_pRouletteInfo(int fd, struct map_session_data *sd) { void HP_clif_pRouletteClose(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRouletteClose_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteClose_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRouletteClose_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23851,10 +23874,10 @@ void HP_clif_pRouletteClose(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRouletteClose(fd, sd); } if( HPMHooks.count.HP_clif_pRouletteClose_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteClose_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRouletteClose_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23862,11 +23885,11 @@ void HP_clif_pRouletteClose(int fd, struct map_session_data *sd) { void HP_clif_pRouletteGenerate(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRouletteGenerate_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteGenerate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRouletteGenerate_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23877,10 +23900,10 @@ void HP_clif_pRouletteGenerate(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRouletteGenerate(fd, sd); } if( HPMHooks.count.HP_clif_pRouletteGenerate_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteGenerate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRouletteGenerate_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23888,11 +23911,11 @@ void HP_clif_pRouletteGenerate(int fd, struct map_session_data *sd) { void HP_clif_pRouletteRecvItem(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pRouletteRecvItem_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteRecvItem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pRouletteRecvItem_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23903,10 +23926,10 @@ void HP_clif_pRouletteRecvItem(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pRouletteRecvItem(fd, sd); } if( HPMHooks.count.HP_clif_pRouletteRecvItem_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRouletteRecvItem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pRouletteRecvItem_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23914,11 +23937,11 @@ void HP_clif_pRouletteRecvItem(int fd, struct map_session_data *sd) { void HP_clif_pNPCShopClosed(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNPCShopClosed_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCShopClosed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNPCShopClosed_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23929,10 +23952,10 @@ void HP_clif_pNPCShopClosed(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNPCShopClosed(fd, sd); } if( HPMHooks.count.HP_clif_pNPCShopClosed_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCShopClosed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNPCShopClosed_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23940,11 +23963,11 @@ void HP_clif_pNPCShopClosed(int fd, struct map_session_data *sd) { void HP_clif_pNPCMarketClosed(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNPCMarketClosed_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCMarketClosed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNPCMarketClosed_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23955,10 +23978,10 @@ void HP_clif_pNPCMarketClosed(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNPCMarketClosed(fd, sd); } if( HPMHooks.count.HP_clif_pNPCMarketClosed_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCMarketClosed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNPCMarketClosed_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23966,11 +23989,11 @@ void HP_clif_pNPCMarketClosed(int fd, struct map_session_data *sd) { void HP_clif_pNPCMarketPurchase(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pNPCMarketPurchase_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCMarketPurchase_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pNPCMarketPurchase_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -23981,10 +24004,10 @@ void HP_clif_pNPCMarketPurchase(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pNPCMarketPurchase(fd, sd); } if( HPMHooks.count.HP_clif_pNPCMarketPurchase_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCMarketPurchase_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pNPCMarketPurchase_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -23992,11 +24015,11 @@ void HP_clif_pNPCMarketPurchase(int fd, struct map_session_data *sd) { void HP_clif_add_random_options(unsigned char *buf, struct item *item) { int hIndex = 0; if( HPMHooks.count.HP_clif_add_random_options_pre ) { - void (*preHookFunc) (unsigned char *buf, struct item *item); + void (*preHookFunc) (unsigned char **buf, struct item **item); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_add_random_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_add_random_options_pre[hIndex].func; - preHookFunc(buf, item); + preHookFunc(&buf, &item); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24018,11 +24041,11 @@ void HP_clif_add_random_options(unsigned char *buf, struct item *item) { void HP_clif_pHotkeyRowShift(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pHotkeyRowShift_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24033,10 +24056,10 @@ void HP_clif_pHotkeyRowShift(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pHotkeyRowShift(fd, sd); } if( HPMHooks.count.HP_clif_pHotkeyRowShift_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -24044,11 +24067,11 @@ void HP_clif_pHotkeyRowShift(int fd, struct map_session_data *sd) { void HP_clif_dressroom_open(struct map_session_data *sd, int view) { int hIndex = 0; if( HPMHooks.count.HP_clif_dressroom_open_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *view); + void (*preHookFunc) (struct map_session_data **sd, int *view); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_dressroom_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_dressroom_open_pre[hIndex].func; - preHookFunc(sd, &view); + preHookFunc(&sd, &view); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24059,10 +24082,10 @@ void HP_clif_dressroom_open(struct map_session_data *sd, int view) { HPMHooks.source.clif.dressroom_open(sd, view); } if( HPMHooks.count.HP_clif_dressroom_open_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *view); + void (*postHookFunc) (struct map_session_data *sd, int view); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_dressroom_open_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_dressroom_open_post[hIndex].func; - postHookFunc(sd, &view); + postHookFunc(sd, view); } } return; @@ -24070,11 +24093,11 @@ void HP_clif_dressroom_open(struct map_session_data *sd, int view) { void HP_clif_pOneClick_ItemIdentify(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pOneClick_ItemIdentify_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pOneClick_ItemIdentify_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pOneClick_ItemIdentify_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24085,10 +24108,10 @@ void HP_clif_pOneClick_ItemIdentify(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pOneClick_ItemIdentify(fd, sd); } if( HPMHooks.count.HP_clif_pOneClick_ItemIdentify_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pOneClick_ItemIdentify_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pOneClick_ItemIdentify_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; @@ -24096,11 +24119,11 @@ void HP_clif_pOneClick_ItemIdentify(int fd, struct map_session_data *sd) { void HP_clif_selectcart(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_selectcart_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_selectcart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_selectcart_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24122,11 +24145,11 @@ void HP_clif_selectcart(struct map_session_data *sd) { void HP_clif_pSelectCart(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pSelectCart_pre ) { - void (*preHookFunc) (int *fd, struct map_session_data *sd); + void (*preHookFunc) (int *fd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSelectCart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_pSelectCart_pre[hIndex].func; - preHookFunc(&fd, sd); + preHookFunc(&fd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24137,15 +24160,42 @@ void HP_clif_pSelectCart(int fd, struct map_session_data *sd) { HPMHooks.source.clif.pSelectCart(fd, sd); } if( HPMHooks.count.HP_clif_pSelectCart_post ) { - void (*postHookFunc) (int *fd, struct map_session_data *sd); + void (*postHookFunc) (int fd, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSelectCart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_pSelectCart_post[hIndex].func; - postHookFunc(&fd, sd); + postHookFunc(fd, sd); } } return; } -/* cmdline */ +const char* HP_clif_get_bl_name(const struct block_list *bl) { + int hIndex = 0; + const char* retVal___ = NULL; + if( HPMHooks.count.HP_clif_get_bl_name_pre ) { + const char* (*preHookFunc) (const struct block_list **bl); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_get_bl_name_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_get_bl_name_pre[hIndex].func; + retVal___ = preHookFunc(&bl); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.clif.get_bl_name(bl); + } + if( HPMHooks.count.HP_clif_get_bl_name_post ) { + const char* (*postHookFunc) (const char* retVal___, const struct block_list *bl); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_get_bl_name_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_get_bl_name_post[hIndex].func; + retVal___ = postHookFunc(retVal___, bl); + } + } + return retVal___; +} +/* cmdline_interface */ void HP_cmdline_init(void) { int hIndex = 0; if( HPMHooks.count.HP_cmdline_init_pre ) { @@ -24202,11 +24252,11 @@ bool HP_cmdline_arg_add(unsigned int pluginID, const char *name, char shortname, int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_cmdline_arg_add_pre ) { - bool (*preHookFunc) (unsigned int *pluginID, const char *name, char *shortname, CmdlineExecFunc *func, const char *help, unsigned int *options); + bool (*preHookFunc) (unsigned int *pluginID, const char **name, char *shortname, CmdlineExecFunc *func, const char **help, unsigned int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_arg_add_pre[hIndex].func; - retVal___ = preHookFunc(&pluginID, name, &shortname, &func, help, &options); + retVal___ = preHookFunc(&pluginID, &name, &shortname, &func, &help, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24217,10 +24267,10 @@ bool HP_cmdline_arg_add(unsigned int pluginID, const char *name, char shortname, retVal___ = HPMHooks.source.cmdline.arg_add(pluginID, name, shortname, func, help, options); } if( HPMHooks.count.HP_cmdline_arg_add_post ) { - bool (*postHookFunc) (bool retVal___, unsigned int *pluginID, const char *name, char *shortname, CmdlineExecFunc *func, const char *help, unsigned int *options); + bool (*postHookFunc) (bool retVal___, unsigned int pluginID, const char *name, char shortname, CmdlineExecFunc func, const char *help, unsigned int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_cmdline_arg_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &pluginID, name, &shortname, &func, help, &options); + retVal___ = postHookFunc(retVal___, pluginID, name, shortname, func, help, options); } } return retVal___; @@ -24229,11 +24279,11 @@ int HP_cmdline_exec(int argc, char **argv, unsigned int options) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_cmdline_exec_pre ) { - int (*preHookFunc) (int *argc, char **argv, unsigned int *options); + int (*preHookFunc) (int *argc, char ***argv, unsigned int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_exec_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_exec_pre[hIndex].func; - retVal___ = preHookFunc(&argc, argv, &options); + retVal___ = preHookFunc(&argc, &argv, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24244,10 +24294,10 @@ int HP_cmdline_exec(int argc, char **argv, unsigned int options) { retVal___ = HPMHooks.source.cmdline.exec(argc, argv, options); } if( HPMHooks.count.HP_cmdline_exec_post ) { - int (*postHookFunc) (int retVal___, int *argc, char **argv, unsigned int *options); + int (*postHookFunc) (int retVal___, int argc, char **argv, unsigned int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_exec_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_cmdline_exec_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &argc, argv, &options); + retVal___ = postHookFunc(retVal___, argc, argv, options); } } return retVal___; @@ -24256,11 +24306,11 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_cmdline_arg_next_value_pre ) { - bool (*preHookFunc) (const char *name, int *current_arg, int *argc); + bool (*preHookFunc) (const char **name, int *current_arg, int *argc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_next_value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_arg_next_value_pre[hIndex].func; - retVal___ = preHookFunc(name, ¤t_arg, &argc); + retVal___ = preHookFunc(&name, ¤t_arg, &argc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24271,10 +24321,10 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { retVal___ = HPMHooks.source.cmdline.arg_next_value(name, current_arg, argc); } if( HPMHooks.count.HP_cmdline_arg_next_value_post ) { - bool (*postHookFunc) (bool retVal___, const char *name, int *current_arg, int *argc); + bool (*postHookFunc) (bool retVal___, const char *name, int current_arg, int argc); for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_next_value_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_cmdline_arg_next_value_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, ¤t_arg, &argc); + retVal___ = postHookFunc(retVal___, name, current_arg, argc); } } return retVal___; @@ -24283,11 +24333,11 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_cmdline_arg_source_pre ) { - const char* (*preHookFunc) (struct CmdlineArgData *arg); + const char* (*preHookFunc) (struct CmdlineArgData **arg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_cmdline_arg_source_pre[hIndex].func; - retVal___ = preHookFunc(arg); + retVal___ = preHookFunc(&arg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24306,7 +24356,7 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { } return retVal___; } -/* console */ +/* console_interface */ void HP_console_init(void) { int hIndex = 0; if( HPMHooks.count.HP_console_init_pre ) { @@ -24411,7 +24461,7 @@ void HP_console_display_gplnotice(void) { } return; } -/* core */ +/* core_interface */ void HP_core_shutdown_callback(void) { int hIndex = 0; if( HPMHooks.count.HP_core_shutdown_callback_pre ) { @@ -24438,12 +24488,12 @@ void HP_core_shutdown_callback(void) { } return; } -/* DB */ -DBOptions HP_DB_fix_options(DBType type, DBOptions options) { +/* db_interface */ +enum DBOptions HP_DB_fix_options(enum DBType type, enum DBOptions options) { int hIndex = 0; - DBOptions retVal___ = DB_OPT_BASE; + enum DBOptions retVal___ = DB_OPT_BASE; if( HPMHooks.count.HP_DB_fix_options_pre ) { - DBOptions (*preHookFunc) (DBType *type, DBOptions *options); + enum DBOptions (*preHookFunc) (enum DBType *type, enum DBOptions *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_fix_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_fix_options_pre[hIndex].func; @@ -24458,19 +24508,19 @@ DBOptions HP_DB_fix_options(DBType type, DBOptions options) { retVal___ = HPMHooks.source.DB.fix_options(type, options); } if( HPMHooks.count.HP_DB_fix_options_post ) { - DBOptions (*postHookFunc) (DBOptions retVal___, DBType *type, DBOptions *options); + enum DBOptions (*postHookFunc) (enum DBOptions retVal___, enum DBType type, enum DBOptions options); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_fix_options_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_fix_options_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type, &options); + retVal___ = postHookFunc(retVal___, type, options); } } return retVal___; } -DBComparator HP_DB_default_cmp(DBType type) { +DBComparator HP_DB_default_cmp(enum DBType type) { int hIndex = 0; DBComparator retVal___ = NULL; if( HPMHooks.count.HP_DB_default_cmp_pre ) { - DBComparator (*preHookFunc) (DBType *type); + DBComparator (*preHookFunc) (enum DBType *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_cmp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_default_cmp_pre[hIndex].func; @@ -24485,19 +24535,19 @@ DBComparator HP_DB_default_cmp(DBType type) { retVal___ = HPMHooks.source.DB.default_cmp(type); } if( HPMHooks.count.HP_DB_default_cmp_post ) { - DBComparator (*postHookFunc) (DBComparator retVal___, DBType *type); + DBComparator (*postHookFunc) (DBComparator retVal___, enum DBType type); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_cmp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_default_cmp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; } -DBHasher HP_DB_default_hash(DBType type) { +DBHasher HP_DB_default_hash(enum DBType type) { int hIndex = 0; DBHasher retVal___ = NULL; if( HPMHooks.count.HP_DB_default_hash_pre ) { - DBHasher (*preHookFunc) (DBType *type); + DBHasher (*preHookFunc) (enum DBType *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_hash_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_default_hash_pre[hIndex].func; @@ -24512,19 +24562,19 @@ DBHasher HP_DB_default_hash(DBType type) { retVal___ = HPMHooks.source.DB.default_hash(type); } if( HPMHooks.count.HP_DB_default_hash_post ) { - DBHasher (*postHookFunc) (DBHasher retVal___, DBType *type); + DBHasher (*postHookFunc) (DBHasher retVal___, enum DBType type); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_hash_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_default_hash_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; } -DBReleaser HP_DB_default_release(DBType type, DBOptions options) { +DBReleaser HP_DB_default_release(enum DBType type, enum DBOptions options) { int hIndex = 0; DBReleaser retVal___ = NULL; if( HPMHooks.count.HP_DB_default_release_pre ) { - DBReleaser (*preHookFunc) (DBType *type, DBOptions *options); + DBReleaser (*preHookFunc) (enum DBType *type, enum DBOptions *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_release_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_default_release_pre[hIndex].func; @@ -24539,19 +24589,19 @@ DBReleaser HP_DB_default_release(DBType type, DBOptions options) { retVal___ = HPMHooks.source.DB.default_release(type, options); } if( HPMHooks.count.HP_DB_default_release_post ) { - DBReleaser (*postHookFunc) (DBReleaser retVal___, DBType *type, DBOptions *options); + DBReleaser (*postHookFunc) (DBReleaser retVal___, enum DBType type, enum DBOptions options); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_release_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_default_release_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type, &options); + retVal___ = postHookFunc(retVal___, type, options); } } return retVal___; } -DBReleaser HP_DB_custom_release(DBRelease which) { +DBReleaser HP_DB_custom_release(enum DBReleaseOption which) { int hIndex = 0; DBReleaser retVal___ = NULL; if( HPMHooks.count.HP_DB_custom_release_pre ) { - DBReleaser (*preHookFunc) (DBRelease *which); + DBReleaser (*preHookFunc) (enum DBReleaseOption *which); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_custom_release_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_custom_release_pre[hIndex].func; @@ -24566,23 +24616,23 @@ DBReleaser HP_DB_custom_release(DBRelease which) { retVal___ = HPMHooks.source.DB.custom_release(which); } if( HPMHooks.count.HP_DB_custom_release_post ) { - DBReleaser (*postHookFunc) (DBReleaser retVal___, DBRelease *which); + DBReleaser (*postHookFunc) (DBReleaser retVal___, enum DBReleaseOption which); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_custom_release_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_custom_release_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &which); + retVal___ = postHookFunc(retVal___, which); } } return retVal___; } -DBMap* HP_DB_alloc(const char *file, const char *func, int line, DBType type, DBOptions options, unsigned short maxlen) { +struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { int hIndex = 0; - DBMap* retVal___ = NULL; + struct DBMap* retVal___ = NULL; if( HPMHooks.count.HP_DB_alloc_pre ) { - DBMap* (*preHookFunc) (const char *file, const char *func, int *line, DBType *type, DBOptions *options, unsigned short *maxlen); + struct DBMap* (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_alloc_pre[hIndex].func; - retVal___ = preHookFunc(file, func, &line, &type, &options, &maxlen); + retVal___ = preHookFunc(&file, &func, &line, &type, &options, &maxlen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24593,20 +24643,19 @@ DBMap* HP_DB_alloc(const char *file, const char *func, int line, DBType type, DB retVal___ = HPMHooks.source.DB.alloc(file, func, line, type, options, maxlen); } if( HPMHooks.count.HP_DB_alloc_post ) { - DBMap* (*postHookFunc) (DBMap* retVal___, const char *file, const char *func, int *line, DBType *type, DBOptions *options, unsigned short *maxlen); + struct DBMap* (*postHookFunc) (struct DBMap* retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_alloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, file, func, &line, &type, &options, &maxlen); + retVal___ = postHookFunc(retVal___, file, func, line, type, options, maxlen); } } return retVal___; } -DBKey HP_DB_i2key(int key) { +union DBKey HP_DB_i2key(int key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_i2key_pre ) { - DBKey (*preHookFunc) (int *key); + union DBKey (*preHookFunc) (int *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_i2key_pre[hIndex].func; @@ -24621,20 +24670,19 @@ DBKey HP_DB_i2key(int key) { retVal___ = HPMHooks.source.DB.i2key(key); } if( HPMHooks.count.HP_DB_i2key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, int *key); + union DBKey (*postHookFunc) (union DBKey retVal___, int key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_i2key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBKey HP_DB_ui2key(unsigned int key) { +union DBKey HP_DB_ui2key(unsigned int key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ui2key_pre ) { - DBKey (*preHookFunc) (unsigned int *key); + union DBKey (*preHookFunc) (unsigned int *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ui2key_pre[hIndex].func; @@ -24649,24 +24697,23 @@ DBKey HP_DB_ui2key(unsigned int key) { retVal___ = HPMHooks.source.DB.ui2key(key); } if( HPMHooks.count.HP_DB_ui2key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, unsigned int *key); + union DBKey (*postHookFunc) (union DBKey retVal___, unsigned int key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ui2key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBKey HP_DB_str2key(const char *key) { +union DBKey HP_DB_str2key(const char *key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_str2key_pre ) { - DBKey (*preHookFunc) (const char *key); + union DBKey (*preHookFunc) (const char **key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_str2key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_str2key_pre[hIndex].func; - retVal___ = preHookFunc(key); + retVal___ = preHookFunc(&key); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24677,7 +24724,7 @@ DBKey HP_DB_str2key(const char *key) { retVal___ = HPMHooks.source.DB.str2key(key); } if( HPMHooks.count.HP_DB_str2key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, const char *key); + union DBKey (*postHookFunc) (union DBKey retVal___, const char *key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_str2key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_str2key_post[hIndex].func; retVal___ = postHookFunc(retVal___, key); @@ -24685,12 +24732,11 @@ DBKey HP_DB_str2key(const char *key) { } return retVal___; } -DBKey HP_DB_i642key(int64 key) { +union DBKey HP_DB_i642key(int64 key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_i642key_pre ) { - DBKey (*preHookFunc) (int64 *key); + union DBKey (*preHookFunc) (int64 *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i642key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_i642key_pre[hIndex].func; @@ -24705,20 +24751,19 @@ DBKey HP_DB_i642key(int64 key) { retVal___ = HPMHooks.source.DB.i642key(key); } if( HPMHooks.count.HP_DB_i642key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, int64 *key); + union DBKey (*postHookFunc) (union DBKey retVal___, int64 key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i642key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_i642key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBKey HP_DB_ui642key(uint64 key) { +union DBKey HP_DB_ui642key(uint64 key) { int hIndex = 0; - DBKey retVal___; - memset(&retVal___, '\0', sizeof(DBKey)); + union DBKey retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ui642key_pre ) { - DBKey (*preHookFunc) (uint64 *key); + union DBKey (*preHookFunc) (uint64 *key); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui642key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ui642key_pre[hIndex].func; @@ -24733,20 +24778,19 @@ DBKey HP_DB_ui642key(uint64 key) { retVal___ = HPMHooks.source.DB.ui642key(key); } if( HPMHooks.count.HP_DB_ui642key_post ) { - DBKey (*postHookFunc) (DBKey retVal___, uint64 *key); + union DBKey (*postHookFunc) (union DBKey retVal___, uint64 key); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui642key_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ui642key_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key); + retVal___ = postHookFunc(retVal___, key); } } return retVal___; } -DBData HP_DB_i2data(int data) { +struct DBData HP_DB_i2data(int data) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_DB_i2data_pre ) { - DBData (*preHookFunc) (int *data); + struct DBData (*preHookFunc) (int *data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_i2data_pre[hIndex].func; @@ -24761,20 +24805,19 @@ DBData HP_DB_i2data(int data) { retVal___ = HPMHooks.source.DB.i2data(data); } if( HPMHooks.count.HP_DB_i2data_post ) { - DBData (*postHookFunc) (DBData retVal___, int *data); + struct DBData (*postHookFunc) (struct DBData retVal___, int data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_i2data_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &data); + retVal___ = postHookFunc(retVal___, data); } } return retVal___; } -DBData HP_DB_ui2data(unsigned int data) { +struct DBData HP_DB_ui2data(unsigned int data) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ui2data_pre ) { - DBData (*preHookFunc) (unsigned int *data); + struct DBData (*preHookFunc) (unsigned int *data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ui2data_pre[hIndex].func; @@ -24789,24 +24832,23 @@ DBData HP_DB_ui2data(unsigned int data) { retVal___ = HPMHooks.source.DB.ui2data(data); } if( HPMHooks.count.HP_DB_ui2data_post ) { - DBData (*postHookFunc) (DBData retVal___, unsigned int *data); + struct DBData (*postHookFunc) (struct DBData retVal___, unsigned int data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ui2data_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &data); + retVal___ = postHookFunc(retVal___, data); } } return retVal___; } -DBData HP_DB_ptr2data(void *data) { +struct DBData HP_DB_ptr2data(void *data) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_DB_ptr2data_pre ) { - DBData (*preHookFunc) (void *data); + struct DBData (*preHookFunc) (void **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ptr2data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_ptr2data_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24817,7 +24859,7 @@ DBData HP_DB_ptr2data(void *data) { retVal___ = HPMHooks.source.DB.ptr2data(data); } if( HPMHooks.count.HP_DB_ptr2data_post ) { - DBData (*postHookFunc) (DBData retVal___, void *data); + struct DBData (*postHookFunc) (struct DBData retVal___, void *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ptr2data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_ptr2data_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -24825,15 +24867,15 @@ DBData HP_DB_ptr2data(void *data) { } return retVal___; } -int HP_DB_data2i(DBData *data) { +int HP_DB_data2i(struct DBData *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_DB_data2i_pre ) { - int (*preHookFunc) (DBData *data); + int (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2i_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_data2i_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24844,7 +24886,7 @@ int HP_DB_data2i(DBData *data) { retVal___ = HPMHooks.source.DB.data2i(data); } if( HPMHooks.count.HP_DB_data2i_post ) { - int (*postHookFunc) (int retVal___, DBData *data); + int (*postHookFunc) (int retVal___, struct DBData *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2i_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_data2i_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -24852,15 +24894,15 @@ int HP_DB_data2i(DBData *data) { } return retVal___; } -unsigned int HP_DB_data2ui(DBData *data) { +unsigned int HP_DB_data2ui(struct DBData *data) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_DB_data2ui_pre ) { - unsigned int (*preHookFunc) (DBData *data); + unsigned int (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ui_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_data2ui_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24871,7 +24913,7 @@ unsigned int HP_DB_data2ui(DBData *data) { retVal___ = HPMHooks.source.DB.data2ui(data); } if( HPMHooks.count.HP_DB_data2ui_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, DBData *data); + unsigned int (*postHookFunc) (unsigned int retVal___, struct DBData *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ui_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_data2ui_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -24879,15 +24921,15 @@ unsigned int HP_DB_data2ui(DBData *data) { } return retVal___; } -void* HP_DB_data2ptr(DBData *data) { +void* HP_DB_data2ptr(struct DBData *data) { int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_DB_data2ptr_pre ) { - void* (*preHookFunc) (DBData *data); + void* (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_DB_data2ptr_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24898,7 +24940,7 @@ void* HP_DB_data2ptr(DBData *data) { retVal___ = HPMHooks.source.DB.data2ptr(data); } if( HPMHooks.count.HP_DB_data2ptr_post ) { - void* (*postHookFunc) (void* retVal___, DBData *data); + void* (*postHookFunc) (void* retVal___, struct DBData *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_DB_data2ptr_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -24958,16 +25000,16 @@ void HP_DB_final(void) { } return; } -/* duel */ +/* duel_interface */ int HP_duel_create(struct map_session_data *sd, const unsigned int maxpl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_duel_create_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const unsigned int *maxpl); + int (*preHookFunc) (struct map_session_data **sd, const unsigned int *maxpl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_duel_create_pre[hIndex].func; - retVal___ = preHookFunc(sd, &maxpl); + retVal___ = preHookFunc(&sd, &maxpl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24978,10 +25020,10 @@ int HP_duel_create(struct map_session_data *sd, const unsigned int maxpl) { retVal___ = HPMHooks.source.duel.create(sd, maxpl); } if( HPMHooks.count.HP_duel_create_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const unsigned int *maxpl); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const unsigned int maxpl); for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_duel_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &maxpl); + retVal___ = postHookFunc(retVal___, sd, maxpl); } } return retVal___; @@ -24989,11 +25031,11 @@ int HP_duel_create(struct map_session_data *sd, const unsigned int maxpl) { void HP_duel_invite(const unsigned int did, struct map_session_data *sd, struct map_session_data *target_sd) { int hIndex = 0; if( HPMHooks.count.HP_duel_invite_pre ) { - void (*preHookFunc) (const unsigned int *did, struct map_session_data *sd, struct map_session_data *target_sd); + void (*preHookFunc) (const unsigned int *did, struct map_session_data **sd, struct map_session_data **target_sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_invite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_duel_invite_pre[hIndex].func; - preHookFunc(&did, sd, target_sd); + preHookFunc(&did, &sd, &target_sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25004,10 +25046,10 @@ void HP_duel_invite(const unsigned int did, struct map_session_data *sd, struct HPMHooks.source.duel.invite(did, sd, target_sd); } if( HPMHooks.count.HP_duel_invite_post ) { - void (*postHookFunc) (const unsigned int *did, struct map_session_data *sd, struct map_session_data *target_sd); + void (*postHookFunc) (const unsigned int did, struct map_session_data *sd, struct map_session_data *target_sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_invite_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_duel_invite_post[hIndex].func; - postHookFunc(&did, sd, target_sd); + postHookFunc(did, sd, target_sd); } } return; @@ -25015,11 +25057,11 @@ void HP_duel_invite(const unsigned int did, struct map_session_data *sd, struct void HP_duel_accept(const unsigned int did, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_duel_accept_pre ) { - void (*preHookFunc) (const unsigned int *did, struct map_session_data *sd); + void (*preHookFunc) (const unsigned int *did, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_accept_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_duel_accept_pre[hIndex].func; - preHookFunc(&did, sd); + preHookFunc(&did, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25030,10 +25072,10 @@ void HP_duel_accept(const unsigned int did, struct map_session_data *sd) { HPMHooks.source.duel.accept(did, sd); } if( HPMHooks.count.HP_duel_accept_post ) { - void (*postHookFunc) (const unsigned int *did, struct map_session_data *sd); + void (*postHookFunc) (const unsigned int did, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_accept_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_duel_accept_post[hIndex].func; - postHookFunc(&did, sd); + postHookFunc(did, sd); } } return; @@ -25041,11 +25083,11 @@ void HP_duel_accept(const unsigned int did, struct map_session_data *sd) { void HP_duel_reject(const unsigned int did, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_duel_reject_pre ) { - void (*preHookFunc) (const unsigned int *did, struct map_session_data *sd); + void (*preHookFunc) (const unsigned int *did, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_reject_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_duel_reject_pre[hIndex].func; - preHookFunc(&did, sd); + preHookFunc(&did, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25056,10 +25098,10 @@ void HP_duel_reject(const unsigned int did, struct map_session_data *sd) { HPMHooks.source.duel.reject(did, sd); } if( HPMHooks.count.HP_duel_reject_post ) { - void (*postHookFunc) (const unsigned int *did, struct map_session_data *sd); + void (*postHookFunc) (const unsigned int did, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_reject_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_duel_reject_post[hIndex].func; - postHookFunc(&did, sd); + postHookFunc(did, sd); } } return; @@ -25067,11 +25109,11 @@ void HP_duel_reject(const unsigned int did, struct map_session_data *sd) { void HP_duel_leave(const unsigned int did, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_duel_leave_pre ) { - void (*preHookFunc) (const unsigned int *did, struct map_session_data *sd); + void (*preHookFunc) (const unsigned int *did, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_leave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_duel_leave_pre[hIndex].func; - preHookFunc(&did, sd); + preHookFunc(&did, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25082,10 +25124,10 @@ void HP_duel_leave(const unsigned int did, struct map_session_data *sd) { HPMHooks.source.duel.leave(did, sd); } if( HPMHooks.count.HP_duel_leave_post ) { - void (*postHookFunc) (const unsigned int *did, struct map_session_data *sd); + void (*postHookFunc) (const unsigned int did, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_leave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_duel_leave_post[hIndex].func; - postHookFunc(&did, sd); + postHookFunc(did, sd); } } return; @@ -25093,11 +25135,11 @@ void HP_duel_leave(const unsigned int did, struct map_session_data *sd) { void HP_duel_showinfo(const unsigned int did, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_duel_showinfo_pre ) { - void (*preHookFunc) (const unsigned int *did, struct map_session_data *sd); + void (*preHookFunc) (const unsigned int *did, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_showinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_duel_showinfo_pre[hIndex].func; - preHookFunc(&did, sd); + preHookFunc(&did, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25108,10 +25150,10 @@ void HP_duel_showinfo(const unsigned int did, struct map_session_data *sd) { HPMHooks.source.duel.showinfo(did, sd); } if( HPMHooks.count.HP_duel_showinfo_post ) { - void (*postHookFunc) (const unsigned int *did, struct map_session_data *sd); + void (*postHookFunc) (const unsigned int did, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_showinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_duel_showinfo_post[hIndex].func; - postHookFunc(&did, sd); + postHookFunc(did, sd); } } return; @@ -25120,11 +25162,11 @@ int HP_duel_checktime(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_duel_checktime_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_checktime_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_duel_checktime_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25161,10 +25203,10 @@ void HP_duel_init(bool minimal) { HPMHooks.source.duel.init(minimal); } if( HPMHooks.count.HP_duel_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_duel_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -25195,7 +25237,7 @@ void HP_duel_final(void) { } return; } -/* elemental */ +/* elemental_interface */ int HP_elemental_init(bool minimal) { int hIndex = 0; int retVal___ = 0; @@ -25215,10 +25257,10 @@ int HP_elemental_init(bool minimal) { retVal___ = HPMHooks.source.elemental.init(minimal); } if( HPMHooks.count.HP_elemental_init_post ) { - int (*postHookFunc) (int retVal___, bool *minimal); + int (*postHookFunc) (int retVal___, bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &minimal); + retVal___ = postHookFunc(retVal___, minimal); } } return retVal___; @@ -25268,10 +25310,10 @@ bool HP_elemental_class(int class_) { retVal___ = HPMHooks.source.elemental.class(class_); } if( HPMHooks.count.HP_elemental_class_post ) { - bool (*postHookFunc) (bool retVal___, int *class_); + bool (*postHookFunc) (bool retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_class_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_class_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -25295,10 +25337,10 @@ struct view_data* HP_elemental_get_viewdata(int class_) { retVal___ = HPMHooks.source.elemental.get_viewdata(class_); } if( HPMHooks.count.HP_elemental_get_viewdata_post ) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int *class_); + struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_get_viewdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_get_viewdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -25307,11 +25349,11 @@ int HP_elemental_create(struct map_session_data *sd, int class_, unsigned int li int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_create_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *class_, unsigned int *lifetime); + int (*preHookFunc) (struct map_session_data **sd, int *class_, unsigned int *lifetime); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_create_pre[hIndex].func; - retVal___ = preHookFunc(sd, &class_, &lifetime); + retVal___ = preHookFunc(&sd, &class_, &lifetime); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25322,10 +25364,10 @@ int HP_elemental_create(struct map_session_data *sd, int class_, unsigned int li retVal___ = HPMHooks.source.elemental.create(sd, class_, lifetime); } if( HPMHooks.count.HP_elemental_create_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *class_, unsigned int *lifetime); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int class_, unsigned int lifetime); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &class_, &lifetime); + retVal___ = postHookFunc(retVal___, sd, class_, lifetime); } } return retVal___; @@ -25334,11 +25376,11 @@ int HP_elemental_data_received(const struct s_elemental *ele, bool flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_data_received_pre ) { - int (*preHookFunc) (const struct s_elemental *ele, bool *flag); + int (*preHookFunc) (const struct s_elemental **ele, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_data_received_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_data_received_pre[hIndex].func; - retVal___ = preHookFunc(ele, &flag); + retVal___ = preHookFunc(&ele, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25349,10 +25391,10 @@ int HP_elemental_data_received(const struct s_elemental *ele, bool flag) { retVal___ = HPMHooks.source.elemental.data_received(ele, flag); } if( HPMHooks.count.HP_elemental_data_received_post ) { - int (*postHookFunc) (int retVal___, const struct s_elemental *ele, bool *flag); + int (*postHookFunc) (int retVal___, const struct s_elemental *ele, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_data_received_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_data_received_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ele, &flag); + retVal___ = postHookFunc(retVal___, ele, flag); } } return retVal___; @@ -25361,11 +25403,11 @@ int HP_elemental_save(struct elemental_data *ed) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_save_pre ) { - int (*preHookFunc) (struct elemental_data *ed); + int (*preHookFunc) (struct elemental_data **ed); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_save_pre[hIndex].func; - retVal___ = preHookFunc(ed); + retVal___ = preHookFunc(&ed); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25388,11 +25430,11 @@ int HP_elemental_change_mode_ack(struct elemental_data *ed, int mode) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_change_mode_ack_pre ) { - int (*preHookFunc) (struct elemental_data *ed, int *mode); + int (*preHookFunc) (struct elemental_data **ed, int *mode); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_change_mode_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_change_mode_ack_pre[hIndex].func; - retVal___ = preHookFunc(ed, &mode); + retVal___ = preHookFunc(&ed, &mode); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25403,10 +25445,10 @@ int HP_elemental_change_mode_ack(struct elemental_data *ed, int mode) { retVal___ = HPMHooks.source.elemental.change_mode_ack(ed, mode); } if( HPMHooks.count.HP_elemental_change_mode_ack_post ) { - int (*postHookFunc) (int retVal___, struct elemental_data *ed, int *mode); + int (*postHookFunc) (int retVal___, struct elemental_data *ed, int mode); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_change_mode_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_change_mode_ack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ed, &mode); + retVal___ = postHookFunc(retVal___, ed, mode); } } return retVal___; @@ -25415,11 +25457,11 @@ int HP_elemental_change_mode(struct elemental_data *ed, uint32 mode) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_change_mode_pre ) { - int (*preHookFunc) (struct elemental_data *ed, uint32 *mode); + int (*preHookFunc) (struct elemental_data **ed, uint32 *mode); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_change_mode_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_change_mode_pre[hIndex].func; - retVal___ = preHookFunc(ed, &mode); + retVal___ = preHookFunc(&ed, &mode); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25430,10 +25472,10 @@ int HP_elemental_change_mode(struct elemental_data *ed, uint32 mode) { retVal___ = HPMHooks.source.elemental.change_mode(ed, mode); } if( HPMHooks.count.HP_elemental_change_mode_post ) { - int (*postHookFunc) (int retVal___, struct elemental_data *ed, uint32 *mode); + int (*postHookFunc) (int retVal___, struct elemental_data *ed, uint32 mode); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_change_mode_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_change_mode_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ed, &mode); + retVal___ = postHookFunc(retVal___, ed, mode); } } return retVal___; @@ -25441,11 +25483,11 @@ int HP_elemental_change_mode(struct elemental_data *ed, uint32 mode) { void HP_elemental_heal(struct elemental_data *ed, int hp, int sp) { int hIndex = 0; if( HPMHooks.count.HP_elemental_heal_pre ) { - void (*preHookFunc) (struct elemental_data *ed, int *hp, int *sp); + void (*preHookFunc) (struct elemental_data **ed, int *hp, int *sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_heal_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_heal_pre[hIndex].func; - preHookFunc(ed, &hp, &sp); + preHookFunc(&ed, &hp, &sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25456,10 +25498,10 @@ void HP_elemental_heal(struct elemental_data *ed, int hp, int sp) { HPMHooks.source.elemental.heal(ed, hp, sp); } if( HPMHooks.count.HP_elemental_heal_post ) { - void (*postHookFunc) (struct elemental_data *ed, int *hp, int *sp); + void (*postHookFunc) (struct elemental_data *ed, int hp, int sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_heal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_heal_post[hIndex].func; - postHookFunc(ed, &hp, &sp); + postHookFunc(ed, hp, sp); } } return; @@ -25468,11 +25510,11 @@ int HP_elemental_dead(struct elemental_data *ed) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_dead_pre ) { - int (*preHookFunc) (struct elemental_data *ed); + int (*preHookFunc) (struct elemental_data **ed); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_dead_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_dead_pre[hIndex].func; - retVal___ = preHookFunc(ed); + retVal___ = preHookFunc(&ed); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25495,11 +25537,11 @@ int HP_elemental_delete(struct elemental_data *ed, int reply) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_delete_pre ) { - int (*preHookFunc) (struct elemental_data *ed, int *reply); + int (*preHookFunc) (struct elemental_data **ed, int *reply); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_delete_pre[hIndex].func; - retVal___ = preHookFunc(ed, &reply); + retVal___ = preHookFunc(&ed, &reply); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25510,10 +25552,10 @@ int HP_elemental_delete(struct elemental_data *ed, int reply) { retVal___ = HPMHooks.source.elemental.delete(ed, reply); } if( HPMHooks.count.HP_elemental_delete_post ) { - int (*postHookFunc) (int retVal___, struct elemental_data *ed, int *reply); + int (*postHookFunc) (int retVal___, struct elemental_data *ed, int reply); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ed, &reply); + retVal___ = postHookFunc(retVal___, ed, reply); } } return retVal___; @@ -25521,11 +25563,11 @@ int HP_elemental_delete(struct elemental_data *ed, int reply) { void HP_elemental_summon_stop(struct elemental_data *ed) { int hIndex = 0; if( HPMHooks.count.HP_elemental_summon_stop_pre ) { - void (*preHookFunc) (struct elemental_data *ed); + void (*preHookFunc) (struct elemental_data **ed); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_summon_stop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_summon_stop_pre[hIndex].func; - preHookFunc(ed); + preHookFunc(&ed); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25548,11 +25590,11 @@ int HP_elemental_get_lifetime(struct elemental_data *ed) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_get_lifetime_pre ) { - int (*preHookFunc) (struct elemental_data *ed); + int (*preHookFunc) (struct elemental_data **ed); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_get_lifetime_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_get_lifetime_pre[hIndex].func; - retVal___ = preHookFunc(ed); + retVal___ = preHookFunc(&ed); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25575,11 +25617,11 @@ int HP_elemental_unlocktarget(struct elemental_data *ed) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_unlocktarget_pre ) { - int (*preHookFunc) (struct elemental_data *ed); + int (*preHookFunc) (struct elemental_data **ed); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_unlocktarget_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_unlocktarget_pre[hIndex].func; - retVal___ = preHookFunc(ed); + retVal___ = preHookFunc(&ed); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25602,11 +25644,11 @@ int HP_elemental_skillnotok(uint16 skill_id, struct elemental_data *ed) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_skillnotok_pre ) { - int (*preHookFunc) (uint16 *skill_id, struct elemental_data *ed); + int (*preHookFunc) (uint16 *skill_id, struct elemental_data **ed); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_skillnotok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_skillnotok_pre[hIndex].func; - retVal___ = preHookFunc(&skill_id, ed); + retVal___ = preHookFunc(&skill_id, &ed); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25617,10 +25659,10 @@ int HP_elemental_skillnotok(uint16 skill_id, struct elemental_data *ed) { retVal___ = HPMHooks.source.elemental.skillnotok(skill_id, ed); } if( HPMHooks.count.HP_elemental_skillnotok_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, struct elemental_data *ed); + int (*postHookFunc) (int retVal___, uint16 skill_id, struct elemental_data *ed); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_skillnotok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_skillnotok_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, ed); + retVal___ = postHookFunc(retVal___, skill_id, ed); } } return retVal___; @@ -25629,11 +25671,11 @@ int HP_elemental_set_target(struct map_session_data *sd, struct block_list *bl) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_set_target_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct block_list *bl); + int (*preHookFunc) (struct map_session_data **sd, struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_set_target_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_set_target_pre[hIndex].func; - retVal___ = preHookFunc(sd, bl); + retVal___ = preHookFunc(&sd, &bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25656,11 +25698,11 @@ int HP_elemental_clean_single_effect(struct elemental_data *ed, uint16 skill_id) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_clean_single_effect_pre ) { - int (*preHookFunc) (struct elemental_data *ed, uint16 *skill_id); + int (*preHookFunc) (struct elemental_data **ed, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_clean_single_effect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_clean_single_effect_pre[hIndex].func; - retVal___ = preHookFunc(ed, &skill_id); + retVal___ = preHookFunc(&ed, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25671,10 +25713,10 @@ int HP_elemental_clean_single_effect(struct elemental_data *ed, uint16 skill_id) retVal___ = HPMHooks.source.elemental.clean_single_effect(ed, skill_id); } if( HPMHooks.count.HP_elemental_clean_single_effect_post ) { - int (*postHookFunc) (int retVal___, struct elemental_data *ed, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct elemental_data *ed, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_clean_single_effect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_clean_single_effect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ed, &skill_id); + retVal___ = postHookFunc(retVal___, ed, skill_id); } } return retVal___; @@ -25683,11 +25725,11 @@ int HP_elemental_clean_effect(struct elemental_data *ed) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_clean_effect_pre ) { - int (*preHookFunc) (struct elemental_data *ed); + int (*preHookFunc) (struct elemental_data **ed); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_clean_effect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_clean_effect_pre[hIndex].func; - retVal___ = preHookFunc(ed); + retVal___ = preHookFunc(&ed); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25710,11 +25752,11 @@ int HP_elemental_action(struct elemental_data *ed, struct block_list *bl, int64 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_action_pre ) { - int (*preHookFunc) (struct elemental_data *ed, struct block_list *bl, int64 *tick); + int (*preHookFunc) (struct elemental_data **ed, struct block_list **bl, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_action_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_action_pre[hIndex].func; - retVal___ = preHookFunc(ed, bl, &tick); + retVal___ = preHookFunc(&ed, &bl, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25725,18 +25767,17 @@ int HP_elemental_action(struct elemental_data *ed, struct block_list *bl, int64 retVal___ = HPMHooks.source.elemental.action(ed, bl, tick); } if( HPMHooks.count.HP_elemental_action_post ) { - int (*postHookFunc) (int retVal___, struct elemental_data *ed, struct block_list *bl, int64 *tick); + int (*postHookFunc) (int retVal___, struct elemental_data *ed, struct block_list *bl, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_action_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_action_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ed, bl, &tick); + retVal___ = postHookFunc(retVal___, ed, bl, tick); } } return retVal___; } struct skill_condition HP_elemental_skill_get_requirements(uint16 skill_id, uint16 skill_lv) { int hIndex = 0; - struct skill_condition retVal___; - memset(&retVal___, '\0', sizeof(struct skill_condition)); + struct skill_condition retVal___ = { 0 }; if( HPMHooks.count.HP_elemental_skill_get_requirements_pre ) { struct skill_condition (*preHookFunc) (uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; @@ -25753,10 +25794,10 @@ struct skill_condition HP_elemental_skill_get_requirements(uint16 skill_id, uint retVal___ = HPMHooks.source.elemental.skill_get_requirements(skill_id, skill_lv); } if( HPMHooks.count.HP_elemental_skill_get_requirements_post ) { - struct skill_condition (*postHookFunc) (struct skill_condition retVal___, uint16 *skill_id, uint16 *skill_lv); + struct skill_condition (*postHookFunc) (struct skill_condition retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_skill_get_requirements_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_skill_get_requirements_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -25859,10 +25900,10 @@ int HP_elemental_search_index(int class_) { retVal___ = HPMHooks.source.elemental.search_index(class_); } if( HPMHooks.count.HP_elemental_search_index_post ) { - int (*postHookFunc) (int retVal___, int *class_); + int (*postHookFunc) (int retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_search_index_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_search_index_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -25870,11 +25911,11 @@ int HP_elemental_search_index(int class_) { void HP_elemental_summon_init(struct elemental_data *ed) { int hIndex = 0; if( HPMHooks.count.HP_elemental_summon_init_pre ) { - void (*preHookFunc) (struct elemental_data *ed); + void (*preHookFunc) (struct elemental_data **ed); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_summon_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_summon_init_pre[hIndex].func; - preHookFunc(ed); + preHookFunc(&ed); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25912,10 +25953,10 @@ int HP_elemental_summon_end_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.elemental.summon_end_timer(tid, tick, id, data); } if( HPMHooks.count.HP_elemental_summon_end_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_summon_end_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_summon_end_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -25924,12 +25965,12 @@ int HP_elemental_ai_sub_timer_activesearch(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_ai_sub_timer_activesearch_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_ai_sub_timer_activesearch_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_elemental_ai_sub_timer_activesearch_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -25957,11 +25998,11 @@ int HP_elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_data int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_ai_sub_timer_pre ) { - int (*preHookFunc) (struct elemental_data *ed, struct map_session_data *sd, int64 *tick); + int (*preHookFunc) (struct elemental_data **ed, struct map_session_data **sd, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_ai_sub_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_ai_sub_timer_pre[hIndex].func; - retVal___ = preHookFunc(ed, sd, &tick); + retVal___ = preHookFunc(&ed, &sd, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25972,10 +26013,10 @@ int HP_elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_data retVal___ = HPMHooks.source.elemental.ai_sub_timer(ed, sd, tick); } if( HPMHooks.count.HP_elemental_ai_sub_timer_post ) { - int (*postHookFunc) (int retVal___, struct elemental_data *ed, struct map_session_data *sd, int64 *tick); + int (*postHookFunc) (int retVal___, struct elemental_data *ed, struct map_session_data *sd, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_ai_sub_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_ai_sub_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ed, sd, &tick); + retVal___ = postHookFunc(retVal___, ed, sd, tick); } } return retVal___; @@ -25984,12 +26025,12 @@ int HP_elemental_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_ai_sub_foreachclient_pre ) { - int (*preHookFunc) (struct map_session_data *sd, va_list ap); + int (*preHookFunc) (struct map_session_data **sd, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_ai_sub_foreachclient_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_elemental_ai_sub_foreachclient_pre[hIndex].func; - retVal___ = preHookFunc(sd, ap___copy); + retVal___ = preHookFunc(&sd, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -26032,10 +26073,10 @@ int HP_elemental_ai_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.elemental.ai_timer(tid, tick, id, data); } if( HPMHooks.count.HP_elemental_ai_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_ai_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_ai_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -26067,7 +26108,7 @@ int HP_elemental_read_db(void) { } return retVal___; } -/* guild */ +/* guild_interface */ void HP_guild_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_guild_init_pre ) { @@ -26086,10 +26127,10 @@ void HP_guild_init(bool minimal) { HPMHooks.source.guild.init(minimal); } if( HPMHooks.count.HP_guild_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -26139,10 +26180,10 @@ int HP_guild_skill_get_max(int id) { retVal___ = HPMHooks.source.guild.skill_get_max(id); } if( HPMHooks.count.HP_guild_skill_get_max_post ) { - int (*postHookFunc) (int retVal___, int *id); + int (*postHookFunc) (int retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_skill_get_max_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_skill_get_max_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -26151,11 +26192,11 @@ int HP_guild_checkskill(struct guild *g, int id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_checkskill_pre ) { - int (*preHookFunc) (struct guild *g, int *id); + int (*preHookFunc) (struct guild **g, int *id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_checkskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_checkskill_pre[hIndex].func; - retVal___ = preHookFunc(g, &id); + retVal___ = preHookFunc(&g, &id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26166,10 +26207,10 @@ int HP_guild_checkskill(struct guild *g, int id) { retVal___ = HPMHooks.source.guild.checkskill(g, id); } if( HPMHooks.count.HP_guild_checkskill_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *id); + int (*postHookFunc) (int retVal___, struct guild *g, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_checkskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_checkskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &id); + retVal___ = postHookFunc(retVal___, g, id); } } return retVal___; @@ -26178,11 +26219,11 @@ int HP_guild_check_skill_require(struct guild *g, int id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_check_skill_require_pre ) { - int (*preHookFunc) (struct guild *g, int *id); + int (*preHookFunc) (struct guild **g, int *id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_check_skill_require_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_check_skill_require_pre[hIndex].func; - retVal___ = preHookFunc(g, &id); + retVal___ = preHookFunc(&g, &id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26193,10 +26234,10 @@ int HP_guild_check_skill_require(struct guild *g, int id) { retVal___ = HPMHooks.source.guild.check_skill_require(g, id); } if( HPMHooks.count.HP_guild_check_skill_require_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *id); + int (*postHookFunc) (int retVal___, struct guild *g, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_check_skill_require_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_check_skill_require_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &id); + retVal___ = postHookFunc(retVal___, g, id); } } return retVal___; @@ -26205,11 +26246,11 @@ int HP_guild_checkcastles(struct guild *g) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_checkcastles_pre ) { - int (*preHookFunc) (struct guild *g); + int (*preHookFunc) (struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_checkcastles_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_checkcastles_pre[hIndex].func; - retVal___ = preHookFunc(g); + retVal___ = preHookFunc(&g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26247,10 +26288,10 @@ bool HP_guild_isallied(int guild_id, int guild_id2) { retVal___ = HPMHooks.source.guild.isallied(guild_id, guild_id2); } if( HPMHooks.count.HP_guild_isallied_post ) { - bool (*postHookFunc) (bool retVal___, int *guild_id, int *guild_id2); + bool (*postHookFunc) (bool retVal___, int guild_id, int guild_id2); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_isallied_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_isallied_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &guild_id2); + retVal___ = postHookFunc(retVal___, guild_id, guild_id2); } } return retVal___; @@ -26274,10 +26315,10 @@ struct guild* HP_guild_search(int guild_id) { retVal___ = HPMHooks.source.guild.search(guild_id); } if( HPMHooks.count.HP_guild_search_post ) { - struct guild* (*postHookFunc) (struct guild* retVal___, int *guild_id); + struct guild* (*postHookFunc) (struct guild* retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; @@ -26286,11 +26327,11 @@ struct guild* HP_guild_searchname(char *str) { int hIndex = 0; struct guild* retVal___ = NULL; if( HPMHooks.count.HP_guild_searchname_pre ) { - struct guild* (*preHookFunc) (char *str); + struct guild* (*preHookFunc) (char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_searchname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_searchname_pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26328,10 +26369,10 @@ struct guild_castle* HP_guild_castle_search(int gcid) { retVal___ = HPMHooks.source.guild.castle_search(gcid); } if( HPMHooks.count.HP_guild_castle_search_post ) { - struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, int *gcid); + struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, int gcid); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castle_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_castle_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &gcid); + retVal___ = postHookFunc(retVal___, gcid); } } return retVal___; @@ -26340,11 +26381,11 @@ struct guild_castle* HP_guild_mapname2gc(const char *mapname) { int hIndex = 0; struct guild_castle* retVal___ = NULL; if( HPMHooks.count.HP_guild_mapname2gc_pre ) { - struct guild_castle* (*preHookFunc) (const char *mapname); + struct guild_castle* (*preHookFunc) (const char **mapname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_mapname2gc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_mapname2gc_pre[hIndex].func; - retVal___ = preHookFunc(mapname); + retVal___ = preHookFunc(&mapname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26382,10 +26423,10 @@ struct guild_castle* HP_guild_mapindex2gc(short map_index) { retVal___ = HPMHooks.source.guild.mapindex2gc(map_index); } if( HPMHooks.count.HP_guild_mapindex2gc_post ) { - struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, short *map_index); + struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, short map_index); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_mapindex2gc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_mapindex2gc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &map_index); + retVal___ = postHookFunc(retVal___, map_index); } } return retVal___; @@ -26394,11 +26435,11 @@ struct map_session_data* HP_guild_getavailablesd(struct guild *g) { int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_guild_getavailablesd_pre ) { - struct map_session_data* (*preHookFunc) (struct guild *g); + struct map_session_data* (*preHookFunc) (struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_getavailablesd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_getavailablesd_pre[hIndex].func; - retVal___ = preHookFunc(g); + retVal___ = preHookFunc(&g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26421,11 +26462,11 @@ int HP_guild_getindex(const struct guild *g, int account_id, int char_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_getindex_pre ) { - int (*preHookFunc) (const struct guild *g, int *account_id, int *char_id); + int (*preHookFunc) (const struct guild **g, int *account_id, int *char_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_getindex_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_getindex_pre[hIndex].func; - retVal___ = preHookFunc(g, &account_id, &char_id); + retVal___ = preHookFunc(&g, &account_id, &char_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26436,10 +26477,10 @@ int HP_guild_getindex(const struct guild *g, int account_id, int char_id) { retVal___ = HPMHooks.source.guild.getindex(g, account_id, char_id); } if( HPMHooks.count.HP_guild_getindex_post ) { - int (*postHookFunc) (int retVal___, const struct guild *g, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, const struct guild *g, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_getindex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_getindex_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, g, account_id, char_id); } } return retVal___; @@ -26448,11 +26489,11 @@ int HP_guild_getposition(struct guild *g, struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_getposition_pre ) { - int (*preHookFunc) (struct guild *g, struct map_session_data *sd); + int (*preHookFunc) (struct guild **g, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_getposition_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_getposition_pre[hIndex].func; - retVal___ = preHookFunc(g, sd); + retVal___ = preHookFunc(&g, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26475,11 +26516,11 @@ unsigned int HP_guild_payexp(struct map_session_data *sd, unsigned int exp) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_guild_payexp_pre ) { - unsigned int (*preHookFunc) (struct map_session_data *sd, unsigned int *exp); + unsigned int (*preHookFunc) (struct map_session_data **sd, unsigned int *exp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_payexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_payexp_pre[hIndex].func; - retVal___ = preHookFunc(sd, &exp); + retVal___ = preHookFunc(&sd, &exp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26490,10 +26531,10 @@ unsigned int HP_guild_payexp(struct map_session_data *sd, unsigned int exp) { retVal___ = HPMHooks.source.guild.payexp(sd, exp); } if( HPMHooks.count.HP_guild_payexp_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, struct map_session_data *sd, unsigned int *exp); + unsigned int (*postHookFunc) (unsigned int retVal___, struct map_session_data *sd, unsigned int exp); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_payexp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_payexp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &exp); + retVal___ = postHookFunc(retVal___, sd, exp); } } return retVal___; @@ -26502,11 +26543,11 @@ int HP_guild_getexp(struct map_session_data *sd, int exp) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_getexp_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *exp); + int (*preHookFunc) (struct map_session_data **sd, int *exp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_getexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_getexp_pre[hIndex].func; - retVal___ = preHookFunc(sd, &exp); + retVal___ = preHookFunc(&sd, &exp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26517,10 +26558,10 @@ int HP_guild_getexp(struct map_session_data *sd, int exp) { retVal___ = HPMHooks.source.guild.getexp(sd, exp); } if( HPMHooks.count.HP_guild_getexp_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *exp); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int exp); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_getexp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_getexp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &exp); + retVal___ = postHookFunc(retVal___, sd, exp); } } return retVal___; @@ -26529,11 +26570,11 @@ int HP_guild_create(struct map_session_data *sd, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_create_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *name); + int (*preHookFunc) (struct map_session_data **sd, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_create_pre[hIndex].func; - retVal___ = preHookFunc(sd, name); + retVal___ = preHookFunc(&sd, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26571,10 +26612,10 @@ int HP_guild_created(int account_id, int guild_id) { retVal___ = HPMHooks.source.guild.created(account_id, guild_id); } if( HPMHooks.count.HP_guild_created_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *guild_id); + int (*postHookFunc) (int retVal___, int account_id, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_created_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &guild_id); + retVal___ = postHookFunc(retVal___, account_id, guild_id); } } return retVal___; @@ -26598,10 +26639,10 @@ int HP_guild_request_info(int guild_id) { retVal___ = HPMHooks.source.guild.request_info(guild_id); } if( HPMHooks.count.HP_guild_request_info_post ) { - int (*postHookFunc) (int retVal___, int *guild_id); + int (*postHookFunc) (int retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_request_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_request_info_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; @@ -26625,10 +26666,10 @@ int HP_guild_recv_noinfo(int guild_id) { retVal___ = HPMHooks.source.guild.recv_noinfo(guild_id); } if( HPMHooks.count.HP_guild_recv_noinfo_post ) { - int (*postHookFunc) (int retVal___, int *guild_id); + int (*postHookFunc) (int retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_recv_noinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_recv_noinfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; @@ -26637,11 +26678,11 @@ int HP_guild_recv_info(const struct guild *sg) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_recv_info_pre ) { - int (*preHookFunc) (const struct guild *sg); + int (*preHookFunc) (const struct guild **sg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_recv_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_recv_info_pre[hIndex].func; - retVal___ = preHookFunc(sg); + retVal___ = preHookFunc(&sg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26664,11 +26705,11 @@ int HP_guild_npc_request_info(int guild_id, const char *ev) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_npc_request_info_pre ) { - int (*preHookFunc) (int *guild_id, const char *ev); + int (*preHookFunc) (int *guild_id, const char **ev); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_npc_request_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_npc_request_info_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, ev); + retVal___ = preHookFunc(&guild_id, &ev); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26679,10 +26720,10 @@ int HP_guild_npc_request_info(int guild_id, const char *ev) { retVal___ = HPMHooks.source.guild.npc_request_info(guild_id, ev); } if( HPMHooks.count.HP_guild_npc_request_info_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, const char *ev); + int (*postHookFunc) (int retVal___, int guild_id, const char *ev); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_npc_request_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_npc_request_info_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, ev); + retVal___ = postHookFunc(retVal___, guild_id, ev); } } return retVal___; @@ -26691,11 +26732,11 @@ int HP_guild_invite(struct map_session_data *sd, struct map_session_data *tsd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_invite_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd); + int (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_invite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_invite_pre[hIndex].func; - retVal___ = preHookFunc(sd, tsd); + retVal___ = preHookFunc(&sd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26718,11 +26759,11 @@ int HP_guild_reply_invite(struct map_session_data *sd, int guild_id, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_reply_invite_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *guild_id, int *flag); + int (*preHookFunc) (struct map_session_data **sd, int *guild_id, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_reply_invite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_reply_invite_pre[hIndex].func; - retVal___ = preHookFunc(sd, &guild_id, &flag); + retVal___ = preHookFunc(&sd, &guild_id, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26733,10 +26774,10 @@ int HP_guild_reply_invite(struct map_session_data *sd, int guild_id, int flag) { retVal___ = HPMHooks.source.guild.reply_invite(sd, guild_id, flag); } if( HPMHooks.count.HP_guild_reply_invite_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *guild_id, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int guild_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_reply_invite_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_reply_invite_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &guild_id, &flag); + retVal___ = postHookFunc(retVal___, sd, guild_id, flag); } } return retVal___; @@ -26744,11 +26785,11 @@ int HP_guild_reply_invite(struct map_session_data *sd, int guild_id, int flag) { void HP_guild_member_joined(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_guild_member_joined_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_member_joined_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_member_joined_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26786,10 +26827,10 @@ int HP_guild_member_added(int guild_id, int account_id, int char_id, int flag) { retVal___ = HPMHooks.source.guild.member_added(guild_id, account_id, char_id, flag); } if( HPMHooks.count.HP_guild_member_added_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, int *flag); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_member_added_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_member_added_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &flag); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, flag); } } return retVal___; @@ -26798,11 +26839,11 @@ int HP_guild_leave(struct map_session_data *sd, int guild_id, int account_id, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_leave_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *guild_id, int *account_id, int *char_id, const char *mes); + int (*preHookFunc) (struct map_session_data **sd, int *guild_id, int *account_id, int *char_id, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_leave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_leave_pre[hIndex].func; - retVal___ = preHookFunc(sd, &guild_id, &account_id, &char_id, mes); + retVal___ = preHookFunc(&sd, &guild_id, &account_id, &char_id, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26813,10 +26854,10 @@ int HP_guild_leave(struct map_session_data *sd, int guild_id, int account_id, in retVal___ = HPMHooks.source.guild.leave(sd, guild_id, account_id, char_id, mes); } if( HPMHooks.count.HP_guild_leave_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *guild_id, int *account_id, int *char_id, const char *mes); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int guild_id, int account_id, int char_id, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_leave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_leave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &guild_id, &account_id, &char_id, mes); + retVal___ = postHookFunc(retVal___, sd, guild_id, account_id, char_id, mes); } } return retVal___; @@ -26825,11 +26866,11 @@ int HP_guild_member_withdraw(int guild_id, int account_id, int char_id, int flag int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_member_withdraw_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *flag, const char *name, const char *mes); + int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *flag, const char **name, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_member_withdraw_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_member_withdraw_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &flag, name, mes); + retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &flag, &name, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26840,10 +26881,10 @@ int HP_guild_member_withdraw(int guild_id, int account_id, int char_id, int flag retVal___ = HPMHooks.source.guild.member_withdraw(guild_id, account_id, char_id, flag, name, mes); } if( HPMHooks.count.HP_guild_member_withdraw_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, int *flag, const char *name, const char *mes); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_member_withdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_member_withdraw_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &flag, name, mes); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, flag, name, mes); } } return retVal___; @@ -26852,11 +26893,11 @@ int HP_guild_expulsion(struct map_session_data *sd, int guild_id, int account_id int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_expulsion_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *guild_id, int *account_id, int *char_id, const char *mes); + int (*preHookFunc) (struct map_session_data **sd, int *guild_id, int *account_id, int *char_id, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_expulsion_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_expulsion_pre[hIndex].func; - retVal___ = preHookFunc(sd, &guild_id, &account_id, &char_id, mes); + retVal___ = preHookFunc(&sd, &guild_id, &account_id, &char_id, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26867,10 +26908,10 @@ int HP_guild_expulsion(struct map_session_data *sd, int guild_id, int account_id retVal___ = HPMHooks.source.guild.expulsion(sd, guild_id, account_id, char_id, mes); } if( HPMHooks.count.HP_guild_expulsion_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *guild_id, int *account_id, int *char_id, const char *mes); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int guild_id, int account_id, int char_id, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_expulsion_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_expulsion_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &guild_id, &account_id, &char_id, mes); + retVal___ = postHookFunc(retVal___, sd, guild_id, account_id, char_id, mes); } } return retVal___; @@ -26879,11 +26920,11 @@ int HP_guild_skillup(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_skillup_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_skillup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_skillup_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id); + retVal___ = preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26894,10 +26935,10 @@ int HP_guild_skillup(struct map_session_data *sd, uint16 skill_id) { retVal___ = HPMHooks.source.guild.skillup(sd, skill_id); } if( HPMHooks.count.HP_guild_skillup_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_skillup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_skillup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id); + retVal___ = postHookFunc(retVal___, sd, skill_id); } } return retVal___; @@ -26905,11 +26946,11 @@ int HP_guild_skillup(struct map_session_data *sd, uint16 skill_id) { void HP_guild_block_skill(struct map_session_data *sd, int time) { int hIndex = 0; if( HPMHooks.count.HP_guild_block_skill_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *time); + void (*preHookFunc) (struct map_session_data **sd, int *time); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_block_skill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_block_skill_pre[hIndex].func; - preHookFunc(sd, &time); + preHookFunc(&sd, &time); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26920,10 +26961,10 @@ void HP_guild_block_skill(struct map_session_data *sd, int time) { HPMHooks.source.guild.block_skill(sd, time); } if( HPMHooks.count.HP_guild_block_skill_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *time); + void (*postHookFunc) (struct map_session_data *sd, int time); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_block_skill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_block_skill_post[hIndex].func; - postHookFunc(sd, &time); + postHookFunc(sd, time); } } return; @@ -26932,11 +26973,11 @@ int HP_guild_reqalliance(struct map_session_data *sd, struct map_session_data *t int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_reqalliance_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd); + int (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_reqalliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_reqalliance_pre[hIndex].func; - retVal___ = preHookFunc(sd, tsd); + retVal___ = preHookFunc(&sd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26959,11 +27000,11 @@ int HP_guild_reply_reqalliance(struct map_session_data *sd, int account_id, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_reply_reqalliance_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *account_id, int *flag); + int (*preHookFunc) (struct map_session_data **sd, int *account_id, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_reply_reqalliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_reply_reqalliance_pre[hIndex].func; - retVal___ = preHookFunc(sd, &account_id, &flag); + retVal___ = preHookFunc(&sd, &account_id, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26974,10 +27015,10 @@ int HP_guild_reply_reqalliance(struct map_session_data *sd, int account_id, int retVal___ = HPMHooks.source.guild.reply_reqalliance(sd, account_id, flag); } if( HPMHooks.count.HP_guild_reply_reqalliance_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *account_id, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int account_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_reply_reqalliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_reply_reqalliance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &account_id, &flag); + retVal___ = postHookFunc(retVal___, sd, account_id, flag); } } return retVal___; @@ -26986,11 +27027,11 @@ int HP_guild_allianceack(int guild_id1, int guild_id2, int account_id1, int acco int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_allianceack_pre ) { - int (*preHookFunc) (int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag, const char *name1, const char *name2); + int (*preHookFunc) (int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag, const char **name1, const char **name2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_allianceack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_allianceack_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id1, &guild_id2, &account_id1, &account_id2, &flag, name1, name2); + retVal___ = preHookFunc(&guild_id1, &guild_id2, &account_id1, &account_id2, &flag, &name1, &name2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27001,10 +27042,10 @@ int HP_guild_allianceack(int guild_id1, int guild_id2, int account_id1, int acco retVal___ = HPMHooks.source.guild.allianceack(guild_id1, guild_id2, account_id1, account_id2, flag, name1, name2); } if( HPMHooks.count.HP_guild_allianceack_post ) { - int (*postHookFunc) (int retVal___, int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag, const char *name1, const char *name2); + int (*postHookFunc) (int retVal___, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_allianceack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_allianceack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id1, &guild_id2, &account_id1, &account_id2, &flag, name1, name2); + retVal___ = postHookFunc(retVal___, guild_id1, guild_id2, account_id1, account_id2, flag, name1, name2); } } return retVal___; @@ -27013,11 +27054,11 @@ int HP_guild_delalliance(struct map_session_data *sd, int guild_id, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_delalliance_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *guild_id, int *flag); + int (*preHookFunc) (struct map_session_data **sd, int *guild_id, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_delalliance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_delalliance_pre[hIndex].func; - retVal___ = preHookFunc(sd, &guild_id, &flag); + retVal___ = preHookFunc(&sd, &guild_id, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27028,10 +27069,10 @@ int HP_guild_delalliance(struct map_session_data *sd, int guild_id, int flag) { retVal___ = HPMHooks.source.guild.delalliance(sd, guild_id, flag); } if( HPMHooks.count.HP_guild_delalliance_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *guild_id, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int guild_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_delalliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_delalliance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &guild_id, &flag); + retVal___ = postHookFunc(retVal___, sd, guild_id, flag); } } return retVal___; @@ -27040,11 +27081,11 @@ int HP_guild_opposition(struct map_session_data *sd, struct map_session_data *ts int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_opposition_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd); + int (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_opposition_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_opposition_pre[hIndex].func; - retVal___ = preHookFunc(sd, tsd); + retVal___ = preHookFunc(&sd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27082,10 +27123,10 @@ int HP_guild_check_alliance(int guild_id1, int guild_id2, int flag) { retVal___ = HPMHooks.source.guild.check_alliance(guild_id1, guild_id2, flag); } if( HPMHooks.count.HP_guild_check_alliance_post ) { - int (*postHookFunc) (int retVal___, int *guild_id1, int *guild_id2, int *flag); + int (*postHookFunc) (int retVal___, int guild_id1, int guild_id2, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_check_alliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_check_alliance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id1, &guild_id2, &flag); + retVal___ = postHookFunc(retVal___, guild_id1, guild_id2, flag); } } return retVal___; @@ -27094,11 +27135,11 @@ int HP_guild_send_memberinfoshort(struct map_session_data *sd, int online) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_send_memberinfoshort_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *online); + int (*preHookFunc) (struct map_session_data **sd, int *online); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_send_memberinfoshort_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_send_memberinfoshort_pre[hIndex].func; - retVal___ = preHookFunc(sd, &online); + retVal___ = preHookFunc(&sd, &online); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27109,10 +27150,10 @@ int HP_guild_send_memberinfoshort(struct map_session_data *sd, int online) { retVal___ = HPMHooks.source.guild.send_memberinfoshort(sd, online); } if( HPMHooks.count.HP_guild_send_memberinfoshort_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *online); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int online); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_send_memberinfoshort_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_send_memberinfoshort_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &online); + retVal___ = postHookFunc(retVal___, sd, online); } } return retVal___; @@ -27136,10 +27177,10 @@ int HP_guild_recv_memberinfoshort(int guild_id, int account_id, int char_id, int retVal___ = HPMHooks.source.guild.recv_memberinfoshort(guild_id, account_id, char_id, online, lv, class_); } if( HPMHooks.count.HP_guild_recv_memberinfoshort_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, int *online, int *lv, int *class_); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, int online, int lv, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_recv_memberinfoshort_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_recv_memberinfoshort_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &online, &lv, &class_); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, online, lv, class_); } } return retVal___; @@ -27163,10 +27204,10 @@ int HP_guild_change_memberposition(int guild_id, int account_id, int char_id, sh retVal___ = HPMHooks.source.guild.change_memberposition(guild_id, account_id, char_id, idx); } if( HPMHooks.count.HP_guild_change_memberposition_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, short *idx); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, short idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_change_memberposition_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_change_memberposition_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &idx); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, idx); } } return retVal___; @@ -27175,11 +27216,11 @@ int HP_guild_memberposition_changed(struct guild *g, int idx, int pos) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_memberposition_changed_pre ) { - int (*preHookFunc) (struct guild *g, int *idx, int *pos); + int (*preHookFunc) (struct guild **g, int *idx, int *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_memberposition_changed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_memberposition_changed_pre[hIndex].func; - retVal___ = preHookFunc(g, &idx, &pos); + retVal___ = preHookFunc(&g, &idx, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27190,10 +27231,10 @@ int HP_guild_memberposition_changed(struct guild *g, int idx, int pos) { retVal___ = HPMHooks.source.guild.memberposition_changed(g, idx, pos); } if( HPMHooks.count.HP_guild_memberposition_changed_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *idx, int *pos); + int (*postHookFunc) (int retVal___, struct guild *g, int idx, int pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_memberposition_changed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_memberposition_changed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &idx, &pos); + retVal___ = postHookFunc(retVal___, g, idx, pos); } } return retVal___; @@ -27202,11 +27243,11 @@ int HP_guild_change_position(int guild_id, int idx, int mode, int exp_mode, cons int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_change_position_pre ) { - int (*preHookFunc) (int *guild_id, int *idx, int *mode, int *exp_mode, const char *name); + int (*preHookFunc) (int *guild_id, int *idx, int *mode, int *exp_mode, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_change_position_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_change_position_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &idx, &mode, &exp_mode, name); + retVal___ = preHookFunc(&guild_id, &idx, &mode, &exp_mode, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27217,10 +27258,10 @@ int HP_guild_change_position(int guild_id, int idx, int mode, int exp_mode, cons retVal___ = HPMHooks.source.guild.change_position(guild_id, idx, mode, exp_mode, name); } if( HPMHooks.count.HP_guild_change_position_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *idx, int *mode, int *exp_mode, const char *name); + int (*postHookFunc) (int retVal___, int guild_id, int idx, int mode, int exp_mode, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_change_position_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_change_position_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &idx, &mode, &exp_mode, name); + retVal___ = postHookFunc(retVal___, guild_id, idx, mode, exp_mode, name); } } return retVal___; @@ -27229,11 +27270,11 @@ int HP_guild_position_changed(int guild_id, int idx, const struct guild_position int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_position_changed_pre ) { - int (*preHookFunc) (int *guild_id, int *idx, const struct guild_position *p); + int (*preHookFunc) (int *guild_id, int *idx, const struct guild_position **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_position_changed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_position_changed_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &idx, p); + retVal___ = preHookFunc(&guild_id, &idx, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27244,10 +27285,10 @@ int HP_guild_position_changed(int guild_id, int idx, const struct guild_position retVal___ = HPMHooks.source.guild.position_changed(guild_id, idx, p); } if( HPMHooks.count.HP_guild_position_changed_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *idx, const struct guild_position *p); + int (*postHookFunc) (int retVal___, int guild_id, int idx, const struct guild_position *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_position_changed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_position_changed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &idx, p); + retVal___ = postHookFunc(retVal___, guild_id, idx, p); } } return retVal___; @@ -27256,11 +27297,11 @@ int HP_guild_change_notice(struct map_session_data *sd, int guild_id, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_change_notice_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *guild_id, const char *mes1, const char *mes2); + int (*preHookFunc) (struct map_session_data **sd, int *guild_id, const char **mes1, const char **mes2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_change_notice_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_change_notice_pre[hIndex].func; - retVal___ = preHookFunc(sd, &guild_id, mes1, mes2); + retVal___ = preHookFunc(&sd, &guild_id, &mes1, &mes2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27271,10 +27312,10 @@ int HP_guild_change_notice(struct map_session_data *sd, int guild_id, const char retVal___ = HPMHooks.source.guild.change_notice(sd, guild_id, mes1, mes2); } if( HPMHooks.count.HP_guild_change_notice_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *guild_id, const char *mes1, const char *mes2); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int guild_id, const char *mes1, const char *mes2); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_change_notice_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_change_notice_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &guild_id, mes1, mes2); + retVal___ = postHookFunc(retVal___, sd, guild_id, mes1, mes2); } } return retVal___; @@ -27283,11 +27324,11 @@ int HP_guild_notice_changed(int guild_id, const char *mes1, const char *mes2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_notice_changed_pre ) { - int (*preHookFunc) (int *guild_id, const char *mes1, const char *mes2); + int (*preHookFunc) (int *guild_id, const char **mes1, const char **mes2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_notice_changed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_notice_changed_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, mes1, mes2); + retVal___ = preHookFunc(&guild_id, &mes1, &mes2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27298,10 +27339,10 @@ int HP_guild_notice_changed(int guild_id, const char *mes1, const char *mes2) { retVal___ = HPMHooks.source.guild.notice_changed(guild_id, mes1, mes2); } if( HPMHooks.count.HP_guild_notice_changed_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, const char *mes1, const char *mes2); + int (*postHookFunc) (int retVal___, int guild_id, const char *mes1, const char *mes2); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_notice_changed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_notice_changed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, mes1, mes2); + retVal___ = postHookFunc(retVal___, guild_id, mes1, mes2); } } return retVal___; @@ -27310,11 +27351,11 @@ int HP_guild_change_emblem(struct map_session_data *sd, int len, const char *dat int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_change_emblem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *len, const char *data); + int (*preHookFunc) (struct map_session_data **sd, int *len, const char **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_change_emblem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_change_emblem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &len, data); + retVal___ = preHookFunc(&sd, &len, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27325,10 +27366,10 @@ int HP_guild_change_emblem(struct map_session_data *sd, int len, const char *dat retVal___ = HPMHooks.source.guild.change_emblem(sd, len, data); } if( HPMHooks.count.HP_guild_change_emblem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *len, const char *data); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int len, const char *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_change_emblem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_change_emblem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &len, data); + retVal___ = postHookFunc(retVal___, sd, len, data); } } return retVal___; @@ -27337,11 +27378,11 @@ int HP_guild_emblem_changed(int len, int guild_id, int emblem_id, const char *da int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_emblem_changed_pre ) { - int (*preHookFunc) (int *len, int *guild_id, int *emblem_id, const char *data); + int (*preHookFunc) (int *len, int *guild_id, int *emblem_id, const char **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_emblem_changed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_emblem_changed_pre[hIndex].func; - retVal___ = preHookFunc(&len, &guild_id, &emblem_id, data); + retVal___ = preHookFunc(&len, &guild_id, &emblem_id, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27352,23 +27393,23 @@ int HP_guild_emblem_changed(int len, int guild_id, int emblem_id, const char *da retVal___ = HPMHooks.source.guild.emblem_changed(len, guild_id, emblem_id, data); } if( HPMHooks.count.HP_guild_emblem_changed_post ) { - int (*postHookFunc) (int retVal___, int *len, int *guild_id, int *emblem_id, const char *data); + int (*postHookFunc) (int retVal___, int len, int guild_id, int emblem_id, const char *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_emblem_changed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_emblem_changed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &len, &guild_id, &emblem_id, data); + retVal___ = postHookFunc(retVal___, len, guild_id, emblem_id, data); } } return retVal___; } -int HP_guild_send_message(struct map_session_data *sd, const char *mes, int len) { +int HP_guild_send_message(struct map_session_data *sd, const char *mes) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_send_message_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *mes, int *len); + int (*preHookFunc) (struct map_session_data **sd, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_send_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_send_message_pre[hIndex].func; - retVal___ = preHookFunc(sd, mes, &len); + retVal___ = preHookFunc(&sd, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27376,13 +27417,13 @@ int HP_guild_send_message(struct map_session_data *sd, const char *mes, int len) } } { - retVal___ = HPMHooks.source.guild.send_message(sd, mes, len); + retVal___ = HPMHooks.source.guild.send_message(sd, mes); } if( HPMHooks.count.HP_guild_send_message_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *mes, int *len); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_send_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_send_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, mes, &len); + retVal___ = postHookFunc(retVal___, sd, mes); } } return retVal___; @@ -27391,11 +27432,11 @@ int HP_guild_recv_message(int guild_id, int account_id, const char *mes, int len int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_recv_message_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, const char *mes, int *len); + int (*preHookFunc) (int *guild_id, int *account_id, const char **mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_recv_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_recv_message_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &account_id, mes, &len); + retVal___ = preHookFunc(&guild_id, &account_id, &mes, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27406,10 +27447,10 @@ int HP_guild_recv_message(int guild_id, int account_id, const char *mes, int len retVal___ = HPMHooks.source.guild.recv_message(guild_id, account_id, mes, len); } if( HPMHooks.count.HP_guild_recv_message_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, const char *mes, int *len); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, const char *mes, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_recv_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_recv_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, mes, &len); + retVal___ = postHookFunc(retVal___, guild_id, account_id, mes, len); } } return retVal___; @@ -27418,11 +27459,11 @@ int HP_guild_send_dot_remove(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_send_dot_remove_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_send_dot_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_send_dot_remove_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27460,10 +27501,10 @@ int HP_guild_skillupack(int guild_id, uint16 skill_id, int account_id) { retVal___ = HPMHooks.source.guild.skillupack(guild_id, skill_id, account_id); } if( HPMHooks.count.HP_guild_skillupack_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, uint16 *skill_id, int *account_id); + int (*postHookFunc) (int retVal___, int guild_id, uint16 skill_id, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_skillupack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_skillupack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &skill_id, &account_id); + retVal___ = postHookFunc(retVal___, guild_id, skill_id, account_id); } } return retVal___; @@ -27472,11 +27513,11 @@ int HP_guild_dobreak(struct map_session_data *sd, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_dobreak_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *name); + int (*preHookFunc) (struct map_session_data **sd, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_dobreak_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_dobreak_pre[hIndex].func; - retVal___ = preHookFunc(sd, name); + retVal___ = preHookFunc(&sd, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27514,10 +27555,10 @@ int HP_guild_broken(int guild_id, int flag) { retVal___ = HPMHooks.source.guild.broken(guild_id, flag); } if( HPMHooks.count.HP_guild_broken_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *flag); + int (*postHookFunc) (int retVal___, int guild_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_broken_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_broken_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &flag); + retVal___ = postHookFunc(retVal___, guild_id, flag); } } return retVal___; @@ -27526,11 +27567,11 @@ int HP_guild_gm_change(int guild_id, struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_gm_change_pre ) { - int (*preHookFunc) (int *guild_id, struct map_session_data *sd); + int (*preHookFunc) (int *guild_id, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_gm_change_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_gm_change_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, sd); + retVal___ = preHookFunc(&guild_id, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27541,10 +27582,10 @@ int HP_guild_gm_change(int guild_id, struct map_session_data *sd) { retVal___ = HPMHooks.source.guild.gm_change(guild_id, sd); } if( HPMHooks.count.HP_guild_gm_change_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, struct map_session_data *sd); + int (*postHookFunc) (int retVal___, int guild_id, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_gm_change_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_gm_change_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, sd); + retVal___ = postHookFunc(retVal___, guild_id, sd); } } return retVal___; @@ -27568,10 +27609,10 @@ int HP_guild_gm_changed(int guild_id, int account_id, int char_id) { retVal___ = HPMHooks.source.guild.gm_changed(guild_id, account_id, char_id); } if( HPMHooks.count.HP_guild_gm_changed_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_gm_changed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_gm_changed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id); } } return retVal___; @@ -27621,10 +27662,10 @@ int HP_guild_castledatasave(int castle_id, int index, int value) { retVal___ = HPMHooks.source.guild.castledatasave(castle_id, index, value); } if( HPMHooks.count.HP_guild_castledatasave_post ) { - int (*postHookFunc) (int retVal___, int *castle_id, int *index, int *value); + int (*postHookFunc) (int retVal___, int castle_id, int index, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castledatasave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_castledatasave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &castle_id, &index, &value); + retVal___ = postHookFunc(retVal___, castle_id, index, value); } } return retVal___; @@ -27633,11 +27674,11 @@ int HP_guild_castledataloadack(int len, const struct guild_castle *gc) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_castledataloadack_pre ) { - int (*preHookFunc) (int *len, const struct guild_castle *gc); + int (*preHookFunc) (int *len, const struct guild_castle **gc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castledataloadack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_castledataloadack_pre[hIndex].func; - retVal___ = preHookFunc(&len, gc); + retVal___ = preHookFunc(&len, &gc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27648,10 +27689,10 @@ int HP_guild_castledataloadack(int len, const struct guild_castle *gc) { retVal___ = HPMHooks.source.guild.castledataloadack(len, gc); } if( HPMHooks.count.HP_guild_castledataloadack_post ) { - int (*postHookFunc) (int retVal___, int *len, const struct guild_castle *gc); + int (*postHookFunc) (int retVal___, int len, const struct guild_castle *gc); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castledataloadack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_castledataloadack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &len, gc); + retVal___ = postHookFunc(retVal___, len, gc); } } return retVal___; @@ -27674,10 +27715,10 @@ void HP_guild_castle_reconnect(int castle_id, int index, int value) { HPMHooks.source.guild.castle_reconnect(castle_id, index, value); } if( HPMHooks.count.HP_guild_castle_reconnect_post ) { - void (*postHookFunc) (int *castle_id, int *index, int *value); + void (*postHookFunc) (int castle_id, int index, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castle_reconnect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_castle_reconnect_post[hIndex].func; - postHookFunc(&castle_id, &index, &value); + postHookFunc(castle_id, index, value); } } return; @@ -27789,11 +27830,11 @@ void HP_guild_agit2_end(void) { void HP_guild_flag_add(struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_guild_flag_add_pre ) { - void (*preHookFunc) (struct npc_data *nd); + void (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_flag_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_flag_add_pre[hIndex].func; - preHookFunc(nd); + preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27815,11 +27856,11 @@ void HP_guild_flag_add(struct npc_data *nd) { void HP_guild_flag_remove(struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_guild_flag_remove_pre ) { - void (*preHookFunc) (struct npc_data *nd); + void (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_flag_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_flag_remove_pre[hIndex].func; - preHookFunc(nd); + preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27867,11 +27908,11 @@ void HP_guild_flags_clear(void) { void HP_guild_aura_refresh(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) { int hIndex = 0; if( HPMHooks.count.HP_guild_aura_refresh_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_aura_refresh_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_aura_refresh_pre[hIndex].func; - preHookFunc(sd, &skill_id, &skill_lv); + preHookFunc(&sd, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27882,10 +27923,10 @@ void HP_guild_aura_refresh(struct map_session_data *sd, uint16 skill_id, uint16 HPMHooks.source.guild.aura_refresh(sd, skill_id, skill_lv); } if( HPMHooks.count.HP_guild_aura_refresh_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_aura_refresh_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_aura_refresh_post[hIndex].func; - postHookFunc(sd, &skill_id, &skill_lv); + postHookFunc(sd, skill_id, skill_lv); } } return; @@ -27908,10 +27949,10 @@ void HP_guild_retrieveitembound(int char_id, int aid, int guild_id) { HPMHooks.source.guild.retrieveitembound(char_id, aid, guild_id); } if( HPMHooks.count.HP_guild_retrieveitembound_post ) { - void (*postHookFunc) (int *char_id, int *aid, int *guild_id); + void (*postHookFunc) (int char_id, int aid, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_retrieveitembound_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_retrieveitembound_post[hIndex].func; - postHookFunc(&char_id, &aid, &guild_id); + postHookFunc(char_id, aid, guild_id); } } return; @@ -27935,10 +27976,10 @@ int HP_guild_payexp_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.guild.payexp_timer(tid, tick, id, data); } if( HPMHooks.count.HP_guild_payexp_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_payexp_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_payexp_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -27962,10 +28003,10 @@ struct map_session_data* HP_guild_sd_check(int guild_id, int account_id, int cha retVal___ = HPMHooks.source.guild.sd_check(guild_id, account_id, char_id); } if( HPMHooks.count.HP_guild_sd_check_post ) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int *guild_id, int *account_id, int *char_id); + struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int guild_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_sd_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_sd_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id); } } return retVal___; @@ -27974,11 +28015,11 @@ bool HP_guild_read_guildskill_tree_db(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_guild_read_guildskill_tree_db_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_guildskill_tree_db_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_read_guildskill_tree_db_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -27989,10 +28030,10 @@ bool HP_guild_read_guildskill_tree_db(char *split[], int columns, int current) { retVal___ = HPMHooks.source.guild.read_guildskill_tree_db(split, columns, current); } if( HPMHooks.count.HP_guild_read_guildskill_tree_db_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_guildskill_tree_db_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_read_guildskill_tree_db_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -28001,11 +28042,11 @@ bool HP_guild_read_castledb(char *str[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_guild_read_castledb_pre ) { - bool (*preHookFunc) (char *str[], int *columns, int *current); + bool (*preHookFunc) (char **str[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_read_castledb_pre[hIndex].func; - retVal___ = preHookFunc(str, &columns, ¤t); + retVal___ = preHookFunc(&str, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28016,24 +28057,24 @@ bool HP_guild_read_castledb(char *str[], int columns, int current) { retVal___ = HPMHooks.source.guild.read_castledb(str, columns, current); } if( HPMHooks.count.HP_guild_read_castledb_post ) { - bool (*postHookFunc) (bool retVal___, char *str[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *str[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_read_castledb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &columns, ¤t); + retVal___ = postHookFunc(retVal___, str, columns, current); } } return retVal___; } -int HP_guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) { +int HP_guild_payexp_timer_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_payexp_timer_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_payexp_timer_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_guild_payexp_timer_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -28047,26 +28088,26 @@ int HP_guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_guild_payexp_timer_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_payexp_timer_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_guild_payexp_timer_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) { +int HP_guild_send_xy_timer_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_send_xy_timer_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_send_xy_timer_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_guild_send_xy_timer_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -28080,11 +28121,11 @@ int HP_guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_guild_send_xy_timer_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_send_xy_timer_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_guild_send_xy_timer_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -28109,20 +28150,19 @@ int HP_guild_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.guild.send_xy_timer(tid, tick, id, data); } if( HPMHooks.count.HP_guild_send_xy_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_send_xy_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_send_xy_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -DBData HP_guild_create_expcache(DBKey key, va_list args) { +struct DBData HP_guild_create_expcache(union DBKey key, va_list args) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_guild_create_expcache_pre ) { - DBData (*preHookFunc) (DBKey *key, va_list args); + struct DBData (*preHookFunc) (union DBKey *key, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_create_expcache_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); @@ -28141,26 +28181,26 @@ DBData HP_guild_create_expcache(DBKey key, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_guild_create_expcache_post ) { - DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args); + struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey key, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_create_expcache_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_guild_create_expcache_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, args___copy); + retVal___ = postHookFunc(retVal___, key, args___copy); va_end(args___copy); } } return retVal___; } -int HP_guild_eventlist_db_final(DBKey key, DBData *data, va_list ap) { +int HP_guild_eventlist_db_final(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_eventlist_db_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_eventlist_db_final_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_guild_eventlist_db_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -28174,26 +28214,26 @@ int HP_guild_eventlist_db_final(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_guild_eventlist_db_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_eventlist_db_final_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_guild_eventlist_db_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_guild_expcache_db_final(DBKey key, DBData *data, va_list ap) { +int HP_guild_expcache_db_final(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_expcache_db_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_expcache_db_final_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_guild_expcache_db_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -28207,26 +28247,26 @@ int HP_guild_expcache_db_final(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_guild_expcache_db_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_expcache_db_final_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_guild_expcache_db_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_guild_castle_db_final(DBKey key, DBData *data, va_list ap) { +int HP_guild_castle_db_final(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_castle_db_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castle_db_final_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_guild_castle_db_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -28240,26 +28280,26 @@ int HP_guild_castle_db_final(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_guild_castle_db_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castle_db_final_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_guild_castle_db_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_guild_broken_sub(DBKey key, DBData *data, va_list ap) { +int HP_guild_broken_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_broken_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_broken_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_guild_broken_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -28273,26 +28313,26 @@ int HP_guild_broken_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_guild_broken_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_broken_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_guild_broken_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_guild_castle_broken_sub(DBKey key, DBData *data, va_list ap) { +int HP_guild_castle_broken_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_castle_broken_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castle_broken_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_guild_castle_broken_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -28306,11 +28346,11 @@ int HP_guild_castle_broken_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_guild_castle_broken_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castle_broken_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_guild_castle_broken_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -28319,11 +28359,11 @@ int HP_guild_castle_broken_sub(DBKey key, DBData *data, va_list ap) { void HP_guild_makemember(struct guild_member *m, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_guild_makemember_pre ) { - void (*preHookFunc) (struct guild_member *m, struct map_session_data *sd); + void (*preHookFunc) (struct guild_member **m, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_makemember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_makemember_pre[hIndex].func; - preHookFunc(m, sd); + preHookFunc(&m, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28346,11 +28386,11 @@ int HP_guild_check_member(const struct guild *g) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_check_member_pre ) { - int (*preHookFunc) (const struct guild *g); + int (*preHookFunc) (const struct guild **g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_check_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_check_member_pre[hIndex].func; - retVal___ = preHookFunc(g); + retVal___ = preHookFunc(&g); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28373,11 +28413,11 @@ int HP_guild_get_alliance_count(struct guild *g, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_get_alliance_count_pre ) { - int (*preHookFunc) (struct guild *g, int *flag); + int (*preHookFunc) (struct guild **g, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_get_alliance_count_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_get_alliance_count_pre[hIndex].func; - retVal___ = preHookFunc(g, &flag); + retVal___ = preHookFunc(&g, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28388,10 +28428,10 @@ int HP_guild_get_alliance_count(struct guild *g, int flag) { retVal___ = HPMHooks.source.guild.get_alliance_count(g, flag); } if( HPMHooks.count.HP_guild_get_alliance_count_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *flag); + int (*postHookFunc) (int retVal___, struct guild *g, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_get_alliance_count_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_get_alliance_count_post[hIndex].func; - retVal___ = postHookFunc(retVal___, g, &flag); + retVal___ = postHookFunc(retVal___, g, flag); } } return retVal___; @@ -28399,12 +28439,12 @@ int HP_guild_get_alliance_count(struct guild *g, int flag) { void HP_guild_castle_reconnect_sub(void *key, void *data, va_list ap) { int hIndex = 0; if( HPMHooks.count.HP_guild_castle_reconnect_sub_pre ) { - void (*preHookFunc) (void *key, void *data, va_list ap); + void (*preHookFunc) (void **key, void **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castle_reconnect_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_guild_castle_reconnect_sub_pre[hIndex].func; - preHookFunc(key, data, ap___copy); + preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -28428,7 +28468,7 @@ void HP_guild_castle_reconnect_sub(void *key, void *data, va_list ap) { } return; } -/* gstorage */ +/* guild_storage_interface */ struct guild_storage* HP_gstorage_ensure(int guild_id) { int hIndex = 0; struct guild_storage* retVal___ = NULL; @@ -28448,10 +28488,10 @@ struct guild_storage* HP_gstorage_ensure(int guild_id) { retVal___ = HPMHooks.source.gstorage.ensure(guild_id); } if( HPMHooks.count.HP_gstorage_ensure_post ) { - struct guild_storage* (*postHookFunc) (struct guild_storage* retVal___, int *guild_id); + struct guild_storage* (*postHookFunc) (struct guild_storage* retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_ensure_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_ensure_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; @@ -28474,10 +28514,10 @@ void HP_gstorage_init(bool minimal) { HPMHooks.source.gstorage.init(minimal); } if( HPMHooks.count.HP_gstorage_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -28527,10 +28567,10 @@ int HP_gstorage_delete(int guild_id) { retVal___ = HPMHooks.source.gstorage.delete(guild_id); } if( HPMHooks.count.HP_gstorage_delete_post ) { - int (*postHookFunc) (int retVal___, int *guild_id); + int (*postHookFunc) (int retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; @@ -28539,11 +28579,11 @@ int HP_gstorage_open(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_gstorage_open_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_open_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28566,11 +28606,11 @@ int HP_gstorage_additem(struct map_session_data *sd, struct guild_storage *stor, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_gstorage_additem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct guild_storage *stor, struct item *item_data, int *amount); + int (*preHookFunc) (struct map_session_data **sd, struct guild_storage **stor, struct item **item_data, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_additem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_additem_pre[hIndex].func; - retVal___ = preHookFunc(sd, stor, item_data, &amount); + retVal___ = preHookFunc(&sd, &stor, &item_data, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28581,10 +28621,10 @@ int HP_gstorage_additem(struct map_session_data *sd, struct guild_storage *stor, retVal___ = HPMHooks.source.gstorage.additem(sd, stor, item_data, amount); } if( HPMHooks.count.HP_gstorage_additem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct guild_storage *stor, struct item *item_data, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct guild_storage *stor, struct item *item_data, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_additem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_additem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, stor, item_data, &amount); + retVal___ = postHookFunc(retVal___, sd, stor, item_data, amount); } } return retVal___; @@ -28593,11 +28633,11 @@ int HP_gstorage_delitem(struct map_session_data *sd, struct guild_storage *stor, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_gstorage_delitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct guild_storage *stor, int *n, int *amount); + int (*preHookFunc) (struct map_session_data **sd, struct guild_storage **stor, int *n, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_delitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_delitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, stor, &n, &amount); + retVal___ = preHookFunc(&sd, &stor, &n, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28608,10 +28648,10 @@ int HP_gstorage_delitem(struct map_session_data *sd, struct guild_storage *stor, retVal___ = HPMHooks.source.gstorage.delitem(sd, stor, n, amount); } if( HPMHooks.count.HP_gstorage_delitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct guild_storage *stor, int *n, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct guild_storage *stor, int n, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_delitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_delitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, stor, &n, &amount); + retVal___ = postHookFunc(retVal___, sd, stor, n, amount); } } return retVal___; @@ -28620,11 +28660,11 @@ int HP_gstorage_add(struct map_session_data *sd, int index, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_gstorage_add_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_add_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index, &amount); + retVal___ = preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28635,10 +28675,10 @@ int HP_gstorage_add(struct map_session_data *sd, int index, int amount) { retVal___ = HPMHooks.source.gstorage.add(sd, index, amount); } if( HPMHooks.count.HP_gstorage_add_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *index, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index, &amount); + retVal___ = postHookFunc(retVal___, sd, index, amount); } } return retVal___; @@ -28647,11 +28687,11 @@ int HP_gstorage_get(struct map_session_data *sd, int index, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_gstorage_get_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_get_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_get_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index, &amount); + retVal___ = preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28662,10 +28702,10 @@ int HP_gstorage_get(struct map_session_data *sd, int index, int amount) { retVal___ = HPMHooks.source.gstorage.get(sd, index, amount); } if( HPMHooks.count.HP_gstorage_get_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *index, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_get_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_get_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index, &amount); + retVal___ = postHookFunc(retVal___, sd, index, amount); } } return retVal___; @@ -28674,11 +28714,11 @@ int HP_gstorage_addfromcart(struct map_session_data *sd, int index, int amount) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_gstorage_addfromcart_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_addfromcart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_addfromcart_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index, &amount); + retVal___ = preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28689,10 +28729,10 @@ int HP_gstorage_addfromcart(struct map_session_data *sd, int index, int amount) retVal___ = HPMHooks.source.gstorage.addfromcart(sd, index, amount); } if( HPMHooks.count.HP_gstorage_addfromcart_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *index, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_addfromcart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_addfromcart_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index, &amount); + retVal___ = postHookFunc(retVal___, sd, index, amount); } } return retVal___; @@ -28701,11 +28741,11 @@ int HP_gstorage_gettocart(struct map_session_data *sd, int index, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_gstorage_gettocart_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_gettocart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_gettocart_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index, &amount); + retVal___ = preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28716,10 +28756,10 @@ int HP_gstorage_gettocart(struct map_session_data *sd, int index, int amount) { retVal___ = HPMHooks.source.gstorage.gettocart(sd, index, amount); } if( HPMHooks.count.HP_gstorage_gettocart_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *index, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_gettocart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_gettocart_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index, &amount); + retVal___ = postHookFunc(retVal___, sd, index, amount); } } return retVal___; @@ -28728,11 +28768,11 @@ int HP_gstorage_close(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_gstorage_close_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_close_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_close_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28755,11 +28795,11 @@ int HP_gstorage_pc_quit(struct map_session_data *sd, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_gstorage_pc_quit_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *flag); + int (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_pc_quit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_pc_quit_pre[hIndex].func; - retVal___ = preHookFunc(sd, &flag); + retVal___ = preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -28770,10 +28810,10 @@ int HP_gstorage_pc_quit(struct map_session_data *sd, int flag) { retVal___ = HPMHooks.source.gstorage.pc_quit(sd, flag); } if( HPMHooks.count.HP_gstorage_pc_quit_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_pc_quit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_pc_quit_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &flag); + retVal___ = postHookFunc(retVal___, sd, flag); } } return retVal___; @@ -28797,10 +28837,10 @@ int HP_gstorage_save(int account_id, int guild_id, int flag) { retVal___ = HPMHooks.source.gstorage.save(account_id, guild_id, flag); } if( HPMHooks.count.HP_gstorage_save_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *guild_id, int *flag); + int (*postHookFunc) (int retVal___, int account_id, int guild_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_save_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &guild_id, &flag); + retVal___ = postHookFunc(retVal___, account_id, guild_id, flag); } } return retVal___; @@ -28824,20 +28864,19 @@ int HP_gstorage_saved(int guild_id) { retVal___ = HPMHooks.source.gstorage.saved(guild_id); } if( HPMHooks.count.HP_gstorage_saved_post ) { - int (*postHookFunc) (int retVal___, int *guild_id); + int (*postHookFunc) (int retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_saved_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_saved_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; } -DBData HP_gstorage_create(DBKey key, va_list args) { +struct DBData HP_gstorage_create(union DBKey key, va_list args) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_gstorage_create_pre ) { - DBData (*preHookFunc) (DBKey *key, va_list args); + struct DBData (*preHookFunc) (union DBKey *key, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_create_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); @@ -28856,17 +28895,17 @@ DBData HP_gstorage_create(DBKey key, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_gstorage_create_post ) { - DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args); + struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey key, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_create_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_gstorage_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, args___copy); + retVal___ = postHookFunc(retVal___, key, args___copy); va_end(args___copy); } } return retVal___; } -/* homun */ +/* homunculus_interface */ void HP_homun_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_homun_init_pre ) { @@ -28885,10 +28924,10 @@ void HP_homun_init(bool minimal) { HPMHooks.source.homun.init(minimal); } if( HPMHooks.count.HP_homun_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -28990,10 +29029,10 @@ struct view_data* HP_homun_get_viewdata(int class_) { retVal___ = HPMHooks.source.homun.get_viewdata(class_); } if( HPMHooks.count.HP_homun_get_viewdata_post ) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int *class_); + struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_get_viewdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_get_viewdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -29017,10 +29056,10 @@ enum homun_type HP_homun_class2type(int class_) { retVal___ = HPMHooks.source.homun.class2type(class_); } if( HPMHooks.count.HP_homun_class2type_post ) { - enum homun_type (*postHookFunc) (enum homun_type retVal___, int *class_); + enum homun_type (*postHookFunc) (enum homun_type retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_class2type_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_class2type_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -29028,11 +29067,11 @@ enum homun_type HP_homun_class2type(int class_) { void HP_homun_damaged(struct homun_data *hd) { int hIndex = 0; if( HPMHooks.count.HP_homun_damaged_pre ) { - void (*preHookFunc) (struct homun_data *hd); + void (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_damaged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_damaged_pre[hIndex].func; - preHookFunc(hd); + preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29055,11 +29094,11 @@ int HP_homun_dead(struct homun_data *hd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_dead_pre ) { - int (*preHookFunc) (struct homun_data *hd); + int (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_dead_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_dead_pre[hIndex].func; - retVal___ = preHookFunc(hd); + retVal___ = preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29082,11 +29121,11 @@ int HP_homun_vaporize(struct map_session_data *sd, enum homun_state flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_vaporize_pre ) { - int (*preHookFunc) (struct map_session_data *sd, enum homun_state *flag); + int (*preHookFunc) (struct map_session_data **sd, enum homun_state *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_vaporize_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_vaporize_pre[hIndex].func; - retVal___ = preHookFunc(sd, &flag); + retVal___ = preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29097,10 +29136,10 @@ int HP_homun_vaporize(struct map_session_data *sd, enum homun_state flag) { retVal___ = HPMHooks.source.homun.vaporize(sd, flag); } if( HPMHooks.count.HP_homun_vaporize_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum homun_state *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum homun_state flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_vaporize_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_vaporize_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &flag); + retVal___ = postHookFunc(retVal___, sd, flag); } } return retVal___; @@ -29109,11 +29148,11 @@ int HP_homun_delete(struct homun_data *hd, int emote) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_delete_pre ) { - int (*preHookFunc) (struct homun_data *hd, int *emote); + int (*preHookFunc) (struct homun_data **hd, int *emote); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_delete_pre[hIndex].func; - retVal___ = preHookFunc(hd, &emote); + retVal___ = preHookFunc(&hd, &emote); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29124,10 +29163,10 @@ int HP_homun_delete(struct homun_data *hd, int emote) { retVal___ = HPMHooks.source.homun.delete(hd, emote); } if( HPMHooks.count.HP_homun_delete_post ) { - int (*postHookFunc) (int retVal___, struct homun_data *hd, int *emote); + int (*postHookFunc) (int retVal___, struct homun_data *hd, int emote); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &emote); + retVal___ = postHookFunc(retVal___, hd, emote); } } return retVal___; @@ -29136,11 +29175,11 @@ int HP_homun_checkskill(struct homun_data *hd, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_checkskill_pre ) { - int (*preHookFunc) (struct homun_data *hd, uint16 *skill_id); + int (*preHookFunc) (struct homun_data **hd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_checkskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_checkskill_pre[hIndex].func; - retVal___ = preHookFunc(hd, &skill_id); + retVal___ = preHookFunc(&hd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29151,10 +29190,10 @@ int HP_homun_checkskill(struct homun_data *hd, uint16 skill_id) { retVal___ = HPMHooks.source.homun.checkskill(hd, skill_id); } if( HPMHooks.count.HP_homun_checkskill_post ) { - int (*postHookFunc) (int retVal___, struct homun_data *hd, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct homun_data *hd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_checkskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_checkskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &skill_id); + retVal___ = postHookFunc(retVal___, hd, skill_id); } } return retVal___; @@ -29163,11 +29202,11 @@ int HP_homun_calc_skilltree(struct homun_data *hd, int flag_evolve) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_calc_skilltree_pre ) { - int (*preHookFunc) (struct homun_data *hd, int *flag_evolve); + int (*preHookFunc) (struct homun_data **hd, int *flag_evolve); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_calc_skilltree_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_calc_skilltree_pre[hIndex].func; - retVal___ = preHookFunc(hd, &flag_evolve); + retVal___ = preHookFunc(&hd, &flag_evolve); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29178,10 +29217,10 @@ int HP_homun_calc_skilltree(struct homun_data *hd, int flag_evolve) { retVal___ = HPMHooks.source.homun.calc_skilltree(hd, flag_evolve); } if( HPMHooks.count.HP_homun_calc_skilltree_post ) { - int (*postHookFunc) (int retVal___, struct homun_data *hd, int *flag_evolve); + int (*postHookFunc) (int retVal___, struct homun_data *hd, int flag_evolve); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_calc_skilltree_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_calc_skilltree_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &flag_evolve); + retVal___ = postHookFunc(retVal___, hd, flag_evolve); } } return retVal___; @@ -29205,10 +29244,10 @@ int HP_homun_skill_tree_get_max(int id, int b_class) { retVal___ = HPMHooks.source.homun.skill_tree_get_max(id, b_class); } if( HPMHooks.count.HP_homun_skill_tree_get_max_post ) { - int (*postHookFunc) (int retVal___, int *id, int *b_class); + int (*postHookFunc) (int retVal___, int id, int b_class); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_skill_tree_get_max_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_skill_tree_get_max_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id, &b_class); + retVal___ = postHookFunc(retVal___, id, b_class); } } return retVal___; @@ -29216,11 +29255,11 @@ int HP_homun_skill_tree_get_max(int id, int b_class) { void HP_homun_skillup(struct homun_data *hd, uint16 skill_id) { int hIndex = 0; if( HPMHooks.count.HP_homun_skillup_pre ) { - void (*preHookFunc) (struct homun_data *hd, uint16 *skill_id); + void (*preHookFunc) (struct homun_data **hd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_skillup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_skillup_pre[hIndex].func; - preHookFunc(hd, &skill_id); + preHookFunc(&hd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29231,10 +29270,10 @@ void HP_homun_skillup(struct homun_data *hd, uint16 skill_id) { HPMHooks.source.homun.skillup(hd, skill_id); } if( HPMHooks.count.HP_homun_skillup_post ) { - void (*postHookFunc) (struct homun_data *hd, uint16 *skill_id); + void (*postHookFunc) (struct homun_data *hd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_skillup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_skillup_post[hIndex].func; - postHookFunc(hd, &skill_id); + postHookFunc(hd, skill_id); } } return; @@ -29243,11 +29282,11 @@ bool HP_homun_levelup(struct homun_data *hd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_levelup_pre ) { - bool (*preHookFunc) (struct homun_data *hd); + bool (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_levelup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_levelup_pre[hIndex].func; - retVal___ = preHookFunc(hd); + retVal___ = preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29270,11 +29309,11 @@ int HP_homun_change_class(struct homun_data *hd, short class_) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_change_class_pre ) { - int (*preHookFunc) (struct homun_data *hd, short *class_); + int (*preHookFunc) (struct homun_data **hd, short *class_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_change_class_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_change_class_pre[hIndex].func; - retVal___ = preHookFunc(hd, &class_); + retVal___ = preHookFunc(&hd, &class_); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29285,10 +29324,10 @@ int HP_homun_change_class(struct homun_data *hd, short class_) { retVal___ = HPMHooks.source.homun.change_class(hd, class_); } if( HPMHooks.count.HP_homun_change_class_post ) { - int (*postHookFunc) (int retVal___, struct homun_data *hd, short *class_); + int (*postHookFunc) (int retVal___, struct homun_data *hd, short class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_change_class_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_change_class_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &class_); + retVal___ = postHookFunc(retVal___, hd, class_); } } return retVal___; @@ -29297,11 +29336,11 @@ bool HP_homun_evolve(struct homun_data *hd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_evolve_pre ) { - bool (*preHookFunc) (struct homun_data *hd); + bool (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_evolve_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_evolve_pre[hIndex].func; - retVal___ = preHookFunc(hd); + retVal___ = preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29324,11 +29363,11 @@ bool HP_homun_mutate(struct homun_data *hd, int homun_id) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_mutate_pre ) { - bool (*preHookFunc) (struct homun_data *hd, int *homun_id); + bool (*preHookFunc) (struct homun_data **hd, int *homun_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_mutate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_mutate_pre[hIndex].func; - retVal___ = preHookFunc(hd, &homun_id); + retVal___ = preHookFunc(&hd, &homun_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29339,10 +29378,10 @@ bool HP_homun_mutate(struct homun_data *hd, int homun_id) { retVal___ = HPMHooks.source.homun.mutate(hd, homun_id); } if( HPMHooks.count.HP_homun_mutate_post ) { - bool (*postHookFunc) (bool retVal___, struct homun_data *hd, int *homun_id); + bool (*postHookFunc) (bool retVal___, struct homun_data *hd, int homun_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_mutate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_mutate_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &homun_id); + retVal___ = postHookFunc(retVal___, hd, homun_id); } } return retVal___; @@ -29351,11 +29390,11 @@ int HP_homun_gainexp(struct homun_data *hd, unsigned int exp) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_gainexp_pre ) { - int (*preHookFunc) (struct homun_data *hd, unsigned int *exp); + int (*preHookFunc) (struct homun_data **hd, unsigned int *exp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_gainexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_gainexp_pre[hIndex].func; - retVal___ = preHookFunc(hd, &exp); + retVal___ = preHookFunc(&hd, &exp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29366,10 +29405,10 @@ int HP_homun_gainexp(struct homun_data *hd, unsigned int exp) { retVal___ = HPMHooks.source.homun.gainexp(hd, exp); } if( HPMHooks.count.HP_homun_gainexp_post ) { - int (*postHookFunc) (int retVal___, struct homun_data *hd, unsigned int *exp); + int (*postHookFunc) (int retVal___, struct homun_data *hd, unsigned int exp); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_gainexp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_gainexp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &exp); + retVal___ = postHookFunc(retVal___, hd, exp); } } return retVal___; @@ -29378,11 +29417,11 @@ unsigned int HP_homun_add_intimacy(struct homun_data *hd, unsigned int value) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_homun_add_intimacy_pre ) { - unsigned int (*preHookFunc) (struct homun_data *hd, unsigned int *value); + unsigned int (*preHookFunc) (struct homun_data **hd, unsigned int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_add_intimacy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_add_intimacy_pre[hIndex].func; - retVal___ = preHookFunc(hd, &value); + retVal___ = preHookFunc(&hd, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29393,10 +29432,10 @@ unsigned int HP_homun_add_intimacy(struct homun_data *hd, unsigned int value) { retVal___ = HPMHooks.source.homun.add_intimacy(hd, value); } if( HPMHooks.count.HP_homun_add_intimacy_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, struct homun_data *hd, unsigned int *value); + unsigned int (*postHookFunc) (unsigned int retVal___, struct homun_data *hd, unsigned int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_add_intimacy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_add_intimacy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &value); + retVal___ = postHookFunc(retVal___, hd, value); } } return retVal___; @@ -29405,11 +29444,11 @@ unsigned int HP_homun_consume_intimacy(struct homun_data *hd, unsigned int value int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_homun_consume_intimacy_pre ) { - unsigned int (*preHookFunc) (struct homun_data *hd, unsigned int *value); + unsigned int (*preHookFunc) (struct homun_data **hd, unsigned int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_consume_intimacy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_consume_intimacy_pre[hIndex].func; - retVal___ = preHookFunc(hd, &value); + retVal___ = preHookFunc(&hd, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29420,10 +29459,10 @@ unsigned int HP_homun_consume_intimacy(struct homun_data *hd, unsigned int value retVal___ = HPMHooks.source.homun.consume_intimacy(hd, value); } if( HPMHooks.count.HP_homun_consume_intimacy_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, struct homun_data *hd, unsigned int *value); + unsigned int (*postHookFunc) (unsigned int retVal___, struct homun_data *hd, unsigned int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_consume_intimacy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_consume_intimacy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &value); + retVal___ = postHookFunc(retVal___, hd, value); } } return retVal___; @@ -29431,11 +29470,11 @@ unsigned int HP_homun_consume_intimacy(struct homun_data *hd, unsigned int value void HP_homun_healed(struct homun_data *hd) { int hIndex = 0; if( HPMHooks.count.HP_homun_healed_pre ) { - void (*preHookFunc) (struct homun_data *hd); + void (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_healed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_healed_pre[hIndex].func; - preHookFunc(hd); + preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29457,11 +29496,11 @@ void HP_homun_healed(struct homun_data *hd) { void HP_homun_save(struct homun_data *hd) { int hIndex = 0; if( HPMHooks.count.HP_homun_save_pre ) { - void (*preHookFunc) (struct homun_data *hd); + void (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_save_pre[hIndex].func; - preHookFunc(hd); + preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29484,11 +29523,11 @@ unsigned char HP_homun_menu(struct map_session_data *sd, unsigned char menu_num) int hIndex = 0; unsigned char retVal___ = 0; if( HPMHooks.count.HP_homun_menu_pre ) { - unsigned char (*preHookFunc) (struct map_session_data *sd, unsigned char *menu_num); + unsigned char (*preHookFunc) (struct map_session_data **sd, unsigned char *menu_num); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_menu_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_menu_pre[hIndex].func; - retVal___ = preHookFunc(sd, &menu_num); + retVal___ = preHookFunc(&sd, &menu_num); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29499,10 +29538,10 @@ unsigned char HP_homun_menu(struct map_session_data *sd, unsigned char menu_num) retVal___ = HPMHooks.source.homun.menu(sd, menu_num); } if( HPMHooks.count.HP_homun_menu_post ) { - unsigned char (*postHookFunc) (unsigned char retVal___, struct map_session_data *sd, unsigned char *menu_num); + unsigned char (*postHookFunc) (unsigned char retVal___, struct map_session_data *sd, unsigned char menu_num); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_menu_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_menu_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &menu_num); + retVal___ = postHookFunc(retVal___, sd, menu_num); } } return retVal___; @@ -29511,11 +29550,11 @@ bool HP_homun_feed(struct map_session_data *sd, struct homun_data *hd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_feed_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, struct homun_data *hd); + bool (*preHookFunc) (struct map_session_data **sd, struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_feed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_feed_pre[hIndex].func; - retVal___ = preHookFunc(sd, hd); + retVal___ = preHookFunc(&sd, &hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29553,10 +29592,10 @@ int HP_homun_hunger_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.homun.hunger_timer(tid, tick, id, data); } if( HPMHooks.count.HP_homun_hunger_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_hunger_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_hunger_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -29564,11 +29603,11 @@ int HP_homun_hunger_timer(int tid, int64 tick, int id, intptr_t data) { void HP_homun_hunger_timer_delete(struct homun_data *hd) { int hIndex = 0; if( HPMHooks.count.HP_homun_hunger_timer_delete_pre ) { - void (*preHookFunc) (struct homun_data *hd); + void (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_hunger_timer_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_hunger_timer_delete_pre[hIndex].func; - preHookFunc(hd); + preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29591,11 +29630,11 @@ int HP_homun_change_name(struct map_session_data *sd, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_change_name_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *name); + int (*preHookFunc) (struct map_session_data **sd, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_change_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_change_name_pre[hIndex].func; - retVal___ = preHookFunc(sd, name); + retVal___ = preHookFunc(&sd, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29618,11 +29657,11 @@ bool HP_homun_change_name_ack(struct map_session_data *sd, const char *name, int int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_change_name_ack_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const char *name, int *flag); + bool (*preHookFunc) (struct map_session_data **sd, const char **name, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_change_name_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_change_name_ack_pre[hIndex].func; - retVal___ = preHookFunc(sd, name, &flag); + retVal___ = preHookFunc(&sd, &name, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29633,10 +29672,10 @@ bool HP_homun_change_name_ack(struct map_session_data *sd, const char *name, int retVal___ = HPMHooks.source.homun.change_name_ack(sd, name, flag); } if( HPMHooks.count.HP_homun_change_name_ack_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *name, int *flag); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *name, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_change_name_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_change_name_ack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, name, &flag); + retVal___ = postHookFunc(retVal___, sd, name, flag); } } return retVal___; @@ -29660,10 +29699,10 @@ int HP_homun_db_search(int key, int type) { retVal___ = HPMHooks.source.homun.db_search(key, type); } if( HPMHooks.count.HP_homun_db_search_post ) { - int (*postHookFunc) (int retVal___, int *key, int *type); + int (*postHookFunc) (int retVal___, int key, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_db_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_db_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, &type); + retVal___ = postHookFunc(retVal___, key, type); } } return retVal___; @@ -29672,11 +29711,11 @@ bool HP_homun_create(struct map_session_data *sd, const struct s_homunculus *hom int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_create_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const struct s_homunculus *hom); + bool (*preHookFunc) (struct map_session_data **sd, const struct s_homunculus **hom); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_create_pre[hIndex].func; - retVal___ = preHookFunc(sd, hom); + retVal___ = preHookFunc(&sd, &hom); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29698,11 +29737,11 @@ bool HP_homun_create(struct map_session_data *sd, const struct s_homunculus *hom void HP_homun_init_timers(struct homun_data *hd) { int hIndex = 0; if( HPMHooks.count.HP_homun_init_timers_pre ) { - void (*preHookFunc) (struct homun_data *hd); + void (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_init_timers_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_init_timers_pre[hIndex].func; - preHookFunc(hd); + preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29725,11 +29764,11 @@ bool HP_homun_call(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_call_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_call_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_call_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29752,11 +29791,11 @@ bool HP_homun_recv_data(int account_id, const struct s_homunculus *sh, int flag) int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_recv_data_pre ) { - bool (*preHookFunc) (int *account_id, const struct s_homunculus *sh, int *flag); + bool (*preHookFunc) (int *account_id, const struct s_homunculus **sh, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_recv_data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_recv_data_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, sh, &flag); + retVal___ = preHookFunc(&account_id, &sh, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29767,10 +29806,10 @@ bool HP_homun_recv_data(int account_id, const struct s_homunculus *sh, int flag) retVal___ = HPMHooks.source.homun.recv_data(account_id, sh, flag); } if( HPMHooks.count.HP_homun_recv_data_post ) { - bool (*postHookFunc) (bool retVal___, int *account_id, const struct s_homunculus *sh, int *flag); + bool (*postHookFunc) (bool retVal___, int account_id, const struct s_homunculus *sh, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_recv_data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_recv_data_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, sh, &flag); + retVal___ = postHookFunc(retVal___, account_id, sh, flag); } } return retVal___; @@ -29779,11 +29818,11 @@ bool HP_homun_creation_request(struct map_session_data *sd, int class_) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_creation_request_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *class_); + bool (*preHookFunc) (struct map_session_data **sd, int *class_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_creation_request_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_creation_request_pre[hIndex].func; - retVal___ = preHookFunc(sd, &class_); + retVal___ = preHookFunc(&sd, &class_); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29794,10 +29833,10 @@ bool HP_homun_creation_request(struct map_session_data *sd, int class_) { retVal___ = HPMHooks.source.homun.creation_request(sd, class_); } if( HPMHooks.count.HP_homun_creation_request_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *class_); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_creation_request_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_creation_request_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &class_); + retVal___ = postHookFunc(retVal___, sd, class_); } } return retVal___; @@ -29806,11 +29845,11 @@ bool HP_homun_ressurect(struct map_session_data *sd, unsigned char per, short x, int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_ressurect_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, unsigned char *per, short *x, short *y); + bool (*preHookFunc) (struct map_session_data **sd, unsigned char *per, short *x, short *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_ressurect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_ressurect_pre[hIndex].func; - retVal___ = preHookFunc(sd, &per, &x, &y); + retVal___ = preHookFunc(&sd, &per, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29821,10 +29860,10 @@ bool HP_homun_ressurect(struct map_session_data *sd, unsigned char per, short x, retVal___ = HPMHooks.source.homun.ressurect(sd, per, x, y); } if( HPMHooks.count.HP_homun_ressurect_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned char *per, short *x, short *y); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned char per, short x, short y); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_ressurect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_ressurect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &per, &x, &y); + retVal___ = postHookFunc(retVal___, sd, per, x, y); } } return retVal___; @@ -29832,11 +29871,11 @@ bool HP_homun_ressurect(struct map_session_data *sd, unsigned char per, short x, void HP_homun_revive(struct homun_data *hd, unsigned int hp, unsigned int sp) { int hIndex = 0; if( HPMHooks.count.HP_homun_revive_pre ) { - void (*preHookFunc) (struct homun_data *hd, unsigned int *hp, unsigned int *sp); + void (*preHookFunc) (struct homun_data **hd, unsigned int *hp, unsigned int *sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_revive_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_revive_pre[hIndex].func; - preHookFunc(hd, &hp, &sp); + preHookFunc(&hd, &hp, &sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29847,10 +29886,10 @@ void HP_homun_revive(struct homun_data *hd, unsigned int hp, unsigned int sp) { HPMHooks.source.homun.revive(hd, hp, sp); } if( HPMHooks.count.HP_homun_revive_post ) { - void (*postHookFunc) (struct homun_data *hd, unsigned int *hp, unsigned int *sp); + void (*postHookFunc) (struct homun_data *hd, unsigned int hp, unsigned int sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_revive_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_revive_post[hIndex].func; - postHookFunc(hd, &hp, &sp); + postHookFunc(hd, hp, sp); } } return; @@ -29858,11 +29897,11 @@ void HP_homun_revive(struct homun_data *hd, unsigned int hp, unsigned int sp) { void HP_homun_stat_reset(struct homun_data *hd) { int hIndex = 0; if( HPMHooks.count.HP_homun_stat_reset_pre ) { - void (*preHookFunc) (struct homun_data *hd); + void (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_stat_reset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_stat_reset_pre[hIndex].func; - preHookFunc(hd); + preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29885,11 +29924,11 @@ bool HP_homun_shuffle(struct homun_data *hd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_shuffle_pre ) { - bool (*preHookFunc) (struct homun_data *hd); + bool (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_shuffle_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_shuffle_pre[hIndex].func; - retVal___ = preHookFunc(hd); + retVal___ = preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29912,11 +29951,11 @@ bool HP_homun_read_db_sub(char *str[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_read_db_sub_pre ) { - bool (*preHookFunc) (char *str[], int *columns, int *current); + bool (*preHookFunc) (char **str[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_read_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_read_db_sub_pre[hIndex].func; - retVal___ = preHookFunc(str, &columns, ¤t); + retVal___ = preHookFunc(&str, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29927,10 +29966,10 @@ bool HP_homun_read_db_sub(char *str[], int columns, int current) { retVal___ = HPMHooks.source.homun.read_db_sub(str, columns, current); } if( HPMHooks.count.HP_homun_read_db_sub_post ) { - bool (*postHookFunc) (bool retVal___, char *str[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *str[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_read_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_read_db_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &columns, ¤t); + retVal___ = postHookFunc(retVal___, str, columns, current); } } return retVal___; @@ -29965,11 +30004,11 @@ bool HP_homun_read_skill_db_sub(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_read_skill_db_sub_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_read_skill_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_read_skill_db_sub_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -29980,10 +30019,10 @@ bool HP_homun_read_skill_db_sub(char *split[], int columns, int current) { retVal___ = HPMHooks.source.homun.read_skill_db_sub(split, columns, current); } if( HPMHooks.count.HP_homun_read_skill_db_sub_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_read_skill_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_read_skill_db_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -30043,11 +30082,11 @@ void HP_homun_exp_db_read(void) { void HP_homun_addspiritball(struct homun_data *hd, int max) { int hIndex = 0; if( HPMHooks.count.HP_homun_addspiritball_pre ) { - void (*preHookFunc) (struct homun_data *hd, int *max); + void (*preHookFunc) (struct homun_data **hd, int *max); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_addspiritball_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_addspiritball_pre[hIndex].func; - preHookFunc(hd, &max); + preHookFunc(&hd, &max); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30058,10 +30097,10 @@ void HP_homun_addspiritball(struct homun_data *hd, int max) { HPMHooks.source.homun.addspiritball(hd, max); } if( HPMHooks.count.HP_homun_addspiritball_post ) { - void (*postHookFunc) (struct homun_data *hd, int *max); + void (*postHookFunc) (struct homun_data *hd, int max); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_addspiritball_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_addspiritball_post[hIndex].func; - postHookFunc(hd, &max); + postHookFunc(hd, max); } } return; @@ -30069,11 +30108,11 @@ void HP_homun_addspiritball(struct homun_data *hd, int max) { void HP_homun_delspiritball(struct homun_data *hd, int count, int type) { int hIndex = 0; if( HPMHooks.count.HP_homun_delspiritball_pre ) { - void (*preHookFunc) (struct homun_data *hd, int *count, int *type); + void (*preHookFunc) (struct homun_data **hd, int *count, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_delspiritball_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_delspiritball_pre[hIndex].func; - preHookFunc(hd, &count, &type); + preHookFunc(&hd, &count, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30084,10 +30123,10 @@ void HP_homun_delspiritball(struct homun_data *hd, int count, int type) { HPMHooks.source.homun.delspiritball(hd, count, type); } if( HPMHooks.count.HP_homun_delspiritball_post ) { - void (*postHookFunc) (struct homun_data *hd, int *count, int *type); + void (*postHookFunc) (struct homun_data *hd, int count, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_delspiritball_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_delspiritball_post[hIndex].func; - postHookFunc(hd, &count, &type); + postHookFunc(hd, count, type); } } return; @@ -30096,11 +30135,11 @@ int8 HP_homun_get_intimacy_grade(struct homun_data *hd) { int hIndex = 0; int8 retVal___ = 0; if( HPMHooks.count.HP_homun_get_intimacy_grade_pre ) { - int8 (*preHookFunc) (struct homun_data *hd); + int8 (*preHookFunc) (struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_get_intimacy_grade_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_get_intimacy_grade_pre[hIndex].func; - retVal___ = preHookFunc(hd); + retVal___ = preHookFunc(&hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30119,7 +30158,7 @@ int8 HP_homun_get_intimacy_grade(struct homun_data *hd) { } return retVal___; } -/* instance */ +/* instance_interface */ void HP_instance_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_instance_init_pre ) { @@ -30138,10 +30177,10 @@ void HP_instance_init(bool minimal) { HPMHooks.source.instance.init(minimal); } if( HPMHooks.count.HP_instance_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -30202,11 +30241,11 @@ int HP_instance_create(int party_id, const char *name, enum instance_owner_type int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_instance_create_pre ) { - int (*preHookFunc) (int *party_id, const char *name, enum instance_owner_type *type); + int (*preHookFunc) (int *party_id, const char **name, enum instance_owner_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_instance_create_pre[hIndex].func; - retVal___ = preHookFunc(&party_id, name, &type); + retVal___ = preHookFunc(&party_id, &name, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30217,10 +30256,10 @@ int HP_instance_create(int party_id, const char *name, enum instance_owner_type retVal___ = HPMHooks.source.instance.create(party_id, name, type); } if( HPMHooks.count.HP_instance_create_post ) { - int (*postHookFunc) (int retVal___, int *party_id, const char *name, enum instance_owner_type *type); + int (*postHookFunc) (int retVal___, int party_id, const char *name, enum instance_owner_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, name, &type); + retVal___ = postHookFunc(retVal___, party_id, name, type); } } return retVal___; @@ -30229,11 +30268,11 @@ int HP_instance_add_map(const char *name, int instance_id, bool usebasename, con int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_instance_add_map_pre ) { - int (*preHookFunc) (const char *name, int *instance_id, bool *usebasename, const char *map_name); + int (*preHookFunc) (const char **name, int *instance_id, bool *usebasename, const char **map_name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_add_map_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_instance_add_map_pre[hIndex].func; - retVal___ = preHookFunc(name, &instance_id, &usebasename, map_name); + retVal___ = preHookFunc(&name, &instance_id, &usebasename, &map_name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30244,10 +30283,10 @@ int HP_instance_add_map(const char *name, int instance_id, bool usebasename, con retVal___ = HPMHooks.source.instance.add_map(name, instance_id, usebasename, map_name); } if( HPMHooks.count.HP_instance_add_map_post ) { - int (*postHookFunc) (int retVal___, const char *name, int *instance_id, bool *usebasename, const char *map_name); + int (*postHookFunc) (int retVal___, const char *name, int instance_id, bool usebasename, const char *map_name); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_add_map_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_add_map_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, &instance_id, &usebasename, map_name); + retVal___ = postHookFunc(retVal___, name, instance_id, usebasename, map_name); } } return retVal___; @@ -30270,10 +30309,10 @@ void HP_instance_del_map(int16 m) { HPMHooks.source.instance.del_map(m); } if( HPMHooks.count.HP_instance_del_map_post ) { - void (*postHookFunc) (int16 *m); + void (*postHookFunc) (int16 m); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_del_map_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_del_map_post[hIndex].func; - postHookFunc(&m); + postHookFunc(m); } } return; @@ -30297,10 +30336,10 @@ int HP_instance_map2imap(int16 m, int instance_id) { retVal___ = HPMHooks.source.instance.map2imap(m, instance_id); } if( HPMHooks.count.HP_instance_map2imap_post ) { - int (*postHookFunc) (int retVal___, int16 *m, int *instance_id); + int (*postHookFunc) (int retVal___, int16 m, int instance_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_map2imap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_map2imap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, &instance_id); + retVal___ = postHookFunc(retVal___, m, instance_id); } } return retVal___; @@ -30324,10 +30363,10 @@ int HP_instance_mapid2imapid(int16 m, int instance_id) { retVal___ = HPMHooks.source.instance.mapid2imapid(m, instance_id); } if( HPMHooks.count.HP_instance_mapid2imapid_post ) { - int (*postHookFunc) (int retVal___, int16 *m, int *instance_id); + int (*postHookFunc) (int retVal___, int16 m, int instance_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_mapid2imapid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_mapid2imapid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, &instance_id); + retVal___ = postHookFunc(retVal___, m, instance_id); } } return retVal___; @@ -30336,11 +30375,11 @@ int HP_instance_mapname2imap(const char *map_name, int instance_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_instance_mapname2imap_pre ) { - int (*preHookFunc) (const char *map_name, int *instance_id); + int (*preHookFunc) (const char **map_name, int *instance_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_mapname2imap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_instance_mapname2imap_pre[hIndex].func; - retVal___ = preHookFunc(map_name, &instance_id); + retVal___ = preHookFunc(&map_name, &instance_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30351,10 +30390,10 @@ int HP_instance_mapname2imap(const char *map_name, int instance_id) { retVal___ = HPMHooks.source.instance.mapname2imap(map_name, instance_id); } if( HPMHooks.count.HP_instance_mapname2imap_post ) { - int (*postHookFunc) (int retVal___, const char *map_name, int *instance_id); + int (*postHookFunc) (int retVal___, const char *map_name, int instance_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_mapname2imap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_mapname2imap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, map_name, &instance_id); + retVal___ = postHookFunc(retVal___, map_name, instance_id); } } return retVal___; @@ -30363,12 +30402,12 @@ int HP_instance_map_npcsub(struct block_list *bl, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_instance_map_npcsub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list args); + int (*preHookFunc) (struct block_list **bl, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_map_npcsub_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_instance_map_npcsub_pre[hIndex].func; - retVal___ = preHookFunc(bl, args___copy); + retVal___ = preHookFunc(&bl, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -30396,12 +30435,12 @@ int HP_instance_init_npc(struct block_list *bl, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_instance_init_npc_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list args); + int (*preHookFunc) (struct block_list **bl, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_init_npc_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_instance_init_npc_pre[hIndex].func; - retVal___ = preHookFunc(bl, args___copy); + retVal___ = preHookFunc(&bl, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -30443,10 +30482,10 @@ void HP_instance_destroy(int instance_id) { HPMHooks.source.instance.destroy(instance_id); } if( HPMHooks.count.HP_instance_destroy_post ) { - void (*postHookFunc) (int *instance_id); + void (*postHookFunc) (int instance_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_destroy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_destroy_post[hIndex].func; - postHookFunc(&instance_id); + postHookFunc(instance_id); } } return; @@ -30469,10 +30508,10 @@ void HP_instance_start(int instance_id) { HPMHooks.source.instance.start(instance_id); } if( HPMHooks.count.HP_instance_start_post ) { - void (*postHookFunc) (int *instance_id); + void (*postHookFunc) (int instance_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_start_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_start_post[hIndex].func; - postHookFunc(&instance_id); + postHookFunc(instance_id); } } return; @@ -30495,10 +30534,10 @@ void HP_instance_check_idle(int instance_id) { HPMHooks.source.instance.check_idle(instance_id); } if( HPMHooks.count.HP_instance_check_idle_post ) { - void (*postHookFunc) (int *instance_id); + void (*postHookFunc) (int instance_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_check_idle_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_check_idle_post[hIndex].func; - postHookFunc(&instance_id); + postHookFunc(instance_id); } } return; @@ -30506,11 +30545,11 @@ void HP_instance_check_idle(int instance_id) { void HP_instance_check_kick(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_instance_check_kick_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_check_kick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_instance_check_kick_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30547,10 +30586,10 @@ void HP_instance_set_timeout(int instance_id, unsigned int progress_timeout, uns HPMHooks.source.instance.set_timeout(instance_id, progress_timeout, idle_timeout); } if( HPMHooks.count.HP_instance_set_timeout_post ) { - void (*postHookFunc) (int *instance_id, unsigned int *progress_timeout, unsigned int *idle_timeout); + void (*postHookFunc) (int instance_id, unsigned int progress_timeout, unsigned int idle_timeout); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_set_timeout_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_set_timeout_post[hIndex].func; - postHookFunc(&instance_id, &progress_timeout, &idle_timeout); + postHookFunc(instance_id, progress_timeout, idle_timeout); } } return; @@ -30574,10 +30613,10 @@ bool HP_instance_valid(int instance_id) { retVal___ = HPMHooks.source.instance.valid(instance_id); } if( HPMHooks.count.HP_instance_valid_post ) { - bool (*postHookFunc) (bool retVal___, int *instance_id); + bool (*postHookFunc) (bool retVal___, int instance_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_valid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_valid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &instance_id); + retVal___ = postHookFunc(retVal___, instance_id); } } return retVal___; @@ -30601,15 +30640,15 @@ int HP_instance_destroy_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.instance.destroy_timer(tid, tick, id, data); } if( HPMHooks.count.HP_instance_destroy_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_destroy_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_destroy_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -/* intif */ +/* intif_interface */ int HP_intif_parse(int fd) { int hIndex = 0; int retVal___ = 0; @@ -30629,10 +30668,10 @@ int HP_intif_parse(int fd) { retVal___ = HPMHooks.source.intif.parse(fd); } if( HPMHooks.count.HP_intif_parse_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_parse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_parse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -30641,11 +30680,11 @@ int HP_intif_create_pet(int account_id, int char_id, short pet_type, short pet_l int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_create_pet_pre ) { - int (*preHookFunc) (int *account_id, int *char_id, short *pet_type, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, char *pet_name); + int (*preHookFunc) (int *account_id, int *char_id, short *pet_type, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, char **pet_name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_create_pet_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_create_pet_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, &char_id, &pet_type, &pet_lv, &pet_egg_id, &pet_equip, &intimate, &hungry, &rename_flag, &incubate, pet_name); + retVal___ = preHookFunc(&account_id, &char_id, &pet_type, &pet_lv, &pet_egg_id, &pet_equip, &intimate, &hungry, &rename_flag, &incubate, &pet_name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30656,23 +30695,23 @@ int HP_intif_create_pet(int account_id, int char_id, short pet_type, short pet_l retVal___ = HPMHooks.source.intif.create_pet(account_id, char_id, pet_type, pet_lv, pet_egg_id, pet_equip, intimate, hungry, rename_flag, incubate, pet_name); } if( HPMHooks.count.HP_intif_create_pet_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *char_id, short *pet_type, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, char *pet_name); + int (*postHookFunc) (int retVal___, int account_id, int char_id, short pet_type, short pet_lv, short pet_egg_id, short pet_equip, short intimate, short hungry, char rename_flag, char incubate, char *pet_name); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_create_pet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_create_pet_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &char_id, &pet_type, &pet_lv, &pet_egg_id, &pet_equip, &intimate, &hungry, &rename_flag, &incubate, pet_name); + retVal___ = postHookFunc(retVal___, account_id, char_id, pet_type, pet_lv, pet_egg_id, pet_equip, intimate, hungry, rename_flag, incubate, pet_name); } } return retVal___; } -int HP_intif_broadcast(const char *mes, size_t len, int type) { +int HP_intif_broadcast(const char *mes, int len, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_broadcast_pre ) { - int (*preHookFunc) (const char *mes, size_t *len, int *type); + int (*preHookFunc) (const char **mes, int *len, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_broadcast_pre[hIndex].func; - retVal___ = preHookFunc(mes, &len, &type); + retVal___ = preHookFunc(&mes, &len, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30683,23 +30722,23 @@ int HP_intif_broadcast(const char *mes, size_t len, int type) { retVal___ = HPMHooks.source.intif.broadcast(mes, len, type); } if( HPMHooks.count.HP_intif_broadcast_post ) { - int (*postHookFunc) (int retVal___, const char *mes, size_t *len, int *type); + int (*postHookFunc) (int retVal___, const char *mes, int len, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_broadcast_post[hIndex].func; - retVal___ = postHookFunc(retVal___, mes, &len, &type); + retVal___ = postHookFunc(retVal___, mes, len, type); } } return retVal___; } -int HP_intif_broadcast2(const char *mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY) { +int HP_intif_broadcast2(const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_broadcast2_pre ) { - int (*preHookFunc) (const char *mes, size_t *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY); + int (*preHookFunc) (const char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_broadcast2_pre[hIndex].func; - retVal___ = preHookFunc(mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY); + retVal___ = preHookFunc(&mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30710,10 +30749,10 @@ int HP_intif_broadcast2(const char *mes, size_t len, unsigned int fontColor, sho retVal___ = HPMHooks.source.intif.broadcast2(mes, len, fontColor, fontType, fontSize, fontAlign, fontY); } if( HPMHooks.count.HP_intif_broadcast2_post ) { - int (*postHookFunc) (int retVal___, const char *mes, size_t *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY); + int (*postHookFunc) (int retVal___, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_broadcast2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY); + retVal___ = postHookFunc(retVal___, mes, len, fontColor, fontType, fontSize, fontAlign, fontY); } } return retVal___; @@ -30722,11 +30761,11 @@ int HP_intif_main_message(struct map_session_data *sd, const char *message) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_main_message_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *message); + int (*preHookFunc) (struct map_session_data **sd, const char **message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_main_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_main_message_pre[hIndex].func; - retVal___ = preHookFunc(sd, message); + retVal___ = preHookFunc(&sd, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30745,15 +30784,15 @@ int HP_intif_main_message(struct map_session_data *sd, const char *message) { } return retVal___; } -int HP_intif_wis_message(struct map_session_data *sd, const char *nick, const char *mes, size_t mes_len) { +int HP_intif_wis_message(struct map_session_data *sd, const char *nick, const char *mes, int mes_len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_wis_message_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *nick, const char *mes, size_t *mes_len); + int (*preHookFunc) (struct map_session_data **sd, const char **nick, const char **mes, int *mes_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_wis_message_pre[hIndex].func; - retVal___ = preHookFunc(sd, nick, mes, &mes_len); + retVal___ = preHookFunc(&sd, &nick, &mes, &mes_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30764,10 +30803,10 @@ int HP_intif_wis_message(struct map_session_data *sd, const char *nick, const ch retVal___ = HPMHooks.source.intif.wis_message(sd, nick, mes, mes_len); } if( HPMHooks.count.HP_intif_wis_message_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *nick, const char *mes, size_t *mes_len); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *nick, const char *mes, int mes_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_wis_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, nick, mes, &mes_len); + retVal___ = postHookFunc(retVal___, sd, nick, mes, mes_len); } } return retVal___; @@ -30776,11 +30815,11 @@ int HP_intif_wis_message_to_gm(char *Wisp_name, int permission, char *mes) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_wis_message_to_gm_pre ) { - int (*preHookFunc) (char *Wisp_name, int *permission, char *mes); + int (*preHookFunc) (char **Wisp_name, int *permission, char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_to_gm_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_wis_message_to_gm_pre[hIndex].func; - retVal___ = preHookFunc(Wisp_name, &permission, mes); + retVal___ = preHookFunc(&Wisp_name, &permission, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30791,10 +30830,10 @@ int HP_intif_wis_message_to_gm(char *Wisp_name, int permission, char *mes) { retVal___ = HPMHooks.source.intif.wis_message_to_gm(Wisp_name, permission, mes); } if( HPMHooks.count.HP_intif_wis_message_to_gm_post ) { - int (*postHookFunc) (int retVal___, char *Wisp_name, int *permission, char *mes); + int (*postHookFunc) (int retVal___, char *Wisp_name, int permission, char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_to_gm_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_wis_message_to_gm_post[hIndex].func; - retVal___ = postHookFunc(retVal___, Wisp_name, &permission, mes); + retVal___ = postHookFunc(retVal___, Wisp_name, permission, mes); } } return retVal___; @@ -30803,11 +30842,11 @@ int HP_intif_saveregistry(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_saveregistry_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_saveregistry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_saveregistry_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30830,11 +30869,11 @@ int HP_intif_request_registry(struct map_session_data *sd, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_request_registry_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *flag); + int (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_registry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_request_registry_pre[hIndex].func; - retVal___ = preHookFunc(sd, &flag); + retVal___ = preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30845,10 +30884,10 @@ int HP_intif_request_registry(struct map_session_data *sd, int flag) { retVal___ = HPMHooks.source.intif.request_registry(sd, flag); } if( HPMHooks.count.HP_intif_request_registry_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_registry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_request_registry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &flag); + retVal___ = postHookFunc(retVal___, sd, flag); } } return retVal___; @@ -30872,10 +30911,10 @@ int HP_intif_request_guild_storage(int account_id, int guild_id) { retVal___ = HPMHooks.source.intif.request_guild_storage(account_id, guild_id); } if( HPMHooks.count.HP_intif_request_guild_storage_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *guild_id); + int (*postHookFunc) (int retVal___, int account_id, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_guild_storage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_request_guild_storage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &guild_id); + retVal___ = postHookFunc(retVal___, account_id, guild_id); } } return retVal___; @@ -30884,11 +30923,11 @@ int HP_intif_send_guild_storage(int account_id, struct guild_storage *gstor) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_send_guild_storage_pre ) { - int (*preHookFunc) (int *account_id, struct guild_storage *gstor); + int (*preHookFunc) (int *account_id, struct guild_storage **gstor); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_send_guild_storage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_send_guild_storage_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, gstor); + retVal___ = preHookFunc(&account_id, &gstor); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30899,10 +30938,10 @@ int HP_intif_send_guild_storage(int account_id, struct guild_storage *gstor) { retVal___ = HPMHooks.source.intif.send_guild_storage(account_id, gstor); } if( HPMHooks.count.HP_intif_send_guild_storage_post ) { - int (*postHookFunc) (int retVal___, int *account_id, struct guild_storage *gstor); + int (*postHookFunc) (int retVal___, int account_id, struct guild_storage *gstor); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_send_guild_storage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_send_guild_storage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, gstor); + retVal___ = postHookFunc(retVal___, account_id, gstor); } } return retVal___; @@ -30911,11 +30950,11 @@ int HP_intif_create_party(struct party_member *member, const char *name, int ite int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_create_party_pre ) { - int (*preHookFunc) (struct party_member *member, const char *name, int *item, int *item2); + int (*preHookFunc) (struct party_member **member, const char **name, int *item, int *item2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_create_party_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_create_party_pre[hIndex].func; - retVal___ = preHookFunc(member, name, &item, &item2); + retVal___ = preHookFunc(&member, &name, &item, &item2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30926,10 +30965,10 @@ int HP_intif_create_party(struct party_member *member, const char *name, int ite retVal___ = HPMHooks.source.intif.create_party(member, name, item, item2); } if( HPMHooks.count.HP_intif_create_party_post ) { - int (*postHookFunc) (int retVal___, struct party_member *member, const char *name, int *item, int *item2); + int (*postHookFunc) (int retVal___, struct party_member *member, const char *name, int item, int item2); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_create_party_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_create_party_post[hIndex].func; - retVal___ = postHookFunc(retVal___, member, name, &item, &item2); + retVal___ = postHookFunc(retVal___, member, name, item, item2); } } return retVal___; @@ -30953,10 +30992,10 @@ int HP_intif_request_partyinfo(int party_id, int char_id) { retVal___ = HPMHooks.source.intif.request_partyinfo(party_id, char_id); } if( HPMHooks.count.HP_intif_request_partyinfo_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *char_id); + int (*postHookFunc) (int retVal___, int party_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_partyinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_request_partyinfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &char_id); + retVal___ = postHookFunc(retVal___, party_id, char_id); } } return retVal___; @@ -30965,11 +31004,11 @@ int HP_intif_party_addmember(int party_id, struct party_member *member) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_party_addmember_pre ) { - int (*preHookFunc) (int *party_id, struct party_member *member); + int (*preHookFunc) (int *party_id, struct party_member **member); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_addmember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_party_addmember_pre[hIndex].func; - retVal___ = preHookFunc(&party_id, member); + retVal___ = preHookFunc(&party_id, &member); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30980,10 +31019,10 @@ int HP_intif_party_addmember(int party_id, struct party_member *member) { retVal___ = HPMHooks.source.intif.party_addmember(party_id, member); } if( HPMHooks.count.HP_intif_party_addmember_post ) { - int (*postHookFunc) (int retVal___, int *party_id, struct party_member *member); + int (*postHookFunc) (int retVal___, int party_id, struct party_member *member); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_addmember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_party_addmember_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, member); + retVal___ = postHookFunc(retVal___, party_id, member); } } return retVal___; @@ -31007,10 +31046,10 @@ int HP_intif_party_changeoption(int party_id, int account_id, int exp, int item) retVal___ = HPMHooks.source.intif.party_changeoption(party_id, account_id, exp, item); } if( HPMHooks.count.HP_intif_party_changeoption_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, int *exp, int *item); + int (*postHookFunc) (int retVal___, int party_id, int account_id, int exp, int item); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_changeoption_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_party_changeoption_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &exp, &item); + retVal___ = postHookFunc(retVal___, party_id, account_id, exp, item); } } return retVal___; @@ -31034,10 +31073,10 @@ int HP_intif_party_leave(int party_id, int account_id, int char_id) { retVal___ = HPMHooks.source.intif.party_leave(party_id, account_id, char_id); } if( HPMHooks.count.HP_intif_party_leave_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int party_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_leave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_party_leave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, party_id, account_id, char_id); } } return retVal___; @@ -31046,11 +31085,11 @@ int HP_intif_party_changemap(struct map_session_data *sd, int online) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_party_changemap_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *online); + int (*preHookFunc) (struct map_session_data **sd, int *online); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_changemap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_party_changemap_pre[hIndex].func; - retVal___ = preHookFunc(sd, &online); + retVal___ = preHookFunc(&sd, &online); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31061,10 +31100,10 @@ int HP_intif_party_changemap(struct map_session_data *sd, int online) { retVal___ = HPMHooks.source.intif.party_changemap(sd, online); } if( HPMHooks.count.HP_intif_party_changemap_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *online); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int online); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_changemap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_party_changemap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &online); + retVal___ = postHookFunc(retVal___, sd, online); } } return retVal___; @@ -31088,10 +31127,10 @@ int HP_intif_break_party(int party_id) { retVal___ = HPMHooks.source.intif.break_party(party_id); } if( HPMHooks.count.HP_intif_break_party_post ) { - int (*postHookFunc) (int retVal___, int *party_id); + int (*postHookFunc) (int retVal___, int party_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_break_party_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_break_party_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id); + retVal___ = postHookFunc(retVal___, party_id); } } return retVal___; @@ -31100,11 +31139,11 @@ int HP_intif_party_message(int party_id, int account_id, const char *mes, int le int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_party_message_pre ) { - int (*preHookFunc) (int *party_id, int *account_id, const char *mes, int *len); + int (*preHookFunc) (int *party_id, int *account_id, const char **mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_party_message_pre[hIndex].func; - retVal___ = preHookFunc(&party_id, &account_id, mes, &len); + retVal___ = preHookFunc(&party_id, &account_id, &mes, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31115,10 +31154,10 @@ int HP_intif_party_message(int party_id, int account_id, const char *mes, int le retVal___ = HPMHooks.source.intif.party_message(party_id, account_id, mes, len); } if( HPMHooks.count.HP_intif_party_message_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, const char *mes, int *len); + int (*postHookFunc) (int retVal___, int party_id, int account_id, const char *mes, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_party_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, mes, &len); + retVal___ = postHookFunc(retVal___, party_id, account_id, mes, len); } } return retVal___; @@ -31142,10 +31181,10 @@ int HP_intif_party_leaderchange(int party_id, int account_id, int char_id) { retVal___ = HPMHooks.source.intif.party_leaderchange(party_id, account_id, char_id); } if( HPMHooks.count.HP_intif_party_leaderchange_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int party_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_leaderchange_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_party_leaderchange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, party_id, account_id, char_id); } } return retVal___; @@ -31154,11 +31193,11 @@ int HP_intif_guild_create(const char *name, const struct guild_member *master) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_create_pre ) { - int (*preHookFunc) (const char *name, const struct guild_member *master); + int (*preHookFunc) (const char **name, const struct guild_member **master); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_create_pre[hIndex].func; - retVal___ = preHookFunc(name, master); + retVal___ = preHookFunc(&name, &master); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31196,10 +31235,10 @@ int HP_intif_guild_request_info(int guild_id) { retVal___ = HPMHooks.source.intif.guild_request_info(guild_id); } if( HPMHooks.count.HP_intif_guild_request_info_post ) { - int (*postHookFunc) (int retVal___, int *guild_id); + int (*postHookFunc) (int retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_request_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_request_info_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; @@ -31208,11 +31247,11 @@ int HP_intif_guild_addmember(int guild_id, struct guild_member *m) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_addmember_pre ) { - int (*preHookFunc) (int *guild_id, struct guild_member *m); + int (*preHookFunc) (int *guild_id, struct guild_member **m); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_addmember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_addmember_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, m); + retVal___ = preHookFunc(&guild_id, &m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31223,10 +31262,10 @@ int HP_intif_guild_addmember(int guild_id, struct guild_member *m) { retVal___ = HPMHooks.source.intif.guild_addmember(guild_id, m); } if( HPMHooks.count.HP_intif_guild_addmember_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, struct guild_member *m); + int (*postHookFunc) (int retVal___, int guild_id, struct guild_member *m); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_addmember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_addmember_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, m); + retVal___ = postHookFunc(retVal___, guild_id, m); } } return retVal___; @@ -31235,11 +31274,11 @@ int HP_intif_guild_leave(int guild_id, int account_id, int char_id, int flag, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_leave_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *flag, const char *mes); + int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *flag, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_leave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_leave_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &flag, mes); + retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &flag, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31250,10 +31289,10 @@ int HP_intif_guild_leave(int guild_id, int account_id, int char_id, int flag, co retVal___ = HPMHooks.source.intif.guild_leave(guild_id, account_id, char_id, flag, mes); } if( HPMHooks.count.HP_intif_guild_leave_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, int *flag, const char *mes); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, int flag, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_leave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_leave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &flag, mes); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, flag, mes); } } return retVal___; @@ -31277,10 +31316,10 @@ int HP_intif_guild_memberinfoshort(int guild_id, int account_id, int char_id, in retVal___ = HPMHooks.source.intif.guild_memberinfoshort(guild_id, account_id, char_id, online, lv, class_); } if( HPMHooks.count.HP_intif_guild_memberinfoshort_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, int *online, int *lv, int *class_); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, int online, int lv, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_memberinfoshort_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_memberinfoshort_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &online, &lv, &class_); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, online, lv, class_); } } return retVal___; @@ -31304,10 +31343,10 @@ int HP_intif_guild_break(int guild_id) { retVal___ = HPMHooks.source.intif.guild_break(guild_id); } if( HPMHooks.count.HP_intif_guild_break_post ) { - int (*postHookFunc) (int retVal___, int *guild_id); + int (*postHookFunc) (int retVal___, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_break_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_break_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id); + retVal___ = postHookFunc(retVal___, guild_id); } } return retVal___; @@ -31316,11 +31355,11 @@ int HP_intif_guild_message(int guild_id, int account_id, const char *mes, int le int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_message_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, const char *mes, int *len); + int (*preHookFunc) (int *guild_id, int *account_id, const char **mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_message_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &account_id, mes, &len); + retVal___ = preHookFunc(&guild_id, &account_id, &mes, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31331,23 +31370,23 @@ int HP_intif_guild_message(int guild_id, int account_id, const char *mes, int le retVal___ = HPMHooks.source.intif.guild_message(guild_id, account_id, mes, len); } if( HPMHooks.count.HP_intif_guild_message_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, const char *mes, int *len); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, const char *mes, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, mes, &len); + retVal___ = postHookFunc(retVal___, guild_id, account_id, mes, len); } } return retVal___; } -int HP_intif_guild_change_gm(int guild_id, const char *name, size_t len) { +int HP_intif_guild_change_gm(int guild_id, const char *name, int len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_change_gm_pre ) { - int (*preHookFunc) (int *guild_id, const char *name, size_t *len); + int (*preHookFunc) (int *guild_id, const char **name, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_change_gm_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_change_gm_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, name, &len); + retVal___ = preHookFunc(&guild_id, &name, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31358,10 +31397,10 @@ int HP_intif_guild_change_gm(int guild_id, const char *name, size_t len) { retVal___ = HPMHooks.source.intif.guild_change_gm(guild_id, name, len); } if( HPMHooks.count.HP_intif_guild_change_gm_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, const char *name, size_t *len); + int (*postHookFunc) (int retVal___, int guild_id, const char *name, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_change_gm_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_change_gm_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, name, &len); + retVal___ = postHookFunc(retVal___, guild_id, name, len); } } return retVal___; @@ -31370,11 +31409,11 @@ int HP_intif_guild_change_basicinfo(int guild_id, int type, const void *data, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_change_basicinfo_pre ) { - int (*preHookFunc) (int *guild_id, int *type, const void *data, int *len); + int (*preHookFunc) (int *guild_id, int *type, const void **data, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_change_basicinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_change_basicinfo_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &type, data, &len); + retVal___ = preHookFunc(&guild_id, &type, &data, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31385,10 +31424,10 @@ int HP_intif_guild_change_basicinfo(int guild_id, int type, const void *data, in retVal___ = HPMHooks.source.intif.guild_change_basicinfo(guild_id, type, data, len); } if( HPMHooks.count.HP_intif_guild_change_basicinfo_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *type, const void *data, int *len); + int (*postHookFunc) (int retVal___, int guild_id, int type, const void *data, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_change_basicinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_change_basicinfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &type, data, &len); + retVal___ = postHookFunc(retVal___, guild_id, type, data, len); } } return retVal___; @@ -31397,11 +31436,11 @@ int HP_intif_guild_change_memberinfo(int guild_id, int account_id, int char_id, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_change_memberinfo_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *type, const void *data, int *len); + int (*preHookFunc) (int *guild_id, int *account_id, int *char_id, int *type, const void **data, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_change_memberinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_change_memberinfo_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &type, data, &len); + retVal___ = preHookFunc(&guild_id, &account_id, &char_id, &type, &data, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31412,10 +31451,10 @@ int HP_intif_guild_change_memberinfo(int guild_id, int account_id, int char_id, retVal___ = HPMHooks.source.intif.guild_change_memberinfo(guild_id, account_id, char_id, type, data, len); } if( HPMHooks.count.HP_intif_guild_change_memberinfo_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, int *char_id, int *type, const void *data, int *len); + int (*postHookFunc) (int retVal___, int guild_id, int account_id, int char_id, int type, const void *data, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_change_memberinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_change_memberinfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &account_id, &char_id, &type, data, &len); + retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id, type, data, len); } } return retVal___; @@ -31424,11 +31463,11 @@ int HP_intif_guild_position(int guild_id, int idx, struct guild_position *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_position_pre ) { - int (*preHookFunc) (int *guild_id, int *idx, struct guild_position *p); + int (*preHookFunc) (int *guild_id, int *idx, struct guild_position **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_position_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_position_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &idx, p); + retVal___ = preHookFunc(&guild_id, &idx, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31439,10 +31478,10 @@ int HP_intif_guild_position(int guild_id, int idx, struct guild_position *p) { retVal___ = HPMHooks.source.intif.guild_position(guild_id, idx, p); } if( HPMHooks.count.HP_intif_guild_position_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *idx, struct guild_position *p); + int (*postHookFunc) (int retVal___, int guild_id, int idx, struct guild_position *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_position_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_position_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &idx, p); + retVal___ = postHookFunc(retVal___, guild_id, idx, p); } } return retVal___; @@ -31466,10 +31505,10 @@ int HP_intif_guild_skillup(int guild_id, uint16 skill_id, int account_id, int ma retVal___ = HPMHooks.source.intif.guild_skillup(guild_id, skill_id, account_id, max); } if( HPMHooks.count.HP_intif_guild_skillup_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, uint16 *skill_id, int *account_id, int *max); + int (*postHookFunc) (int retVal___, int guild_id, uint16 skill_id, int account_id, int max); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_skillup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_skillup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &skill_id, &account_id, &max); + retVal___ = postHookFunc(retVal___, guild_id, skill_id, account_id, max); } } return retVal___; @@ -31493,10 +31532,10 @@ int HP_intif_guild_alliance(int guild_id1, int guild_id2, int account_id1, int a retVal___ = HPMHooks.source.intif.guild_alliance(guild_id1, guild_id2, account_id1, account_id2, flag); } if( HPMHooks.count.HP_intif_guild_alliance_post ) { - int (*postHookFunc) (int retVal___, int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag); + int (*postHookFunc) (int retVal___, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_alliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_alliance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id1, &guild_id2, &account_id1, &account_id2, &flag); + retVal___ = postHookFunc(retVal___, guild_id1, guild_id2, account_id1, account_id2, flag); } } return retVal___; @@ -31505,11 +31544,11 @@ int HP_intif_guild_notice(int guild_id, const char *mes1, const char *mes2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_notice_pre ) { - int (*preHookFunc) (int *guild_id, const char *mes1, const char *mes2); + int (*preHookFunc) (int *guild_id, const char **mes1, const char **mes2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_notice_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_notice_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, mes1, mes2); + retVal___ = preHookFunc(&guild_id, &mes1, &mes2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31520,10 +31559,10 @@ int HP_intif_guild_notice(int guild_id, const char *mes1, const char *mes2) { retVal___ = HPMHooks.source.intif.guild_notice(guild_id, mes1, mes2); } if( HPMHooks.count.HP_intif_guild_notice_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, const char *mes1, const char *mes2); + int (*postHookFunc) (int retVal___, int guild_id, const char *mes1, const char *mes2); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_notice_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_notice_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, mes1, mes2); + retVal___ = postHookFunc(retVal___, guild_id, mes1, mes2); } } return retVal___; @@ -31532,11 +31571,11 @@ int HP_intif_guild_emblem(int guild_id, int len, const char *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_emblem_pre ) { - int (*preHookFunc) (int *guild_id, int *len, const char *data); + int (*preHookFunc) (int *guild_id, int *len, const char **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_emblem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_emblem_pre[hIndex].func; - retVal___ = preHookFunc(&guild_id, &len, data); + retVal___ = preHookFunc(&guild_id, &len, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31547,10 +31586,10 @@ int HP_intif_guild_emblem(int guild_id, int len, const char *data) { retVal___ = HPMHooks.source.intif.guild_emblem(guild_id, len, data); } if( HPMHooks.count.HP_intif_guild_emblem_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *len, const char *data); + int (*postHookFunc) (int retVal___, int guild_id, int len, const char *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_emblem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_emblem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &guild_id, &len, data); + retVal___ = postHookFunc(retVal___, guild_id, len, data); } } return retVal___; @@ -31559,11 +31598,11 @@ int HP_intif_guild_castle_dataload(int num, int *castle_ids) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_castle_dataload_pre ) { - int (*preHookFunc) (int *num, int *castle_ids); + int (*preHookFunc) (int *num, int **castle_ids); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_castle_dataload_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_castle_dataload_pre[hIndex].func; - retVal___ = preHookFunc(&num, castle_ids); + retVal___ = preHookFunc(&num, &castle_ids); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31574,10 +31613,10 @@ int HP_intif_guild_castle_dataload(int num, int *castle_ids) { retVal___ = HPMHooks.source.intif.guild_castle_dataload(num, castle_ids); } if( HPMHooks.count.HP_intif_guild_castle_dataload_post ) { - int (*postHookFunc) (int retVal___, int *num, int *castle_ids); + int (*postHookFunc) (int retVal___, int num, int *castle_ids); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_castle_dataload_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_castle_dataload_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &num, castle_ids); + retVal___ = postHookFunc(retVal___, num, castle_ids); } } return retVal___; @@ -31601,10 +31640,10 @@ int HP_intif_guild_castle_datasave(int castle_id, int index, int value) { retVal___ = HPMHooks.source.intif.guild_castle_datasave(castle_id, index, value); } if( HPMHooks.count.HP_intif_guild_castle_datasave_post ) { - int (*postHookFunc) (int retVal___, int *castle_id, int *index, int *value); + int (*postHookFunc) (int retVal___, int castle_id, int index, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_castle_datasave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_castle_datasave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &castle_id, &index, &value); + retVal___ = postHookFunc(retVal___, castle_id, index, value); } } return retVal___; @@ -31627,10 +31666,10 @@ void HP_intif_itembound_req(int char_id, int aid, int guild_id) { HPMHooks.source.intif.itembound_req(char_id, aid, guild_id); } if( HPMHooks.count.HP_intif_itembound_req_post ) { - void (*postHookFunc) (int *char_id, int *aid, int *guild_id); + void (*postHookFunc) (int char_id, int aid, int guild_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_itembound_req_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_itembound_req_post[hIndex].func; - postHookFunc(&char_id, &aid, &guild_id); + postHookFunc(char_id, aid, guild_id); } } return; @@ -31654,10 +31693,10 @@ int HP_intif_request_petdata(int account_id, int char_id, int pet_id) { retVal___ = HPMHooks.source.intif.request_petdata(account_id, char_id, pet_id); } if( HPMHooks.count.HP_intif_request_petdata_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *char_id, int *pet_id); + int (*postHookFunc) (int retVal___, int account_id, int char_id, int pet_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_petdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_request_petdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &char_id, &pet_id); + retVal___ = postHookFunc(retVal___, account_id, char_id, pet_id); } } return retVal___; @@ -31666,11 +31705,11 @@ int HP_intif_save_petdata(int account_id, struct s_pet *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_save_petdata_pre ) { - int (*preHookFunc) (int *account_id, struct s_pet *p); + int (*preHookFunc) (int *account_id, struct s_pet **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_save_petdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_save_petdata_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, p); + retVal___ = preHookFunc(&account_id, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31681,10 +31720,10 @@ int HP_intif_save_petdata(int account_id, struct s_pet *p) { retVal___ = HPMHooks.source.intif.save_petdata(account_id, p); } if( HPMHooks.count.HP_intif_save_petdata_post ) { - int (*postHookFunc) (int retVal___, int *account_id, struct s_pet *p); + int (*postHookFunc) (int retVal___, int account_id, struct s_pet *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_save_petdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_save_petdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, p); + retVal___ = postHookFunc(retVal___, account_id, p); } } return retVal___; @@ -31708,10 +31747,10 @@ int HP_intif_delete_petdata(int pet_id) { retVal___ = HPMHooks.source.intif.delete_petdata(pet_id); } if( HPMHooks.count.HP_intif_delete_petdata_post ) { - int (*postHookFunc) (int retVal___, int *pet_id); + int (*postHookFunc) (int retVal___, int pet_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_delete_petdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_delete_petdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &pet_id); + retVal___ = postHookFunc(retVal___, pet_id); } } return retVal___; @@ -31720,11 +31759,11 @@ int HP_intif_rename(struct map_session_data *sd, int type, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_rename_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, const char *name); + int (*preHookFunc) (struct map_session_data **sd, int *type, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_rename_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_rename_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, name); + retVal___ = preHookFunc(&sd, &type, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31735,10 +31774,10 @@ int HP_intif_rename(struct map_session_data *sd, int type, const char *name) { retVal___ = HPMHooks.source.intif.rename(sd, type, name); } if( HPMHooks.count.HP_intif_rename_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, const char *name); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_rename_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_rename_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, name); + retVal___ = postHookFunc(retVal___, sd, type, name); } } return retVal___; @@ -31747,11 +31786,11 @@ int HP_intif_homunculus_create(int account_id, struct s_homunculus *sh) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_homunculus_create_pre ) { - int (*preHookFunc) (int *account_id, struct s_homunculus *sh); + int (*preHookFunc) (int *account_id, struct s_homunculus **sh); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_homunculus_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_homunculus_create_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, sh); + retVal___ = preHookFunc(&account_id, &sh); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31762,10 +31801,10 @@ int HP_intif_homunculus_create(int account_id, struct s_homunculus *sh) { retVal___ = HPMHooks.source.intif.homunculus_create(account_id, sh); } if( HPMHooks.count.HP_intif_homunculus_create_post ) { - int (*postHookFunc) (int retVal___, int *account_id, struct s_homunculus *sh); + int (*postHookFunc) (int retVal___, int account_id, struct s_homunculus *sh); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_homunculus_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_homunculus_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, sh); + retVal___ = postHookFunc(retVal___, account_id, sh); } } return retVal___; @@ -31789,10 +31828,10 @@ bool HP_intif_homunculus_requestload(int account_id, int homun_id) { retVal___ = HPMHooks.source.intif.homunculus_requestload(account_id, homun_id); } if( HPMHooks.count.HP_intif_homunculus_requestload_post ) { - bool (*postHookFunc) (bool retVal___, int *account_id, int *homun_id); + bool (*postHookFunc) (bool retVal___, int account_id, int homun_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_homunculus_requestload_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_homunculus_requestload_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &homun_id); + retVal___ = postHookFunc(retVal___, account_id, homun_id); } } return retVal___; @@ -31801,11 +31840,11 @@ int HP_intif_homunculus_requestsave(int account_id, struct s_homunculus *sh) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_homunculus_requestsave_pre ) { - int (*preHookFunc) (int *account_id, struct s_homunculus *sh); + int (*preHookFunc) (int *account_id, struct s_homunculus **sh); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_homunculus_requestsave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_homunculus_requestsave_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, sh); + retVal___ = preHookFunc(&account_id, &sh); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31816,10 +31855,10 @@ int HP_intif_homunculus_requestsave(int account_id, struct s_homunculus *sh) { retVal___ = HPMHooks.source.intif.homunculus_requestsave(account_id, sh); } if( HPMHooks.count.HP_intif_homunculus_requestsave_post ) { - int (*postHookFunc) (int retVal___, int *account_id, struct s_homunculus *sh); + int (*postHookFunc) (int retVal___, int account_id, struct s_homunculus *sh); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_homunculus_requestsave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_homunculus_requestsave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, sh); + retVal___ = postHookFunc(retVal___, account_id, sh); } } return retVal___; @@ -31843,10 +31882,10 @@ int HP_intif_homunculus_requestdelete(int homun_id) { retVal___ = HPMHooks.source.intif.homunculus_requestdelete(homun_id); } if( HPMHooks.count.HP_intif_homunculus_requestdelete_post ) { - int (*postHookFunc) (int retVal___, int *homun_id); + int (*postHookFunc) (int retVal___, int homun_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_homunculus_requestdelete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_homunculus_requestdelete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &homun_id); + retVal___ = postHookFunc(retVal___, homun_id); } } return retVal___; @@ -31854,11 +31893,11 @@ int HP_intif_homunculus_requestdelete(int homun_id) { void HP_intif_request_questlog(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_intif_request_questlog_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_questlog_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_request_questlog_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31881,11 +31920,11 @@ int HP_intif_quest_save(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_quest_save_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_quest_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_quest_save_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31908,11 +31947,11 @@ int HP_intif_mercenary_create(struct s_mercenary *merc) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_mercenary_create_pre ) { - int (*preHookFunc) (struct s_mercenary *merc); + int (*preHookFunc) (struct s_mercenary **merc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_mercenary_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_mercenary_create_pre[hIndex].func; - retVal___ = preHookFunc(merc); + retVal___ = preHookFunc(&merc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31950,10 +31989,10 @@ int HP_intif_mercenary_request(int merc_id, int char_id) { retVal___ = HPMHooks.source.intif.mercenary_request(merc_id, char_id); } if( HPMHooks.count.HP_intif_mercenary_request_post ) { - int (*postHookFunc) (int retVal___, int *merc_id, int *char_id); + int (*postHookFunc) (int retVal___, int merc_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_mercenary_request_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_mercenary_request_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &merc_id, &char_id); + retVal___ = postHookFunc(retVal___, merc_id, char_id); } } return retVal___; @@ -31977,10 +32016,10 @@ int HP_intif_mercenary_delete(int merc_id) { retVal___ = HPMHooks.source.intif.mercenary_delete(merc_id); } if( HPMHooks.count.HP_intif_mercenary_delete_post ) { - int (*postHookFunc) (int retVal___, int *merc_id); + int (*postHookFunc) (int retVal___, int merc_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_mercenary_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_mercenary_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &merc_id); + retVal___ = postHookFunc(retVal___, merc_id); } } return retVal___; @@ -31989,11 +32028,11 @@ int HP_intif_mercenary_save(struct s_mercenary *merc) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_mercenary_save_pre ) { - int (*preHookFunc) (struct s_mercenary *merc); + int (*preHookFunc) (struct s_mercenary **merc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_mercenary_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_mercenary_save_pre[hIndex].func; - retVal___ = preHookFunc(merc); + retVal___ = preHookFunc(&merc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -32031,10 +32070,10 @@ int HP_intif_Mail_requestinbox(int char_id, unsigned char flag) { retVal___ = HPMHooks.source.intif.Mail_requestinbox(char_id, flag); } if( HPMHooks.count.HP_intif_Mail_requestinbox_post ) { - int (*postHookFunc) (int retVal___, int *char_id, unsigned char *flag); + int (*postHookFunc) (int retVal___, int char_id, unsigned char flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Mail_requestinbox_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Mail_requestinbox_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &flag); + retVal___ = postHookFunc(retVal___, char_id, flag); } } return retVal___; @@ -32058,10 +32097,10 @@ int HP_intif_Mail_read(int mail_id) { retVal___ = HPMHooks.source.intif.Mail_read(mail_id); } if( HPMHooks.count.HP_intif_Mail_read_post ) { - int (*postHookFunc) (int retVal___, int *mail_id); + int (*postHookFunc) (int retVal___, int mail_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Mail_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Mail_read_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &mail_id); + retVal___ = postHookFunc(retVal___, mail_id); } } return retVal___; @@ -32085,10 +32124,10 @@ int HP_intif_Mail_getattach(int char_id, int mail_id) { retVal___ = HPMHooks.source.intif.Mail_getattach(char_id, mail_id); } if( HPMHooks.count.HP_intif_Mail_getattach_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *mail_id); + int (*postHookFunc) (int retVal___, int char_id, int mail_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Mail_getattach_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Mail_getattach_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &mail_id); + retVal___ = postHookFunc(retVal___, char_id, mail_id); } } return retVal___; @@ -32112,10 +32151,10 @@ int HP_intif_Mail_delete(int char_id, int mail_id) { retVal___ = HPMHooks.source.intif.Mail_delete(char_id, mail_id); } if( HPMHooks.count.HP_intif_Mail_delete_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *mail_id); + int (*postHookFunc) (int retVal___, int char_id, int mail_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Mail_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Mail_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &mail_id); + retVal___ = postHookFunc(retVal___, char_id, mail_id); } } return retVal___; @@ -32139,10 +32178,10 @@ int HP_intif_Mail_return(int char_id, int mail_id) { retVal___ = HPMHooks.source.intif.Mail_return(char_id, mail_id); } if( HPMHooks.count.HP_intif_Mail_return_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *mail_id); + int (*postHookFunc) (int retVal___, int char_id, int mail_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Mail_return_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Mail_return_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &mail_id); + retVal___ = postHookFunc(retVal___, char_id, mail_id); } } return retVal___; @@ -32151,11 +32190,11 @@ int HP_intif_Mail_send(int account_id, struct mail_message *msg) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_Mail_send_pre ) { - int (*preHookFunc) (int *account_id, struct mail_message *msg); + int (*preHookFunc) (int *account_id, struct mail_message **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Mail_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_Mail_send_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, msg); + retVal___ = preHookFunc(&account_id, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -32166,10 +32205,10 @@ int HP_intif_Mail_send(int account_id, struct mail_message *msg) { retVal___ = HPMHooks.source.intif.Mail_send(account_id, msg); } if( HPMHooks.count.HP_intif_Mail_send_post ) { - int (*postHookFunc) (int retVal___, int *account_id, struct mail_message *msg); + int (*postHookFunc) (int retVal___, int account_id, struct mail_message *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Mail_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Mail_send_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, msg); + retVal___ = postHookFunc(retVal___, account_id, msg); } } return retVal___; @@ -32178,11 +32217,11 @@ int HP_intif_Auction_requestlist(int char_id, short type, int price, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_Auction_requestlist_pre ) { - int (*preHookFunc) (int *char_id, short *type, int *price, const char *searchtext, short *page); + int (*preHookFunc) (int *char_id, short *type, int *price, const char **searchtext, short *page); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Auction_requestlist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_Auction_requestlist_pre[hIndex].func; - retVal___ = preHookFunc(&char_id, &type, &price, searchtext, &page); + retVal___ = preHookFunc(&char_id, &type, &price, &searchtext, &page); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -32193,10 +32232,10 @@ int HP_intif_Auction_requestlist(int char_id, short type, int price, const char retVal___ = HPMHooks.source.intif.Auction_requestlist(char_id, type, price, searchtext, page); } if( HPMHooks.count.HP_intif_Auction_requestlist_post ) { - int (*postHookFunc) (int retVal___, int *char_id, short *type, int *price, const char *searchtext, short *page); + int (*postHookFunc) (int retVal___, int char_id, short type, int price, const char *searchtext, short page); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Auction_requestlist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Auction_requestlist_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &type, &price, searchtext, &page); + retVal___ = postHookFunc(retVal___, char_id, type, price, searchtext, page); } } return retVal___; @@ -32205,11 +32244,11 @@ int HP_intif_Auction_register(struct auction_data *auction) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_Auction_register_pre ) { - int (*preHookFunc) (struct auction_data *auction); + int (*preHookFunc) (struct auction_data **auction); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Auction_register_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_Auction_register_pre[hIndex].func; - retVal___ = preHookFunc(auction); + retVal___ = preHookFunc(&auction); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -32247,10 +32286,10 @@ int HP_intif_Auction_cancel(int char_id, unsigned int auction_id) { retVal___ = HPMHooks.source.intif.Auction_cancel(char_id, auction_id); } if( HPMHooks.count.HP_intif_Auction_cancel_post ) { - int (*postHookFunc) (int retVal___, int *char_id, unsigned int *auction_id); + int (*postHookFunc) (int retVal___, int char_id, unsigned int auction_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Auction_cancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Auction_cancel_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &auction_id); + retVal___ = postHookFunc(retVal___, char_id, auction_id); } } return retVal___; @@ -32274,10 +32313,10 @@ int HP_intif_Auction_close(int char_id, unsigned int auction_id) { retVal___ = HPMHooks.source.intif.Auction_close(char_id, auction_id); } if( HPMHooks.count.HP_intif_Auction_close_post ) { - int (*postHookFunc) (int retVal___, int *char_id, unsigned int *auction_id); + int (*postHookFunc) (int retVal___, int char_id, unsigned int auction_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Auction_close_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Auction_close_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &auction_id); + retVal___ = postHookFunc(retVal___, char_id, auction_id); } } return retVal___; @@ -32286,11 +32325,11 @@ int HP_intif_Auction_bid(int char_id, const char *name, unsigned int auction_id, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_Auction_bid_pre ) { - int (*preHookFunc) (int *char_id, const char *name, unsigned int *auction_id, int *bid); + int (*preHookFunc) (int *char_id, const char **name, unsigned int *auction_id, int *bid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Auction_bid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_Auction_bid_pre[hIndex].func; - retVal___ = preHookFunc(&char_id, name, &auction_id, &bid); + retVal___ = preHookFunc(&char_id, &name, &auction_id, &bid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -32301,10 +32340,10 @@ int HP_intif_Auction_bid(int char_id, const char *name, unsigned int auction_id, retVal___ = HPMHooks.source.intif.Auction_bid(char_id, name, auction_id, bid); } if( HPMHooks.count.HP_intif_Auction_bid_post ) { - int (*postHookFunc) (int retVal___, int *char_id, const char *name, unsigned int *auction_id, int *bid); + int (*postHookFunc) (int retVal___, int char_id, const char *name, unsigned int auction_id, int bid); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_Auction_bid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_Auction_bid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, name, &auction_id, &bid); + retVal___ = postHookFunc(retVal___, char_id, name, auction_id, bid); } } return retVal___; @@ -32313,11 +32352,11 @@ int HP_intif_elemental_create(struct s_elemental *ele) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_elemental_create_pre ) { - int (*preHookFunc) (struct s_elemental *ele); + int (*preHookFunc) (struct s_elemental **ele); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_elemental_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_elemental_create_pre[hIndex].func; - retVal___ = preHookFunc(ele); + retVal___ = preHookFunc(&ele); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -32355,10 +32394,10 @@ int HP_intif_elemental_request(int ele_id, int char_id) { retVal___ = HPMHooks.source.intif.elemental_request(ele_id, char_id); } if( HPMHooks.count.HP_intif_elemental_request_post ) { - int (*postHookFunc) (int retVal___, int *ele_id, int *char_id); + int (*postHookFunc) (int retVal___, int ele_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_elemental_request_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_elemental_request_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ele_id, &char_id); + retVal___ = postHookFunc(retVal___, ele_id, char_id); } } return retVal___; @@ -32382,10 +32421,10 @@ int HP_intif_elemental_delete(int ele_id) { retVal___ = HPMHooks.source.intif.elemental_delete(ele_id); } if( HPMHooks.count.HP_intif_elemental_delete_post ) { - int (*postHookFunc) (int retVal___, int *ele_id); + int (*postHookFunc) (int retVal___, int ele_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_elemental_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_elemental_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ele_id); + retVal___ = postHookFunc(retVal___, ele_id); } } return retVal___; @@ -32394,11 +32433,11 @@ int HP_intif_elemental_save(struct s_elemental *ele) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_elemental_save_pre ) { - int (*preHookFunc) (struct s_elemental *ele); + int (*preHookFunc) (struct s_elemental **ele); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_elemental_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_elemental_save_pre[hIndex].func; - retVal___ = preHookFunc(ele); + retVal___ = preHookFunc(&ele); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -32420,11 +32459,11 @@ int HP_intif_elemental_save(struct s_elemental *ele) { void HP_intif_request_accinfo(int u_fd, int aid, int group_lv, char *query) { int hIndex = 0; if( HPMHooks.count.HP_intif_request_accinfo_pre ) { - void (*preHookFunc) (int *u_fd, int *aid, int *group_lv, char *query); + void (*preHookFunc) (int *u_fd, int *aid, int *group_lv, char **query); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_accinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_request_accinfo_pre[hIndex].func; - preHookFunc(&u_fd, &aid, &group_lv, query); + preHookFunc(&u_fd, &aid, &group_lv, &query); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -32435,10 +32474,10 @@ void HP_intif_request_accinfo(int u_fd, int aid, int group_lv, char *query) { HPMHooks.source.intif.request_accinfo(u_fd, aid, group_lv, query); } if( HPMHooks.count.HP_intif_request_accinfo_post ) { - void (*postHookFunc) (int *u_fd, int *aid, int *group_lv, char *query); + void (*postHookFunc) (int u_fd, int aid, int group_lv, char *query); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_accinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_request_accinfo_post[hIndex].func; - postHookFunc(&u_fd, &aid, &group_lv, query); + postHookFunc(u_fd, aid, group_lv, query); } } return; @@ -32488,10 +32527,10 @@ void HP_intif_pWisMessage(int fd) { HPMHooks.source.intif.pWisMessage(fd); } if( HPMHooks.count.HP_intif_pWisMessage_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pWisMessage_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32514,10 +32553,10 @@ void HP_intif_pWisEnd(int fd) { HPMHooks.source.intif.pWisEnd(fd); } if( HPMHooks.count.HP_intif_pWisEnd_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisEnd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pWisEnd_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32526,12 +32565,12 @@ int HP_intif_pWisToGM_sub(struct map_session_data *sd, va_list va) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_pWisToGM_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, va_list va); + int (*preHookFunc) (struct map_session_data **sd, va_list va); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisToGM_sub_pre; hIndex++ ) { va_list va___copy; va_copy(va___copy, va); preHookFunc = HPMHooks.list.HP_intif_pWisToGM_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, va___copy); + retVal___ = preHookFunc(&sd, va___copy); va_end(va___copy); } if( *HPMforce_return ) { @@ -32573,10 +32612,10 @@ void HP_intif_pWisToGM(int fd) { HPMHooks.source.intif.pWisToGM(fd); } if( HPMHooks.count.HP_intif_pWisToGM_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisToGM_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pWisToGM_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32599,10 +32638,10 @@ void HP_intif_pRegisters(int fd) { HPMHooks.source.intif.pRegisters(fd); } if( HPMHooks.count.HP_intif_pRegisters_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pRegisters_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pRegisters_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32625,10 +32664,10 @@ void HP_intif_pChangeNameOk(int fd) { HPMHooks.source.intif.pChangeNameOk(fd); } if( HPMHooks.count.HP_intif_pChangeNameOk_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pChangeNameOk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pChangeNameOk_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32651,10 +32690,10 @@ void HP_intif_pMessageToFD(int fd) { HPMHooks.source.intif.pMessageToFD(fd); } if( HPMHooks.count.HP_intif_pMessageToFD_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMessageToFD_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMessageToFD_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32677,10 +32716,10 @@ void HP_intif_pLoadGuildStorage(int fd) { HPMHooks.source.intif.pLoadGuildStorage(fd); } if( HPMHooks.count.HP_intif_pLoadGuildStorage_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pLoadGuildStorage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pLoadGuildStorage_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32703,10 +32742,10 @@ void HP_intif_pSaveGuildStorage(int fd) { HPMHooks.source.intif.pSaveGuildStorage(fd); } if( HPMHooks.count.HP_intif_pSaveGuildStorage_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pSaveGuildStorage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pSaveGuildStorage_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32729,10 +32768,10 @@ void HP_intif_pPartyCreated(int fd) { HPMHooks.source.intif.pPartyCreated(fd); } if( HPMHooks.count.HP_intif_pPartyCreated_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyCreated_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pPartyCreated_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32755,10 +32794,10 @@ void HP_intif_pPartyInfo(int fd) { HPMHooks.source.intif.pPartyInfo(fd); } if( HPMHooks.count.HP_intif_pPartyInfo_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pPartyInfo_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32781,10 +32820,10 @@ void HP_intif_pPartyMemberAdded(int fd) { HPMHooks.source.intif.pPartyMemberAdded(fd); } if( HPMHooks.count.HP_intif_pPartyMemberAdded_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyMemberAdded_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pPartyMemberAdded_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32807,10 +32846,10 @@ void HP_intif_pPartyOptionChanged(int fd) { HPMHooks.source.intif.pPartyOptionChanged(fd); } if( HPMHooks.count.HP_intif_pPartyOptionChanged_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyOptionChanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pPartyOptionChanged_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32833,10 +32872,10 @@ void HP_intif_pPartyMemberWithdraw(int fd) { HPMHooks.source.intif.pPartyMemberWithdraw(fd); } if( HPMHooks.count.HP_intif_pPartyMemberWithdraw_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyMemberWithdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pPartyMemberWithdraw_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32859,10 +32898,10 @@ void HP_intif_pPartyMove(int fd) { HPMHooks.source.intif.pPartyMove(fd); } if( HPMHooks.count.HP_intif_pPartyMove_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyMove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pPartyMove_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32885,10 +32924,10 @@ void HP_intif_pPartyBroken(int fd) { HPMHooks.source.intif.pPartyBroken(fd); } if( HPMHooks.count.HP_intif_pPartyBroken_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyBroken_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pPartyBroken_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32911,10 +32950,10 @@ void HP_intif_pPartyMessage(int fd) { HPMHooks.source.intif.pPartyMessage(fd); } if( HPMHooks.count.HP_intif_pPartyMessage_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pPartyMessage_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32937,10 +32976,10 @@ void HP_intif_pGuildCreated(int fd) { HPMHooks.source.intif.pGuildCreated(fd); } if( HPMHooks.count.HP_intif_pGuildCreated_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildCreated_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildCreated_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32963,10 +33002,10 @@ void HP_intif_pGuildInfo(int fd) { HPMHooks.source.intif.pGuildInfo(fd); } if( HPMHooks.count.HP_intif_pGuildInfo_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildInfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildInfo_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -32989,10 +33028,10 @@ void HP_intif_pGuildMemberAdded(int fd) { HPMHooks.source.intif.pGuildMemberAdded(fd); } if( HPMHooks.count.HP_intif_pGuildMemberAdded_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildMemberAdded_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildMemberAdded_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33015,10 +33054,10 @@ void HP_intif_pGuildMemberWithdraw(int fd) { HPMHooks.source.intif.pGuildMemberWithdraw(fd); } if( HPMHooks.count.HP_intif_pGuildMemberWithdraw_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildMemberWithdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildMemberWithdraw_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33041,10 +33080,10 @@ void HP_intif_pGuildMemberInfoShort(int fd) { HPMHooks.source.intif.pGuildMemberInfoShort(fd); } if( HPMHooks.count.HP_intif_pGuildMemberInfoShort_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildMemberInfoShort_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildMemberInfoShort_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33067,10 +33106,10 @@ void HP_intif_pGuildBroken(int fd) { HPMHooks.source.intif.pGuildBroken(fd); } if( HPMHooks.count.HP_intif_pGuildBroken_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildBroken_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildBroken_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33093,10 +33132,10 @@ void HP_intif_pGuildMessage(int fd) { HPMHooks.source.intif.pGuildMessage(fd); } if( HPMHooks.count.HP_intif_pGuildMessage_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildMessage_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33119,10 +33158,10 @@ void HP_intif_pGuildBasicInfoChanged(int fd) { HPMHooks.source.intif.pGuildBasicInfoChanged(fd); } if( HPMHooks.count.HP_intif_pGuildBasicInfoChanged_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildBasicInfoChanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildBasicInfoChanged_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33145,10 +33184,10 @@ void HP_intif_pGuildMemberInfoChanged(int fd) { HPMHooks.source.intif.pGuildMemberInfoChanged(fd); } if( HPMHooks.count.HP_intif_pGuildMemberInfoChanged_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildMemberInfoChanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildMemberInfoChanged_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33171,10 +33210,10 @@ void HP_intif_pGuildPosition(int fd) { HPMHooks.source.intif.pGuildPosition(fd); } if( HPMHooks.count.HP_intif_pGuildPosition_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildPosition_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildPosition_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33197,10 +33236,10 @@ void HP_intif_pGuildSkillUp(int fd) { HPMHooks.source.intif.pGuildSkillUp(fd); } if( HPMHooks.count.HP_intif_pGuildSkillUp_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildSkillUp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildSkillUp_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33223,10 +33262,10 @@ void HP_intif_pGuildAlliance(int fd) { HPMHooks.source.intif.pGuildAlliance(fd); } if( HPMHooks.count.HP_intif_pGuildAlliance_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildAlliance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildAlliance_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33249,10 +33288,10 @@ void HP_intif_pGuildNotice(int fd) { HPMHooks.source.intif.pGuildNotice(fd); } if( HPMHooks.count.HP_intif_pGuildNotice_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildNotice_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildNotice_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33275,10 +33314,10 @@ void HP_intif_pGuildEmblem(int fd) { HPMHooks.source.intif.pGuildEmblem(fd); } if( HPMHooks.count.HP_intif_pGuildEmblem_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildEmblem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildEmblem_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33301,10 +33340,10 @@ void HP_intif_pGuildCastleDataLoad(int fd) { HPMHooks.source.intif.pGuildCastleDataLoad(fd); } if( HPMHooks.count.HP_intif_pGuildCastleDataLoad_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildCastleDataLoad_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildCastleDataLoad_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33327,10 +33366,10 @@ void HP_intif_pGuildMasterChanged(int fd) { HPMHooks.source.intif.pGuildMasterChanged(fd); } if( HPMHooks.count.HP_intif_pGuildMasterChanged_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildMasterChanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pGuildMasterChanged_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33353,10 +33392,10 @@ void HP_intif_pQuestLog(int fd) { HPMHooks.source.intif.pQuestLog(fd); } if( HPMHooks.count.HP_intif_pQuestLog_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pQuestLog_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pQuestLog_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33379,10 +33418,10 @@ void HP_intif_pQuestSave(int fd) { HPMHooks.source.intif.pQuestSave(fd); } if( HPMHooks.count.HP_intif_pQuestSave_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pQuestSave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pQuestSave_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33405,10 +33444,10 @@ void HP_intif_pMailInboxReceived(int fd) { HPMHooks.source.intif.pMailInboxReceived(fd); } if( HPMHooks.count.HP_intif_pMailInboxReceived_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMailInboxReceived_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMailInboxReceived_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33431,10 +33470,10 @@ void HP_intif_pMailNew(int fd) { HPMHooks.source.intif.pMailNew(fd); } if( HPMHooks.count.HP_intif_pMailNew_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMailNew_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMailNew_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33457,10 +33496,10 @@ void HP_intif_pMailGetAttach(int fd) { HPMHooks.source.intif.pMailGetAttach(fd); } if( HPMHooks.count.HP_intif_pMailGetAttach_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMailGetAttach_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMailGetAttach_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33483,10 +33522,10 @@ void HP_intif_pMailDelete(int fd) { HPMHooks.source.intif.pMailDelete(fd); } if( HPMHooks.count.HP_intif_pMailDelete_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMailDelete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMailDelete_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33509,10 +33548,10 @@ void HP_intif_pMailReturn(int fd) { HPMHooks.source.intif.pMailReturn(fd); } if( HPMHooks.count.HP_intif_pMailReturn_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMailReturn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMailReturn_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33535,10 +33574,10 @@ void HP_intif_pMailSend(int fd) { HPMHooks.source.intif.pMailSend(fd); } if( HPMHooks.count.HP_intif_pMailSend_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMailSend_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMailSend_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33561,10 +33600,10 @@ void HP_intif_pAuctionResults(int fd) { HPMHooks.source.intif.pAuctionResults(fd); } if( HPMHooks.count.HP_intif_pAuctionResults_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pAuctionResults_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pAuctionResults_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33587,10 +33626,10 @@ void HP_intif_pAuctionRegister(int fd) { HPMHooks.source.intif.pAuctionRegister(fd); } if( HPMHooks.count.HP_intif_pAuctionRegister_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pAuctionRegister_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pAuctionRegister_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33613,10 +33652,10 @@ void HP_intif_pAuctionCancel(int fd) { HPMHooks.source.intif.pAuctionCancel(fd); } if( HPMHooks.count.HP_intif_pAuctionCancel_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pAuctionCancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pAuctionCancel_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33639,10 +33678,10 @@ void HP_intif_pAuctionClose(int fd) { HPMHooks.source.intif.pAuctionClose(fd); } if( HPMHooks.count.HP_intif_pAuctionClose_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pAuctionClose_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pAuctionClose_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33665,10 +33704,10 @@ void HP_intif_pAuctionMessage(int fd) { HPMHooks.source.intif.pAuctionMessage(fd); } if( HPMHooks.count.HP_intif_pAuctionMessage_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pAuctionMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pAuctionMessage_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33691,10 +33730,10 @@ void HP_intif_pAuctionBid(int fd) { HPMHooks.source.intif.pAuctionBid(fd); } if( HPMHooks.count.HP_intif_pAuctionBid_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pAuctionBid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pAuctionBid_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33717,10 +33756,10 @@ void HP_intif_pItembound_ack(int fd) { HPMHooks.source.intif.pItembound_ack(fd); } if( HPMHooks.count.HP_intif_pItembound_ack_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pItembound_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pItembound_ack_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33743,10 +33782,10 @@ void HP_intif_pMercenaryReceived(int fd) { HPMHooks.source.intif.pMercenaryReceived(fd); } if( HPMHooks.count.HP_intif_pMercenaryReceived_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMercenaryReceived_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMercenaryReceived_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33769,10 +33808,10 @@ void HP_intif_pMercenaryDeleted(int fd) { HPMHooks.source.intif.pMercenaryDeleted(fd); } if( HPMHooks.count.HP_intif_pMercenaryDeleted_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMercenaryDeleted_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMercenaryDeleted_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33795,10 +33834,10 @@ void HP_intif_pMercenarySaved(int fd) { HPMHooks.source.intif.pMercenarySaved(fd); } if( HPMHooks.count.HP_intif_pMercenarySaved_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pMercenarySaved_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pMercenarySaved_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33821,10 +33860,10 @@ void HP_intif_pElementalReceived(int fd) { HPMHooks.source.intif.pElementalReceived(fd); } if( HPMHooks.count.HP_intif_pElementalReceived_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pElementalReceived_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pElementalReceived_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33847,10 +33886,10 @@ void HP_intif_pElementalDeleted(int fd) { HPMHooks.source.intif.pElementalDeleted(fd); } if( HPMHooks.count.HP_intif_pElementalDeleted_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pElementalDeleted_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pElementalDeleted_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33873,10 +33912,10 @@ void HP_intif_pElementalSaved(int fd) { HPMHooks.source.intif.pElementalSaved(fd); } if( HPMHooks.count.HP_intif_pElementalSaved_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pElementalSaved_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pElementalSaved_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33899,10 +33938,10 @@ void HP_intif_pCreatePet(int fd) { HPMHooks.source.intif.pCreatePet(fd); } if( HPMHooks.count.HP_intif_pCreatePet_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pCreatePet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pCreatePet_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33925,10 +33964,10 @@ void HP_intif_pRecvPetData(int fd) { HPMHooks.source.intif.pRecvPetData(fd); } if( HPMHooks.count.HP_intif_pRecvPetData_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pRecvPetData_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pRecvPetData_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33951,10 +33990,10 @@ void HP_intif_pSavePetOk(int fd) { HPMHooks.source.intif.pSavePetOk(fd); } if( HPMHooks.count.HP_intif_pSavePetOk_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pSavePetOk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pSavePetOk_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -33977,10 +34016,10 @@ void HP_intif_pDeletePetOk(int fd) { HPMHooks.source.intif.pDeletePetOk(fd); } if( HPMHooks.count.HP_intif_pDeletePetOk_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pDeletePetOk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pDeletePetOk_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -34003,10 +34042,10 @@ void HP_intif_pCreateHomunculus(int fd) { HPMHooks.source.intif.pCreateHomunculus(fd); } if( HPMHooks.count.HP_intif_pCreateHomunculus_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pCreateHomunculus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pCreateHomunculus_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -34029,10 +34068,10 @@ void HP_intif_pRecvHomunculusData(int fd) { HPMHooks.source.intif.pRecvHomunculusData(fd); } if( HPMHooks.count.HP_intif_pRecvHomunculusData_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pRecvHomunculusData_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pRecvHomunculusData_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -34055,10 +34094,10 @@ void HP_intif_pSaveHomunculusOk(int fd) { HPMHooks.source.intif.pSaveHomunculusOk(fd); } if( HPMHooks.count.HP_intif_pSaveHomunculusOk_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pSaveHomunculusOk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pSaveHomunculusOk_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -34081,15 +34120,15 @@ void HP_intif_pDeleteHomunculusOk(int fd) { HPMHooks.source.intif.pDeleteHomunculusOk(fd); } if( HPMHooks.count.HP_intif_pDeleteHomunculusOk_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pDeleteHomunculusOk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_pDeleteHomunculusOk_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; } -/* ircbot */ +/* irc_bot_interface */ void HP_ircbot_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_init_pre ) { @@ -34108,10 +34147,10 @@ void HP_ircbot_init(bool minimal) { HPMHooks.source.ircbot.init(minimal); } if( HPMHooks.count.HP_ircbot_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -34161,10 +34200,10 @@ int HP_ircbot_parse(int fd) { retVal___ = HPMHooks.source.ircbot.parse(fd); } if( HPMHooks.count.HP_ircbot_parse_post ) { - int (*postHookFunc) (int retVal___, int *fd); + int (*postHookFunc) (int retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_parse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_parse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -34172,11 +34211,11 @@ int HP_ircbot_parse(int fd) { void HP_ircbot_parse_sub(int fd, char *str) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_parse_sub_pre ) { - void (*preHookFunc) (int *fd, char *str); + void (*preHookFunc) (int *fd, char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_parse_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_parse_sub_pre[hIndex].func; - preHookFunc(&fd, str); + preHookFunc(&fd, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34187,10 +34226,10 @@ void HP_ircbot_parse_sub(int fd, char *str) { HPMHooks.source.ircbot.parse_sub(fd, str); } if( HPMHooks.count.HP_ircbot_parse_sub_post ) { - void (*postHookFunc) (int *fd, char *str); + void (*postHookFunc) (int fd, char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_parse_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_parse_sub_post[hIndex].func; - postHookFunc(&fd, str); + postHookFunc(fd, str); } } return; @@ -34198,11 +34237,11 @@ void HP_ircbot_parse_sub(int fd, char *str) { void HP_ircbot_parse_source(char *source, char *nick, char *ident, char *host) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_parse_source_pre ) { - void (*preHookFunc) (char *source, char *nick, char *ident, char *host); + void (*preHookFunc) (char **source, char **nick, char **ident, char **host); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_parse_source_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_parse_source_pre[hIndex].func; - preHookFunc(source, nick, ident, host); + preHookFunc(&source, &nick, &ident, &host); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34225,11 +34264,11 @@ struct irc_func* HP_ircbot_func_search(char *function_name) { int hIndex = 0; struct irc_func* retVal___ = NULL; if( HPMHooks.count.HP_ircbot_func_search_pre ) { - struct irc_func* (*preHookFunc) (char *function_name); + struct irc_func* (*preHookFunc) (char **function_name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_func_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_func_search_pre[hIndex].func; - retVal___ = preHookFunc(function_name); + retVal___ = preHookFunc(&function_name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34267,10 +34306,10 @@ int HP_ircbot_connect_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.ircbot.connect_timer(tid, tick, id, data); } if( HPMHooks.count.HP_ircbot_connect_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_connect_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_connect_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -34294,10 +34333,10 @@ int HP_ircbot_identify_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.ircbot.identify_timer(tid, tick, id, data); } if( HPMHooks.count.HP_ircbot_identify_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_identify_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_identify_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -34321,22 +34360,75 @@ int HP_ircbot_join_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.ircbot.join_timer(tid, tick, id, data); } if( HPMHooks.count.HP_ircbot_join_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_join_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_join_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -void HP_ircbot_send(char *str) { +int HP_ircbot_queue_timer(int tid, int64 tick, int id, intptr_t data) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_ircbot_queue_timer_pre ) { + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_queue_timer_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_ircbot_queue_timer_pre[hIndex].func; + retVal___ = preHookFunc(&tid, &tick, &id, &data); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.ircbot.queue_timer(tid, tick, id, data); + } + if( HPMHooks.count.HP_ircbot_queue_timer_post ) { + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); + for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_queue_timer_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_ircbot_queue_timer_post[hIndex].func; + retVal___ = postHookFunc(retVal___, tid, tick, id, data); + } + } + return retVal___; +} +void HP_ircbot_queue(char *str) { + int hIndex = 0; + if( HPMHooks.count.HP_ircbot_queue_pre ) { + void (*preHookFunc) (char **str); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_queue_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_ircbot_queue_pre[hIndex].func; + preHookFunc(&str); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.ircbot.queue(str); + } + if( HPMHooks.count.HP_ircbot_queue_post ) { + void (*postHookFunc) (char *str); + for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_queue_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_ircbot_queue_post[hIndex].func; + postHookFunc(str); + } + } + return; +} +void HP_ircbot_send(char *str, bool force) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_send_pre ) { - void (*preHookFunc) (char *str); + void (*preHookFunc) (char **str, bool *force); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_send_pre[hIndex].func; - preHookFunc(str); + preHookFunc(&str, &force); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34344,13 +34436,13 @@ void HP_ircbot_send(char *str) { } } { - HPMHooks.source.ircbot.send(str); + HPMHooks.source.ircbot.send(str, force); } if( HPMHooks.count.HP_ircbot_send_post ) { - void (*postHookFunc) (char *str); + void (*postHookFunc) (char *str, bool force); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_send_post[hIndex].func; - postHookFunc(str); + postHookFunc(str, force); } } return; @@ -34358,11 +34450,11 @@ void HP_ircbot_send(char *str) { void HP_ircbot_relay(const char *name, const char *msg) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_relay_pre ) { - void (*preHookFunc) (const char *name, const char *msg); + void (*preHookFunc) (const char **name, const char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_relay_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_relay_pre[hIndex].func; - preHookFunc(name, msg); + preHookFunc(&name, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34384,11 +34476,11 @@ void HP_ircbot_relay(const char *name, const char *msg) { void HP_ircbot_pong(int fd, char *cmd, char *source, char *target, char *msg) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_pong_pre ) { - void (*preHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*preHookFunc) (int *fd, char **cmd, char **source, char **target, char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_pong_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_pong_pre[hIndex].func; - preHookFunc(&fd, cmd, source, target, msg); + preHookFunc(&fd, &cmd, &source, &target, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34399,10 +34491,10 @@ void HP_ircbot_pong(int fd, char *cmd, char *source, char *target, char *msg) { HPMHooks.source.ircbot.pong(fd, cmd, source, target, msg); } if( HPMHooks.count.HP_ircbot_pong_post ) { - void (*postHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*postHookFunc) (int fd, char *cmd, char *source, char *target, char *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_pong_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_pong_post[hIndex].func; - postHookFunc(&fd, cmd, source, target, msg); + postHookFunc(fd, cmd, source, target, msg); } } return; @@ -34410,11 +34502,11 @@ void HP_ircbot_pong(int fd, char *cmd, char *source, char *target, char *msg) { void HP_ircbot_privmsg(int fd, char *cmd, char *source, char *target, char *msg) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_privmsg_pre ) { - void (*preHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*preHookFunc) (int *fd, char **cmd, char **source, char **target, char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_privmsg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_privmsg_pre[hIndex].func; - preHookFunc(&fd, cmd, source, target, msg); + preHookFunc(&fd, &cmd, &source, &target, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34425,10 +34517,36 @@ void HP_ircbot_privmsg(int fd, char *cmd, char *source, char *target, char *msg) HPMHooks.source.ircbot.privmsg(fd, cmd, source, target, msg); } if( HPMHooks.count.HP_ircbot_privmsg_post ) { - void (*postHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*postHookFunc) (int fd, char *cmd, char *source, char *target, char *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_privmsg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_privmsg_post[hIndex].func; - postHookFunc(&fd, cmd, source, target, msg); + postHookFunc(fd, cmd, source, target, msg); + } + } + return; +} +void HP_ircbot_privmsg_ctcp(int fd, char *cmd, char *source, char *target, char *msg) { + int hIndex = 0; + if( HPMHooks.count.HP_ircbot_privmsg_ctcp_pre ) { + void (*preHookFunc) (int *fd, char **cmd, char **source, char **target, char **msg); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_privmsg_ctcp_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_ircbot_privmsg_ctcp_pre[hIndex].func; + preHookFunc(&fd, &cmd, &source, &target, &msg); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.ircbot.privmsg_ctcp(fd, cmd, source, target, msg); + } + if( HPMHooks.count.HP_ircbot_privmsg_ctcp_post ) { + void (*postHookFunc) (int fd, char *cmd, char *source, char *target, char *msg); + for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_privmsg_ctcp_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_ircbot_privmsg_ctcp_post[hIndex].func; + postHookFunc(fd, cmd, source, target, msg); } } return; @@ -34436,11 +34554,11 @@ void HP_ircbot_privmsg(int fd, char *cmd, char *source, char *target, char *msg) void HP_ircbot_userjoin(int fd, char *cmd, char *source, char *target, char *msg) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_userjoin_pre ) { - void (*preHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*preHookFunc) (int *fd, char **cmd, char **source, char **target, char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_userjoin_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_userjoin_pre[hIndex].func; - preHookFunc(&fd, cmd, source, target, msg); + preHookFunc(&fd, &cmd, &source, &target, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34451,10 +34569,10 @@ void HP_ircbot_userjoin(int fd, char *cmd, char *source, char *target, char *msg HPMHooks.source.ircbot.userjoin(fd, cmd, source, target, msg); } if( HPMHooks.count.HP_ircbot_userjoin_post ) { - void (*postHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*postHookFunc) (int fd, char *cmd, char *source, char *target, char *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_userjoin_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_userjoin_post[hIndex].func; - postHookFunc(&fd, cmd, source, target, msg); + postHookFunc(fd, cmd, source, target, msg); } } return; @@ -34462,11 +34580,11 @@ void HP_ircbot_userjoin(int fd, char *cmd, char *source, char *target, char *msg void HP_ircbot_userleave(int fd, char *cmd, char *source, char *target, char *msg) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_userleave_pre ) { - void (*preHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*preHookFunc) (int *fd, char **cmd, char **source, char **target, char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_userleave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_userleave_pre[hIndex].func; - preHookFunc(&fd, cmd, source, target, msg); + preHookFunc(&fd, &cmd, &source, &target, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34477,10 +34595,10 @@ void HP_ircbot_userleave(int fd, char *cmd, char *source, char *target, char *ms HPMHooks.source.ircbot.userleave(fd, cmd, source, target, msg); } if( HPMHooks.count.HP_ircbot_userleave_post ) { - void (*postHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*postHookFunc) (int fd, char *cmd, char *source, char *target, char *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_userleave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_userleave_post[hIndex].func; - postHookFunc(&fd, cmd, source, target, msg); + postHookFunc(fd, cmd, source, target, msg); } } return; @@ -34488,11 +34606,11 @@ void HP_ircbot_userleave(int fd, char *cmd, char *source, char *target, char *ms void HP_ircbot_usernick(int fd, char *cmd, char *source, char *target, char *msg) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_usernick_pre ) { - void (*preHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*preHookFunc) (int *fd, char **cmd, char **source, char **target, char **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_usernick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_usernick_pre[hIndex].func; - preHookFunc(&fd, cmd, source, target, msg); + preHookFunc(&fd, &cmd, &source, &target, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34503,15 +34621,15 @@ void HP_ircbot_usernick(int fd, char *cmd, char *source, char *target, char *msg HPMHooks.source.ircbot.usernick(fd, cmd, source, target, msg); } if( HPMHooks.count.HP_ircbot_usernick_post ) { - void (*postHookFunc) (int *fd, char *cmd, char *source, char *target, char *msg); + void (*postHookFunc) (int fd, char *cmd, char *source, char *target, char *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_usernick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_usernick_post[hIndex].func; - postHookFunc(&fd, cmd, source, target, msg); + postHookFunc(fd, cmd, source, target, msg); } } return; } -/* itemdb */ +/* itemdb_interface */ void HP_itemdb_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_init_pre ) { @@ -34530,10 +34648,10 @@ void HP_itemdb_init(bool minimal) { HPMHooks.source.itemdb.init(minimal); } if( HPMHooks.count.HP_itemdb_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -34697,11 +34815,11 @@ void HP_itemdb_read_packages(void) { void HP_itemdb_write_cached_packages(const char *config_filename) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_write_cached_packages_pre ) { - void (*preHookFunc) (const char *config_filename); + void (*preHookFunc) (const char **config_filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_write_cached_packages_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_write_cached_packages_pre[hIndex].func; - preHookFunc(config_filename); + preHookFunc(&config_filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34724,11 +34842,11 @@ bool HP_itemdb_read_cached_packages(const char *config_filename) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_itemdb_read_cached_packages_pre ) { - bool (*preHookFunc) (const char *config_filename); + bool (*preHookFunc) (const char **config_filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_cached_packages_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_read_cached_packages_pre[hIndex].func; - retVal___ = preHookFunc(config_filename); + retVal___ = preHookFunc(&config_filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34751,11 +34869,11 @@ struct item_data* HP_itemdb_name2id(const char *str) { int hIndex = 0; struct item_data* retVal___ = NULL; if( HPMHooks.count.HP_itemdb_name2id_pre ) { - struct item_data* (*preHookFunc) (const char *str); + struct item_data* (*preHookFunc) (const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_name2id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_name2id_pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34778,11 +34896,11 @@ struct item_data* HP_itemdb_search_name(const char *name) { int hIndex = 0; struct item_data* retVal___ = NULL; if( HPMHooks.count.HP_itemdb_search_name_pre ) { - struct item_data* (*preHookFunc) (const char *name); + struct item_data* (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_search_name_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34805,11 +34923,11 @@ int HP_itemdb_search_name_array(struct item_data **data, int size, const char *s int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_search_name_array_pre ) { - int (*preHookFunc) (struct item_data **data, int *size, const char *str, int *flag); + int (*preHookFunc) (struct item_data ***data, int *size, const char **str, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_name_array_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_search_name_array_pre[hIndex].func; - retVal___ = preHookFunc(data, &size, str, &flag); + retVal___ = preHookFunc(&data, &size, &str, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34820,10 +34938,10 @@ int HP_itemdb_search_name_array(struct item_data **data, int size, const char *s retVal___ = HPMHooks.source.itemdb.search_name_array(data, size, str, flag); } if( HPMHooks.count.HP_itemdb_search_name_array_post ) { - int (*postHookFunc) (int retVal___, struct item_data **data, int *size, const char *str, int *flag); + int (*postHookFunc) (int retVal___, struct item_data **data, int size, const char *str, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_name_array_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_search_name_array_post[hIndex].func; - retVal___ = postHookFunc(retVal___, data, &size, str, &flag); + retVal___ = postHookFunc(retVal___, data, size, str, flag); } } return retVal___; @@ -34847,10 +34965,10 @@ struct item_data* HP_itemdb_load(int nameid) { retVal___ = HPMHooks.source.itemdb.load(nameid); } if( HPMHooks.count.HP_itemdb_load_post ) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, int *nameid); + struct item_data* (*postHookFunc) (struct item_data* retVal___, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_load_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &nameid); + retVal___ = postHookFunc(retVal___, nameid); } } return retVal___; @@ -34874,10 +34992,10 @@ struct item_data* HP_itemdb_search(int nameid) { retVal___ = HPMHooks.source.itemdb.search(nameid); } if( HPMHooks.count.HP_itemdb_search_post ) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, int *nameid); + struct item_data* (*postHookFunc) (struct item_data* retVal___, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &nameid); + retVal___ = postHookFunc(retVal___, nameid); } } return retVal___; @@ -34901,10 +35019,10 @@ struct item_data* HP_itemdb_exists(int nameid) { retVal___ = HPMHooks.source.itemdb.exists(nameid); } if( HPMHooks.count.HP_itemdb_exists_post ) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, int *nameid); + struct item_data* (*postHookFunc) (struct item_data* retVal___, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_exists_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_exists_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &nameid); + retVal___ = postHookFunc(retVal___, nameid); } } return retVal___; @@ -34913,11 +35031,11 @@ bool HP_itemdb_in_group(struct item_group *group, int nameid) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_itemdb_in_group_pre ) { - bool (*preHookFunc) (struct item_group *group, int *nameid); + bool (*preHookFunc) (struct item_group **group, int *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_in_group_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_in_group_pre[hIndex].func; - retVal___ = preHookFunc(group, &nameid); + retVal___ = preHookFunc(&group, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34928,10 +35046,10 @@ bool HP_itemdb_in_group(struct item_group *group, int nameid) { retVal___ = HPMHooks.source.itemdb.in_group(group, nameid); } if( HPMHooks.count.HP_itemdb_in_group_post ) { - bool (*postHookFunc) (bool retVal___, struct item_group *group, int *nameid); + bool (*postHookFunc) (bool retVal___, struct item_group *group, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_in_group_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_in_group_post[hIndex].func; - retVal___ = postHookFunc(retVal___, group, &nameid); + retVal___ = postHookFunc(retVal___, group, nameid); } } return retVal___; @@ -34940,11 +35058,11 @@ int HP_itemdb_group_item(struct item_group *group) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_group_item_pre ) { - int (*preHookFunc) (struct item_group *group); + int (*preHookFunc) (struct item_group **group); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_group_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_group_item_pre[hIndex].func; - retVal___ = preHookFunc(group); + retVal___ = preHookFunc(&group); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34967,11 +35085,11 @@ int HP_itemdb_chain_item(unsigned short chain_id, int *rate) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_chain_item_pre ) { - int (*preHookFunc) (unsigned short *chain_id, int *rate); + int (*preHookFunc) (unsigned short *chain_id, int **rate); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_chain_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_chain_item_pre[hIndex].func; - retVal___ = preHookFunc(&chain_id, rate); + retVal___ = preHookFunc(&chain_id, &rate); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34982,10 +35100,10 @@ int HP_itemdb_chain_item(unsigned short chain_id, int *rate) { retVal___ = HPMHooks.source.itemdb.chain_item(chain_id, rate); } if( HPMHooks.count.HP_itemdb_chain_item_post ) { - int (*postHookFunc) (int retVal___, unsigned short *chain_id, int *rate); + int (*postHookFunc) (int retVal___, unsigned short chain_id, int *rate); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_chain_item_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_chain_item_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &chain_id, rate); + retVal___ = postHookFunc(retVal___, chain_id, rate); } } return retVal___; @@ -34993,11 +35111,11 @@ int HP_itemdb_chain_item(unsigned short chain_id, int *rate) { void HP_itemdb_package_item(struct map_session_data *sd, struct item_package *package) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_package_item_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct item_package *package); + void (*preHookFunc) (struct map_session_data **sd, struct item_package **package); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_package_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_package_item_pre[hIndex].func; - preHookFunc(sd, package); + preHookFunc(&sd, &package); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35016,16 +35134,16 @@ void HP_itemdb_package_item(struct map_session_data *sd, struct item_package *pa } return; } -int HP_itemdb_searchname_sub(DBKey key, DBData *data, va_list ap) { +int HP_itemdb_searchname_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_searchname_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_searchname_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_itemdb_searchname_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -35039,21 +35157,21 @@ int HP_itemdb_searchname_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_itemdb_searchname_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_searchname_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_itemdb_searchname_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_itemdb_searchname_array_sub(DBKey key, DBData data, va_list ap) { +int HP_itemdb_searchname_array_sub(union DBKey key, struct DBData data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_searchname_array_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData *data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_searchname_array_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); @@ -35072,11 +35190,11 @@ int HP_itemdb_searchname_array_sub(DBKey key, DBData data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_itemdb_searchname_array_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_searchname_array_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_itemdb_searchname_array_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, &data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -35086,11 +35204,11 @@ int HP_itemdb_searchrandomid(struct item_group *group) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_searchrandomid_pre ) { - int (*preHookFunc) (struct item_group *group); + int (*preHookFunc) (struct item_group **group); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_searchrandomid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_searchrandomid_pre[hIndex].func; - retVal___ = preHookFunc(group); + retVal___ = preHookFunc(&group); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35128,10 +35246,10 @@ const char* HP_itemdb_typename(int type) { retVal___ = HPMHooks.source.itemdb.typename(type); } if( HPMHooks.count.HP_itemdb_typename_post ) { - const char* (*postHookFunc) (const char* retVal___, int *type); + const char* (*postHookFunc) (const char* retVal___, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_typename_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_typename_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; @@ -35139,11 +35257,11 @@ const char* HP_itemdb_typename(int type) { void HP_itemdb_jobmask2mapid(uint64 *bclass, uint64 jobmask) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_jobmask2mapid_pre ) { - void (*preHookFunc) (uint64 *bclass, uint64 *jobmask); + void (*preHookFunc) (uint64 **bclass, uint64 *jobmask); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_jobmask2mapid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_jobmask2mapid_pre[hIndex].func; - preHookFunc(bclass, &jobmask); + preHookFunc(&bclass, &jobmask); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35154,10 +35272,10 @@ void HP_itemdb_jobmask2mapid(uint64 *bclass, uint64 jobmask) { HPMHooks.source.itemdb.jobmask2mapid(bclass, jobmask); } if( HPMHooks.count.HP_itemdb_jobmask2mapid_post ) { - void (*postHookFunc) (uint64 *bclass, uint64 *jobmask); + void (*postHookFunc) (uint64 *bclass, uint64 jobmask); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_jobmask2mapid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_jobmask2mapid_post[hIndex].func; - postHookFunc(bclass, &jobmask); + postHookFunc(bclass, jobmask); } } return; @@ -35165,11 +35283,11 @@ void HP_itemdb_jobmask2mapid(uint64 *bclass, uint64 jobmask) { void HP_itemdb_jobid2mapid(uint64 *bclass, int job_id, bool enable) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_jobid2mapid_pre ) { - void (*preHookFunc) (uint64 *bclass, int *job_id, bool *enable); + void (*preHookFunc) (uint64 **bclass, int *job_id, bool *enable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_jobid2mapid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_jobid2mapid_pre[hIndex].func; - preHookFunc(bclass, &job_id, &enable); + preHookFunc(&bclass, &job_id, &enable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35180,10 +35298,10 @@ void HP_itemdb_jobid2mapid(uint64 *bclass, int job_id, bool enable) { HPMHooks.source.itemdb.jobid2mapid(bclass, job_id, enable); } if( HPMHooks.count.HP_itemdb_jobid2mapid_post ) { - void (*postHookFunc) (uint64 *bclass, int *job_id, bool *enable); + void (*postHookFunc) (uint64 *bclass, int job_id, bool enable); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_jobid2mapid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_jobid2mapid_post[hIndex].func; - postHookFunc(bclass, &job_id, &enable); + postHookFunc(bclass, job_id, enable); } } return; @@ -35233,10 +35351,10 @@ struct item_data* HP_itemdb_create_item_data(int nameid) { retVal___ = HPMHooks.source.itemdb.create_item_data(nameid); } if( HPMHooks.count.HP_itemdb_create_item_data_post ) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, int *nameid); + struct item_data* (*postHookFunc) (struct item_data* retVal___, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_create_item_data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_create_item_data_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &nameid); + retVal___ = postHookFunc(retVal___, nameid); } } return retVal___; @@ -35260,10 +35378,10 @@ int HP_itemdb_isequip(int nameid) { retVal___ = HPMHooks.source.itemdb.isequip(nameid); } if( HPMHooks.count.HP_itemdb_isequip_post ) { - int (*postHookFunc) (int retVal___, int *nameid); + int (*postHookFunc) (int retVal___, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isequip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_isequip_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &nameid); + retVal___ = postHookFunc(retVal___, nameid); } } return retVal___; @@ -35272,11 +35390,11 @@ int HP_itemdb_isequip2(struct item_data *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_isequip2_pre ) { - int (*preHookFunc) (struct item_data *data); + int (*preHookFunc) (struct item_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isequip2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_isequip2_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35314,10 +35432,10 @@ int HP_itemdb_isstackable(int nameid) { retVal___ = HPMHooks.source.itemdb.isstackable(nameid); } if( HPMHooks.count.HP_itemdb_isstackable_post ) { - int (*postHookFunc) (int retVal___, int *nameid); + int (*postHookFunc) (int retVal___, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isstackable_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_isstackable_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &nameid); + retVal___ = postHookFunc(retVal___, nameid); } } return retVal___; @@ -35326,11 +35444,11 @@ int HP_itemdb_isstackable2(struct item_data *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_isstackable2_pre ) { - int (*preHookFunc) (struct item_data *data); + int (*preHookFunc) (struct item_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isstackable2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_isstackable2_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35353,11 +35471,11 @@ int HP_itemdb_isdropable_sub(struct item_data *item, int gmlv, int unused) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_isdropable_sub_pre ) { - int (*preHookFunc) (struct item_data *item, int *gmlv, int *unused); + int (*preHookFunc) (struct item_data **item, int *gmlv, int *unused); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isdropable_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_isdropable_sub_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &unused); + retVal___ = preHookFunc(&item, &gmlv, &unused); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35368,10 +35486,10 @@ int HP_itemdb_isdropable_sub(struct item_data *item, int gmlv, int unused) { retVal___ = HPMHooks.source.itemdb.isdropable_sub(item, gmlv, unused); } if( HPMHooks.count.HP_itemdb_isdropable_sub_post ) { - int (*postHookFunc) (int retVal___, struct item_data *item, int *gmlv, int *unused); + int (*postHookFunc) (int retVal___, struct item_data *item, int gmlv, int unused); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isdropable_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_isdropable_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &unused); + retVal___ = postHookFunc(retVal___, item, gmlv, unused); } } return retVal___; @@ -35380,11 +35498,11 @@ int HP_itemdb_cantrade_sub(struct item_data *item, int gmlv, int gmlv2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_cantrade_sub_pre ) { - int (*preHookFunc) (struct item_data *item, int *gmlv, int *gmlv2); + int (*preHookFunc) (struct item_data **item, int *gmlv, int *gmlv2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_cantrade_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_cantrade_sub_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &gmlv2); + retVal___ = preHookFunc(&item, &gmlv, &gmlv2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35395,10 +35513,10 @@ int HP_itemdb_cantrade_sub(struct item_data *item, int gmlv, int gmlv2) { retVal___ = HPMHooks.source.itemdb.cantrade_sub(item, gmlv, gmlv2); } if( HPMHooks.count.HP_itemdb_cantrade_sub_post ) { - int (*postHookFunc) (int retVal___, struct item_data *item, int *gmlv, int *gmlv2); + int (*postHookFunc) (int retVal___, struct item_data *item, int gmlv, int gmlv2); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_cantrade_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_cantrade_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &gmlv2); + retVal___ = postHookFunc(retVal___, item, gmlv, gmlv2); } } return retVal___; @@ -35407,11 +35525,11 @@ int HP_itemdb_canpartnertrade_sub(struct item_data *item, int gmlv, int gmlv2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_canpartnertrade_sub_pre ) { - int (*preHookFunc) (struct item_data *item, int *gmlv, int *gmlv2); + int (*preHookFunc) (struct item_data **item, int *gmlv, int *gmlv2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canpartnertrade_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_canpartnertrade_sub_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &gmlv2); + retVal___ = preHookFunc(&item, &gmlv, &gmlv2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35422,10 +35540,10 @@ int HP_itemdb_canpartnertrade_sub(struct item_data *item, int gmlv, int gmlv2) { retVal___ = HPMHooks.source.itemdb.canpartnertrade_sub(item, gmlv, gmlv2); } if( HPMHooks.count.HP_itemdb_canpartnertrade_sub_post ) { - int (*postHookFunc) (int retVal___, struct item_data *item, int *gmlv, int *gmlv2); + int (*postHookFunc) (int retVal___, struct item_data *item, int gmlv, int gmlv2); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canpartnertrade_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_canpartnertrade_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &gmlv2); + retVal___ = postHookFunc(retVal___, item, gmlv, gmlv2); } } return retVal___; @@ -35434,11 +35552,11 @@ int HP_itemdb_cansell_sub(struct item_data *item, int gmlv, int unused) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_cansell_sub_pre ) { - int (*preHookFunc) (struct item_data *item, int *gmlv, int *unused); + int (*preHookFunc) (struct item_data **item, int *gmlv, int *unused); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_cansell_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_cansell_sub_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &unused); + retVal___ = preHookFunc(&item, &gmlv, &unused); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35449,10 +35567,10 @@ int HP_itemdb_cansell_sub(struct item_data *item, int gmlv, int unused) { retVal___ = HPMHooks.source.itemdb.cansell_sub(item, gmlv, unused); } if( HPMHooks.count.HP_itemdb_cansell_sub_post ) { - int (*postHookFunc) (int retVal___, struct item_data *item, int *gmlv, int *unused); + int (*postHookFunc) (int retVal___, struct item_data *item, int gmlv, int unused); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_cansell_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_cansell_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &unused); + retVal___ = postHookFunc(retVal___, item, gmlv, unused); } } return retVal___; @@ -35461,11 +35579,11 @@ int HP_itemdb_cancartstore_sub(struct item_data *item, int gmlv, int unused) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_cancartstore_sub_pre ) { - int (*preHookFunc) (struct item_data *item, int *gmlv, int *unused); + int (*preHookFunc) (struct item_data **item, int *gmlv, int *unused); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_cancartstore_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_cancartstore_sub_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &unused); + retVal___ = preHookFunc(&item, &gmlv, &unused); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35476,10 +35594,10 @@ int HP_itemdb_cancartstore_sub(struct item_data *item, int gmlv, int unused) { retVal___ = HPMHooks.source.itemdb.cancartstore_sub(item, gmlv, unused); } if( HPMHooks.count.HP_itemdb_cancartstore_sub_post ) { - int (*postHookFunc) (int retVal___, struct item_data *item, int *gmlv, int *unused); + int (*postHookFunc) (int retVal___, struct item_data *item, int gmlv, int unused); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_cancartstore_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_cancartstore_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &unused); + retVal___ = postHookFunc(retVal___, item, gmlv, unused); } } return retVal___; @@ -35488,11 +35606,11 @@ int HP_itemdb_canstore_sub(struct item_data *item, int gmlv, int unused) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_canstore_sub_pre ) { - int (*preHookFunc) (struct item_data *item, int *gmlv, int *unused); + int (*preHookFunc) (struct item_data **item, int *gmlv, int *unused); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canstore_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_canstore_sub_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &unused); + retVal___ = preHookFunc(&item, &gmlv, &unused); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35503,10 +35621,10 @@ int HP_itemdb_canstore_sub(struct item_data *item, int gmlv, int unused) { retVal___ = HPMHooks.source.itemdb.canstore_sub(item, gmlv, unused); } if( HPMHooks.count.HP_itemdb_canstore_sub_post ) { - int (*postHookFunc) (int retVal___, struct item_data *item, int *gmlv, int *unused); + int (*postHookFunc) (int retVal___, struct item_data *item, int gmlv, int unused); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canstore_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_canstore_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &unused); + retVal___ = postHookFunc(retVal___, item, gmlv, unused); } } return retVal___; @@ -35515,11 +35633,11 @@ int HP_itemdb_canguildstore_sub(struct item_data *item, int gmlv, int unused) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_canguildstore_sub_pre ) { - int (*preHookFunc) (struct item_data *item, int *gmlv, int *unused); + int (*preHookFunc) (struct item_data **item, int *gmlv, int *unused); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canguildstore_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_canguildstore_sub_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &unused); + retVal___ = preHookFunc(&item, &gmlv, &unused); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35530,10 +35648,10 @@ int HP_itemdb_canguildstore_sub(struct item_data *item, int gmlv, int unused) { retVal___ = HPMHooks.source.itemdb.canguildstore_sub(item, gmlv, unused); } if( HPMHooks.count.HP_itemdb_canguildstore_sub_post ) { - int (*postHookFunc) (int retVal___, struct item_data *item, int *gmlv, int *unused); + int (*postHookFunc) (int retVal___, struct item_data *item, int gmlv, int unused); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canguildstore_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_canguildstore_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &unused); + retVal___ = postHookFunc(retVal___, item, gmlv, unused); } } return retVal___; @@ -35542,11 +35660,11 @@ int HP_itemdb_canmail_sub(struct item_data *item, int gmlv, int unused) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_canmail_sub_pre ) { - int (*preHookFunc) (struct item_data *item, int *gmlv, int *unused); + int (*preHookFunc) (struct item_data **item, int *gmlv, int *unused); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canmail_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_canmail_sub_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &unused); + retVal___ = preHookFunc(&item, &gmlv, &unused); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35557,10 +35675,10 @@ int HP_itemdb_canmail_sub(struct item_data *item, int gmlv, int unused) { retVal___ = HPMHooks.source.itemdb.canmail_sub(item, gmlv, unused); } if( HPMHooks.count.HP_itemdb_canmail_sub_post ) { - int (*postHookFunc) (int retVal___, struct item_data *item, int *gmlv, int *unused); + int (*postHookFunc) (int retVal___, struct item_data *item, int gmlv, int unused); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canmail_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_canmail_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &unused); + retVal___ = postHookFunc(retVal___, item, gmlv, unused); } } return retVal___; @@ -35569,11 +35687,11 @@ int HP_itemdb_canauction_sub(struct item_data *item, int gmlv, int unused) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_canauction_sub_pre ) { - int (*preHookFunc) (struct item_data *item, int *gmlv, int *unused); + int (*preHookFunc) (struct item_data **item, int *gmlv, int *unused); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canauction_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_canauction_sub_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &unused); + retVal___ = preHookFunc(&item, &gmlv, &unused); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35584,10 +35702,10 @@ int HP_itemdb_canauction_sub(struct item_data *item, int gmlv, int unused) { retVal___ = HPMHooks.source.itemdb.canauction_sub(item, gmlv, unused); } if( HPMHooks.count.HP_itemdb_canauction_sub_post ) { - int (*postHookFunc) (int retVal___, struct item_data *item, int *gmlv, int *unused); + int (*postHookFunc) (int retVal___, struct item_data *item, int gmlv, int unused); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_canauction_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_canauction_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &unused); + retVal___ = postHookFunc(retVal___, item, gmlv, unused); } } return retVal___; @@ -35596,11 +35714,11 @@ int HP_itemdb_isrestricted(struct item *item, int gmlv, int gmlv2, int ( *func ) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_isrestricted_pre ) { - int (*preHookFunc) (struct item *item, int *gmlv, int *gmlv2, int ( *func ) (struct item_data *, int, int)); + int (*preHookFunc) (struct item **item, int *gmlv, int *gmlv2, int ( **func ) (struct item_data *, int, int)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isrestricted_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_isrestricted_pre[hIndex].func; - retVal___ = preHookFunc(item, &gmlv, &gmlv2, func); + retVal___ = preHookFunc(&item, &gmlv, &gmlv2, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35611,10 +35729,10 @@ int HP_itemdb_isrestricted(struct item *item, int gmlv, int gmlv2, int ( *func ) retVal___ = HPMHooks.source.itemdb.isrestricted(item, gmlv, gmlv2, func); } if( HPMHooks.count.HP_itemdb_isrestricted_post ) { - int (*postHookFunc) (int retVal___, struct item *item, int *gmlv, int *gmlv2, int ( *func ) (struct item_data *, int, int)); + int (*postHookFunc) (int retVal___, struct item *item, int gmlv, int gmlv2, int ( *func ) (struct item_data *, int, int)); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isrestricted_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_isrestricted_post[hIndex].func; - retVal___ = postHookFunc(retVal___, item, &gmlv, &gmlv2, func); + retVal___ = postHookFunc(retVal___, item, gmlv, gmlv2, func); } } return retVal___; @@ -35638,10 +35756,10 @@ int HP_itemdb_isidentified(int nameid) { retVal___ = HPMHooks.source.itemdb.isidentified(nameid); } if( HPMHooks.count.HP_itemdb_isidentified_post ) { - int (*postHookFunc) (int retVal___, int *nameid); + int (*postHookFunc) (int retVal___, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isidentified_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_isidentified_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &nameid); + retVal___ = postHookFunc(retVal___, nameid); } } return retVal___; @@ -35650,11 +35768,11 @@ int HP_itemdb_isidentified2(struct item_data *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_isidentified2_pre ) { - int (*preHookFunc) (struct item_data *data); + int (*preHookFunc) (struct item_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_isidentified2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_isidentified2_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35677,11 +35795,11 @@ int HP_itemdb_combo_split_atoi(char *str, int *val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_combo_split_atoi_pre ) { - int (*preHookFunc) (char *str, int *val); + int (*preHookFunc) (char **str, int **val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_combo_split_atoi_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_combo_split_atoi_pre[hIndex].func; - retVal___ = preHookFunc(str, val); + retVal___ = preHookFunc(&str, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35730,11 +35848,11 @@ int HP_itemdb_gendercheck(struct item_data *id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_gendercheck_pre ) { - int (*preHookFunc) (struct item_data *id); + int (*preHookFunc) (struct item_data **id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_gendercheck_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_gendercheck_pre[hIndex].func; - retVal___ = preHookFunc(id); + retVal___ = preHookFunc(&id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35757,11 +35875,11 @@ int HP_itemdb_validate_entry(struct item_data *entry, int n, const char *source) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_validate_entry_pre ) { - int (*preHookFunc) (struct item_data *entry, int *n, const char *source); + int (*preHookFunc) (struct item_data **entry, int *n, const char **source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_validate_entry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_validate_entry_pre[hIndex].func; - retVal___ = preHookFunc(entry, &n, source); + retVal___ = preHookFunc(&entry, &n, &source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35772,10 +35890,10 @@ int HP_itemdb_validate_entry(struct item_data *entry, int n, const char *source) retVal___ = HPMHooks.source.itemdb.validate_entry(entry, n, source); } if( HPMHooks.count.HP_itemdb_validate_entry_post ) { - int (*postHookFunc) (int retVal___, struct item_data *entry, int *n, const char *source); + int (*postHookFunc) (int retVal___, struct item_data *entry, int n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_validate_entry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_validate_entry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, entry, &n, source); + retVal___ = postHookFunc(retVal___, entry, n, source); } } return retVal___; @@ -35783,11 +35901,11 @@ int HP_itemdb_validate_entry(struct item_data *entry, int n, const char *source) void HP_itemdb_readdb_additional_fields(int itemid, struct config_setting_t *it, int n, const char *source) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_readdb_additional_fields_pre ) { - void (*preHookFunc) (int *itemid, struct config_setting_t *it, int *n, const char *source); + void (*preHookFunc) (int *itemid, struct config_setting_t **it, int *n, const char **source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_additional_fields_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_readdb_additional_fields_pre[hIndex].func; - preHookFunc(&itemid, it, &n, source); + preHookFunc(&itemid, &it, &n, &source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35798,10 +35916,10 @@ void HP_itemdb_readdb_additional_fields(int itemid, struct config_setting_t *it, HPMHooks.source.itemdb.readdb_additional_fields(itemid, it, n, source); } if( HPMHooks.count.HP_itemdb_readdb_additional_fields_post ) { - void (*postHookFunc) (int *itemid, struct config_setting_t *it, int *n, const char *source); + void (*postHookFunc) (int itemid, struct config_setting_t *it, int n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_additional_fields_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_readdb_additional_fields_post[hIndex].func; - postHookFunc(&itemid, it, &n, source); + postHookFunc(itemid, it, n, source); } } return; @@ -35809,11 +35927,11 @@ void HP_itemdb_readdb_additional_fields(int itemid, struct config_setting_t *it, void HP_itemdb_readdb_job_sub(struct item_data *id, struct config_setting_t *t) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_readdb_job_sub_pre ) { - void (*preHookFunc) (struct item_data *id, struct config_setting_t *t); + void (*preHookFunc) (struct item_data **id, struct config_setting_t **t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_job_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_readdb_job_sub_pre[hIndex].func; - preHookFunc(id, t); + preHookFunc(&id, &t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35836,11 +35954,11 @@ int HP_itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const cha int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre ) { - int (*preHookFunc) (struct config_setting_t *it, int *n, const char *source); + int (*preHookFunc) (struct config_setting_t **it, int *n, const char **source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_pre[hIndex].func; - retVal___ = preHookFunc(it, &n, source); + retVal___ = preHookFunc(&it, &n, &source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35851,10 +35969,10 @@ int HP_itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const cha retVal___ = HPMHooks.source.itemdb.readdb_libconfig_sub(it, n, source); } if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *it, int *n, const char *source); + int (*postHookFunc) (int retVal___, struct config_setting_t *it, int n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, it, &n, source); + retVal___ = postHookFunc(retVal___, it, n, source); } } return retVal___; @@ -35863,11 +35981,11 @@ int HP_itemdb_readdb_libconfig(const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_readdb_libconfig_pre ) { - int (*preHookFunc) (const char *filename); + int (*preHookFunc) (const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_pre[hIndex].func; - retVal___ = preHookFunc(filename); + retVal___ = preHookFunc(&filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35890,11 +36008,11 @@ uint64 HP_itemdb_unique_id(struct map_session_data *sd) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_itemdb_unique_id_pre ) { - uint64 (*preHookFunc) (struct map_session_data *sd); + uint64 (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_unique_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_unique_id_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35931,10 +36049,10 @@ void HP_itemdb_read(bool minimal) { HPMHooks.source.itemdb.read(minimal); } if( HPMHooks.count.HP_itemdb_read_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_read_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -35942,11 +36060,11 @@ void HP_itemdb_read(bool minimal) { void HP_itemdb_destroy_item_data(struct item_data *self, int free_self) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_destroy_item_data_pre ) { - void (*preHookFunc) (struct item_data *self, int *free_self); + void (*preHookFunc) (struct item_data **self, int *free_self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_destroy_item_data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_destroy_item_data_pre[hIndex].func; - preHookFunc(self, &free_self); + preHookFunc(&self, &free_self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35957,24 +36075,24 @@ void HP_itemdb_destroy_item_data(struct item_data *self, int free_self) { HPMHooks.source.itemdb.destroy_item_data(self, free_self); } if( HPMHooks.count.HP_itemdb_destroy_item_data_post ) { - void (*postHookFunc) (struct item_data *self, int *free_self); + void (*postHookFunc) (struct item_data *self, int free_self); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_destroy_item_data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_destroy_item_data_post[hIndex].func; - postHookFunc(self, &free_self); + postHookFunc(self, free_self); } } return; } -int HP_itemdb_final_sub(DBKey key, DBData *data, va_list ap) { +int HP_itemdb_final_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_final_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_final_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_itemdb_final_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -35988,11 +36106,11 @@ int HP_itemdb_final_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_itemdb_final_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_final_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_itemdb_final_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -36016,10 +36134,10 @@ void HP_itemdb_clear(bool total) { HPMHooks.source.itemdb.clear(total); } if( HPMHooks.count.HP_itemdb_clear_post ) { - void (*postHookFunc) (bool *total); + void (*postHookFunc) (bool total); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_clear_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_clear_post[hIndex].func; - postHookFunc(&total); + postHookFunc(total); } } return; @@ -36043,10 +36161,10 @@ struct item_combo* HP_itemdb_id2combo(unsigned short id) { retVal___ = HPMHooks.source.itemdb.id2combo(id); } if( HPMHooks.count.HP_itemdb_id2combo_post ) { - struct item_combo* (*postHookFunc) (struct item_combo* retVal___, unsigned short *id); + struct item_combo* (*postHookFunc) (struct item_combo* retVal___, unsigned short id); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_id2combo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_id2combo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -36055,11 +36173,11 @@ bool HP_itemdb_is_item_usable(struct item_data *item) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_itemdb_is_item_usable_pre ) { - bool (*preHookFunc) (struct item_data *item); + bool (*preHookFunc) (struct item_data **item); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_is_item_usable_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_is_item_usable_pre[hIndex].func; - retVal___ = preHookFunc(item); + retVal___ = preHookFunc(&item); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36082,11 +36200,11 @@ bool HP_itemdb_lookup_const(const struct config_setting_t *it, const char *name, int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_itemdb_lookup_const_pre ) { - bool (*preHookFunc) (const struct config_setting_t *it, const char *name, int *value); + bool (*preHookFunc) (const struct config_setting_t **it, const char **name, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_lookup_const_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_lookup_const_pre[hIndex].func; - retVal___ = preHookFunc(it, name, value); + retVal___ = preHookFunc(&it, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36105,16 +36223,16 @@ bool HP_itemdb_lookup_const(const struct config_setting_t *it, const char *name, } return retVal___; } -/* libconfig */ +/* libconfig_interface */ int HP_libconfig_read(struct config_t *config, FILE *stream) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_pre ) { - int (*preHookFunc) (struct config_t *config, FILE *stream); + int (*preHookFunc) (struct config_t **config, FILE **stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func; - retVal___ = preHookFunc(config, stream); + retVal___ = preHookFunc(&config, &stream); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36136,11 +36254,11 @@ int HP_libconfig_read(struct config_t *config, FILE *stream) { void HP_libconfig_write(const struct config_t *config, FILE *stream) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_write_pre ) { - void (*preHookFunc) (const struct config_t *config, FILE *stream); + void (*preHookFunc) (const struct config_t **config, FILE **stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func; - preHookFunc(config, stream); + preHookFunc(&config, &stream); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36162,11 +36280,11 @@ void HP_libconfig_write(const struct config_t *config, FILE *stream) { void HP_libconfig_set_options(struct config_t *config, int options) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_options_pre ) { - void (*preHookFunc) (struct config_t *config, int *options); + void (*preHookFunc) (struct config_t **config, int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func; - preHookFunc(config, &options); + preHookFunc(&config, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36177,10 +36295,10 @@ void HP_libconfig_set_options(struct config_t *config, int options) { HPMHooks.source.libconfig.set_options(config, options); } if( HPMHooks.count.HP_libconfig_set_options_post ) { - void (*postHookFunc) (struct config_t *config, int *options); + void (*postHookFunc) (struct config_t *config, int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func; - postHookFunc(config, &options); + postHookFunc(config, options); } } return; @@ -36189,11 +36307,11 @@ int HP_libconfig_get_options(const struct config_t *config) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_get_options_pre ) { - int (*preHookFunc) (const struct config_t *config); + int (*preHookFunc) (const struct config_t **config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func; - retVal___ = preHookFunc(config); + retVal___ = preHookFunc(&config); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36216,11 +36334,11 @@ int HP_libconfig_read_string(struct config_t *config, const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_string_pre ) { - int (*preHookFunc) (struct config_t *config, const char *str); + int (*preHookFunc) (struct config_t **config, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func; - retVal___ = preHookFunc(config, str); + retVal___ = preHookFunc(&config, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36243,11 +36361,11 @@ int HP_libconfig_read_file_src(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_file_src_pre ) { - int (*preHookFunc) (struct config_t *config, const char *filename); + int (*preHookFunc) (struct config_t **config, const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func; - retVal___ = preHookFunc(config, filename); + retVal___ = preHookFunc(&config, &filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36270,11 +36388,11 @@ int HP_libconfig_write_file(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_write_file_pre ) { - int (*preHookFunc) (struct config_t *config, const char *filename); + int (*preHookFunc) (struct config_t **config, const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func; - retVal___ = preHookFunc(config, filename); + retVal___ = preHookFunc(&config, &filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36296,11 +36414,11 @@ int HP_libconfig_write_file(struct config_t *config, const char *filename) { void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_destructor_pre ) { - void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *)); + void (*preHookFunc) (struct config_t **config, void ( **destructor ) (void *)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func; - preHookFunc(config, destructor); + preHookFunc(&config, &destructor); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36322,11 +36440,11 @@ void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) ( void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) { - void (*preHookFunc) (struct config_t *config, const char *include_dir); + void (*preHookFunc) (struct config_t **config, const char **include_dir); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func; - preHookFunc(config, include_dir); + preHookFunc(&config, &include_dir); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36348,11 +36466,11 @@ void HP_libconfig_set_include_dir(struct config_t *config, const char *include_d void HP_libconfig_init(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_init_pre ) { - void (*preHookFunc) (struct config_t *config); + void (*preHookFunc) (struct config_t **config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func; - preHookFunc(config); + preHookFunc(&config); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36374,11 +36492,11 @@ void HP_libconfig_init(struct config_t *config) { void HP_libconfig_destroy(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_destroy_pre ) { - void (*preHookFunc) (struct config_t *config); + void (*preHookFunc) (struct config_t **config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func; - preHookFunc(config); + preHookFunc(&config); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36401,11 +36519,11 @@ int HP_libconfig_setting_get_int(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36428,11 +36546,11 @@ long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) { - long long (*preHookFunc) (const struct config_setting_t *setting); + long long (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36455,11 +36573,11 @@ double HP_libconfig_setting_get_float(const struct config_setting_t *setting) { int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) { - double (*preHookFunc) (const struct config_setting_t *setting); + double (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36482,11 +36600,11 @@ int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36509,11 +36627,11 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) { - const char* (*preHookFunc) (const struct config_setting_t *setting); + const char* (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36536,11 +36654,11 @@ struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *se int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; - retVal___ = preHookFunc(setting, name); + retVal___ = preHookFunc(&setting, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36563,11 +36681,11 @@ int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, cons int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36590,11 +36708,11 @@ int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, long long **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36617,11 +36735,11 @@ int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, double **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36644,11 +36762,11 @@ int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, con int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36671,11 +36789,11 @@ int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, const char ***value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36698,11 +36816,11 @@ int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t **setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36713,10 +36831,10 @@ int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -36725,11 +36843,11 @@ int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long v int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, long long *value); + int (*preHookFunc) (struct config_setting_t **setting, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36740,10 +36858,10 @@ int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long v retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -36752,11 +36870,11 @@ int HP_libconfig_setting_set_float(struct config_setting_t *setting, double valu int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, double *value); + int (*preHookFunc) (struct config_setting_t **setting, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36767,10 +36885,10 @@ int HP_libconfig_setting_set_float(struct config_setting_t *setting, double valu retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -36779,11 +36897,11 @@ int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t **setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func; - retVal___ = preHookFunc(setting, &value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36794,10 +36912,10 @@ int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &value); + retVal___ = postHookFunc(retVal___, setting, value); } } return retVal___; @@ -36806,11 +36924,11 @@ int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, const char *value); + int (*preHookFunc) (struct config_setting_t **setting, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func; - retVal___ = preHookFunc(setting, value); + retVal___ = preHookFunc(&setting, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36833,11 +36951,11 @@ int HP_libconfig_setting_set_format(struct config_setting_t *setting, short form int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) { - int (*preHookFunc) (struct config_setting_t *setting, short *format); + int (*preHookFunc) (struct config_setting_t **setting, short *format); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func; - retVal___ = preHookFunc(setting, &format); + retVal___ = preHookFunc(&setting, &format); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36848,10 +36966,10 @@ int HP_libconfig_setting_set_format(struct config_setting_t *setting, short form retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format); } if( HPMHooks.count.HP_libconfig_setting_set_format_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short format); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &format); + retVal___ = postHookFunc(retVal___, setting, format); } } return retVal___; @@ -36860,11 +36978,11 @@ short HP_libconfig_setting_get_format(const struct config_setting_t *setting) { int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) { - short (*preHookFunc) (const struct config_setting_t *setting); + short (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36887,11 +37005,11 @@ int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36902,10 +37020,10 @@ int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, in retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) { - int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -36914,11 +37032,11 @@ long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *set int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) { - long long (*preHookFunc) (const struct config_setting_t *setting, int *idx); + long long (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36929,10 +37047,10 @@ long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *set retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) { - long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx); + long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -36941,11 +37059,11 @@ double HP_libconfig_setting_get_float_elem(const struct config_setting_t *settin int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) { - double (*preHookFunc) (const struct config_setting_t *setting, int *idx); + double (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36956,10 +37074,10 @@ double HP_libconfig_setting_get_float_elem(const struct config_setting_t *settin retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) { - double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx); + double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -36968,11 +37086,11 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36983,10 +37101,10 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) { - int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -36995,11 +37113,11 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) { - const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx); + const char* (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37010,10 +37128,10 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx); + const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -37022,11 +37140,11 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37037,10 +37155,10 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -37049,11 +37167,11 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37064,10 +37182,10 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, long long value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -37076,11 +37194,11 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37091,10 +37209,10 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, double value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -37103,11 +37221,11 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, &value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37118,10 +37236,10 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, &value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -37130,11 +37248,11 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx, value); + retVal___ = preHookFunc(&setting, &idx, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37145,10 +37263,10 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, const char *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx, value); + retVal___ = postHookFunc(retVal___, setting, idx, value); } } return retVal___; @@ -37157,11 +37275,11 @@ int HP_libconfig_setting_index(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_index_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37184,11 +37302,11 @@ int HP_libconfig_setting_length(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_length_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37211,11 +37329,11 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; - retVal___ = preHookFunc(setting, &idx); + retVal___ = preHookFunc(&setting, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37226,10 +37344,10 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, &idx); + retVal___ = postHookFunc(retVal___, setting, idx); } } return retVal___; @@ -37238,11 +37356,11 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; - retVal___ = preHookFunc(setting, name); + retVal___ = preHookFunc(&setting, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37265,11 +37383,11 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_add_pre ) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; - retVal___ = preHookFunc(parent, name, &type); + retVal___ = preHookFunc(&parent, &name, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37280,10 +37398,10 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if( HPMHooks.count.HP_libconfig_setting_add_post ) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, parent, name, &type); + retVal___ = postHookFunc(retVal___, parent, name, type); } } return retVal___; @@ -37292,11 +37410,11 @@ int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *nam int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_pre ) { - int (*preHookFunc) (struct config_setting_t *parent, const char *name); + int (*preHookFunc) (struct config_setting_t **parent, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func; - retVal___ = preHookFunc(parent, name); + retVal___ = preHookFunc(&parent, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37319,11 +37437,11 @@ int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) { - int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx); + int (*preHookFunc) (struct config_setting_t **parent, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func; - retVal___ = preHookFunc(parent, &idx); + retVal___ = preHookFunc(&parent, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37334,10 +37452,10 @@ int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned i retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx); } if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, parent, &idx); + retVal___ = postHookFunc(retVal___, parent, idx); } } return retVal___; @@ -37345,11 +37463,11 @@ int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned i void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) { - void (*preHookFunc) (struct config_setting_t *setting, void *hook); + void (*preHookFunc) (struct config_setting_t **setting, void **hook); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func; - preHookFunc(setting, hook); + preHookFunc(&setting, &hook); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37372,11 +37490,11 @@ struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, cons int hIndex = 0; struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_lookup_pre ) { - struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath); + struct config_setting_t* (*preHookFunc) (const struct config_t **config, const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath); + retVal___ = preHookFunc(&config, &filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37399,11 +37517,11 @@ int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37426,11 +37544,11 @@ int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepat int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, long long **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37453,11 +37571,11 @@ int HP_libconfig_lookup_float(const struct config_t *config, const char *filepat int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_float_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, double **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37480,11 +37598,11 @@ int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37507,11 +37625,11 @@ int HP_libconfig_lookup_string(const struct config_t *config, const char *filepa int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_string_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value); + int (*preHookFunc) (const struct config_t **config, const char **filepath, const char ***value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func; - retVal___ = preHookFunc(config, filepath, value); + retVal___ = preHookFunc(&config, &filepath, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37534,11 +37652,11 @@ int HP_libconfig_load_file(struct config_t *config, const char *config_filename) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_load_file_pre ) { - int (*preHookFunc) (struct config_t *config, const char *config_filename); + int (*preHookFunc) (struct config_t **config, const char **config_filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func; - retVal___ = preHookFunc(config, config_filename); + retVal___ = preHookFunc(&config, &config_filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37560,11 +37678,11 @@ int HP_libconfig_load_file(struct config_t *config, const char *config_filename) void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) { - void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func; - preHookFunc(parent, src); + preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37586,11 +37704,11 @@ void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const str void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) { - void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func; - preHookFunc(parent, src); + preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37612,11 +37730,11 @@ void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struc void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) { - void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func; - preHookFunc(parent, src); + preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37639,11 +37757,11 @@ int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct conf int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_copy_pre ) { - int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); + int (*preHookFunc) (struct config_setting_t **parent, const struct config_setting_t **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func; - retVal___ = preHookFunc(parent, src); + retVal___ = preHookFunc(&parent, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37666,11 +37784,11 @@ bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) { - bool (*preHookFunc) (const struct config_setting_t *setting); + bool (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37693,11 +37811,11 @@ uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) { - uint32 (*preHookFunc) (const struct config_setting_t *setting); + uint32 (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37720,11 +37838,11 @@ uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) { int hIndex = 0; uint16 retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) { - uint16 (*preHookFunc) (const struct config_setting_t *setting); + uint16 (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37747,11 +37865,11 @@ int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) { int hIndex = 0; int16 retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) { - int16 (*preHookFunc) (const struct config_setting_t *setting); + int16 (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func; - retVal___ = preHookFunc(setting); + retVal___ = preHookFunc(&setting); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37774,11 +37892,11 @@ int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, bool **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37801,11 +37919,11 @@ int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, uint32 **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37828,11 +37946,11 @@ int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, uint16 **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37855,11 +37973,11 @@ int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, int16 **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, value); + retVal___ = preHookFunc(&setting, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37882,11 +38000,11 @@ int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *se int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) { - int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + int (*preHookFunc) (const struct config_setting_t **setting, const char **name, char **out, size_t *out_size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func; - retVal___ = preHookFunc(setting, name, out, &out_size); + retVal___ = preHookFunc(&setting, &name, &out, &out_size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37897,10 +38015,10 @@ int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *se retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size); } if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) { - int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t out_size); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, name, out, &out_size); + retVal___ = postHookFunc(retVal___, setting, name, out, out_size); } } return retVal___; @@ -37909,11 +38027,11 @@ int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) { - int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size); + int (*preHookFunc) (const struct config_t **config, const char **name, char **out, size_t *out_size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func; - retVal___ = preHookFunc(config, name, out, &out_size); + retVal___ = preHookFunc(&config, &name, &out, &out_size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37924,23 +38042,23 @@ int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size); } if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) { - int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t out_size); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func; - retVal___ = postHookFunc(retVal___, config, name, out, &out_size); + retVal___ = postHookFunc(retVal___, config, name, out, out_size); } } return retVal___; } -/* logs */ +/* log_interface */ void HP_logs_pick_pc(struct map_session_data *sd, e_log_pick_type type, int amount, struct item *itm, struct item_data *data) { int hIndex = 0; if( HPMHooks.count.HP_logs_pick_pc_pre ) { - void (*preHookFunc) (struct map_session_data *sd, e_log_pick_type *type, int *amount, struct item *itm, struct item_data *data); + void (*preHookFunc) (struct map_session_data **sd, e_log_pick_type *type, int *amount, struct item **itm, struct item_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_pick_pc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_pick_pc_pre[hIndex].func; - preHookFunc(sd, &type, &amount, itm, data); + preHookFunc(&sd, &type, &amount, &itm, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37951,10 +38069,10 @@ void HP_logs_pick_pc(struct map_session_data *sd, e_log_pick_type type, int amou HPMHooks.source.logs.pick_pc(sd, type, amount, itm, data); } if( HPMHooks.count.HP_logs_pick_pc_post ) { - void (*postHookFunc) (struct map_session_data *sd, e_log_pick_type *type, int *amount, struct item *itm, struct item_data *data); + void (*postHookFunc) (struct map_session_data *sd, e_log_pick_type type, int amount, struct item *itm, struct item_data *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_pick_pc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_pick_pc_post[hIndex].func; - postHookFunc(sd, &type, &amount, itm, data); + postHookFunc(sd, type, amount, itm, data); } } return; @@ -37962,11 +38080,11 @@ void HP_logs_pick_pc(struct map_session_data *sd, e_log_pick_type type, int amou void HP_logs_pick_mob(struct mob_data *md, e_log_pick_type type, int amount, struct item *itm, struct item_data *data) { int hIndex = 0; if( HPMHooks.count.HP_logs_pick_mob_pre ) { - void (*preHookFunc) (struct mob_data *md, e_log_pick_type *type, int *amount, struct item *itm, struct item_data *data); + void (*preHookFunc) (struct mob_data **md, e_log_pick_type *type, int *amount, struct item **itm, struct item_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_pick_mob_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_pick_mob_pre[hIndex].func; - preHookFunc(md, &type, &amount, itm, data); + preHookFunc(&md, &type, &amount, &itm, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37977,10 +38095,10 @@ void HP_logs_pick_mob(struct mob_data *md, e_log_pick_type type, int amount, str HPMHooks.source.logs.pick_mob(md, type, amount, itm, data); } if( HPMHooks.count.HP_logs_pick_mob_post ) { - void (*postHookFunc) (struct mob_data *md, e_log_pick_type *type, int *amount, struct item *itm, struct item_data *data); + void (*postHookFunc) (struct mob_data *md, e_log_pick_type type, int amount, struct item *itm, struct item_data *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_pick_mob_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_pick_mob_post[hIndex].func; - postHookFunc(md, &type, &amount, itm, data); + postHookFunc(md, type, amount, itm, data); } } return; @@ -37988,11 +38106,11 @@ void HP_logs_pick_mob(struct mob_data *md, e_log_pick_type type, int amount, str void HP_logs_zeny(struct map_session_data *sd, e_log_pick_type type, struct map_session_data *src_sd, int amount) { int hIndex = 0; if( HPMHooks.count.HP_logs_zeny_pre ) { - void (*preHookFunc) (struct map_session_data *sd, e_log_pick_type *type, struct map_session_data *src_sd, int *amount); + void (*preHookFunc) (struct map_session_data **sd, e_log_pick_type *type, struct map_session_data **src_sd, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_zeny_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_zeny_pre[hIndex].func; - preHookFunc(sd, &type, src_sd, &amount); + preHookFunc(&sd, &type, &src_sd, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38003,10 +38121,10 @@ void HP_logs_zeny(struct map_session_data *sd, e_log_pick_type type, struct map_ HPMHooks.source.logs.zeny(sd, type, src_sd, amount); } if( HPMHooks.count.HP_logs_zeny_post ) { - void (*postHookFunc) (struct map_session_data *sd, e_log_pick_type *type, struct map_session_data *src_sd, int *amount); + void (*postHookFunc) (struct map_session_data *sd, e_log_pick_type type, struct map_session_data *src_sd, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_zeny_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_zeny_post[hIndex].func; - postHookFunc(sd, &type, src_sd, &amount); + postHookFunc(sd, type, src_sd, amount); } } return; @@ -38014,11 +38132,11 @@ void HP_logs_zeny(struct map_session_data *sd, e_log_pick_type type, struct map_ void HP_logs_npc(struct map_session_data *sd, const char *message) { int hIndex = 0; if( HPMHooks.count.HP_logs_npc_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *message); + void (*preHookFunc) (struct map_session_data **sd, const char **message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_npc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_npc_pre[hIndex].func; - preHookFunc(sd, message); + preHookFunc(&sd, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38040,11 +38158,11 @@ void HP_logs_npc(struct map_session_data *sd, const char *message) { void HP_logs_chat(e_log_chat_type type, int type_id, int src_charid, int src_accid, const char *mapname, int x, int y, const char *dst_charname, const char *message) { int hIndex = 0; if( HPMHooks.count.HP_logs_chat_pre ) { - void (*preHookFunc) (e_log_chat_type *type, int *type_id, int *src_charid, int *src_accid, const char *mapname, int *x, int *y, const char *dst_charname, const char *message); + void (*preHookFunc) (e_log_chat_type *type, int *type_id, int *src_charid, int *src_accid, const char **mapname, int *x, int *y, const char **dst_charname, const char **message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_chat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_chat_pre[hIndex].func; - preHookFunc(&type, &type_id, &src_charid, &src_accid, mapname, &x, &y, dst_charname, message); + preHookFunc(&type, &type_id, &src_charid, &src_accid, &mapname, &x, &y, &dst_charname, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38055,10 +38173,10 @@ void HP_logs_chat(e_log_chat_type type, int type_id, int src_charid, int src_acc HPMHooks.source.logs.chat(type, type_id, src_charid, src_accid, mapname, x, y, dst_charname, message); } if( HPMHooks.count.HP_logs_chat_post ) { - void (*postHookFunc) (e_log_chat_type *type, int *type_id, int *src_charid, int *src_accid, const char *mapname, int *x, int *y, const char *dst_charname, const char *message); + void (*postHookFunc) (e_log_chat_type type, int type_id, int src_charid, int src_accid, const char *mapname, int x, int y, const char *dst_charname, const char *message); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_chat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_chat_post[hIndex].func; - postHookFunc(&type, &type_id, &src_charid, &src_accid, mapname, &x, &y, dst_charname, message); + postHookFunc(type, type_id, src_charid, src_accid, mapname, x, y, dst_charname, message); } } return; @@ -38066,11 +38184,11 @@ void HP_logs_chat(e_log_chat_type type, int type_id, int src_charid, int src_acc void HP_logs_atcommand(struct map_session_data *sd, const char *message) { int hIndex = 0; if( HPMHooks.count.HP_logs_atcommand_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *message); + void (*preHookFunc) (struct map_session_data **sd, const char **message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_atcommand_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_atcommand_pre[hIndex].func; - preHookFunc(sd, message); + preHookFunc(&sd, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38092,11 +38210,11 @@ void HP_logs_atcommand(struct map_session_data *sd, const char *message) { void HP_logs_branch(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_logs_branch_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_branch_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_branch_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38118,11 +38236,11 @@ void HP_logs_branch(struct map_session_data *sd) { void HP_logs_mvpdrop(struct map_session_data *sd, int monster_id, int *log_mvp) { int hIndex = 0; if( HPMHooks.count.HP_logs_mvpdrop_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *monster_id, int *log_mvp); + void (*preHookFunc) (struct map_session_data **sd, int *monster_id, int **log_mvp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_mvpdrop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_mvpdrop_pre[hIndex].func; - preHookFunc(sd, &monster_id, log_mvp); + preHookFunc(&sd, &monster_id, &log_mvp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38133,10 +38251,10 @@ void HP_logs_mvpdrop(struct map_session_data *sd, int monster_id, int *log_mvp) HPMHooks.source.logs.mvpdrop(sd, monster_id, log_mvp); } if( HPMHooks.count.HP_logs_mvpdrop_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *monster_id, int *log_mvp); + void (*postHookFunc) (struct map_session_data *sd, int monster_id, int *log_mvp); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_mvpdrop_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_mvpdrop_post[hIndex].func; - postHookFunc(sd, &monster_id, log_mvp); + postHookFunc(sd, monster_id, log_mvp); } } return; @@ -38144,11 +38262,11 @@ void HP_logs_mvpdrop(struct map_session_data *sd, int monster_id, int *log_mvp) void HP_logs_pick_sub(int id, int16 m, e_log_pick_type type, int amount, struct item *itm, struct item_data *data) { int hIndex = 0; if( HPMHooks.count.HP_logs_pick_sub_pre ) { - void (*preHookFunc) (int *id, int16 *m, e_log_pick_type *type, int *amount, struct item *itm, struct item_data *data); + void (*preHookFunc) (int *id, int16 *m, e_log_pick_type *type, int *amount, struct item **itm, struct item_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_pick_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_pick_sub_pre[hIndex].func; - preHookFunc(&id, &m, &type, &amount, itm, data); + preHookFunc(&id, &m, &type, &amount, &itm, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38159,10 +38277,10 @@ void HP_logs_pick_sub(int id, int16 m, e_log_pick_type type, int amount, struct HPMHooks.source.logs.pick_sub(id, m, type, amount, itm, data); } if( HPMHooks.count.HP_logs_pick_sub_post ) { - void (*postHookFunc) (int *id, int16 *m, e_log_pick_type *type, int *amount, struct item *itm, struct item_data *data); + void (*postHookFunc) (int id, int16 m, e_log_pick_type type, int amount, struct item *itm, struct item_data *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_pick_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_pick_sub_post[hIndex].func; - postHookFunc(&id, &m, &type, &amount, itm, data); + postHookFunc(id, m, type, amount, itm, data); } } return; @@ -38170,11 +38288,11 @@ void HP_logs_pick_sub(int id, int16 m, e_log_pick_type type, int amount, struct void HP_logs_zeny_sub(struct map_session_data *sd, e_log_pick_type type, struct map_session_data *src_sd, int amount) { int hIndex = 0; if( HPMHooks.count.HP_logs_zeny_sub_pre ) { - void (*preHookFunc) (struct map_session_data *sd, e_log_pick_type *type, struct map_session_data *src_sd, int *amount); + void (*preHookFunc) (struct map_session_data **sd, e_log_pick_type *type, struct map_session_data **src_sd, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_zeny_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_zeny_sub_pre[hIndex].func; - preHookFunc(sd, &type, src_sd, &amount); + preHookFunc(&sd, &type, &src_sd, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38185,10 +38303,10 @@ void HP_logs_zeny_sub(struct map_session_data *sd, e_log_pick_type type, struct HPMHooks.source.logs.zeny_sub(sd, type, src_sd, amount); } if( HPMHooks.count.HP_logs_zeny_sub_post ) { - void (*postHookFunc) (struct map_session_data *sd, e_log_pick_type *type, struct map_session_data *src_sd, int *amount); + void (*postHookFunc) (struct map_session_data *sd, e_log_pick_type type, struct map_session_data *src_sd, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_zeny_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_zeny_sub_post[hIndex].func; - postHookFunc(sd, &type, src_sd, &amount); + postHookFunc(sd, type, src_sd, amount); } } return; @@ -38196,11 +38314,11 @@ void HP_logs_zeny_sub(struct map_session_data *sd, e_log_pick_type type, struct void HP_logs_npc_sub(struct map_session_data *sd, const char *message) { int hIndex = 0; if( HPMHooks.count.HP_logs_npc_sub_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *message); + void (*preHookFunc) (struct map_session_data **sd, const char **message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_npc_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_npc_sub_pre[hIndex].func; - preHookFunc(sd, message); + preHookFunc(&sd, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38222,11 +38340,11 @@ void HP_logs_npc_sub(struct map_session_data *sd, const char *message) { void HP_logs_chat_sub(e_log_chat_type type, int type_id, int src_charid, int src_accid, const char *mapname, int x, int y, const char *dst_charname, const char *message) { int hIndex = 0; if( HPMHooks.count.HP_logs_chat_sub_pre ) { - void (*preHookFunc) (e_log_chat_type *type, int *type_id, int *src_charid, int *src_accid, const char *mapname, int *x, int *y, const char *dst_charname, const char *message); + void (*preHookFunc) (e_log_chat_type *type, int *type_id, int *src_charid, int *src_accid, const char **mapname, int *x, int *y, const char **dst_charname, const char **message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_chat_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_chat_sub_pre[hIndex].func; - preHookFunc(&type, &type_id, &src_charid, &src_accid, mapname, &x, &y, dst_charname, message); + preHookFunc(&type, &type_id, &src_charid, &src_accid, &mapname, &x, &y, &dst_charname, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38237,10 +38355,10 @@ void HP_logs_chat_sub(e_log_chat_type type, int type_id, int src_charid, int src HPMHooks.source.logs.chat_sub(type, type_id, src_charid, src_accid, mapname, x, y, dst_charname, message); } if( HPMHooks.count.HP_logs_chat_sub_post ) { - void (*postHookFunc) (e_log_chat_type *type, int *type_id, int *src_charid, int *src_accid, const char *mapname, int *x, int *y, const char *dst_charname, const char *message); + void (*postHookFunc) (e_log_chat_type type, int type_id, int src_charid, int src_accid, const char *mapname, int x, int y, const char *dst_charname, const char *message); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_chat_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_chat_sub_post[hIndex].func; - postHookFunc(&type, &type_id, &src_charid, &src_accid, mapname, &x, &y, dst_charname, message); + postHookFunc(type, type_id, src_charid, src_accid, mapname, x, y, dst_charname, message); } } return; @@ -38248,11 +38366,11 @@ void HP_logs_chat_sub(e_log_chat_type type, int type_id, int src_charid, int src void HP_logs_atcommand_sub(struct map_session_data *sd, const char *message) { int hIndex = 0; if( HPMHooks.count.HP_logs_atcommand_sub_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *message); + void (*preHookFunc) (struct map_session_data **sd, const char **message); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_atcommand_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_atcommand_sub_pre[hIndex].func; - preHookFunc(sd, message); + preHookFunc(&sd, &message); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38274,11 +38392,11 @@ void HP_logs_atcommand_sub(struct map_session_data *sd, const char *message) { void HP_logs_branch_sub(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_logs_branch_sub_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_branch_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_branch_sub_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38300,11 +38418,11 @@ void HP_logs_branch_sub(struct map_session_data *sd) { void HP_logs_mvpdrop_sub(struct map_session_data *sd, int monster_id, int *log_mvp) { int hIndex = 0; if( HPMHooks.count.HP_logs_mvpdrop_sub_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *monster_id, int *log_mvp); + void (*preHookFunc) (struct map_session_data **sd, int *monster_id, int **log_mvp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_mvpdrop_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_mvpdrop_sub_pre[hIndex].func; - preHookFunc(sd, &monster_id, log_mvp); + preHookFunc(&sd, &monster_id, &log_mvp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38315,10 +38433,10 @@ void HP_logs_mvpdrop_sub(struct map_session_data *sd, int monster_id, int *log_m HPMHooks.source.logs.mvpdrop_sub(sd, monster_id, log_mvp); } if( HPMHooks.count.HP_logs_mvpdrop_sub_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *monster_id, int *log_mvp); + void (*postHookFunc) (struct map_session_data *sd, int monster_id, int *log_mvp); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_mvpdrop_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_mvpdrop_sub_post[hIndex].func; - postHookFunc(sd, &monster_id, log_mvp); + postHookFunc(sd, monster_id, log_mvp); } } return; @@ -38327,11 +38445,11 @@ int HP_logs_config_read(const char *cfgName) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_logs_config_read_pre ) { - int (*preHookFunc) (const char *cfgName); + int (*preHookFunc) (const char **cfgName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_config_read_pre[hIndex].func; - retVal___ = preHookFunc(cfgName); + retVal___ = preHookFunc(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38447,10 +38565,10 @@ char HP_logs_picktype2char(e_log_pick_type type) { retVal___ = HPMHooks.source.logs.picktype2char(type); } if( HPMHooks.count.HP_logs_picktype2char_post ) { - char (*postHookFunc) (char retVal___, e_log_pick_type *type); + char (*postHookFunc) (char retVal___, e_log_pick_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_picktype2char_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_picktype2char_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; @@ -38474,10 +38592,10 @@ char HP_logs_chattype2char(e_log_chat_type type) { retVal___ = HPMHooks.source.logs.chattype2char(type); } if( HPMHooks.count.HP_logs_chattype2char_post ) { - char (*postHookFunc) (char retVal___, e_log_chat_type *type); + char (*postHookFunc) (char retVal___, e_log_chat_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_chattype2char_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_chattype2char_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; @@ -38486,11 +38604,11 @@ bool HP_logs_should_log_item(int nameid, int amount, int refine, struct item_dat int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_logs_should_log_item_pre ) { - bool (*preHookFunc) (int *nameid, int *amount, int *refine, struct item_data *id); + bool (*preHookFunc) (int *nameid, int *amount, int *refine, struct item_data **id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_should_log_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_logs_should_log_item_pre[hIndex].func; - retVal___ = preHookFunc(&nameid, &amount, &refine, id); + retVal___ = preHookFunc(&nameid, &amount, &refine, &id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38501,23 +38619,23 @@ bool HP_logs_should_log_item(int nameid, int amount, int refine, struct item_dat retVal___ = HPMHooks.source.logs.should_log_item(nameid, amount, refine, id); } if( HPMHooks.count.HP_logs_should_log_item_post ) { - bool (*postHookFunc) (bool retVal___, int *nameid, int *amount, int *refine, struct item_data *id); + bool (*postHookFunc) (bool retVal___, int nameid, int amount, int refine, struct item_data *id); for(hIndex = 0; hIndex < HPMHooks.count.HP_logs_should_log_item_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_logs_should_log_item_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &nameid, &amount, &refine, id); + retVal___ = postHookFunc(retVal___, nameid, amount, refine, id); } } return retVal___; } -/* mail */ +/* mail_interface */ void HP_mail_clear(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_mail_clear_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_clear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mail_clear_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38540,11 +38658,11 @@ int HP_mail_removeitem(struct map_session_data *sd, short flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mail_removeitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, short *flag); + int (*preHookFunc) (struct map_session_data **sd, short *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_removeitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mail_removeitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &flag); + retVal___ = preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38555,10 +38673,10 @@ int HP_mail_removeitem(struct map_session_data *sd, short flag) { retVal___ = HPMHooks.source.mail.removeitem(sd, flag); } if( HPMHooks.count.HP_mail_removeitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, short *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, short flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_removeitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mail_removeitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &flag); + retVal___ = postHookFunc(retVal___, sd, flag); } } return retVal___; @@ -38567,11 +38685,11 @@ int HP_mail_removezeny(struct map_session_data *sd, short flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mail_removezeny_pre ) { - int (*preHookFunc) (struct map_session_data *sd, short *flag); + int (*preHookFunc) (struct map_session_data **sd, short *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_removezeny_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mail_removezeny_pre[hIndex].func; - retVal___ = preHookFunc(sd, &flag); + retVal___ = preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38582,10 +38700,10 @@ int HP_mail_removezeny(struct map_session_data *sd, short flag) { retVal___ = HPMHooks.source.mail.removezeny(sd, flag); } if( HPMHooks.count.HP_mail_removezeny_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, short *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, short flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_removezeny_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mail_removezeny_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &flag); + retVal___ = postHookFunc(retVal___, sd, flag); } } return retVal___; @@ -38594,11 +38712,11 @@ unsigned char HP_mail_setitem(struct map_session_data *sd, int idx, int amount) int hIndex = 0; unsigned char retVal___ = 0; if( HPMHooks.count.HP_mail_setitem_pre ) { - unsigned char (*preHookFunc) (struct map_session_data *sd, int *idx, int *amount); + unsigned char (*preHookFunc) (struct map_session_data **sd, int *idx, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_setitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mail_setitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &idx, &amount); + retVal___ = preHookFunc(&sd, &idx, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38609,10 +38727,10 @@ unsigned char HP_mail_setitem(struct map_session_data *sd, int idx, int amount) retVal___ = HPMHooks.source.mail.setitem(sd, idx, amount); } if( HPMHooks.count.HP_mail_setitem_post ) { - unsigned char (*postHookFunc) (unsigned char retVal___, struct map_session_data *sd, int *idx, int *amount); + unsigned char (*postHookFunc) (unsigned char retVal___, struct map_session_data *sd, int idx, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_setitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mail_setitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &idx, &amount); + retVal___ = postHookFunc(retVal___, sd, idx, amount); } } return retVal___; @@ -38621,11 +38739,11 @@ bool HP_mail_setattachment(struct map_session_data *sd, struct mail_message *msg int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mail_setattachment_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, struct mail_message *msg); + bool (*preHookFunc) (struct map_session_data **sd, struct mail_message **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_setattachment_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mail_setattachment_pre[hIndex].func; - retVal___ = preHookFunc(sd, msg); + retVal___ = preHookFunc(&sd, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38647,11 +38765,11 @@ bool HP_mail_setattachment(struct map_session_data *sd, struct mail_message *msg void HP_mail_getattachment(struct map_session_data *sd, int zeny, struct item *item) { int hIndex = 0; if( HPMHooks.count.HP_mail_getattachment_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *zeny, struct item *item); + void (*preHookFunc) (struct map_session_data **sd, int *zeny, struct item **item); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_getattachment_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mail_getattachment_pre[hIndex].func; - preHookFunc(sd, &zeny, item); + preHookFunc(&sd, &zeny, &item); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38662,10 +38780,10 @@ void HP_mail_getattachment(struct map_session_data *sd, int zeny, struct item *i HPMHooks.source.mail.getattachment(sd, zeny, item); } if( HPMHooks.count.HP_mail_getattachment_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *zeny, struct item *item); + void (*postHookFunc) (struct map_session_data *sd, int zeny, struct item *item); for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_getattachment_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mail_getattachment_post[hIndex].func; - postHookFunc(sd, &zeny, item); + postHookFunc(sd, zeny, item); } } return; @@ -38674,11 +38792,11 @@ int HP_mail_openmail(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mail_openmail_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_openmail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mail_openmail_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38700,11 +38818,11 @@ int HP_mail_openmail(struct map_session_data *sd) { void HP_mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg) { int hIndex = 0; if( HPMHooks.count.HP_mail_deliveryfail_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct mail_message *msg); + void (*preHookFunc) (struct map_session_data **sd, struct mail_message **msg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_deliveryfail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mail_deliveryfail_pre[hIndex].func; - preHookFunc(sd, msg); + preHookFunc(&sd, &msg); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38727,11 +38845,11 @@ bool HP_mail_invalid_operation(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mail_invalid_operation_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mail_invalid_operation_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mail_invalid_operation_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38750,7 +38868,7 @@ bool HP_mail_invalid_operation(struct map_session_data *sd) { } return retVal___; } -/* iMalloc */ +/* malloc_interface */ void HP_iMalloc_init(void) { int hIndex = 0; if( HPMHooks.count.HP_iMalloc_init_pre ) { @@ -38807,11 +38925,11 @@ void* HP_iMalloc_malloc(size_t size, const char *file, int line, const char *fun int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_malloc_pre ) { - void* (*preHookFunc) (size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_malloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_malloc_pre[hIndex].func; - retVal___ = preHookFunc(&size, file, &line, func); + retVal___ = preHookFunc(&size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38822,10 +38940,10 @@ void* HP_iMalloc_malloc(size_t size, const char *file, int line, const char *fun retVal___ = HPMHooks.source.iMalloc.malloc(size, file, line, func); } if( HPMHooks.count.HP_iMalloc_malloc_post ) { - void* (*postHookFunc) (void* retVal___, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_malloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_malloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, size, file, line, func); } } return retVal___; @@ -38834,11 +38952,11 @@ void* HP_iMalloc_calloc(size_t num, size_t size, const char *file, int line, con int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_calloc_pre ) { - void* (*preHookFunc) (size_t *num, size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (size_t *num, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_calloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_calloc_pre[hIndex].func; - retVal___ = preHookFunc(&num, &size, file, &line, func); + retVal___ = preHookFunc(&num, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38849,10 +38967,10 @@ void* HP_iMalloc_calloc(size_t num, size_t size, const char *file, int line, con retVal___ = HPMHooks.source.iMalloc.calloc(num, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_calloc_post ) { - void* (*postHookFunc) (void* retVal___, size_t *num, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, size_t num, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_calloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_calloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &num, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, num, size, file, line, func); } } return retVal___; @@ -38861,11 +38979,11 @@ void* HP_iMalloc_realloc(void *p, size_t size, const char *file, int line, const int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_realloc_pre ) { - void* (*preHookFunc) (void *p, size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (void **p, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_realloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_realloc_pre[hIndex].func; - retVal___ = preHookFunc(p, &size, file, &line, func); + retVal___ = preHookFunc(&p, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38876,10 +38994,10 @@ void* HP_iMalloc_realloc(void *p, size_t size, const char *file, int line, const retVal___ = HPMHooks.source.iMalloc.realloc(p, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_realloc_post ) { - void* (*postHookFunc) (void* retVal___, void *p, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, void *p, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_realloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_realloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, p, size, file, line, func); } } return retVal___; @@ -38888,11 +39006,11 @@ void* HP_iMalloc_reallocz(void *p, size_t size, const char *file, int line, cons int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_reallocz_pre ) { - void* (*preHookFunc) (void *p, size_t *size, const char *file, int *line, const char *func); + void* (*preHookFunc) (void **p, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_reallocz_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_reallocz_pre[hIndex].func; - retVal___ = preHookFunc(p, &size, file, &line, func); + retVal___ = preHookFunc(&p, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38903,10 +39021,10 @@ void* HP_iMalloc_reallocz(void *p, size_t size, const char *file, int line, cons retVal___ = HPMHooks.source.iMalloc.reallocz(p, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_reallocz_post ) { - void* (*postHookFunc) (void* retVal___, void *p, size_t *size, const char *file, int *line, const char *func); + void* (*postHookFunc) (void* retVal___, void *p, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_reallocz_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_reallocz_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, p, size, file, line, func); } } return retVal___; @@ -38915,11 +39033,11 @@ char* HP_iMalloc_astrdup(const char *p, const char *file, int line, const char * int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_astrdup_pre ) { - char* (*preHookFunc) (const char *p, const char *file, int *line, const char *func); + char* (*preHookFunc) (const char **p, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrdup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_astrdup_pre[hIndex].func; - retVal___ = preHookFunc(p, file, &line, func); + retVal___ = preHookFunc(&p, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38930,10 +39048,10 @@ char* HP_iMalloc_astrdup(const char *p, const char *file, int line, const char * retVal___ = HPMHooks.source.iMalloc.astrdup(p, file, line, func); } if( HPMHooks.count.HP_iMalloc_astrdup_post ) { - char* (*postHookFunc) (char* retVal___, const char *p, const char *file, int *line, const char *func); + char* (*postHookFunc) (char* retVal___, const char *p, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrdup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_astrdup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, file, &line, func); + retVal___ = postHookFunc(retVal___, p, file, line, func); } } return retVal___; @@ -38942,11 +39060,11 @@ char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_iMalloc_astrndup_pre ) { - char* (*preHookFunc) (const char *p, size_t *size, const char *file, int *line, const char *func); + char* (*preHookFunc) (const char **p, size_t *size, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_astrndup_pre[hIndex].func; - retVal___ = preHookFunc(p, &size, file, &line, func); + retVal___ = preHookFunc(&p, &size, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38957,10 +39075,10 @@ char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line retVal___ = HPMHooks.source.iMalloc.astrndup(p, size, file, line, func); } if( HPMHooks.count.HP_iMalloc_astrndup_post ) { - char* (*postHookFunc) (char* retVal___, const char *p, size_t *size, const char *file, int *line, const char *func); + char* (*postHookFunc) (char* retVal___, const char *p, size_t size, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_astrndup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + retVal___ = postHookFunc(retVal___, p, size, file, line, func); } } return retVal___; @@ -38968,11 +39086,11 @@ char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line void HP_iMalloc_free(void *p, const char *file, int line, const char *func) { int hIndex = 0; if( HPMHooks.count.HP_iMalloc_free_pre ) { - void (*preHookFunc) (void *p, const char *file, int *line, const char *func); + void (*preHookFunc) (void **p, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_free_pre[hIndex].func; - preHookFunc(p, file, &line, func); + preHookFunc(&p, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -38983,10 +39101,10 @@ void HP_iMalloc_free(void *p, const char *file, int line, const char *func) { HPMHooks.source.iMalloc.free(p, file, line, func); } if( HPMHooks.count.HP_iMalloc_free_post ) { - void (*postHookFunc) (void *p, const char *file, int *line, const char *func); + void (*postHookFunc) (void *p, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_free_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_iMalloc_free_post[hIndex].func; - postHookFunc(p, file, &line, func); + postHookFunc(p, file, line, func); } } return; @@ -39021,11 +39139,11 @@ bool HP_iMalloc_verify_ptr(void *ptr) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_iMalloc_verify_ptr_pre ) { - bool (*preHookFunc) (void *ptr); + bool (*preHookFunc) (void **ptr); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_verify_ptr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_iMalloc_verify_ptr_pre[hIndex].func; - retVal___ = preHookFunc(ptr); + retVal___ = preHookFunc(&ptr); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39123,7 +39241,7 @@ void HP_iMalloc_init_messages(void) { } return; } -/* map */ +/* map_interface */ void HP_map_zone_init(void) { int hIndex = 0; if( HPMHooks.count.HP_map_zone_init_pre ) { @@ -39168,10 +39286,10 @@ void HP_map_zone_remove(int m) { HPMHooks.source.map.zone_remove(m); } if( HPMHooks.count.HP_map_zone_remove_post ) { - void (*postHookFunc) (int *m); + void (*postHookFunc) (int m); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_remove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_zone_remove_post[hIndex].func; - postHookFunc(&m); + postHookFunc(m); } } return; @@ -39179,11 +39297,11 @@ void HP_map_zone_remove(int m) { void HP_map_zone_apply(int m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath) { int hIndex = 0; if( HPMHooks.count.HP_map_zone_apply_pre ) { - void (*preHookFunc) (int *m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath); + void (*preHookFunc) (int *m, struct map_zone_data **zone, const char **start, const char **buffer, const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_apply_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_zone_apply_pre[hIndex].func; - preHookFunc(&m, zone, start, buffer, filepath); + preHookFunc(&m, &zone, &start, &buffer, &filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39194,10 +39312,10 @@ void HP_map_zone_apply(int m, struct map_zone_data *zone, const char *start, con HPMHooks.source.map.zone_apply(m, zone, start, buffer, filepath); } if( HPMHooks.count.HP_map_zone_apply_post ) { - void (*postHookFunc) (int *m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath); + void (*postHookFunc) (int m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_apply_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_zone_apply_post[hIndex].func; - postHookFunc(&m, zone, start, buffer, filepath); + postHookFunc(m, zone, start, buffer, filepath); } } return; @@ -39205,11 +39323,11 @@ void HP_map_zone_apply(int m, struct map_zone_data *zone, const char *start, con void HP_map_zone_change(int m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath) { int hIndex = 0; if( HPMHooks.count.HP_map_zone_change_pre ) { - void (*preHookFunc) (int *m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath); + void (*preHookFunc) (int *m, struct map_zone_data **zone, const char **start, const char **buffer, const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_change_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_zone_change_pre[hIndex].func; - preHookFunc(&m, zone, start, buffer, filepath); + preHookFunc(&m, &zone, &start, &buffer, &filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39220,10 +39338,10 @@ void HP_map_zone_change(int m, struct map_zone_data *zone, const char *start, co HPMHooks.source.map.zone_change(m, zone, start, buffer, filepath); } if( HPMHooks.count.HP_map_zone_change_post ) { - void (*postHookFunc) (int *m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath); + void (*postHookFunc) (int m, struct map_zone_data *zone, const char *start, const char *buffer, const char *filepath); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_change_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_zone_change_post[hIndex].func; - postHookFunc(&m, zone, start, buffer, filepath); + postHookFunc(m, zone, start, buffer, filepath); } } return; @@ -39231,11 +39349,11 @@ void HP_map_zone_change(int m, struct map_zone_data *zone, const char *start, co void HP_map_zone_change2(int m, struct map_zone_data *zone) { int hIndex = 0; if( HPMHooks.count.HP_map_zone_change2_pre ) { - void (*preHookFunc) (int *m, struct map_zone_data *zone); + void (*preHookFunc) (int *m, struct map_zone_data **zone); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_change2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_zone_change2_pre[hIndex].func; - preHookFunc(&m, zone); + preHookFunc(&m, &zone); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39246,10 +39364,10 @@ void HP_map_zone_change2(int m, struct map_zone_data *zone) { HPMHooks.source.map.zone_change2(m, zone); } if( HPMHooks.count.HP_map_zone_change2_post ) { - void (*postHookFunc) (int *m, struct map_zone_data *zone); + void (*postHookFunc) (int m, struct map_zone_data *zone); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_change2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_zone_change2_post[hIndex].func; - postHookFunc(&m, zone); + postHookFunc(m, zone); } } return; @@ -39258,11 +39376,11 @@ int HP_map_getcell(int16 m, const struct block_list *bl, int16 x, int16 y, cell_ int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_getcell_pre ) { - int (*preHookFunc) (int16 *m, const struct block_list *bl, int16 *x, int16 *y, cell_chk *cellchk); + int (*preHookFunc) (int16 *m, const struct block_list **bl, int16 *x, int16 *y, cell_chk *cellchk); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_getcell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_getcell_pre[hIndex].func; - retVal___ = preHookFunc(&m, bl, &x, &y, &cellchk); + retVal___ = preHookFunc(&m, &bl, &x, &y, &cellchk); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39273,10 +39391,10 @@ int HP_map_getcell(int16 m, const struct block_list *bl, int16 x, int16 y, cell_ retVal___ = HPMHooks.source.map.getcell(m, bl, x, y, cellchk); } if( HPMHooks.count.HP_map_getcell_post ) { - int (*postHookFunc) (int retVal___, int16 *m, const struct block_list *bl, int16 *x, int16 *y, cell_chk *cellchk); + int (*postHookFunc) (int retVal___, int16 m, const struct block_list *bl, int16 x, int16 y, cell_chk cellchk); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_getcell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_getcell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, bl, &x, &y, &cellchk); + retVal___ = postHookFunc(retVal___, m, bl, x, y, cellchk); } } return retVal___; @@ -39299,10 +39417,10 @@ void HP_map_setgatcell(int16 m, int16 x, int16 y, int gat) { HPMHooks.source.map.setgatcell(m, x, y, gat); } if( HPMHooks.count.HP_map_setgatcell_post ) { - void (*postHookFunc) (int16 *m, int16 *x, int16 *y, int *gat); + void (*postHookFunc) (int16 m, int16 x, int16 y, int gat); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_setgatcell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_setgatcell_post[hIndex].func; - postHookFunc(&m, &x, &y, &gat); + postHookFunc(m, x, y, gat); } } return; @@ -39310,11 +39428,11 @@ void HP_map_setgatcell(int16 m, int16 x, int16 y, int gat) { void HP_map_cellfromcache(struct map_data *m) { int hIndex = 0; if( HPMHooks.count.HP_map_cellfromcache_pre ) { - void (*preHookFunc) (struct map_data *m); + void (*preHookFunc) (struct map_data **m); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_cellfromcache_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_cellfromcache_pre[hIndex].func; - preHookFunc(m); + preHookFunc(&m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39351,10 +39469,10 @@ void HP_map_setusers(int p1) { HPMHooks.source.map.setusers(p1); } if( HPMHooks.count.HP_map_setusers_post ) { - void (*postHookFunc) (int *p1); + void (*postHookFunc) (int p1); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_setusers_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_setusers_post[hIndex].func; - postHookFunc(&p1); + postHookFunc(p1); } } return; @@ -39417,11 +39535,11 @@ int HP_map_freeblock(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_freeblock_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_freeblock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_freeblock_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39498,11 +39616,11 @@ int HP_map_addblock(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_addblock_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addblock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_addblock_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39525,11 +39643,11 @@ int HP_map_delblock(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_delblock_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_delblock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_delblock_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39552,11 +39670,11 @@ int HP_map_moveblock(struct block_list *bl, int x1, int y1, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_moveblock_pre ) { - int (*preHookFunc) (struct block_list *bl, int *x1, int *y1, int64 *tick); + int (*preHookFunc) (struct block_list **bl, int *x1, int *y1, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_moveblock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_moveblock_pre[hIndex].func; - retVal___ = preHookFunc(bl, &x1, &y1, &tick); + retVal___ = preHookFunc(&bl, &x1, &y1, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39567,10 +39685,10 @@ int HP_map_moveblock(struct block_list *bl, int x1, int y1, int64 tick) { retVal___ = HPMHooks.source.map.moveblock(bl, x1, y1, tick); } if( HPMHooks.count.HP_map_moveblock_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *x1, int *y1, int64 *tick); + int (*postHookFunc) (int retVal___, struct block_list *bl, int x1, int y1, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_moveblock_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_moveblock_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &x1, &y1, &tick); + retVal___ = postHookFunc(retVal___, bl, x1, y1, tick); } } return retVal___; @@ -39594,10 +39712,10 @@ int HP_map_count_oncell(int16 m, int16 x, int16 y, int type, int flag) { retVal___ = HPMHooks.source.map.count_oncell(m, x, y, type, flag); } if( HPMHooks.count.HP_map_count_oncell_post ) { - int (*postHookFunc) (int retVal___, int16 *m, int16 *x, int16 *y, int *type, int *flag); + int (*postHookFunc) (int retVal___, int16 m, int16 x, int16 y, int type, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_count_oncell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_count_oncell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, &x, &y, &type, &flag); + retVal___ = postHookFunc(retVal___, m, x, y, type, flag); } } return retVal___; @@ -39606,11 +39724,11 @@ struct skill_unit* HP_map_find_skill_unit_oncell(struct block_list *target, int1 int hIndex = 0; struct skill_unit* retVal___ = NULL; if( HPMHooks.count.HP_map_find_skill_unit_oncell_pre ) { - struct skill_unit* (*preHookFunc) (struct block_list *target, int16 *x, int16 *y, uint16 *skill_id, struct skill_unit *out_unit, int *flag); + struct skill_unit* (*preHookFunc) (struct block_list **target, int16 *x, int16 *y, uint16 *skill_id, struct skill_unit **out_unit, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_find_skill_unit_oncell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_find_skill_unit_oncell_pre[hIndex].func; - retVal___ = preHookFunc(target, &x, &y, &skill_id, out_unit, &flag); + retVal___ = preHookFunc(&target, &x, &y, &skill_id, &out_unit, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39621,10 +39739,10 @@ struct skill_unit* HP_map_find_skill_unit_oncell(struct block_list *target, int1 retVal___ = HPMHooks.source.map.find_skill_unit_oncell(target, x, y, skill_id, out_unit, flag); } if( HPMHooks.count.HP_map_find_skill_unit_oncell_post ) { - struct skill_unit* (*postHookFunc) (struct skill_unit* retVal___, struct block_list *target, int16 *x, int16 *y, uint16 *skill_id, struct skill_unit *out_unit, int *flag); + struct skill_unit* (*postHookFunc) (struct skill_unit* retVal___, struct block_list *target, int16 x, int16 y, uint16 skill_id, struct skill_unit *out_unit, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_find_skill_unit_oncell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_find_skill_unit_oncell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, target, &x, &y, &skill_id, out_unit, &flag); + retVal___ = postHookFunc(retVal___, target, x, y, skill_id, out_unit, flag); } } return retVal___; @@ -39660,11 +39778,11 @@ int HP_map_search_freecell(struct block_list *src, int16 m, int16 *x, int16 *y, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_search_freecell_pre ) { - int (*preHookFunc) (struct block_list *src, int16 *m, int16 *x, int16 *y, int16 *rx, int16 *ry, int *flag); + int (*preHookFunc) (struct block_list **src, int16 *m, int16 **x, int16 **y, int16 *rx, int16 *ry, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_search_freecell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_search_freecell_pre[hIndex].func; - retVal___ = preHookFunc(src, &m, x, y, &rx, &ry, &flag); + retVal___ = preHookFunc(&src, &m, &x, &y, &rx, &ry, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39675,10 +39793,10 @@ int HP_map_search_freecell(struct block_list *src, int16 m, int16 *x, int16 *y, retVal___ = HPMHooks.source.map.search_freecell(src, m, x, y, rx, ry, flag); } if( HPMHooks.count.HP_map_search_freecell_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, int16 *m, int16 *x, int16 *y, int16 *rx, int16 *ry, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, int16 m, int16 *x, int16 *y, int16 rx, int16 ry, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_search_freecell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_search_freecell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &m, x, y, &rx, &ry, &flag); + retVal___ = postHookFunc(retVal___, src, m, x, y, rx, ry, flag); } } return retVal___; @@ -39687,11 +39805,11 @@ bool HP_map_closest_freecell(int16 m, const struct block_list *bl, int16 *x, int int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_map_closest_freecell_pre ) { - bool (*preHookFunc) (int16 *m, const struct block_list *bl, int16 *x, int16 *y, int *type, int *flag); + bool (*preHookFunc) (int16 *m, const struct block_list **bl, int16 **x, int16 **y, int *type, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_closest_freecell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_closest_freecell_pre[hIndex].func; - retVal___ = preHookFunc(&m, bl, x, y, &type, &flag); + retVal___ = preHookFunc(&m, &bl, &x, &y, &type, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39702,10 +39820,10 @@ bool HP_map_closest_freecell(int16 m, const struct block_list *bl, int16 *x, int retVal___ = HPMHooks.source.map.closest_freecell(m, bl, x, y, type, flag); } if( HPMHooks.count.HP_map_closest_freecell_post ) { - bool (*postHookFunc) (bool retVal___, int16 *m, const struct block_list *bl, int16 *x, int16 *y, int *type, int *flag); + bool (*postHookFunc) (bool retVal___, int16 m, const struct block_list *bl, int16 *x, int16 *y, int type, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_closest_freecell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_closest_freecell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, bl, x, y, &type, &flag); + retVal___ = postHookFunc(retVal___, m, bl, x, y, type, flag); } } return retVal___; @@ -39714,11 +39832,11 @@ int HP_map_quit(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_quit_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_quit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_quit_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39741,11 +39859,11 @@ bool HP_map_addnpc(int16 m, struct npc_data *nd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_map_addnpc_pre ) { - bool (*preHookFunc) (int16 *m, struct npc_data *nd); + bool (*preHookFunc) (int16 *m, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addnpc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_addnpc_pre[hIndex].func; - retVal___ = preHookFunc(&m, nd); + retVal___ = preHookFunc(&m, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39756,10 +39874,10 @@ bool HP_map_addnpc(int16 m, struct npc_data *nd) { retVal___ = HPMHooks.source.map.addnpc(m, nd); } if( HPMHooks.count.HP_map_addnpc_post ) { - bool (*postHookFunc) (bool retVal___, int16 *m, struct npc_data *nd); + bool (*postHookFunc) (bool retVal___, int16 m, struct npc_data *nd); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addnpc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_addnpc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, nd); + retVal___ = postHookFunc(retVal___, m, nd); } } return retVal___; @@ -39783,10 +39901,10 @@ int HP_map_clearflooritem_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.map.clearflooritem_timer(tid, tick, id, data); } if( HPMHooks.count.HP_map_clearflooritem_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_clearflooritem_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_clearflooritem_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -39810,10 +39928,10 @@ int HP_map_removemobs_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.map.removemobs_timer(tid, tick, id, data); } if( HPMHooks.count.HP_map_removemobs_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_removemobs_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_removemobs_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -39821,11 +39939,11 @@ int HP_map_removemobs_timer(int tid, int64 tick, int id, intptr_t data) { void HP_map_clearflooritem(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_map_clearflooritem_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_clearflooritem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_clearflooritem_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39848,11 +39966,11 @@ int HP_map_addflooritem(const struct block_list *bl, struct item *item_data, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_addflooritem_pre ) { - int (*preHookFunc) (const struct block_list *bl, struct item *item_data, int *amount, int16 *m, int16 *x, int16 *y, int *first_charid, int *second_charid, int *third_charid, int *flags); + int (*preHookFunc) (const struct block_list **bl, struct item **item_data, int *amount, int16 *m, int16 *x, int16 *y, int *first_charid, int *second_charid, int *third_charid, int *flags); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addflooritem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_addflooritem_pre[hIndex].func; - retVal___ = preHookFunc(bl, item_data, &amount, &m, &x, &y, &first_charid, &second_charid, &third_charid, &flags); + retVal___ = preHookFunc(&bl, &item_data, &amount, &m, &x, &y, &first_charid, &second_charid, &third_charid, &flags); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39863,10 +39981,10 @@ int HP_map_addflooritem(const struct block_list *bl, struct item *item_data, int retVal___ = HPMHooks.source.map.addflooritem(bl, item_data, amount, m, x, y, first_charid, second_charid, third_charid, flags); } if( HPMHooks.count.HP_map_addflooritem_post ) { - int (*postHookFunc) (int retVal___, const struct block_list *bl, struct item *item_data, int *amount, int16 *m, int16 *x, int16 *y, int *first_charid, int *second_charid, int *third_charid, int *flags); + int (*postHookFunc) (int retVal___, const struct block_list *bl, struct item *item_data, int amount, int16 m, int16 x, int16 y, int first_charid, int second_charid, int third_charid, int flags); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addflooritem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_addflooritem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, item_data, &amount, &m, &x, &y, &first_charid, &second_charid, &third_charid, &flags); + retVal___ = postHookFunc(retVal___, bl, item_data, amount, m, x, y, first_charid, second_charid, third_charid, flags); } } return retVal___; @@ -39874,11 +39992,11 @@ int HP_map_addflooritem(const struct block_list *bl, struct item *item_data, int void HP_map_addnickdb(int charid, const char *nick) { int hIndex = 0; if( HPMHooks.count.HP_map_addnickdb_pre ) { - void (*preHookFunc) (int *charid, const char *nick); + void (*preHookFunc) (int *charid, const char **nick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addnickdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_addnickdb_pre[hIndex].func; - preHookFunc(&charid, nick); + preHookFunc(&charid, &nick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39889,10 +40007,10 @@ void HP_map_addnickdb(int charid, const char *nick) { HPMHooks.source.map.addnickdb(charid, nick); } if( HPMHooks.count.HP_map_addnickdb_post ) { - void (*postHookFunc) (int *charid, const char *nick); + void (*postHookFunc) (int charid, const char *nick); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addnickdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_addnickdb_post[hIndex].func; - postHookFunc(&charid, nick); + postHookFunc(charid, nick); } } return; @@ -39900,11 +40018,11 @@ void HP_map_addnickdb(int charid, const char *nick) { void HP_map_delnickdb(int charid, const char *nick) { int hIndex = 0; if( HPMHooks.count.HP_map_delnickdb_pre ) { - void (*preHookFunc) (int *charid, const char *nick); + void (*preHookFunc) (int *charid, const char **nick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_delnickdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_delnickdb_pre[hIndex].func; - preHookFunc(&charid, nick); + preHookFunc(&charid, &nick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39915,10 +40033,10 @@ void HP_map_delnickdb(int charid, const char *nick) { HPMHooks.source.map.delnickdb(charid, nick); } if( HPMHooks.count.HP_map_delnickdb_post ) { - void (*postHookFunc) (int *charid, const char *nick); + void (*postHookFunc) (int charid, const char *nick); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_delnickdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_delnickdb_post[hIndex].func; - postHookFunc(&charid, nick); + postHookFunc(charid, nick); } } return; @@ -39926,11 +40044,11 @@ void HP_map_delnickdb(int charid, const char *nick) { void HP_map_reqnickdb(struct map_session_data *sd, int charid) { int hIndex = 0; if( HPMHooks.count.HP_map_reqnickdb_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *charid); + void (*preHookFunc) (struct map_session_data **sd, int *charid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_reqnickdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_reqnickdb_pre[hIndex].func; - preHookFunc(sd, &charid); + preHookFunc(&sd, &charid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39941,10 +40059,10 @@ void HP_map_reqnickdb(struct map_session_data *sd, int charid) { HPMHooks.source.map.reqnickdb(sd, charid); } if( HPMHooks.count.HP_map_reqnickdb_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *charid); + void (*postHookFunc) (struct map_session_data *sd, int charid); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_reqnickdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_reqnickdb_post[hIndex].func; - postHookFunc(sd, &charid); + postHookFunc(sd, charid); } } return; @@ -39968,10 +40086,10 @@ const char* HP_map_charid2nick(int charid) { retVal___ = HPMHooks.source.map.charid2nick(charid); } if( HPMHooks.count.HP_map_charid2nick_post ) { - const char* (*postHookFunc) (const char* retVal___, int *charid); + const char* (*postHookFunc) (const char* retVal___, int charid); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_charid2nick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_charid2nick_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &charid); + retVal___ = postHookFunc(retVal___, charid); } } return retVal___; @@ -39995,10 +40113,10 @@ struct map_session_data* HP_map_charid2sd(int charid) { retVal___ = HPMHooks.source.map.charid2sd(charid); } if( HPMHooks.count.HP_map_charid2sd_post ) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int *charid); + struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int charid); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_charid2sd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_charid2sd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &charid); + retVal___ = postHookFunc(retVal___, charid); } } return retVal___; @@ -40006,12 +40124,12 @@ struct map_session_data* HP_map_charid2sd(int charid) { void HP_map_vforeachpc(int ( *func ) (struct map_session_data *sd, va_list args), va_list args) { int hIndex = 0; if( HPMHooks.count.HP_map_vforeachpc_pre ) { - void (*preHookFunc) (int ( *func ) (struct map_session_data *sd, va_list args), va_list args); + void (*preHookFunc) (int ( **func ) (struct map_session_data *sd, va_list args), va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachpc_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_map_vforeachpc_pre[hIndex].func; - preHookFunc(func, args___copy); + preHookFunc(&func, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -40038,12 +40156,12 @@ void HP_map_vforeachpc(int ( *func ) (struct map_session_data *sd, va_list args) void HP_map_vforeachmob(int ( *func ) (struct mob_data *md, va_list args), va_list args) { int hIndex = 0; if( HPMHooks.count.HP_map_vforeachmob_pre ) { - void (*preHookFunc) (int ( *func ) (struct mob_data *md, va_list args), va_list args); + void (*preHookFunc) (int ( **func ) (struct mob_data *md, va_list args), va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachmob_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_map_vforeachmob_pre[hIndex].func; - preHookFunc(func, args___copy); + preHookFunc(&func, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -40070,12 +40188,12 @@ void HP_map_vforeachmob(int ( *func ) (struct mob_data *md, va_list args), va_li void HP_map_vforeachnpc(int ( *func ) (struct npc_data *nd, va_list args), va_list args) { int hIndex = 0; if( HPMHooks.count.HP_map_vforeachnpc_pre ) { - void (*preHookFunc) (int ( *func ) (struct npc_data *nd, va_list args), va_list args); + void (*preHookFunc) (int ( **func ) (struct npc_data *nd, va_list args), va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachnpc_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_map_vforeachnpc_pre[hIndex].func; - preHookFunc(func, args___copy); + preHookFunc(&func, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -40102,12 +40220,12 @@ void HP_map_vforeachnpc(int ( *func ) (struct npc_data *nd, va_list args), va_li void HP_map_vforeachregen(int ( *func ) (struct block_list *bl, va_list args), va_list args) { int hIndex = 0; if( HPMHooks.count.HP_map_vforeachregen_pre ) { - void (*preHookFunc) (int ( *func ) (struct block_list *bl, va_list args), va_list args); + void (*preHookFunc) (int ( **func ) (struct block_list *bl, va_list args), va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachregen_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_map_vforeachregen_pre[hIndex].func; - preHookFunc(func, args___copy); + preHookFunc(&func, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -40134,12 +40252,12 @@ void HP_map_vforeachregen(int ( *func ) (struct block_list *bl, va_list args), v void HP_map_vforeachiddb(int ( *func ) (struct block_list *bl, va_list args), va_list args) { int hIndex = 0; if( HPMHooks.count.HP_map_vforeachiddb_pre ) { - void (*preHookFunc) (int ( *func ) (struct block_list *bl, va_list args), va_list args); + void (*preHookFunc) (int ( **func ) (struct block_list *bl, va_list args), va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachiddb_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_map_vforeachiddb_pre[hIndex].func; - preHookFunc(func, args___copy); + preHookFunc(&func, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -40167,12 +40285,12 @@ int HP_map_vforeachinrange(int ( *func ) (struct block_list *, va_list), struct int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforeachinrange_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 *range, int *type, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), struct block_list **center, int16 *range, int *type, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinrange_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_vforeachinrange_pre[hIndex].func; - retVal___ = preHookFunc(func, center, &range, &type, ap___copy); + retVal___ = preHookFunc(&func, ¢er, &range, &type, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -40186,11 +40304,11 @@ int HP_map_vforeachinrange(int ( *func ) (struct block_list *, va_list), struct va_end(ap___copy); } if( HPMHooks.count.HP_map_vforeachinrange_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 *range, int *type, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 range, int type, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinrange_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_vforeachinrange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, center, &range, &type, ap___copy); + retVal___ = postHookFunc(retVal___, func, center, range, type, ap___copy); va_end(ap___copy); } } @@ -40200,12 +40318,12 @@ int HP_map_vforeachinshootrange(int ( *func ) (struct block_list *, va_list), st int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforeachinshootrange_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 *range, int *type, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), struct block_list **center, int16 *range, int *type, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinshootrange_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_vforeachinshootrange_pre[hIndex].func; - retVal___ = preHookFunc(func, center, &range, &type, ap___copy); + retVal___ = preHookFunc(&func, ¢er, &range, &type, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -40219,11 +40337,11 @@ int HP_map_vforeachinshootrange(int ( *func ) (struct block_list *, va_list), st va_end(ap___copy); } if( HPMHooks.count.HP_map_vforeachinshootrange_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 *range, int *type, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 range, int type, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinshootrange_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_vforeachinshootrange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, center, &range, &type, ap___copy); + retVal___ = postHookFunc(retVal___, func, center, range, type, ap___copy); va_end(ap___copy); } } @@ -40233,12 +40351,12 @@ int HP_map_vforeachinarea(int ( *func ) (struct block_list *, va_list), int16 m, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforeachinarea_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *type, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *type, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinarea_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_vforeachinarea_pre[hIndex].func; - retVal___ = preHookFunc(func, &m, &x0, &y0, &x1, &y1, &type, ap___copy); + retVal___ = preHookFunc(&func, &m, &x0, &y0, &x1, &y1, &type, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -40252,11 +40370,11 @@ int HP_map_vforeachinarea(int ( *func ) (struct block_list *, va_list), int16 m, va_end(ap___copy); } if( HPMHooks.count.HP_map_vforeachinarea_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *type, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int16 x0, int16 y0, int16 x1, int16 y1, int type, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinarea_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_vforeachinarea_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, &m, &x0, &y0, &x1, &y1, &type, ap___copy); + retVal___ = postHookFunc(retVal___, func, m, x0, y0, x1, y1, type, ap___copy); va_end(ap___copy); } } @@ -40266,12 +40384,12 @@ int HP_map_vforcountinrange(int ( *func ) (struct block_list *, va_list), struct int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforcountinrange_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 *range, int *count, int *type, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), struct block_list **center, int16 *range, int *count, int *type, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforcountinrange_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_vforcountinrange_pre[hIndex].func; - retVal___ = preHookFunc(func, center, &range, &count, &type, ap___copy); + retVal___ = preHookFunc(&func, ¢er, &range, &count, &type, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -40285,11 +40403,11 @@ int HP_map_vforcountinrange(int ( *func ) (struct block_list *, va_list), struct va_end(ap___copy); } if( HPMHooks.count.HP_map_vforcountinrange_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 *range, int *count, int *type, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 range, int count, int type, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforcountinrange_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_vforcountinrange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, center, &range, &count, &type, ap___copy); + retVal___ = postHookFunc(retVal___, func, center, range, count, type, ap___copy); va_end(ap___copy); } } @@ -40299,12 +40417,12 @@ int HP_map_vforcountinarea(int ( *func ) (struct block_list *, va_list), int16 m int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforcountinarea_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *count, int *type, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *count, int *type, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforcountinarea_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_vforcountinarea_pre[hIndex].func; - retVal___ = preHookFunc(func, &m, &x0, &y0, &x1, &y1, &count, &type, ap___copy); + retVal___ = preHookFunc(&func, &m, &x0, &y0, &x1, &y1, &count, &type, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -40318,11 +40436,11 @@ int HP_map_vforcountinarea(int ( *func ) (struct block_list *, va_list), int16 m va_end(ap___copy); } if( HPMHooks.count.HP_map_vforcountinarea_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *count, int *type, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int16 x0, int16 y0, int16 x1, int16 y1, int count, int type, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforcountinarea_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_vforcountinarea_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, &m, &x0, &y0, &x1, &y1, &count, &type, ap___copy); + retVal___ = postHookFunc(retVal___, func, m, x0, y0, x1, y1, count, type, ap___copy); va_end(ap___copy); } } @@ -40332,12 +40450,12 @@ int HP_map_vforeachinmovearea(int ( *func ) (struct block_list *, va_list), stru int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforeachinmovearea_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 *range, int16 *dx, int16 *dy, int *type, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), struct block_list **center, int16 *range, int16 *dx, int16 *dy, int *type, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinmovearea_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_vforeachinmovearea_pre[hIndex].func; - retVal___ = preHookFunc(func, center, &range, &dx, &dy, &type, ap___copy); + retVal___ = preHookFunc(&func, ¢er, &range, &dx, &dy, &type, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -40351,11 +40469,11 @@ int HP_map_vforeachinmovearea(int ( *func ) (struct block_list *, va_list), stru va_end(ap___copy); } if( HPMHooks.count.HP_map_vforeachinmovearea_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 *range, int16 *dx, int16 *dy, int *type, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct block_list *center, int16 range, int16 dx, int16 dy, int type, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinmovearea_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_vforeachinmovearea_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, center, &range, &dx, &dy, &type, ap___copy); + retVal___ = postHookFunc(retVal___, func, center, range, dx, dy, type, ap___copy); va_end(ap___copy); } } @@ -40365,12 +40483,12 @@ int HP_map_vforeachincell(int ( *func ) (struct block_list *, va_list), int16 m, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforeachincell_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), int16 *m, int16 *x, int16 *y, int *type, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), int16 *m, int16 *x, int16 *y, int *type, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachincell_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_vforeachincell_pre[hIndex].func; - retVal___ = preHookFunc(func, &m, &x, &y, &type, ap___copy); + retVal___ = preHookFunc(&func, &m, &x, &y, &type, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -40384,11 +40502,11 @@ int HP_map_vforeachincell(int ( *func ) (struct block_list *, va_list), int16 m, va_end(ap___copy); } if( HPMHooks.count.HP_map_vforeachincell_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 *m, int16 *x, int16 *y, int *type, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int16 x, int16 y, int type, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachincell_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_vforeachincell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, &m, &x, &y, &type, ap___copy); + retVal___ = postHookFunc(retVal___, func, m, x, y, type, ap___copy); va_end(ap___copy); } } @@ -40398,12 +40516,12 @@ int HP_map_vforeachinpath(int ( *func ) (struct block_list *, va_list), int16 m, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforeachinpath_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int16 *range, int *length, int *type, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int16 *range, int *length, int *type, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinpath_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_vforeachinpath_pre[hIndex].func; - retVal___ = preHookFunc(func, &m, &x0, &y0, &x1, &y1, &range, &length, &type, ap___copy); + retVal___ = preHookFunc(&func, &m, &x0, &y0, &x1, &y1, &range, &length, &type, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -40417,11 +40535,11 @@ int HP_map_vforeachinpath(int ( *func ) (struct block_list *, va_list), int16 m, va_end(ap___copy); } if( HPMHooks.count.HP_map_vforeachinpath_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int16 *range, int *length, int *type, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int16 x0, int16 y0, int16 x1, int16 y1, int16 range, int length, int type, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinpath_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_vforeachinpath_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, &m, &x0, &y0, &x1, &y1, &range, &length, &type, ap___copy); + retVal___ = postHookFunc(retVal___, func, m, x0, y0, x1, y1, range, length, type, ap___copy); va_end(ap___copy); } } @@ -40431,12 +40549,12 @@ int HP_map_vforeachinmap(int ( *func ) (struct block_list *, va_list), int16 m, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforeachinmap_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), int16 *m, int *type, va_list args); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), int16 *m, int *type, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinmap_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_map_vforeachinmap_pre[hIndex].func; - retVal___ = preHookFunc(func, &m, &type, args___copy); + retVal___ = preHookFunc(&func, &m, &type, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -40450,11 +40568,11 @@ int HP_map_vforeachinmap(int ( *func ) (struct block_list *, va_list), int16 m, va_end(args___copy); } if( HPMHooks.count.HP_map_vforeachinmap_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 *m, int *type, va_list args); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int type, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachinmap_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_map_vforeachinmap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, &m, &type, args___copy); + retVal___ = postHookFunc(retVal___, func, m, type, args___copy); va_end(args___copy); } } @@ -40464,12 +40582,12 @@ int HP_map_vforeachininstance(int ( *func ) (struct block_list *, va_list), int1 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_vforeachininstance_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), int16 *instance_id, int *type, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), int16 *instance_id, int *type, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachininstance_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_vforeachininstance_pre[hIndex].func; - retVal___ = preHookFunc(func, &instance_id, &type, ap___copy); + retVal___ = preHookFunc(&func, &instance_id, &type, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -40483,11 +40601,11 @@ int HP_map_vforeachininstance(int ( *func ) (struct block_list *, va_list), int1 va_end(ap___copy); } if( HPMHooks.count.HP_map_vforeachininstance_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 *instance_id, int *type, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 instance_id, int type, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_vforeachininstance_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_vforeachininstance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, &instance_id, &type, ap___copy); + retVal___ = postHookFunc(retVal___, func, instance_id, type, ap___copy); va_end(ap___copy); } } @@ -40512,10 +40630,10 @@ struct map_session_data* HP_map_id2sd(int id) { retVal___ = HPMHooks.source.map.id2sd(id); } if( HPMHooks.count.HP_map_id2sd_post ) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int *id); + struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2sd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2sd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40539,10 +40657,10 @@ struct npc_data* HP_map_id2nd(int id) { retVal___ = HPMHooks.source.map.id2nd(id); } if( HPMHooks.count.HP_map_id2nd_post ) { - struct npc_data* (*postHookFunc) (struct npc_data* retVal___, int *id); + struct npc_data* (*postHookFunc) (struct npc_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2nd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2nd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40566,10 +40684,10 @@ struct mob_data* HP_map_id2md(int id) { retVal___ = HPMHooks.source.map.id2md(id); } if( HPMHooks.count.HP_map_id2md_post ) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, int *id); + struct mob_data* (*postHookFunc) (struct mob_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2md_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2md_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40593,10 +40711,10 @@ struct flooritem_data* HP_map_id2fi(int id) { retVal___ = HPMHooks.source.map.id2fi(id); } if( HPMHooks.count.HP_map_id2fi_post ) { - struct flooritem_data* (*postHookFunc) (struct flooritem_data* retVal___, int *id); + struct flooritem_data* (*postHookFunc) (struct flooritem_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2fi_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2fi_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40620,10 +40738,10 @@ struct chat_data* HP_map_id2cd(int id) { retVal___ = HPMHooks.source.map.id2cd(id); } if( HPMHooks.count.HP_map_id2cd_post ) { - struct chat_data* (*postHookFunc) (struct chat_data* retVal___, int *id); + struct chat_data* (*postHookFunc) (struct chat_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2cd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2cd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40647,10 +40765,10 @@ struct skill_unit* HP_map_id2su(int id) { retVal___ = HPMHooks.source.map.id2su(id); } if( HPMHooks.count.HP_map_id2su_post ) { - struct skill_unit* (*postHookFunc) (struct skill_unit* retVal___, int *id); + struct skill_unit* (*postHookFunc) (struct skill_unit* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2su_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2su_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40674,10 +40792,10 @@ struct pet_data* HP_map_id2pd(int id) { retVal___ = HPMHooks.source.map.id2pd(id); } if( HPMHooks.count.HP_map_id2pd_post ) { - struct pet_data* (*postHookFunc) (struct pet_data* retVal___, int *id); + struct pet_data* (*postHookFunc) (struct pet_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2pd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2pd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40701,10 +40819,10 @@ struct homun_data* HP_map_id2hd(int id) { retVal___ = HPMHooks.source.map.id2hd(id); } if( HPMHooks.count.HP_map_id2hd_post ) { - struct homun_data* (*postHookFunc) (struct homun_data* retVal___, int *id); + struct homun_data* (*postHookFunc) (struct homun_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2hd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2hd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40728,10 +40846,10 @@ struct mercenary_data* HP_map_id2mc(int id) { retVal___ = HPMHooks.source.map.id2mc(id); } if( HPMHooks.count.HP_map_id2mc_post ) { - struct mercenary_data* (*postHookFunc) (struct mercenary_data* retVal___, int *id); + struct mercenary_data* (*postHookFunc) (struct mercenary_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2mc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2mc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40755,10 +40873,10 @@ struct elemental_data* HP_map_id2ed(int id) { retVal___ = HPMHooks.source.map.id2ed(id); } if( HPMHooks.count.HP_map_id2ed_post ) { - struct elemental_data* (*postHookFunc) (struct elemental_data* retVal___, int *id); + struct elemental_data* (*postHookFunc) (struct elemental_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2ed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2ed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40782,10 +40900,10 @@ struct block_list* HP_map_id2bl(int id) { retVal___ = HPMHooks.source.map.id2bl(id); } if( HPMHooks.count.HP_map_id2bl_post ) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, int *id); + struct block_list* (*postHookFunc) (struct block_list* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2bl_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2bl_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40809,10 +40927,10 @@ bool HP_map_blid_exists(int id) { retVal___ = HPMHooks.source.map.blid_exists(id); } if( HPMHooks.count.HP_map_blid_exists_post ) { - bool (*postHookFunc) (bool retVal___, int *id); + bool (*postHookFunc) (bool retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_blid_exists_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_blid_exists_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -40836,10 +40954,10 @@ int16 HP_map_mapindex2mapid(unsigned short map_index) { retVal___ = HPMHooks.source.map.mapindex2mapid(map_index); } if( HPMHooks.count.HP_map_mapindex2mapid_post ) { - int16 (*postHookFunc) (int16 retVal___, unsigned short *map_index); + int16 (*postHookFunc) (int16 retVal___, unsigned short map_index); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_mapindex2mapid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_mapindex2mapid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &map_index); + retVal___ = postHookFunc(retVal___, map_index); } } return retVal___; @@ -40848,11 +40966,11 @@ int16 HP_map_mapname2mapid(const char *name) { int hIndex = 0; int16 retVal___ = 0; if( HPMHooks.count.HP_map_mapname2mapid_pre ) { - int16 (*preHookFunc) (const char *name); + int16 (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_mapname2mapid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_mapname2mapid_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -40875,11 +40993,11 @@ int HP_map_mapname2ipport(unsigned short name, uint32 *ip, uint16 *port) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_mapname2ipport_pre ) { - int (*preHookFunc) (unsigned short *name, uint32 *ip, uint16 *port); + int (*preHookFunc) (unsigned short *name, uint32 **ip, uint16 **port); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_mapname2ipport_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_mapname2ipport_pre[hIndex].func; - retVal___ = preHookFunc(&name, ip, port); + retVal___ = preHookFunc(&name, &ip, &port); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -40890,10 +41008,10 @@ int HP_map_mapname2ipport(unsigned short name, uint32 *ip, uint16 *port) { retVal___ = HPMHooks.source.map.mapname2ipport(name, ip, port); } if( HPMHooks.count.HP_map_mapname2ipport_post ) { - int (*postHookFunc) (int retVal___, unsigned short *name, uint32 *ip, uint16 *port); + int (*postHookFunc) (int retVal___, unsigned short name, uint32 *ip, uint16 *port); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_mapname2ipport_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_mapname2ipport_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &name, ip, port); + retVal___ = postHookFunc(retVal___, name, ip, port); } } return retVal___; @@ -40917,10 +41035,10 @@ int HP_map_setipport(unsigned short map_index, uint32 ip, uint16 port) { retVal___ = HPMHooks.source.map.setipport(map_index, ip, port); } if( HPMHooks.count.HP_map_setipport_post ) { - int (*postHookFunc) (int retVal___, unsigned short *map_index, uint32 *ip, uint16 *port); + int (*postHookFunc) (int retVal___, unsigned short map_index, uint32 ip, uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_setipport_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_setipport_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &map_index, &ip, &port); + retVal___ = postHookFunc(retVal___, map_index, ip, port); } } return retVal___; @@ -40944,10 +41062,10 @@ int HP_map_eraseipport(unsigned short map_index, uint32 ip, uint16 port) { retVal___ = HPMHooks.source.map.eraseipport(map_index, ip, port); } if( HPMHooks.count.HP_map_eraseipport_post ) { - int (*postHookFunc) (int retVal___, unsigned short *map_index, uint32 *ip, uint16 *port); + int (*postHookFunc) (int retVal___, unsigned short map_index, uint32 ip, uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_eraseipport_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_eraseipport_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &map_index, &ip, &port); + retVal___ = postHookFunc(retVal___, map_index, ip, port); } } return retVal___; @@ -40982,11 +41100,11 @@ int HP_map_eraseallipport(void) { void HP_map_addiddb(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_map_addiddb_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addiddb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_addiddb_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41008,11 +41126,11 @@ void HP_map_addiddb(struct block_list *bl) { void HP_map_deliddb(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_map_deliddb_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_deliddb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_deliddb_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41035,11 +41153,11 @@ struct map_session_data* HP_map_nick2sd(const char *nick) { int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_map_nick2sd_pre ) { - struct map_session_data* (*preHookFunc) (const char *nick); + struct map_session_data* (*preHookFunc) (const char **nick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_nick2sd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_nick2sd_pre[hIndex].func; - retVal___ = preHookFunc(nick); + retVal___ = preHookFunc(&nick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41077,10 +41195,10 @@ struct mob_data* HP_map_getmob_boss(int16 m) { retVal___ = HPMHooks.source.map.getmob_boss(m); } if( HPMHooks.count.HP_map_getmob_boss_post ) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, int16 *m); + struct mob_data* (*postHookFunc) (struct mob_data* retVal___, int16 m); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_getmob_boss_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_getmob_boss_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m); + retVal___ = postHookFunc(retVal___, m); } } return retVal___; @@ -41104,10 +41222,10 @@ struct mob_data* HP_map_id2boss(int id) { retVal___ = HPMHooks.source.map.id2boss(id); } if( HPMHooks.count.HP_map_id2boss_post ) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, int *id); + struct mob_data* (*postHookFunc) (struct mob_data* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_id2boss_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_id2boss_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -41131,10 +41249,10 @@ uint32 HP_map_race_id2mask(int race) { retVal___ = HPMHooks.source.map.race_id2mask(race); } if( HPMHooks.count.HP_map_race_id2mask_post ) { - uint32 (*postHookFunc) (uint32 retVal___, int *race); + uint32 (*postHookFunc) (uint32 retVal___, int race); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_race_id2mask_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_race_id2mask_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &race); + retVal___ = postHookFunc(retVal___, race); } } return retVal___; @@ -41157,10 +41275,10 @@ void HP_map_reloadnpc(bool clear) { HPMHooks.source.map.reloadnpc(clear); } if( HPMHooks.count.HP_map_reloadnpc_post ) { - void (*postHookFunc) (bool *clear); + void (*postHookFunc) (bool clear); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_reloadnpc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_reloadnpc_post[hIndex].func; - postHookFunc(&clear); + postHookFunc(clear); } } return; @@ -41184,10 +41302,10 @@ int HP_map_check_dir(int s_dir, int t_dir) { retVal___ = HPMHooks.source.map.check_dir(s_dir, t_dir); } if( HPMHooks.count.HP_map_check_dir_post ) { - int (*postHookFunc) (int retVal___, int *s_dir, int *t_dir); + int (*postHookFunc) (int retVal___, int s_dir, int t_dir); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_check_dir_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_check_dir_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &s_dir, &t_dir); + retVal___ = postHookFunc(retVal___, s_dir, t_dir); } } return retVal___; @@ -41196,11 +41314,11 @@ uint8 HP_map_calc_dir(struct block_list *src, int16 x, int16 y) { int hIndex = 0; uint8 retVal___ = 0; if( HPMHooks.count.HP_map_calc_dir_pre ) { - uint8 (*preHookFunc) (struct block_list *src, int16 *x, int16 *y); + uint8 (*preHookFunc) (struct block_list **src, int16 *x, int16 *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_calc_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_calc_dir_pre[hIndex].func; - retVal___ = preHookFunc(src, &x, &y); + retVal___ = preHookFunc(&src, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41211,10 +41329,10 @@ uint8 HP_map_calc_dir(struct block_list *src, int16 x, int16 y) { retVal___ = HPMHooks.source.map.calc_dir(src, x, y); } if( HPMHooks.count.HP_map_calc_dir_post ) { - uint8 (*postHookFunc) (uint8 retVal___, struct block_list *src, int16 *x, int16 *y); + uint8 (*postHookFunc) (uint8 retVal___, struct block_list *src, int16 x, int16 y); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_calc_dir_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_calc_dir_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &x, &y); + retVal___ = postHookFunc(retVal___, src, x, y); } } return retVal___; @@ -41223,11 +41341,11 @@ int HP_map_random_dir(struct block_list *bl, short *x, short *y) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_random_dir_pre ) { - int (*preHookFunc) (struct block_list *bl, short *x, short *y); + int (*preHookFunc) (struct block_list **bl, short **x, short **y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_random_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_random_dir_pre[hIndex].func; - retVal___ = preHookFunc(bl, x, y); + retVal___ = preHookFunc(&bl, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41250,12 +41368,12 @@ int HP_map_cleanup_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_cleanup_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_cleanup_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_cleanup_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -41283,11 +41401,11 @@ int HP_map_delmap(char *mapname) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_delmap_pre ) { - int (*preHookFunc) (char *mapname); + int (*preHookFunc) (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; - retVal___ = preHookFunc(mapname); + retVal___ = preHookFunc(&mapname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41336,11 +41454,11 @@ bool HP_map_iwall_set(int16 m, int16 x, int16 y, int size, int8 dir, bool shoota int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_map_iwall_set_pre ) { - bool (*preHookFunc) (int16 *m, int16 *x, int16 *y, int *size, int8 *dir, bool *shootable, const char *wall_name); + bool (*preHookFunc) (int16 *m, int16 *x, int16 *y, int *size, int8 *dir, bool *shootable, const char **wall_name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_iwall_set_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_iwall_set_pre[hIndex].func; - retVal___ = preHookFunc(&m, &x, &y, &size, &dir, &shootable, wall_name); + retVal___ = preHookFunc(&m, &x, &y, &size, &dir, &shootable, &wall_name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41351,10 +41469,10 @@ bool HP_map_iwall_set(int16 m, int16 x, int16 y, int size, int8 dir, bool shoota retVal___ = HPMHooks.source.map.iwall_set(m, x, y, size, dir, shootable, wall_name); } if( HPMHooks.count.HP_map_iwall_set_post ) { - bool (*postHookFunc) (bool retVal___, int16 *m, int16 *x, int16 *y, int *size, int8 *dir, bool *shootable, const char *wall_name); + bool (*postHookFunc) (bool retVal___, int16 m, int16 x, int16 y, int size, int8 dir, bool shootable, const char *wall_name); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_iwall_set_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_iwall_set_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, &x, &y, &size, &dir, &shootable, wall_name); + retVal___ = postHookFunc(retVal___, m, x, y, size, dir, shootable, wall_name); } } return retVal___; @@ -41362,11 +41480,11 @@ bool HP_map_iwall_set(int16 m, int16 x, int16 y, int size, int8 dir, bool shoota void HP_map_iwall_get(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_map_iwall_get_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_iwall_get_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_iwall_get_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41388,11 +41506,11 @@ void HP_map_iwall_get(struct map_session_data *sd) { void HP_map_iwall_remove(const char *wall_name) { int hIndex = 0; if( HPMHooks.count.HP_map_iwall_remove_pre ) { - void (*preHookFunc) (const char *wall_name); + void (*preHookFunc) (const char **wall_name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_iwall_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_iwall_remove_pre[hIndex].func; - preHookFunc(wall_name); + preHookFunc(&wall_name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41415,11 +41533,11 @@ int HP_map_addmobtolist(unsigned short m, struct spawn_data *spawn) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_addmobtolist_pre ) { - int (*preHookFunc) (unsigned short *m, struct spawn_data *spawn); + int (*preHookFunc) (unsigned short *m, struct spawn_data **spawn); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addmobtolist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_addmobtolist_pre[hIndex].func; - retVal___ = preHookFunc(&m, spawn); + retVal___ = preHookFunc(&m, &spawn); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41430,10 +41548,10 @@ int HP_map_addmobtolist(unsigned short m, struct spawn_data *spawn) { retVal___ = HPMHooks.source.map.addmobtolist(m, spawn); } if( HPMHooks.count.HP_map_addmobtolist_post ) { - int (*postHookFunc) (int retVal___, unsigned short *m, struct spawn_data *spawn); + int (*postHookFunc) (int retVal___, unsigned short m, struct spawn_data *spawn); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addmobtolist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_addmobtolist_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, spawn); + retVal___ = postHookFunc(retVal___, m, spawn); } } return retVal___; @@ -41456,10 +41574,10 @@ void HP_map_spawnmobs(int16 m) { HPMHooks.source.map.spawnmobs(m); } if( HPMHooks.count.HP_map_spawnmobs_post ) { - void (*postHookFunc) (int16 *m); + void (*postHookFunc) (int16 m); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_spawnmobs_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_spawnmobs_post[hIndex].func; - postHookFunc(&m); + postHookFunc(m); } } return; @@ -41482,10 +41600,10 @@ void HP_map_removemobs(int16 m) { HPMHooks.source.map.removemobs(m); } if( HPMHooks.count.HP_map_removemobs_post ) { - void (*postHookFunc) (int16 *m); + void (*postHookFunc) (int16 m); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_removemobs_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_removemobs_post[hIndex].func; - postHookFunc(&m); + postHookFunc(m); } } return; @@ -41493,11 +41611,11 @@ void HP_map_removemobs(int16 m) { void HP_map_addmap2db(struct map_data *m) { int hIndex = 0; if( HPMHooks.count.HP_map_addmap2db_pre ) { - void (*preHookFunc) (struct map_data *m); + void (*preHookFunc) (struct map_data **m); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addmap2db_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_addmap2db_pre[hIndex].func; - preHookFunc(m); + preHookFunc(&m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41519,11 +41637,11 @@ void HP_map_addmap2db(struct map_data *m) { void HP_map_removemapdb(struct map_data *m) { int hIndex = 0; if( HPMHooks.count.HP_map_removemapdb_pre ) { - void (*preHookFunc) (struct map_data *m); + void (*preHookFunc) (struct map_data **m); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_removemapdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_removemapdb_pre[hIndex].func; - preHookFunc(m); + preHookFunc(&m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41560,10 +41678,10 @@ void HP_map_clean(int i) { HPMHooks.source.map.clean(i); } if( HPMHooks.count.HP_map_clean_post ) { - void (*postHookFunc) (int *i); + void (*postHookFunc) (int i); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_clean_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_clean_post[hIndex].func; - postHookFunc(&i); + postHookFunc(i); } } return; @@ -41613,10 +41731,10 @@ int HP_map_freeblock_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.map.freeblock_timer(tid, tick, id, data); } if( HPMHooks.count.HP_map_freeblock_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_freeblock_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_freeblock_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -41625,11 +41743,11 @@ int HP_map_searchrandfreecell(int16 m, const struct block_list *bl, int16 *x, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_searchrandfreecell_pre ) { - int (*preHookFunc) (int16 *m, const struct block_list *bl, int16 *x, int16 *y, int *stack); + int (*preHookFunc) (int16 *m, const struct block_list **bl, int16 **x, int16 **y, int *stack); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_searchrandfreecell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_searchrandfreecell_pre[hIndex].func; - retVal___ = preHookFunc(&m, bl, x, y, &stack); + retVal___ = preHookFunc(&m, &bl, &x, &y, &stack); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41640,10 +41758,10 @@ int HP_map_searchrandfreecell(int16 m, const struct block_list *bl, int16 *x, in retVal___ = HPMHooks.source.map.searchrandfreecell(m, bl, x, y, stack); } if( HPMHooks.count.HP_map_searchrandfreecell_post ) { - int (*postHookFunc) (int retVal___, int16 *m, const struct block_list *bl, int16 *x, int16 *y, int *stack); + int (*postHookFunc) (int retVal___, int16 m, const struct block_list *bl, int16 *x, int16 *y, int stack); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_searchrandfreecell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_searchrandfreecell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, bl, x, y, &stack); + retVal___ = postHookFunc(retVal___, m, bl, x, y, stack); } } return retVal___; @@ -41652,12 +41770,12 @@ int HP_map_count_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_count_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_count_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_count_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -41681,12 +41799,11 @@ int HP_map_count_sub(struct block_list *bl, va_list ap) { } return retVal___; } -DBData HP_map_create_charid2nick(DBKey key, va_list args) { +struct DBData HP_map_create_charid2nick(union DBKey key, va_list args) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_map_create_charid2nick_pre ) { - DBData (*preHookFunc) (DBKey *key, va_list args); + struct DBData (*preHookFunc) (union DBKey *key, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_create_charid2nick_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); @@ -41705,11 +41822,11 @@ DBData HP_map_create_charid2nick(DBKey key, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_map_create_charid2nick_post ) { - DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args); + struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey key, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_create_charid2nick_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_map_create_charid2nick_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, args___copy); + retVal___ = postHookFunc(retVal___, key, args___copy); va_end(args___copy); } } @@ -41719,12 +41836,12 @@ int HP_map_removemobs_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_removemobs_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_removemobs_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_removemobs_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -41750,8 +41867,7 @@ int HP_map_removemobs_sub(struct block_list *bl, va_list ap) { } struct mapcell HP_map_gat2cell(int gat) { int hIndex = 0; - struct mapcell retVal___; - memset(&retVal___, '\0', sizeof(struct mapcell)); + struct mapcell retVal___ = { 0 }; if( HPMHooks.count.HP_map_gat2cell_pre ) { struct mapcell (*preHookFunc) (int *gat); *HPMforce_return = false; @@ -41768,10 +41884,10 @@ struct mapcell HP_map_gat2cell(int gat) { retVal___ = HPMHooks.source.map.gat2cell(gat); } if( HPMHooks.count.HP_map_gat2cell_post ) { - struct mapcell (*postHookFunc) (struct mapcell retVal___, int *gat); + struct mapcell (*postHookFunc) (struct mapcell retVal___, int gat); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_gat2cell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_gat2cell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &gat); + retVal___ = postHookFunc(retVal___, gat); } } return retVal___; @@ -41795,10 +41911,10 @@ int HP_map_cell2gat(struct mapcell cell) { retVal___ = HPMHooks.source.map.cell2gat(cell); } if( HPMHooks.count.HP_map_cell2gat_post ) { - int (*postHookFunc) (int retVal___, struct mapcell *cell); + int (*postHookFunc) (int retVal___, struct mapcell cell); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_cell2gat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_cell2gat_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &cell); + retVal___ = postHookFunc(retVal___, cell); } } return retVal___; @@ -41807,11 +41923,11 @@ int HP_map_getcellp(struct map_data *m, const struct block_list *bl, int16 x, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_getcellp_pre ) { - int (*preHookFunc) (struct map_data *m, const struct block_list *bl, int16 *x, int16 *y, cell_chk *cellchk); + int (*preHookFunc) (struct map_data **m, const struct block_list **bl, int16 *x, int16 *y, cell_chk *cellchk); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_getcellp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_getcellp_pre[hIndex].func; - retVal___ = preHookFunc(m, bl, &x, &y, &cellchk); + retVal___ = preHookFunc(&m, &bl, &x, &y, &cellchk); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41822,10 +41938,10 @@ int HP_map_getcellp(struct map_data *m, const struct block_list *bl, int16 x, in retVal___ = HPMHooks.source.map.getcellp(m, bl, x, y, cellchk); } if( HPMHooks.count.HP_map_getcellp_post ) { - int (*postHookFunc) (int retVal___, struct map_data *m, const struct block_list *bl, int16 *x, int16 *y, cell_chk *cellchk); + int (*postHookFunc) (int retVal___, struct map_data *m, const struct block_list *bl, int16 x, int16 y, cell_chk cellchk); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_getcellp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_getcellp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, m, bl, &x, &y, &cellchk); + retVal___ = postHookFunc(retVal___, m, bl, x, y, cellchk); } } return retVal___; @@ -41848,10 +41964,10 @@ void HP_map_setcell(int16 m, int16 x, int16 y, cell_t cell, bool flag) { HPMHooks.source.map.setcell(m, x, y, cell, flag); } if( HPMHooks.count.HP_map_setcell_post ) { - void (*postHookFunc) (int16 *m, int16 *x, int16 *y, cell_t *cell, bool *flag); + void (*postHookFunc) (int16 m, int16 x, int16 y, cell_t cell, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_setcell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_setcell_post[hIndex].func; - postHookFunc(&m, &x, &y, &cell, &flag); + postHookFunc(m, x, y, cell, flag); } } return; @@ -41860,11 +41976,11 @@ int HP_map_sub_getcellp(struct map_data *m, const struct block_list *bl, int16 x int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_sub_getcellp_pre ) { - int (*preHookFunc) (struct map_data *m, const struct block_list *bl, int16 *x, int16 *y, cell_chk *cellchk); + int (*preHookFunc) (struct map_data **m, const struct block_list **bl, int16 *x, int16 *y, cell_chk *cellchk); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_sub_getcellp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_sub_getcellp_pre[hIndex].func; - retVal___ = preHookFunc(m, bl, &x, &y, &cellchk); + retVal___ = preHookFunc(&m, &bl, &x, &y, &cellchk); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41875,10 +41991,10 @@ int HP_map_sub_getcellp(struct map_data *m, const struct block_list *bl, int16 x retVal___ = HPMHooks.source.map.sub_getcellp(m, bl, x, y, cellchk); } if( HPMHooks.count.HP_map_sub_getcellp_post ) { - int (*postHookFunc) (int retVal___, struct map_data *m, const struct block_list *bl, int16 *x, int16 *y, cell_chk *cellchk); + int (*postHookFunc) (int retVal___, struct map_data *m, const struct block_list *bl, int16 x, int16 y, cell_chk cellchk); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_sub_getcellp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_sub_getcellp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, m, bl, &x, &y, &cellchk); + retVal___ = postHookFunc(retVal___, m, bl, x, y, cellchk); } } return retVal___; @@ -41901,10 +42017,10 @@ void HP_map_sub_setcell(int16 m, int16 x, int16 y, cell_t cell, bool flag) { HPMHooks.source.map.sub_setcell(m, x, y, cell, flag); } if( HPMHooks.count.HP_map_sub_setcell_post ) { - void (*postHookFunc) (int16 *m, int16 *x, int16 *y, cell_t *cell, bool *flag); + void (*postHookFunc) (int16 m, int16 x, int16 y, cell_t cell, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_sub_setcell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_sub_setcell_post[hIndex].func; - postHookFunc(&m, &x, &y, &cell, &flag); + postHookFunc(m, x, y, cell, flag); } } return; @@ -41912,11 +42028,11 @@ void HP_map_sub_setcell(int16 m, int16 x, int16 y, cell_t cell, bool flag) { void HP_map_iwall_nextxy(int16 x, int16 y, int8 dir, int pos, int16 *x1, int16 *y1) { int hIndex = 0; if( HPMHooks.count.HP_map_iwall_nextxy_pre ) { - void (*preHookFunc) (int16 *x, int16 *y, int8 *dir, int *pos, int16 *x1, int16 *y1); + void (*preHookFunc) (int16 *x, int16 *y, int8 *dir, int *pos, int16 **x1, int16 **y1); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_iwall_nextxy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_iwall_nextxy_pre[hIndex].func; - preHookFunc(&x, &y, &dir, &pos, x1, y1); + preHookFunc(&x, &y, &dir, &pos, &x1, &y1); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41927,20 +42043,19 @@ void HP_map_iwall_nextxy(int16 x, int16 y, int8 dir, int pos, int16 *x1, int16 * HPMHooks.source.map.iwall_nextxy(x, y, dir, pos, x1, y1); } if( HPMHooks.count.HP_map_iwall_nextxy_post ) { - void (*postHookFunc) (int16 *x, int16 *y, int8 *dir, int *pos, int16 *x1, int16 *y1); + void (*postHookFunc) (int16 x, int16 y, int8 dir, int pos, int16 *x1, int16 *y1); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_iwall_nextxy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_iwall_nextxy_post[hIndex].func; - postHookFunc(&x, &y, &dir, &pos, x1, y1); + postHookFunc(x, y, dir, pos, x1, y1); } } return; } -DBData HP_map_create_map_data_other_server(DBKey key, va_list args) { +struct DBData HP_map_create_map_data_other_server(union DBKey key, va_list args) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_map_create_map_data_other_server_pre ) { - DBData (*preHookFunc) (DBKey *key, va_list args); + struct DBData (*preHookFunc) (union DBKey *key, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_create_map_data_other_server_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); @@ -41959,26 +42074,26 @@ DBData HP_map_create_map_data_other_server(DBKey key, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_map_create_map_data_other_server_post ) { - DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args); + struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey key, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_create_map_data_other_server_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_map_create_map_data_other_server_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, args___copy); + retVal___ = postHookFunc(retVal___, key, args___copy); va_end(args___copy); } } return retVal___; } -int HP_map_eraseallipport_sub(DBKey key, DBData *data, va_list va) { +int HP_map_eraseallipport_sub(union DBKey key, struct DBData *data, va_list va) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_eraseallipport_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list va); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list va); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_eraseallipport_sub_pre; hIndex++ ) { va_list va___copy; va_copy(va___copy, va); preHookFunc = HPMHooks.list.HP_map_eraseallipport_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, va___copy); + retVal___ = preHookFunc(&key, &data, va___copy); va_end(va___copy); } if( *HPMforce_return ) { @@ -41992,11 +42107,11 @@ int HP_map_eraseallipport_sub(DBKey key, DBData *data, va_list va) { va_end(va___copy); } if( HPMHooks.count.HP_map_eraseallipport_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list va); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list va); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_eraseallipport_sub_post; hIndex++ ) { va_list va___copy; va_copy(va___copy, va); postHookFunc = HPMHooks.list.HP_map_eraseallipport_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, va___copy); + retVal___ = postHookFunc(retVal___, key, data, va___copy); va_end(va___copy); } } @@ -42006,11 +42121,11 @@ char* HP_map_init_mapcache(FILE *fp) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_map_init_mapcache_pre ) { - char* (*preHookFunc) (FILE *fp); + char* (*preHookFunc) (FILE **fp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_init_mapcache_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_init_mapcache_pre[hIndex].func; - retVal___ = preHookFunc(fp); + retVal___ = preHookFunc(&fp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42033,11 +42148,11 @@ int HP_map_readfromcache(struct map_data *m, char *buffer) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_readfromcache_pre ) { - int (*preHookFunc) (struct map_data *m, char *buffer); + int (*preHookFunc) (struct map_data **m, char **buffer); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_readfromcache_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_readfromcache_pre[hIndex].func; - retVal___ = preHookFunc(m, buffer); + retVal___ = preHookFunc(&m, &buffer); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42060,11 +42175,11 @@ int HP_map_addmap(const char *mapname) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_addmap_pre ) { - int (*preHookFunc) (const char *mapname); + int (*preHookFunc) (const char **mapname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addmap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_addmap_pre[hIndex].func; - retVal___ = preHookFunc(mapname); + retVal___ = preHookFunc(&mapname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42101,10 +42216,10 @@ void HP_map_delmapid(int id) { HPMHooks.source.map.delmapid(id); } if( HPMHooks.count.HP_map_delmapid_post ) { - void (*postHookFunc) (int *id); + void (*postHookFunc) (int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_delmapid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_delmapid_post[hIndex].func; - postHookFunc(&id); + postHookFunc(id); } } return; @@ -42165,11 +42280,11 @@ int HP_map_waterheight(char *mapname) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_waterheight_pre ) { - int (*preHookFunc) (char *mapname); + int (*preHookFunc) (char **mapname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_waterheight_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_waterheight_pre[hIndex].func; - retVal___ = preHookFunc(mapname); + retVal___ = preHookFunc(&mapname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42192,11 +42307,11 @@ int HP_map_readgat(struct map_data *m) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_readgat_pre ) { - int (*preHookFunc) (struct map_data *m); + int (*preHookFunc) (struct map_data **m); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_readgat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_readgat_pre[hIndex].func; - retVal___ = preHookFunc(m); + retVal___ = preHookFunc(&m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42246,11 +42361,11 @@ int HP_map_config_read(char *cfgName) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_config_read_pre ) { - int (*preHookFunc) (char *cfgName); + int (*preHookFunc) (char **cfgName); *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(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42273,11 +42388,11 @@ int HP_map_config_read_sub(char *cfgName) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_config_read_sub_pre ) { - int (*preHookFunc) (char *cfgName); + int (*preHookFunc) (char **cfgName); *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(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42299,11 +42414,11 @@ int HP_map_config_read_sub(char *cfgName) { void HP_map_reloadnpc_sub(char *cfgName) { int hIndex = 0; if( HPMHooks.count.HP_map_reloadnpc_sub_pre ) { - void (*preHookFunc) (char *cfgName); + void (*preHookFunc) (char **cfgName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_reloadnpc_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_reloadnpc_sub_pre[hIndex].func; - preHookFunc(cfgName); + preHookFunc(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42326,11 +42441,11 @@ int HP_map_inter_config_read(char *cfgName) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_inter_config_read_pre ) { - int (*preHookFunc) (char *cfgName); + int (*preHookFunc) (char **cfgName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_inter_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_inter_config_read_pre[hIndex].func; - retVal___ = preHookFunc(cfgName); + retVal___ = preHookFunc(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42407,11 +42522,11 @@ bool HP_map_zone_mf_cache(int m, char *flag, char *params) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_map_zone_mf_cache_pre ) { - bool (*preHookFunc) (int *m, char *flag, char *params); + bool (*preHookFunc) (int *m, char **flag, char **params); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_mf_cache_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_zone_mf_cache_pre[hIndex].func; - retVal___ = preHookFunc(&m, flag, params); + retVal___ = preHookFunc(&m, &flag, ¶ms); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42422,10 +42537,10 @@ bool HP_map_zone_mf_cache(int m, char *flag, char *params) { retVal___ = HPMHooks.source.map.zone_mf_cache(m, flag, params); } if( HPMHooks.count.HP_map_zone_mf_cache_post ) { - bool (*postHookFunc) (bool retVal___, int *m, char *flag, char *params); + bool (*postHookFunc) (bool retVal___, int m, char *flag, char *params); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_mf_cache_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_zone_mf_cache_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, flag, params); + retVal___ = postHookFunc(retVal___, m, flag, params); } } return retVal___; @@ -42434,11 +42549,11 @@ unsigned short HP_map_zone_str2itemid(const char *name) { int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_map_zone_str2itemid_pre ) { - unsigned short (*preHookFunc) (const char *name); + unsigned short (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_str2itemid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_zone_str2itemid_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42461,11 +42576,11 @@ unsigned short HP_map_zone_str2skillid(const char *name) { int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_map_zone_str2skillid_pre ) { - unsigned short (*preHookFunc) (const char *name); + unsigned short (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_str2skillid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_zone_str2skillid_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42488,11 +42603,11 @@ enum bl_type HP_map_zone_bl_type(const char *entry, enum map_zone_skill_subtype int hIndex = 0; enum bl_type retVal___ = BL_NUL; if( HPMHooks.count.HP_map_zone_bl_type_pre ) { - enum bl_type (*preHookFunc) (const char *entry, enum map_zone_skill_subtype *subtype); + enum bl_type (*preHookFunc) (const char **entry, enum map_zone_skill_subtype **subtype); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_bl_type_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_zone_bl_type_pre[hIndex].func; - retVal___ = preHookFunc(entry, subtype); + retVal___ = preHookFunc(&entry, &subtype); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42537,16 +42652,16 @@ void HP_map_read_zone_db(void) { } return; } -int HP_map_db_final(DBKey key, DBData *data, va_list ap) { +int HP_map_db_final(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_db_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_db_final_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_db_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -42560,26 +42675,26 @@ int HP_map_db_final(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_map_db_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_db_final_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_map_db_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_map_nick_db_final(DBKey key, DBData *data, va_list args) { +int HP_map_nick_db_final(union DBKey key, struct DBData *data, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_nick_db_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list args); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_nick_db_final_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_map_nick_db_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, args___copy); + retVal___ = preHookFunc(&key, &data, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -42593,26 +42708,26 @@ int HP_map_nick_db_final(DBKey key, DBData *data, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_map_nick_db_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list args); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_nick_db_final_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_map_nick_db_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, args___copy); + retVal___ = postHookFunc(retVal___, key, data, args___copy); va_end(args___copy); } } return retVal___; } -int HP_map_cleanup_db_sub(DBKey key, DBData *data, va_list va) { +int HP_map_cleanup_db_sub(union DBKey key, struct DBData *data, va_list va) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_cleanup_db_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list va); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list va); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_cleanup_db_sub_pre; hIndex++ ) { va_list va___copy; va_copy(va___copy, va); preHookFunc = HPMHooks.list.HP_map_cleanup_db_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, va___copy); + retVal___ = preHookFunc(&key, &data, va___copy); va_end(va___copy); } if( *HPMforce_return ) { @@ -42626,11 +42741,11 @@ int HP_map_cleanup_db_sub(DBKey key, DBData *data, va_list va) { va_end(va___copy); } if( HPMHooks.count.HP_map_cleanup_db_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list va); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list va); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_cleanup_db_sub_post; hIndex++ ) { va_list va___copy; va_copy(va___copy, va); postHookFunc = HPMHooks.list.HP_map_cleanup_db_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, va___copy); + retVal___ = postHookFunc(retVal___, key, data, va___copy); va_end(va___copy); } } @@ -42640,12 +42755,12 @@ int HP_map_abort_sub(struct map_session_data *sd, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_abort_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, va_list ap); + int (*preHookFunc) (struct map_session_data **sd, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_abort_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_map_abort_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, ap___copy); + retVal___ = preHookFunc(&sd, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -42672,11 +42787,11 @@ int HP_map_abort_sub(struct map_session_data *sd, va_list ap) { void HP_map_update_cell_bl(struct block_list *bl, bool increase) { int hIndex = 0; if( HPMHooks.count.HP_map_update_cell_bl_pre ) { - void (*preHookFunc) (struct block_list *bl, bool *increase); + void (*preHookFunc) (struct block_list **bl, bool *increase); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_update_cell_bl_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_update_cell_bl_pre[hIndex].func; - preHookFunc(bl, &increase); + preHookFunc(&bl, &increase); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42687,10 +42802,10 @@ void HP_map_update_cell_bl(struct block_list *bl, bool increase) { HPMHooks.source.map.update_cell_bl(bl, increase); } if( HPMHooks.count.HP_map_update_cell_bl_post ) { - void (*postHookFunc) (struct block_list *bl, bool *increase); + void (*postHookFunc) (struct block_list *bl, bool increase); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_update_cell_bl_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_update_cell_bl_post[hIndex].func; - postHookFunc(bl, &increase); + postHookFunc(bl, increase); } } return; @@ -42725,11 +42840,11 @@ int HP_map_get_new_bonus_id(void) { void HP_map_add_questinfo(int m, struct questinfo *qi) { int hIndex = 0; if( HPMHooks.count.HP_map_add_questinfo_pre ) { - void (*preHookFunc) (int *m, struct questinfo *qi); + void (*preHookFunc) (int *m, struct questinfo **qi); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_add_questinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_add_questinfo_pre[hIndex].func; - preHookFunc(&m, qi); + preHookFunc(&m, &qi); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42740,10 +42855,10 @@ void HP_map_add_questinfo(int m, struct questinfo *qi) { HPMHooks.source.map.add_questinfo(m, qi); } if( HPMHooks.count.HP_map_add_questinfo_post ) { - void (*postHookFunc) (int *m, struct questinfo *qi); + void (*postHookFunc) (int m, struct questinfo *qi); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_add_questinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_add_questinfo_post[hIndex].func; - postHookFunc(&m, qi); + postHookFunc(m, qi); } } return; @@ -42752,11 +42867,11 @@ bool HP_map_remove_questinfo(int m, struct npc_data *nd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_map_remove_questinfo_pre ) { - bool (*preHookFunc) (int *m, struct npc_data *nd); + bool (*preHookFunc) (int *m, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_remove_questinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_remove_questinfo_pre[hIndex].func; - retVal___ = preHookFunc(&m, nd); + retVal___ = preHookFunc(&m, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42767,10 +42882,10 @@ bool HP_map_remove_questinfo(int m, struct npc_data *nd) { retVal___ = HPMHooks.source.map.remove_questinfo(m, nd); } if( HPMHooks.count.HP_map_remove_questinfo_post ) { - bool (*postHookFunc) (bool retVal___, int *m, struct npc_data *nd); + bool (*postHookFunc) (bool retVal___, int m, struct npc_data *nd); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_remove_questinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_remove_questinfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &m, nd); + retVal___ = postHookFunc(retVal___, m, nd); } } return retVal___; @@ -42779,11 +42894,11 @@ struct map_zone_data* HP_map_merge_zone(struct map_zone_data *main, struct map_z int hIndex = 0; struct map_zone_data* retVal___ = NULL; if( HPMHooks.count.HP_map_merge_zone_pre ) { - struct map_zone_data* (*preHookFunc) (struct map_zone_data *main, struct map_zone_data *other); + struct map_zone_data* (*preHookFunc) (struct map_zone_data **main, struct map_zone_data **other); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_merge_zone_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_merge_zone_pre[hIndex].func; - retVal___ = preHookFunc(main, other); + retVal___ = preHookFunc(&main, &other); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42805,11 +42920,11 @@ struct map_zone_data* HP_map_merge_zone(struct map_zone_data *main, struct map_z void HP_map_zone_clear_single(struct map_zone_data *zone) { int hIndex = 0; if( HPMHooks.count.HP_map_zone_clear_single_pre ) { - void (*preHookFunc) (struct map_zone_data *zone); + void (*preHookFunc) (struct map_zone_data **zone); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_map_zone_clear_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_zone_clear_single_pre[hIndex].func; - preHookFunc(zone); + preHookFunc(&zone); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42828,7 +42943,7 @@ void HP_map_zone_clear_single(struct map_zone_data *zone) { } return; } -/* mapindex */ +/* mapindex_interface */ int HP_mapindex_init(void) { int hIndex = 0; int retVal___ = 0; @@ -42886,11 +43001,11 @@ int HP_mapindex_addmap(int index, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapindex_addmap_pre ) { - int (*preHookFunc) (int *index, const char *name); + int (*preHookFunc) (int *index, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_addmap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_addmap_pre[hIndex].func; - retVal___ = preHookFunc(&index, name); + retVal___ = preHookFunc(&index, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42901,10 +43016,10 @@ int HP_mapindex_addmap(int index, const char *name) { retVal___ = HPMHooks.source.mapindex.addmap(index, name); } if( HPMHooks.count.HP_mapindex_addmap_post ) { - int (*postHookFunc) (int retVal___, int *index, const char *name); + int (*postHookFunc) (int retVal___, int index, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_addmap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapindex_addmap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &index, name); + retVal___ = postHookFunc(retVal___, index, name); } } return retVal___; @@ -42927,10 +43042,10 @@ void HP_mapindex_removemap(int index) { HPMHooks.source.mapindex.removemap(index); } if( HPMHooks.count.HP_mapindex_removemap_post ) { - void (*postHookFunc) (int *index); + void (*postHookFunc) (int index); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_removemap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapindex_removemap_post[hIndex].func; - postHookFunc(&index); + postHookFunc(index); } } return; @@ -42939,11 +43054,11 @@ const char* HP_mapindex_getmapname(const char *string, char *output) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_mapindex_getmapname_pre ) { - const char* (*preHookFunc) (const char *string, char *output); + const char* (*preHookFunc) (const char **string, char **output); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_getmapname_pre[hIndex].func; - retVal___ = preHookFunc(string, output); + retVal___ = preHookFunc(&string, &output); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42966,11 +43081,11 @@ const char* HP_mapindex_getmapname_ext(const char *string, char *output) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_mapindex_getmapname_ext_pre ) { - const char* (*preHookFunc) (const char *string, char *output); + const char* (*preHookFunc) (const char **string, char **output); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_ext_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_getmapname_ext_pre[hIndex].func; - retVal___ = preHookFunc(string, output); + retVal___ = preHookFunc(&string, &output); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42993,11 +43108,11 @@ unsigned short HP_mapindex_name2id(const char *p1) { int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_mapindex_name2id_pre ) { - unsigned short (*preHookFunc) (const char *p1); + unsigned short (*preHookFunc) (const char **p1); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_name2id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_name2id_pre[hIndex].func; - retVal___ = preHookFunc(p1); + retVal___ = preHookFunc(&p1); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43020,11 +43135,11 @@ const char* HP_mapindex_id2name(uint16 id, const char *file, int line, const cha int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_mapindex_id2name_pre ) { - const char* (*preHookFunc) (uint16 *id, const char *file, int *line, const char *func); + const char* (*preHookFunc) (uint16 *id, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_id2name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapindex_id2name_pre[hIndex].func; - retVal___ = preHookFunc(&id, file, &line, func); + retVal___ = preHookFunc(&id, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43035,10 +43150,10 @@ const char* HP_mapindex_id2name(uint16 id, const char *file, int line, const cha retVal___ = HPMHooks.source.mapindex.id2name(id, file, line, func); } if( HPMHooks.count.HP_mapindex_id2name_post ) { - const char* (*postHookFunc) (const char* retVal___, uint16 *id, const char *file, int *line, const char *func); + const char* (*postHookFunc) (const char* retVal___, uint16 id, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_id2name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapindex_id2name_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id, file, &line, func); + retVal___ = postHookFunc(retVal___, id, file, line, func); } } return retVal___; @@ -43070,7 +43185,7 @@ bool HP_mapindex_check_default(void) { } return retVal___; } -/* mapit */ +/* mapit_interface */ struct s_mapiterator* HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types) { int hIndex = 0; struct s_mapiterator* retVal___ = NULL; @@ -43090,10 +43205,10 @@ struct s_mapiterator* HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types retVal___ = HPMHooks.source.mapit.alloc(flags, types); } if( HPMHooks.count.HP_mapit_alloc_post ) { - struct s_mapiterator* (*postHookFunc) (struct s_mapiterator* retVal___, enum e_mapitflags *flags, enum bl_type *types); + struct s_mapiterator* (*postHookFunc) (struct s_mapiterator* retVal___, enum e_mapitflags flags, enum bl_type types); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapit_alloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapit_alloc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &flags, &types); + retVal___ = postHookFunc(retVal___, flags, types); } } return retVal___; @@ -43101,11 +43216,11 @@ struct s_mapiterator* HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types void HP_mapit_free(struct s_mapiterator *iter) { int hIndex = 0; if( HPMHooks.count.HP_mapit_free_pre ) { - void (*preHookFunc) (struct s_mapiterator *iter); + void (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapit_free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapit_free_pre[hIndex].func; - preHookFunc(iter); + preHookFunc(&iter); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43128,11 +43243,11 @@ struct block_list* HP_mapit_first(struct s_mapiterator *iter) { int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_mapit_first_pre ) { - struct block_list* (*preHookFunc) (struct s_mapiterator *iter); + struct block_list* (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapit_first_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapit_first_pre[hIndex].func; - retVal___ = preHookFunc(iter); + retVal___ = preHookFunc(&iter); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43155,11 +43270,11 @@ struct block_list* HP_mapit_last(struct s_mapiterator *iter) { int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_mapit_last_pre ) { - struct block_list* (*preHookFunc) (struct s_mapiterator *iter); + struct block_list* (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapit_last_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapit_last_pre[hIndex].func; - retVal___ = preHookFunc(iter); + retVal___ = preHookFunc(&iter); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43182,11 +43297,11 @@ struct block_list* HP_mapit_next(struct s_mapiterator *iter) { int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_mapit_next_pre ) { - struct block_list* (*preHookFunc) (struct s_mapiterator *iter); + struct block_list* (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapit_next_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapit_next_pre[hIndex].func; - retVal___ = preHookFunc(iter); + retVal___ = preHookFunc(&iter); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43209,11 +43324,11 @@ struct block_list* HP_mapit_prev(struct s_mapiterator *iter) { int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_mapit_prev_pre ) { - struct block_list* (*preHookFunc) (struct s_mapiterator *iter); + struct block_list* (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapit_prev_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapit_prev_pre[hIndex].func; - retVal___ = preHookFunc(iter); + retVal___ = preHookFunc(&iter); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43236,11 +43351,11 @@ bool HP_mapit_exists(struct s_mapiterator *iter) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapit_exists_pre ) { - bool (*preHookFunc) (struct s_mapiterator *iter); + bool (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapit_exists_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapit_exists_pre[hIndex].func; - retVal___ = preHookFunc(iter); + retVal___ = preHookFunc(&iter); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43259,7 +43374,7 @@ bool HP_mapit_exists(struct s_mapiterator *iter) { } return retVal___; } -/* mapreg */ +/* mapreg_interface */ void HP_mapreg_init(void) { int hIndex = 0; if( HPMHooks.count.HP_mapreg_init_pre ) { @@ -43331,10 +43446,10 @@ int HP_mapreg_readreg(int64 uid) { retVal___ = HPMHooks.source.mapreg.readreg(uid); } if( HPMHooks.count.HP_mapreg_readreg_post ) { - int (*postHookFunc) (int retVal___, int64 *uid); + int (*postHookFunc) (int retVal___, int64 uid); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_readreg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapreg_readreg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &uid); + retVal___ = postHookFunc(retVal___, uid); } } return retVal___; @@ -43358,10 +43473,10 @@ char* HP_mapreg_readregstr(int64 uid) { retVal___ = HPMHooks.source.mapreg.readregstr(uid); } if( HPMHooks.count.HP_mapreg_readregstr_post ) { - char* (*postHookFunc) (char* retVal___, int64 *uid); + char* (*postHookFunc) (char* retVal___, int64 uid); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_readregstr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapreg_readregstr_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &uid); + retVal___ = postHookFunc(retVal___, uid); } } return retVal___; @@ -43385,10 +43500,10 @@ bool HP_mapreg_setreg(int64 uid, int val) { retVal___ = HPMHooks.source.mapreg.setreg(uid, val); } if( HPMHooks.count.HP_mapreg_setreg_post ) { - bool (*postHookFunc) (bool retVal___, int64 *uid, int *val); + bool (*postHookFunc) (bool retVal___, int64 uid, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_setreg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapreg_setreg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &uid, &val); + retVal___ = postHookFunc(retVal___, uid, val); } } return retVal___; @@ -43397,11 +43512,11 @@ bool HP_mapreg_setregstr(int64 uid, const char *str) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapreg_setregstr_pre ) { - bool (*preHookFunc) (int64 *uid, const char *str); + bool (*preHookFunc) (int64 *uid, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_setregstr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapreg_setregstr_pre[hIndex].func; - retVal___ = preHookFunc(&uid, str); + retVal___ = preHookFunc(&uid, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43412,10 +43527,10 @@ bool HP_mapreg_setregstr(int64 uid, const char *str) { retVal___ = HPMHooks.source.mapreg.setregstr(uid, str); } if( HPMHooks.count.HP_mapreg_setregstr_post ) { - bool (*postHookFunc) (bool retVal___, int64 *uid, const char *str); + bool (*postHookFunc) (bool retVal___, int64 uid, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_setregstr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapreg_setregstr_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &uid, str); + retVal___ = postHookFunc(retVal___, uid, str); } } return retVal___; @@ -43491,24 +43606,24 @@ int HP_mapreg_save_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.mapreg.save_timer(tid, tick, id, data); } if( HPMHooks.count.HP_mapreg_save_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_save_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapreg_save_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -int HP_mapreg_destroyreg(DBKey key, DBData *data, va_list ap) { +int HP_mapreg_destroyreg(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapreg_destroyreg_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_destroyreg_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mapreg_destroyreg_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -43522,11 +43637,11 @@ int HP_mapreg_destroyreg(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_mapreg_destroyreg_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_destroyreg_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_mapreg_destroyreg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -43562,11 +43677,11 @@ bool HP_mapreg_config_read(const char *w1, const char *w2) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapreg_config_read_pre ) { - bool (*preHookFunc) (const char *w1, const char *w2); + bool (*preHookFunc) (const char **w1, const char **w2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapreg_config_read_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2); + retVal___ = preHookFunc(&w1, &w2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43585,7 +43700,7 @@ bool HP_mapreg_config_read(const char *w1, const char *w2) { } return retVal___; } -/* mercenary */ +/* mercenary_interface */ void HP_mercenary_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_mercenary_init_pre ) { @@ -43604,10 +43719,10 @@ void HP_mercenary_init(bool minimal) { HPMHooks.source.mercenary.init(minimal); } if( HPMHooks.count.HP_mercenary_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -43631,10 +43746,10 @@ bool HP_mercenary_class(int class_) { retVal___ = HPMHooks.source.mercenary.class(class_); } if( HPMHooks.count.HP_mercenary_class_post ) { - bool (*postHookFunc) (bool retVal___, int *class_); + bool (*postHookFunc) (bool retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_class_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_class_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -43658,10 +43773,10 @@ struct view_data* HP_mercenary_get_viewdata(int class_) { retVal___ = HPMHooks.source.mercenary.get_viewdata(class_); } if( HPMHooks.count.HP_mercenary_get_viewdata_post ) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int *class_); + struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_get_viewdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_get_viewdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -43670,11 +43785,11 @@ int HP_mercenary_create(struct map_session_data *sd, int class_, unsigned int li int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_create_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *class_, unsigned int *lifetime); + int (*preHookFunc) (struct map_session_data **sd, int *class_, unsigned int *lifetime); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_create_pre[hIndex].func; - retVal___ = preHookFunc(sd, &class_, &lifetime); + retVal___ = preHookFunc(&sd, &class_, &lifetime); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43685,10 +43800,10 @@ int HP_mercenary_create(struct map_session_data *sd, int class_, unsigned int li retVal___ = HPMHooks.source.mercenary.create(sd, class_, lifetime); } if( HPMHooks.count.HP_mercenary_create_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *class_, unsigned int *lifetime); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int class_, unsigned int lifetime); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &class_, &lifetime); + retVal___ = postHookFunc(retVal___, sd, class_, lifetime); } } return retVal___; @@ -43697,11 +43812,11 @@ int HP_mercenary_data_received(const struct s_mercenary *merc, bool flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_data_received_pre ) { - int (*preHookFunc) (const struct s_mercenary *merc, bool *flag); + int (*preHookFunc) (const struct s_mercenary **merc, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_data_received_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_data_received_pre[hIndex].func; - retVal___ = preHookFunc(merc, &flag); + retVal___ = preHookFunc(&merc, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43712,10 +43827,10 @@ int HP_mercenary_data_received(const struct s_mercenary *merc, bool flag) { retVal___ = HPMHooks.source.mercenary.data_received(merc, flag); } if( HPMHooks.count.HP_mercenary_data_received_post ) { - int (*postHookFunc) (int retVal___, const struct s_mercenary *merc, bool *flag); + int (*postHookFunc) (int retVal___, const struct s_mercenary *merc, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_data_received_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_data_received_post[hIndex].func; - retVal___ = postHookFunc(retVal___, merc, &flag); + retVal___ = postHookFunc(retVal___, merc, flag); } } return retVal___; @@ -43724,11 +43839,11 @@ int HP_mercenary_save(struct mercenary_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_save_pre ) { - int (*preHookFunc) (struct mercenary_data *md); + int (*preHookFunc) (struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_save_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43750,11 +43865,11 @@ int HP_mercenary_save(struct mercenary_data *md) { void HP_mercenary_heal(struct mercenary_data *md, int hp, int sp) { int hIndex = 0; if( HPMHooks.count.HP_mercenary_heal_pre ) { - void (*preHookFunc) (struct mercenary_data *md, int *hp, int *sp); + void (*preHookFunc) (struct mercenary_data **md, int *hp, int *sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_heal_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_heal_pre[hIndex].func; - preHookFunc(md, &hp, &sp); + preHookFunc(&md, &hp, &sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43765,10 +43880,10 @@ void HP_mercenary_heal(struct mercenary_data *md, int hp, int sp) { HPMHooks.source.mercenary.heal(md, hp, sp); } if( HPMHooks.count.HP_mercenary_heal_post ) { - void (*postHookFunc) (struct mercenary_data *md, int *hp, int *sp); + void (*postHookFunc) (struct mercenary_data *md, int hp, int sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_heal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_heal_post[hIndex].func; - postHookFunc(md, &hp, &sp); + postHookFunc(md, hp, sp); } } return; @@ -43777,11 +43892,11 @@ int HP_mercenary_dead(struct mercenary_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_dead_pre ) { - int (*preHookFunc) (struct mercenary_data *md); + int (*preHookFunc) (struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_dead_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_dead_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43804,11 +43919,11 @@ int HP_mercenary_delete(struct mercenary_data *md, int reply) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_delete_pre ) { - int (*preHookFunc) (struct mercenary_data *md, int *reply); + int (*preHookFunc) (struct mercenary_data **md, int *reply); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_delete_pre[hIndex].func; - retVal___ = preHookFunc(md, &reply); + retVal___ = preHookFunc(&md, &reply); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43819,10 +43934,10 @@ int HP_mercenary_delete(struct mercenary_data *md, int reply) { retVal___ = HPMHooks.source.mercenary.delete(md, reply); } if( HPMHooks.count.HP_mercenary_delete_post ) { - int (*postHookFunc) (int retVal___, struct mercenary_data *md, int *reply); + int (*postHookFunc) (int retVal___, struct mercenary_data *md, int reply); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &reply); + retVal___ = postHookFunc(retVal___, md, reply); } } return retVal___; @@ -43830,11 +43945,11 @@ int HP_mercenary_delete(struct mercenary_data *md, int reply) { void HP_mercenary_contract_stop(struct mercenary_data *md) { int hIndex = 0; if( HPMHooks.count.HP_mercenary_contract_stop_pre ) { - void (*preHookFunc) (struct mercenary_data *md); + void (*preHookFunc) (struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_contract_stop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_contract_stop_pre[hIndex].func; - preHookFunc(md); + preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43857,11 +43972,11 @@ int HP_mercenary_get_lifetime(struct mercenary_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_get_lifetime_pre ) { - int (*preHookFunc) (struct mercenary_data *md); + int (*preHookFunc) (struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_get_lifetime_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_get_lifetime_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43884,11 +43999,11 @@ int HP_mercenary_get_guild(struct mercenary_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_get_guild_pre ) { - int (*preHookFunc) (struct mercenary_data *md); + int (*preHookFunc) (struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_get_guild_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_get_guild_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43911,11 +44026,11 @@ int HP_mercenary_get_faith(struct mercenary_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_get_faith_pre ) { - int (*preHookFunc) (struct mercenary_data *md); + int (*preHookFunc) (struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_get_faith_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_get_faith_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43938,11 +44053,11 @@ int HP_mercenary_set_faith(struct mercenary_data *md, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_set_faith_pre ) { - int (*preHookFunc) (struct mercenary_data *md, int *value); + int (*preHookFunc) (struct mercenary_data **md, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_set_faith_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_set_faith_pre[hIndex].func; - retVal___ = preHookFunc(md, &value); + retVal___ = preHookFunc(&md, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43953,10 +44068,10 @@ int HP_mercenary_set_faith(struct mercenary_data *md, int value) { retVal___ = HPMHooks.source.mercenary.set_faith(md, value); } if( HPMHooks.count.HP_mercenary_set_faith_post ) { - int (*postHookFunc) (int retVal___, struct mercenary_data *md, int *value); + int (*postHookFunc) (int retVal___, struct mercenary_data *md, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_set_faith_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_set_faith_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &value); + retVal___ = postHookFunc(retVal___, md, value); } } return retVal___; @@ -43965,11 +44080,11 @@ int HP_mercenary_get_calls(struct mercenary_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_get_calls_pre ) { - int (*preHookFunc) (struct mercenary_data *md); + int (*preHookFunc) (struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_get_calls_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_get_calls_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43992,11 +44107,11 @@ int HP_mercenary_set_calls(struct mercenary_data *md, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_set_calls_pre ) { - int (*preHookFunc) (struct mercenary_data *md, int *value); + int (*preHookFunc) (struct mercenary_data **md, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_set_calls_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_set_calls_pre[hIndex].func; - retVal___ = preHookFunc(md, &value); + retVal___ = preHookFunc(&md, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44007,10 +44122,10 @@ int HP_mercenary_set_calls(struct mercenary_data *md, int value) { retVal___ = HPMHooks.source.mercenary.set_calls(md, value); } if( HPMHooks.count.HP_mercenary_set_calls_post ) { - int (*postHookFunc) (int retVal___, struct mercenary_data *md, int *value); + int (*postHookFunc) (int retVal___, struct mercenary_data *md, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_set_calls_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_set_calls_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &value); + retVal___ = postHookFunc(retVal___, md, value); } } return retVal___; @@ -44019,11 +44134,11 @@ int HP_mercenary_kills(struct mercenary_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_kills_pre ) { - int (*preHookFunc) (struct mercenary_data *md); + int (*preHookFunc) (struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_kills_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_kills_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44046,11 +44161,11 @@ int HP_mercenary_checkskill(struct mercenary_data *md, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_checkskill_pre ) { - int (*preHookFunc) (struct mercenary_data *md, uint16 *skill_id); + int (*preHookFunc) (struct mercenary_data **md, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_checkskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_checkskill_pre[hIndex].func; - retVal___ = preHookFunc(md, &skill_id); + retVal___ = preHookFunc(&md, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44061,10 +44176,10 @@ int HP_mercenary_checkskill(struct mercenary_data *md, uint16 skill_id) { retVal___ = HPMHooks.source.mercenary.checkskill(md, skill_id); } if( HPMHooks.count.HP_mercenary_checkskill_post ) { - int (*postHookFunc) (int retVal___, struct mercenary_data *md, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct mercenary_data *md, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_checkskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_checkskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &skill_id); + retVal___ = postHookFunc(retVal___, md, skill_id); } } return retVal___; @@ -44127,11 +44242,11 @@ int HP_mercenary_killbonus(struct mercenary_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_killbonus_pre ) { - int (*preHookFunc) (struct mercenary_data *md); + int (*preHookFunc) (struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_killbonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_killbonus_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44169,10 +44284,10 @@ int HP_mercenary_search_index(int class_) { retVal___ = HPMHooks.source.mercenary.search_index(class_); } if( HPMHooks.count.HP_mercenary_search_index_post ) { - int (*postHookFunc) (int retVal___, int *class_); + int (*postHookFunc) (int retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_search_index_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_search_index_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -44196,10 +44311,10 @@ int HP_mercenary_contract_end_timer(int tid, int64 tick, int id, intptr_t data) retVal___ = HPMHooks.source.mercenary.contract_end_timer(tid, tick, id, data); } if( HPMHooks.count.HP_mercenary_contract_end_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_contract_end_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_contract_end_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -44208,11 +44323,11 @@ bool HP_mercenary_read_db_sub(char *str[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mercenary_read_db_sub_pre ) { - bool (*preHookFunc) (char *str[], int *columns, int *current); + bool (*preHookFunc) (char **str[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_read_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_read_db_sub_pre[hIndex].func; - retVal___ = preHookFunc(str, &columns, ¤t); + retVal___ = preHookFunc(&str, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44223,10 +44338,10 @@ bool HP_mercenary_read_db_sub(char *str[], int columns, int current) { retVal___ = HPMHooks.source.mercenary.read_db_sub(str, columns, current); } if( HPMHooks.count.HP_mercenary_read_db_sub_post ) { - bool (*postHookFunc) (bool retVal___, char *str[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *str[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_read_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_read_db_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &columns, ¤t); + retVal___ = postHookFunc(retVal___, str, columns, current); } } return retVal___; @@ -44235,11 +44350,11 @@ bool HP_mercenary_read_skill_db_sub(char *str[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mercenary_read_skill_db_sub_pre ) { - bool (*preHookFunc) (char *str[], int *columns, int *current); + bool (*preHookFunc) (char **str[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_read_skill_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_read_skill_db_sub_pre[hIndex].func; - retVal___ = preHookFunc(str, &columns, ¤t); + retVal___ = preHookFunc(&str, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44250,15 +44365,15 @@ bool HP_mercenary_read_skill_db_sub(char *str[], int columns, int current) { retVal___ = HPMHooks.source.mercenary.read_skill_db_sub(str, columns, current); } if( HPMHooks.count.HP_mercenary_read_skill_db_sub_post ) { - bool (*postHookFunc) (bool retVal___, char *str[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *str[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_read_skill_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_read_skill_db_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &columns, ¤t); + retVal___ = postHookFunc(retVal___, str, columns, current); } } return retVal___; } -/* mob */ +/* mob_interface */ int HP_mob_init(bool mimimal) { int hIndex = 0; int retVal___ = 0; @@ -44278,10 +44393,10 @@ int HP_mob_init(bool mimimal) { retVal___ = HPMHooks.source.mob.init(mimimal); } if( HPMHooks.count.HP_mob_init_post ) { - int (*postHookFunc) (int retVal___, bool *mimimal); + int (*postHookFunc) (int retVal___, bool mimimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &mimimal); + retVal___ = postHookFunc(retVal___, mimimal); } } return retVal___; @@ -44358,10 +44473,10 @@ struct mob_db* HP_mob_db(int index) { retVal___ = HPMHooks.source.mob.db(index); } if( HPMHooks.count.HP_mob_db_post ) { - struct mob_db* (*postHookFunc) (struct mob_db* retVal___, int *index); + struct mob_db* (*postHookFunc) (struct mob_db* retVal___, int index); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_db_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &index); + retVal___ = postHookFunc(retVal___, index); } } return retVal___; @@ -44385,10 +44500,10 @@ struct mob_chat* HP_mob_chat(short id) { retVal___ = HPMHooks.source.mob.chat(id); } if( HPMHooks.count.HP_mob_chat_post ) { - struct mob_chat* (*postHookFunc) (struct mob_chat* retVal___, short *id); + struct mob_chat* (*postHookFunc) (struct mob_chat* retVal___, short id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_chat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_chat_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -44412,10 +44527,10 @@ int HP_mob_makedummymobdb(int p1) { retVal___ = HPMHooks.source.mob.makedummymobdb(p1); } if( HPMHooks.count.HP_mob_makedummymobdb_post ) { - int (*postHookFunc) (int retVal___, int *p1); + int (*postHookFunc) (int retVal___, int p1); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_makedummymobdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_makedummymobdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &p1); + retVal___ = postHookFunc(retVal___, p1); } } return retVal___; @@ -44439,10 +44554,10 @@ int HP_mob_spawn_guardian_sub(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.mob.spawn_guardian_sub(tid, tick, id, data); } if( HPMHooks.count.HP_mob_spawn_guardian_sub_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_guardian_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_spawn_guardian_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -44466,10 +44581,10 @@ int HP_mob_skill_id2skill_idx(int class_, uint16 skill_id) { retVal___ = HPMHooks.source.mob.skill_id2skill_idx(class_, skill_id); } if( HPMHooks.count.HP_mob_skill_id2skill_idx_post ) { - int (*postHookFunc) (int retVal___, int *class_, uint16 *skill_id); + int (*postHookFunc) (int retVal___, int class_, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_skill_id2skill_idx_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_skill_id2skill_idx_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_, &skill_id); + retVal___ = postHookFunc(retVal___, class_, skill_id); } } return retVal___; @@ -44478,11 +44593,11 @@ int HP_mob_db_searchname(const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_db_searchname_pre ) { - int (*preHookFunc) (const char *str); + int (*preHookFunc) (const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_searchname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_db_searchname_pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44505,11 +44620,11 @@ int HP_mob_db_searchname_array_sub(struct mob_db *monster, const char *str, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_db_searchname_array_sub_pre ) { - int (*preHookFunc) (struct mob_db *monster, const char *str, int *flag); + int (*preHookFunc) (struct mob_db **monster, const char **str, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_searchname_array_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_db_searchname_array_sub_pre[hIndex].func; - retVal___ = preHookFunc(monster, str, &flag); + retVal___ = preHookFunc(&monster, &str, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44520,10 +44635,10 @@ int HP_mob_db_searchname_array_sub(struct mob_db *monster, const char *str, int retVal___ = HPMHooks.source.mob.db_searchname_array_sub(monster, str, flag); } if( HPMHooks.count.HP_mob_db_searchname_array_sub_post ) { - int (*postHookFunc) (int retVal___, struct mob_db *monster, const char *str, int *flag); + int (*postHookFunc) (int retVal___, struct mob_db *monster, const char *str, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_searchname_array_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_db_searchname_array_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, monster, str, &flag); + retVal___ = postHookFunc(retVal___, monster, str, flag); } } return retVal___; @@ -44531,11 +44646,11 @@ int HP_mob_db_searchname_array_sub(struct mob_db *monster, const char *str, int void HP_mob_mvptomb_create(struct mob_data *md, char *killer, time_t time) { int hIndex = 0; if( HPMHooks.count.HP_mob_mvptomb_create_pre ) { - void (*preHookFunc) (struct mob_data *md, char *killer, time_t *time); + void (*preHookFunc) (struct mob_data **md, char **killer, time_t *time); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_mvptomb_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_mvptomb_create_pre[hIndex].func; - preHookFunc(md, killer, &time); + preHookFunc(&md, &killer, &time); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44546,10 +44661,10 @@ void HP_mob_mvptomb_create(struct mob_data *md, char *killer, time_t time) { HPMHooks.source.mob.mvptomb_create(md, killer, time); } if( HPMHooks.count.HP_mob_mvptomb_create_post ) { - void (*postHookFunc) (struct mob_data *md, char *killer, time_t *time); + void (*postHookFunc) (struct mob_data *md, char *killer, time_t time); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_mvptomb_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_mvptomb_create_post[hIndex].func; - postHookFunc(md, killer, &time); + postHookFunc(md, killer, time); } } return; @@ -44557,11 +44672,11 @@ void HP_mob_mvptomb_create(struct mob_data *md, char *killer, time_t time) { void HP_mob_mvptomb_destroy(struct mob_data *md) { int hIndex = 0; if( HPMHooks.count.HP_mob_mvptomb_destroy_pre ) { - void (*preHookFunc) (struct mob_data *md); + void (*preHookFunc) (struct mob_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_mvptomb_destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_mvptomb_destroy_pre[hIndex].func; - preHookFunc(md); + preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44584,11 +44699,11 @@ int HP_mob_db_searchname_array(struct mob_db **data, int size, const char *str, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_db_searchname_array_pre ) { - int (*preHookFunc) (struct mob_db **data, int *size, const char *str, int *flag); + int (*preHookFunc) (struct mob_db ***data, int *size, const char **str, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_searchname_array_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_db_searchname_array_pre[hIndex].func; - retVal___ = preHookFunc(data, &size, str, &flag); + retVal___ = preHookFunc(&data, &size, &str, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44599,10 +44714,10 @@ int HP_mob_db_searchname_array(struct mob_db **data, int size, const char *str, retVal___ = HPMHooks.source.mob.db_searchname_array(data, size, str, flag); } if( HPMHooks.count.HP_mob_db_searchname_array_post ) { - int (*postHookFunc) (int retVal___, struct mob_db **data, int *size, const char *str, int *flag); + int (*postHookFunc) (int retVal___, struct mob_db **data, int size, const char *str, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_searchname_array_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_db_searchname_array_post[hIndex].func; - retVal___ = postHookFunc(retVal___, data, &size, str, &flag); + retVal___ = postHookFunc(retVal___, data, size, str, flag); } } return retVal___; @@ -44626,10 +44741,10 @@ int HP_mob_db_checkid(const int id) { retVal___ = HPMHooks.source.mob.db_checkid(id); } if( HPMHooks.count.HP_mob_db_checkid_post ) { - int (*postHookFunc) (int retVal___, const int *id); + int (*postHookFunc) (int retVal___, const int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_checkid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_db_checkid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -44653,10 +44768,10 @@ struct view_data* HP_mob_get_viewdata(int class_) { retVal___ = HPMHooks.source.mob.get_viewdata(class_); } if( HPMHooks.count.HP_mob_get_viewdata_post ) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int *class_); + struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_viewdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_get_viewdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -44665,11 +44780,11 @@ int HP_mob_parse_dataset(struct spawn_data *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_parse_dataset_pre ) { - int (*preHookFunc) (struct spawn_data *data); + int (*preHookFunc) (struct spawn_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_parse_dataset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_parse_dataset_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44692,11 +44807,11 @@ struct mob_data* HP_mob_spawn_dataset(struct spawn_data *data) { int hIndex = 0; struct mob_data* retVal___ = NULL; if( HPMHooks.count.HP_mob_spawn_dataset_pre ) { - struct mob_data* (*preHookFunc) (struct spawn_data *data); + struct mob_data* (*preHookFunc) (struct spawn_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_dataset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_spawn_dataset_pre[hIndex].func; - retVal___ = preHookFunc(data); + retVal___ = preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44734,10 +44849,10 @@ int HP_mob_get_random_id(int type, int flag, int lv) { retVal___ = HPMHooks.source.mob.get_random_id(type, flag, lv); } if( HPMHooks.count.HP_mob_get_random_id_post ) { - int (*postHookFunc) (int retVal___, int *type, int *flag, int *lv); + int (*postHookFunc) (int retVal___, int type, int flag, int lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_random_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_get_random_id_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type, &flag, &lv); + retVal___ = postHookFunc(retVal___, type, flag, lv); } } return retVal___; @@ -44746,11 +44861,11 @@ bool HP_mob_ksprotected(struct block_list *src, struct block_list *target) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_ksprotected_pre ) { - bool (*preHookFunc) (struct block_list *src, struct block_list *target); + bool (*preHookFunc) (struct block_list **src, struct block_list **target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ksprotected_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_ksprotected_pre[hIndex].func; - retVal___ = preHookFunc(src, target); + retVal___ = preHookFunc(&src, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44773,11 +44888,11 @@ struct mob_data* HP_mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int hIndex = 0; struct mob_data* retVal___ = NULL; if( HPMHooks.count.HP_mob_once_spawn_sub_pre ) { - struct mob_data* (*preHookFunc) (struct block_list *bl, int16 *m, int16 *x, int16 *y, const char *mobname, int *class_, const char *event, unsigned int *size, unsigned int *ai); + struct mob_data* (*preHookFunc) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_once_spawn_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, &m, &x, &y, mobname, &class_, event, &size, &ai); + retVal___ = preHookFunc(&bl, &m, &x, &y, &mobname, &class_, &event, &size, &ai); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44788,10 +44903,10 @@ struct mob_data* HP_mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, retVal___ = HPMHooks.source.mob.once_spawn_sub(bl, m, x, y, mobname, class_, event, size, ai); } if( HPMHooks.count.HP_mob_once_spawn_sub_post ) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct block_list *bl, int16 *m, int16 *x, int16 *y, const char *mobname, int *class_, const char *event, unsigned int *size, unsigned int *ai); + struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_once_spawn_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &m, &x, &y, mobname, &class_, event, &size, &ai); + retVal___ = postHookFunc(retVal___, bl, m, x, y, mobname, class_, event, size, ai); } } return retVal___; @@ -44800,11 +44915,11 @@ int HP_mob_once_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, co int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_once_spawn_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int16 *m, int16 *x, int16 *y, const char *mobname, int *class_, int *amount, const char *event, unsigned int *size, unsigned int *ai); + int (*preHookFunc) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, int *amount, const char **event, unsigned int *size, unsigned int *ai); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_once_spawn_pre[hIndex].func; - retVal___ = preHookFunc(sd, &m, &x, &y, mobname, &class_, &amount, event, &size, &ai); + retVal___ = preHookFunc(&sd, &m, &x, &y, &mobname, &class_, &amount, &event, &size, &ai); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44815,10 +44930,10 @@ int HP_mob_once_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, co retVal___ = HPMHooks.source.mob.once_spawn(sd, m, x, y, mobname, class_, amount, event, size, ai); } if( HPMHooks.count.HP_mob_once_spawn_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 *m, int16 *x, int16 *y, const char *mobname, int *class_, int *amount, const char *event, unsigned int *size, unsigned int *ai); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y, const char *mobname, int class_, int amount, const char *event, unsigned int size, unsigned int ai); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_once_spawn_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &m, &x, &y, mobname, &class_, &amount, event, &size, &ai); + retVal___ = postHookFunc(retVal___, sd, m, x, y, mobname, class_, amount, event, size, ai); } } return retVal___; @@ -44827,11 +44942,11 @@ int HP_mob_once_spawn_area(struct map_session_data *sd, int16 m, int16 x0, int16 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_once_spawn_area_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, const char *mobname, int *class_, int *amount, const char *event, unsigned int *size, unsigned int *ai); + int (*preHookFunc) (struct map_session_data **sd, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, const char **mobname, int *class_, int *amount, const char **event, unsigned int *size, unsigned int *ai); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_area_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_once_spawn_area_pre[hIndex].func; - retVal___ = preHookFunc(sd, &m, &x0, &y0, &x1, &y1, mobname, &class_, &amount, event, &size, &ai); + retVal___ = preHookFunc(&sd, &m, &x0, &y0, &x1, &y1, &mobname, &class_, &amount, &event, &size, &ai); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44842,10 +44957,10 @@ int HP_mob_once_spawn_area(struct map_session_data *sd, int16 m, int16 x0, int16 retVal___ = HPMHooks.source.mob.once_spawn_area(sd, m, x0, y0, x1, y1, mobname, class_, amount, event, size, ai); } if( HPMHooks.count.HP_mob_once_spawn_area_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, const char *mobname, int *class_, int *amount, const char *event, unsigned int *size, unsigned int *ai); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, const char *mobname, int class_, int amount, const char *event, unsigned int size, unsigned int ai); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_area_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_once_spawn_area_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &m, &x0, &y0, &x1, &y1, mobname, &class_, &amount, event, &size, &ai); + retVal___ = postHookFunc(retVal___, sd, m, x0, y0, x1, y1, mobname, class_, amount, event, size, ai); } } return retVal___; @@ -44854,11 +44969,11 @@ int HP_mob_spawn_guardian(const char *mapname, short x, short y, const char *mob int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_spawn_guardian_pre ) { - int (*preHookFunc) (const char *mapname, short *x, short *y, const char *mobname, int *class_, const char *event, int *guardian, bool *has_index); + int (*preHookFunc) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, int *guardian, bool *has_index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_guardian_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_spawn_guardian_pre[hIndex].func; - retVal___ = preHookFunc(mapname, &x, &y, mobname, &class_, event, &guardian, &has_index); + retVal___ = preHookFunc(&mapname, &x, &y, &mobname, &class_, &event, &guardian, &has_index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44869,10 +44984,10 @@ int HP_mob_spawn_guardian(const char *mapname, short x, short y, const char *mob retVal___ = HPMHooks.source.mob.spawn_guardian(mapname, x, y, mobname, class_, event, guardian, has_index); } if( HPMHooks.count.HP_mob_spawn_guardian_post ) { - int (*postHookFunc) (int retVal___, const char *mapname, short *x, short *y, const char *mobname, int *class_, const char *event, int *guardian, bool *has_index); + int (*postHookFunc) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, int guardian, bool has_index); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_guardian_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_spawn_guardian_post[hIndex].func; - retVal___ = postHookFunc(retVal___, mapname, &x, &y, mobname, &class_, event, &guardian, &has_index); + retVal___ = postHookFunc(retVal___, mapname, x, y, mobname, class_, event, guardian, has_index); } } return retVal___; @@ -44881,11 +44996,11 @@ int HP_mob_spawn_bg(const char *mapname, short x, short y, const char *mobname, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_spawn_bg_pre ) { - int (*preHookFunc) (const char *mapname, short *x, short *y, const char *mobname, int *class_, const char *event, unsigned int *bg_id); + int (*preHookFunc) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, unsigned int *bg_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_bg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_spawn_bg_pre[hIndex].func; - retVal___ = preHookFunc(mapname, &x, &y, mobname, &class_, event, &bg_id); + retVal___ = preHookFunc(&mapname, &x, &y, &mobname, &class_, &event, &bg_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44896,10 +45011,10 @@ int HP_mob_spawn_bg(const char *mapname, short x, short y, const char *mobname, retVal___ = HPMHooks.source.mob.spawn_bg(mapname, x, y, mobname, class_, event, bg_id); } if( HPMHooks.count.HP_mob_spawn_bg_post ) { - int (*postHookFunc) (int retVal___, const char *mapname, short *x, short *y, const char *mobname, int *class_, const char *event, unsigned int *bg_id); + int (*postHookFunc) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, unsigned int bg_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_bg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_spawn_bg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, mapname, &x, &y, mobname, &class_, event, &bg_id); + retVal___ = postHookFunc(retVal___, mapname, x, y, mobname, class_, event, bg_id); } } return retVal___; @@ -44908,11 +45023,11 @@ int HP_mob_can_reach(struct mob_data *md, struct block_list *bl, int range, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_can_reach_pre ) { - int (*preHookFunc) (struct mob_data *md, struct block_list *bl, int *range, int *state); + int (*preHookFunc) (struct mob_data **md, struct block_list **bl, int *range, int *state); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_can_reach_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_can_reach_pre[hIndex].func; - retVal___ = preHookFunc(md, bl, &range, &state); + retVal___ = preHookFunc(&md, &bl, &range, &state); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44923,10 +45038,10 @@ int HP_mob_can_reach(struct mob_data *md, struct block_list *bl, int range, int retVal___ = HPMHooks.source.mob.can_reach(md, bl, range, state); } if( HPMHooks.count.HP_mob_can_reach_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, struct block_list *bl, int *range, int *state); + int (*postHookFunc) (int retVal___, struct mob_data *md, struct block_list *bl, int range, int state); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_can_reach_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_can_reach_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, bl, &range, &state); + retVal___ = postHookFunc(retVal___, md, bl, range, state); } } return retVal___; @@ -44935,12 +45050,12 @@ int HP_mob_linksearch(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_linksearch_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_linksearch_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_linksearch_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -44983,10 +45098,10 @@ int HP_mob_delayspawn(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.mob.delayspawn(tid, tick, id, data); } if( HPMHooks.count.HP_mob_delayspawn_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_delayspawn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_delayspawn_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -44995,11 +45110,11 @@ int HP_mob_setdelayspawn(struct mob_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_setdelayspawn_pre ) { - int (*preHookFunc) (struct mob_data *md); + int (*preHookFunc) (struct mob_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_setdelayspawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_setdelayspawn_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45022,12 +45137,12 @@ int HP_mob_count_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_count_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_count_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_count_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -45055,11 +45170,11 @@ int HP_mob_spawn(struct mob_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_spawn_pre ) { - int (*preHookFunc) (struct mob_data *md); + int (*preHookFunc) (struct mob_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_spawn_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45082,11 +45197,11 @@ int HP_mob_can_changetarget(const struct mob_data *md, const struct block_list * int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_can_changetarget_pre ) { - int (*preHookFunc) (const struct mob_data *md, const struct block_list *target, uint32 *mode); + int (*preHookFunc) (const struct mob_data **md, const struct block_list **target, uint32 *mode); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_can_changetarget_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_can_changetarget_pre[hIndex].func; - retVal___ = preHookFunc(md, target, &mode); + retVal___ = preHookFunc(&md, &target, &mode); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45097,10 +45212,10 @@ int HP_mob_can_changetarget(const struct mob_data *md, const struct block_list * retVal___ = HPMHooks.source.mob.can_changetarget(md, target, mode); } if( HPMHooks.count.HP_mob_can_changetarget_post ) { - int (*postHookFunc) (int retVal___, const struct mob_data *md, const struct block_list *target, uint32 *mode); + int (*postHookFunc) (int retVal___, const struct mob_data *md, const struct block_list *target, uint32 mode); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_can_changetarget_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_can_changetarget_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, target, &mode); + retVal___ = postHookFunc(retVal___, md, target, mode); } } return retVal___; @@ -45109,11 +45224,11 @@ int HP_mob_target(struct mob_data *md, struct block_list *bl, int dist) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_target_pre ) { - int (*preHookFunc) (struct mob_data *md, struct block_list *bl, int *dist); + int (*preHookFunc) (struct mob_data **md, struct block_list **bl, int *dist); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_target_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_target_pre[hIndex].func; - retVal___ = preHookFunc(md, bl, &dist); + retVal___ = preHookFunc(&md, &bl, &dist); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45124,10 +45239,10 @@ int HP_mob_target(struct mob_data *md, struct block_list *bl, int dist) { retVal___ = HPMHooks.source.mob.target(md, bl, dist); } if( HPMHooks.count.HP_mob_target_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, struct block_list *bl, int *dist); + int (*postHookFunc) (int retVal___, struct mob_data *md, struct block_list *bl, int dist); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_target_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_target_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, bl, &dist); + retVal___ = postHookFunc(retVal___, md, bl, dist); } } return retVal___; @@ -45136,12 +45251,12 @@ int HP_mob_ai_sub_hard_activesearch(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_sub_hard_activesearch_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_hard_activesearch_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_ai_sub_hard_activesearch_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -45169,12 +45284,12 @@ int HP_mob_ai_sub_hard_changechase(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_sub_hard_changechase_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_hard_changechase_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_ai_sub_hard_changechase_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -45202,12 +45317,12 @@ int HP_mob_ai_sub_hard_bg_ally(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_sub_hard_bg_ally_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_hard_bg_ally_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_ai_sub_hard_bg_ally_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -45235,12 +45350,12 @@ int HP_mob_ai_sub_hard_lootsearch(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_sub_hard_lootsearch_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_hard_lootsearch_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_ai_sub_hard_lootsearch_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -45268,12 +45383,12 @@ int HP_mob_warpchase_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_warpchase_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_warpchase_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_warpchase_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -45301,11 +45416,11 @@ int HP_mob_ai_sub_hard_slavemob(struct mob_data *md, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_sub_hard_slavemob_pre ) { - int (*preHookFunc) (struct mob_data *md, int64 *tick); + int (*preHookFunc) (struct mob_data **md, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_hard_slavemob_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_ai_sub_hard_slavemob_pre[hIndex].func; - retVal___ = preHookFunc(md, &tick); + retVal___ = preHookFunc(&md, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45316,10 +45431,10 @@ int HP_mob_ai_sub_hard_slavemob(struct mob_data *md, int64 tick) { retVal___ = HPMHooks.source.mob.ai_sub_hard_slavemob(md, tick); } if( HPMHooks.count.HP_mob_ai_sub_hard_slavemob_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, int64 *tick); + int (*postHookFunc) (int retVal___, struct mob_data *md, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_hard_slavemob_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_ai_sub_hard_slavemob_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &tick); + retVal___ = postHookFunc(retVal___, md, tick); } } return retVal___; @@ -45328,11 +45443,11 @@ int HP_mob_unlocktarget(struct mob_data *md, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_unlocktarget_pre ) { - int (*preHookFunc) (struct mob_data *md, int64 *tick); + int (*preHookFunc) (struct mob_data **md, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_unlocktarget_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_unlocktarget_pre[hIndex].func; - retVal___ = preHookFunc(md, &tick); + retVal___ = preHookFunc(&md, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45343,10 +45458,10 @@ int HP_mob_unlocktarget(struct mob_data *md, int64 tick) { retVal___ = HPMHooks.source.mob.unlocktarget(md, tick); } if( HPMHooks.count.HP_mob_unlocktarget_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, int64 *tick); + int (*postHookFunc) (int retVal___, struct mob_data *md, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_unlocktarget_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_unlocktarget_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &tick); + retVal___ = postHookFunc(retVal___, md, tick); } } return retVal___; @@ -45355,11 +45470,11 @@ int HP_mob_randomwalk(struct mob_data *md, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_randomwalk_pre ) { - int (*preHookFunc) (struct mob_data *md, int64 *tick); + int (*preHookFunc) (struct mob_data **md, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_randomwalk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_randomwalk_pre[hIndex].func; - retVal___ = preHookFunc(md, &tick); + retVal___ = preHookFunc(&md, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45370,10 +45485,10 @@ int HP_mob_randomwalk(struct mob_data *md, int64 tick) { retVal___ = HPMHooks.source.mob.randomwalk(md, tick); } if( HPMHooks.count.HP_mob_randomwalk_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, int64 *tick); + int (*postHookFunc) (int retVal___, struct mob_data *md, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_randomwalk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_randomwalk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &tick); + retVal___ = postHookFunc(retVal___, md, tick); } } return retVal___; @@ -45382,11 +45497,11 @@ int HP_mob_warpchase(struct mob_data *md, struct block_list *target) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_warpchase_pre ) { - int (*preHookFunc) (struct mob_data *md, struct block_list *target); + int (*preHookFunc) (struct mob_data **md, struct block_list **target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_warpchase_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_warpchase_pre[hIndex].func; - retVal___ = preHookFunc(md, target); + retVal___ = preHookFunc(&md, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45409,11 +45524,11 @@ bool HP_mob_ai_sub_hard(struct mob_data *md, int64 tick) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_ai_sub_hard_pre ) { - bool (*preHookFunc) (struct mob_data *md, int64 *tick); + bool (*preHookFunc) (struct mob_data **md, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_hard_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_ai_sub_hard_pre[hIndex].func; - retVal___ = preHookFunc(md, &tick); + retVal___ = preHookFunc(&md, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45424,10 +45539,10 @@ bool HP_mob_ai_sub_hard(struct mob_data *md, int64 tick) { retVal___ = HPMHooks.source.mob.ai_sub_hard(md, tick); } if( HPMHooks.count.HP_mob_ai_sub_hard_post ) { - bool (*postHookFunc) (bool retVal___, struct mob_data *md, int64 *tick); + bool (*postHookFunc) (bool retVal___, struct mob_data *md, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_hard_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_ai_sub_hard_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &tick); + retVal___ = postHookFunc(retVal___, md, tick); } } return retVal___; @@ -45436,12 +45551,12 @@ int HP_mob_ai_sub_hard_timer(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_sub_hard_timer_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_hard_timer_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_ai_sub_hard_timer_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -45469,12 +45584,12 @@ int HP_mob_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_sub_foreachclient_pre ) { - int (*preHookFunc) (struct map_session_data *sd, va_list ap); + int (*preHookFunc) (struct map_session_data **sd, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_foreachclient_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_ai_sub_foreachclient_pre[hIndex].func; - retVal___ = preHookFunc(sd, ap___copy); + retVal___ = preHookFunc(&sd, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -45502,12 +45617,12 @@ int HP_mob_ai_sub_lazy(struct mob_data *md, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_sub_lazy_pre ) { - int (*preHookFunc) (struct mob_data *md, va_list args); + int (*preHookFunc) (struct mob_data **md, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_sub_lazy_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_mob_ai_sub_lazy_pre[hIndex].func; - retVal___ = preHookFunc(md, args___copy); + retVal___ = preHookFunc(&md, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -45550,10 +45665,10 @@ int HP_mob_ai_lazy(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.mob.ai_lazy(tid, tick, id, data); } if( HPMHooks.count.HP_mob_ai_lazy_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_lazy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_ai_lazy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -45577,10 +45692,10 @@ int HP_mob_ai_hard(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.mob.ai_hard(tid, tick, id, data); } if( HPMHooks.count.HP_mob_ai_hard_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_hard_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_ai_hard_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -45589,11 +45704,11 @@ struct item_drop* HP_mob_setdropitem(int nameid, int qty, struct item_data *data int hIndex = 0; struct item_drop* retVal___ = NULL; if( HPMHooks.count.HP_mob_setdropitem_pre ) { - struct item_drop* (*preHookFunc) (int *nameid, int *qty, struct item_data *data); + struct item_drop* (*preHookFunc) (int *nameid, int *qty, struct item_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_setdropitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_setdropitem_pre[hIndex].func; - retVal___ = preHookFunc(&nameid, &qty, data); + retVal___ = preHookFunc(&nameid, &qty, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45604,10 +45719,10 @@ struct item_drop* HP_mob_setdropitem(int nameid, int qty, struct item_data *data retVal___ = HPMHooks.source.mob.setdropitem(nameid, qty, data); } if( HPMHooks.count.HP_mob_setdropitem_post ) { - struct item_drop* (*postHookFunc) (struct item_drop* retVal___, int *nameid, int *qty, struct item_data *data); + struct item_drop* (*postHookFunc) (struct item_drop* retVal___, int nameid, int qty, struct item_data *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_setdropitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_setdropitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &nameid, &qty, data); + retVal___ = postHookFunc(retVal___, nameid, qty, data); } } return retVal___; @@ -45616,11 +45731,11 @@ struct item_drop* HP_mob_setlootitem(struct item *item) { int hIndex = 0; struct item_drop* retVal___ = NULL; if( HPMHooks.count.HP_mob_setlootitem_pre ) { - struct item_drop* (*preHookFunc) (struct item *item); + struct item_drop* (*preHookFunc) (struct item **item); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_setlootitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_setlootitem_pre[hIndex].func; - retVal___ = preHookFunc(item); + retVal___ = preHookFunc(&item); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45658,10 +45773,10 @@ int HP_mob_delay_item_drop(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.mob.delay_item_drop(tid, tick, id, data); } if( HPMHooks.count.HP_mob_delay_item_drop_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_delay_item_drop_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_delay_item_drop_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -45669,11 +45784,11 @@ int HP_mob_delay_item_drop(int tid, int64 tick, int id, intptr_t data) { void HP_mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, struct item_drop *ditem, int loot, int drop_rate, unsigned short flag) { int hIndex = 0; if( HPMHooks.count.HP_mob_item_drop_pre ) { - void (*preHookFunc) (struct mob_data *md, struct item_drop_list *dlist, struct item_drop *ditem, int *loot, int *drop_rate, unsigned short *flag); + void (*preHookFunc) (struct mob_data **md, struct item_drop_list **dlist, struct item_drop **ditem, int *loot, int *drop_rate, unsigned short *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_item_drop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_item_drop_pre[hIndex].func; - preHookFunc(md, dlist, ditem, &loot, &drop_rate, &flag); + preHookFunc(&md, &dlist, &ditem, &loot, &drop_rate, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45684,10 +45799,10 @@ void HP_mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, struct HPMHooks.source.mob.item_drop(md, dlist, ditem, loot, drop_rate, flag); } if( HPMHooks.count.HP_mob_item_drop_post ) { - void (*postHookFunc) (struct mob_data *md, struct item_drop_list *dlist, struct item_drop *ditem, int *loot, int *drop_rate, unsigned short *flag); + void (*postHookFunc) (struct mob_data *md, struct item_drop_list *dlist, struct item_drop *ditem, int loot, int drop_rate, unsigned short flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_item_drop_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_item_drop_post[hIndex].func; - postHookFunc(md, dlist, ditem, &loot, &drop_rate, &flag); + postHookFunc(md, dlist, ditem, loot, drop_rate, flag); } } return; @@ -45711,10 +45826,10 @@ int HP_mob_timer_delete(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.mob.timer_delete(tid, tick, id, data); } if( HPMHooks.count.HP_mob_timer_delete_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_timer_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_timer_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -45723,12 +45838,12 @@ int HP_mob_deleteslave_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_deleteslave_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_deleteslave_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_deleteslave_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -45756,11 +45871,11 @@ int HP_mob_deleteslave(struct mob_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_deleteslave_pre ) { - int (*preHookFunc) (struct mob_data *md); + int (*preHookFunc) (struct mob_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_deleteslave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_deleteslave_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45798,10 +45913,10 @@ int HP_mob_respawn(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.mob.respawn(tid, tick, id, data); } if( HPMHooks.count.HP_mob_respawn_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_respawn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_respawn_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -45809,11 +45924,11 @@ int HP_mob_respawn(int tid, int64 tick, int id, intptr_t data) { void HP_mob_log_damage(struct mob_data *md, struct block_list *src, int damage) { int hIndex = 0; if( HPMHooks.count.HP_mob_log_damage_pre ) { - void (*preHookFunc) (struct mob_data *md, struct block_list *src, int *damage); + void (*preHookFunc) (struct mob_data **md, struct block_list **src, int *damage); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_log_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_log_damage_pre[hIndex].func; - preHookFunc(md, src, &damage); + preHookFunc(&md, &src, &damage); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45824,10 +45939,10 @@ void HP_mob_log_damage(struct mob_data *md, struct block_list *src, int damage) HPMHooks.source.mob.log_damage(md, src, damage); } if( HPMHooks.count.HP_mob_log_damage_post ) { - void (*postHookFunc) (struct mob_data *md, struct block_list *src, int *damage); + void (*postHookFunc) (struct mob_data *md, struct block_list *src, int damage); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_log_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_log_damage_post[hIndex].func; - postHookFunc(md, src, &damage); + postHookFunc(md, src, damage); } } return; @@ -45835,11 +45950,11 @@ void HP_mob_log_damage(struct mob_data *md, struct block_list *src, int damage) void HP_mob_damage(struct mob_data *md, struct block_list *src, int damage) { int hIndex = 0; if( HPMHooks.count.HP_mob_damage_pre ) { - void (*preHookFunc) (struct mob_data *md, struct block_list *src, int *damage); + void (*preHookFunc) (struct mob_data **md, struct block_list **src, int *damage); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_damage_pre[hIndex].func; - preHookFunc(md, src, &damage); + preHookFunc(&md, &src, &damage); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45850,10 +45965,10 @@ void HP_mob_damage(struct mob_data *md, struct block_list *src, int damage) { HPMHooks.source.mob.damage(md, src, damage); } if( HPMHooks.count.HP_mob_damage_post ) { - void (*postHookFunc) (struct mob_data *md, struct block_list *src, int *damage); + void (*postHookFunc) (struct mob_data *md, struct block_list *src, int damage); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_damage_post[hIndex].func; - postHookFunc(md, src, &damage); + postHookFunc(md, src, damage); } } return; @@ -45862,11 +45977,11 @@ int HP_mob_dead(struct mob_data *md, struct block_list *src, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_dead_pre ) { - int (*preHookFunc) (struct mob_data *md, struct block_list *src, int *type); + int (*preHookFunc) (struct mob_data **md, struct block_list **src, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_dead_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_dead_pre[hIndex].func; - retVal___ = preHookFunc(md, src, &type); + retVal___ = preHookFunc(&md, &src, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45877,10 +45992,10 @@ int HP_mob_dead(struct mob_data *md, struct block_list *src, int type) { retVal___ = HPMHooks.source.mob.dead(md, src, type); } if( HPMHooks.count.HP_mob_dead_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, struct block_list *src, int *type); + int (*postHookFunc) (int retVal___, struct mob_data *md, struct block_list *src, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_dead_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_dead_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, src, &type); + retVal___ = postHookFunc(retVal___, md, src, type); } } return retVal___; @@ -45888,11 +46003,11 @@ int HP_mob_dead(struct mob_data *md, struct block_list *src, int type) { void HP_mob_revive(struct mob_data *md, unsigned int hp) { int hIndex = 0; if( HPMHooks.count.HP_mob_revive_pre ) { - void (*preHookFunc) (struct mob_data *md, unsigned int *hp); + void (*preHookFunc) (struct mob_data **md, unsigned int *hp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_revive_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_revive_pre[hIndex].func; - preHookFunc(md, &hp); + preHookFunc(&md, &hp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45903,10 +46018,10 @@ void HP_mob_revive(struct mob_data *md, unsigned int hp) { HPMHooks.source.mob.revive(md, hp); } if( HPMHooks.count.HP_mob_revive_post ) { - void (*postHookFunc) (struct mob_data *md, unsigned int *hp); + void (*postHookFunc) (struct mob_data *md, unsigned int hp); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_revive_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_revive_post[hIndex].func; - postHookFunc(md, &hp); + postHookFunc(md, hp); } } return; @@ -45915,11 +46030,11 @@ int HP_mob_guardian_guildchange(struct mob_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_guardian_guildchange_pre ) { - int (*preHookFunc) (struct mob_data *md); + int (*preHookFunc) (struct mob_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_guardian_guildchange_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_guardian_guildchange_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45942,11 +46057,11 @@ int HP_mob_random_class(int *value, size_t count) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_random_class_pre ) { - int (*preHookFunc) (int *value, size_t *count); + int (*preHookFunc) (int **value, size_t *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_random_class_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_random_class_pre[hIndex].func; - retVal___ = preHookFunc(value, &count); + retVal___ = preHookFunc(&value, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45957,10 +46072,10 @@ int HP_mob_random_class(int *value, size_t count) { retVal___ = HPMHooks.source.mob.random_class(value, count); } if( HPMHooks.count.HP_mob_random_class_post ) { - int (*postHookFunc) (int retVal___, int *value, size_t *count); + int (*postHookFunc) (int retVal___, int *value, size_t count); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_random_class_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_random_class_post[hIndex].func; - retVal___ = postHookFunc(retVal___, value, &count); + retVal___ = postHookFunc(retVal___, value, count); } } return retVal___; @@ -45969,11 +46084,11 @@ int HP_mob_class_change(struct mob_data *md, int class_) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_class_change_pre ) { - int (*preHookFunc) (struct mob_data *md, int *class_); + int (*preHookFunc) (struct mob_data **md, int *class_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_class_change_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_class_change_pre[hIndex].func; - retVal___ = preHookFunc(md, &class_); + retVal___ = preHookFunc(&md, &class_); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45984,10 +46099,10 @@ int HP_mob_class_change(struct mob_data *md, int class_) { retVal___ = HPMHooks.source.mob.class_change(md, class_); } if( HPMHooks.count.HP_mob_class_change_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, int *class_); + int (*postHookFunc) (int retVal___, struct mob_data *md, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_class_change_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_class_change_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &class_); + retVal___ = postHookFunc(retVal___, md, class_); } } return retVal___; @@ -45995,11 +46110,11 @@ int HP_mob_class_change(struct mob_data *md, int class_) { void HP_mob_heal(struct mob_data *md, unsigned int heal) { int hIndex = 0; if( HPMHooks.count.HP_mob_heal_pre ) { - void (*preHookFunc) (struct mob_data *md, unsigned int *heal); + void (*preHookFunc) (struct mob_data **md, unsigned int *heal); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_heal_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_heal_pre[hIndex].func; - preHookFunc(md, &heal); + preHookFunc(&md, &heal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46010,10 +46125,10 @@ void HP_mob_heal(struct mob_data *md, unsigned int heal) { HPMHooks.source.mob.heal(md, heal); } if( HPMHooks.count.HP_mob_heal_post ) { - void (*postHookFunc) (struct mob_data *md, unsigned int *heal); + void (*postHookFunc) (struct mob_data *md, unsigned int heal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_heal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_heal_post[hIndex].func; - postHookFunc(md, &heal); + postHookFunc(md, heal); } } return; @@ -46022,12 +46137,12 @@ int HP_mob_warpslave_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_warpslave_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_warpslave_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_warpslave_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -46055,11 +46170,11 @@ int HP_mob_warpslave(struct block_list *bl, int range) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_warpslave_pre ) { - int (*preHookFunc) (struct block_list *bl, int *range); + int (*preHookFunc) (struct block_list **bl, int *range); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_warpslave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_warpslave_pre[hIndex].func; - retVal___ = preHookFunc(bl, &range); + retVal___ = preHookFunc(&bl, &range); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46070,10 +46185,10 @@ int HP_mob_warpslave(struct block_list *bl, int range) { retVal___ = HPMHooks.source.mob.warpslave(bl, range); } if( HPMHooks.count.HP_mob_warpslave_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *range); + int (*postHookFunc) (int retVal___, struct block_list *bl, int range); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_warpslave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_warpslave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &range); + retVal___ = postHookFunc(retVal___, bl, range); } } return retVal___; @@ -46082,12 +46197,12 @@ int HP_mob_countslave_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_countslave_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_countslave_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_countslave_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -46115,11 +46230,11 @@ int HP_mob_countslave(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_countslave_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_countslave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_countslave_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46142,11 +46257,11 @@ int HP_mob_summonslave(struct mob_data *md2, int *value, int amount, uint16 skil int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_summonslave_pre ) { - int (*preHookFunc) (struct mob_data *md2, int *value, int *amount, uint16 *skill_id); + int (*preHookFunc) (struct mob_data **md2, int **value, int *amount, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_summonslave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_summonslave_pre[hIndex].func; - retVal___ = preHookFunc(md2, value, &amount, &skill_id); + retVal___ = preHookFunc(&md2, &value, &amount, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46157,10 +46272,10 @@ int HP_mob_summonslave(struct mob_data *md2, int *value, int amount, uint16 skil retVal___ = HPMHooks.source.mob.summonslave(md2, value, amount, skill_id); } if( HPMHooks.count.HP_mob_summonslave_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md2, int *value, int *amount, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct mob_data *md2, int *value, int amount, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_summonslave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_summonslave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md2, value, &amount, &skill_id); + retVal___ = postHookFunc(retVal___, md2, value, amount, skill_id); } } return retVal___; @@ -46169,12 +46284,12 @@ int HP_mob_getfriendhprate_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_getfriendhprate_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendhprate_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_getfriendhprate_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -46202,11 +46317,11 @@ struct block_list* HP_mob_getfriendhprate(struct mob_data *md, int min_rate, int int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_mob_getfriendhprate_pre ) { - struct block_list* (*preHookFunc) (struct mob_data *md, int *min_rate, int *max_rate); + struct block_list* (*preHookFunc) (struct mob_data **md, int *min_rate, int *max_rate); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendhprate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_getfriendhprate_pre[hIndex].func; - retVal___ = preHookFunc(md, &min_rate, &max_rate); + retVal___ = preHookFunc(&md, &min_rate, &max_rate); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46217,10 +46332,10 @@ struct block_list* HP_mob_getfriendhprate(struct mob_data *md, int min_rate, int retVal___ = HPMHooks.source.mob.getfriendhprate(md, min_rate, max_rate); } if( HPMHooks.count.HP_mob_getfriendhprate_post ) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct mob_data *md, int *min_rate, int *max_rate); + struct block_list* (*postHookFunc) (struct block_list* retVal___, struct mob_data *md, int min_rate, int max_rate); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendhprate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_getfriendhprate_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &min_rate, &max_rate); + retVal___ = postHookFunc(retVal___, md, min_rate, max_rate); } } return retVal___; @@ -46229,11 +46344,11 @@ struct block_list* HP_mob_getmasterhpltmaxrate(struct mob_data *md, int rate) { int hIndex = 0; struct block_list* retVal___ = NULL; if( HPMHooks.count.HP_mob_getmasterhpltmaxrate_pre ) { - struct block_list* (*preHookFunc) (struct mob_data *md, int *rate); + struct block_list* (*preHookFunc) (struct mob_data **md, int *rate); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_getmasterhpltmaxrate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_getmasterhpltmaxrate_pre[hIndex].func; - retVal___ = preHookFunc(md, &rate); + retVal___ = preHookFunc(&md, &rate); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46244,10 +46359,10 @@ struct block_list* HP_mob_getmasterhpltmaxrate(struct mob_data *md, int rate) { retVal___ = HPMHooks.source.mob.getmasterhpltmaxrate(md, rate); } if( HPMHooks.count.HP_mob_getmasterhpltmaxrate_post ) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct mob_data *md, int *rate); + struct block_list* (*postHookFunc) (struct block_list* retVal___, struct mob_data *md, int rate); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_getmasterhpltmaxrate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_getmasterhpltmaxrate_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &rate); + retVal___ = postHookFunc(retVal___, md, rate); } } return retVal___; @@ -46256,12 +46371,12 @@ int HP_mob_getfriendstatus_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_getfriendstatus_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendstatus_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_mob_getfriendstatus_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -46289,11 +46404,11 @@ struct mob_data* HP_mob_getfriendstatus(struct mob_data *md, int cond1, int cond int hIndex = 0; struct mob_data* retVal___ = NULL; if( HPMHooks.count.HP_mob_getfriendstatus_pre ) { - struct mob_data* (*preHookFunc) (struct mob_data *md, int *cond1, int *cond2); + struct mob_data* (*preHookFunc) (struct mob_data **md, int *cond1, int *cond2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendstatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_getfriendstatus_pre[hIndex].func; - retVal___ = preHookFunc(md, &cond1, &cond2); + retVal___ = preHookFunc(&md, &cond1, &cond2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46304,10 +46419,10 @@ struct mob_data* HP_mob_getfriendstatus(struct mob_data *md, int cond1, int cond retVal___ = HPMHooks.source.mob.getfriendstatus(md, cond1, cond2); } if( HPMHooks.count.HP_mob_getfriendstatus_post ) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct mob_data *md, int *cond1, int *cond2); + struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct mob_data *md, int cond1, int cond2); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendstatus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_getfriendstatus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &cond1, &cond2); + retVal___ = postHookFunc(retVal___, md, cond1, cond2); } } return retVal___; @@ -46316,11 +46431,11 @@ int HP_mob_skill_use(struct mob_data *md, int64 tick, int event) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_skill_use_pre ) { - int (*preHookFunc) (struct mob_data *md, int64 *tick, int *event); + int (*preHookFunc) (struct mob_data **md, int64 *tick, int *event); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_skill_use_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_skill_use_pre[hIndex].func; - retVal___ = preHookFunc(md, &tick, &event); + retVal___ = preHookFunc(&md, &tick, &event); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46331,10 +46446,10 @@ int HP_mob_skill_use(struct mob_data *md, int64 tick, int event) { retVal___ = HPMHooks.source.mob.skill_use(md, tick, event); } if( HPMHooks.count.HP_mob_skill_use_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, int64 *tick, int *event); + int (*postHookFunc) (int retVal___, struct mob_data *md, int64 tick, int event); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_skill_use_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_skill_use_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &tick, &event); + retVal___ = postHookFunc(retVal___, md, tick, event); } } return retVal___; @@ -46343,11 +46458,11 @@ int HP_mob_skill_event(struct mob_data *md, struct block_list *src, int64 tick, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_skill_event_pre ) { - int (*preHookFunc) (struct mob_data *md, struct block_list *src, int64 *tick, int *flag); + int (*preHookFunc) (struct mob_data **md, struct block_list **src, int64 *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_skill_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_skill_event_pre[hIndex].func; - retVal___ = preHookFunc(md, src, &tick, &flag); + retVal___ = preHookFunc(&md, &src, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46358,10 +46473,10 @@ int HP_mob_skill_event(struct mob_data *md, struct block_list *src, int64 tick, retVal___ = HPMHooks.source.mob.skill_event(md, src, tick, flag); } if( HPMHooks.count.HP_mob_skill_event_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, struct block_list *src, int64 *tick, int *flag); + int (*postHookFunc) (int retVal___, struct mob_data *md, struct block_list *src, int64 tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_skill_event_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_skill_event_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, src, &tick, &flag); + retVal___ = postHookFunc(retVal___, md, src, tick, flag); } } return retVal___; @@ -46385,10 +46500,10 @@ int HP_mob_is_clone(int class_) { retVal___ = HPMHooks.source.mob.is_clone(class_); } if( HPMHooks.count.HP_mob_is_clone_post ) { - int (*postHookFunc) (int retVal___, int *class_); + int (*postHookFunc) (int retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_is_clone_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_is_clone_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -46397,11 +46512,11 @@ int HP_mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_clone_spawn_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int16 *m, int16 *x, int16 *y, const char *event, int *master_id, uint32 *mode, int *flag, unsigned int *duration); + int (*preHookFunc) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y, const char **event, int *master_id, uint32 *mode, int *flag, unsigned int *duration); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_clone_spawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_clone_spawn_pre[hIndex].func; - retVal___ = preHookFunc(sd, &m, &x, &y, event, &master_id, &mode, &flag, &duration); + retVal___ = preHookFunc(&sd, &m, &x, &y, &event, &master_id, &mode, &flag, &duration); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46412,10 +46527,10 @@ int HP_mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, c retVal___ = HPMHooks.source.mob.clone_spawn(sd, m, x, y, event, master_id, mode, flag, duration); } if( HPMHooks.count.HP_mob_clone_spawn_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 *m, int16 *x, int16 *y, const char *event, int *master_id, uint32 *mode, int *flag, unsigned int *duration); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, uint32 mode, int flag, unsigned int duration); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_clone_spawn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_clone_spawn_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &m, &x, &y, event, &master_id, &mode, &flag, &duration); + retVal___ = postHookFunc(retVal___, sd, m, x, y, event, master_id, mode, flag, duration); } } return retVal___; @@ -46424,11 +46539,11 @@ int HP_mob_clone_delete(struct mob_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_clone_delete_pre ) { - int (*preHookFunc) (struct mob_data *md); + int (*preHookFunc) (struct mob_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_clone_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_clone_delete_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46466,10 +46581,10 @@ unsigned int HP_mob_drop_adjust(int baserate, int rate_adjust, unsigned short ra retVal___ = HPMHooks.source.mob.drop_adjust(baserate, rate_adjust, rate_min, rate_max); } if( HPMHooks.count.HP_mob_drop_adjust_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, int *baserate, int *rate_adjust, unsigned short *rate_min, unsigned short *rate_max); + unsigned int (*postHookFunc) (unsigned int retVal___, int baserate, int rate_adjust, unsigned short rate_min, unsigned short rate_max); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_drop_adjust_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_drop_adjust_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &baserate, &rate_adjust, &rate_min, &rate_max); + retVal___ = postHookFunc(retVal___, baserate, rate_adjust, rate_min, rate_max); } } return retVal___; @@ -46477,11 +46592,11 @@ unsigned int HP_mob_drop_adjust(int baserate, int rate_adjust, unsigned short ra void HP_mob_item_dropratio_adjust(int nameid, int mob_id, int *rate_adjust) { int hIndex = 0; if( HPMHooks.count.HP_mob_item_dropratio_adjust_pre ) { - void (*preHookFunc) (int *nameid, int *mob_id, int *rate_adjust); + void (*preHookFunc) (int *nameid, int *mob_id, int **rate_adjust); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_item_dropratio_adjust_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_item_dropratio_adjust_pre[hIndex].func; - preHookFunc(&nameid, &mob_id, rate_adjust); + preHookFunc(&nameid, &mob_id, &rate_adjust); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46492,10 +46607,10 @@ void HP_mob_item_dropratio_adjust(int nameid, int mob_id, int *rate_adjust) { HPMHooks.source.mob.item_dropratio_adjust(nameid, mob_id, rate_adjust); } if( HPMHooks.count.HP_mob_item_dropratio_adjust_post ) { - void (*postHookFunc) (int *nameid, int *mob_id, int *rate_adjust); + void (*postHookFunc) (int nameid, int mob_id, int *rate_adjust); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_item_dropratio_adjust_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_item_dropratio_adjust_post[hIndex].func; - postHookFunc(&nameid, &mob_id, rate_adjust); + postHookFunc(nameid, mob_id, rate_adjust); } } return; @@ -46530,11 +46645,11 @@ bool HP_mob_lookup_const(const struct config_setting_t *it, const char *name, in int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_lookup_const_pre ) { - bool (*preHookFunc) (const struct config_setting_t *it, const char *name, int *value); + bool (*preHookFunc) (const struct config_setting_t **it, const char **name, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_lookup_const_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_lookup_const_pre[hIndex].func; - retVal___ = preHookFunc(it, name, value); + retVal___ = preHookFunc(&it, &name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46557,11 +46672,11 @@ bool HP_mob_get_const(const struct config_setting_t *it, int *value) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_get_const_pre ) { - bool (*preHookFunc) (const struct config_setting_t *it, int *value); + bool (*preHookFunc) (const struct config_setting_t **it, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_const_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_get_const_pre[hIndex].func; - retVal___ = preHookFunc(it, value); + retVal___ = preHookFunc(&it, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46584,11 +46699,11 @@ int HP_mob_db_validate_entry(struct mob_db *entry, int n, const char *source) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_db_validate_entry_pre ) { - int (*preHookFunc) (struct mob_db *entry, int *n, const char *source); + int (*preHookFunc) (struct mob_db **entry, int *n, const char **source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_validate_entry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_db_validate_entry_pre[hIndex].func; - retVal___ = preHookFunc(entry, &n, source); + retVal___ = preHookFunc(&entry, &n, &source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46599,10 +46714,10 @@ int HP_mob_db_validate_entry(struct mob_db *entry, int n, const char *source) { retVal___ = HPMHooks.source.mob.db_validate_entry(entry, n, source); } if( HPMHooks.count.HP_mob_db_validate_entry_post ) { - int (*postHookFunc) (int retVal___, struct mob_db *entry, int *n, const char *source); + int (*postHookFunc) (int retVal___, struct mob_db *entry, int n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_validate_entry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_db_validate_entry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, entry, &n, source); + retVal___ = postHookFunc(retVal___, entry, n, source); } } return retVal___; @@ -46611,11 +46726,11 @@ 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, bool *ignore_missing); + 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, &ignore_missing); + retVal___ = preHookFunc(&filename, &ignore_missing); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46626,10 +46741,10 @@ int HP_mob_read_libconfig(const char *filename, bool ignore_missing) { retVal___ = HPMHooks.source.mob.read_libconfig(filename, ignore_missing); } if( HPMHooks.count.HP_mob_read_libconfig_post ) { - int (*postHookFunc) (int retVal___, const char *filename, bool *ignore_missing); + 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, &ignore_missing); + retVal___ = postHookFunc(retVal___, filename, ignore_missing); } } return retVal___; @@ -46637,11 +46752,11 @@ int HP_mob_read_libconfig(const char *filename, bool ignore_missing) { void HP_mob_read_db_additional_fields(struct mob_db *entry, struct config_setting_t *it, int n, const char *source) { int hIndex = 0; if( HPMHooks.count.HP_mob_read_db_additional_fields_pre ) { - void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *it, int *n, const char *source); + void (*preHookFunc) (struct mob_db **entry, struct config_setting_t **it, int *n, const char **source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_pre[hIndex].func; - preHookFunc(entry, it, &n, source); + preHookFunc(&entry, &it, &n, &source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46652,10 +46767,10 @@ void HP_mob_read_db_additional_fields(struct mob_db *entry, struct config_settin HPMHooks.source.mob.read_db_additional_fields(entry, it, n, source); } if( HPMHooks.count.HP_mob_read_db_additional_fields_post ) { - void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *it, int *n, const char *source); + void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *it, int n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_post[hIndex].func; - postHookFunc(entry, it, &n, source); + postHookFunc(entry, it, n, source); } } return; @@ -46664,11 +46779,11 @@ int HP_mob_read_db_sub(struct config_setting_t *mobt, int id, const char *source int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_read_db_sub_pre ) { - int (*preHookFunc) (struct config_setting_t *mobt, int *id, const char *source); + int (*preHookFunc) (struct config_setting_t **mobt, int *id, const char **source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_sub_pre[hIndex].func; - retVal___ = preHookFunc(mobt, &id, source); + retVal___ = preHookFunc(&mobt, &id, &source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46679,10 +46794,10 @@ int HP_mob_read_db_sub(struct config_setting_t *mobt, int id, const char *source retVal___ = HPMHooks.source.mob.read_db_sub(mobt, id, source); } if( HPMHooks.count.HP_mob_read_db_sub_post ) { - int (*postHookFunc) (int retVal___, struct config_setting_t *mobt, int *id, const char *source); + int (*postHookFunc) (int retVal___, struct config_setting_t *mobt, int id, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_read_db_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, mobt, &id, source); + retVal___ = postHookFunc(retVal___, mobt, id, source); } } return retVal___; @@ -46690,11 +46805,11 @@ int HP_mob_read_db_sub(struct config_setting_t *mobt, int id, const char *source void HP_mob_read_db_drops_sub(struct mob_db *entry, struct config_setting_t *t) { int hIndex = 0; if( HPMHooks.count.HP_mob_read_db_drops_sub_pre ) { - void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t); + void (*preHookFunc) (struct mob_db **entry, struct config_setting_t **t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_drops_sub_pre[hIndex].func; - preHookFunc(entry, t); + preHookFunc(&entry, &t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46716,11 +46831,11 @@ void HP_mob_read_db_drops_sub(struct mob_db *entry, struct config_setting_t *t) void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, struct config_setting_t *t) { int hIndex = 0; if( HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre ) { - void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t); + void (*preHookFunc) (struct mob_db **entry, struct config_setting_t **t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_mvpdrops_sub_pre[hIndex].func; - preHookFunc(entry, t); + preHookFunc(&entry, &t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46743,11 +46858,11 @@ uint32 HP_mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t) int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_mob_read_db_mode_sub_pre ) { - uint32 (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t); + uint32 (*preHookFunc) (struct mob_db **entry, struct config_setting_t **t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mode_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_mode_sub_pre[hIndex].func; - retVal___ = preHookFunc(entry, t); + retVal___ = preHookFunc(&entry, &t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46769,11 +46884,11 @@ uint32 HP_mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t) void HP_mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t) { int hIndex = 0; if( HPMHooks.count.HP_mob_read_db_stats_sub_pre ) { - void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t); + void (*preHookFunc) (struct mob_db **entry, struct config_setting_t **t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_stats_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_stats_sub_pre[hIndex].func; - preHookFunc(entry, t); + preHookFunc(&entry, &t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46822,11 +46937,11 @@ bool HP_mob_readdb_mobavail(char *str[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_readdb_mobavail_pre ) { - bool (*preHookFunc) (char *str[], int *columns, int *current); + bool (*preHookFunc) (char **str[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_readdb_mobavail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_readdb_mobavail_pre[hIndex].func; - retVal___ = preHookFunc(str, &columns, ¤t); + retVal___ = preHookFunc(&str, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46837,10 +46952,10 @@ bool HP_mob_readdb_mobavail(char *str[], int columns, int current) { retVal___ = HPMHooks.source.mob.readdb_mobavail(str, columns, current); } if( HPMHooks.count.HP_mob_readdb_mobavail_post ) { - bool (*postHookFunc) (bool retVal___, char *str[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *str[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_readdb_mobavail_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_readdb_mobavail_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &columns, ¤t); + retVal___ = postHookFunc(retVal___, str, columns, current); } } return retVal___; @@ -46876,11 +46991,11 @@ bool HP_mob_parse_row_chatdb(char **str, const char *source, int line, int *last int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_parse_row_chatdb_pre ) { - bool (*preHookFunc) (char **str, const char *source, int *line, int *last_msg_id); + bool (*preHookFunc) (char ***str, const char **source, int *line, int **last_msg_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_parse_row_chatdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_parse_row_chatdb_pre[hIndex].func; - retVal___ = preHookFunc(str, source, &line, last_msg_id); + retVal___ = preHookFunc(&str, &source, &line, &last_msg_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46891,10 +47006,10 @@ bool HP_mob_parse_row_chatdb(char **str, const char *source, int line, int *last retVal___ = HPMHooks.source.mob.parse_row_chatdb(str, source, line, last_msg_id); } if( HPMHooks.count.HP_mob_parse_row_chatdb_post ) { - bool (*postHookFunc) (bool retVal___, char **str, const char *source, int *line, int *last_msg_id); + bool (*postHookFunc) (bool retVal___, char **str, const char *source, int line, int *last_msg_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_parse_row_chatdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_parse_row_chatdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, source, &line, last_msg_id); + retVal___ = postHookFunc(retVal___, str, source, line, last_msg_id); } } return retVal___; @@ -46929,11 +47044,11 @@ bool HP_mob_parse_row_mobskilldb(char **str, int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_parse_row_mobskilldb_pre ) { - bool (*preHookFunc) (char **str, int *columns, int *current); + bool (*preHookFunc) (char ***str, int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_parse_row_mobskilldb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_parse_row_mobskilldb_pre[hIndex].func; - retVal___ = preHookFunc(str, &columns, ¤t); + retVal___ = preHookFunc(&str, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46944,10 +47059,10 @@ bool HP_mob_parse_row_mobskilldb(char **str, int columns, int current) { retVal___ = HPMHooks.source.mob.parse_row_mobskilldb(str, columns, current); } if( HPMHooks.count.HP_mob_parse_row_mobskilldb_post ) { - bool (*postHookFunc) (bool retVal___, char **str, int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char **str, int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_parse_row_mobskilldb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_parse_row_mobskilldb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &columns, ¤t); + retVal___ = postHookFunc(retVal___, str, columns, current); } } return retVal___; @@ -46982,11 +47097,11 @@ bool HP_mob_readdb_race2(char *fields[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_readdb_race2_pre ) { - bool (*preHookFunc) (char *fields[], int *columns, int *current); + bool (*preHookFunc) (char **fields[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_readdb_race2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_readdb_race2_pre[hIndex].func; - retVal___ = preHookFunc(fields, &columns, ¤t); + retVal___ = preHookFunc(&fields, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46997,10 +47112,10 @@ bool HP_mob_readdb_race2(char *fields[], int columns, int current) { retVal___ = HPMHooks.source.mob.readdb_race2(fields, columns, current); } if( HPMHooks.count.HP_mob_readdb_race2_post ) { - bool (*postHookFunc) (bool retVal___, char *fields[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *fields[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_readdb_race2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_readdb_race2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, fields, &columns, ¤t); + retVal___ = postHookFunc(retVal___, fields, columns, current); } } return retVal___; @@ -47009,11 +47124,11 @@ bool HP_mob_readdb_itemratio(char *str[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_readdb_itemratio_pre ) { - bool (*preHookFunc) (char *str[], int *columns, int *current); + bool (*preHookFunc) (char **str[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_readdb_itemratio_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_readdb_itemratio_pre[hIndex].func; - retVal___ = preHookFunc(str, &columns, ¤t); + retVal___ = preHookFunc(&str, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47024,10 +47139,10 @@ bool HP_mob_readdb_itemratio(char *str[], int columns, int current) { retVal___ = HPMHooks.source.mob.readdb_itemratio(str, columns, current); } if( HPMHooks.count.HP_mob_readdb_itemratio_post ) { - bool (*postHookFunc) (bool retVal___, char *str[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *str[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_readdb_itemratio_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_readdb_itemratio_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &columns, ¤t); + retVal___ = postHookFunc(retVal___, str, columns, current); } } return retVal___; @@ -47050,10 +47165,10 @@ void HP_mob_load(bool minimal) { HPMHooks.source.mob.load(minimal); } if( HPMHooks.count.HP_mob_load_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_load_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -47102,25 +47217,25 @@ void HP_mob_destroy_mob_db(int index) { HPMHooks.source.mob.destroy_mob_db(index); } if( HPMHooks.count.HP_mob_destroy_mob_db_post ) { - void (*postHookFunc) (int *index); + void (*postHookFunc) (int index); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_destroy_mob_db_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_destroy_mob_db_post[hIndex].func; - postHookFunc(&index); + postHookFunc(index); } } return; } -/* npc_chat */ +/* npc_chat_interface */ int HP_npc_chat_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_chat_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_npc_chat_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -47147,11 +47262,11 @@ int HP_npc_chat_sub(struct block_list *bl, va_list ap) { void HP_npc_chat_finalize(struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_npc_chat_finalize_pre ) { - void (*preHookFunc) (struct npc_data *nd); + void (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_finalize_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_chat_finalize_pre[hIndex].func; - preHookFunc(nd); + preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47173,11 +47288,11 @@ void HP_npc_chat_finalize(struct npc_data *nd) { void HP_npc_chat_def_pattern(struct npc_data *nd, int setid, const char *pattern, const char *label) { int hIndex = 0; if( HPMHooks.count.HP_npc_chat_def_pattern_pre ) { - void (*preHookFunc) (struct npc_data *nd, int *setid, const char *pattern, const char *label); + void (*preHookFunc) (struct npc_data **nd, int *setid, const char **pattern, const char **label); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_def_pattern_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_chat_def_pattern_pre[hIndex].func; - preHookFunc(nd, &setid, pattern, label); + preHookFunc(&nd, &setid, &pattern, &label); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47188,10 +47303,10 @@ void HP_npc_chat_def_pattern(struct npc_data *nd, int setid, const char *pattern HPMHooks.source.npc_chat.def_pattern(nd, setid, pattern, label); } if( HPMHooks.count.HP_npc_chat_def_pattern_post ) { - void (*postHookFunc) (struct npc_data *nd, int *setid, const char *pattern, const char *label); + void (*postHookFunc) (struct npc_data *nd, int setid, const char *pattern, const char *label); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_def_pattern_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_chat_def_pattern_post[hIndex].func; - postHookFunc(nd, &setid, pattern, label); + postHookFunc(nd, setid, pattern, label); } } return; @@ -47200,11 +47315,11 @@ struct pcrematch_entry* HP_npc_chat_create_pcrematch_entry(struct pcrematch_set int hIndex = 0; struct pcrematch_entry* retVal___ = NULL; if( HPMHooks.count.HP_npc_chat_create_pcrematch_entry_pre ) { - struct pcrematch_entry* (*preHookFunc) (struct pcrematch_set *set); + struct pcrematch_entry* (*preHookFunc) (struct pcrematch_set **set); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_create_pcrematch_entry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_chat_create_pcrematch_entry_pre[hIndex].func; - retVal___ = preHookFunc(set); + retVal___ = preHookFunc(&set); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47226,11 +47341,11 @@ struct pcrematch_entry* HP_npc_chat_create_pcrematch_entry(struct pcrematch_set void HP_npc_chat_delete_pcreset(struct npc_data *nd, int setid) { int hIndex = 0; if( HPMHooks.count.HP_npc_chat_delete_pcreset_pre ) { - void (*preHookFunc) (struct npc_data *nd, int *setid); + void (*preHookFunc) (struct npc_data **nd, int *setid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_delete_pcreset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_chat_delete_pcreset_pre[hIndex].func; - preHookFunc(nd, &setid); + preHookFunc(&nd, &setid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47241,10 +47356,10 @@ void HP_npc_chat_delete_pcreset(struct npc_data *nd, int setid) { HPMHooks.source.npc_chat.delete_pcreset(nd, setid); } if( HPMHooks.count.HP_npc_chat_delete_pcreset_post ) { - void (*postHookFunc) (struct npc_data *nd, int *setid); + void (*postHookFunc) (struct npc_data *nd, int setid); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_delete_pcreset_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_chat_delete_pcreset_post[hIndex].func; - postHookFunc(nd, &setid); + postHookFunc(nd, setid); } } return; @@ -47252,11 +47367,11 @@ void HP_npc_chat_delete_pcreset(struct npc_data *nd, int setid) { void HP_npc_chat_deactivate_pcreset(struct npc_data *nd, int setid) { int hIndex = 0; if( HPMHooks.count.HP_npc_chat_deactivate_pcreset_pre ) { - void (*preHookFunc) (struct npc_data *nd, int *setid); + void (*preHookFunc) (struct npc_data **nd, int *setid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_deactivate_pcreset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_chat_deactivate_pcreset_pre[hIndex].func; - preHookFunc(nd, &setid); + preHookFunc(&nd, &setid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47267,10 +47382,10 @@ void HP_npc_chat_deactivate_pcreset(struct npc_data *nd, int setid) { HPMHooks.source.npc_chat.deactivate_pcreset(nd, setid); } if( HPMHooks.count.HP_npc_chat_deactivate_pcreset_post ) { - void (*postHookFunc) (struct npc_data *nd, int *setid); + void (*postHookFunc) (struct npc_data *nd, int setid); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_deactivate_pcreset_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_chat_deactivate_pcreset_post[hIndex].func; - postHookFunc(nd, &setid); + postHookFunc(nd, setid); } } return; @@ -47278,11 +47393,11 @@ void HP_npc_chat_deactivate_pcreset(struct npc_data *nd, int setid) { void HP_npc_chat_activate_pcreset(struct npc_data *nd, int setid) { int hIndex = 0; if( HPMHooks.count.HP_npc_chat_activate_pcreset_pre ) { - void (*preHookFunc) (struct npc_data *nd, int *setid); + void (*preHookFunc) (struct npc_data **nd, int *setid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_activate_pcreset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_chat_activate_pcreset_pre[hIndex].func; - preHookFunc(nd, &setid); + preHookFunc(&nd, &setid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47293,10 +47408,10 @@ void HP_npc_chat_activate_pcreset(struct npc_data *nd, int setid) { HPMHooks.source.npc_chat.activate_pcreset(nd, setid); } if( HPMHooks.count.HP_npc_chat_activate_pcreset_post ) { - void (*postHookFunc) (struct npc_data *nd, int *setid); + void (*postHookFunc) (struct npc_data *nd, int setid); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_activate_pcreset_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_chat_activate_pcreset_post[hIndex].func; - postHookFunc(nd, &setid); + postHookFunc(nd, setid); } } return; @@ -47305,11 +47420,11 @@ struct pcrematch_set* HP_npc_chat_lookup_pcreset(struct npc_data *nd, int setid) int hIndex = 0; struct pcrematch_set* retVal___ = NULL; if( HPMHooks.count.HP_npc_chat_lookup_pcreset_pre ) { - struct pcrematch_set* (*preHookFunc) (struct npc_data *nd, int *setid); + struct pcrematch_set* (*preHookFunc) (struct npc_data **nd, int *setid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_lookup_pcreset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_chat_lookup_pcreset_pre[hIndex].func; - retVal___ = preHookFunc(nd, &setid); + retVal___ = preHookFunc(&nd, &setid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47320,10 +47435,10 @@ struct pcrematch_set* HP_npc_chat_lookup_pcreset(struct npc_data *nd, int setid) retVal___ = HPMHooks.source.npc_chat.lookup_pcreset(nd, setid); } if( HPMHooks.count.HP_npc_chat_lookup_pcreset_post ) { - struct pcrematch_set* (*postHookFunc) (struct pcrematch_set* retVal___, struct npc_data *nd, int *setid); + struct pcrematch_set* (*postHookFunc) (struct pcrematch_set* retVal___, struct npc_data *nd, int setid); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_lookup_pcreset_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_chat_lookup_pcreset_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, &setid); + retVal___ = postHookFunc(retVal___, nd, setid); } } return retVal___; @@ -47331,11 +47446,11 @@ struct pcrematch_set* HP_npc_chat_lookup_pcreset(struct npc_data *nd, int setid) void HP_npc_chat_finalize_pcrematch_entry(struct pcrematch_entry *e) { int hIndex = 0; if( HPMHooks.count.HP_npc_chat_finalize_pcrematch_entry_pre ) { - void (*preHookFunc) (struct pcrematch_entry *e); + void (*preHookFunc) (struct pcrematch_entry **e); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_finalize_pcrematch_entry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_chat_finalize_pcrematch_entry_pre[hIndex].func; - preHookFunc(e); + preHookFunc(&e); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47354,7 +47469,7 @@ void HP_npc_chat_finalize_pcrematch_entry(struct pcrematch_entry *e) { } return; } -/* npc */ +/* npc_interface */ int HP_npc_init(bool minimal) { int hIndex = 0; int retVal___ = 0; @@ -47374,10 +47489,10 @@ int HP_npc_init(bool minimal) { retVal___ = HPMHooks.source.npc.init(minimal); } if( HPMHooks.count.HP_npc_init_post ) { - int (*postHookFunc) (int retVal___, bool *minimal); + int (*postHookFunc) (int retVal___, bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &minimal); + retVal___ = postHookFunc(retVal___, minimal); } } return retVal___; @@ -47455,10 +47570,10 @@ struct view_data* HP_npc_get_viewdata(int class_) { retVal___ = HPMHooks.source.npc.get_viewdata(class_); } if( HPMHooks.count.HP_npc_get_viewdata_post ) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int *class_); + struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_get_viewdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_get_viewdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -47467,12 +47582,12 @@ int HP_npc_isnear_sub(struct block_list *bl, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_isnear_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list args); + int (*preHookFunc) (struct block_list **bl, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_isnear_sub_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_npc_isnear_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, args___copy); + retVal___ = preHookFunc(&bl, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -47500,11 +47615,11 @@ bool HP_npc_isnear(struct block_list *bl) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_npc_isnear_pre ) { - bool (*preHookFunc) (struct block_list *bl); + bool (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_isnear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_isnear_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47527,11 +47642,11 @@ int HP_npc_ontouch_event(struct map_session_data *sd, struct npc_data *nd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_ontouch_event_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + int (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_ontouch_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_ontouch_event_pre[hIndex].func; - retVal___ = preHookFunc(sd, nd); + retVal___ = preHookFunc(&sd, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47554,11 +47669,11 @@ int HP_npc_ontouch2_event(struct map_session_data *sd, struct npc_data *nd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_ontouch2_event_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + int (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_ontouch2_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_ontouch2_event_pre[hIndex].func; - retVal___ = preHookFunc(sd, nd); + retVal___ = preHookFunc(&sd, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47581,11 +47696,11 @@ int HP_npc_onuntouch_event(struct map_session_data *sd, struct npc_data *nd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_onuntouch_event_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + int (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_onuntouch_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_onuntouch_event_pre[hIndex].func; - retVal___ = preHookFunc(sd, nd); + retVal___ = preHookFunc(&sd, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47608,12 +47723,12 @@ int HP_npc_enable_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_enable_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_enable_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_npc_enable_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -47641,11 +47756,11 @@ int HP_npc_enable(const char *name, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_enable_pre ) { - int (*preHookFunc) (const char *name, int *flag); + int (*preHookFunc) (const char **name, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_enable_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_enable_pre[hIndex].func; - retVal___ = preHookFunc(name, &flag); + retVal___ = preHookFunc(&name, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47656,10 +47771,10 @@ int HP_npc_enable(const char *name, int flag) { retVal___ = HPMHooks.source.npc.enable(name, flag); } if( HPMHooks.count.HP_npc_enable_post ) { - int (*postHookFunc) (int retVal___, const char *name, int *flag); + int (*postHookFunc) (int retVal___, const char *name, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_enable_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_enable_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, &flag); + retVal___ = postHookFunc(retVal___, name, flag); } } return retVal___; @@ -47668,11 +47783,11 @@ struct npc_data* HP_npc_name2id(const char *name) { int hIndex = 0; struct npc_data* retVal___ = NULL; if( HPMHooks.count.HP_npc_name2id_pre ) { - struct npc_data* (*preHookFunc) (const char *name); + struct npc_data* (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_name2id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_name2id_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47695,11 +47810,11 @@ int HP_npc_event_dequeue(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_event_dequeue_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_dequeue_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_event_dequeue_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47718,12 +47833,11 @@ int HP_npc_event_dequeue(struct map_session_data *sd) { } return retVal___; } -DBData HP_npc_event_export_create(DBKey key, va_list args) { +struct DBData HP_npc_event_export_create(union DBKey key, va_list args) { int hIndex = 0; - DBData retVal___; - memset(&retVal___, '\0', sizeof(DBData)); + struct DBData retVal___ = { 0 }; if( HPMHooks.count.HP_npc_event_export_create_pre ) { - DBData (*preHookFunc) (DBKey *key, va_list args); + struct DBData (*preHookFunc) (union DBKey *key, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_export_create_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); @@ -47742,11 +47856,11 @@ DBData HP_npc_event_export_create(DBKey key, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_npc_event_export_create_post ) { - DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args); + struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey key, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_export_create_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_npc_event_export_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, args___copy); + retVal___ = postHookFunc(retVal___, key, args___copy); va_end(args___copy); } } @@ -47756,11 +47870,11 @@ int HP_npc_event_export(struct npc_data *nd, int i) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_event_export_pre ) { - int (*preHookFunc) (struct npc_data *nd, int *i); + int (*preHookFunc) (struct npc_data **nd, int *i); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_export_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_event_export_pre[hIndex].func; - retVal___ = preHookFunc(nd, &i); + retVal___ = preHookFunc(&nd, &i); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47771,10 +47885,10 @@ int HP_npc_event_export(struct npc_data *nd, int i) { retVal___ = HPMHooks.source.npc.event_export(nd, i); } if( HPMHooks.count.HP_npc_event_export_post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd, int *i); + int (*postHookFunc) (int retVal___, struct npc_data *nd, int i); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_export_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_event_export_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, &i); + retVal___ = postHookFunc(retVal___, nd, i); } } return retVal___; @@ -47783,11 +47897,11 @@ int HP_npc_event_sub(struct map_session_data *sd, struct event_data *ev, const c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_event_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct event_data *ev, const char *eventname); + int (*preHookFunc) (struct map_session_data **sd, struct event_data **ev, const char **eventname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_event_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, ev, eventname); + retVal___ = preHookFunc(&sd, &ev, &eventname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47809,12 +47923,12 @@ int HP_npc_event_sub(struct map_session_data *sd, struct event_data *ev, const c void HP_npc_event_doall_sub(void *key, void *data, va_list ap) { int hIndex = 0; if( HPMHooks.count.HP_npc_event_doall_sub_pre ) { - void (*preHookFunc) (void *key, void *data, va_list ap); + void (*preHookFunc) (void **key, void **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_doall_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_npc_event_doall_sub_pre[hIndex].func; - preHookFunc(key, data, ap___copy); + preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -47842,11 +47956,11 @@ int HP_npc_event_do(const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_event_do_pre ) { - int (*preHookFunc) (const char *name); + int (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_do_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_event_do_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47869,11 +47983,11 @@ int HP_npc_event_doall_id(const char *name, int rid) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_event_doall_id_pre ) { - int (*preHookFunc) (const char *name, int *rid); + int (*preHookFunc) (const char **name, int *rid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_doall_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_event_doall_id_pre[hIndex].func; - retVal___ = preHookFunc(name, &rid); + retVal___ = preHookFunc(&name, &rid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47884,10 +47998,10 @@ int HP_npc_event_doall_id(const char *name, int rid) { retVal___ = HPMHooks.source.npc.event_doall_id(name, rid); } if( HPMHooks.count.HP_npc_event_doall_id_post ) { - int (*postHookFunc) (int retVal___, const char *name, int *rid); + int (*postHookFunc) (int retVal___, const char *name, int rid); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_doall_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_event_doall_id_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, &rid); + retVal___ = postHookFunc(retVal___, name, rid); } } return retVal___; @@ -47896,11 +48010,11 @@ int HP_npc_event_doall(const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_event_doall_pre ) { - int (*preHookFunc) (const char *name); + int (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_doall_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_event_doall_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47938,10 +48052,10 @@ int HP_npc_event_do_clock(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.npc.event_do_clock(tid, tick, id, data); } if( HPMHooks.count.HP_npc_event_do_clock_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_do_clock_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_event_do_clock_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -47964,10 +48078,10 @@ void HP_npc_event_do_oninit(bool reload) { HPMHooks.source.npc.event_do_oninit(reload); } if( HPMHooks.count.HP_npc_event_do_oninit_post ) { - void (*postHookFunc) (bool *reload); + void (*postHookFunc) (bool reload); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_do_oninit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_event_do_oninit_post[hIndex].func; - postHookFunc(&reload); + postHookFunc(reload); } } return; @@ -47976,11 +48090,11 @@ int HP_npc_timerevent_export(struct npc_data *nd, int i) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_timerevent_export_pre ) { - int (*preHookFunc) (struct npc_data *nd, int *i); + int (*preHookFunc) (struct npc_data **nd, int *i); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_timerevent_export_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_timerevent_export_pre[hIndex].func; - retVal___ = preHookFunc(nd, &i); + retVal___ = preHookFunc(&nd, &i); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -47991,10 +48105,10 @@ int HP_npc_timerevent_export(struct npc_data *nd, int i) { retVal___ = HPMHooks.source.npc.timerevent_export(nd, i); } if( HPMHooks.count.HP_npc_timerevent_export_post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd, int *i); + int (*postHookFunc) (int retVal___, struct npc_data *nd, int i); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_timerevent_export_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_timerevent_export_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, &i); + retVal___ = postHookFunc(retVal___, nd, i); } } return retVal___; @@ -48018,10 +48132,10 @@ int HP_npc_timerevent(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.npc.timerevent(tid, tick, id, data); } if( HPMHooks.count.HP_npc_timerevent_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_timerevent_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_timerevent_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -48030,11 +48144,11 @@ int HP_npc_timerevent_start(struct npc_data *nd, int rid) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_timerevent_start_pre ) { - int (*preHookFunc) (struct npc_data *nd, int *rid); + int (*preHookFunc) (struct npc_data **nd, int *rid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_timerevent_start_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_timerevent_start_pre[hIndex].func; - retVal___ = preHookFunc(nd, &rid); + retVal___ = preHookFunc(&nd, &rid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48045,10 +48159,10 @@ int HP_npc_timerevent_start(struct npc_data *nd, int rid) { retVal___ = HPMHooks.source.npc.timerevent_start(nd, rid); } if( HPMHooks.count.HP_npc_timerevent_start_post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd, int *rid); + int (*postHookFunc) (int retVal___, struct npc_data *nd, int rid); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_timerevent_start_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_timerevent_start_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, &rid); + retVal___ = postHookFunc(retVal___, nd, rid); } } return retVal___; @@ -48057,11 +48171,11 @@ int HP_npc_timerevent_stop(struct npc_data *nd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_timerevent_stop_pre ) { - int (*preHookFunc) (struct npc_data *nd); + int (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_timerevent_stop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_timerevent_stop_pre[hIndex].func; - retVal___ = preHookFunc(nd); + retVal___ = preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48083,11 +48197,11 @@ int HP_npc_timerevent_stop(struct npc_data *nd) { void HP_npc_timerevent_quit(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_npc_timerevent_quit_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_timerevent_quit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_timerevent_quit_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48110,11 +48224,11 @@ int64 HP_npc_gettimerevent_tick(struct npc_data *nd) { int hIndex = 0; int64 retVal___ = 0; if( HPMHooks.count.HP_npc_gettimerevent_tick_pre ) { - int64 (*preHookFunc) (struct npc_data *nd); + int64 (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_gettimerevent_tick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_gettimerevent_tick_pre[hIndex].func; - retVal___ = preHookFunc(nd); + retVal___ = preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48137,11 +48251,11 @@ int HP_npc_settimerevent_tick(struct npc_data *nd, int newtimer) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_settimerevent_tick_pre ) { - int (*preHookFunc) (struct npc_data *nd, int *newtimer); + int (*preHookFunc) (struct npc_data **nd, int *newtimer); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_settimerevent_tick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_settimerevent_tick_pre[hIndex].func; - retVal___ = preHookFunc(nd, &newtimer); + retVal___ = preHookFunc(&nd, &newtimer); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48152,10 +48266,10 @@ int HP_npc_settimerevent_tick(struct npc_data *nd, int newtimer) { retVal___ = HPMHooks.source.npc.settimerevent_tick(nd, newtimer); } if( HPMHooks.count.HP_npc_settimerevent_tick_post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd, int *newtimer); + int (*postHookFunc) (int retVal___, struct npc_data *nd, int newtimer); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_settimerevent_tick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_settimerevent_tick_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, &newtimer); + retVal___ = postHookFunc(retVal___, nd, newtimer); } } return retVal___; @@ -48164,11 +48278,11 @@ int HP_npc_event(struct map_session_data *sd, const char *eventname, int ontouch int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_event_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *eventname, int *ontouch); + int (*preHookFunc) (struct map_session_data **sd, const char **eventname, int *ontouch); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_event_pre[hIndex].func; - retVal___ = preHookFunc(sd, eventname, &ontouch); + retVal___ = preHookFunc(&sd, &eventname, &ontouch); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48179,10 +48293,10 @@ int HP_npc_event(struct map_session_data *sd, const char *eventname, int ontouch retVal___ = HPMHooks.source.npc.event(sd, eventname, ontouch); } if( HPMHooks.count.HP_npc_event_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *eventname, int *ontouch); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *eventname, int ontouch); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_event_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, eventname, &ontouch); + retVal___ = postHookFunc(retVal___, sd, eventname, ontouch); } } return retVal___; @@ -48191,12 +48305,12 @@ int HP_npc_touch_areanpc_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_touch_areanpc_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_touch_areanpc_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_npc_touch_areanpc_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -48224,11 +48338,11 @@ int HP_npc_touchnext_areanpc(struct map_session_data *sd, bool leavemap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_touchnext_areanpc_pre ) { - int (*preHookFunc) (struct map_session_data *sd, bool *leavemap); + int (*preHookFunc) (struct map_session_data **sd, bool *leavemap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_touchnext_areanpc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_touchnext_areanpc_pre[hIndex].func; - retVal___ = preHookFunc(sd, &leavemap); + retVal___ = preHookFunc(&sd, &leavemap); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48239,10 +48353,10 @@ int HP_npc_touchnext_areanpc(struct map_session_data *sd, bool leavemap) { retVal___ = HPMHooks.source.npc.touchnext_areanpc(sd, leavemap); } if( HPMHooks.count.HP_npc_touchnext_areanpc_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, bool *leavemap); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, bool leavemap); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_touchnext_areanpc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_touchnext_areanpc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &leavemap); + retVal___ = postHookFunc(retVal___, sd, leavemap); } } return retVal___; @@ -48251,11 +48365,11 @@ int HP_npc_touch_areanpc(struct map_session_data *sd, int16 m, int16 x, int16 y) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_touch_areanpc_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int16 *m, int16 *x, int16 *y); + int (*preHookFunc) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_touch_areanpc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_touch_areanpc_pre[hIndex].func; - retVal___ = preHookFunc(sd, &m, &x, &y); + retVal___ = preHookFunc(&sd, &m, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48266,10 +48380,10 @@ int HP_npc_touch_areanpc(struct map_session_data *sd, int16 m, int16 x, int16 y) retVal___ = HPMHooks.source.npc.touch_areanpc(sd, m, x, y); } if( HPMHooks.count.HP_npc_touch_areanpc_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 *m, int16 *x, int16 *y); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_touch_areanpc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_touch_areanpc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &m, &x, &y); + retVal___ = postHookFunc(retVal___, sd, m, x, y); } } return retVal___; @@ -48278,11 +48392,11 @@ int HP_npc_untouch_areanpc(struct map_session_data *sd, int16 m, int16 x, int16 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_untouch_areanpc_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int16 *m, int16 *x, int16 *y); + int (*preHookFunc) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_untouch_areanpc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_untouch_areanpc_pre[hIndex].func; - retVal___ = preHookFunc(sd, &m, &x, &y); + retVal___ = preHookFunc(&sd, &m, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48293,10 +48407,10 @@ int HP_npc_untouch_areanpc(struct map_session_data *sd, int16 m, int16 x, int16 retVal___ = HPMHooks.source.npc.untouch_areanpc(sd, m, x, y); } if( HPMHooks.count.HP_npc_untouch_areanpc_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 *m, int16 *x, int16 *y); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_untouch_areanpc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_untouch_areanpc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &m, &x, &y); + retVal___ = postHookFunc(retVal___, sd, m, x, y); } } return retVal___; @@ -48305,11 +48419,11 @@ int HP_npc_touch_areanpc2(struct mob_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_touch_areanpc2_pre ) { - int (*preHookFunc) (struct mob_data *md); + int (*preHookFunc) (struct mob_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_touch_areanpc2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_touch_areanpc2_pre[hIndex].func; - retVal___ = preHookFunc(md); + retVal___ = preHookFunc(&md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48347,10 +48461,10 @@ int HP_npc_check_areanpc(int flag, int16 m, int16 x, int16 y, int16 range) { retVal___ = HPMHooks.source.npc.check_areanpc(flag, m, x, y, range); } if( HPMHooks.count.HP_npc_check_areanpc_post ) { - int (*postHookFunc) (int retVal___, int *flag, int16 *m, int16 *x, int16 *y, int16 *range); + int (*postHookFunc) (int retVal___, int flag, int16 m, int16 x, int16 y, int16 range); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_check_areanpc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_check_areanpc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &flag, &m, &x, &y, &range); + retVal___ = postHookFunc(retVal___, flag, m, x, y, range); } } return retVal___; @@ -48359,11 +48473,11 @@ struct npc_data* HP_npc_checknear(struct map_session_data *sd, struct block_list int hIndex = 0; struct npc_data* retVal___ = NULL; if( HPMHooks.count.HP_npc_checknear_pre ) { - struct npc_data* (*preHookFunc) (struct map_session_data *sd, struct block_list *bl); + struct npc_data* (*preHookFunc) (struct map_session_data **sd, struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_checknear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_checknear_pre[hIndex].func; - retVal___ = preHookFunc(sd, bl); + retVal___ = preHookFunc(&sd, &bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48386,11 +48500,11 @@ int HP_npc_globalmessage(const char *name, const char *mes) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_globalmessage_pre ) { - int (*preHookFunc) (const char *name, const char *mes); + int (*preHookFunc) (const char **name, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_globalmessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_globalmessage_pre[hIndex].func; - retVal___ = preHookFunc(name, mes); + retVal___ = preHookFunc(&name, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48412,11 +48526,11 @@ int HP_npc_globalmessage(const char *name, const char *mes) { void HP_npc_run_tomb(struct map_session_data *sd, struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_npc_run_tomb_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + void (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_run_tomb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_run_tomb_pre[hIndex].func; - preHookFunc(sd, nd); + preHookFunc(&sd, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48439,11 +48553,11 @@ int HP_npc_click(struct map_session_data *sd, struct npc_data *nd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_click_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + int (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_click_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_click_pre[hIndex].func; - retVal___ = preHookFunc(sd, nd); + retVal___ = preHookFunc(&sd, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48466,11 +48580,11 @@ int HP_npc_scriptcont(struct map_session_data *sd, int id, bool closing) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_scriptcont_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *id, bool *closing); + int (*preHookFunc) (struct map_session_data **sd, int *id, bool *closing); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_scriptcont_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_scriptcont_pre[hIndex].func; - retVal___ = preHookFunc(sd, &id, &closing); + retVal___ = preHookFunc(&sd, &id, &closing); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48481,10 +48595,10 @@ int HP_npc_scriptcont(struct map_session_data *sd, int id, bool closing) { retVal___ = HPMHooks.source.npc.scriptcont(sd, id, closing); } if( HPMHooks.count.HP_npc_scriptcont_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *id, bool *closing); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int id, bool closing); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_scriptcont_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_scriptcont_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &id, &closing); + retVal___ = postHookFunc(retVal___, sd, id, closing); } } return retVal___; @@ -48493,11 +48607,11 @@ int HP_npc_buysellsel(struct map_session_data *sd, int id, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_buysellsel_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *id, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *id, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_buysellsel_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_buysellsel_pre[hIndex].func; - retVal___ = preHookFunc(sd, &id, &type); + retVal___ = preHookFunc(&sd, &id, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48508,10 +48622,10 @@ int HP_npc_buysellsel(struct map_session_data *sd, int id, int type) { retVal___ = HPMHooks.source.npc.buysellsel(sd, id, type); } if( HPMHooks.count.HP_npc_buysellsel_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *id, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int id, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_buysellsel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_buysellsel_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &id, &type); + retVal___ = postHookFunc(retVal___, sd, id, type); } } return retVal___; @@ -48520,11 +48634,11 @@ int HP_npc_cashshop_buylist(struct map_session_data *sd, int points, struct item int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_cashshop_buylist_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *points, struct itemlist *item_list); + int (*preHookFunc) (struct map_session_data **sd, int *points, struct itemlist **item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_cashshop_buylist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_cashshop_buylist_pre[hIndex].func; - retVal___ = preHookFunc(sd, &points, item_list); + retVal___ = preHookFunc(&sd, &points, &item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48535,10 +48649,10 @@ int HP_npc_cashshop_buylist(struct map_session_data *sd, int points, struct item retVal___ = HPMHooks.source.npc.cashshop_buylist(sd, points, item_list); } if( HPMHooks.count.HP_npc_cashshop_buylist_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *points, struct itemlist *item_list); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int points, struct itemlist *item_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_cashshop_buylist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_cashshop_buylist_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &points, item_list); + retVal___ = postHookFunc(retVal___, sd, points, item_list); } } return retVal___; @@ -48547,11 +48661,11 @@ int HP_npc_buylist_sub(struct map_session_data *sd, struct itemlist *item_list, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_buylist_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd); + int (*preHookFunc) (struct map_session_data **sd, struct itemlist **item_list, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_buylist_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_buylist_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, item_list, nd); + retVal___ = preHookFunc(&sd, &item_list, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48574,11 +48688,11 @@ int HP_npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_cashshop_buy_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *nameid, int *amount, int *points); + int (*preHookFunc) (struct map_session_data **sd, int *nameid, int *amount, int *points); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_cashshop_buy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_cashshop_buy_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid, &amount, &points); + retVal___ = preHookFunc(&sd, &nameid, &amount, &points); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48589,10 +48703,10 @@ int HP_npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int retVal___ = HPMHooks.source.npc.cashshop_buy(sd, nameid, amount, points); } if( HPMHooks.count.HP_npc_cashshop_buy_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *nameid, int *amount, int *points); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int nameid, int amount, int points); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_cashshop_buy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_cashshop_buy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid, &amount, &points); + retVal___ = postHookFunc(retVal___, sd, nameid, amount, points); } } return retVal___; @@ -48601,11 +48715,11 @@ int HP_npc_buylist(struct map_session_data *sd, struct itemlist *item_list) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_buylist_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list); + int (*preHookFunc) (struct map_session_data **sd, struct itemlist **item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_buylist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_buylist_pre[hIndex].func; - retVal___ = preHookFunc(sd, item_list); + retVal___ = preHookFunc(&sd, &item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48628,11 +48742,11 @@ int HP_npc_selllist_sub(struct map_session_data *sd, struct itemlist *item_list, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_selllist_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd); + int (*preHookFunc) (struct map_session_data **sd, struct itemlist **item_list, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_selllist_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_selllist_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, item_list, nd); + retVal___ = preHookFunc(&sd, &item_list, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48655,11 +48769,11 @@ int HP_npc_selllist(struct map_session_data *sd, struct itemlist *item_list) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_selllist_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list); + int (*preHookFunc) (struct map_session_data **sd, struct itemlist **item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_selllist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_selllist_pre[hIndex].func; - retVal___ = preHookFunc(sd, item_list); + retVal___ = preHookFunc(&sd, &item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48682,11 +48796,11 @@ int HP_npc_remove_map(struct npc_data *nd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_remove_map_pre ) { - int (*preHookFunc) (struct npc_data *nd); + int (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_remove_map_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_remove_map_pre[hIndex].func; - retVal___ = preHookFunc(nd); + retVal___ = preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48705,16 +48819,16 @@ int HP_npc_remove_map(struct npc_data *nd) { } return retVal___; } -int HP_npc_unload_ev(DBKey key, DBData *data, va_list ap) { +int HP_npc_unload_ev(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_unload_ev_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_ev_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_npc_unload_ev_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -48728,26 +48842,26 @@ int HP_npc_unload_ev(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_npc_unload_ev_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_ev_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_npc_unload_ev_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_npc_unload_ev_label(DBKey key, DBData *data, va_list ap) { +int HP_npc_unload_ev_label(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_unload_ev_label_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_ev_label_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_npc_unload_ev_label_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -48761,11 +48875,11 @@ int HP_npc_unload_ev_label(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_npc_unload_ev_label_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_ev_label_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_npc_unload_ev_label_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -48775,12 +48889,12 @@ int HP_npc_unload_dup_sub(struct npc_data *nd, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_unload_dup_sub_pre ) { - int (*preHookFunc) (struct npc_data *nd, va_list args); + int (*preHookFunc) (struct npc_data **nd, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_dup_sub_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_npc_unload_dup_sub_pre[hIndex].func; - retVal___ = preHookFunc(nd, args___copy); + retVal___ = preHookFunc(&nd, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -48807,11 +48921,11 @@ int HP_npc_unload_dup_sub(struct npc_data *nd, va_list args) { void HP_npc_unload_duplicates(struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_npc_unload_duplicates_pre ) { - void (*preHookFunc) (struct npc_data *nd); + void (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_duplicates_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_unload_duplicates_pre[hIndex].func; - preHookFunc(nd); + preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48834,11 +48948,11 @@ int HP_npc_unload(struct npc_data *nd, bool single) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_unload_pre ) { - int (*preHookFunc) (struct npc_data *nd, bool *single); + int (*preHookFunc) (struct npc_data **nd, bool *single); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_unload_pre[hIndex].func; - retVal___ = preHookFunc(nd, &single); + retVal___ = preHookFunc(&nd, &single); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48849,10 +48963,10 @@ int HP_npc_unload(struct npc_data *nd, bool single) { retVal___ = HPMHooks.source.npc.unload(nd, single); } if( HPMHooks.count.HP_npc_unload_post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd, bool *single); + int (*postHookFunc) (int retVal___, struct npc_data *nd, bool single); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_unload_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, &single); + retVal___ = postHookFunc(retVal___, nd, single); } } return retVal___; @@ -48886,11 +49000,11 @@ void HP_npc_clearsrcfile(void) { void HP_npc_addsrcfile(const char *name) { int hIndex = 0; if( HPMHooks.count.HP_npc_addsrcfile_pre ) { - void (*preHookFunc) (const char *name); + void (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_addsrcfile_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_addsrcfile_pre[hIndex].func; - preHookFunc(name); + preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48912,11 +49026,11 @@ void HP_npc_addsrcfile(const char *name) { void HP_npc_delsrcfile(const char *name) { int hIndex = 0; if( HPMHooks.count.HP_npc_delsrcfile_pre ) { - void (*preHookFunc) (const char *name); + void (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_delsrcfile_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_delsrcfile_pre[hIndex].func; - preHookFunc(name); + preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48939,11 +49053,11 @@ const char* HP_npc_retainpathreference(const char *filepath) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_retainpathreference_pre ) { - const char* (*preHookFunc) (const char *filepath); + const char* (*preHookFunc) (const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_retainpathreference_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_retainpathreference_pre[hIndex].func; - retVal___ = preHookFunc(filepath); + retVal___ = preHookFunc(&filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48965,11 +49079,11 @@ const char* HP_npc_retainpathreference(const char *filepath) { void HP_npc_releasepathreference(const char *filepath) { int hIndex = 0; if( HPMHooks.count.HP_npc_releasepathreference_pre ) { - void (*preHookFunc) (const char *filepath); + void (*preHookFunc) (const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_releasepathreference_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_releasepathreference_pre[hIndex].func; - preHookFunc(filepath); + preHookFunc(&filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48991,11 +49105,11 @@ void HP_npc_releasepathreference(const char *filepath) { void HP_npc_parsename(struct npc_data *nd, const char *name, const char *start, const char *buffer, const char *filepath) { int hIndex = 0; if( HPMHooks.count.HP_npc_parsename_pre ) { - void (*preHookFunc) (struct npc_data *nd, const char *name, const char *start, const char *buffer, const char *filepath); + void (*preHookFunc) (struct npc_data **nd, const char **name, const char **start, const char **buffer, const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parsename_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parsename_pre[hIndex].func; - preHookFunc(nd, name, start, buffer, filepath); + preHookFunc(&nd, &name, &start, &buffer, &filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49018,11 +49132,11 @@ int HP_npc_parseview(const char *w4, const char *start, const char *buffer, cons int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_parseview_pre ) { - int (*preHookFunc) (const char *w4, const char *start, const char *buffer, const char *filepath); + int (*preHookFunc) (const char **w4, const char **start, const char **buffer, const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parseview_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parseview_pre[hIndex].func; - retVal___ = preHookFunc(w4, start, buffer, filepath); + retVal___ = preHookFunc(&w4, &start, &buffer, &filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49045,11 +49159,11 @@ bool HP_npc_viewisid(const char *viewid) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_npc_viewisid_pre ) { - bool (*preHookFunc) (const char *viewid); + bool (*preHookFunc) (const char **viewid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_viewisid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_viewisid_pre[hIndex].func; - retVal___ = preHookFunc(viewid); + retVal___ = preHookFunc(&viewid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49087,10 +49201,10 @@ struct npc_data* HP_npc_create_npc(enum npc_subtype subtype, int m, int x, int y retVal___ = HPMHooks.source.npc.create_npc(subtype, m, x, y, dir, class_); } if( HPMHooks.count.HP_npc_create_npc_post ) { - struct npc_data* (*postHookFunc) (struct npc_data* retVal___, enum npc_subtype *subtype, int *m, int *x, int *y, uint8 *dir, int16 *class_); + struct npc_data* (*postHookFunc) (struct npc_data* retVal___, enum npc_subtype subtype, int m, int x, int y, uint8 dir, int16 class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_create_npc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_create_npc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &subtype, &m, &x, &y, &dir, &class_); + retVal___ = postHookFunc(retVal___, subtype, m, x, y, dir, class_); } } return retVal___; @@ -49099,11 +49213,11 @@ struct npc_data* HP_npc_add_warp(char *name, short from_mapid, short from_x, sho int hIndex = 0; struct npc_data* retVal___ = NULL; if( HPMHooks.count.HP_npc_add_warp_pre ) { - struct npc_data* (*preHookFunc) (char *name, short *from_mapid, short *from_x, short *from_y, short *xs, short *ys, unsigned short *to_mapindex, short *to_x, short *to_y); + struct npc_data* (*preHookFunc) (char **name, short *from_mapid, short *from_x, short *from_y, short *xs, short *ys, unsigned short *to_mapindex, short *to_x, short *to_y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_add_warp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_add_warp_pre[hIndex].func; - retVal___ = preHookFunc(name, &from_mapid, &from_x, &from_y, &xs, &ys, &to_mapindex, &to_x, &to_y); + retVal___ = preHookFunc(&name, &from_mapid, &from_x, &from_y, &xs, &ys, &to_mapindex, &to_x, &to_y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49114,10 +49228,10 @@ struct npc_data* HP_npc_add_warp(char *name, short from_mapid, short from_x, sho retVal___ = HPMHooks.source.npc.add_warp(name, from_mapid, from_x, from_y, xs, ys, to_mapindex, to_x, to_y); } if( HPMHooks.count.HP_npc_add_warp_post ) { - struct npc_data* (*postHookFunc) (struct npc_data* retVal___, char *name, short *from_mapid, short *from_x, short *from_y, short *xs, short *ys, unsigned short *to_mapindex, short *to_x, short *to_y); + struct npc_data* (*postHookFunc) (struct npc_data* retVal___, char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_add_warp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_add_warp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, &from_mapid, &from_x, &from_y, &xs, &ys, &to_mapindex, &to_x, &to_y); + retVal___ = postHookFunc(retVal___, name, from_mapid, from_x, from_y, xs, ys, to_mapindex, to_x, to_y); } } return retVal___; @@ -49126,11 +49240,11 @@ const char* HP_npc_parse_warp(const char *w1, const char *w2, const char *w3, co int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_parse_warp_pre ) { - const char* (*preHookFunc) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_warp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_warp_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, retval); + retVal___ = preHookFunc(&w1, &w2, &w3, &w4, &start, &buffer, &filepath, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49153,11 +49267,11 @@ const char* HP_npc_parse_shop(const char *w1, const char *w2, const char *w3, co int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_parse_shop_pre ) { - const char* (*preHookFunc) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_shop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_shop_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, retval); + retVal___ = preHookFunc(&w1, &w2, &w3, &w4, &start, &buffer, &filepath, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49180,11 +49294,11 @@ const char* HP_npc_parse_unknown_object(const char *w1, const char *w2, const ch int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_parse_unknown_object_pre ) { - const char* (*preHookFunc) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_unknown_object_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_unknown_object_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, retval); + retVal___ = preHookFunc(&w1, &w2, &w3, &w4, &start, &buffer, &filepath, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49206,11 +49320,11 @@ const char* HP_npc_parse_unknown_object(const char *w1, const char *w2, const ch void HP_npc_convertlabel_db(struct npc_label_list *label_list, const char *filepath) { int hIndex = 0; if( HPMHooks.count.HP_npc_convertlabel_db_pre ) { - void (*preHookFunc) (struct npc_label_list *label_list, const char *filepath); + void (*preHookFunc) (struct npc_label_list **label_list, const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_convertlabel_db_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_convertlabel_db_pre[hIndex].func; - preHookFunc(label_list, filepath); + preHookFunc(&label_list, &filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49233,11 +49347,11 @@ const char* HP_npc_skip_script(const char *start, const char *buffer, const char int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_skip_script_pre ) { - const char* (*preHookFunc) (const char *start, const char *buffer, const char *filepath, int *retval); + const char* (*preHookFunc) (const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_skip_script_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_skip_script_pre[hIndex].func; - retVal___ = preHookFunc(start, buffer, filepath, retval); + retVal___ = preHookFunc(&start, &buffer, &filepath, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49260,11 +49374,11 @@ const char* HP_npc_parse_script(const char *w1, const char *w2, const char *w3, int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_parse_script_pre ) { - const char* (*preHookFunc) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *options, int *retval); + const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_script_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_script_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, &options, retval); + retVal___ = preHookFunc(&w1, &w2, &w3, &w4, &start, &buffer, &filepath, &options, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49275,10 +49389,10 @@ const char* HP_npc_parse_script(const char *w1, const char *w2, const char *w3, retVal___ = HPMHooks.source.npc.parse_script(w1, w2, w3, w4, start, buffer, filepath, options, retval); } if( HPMHooks.count.HP_npc_parse_script_post ) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *options, int *retval); + const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_script_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_parse_script_post[hIndex].func; - retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, &options, retval); + retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, options, retval); } } return retVal___; @@ -49286,11 +49400,11 @@ const char* HP_npc_parse_script(const char *w1, const char *w2, const char *w3, void HP_npc_add_to_location(struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_npc_add_to_location_pre ) { - void (*preHookFunc) (struct npc_data *nd); + void (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_add_to_location_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_add_to_location_pre[hIndex].func; - preHookFunc(nd); + preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49313,11 +49427,11 @@ bool HP_npc_duplicate_script_sub(struct npc_data *nd, const struct npc_data *snd int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_npc_duplicate_script_sub_pre ) { - bool (*preHookFunc) (struct npc_data *nd, const struct npc_data *snd, int *xs, int *ys, int *options); + bool (*preHookFunc) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate_script_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_duplicate_script_sub_pre[hIndex].func; - retVal___ = preHookFunc(nd, snd, &xs, &ys, &options); + retVal___ = preHookFunc(&nd, &snd, &xs, &ys, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49328,10 +49442,10 @@ bool HP_npc_duplicate_script_sub(struct npc_data *nd, const struct npc_data *snd retVal___ = HPMHooks.source.npc.duplicate_script_sub(nd, snd, xs, ys, options); } if( HPMHooks.count.HP_npc_duplicate_script_sub_post ) { - bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int *xs, int *ys, int *options); + bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate_script_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_duplicate_script_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, snd, &xs, &ys, &options); + retVal___ = postHookFunc(retVal___, nd, snd, xs, ys, options); } } return retVal___; @@ -49340,11 +49454,11 @@ bool HP_npc_duplicate_shop_sub(struct npc_data *nd, const struct npc_data *snd, int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_npc_duplicate_shop_sub_pre ) { - bool (*preHookFunc) (struct npc_data *nd, const struct npc_data *snd, int *xs, int *ys, int *options); + bool (*preHookFunc) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate_shop_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_duplicate_shop_sub_pre[hIndex].func; - retVal___ = preHookFunc(nd, snd, &xs, &ys, &options); + retVal___ = preHookFunc(&nd, &snd, &xs, &ys, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49355,10 +49469,10 @@ bool HP_npc_duplicate_shop_sub(struct npc_data *nd, const struct npc_data *snd, retVal___ = HPMHooks.source.npc.duplicate_shop_sub(nd, snd, xs, ys, options); } if( HPMHooks.count.HP_npc_duplicate_shop_sub_post ) { - bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int *xs, int *ys, int *options); + bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate_shop_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_duplicate_shop_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, snd, &xs, &ys, &options); + retVal___ = postHookFunc(retVal___, nd, snd, xs, ys, options); } } return retVal___; @@ -49367,11 +49481,11 @@ bool HP_npc_duplicate_warp_sub(struct npc_data *nd, const struct npc_data *snd, int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_npc_duplicate_warp_sub_pre ) { - bool (*preHookFunc) (struct npc_data *nd, const struct npc_data *snd, int *xs, int *ys, int *options); + bool (*preHookFunc) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate_warp_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_duplicate_warp_sub_pre[hIndex].func; - retVal___ = preHookFunc(nd, snd, &xs, &ys, &options); + retVal___ = preHookFunc(&nd, &snd, &xs, &ys, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49382,10 +49496,10 @@ bool HP_npc_duplicate_warp_sub(struct npc_data *nd, const struct npc_data *snd, retVal___ = HPMHooks.source.npc.duplicate_warp_sub(nd, snd, xs, ys, options); } if( HPMHooks.count.HP_npc_duplicate_warp_sub_post ) { - bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int *xs, int *ys, int *options); + bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate_warp_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_duplicate_warp_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, snd, &xs, &ys, &options); + retVal___ = postHookFunc(retVal___, nd, snd, xs, ys, options); } } return retVal___; @@ -49394,11 +49508,11 @@ bool HP_npc_duplicate_sub(struct npc_data *nd, const struct npc_data *snd, int x int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_npc_duplicate_sub_pre ) { - bool (*preHookFunc) (struct npc_data *nd, const struct npc_data *snd, int *xs, int *ys, int *options); + bool (*preHookFunc) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_duplicate_sub_pre[hIndex].func; - retVal___ = preHookFunc(nd, snd, &xs, &ys, &options); + retVal___ = preHookFunc(&nd, &snd, &xs, &ys, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49409,10 +49523,10 @@ bool HP_npc_duplicate_sub(struct npc_data *nd, const struct npc_data *snd, int x retVal___ = HPMHooks.source.npc.duplicate_sub(nd, snd, xs, ys, options); } if( HPMHooks.count.HP_npc_duplicate_sub_post ) { - bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int *xs, int *ys, int *options); + bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_duplicate_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, snd, &xs, &ys, &options); + retVal___ = postHookFunc(retVal___, nd, snd, xs, ys, options); } } return retVal___; @@ -49421,11 +49535,11 @@ const char* HP_npc_parse_duplicate(const char *w1, const char *w2, const char *w int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_parse_duplicate_pre ) { - const char* (*preHookFunc) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *options, int *retval); + const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_duplicate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_duplicate_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, &options, retval); + retVal___ = preHookFunc(&w1, &w2, &w3, &w4, &start, &buffer, &filepath, &options, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49436,10 +49550,10 @@ const char* HP_npc_parse_duplicate(const char *w1, const char *w2, const char *w retVal___ = HPMHooks.source.npc.parse_duplicate(w1, w2, w3, w4, start, buffer, filepath, options, retval); } if( HPMHooks.count.HP_npc_parse_duplicate_post ) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *options, int *retval); + const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_duplicate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_parse_duplicate_post[hIndex].func; - retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, &options, retval); + retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, options, retval); } } return retVal___; @@ -49448,11 +49562,11 @@ int HP_npc_duplicate4instance(struct npc_data *snd, int16 m) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_duplicate4instance_pre ) { - int (*preHookFunc) (struct npc_data *snd, int16 *m); + int (*preHookFunc) (struct npc_data **snd, int16 *m); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate4instance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_duplicate4instance_pre[hIndex].func; - retVal___ = preHookFunc(snd, &m); + retVal___ = preHookFunc(&snd, &m); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49463,10 +49577,10 @@ int HP_npc_duplicate4instance(struct npc_data *snd, int16 m) { retVal___ = HPMHooks.source.npc.duplicate4instance(snd, m); } if( HPMHooks.count.HP_npc_duplicate4instance_post ) { - int (*postHookFunc) (int retVal___, struct npc_data *snd, int16 *m); + int (*postHookFunc) (int retVal___, struct npc_data *snd, int16 m); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_duplicate4instance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_duplicate4instance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, snd, &m); + retVal___ = postHookFunc(retVal___, snd, m); } } return retVal___; @@ -49474,11 +49588,11 @@ int HP_npc_duplicate4instance(struct npc_data *snd, int16 m) { void HP_npc_setcells(struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_npc_setcells_pre ) { - void (*preHookFunc) (struct npc_data *nd); + void (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_setcells_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_setcells_pre[hIndex].func; - preHookFunc(nd); + preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49501,12 +49615,12 @@ int HP_npc_unsetcells_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_unsetcells_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unsetcells_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_npc_unsetcells_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -49533,11 +49647,11 @@ int HP_npc_unsetcells_sub(struct block_list *bl, va_list ap) { void HP_npc_unsetcells(struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_npc_unsetcells_pre ) { - void (*preHookFunc) (struct npc_data *nd); + void (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unsetcells_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_unsetcells_pre[hIndex].func; - preHookFunc(nd); + preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49559,11 +49673,11 @@ void HP_npc_unsetcells(struct npc_data *nd) { void HP_npc_movenpc(struct npc_data *nd, int16 x, int16 y) { int hIndex = 0; if( HPMHooks.count.HP_npc_movenpc_pre ) { - void (*preHookFunc) (struct npc_data *nd, int16 *x, int16 *y); + void (*preHookFunc) (struct npc_data **nd, int16 *x, int16 *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_movenpc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_movenpc_pre[hIndex].func; - preHookFunc(nd, &x, &y); + preHookFunc(&nd, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49574,10 +49688,10 @@ void HP_npc_movenpc(struct npc_data *nd, int16 x, int16 y) { HPMHooks.source.npc.movenpc(nd, x, y); } if( HPMHooks.count.HP_npc_movenpc_post ) { - void (*postHookFunc) (struct npc_data *nd, int16 *x, int16 *y); + void (*postHookFunc) (struct npc_data *nd, int16 x, int16 y); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_movenpc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_movenpc_post[hIndex].func; - postHookFunc(nd, &x, &y); + postHookFunc(nd, x, y); } } return; @@ -49585,11 +49699,11 @@ void HP_npc_movenpc(struct npc_data *nd, int16 x, int16 y) { void HP_npc_setdisplayname(struct npc_data *nd, const char *newname) { int hIndex = 0; if( HPMHooks.count.HP_npc_setdisplayname_pre ) { - void (*preHookFunc) (struct npc_data *nd, const char *newname); + void (*preHookFunc) (struct npc_data **nd, const char **newname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_setdisplayname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_setdisplayname_pre[hIndex].func; - preHookFunc(nd, newname); + preHookFunc(&nd, &newname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49611,11 +49725,11 @@ void HP_npc_setdisplayname(struct npc_data *nd, const char *newname) { void HP_npc_setclass(struct npc_data *nd, short class_) { int hIndex = 0; if( HPMHooks.count.HP_npc_setclass_pre ) { - void (*preHookFunc) (struct npc_data *nd, short *class_); + void (*preHookFunc) (struct npc_data **nd, short *class_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_setclass_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_setclass_pre[hIndex].func; - preHookFunc(nd, &class_); + preHookFunc(&nd, &class_); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49626,10 +49740,10 @@ void HP_npc_setclass(struct npc_data *nd, short class_) { HPMHooks.source.npc.setclass(nd, class_); } if( HPMHooks.count.HP_npc_setclass_post ) { - void (*postHookFunc) (struct npc_data *nd, short *class_); + void (*postHookFunc) (struct npc_data *nd, short class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_setclass_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_setclass_post[hIndex].func; - postHookFunc(nd, &class_); + postHookFunc(nd, class_); } } return; @@ -49638,11 +49752,11 @@ int HP_npc_do_atcmd_event(struct map_session_data *sd, const char *command, cons int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_do_atcmd_event_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *command, const char *message, const char *eventname); + int (*preHookFunc) (struct map_session_data **sd, const char **command, const char **message, const char **eventname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_do_atcmd_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_do_atcmd_event_pre[hIndex].func; - retVal___ = preHookFunc(sd, command, message, eventname); + retVal___ = preHookFunc(&sd, &command, &message, &eventname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49665,11 +49779,11 @@ const char* HP_npc_parse_function(const char *w1, const char *w2, const char *w3 int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_parse_function_pre ) { - const char* (*preHookFunc) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_function_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_function_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, retval); + retVal___ = preHookFunc(&w1, &w2, &w3, &w4, &start, &buffer, &filepath, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49691,11 +49805,11 @@ const char* HP_npc_parse_function(const char *w1, const char *w2, const char *w3 void HP_npc_parse_mob2(struct spawn_data *mobspawn) { int hIndex = 0; if( HPMHooks.count.HP_npc_parse_mob2_pre ) { - void (*preHookFunc) (struct spawn_data *mobspawn); + void (*preHookFunc) (struct spawn_data **mobspawn); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_mob2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_mob2_pre[hIndex].func; - preHookFunc(mobspawn); + preHookFunc(&mobspawn); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49718,11 +49832,11 @@ const char* HP_npc_parse_mob(const char *w1, const char *w2, const char *w3, con int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_parse_mob_pre ) { - const char* (*preHookFunc) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_mob_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_mob_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, retval); + retVal___ = preHookFunc(&w1, &w2, &w3, &w4, &start, &buffer, &filepath, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49745,11 +49859,11 @@ const char* HP_npc_parse_mapflag(const char *w1, const char *w2, const char *w3, int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_parse_mapflag_pre ) { - const char* (*preHookFunc) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_mapflag_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_mapflag_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, retval); + retVal___ = preHookFunc(&w1, &w2, &w3, &w4, &start, &buffer, &filepath, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49771,11 +49885,11 @@ const char* HP_npc_parse_mapflag(const char *w1, const char *w2, const char *w3, void HP_npc_parse_unknown_mapflag(const char *name, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { int hIndex = 0; if( HPMHooks.count.HP_npc_parse_unknown_mapflag_pre ) { - void (*preHookFunc) (const char *name, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + void (*preHookFunc) (const char **name, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_unknown_mapflag_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_unknown_mapflag_pre[hIndex].func; - preHookFunc(name, w3, w4, start, buffer, filepath, retval); + preHookFunc(&name, &w3, &w4, &start, &buffer, &filepath, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49798,11 +49912,11 @@ int HP_npc_parsesrcfile(const char *filepath, bool runOnInit) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_parsesrcfile_pre ) { - int (*preHookFunc) (const char *filepath, bool *runOnInit); + int (*preHookFunc) (const char **filepath, bool *runOnInit); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parsesrcfile_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parsesrcfile_pre[hIndex].func; - retVal___ = preHookFunc(filepath, &runOnInit); + retVal___ = preHookFunc(&filepath, &runOnInit); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49813,10 +49927,10 @@ int HP_npc_parsesrcfile(const char *filepath, bool runOnInit) { retVal___ = HPMHooks.source.npc.parsesrcfile(filepath, runOnInit); } if( HPMHooks.count.HP_npc_parsesrcfile_post ) { - int (*postHookFunc) (int retVal___, const char *filepath, bool *runOnInit); + int (*postHookFunc) (int retVal___, const char *filepath, bool runOnInit); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parsesrcfile_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_parsesrcfile_post[hIndex].func; - retVal___ = postHookFunc(retVal___, filepath, &runOnInit); + retVal___ = postHookFunc(retVal___, filepath, runOnInit); } } return retVal___; @@ -49825,11 +49939,11 @@ int HP_npc_script_event(struct map_session_data *sd, enum npce_event type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_script_event_pre ) { - int (*preHookFunc) (struct map_session_data *sd, enum npce_event *type); + int (*preHookFunc) (struct map_session_data **sd, enum npce_event *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_script_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_script_event_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49840,10 +49954,10 @@ int HP_npc_script_event(struct map_session_data *sd, enum npce_event type) { retVal___ = HPMHooks.source.npc.script_event(sd, type); } if( HPMHooks.count.HP_npc_script_event_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum npce_event *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum npce_event type); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_script_event_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_script_event_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -49874,16 +49988,16 @@ void HP_npc_read_event_script(void) { } return; } -int HP_npc_path_db_clear_sub(DBKey key, DBData *data, va_list args) { +int HP_npc_path_db_clear_sub(union DBKey key, struct DBData *data, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_path_db_clear_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list args); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_path_db_clear_sub_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_npc_path_db_clear_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, args___copy); + retVal___ = preHookFunc(&key, &data, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -49897,26 +50011,26 @@ int HP_npc_path_db_clear_sub(DBKey key, DBData *data, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_npc_path_db_clear_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list args); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_path_db_clear_sub_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_npc_path_db_clear_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, args___copy); + retVal___ = postHookFunc(retVal___, key, data, args___copy); va_end(args___copy); } } return retVal___; } -int HP_npc_ev_label_db_clear_sub(DBKey key, DBData *data, va_list args) { +int HP_npc_ev_label_db_clear_sub(union DBKey key, struct DBData *data, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_ev_label_db_clear_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list args); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_ev_label_db_clear_sub_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_npc_ev_label_db_clear_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, args___copy); + retVal___ = preHookFunc(&key, &data, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -49930,11 +50044,11 @@ int HP_npc_ev_label_db_clear_sub(DBKey key, DBData *data, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_npc_ev_label_db_clear_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list args); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_ev_label_db_clear_sub_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_npc_ev_label_db_clear_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, args___copy); + retVal___ = postHookFunc(retVal___, key, data, args___copy); va_end(args___copy); } } @@ -49971,11 +50085,11 @@ bool HP_npc_unloadfile(const char *filepath) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_npc_unloadfile_pre ) { - bool (*preHookFunc) (const char *filepath); + bool (*preHookFunc) (const char **filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_unloadfile_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_unloadfile_pre[hIndex].func; - retVal___ = preHookFunc(filepath); + retVal___ = preHookFunc(&filepath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50023,11 +50137,11 @@ void HP_npc_do_clear_npc(void) { void HP_npc_debug_warps_sub(struct npc_data *nd) { int hIndex = 0; if( HPMHooks.count.HP_npc_debug_warps_sub_pre ) { - void (*preHookFunc) (struct npc_data *nd); + void (*preHookFunc) (struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_debug_warps_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_debug_warps_sub_pre[hIndex].func; - preHookFunc(nd); + preHookFunc(&nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50075,11 +50189,11 @@ void HP_npc_debug_warps(void) { void HP_npc_trader_count_funds(struct npc_data *nd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_npc_trader_count_funds_pre ) { - void (*preHookFunc) (struct npc_data *nd, struct map_session_data *sd); + void (*preHookFunc) (struct npc_data **nd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_count_funds_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_trader_count_funds_pre[hIndex].func; - preHookFunc(nd, sd); + preHookFunc(&nd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50102,11 +50216,11 @@ bool HP_npc_trader_pay(struct npc_data *nd, struct map_session_data *sd, int pri int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_npc_trader_pay_pre ) { - bool (*preHookFunc) (struct npc_data *nd, struct map_session_data *sd, int *price, int *points); + bool (*preHookFunc) (struct npc_data **nd, struct map_session_data **sd, int *price, int *points); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_pay_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_trader_pay_pre[hIndex].func; - retVal___ = preHookFunc(nd, sd, &price, &points); + retVal___ = preHookFunc(&nd, &sd, &price, &points); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50117,10 +50231,10 @@ bool HP_npc_trader_pay(struct npc_data *nd, struct map_session_data *sd, int pri retVal___ = HPMHooks.source.npc.trader_pay(nd, sd, price, points); } if( HPMHooks.count.HP_npc_trader_pay_post ) { - bool (*postHookFunc) (bool retVal___, struct npc_data *nd, struct map_session_data *sd, int *price, int *points); + bool (*postHookFunc) (bool retVal___, struct npc_data *nd, struct map_session_data *sd, int price, int points); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_pay_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_trader_pay_post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, sd, &price, &points); + retVal___ = postHookFunc(retVal___, nd, sd, price, points); } } return retVal___; @@ -50143,10 +50257,10 @@ void HP_npc_trader_update(int master) { HPMHooks.source.npc.trader_update(master); } if( HPMHooks.count.HP_npc_trader_update_post ) { - void (*postHookFunc) (int *master); + void (*postHookFunc) (int master); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_update_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_trader_update_post[hIndex].func; - postHookFunc(&master); + postHookFunc(master); } } return; @@ -50155,11 +50269,11 @@ int HP_npc_market_buylist(struct map_session_data *sd, struct itemlist *item_lis int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_market_buylist_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list); + int (*preHookFunc) (struct map_session_data **sd, struct itemlist **item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_buylist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_market_buylist_pre[hIndex].func; - retVal___ = preHookFunc(sd, item_list); + retVal___ = preHookFunc(&sd, &item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50182,11 +50296,11 @@ bool HP_npc_trader_open(struct map_session_data *sd, struct npc_data *nd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_npc_trader_open_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + bool (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_trader_open_pre[hIndex].func; - retVal___ = preHookFunc(sd, nd); + retVal___ = preHookFunc(&sd, &nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50234,11 +50348,11 @@ void HP_npc_market_fromsql(void) { void HP_npc_market_tosql(struct npc_data *nd, unsigned short index) { int hIndex = 0; if( HPMHooks.count.HP_npc_market_tosql_pre ) { - void (*preHookFunc) (struct npc_data *nd, unsigned short *index); + void (*preHookFunc) (struct npc_data **nd, unsigned short *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_market_tosql_pre[hIndex].func; - preHookFunc(nd, &index); + preHookFunc(&nd, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50249,10 +50363,10 @@ void HP_npc_market_tosql(struct npc_data *nd, unsigned short index) { HPMHooks.source.npc.market_tosql(nd, index); } if( HPMHooks.count.HP_npc_market_tosql_post ) { - void (*postHookFunc) (struct npc_data *nd, unsigned short *index); + void (*postHookFunc) (struct npc_data *nd, unsigned short index); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_market_tosql_post[hIndex].func; - postHookFunc(nd, &index); + postHookFunc(nd, index); } } return; @@ -50260,11 +50374,11 @@ void HP_npc_market_tosql(struct npc_data *nd, unsigned short index) { void HP_npc_market_delfromsql(struct npc_data *nd, unsigned short index) { int hIndex = 0; if( HPMHooks.count.HP_npc_market_delfromsql_pre ) { - void (*preHookFunc) (struct npc_data *nd, unsigned short *index); + void (*preHookFunc) (struct npc_data **nd, unsigned short *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_delfromsql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_market_delfromsql_pre[hIndex].func; - preHookFunc(nd, &index); + preHookFunc(&nd, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50275,10 +50389,10 @@ void HP_npc_market_delfromsql(struct npc_data *nd, unsigned short index) { HPMHooks.source.npc.market_delfromsql(nd, index); } if( HPMHooks.count.HP_npc_market_delfromsql_post ) { - void (*postHookFunc) (struct npc_data *nd, unsigned short *index); + void (*postHookFunc) (struct npc_data *nd, unsigned short index); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_delfromsql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_market_delfromsql_post[hIndex].func; - postHookFunc(nd, &index); + postHookFunc(nd, index); } } return; @@ -50286,11 +50400,11 @@ void HP_npc_market_delfromsql(struct npc_data *nd, unsigned short index) { void HP_npc_market_delfromsql_sub(const char *npcname, unsigned short index) { int hIndex = 0; if( HPMHooks.count.HP_npc_market_delfromsql_sub_pre ) { - void (*preHookFunc) (const char *npcname, unsigned short *index); + void (*preHookFunc) (const char **npcname, unsigned short *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_delfromsql_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_market_delfromsql_sub_pre[hIndex].func; - preHookFunc(npcname, &index); + preHookFunc(&npcname, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50301,10 +50415,10 @@ void HP_npc_market_delfromsql_sub(const char *npcname, unsigned short index) { HPMHooks.source.npc.market_delfromsql_sub(npcname, index); } if( HPMHooks.count.HP_npc_market_delfromsql_sub_post ) { - void (*postHookFunc) (const char *npcname, unsigned short *index); + void (*postHookFunc) (const char *npcname, unsigned short index); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_delfromsql_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_market_delfromsql_sub_post[hIndex].func; - postHookFunc(npcname, &index); + postHookFunc(npcname, index); } } return; @@ -50328,10 +50442,10 @@ bool HP_npc_db_checkid(const int id) { retVal___ = HPMHooks.source.npc.db_checkid(id); } if( HPMHooks.count.HP_npc_db_checkid_post ) { - bool (*postHookFunc) (bool retVal___, const int *id); + bool (*postHookFunc) (bool retVal___, const int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_db_checkid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_db_checkid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -50355,23 +50469,23 @@ int HP_npc_secure_timeout_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.npc.secure_timeout_timer(tid, tick, id, data); } if( HPMHooks.count.HP_npc_secure_timeout_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_secure_timeout_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_secure_timeout_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -/* nullpo */ +/* nullpo_interface */ void HP_nullpo_assert_report(const char *file, int line, const char *func, const char *targetname, const char *title) { int hIndex = 0; if( HPMHooks.count.HP_nullpo_assert_report_pre ) { - void (*preHookFunc) (const char *file, int *line, const char *func, const char *targetname, const char *title); + void (*preHookFunc) (const char **file, int *line, const char **func, const char **targetname, const char **title); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_assert_report_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_nullpo_assert_report_pre[hIndex].func; - preHookFunc(file, &line, func, targetname, title); + preHookFunc(&file, &line, &func, &targetname, &title); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50382,15 +50496,15 @@ void HP_nullpo_assert_report(const char *file, int line, const char *func, const HPMHooks.source.nullpo.assert_report(file, line, func, targetname, title); } if( HPMHooks.count.HP_nullpo_assert_report_post ) { - void (*postHookFunc) (const char *file, int *line, const char *func, const char *targetname, const char *title); + void (*postHookFunc) (const char *file, int line, const char *func, const char *targetname, const char *title); for(hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_assert_report_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_nullpo_assert_report_post[hIndex].func; - postHookFunc(file, &line, func, targetname, title); + postHookFunc(file, line, func, targetname, title); } } return; } -/* party */ +/* party_interface */ void HP_party_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_party_init_pre ) { @@ -50409,10 +50523,10 @@ void HP_party_init(bool minimal) { HPMHooks.source.party.init(minimal); } if( HPMHooks.count.HP_party_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -50462,10 +50576,10 @@ struct party_data* HP_party_search(int party_id) { retVal___ = HPMHooks.source.party.search(party_id); } if( HPMHooks.count.HP_party_search_post ) { - struct party_data* (*postHookFunc) (struct party_data* retVal___, int *party_id); + struct party_data* (*postHookFunc) (struct party_data* retVal___, int party_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id); + retVal___ = postHookFunc(retVal___, party_id); } } return retVal___; @@ -50474,11 +50588,11 @@ struct party_data* HP_party_searchname(const char *str) { int hIndex = 0; struct party_data* retVal___ = NULL; if( HPMHooks.count.HP_party_searchname_pre ) { - struct party_data* (*preHookFunc) (const char *str); + struct party_data* (*preHookFunc) (const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_searchname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_searchname_pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50501,11 +50615,11 @@ int HP_party_getmemberid(struct party_data *p, struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_getmemberid_pre ) { - int (*preHookFunc) (struct party_data *p, struct map_session_data *sd); + int (*preHookFunc) (struct party_data **p, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_getmemberid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_getmemberid_pre[hIndex].func; - retVal___ = preHookFunc(p, sd); + retVal___ = preHookFunc(&p, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50528,11 +50642,11 @@ struct map_session_data* HP_party_getavailablesd(struct party_data *p) { int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_party_getavailablesd_pre ) { - struct map_session_data* (*preHookFunc) (struct party_data *p); + struct map_session_data* (*preHookFunc) (struct party_data **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_getavailablesd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_getavailablesd_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50555,11 +50669,11 @@ int HP_party_create(struct map_session_data *sd, const char *name, int item, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_create_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *name, int *item, int *item2); + int (*preHookFunc) (struct map_session_data **sd, const char **name, int *item, int *item2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_create_pre[hIndex].func; - retVal___ = preHookFunc(sd, name, &item, &item2); + retVal___ = preHookFunc(&sd, &name, &item, &item2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50570,10 +50684,10 @@ int HP_party_create(struct map_session_data *sd, const char *name, int item, int retVal___ = HPMHooks.source.party.create(sd, name, item, item2); } if( HPMHooks.count.HP_party_create_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name, int *item, int *item2); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name, int item, int item2); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, name, &item, &item2); + retVal___ = postHookFunc(retVal___, sd, name, item, item2); } } return retVal___; @@ -50581,11 +50695,11 @@ int HP_party_create(struct map_session_data *sd, const char *name, int item, int void HP_party_created(int account_id, int char_id, int fail, int party_id, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_party_created_pre ) { - void (*preHookFunc) (int *account_id, int *char_id, int *fail, int *party_id, const char *name); + void (*preHookFunc) (int *account_id, int *char_id, int *fail, int *party_id, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_created_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_created_pre[hIndex].func; - preHookFunc(&account_id, &char_id, &fail, &party_id, name); + preHookFunc(&account_id, &char_id, &fail, &party_id, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50596,10 +50710,10 @@ void HP_party_created(int account_id, int char_id, int fail, int party_id, const HPMHooks.source.party.created(account_id, char_id, fail, party_id, name); } if( HPMHooks.count.HP_party_created_post ) { - void (*postHookFunc) (int *account_id, int *char_id, int *fail, int *party_id, const char *name); + void (*postHookFunc) (int account_id, int char_id, int fail, int party_id, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_created_post[hIndex].func; - postHookFunc(&account_id, &char_id, &fail, &party_id, name); + postHookFunc(account_id, char_id, fail, party_id, name); } } return; @@ -50623,10 +50737,10 @@ int HP_party_request_info(int party_id, int char_id) { retVal___ = HPMHooks.source.party.request_info(party_id, char_id); } if( HPMHooks.count.HP_party_request_info_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *char_id); + int (*postHookFunc) (int retVal___, int party_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_request_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_request_info_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &char_id); + retVal___ = postHookFunc(retVal___, party_id, char_id); } } return retVal___; @@ -50635,11 +50749,11 @@ int HP_party_invite(struct map_session_data *sd, struct map_session_data *tsd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_invite_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd); + int (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_invite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_invite_pre[hIndex].func; - retVal___ = preHookFunc(sd, tsd); + retVal___ = preHookFunc(&sd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50661,11 +50775,11 @@ int HP_party_invite(struct map_session_data *sd, struct map_session_data *tsd) { void HP_party_member_joined(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_party_member_joined_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_member_joined_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_member_joined_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50703,10 +50817,10 @@ int HP_party_member_added(int party_id, int account_id, int char_id, int flag) { retVal___ = HPMHooks.source.party.member_added(party_id, account_id, char_id, flag); } if( HPMHooks.count.HP_party_member_added_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, int *char_id, int *flag); + int (*postHookFunc) (int retVal___, int party_id, int account_id, int char_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_member_added_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_member_added_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &char_id, &flag); + retVal___ = postHookFunc(retVal___, party_id, account_id, char_id, flag); } } return retVal___; @@ -50715,11 +50829,11 @@ int HP_party_leave(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_leave_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_leave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_leave_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50742,11 +50856,11 @@ int HP_party_removemember(struct map_session_data *sd, int account_id, const cha int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_removemember_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *account_id, const char *name); + int (*preHookFunc) (struct map_session_data **sd, int *account_id, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_removemember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_removemember_pre[hIndex].func; - retVal___ = preHookFunc(sd, &account_id, name); + retVal___ = preHookFunc(&sd, &account_id, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50757,10 +50871,10 @@ int HP_party_removemember(struct map_session_data *sd, int account_id, const cha retVal___ = HPMHooks.source.party.removemember(sd, account_id, name); } if( HPMHooks.count.HP_party_removemember_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *account_id, const char *name); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int account_id, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_removemember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_removemember_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &account_id, name); + retVal___ = postHookFunc(retVal___, sd, account_id, name); } } return retVal___; @@ -50784,10 +50898,10 @@ int HP_party_member_withdraw(int party_id, int account_id, int char_id) { retVal___ = HPMHooks.source.party.member_withdraw(party_id, account_id, char_id); } if( HPMHooks.count.HP_party_member_withdraw_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, int party_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_member_withdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_member_withdraw_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, party_id, account_id, char_id); } } return retVal___; @@ -50795,11 +50909,11 @@ int HP_party_member_withdraw(int party_id, int account_id, int char_id) { void HP_party_reply_invite(struct map_session_data *sd, int party_id, int flag) { int hIndex = 0; if( HPMHooks.count.HP_party_reply_invite_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *party_id, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *party_id, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_reply_invite_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_reply_invite_pre[hIndex].func; - preHookFunc(sd, &party_id, &flag); + preHookFunc(&sd, &party_id, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50810,10 +50924,10 @@ void HP_party_reply_invite(struct map_session_data *sd, int party_id, int flag) HPMHooks.source.party.reply_invite(sd, party_id, flag); } if( HPMHooks.count.HP_party_reply_invite_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *party_id, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int party_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_reply_invite_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_reply_invite_post[hIndex].func; - postHookFunc(sd, &party_id, &flag); + postHookFunc(sd, party_id, flag); } } return; @@ -50837,10 +50951,10 @@ int HP_party_recv_noinfo(int party_id, int char_id) { retVal___ = HPMHooks.source.party.recv_noinfo(party_id, char_id); } if( HPMHooks.count.HP_party_recv_noinfo_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *char_id); + int (*postHookFunc) (int retVal___, int party_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_noinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_recv_noinfo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &char_id); + retVal___ = postHookFunc(retVal___, party_id, char_id); } } return retVal___; @@ -50849,11 +50963,11 @@ int HP_party_recv_info(const struct party *sp, int char_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_recv_info_pre ) { - int (*preHookFunc) (const struct party *sp, int *char_id); + int (*preHookFunc) (const struct party **sp, int *char_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_recv_info_pre[hIndex].func; - retVal___ = preHookFunc(sp, &char_id); + retVal___ = preHookFunc(&sp, &char_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50864,10 +50978,10 @@ int HP_party_recv_info(const struct party *sp, int char_id) { retVal___ = HPMHooks.source.party.recv_info(sp, char_id); } if( HPMHooks.count.HP_party_recv_info_post ) { - int (*postHookFunc) (int retVal___, const struct party *sp, int *char_id); + int (*postHookFunc) (int retVal___, const struct party *sp, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_recv_info_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sp, &char_id); + retVal___ = postHookFunc(retVal___, sp, char_id); } } return retVal___; @@ -50891,10 +51005,10 @@ int HP_party_recv_movemap(int party_id, int account_id, int char_id, unsigned sh retVal___ = HPMHooks.source.party.recv_movemap(party_id, account_id, char_id, mapid, online, lv); } if( HPMHooks.count.HP_party_recv_movemap_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, int *char_id, unsigned short *mapid, int *online, int *lv); + int (*postHookFunc) (int retVal___, int party_id, int account_id, int char_id, unsigned short mapid, int online, int lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_movemap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_recv_movemap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &char_id, &mapid, &online, &lv); + retVal___ = postHookFunc(retVal___, party_id, account_id, char_id, mapid, online, lv); } } return retVal___; @@ -50918,10 +51032,10 @@ int HP_party_broken(int party_id) { retVal___ = HPMHooks.source.party.broken(party_id); } if( HPMHooks.count.HP_party_broken_post ) { - int (*postHookFunc) (int retVal___, int *party_id); + int (*postHookFunc) (int retVal___, int party_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_broken_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_broken_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id); + retVal___ = postHookFunc(retVal___, party_id); } } return retVal___; @@ -50945,10 +51059,10 @@ int HP_party_optionchanged(int party_id, int account_id, int exp, int item, int retVal___ = HPMHooks.source.party.optionchanged(party_id, account_id, exp, item, flag); } if( HPMHooks.count.HP_party_optionchanged_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, int *exp, int *item, int *flag); + int (*postHookFunc) (int retVal___, int party_id, int account_id, int exp, int item, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_optionchanged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_optionchanged_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &exp, &item, &flag); + retVal___ = postHookFunc(retVal___, party_id, account_id, exp, item, flag); } } return retVal___; @@ -50957,11 +51071,11 @@ int HP_party_changeoption(struct map_session_data *sd, int exp, int item) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_changeoption_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *exp, int *item); + int (*preHookFunc) (struct map_session_data **sd, int *exp, int *item); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_changeoption_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_changeoption_pre[hIndex].func; - retVal___ = preHookFunc(sd, &exp, &item); + retVal___ = preHookFunc(&sd, &exp, &item); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -50972,10 +51086,10 @@ int HP_party_changeoption(struct map_session_data *sd, int exp, int item) { retVal___ = HPMHooks.source.party.changeoption(sd, exp, item); } if( HPMHooks.count.HP_party_changeoption_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *exp, int *item); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int exp, int item); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_changeoption_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_changeoption_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &exp, &item); + retVal___ = postHookFunc(retVal___, sd, exp, item); } } return retVal___; @@ -50984,11 +51098,11 @@ bool HP_party_changeleader(struct map_session_data *sd, struct map_session_data int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_party_changeleader_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, struct map_session_data *t_sd); + bool (*preHookFunc) (struct map_session_data **sd, struct map_session_data **t_sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_changeleader_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_changeleader_pre[hIndex].func; - retVal___ = preHookFunc(sd, t_sd); + retVal___ = preHookFunc(&sd, &t_sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51010,11 +51124,11 @@ bool HP_party_changeleader(struct map_session_data *sd, struct map_session_data void HP_party_send_movemap(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_party_send_movemap_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_send_movemap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_send_movemap_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51036,11 +51150,11 @@ void HP_party_send_movemap(struct map_session_data *sd) { void HP_party_send_levelup(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_party_send_levelup_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_send_levelup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_send_levelup_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51063,11 +51177,11 @@ int HP_party_send_logout(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_send_logout_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_send_logout_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_send_logout_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51086,15 +51200,15 @@ int HP_party_send_logout(struct map_session_data *sd) { } return retVal___; } -int HP_party_send_message(struct map_session_data *sd, const char *mes, int len) { +int HP_party_send_message(struct map_session_data *sd, const char *mes) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_send_message_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *mes, int *len); + int (*preHookFunc) (struct map_session_data **sd, const char **mes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_send_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_send_message_pre[hIndex].func; - retVal___ = preHookFunc(sd, mes, &len); + retVal___ = preHookFunc(&sd, &mes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51102,13 +51216,13 @@ int HP_party_send_message(struct map_session_data *sd, const char *mes, int len) } } { - retVal___ = HPMHooks.source.party.send_message(sd, mes, len); + retVal___ = HPMHooks.source.party.send_message(sd, mes); } if( HPMHooks.count.HP_party_send_message_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *mes, int *len); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *mes); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_send_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_send_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, mes, &len); + retVal___ = postHookFunc(retVal___, sd, mes); } } return retVal___; @@ -51117,11 +51231,11 @@ int HP_party_recv_message(int party_id, int account_id, const char *mes, int len int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_recv_message_pre ) { - int (*preHookFunc) (int *party_id, int *account_id, const char *mes, int *len); + int (*preHookFunc) (int *party_id, int *account_id, const char **mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_recv_message_pre[hIndex].func; - retVal___ = preHookFunc(&party_id, &account_id, mes, &len); + retVal___ = preHookFunc(&party_id, &account_id, &mes, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51132,10 +51246,10 @@ int HP_party_recv_message(int party_id, int account_id, const char *mes, int len retVal___ = HPMHooks.source.party.recv_message(party_id, account_id, mes, len); } if( HPMHooks.count.HP_party_recv_message_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, const char *mes, int *len); + int (*postHookFunc) (int retVal___, int party_id, int account_id, const char *mes, int len); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_recv_message_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, mes, &len); + retVal___ = postHookFunc(retVal___, party_id, account_id, mes, len); } } return retVal___; @@ -51144,11 +51258,11 @@ int HP_party_skill_check(struct map_session_data *sd, int party_id, uint16 skill int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_skill_check_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *party_id, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct map_session_data **sd, int *party_id, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_skill_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_skill_check_pre[hIndex].func; - retVal___ = preHookFunc(sd, &party_id, &skill_id, &skill_lv); + retVal___ = preHookFunc(&sd, &party_id, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51159,10 +51273,10 @@ int HP_party_skill_check(struct map_session_data *sd, int party_id, uint16 skill retVal___ = HPMHooks.source.party.skill_check(sd, party_id, skill_id, skill_lv); } if( HPMHooks.count.HP_party_skill_check_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *party_id, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_skill_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_skill_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &party_id, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, sd, party_id, skill_id, skill_lv); } } return retVal___; @@ -51171,11 +51285,11 @@ int HP_party_send_xy_clear(struct party_data *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_send_xy_clear_pre ) { - int (*preHookFunc) (struct party_data *p); + int (*preHookFunc) (struct party_data **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_send_xy_clear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_send_xy_clear_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51198,11 +51312,11 @@ int HP_party_exp_share(struct party_data *p, struct block_list *src, unsigned in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_exp_share_pre ) { - int (*preHookFunc) (struct party_data *p, struct block_list *src, unsigned int *base_exp, unsigned int *job_exp, int *zeny); + int (*preHookFunc) (struct party_data **p, struct block_list **src, unsigned int *base_exp, unsigned int *job_exp, int *zeny); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_exp_share_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_exp_share_pre[hIndex].func; - retVal___ = preHookFunc(p, src, &base_exp, &job_exp, &zeny); + retVal___ = preHookFunc(&p, &src, &base_exp, &job_exp, &zeny); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51213,10 +51327,10 @@ int HP_party_exp_share(struct party_data *p, struct block_list *src, unsigned in retVal___ = HPMHooks.source.party.exp_share(p, src, base_exp, job_exp, zeny); } if( HPMHooks.count.HP_party_exp_share_post ) { - int (*postHookFunc) (int retVal___, struct party_data *p, struct block_list *src, unsigned int *base_exp, unsigned int *job_exp, int *zeny); + int (*postHookFunc) (int retVal___, struct party_data *p, struct block_list *src, unsigned int base_exp, unsigned int job_exp, int zeny); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_exp_share_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_exp_share_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, src, &base_exp, &job_exp, &zeny); + retVal___ = postHookFunc(retVal___, p, src, base_exp, job_exp, zeny); } } return retVal___; @@ -51225,11 +51339,11 @@ int HP_party_share_loot(struct party_data *p, struct map_session_data *sd, struc int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_share_loot_pre ) { - int (*preHookFunc) (struct party_data *p, struct map_session_data *sd, struct item *item_data, int *first_charid); + int (*preHookFunc) (struct party_data **p, struct map_session_data **sd, struct item **item_data, int *first_charid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_share_loot_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_share_loot_pre[hIndex].func; - retVal___ = preHookFunc(p, sd, item_data, &first_charid); + retVal___ = preHookFunc(&p, &sd, &item_data, &first_charid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51240,10 +51354,10 @@ int HP_party_share_loot(struct party_data *p, struct map_session_data *sd, struc retVal___ = HPMHooks.source.party.share_loot(p, sd, item_data, first_charid); } if( HPMHooks.count.HP_party_share_loot_post ) { - int (*postHookFunc) (int retVal___, struct party_data *p, struct map_session_data *sd, struct item *item_data, int *first_charid); + int (*postHookFunc) (int retVal___, struct party_data *p, struct map_session_data *sd, struct item *item_data, int first_charid); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_share_loot_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_share_loot_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, sd, item_data, &first_charid); + retVal___ = postHookFunc(retVal___, p, sd, item_data, first_charid); } } return retVal___; @@ -51252,11 +51366,11 @@ int HP_party_send_dot_remove(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_send_dot_remove_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_send_dot_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_send_dot_remove_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51279,12 +51393,12 @@ int HP_party_sub_count(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_sub_count_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_sub_count_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_party_sub_count_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -51312,12 +51426,12 @@ int HP_party_sub_count_chorus(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_sub_count_chorus_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_sub_count_chorus_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_party_sub_count_chorus_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -51344,11 +51458,11 @@ int HP_party_sub_count_chorus(struct block_list *bl, va_list ap) { void HP_party_booking_register(struct map_session_data *sd, short level, short mapid, short *job) { int hIndex = 0; if( HPMHooks.count.HP_party_booking_register_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *level, short *mapid, short *job); + void (*preHookFunc) (struct map_session_data **sd, short *level, short *mapid, short **job); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_register_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_booking_register_pre[hIndex].func; - preHookFunc(sd, &level, &mapid, job); + preHookFunc(&sd, &level, &mapid, &job); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51359,10 +51473,10 @@ void HP_party_booking_register(struct map_session_data *sd, short level, short m HPMHooks.source.party.booking_register(sd, level, mapid, job); } if( HPMHooks.count.HP_party_booking_register_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *level, short *mapid, short *job); + void (*postHookFunc) (struct map_session_data *sd, short level, short mapid, short *job); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_register_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_booking_register_post[hIndex].func; - postHookFunc(sd, &level, &mapid, job); + postHookFunc(sd, level, mapid, job); } } return; @@ -51370,11 +51484,11 @@ void HP_party_booking_register(struct map_session_data *sd, short level, short m void HP_party_booking_update(struct map_session_data *sd, short *job) { int hIndex = 0; if( HPMHooks.count.HP_party_booking_update_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *job); + void (*preHookFunc) (struct map_session_data **sd, short **job); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_update_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_booking_update_pre[hIndex].func; - preHookFunc(sd, job); + preHookFunc(&sd, &job); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51396,11 +51510,11 @@ void HP_party_booking_update(struct map_session_data *sd, short *job) { void HP_party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount) { int hIndex = 0; if( HPMHooks.count.HP_party_booking_search_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *level, short *mapid, short *job, unsigned long *lastindex, short *resultcount); + void (*preHookFunc) (struct map_session_data **sd, short *level, short *mapid, short *job, unsigned long *lastindex, short *resultcount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_booking_search_pre[hIndex].func; - preHookFunc(sd, &level, &mapid, &job, &lastindex, &resultcount); + preHookFunc(&sd, &level, &mapid, &job, &lastindex, &resultcount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51411,10 +51525,10 @@ void HP_party_booking_search(struct map_session_data *sd, short level, short map HPMHooks.source.party.booking_search(sd, level, mapid, job, lastindex, resultcount); } if( HPMHooks.count.HP_party_booking_search_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *level, short *mapid, short *job, unsigned long *lastindex, short *resultcount); + void (*postHookFunc) (struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_booking_search_post[hIndex].func; - postHookFunc(sd, &level, &mapid, &job, &lastindex, &resultcount); + postHookFunc(sd, level, mapid, job, lastindex, resultcount); } } return; @@ -51422,11 +51536,11 @@ void HP_party_booking_search(struct map_session_data *sd, short level, short map void HP_party_recruit_register(struct map_session_data *sd, short level, const char *notice) { int hIndex = 0; if( HPMHooks.count.HP_party_recruit_register_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *level, const char *notice); + void (*preHookFunc) (struct map_session_data **sd, short *level, const char **notice); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_register_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_recruit_register_pre[hIndex].func; - preHookFunc(sd, &level, notice); + preHookFunc(&sd, &level, ¬ice); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51437,10 +51551,10 @@ void HP_party_recruit_register(struct map_session_data *sd, short level, const c HPMHooks.source.party.recruit_register(sd, level, notice); } if( HPMHooks.count.HP_party_recruit_register_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *level, const char *notice); + void (*postHookFunc) (struct map_session_data *sd, short level, const char *notice); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_register_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_recruit_register_post[hIndex].func; - postHookFunc(sd, &level, notice); + postHookFunc(sd, level, notice); } } return; @@ -51448,11 +51562,11 @@ void HP_party_recruit_register(struct map_session_data *sd, short level, const c void HP_party_recruit_update(struct map_session_data *sd, const char *notice) { int hIndex = 0; if( HPMHooks.count.HP_party_recruit_update_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *notice); + void (*preHookFunc) (struct map_session_data **sd, const char **notice); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_update_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_recruit_update_pre[hIndex].func; - preHookFunc(sd, notice); + preHookFunc(&sd, ¬ice); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51474,11 +51588,11 @@ void HP_party_recruit_update(struct map_session_data *sd, const char *notice) { void HP_party_recruit_search(struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount) { int hIndex = 0; if( HPMHooks.count.HP_party_recruit_search_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *level, short *mapid, unsigned long *lastindex, short *resultcount); + void (*preHookFunc) (struct map_session_data **sd, short *level, short *mapid, unsigned long *lastindex, short *resultcount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_recruit_search_pre[hIndex].func; - preHookFunc(sd, &level, &mapid, &lastindex, &resultcount); + preHookFunc(&sd, &level, &mapid, &lastindex, &resultcount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51489,10 +51603,10 @@ void HP_party_recruit_search(struct map_session_data *sd, short level, short map HPMHooks.source.party.recruit_search(sd, level, mapid, lastindex, resultcount); } if( HPMHooks.count.HP_party_recruit_search_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *level, short *mapid, unsigned long *lastindex, short *resultcount); + void (*postHookFunc) (struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_recruit_search_post[hIndex].func; - postHookFunc(sd, &level, &mapid, &lastindex, &resultcount); + postHookFunc(sd, level, mapid, lastindex, resultcount); } } return; @@ -51501,11 +51615,11 @@ bool HP_party_booking_delete(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_party_booking_delete_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_booking_delete_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51528,12 +51642,12 @@ int HP_party_vforeachsamemap(int ( *func ) (struct block_list *, va_list), struc int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_vforeachsamemap_pre ) { - int (*preHookFunc) (int ( *func ) (struct block_list *, va_list), struct map_session_data *sd, int *range, va_list ap); + int (*preHookFunc) (int ( **func ) (struct block_list *, va_list), struct map_session_data **sd, int *range, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_vforeachsamemap_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_party_vforeachsamemap_pre[hIndex].func; - retVal___ = preHookFunc(func, sd, &range, ap___copy); + retVal___ = preHookFunc(&func, &sd, &range, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -51547,11 +51661,11 @@ int HP_party_vforeachsamemap(int ( *func ) (struct block_list *, va_list), struc va_end(ap___copy); } if( HPMHooks.count.HP_party_vforeachsamemap_post ) { - int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct map_session_data *sd, int *range, va_list ap); + int (*postHookFunc) (int retVal___, int ( *func ) (struct block_list *, va_list), struct map_session_data *sd, int range, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_vforeachsamemap_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_party_vforeachsamemap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, func, sd, &range, ap___copy); + retVal___ = postHookFunc(retVal___, func, sd, range, ap___copy); va_end(ap___copy); } } @@ -51576,10 +51690,10 @@ int HP_party_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.party.send_xy_timer(tid, tick, id, data); } if( HPMHooks.count.HP_party_send_xy_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_send_xy_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_send_xy_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -51587,11 +51701,11 @@ int HP_party_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { void HP_party_fill_member(struct party_member *member, struct map_session_data *sd, unsigned int leader) { int hIndex = 0; if( HPMHooks.count.HP_party_fill_member_pre ) { - void (*preHookFunc) (struct party_member *member, struct map_session_data *sd, unsigned int *leader); + void (*preHookFunc) (struct party_member **member, struct map_session_data **sd, unsigned int *leader); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_fill_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_fill_member_pre[hIndex].func; - preHookFunc(member, sd, &leader); + preHookFunc(&member, &sd, &leader); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51602,10 +51716,10 @@ void HP_party_fill_member(struct party_member *member, struct map_session_data * HPMHooks.source.party.fill_member(member, sd, leader); } if( HPMHooks.count.HP_party_fill_member_post ) { - void (*postHookFunc) (struct party_member *member, struct map_session_data *sd, unsigned int *leader); + void (*postHookFunc) (struct party_member *member, struct map_session_data *sd, unsigned int leader); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_fill_member_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_fill_member_post[hIndex].func; - postHookFunc(member, sd, &leader); + postHookFunc(member, sd, leader); } } return; @@ -51629,10 +51743,10 @@ struct map_session_data* HP_party_sd_check(int party_id, int account_id, int cha retVal___ = HPMHooks.source.party.sd_check(party_id, account_id, char_id); } if( HPMHooks.count.HP_party_sd_check_post ) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int *party_id, int *account_id, int *char_id); + struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int party_id, int account_id, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_sd_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_sd_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &party_id, &account_id, &char_id); + retVal___ = postHookFunc(retVal___, party_id, account_id, char_id); } } return retVal___; @@ -51640,11 +51754,11 @@ struct map_session_data* HP_party_sd_check(int party_id, int account_id, int cha void HP_party_check_state(struct party_data *p) { int hIndex = 0; if( HPMHooks.count.HP_party_check_state_pre ) { - void (*preHookFunc) (struct party_data *p); + void (*preHookFunc) (struct party_data **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_check_state_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_check_state_pre[hIndex].func; - preHookFunc(p); + preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51690,16 +51804,16 @@ struct party_booking_ad_info* HP_party_create_booking_data(void) { } return retVal___; } -int HP_party_db_final(DBKey key, DBData *data, va_list ap) { +int HP_party_db_final(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_db_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_db_final_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_party_db_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -51713,26 +51827,26 @@ int HP_party_db_final(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_party_db_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_db_final_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_party_db_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -/* path */ +/* path_interface */ int HP_path_blownpos(struct block_list *bl, int16 m, int16 x0, int16 y0, int16 dx, int16 dy, int count) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_path_blownpos_pre ) { - int (*preHookFunc) (struct block_list *bl, int16 *m, int16 *x0, int16 *y0, int16 *dx, int16 *dy, int *count); + int (*preHookFunc) (struct block_list **bl, int16 *m, int16 *x0, int16 *y0, int16 *dx, int16 *dy, int *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_path_blownpos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_path_blownpos_pre[hIndex].func; - retVal___ = preHookFunc(bl, &m, &x0, &y0, &dx, &dy, &count); + retVal___ = preHookFunc(&bl, &m, &x0, &y0, &dx, &dy, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51743,10 +51857,10 @@ int HP_path_blownpos(struct block_list *bl, int16 m, int16 x0, int16 y0, int16 d retVal___ = HPMHooks.source.path.blownpos(bl, m, x0, y0, dx, dy, count); } if( HPMHooks.count.HP_path_blownpos_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int16 *m, int16 *x0, int16 *y0, int16 *dx, int16 *dy, int *count); + int (*postHookFunc) (int retVal___, struct block_list *bl, int16 m, int16 x0, int16 y0, int16 dx, int16 dy, int count); for(hIndex = 0; hIndex < HPMHooks.count.HP_path_blownpos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_path_blownpos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &m, &x0, &y0, &dx, &dy, &count); + retVal___ = postHookFunc(retVal___, bl, m, x0, y0, dx, dy, count); } } return retVal___; @@ -51755,11 +51869,11 @@ bool HP_path_search(struct walkpath_data *wpd, struct block_list *bl, int16 m, i int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_path_search_pre ) { - bool (*preHookFunc) (struct walkpath_data *wpd, struct block_list *bl, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *flag, cell_chk *cell); + bool (*preHookFunc) (struct walkpath_data **wpd, struct block_list **bl, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *flag, cell_chk *cell); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_path_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_path_search_pre[hIndex].func; - retVal___ = preHookFunc(wpd, bl, &m, &x0, &y0, &x1, &y1, &flag, &cell); + retVal___ = preHookFunc(&wpd, &bl, &m, &x0, &y0, &x1, &y1, &flag, &cell); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51770,10 +51884,10 @@ bool HP_path_search(struct walkpath_data *wpd, struct block_list *bl, int16 m, i retVal___ = HPMHooks.source.path.search(wpd, bl, m, x0, y0, x1, y1, flag, cell); } if( HPMHooks.count.HP_path_search_post ) { - bool (*postHookFunc) (bool retVal___, struct walkpath_data *wpd, struct block_list *bl, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, int *flag, cell_chk *cell); + bool (*postHookFunc) (bool retVal___, struct walkpath_data *wpd, struct block_list *bl, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, int flag, cell_chk cell); for(hIndex = 0; hIndex < HPMHooks.count.HP_path_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_path_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, wpd, bl, &m, &x0, &y0, &x1, &y1, &flag, &cell); + retVal___ = postHookFunc(retVal___, wpd, bl, m, x0, y0, x1, y1, flag, cell); } } return retVal___; @@ -51782,11 +51896,11 @@ bool HP_path_search_long(struct shootpath_data *spd, struct block_list *bl, int1 int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_path_search_long_pre ) { - bool (*preHookFunc) (struct shootpath_data *spd, struct block_list *bl, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, cell_chk *cell); + bool (*preHookFunc) (struct shootpath_data **spd, struct block_list **bl, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, cell_chk *cell); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_path_search_long_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_path_search_long_pre[hIndex].func; - retVal___ = preHookFunc(spd, bl, &m, &x0, &y0, &x1, &y1, &cell); + retVal___ = preHookFunc(&spd, &bl, &m, &x0, &y0, &x1, &y1, &cell); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -51797,10 +51911,10 @@ bool HP_path_search_long(struct shootpath_data *spd, struct block_list *bl, int1 retVal___ = HPMHooks.source.path.search_long(spd, bl, m, x0, y0, x1, y1, cell); } if( HPMHooks.count.HP_path_search_long_post ) { - bool (*postHookFunc) (bool retVal___, struct shootpath_data *spd, struct block_list *bl, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, cell_chk *cell); + bool (*postHookFunc) (bool retVal___, struct shootpath_data *spd, struct block_list *bl, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, cell_chk cell); for(hIndex = 0; hIndex < HPMHooks.count.HP_path_search_long_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_path_search_long_post[hIndex].func; - retVal___ = postHookFunc(retVal___, spd, bl, &m, &x0, &y0, &x1, &y1, &cell); + retVal___ = postHookFunc(retVal___, spd, bl, m, x0, y0, x1, y1, cell); } } return retVal___; @@ -51824,10 +51938,10 @@ bool HP_path_check_distance(int dx, int dy, int distance) { retVal___ = HPMHooks.source.path.check_distance(dx, dy, distance); } if( HPMHooks.count.HP_path_check_distance_post ) { - bool (*postHookFunc) (bool retVal___, int *dx, int *dy, int *distance); + bool (*postHookFunc) (bool retVal___, int dx, int dy, int distance); for(hIndex = 0; hIndex < HPMHooks.count.HP_path_check_distance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_path_check_distance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &dx, &dy, &distance); + retVal___ = postHookFunc(retVal___, dx, dy, distance); } } return retVal___; @@ -51851,10 +51965,10 @@ unsigned int HP_path_distance(int dx, int dy) { retVal___ = HPMHooks.source.path.distance(dx, dy); } if( HPMHooks.count.HP_path_distance_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, int *dx, int *dy); + unsigned int (*postHookFunc) (unsigned int retVal___, int dx, int dy); for(hIndex = 0; hIndex < HPMHooks.count.HP_path_distance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_path_distance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &dx, &dy); + retVal___ = postHookFunc(retVal___, dx, dy); } } return retVal___; @@ -51878,10 +51992,10 @@ bool HP_path_check_distance_client(int dx, int dy, int distance) { retVal___ = HPMHooks.source.path.check_distance_client(dx, dy, distance); } if( HPMHooks.count.HP_path_check_distance_client_post ) { - bool (*postHookFunc) (bool retVal___, int *dx, int *dy, int *distance); + bool (*postHookFunc) (bool retVal___, int dx, int dy, int distance); for(hIndex = 0; hIndex < HPMHooks.count.HP_path_check_distance_client_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_path_check_distance_client_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &dx, &dy, &distance); + retVal___ = postHookFunc(retVal___, dx, dy, distance); } } return retVal___; @@ -51905,15 +52019,15 @@ int HP_path_distance_client(int dx, int dy) { retVal___ = HPMHooks.source.path.distance_client(dx, dy); } if( HPMHooks.count.HP_path_distance_client_post ) { - int (*postHookFunc) (int retVal___, int *dx, int *dy); + int (*postHookFunc) (int retVal___, int dx, int dy); for(hIndex = 0; hIndex < HPMHooks.count.HP_path_distance_client_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_path_distance_client_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &dx, &dy); + retVal___ = postHookFunc(retVal___, dx, dy); } } return retVal___; } -/* pcg */ +/* pc_groups_interface */ void HP_pcg_init(void) { int hIndex = 0; if( HPMHooks.count.HP_pcg_init_pre ) { @@ -52038,10 +52152,10 @@ bool HP_pcg_exists(int group_id) { retVal___ = HPMHooks.source.pcg.exists(group_id); } if( HPMHooks.count.HP_pcg_exists_post ) { - bool (*postHookFunc) (bool retVal___, int *group_id); + bool (*postHookFunc) (bool retVal___, int group_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_exists_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pcg_exists_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &group_id); + retVal___ = postHookFunc(retVal___, group_id); } } return retVal___; @@ -52065,10 +52179,10 @@ GroupSettings* HP_pcg_id2group(int group_id) { retVal___ = HPMHooks.source.pcg.id2group(group_id); } if( HPMHooks.count.HP_pcg_id2group_post ) { - GroupSettings* (*postHookFunc) (GroupSettings* retVal___, int *group_id); + GroupSettings* (*postHookFunc) (GroupSettings* retVal___, int group_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_id2group_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pcg_id2group_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &group_id); + retVal___ = postHookFunc(retVal___, group_id); } } return retVal___; @@ -52077,11 +52191,11 @@ bool HP_pcg_has_permission(GroupSettings *group, unsigned int permission) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pcg_has_permission_pre ) { - bool (*preHookFunc) (GroupSettings *group, unsigned int *permission); + bool (*preHookFunc) (GroupSettings **group, unsigned int *permission); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_has_permission_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pcg_has_permission_pre[hIndex].func; - retVal___ = preHookFunc(group, &permission); + retVal___ = preHookFunc(&group, &permission); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52092,10 +52206,10 @@ bool HP_pcg_has_permission(GroupSettings *group, unsigned int permission) { retVal___ = HPMHooks.source.pcg.has_permission(group, permission); } if( HPMHooks.count.HP_pcg_has_permission_post ) { - bool (*postHookFunc) (bool retVal___, GroupSettings *group, unsigned int *permission); + bool (*postHookFunc) (bool retVal___, GroupSettings *group, unsigned int permission); for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_has_permission_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pcg_has_permission_post[hIndex].func; - retVal___ = postHookFunc(retVal___, group, &permission); + retVal___ = postHookFunc(retVal___, group, permission); } } return retVal___; @@ -52104,11 +52218,11 @@ bool HP_pcg_should_log_commands(GroupSettings *group) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pcg_should_log_commands_pre ) { - bool (*preHookFunc) (GroupSettings *group); + bool (*preHookFunc) (GroupSettings **group); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_should_log_commands_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pcg_should_log_commands_pre[hIndex].func; - retVal___ = preHookFunc(group); + retVal___ = preHookFunc(&group); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52131,11 +52245,11 @@ const char* HP_pcg_get_name(GroupSettings *group) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_pcg_get_name_pre ) { - const char* (*preHookFunc) (GroupSettings *group); + const char* (*preHookFunc) (GroupSettings **group); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pcg_get_name_pre[hIndex].func; - retVal___ = preHookFunc(group); + retVal___ = preHookFunc(&group); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52158,11 +52272,11 @@ int HP_pcg_get_level(GroupSettings *group) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pcg_get_level_pre ) { - int (*preHookFunc) (GroupSettings *group); + int (*preHookFunc) (GroupSettings **group); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_level_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pcg_get_level_pre[hIndex].func; - retVal___ = preHookFunc(group); + retVal___ = preHookFunc(&group); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52185,11 +52299,11 @@ int HP_pcg_get_idx(GroupSettings *group) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pcg_get_idx_pre ) { - int (*preHookFunc) (GroupSettings *group); + int (*preHookFunc) (GroupSettings **group); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_idx_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pcg_get_idx_pre[hIndex].func; - retVal___ = preHookFunc(group); + retVal___ = preHookFunc(&group); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52208,7 +52322,7 @@ int HP_pcg_get_idx(GroupSettings *group) { } return retVal___; } -/* pc */ +/* pc_interface */ void HP_pc_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_pc_init_pre ) { @@ -52227,10 +52341,10 @@ void HP_pc_init(bool minimal) { HPMHooks.source.pc.init(minimal); } if( HPMHooks.count.HP_pc_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -52307,10 +52421,10 @@ int HP_pc_class2idx(int class_) { retVal___ = HPMHooks.source.pc.class2idx(class_); } if( HPMHooks.count.HP_pc_class2idx_post ) { - int (*postHookFunc) (int retVal___, int *class_); + int (*postHookFunc) (int retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_class2idx_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_class2idx_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -52319,11 +52433,11 @@ bool HP_pc_can_talk(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_can_talk_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_talk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_can_talk_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52346,11 +52460,11 @@ bool HP_pc_can_attack(struct map_session_data *sd, int target_id) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_can_attack_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *target_id); + bool (*preHookFunc) (struct map_session_data **sd, int *target_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_attack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_can_attack_pre[hIndex].func; - retVal___ = preHookFunc(sd, &target_id); + retVal___ = preHookFunc(&sd, &target_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52361,10 +52475,10 @@ bool HP_pc_can_attack(struct map_session_data *sd, int target_id) { retVal___ = HPMHooks.source.pc.can_attack(sd, target_id); } if( HPMHooks.count.HP_pc_can_attack_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *target_id); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int target_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_attack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_can_attack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &target_id); + retVal___ = postHookFunc(retVal___, sd, target_id); } } return retVal___; @@ -52373,11 +52487,11 @@ bool HP_pc_can_use_command(struct map_session_data *sd, const char *command) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_can_use_command_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const char *command); + bool (*preHookFunc) (struct map_session_data **sd, const char **command); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_use_command_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_can_use_command_pre[hIndex].func; - retVal___ = preHookFunc(sd, command); + retVal___ = preHookFunc(&sd, &command); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52400,11 +52514,11 @@ int HP_pc_set_group(struct map_session_data *sd, int group_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_set_group_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *group_id); + int (*preHookFunc) (struct map_session_data **sd, int *group_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_set_group_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_set_group_pre[hIndex].func; - retVal___ = preHookFunc(sd, &group_id); + retVal___ = preHookFunc(&sd, &group_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52415,10 +52529,10 @@ int HP_pc_set_group(struct map_session_data *sd, int group_id) { retVal___ = HPMHooks.source.pc.set_group(sd, group_id); } if( HPMHooks.count.HP_pc_set_group_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *group_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int group_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_set_group_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_set_group_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &group_id); + retVal___ = postHookFunc(retVal___, sd, group_id); } } return retVal___; @@ -52427,11 +52541,11 @@ bool HP_pc_should_log_commands(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_should_log_commands_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_should_log_commands_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_should_log_commands_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52454,11 +52568,11 @@ int HP_pc_setrestartvalue(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setrestartvalue_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setrestartvalue_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setrestartvalue_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52469,10 +52583,10 @@ int HP_pc_setrestartvalue(struct map_session_data *sd, int type) { retVal___ = HPMHooks.source.pc.setrestartvalue(sd, type); } if( HPMHooks.count.HP_pc_setrestartvalue_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setrestartvalue_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setrestartvalue_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -52481,11 +52595,11 @@ int HP_pc_makesavestatus(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_makesavestatus_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_makesavestatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_makesavestatus_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52507,11 +52621,11 @@ int HP_pc_makesavestatus(struct map_session_data *sd) { void HP_pc_respawn(struct map_session_data *sd, clr_type clrtype) { int hIndex = 0; if( HPMHooks.count.HP_pc_respawn_pre ) { - void (*preHookFunc) (struct map_session_data *sd, clr_type *clrtype); + void (*preHookFunc) (struct map_session_data **sd, clr_type *clrtype); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_respawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_respawn_pre[hIndex].func; - preHookFunc(sd, &clrtype); + preHookFunc(&sd, &clrtype); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52522,10 +52636,10 @@ void HP_pc_respawn(struct map_session_data *sd, clr_type clrtype) { HPMHooks.source.pc.respawn(sd, clrtype); } if( HPMHooks.count.HP_pc_respawn_post ) { - void (*postHookFunc) (struct map_session_data *sd, clr_type *clrtype); + void (*postHookFunc) (struct map_session_data *sd, clr_type clrtype); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_respawn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_respawn_post[hIndex].func; - postHookFunc(sd, &clrtype); + postHookFunc(sd, clrtype); } } return; @@ -52534,11 +52648,11 @@ int HP_pc_setnewpc(struct map_session_data *sd, int account_id, int char_id, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setnewpc_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *account_id, int *char_id, int *login_id1, unsigned int *client_tick, int *sex, int *fd); + int (*preHookFunc) (struct map_session_data **sd, int *account_id, int *char_id, int *login_id1, unsigned int *client_tick, int *sex, int *fd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setnewpc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setnewpc_pre[hIndex].func; - retVal___ = preHookFunc(sd, &account_id, &char_id, &login_id1, &client_tick, &sex, &fd); + retVal___ = preHookFunc(&sd, &account_id, &char_id, &login_id1, &client_tick, &sex, &fd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52549,10 +52663,10 @@ int HP_pc_setnewpc(struct map_session_data *sd, int account_id, int char_id, int retVal___ = HPMHooks.source.pc.setnewpc(sd, account_id, char_id, login_id1, client_tick, sex, fd); } if( HPMHooks.count.HP_pc_setnewpc_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *account_id, int *char_id, int *login_id1, unsigned int *client_tick, int *sex, int *fd); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int account_id, int char_id, int login_id1, unsigned int client_tick, int sex, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setnewpc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setnewpc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &account_id, &char_id, &login_id1, &client_tick, &sex, &fd); + retVal___ = postHookFunc(retVal___, sd, account_id, char_id, login_id1, client_tick, sex, fd); } } return retVal___; @@ -52561,11 +52675,11 @@ bool HP_pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_ int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_authok_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *login_id2, time_t *expiration_time, int *group_id, const struct mmo_charstatus *st, bool *changing_mapservers); + bool (*preHookFunc) (struct map_session_data **sd, int *login_id2, time_t *expiration_time, int *group_id, const struct mmo_charstatus **st, bool *changing_mapservers); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_authok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_authok_pre[hIndex].func; - retVal___ = preHookFunc(sd, &login_id2, &expiration_time, &group_id, st, &changing_mapservers); + retVal___ = preHookFunc(&sd, &login_id2, &expiration_time, &group_id, &st, &changing_mapservers); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52576,10 +52690,10 @@ bool HP_pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_ retVal___ = HPMHooks.source.pc.authok(sd, login_id2, expiration_time, group_id, st, changing_mapservers); } if( HPMHooks.count.HP_pc_authok_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *login_id2, time_t *expiration_time, int *group_id, const struct mmo_charstatus *st, bool *changing_mapservers); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int login_id2, time_t expiration_time, int group_id, const struct mmo_charstatus *st, bool changing_mapservers); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_authok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_authok_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &login_id2, &expiration_time, &group_id, st, &changing_mapservers); + retVal___ = postHookFunc(retVal___, sd, login_id2, expiration_time, group_id, st, changing_mapservers); } } return retVal___; @@ -52587,11 +52701,11 @@ bool HP_pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_ void HP_pc_authfail(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_authfail_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_authfail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_authfail_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52614,11 +52728,11 @@ int HP_pc_reg_received(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_reg_received_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_reg_received_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_reg_received_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52641,11 +52755,11 @@ int HP_pc_isequip(struct map_session_data *sd, int n) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_isequip_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n); + int (*preHookFunc) (struct map_session_data **sd, int *n); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_isequip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_isequip_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n); + retVal___ = preHookFunc(&sd, &n); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52656,10 +52770,10 @@ int HP_pc_isequip(struct map_session_data *sd, int n) { retVal___ = HPMHooks.source.pc.isequip(sd, n); } if( HPMHooks.count.HP_pc_isequip_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_isequip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_isequip_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n); + retVal___ = postHookFunc(retVal___, sd, n); } } return retVal___; @@ -52668,11 +52782,11 @@ int HP_pc_equippoint(struct map_session_data *sd, int n) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_equippoint_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n); + int (*preHookFunc) (struct map_session_data **sd, int *n); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_equippoint_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_equippoint_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n); + retVal___ = preHookFunc(&sd, &n); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52683,10 +52797,10 @@ int HP_pc_equippoint(struct map_session_data *sd, int n) { retVal___ = HPMHooks.source.pc.equippoint(sd, n); } if( HPMHooks.count.HP_pc_equippoint_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_equippoint_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_equippoint_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n); + retVal___ = postHookFunc(retVal___, sd, n); } } return retVal___; @@ -52695,11 +52809,11 @@ int HP_pc_setinventorydata(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setinventorydata_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setinventorydata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setinventorydata_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52722,11 +52836,11 @@ int HP_pc_checkskill(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_checkskill_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_checkskill_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id); + retVal___ = preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52737,10 +52851,10 @@ int HP_pc_checkskill(struct map_session_data *sd, uint16 skill_id) { retVal___ = HPMHooks.source.pc.checkskill(sd, skill_id); } if( HPMHooks.count.HP_pc_checkskill_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_checkskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id); + retVal___ = postHookFunc(retVal___, sd, skill_id); } } return retVal___; @@ -52749,11 +52863,11 @@ int HP_pc_checkskill2(struct map_session_data *sd, uint16 index) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_checkskill2_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *index); + int (*preHookFunc) (struct map_session_data **sd, uint16 *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkskill2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_checkskill2_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index); + retVal___ = preHookFunc(&sd, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52764,10 +52878,10 @@ int HP_pc_checkskill2(struct map_session_data *sd, uint16 index) { retVal___ = HPMHooks.source.pc.checkskill2(sd, index); } if( HPMHooks.count.HP_pc_checkskill2_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *index); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 index); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkskill2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_checkskill2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index); + retVal___ = postHookFunc(retVal___, sd, index); } } return retVal___; @@ -52776,11 +52890,11 @@ int HP_pc_checkallowskill(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_checkallowskill_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkallowskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_checkallowskill_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52803,11 +52917,11 @@ int HP_pc_checkequip(struct map_session_data *sd, int pos) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_checkequip_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *pos); + int (*preHookFunc) (struct map_session_data **sd, int *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkequip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_checkequip_pre[hIndex].func; - retVal___ = preHookFunc(sd, &pos); + retVal___ = preHookFunc(&sd, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52818,10 +52932,10 @@ int HP_pc_checkequip(struct map_session_data *sd, int pos) { retVal___ = HPMHooks.source.pc.checkequip(sd, pos); } if( HPMHooks.count.HP_pc_checkequip_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *pos); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkequip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_checkequip_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &pos); + retVal___ = postHookFunc(retVal___, sd, pos); } } return retVal___; @@ -52830,11 +52944,11 @@ int HP_pc_calc_skilltree(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_calc_skilltree_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_calc_skilltree_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_calc_skilltree_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52857,11 +52971,11 @@ int HP_pc_calc_skilltree_normalize_job(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_calc_skilltree_normalize_job_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_calc_skilltree_normalize_job_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_calc_skilltree_normalize_job_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52884,11 +52998,11 @@ int HP_pc_clean_skilltree(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_clean_skilltree_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_clean_skilltree_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_clean_skilltree_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52911,11 +53025,11 @@ int HP_pc_setpos(struct map_session_data *sd, unsigned short map_index, int x, i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setpos_pre ) { - int (*preHookFunc) (struct map_session_data *sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype); + int (*preHookFunc) (struct map_session_data **sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setpos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setpos_pre[hIndex].func; - retVal___ = preHookFunc(sd, &map_index, &x, &y, &clrtype); + retVal___ = preHookFunc(&sd, &map_index, &x, &y, &clrtype); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52926,10 +53040,10 @@ int HP_pc_setpos(struct map_session_data *sd, unsigned short map_index, int x, i retVal___ = HPMHooks.source.pc.setpos(sd, map_index, x, y, clrtype); } if( HPMHooks.count.HP_pc_setpos_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short map_index, int x, int y, clr_type clrtype); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setpos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setpos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &map_index, &x, &y, &clrtype); + retVal___ = postHookFunc(retVal___, sd, map_index, x, y, clrtype); } } return retVal___; @@ -52938,11 +53052,11 @@ int HP_pc_setsavepoint(struct map_session_data *sd, short map_index, int x, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setsavepoint_pre ) { - int (*preHookFunc) (struct map_session_data *sd, short *map_index, int *x, int *y); + int (*preHookFunc) (struct map_session_data **sd, short *map_index, int *x, int *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setsavepoint_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setsavepoint_pre[hIndex].func; - retVal___ = preHookFunc(sd, &map_index, &x, &y); + retVal___ = preHookFunc(&sd, &map_index, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52953,10 +53067,10 @@ int HP_pc_setsavepoint(struct map_session_data *sd, short map_index, int x, int retVal___ = HPMHooks.source.pc.setsavepoint(sd, map_index, x, y); } if( HPMHooks.count.HP_pc_setsavepoint_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, short *map_index, int *x, int *y); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, short map_index, int x, int y); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setsavepoint_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setsavepoint_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &map_index, &x, &y); + retVal___ = postHookFunc(retVal___, sd, map_index, x, y); } } return retVal___; @@ -52965,11 +53079,11 @@ int HP_pc_randomwarp(struct map_session_data *sd, clr_type type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_randomwarp_pre ) { - int (*preHookFunc) (struct map_session_data *sd, clr_type *type); + int (*preHookFunc) (struct map_session_data **sd, clr_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_randomwarp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_randomwarp_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -52980,10 +53094,10 @@ int HP_pc_randomwarp(struct map_session_data *sd, clr_type type) { retVal___ = HPMHooks.source.pc.randomwarp(sd, type); } if( HPMHooks.count.HP_pc_randomwarp_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, clr_type *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, clr_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_randomwarp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_randomwarp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -52992,11 +53106,11 @@ int HP_pc_memo(struct map_session_data *sd, int pos) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_memo_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *pos); + int (*preHookFunc) (struct map_session_data **sd, int *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_memo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_memo_pre[hIndex].func; - retVal___ = preHookFunc(sd, &pos); + retVal___ = preHookFunc(&sd, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53007,10 +53121,10 @@ int HP_pc_memo(struct map_session_data *sd, int pos) { retVal___ = HPMHooks.source.pc.memo(sd, pos); } if( HPMHooks.count.HP_pc_memo_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *pos); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_memo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_memo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &pos); + retVal___ = postHookFunc(retVal___, sd, pos); } } return retVal___; @@ -53019,11 +53133,11 @@ int HP_pc_checkadditem(struct map_session_data *sd, int nameid, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_checkadditem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *nameid, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *nameid, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkadditem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_checkadditem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid, &amount); + retVal___ = preHookFunc(&sd, &nameid, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53034,10 +53148,10 @@ int HP_pc_checkadditem(struct map_session_data *sd, int nameid, int amount) { retVal___ = HPMHooks.source.pc.checkadditem(sd, nameid, amount); } if( HPMHooks.count.HP_pc_checkadditem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *nameid, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int nameid, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkadditem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_checkadditem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid, &amount); + retVal___ = postHookFunc(retVal___, sd, nameid, amount); } } return retVal___; @@ -53046,11 +53160,11 @@ int HP_pc_inventoryblank(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_inventoryblank_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_inventoryblank_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_inventoryblank_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53073,11 +53187,11 @@ int HP_pc_search_inventory(struct map_session_data *sd, int item_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_search_inventory_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *item_id); + int (*preHookFunc) (struct map_session_data **sd, int *item_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_search_inventory_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_search_inventory_pre[hIndex].func; - retVal___ = preHookFunc(sd, &item_id); + retVal___ = preHookFunc(&sd, &item_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53088,10 +53202,10 @@ int HP_pc_search_inventory(struct map_session_data *sd, int item_id) { retVal___ = HPMHooks.source.pc.search_inventory(sd, item_id); } if( HPMHooks.count.HP_pc_search_inventory_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *item_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int item_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_search_inventory_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_search_inventory_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &item_id); + retVal___ = postHookFunc(retVal___, sd, item_id); } } return retVal___; @@ -53100,11 +53214,11 @@ int HP_pc_payzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type ty int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_payzeny_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *zeny, enum e_log_pick_type *type, struct map_session_data *tsd); + int (*preHookFunc) (struct map_session_data **sd, int *zeny, enum e_log_pick_type *type, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_payzeny_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_payzeny_pre[hIndex].func; - retVal___ = preHookFunc(sd, &zeny, &type, tsd); + retVal___ = preHookFunc(&sd, &zeny, &type, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53115,10 +53229,10 @@ int HP_pc_payzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type ty retVal___ = HPMHooks.source.pc.payzeny(sd, zeny, type, tsd); } if( HPMHooks.count.HP_pc_payzeny_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *zeny, enum e_log_pick_type *type, struct map_session_data *tsd); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int zeny, enum e_log_pick_type type, struct map_session_data *tsd); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_payzeny_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_payzeny_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &zeny, &type, tsd); + retVal___ = postHookFunc(retVal___, sd, zeny, type, tsd); } } return retVal___; @@ -53127,11 +53241,11 @@ int HP_pc_additem(struct map_session_data *sd, struct item *item_data, int amoun int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_additem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct item *item_data, int *amount, e_log_pick_type *log_type); + int (*preHookFunc) (struct map_session_data **sd, struct item **item_data, int *amount, e_log_pick_type *log_type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_additem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_additem_pre[hIndex].func; - retVal___ = preHookFunc(sd, item_data, &amount, &log_type); + retVal___ = preHookFunc(&sd, &item_data, &amount, &log_type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53142,10 +53256,10 @@ int HP_pc_additem(struct map_session_data *sd, struct item *item_data, int amoun retVal___ = HPMHooks.source.pc.additem(sd, item_data, amount, log_type); } if( HPMHooks.count.HP_pc_additem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct item *item_data, int *amount, e_log_pick_type *log_type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct item *item_data, int amount, e_log_pick_type log_type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_additem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_additem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, item_data, &amount, &log_type); + retVal___ = postHookFunc(retVal___, sd, item_data, amount, log_type); } } return retVal___; @@ -53154,11 +53268,11 @@ int HP_pc_getzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type ty int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_getzeny_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *zeny, enum e_log_pick_type *type, struct map_session_data *tsd); + int (*preHookFunc) (struct map_session_data **sd, int *zeny, enum e_log_pick_type *type, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getzeny_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_getzeny_pre[hIndex].func; - retVal___ = preHookFunc(sd, &zeny, &type, tsd); + retVal___ = preHookFunc(&sd, &zeny, &type, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53169,10 +53283,10 @@ int HP_pc_getzeny(struct map_session_data *sd, int zeny, enum e_log_pick_type ty retVal___ = HPMHooks.source.pc.getzeny(sd, zeny, type, tsd); } if( HPMHooks.count.HP_pc_getzeny_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *zeny, enum e_log_pick_type *type, struct map_session_data *tsd); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int zeny, enum e_log_pick_type type, struct map_session_data *tsd); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getzeny_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_getzeny_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &zeny, &type, tsd); + retVal___ = postHookFunc(retVal___, sd, zeny, type, tsd); } } return retVal___; @@ -53181,11 +53295,11 @@ int HP_pc_delitem(struct map_session_data *sd, int n, int amount, int type, shor int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_delitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, int *amount, int *type, short *reason, e_log_pick_type *log_type); + int (*preHookFunc) (struct map_session_data **sd, int *n, int *amount, int *type, short *reason, e_log_pick_type *log_type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_delitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_delitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, &amount, &type, &reason, &log_type); + retVal___ = preHookFunc(&sd, &n, &amount, &type, &reason, &log_type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53196,10 +53310,10 @@ int HP_pc_delitem(struct map_session_data *sd, int n, int amount, int type, shor retVal___ = HPMHooks.source.pc.delitem(sd, n, amount, type, reason, log_type); } if( HPMHooks.count.HP_pc_delitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, int *amount, int *type, short *reason, e_log_pick_type *log_type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n, int amount, int type, short reason, e_log_pick_type log_type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_delitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_delitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, &amount, &type, &reason, &log_type); + retVal___ = postHookFunc(retVal___, sd, n, amount, type, reason, log_type); } } return retVal___; @@ -53208,11 +53322,11 @@ int HP_pc_paycash(struct map_session_data *sd, int price, int points) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_paycash_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *price, int *points); + int (*preHookFunc) (struct map_session_data **sd, int *price, int *points); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_paycash_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_paycash_pre[hIndex].func; - retVal___ = preHookFunc(sd, &price, &points); + retVal___ = preHookFunc(&sd, &price, &points); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53223,10 +53337,10 @@ int HP_pc_paycash(struct map_session_data *sd, int price, int points) { retVal___ = HPMHooks.source.pc.paycash(sd, price, points); } if( HPMHooks.count.HP_pc_paycash_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *price, int *points); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int price, int points); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_paycash_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_paycash_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &price, &points); + retVal___ = postHookFunc(retVal___, sd, price, points); } } return retVal___; @@ -53235,11 +53349,11 @@ int HP_pc_getcash(struct map_session_data *sd, int cash, int points) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_getcash_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *cash, int *points); + int (*preHookFunc) (struct map_session_data **sd, int *cash, int *points); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getcash_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_getcash_pre[hIndex].func; - retVal___ = preHookFunc(sd, &cash, &points); + retVal___ = preHookFunc(&sd, &cash, &points); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53250,10 +53364,10 @@ int HP_pc_getcash(struct map_session_data *sd, int cash, int points) { retVal___ = HPMHooks.source.pc.getcash(sd, cash, points); } if( HPMHooks.count.HP_pc_getcash_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *cash, int *points); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int cash, int points); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getcash_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_getcash_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &cash, &points); + retVal___ = postHookFunc(retVal___, sd, cash, points); } } return retVal___; @@ -53262,11 +53376,11 @@ int HP_pc_cart_additem(struct map_session_data *sd, struct item *item_data, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_cart_additem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct item *item_data, int *amount, e_log_pick_type *log_type); + int (*preHookFunc) (struct map_session_data **sd, struct item **item_data, int *amount, e_log_pick_type *log_type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_cart_additem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_cart_additem_pre[hIndex].func; - retVal___ = preHookFunc(sd, item_data, &amount, &log_type); + retVal___ = preHookFunc(&sd, &item_data, &amount, &log_type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53277,10 +53391,10 @@ int HP_pc_cart_additem(struct map_session_data *sd, struct item *item_data, int retVal___ = HPMHooks.source.pc.cart_additem(sd, item_data, amount, log_type); } if( HPMHooks.count.HP_pc_cart_additem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct item *item_data, int *amount, e_log_pick_type *log_type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct item *item_data, int amount, e_log_pick_type log_type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_cart_additem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_cart_additem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, item_data, &amount, &log_type); + retVal___ = postHookFunc(retVal___, sd, item_data, amount, log_type); } } return retVal___; @@ -53289,11 +53403,11 @@ int HP_pc_cart_delitem(struct map_session_data *sd, int n, int amount, int type, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_cart_delitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, int *amount, int *type, e_log_pick_type *log_type); + int (*preHookFunc) (struct map_session_data **sd, int *n, int *amount, int *type, e_log_pick_type *log_type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_cart_delitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_cart_delitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, &amount, &type, &log_type); + retVal___ = preHookFunc(&sd, &n, &amount, &type, &log_type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53304,10 +53418,10 @@ int HP_pc_cart_delitem(struct map_session_data *sd, int n, int amount, int type, retVal___ = HPMHooks.source.pc.cart_delitem(sd, n, amount, type, log_type); } if( HPMHooks.count.HP_pc_cart_delitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, int *amount, int *type, e_log_pick_type *log_type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n, int amount, int type, e_log_pick_type log_type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_cart_delitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_cart_delitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, &amount, &type, &log_type); + retVal___ = postHookFunc(retVal___, sd, n, amount, type, log_type); } } return retVal___; @@ -53316,11 +53430,11 @@ int HP_pc_putitemtocart(struct map_session_data *sd, int idx, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_putitemtocart_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *idx, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *idx, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_putitemtocart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_putitemtocart_pre[hIndex].func; - retVal___ = preHookFunc(sd, &idx, &amount); + retVal___ = preHookFunc(&sd, &idx, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53331,10 +53445,10 @@ int HP_pc_putitemtocart(struct map_session_data *sd, int idx, int amount) { retVal___ = HPMHooks.source.pc.putitemtocart(sd, idx, amount); } if( HPMHooks.count.HP_pc_putitemtocart_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *idx, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int idx, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_putitemtocart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_putitemtocart_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &idx, &amount); + retVal___ = postHookFunc(retVal___, sd, idx, amount); } } return retVal___; @@ -53343,11 +53457,11 @@ int HP_pc_getitemfromcart(struct map_session_data *sd, int idx, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_getitemfromcart_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *idx, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *idx, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getitemfromcart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_getitemfromcart_pre[hIndex].func; - retVal___ = preHookFunc(sd, &idx, &amount); + retVal___ = preHookFunc(&sd, &idx, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53358,10 +53472,10 @@ int HP_pc_getitemfromcart(struct map_session_data *sd, int idx, int amount) { retVal___ = HPMHooks.source.pc.getitemfromcart(sd, idx, amount); } if( HPMHooks.count.HP_pc_getitemfromcart_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *idx, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int idx, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getitemfromcart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_getitemfromcart_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &idx, &amount); + retVal___ = postHookFunc(retVal___, sd, idx, amount); } } return retVal___; @@ -53370,11 +53484,11 @@ int HP_pc_cartitem_amount(struct map_session_data *sd, int idx, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_cartitem_amount_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *idx, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *idx, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_cartitem_amount_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_cartitem_amount_pre[hIndex].func; - retVal___ = preHookFunc(sd, &idx, &amount); + retVal___ = preHookFunc(&sd, &idx, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53385,10 +53499,10 @@ int HP_pc_cartitem_amount(struct map_session_data *sd, int idx, int amount) { retVal___ = HPMHooks.source.pc.cartitem_amount(sd, idx, amount); } if( HPMHooks.count.HP_pc_cartitem_amount_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *idx, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int idx, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_cartitem_amount_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_cartitem_amount_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &idx, &amount); + retVal___ = postHookFunc(retVal___, sd, idx, amount); } } return retVal___; @@ -53397,11 +53511,11 @@ int HP_pc_takeitem(struct map_session_data *sd, struct flooritem_data *fitem) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_takeitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct flooritem_data *fitem); + int (*preHookFunc) (struct map_session_data **sd, struct flooritem_data **fitem); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_takeitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_takeitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, fitem); + retVal___ = preHookFunc(&sd, &fitem); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53424,11 +53538,11 @@ int HP_pc_dropitem(struct map_session_data *sd, int n, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_dropitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *n, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_dropitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_dropitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, &amount); + retVal___ = preHookFunc(&sd, &n, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53439,10 +53553,10 @@ int HP_pc_dropitem(struct map_session_data *sd, int n, int amount) { retVal___ = HPMHooks.source.pc.dropitem(sd, n, amount); } if( HPMHooks.count.HP_pc_dropitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_dropitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_dropitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, &amount); + retVal___ = postHookFunc(retVal___, sd, n, amount); } } return retVal___; @@ -53451,11 +53565,11 @@ bool HP_pc_isequipped(struct map_session_data *sd, int nameid) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_isequipped_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *nameid); + bool (*preHookFunc) (struct map_session_data **sd, int *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_isequipped_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_isequipped_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid); + retVal___ = preHookFunc(&sd, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53466,10 +53580,10 @@ bool HP_pc_isequipped(struct map_session_data *sd, int nameid) { retVal___ = HPMHooks.source.pc.isequipped(sd, nameid); } if( HPMHooks.count.HP_pc_isequipped_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *nameid); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_isequipped_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_isequipped_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid); + retVal___ = postHookFunc(retVal___, sd, nameid); } } return retVal___; @@ -53478,11 +53592,11 @@ bool HP_pc_can_Adopt(struct map_session_data *p1_sd, struct map_session_data *p2 int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_can_Adopt_pre ) { - bool (*preHookFunc) (struct map_session_data *p1_sd, struct map_session_data *p2_sd, struct map_session_data *b_sd); + bool (*preHookFunc) (struct map_session_data **p1_sd, struct map_session_data **p2_sd, struct map_session_data **b_sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_Adopt_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_can_Adopt_pre[hIndex].func; - retVal___ = preHookFunc(p1_sd, p2_sd, b_sd); + retVal___ = preHookFunc(&p1_sd, &p2_sd, &b_sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53505,11 +53619,11 @@ bool HP_pc_adoption(struct map_session_data *p1_sd, struct map_session_data *p2_ int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_adoption_pre ) { - bool (*preHookFunc) (struct map_session_data *p1_sd, struct map_session_data *p2_sd, struct map_session_data *b_sd); + bool (*preHookFunc) (struct map_session_data **p1_sd, struct map_session_data **p2_sd, struct map_session_data **b_sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_adoption_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_adoption_pre[hIndex].func; - retVal___ = preHookFunc(p1_sd, p2_sd, b_sd); + retVal___ = preHookFunc(&p1_sd, &p2_sd, &b_sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53532,11 +53646,11 @@ int HP_pc_updateweightstatus(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_updateweightstatus_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_updateweightstatus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_updateweightstatus_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53559,11 +53673,11 @@ int HP_pc_addautobonus(struct s_autobonus *bonus, char max, const char *bonus_sc int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_addautobonus_pre ) { - int (*preHookFunc) (struct s_autobonus *bonus, char *max, const char *bonus_script, short *rate, unsigned int *dur, short *atk_type, const char *o_script, unsigned short *pos, bool *onskill); + int (*preHookFunc) (struct s_autobonus **bonus, char *max, const char **bonus_script, short *rate, unsigned int *dur, short *atk_type, const char **o_script, unsigned short *pos, bool *onskill); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addautobonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_addautobonus_pre[hIndex].func; - retVal___ = preHookFunc(bonus, &max, bonus_script, &rate, &dur, &atk_type, o_script, &pos, &onskill); + retVal___ = preHookFunc(&bonus, &max, &bonus_script, &rate, &dur, &atk_type, &o_script, &pos, &onskill); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53574,10 +53688,10 @@ int HP_pc_addautobonus(struct s_autobonus *bonus, char max, const char *bonus_sc retVal___ = HPMHooks.source.pc.addautobonus(bonus, max, bonus_script, rate, dur, atk_type, o_script, pos, onskill); } if( HPMHooks.count.HP_pc_addautobonus_post ) { - int (*postHookFunc) (int retVal___, struct s_autobonus *bonus, char *max, const char *bonus_script, short *rate, unsigned int *dur, short *atk_type, const char *o_script, unsigned short *pos, bool *onskill); + int (*postHookFunc) (int retVal___, struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short atk_type, const char *o_script, unsigned short pos, bool onskill); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addautobonus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_addautobonus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bonus, &max, bonus_script, &rate, &dur, &atk_type, o_script, &pos, &onskill); + retVal___ = postHookFunc(retVal___, bonus, max, bonus_script, rate, dur, atk_type, o_script, pos, onskill); } } return retVal___; @@ -53586,11 +53700,11 @@ int HP_pc_exeautobonus(struct map_session_data *sd, struct s_autobonus *bonus) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_exeautobonus_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct s_autobonus *bonus); + int (*preHookFunc) (struct map_session_data **sd, struct s_autobonus **bonus); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_exeautobonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_exeautobonus_pre[hIndex].func; - retVal___ = preHookFunc(sd, bonus); + retVal___ = preHookFunc(&sd, &bonus); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53628,10 +53742,10 @@ int HP_pc_endautobonus(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.endautobonus(tid, tick, id, data); } if( HPMHooks.count.HP_pc_endautobonus_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_endautobonus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_endautobonus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -53640,11 +53754,11 @@ int HP_pc_delautobonus(struct map_session_data *sd, struct s_autobonus *bonus, c int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_delautobonus_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct s_autobonus *bonus, char *max, bool *restore); + int (*preHookFunc) (struct map_session_data **sd, struct s_autobonus **bonus, char *max, bool *restore); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_delautobonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_delautobonus_pre[hIndex].func; - retVal___ = preHookFunc(sd, bonus, &max, &restore); + retVal___ = preHookFunc(&sd, &bonus, &max, &restore); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53655,10 +53769,10 @@ int HP_pc_delautobonus(struct map_session_data *sd, struct s_autobonus *bonus, c retVal___ = HPMHooks.source.pc.delautobonus(sd, bonus, max, restore); } if( HPMHooks.count.HP_pc_delautobonus_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct s_autobonus *bonus, char *max, bool *restore); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct s_autobonus *bonus, char max, bool restore); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_delautobonus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_delautobonus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, bonus, &max, &restore); + retVal___ = postHookFunc(retVal___, sd, bonus, max, restore); } } return retVal___; @@ -53667,11 +53781,11 @@ int HP_pc_bonus(struct map_session_data *sd, int type, int val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &val); + retVal___ = preHookFunc(&sd, &type, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53682,10 +53796,10 @@ int HP_pc_bonus(struct map_session_data *sd, int type, int val) { retVal___ = HPMHooks.source.pc.bonus(sd, type, val); } if( HPMHooks.count.HP_pc_bonus_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &val); + retVal___ = postHookFunc(retVal___, sd, type, val); } } return retVal___; @@ -53694,11 +53808,11 @@ int HP_pc_bonus2(struct map_session_data *sd, int type, int type2, int val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus2_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *type2, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *type2, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus2_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &type2, &val); + retVal___ = preHookFunc(&sd, &type, &type2, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53709,10 +53823,10 @@ int HP_pc_bonus2(struct map_session_data *sd, int type, int type2, int val) { retVal___ = HPMHooks.source.pc.bonus2(sd, type, type2, val); } if( HPMHooks.count.HP_pc_bonus2_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *type2, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int type2, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &type2, &val); + retVal___ = postHookFunc(retVal___, sd, type, type2, val); } } return retVal___; @@ -53721,11 +53835,11 @@ int HP_pc_bonus3(struct map_session_data *sd, int type, int type2, int type3, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus3_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *type2, int *type3, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *type2, int *type3, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus3_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus3_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &type2, &type3, &val); + retVal___ = preHookFunc(&sd, &type, &type2, &type3, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53736,10 +53850,10 @@ int HP_pc_bonus3(struct map_session_data *sd, int type, int type2, int type3, in retVal___ = HPMHooks.source.pc.bonus3(sd, type, type2, type3, val); } if( HPMHooks.count.HP_pc_bonus3_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *type2, int *type3, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int type2, int type3, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus3_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus3_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &type2, &type3, &val); + retVal___ = postHookFunc(retVal___, sd, type, type2, type3, val); } } return retVal___; @@ -53748,11 +53862,11 @@ int HP_pc_bonus4(struct map_session_data *sd, int type, int type2, int type3, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus4_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *type2, int *type3, int *type4, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *type2, int *type3, int *type4, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus4_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus4_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &type2, &type3, &type4, &val); + retVal___ = preHookFunc(&sd, &type, &type2, &type3, &type4, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53763,10 +53877,10 @@ int HP_pc_bonus4(struct map_session_data *sd, int type, int type2, int type3, in retVal___ = HPMHooks.source.pc.bonus4(sd, type, type2, type3, type4, val); } if( HPMHooks.count.HP_pc_bonus4_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *type2, int *type3, int *type4, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int type2, int type3, int type4, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus4_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus4_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &type2, &type3, &type4, &val); + retVal___ = postHookFunc(retVal___, sd, type, type2, type3, type4, val); } } return retVal___; @@ -53775,11 +53889,11 @@ int HP_pc_bonus5(struct map_session_data *sd, int type, int type2, int type3, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus5_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *type2, int *type3, int *type4, int *type5, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *type2, int *type3, int *type4, int *type5, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus5_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus5_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &type2, &type3, &type4, &type5, &val); + retVal___ = preHookFunc(&sd, &type, &type2, &type3, &type4, &type5, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53790,10 +53904,10 @@ int HP_pc_bonus5(struct map_session_data *sd, int type, int type2, int type3, in retVal___ = HPMHooks.source.pc.bonus5(sd, type, type2, type3, type4, type5, val); } if( HPMHooks.count.HP_pc_bonus5_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *type2, int *type3, int *type4, int *type5, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int type2, int type3, int type4, int type5, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus5_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus5_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &type2, &type3, &type4, &type5, &val); + retVal___ = postHookFunc(retVal___, sd, type, type2, type3, type4, type5, val); } } return retVal___; @@ -53802,11 +53916,11 @@ int HP_pc_skill(struct map_session_data *sd, int id, int level, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_skill_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *id, int *level, int *flag); + int (*preHookFunc) (struct map_session_data **sd, int *id, int *level, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_skill_pre[hIndex].func; - retVal___ = preHookFunc(sd, &id, &level, &flag); + retVal___ = preHookFunc(&sd, &id, &level, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53817,10 +53931,10 @@ int HP_pc_skill(struct map_session_data *sd, int id, int level, int flag) { retVal___ = HPMHooks.source.pc.skill(sd, id, level, flag); } if( HPMHooks.count.HP_pc_skill_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *id, int *level, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int id, int level, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_skill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &id, &level, &flag); + retVal___ = postHookFunc(retVal___, sd, id, level, flag); } } return retVal___; @@ -53829,11 +53943,11 @@ int HP_pc_insert_card(struct map_session_data *sd, int idx_card, int idx_equip) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_insert_card_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *idx_card, int *idx_equip); + int (*preHookFunc) (struct map_session_data **sd, int *idx_card, int *idx_equip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_insert_card_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_insert_card_pre[hIndex].func; - retVal___ = preHookFunc(sd, &idx_card, &idx_equip); + retVal___ = preHookFunc(&sd, &idx_card, &idx_equip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53844,10 +53958,10 @@ int HP_pc_insert_card(struct map_session_data *sd, int idx_card, int idx_equip) retVal___ = HPMHooks.source.pc.insert_card(sd, idx_card, idx_equip); } if( HPMHooks.count.HP_pc_insert_card_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *idx_card, int *idx_equip); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int idx_card, int idx_equip); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_insert_card_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_insert_card_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &idx_card, &idx_equip); + retVal___ = postHookFunc(retVal___, sd, idx_card, idx_equip); } } return retVal___; @@ -53856,11 +53970,11 @@ bool HP_pc_can_insert_card(struct map_session_data *sd, int idx_card) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_can_insert_card_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *idx_card); + bool (*preHookFunc) (struct map_session_data **sd, int *idx_card); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_insert_card_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_can_insert_card_pre[hIndex].func; - retVal___ = preHookFunc(sd, &idx_card); + retVal___ = preHookFunc(&sd, &idx_card); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53871,10 +53985,10 @@ bool HP_pc_can_insert_card(struct map_session_data *sd, int idx_card) { retVal___ = HPMHooks.source.pc.can_insert_card(sd, idx_card); } if( HPMHooks.count.HP_pc_can_insert_card_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *idx_card); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int idx_card); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_insert_card_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_can_insert_card_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &idx_card); + retVal___ = postHookFunc(retVal___, sd, idx_card); } } return retVal___; @@ -53883,11 +53997,11 @@ bool HP_pc_can_insert_card_into(struct map_session_data *sd, int idx_card, int i int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_can_insert_card_into_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *idx_card, int *idx_equip); + bool (*preHookFunc) (struct map_session_data **sd, int *idx_card, int *idx_equip); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_insert_card_into_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_can_insert_card_into_pre[hIndex].func; - retVal___ = preHookFunc(sd, &idx_card, &idx_equip); + retVal___ = preHookFunc(&sd, &idx_card, &idx_equip); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53898,10 +54012,10 @@ bool HP_pc_can_insert_card_into(struct map_session_data *sd, int idx_card, int i retVal___ = HPMHooks.source.pc.can_insert_card_into(sd, idx_card, idx_equip); } if( HPMHooks.count.HP_pc_can_insert_card_into_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *idx_card, int *idx_equip); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int idx_card, int idx_equip); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_insert_card_into_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_can_insert_card_into_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &idx_card, &idx_equip); + retVal___ = postHookFunc(retVal___, sd, idx_card, idx_equip); } } return retVal___; @@ -53910,11 +54024,11 @@ int HP_pc_steal_item(struct map_session_data *sd, struct block_list *bl, uint16 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_steal_item_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct block_list *bl, uint16 *skill_lv); + int (*preHookFunc) (struct map_session_data **sd, struct block_list **bl, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_steal_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_steal_item_pre[hIndex].func; - retVal___ = preHookFunc(sd, bl, &skill_lv); + retVal___ = preHookFunc(&sd, &bl, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53925,10 +54039,10 @@ int HP_pc_steal_item(struct map_session_data *sd, struct block_list *bl, uint16 retVal___ = HPMHooks.source.pc.steal_item(sd, bl, skill_lv); } if( HPMHooks.count.HP_pc_steal_item_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct block_list *bl, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct block_list *bl, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_steal_item_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_steal_item_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, bl, &skill_lv); + retVal___ = postHookFunc(retVal___, sd, bl, skill_lv); } } return retVal___; @@ -53937,11 +54051,11 @@ int HP_pc_steal_coin(struct map_session_data *sd, struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_steal_coin_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct block_list *bl); + int (*preHookFunc) (struct map_session_data **sd, struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_steal_coin_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_steal_coin_pre[hIndex].func; - retVal___ = preHookFunc(sd, bl); + retVal___ = preHookFunc(&sd, &bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53964,11 +54078,11 @@ int HP_pc_modifybuyvalue(struct map_session_data *sd, int orig_value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_modifybuyvalue_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *orig_value); + int (*preHookFunc) (struct map_session_data **sd, int *orig_value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_modifybuyvalue_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_modifybuyvalue_pre[hIndex].func; - retVal___ = preHookFunc(sd, &orig_value); + retVal___ = preHookFunc(&sd, &orig_value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53979,10 +54093,10 @@ int HP_pc_modifybuyvalue(struct map_session_data *sd, int orig_value) { retVal___ = HPMHooks.source.pc.modifybuyvalue(sd, orig_value); } if( HPMHooks.count.HP_pc_modifybuyvalue_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *orig_value); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int orig_value); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_modifybuyvalue_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_modifybuyvalue_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &orig_value); + retVal___ = postHookFunc(retVal___, sd, orig_value); } } return retVal___; @@ -53991,11 +54105,11 @@ int HP_pc_modifysellvalue(struct map_session_data *sd, int orig_value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_modifysellvalue_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *orig_value); + int (*preHookFunc) (struct map_session_data **sd, int *orig_value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_modifysellvalue_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_modifysellvalue_pre[hIndex].func; - retVal___ = preHookFunc(sd, &orig_value); + retVal___ = preHookFunc(&sd, &orig_value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54006,10 +54120,10 @@ int HP_pc_modifysellvalue(struct map_session_data *sd, int orig_value) { retVal___ = HPMHooks.source.pc.modifysellvalue(sd, orig_value); } if( HPMHooks.count.HP_pc_modifysellvalue_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *orig_value); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int orig_value); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_modifysellvalue_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_modifysellvalue_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &orig_value); + retVal___ = postHookFunc(retVal___, sd, orig_value); } } return retVal___; @@ -54018,11 +54132,11 @@ int HP_pc_follow(struct map_session_data *sd, int target_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_follow_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *target_id); + int (*preHookFunc) (struct map_session_data **sd, int *target_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_follow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_follow_pre[hIndex].func; - retVal___ = preHookFunc(sd, &target_id); + retVal___ = preHookFunc(&sd, &target_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54033,10 +54147,10 @@ int HP_pc_follow(struct map_session_data *sd, int target_id) { retVal___ = HPMHooks.source.pc.follow(sd, target_id); } if( HPMHooks.count.HP_pc_follow_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *target_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int target_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_follow_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_follow_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &target_id); + retVal___ = postHookFunc(retVal___, sd, target_id); } } return retVal___; @@ -54045,11 +54159,11 @@ int HP_pc_stop_following(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_stop_following_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_stop_following_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_stop_following_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54072,11 +54186,11 @@ unsigned int HP_pc_maxbaselv(struct map_session_data *sd) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_pc_maxbaselv_pre ) { - unsigned int (*preHookFunc) (struct map_session_data *sd); + unsigned int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_maxbaselv_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_maxbaselv_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54099,11 +54213,11 @@ unsigned int HP_pc_maxjoblv(struct map_session_data *sd) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_pc_maxjoblv_pre ) { - unsigned int (*preHookFunc) (struct map_session_data *sd); + unsigned int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_maxjoblv_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_maxjoblv_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54126,11 +54240,11 @@ int HP_pc_checkbaselevelup(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_checkbaselevelup_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkbaselevelup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_checkbaselevelup_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54153,11 +54267,11 @@ int HP_pc_checkjoblevelup(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_checkjoblevelup_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkjoblevelup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_checkjoblevelup_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54180,11 +54294,11 @@ bool HP_pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_gainexp_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, struct block_list *src, unsigned int *base_exp, unsigned int *job_exp, bool *is_quest); + bool (*preHookFunc) (struct map_session_data **sd, struct block_list **src, unsigned int *base_exp, unsigned int *job_exp, bool *is_quest); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_gainexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_gainexp_pre[hIndex].func; - retVal___ = preHookFunc(sd, src, &base_exp, &job_exp, &is_quest); + retVal___ = preHookFunc(&sd, &src, &base_exp, &job_exp, &is_quest); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54195,10 +54309,10 @@ bool HP_pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned retVal___ = HPMHooks.source.pc.gainexp(sd, src, base_exp, job_exp, is_quest); } if( HPMHooks.count.HP_pc_gainexp_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, struct block_list *src, unsigned int *base_exp, unsigned int *job_exp, bool *is_quest); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, struct block_list *src, unsigned int base_exp, unsigned int job_exp, bool is_quest); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_gainexp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_gainexp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, src, &base_exp, &job_exp, &is_quest); + retVal___ = postHookFunc(retVal___, sd, src, base_exp, job_exp, is_quest); } } return retVal___; @@ -54207,11 +54321,11 @@ unsigned int HP_pc_nextbaseexp(struct map_session_data *sd) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_pc_nextbaseexp_pre ) { - unsigned int (*preHookFunc) (struct map_session_data *sd); + unsigned int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_nextbaseexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_nextbaseexp_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54234,11 +54348,11 @@ unsigned int HP_pc_thisbaseexp(struct map_session_data *sd) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_pc_thisbaseexp_pre ) { - unsigned int (*preHookFunc) (struct map_session_data *sd); + unsigned int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_thisbaseexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_thisbaseexp_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54261,11 +54375,11 @@ unsigned int HP_pc_nextjobexp(struct map_session_data *sd) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_pc_nextjobexp_pre ) { - unsigned int (*preHookFunc) (struct map_session_data *sd); + unsigned int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_nextjobexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_nextjobexp_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54288,11 +54402,11 @@ unsigned int HP_pc_thisjobexp(struct map_session_data *sd) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_pc_thisjobexp_pre ) { - unsigned int (*preHookFunc) (struct map_session_data *sd); + unsigned int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_thisjobexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_thisjobexp_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54330,10 +54444,10 @@ int HP_pc_gets_status_point(int level) { retVal___ = HPMHooks.source.pc.gets_status_point(level); } if( HPMHooks.count.HP_pc_gets_status_point_post ) { - int (*postHookFunc) (int retVal___, int *level); + int (*postHookFunc) (int retVal___, int level); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_gets_status_point_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_gets_status_point_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &level); + retVal___ = postHookFunc(retVal___, level); } } return retVal___; @@ -54342,11 +54456,11 @@ int HP_pc_need_status_point(struct map_session_data *sd, int type, int val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_need_status_point_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_need_status_point_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_need_status_point_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &val); + retVal___ = preHookFunc(&sd, &type, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54357,10 +54471,10 @@ int HP_pc_need_status_point(struct map_session_data *sd, int type, int val) { retVal___ = HPMHooks.source.pc.need_status_point(sd, type, val); } if( HPMHooks.count.HP_pc_need_status_point_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_need_status_point_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_need_status_point_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &val); + retVal___ = postHookFunc(retVal___, sd, type, val); } } return retVal___; @@ -54369,11 +54483,11 @@ int HP_pc_maxparameterincrease(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_maxparameterincrease_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_maxparameterincrease_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_maxparameterincrease_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54384,10 +54498,10 @@ int HP_pc_maxparameterincrease(struct map_session_data *sd, int type) { retVal___ = HPMHooks.source.pc.maxparameterincrease(sd, type); } if( HPMHooks.count.HP_pc_maxparameterincrease_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_maxparameterincrease_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_maxparameterincrease_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -54396,11 +54510,11 @@ bool HP_pc_statusup(struct map_session_data *sd, int type, int increase) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_statusup_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *type, int *increase); + bool (*preHookFunc) (struct map_session_data **sd, int *type, int *increase); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_statusup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_statusup_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &increase); + retVal___ = preHookFunc(&sd, &type, &increase); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54411,10 +54525,10 @@ bool HP_pc_statusup(struct map_session_data *sd, int type, int increase) { retVal___ = HPMHooks.source.pc.statusup(sd, type, increase); } if( HPMHooks.count.HP_pc_statusup_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *type, int *increase); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int type, int increase); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_statusup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_statusup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &increase); + retVal___ = postHookFunc(retVal___, sd, type, increase); } } return retVal___; @@ -54423,11 +54537,11 @@ int HP_pc_statusup2(struct map_session_data *sd, int type, int val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_statusup2_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_statusup2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_statusup2_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &val); + retVal___ = preHookFunc(&sd, &type, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54438,10 +54552,10 @@ int HP_pc_statusup2(struct map_session_data *sd, int type, int val) { retVal___ = HPMHooks.source.pc.statusup2(sd, type, val); } if( HPMHooks.count.HP_pc_statusup2_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_statusup2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_statusup2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &val); + retVal___ = postHookFunc(retVal___, sd, type, val); } } return retVal___; @@ -54450,11 +54564,11 @@ int HP_pc_skillup(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_skillup_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skillup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_skillup_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id); + retVal___ = preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54465,10 +54579,10 @@ int HP_pc_skillup(struct map_session_data *sd, uint16 skill_id) { retVal___ = HPMHooks.source.pc.skillup(sd, skill_id); } if( HPMHooks.count.HP_pc_skillup_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skillup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_skillup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id); + retVal___ = postHookFunc(retVal___, sd, skill_id); } } return retVal___; @@ -54477,11 +54591,11 @@ int HP_pc_allskillup(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_allskillup_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_allskillup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_allskillup_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54504,11 +54618,11 @@ int HP_pc_resetlvl(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_resetlvl_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_resetlvl_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_resetlvl_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54519,10 +54633,10 @@ int HP_pc_resetlvl(struct map_session_data *sd, int type) { retVal___ = HPMHooks.source.pc.resetlvl(sd, type); } if( HPMHooks.count.HP_pc_resetlvl_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_resetlvl_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_resetlvl_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -54531,11 +54645,11 @@ int HP_pc_resetstate(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_resetstate_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_resetstate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_resetstate_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54558,11 +54672,11 @@ int HP_pc_resetskill(struct map_session_data *sd, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_resetskill_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *flag); + int (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_resetskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_resetskill_pre[hIndex].func; - retVal___ = preHookFunc(sd, &flag); + retVal___ = preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54573,10 +54687,10 @@ int HP_pc_resetskill(struct map_session_data *sd, int flag) { retVal___ = HPMHooks.source.pc.resetskill(sd, flag); } if( HPMHooks.count.HP_pc_resetskill_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_resetskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_resetskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &flag); + retVal___ = postHookFunc(retVal___, sd, flag); } } return retVal___; @@ -54585,11 +54699,11 @@ int HP_pc_resetfeel(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_resetfeel_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_resetfeel_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_resetfeel_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54612,11 +54726,11 @@ int HP_pc_resethate(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_resethate_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_resethate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_resethate_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54639,11 +54753,11 @@ int HP_pc_equipitem(struct map_session_data *sd, int n, int req_pos) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_equipitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, int *req_pos); + int (*preHookFunc) (struct map_session_data **sd, int *n, int *req_pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_equipitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_equipitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, &req_pos); + retVal___ = preHookFunc(&sd, &n, &req_pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54654,10 +54768,10 @@ int HP_pc_equipitem(struct map_session_data *sd, int n, int req_pos) { retVal___ = HPMHooks.source.pc.equipitem(sd, n, req_pos); } if( HPMHooks.count.HP_pc_equipitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, int *req_pos); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n, int req_pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_equipitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_equipitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, &req_pos); + retVal___ = postHookFunc(retVal___, sd, n, req_pos); } } return retVal___; @@ -54665,11 +54779,11 @@ int HP_pc_equipitem(struct map_session_data *sd, int n, int req_pos) { void HP_pc_equipitem_pos(struct map_session_data *sd, struct item_data *id, int n, int pos) { int hIndex = 0; if( HPMHooks.count.HP_pc_equipitem_pos_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct item_data *id, int *n, int *pos); + void (*preHookFunc) (struct map_session_data **sd, struct item_data **id, int *n, int *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_equipitem_pos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_equipitem_pos_pre[hIndex].func; - preHookFunc(sd, id, &n, &pos); + preHookFunc(&sd, &id, &n, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54680,10 +54794,10 @@ void HP_pc_equipitem_pos(struct map_session_data *sd, struct item_data *id, int HPMHooks.source.pc.equipitem_pos(sd, id, n, pos); } if( HPMHooks.count.HP_pc_equipitem_pos_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct item_data *id, int *n, int *pos); + void (*postHookFunc) (struct map_session_data *sd, struct item_data *id, int n, int pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_equipitem_pos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_equipitem_pos_post[hIndex].func; - postHookFunc(sd, id, &n, &pos); + postHookFunc(sd, id, n, pos); } } return; @@ -54692,11 +54806,11 @@ int HP_pc_unequipitem(struct map_session_data *sd, int n, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_unequipitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, int *flag); + int (*preHookFunc) (struct map_session_data **sd, int *n, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_unequipitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_unequipitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, &flag); + retVal___ = preHookFunc(&sd, &n, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54707,10 +54821,10 @@ int HP_pc_unequipitem(struct map_session_data *sd, int n, int flag) { retVal___ = HPMHooks.source.pc.unequipitem(sd, n, flag); } if( HPMHooks.count.HP_pc_unequipitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_unequipitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_unequipitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, &flag); + retVal___ = postHookFunc(retVal___, sd, n, flag); } } return retVal___; @@ -54718,11 +54832,11 @@ int HP_pc_unequipitem(struct map_session_data *sd, int n, int flag) { void HP_pc_unequipitem_pos(struct map_session_data *sd, int n, int pos) { int hIndex = 0; if( HPMHooks.count.HP_pc_unequipitem_pos_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *n, int *pos); + void (*preHookFunc) (struct map_session_data **sd, int *n, int *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_unequipitem_pos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_unequipitem_pos_pre[hIndex].func; - preHookFunc(sd, &n, &pos); + preHookFunc(&sd, &n, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54733,10 +54847,10 @@ void HP_pc_unequipitem_pos(struct map_session_data *sd, int n, int pos) { HPMHooks.source.pc.unequipitem_pos(sd, n, pos); } if( HPMHooks.count.HP_pc_unequipitem_pos_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *n, int *pos); + void (*postHookFunc) (struct map_session_data *sd, int n, int pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_unequipitem_pos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_unequipitem_pos_post[hIndex].func; - postHookFunc(sd, &n, &pos); + postHookFunc(sd, n, pos); } } return; @@ -54745,11 +54859,11 @@ int HP_pc_checkitem(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_checkitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_checkitem_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54772,11 +54886,11 @@ int HP_pc_useitem(struct map_session_data *sd, int n) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_useitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n); + int (*preHookFunc) (struct map_session_data **sd, int *n); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_useitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_useitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n); + retVal___ = preHookFunc(&sd, &n); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54787,10 +54901,10 @@ int HP_pc_useitem(struct map_session_data *sd, int n) { retVal___ = HPMHooks.source.pc.useitem(sd, n); } if( HPMHooks.count.HP_pc_useitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_useitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_useitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n); + retVal___ = postHookFunc(retVal___, sd, n); } } return retVal___; @@ -54799,11 +54913,11 @@ int HP_pc_skillatk_bonus(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_skillatk_bonus_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skillatk_bonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_skillatk_bonus_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id); + retVal___ = preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54814,10 +54928,10 @@ int HP_pc_skillatk_bonus(struct map_session_data *sd, uint16 skill_id) { retVal___ = HPMHooks.source.pc.skillatk_bonus(sd, skill_id); } if( HPMHooks.count.HP_pc_skillatk_bonus_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skillatk_bonus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_skillatk_bonus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id); + retVal___ = postHookFunc(retVal___, sd, skill_id); } } return retVal___; @@ -54826,11 +54940,11 @@ int HP_pc_skillheal_bonus(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_skillheal_bonus_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skillheal_bonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_skillheal_bonus_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id); + retVal___ = preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54841,10 +54955,10 @@ int HP_pc_skillheal_bonus(struct map_session_data *sd, uint16 skill_id) { retVal___ = HPMHooks.source.pc.skillheal_bonus(sd, skill_id); } if( HPMHooks.count.HP_pc_skillheal_bonus_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skillheal_bonus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_skillheal_bonus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id); + retVal___ = postHookFunc(retVal___, sd, skill_id); } } return retVal___; @@ -54853,11 +54967,11 @@ int HP_pc_skillheal2_bonus(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_skillheal2_bonus_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skillheal2_bonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_skillheal2_bonus_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id); + retVal___ = preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54868,10 +54982,10 @@ int HP_pc_skillheal2_bonus(struct map_session_data *sd, uint16 skill_id) { retVal___ = HPMHooks.source.pc.skillheal2_bonus(sd, skill_id); } if( HPMHooks.count.HP_pc_skillheal2_bonus_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_skillheal2_bonus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_skillheal2_bonus_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id); + retVal___ = postHookFunc(retVal___, sd, skill_id); } } return retVal___; @@ -54879,11 +54993,11 @@ int HP_pc_skillheal2_bonus(struct map_session_data *sd, uint16 skill_id) { void HP_pc_damage(struct map_session_data *sd, struct block_list *src, unsigned int hp, unsigned int sp) { int hIndex = 0; if( HPMHooks.count.HP_pc_damage_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct block_list *src, unsigned int *hp, unsigned int *sp); + void (*preHookFunc) (struct map_session_data **sd, struct block_list **src, unsigned int *hp, unsigned int *sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_damage_pre[hIndex].func; - preHookFunc(sd, src, &hp, &sp); + preHookFunc(&sd, &src, &hp, &sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54894,10 +55008,10 @@ void HP_pc_damage(struct map_session_data *sd, struct block_list *src, unsigned HPMHooks.source.pc.damage(sd, src, hp, sp); } if( HPMHooks.count.HP_pc_damage_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct block_list *src, unsigned int *hp, unsigned int *sp); + void (*postHookFunc) (struct map_session_data *sd, struct block_list *src, unsigned int hp, unsigned int sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_damage_post[hIndex].func; - postHookFunc(sd, src, &hp, &sp); + postHookFunc(sd, src, hp, sp); } } return; @@ -54906,11 +55020,11 @@ int HP_pc_dead(struct map_session_data *sd, struct block_list *src) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_dead_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct block_list *src); + int (*preHookFunc) (struct map_session_data **sd, struct block_list **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_dead_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_dead_pre[hIndex].func; - retVal___ = preHookFunc(sd, src); + retVal___ = preHookFunc(&sd, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54932,11 +55046,11 @@ int HP_pc_dead(struct map_session_data *sd, struct block_list *src) { void HP_pc_revive(struct map_session_data *sd, unsigned int hp, unsigned int sp) { int hIndex = 0; if( HPMHooks.count.HP_pc_revive_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *hp, unsigned int *sp); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *hp, unsigned int *sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_revive_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_revive_pre[hIndex].func; - preHookFunc(sd, &hp, &sp); + preHookFunc(&sd, &hp, &sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54947,10 +55061,10 @@ void HP_pc_revive(struct map_session_data *sd, unsigned int hp, unsigned int sp) HPMHooks.source.pc.revive(sd, hp, sp); } if( HPMHooks.count.HP_pc_revive_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *hp, unsigned int *sp); + void (*postHookFunc) (struct map_session_data *sd, unsigned int hp, unsigned int sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_revive_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_revive_post[hIndex].func; - postHookFunc(sd, &hp, &sp); + postHookFunc(sd, hp, sp); } } return; @@ -54958,11 +55072,11 @@ void HP_pc_revive(struct map_session_data *sd, unsigned int hp, unsigned int sp) void HP_pc_heal(struct map_session_data *sd, unsigned int hp, unsigned int sp, int type) { int hIndex = 0; if( HPMHooks.count.HP_pc_heal_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *hp, unsigned int *sp, int *type); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *hp, unsigned int *sp, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_heal_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_heal_pre[hIndex].func; - preHookFunc(sd, &hp, &sp, &type); + preHookFunc(&sd, &hp, &sp, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54973,10 +55087,10 @@ void HP_pc_heal(struct map_session_data *sd, unsigned int hp, unsigned int sp, i HPMHooks.source.pc.heal(sd, hp, sp, type); } if( HPMHooks.count.HP_pc_heal_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *hp, unsigned int *sp, int *type); + void (*postHookFunc) (struct map_session_data *sd, unsigned int hp, unsigned int sp, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_heal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_heal_post[hIndex].func; - postHookFunc(sd, &hp, &sp, &type); + postHookFunc(sd, hp, sp, type); } } return; @@ -54985,11 +55099,11 @@ int HP_pc_itemheal(struct map_session_data *sd, int itemid, int hp, int sp) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_itemheal_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *itemid, int *hp, int *sp); + int (*preHookFunc) (struct map_session_data **sd, int *itemid, int *hp, int *sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_itemheal_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_itemheal_pre[hIndex].func; - retVal___ = preHookFunc(sd, &itemid, &hp, &sp); + retVal___ = preHookFunc(&sd, &itemid, &hp, &sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55000,10 +55114,10 @@ int HP_pc_itemheal(struct map_session_data *sd, int itemid, int hp, int sp) { retVal___ = HPMHooks.source.pc.itemheal(sd, itemid, hp, sp); } if( HPMHooks.count.HP_pc_itemheal_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *itemid, int *hp, int *sp); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int itemid, int hp, int sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_itemheal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_itemheal_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &itemid, &hp, &sp); + retVal___ = postHookFunc(retVal___, sd, itemid, hp, sp); } } return retVal___; @@ -55012,11 +55126,11 @@ int HP_pc_percentheal(struct map_session_data *sd, int hp, int sp) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_percentheal_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *hp, int *sp); + int (*preHookFunc) (struct map_session_data **sd, int *hp, int *sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_percentheal_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_percentheal_pre[hIndex].func; - retVal___ = preHookFunc(sd, &hp, &sp); + retVal___ = preHookFunc(&sd, &hp, &sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55027,10 +55141,10 @@ int HP_pc_percentheal(struct map_session_data *sd, int hp, int sp) { retVal___ = HPMHooks.source.pc.percentheal(sd, hp, sp); } if( HPMHooks.count.HP_pc_percentheal_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *hp, int *sp); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int hp, int sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_percentheal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_percentheal_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &hp, &sp); + retVal___ = postHookFunc(retVal___, sd, hp, sp); } } return retVal___; @@ -55039,11 +55153,11 @@ int HP_pc_jobchange(struct map_session_data *sd, int job, int upper) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_jobchange_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *job, int *upper); + int (*preHookFunc) (struct map_session_data **sd, int *job, int *upper); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_jobchange_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_jobchange_pre[hIndex].func; - retVal___ = preHookFunc(sd, &job, &upper); + retVal___ = preHookFunc(&sd, &job, &upper); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55054,10 +55168,10 @@ int HP_pc_jobchange(struct map_session_data *sd, int job, int upper) { retVal___ = HPMHooks.source.pc.jobchange(sd, job, upper); } if( HPMHooks.count.HP_pc_jobchange_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *job, int *upper); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int job, int upper); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_jobchange_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_jobchange_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &job, &upper); + retVal___ = postHookFunc(retVal___, sd, job, upper); } } return retVal___; @@ -55066,11 +55180,11 @@ int HP_pc_setoption(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setoption_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setoption_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setoption_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55081,10 +55195,10 @@ int HP_pc_setoption(struct map_session_data *sd, int type) { retVal___ = HPMHooks.source.pc.setoption(sd, type); } if( HPMHooks.count.HP_pc_setoption_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setoption_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setoption_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -55093,11 +55207,11 @@ int HP_pc_setcart(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setcart_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setcart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setcart_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55108,10 +55222,10 @@ int HP_pc_setcart(struct map_session_data *sd, int type) { retVal___ = HPMHooks.source.pc.setcart(sd, type); } if( HPMHooks.count.HP_pc_setcart_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setcart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setcart_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -55119,11 +55233,11 @@ int HP_pc_setcart(struct map_session_data *sd, int type) { void HP_pc_setfalcon(struct map_session_data *sd, bool flag) { int hIndex = 0; if( HPMHooks.count.HP_pc_setfalcon_pre ) { - void (*preHookFunc) (struct map_session_data *sd, bool *flag); + void (*preHookFunc) (struct map_session_data **sd, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setfalcon_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setfalcon_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55134,10 +55248,10 @@ void HP_pc_setfalcon(struct map_session_data *sd, bool flag) { HPMHooks.source.pc.setfalcon(sd, flag); } if( HPMHooks.count.HP_pc_setfalcon_post ) { - void (*postHookFunc) (struct map_session_data *sd, bool *flag); + void (*postHookFunc) (struct map_session_data *sd, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setfalcon_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setfalcon_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -55145,11 +55259,11 @@ void HP_pc_setfalcon(struct map_session_data *sd, bool flag) { void HP_pc_setridingpeco(struct map_session_data *sd, bool flag) { int hIndex = 0; if( HPMHooks.count.HP_pc_setridingpeco_pre ) { - void (*preHookFunc) (struct map_session_data *sd, bool *flag); + void (*preHookFunc) (struct map_session_data **sd, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingpeco_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setridingpeco_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55160,10 +55274,10 @@ void HP_pc_setridingpeco(struct map_session_data *sd, bool flag) { HPMHooks.source.pc.setridingpeco(sd, flag); } if( HPMHooks.count.HP_pc_setridingpeco_post ) { - void (*postHookFunc) (struct map_session_data *sd, bool *flag); + void (*postHookFunc) (struct map_session_data *sd, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingpeco_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setridingpeco_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -55171,11 +55285,11 @@ void HP_pc_setridingpeco(struct map_session_data *sd, bool flag) { void HP_pc_setmadogear(struct map_session_data *sd, bool flag) { int hIndex = 0; if( HPMHooks.count.HP_pc_setmadogear_pre ) { - void (*preHookFunc) (struct map_session_data *sd, bool *flag); + void (*preHookFunc) (struct map_session_data **sd, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setmadogear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setmadogear_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55186,10 +55300,10 @@ void HP_pc_setmadogear(struct map_session_data *sd, bool flag) { HPMHooks.source.pc.setmadogear(sd, flag); } if( HPMHooks.count.HP_pc_setmadogear_post ) { - void (*postHookFunc) (struct map_session_data *sd, bool *flag); + void (*postHookFunc) (struct map_session_data *sd, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setmadogear_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setmadogear_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -55197,11 +55311,11 @@ void HP_pc_setmadogear(struct map_session_data *sd, bool flag) { void HP_pc_setridingdragon(struct map_session_data *sd, unsigned int type) { int hIndex = 0; if( HPMHooks.count.HP_pc_setridingdragon_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *type); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingdragon_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setridingdragon_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55212,10 +55326,10 @@ void HP_pc_setridingdragon(struct map_session_data *sd, unsigned int type) { HPMHooks.source.pc.setridingdragon(sd, type); } if( HPMHooks.count.HP_pc_setridingdragon_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *type); + void (*postHookFunc) (struct map_session_data *sd, unsigned int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingdragon_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setridingdragon_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -55223,11 +55337,11 @@ void HP_pc_setridingdragon(struct map_session_data *sd, unsigned int type) { void HP_pc_setridingwug(struct map_session_data *sd, bool flag) { int hIndex = 0; if( HPMHooks.count.HP_pc_setridingwug_pre ) { - void (*preHookFunc) (struct map_session_data *sd, bool *flag); + void (*preHookFunc) (struct map_session_data **sd, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingwug_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setridingwug_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55238,10 +55352,10 @@ void HP_pc_setridingwug(struct map_session_data *sd, bool flag) { HPMHooks.source.pc.setridingwug(sd, flag); } if( HPMHooks.count.HP_pc_setridingwug_post ) { - void (*postHookFunc) (struct map_session_data *sd, bool *flag); + void (*postHookFunc) (struct map_session_data *sd, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setridingwug_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setridingwug_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -55250,11 +55364,11 @@ int HP_pc_changelook(struct map_session_data *sd, int type, int val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_changelook_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_changelook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_changelook_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &val); + retVal___ = preHookFunc(&sd, &type, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55265,10 +55379,10 @@ int HP_pc_changelook(struct map_session_data *sd, int type, int val) { retVal___ = HPMHooks.source.pc.changelook(sd, type, val); } if( HPMHooks.count.HP_pc_changelook_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_changelook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_changelook_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &val); + retVal___ = postHookFunc(retVal___, sd, type, val); } } return retVal___; @@ -55277,11 +55391,11 @@ int HP_pc_equiplookall(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_equiplookall_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_equiplookall_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_equiplookall_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55304,11 +55418,11 @@ int HP_pc_readparam(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_readparam_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readparam_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readparam_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55319,10 +55433,10 @@ int HP_pc_readparam(struct map_session_data *sd, int type) { retVal___ = HPMHooks.source.pc.readparam(sd, type); } if( HPMHooks.count.HP_pc_readparam_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readparam_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readparam_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -55331,11 +55445,11 @@ int HP_pc_setparam(struct map_session_data *sd, int type, int val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setparam_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setparam_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setparam_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &val); + retVal___ = preHookFunc(&sd, &type, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55346,10 +55460,10 @@ int HP_pc_setparam(struct map_session_data *sd, int type, int val) { retVal___ = HPMHooks.source.pc.setparam(sd, type, val); } if( HPMHooks.count.HP_pc_setparam_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setparam_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setparam_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &val); + retVal___ = postHookFunc(retVal___, sd, type, val); } } return retVal___; @@ -55358,11 +55472,11 @@ int HP_pc_readreg(struct map_session_data *sd, int64 reg) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_readreg_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int64 *reg); + int (*preHookFunc) (struct map_session_data **sd, int64 *reg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readreg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readreg_pre[hIndex].func; - retVal___ = preHookFunc(sd, ®); + retVal___ = preHookFunc(&sd, ®); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55373,10 +55487,10 @@ int HP_pc_readreg(struct map_session_data *sd, int64 reg) { retVal___ = HPMHooks.source.pc.readreg(sd, reg); } if( HPMHooks.count.HP_pc_readreg_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 *reg); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readreg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readreg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, ®); + retVal___ = postHookFunc(retVal___, sd, reg); } } return retVal___; @@ -55384,11 +55498,11 @@ int HP_pc_readreg(struct map_session_data *sd, int64 reg) { void HP_pc_setreg(struct map_session_data *sd, int64 reg, int val) { int hIndex = 0; if( HPMHooks.count.HP_pc_setreg_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int64 *reg, int *val); + void (*preHookFunc) (struct map_session_data **sd, int64 *reg, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setreg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setreg_pre[hIndex].func; - preHookFunc(sd, ®, &val); + preHookFunc(&sd, ®, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55399,10 +55513,10 @@ void HP_pc_setreg(struct map_session_data *sd, int64 reg, int val) { HPMHooks.source.pc.setreg(sd, reg, val); } if( HPMHooks.count.HP_pc_setreg_post ) { - void (*postHookFunc) (struct map_session_data *sd, int64 *reg, int *val); + void (*postHookFunc) (struct map_session_data *sd, int64 reg, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setreg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setreg_post[hIndex].func; - postHookFunc(sd, ®, &val); + postHookFunc(sd, reg, val); } } return; @@ -55411,11 +55525,11 @@ char* HP_pc_readregstr(struct map_session_data *sd, int64 reg) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_pc_readregstr_pre ) { - char* (*preHookFunc) (struct map_session_data *sd, int64 *reg); + char* (*preHookFunc) (struct map_session_data **sd, int64 *reg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregstr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readregstr_pre[hIndex].func; - retVal___ = preHookFunc(sd, ®); + retVal___ = preHookFunc(&sd, ®); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55426,10 +55540,10 @@ char* HP_pc_readregstr(struct map_session_data *sd, int64 reg) { retVal___ = HPMHooks.source.pc.readregstr(sd, reg); } if( HPMHooks.count.HP_pc_readregstr_post ) { - char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, int64 *reg); + char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, int64 reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregstr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readregstr_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, ®); + retVal___ = postHookFunc(retVal___, sd, reg); } } return retVal___; @@ -55437,11 +55551,11 @@ char* HP_pc_readregstr(struct map_session_data *sd, int64 reg) { void HP_pc_setregstr(struct map_session_data *sd, int64 reg, const char *str) { int hIndex = 0; if( HPMHooks.count.HP_pc_setregstr_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int64 *reg, const char *str); + void (*preHookFunc) (struct map_session_data **sd, int64 *reg, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregstr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setregstr_pre[hIndex].func; - preHookFunc(sd, ®, str); + preHookFunc(&sd, ®, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55452,10 +55566,10 @@ void HP_pc_setregstr(struct map_session_data *sd, int64 reg, const char *str) { HPMHooks.source.pc.setregstr(sd, reg, str); } if( HPMHooks.count.HP_pc_setregstr_post ) { - void (*postHookFunc) (struct map_session_data *sd, int64 *reg, const char *str); + void (*postHookFunc) (struct map_session_data *sd, int64 reg, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregstr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setregstr_post[hIndex].func; - postHookFunc(sd, ®, str); + postHookFunc(sd, reg, str); } } return; @@ -55464,11 +55578,11 @@ int HP_pc_readregistry(struct map_session_data *sd, int64 reg) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_readregistry_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int64 *reg); + int (*preHookFunc) (struct map_session_data **sd, int64 *reg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readregistry_pre[hIndex].func; - retVal___ = preHookFunc(sd, ®); + retVal___ = preHookFunc(&sd, ®); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55479,10 +55593,10 @@ int HP_pc_readregistry(struct map_session_data *sd, int64 reg) { retVal___ = HPMHooks.source.pc.readregistry(sd, reg); } if( HPMHooks.count.HP_pc_readregistry_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 *reg); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readregistry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, ®); + retVal___ = postHookFunc(retVal___, sd, reg); } } return retVal___; @@ -55491,11 +55605,11 @@ int HP_pc_setregistry(struct map_session_data *sd, int64 reg, int val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setregistry_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int64 *reg, int *val); + int (*preHookFunc) (struct map_session_data **sd, int64 *reg, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregistry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setregistry_pre[hIndex].func; - retVal___ = preHookFunc(sd, ®, &val); + retVal___ = preHookFunc(&sd, ®, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55506,10 +55620,10 @@ int HP_pc_setregistry(struct map_session_data *sd, int64 reg, int val) { retVal___ = HPMHooks.source.pc.setregistry(sd, reg, val); } if( HPMHooks.count.HP_pc_setregistry_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 *reg, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 reg, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregistry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setregistry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, ®, &val); + retVal___ = postHookFunc(retVal___, sd, reg, val); } } return retVal___; @@ -55518,11 +55632,11 @@ char* HP_pc_readregistry_str(struct map_session_data *sd, int64 reg) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_pc_readregistry_str_pre ) { - char* (*preHookFunc) (struct map_session_data *sd, int64 *reg); + char* (*preHookFunc) (struct map_session_data **sd, int64 *reg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readregistry_str_pre[hIndex].func; - retVal___ = preHookFunc(sd, ®); + retVal___ = preHookFunc(&sd, ®); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55533,10 +55647,10 @@ char* HP_pc_readregistry_str(struct map_session_data *sd, int64 reg) { retVal___ = HPMHooks.source.pc.readregistry_str(sd, reg); } if( HPMHooks.count.HP_pc_readregistry_str_post ) { - char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, int64 *reg); + char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, int64 reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readregistry_str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, ®); + retVal___ = postHookFunc(retVal___, sd, reg); } } return retVal___; @@ -55545,11 +55659,11 @@ int HP_pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *va int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setregistry_str_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int64 *reg, const char *val); + int (*preHookFunc) (struct map_session_data **sd, int64 *reg, const char **val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregistry_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setregistry_str_pre[hIndex].func; - retVal___ = preHookFunc(sd, ®, val); + retVal___ = preHookFunc(&sd, ®, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55560,10 +55674,10 @@ int HP_pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *va retVal___ = HPMHooks.source.pc.setregistry_str(sd, reg, val); } if( HPMHooks.count.HP_pc_setregistry_str_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 *reg, const char *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 reg, const char *val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregistry_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setregistry_str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, ®, val); + retVal___ = postHookFunc(retVal___, sd, reg, val); } } return retVal___; @@ -55572,11 +55686,11 @@ int HP_pc_addeventtimer(struct map_session_data *sd, int tick, const char *name) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_addeventtimer_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *tick, const char *name); + int (*preHookFunc) (struct map_session_data **sd, int *tick, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addeventtimer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_addeventtimer_pre[hIndex].func; - retVal___ = preHookFunc(sd, &tick, name); + retVal___ = preHookFunc(&sd, &tick, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55587,10 +55701,10 @@ int HP_pc_addeventtimer(struct map_session_data *sd, int tick, const char *name) retVal___ = HPMHooks.source.pc.addeventtimer(sd, tick, name); } if( HPMHooks.count.HP_pc_addeventtimer_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *tick, const char *name); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int tick, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addeventtimer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_addeventtimer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &tick, name); + retVal___ = postHookFunc(retVal___, sd, tick, name); } } return retVal___; @@ -55599,11 +55713,11 @@ int HP_pc_deleventtimer(struct map_session_data *sd, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_deleventtimer_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *name); + int (*preHookFunc) (struct map_session_data **sd, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_deleventtimer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_deleventtimer_pre[hIndex].func; - retVal___ = preHookFunc(sd, name); + retVal___ = preHookFunc(&sd, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55626,11 +55740,11 @@ int HP_pc_cleareventtimer(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_cleareventtimer_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_cleareventtimer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_cleareventtimer_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55653,11 +55767,11 @@ int HP_pc_addeventtimercount(struct map_session_data *sd, const char *name, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_addeventtimercount_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *name, int *tick); + int (*preHookFunc) (struct map_session_data **sd, const char **name, int *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addeventtimercount_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_addeventtimercount_pre[hIndex].func; - retVal___ = preHookFunc(sd, name, &tick); + retVal___ = preHookFunc(&sd, &name, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55668,10 +55782,10 @@ int HP_pc_addeventtimercount(struct map_session_data *sd, const char *name, int retVal___ = HPMHooks.source.pc.addeventtimercount(sd, name, tick); } if( HPMHooks.count.HP_pc_addeventtimercount_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name, int *tick); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name, int tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addeventtimercount_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_addeventtimercount_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, name, &tick); + retVal___ = postHookFunc(retVal___, sd, name, tick); } } return retVal___; @@ -55680,11 +55794,11 @@ int HP_pc_calc_pvprank(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_calc_pvprank_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_calc_pvprank_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_calc_pvprank_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55722,10 +55836,10 @@ int HP_pc_calc_pvprank_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.calc_pvprank_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_calc_pvprank_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_calc_pvprank_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_calc_pvprank_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -55734,11 +55848,11 @@ int HP_pc_ismarried(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_ismarried_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_ismarried_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_ismarried_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55761,11 +55875,11 @@ int HP_pc_marriage(struct map_session_data *sd, struct map_session_data *dstsd) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_marriage_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct map_session_data *dstsd); + int (*preHookFunc) (struct map_session_data **sd, struct map_session_data **dstsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_marriage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_marriage_pre[hIndex].func; - retVal___ = preHookFunc(sd, dstsd); + retVal___ = preHookFunc(&sd, &dstsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55788,11 +55902,11 @@ int HP_pc_divorce(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_divorce_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_divorce_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_divorce_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55815,11 +55929,11 @@ struct map_session_data* HP_pc_get_partner(struct map_session_data *sd) { int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_pc_get_partner_pre ) { - struct map_session_data* (*preHookFunc) (struct map_session_data *sd); + struct map_session_data* (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_partner_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_get_partner_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55842,11 +55956,11 @@ struct map_session_data* HP_pc_get_father(struct map_session_data *sd) { int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_pc_get_father_pre ) { - struct map_session_data* (*preHookFunc) (struct map_session_data *sd); + struct map_session_data* (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_father_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_get_father_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55869,11 +55983,11 @@ struct map_session_data* HP_pc_get_mother(struct map_session_data *sd) { int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_pc_get_mother_pre ) { - struct map_session_data* (*preHookFunc) (struct map_session_data *sd); + struct map_session_data* (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_mother_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_get_mother_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55896,11 +56010,11 @@ struct map_session_data* HP_pc_get_child(struct map_session_data *sd) { int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_pc_get_child_pre ) { - struct map_session_data* (*preHookFunc) (struct map_session_data *sd); + struct map_session_data* (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_child_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_get_child_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55922,11 +56036,11 @@ struct map_session_data* HP_pc_get_child(struct map_session_data *sd) { void HP_pc_bleeding(struct map_session_data *sd, unsigned int diff_tick) { int hIndex = 0; if( HPMHooks.count.HP_pc_bleeding_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *diff_tick); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *diff_tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bleeding_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bleeding_pre[hIndex].func; - preHookFunc(sd, &diff_tick); + preHookFunc(&sd, &diff_tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55937,10 +56051,10 @@ void HP_pc_bleeding(struct map_session_data *sd, unsigned int diff_tick) { HPMHooks.source.pc.bleeding(sd, diff_tick); } if( HPMHooks.count.HP_pc_bleeding_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *diff_tick); + void (*postHookFunc) (struct map_session_data *sd, unsigned int diff_tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bleeding_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bleeding_post[hIndex].func; - postHookFunc(sd, &diff_tick); + postHookFunc(sd, diff_tick); } } return; @@ -55948,11 +56062,11 @@ void HP_pc_bleeding(struct map_session_data *sd, unsigned int diff_tick) { void HP_pc_regen(struct map_session_data *sd, unsigned int diff_tick) { int hIndex = 0; if( HPMHooks.count.HP_pc_regen_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *diff_tick); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *diff_tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_regen_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_regen_pre[hIndex].func; - preHookFunc(sd, &diff_tick); + preHookFunc(&sd, &diff_tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -55963,10 +56077,10 @@ void HP_pc_regen(struct map_session_data *sd, unsigned int diff_tick) { HPMHooks.source.pc.regen(sd, diff_tick); } if( HPMHooks.count.HP_pc_regen_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *diff_tick); + void (*postHookFunc) (struct map_session_data *sd, unsigned int diff_tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_regen_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_regen_post[hIndex].func; - postHookFunc(sd, &diff_tick); + postHookFunc(sd, diff_tick); } } return; @@ -55974,11 +56088,11 @@ void HP_pc_regen(struct map_session_data *sd, unsigned int diff_tick) { void HP_pc_setstand(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_setstand_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setstand_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setstand_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56001,11 +56115,11 @@ int HP_pc_candrop(struct map_session_data *sd, struct item *item) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_candrop_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct item *item); + int (*preHookFunc) (struct map_session_data **sd, struct item **item); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_candrop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_candrop_pre[hIndex].func; - retVal___ = preHookFunc(sd, item); + retVal___ = preHookFunc(&sd, &item); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56043,10 +56157,10 @@ int HP_pc_jobid2mapid(unsigned short b_class) { retVal___ = HPMHooks.source.pc.jobid2mapid(b_class); } if( HPMHooks.count.HP_pc_jobid2mapid_post ) { - int (*postHookFunc) (int retVal___, unsigned short *b_class); + int (*postHookFunc) (int retVal___, unsigned short b_class); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_jobid2mapid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_jobid2mapid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &b_class); + retVal___ = postHookFunc(retVal___, b_class); } } return retVal___; @@ -56070,10 +56184,10 @@ int HP_pc_mapid2jobid(unsigned short class_, int sex) { retVal___ = HPMHooks.source.pc.mapid2jobid(class_, sex); } if( HPMHooks.count.HP_pc_mapid2jobid_post ) { - int (*postHookFunc) (int retVal___, unsigned short *class_, int *sex); + int (*postHookFunc) (int retVal___, unsigned short class_, int sex); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_mapid2jobid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_mapid2jobid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_, &sex); + retVal___ = postHookFunc(retVal___, class_, sex); } } return retVal___; @@ -56097,10 +56211,10 @@ const char* HP_pc_job_name(int class_) { retVal___ = HPMHooks.source.pc.job_name(class_); } if( HPMHooks.count.HP_pc_job_name_post ) { - const char* (*postHookFunc) (const char* retVal___, int *class_); + const char* (*postHookFunc) (const char* retVal___, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_job_name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_job_name_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -56108,11 +56222,11 @@ const char* HP_pc_job_name(int class_) { void HP_pc_setinvincibletimer(struct map_session_data *sd, int val) { int hIndex = 0; if( HPMHooks.count.HP_pc_setinvincibletimer_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *val); + void (*preHookFunc) (struct map_session_data **sd, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setinvincibletimer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setinvincibletimer_pre[hIndex].func; - preHookFunc(sd, &val); + preHookFunc(&sd, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56123,10 +56237,10 @@ void HP_pc_setinvincibletimer(struct map_session_data *sd, int val) { HPMHooks.source.pc.setinvincibletimer(sd, val); } if( HPMHooks.count.HP_pc_setinvincibletimer_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *val); + void (*postHookFunc) (struct map_session_data *sd, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setinvincibletimer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setinvincibletimer_post[hIndex].func; - postHookFunc(sd, &val); + postHookFunc(sd, val); } } return; @@ -56134,11 +56248,11 @@ void HP_pc_setinvincibletimer(struct map_session_data *sd, int val) { void HP_pc_delinvincibletimer(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_delinvincibletimer_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_delinvincibletimer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_delinvincibletimer_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56161,11 +56275,11 @@ int HP_pc_addspiritball(struct map_session_data *sd, int interval, int max) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_addspiritball_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *interval, int *max); + int (*preHookFunc) (struct map_session_data **sd, int *interval, int *max); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addspiritball_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_addspiritball_pre[hIndex].func; - retVal___ = preHookFunc(sd, &interval, &max); + retVal___ = preHookFunc(&sd, &interval, &max); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56176,10 +56290,10 @@ int HP_pc_addspiritball(struct map_session_data *sd, int interval, int max) { retVal___ = HPMHooks.source.pc.addspiritball(sd, interval, max); } if( HPMHooks.count.HP_pc_addspiritball_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *interval, int *max); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int interval, int max); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addspiritball_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_addspiritball_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &interval, &max); + retVal___ = postHookFunc(retVal___, sd, interval, max); } } return retVal___; @@ -56188,11 +56302,11 @@ int HP_pc_delspiritball(struct map_session_data *sd, int count, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_delspiritball_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *count, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *count, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_delspiritball_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_delspiritball_pre[hIndex].func; - retVal___ = preHookFunc(sd, &count, &type); + retVal___ = preHookFunc(&sd, &count, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56203,10 +56317,10 @@ int HP_pc_delspiritball(struct map_session_data *sd, int count, int type) { retVal___ = HPMHooks.source.pc.delspiritball(sd, count, type); } if( HPMHooks.count.HP_pc_delspiritball_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *count, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int count, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_delspiritball_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_delspiritball_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &count, &type); + retVal___ = postHookFunc(retVal___, sd, count, type); } } return retVal___; @@ -56215,11 +56329,11 @@ int HP_pc_getmaxspiritball(struct map_session_data *sd, int min) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_getmaxspiritball_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *min); + int (*preHookFunc) (struct map_session_data **sd, int *min); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getmaxspiritball_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_getmaxspiritball_pre[hIndex].func; - retVal___ = preHookFunc(sd, &min); + retVal___ = preHookFunc(&sd, &min); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56230,10 +56344,10 @@ int HP_pc_getmaxspiritball(struct map_session_data *sd, int min) { retVal___ = HPMHooks.source.pc.getmaxspiritball(sd, min); } if( HPMHooks.count.HP_pc_getmaxspiritball_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *min); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int min); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getmaxspiritball_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_getmaxspiritball_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &min); + retVal___ = postHookFunc(retVal___, sd, min); } } return retVal___; @@ -56241,11 +56355,11 @@ int HP_pc_getmaxspiritball(struct map_session_data *sd, int min) { void HP_pc_addfame(struct map_session_data *sd, int count) { int hIndex = 0; if( HPMHooks.count.HP_pc_addfame_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *count); + void (*preHookFunc) (struct map_session_data **sd, int *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addfame_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_addfame_pre[hIndex].func; - preHookFunc(sd, &count); + preHookFunc(&sd, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56256,10 +56370,10 @@ void HP_pc_addfame(struct map_session_data *sd, int count) { HPMHooks.source.pc.addfame(sd, count); } if( HPMHooks.count.HP_pc_addfame_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *count); + void (*postHookFunc) (struct map_session_data *sd, int count); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_addfame_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_addfame_post[hIndex].func; - postHookFunc(sd, &count); + postHookFunc(sd, count); } } return; @@ -56283,10 +56397,10 @@ unsigned char HP_pc_famerank(int char_id, int job) { retVal___ = HPMHooks.source.pc.famerank(char_id, job); } if( HPMHooks.count.HP_pc_famerank_post ) { - unsigned char (*postHookFunc) (unsigned char retVal___, int *char_id, int *job); + unsigned char (*postHookFunc) (unsigned char retVal___, int char_id, int job); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_famerank_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_famerank_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &char_id, &job); + retVal___ = postHookFunc(retVal___, char_id, job); } } return retVal___; @@ -56295,11 +56409,11 @@ int HP_pc_set_hate_mob(struct map_session_data *sd, int pos, struct block_list * int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_set_hate_mob_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *pos, struct block_list *bl); + int (*preHookFunc) (struct map_session_data **sd, int *pos, struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_set_hate_mob_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_set_hate_mob_pre[hIndex].func; - retVal___ = preHookFunc(sd, &pos, bl); + retVal___ = preHookFunc(&sd, &pos, &bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56310,10 +56424,10 @@ int HP_pc_set_hate_mob(struct map_session_data *sd, int pos, struct block_list * retVal___ = HPMHooks.source.pc.set_hate_mob(sd, pos, bl); } if( HPMHooks.count.HP_pc_set_hate_mob_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *pos, struct block_list *bl); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int pos, struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_set_hate_mob_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_set_hate_mob_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &pos, bl); + retVal___ = postHookFunc(retVal___, sd, pos, bl); } } return retVal___; @@ -56364,10 +56478,10 @@ int HP_pc_map_day_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.map_day_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_map_day_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_map_day_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_map_day_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -56391,10 +56505,10 @@ int HP_pc_map_night_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.map_night_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_map_night_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_map_night_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_map_night_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -56402,11 +56516,11 @@ int HP_pc_map_night_timer(int tid, int64 tick, int id, intptr_t data) { void HP_pc_inventory_rentals(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_inventory_rentals_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_inventory_rentals_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_inventory_rentals_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56429,11 +56543,11 @@ int HP_pc_inventory_rental_clear(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_inventory_rental_clear_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_inventory_rental_clear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_inventory_rental_clear_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56455,11 +56569,11 @@ int HP_pc_inventory_rental_clear(struct map_session_data *sd) { void HP_pc_inventory_rental_add(struct map_session_data *sd, int seconds) { int hIndex = 0; if( HPMHooks.count.HP_pc_inventory_rental_add_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *seconds); + void (*preHookFunc) (struct map_session_data **sd, int *seconds); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_inventory_rental_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_inventory_rental_add_pre[hIndex].func; - preHookFunc(sd, &seconds); + preHookFunc(&sd, &seconds); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56470,10 +56584,10 @@ void HP_pc_inventory_rental_add(struct map_session_data *sd, int seconds) { HPMHooks.source.pc.inventory_rental_add(sd, seconds); } if( HPMHooks.count.HP_pc_inventory_rental_add_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *seconds); + void (*postHookFunc) (struct map_session_data *sd, int seconds); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_inventory_rental_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_inventory_rental_add_post[hIndex].func; - postHookFunc(sd, &seconds); + postHookFunc(sd, seconds); } } return; @@ -56482,11 +56596,11 @@ int HP_pc_disguise(struct map_session_data *sd, int class_) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_disguise_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *class_); + int (*preHookFunc) (struct map_session_data **sd, int *class_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_disguise_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_disguise_pre[hIndex].func; - retVal___ = preHookFunc(sd, &class_); + retVal___ = preHookFunc(&sd, &class_); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56497,10 +56611,10 @@ int HP_pc_disguise(struct map_session_data *sd, int class_) { retVal___ = HPMHooks.source.pc.disguise(sd, class_); } if( HPMHooks.count.HP_pc_disguise_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *class_); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_disguise_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_disguise_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &class_); + retVal___ = postHookFunc(retVal___, sd, class_); } } return retVal___; @@ -56509,11 +56623,11 @@ bool HP_pc_isautolooting(struct map_session_data *sd, int nameid) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_isautolooting_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *nameid); + bool (*preHookFunc) (struct map_session_data **sd, int *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_isautolooting_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_isautolooting_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid); + retVal___ = preHookFunc(&sd, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56524,10 +56638,10 @@ bool HP_pc_isautolooting(struct map_session_data *sd, int nameid) { retVal___ = HPMHooks.source.pc.isautolooting(sd, nameid); } if( HPMHooks.count.HP_pc_isautolooting_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *nameid); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_isautolooting_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_isautolooting_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid); + retVal___ = postHookFunc(retVal___, sd, nameid); } } return retVal___; @@ -56535,11 +56649,11 @@ bool HP_pc_isautolooting(struct map_session_data *sd, int nameid) { void HP_pc_overheat(struct map_session_data *sd, int val) { int hIndex = 0; if( HPMHooks.count.HP_pc_overheat_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *val); + void (*preHookFunc) (struct map_session_data **sd, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_overheat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_overheat_pre[hIndex].func; - preHookFunc(sd, &val); + preHookFunc(&sd, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56550,10 +56664,10 @@ void HP_pc_overheat(struct map_session_data *sd, int val) { HPMHooks.source.pc.overheat(sd, val); } if( HPMHooks.count.HP_pc_overheat_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *val); + void (*postHookFunc) (struct map_session_data *sd, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_overheat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_overheat_post[hIndex].func; - postHookFunc(sd, &val); + postHookFunc(sd, val); } } return; @@ -56562,11 +56676,11 @@ int HP_pc_banding(struct map_session_data *sd, uint16 skill_lv) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_banding_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_lv); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_banding_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_banding_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_lv); + retVal___ = preHookFunc(&sd, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56577,10 +56691,10 @@ int HP_pc_banding(struct map_session_data *sd, uint16 skill_lv) { retVal___ = HPMHooks.source.pc.banding(sd, skill_lv); } if( HPMHooks.count.HP_pc_banding_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_banding_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_banding_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_lv); + retVal___ = postHookFunc(retVal___, sd, skill_lv); } } return retVal___; @@ -56588,11 +56702,11 @@ int HP_pc_banding(struct map_session_data *sd, uint16 skill_lv) { void HP_pc_itemcd_do(struct map_session_data *sd, bool load) { int hIndex = 0; if( HPMHooks.count.HP_pc_itemcd_do_pre ) { - void (*preHookFunc) (struct map_session_data *sd, bool *load); + void (*preHookFunc) (struct map_session_data **sd, bool *load); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_itemcd_do_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_itemcd_do_pre[hIndex].func; - preHookFunc(sd, &load); + preHookFunc(&sd, &load); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56603,10 +56717,10 @@ void HP_pc_itemcd_do(struct map_session_data *sd, bool load) { HPMHooks.source.pc.itemcd_do(sd, load); } if( HPMHooks.count.HP_pc_itemcd_do_post ) { - void (*postHookFunc) (struct map_session_data *sd, bool *load); + void (*postHookFunc) (struct map_session_data *sd, bool load); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_itemcd_do_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_itemcd_do_post[hIndex].func; - postHookFunc(sd, &load); + postHookFunc(sd, load); } } return; @@ -56615,11 +56729,11 @@ int HP_pc_load_combo(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_load_combo_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_load_combo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_load_combo_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56641,11 +56755,11 @@ int HP_pc_load_combo(struct map_session_data *sd) { void HP_pc_add_charm(struct map_session_data *sd, int interval, int max, int type) { int hIndex = 0; if( HPMHooks.count.HP_pc_add_charm_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *interval, int *max, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *interval, int *max, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_add_charm_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_add_charm_pre[hIndex].func; - preHookFunc(sd, &interval, &max, &type); + preHookFunc(&sd, &interval, &max, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56656,10 +56770,10 @@ void HP_pc_add_charm(struct map_session_data *sd, int interval, int max, int typ HPMHooks.source.pc.add_charm(sd, interval, max, type); } if( HPMHooks.count.HP_pc_add_charm_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *interval, int *max, int *type); + void (*postHookFunc) (struct map_session_data *sd, int interval, int max, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_add_charm_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_add_charm_post[hIndex].func; - postHookFunc(sd, &interval, &max, &type); + postHookFunc(sd, interval, max, type); } } return; @@ -56667,11 +56781,11 @@ void HP_pc_add_charm(struct map_session_data *sd, int interval, int max, int typ void HP_pc_del_charm(struct map_session_data *sd, int count, int type) { int hIndex = 0; if( HPMHooks.count.HP_pc_del_charm_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *count, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *count, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_del_charm_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_del_charm_pre[hIndex].func; - preHookFunc(sd, &count, &type); + preHookFunc(&sd, &count, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56682,10 +56796,10 @@ void HP_pc_del_charm(struct map_session_data *sd, int count, int type) { HPMHooks.source.pc.del_charm(sd, count, type); } if( HPMHooks.count.HP_pc_del_charm_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *count, int *type); + void (*postHookFunc) (struct map_session_data *sd, int count, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_del_charm_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_del_charm_post[hIndex].func; - postHookFunc(sd, &count, &type); + postHookFunc(sd, count, type); } } return; @@ -56693,11 +56807,11 @@ void HP_pc_del_charm(struct map_session_data *sd, int count, int type) { void HP_pc_baselevelchanged(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_baselevelchanged_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_baselevelchanged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_baselevelchanged_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56735,10 +56849,10 @@ int HP_pc_level_penalty_mod(int diff, unsigned char race, uint32 mode, int type) retVal___ = HPMHooks.source.pc.level_penalty_mod(diff, race, mode, type); } if( HPMHooks.count.HP_pc_level_penalty_mod_post ) { - int (*postHookFunc) (int retVal___, int *diff, unsigned char *race, uint32 *mode, int *type); + int (*postHookFunc) (int retVal___, int diff, unsigned char race, uint32 mode, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_level_penalty_mod_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_level_penalty_mod_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &diff, &race, &mode, &type); + retVal___ = postHookFunc(retVal___, diff, race, mode, type); } } return retVal___; @@ -56747,11 +56861,11 @@ int HP_pc_calc_skillpoint(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_calc_skillpoint_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_calc_skillpoint_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_calc_skillpoint_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56789,10 +56903,10 @@ int HP_pc_invincible_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.invincible_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_invincible_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_invincible_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_invincible_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -56816,10 +56930,10 @@ int HP_pc_spiritball_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.spiritball_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_spiritball_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_spiritball_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_spiritball_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -56828,12 +56942,12 @@ int HP_pc_check_banding(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_check_banding_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_check_banding_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_pc_check_banding_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -56876,10 +56990,10 @@ int HP_pc_inventory_rental_end(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.inventory_rental_end(tid, tick, id, data); } if( HPMHooks.count.HP_pc_inventory_rental_end_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_inventory_rental_end_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_inventory_rental_end_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -56887,11 +57001,11 @@ int HP_pc_inventory_rental_end(int tid, int64 tick, int id, intptr_t data) { void HP_pc_check_skilltree(struct map_session_data *sd, int skill_id) { int hIndex = 0; if( HPMHooks.count.HP_pc_check_skilltree_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *skill_id); + void (*preHookFunc) (struct map_session_data **sd, int *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_check_skilltree_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_check_skilltree_pre[hIndex].func; - preHookFunc(sd, &skill_id); + preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56902,10 +57016,10 @@ void HP_pc_check_skilltree(struct map_session_data *sd, int skill_id) { HPMHooks.source.pc.check_skilltree(sd, skill_id); } if( HPMHooks.count.HP_pc_check_skilltree_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *skill_id); + void (*postHookFunc) (struct map_session_data *sd, int skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_check_skilltree_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_check_skilltree_post[hIndex].func; - postHookFunc(sd, &skill_id); + postHookFunc(sd, skill_id); } } return; @@ -56914,11 +57028,11 @@ int HP_pc_bonus_autospell(struct s_autospell *spell, int max, short id, short lv int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus_autospell_pre ) { - int (*preHookFunc) (struct s_autospell *spell, int *max, short *id, short *lv, short *rate, short *flag, short *card_id); + int (*preHookFunc) (struct s_autospell **spell, int *max, short *id, short *lv, short *rate, short *flag, short *card_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_autospell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus_autospell_pre[hIndex].func; - retVal___ = preHookFunc(spell, &max, &id, &lv, &rate, &flag, &card_id); + retVal___ = preHookFunc(&spell, &max, &id, &lv, &rate, &flag, &card_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56929,10 +57043,10 @@ int HP_pc_bonus_autospell(struct s_autospell *spell, int max, short id, short lv retVal___ = HPMHooks.source.pc.bonus_autospell(spell, max, id, lv, rate, flag, card_id); } if( HPMHooks.count.HP_pc_bonus_autospell_post ) { - int (*postHookFunc) (int retVal___, struct s_autospell *spell, int *max, short *id, short *lv, short *rate, short *flag, short *card_id); + int (*postHookFunc) (int retVal___, struct s_autospell *spell, int max, short id, short lv, short rate, short flag, short card_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_autospell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus_autospell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, spell, &max, &id, &lv, &rate, &flag, &card_id); + retVal___ = postHookFunc(retVal___, spell, max, id, lv, rate, flag, card_id); } } return retVal___; @@ -56941,11 +57055,11 @@ int HP_pc_bonus_autospell_onskill(struct s_autospell *spell, int max, short src_ int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus_autospell_onskill_pre ) { - int (*preHookFunc) (struct s_autospell *spell, int *max, short *src_skill, short *id, short *lv, short *rate, short *card_id); + int (*preHookFunc) (struct s_autospell **spell, int *max, short *src_skill, short *id, short *lv, short *rate, short *card_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_autospell_onskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus_autospell_onskill_pre[hIndex].func; - retVal___ = preHookFunc(spell, &max, &src_skill, &id, &lv, &rate, &card_id); + retVal___ = preHookFunc(&spell, &max, &src_skill, &id, &lv, &rate, &card_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56956,10 +57070,10 @@ int HP_pc_bonus_autospell_onskill(struct s_autospell *spell, int max, short src_ retVal___ = HPMHooks.source.pc.bonus_autospell_onskill(spell, max, src_skill, id, lv, rate, card_id); } if( HPMHooks.count.HP_pc_bonus_autospell_onskill_post ) { - int (*postHookFunc) (int retVal___, struct s_autospell *spell, int *max, short *src_skill, short *id, short *lv, short *rate, short *card_id); + int (*postHookFunc) (int retVal___, struct s_autospell *spell, int max, short src_skill, short id, short lv, short rate, short card_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_autospell_onskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus_autospell_onskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, spell, &max, &src_skill, &id, &lv, &rate, &card_id); + retVal___ = postHookFunc(retVal___, spell, max, src_skill, id, lv, rate, card_id); } } return retVal___; @@ -56968,11 +57082,11 @@ int HP_pc_bonus_addeff(struct s_addeffect *effect, int max, enum sc_type id, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus_addeff_pre ) { - int (*preHookFunc) (struct s_addeffect *effect, int *max, enum sc_type *id, int16 *rate, int16 *arrow_rate, uint8 *flag, uint16 *duration); + int (*preHookFunc) (struct s_addeffect **effect, int *max, enum sc_type *id, int16 *rate, int16 *arrow_rate, uint8 *flag, uint16 *duration); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_addeff_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus_addeff_pre[hIndex].func; - retVal___ = preHookFunc(effect, &max, &id, &rate, &arrow_rate, &flag, &duration); + retVal___ = preHookFunc(&effect, &max, &id, &rate, &arrow_rate, &flag, &duration); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56983,10 +57097,10 @@ int HP_pc_bonus_addeff(struct s_addeffect *effect, int max, enum sc_type id, int retVal___ = HPMHooks.source.pc.bonus_addeff(effect, max, id, rate, arrow_rate, flag, duration); } if( HPMHooks.count.HP_pc_bonus_addeff_post ) { - int (*postHookFunc) (int retVal___, struct s_addeffect *effect, int *max, enum sc_type *id, int16 *rate, int16 *arrow_rate, uint8 *flag, uint16 *duration); + int (*postHookFunc) (int retVal___, struct s_addeffect *effect, int max, enum sc_type id, int16 rate, int16 arrow_rate, uint8 flag, uint16 duration); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_addeff_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus_addeff_post[hIndex].func; - retVal___ = postHookFunc(retVal___, effect, &max, &id, &rate, &arrow_rate, &flag, &duration); + retVal___ = postHookFunc(retVal___, effect, max, id, rate, arrow_rate, flag, duration); } } return retVal___; @@ -56995,11 +57109,11 @@ int HP_pc_bonus_addeff_onskill(struct s_addeffectonskill *effect, int max, enum int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus_addeff_onskill_pre ) { - int (*preHookFunc) (struct s_addeffectonskill *effect, int *max, enum sc_type *id, short *rate, short *skill_id, unsigned char *target); + int (*preHookFunc) (struct s_addeffectonskill **effect, int *max, enum sc_type *id, short *rate, short *skill_id, unsigned char *target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_addeff_onskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus_addeff_onskill_pre[hIndex].func; - retVal___ = preHookFunc(effect, &max, &id, &rate, &skill_id, &target); + retVal___ = preHookFunc(&effect, &max, &id, &rate, &skill_id, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57010,10 +57124,10 @@ int HP_pc_bonus_addeff_onskill(struct s_addeffectonskill *effect, int max, enum retVal___ = HPMHooks.source.pc.bonus_addeff_onskill(effect, max, id, rate, skill_id, target); } if( HPMHooks.count.HP_pc_bonus_addeff_onskill_post ) { - int (*postHookFunc) (int retVal___, struct s_addeffectonskill *effect, int *max, enum sc_type *id, short *rate, short *skill_id, unsigned char *target); + int (*postHookFunc) (int retVal___, struct s_addeffectonskill *effect, int max, enum sc_type id, short rate, short skill_id, unsigned char target); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_addeff_onskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus_addeff_onskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, effect, &max, &id, &rate, &skill_id, &target); + retVal___ = postHookFunc(retVal___, effect, max, id, rate, skill_id, target); } } return retVal___; @@ -57022,11 +57136,11 @@ int HP_pc_bonus_item_drop(struct s_add_drop *drop, const short max, short id, sh int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_bonus_item_drop_pre ) { - int (*preHookFunc) (struct s_add_drop *drop, const short *max, short *id, short *group, int *race, int *rate); + int (*preHookFunc) (struct s_add_drop **drop, const short *max, short *id, short *group, int *race, int *rate); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_item_drop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bonus_item_drop_pre[hIndex].func; - retVal___ = preHookFunc(drop, &max, &id, &group, &race, &rate); + retVal___ = preHookFunc(&drop, &max, &id, &group, &race, &rate); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57037,10 +57151,10 @@ int HP_pc_bonus_item_drop(struct s_add_drop *drop, const short max, short id, sh retVal___ = HPMHooks.source.pc.bonus_item_drop(drop, max, id, group, race, rate); } if( HPMHooks.count.HP_pc_bonus_item_drop_post ) { - int (*postHookFunc) (int retVal___, struct s_add_drop *drop, const short *max, short *id, short *group, int *race, int *rate); + int (*postHookFunc) (int retVal___, struct s_add_drop *drop, const short max, short id, short group, int race, int rate); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bonus_item_drop_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bonus_item_drop_post[hIndex].func; - retVal___ = postHookFunc(retVal___, drop, &max, &id, &group, &race, &rate); + retVal___ = postHookFunc(retVal___, drop, max, id, group, race, rate); } } return retVal___; @@ -57048,11 +57162,11 @@ int HP_pc_bonus_item_drop(struct s_add_drop *drop, const short max, short id, sh void HP_pc_calcexp(struct map_session_data *sd, unsigned int *base_exp, unsigned int *job_exp, struct block_list *src) { int hIndex = 0; if( HPMHooks.count.HP_pc_calcexp_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *base_exp, unsigned int *job_exp, struct block_list *src); + void (*preHookFunc) (struct map_session_data **sd, unsigned int **base_exp, unsigned int **job_exp, struct block_list **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_calcexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_calcexp_pre[hIndex].func; - preHookFunc(sd, base_exp, job_exp, src); + preHookFunc(&sd, &base_exp, &job_exp, &src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57090,10 +57204,10 @@ int HP_pc_respawn_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.respawn_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_respawn_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_respawn_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_respawn_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -57102,12 +57216,12 @@ int HP_pc_jobchange_killclone(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_jobchange_killclone_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_jobchange_killclone_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_pc_jobchange_killclone_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -57135,11 +57249,11 @@ int HP_pc_getstat(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_getstat_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getstat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_getstat_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57150,10 +57264,10 @@ int HP_pc_getstat(struct map_session_data *sd, int type) { retVal___ = HPMHooks.source.pc.getstat(sd, type); } if( HPMHooks.count.HP_pc_getstat_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_getstat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_getstat_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -57162,11 +57276,11 @@ int HP_pc_setstat(struct map_session_data *sd, int type, int val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setstat_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, int *val); + int (*preHookFunc) (struct map_session_data **sd, int *type, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setstat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setstat_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type, &val); + retVal___ = preHookFunc(&sd, &type, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57177,10 +57291,10 @@ int HP_pc_setstat(struct map_session_data *sd, int type, int val) { retVal___ = HPMHooks.source.pc.setstat(sd, type, val); } if( HPMHooks.count.HP_pc_setstat_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, int *val); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setstat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setstat_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type, &val); + retVal___ = postHookFunc(retVal___, sd, type, val); } } return retVal___; @@ -57204,10 +57318,10 @@ int HP_pc_eventtimer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.eventtimer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_eventtimer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_eventtimer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_eventtimer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -57216,12 +57330,12 @@ int HP_pc_daynight_timer_sub(struct map_session_data *sd, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_daynight_timer_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, va_list ap); + int (*preHookFunc) (struct map_session_data **sd, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_daynight_timer_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_pc_daynight_timer_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, ap___copy); + retVal___ = preHookFunc(&sd, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -57264,10 +57378,10 @@ int HP_pc_charm_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.charm_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_charm_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_charm_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_charm_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -57276,11 +57390,11 @@ bool HP_pc_readdb_levelpenalty(char *fields[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_readdb_levelpenalty_pre ) { - bool (*preHookFunc) (char *fields[], int *columns, int *current); + bool (*preHookFunc) (char **fields[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readdb_levelpenalty_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readdb_levelpenalty_pre[hIndex].func; - retVal___ = preHookFunc(fields, &columns, ¤t); + retVal___ = preHookFunc(&fields, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57291,10 +57405,10 @@ bool HP_pc_readdb_levelpenalty(char *fields[], int columns, int current) { retVal___ = HPMHooks.source.pc.readdb_levelpenalty(fields, columns, current); } if( HPMHooks.count.HP_pc_readdb_levelpenalty_post ) { - bool (*postHookFunc) (bool retVal___, char *fields[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *fields[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readdb_levelpenalty_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readdb_levelpenalty_post[hIndex].func; - retVal___ = postHookFunc(retVal___, fields, &columns, ¤t); + retVal___ = postHookFunc(retVal___, fields, columns, current); } } return retVal___; @@ -57318,10 +57432,10 @@ int HP_pc_autosave(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.autosave(tid, tick, id, data); } if( HPMHooks.count.HP_pc_autosave_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autosave_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_autosave_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -57345,10 +57459,10 @@ int HP_pc_follow_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.follow_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_follow_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_follow_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_follow_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -57409,11 +57523,11 @@ int HP_pc_isUseitem(struct map_session_data *sd, int n) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_isUseitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n); + int (*preHookFunc) (struct map_session_data **sd, int *n); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_isUseitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_isUseitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n); + retVal___ = preHookFunc(&sd, &n); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57424,10 +57538,10 @@ int HP_pc_isUseitem(struct map_session_data *sd, int n) { retVal___ = HPMHooks.source.pc.isUseitem(sd, n); } if( HPMHooks.count.HP_pc_isUseitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_isUseitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_isUseitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n); + retVal___ = postHookFunc(retVal___, sd, n); } } return retVal___; @@ -57436,12 +57550,12 @@ int HP_pc_show_steal(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_show_steal_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_show_steal_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_pc_show_steal_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -57469,11 +57583,11 @@ int HP_pc_checkcombo(struct map_session_data *sd, struct item_data *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_checkcombo_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct item_data *data); + int (*preHookFunc) (struct map_session_data **sd, struct item_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_checkcombo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_checkcombo_pre[hIndex].func; - retVal___ = preHookFunc(sd, data); + retVal___ = preHookFunc(&sd, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57496,11 +57610,11 @@ int HP_pc_calcweapontype(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_calcweapontype_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_calcweapontype_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_calcweapontype_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57523,11 +57637,11 @@ int HP_pc_removecombo(struct map_session_data *sd, struct item_data *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_removecombo_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct item_data *data); + int (*preHookFunc) (struct map_session_data **sd, struct item_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_removecombo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_removecombo_pre[hIndex].func; - retVal___ = preHookFunc(sd, data); + retVal___ = preHookFunc(&sd, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57549,11 +57663,11 @@ int HP_pc_removecombo(struct map_session_data *sd, struct item_data *data) { void HP_pc_bank_deposit(struct map_session_data *sd, int money) { int hIndex = 0; if( HPMHooks.count.HP_pc_bank_deposit_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *money); + void (*preHookFunc) (struct map_session_data **sd, int *money); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_deposit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bank_deposit_pre[hIndex].func; - preHookFunc(sd, &money); + preHookFunc(&sd, &money); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57564,10 +57678,10 @@ void HP_pc_bank_deposit(struct map_session_data *sd, int money) { HPMHooks.source.pc.bank_deposit(sd, money); } if( HPMHooks.count.HP_pc_bank_deposit_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *money); + void (*postHookFunc) (struct map_session_data *sd, int money); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_deposit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bank_deposit_post[hIndex].func; - postHookFunc(sd, &money); + postHookFunc(sd, money); } } return; @@ -57575,11 +57689,11 @@ void HP_pc_bank_deposit(struct map_session_data *sd, int money) { void HP_pc_bank_withdraw(struct map_session_data *sd, int money) { int hIndex = 0; if( HPMHooks.count.HP_pc_bank_withdraw_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *money); + void (*preHookFunc) (struct map_session_data **sd, int *money); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_withdraw_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bank_withdraw_pre[hIndex].func; - preHookFunc(sd, &money); + preHookFunc(&sd, &money); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57590,10 +57704,10 @@ void HP_pc_bank_withdraw(struct map_session_data *sd, int money) { HPMHooks.source.pc.bank_withdraw(sd, money); } if( HPMHooks.count.HP_pc_bank_withdraw_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *money); + void (*postHookFunc) (struct map_session_data *sd, int money); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_withdraw_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bank_withdraw_post[hIndex].func; - postHookFunc(sd, &money); + postHookFunc(sd, money); } } return; @@ -57601,11 +57715,11 @@ void HP_pc_bank_withdraw(struct map_session_data *sd, int money) { void HP_pc_rental_expire(struct map_session_data *sd, int i) { int hIndex = 0; if( HPMHooks.count.HP_pc_rental_expire_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *i); + void (*preHookFunc) (struct map_session_data **sd, int *i); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_rental_expire_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_rental_expire_pre[hIndex].func; - preHookFunc(sd, &i); + preHookFunc(&sd, &i); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57616,10 +57730,10 @@ void HP_pc_rental_expire(struct map_session_data *sd, int i) { HPMHooks.source.pc.rental_expire(sd, i); } if( HPMHooks.count.HP_pc_rental_expire_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *i); + void (*postHookFunc) (struct map_session_data *sd, int i); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_rental_expire_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_rental_expire_post[hIndex].func; - postHookFunc(sd, &i); + postHookFunc(sd, i); } } return; @@ -57627,11 +57741,11 @@ void HP_pc_rental_expire(struct map_session_data *sd, int i) { void HP_pc_scdata_received(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_scdata_received_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_scdata_received_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_scdata_received_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57653,11 +57767,11 @@ void HP_pc_scdata_received(struct map_session_data *sd) { void HP_pc_bound_clear(struct map_session_data *sd, enum e_item_bound_type type) { int hIndex = 0; if( HPMHooks.count.HP_pc_bound_clear_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum e_item_bound_type *type); + void (*preHookFunc) (struct map_session_data **sd, enum e_item_bound_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bound_clear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_bound_clear_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57668,10 +57782,10 @@ void HP_pc_bound_clear(struct map_session_data *sd, enum e_item_bound_type type) HPMHooks.source.pc.bound_clear(sd, type); } if( HPMHooks.count.HP_pc_bound_clear_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum e_item_bound_type *type); + void (*postHookFunc) (struct map_session_data *sd, enum e_item_bound_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bound_clear_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_bound_clear_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -57695,10 +57809,10 @@ int HP_pc_expiration_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.expiration_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_expiration_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_expiration_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_expiration_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -57722,10 +57836,10 @@ int HP_pc_global_expiration_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pc.global_expiration_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pc_global_expiration_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_global_expiration_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_global_expiration_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -57733,11 +57847,11 @@ int HP_pc_global_expiration_timer(int tid, int64 tick, int id, intptr_t data) { void HP_pc_expire_check(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_expire_check_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_expire_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_expire_check_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57775,10 +57889,10 @@ bool HP_pc_db_checkid(unsigned int class_) { retVal___ = HPMHooks.source.pc.db_checkid(class_); } if( HPMHooks.count.HP_pc_db_checkid_post ) { - bool (*postHookFunc) (bool retVal___, unsigned int *class_); + bool (*postHookFunc) (bool retVal___, unsigned int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_db_checkid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_db_checkid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &class_); + retVal___ = postHookFunc(retVal___, class_); } } return retVal___; @@ -57838,11 +57952,11 @@ void HP_pc_autotrade_load(void) { void HP_pc_autotrade_update(struct map_session_data *sd, enum e_pc_autotrade_update_action action) { int hIndex = 0; if( HPMHooks.count.HP_pc_autotrade_update_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum e_pc_autotrade_update_action *action); + void (*preHookFunc) (struct map_session_data **sd, enum e_pc_autotrade_update_action *action); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_update_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_autotrade_update_pre[hIndex].func; - preHookFunc(sd, &action); + preHookFunc(&sd, &action); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57853,10 +57967,10 @@ void HP_pc_autotrade_update(struct map_session_data *sd, enum e_pc_autotrade_upd HPMHooks.source.pc.autotrade_update(sd, action); } if( HPMHooks.count.HP_pc_autotrade_update_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum e_pc_autotrade_update_action *action); + void (*postHookFunc) (struct map_session_data *sd, enum e_pc_autotrade_update_action action); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_update_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_autotrade_update_post[hIndex].func; - postHookFunc(sd, &action); + postHookFunc(sd, action); } } return; @@ -57864,11 +57978,11 @@ void HP_pc_autotrade_update(struct map_session_data *sd, enum e_pc_autotrade_upd void HP_pc_autotrade_start(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_autotrade_start_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_start_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_autotrade_start_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57890,11 +58004,11 @@ void HP_pc_autotrade_start(struct map_session_data *sd) { void HP_pc_autotrade_prepare(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_autotrade_prepare_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_prepare_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_autotrade_prepare_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57916,11 +58030,11 @@ void HP_pc_autotrade_prepare(struct map_session_data *sd) { void HP_pc_autotrade_populate(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_pc_autotrade_populate_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_populate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_autotrade_populate_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57939,16 +58053,16 @@ void HP_pc_autotrade_populate(struct map_session_data *sd) { } return; } -int HP_pc_autotrade_final(DBKey key, DBData *data, va_list ap) { +int HP_pc_autotrade_final(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_autotrade_final_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_final_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_pc_autotrade_final_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -57962,11 +58076,11 @@ int HP_pc_autotrade_final(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_pc_autotrade_final_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_final_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_pc_autotrade_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -57976,11 +58090,11 @@ int HP_pc_check_job_name(const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_check_job_name_pre ) { - int (*preHookFunc) (const char *name); + int (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_check_job_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_check_job_name_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58002,11 +58116,11 @@ int HP_pc_check_job_name(const char *name) { void HP_pc_update_idle_time(struct map_session_data *sd, enum e_battle_config_idletime type) { int hIndex = 0; if( HPMHooks.count.HP_pc_update_idle_time_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum e_battle_config_idletime *type); + void (*preHookFunc) (struct map_session_data **sd, enum e_battle_config_idletime *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_update_idle_time_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_update_idle_time_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58017,10 +58131,10 @@ void HP_pc_update_idle_time(struct map_session_data *sd, enum e_battle_config_id HPMHooks.source.pc.update_idle_time(sd, type); } if( HPMHooks.count.HP_pc_update_idle_time_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum e_battle_config_idletime *type); + void (*postHookFunc) (struct map_session_data *sd, enum e_battle_config_idletime type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_update_idle_time_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_update_idle_time_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -58029,11 +58143,11 @@ int HP_pc_have_magnifier(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_have_magnifier_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_have_magnifier_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_have_magnifier_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58052,16 +58166,69 @@ int HP_pc_have_magnifier(struct map_session_data *sd) { } return retVal___; } -/* libpcre */ +bool HP_pc_process_chat_message(struct map_session_data *sd, const char *message) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_pc_process_chat_message_pre ) { + bool (*preHookFunc) (struct map_session_data **sd, const char **message); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_process_chat_message_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_process_chat_message_pre[hIndex].func; + retVal___ = preHookFunc(&sd, &message); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pc.process_chat_message(sd, message); + } + if( HPMHooks.count.HP_pc_process_chat_message_post ) { + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *message); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_process_chat_message_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_process_chat_message_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sd, message); + } + } + return retVal___; +} +void HP_pc_check_supernovice_call(struct map_session_data *sd, const char *message) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_check_supernovice_call_pre ) { + void (*preHookFunc) (struct map_session_data **sd, const char **message); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_check_supernovice_call_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_check_supernovice_call_pre[hIndex].func; + preHookFunc(&sd, &message); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.check_supernovice_call(sd, message); + } + if( HPMHooks.count.HP_pc_check_supernovice_call_post ) { + void (*postHookFunc) (struct map_session_data *sd, const char *message); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_check_supernovice_call_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_check_supernovice_call_post[hIndex].func; + postHookFunc(sd, message); + } + } + return; +} +/* pcre_interface */ pcre* HP_libpcre_compile(const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr) { int hIndex = 0; pcre* retVal___ = NULL; if( HPMHooks.count.HP_libpcre_compile_pre ) { - pcre* (*preHookFunc) (const char *pattern, int *options, const char **errptr, int *erroffset, const unsigned char *tableptr); + pcre* (*preHookFunc) (const char **pattern, int *options, const char ***errptr, int **erroffset, const unsigned char **tableptr); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_compile_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libpcre_compile_pre[hIndex].func; - retVal___ = preHookFunc(pattern, &options, errptr, erroffset, tableptr); + retVal___ = preHookFunc(&pattern, &options, &errptr, &erroffset, &tableptr); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58072,10 +58239,10 @@ pcre* HP_libpcre_compile(const char *pattern, int options, const char **errptr, retVal___ = HPMHooks.source.libpcre.compile(pattern, options, errptr, erroffset, tableptr); } if( HPMHooks.count.HP_libpcre_compile_post ) { - pcre* (*postHookFunc) (pcre* retVal___, const char *pattern, int *options, const char **errptr, int *erroffset, const unsigned char *tableptr); + pcre* (*postHookFunc) (pcre* retVal___, const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr); for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_compile_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libpcre_compile_post[hIndex].func; - retVal___ = postHookFunc(retVal___, pattern, &options, errptr, erroffset, tableptr); + retVal___ = postHookFunc(retVal___, pattern, options, errptr, erroffset, tableptr); } } return retVal___; @@ -58084,11 +58251,11 @@ pcre_extra* HP_libpcre_study(const pcre *code, int options, const char **errptr) int hIndex = 0; pcre_extra* retVal___ = NULL; if( HPMHooks.count.HP_libpcre_study_pre ) { - pcre_extra* (*preHookFunc) (const pcre *code, int *options, const char **errptr); + pcre_extra* (*preHookFunc) (const pcre **code, int *options, const char ***errptr); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_study_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libpcre_study_pre[hIndex].func; - retVal___ = preHookFunc(code, &options, errptr); + retVal___ = preHookFunc(&code, &options, &errptr); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58099,10 +58266,10 @@ pcre_extra* HP_libpcre_study(const pcre *code, int options, const char **errptr) retVal___ = HPMHooks.source.libpcre.study(code, options, errptr); } if( HPMHooks.count.HP_libpcre_study_post ) { - pcre_extra* (*postHookFunc) (pcre_extra* retVal___, const pcre *code, int *options, const char **errptr); + pcre_extra* (*postHookFunc) (pcre_extra* retVal___, const pcre *code, int options, const char **errptr); for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_study_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libpcre_study_post[hIndex].func; - retVal___ = postHookFunc(retVal___, code, &options, errptr); + retVal___ = postHookFunc(retVal___, code, options, errptr); } } return retVal___; @@ -58111,11 +58278,11 @@ int HP_libpcre_exec(const pcre *code, const pcre_extra *extra, PCRE_SPTR subject int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libpcre_exec_pre ) { - int (*preHookFunc) (const pcre *code, const pcre_extra *extra, PCRE_SPTR *subject, int *length, int *startoffset, int *options, int *ovector, int *ovecsize); + int (*preHookFunc) (const pcre **code, const pcre_extra **extra, PCRE_SPTR *subject, int *length, int *startoffset, int *options, int **ovector, int *ovecsize); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_exec_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libpcre_exec_pre[hIndex].func; - retVal___ = preHookFunc(code, extra, &subject, &length, &startoffset, &options, ovector, &ovecsize); + retVal___ = preHookFunc(&code, &extra, &subject, &length, &startoffset, &options, &ovector, &ovecsize); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58126,10 +58293,10 @@ int HP_libpcre_exec(const pcre *code, const pcre_extra *extra, PCRE_SPTR subject retVal___ = HPMHooks.source.libpcre.exec(code, extra, subject, length, startoffset, options, ovector, ovecsize); } if( HPMHooks.count.HP_libpcre_exec_post ) { - int (*postHookFunc) (int retVal___, const pcre *code, const pcre_extra *extra, PCRE_SPTR *subject, int *length, int *startoffset, int *options, int *ovector, int *ovecsize); + int (*postHookFunc) (int retVal___, const pcre *code, const pcre_extra *extra, PCRE_SPTR subject, int length, int startoffset, int options, int *ovector, int ovecsize); for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_exec_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libpcre_exec_post[hIndex].func; - retVal___ = postHookFunc(retVal___, code, extra, &subject, &length, &startoffset, &options, ovector, &ovecsize); + retVal___ = postHookFunc(retVal___, code, extra, subject, length, startoffset, options, ovector, ovecsize); } } return retVal___; @@ -58137,11 +58304,11 @@ int HP_libpcre_exec(const pcre *code, const pcre_extra *extra, PCRE_SPTR subject void HP_libpcre_free(void *ptr) { int hIndex = 0; if( HPMHooks.count.HP_libpcre_free_pre ) { - void (*preHookFunc) (void *ptr); + void (*preHookFunc) (void **ptr); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libpcre_free_pre[hIndex].func; - preHookFunc(ptr); + preHookFunc(&ptr); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58164,11 +58331,11 @@ int HP_libpcre_copy_substring(const char *subject, int *ovector, int stringcount int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libpcre_copy_substring_pre ) { - int (*preHookFunc) (const char *subject, int *ovector, int *stringcount, int *stringnumber, char *buffer, int *buffersize); + int (*preHookFunc) (const char **subject, int **ovector, int *stringcount, int *stringnumber, char **buffer, int *buffersize); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_copy_substring_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libpcre_copy_substring_pre[hIndex].func; - retVal___ = preHookFunc(subject, ovector, &stringcount, &stringnumber, buffer, &buffersize); + retVal___ = preHookFunc(&subject, &ovector, &stringcount, &stringnumber, &buffer, &buffersize); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58179,10 +58346,10 @@ int HP_libpcre_copy_substring(const char *subject, int *ovector, int stringcount retVal___ = HPMHooks.source.libpcre.copy_substring(subject, ovector, stringcount, stringnumber, buffer, buffersize); } if( HPMHooks.count.HP_libpcre_copy_substring_post ) { - int (*postHookFunc) (int retVal___, const char *subject, int *ovector, int *stringcount, int *stringnumber, char *buffer, int *buffersize); + int (*postHookFunc) (int retVal___, const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int buffersize); for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_copy_substring_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libpcre_copy_substring_post[hIndex].func; - retVal___ = postHookFunc(retVal___, subject, ovector, &stringcount, &stringnumber, buffer, &buffersize); + retVal___ = postHookFunc(retVal___, subject, ovector, stringcount, stringnumber, buffer, buffersize); } } return retVal___; @@ -58190,11 +58357,11 @@ int HP_libpcre_copy_substring(const char *subject, int *ovector, int stringcount void HP_libpcre_free_substring(const char *stringptr) { int hIndex = 0; if( HPMHooks.count.HP_libpcre_free_substring_pre ) { - void (*preHookFunc) (const char *stringptr); + void (*preHookFunc) (const char **stringptr); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_free_substring_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libpcre_free_substring_pre[hIndex].func; - preHookFunc(stringptr); + preHookFunc(&stringptr); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58217,11 +58384,11 @@ int HP_libpcre_copy_named_substring(const pcre *code, const char *subject, int * int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libpcre_copy_named_substring_pre ) { - int (*preHookFunc) (const pcre *code, const char *subject, int *ovector, int *stringcount, const char *stringname, char *buffer, int *buffersize); + int (*preHookFunc) (const pcre **code, const char **subject, int **ovector, int *stringcount, const char **stringname, char **buffer, int *buffersize); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_copy_named_substring_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libpcre_copy_named_substring_pre[hIndex].func; - retVal___ = preHookFunc(code, subject, ovector, &stringcount, stringname, buffer, &buffersize); + retVal___ = preHookFunc(&code, &subject, &ovector, &stringcount, &stringname, &buffer, &buffersize); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58232,10 +58399,10 @@ int HP_libpcre_copy_named_substring(const pcre *code, const char *subject, int * retVal___ = HPMHooks.source.libpcre.copy_named_substring(code, subject, ovector, stringcount, stringname, buffer, buffersize); } if( HPMHooks.count.HP_libpcre_copy_named_substring_post ) { - int (*postHookFunc) (int retVal___, const pcre *code, const char *subject, int *ovector, int *stringcount, const char *stringname, char *buffer, int *buffersize); + int (*postHookFunc) (int retVal___, const pcre *code, const char *subject, int *ovector, int stringcount, const char *stringname, char *buffer, int buffersize); for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_copy_named_substring_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libpcre_copy_named_substring_post[hIndex].func; - retVal___ = postHookFunc(retVal___, code, subject, ovector, &stringcount, stringname, buffer, &buffersize); + retVal___ = postHookFunc(retVal___, code, subject, ovector, stringcount, stringname, buffer, buffersize); } } return retVal___; @@ -58244,11 +58411,11 @@ int HP_libpcre_get_substring(const char *subject, int *ovector, int stringcount, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libpcre_get_substring_pre ) { - int (*preHookFunc) (const char *subject, int *ovector, int *stringcount, int *stringnumber, const char **stringptr); + int (*preHookFunc) (const char **subject, int **ovector, int *stringcount, int *stringnumber, const char ***stringptr); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_get_substring_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libpcre_get_substring_pre[hIndex].func; - retVal___ = preHookFunc(subject, ovector, &stringcount, &stringnumber, stringptr); + retVal___ = preHookFunc(&subject, &ovector, &stringcount, &stringnumber, &stringptr); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58259,15 +58426,15 @@ int HP_libpcre_get_substring(const char *subject, int *ovector, int stringcount, retVal___ = HPMHooks.source.libpcre.get_substring(subject, ovector, stringcount, stringnumber, stringptr); } if( HPMHooks.count.HP_libpcre_get_substring_post ) { - int (*postHookFunc) (int retVal___, const char *subject, int *ovector, int *stringcount, int *stringnumber, const char **stringptr); + int (*postHookFunc) (int retVal___, const char *subject, int *ovector, int stringcount, int stringnumber, const char **stringptr); for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_get_substring_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libpcre_get_substring_post[hIndex].func; - retVal___ = postHookFunc(retVal___, subject, ovector, &stringcount, &stringnumber, stringptr); + retVal___ = postHookFunc(retVal___, subject, ovector, stringcount, stringnumber, stringptr); } } return retVal___; } -/* pet */ +/* pet_interface */ int HP_pet_init(bool minimal) { int hIndex = 0; int retVal___ = 0; @@ -58287,10 +58454,10 @@ int HP_pet_init(bool minimal) { retVal___ = HPMHooks.source.pet.init(minimal); } if( HPMHooks.count.HP_pet_init_post ) { - int (*postHookFunc) (int retVal___, bool *minimal); + int (*postHookFunc) (int retVal___, bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &minimal); + retVal___ = postHookFunc(retVal___, minimal); } } return retVal___; @@ -58326,11 +58493,11 @@ int HP_pet_hungry_val(struct pet_data *pd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_hungry_val_pre ) { - int (*preHookFunc) (struct pet_data *pd); + int (*preHookFunc) (struct pet_data **pd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_hungry_val_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_hungry_val_pre[hIndex].func; - retVal___ = preHookFunc(pd); + retVal___ = preHookFunc(&pd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58352,11 +58519,11 @@ int HP_pet_hungry_val(struct pet_data *pd) { void HP_pet_set_intimate(struct pet_data *pd, int value) { int hIndex = 0; if( HPMHooks.count.HP_pet_set_intimate_pre ) { - void (*preHookFunc) (struct pet_data *pd, int *value); + void (*preHookFunc) (struct pet_data **pd, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_set_intimate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_set_intimate_pre[hIndex].func; - preHookFunc(pd, &value); + preHookFunc(&pd, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58367,10 +58534,10 @@ void HP_pet_set_intimate(struct pet_data *pd, int value) { HPMHooks.source.pet.set_intimate(pd, value); } if( HPMHooks.count.HP_pet_set_intimate_post ) { - void (*postHookFunc) (struct pet_data *pd, int *value); + void (*postHookFunc) (struct pet_data *pd, int value); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_set_intimate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_set_intimate_post[hIndex].func; - postHookFunc(pd, &value); + postHookFunc(pd, value); } } return; @@ -58379,11 +58546,11 @@ int HP_pet_create_egg(struct map_session_data *sd, int item_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_create_egg_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *item_id); + int (*preHookFunc) (struct map_session_data **sd, int *item_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_create_egg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_create_egg_pre[hIndex].func; - retVal___ = preHookFunc(sd, &item_id); + retVal___ = preHookFunc(&sd, &item_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58394,10 +58561,10 @@ int HP_pet_create_egg(struct map_session_data *sd, int item_id) { retVal___ = HPMHooks.source.pet.create_egg(sd, item_id); } if( HPMHooks.count.HP_pet_create_egg_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *item_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int item_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_create_egg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_create_egg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &item_id); + retVal___ = postHookFunc(retVal___, sd, item_id); } } return retVal___; @@ -58406,11 +58573,11 @@ int HP_pet_unlocktarget(struct pet_data *pd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_unlocktarget_pre ) { - int (*preHookFunc) (struct pet_data *pd); + int (*preHookFunc) (struct pet_data **pd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_unlocktarget_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_unlocktarget_pre[hIndex].func; - retVal___ = preHookFunc(pd); + retVal___ = preHookFunc(&pd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58433,11 +58600,11 @@ int HP_pet_attackskill(struct pet_data *pd, int target_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_attackskill_pre ) { - int (*preHookFunc) (struct pet_data *pd, int *target_id); + int (*preHookFunc) (struct pet_data **pd, int *target_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_attackskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_attackskill_pre[hIndex].func; - retVal___ = preHookFunc(pd, &target_id); + retVal___ = preHookFunc(&pd, &target_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58448,10 +58615,10 @@ int HP_pet_attackskill(struct pet_data *pd, int target_id) { retVal___ = HPMHooks.source.pet.attackskill(pd, target_id); } if( HPMHooks.count.HP_pet_attackskill_post ) { - int (*postHookFunc) (int retVal___, struct pet_data *pd, int *target_id); + int (*postHookFunc) (int retVal___, struct pet_data *pd, int target_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_attackskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_attackskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, pd, &target_id); + retVal___ = postHookFunc(retVal___, pd, target_id); } } return retVal___; @@ -58460,11 +58627,11 @@ int HP_pet_target_check(struct map_session_data *sd, struct block_list *bl, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_target_check_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct block_list *bl, int *type); + int (*preHookFunc) (struct map_session_data **sd, struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_target_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_target_check_pre[hIndex].func; - retVal___ = preHookFunc(sd, bl, &type); + retVal___ = preHookFunc(&sd, &bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58475,10 +58642,10 @@ int HP_pet_target_check(struct map_session_data *sd, struct block_list *bl, int retVal___ = HPMHooks.source.pet.target_check(sd, bl, type); } if( HPMHooks.count.HP_pet_target_check_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct block_list *bl, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_target_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_target_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, bl, &type); + retVal___ = postHookFunc(retVal___, sd, bl, type); } } return retVal___; @@ -58487,11 +58654,11 @@ int HP_pet_sc_check(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_sc_check_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_sc_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_sc_check_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58502,10 +58669,10 @@ int HP_pet_sc_check(struct map_session_data *sd, int type) { retVal___ = HPMHooks.source.pet.sc_check(sd, type); } if( HPMHooks.count.HP_pet_sc_check_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_sc_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_sc_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -58529,10 +58696,10 @@ int HP_pet_hungry(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pet.hungry(tid, tick, id, data); } if( HPMHooks.count.HP_pet_hungry_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_hungry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_hungry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -58556,10 +58723,10 @@ int HP_pet_search_petDB_index(int key, int type) { retVal___ = HPMHooks.source.pet.search_petDB_index(key, type); } if( HPMHooks.count.HP_pet_search_petDB_index_post ) { - int (*postHookFunc) (int retVal___, int *key, int *type); + int (*postHookFunc) (int retVal___, int key, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_search_petDB_index_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_search_petDB_index_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, &type); + retVal___ = postHookFunc(retVal___, key, type); } } return retVal___; @@ -58568,11 +58735,11 @@ int HP_pet_hungry_timer_delete(struct pet_data *pd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_hungry_timer_delete_pre ) { - int (*preHookFunc) (struct pet_data *pd); + int (*preHookFunc) (struct pet_data **pd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_hungry_timer_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_hungry_timer_delete_pre[hIndex].func; - retVal___ = preHookFunc(pd); + retVal___ = preHookFunc(&pd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58595,11 +58762,11 @@ int HP_pet_performance(struct map_session_data *sd, struct pet_data *pd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_performance_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct pet_data *pd); + int (*preHookFunc) (struct map_session_data **sd, struct pet_data **pd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_performance_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_performance_pre[hIndex].func; - retVal___ = preHookFunc(sd, pd); + retVal___ = preHookFunc(&sd, &pd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58622,11 +58789,11 @@ int HP_pet_return_egg(struct map_session_data *sd, struct pet_data *pd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_return_egg_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct pet_data *pd); + int (*preHookFunc) (struct map_session_data **sd, struct pet_data **pd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_return_egg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_return_egg_pre[hIndex].func; - retVal___ = preHookFunc(sd, pd); + retVal___ = preHookFunc(&sd, &pd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58649,11 +58816,11 @@ int HP_pet_data_init(struct map_session_data *sd, struct s_pet *petinfo) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_data_init_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct s_pet *petinfo); + int (*preHookFunc) (struct map_session_data **sd, struct s_pet **petinfo); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_data_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_data_init_pre[hIndex].func; - retVal___ = preHookFunc(sd, petinfo); + retVal___ = preHookFunc(&sd, &petinfo); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58676,11 +58843,11 @@ int HP_pet_birth_process(struct map_session_data *sd, struct s_pet *petinfo) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_birth_process_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct s_pet *petinfo); + int (*preHookFunc) (struct map_session_data **sd, struct s_pet **petinfo); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_birth_process_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_birth_process_pre[hIndex].func; - retVal___ = preHookFunc(sd, petinfo); + retVal___ = preHookFunc(&sd, &petinfo); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58703,11 +58870,11 @@ int HP_pet_recv_petdata(int account_id, struct s_pet *p, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_recv_petdata_pre ) { - int (*preHookFunc) (int *account_id, struct s_pet *p, int *flag); + int (*preHookFunc) (int *account_id, struct s_pet **p, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_recv_petdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_recv_petdata_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, p, &flag); + retVal___ = preHookFunc(&account_id, &p, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58718,10 +58885,10 @@ int HP_pet_recv_petdata(int account_id, struct s_pet *p, int flag) { retVal___ = HPMHooks.source.pet.recv_petdata(account_id, p, flag); } if( HPMHooks.count.HP_pet_recv_petdata_post ) { - int (*postHookFunc) (int retVal___, int *account_id, struct s_pet *p, int *flag); + int (*postHookFunc) (int retVal___, int account_id, struct s_pet *p, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_recv_petdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_recv_petdata_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, p, &flag); + retVal___ = postHookFunc(retVal___, account_id, p, flag); } } return retVal___; @@ -58730,11 +58897,11 @@ int HP_pet_select_egg(struct map_session_data *sd, short egg_index) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_select_egg_pre ) { - int (*preHookFunc) (struct map_session_data *sd, short *egg_index); + int (*preHookFunc) (struct map_session_data **sd, short *egg_index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_select_egg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_select_egg_pre[hIndex].func; - retVal___ = preHookFunc(sd, &egg_index); + retVal___ = preHookFunc(&sd, &egg_index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58745,10 +58912,10 @@ int HP_pet_select_egg(struct map_session_data *sd, short egg_index) { retVal___ = HPMHooks.source.pet.select_egg(sd, egg_index); } if( HPMHooks.count.HP_pet_select_egg_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, short *egg_index); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, short egg_index); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_select_egg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_select_egg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &egg_index); + retVal___ = postHookFunc(retVal___, sd, egg_index); } } return retVal___; @@ -58757,11 +58924,11 @@ int HP_pet_catch_process1(struct map_session_data *sd, int target_class) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_catch_process1_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *target_class); + int (*preHookFunc) (struct map_session_data **sd, int *target_class); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_catch_process1_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_catch_process1_pre[hIndex].func; - retVal___ = preHookFunc(sd, &target_class); + retVal___ = preHookFunc(&sd, &target_class); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58772,10 +58939,10 @@ int HP_pet_catch_process1(struct map_session_data *sd, int target_class) { retVal___ = HPMHooks.source.pet.catch_process1(sd, target_class); } if( HPMHooks.count.HP_pet_catch_process1_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *target_class); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int target_class); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_catch_process1_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_catch_process1_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &target_class); + retVal___ = postHookFunc(retVal___, sd, target_class); } } return retVal___; @@ -58784,11 +58951,11 @@ int HP_pet_catch_process2(struct map_session_data *sd, int target_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_catch_process2_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *target_id); + int (*preHookFunc) (struct map_session_data **sd, int *target_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_catch_process2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_catch_process2_pre[hIndex].func; - retVal___ = preHookFunc(sd, &target_id); + retVal___ = preHookFunc(&sd, &target_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58799,10 +58966,10 @@ int HP_pet_catch_process2(struct map_session_data *sd, int target_id) { retVal___ = HPMHooks.source.pet.catch_process2(sd, target_id); } if( HPMHooks.count.HP_pet_catch_process2_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *target_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int target_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_catch_process2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_catch_process2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &target_id); + retVal___ = postHookFunc(retVal___, sd, target_id); } } return retVal___; @@ -58826,10 +58993,10 @@ bool HP_pet_get_egg(int account_id, short pet_class, int pet_id) { retVal___ = HPMHooks.source.pet.get_egg(account_id, pet_class, pet_id); } if( HPMHooks.count.HP_pet_get_egg_post ) { - bool (*postHookFunc) (bool retVal___, int *account_id, short *pet_class, int *pet_id); + bool (*postHookFunc) (bool retVal___, int account_id, short pet_class, int pet_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_get_egg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_get_egg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &account_id, &pet_class, &pet_id); + retVal___ = postHookFunc(retVal___, account_id, pet_class, pet_id); } } return retVal___; @@ -58838,11 +59005,11 @@ int HP_pet_unequipitem(struct map_session_data *sd, struct pet_data *pd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_unequipitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct pet_data *pd); + int (*preHookFunc) (struct map_session_data **sd, struct pet_data **pd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_unequipitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_unequipitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, pd); + retVal___ = preHookFunc(&sd, &pd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58865,11 +59032,11 @@ int HP_pet_food(struct map_session_data *sd, struct pet_data *pd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_food_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct pet_data *pd); + int (*preHookFunc) (struct map_session_data **sd, struct pet_data **pd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_food_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_food_pre[hIndex].func; - retVal___ = preHookFunc(sd, pd); + retVal___ = preHookFunc(&sd, &pd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58892,12 +59059,12 @@ int HP_pet_ai_sub_hard_lootsearch(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_ai_sub_hard_lootsearch_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_ai_sub_hard_lootsearch_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_pet_ai_sub_hard_lootsearch_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -58925,11 +59092,11 @@ int HP_pet_menu(struct map_session_data *sd, int menunum) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_menu_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *menunum); + int (*preHookFunc) (struct map_session_data **sd, int *menunum); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_menu_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_menu_pre[hIndex].func; - retVal___ = preHookFunc(sd, &menunum); + retVal___ = preHookFunc(&sd, &menunum); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58940,10 +59107,10 @@ int HP_pet_menu(struct map_session_data *sd, int menunum) { retVal___ = HPMHooks.source.pet.menu(sd, menunum); } if( HPMHooks.count.HP_pet_menu_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *menunum); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int menunum); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_menu_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_menu_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &menunum); + retVal___ = postHookFunc(retVal___, sd, menunum); } } return retVal___; @@ -58952,11 +59119,11 @@ int HP_pet_change_name(struct map_session_data *sd, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_change_name_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *name); + int (*preHookFunc) (struct map_session_data **sd, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_change_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_change_name_pre[hIndex].func; - retVal___ = preHookFunc(sd, name); + retVal___ = preHookFunc(&sd, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58979,11 +59146,11 @@ int HP_pet_change_name_ack(struct map_session_data *sd, const char *name, int fl int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_change_name_ack_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *name, int *flag); + int (*preHookFunc) (struct map_session_data **sd, const char **name, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_change_name_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_change_name_ack_pre[hIndex].func; - retVal___ = preHookFunc(sd, name, &flag); + retVal___ = preHookFunc(&sd, &name, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58994,10 +59161,10 @@ int HP_pet_change_name_ack(struct map_session_data *sd, const char *name, int fl retVal___ = HPMHooks.source.pet.change_name_ack(sd, name, flag); } if( HPMHooks.count.HP_pet_change_name_ack_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_change_name_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_change_name_ack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, name, &flag); + retVal___ = postHookFunc(retVal___, sd, name, flag); } } return retVal___; @@ -59006,11 +59173,11 @@ int HP_pet_equipitem(struct map_session_data *sd, int index) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_equipitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *index); + int (*preHookFunc) (struct map_session_data **sd, int *index); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_equipitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_equipitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index); + retVal___ = preHookFunc(&sd, &index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59021,10 +59188,10 @@ int HP_pet_equipitem(struct map_session_data *sd, int index) { retVal___ = HPMHooks.source.pet.equipitem(sd, index); } if( HPMHooks.count.HP_pet_equipitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *index); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_equipitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_equipitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index); + retVal___ = postHookFunc(retVal___, sd, index); } } return retVal___; @@ -59033,11 +59200,11 @@ int HP_pet_randomwalk(struct pet_data *pd, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_randomwalk_pre ) { - int (*preHookFunc) (struct pet_data *pd, int64 *tick); + int (*preHookFunc) (struct pet_data **pd, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_randomwalk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_randomwalk_pre[hIndex].func; - retVal___ = preHookFunc(pd, &tick); + retVal___ = preHookFunc(&pd, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59048,10 +59215,10 @@ int HP_pet_randomwalk(struct pet_data *pd, int64 tick) { retVal___ = HPMHooks.source.pet.randomwalk(pd, tick); } if( HPMHooks.count.HP_pet_randomwalk_post ) { - int (*postHookFunc) (int retVal___, struct pet_data *pd, int64 *tick); + int (*postHookFunc) (int retVal___, struct pet_data *pd, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_randomwalk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_randomwalk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, pd, &tick); + retVal___ = postHookFunc(retVal___, pd, tick); } } return retVal___; @@ -59060,11 +59227,11 @@ int HP_pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 t int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_ai_sub_hard_pre ) { - int (*preHookFunc) (struct pet_data *pd, struct map_session_data *sd, int64 *tick); + int (*preHookFunc) (struct pet_data **pd, struct map_session_data **sd, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_ai_sub_hard_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_ai_sub_hard_pre[hIndex].func; - retVal___ = preHookFunc(pd, sd, &tick); + retVal___ = preHookFunc(&pd, &sd, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59075,10 +59242,10 @@ int HP_pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 t retVal___ = HPMHooks.source.pet.ai_sub_hard(pd, sd, tick); } if( HPMHooks.count.HP_pet_ai_sub_hard_post ) { - int (*postHookFunc) (int retVal___, struct pet_data *pd, struct map_session_data *sd, int64 *tick); + int (*postHookFunc) (int retVal___, struct pet_data *pd, struct map_session_data *sd, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_ai_sub_hard_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_ai_sub_hard_post[hIndex].func; - retVal___ = postHookFunc(retVal___, pd, sd, &tick); + retVal___ = postHookFunc(retVal___, pd, sd, tick); } } return retVal___; @@ -59087,12 +59254,12 @@ int HP_pet_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_ai_sub_foreachclient_pre ) { - int (*preHookFunc) (struct map_session_data *sd, va_list ap); + int (*preHookFunc) (struct map_session_data **sd, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_ai_sub_foreachclient_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_pet_ai_sub_foreachclient_pre[hIndex].func; - retVal___ = preHookFunc(sd, ap___copy); + retVal___ = preHookFunc(&sd, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -59135,10 +59302,10 @@ int HP_pet_ai_hard(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pet.ai_hard(tid, tick, id, data); } if( HPMHooks.count.HP_pet_ai_hard_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_ai_hard_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_ai_hard_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -59162,10 +59329,10 @@ int HP_pet_delay_item_drop(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pet.delay_item_drop(tid, tick, id, data); } if( HPMHooks.count.HP_pet_delay_item_drop_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_delay_item_drop_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_delay_item_drop_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -59174,11 +59341,11 @@ int HP_pet_lootitem_drop(struct pet_data *pd, struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_lootitem_drop_pre ) { - int (*preHookFunc) (struct pet_data *pd, struct map_session_data *sd); + int (*preHookFunc) (struct pet_data **pd, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_lootitem_drop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_lootitem_drop_pre[hIndex].func; - retVal___ = preHookFunc(pd, sd); + retVal___ = preHookFunc(&pd, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59216,10 +59383,10 @@ int HP_pet_skill_bonus_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pet.skill_bonus_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pet_skill_bonus_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_skill_bonus_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_skill_bonus_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -59243,10 +59410,10 @@ int HP_pet_recovery_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pet.recovery_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pet_recovery_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_recovery_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_recovery_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -59270,10 +59437,10 @@ int HP_pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pet.skill_support_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pet_skill_support_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_skill_support_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_skill_support_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -59305,7 +59472,7 @@ int HP_pet_read_db(void) { } return retVal___; } -/* quest */ +/* quest_interface */ void HP_quest_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_quest_init_pre ) { @@ -59324,10 +59491,10 @@ void HP_quest_init(bool minimal) { HPMHooks.source.quest.init(minimal); } if( HPMHooks.count.HP_quest_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -59403,10 +59570,10 @@ struct quest_db* HP_quest_db(int quest_id) { retVal___ = HPMHooks.source.quest.db(quest_id); } if( HPMHooks.count.HP_quest_db_post ) { - struct quest_db* (*postHookFunc) (struct quest_db* retVal___, int *quest_id); + struct quest_db* (*postHookFunc) (struct quest_db* retVal___, int quest_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_db_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_db_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &quest_id); + retVal___ = postHookFunc(retVal___, quest_id); } } return retVal___; @@ -59415,11 +59582,11 @@ int HP_quest_pc_login(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_quest_pc_login_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_pc_login_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_pc_login_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59442,11 +59609,11 @@ int HP_quest_add(struct map_session_data *sd, int quest_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_quest_add_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *quest_id); + int (*preHookFunc) (struct map_session_data **sd, int *quest_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_add_pre[hIndex].func; - retVal___ = preHookFunc(sd, &quest_id); + retVal___ = preHookFunc(&sd, &quest_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59457,10 +59624,10 @@ int HP_quest_add(struct map_session_data *sd, int quest_id) { retVal___ = HPMHooks.source.quest.add(sd, quest_id); } if( HPMHooks.count.HP_quest_add_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *quest_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int quest_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &quest_id); + retVal___ = postHookFunc(retVal___, sd, quest_id); } } return retVal___; @@ -59469,11 +59636,11 @@ int HP_quest_change(struct map_session_data *sd, int qid1, int qid2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_quest_change_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *qid1, int *qid2); + int (*preHookFunc) (struct map_session_data **sd, int *qid1, int *qid2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_change_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_change_pre[hIndex].func; - retVal___ = preHookFunc(sd, &qid1, &qid2); + retVal___ = preHookFunc(&sd, &qid1, &qid2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59484,10 +59651,10 @@ int HP_quest_change(struct map_session_data *sd, int qid1, int qid2) { retVal___ = HPMHooks.source.quest.change(sd, qid1, qid2); } if( HPMHooks.count.HP_quest_change_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *qid1, int *qid2); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int qid1, int qid2); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_change_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_change_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &qid1, &qid2); + retVal___ = postHookFunc(retVal___, sd, qid1, qid2); } } return retVal___; @@ -59496,11 +59663,11 @@ int HP_quest_delete(struct map_session_data *sd, int quest_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_quest_delete_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *quest_id); + int (*preHookFunc) (struct map_session_data **sd, int *quest_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_delete_pre[hIndex].func; - retVal___ = preHookFunc(sd, &quest_id); + retVal___ = preHookFunc(&sd, &quest_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59511,10 +59678,10 @@ int HP_quest_delete(struct map_session_data *sd, int quest_id) { retVal___ = HPMHooks.source.quest.delete(sd, quest_id); } if( HPMHooks.count.HP_quest_delete_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *quest_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int quest_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &quest_id); + retVal___ = postHookFunc(retVal___, sd, quest_id); } } return retVal___; @@ -59523,12 +59690,12 @@ int HP_quest_update_objective_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_quest_update_objective_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_update_objective_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_quest_update_objective_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -59555,11 +59722,11 @@ int HP_quest_update_objective_sub(struct block_list *bl, va_list ap) { void HP_quest_update_objective(struct map_session_data *sd, int mob_id) { int hIndex = 0; if( HPMHooks.count.HP_quest_update_objective_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *mob_id); + void (*preHookFunc) (struct map_session_data **sd, int *mob_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_update_objective_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_update_objective_pre[hIndex].func; - preHookFunc(sd, &mob_id); + preHookFunc(&sd, &mob_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59570,10 +59737,10 @@ void HP_quest_update_objective(struct map_session_data *sd, int mob_id) { HPMHooks.source.quest.update_objective(sd, mob_id); } if( HPMHooks.count.HP_quest_update_objective_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *mob_id); + void (*postHookFunc) (struct map_session_data *sd, int mob_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_update_objective_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_update_objective_post[hIndex].func; - postHookFunc(sd, &mob_id); + postHookFunc(sd, mob_id); } } return; @@ -59582,11 +59749,11 @@ int HP_quest_update_status(struct map_session_data *sd, int quest_id, enum quest int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_quest_update_status_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *quest_id, enum quest_state *qs); + int (*preHookFunc) (struct map_session_data **sd, int *quest_id, enum quest_state *qs); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_update_status_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_update_status_pre[hIndex].func; - retVal___ = preHookFunc(sd, &quest_id, &qs); + retVal___ = preHookFunc(&sd, &quest_id, &qs); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59597,10 +59764,10 @@ int HP_quest_update_status(struct map_session_data *sd, int quest_id, enum quest retVal___ = HPMHooks.source.quest.update_status(sd, quest_id, qs); } if( HPMHooks.count.HP_quest_update_status_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *quest_id, enum quest_state *qs); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int quest_id, enum quest_state qs); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_update_status_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_update_status_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &quest_id, &qs); + retVal___ = postHookFunc(retVal___, sd, quest_id, qs); } } return retVal___; @@ -59609,11 +59776,11 @@ int HP_quest_check(struct map_session_data *sd, int quest_id, enum quest_check_t int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_quest_check_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *quest_id, enum quest_check_type *type); + int (*preHookFunc) (struct map_session_data **sd, int *quest_id, enum quest_check_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_check_pre[hIndex].func; - retVal___ = preHookFunc(sd, &quest_id, &type); + retVal___ = preHookFunc(&sd, &quest_id, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59624,10 +59791,10 @@ int HP_quest_check(struct map_session_data *sd, int quest_id, enum quest_check_t retVal___ = HPMHooks.source.quest.check(sd, quest_id, type); } if( HPMHooks.count.HP_quest_check_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *quest_id, enum quest_check_type *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int quest_id, enum quest_check_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &quest_id, &type); + retVal___ = postHookFunc(retVal___, sd, quest_id, type); } } return retVal___; @@ -59689,11 +59856,11 @@ struct quest_db* HP_quest_read_db_sub(struct config_setting_t *cs, int n, const int hIndex = 0; struct quest_db* retVal___ = NULL; if( HPMHooks.count.HP_quest_read_db_sub_pre ) { - struct quest_db* (*preHookFunc) (struct config_setting_t *cs, int *n, const char *source); + struct quest_db* (*preHookFunc) (struct config_setting_t **cs, int *n, const char **source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_read_db_sub_pre[hIndex].func; - retVal___ = preHookFunc(cs, &n, source); + retVal___ = preHookFunc(&cs, &n, &source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59704,15 +59871,15 @@ struct quest_db* HP_quest_read_db_sub(struct config_setting_t *cs, int n, const retVal___ = HPMHooks.source.quest.read_db_sub(cs, n, source); } if( HPMHooks.count.HP_quest_read_db_sub_post ) { - struct quest_db* (*postHookFunc) (struct quest_db* retVal___, struct config_setting_t *cs, int *n, const char *source); + struct quest_db* (*postHookFunc) (struct quest_db* retVal___, struct config_setting_t *cs, int n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_read_db_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, cs, &n, source); + retVal___ = postHookFunc(retVal___, cs, n, source); } } return retVal___; } -/* script */ +/* script_interface */ void HP_script_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_script_init_pre ) { @@ -59731,10 +59898,10 @@ void HP_script_init(bool minimal) { HPMHooks.source.script.init(minimal); } if( HPMHooks.count.HP_script_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -59796,11 +59963,11 @@ struct script_code* HP_script_parse(const char *src, const char *file, int line, int hIndex = 0; struct script_code* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_pre ) { - struct script_code* (*preHookFunc) (const char *src, const char *file, int *line, int *options, int *retval); + struct script_code* (*preHookFunc) (const char **src, const char **file, int *line, int *options, int **retval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_pre[hIndex].func; - retVal___ = preHookFunc(src, file, &line, &options, retval); + retVal___ = preHookFunc(&src, &file, &line, &options, &retval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59811,10 +59978,10 @@ struct script_code* HP_script_parse(const char *src, const char *file, int line, retVal___ = HPMHooks.source.script.parse(src, file, line, options, retval); } if( HPMHooks.count.HP_script_parse_post ) { - struct script_code* (*postHookFunc) (struct script_code* retVal___, const char *src, const char *file, int *line, int *options, int *retval); + struct script_code* (*postHookFunc) (struct script_code* retVal___, const char *src, const char *file, int line, int options, int *retval); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_parse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, file, &line, &options, retval); + retVal___ = postHookFunc(retVal___, src, file, line, options, retval); } } return retVal___; @@ -59823,11 +59990,11 @@ bool HP_script_add_builtin(const struct script_function *buildin, bool override) int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_script_add_builtin_pre ) { - bool (*preHookFunc) (const struct script_function *buildin, bool *override); + bool (*preHookFunc) (const struct script_function **buildin, bool *override); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_add_builtin_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_add_builtin_pre[hIndex].func; - retVal___ = preHookFunc(buildin, &override); + retVal___ = preHookFunc(&buildin, &override); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59838,10 +60005,10 @@ bool HP_script_add_builtin(const struct script_function *buildin, bool override) retVal___ = HPMHooks.source.script.add_builtin(buildin, override); } if( HPMHooks.count.HP_script_add_builtin_post ) { - bool (*postHookFunc) (bool retVal___, const struct script_function *buildin, bool *override); + bool (*postHookFunc) (bool retVal___, const struct script_function *buildin, bool override); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_add_builtin_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_add_builtin_post[hIndex].func; - retVal___ = postHookFunc(retVal___, buildin, &override); + retVal___ = postHookFunc(retVal___, buildin, override); } } return retVal___; @@ -59876,11 +60043,11 @@ const char* HP_script_parse_subexpr(const char *p, int limit) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_subexpr_pre ) { - const char* (*preHookFunc) (const char *p, int *limit); + const char* (*preHookFunc) (const char **p, int *limit); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_subexpr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_subexpr_pre[hIndex].func; - retVal___ = preHookFunc(p, &limit); + retVal___ = preHookFunc(&p, &limit); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59891,10 +60058,10 @@ const char* HP_script_parse_subexpr(const char *p, int limit) { retVal___ = HPMHooks.source.script.parse_subexpr(p, limit); } if( HPMHooks.count.HP_script_parse_subexpr_post ) { - const char* (*postHookFunc) (const char* retVal___, const char *p, int *limit); + const char* (*postHookFunc) (const char* retVal___, const char *p, int limit); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_subexpr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_parse_subexpr_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &limit); + retVal___ = postHookFunc(retVal___, p, limit); } } return retVal___; @@ -59903,11 +60070,11 @@ const char* HP_script_skip_space(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_skip_space_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_skip_space_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_skip_space_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59929,11 +60096,11 @@ const char* HP_script_skip_space(const char *p) { void HP_script_error(const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos) { int hIndex = 0; if( HPMHooks.count.HP_script_error_pre ) { - void (*preHookFunc) (const char *src, const char *file, int *start_line, const char *error_msg, const char *error_pos); + void (*preHookFunc) (const char **src, const char **file, int *start_line, const char **error_msg, const char **error_pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_error_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_error_pre[hIndex].func; - preHookFunc(src, file, &start_line, error_msg, error_pos); + preHookFunc(&src, &file, &start_line, &error_msg, &error_pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59944,10 +60111,10 @@ void HP_script_error(const char *src, const char *file, int start_line, const ch HPMHooks.source.script.error(src, file, start_line, error_msg, error_pos); } if( HPMHooks.count.HP_script_error_post ) { - void (*postHookFunc) (const char *src, const char *file, int *start_line, const char *error_msg, const char *error_pos); + void (*postHookFunc) (const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_error_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_error_post[hIndex].func; - postHookFunc(src, file, &start_line, error_msg, error_pos); + postHookFunc(src, file, start_line, error_msg, error_pos); } } return; @@ -59955,11 +60122,11 @@ void HP_script_error(const char *src, const char *file, int start_line, const ch void HP_script_warning(const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos) { int hIndex = 0; if( HPMHooks.count.HP_script_warning_pre ) { - void (*preHookFunc) (const char *src, const char *file, int *start_line, const char *error_msg, const char *error_pos); + void (*preHookFunc) (const char **src, const char **file, int *start_line, const char **error_msg, const char **error_pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_warning_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_warning_pre[hIndex].func; - preHookFunc(src, file, &start_line, error_msg, error_pos); + preHookFunc(&src, &file, &start_line, &error_msg, &error_pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59970,10 +60137,10 @@ void HP_script_warning(const char *src, const char *file, int start_line, const HPMHooks.source.script.warning(src, file, start_line, error_msg, error_pos); } if( HPMHooks.count.HP_script_warning_post ) { - void (*postHookFunc) (const char *src, const char *file, int *start_line, const char *error_msg, const char *error_pos); + void (*postHookFunc) (const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_warning_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_warning_post[hIndex].func; - postHookFunc(src, file, &start_line, error_msg, error_pos); + postHookFunc(src, file, start_line, error_msg, error_pos); } } return; @@ -59982,11 +60149,11 @@ bool HP_script_addScript(char *name, char *args, bool ( *func ) (struct script_s int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_script_addScript_pre ) { - bool (*preHookFunc) (char *name, char *args, bool ( *func ) (struct script_state *st), bool *isDeprecated); + bool (*preHookFunc) (char **name, char **args, bool ( **func ) (struct script_state *st), bool *isDeprecated); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_addScript_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_addScript_pre[hIndex].func; - retVal___ = preHookFunc(name, args, func, &isDeprecated); + retVal___ = preHookFunc(&name, &args, &func, &isDeprecated); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59997,10 +60164,10 @@ bool HP_script_addScript(char *name, char *args, bool ( *func ) (struct script_s retVal___ = HPMHooks.source.script.addScript(name, args, func, isDeprecated); } if( HPMHooks.count.HP_script_addScript_post ) { - bool (*postHookFunc) (bool retVal___, char *name, char *args, bool ( *func ) (struct script_state *st), bool *isDeprecated); + bool (*postHookFunc) (bool retVal___, char *name, char *args, bool ( *func ) (struct script_state *st), bool isDeprecated); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_addScript_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_addScript_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name, args, func, &isDeprecated); + retVal___ = postHookFunc(retVal___, name, args, func, isDeprecated); } } return retVal___; @@ -60009,11 +60176,11 @@ int HP_script_conv_num(struct script_state *st, struct script_data *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_conv_num_pre ) { - int (*preHookFunc) (struct script_state *st, struct script_data *data); + int (*preHookFunc) (struct script_state **st, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_conv_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_conv_num_pre[hIndex].func; - retVal___ = preHookFunc(st, data); + retVal___ = preHookFunc(&st, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60036,11 +60203,11 @@ const char* HP_script_conv_str(struct script_state *st, struct script_data *data int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_conv_str_pre ) { - const char* (*preHookFunc) (struct script_state *st, struct script_data *data); + const char* (*preHookFunc) (struct script_state **st, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_conv_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_conv_str_pre[hIndex].func; - retVal___ = preHookFunc(st, data); + retVal___ = preHookFunc(&st, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60063,11 +60230,11 @@ struct map_session_data* HP_script_rid2sd(struct script_state *st) { int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_script_rid2sd_pre ) { - struct map_session_data* (*preHookFunc) (struct script_state *st); + struct map_session_data* (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_rid2sd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_rid2sd_pre[hIndex].func; - retVal___ = preHookFunc(st); + retVal___ = preHookFunc(&st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60090,11 +60257,11 @@ struct map_session_data* HP_script_id2sd(struct script_state *st, int account_id int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_script_id2sd_pre ) { - struct map_session_data* (*preHookFunc) (struct script_state *st, int *account_id); + struct map_session_data* (*preHookFunc) (struct script_state **st, int *account_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_id2sd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_id2sd_pre[hIndex].func; - retVal___ = preHookFunc(st, &account_id); + retVal___ = preHookFunc(&st, &account_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60105,10 +60272,10 @@ struct map_session_data* HP_script_id2sd(struct script_state *st, int account_id retVal___ = HPMHooks.source.script.id2sd(st, account_id); } if( HPMHooks.count.HP_script_id2sd_post ) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct script_state *st, int *account_id); + struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct script_state *st, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_id2sd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_id2sd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, st, &account_id); + retVal___ = postHookFunc(retVal___, st, account_id); } } return retVal___; @@ -60117,11 +60284,11 @@ struct map_session_data* HP_script_charid2sd(struct script_state *st, int char_i int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_script_charid2sd_pre ) { - struct map_session_data* (*preHookFunc) (struct script_state *st, int *char_id); + struct map_session_data* (*preHookFunc) (struct script_state **st, int *char_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_charid2sd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_charid2sd_pre[hIndex].func; - retVal___ = preHookFunc(st, &char_id); + retVal___ = preHookFunc(&st, &char_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60132,10 +60299,10 @@ struct map_session_data* HP_script_charid2sd(struct script_state *st, int char_i retVal___ = HPMHooks.source.script.charid2sd(st, char_id); } if( HPMHooks.count.HP_script_charid2sd_post ) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct script_state *st, int *char_id); + struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct script_state *st, int char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_charid2sd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_charid2sd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, st, &char_id); + retVal___ = postHookFunc(retVal___, st, char_id); } } return retVal___; @@ -60144,11 +60311,11 @@ struct map_session_data* HP_script_nick2sd(struct script_state *st, const char * int hIndex = 0; struct map_session_data* retVal___ = NULL; if( HPMHooks.count.HP_script_nick2sd_pre ) { - struct map_session_data* (*preHookFunc) (struct script_state *st, const char *name); + struct map_session_data* (*preHookFunc) (struct script_state **st, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_nick2sd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_nick2sd_pre[hIndex].func; - retVal___ = preHookFunc(st, name); + retVal___ = preHookFunc(&st, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60170,11 +60337,11 @@ struct map_session_data* HP_script_nick2sd(struct script_state *st, const char * void HP_script_detach_rid(struct script_state *st) { int hIndex = 0; if( HPMHooks.count.HP_script_detach_rid_pre ) { - void (*preHookFunc) (struct script_state *st); + void (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_detach_rid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_detach_rid_pre[hIndex].func; - preHookFunc(st); + preHookFunc(&st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60197,11 +60364,11 @@ struct script_data* HP_script_push_val(struct script_stack *stack, enum c_op typ int hIndex = 0; struct script_data* retVal___ = NULL; if( HPMHooks.count.HP_script_push_val_pre ) { - struct script_data* (*preHookFunc) (struct script_stack *stack, enum c_op *type, int64 *val, struct reg_db *ref); + struct script_data* (*preHookFunc) (struct script_stack **stack, enum c_op *type, int64 *val, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_val_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_push_val_pre[hIndex].func; - retVal___ = preHookFunc(stack, &type, &val, ref); + retVal___ = preHookFunc(&stack, &type, &val, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60212,10 +60379,10 @@ struct script_data* HP_script_push_val(struct script_stack *stack, enum c_op typ retVal___ = HPMHooks.source.script.push_val(stack, type, val, ref); } if( HPMHooks.count.HP_script_push_val_post ) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, enum c_op *type, int64 *val, struct reg_db *ref); + struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, enum c_op type, int64 val, struct reg_db *ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_val_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_push_val_post[hIndex].func; - retVal___ = postHookFunc(retVal___, stack, &type, &val, ref); + retVal___ = postHookFunc(retVal___, stack, type, val, ref); } } return retVal___; @@ -60224,11 +60391,11 @@ struct script_data* HP_script_get_val(struct script_state *st, struct script_dat int hIndex = 0; struct script_data* retVal___ = NULL; if( HPMHooks.count.HP_script_get_val_pre ) { - struct script_data* (*preHookFunc) (struct script_state *st, struct script_data *data); + struct script_data* (*preHookFunc) (struct script_state **st, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_pre[hIndex].func; - retVal___ = preHookFunc(st, data); + retVal___ = preHookFunc(&st, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60251,11 +60418,11 @@ char* HP_script_get_val_ref_str(struct script_state *st, struct reg_db *n, struc int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_script_get_val_ref_str_pre ) { - char* (*preHookFunc) (struct script_state *st, struct reg_db *n, struct script_data *data); + char* (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_ref_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_ref_str_pre[hIndex].func; - retVal___ = preHookFunc(st, n, data); + retVal___ = preHookFunc(&st, &n, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60278,11 +60445,11 @@ char* HP_script_get_val_scope_str(struct script_state *st, struct reg_db *n, str int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_script_get_val_scope_str_pre ) { - char* (*preHookFunc) (struct script_state *st, struct reg_db *n, struct script_data *data); + char* (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_scope_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_scope_str_pre[hIndex].func; - retVal___ = preHookFunc(st, n, data); + retVal___ = preHookFunc(&st, &n, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60305,11 +60472,11 @@ char* HP_script_get_val_npc_str(struct script_state *st, struct reg_db *n, struc int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_script_get_val_npc_str_pre ) { - char* (*preHookFunc) (struct script_state *st, struct reg_db *n, struct script_data *data); + char* (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_npc_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_npc_str_pre[hIndex].func; - retVal___ = preHookFunc(st, n, data); + retVal___ = preHookFunc(&st, &n, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60332,11 +60499,11 @@ char* HP_script_get_val_instance_str(struct script_state *st, const char *name, int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_script_get_val_instance_str_pre ) { - char* (*preHookFunc) (struct script_state *st, const char *name, struct script_data *data); + char* (*preHookFunc) (struct script_state **st, const char **name, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_instance_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_instance_str_pre[hIndex].func; - retVal___ = preHookFunc(st, name, data); + retVal___ = preHookFunc(&st, &name, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60359,11 +60526,11 @@ int HP_script_get_val_ref_num(struct script_state *st, struct reg_db *n, struct int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_get_val_ref_num_pre ) { - int (*preHookFunc) (struct script_state *st, struct reg_db *n, struct script_data *data); + int (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_ref_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_ref_num_pre[hIndex].func; - retVal___ = preHookFunc(st, n, data); + retVal___ = preHookFunc(&st, &n, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60386,11 +60553,11 @@ int HP_script_get_val_scope_num(struct script_state *st, struct reg_db *n, struc int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_get_val_scope_num_pre ) { - int (*preHookFunc) (struct script_state *st, struct reg_db *n, struct script_data *data); + int (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_scope_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_scope_num_pre[hIndex].func; - retVal___ = preHookFunc(st, n, data); + retVal___ = preHookFunc(&st, &n, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60413,11 +60580,11 @@ int HP_script_get_val_npc_num(struct script_state *st, struct reg_db *n, struct int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_get_val_npc_num_pre ) { - int (*preHookFunc) (struct script_state *st, struct reg_db *n, struct script_data *data); + int (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_npc_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_npc_num_pre[hIndex].func; - retVal___ = preHookFunc(st, n, data); + retVal___ = preHookFunc(&st, &n, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60440,11 +60607,11 @@ int HP_script_get_val_instance_num(struct script_state *st, const char *name, st int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_get_val_instance_num_pre ) { - int (*preHookFunc) (struct script_state *st, const char *name, struct script_data *data); + int (*preHookFunc) (struct script_state **st, const char **name, struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_instance_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_instance_num_pre[hIndex].func; - retVal___ = preHookFunc(st, name, data); + retVal___ = preHookFunc(&st, &name, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60463,15 +60630,15 @@ int HP_script_get_val_instance_num(struct script_state *st, const char *name, st } return retVal___; } -void* HP_script_get_val2(struct script_state *st, int64 uid, struct reg_db *ref) { +const void* HP_script_get_val2(struct script_state *st, int64 uid, struct reg_db *ref) { int hIndex = 0; - void* retVal___ = NULL; + const void* retVal___ = NULL; if( HPMHooks.count.HP_script_get_val2_pre ) { - void* (*preHookFunc) (struct script_state *st, int64 *uid, struct reg_db *ref); + const void* (*preHookFunc) (struct script_state **st, int64 *uid, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val2_pre[hIndex].func; - retVal___ = preHookFunc(st, &uid, ref); + retVal___ = preHookFunc(&st, &uid, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60482,23 +60649,23 @@ void* HP_script_get_val2(struct script_state *st, int64 uid, struct reg_db *ref) retVal___ = HPMHooks.source.script.get_val2(st, uid, ref); } if( HPMHooks.count.HP_script_get_val2_post ) { - void* (*postHookFunc) (void* retVal___, struct script_state *st, int64 *uid, struct reg_db *ref); + const void* (*postHookFunc) (const void* retVal___, struct script_state *st, int64 uid, struct reg_db *ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_get_val2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, st, &uid, ref); + retVal___ = postHookFunc(retVal___, st, uid, ref); } } return retVal___; } -struct script_data* HP_script_push_str(struct script_stack *stack, enum c_op type, char *str) { +struct script_data* HP_script_push_str(struct script_stack *stack, char *str) { int hIndex = 0; struct script_data* retVal___ = NULL; if( HPMHooks.count.HP_script_push_str_pre ) { - struct script_data* (*preHookFunc) (struct script_stack *stack, enum c_op *type, char *str); + struct script_data* (*preHookFunc) (struct script_stack **stack, char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_push_str_pre[hIndex].func; - retVal___ = preHookFunc(stack, &type, str); + retVal___ = preHookFunc(&stack, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60506,13 +60673,40 @@ struct script_data* HP_script_push_str(struct script_stack *stack, enum c_op typ } } { - retVal___ = HPMHooks.source.script.push_str(stack, type, str); + retVal___ = HPMHooks.source.script.push_str(stack, str); } if( HPMHooks.count.HP_script_push_str_post ) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, enum c_op *type, char *str); + struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_push_str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, stack, &type, str); + retVal___ = postHookFunc(retVal___, stack, str); + } + } + return retVal___; +} +struct script_data* HP_script_push_conststr(struct script_stack *stack, const char *str) { + int hIndex = 0; + struct script_data* retVal___ = NULL; + if( HPMHooks.count.HP_script_push_conststr_pre ) { + struct script_data* (*preHookFunc) (struct script_stack **stack, const char **str); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_conststr_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_push_conststr_pre[hIndex].func; + retVal___ = preHookFunc(&stack, &str); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.push_conststr(stack, str); + } + if( HPMHooks.count.HP_script_push_conststr_post ) { + struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, const char *str); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_conststr_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_push_conststr_post[hIndex].func; + retVal___ = postHookFunc(retVal___, stack, str); } } return retVal___; @@ -60521,11 +60715,11 @@ struct script_data* HP_script_push_copy(struct script_stack *stack, int pos) { int hIndex = 0; struct script_data* retVal___ = NULL; if( HPMHooks.count.HP_script_push_copy_pre ) { - struct script_data* (*preHookFunc) (struct script_stack *stack, int *pos); + struct script_data* (*preHookFunc) (struct script_stack **stack, int *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_copy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_push_copy_pre[hIndex].func; - retVal___ = preHookFunc(stack, &pos); + retVal___ = preHookFunc(&stack, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60536,10 +60730,10 @@ struct script_data* HP_script_push_copy(struct script_stack *stack, int pos) { retVal___ = HPMHooks.source.script.push_copy(stack, pos); } if( HPMHooks.count.HP_script_push_copy_post ) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, int *pos); + struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, int pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_copy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_push_copy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, stack, &pos); + retVal___ = postHookFunc(retVal___, stack, pos); } } return retVal___; @@ -60547,11 +60741,11 @@ struct script_data* HP_script_push_copy(struct script_stack *stack, int pos) { void HP_script_pop_stack(struct script_state *st, int start, int end) { int hIndex = 0; if( HPMHooks.count.HP_script_pop_stack_pre ) { - void (*preHookFunc) (struct script_state *st, int *start, int *end); + void (*preHookFunc) (struct script_state **st, int *start, int *end); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_pop_stack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_pop_stack_pre[hIndex].func; - preHookFunc(st, &start, &end); + preHookFunc(&st, &start, &end); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60562,10 +60756,10 @@ void HP_script_pop_stack(struct script_state *st, int start, int end) { HPMHooks.source.script.pop_stack(st, start, end); } if( HPMHooks.count.HP_script_pop_stack_post ) { - void (*postHookFunc) (struct script_state *st, int *start, int *end); + void (*postHookFunc) (struct script_state *st, int start, int end); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_pop_stack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_pop_stack_post[hIndex].func; - postHookFunc(st, &start, &end); + postHookFunc(st, start, end); } } return; @@ -60573,11 +60767,11 @@ void HP_script_pop_stack(struct script_state *st, int start, int end) { void HP_script_set_constant(const char *name, int value, bool is_parameter, bool is_deprecated) { int hIndex = 0; if( HPMHooks.count.HP_script_set_constant_pre ) { - void (*preHookFunc) (const char *name, int *value, bool *is_parameter, bool *is_deprecated); + void (*preHookFunc) (const char **name, int *value, bool *is_parameter, bool *is_deprecated); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_constant_pre[hIndex].func; - preHookFunc(name, &value, &is_parameter, &is_deprecated); + preHookFunc(&name, &value, &is_parameter, &is_deprecated); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60588,10 +60782,10 @@ void HP_script_set_constant(const char *name, int value, bool is_parameter, bool HPMHooks.source.script.set_constant(name, value, is_parameter, is_deprecated); } if( HPMHooks.count.HP_script_set_constant_post ) { - void (*postHookFunc) (const char *name, int *value, bool *is_parameter, bool *is_deprecated); + void (*postHookFunc) (const char *name, int value, bool is_parameter, bool is_deprecated); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_constant_post[hIndex].func; - postHookFunc(name, &value, &is_parameter, &is_deprecated); + postHookFunc(name, value, is_parameter, is_deprecated); } } return; @@ -60599,11 +60793,11 @@ void HP_script_set_constant(const char *name, int value, bool is_parameter, bool void HP_script_set_constant2(const char *name, int value, bool is_parameter, bool is_deprecated) { int hIndex = 0; if( HPMHooks.count.HP_script_set_constant2_pre ) { - void (*preHookFunc) (const char *name, int *value, bool *is_parameter, bool *is_deprecated); + void (*preHookFunc) (const char **name, int *value, bool *is_parameter, bool *is_deprecated); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_constant2_pre[hIndex].func; - preHookFunc(name, &value, &is_parameter, &is_deprecated); + preHookFunc(&name, &value, &is_parameter, &is_deprecated); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60614,10 +60808,10 @@ void HP_script_set_constant2(const char *name, int value, bool is_parameter, boo HPMHooks.source.script.set_constant2(name, value, is_parameter, is_deprecated); } if( HPMHooks.count.HP_script_set_constant2_post ) { - void (*postHookFunc) (const char *name, int *value, bool *is_parameter, bool *is_deprecated); + void (*postHookFunc) (const char *name, int value, bool is_parameter, bool is_deprecated); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_constant2_post[hIndex].func; - postHookFunc(name, &value, &is_parameter, &is_deprecated); + postHookFunc(name, value, is_parameter, is_deprecated); } } return; @@ -60626,11 +60820,11 @@ bool HP_script_get_constant(const char *name, int *value) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_script_get_constant_pre ) { - bool (*preHookFunc) (const char *name, int *value); + bool (*preHookFunc) (const char **name, int **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_constant_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_constant_pre[hIndex].func; - retVal___ = preHookFunc(name, value); + retVal___ = preHookFunc(&name, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60667,10 +60861,10 @@ void HP_script_label_add(int key, int pos) { HPMHooks.source.script.label_add(key, pos); } if( HPMHooks.count.HP_script_label_add_post ) { - void (*postHookFunc) (int *key, int *pos); + void (*postHookFunc) (int key, int pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_label_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_label_add_post[hIndex].func; - postHookFunc(&key, &pos); + postHookFunc(key, pos); } } return; @@ -60678,11 +60872,11 @@ void HP_script_label_add(int key, int pos) { void HP_script_run(struct script_code *rootscript, int pos, int rid, int oid) { int hIndex = 0; if( HPMHooks.count.HP_script_run_pre ) { - void (*preHookFunc) (struct script_code *rootscript, int *pos, int *rid, int *oid); + void (*preHookFunc) (struct script_code **rootscript, int *pos, int *rid, int *oid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_pre[hIndex].func; - preHookFunc(rootscript, &pos, &rid, &oid); + preHookFunc(&rootscript, &pos, &rid, &oid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60693,10 +60887,10 @@ void HP_script_run(struct script_code *rootscript, int pos, int rid, int oid) { HPMHooks.source.script.run(rootscript, pos, rid, oid); } if( HPMHooks.count.HP_script_run_post ) { - void (*postHookFunc) (struct script_code *rootscript, int *pos, int *rid, int *oid); + void (*postHookFunc) (struct script_code *rootscript, int pos, int rid, int oid); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_run_post[hIndex].func; - postHookFunc(rootscript, &pos, &rid, &oid); + postHookFunc(rootscript, pos, rid, oid); } } return; @@ -60704,11 +60898,11 @@ void HP_script_run(struct script_code *rootscript, int pos, int rid, int oid) { void HP_script_run_npc(struct script_code *rootscript, int pos, int rid, int oid) { int hIndex = 0; if( HPMHooks.count.HP_script_run_npc_pre ) { - void (*preHookFunc) (struct script_code *rootscript, int *pos, int *rid, int *oid); + void (*preHookFunc) (struct script_code **rootscript, int *pos, int *rid, int *oid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_npc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_npc_pre[hIndex].func; - preHookFunc(rootscript, &pos, &rid, &oid); + preHookFunc(&rootscript, &pos, &rid, &oid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60719,10 +60913,10 @@ void HP_script_run_npc(struct script_code *rootscript, int pos, int rid, int oid HPMHooks.source.script.run_npc(rootscript, pos, rid, oid); } if( HPMHooks.count.HP_script_run_npc_post ) { - void (*postHookFunc) (struct script_code *rootscript, int *pos, int *rid, int *oid); + void (*postHookFunc) (struct script_code *rootscript, int pos, int rid, int oid); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_npc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_run_npc_post[hIndex].func; - postHookFunc(rootscript, &pos, &rid, &oid); + postHookFunc(rootscript, pos, rid, oid); } } return; @@ -60730,11 +60924,11 @@ void HP_script_run_npc(struct script_code *rootscript, int pos, int rid, int oid void HP_script_run_pet(struct script_code *rootscript, int pos, int rid, int oid) { int hIndex = 0; if( HPMHooks.count.HP_script_run_pet_pre ) { - void (*preHookFunc) (struct script_code *rootscript, int *pos, int *rid, int *oid); + void (*preHookFunc) (struct script_code **rootscript, int *pos, int *rid, int *oid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_pet_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_pet_pre[hIndex].func; - preHookFunc(rootscript, &pos, &rid, &oid); + preHookFunc(&rootscript, &pos, &rid, &oid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60745,10 +60939,10 @@ void HP_script_run_pet(struct script_code *rootscript, int pos, int rid, int oid HPMHooks.source.script.run_pet(rootscript, pos, rid, oid); } if( HPMHooks.count.HP_script_run_pet_post ) { - void (*postHookFunc) (struct script_code *rootscript, int *pos, int *rid, int *oid); + void (*postHookFunc) (struct script_code *rootscript, int pos, int rid, int oid); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_pet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_run_pet_post[hIndex].func; - postHookFunc(rootscript, &pos, &rid, &oid); + postHookFunc(rootscript, pos, rid, oid); } } return; @@ -60756,11 +60950,11 @@ void HP_script_run_pet(struct script_code *rootscript, int pos, int rid, int oid void HP_script_run_main(struct script_state *st) { int hIndex = 0; if( HPMHooks.count.HP_script_run_main_pre ) { - void (*preHookFunc) (struct script_state *st); + void (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_main_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_main_pre[hIndex].func; - preHookFunc(st); + preHookFunc(&st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60798,10 +60992,10 @@ int HP_script_run_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.script.run_timer(tid, tick, id, data); } if( HPMHooks.count.HP_script_run_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_run_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -60810,11 +61004,11 @@ int HP_script_set_var(struct map_session_data *sd, char *name, void *val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_set_var_pre ) { - int (*preHookFunc) (struct map_session_data *sd, char *name, void *val); + int (*preHookFunc) (struct map_session_data **sd, char **name, void **val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_var_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_var_pre[hIndex].func; - retVal___ = preHookFunc(sd, name, val); + retVal___ = preHookFunc(&sd, &name, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60836,11 +61030,11 @@ int HP_script_set_var(struct map_session_data *sd, char *name, void *val) { void HP_script_stop_instances(struct script_code *code) { int hIndex = 0; if( HPMHooks.count.HP_script_stop_instances_pre ) { - void (*preHookFunc) (struct script_code *code); + void (*preHookFunc) (struct script_code **code); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_stop_instances_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_stop_instances_pre[hIndex].func; - preHookFunc(code); + preHookFunc(&code); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60862,11 +61056,11 @@ void HP_script_stop_instances(struct script_code *code) { void HP_script_free_code(struct script_code *code) { int hIndex = 0; if( HPMHooks.count.HP_script_free_code_pre ) { - void (*preHookFunc) (struct script_code *code); + void (*preHookFunc) (struct script_code **code); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_free_code_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_free_code_pre[hIndex].func; - preHookFunc(code); + preHookFunc(&code); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60888,11 +61082,11 @@ void HP_script_free_code(struct script_code *code) { void HP_script_free_vars(struct DBMap *var_storage) { int hIndex = 0; if( HPMHooks.count.HP_script_free_vars_pre ) { - void (*preHookFunc) (struct DBMap *var_storage); + void (*preHookFunc) (struct DBMap **var_storage); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_free_vars_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_free_vars_pre[hIndex].func; - preHookFunc(var_storage); + preHookFunc(&var_storage); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60915,11 +61109,11 @@ struct script_state* HP_script_alloc_state(struct script_code *rootscript, int p int hIndex = 0; struct script_state* retVal___ = NULL; if( HPMHooks.count.HP_script_alloc_state_pre ) { - struct script_state* (*preHookFunc) (struct script_code *rootscript, int *pos, int *rid, int *oid); + struct script_state* (*preHookFunc) (struct script_code **rootscript, int *pos, int *rid, int *oid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_alloc_state_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_alloc_state_pre[hIndex].func; - retVal___ = preHookFunc(rootscript, &pos, &rid, &oid); + retVal___ = preHookFunc(&rootscript, &pos, &rid, &oid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60930,10 +61124,10 @@ struct script_state* HP_script_alloc_state(struct script_code *rootscript, int p retVal___ = HPMHooks.source.script.alloc_state(rootscript, pos, rid, oid); } if( HPMHooks.count.HP_script_alloc_state_post ) { - struct script_state* (*postHookFunc) (struct script_state* retVal___, struct script_code *rootscript, int *pos, int *rid, int *oid); + struct script_state* (*postHookFunc) (struct script_state* retVal___, struct script_code *rootscript, int pos, int rid, int oid); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_alloc_state_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_alloc_state_post[hIndex].func; - retVal___ = postHookFunc(retVal___, rootscript, &pos, &rid, &oid); + retVal___ = postHookFunc(retVal___, rootscript, pos, rid, oid); } } return retVal___; @@ -60941,11 +61135,11 @@ struct script_state* HP_script_alloc_state(struct script_code *rootscript, int p void HP_script_free_state(struct script_state *st) { int hIndex = 0; if( HPMHooks.count.HP_script_free_state_pre ) { - void (*preHookFunc) (struct script_state *st); + void (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_free_state_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_free_state_pre[hIndex].func; - preHookFunc(st); + preHookFunc(&st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60967,11 +61161,11 @@ void HP_script_free_state(struct script_state *st) { void HP_script_add_pending_ref(struct script_state *st, struct reg_db *ref) { int hIndex = 0; if( HPMHooks.count.HP_script_add_pending_ref_pre ) { - void (*preHookFunc) (struct script_state *st, struct reg_db *ref); + void (*preHookFunc) (struct script_state **st, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_add_pending_ref_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_add_pending_ref_pre[hIndex].func; - preHookFunc(st, ref); + preHookFunc(&st, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60993,11 +61187,11 @@ void HP_script_add_pending_ref(struct script_state *st, struct reg_db *ref) { void HP_script_run_autobonus(const char *autobonus, int id, int pos) { int hIndex = 0; if( HPMHooks.count.HP_script_run_autobonus_pre ) { - void (*preHookFunc) (const char *autobonus, int *id, int *pos); + void (*preHookFunc) (const char **autobonus, int *id, int *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_autobonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_autobonus_pre[hIndex].func; - preHookFunc(autobonus, &id, &pos); + preHookFunc(&autobonus, &id, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61008,10 +61202,10 @@ void HP_script_run_autobonus(const char *autobonus, int id, int pos) { HPMHooks.source.script.run_autobonus(autobonus, id, pos); } if( HPMHooks.count.HP_script_run_autobonus_post ) { - void (*postHookFunc) (const char *autobonus, int *id, int *pos); + void (*postHookFunc) (const char *autobonus, int id, int pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_autobonus_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_run_autobonus_post[hIndex].func; - postHookFunc(autobonus, &id, &pos); + postHookFunc(autobonus, id, pos); } } return; @@ -61019,11 +61213,11 @@ void HP_script_run_autobonus(const char *autobonus, int id, int pos) { void HP_script_cleararray_pc(struct map_session_data *sd, const char *varname, void *value) { int hIndex = 0; if( HPMHooks.count.HP_script_cleararray_pc_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *varname, void *value); + void (*preHookFunc) (struct map_session_data **sd, const char **varname, void **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_cleararray_pc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_cleararray_pc_pre[hIndex].func; - preHookFunc(sd, varname, value); + preHookFunc(&sd, &varname, &value); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61045,11 +61239,11 @@ void HP_script_cleararray_pc(struct map_session_data *sd, const char *varname, v void HP_script_setarray_pc(struct map_session_data *sd, const char *varname, uint32 idx, void *value, int *refcache) { int hIndex = 0; if( HPMHooks.count.HP_script_setarray_pc_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *varname, uint32 *idx, void *value, int *refcache); + void (*preHookFunc) (struct map_session_data **sd, const char **varname, uint32 *idx, void **value, int **refcache); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_setarray_pc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_setarray_pc_pre[hIndex].func; - preHookFunc(sd, varname, &idx, value, refcache); + preHookFunc(&sd, &varname, &idx, &value, &refcache); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61060,10 +61254,10 @@ void HP_script_setarray_pc(struct map_session_data *sd, const char *varname, uin HPMHooks.source.script.setarray_pc(sd, varname, idx, value, refcache); } if( HPMHooks.count.HP_script_setarray_pc_post ) { - void (*postHookFunc) (struct map_session_data *sd, const char *varname, uint32 *idx, void *value, int *refcache); + void (*postHookFunc) (struct map_session_data *sd, const char *varname, uint32 idx, void *value, int *refcache); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_setarray_pc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_setarray_pc_post[hIndex].func; - postHookFunc(sd, varname, &idx, value, refcache); + postHookFunc(sd, varname, idx, value, refcache); } } return; @@ -61072,11 +61266,11 @@ int HP_script_config_read(char *cfgName) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_config_read_pre ) { - int (*preHookFunc) (char *cfgName); + int (*preHookFunc) (char **cfgName); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_config_read_pre[hIndex].func; - retVal___ = preHookFunc(cfgName); + retVal___ = preHookFunc(&cfgName); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61099,11 +61293,11 @@ int HP_script_add_str(const char *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_add_str_pre ) { - int (*preHookFunc) (const char *p); + int (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_add_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_add_str_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61141,10 +61335,10 @@ const char* HP_script_get_str(int id) { retVal___ = HPMHooks.source.script.get_str(id); } if( HPMHooks.count.HP_script_get_str_post ) { - const char* (*postHookFunc) (const char* retVal___, int *id); + const char* (*postHookFunc) (const char* retVal___, int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_get_str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &id); + retVal___ = postHookFunc(retVal___, id); } } return retVal___; @@ -61153,11 +61347,11 @@ int HP_script_search_str(const char *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_search_str_pre ) { - int (*preHookFunc) (const char *p); + int (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_search_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_search_str_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61176,14 +61370,14 @@ int HP_script_search_str(const char *p) { } return retVal___; } -void HP_script_setd_sub(struct script_state *st, struct map_session_data *sd, const char *varname, int elem, void *value, struct reg_db *ref) { +void HP_script_setd_sub(struct script_state *st, struct map_session_data *sd, const char *varname, int elem, const void *value, struct reg_db *ref) { int hIndex = 0; if( HPMHooks.count.HP_script_setd_sub_pre ) { - void (*preHookFunc) (struct script_state *st, struct map_session_data *sd, const char *varname, int *elem, void *value, struct reg_db *ref); + void (*preHookFunc) (struct script_state **st, struct map_session_data **sd, const char **varname, int *elem, const void **value, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_setd_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_setd_sub_pre[hIndex].func; - preHookFunc(st, sd, varname, &elem, value, ref); + preHookFunc(&st, &sd, &varname, &elem, &value, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61194,10 +61388,10 @@ void HP_script_setd_sub(struct script_state *st, struct map_session_data *sd, co HPMHooks.source.script.setd_sub(st, sd, varname, elem, value, ref); } if( HPMHooks.count.HP_script_setd_sub_post ) { - void (*postHookFunc) (struct script_state *st, struct map_session_data *sd, const char *varname, int *elem, void *value, struct reg_db *ref); + void (*postHookFunc) (struct script_state *st, struct map_session_data *sd, const char *varname, int elem, const void *value, struct reg_db *ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_setd_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_setd_sub_post[hIndex].func; - postHookFunc(st, sd, varname, &elem, value, ref); + postHookFunc(st, sd, varname, elem, value, ref); } } return; @@ -61205,11 +61399,11 @@ void HP_script_setd_sub(struct script_state *st, struct map_session_data *sd, co void HP_script_attach_state(struct script_state *st) { int hIndex = 0; if( HPMHooks.count.HP_script_attach_state_pre ) { - void (*preHookFunc) (struct script_state *st); + void (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_attach_state_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_attach_state_pre[hIndex].func; - preHookFunc(st); + preHookFunc(&st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61247,10 +61441,10 @@ struct script_queue* HP_script_queue(int idx) { retVal___ = HPMHooks.source.script.queue(idx); } if( HPMHooks.count.HP_script_queue_post ) { - struct script_queue* (*postHookFunc) (struct script_queue* retVal___, int *idx); + struct script_queue* (*postHookFunc) (struct script_queue* retVal___, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_queue_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_queue_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &idx); + retVal___ = postHookFunc(retVal___, idx); } } return retVal___; @@ -61274,10 +61468,10 @@ bool HP_script_queue_add(int idx, int var) { retVal___ = HPMHooks.source.script.queue_add(idx, var); } if( HPMHooks.count.HP_script_queue_add_post ) { - bool (*postHookFunc) (bool retVal___, int *idx, int *var); + bool (*postHookFunc) (bool retVal___, int idx, int var); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_queue_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_queue_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &idx, &var); + retVal___ = postHookFunc(retVal___, idx, var); } } return retVal___; @@ -61301,10 +61495,10 @@ bool HP_script_queue_del(int idx) { retVal___ = HPMHooks.source.script.queue_del(idx); } if( HPMHooks.count.HP_script_queue_del_post ) { - bool (*postHookFunc) (bool retVal___, int *idx); + bool (*postHookFunc) (bool retVal___, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_queue_del_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_queue_del_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &idx); + retVal___ = postHookFunc(retVal___, idx); } } return retVal___; @@ -61328,10 +61522,10 @@ bool HP_script_queue_remove(int idx, int var) { retVal___ = HPMHooks.source.script.queue_remove(idx, var); } if( HPMHooks.count.HP_script_queue_remove_post ) { - bool (*postHookFunc) (bool retVal___, int *idx, int *var); + bool (*postHookFunc) (bool retVal___, int idx, int var); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_queue_remove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_queue_remove_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &idx, &var); + retVal___ = postHookFunc(retVal___, idx, var); } } return retVal___; @@ -61382,10 +61576,10 @@ bool HP_script_queue_clear(int idx) { retVal___ = HPMHooks.source.script.queue_clear(idx); } if( HPMHooks.count.HP_script_queue_clear_post ) { - bool (*postHookFunc) (bool retVal___, int *idx); + bool (*postHookFunc) (bool retVal___, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_queue_clear_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_queue_clear_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &idx); + retVal___ = postHookFunc(retVal___, idx); } } return retVal___; @@ -61394,11 +61588,11 @@ const char* HP_script_parse_curly_close(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_curly_close_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_curly_close_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_curly_close_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61421,11 +61615,11 @@ const char* HP_script_parse_syntax_close(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_syntax_close_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_close_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_syntax_close_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61448,11 +61642,11 @@ const char* HP_script_parse_syntax_close_sub(const char *p, int *flag) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_syntax_close_sub_pre ) { - const char* (*preHookFunc) (const char *p, int *flag); + const char* (*preHookFunc) (const char **p, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_close_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_syntax_close_sub_pre[hIndex].func; - retVal___ = preHookFunc(p, flag); + retVal___ = preHookFunc(&p, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61475,11 +61669,11 @@ const char* HP_script_parse_syntax(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_syntax_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_syntax_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61502,11 +61696,11 @@ c_op HP_script_get_com(unsigned char *scriptbuf, int *pos) { int hIndex = 0; c_op retVal___ = C_NOP; if( HPMHooks.count.HP_script_get_com_pre ) { - c_op (*preHookFunc) (unsigned char *scriptbuf, int *pos); + c_op (*preHookFunc) (unsigned char **scriptbuf, int **pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_com_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_com_pre[hIndex].func; - retVal___ = preHookFunc(scriptbuf, pos); + retVal___ = preHookFunc(&scriptbuf, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61529,11 +61723,11 @@ int HP_script_get_num(unsigned char *scriptbuf, int *pos) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_get_num_pre ) { - int (*preHookFunc) (unsigned char *scriptbuf, int *pos); + int (*preHookFunc) (unsigned char **scriptbuf, int **pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_num_pre[hIndex].func; - retVal___ = preHookFunc(scriptbuf, pos); + retVal___ = preHookFunc(&scriptbuf, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61571,10 +61765,10 @@ const char* HP_script_op2name(int op) { retVal___ = HPMHooks.source.script.op2name(op); } if( HPMHooks.count.HP_script_op2name_post ) { - const char* (*postHookFunc) (const char* retVal___, int *op); + const char* (*postHookFunc) (const char* retVal___, int op); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op2name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_op2name_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &op); + retVal___ = postHookFunc(retVal___, op); } } return retVal___; @@ -61582,11 +61776,11 @@ const char* HP_script_op2name(int op) { void HP_script_reportsrc(struct script_state *st) { int hIndex = 0; if( HPMHooks.count.HP_script_reportsrc_pre ) { - void (*preHookFunc) (struct script_state *st); + void (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reportsrc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_reportsrc_pre[hIndex].func; - preHookFunc(st); + preHookFunc(&st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61608,11 +61802,11 @@ void HP_script_reportsrc(struct script_state *st) { void HP_script_reportdata(struct script_data *data) { int hIndex = 0; if( HPMHooks.count.HP_script_reportdata_pre ) { - void (*preHookFunc) (struct script_data *data); + void (*preHookFunc) (struct script_data **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reportdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_reportdata_pre[hIndex].func; - preHookFunc(data); + preHookFunc(&data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61634,11 +61828,11 @@ void HP_script_reportdata(struct script_data *data) { void HP_script_reportfunc(struct script_state *st) { int hIndex = 0; if( HPMHooks.count.HP_script_reportfunc_pre ) { - void (*preHookFunc) (struct script_state *st); + void (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reportfunc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_reportfunc_pre[hIndex].func; - preHookFunc(st); + preHookFunc(&st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61660,11 +61854,11 @@ void HP_script_reportfunc(struct script_state *st) { void HP_script_disp_warning_message(const char *mes, const char *pos) { int hIndex = 0; if( HPMHooks.count.HP_script_disp_warning_message_pre ) { - void (*preHookFunc) (const char *mes, const char *pos); + void (*preHookFunc) (const char **mes, const char **pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_disp_warning_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_disp_warning_message_pre[hIndex].func; - preHookFunc(mes, pos); + preHookFunc(&mes, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61686,11 +61880,11 @@ void HP_script_disp_warning_message(const char *mes, const char *pos) { void HP_script_check_event(struct script_state *st, const char *evt) { int hIndex = 0; if( HPMHooks.count.HP_script_check_event_pre ) { - void (*preHookFunc) (struct script_state *st, const char *evt); + void (*preHookFunc) (struct script_state **st, const char **evt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_check_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_check_event_pre[hIndex].func; - preHookFunc(st, evt); + preHookFunc(&st, &evt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61713,11 +61907,11 @@ unsigned int HP_script_calc_hash(const char *p) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_script_calc_hash_pre ) { - unsigned int (*preHookFunc) (const char *p); + unsigned int (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_calc_hash_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_calc_hash_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61754,10 +61948,10 @@ void HP_script_addb(int a) { HPMHooks.source.script.addb(a); } if( HPMHooks.count.HP_script_addb_post ) { - void (*postHookFunc) (int *a); + void (*postHookFunc) (int a); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_addb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_addb_post[hIndex].func; - postHookFunc(&a); + postHookFunc(a); } } return; @@ -61780,10 +61974,10 @@ void HP_script_addc(int a) { HPMHooks.source.script.addc(a); } if( HPMHooks.count.HP_script_addc_post ) { - void (*postHookFunc) (int *a); + void (*postHookFunc) (int a); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_addc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_addc_post[hIndex].func; - postHookFunc(&a); + postHookFunc(a); } } return; @@ -61806,10 +62000,10 @@ void HP_script_addi(int a) { HPMHooks.source.script.addi(a); } if( HPMHooks.count.HP_script_addi_post ) { - void (*postHookFunc) (int *a); + void (*postHookFunc) (int a); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_addi_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_addi_post[hIndex].func; - postHookFunc(&a); + postHookFunc(a); } } return; @@ -61832,10 +62026,10 @@ void HP_script_addl(int l) { HPMHooks.source.script.addl(l); } if( HPMHooks.count.HP_script_addl_post ) { - void (*postHookFunc) (int *l); + void (*postHookFunc) (int l); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_addl_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_addl_post[hIndex].func; - postHookFunc(&l); + postHookFunc(l); } } return; @@ -61843,11 +62037,11 @@ void HP_script_addl(int l) { void HP_script_set_label(int l, int pos, const char *script_pos) { int hIndex = 0; if( HPMHooks.count.HP_script_set_label_pre ) { - void (*preHookFunc) (int *l, int *pos, const char *script_pos); + void (*preHookFunc) (int *l, int *pos, const char **script_pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_label_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_label_pre[hIndex].func; - preHookFunc(&l, &pos, script_pos); + preHookFunc(&l, &pos, &script_pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61858,10 +62052,10 @@ void HP_script_set_label(int l, int pos, const char *script_pos) { HPMHooks.source.script.set_label(l, pos, script_pos); } if( HPMHooks.count.HP_script_set_label_post ) { - void (*postHookFunc) (int *l, int *pos, const char *script_pos); + void (*postHookFunc) (int l, int pos, const char *script_pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_label_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_label_post[hIndex].func; - postHookFunc(&l, &pos, script_pos); + postHookFunc(l, pos, script_pos); } } return; @@ -61870,11 +62064,11 @@ const char* HP_script_skip_word(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_skip_word_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_skip_word_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_skip_word_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61897,11 +62091,11 @@ int HP_script_add_word(const char *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_add_word_pre ) { - int (*preHookFunc) (const char *p); + int (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_add_word_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_add_word_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61924,11 +62118,11 @@ const char* HP_script_parse_callfunc(const char *p, int require_paren, int is_cu int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_callfunc_pre ) { - const char* (*preHookFunc) (const char *p, int *require_paren, int *is_custom); + const char* (*preHookFunc) (const char **p, int *require_paren, int *is_custom); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_callfunc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_callfunc_pre[hIndex].func; - retVal___ = preHookFunc(p, &require_paren, &is_custom); + retVal___ = preHookFunc(&p, &require_paren, &is_custom); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61939,10 +62133,10 @@ const char* HP_script_parse_callfunc(const char *p, int require_paren, int is_cu retVal___ = HPMHooks.source.script.parse_callfunc(p, require_paren, is_custom); } if( HPMHooks.count.HP_script_parse_callfunc_post ) { - const char* (*postHookFunc) (const char* retVal___, const char *p, int *require_paren, int *is_custom); + const char* (*postHookFunc) (const char* retVal___, const char *p, int require_paren, int is_custom); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_callfunc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_parse_callfunc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, p, &require_paren, &is_custom); + retVal___ = postHookFunc(retVal___, p, require_paren, is_custom); } } return retVal___; @@ -61950,11 +62144,11 @@ const char* HP_script_parse_callfunc(const char *p, int require_paren, int is_cu void HP_script_parse_nextline(bool first, const char *p) { int hIndex = 0; if( HPMHooks.count.HP_script_parse_nextline_pre ) { - void (*preHookFunc) (bool *first, const char *p); + void (*preHookFunc) (bool *first, const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_nextline_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_nextline_pre[hIndex].func; - preHookFunc(&first, p); + preHookFunc(&first, &p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61965,10 +62159,10 @@ void HP_script_parse_nextline(bool first, const char *p) { HPMHooks.source.script.parse_nextline(first, p); } if( HPMHooks.count.HP_script_parse_nextline_post ) { - void (*postHookFunc) (bool *first, const char *p); + void (*postHookFunc) (bool first, const char *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_nextline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_parse_nextline_post[hIndex].func; - postHookFunc(&first, p); + postHookFunc(first, p); } } return; @@ -61977,11 +62171,11 @@ const char* HP_script_parse_variable(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_variable_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_variable_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_variable_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62004,11 +62198,11 @@ const char* HP_script_parse_simpleexpr(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_simpleexpr_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62031,11 +62225,11 @@ const char* HP_script_parse_expr(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_expr_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_expr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_expr_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62058,11 +62252,11 @@ const char* HP_script_parse_line(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_parse_line_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_line_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_parse_line_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62110,11 +62304,11 @@ void HP_script_read_constdb(void) { void HP_script_constdb_comment(const char *comment) { int hIndex = 0; if( HPMHooks.count.HP_script_constdb_comment_pre ) { - void (*preHookFunc) (const char *comment); + void (*preHookFunc) (const char **comment); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_constdb_comment_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_constdb_comment_pre[hIndex].func; - preHookFunc(comment); + preHookFunc(&comment); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62133,15 +62327,41 @@ void HP_script_constdb_comment(const char *comment) { } return; } +void HP_script_load_parameters(void) { + int hIndex = 0; + if( HPMHooks.count.HP_script_load_parameters_pre ) { + void (*preHookFunc) (void); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_load_parameters_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_load_parameters_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.script.load_parameters(); + } + if( HPMHooks.count.HP_script_load_parameters_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_load_parameters_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_load_parameters_post[hIndex].func; + postHookFunc(); + } + } + return; +} const char* HP_script_print_line(StringBuf *buf, const char *p, const char *mark, int line) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_print_line_pre ) { - const char* (*preHookFunc) (StringBuf *buf, const char *p, const char *mark, int *line); + const char* (*preHookFunc) (StringBuf **buf, const char **p, const char **mark, int *line); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_print_line_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_print_line_pre[hIndex].func; - retVal___ = preHookFunc(buf, p, mark, &line); + retVal___ = preHookFunc(&buf, &p, &mark, &line); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62152,10 +62372,10 @@ const char* HP_script_print_line(StringBuf *buf, const char *p, const char *mark retVal___ = HPMHooks.source.script.print_line(buf, p, mark, line); } if( HPMHooks.count.HP_script_print_line_post ) { - const char* (*postHookFunc) (const char* retVal___, StringBuf *buf, const char *p, const char *mark, int *line); + const char* (*postHookFunc) (const char* retVal___, StringBuf *buf, const char *p, const char *mark, int line); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_print_line_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_print_line_post[hIndex].func; - retVal___ = postHookFunc(retVal___, buf, p, mark, &line); + retVal___ = postHookFunc(retVal___, buf, p, mark, line); } } return retVal___; @@ -62163,11 +62383,11 @@ const char* HP_script_print_line(StringBuf *buf, const char *p, const char *mark void HP_script_errorwarning_sub(StringBuf *buf, const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos) { int hIndex = 0; if( HPMHooks.count.HP_script_errorwarning_sub_pre ) { - void (*preHookFunc) (StringBuf *buf, const char *src, const char *file, int *start_line, const char *error_msg, const char *error_pos); + void (*preHookFunc) (StringBuf **buf, const char **src, const char **file, int *start_line, const char **error_msg, const char **error_pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_errorwarning_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_errorwarning_sub_pre[hIndex].func; - preHookFunc(buf, src, file, &start_line, error_msg, error_pos); + preHookFunc(&buf, &src, &file, &start_line, &error_msg, &error_pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62178,10 +62398,10 @@ void HP_script_errorwarning_sub(StringBuf *buf, const char *src, const char *fil HPMHooks.source.script.errorwarning_sub(buf, src, file, start_line, error_msg, error_pos); } if( HPMHooks.count.HP_script_errorwarning_sub_post ) { - void (*postHookFunc) (StringBuf *buf, const char *src, const char *file, int *start_line, const char *error_msg, const char *error_pos); + void (*postHookFunc) (StringBuf *buf, const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_errorwarning_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_errorwarning_sub_post[hIndex].func; - postHookFunc(buf, src, file, &start_line, error_msg, error_pos); + postHookFunc(buf, src, file, start_line, error_msg, error_pos); } } return; @@ -62190,11 +62410,11 @@ int HP_script_set_reg(struct script_state *st, struct map_session_data *sd, int6 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_set_reg_pre ) { - int (*preHookFunc) (struct script_state *st, struct map_session_data *sd, int64 *num, const char *name, const void *value, struct reg_db *ref); + int (*preHookFunc) (struct script_state **st, struct map_session_data **sd, int64 *num, const char **name, const void **value, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_pre[hIndex].func; - retVal___ = preHookFunc(st, sd, &num, name, value, ref); + retVal___ = preHookFunc(&st, &sd, &num, &name, &value, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62205,10 +62425,10 @@ int HP_script_set_reg(struct script_state *st, struct map_session_data *sd, int6 retVal___ = HPMHooks.source.script.set_reg(st, sd, num, name, value, ref); } if( HPMHooks.count.HP_script_set_reg_post ) { - int (*postHookFunc) (int retVal___, struct script_state *st, struct map_session_data *sd, int64 *num, const char *name, const void *value, struct reg_db *ref); + int (*postHookFunc) (int retVal___, struct script_state *st, struct map_session_data *sd, int64 num, const char *name, const void *value, struct reg_db *ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, st, sd, &num, name, value, ref); + retVal___ = postHookFunc(retVal___, st, sd, num, name, value, ref); } } return retVal___; @@ -62216,11 +62436,11 @@ int HP_script_set_reg(struct script_state *st, struct map_session_data *sd, int6 void HP_script_set_reg_ref_str(struct script_state *st, struct reg_db *n, int64 num, const char *name, const char *str) { int hIndex = 0; if( HPMHooks.count.HP_script_set_reg_ref_str_pre ) { - void (*preHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, const char *str); + void (*preHookFunc) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_ref_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_ref_str_pre[hIndex].func; - preHookFunc(st, n, &num, name, str); + preHookFunc(&st, &n, &num, &name, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62231,10 +62451,10 @@ void HP_script_set_reg_ref_str(struct script_state *st, struct reg_db *n, int64 HPMHooks.source.script.set_reg_ref_str(st, n, num, name, str); } if( HPMHooks.count.HP_script_set_reg_ref_str_post ) { - void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, const char *str); + void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 num, const char *name, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_ref_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_ref_str_post[hIndex].func; - postHookFunc(st, n, &num, name, str); + postHookFunc(st, n, num, name, str); } } return; @@ -62242,11 +62462,11 @@ void HP_script_set_reg_ref_str(struct script_state *st, struct reg_db *n, int64 void HP_script_set_reg_scope_str(struct script_state *st, struct reg_db *n, int64 num, const char *name, const char *str) { int hIndex = 0; if( HPMHooks.count.HP_script_set_reg_scope_str_pre ) { - void (*preHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, const char *str); + void (*preHookFunc) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_scope_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_scope_str_pre[hIndex].func; - preHookFunc(st, n, &num, name, str); + preHookFunc(&st, &n, &num, &name, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62257,10 +62477,10 @@ void HP_script_set_reg_scope_str(struct script_state *st, struct reg_db *n, int6 HPMHooks.source.script.set_reg_scope_str(st, n, num, name, str); } if( HPMHooks.count.HP_script_set_reg_scope_str_post ) { - void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, const char *str); + void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 num, const char *name, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_scope_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_scope_str_post[hIndex].func; - postHookFunc(st, n, &num, name, str); + postHookFunc(st, n, num, name, str); } } return; @@ -62268,11 +62488,11 @@ void HP_script_set_reg_scope_str(struct script_state *st, struct reg_db *n, int6 void HP_script_set_reg_npc_str(struct script_state *st, struct reg_db *n, int64 num, const char *name, const char *str) { int hIndex = 0; if( HPMHooks.count.HP_script_set_reg_npc_str_pre ) { - void (*preHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, const char *str); + void (*preHookFunc) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_npc_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_npc_str_pre[hIndex].func; - preHookFunc(st, n, &num, name, str); + preHookFunc(&st, &n, &num, &name, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62283,10 +62503,10 @@ void HP_script_set_reg_npc_str(struct script_state *st, struct reg_db *n, int64 HPMHooks.source.script.set_reg_npc_str(st, n, num, name, str); } if( HPMHooks.count.HP_script_set_reg_npc_str_post ) { - void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, const char *str); + void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 num, const char *name, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_npc_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_npc_str_post[hIndex].func; - postHookFunc(st, n, &num, name, str); + postHookFunc(st, n, num, name, str); } } return; @@ -62294,11 +62514,11 @@ void HP_script_set_reg_npc_str(struct script_state *st, struct reg_db *n, int64 void HP_script_set_reg_instance_str(struct script_state *st, int64 num, const char *name, const char *str) { int hIndex = 0; if( HPMHooks.count.HP_script_set_reg_instance_str_pre ) { - void (*preHookFunc) (struct script_state *st, int64 *num, const char *name, const char *str); + void (*preHookFunc) (struct script_state **st, int64 *num, const char **name, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_instance_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_instance_str_pre[hIndex].func; - preHookFunc(st, &num, name, str); + preHookFunc(&st, &num, &name, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62309,10 +62529,10 @@ void HP_script_set_reg_instance_str(struct script_state *st, int64 num, const ch HPMHooks.source.script.set_reg_instance_str(st, num, name, str); } if( HPMHooks.count.HP_script_set_reg_instance_str_post ) { - void (*postHookFunc) (struct script_state *st, int64 *num, const char *name, const char *str); + void (*postHookFunc) (struct script_state *st, int64 num, const char *name, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_instance_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_instance_str_post[hIndex].func; - postHookFunc(st, &num, name, str); + postHookFunc(st, num, name, str); } } return; @@ -62320,11 +62540,11 @@ void HP_script_set_reg_instance_str(struct script_state *st, int64 num, const ch void HP_script_set_reg_ref_num(struct script_state *st, struct reg_db *n, int64 num, const char *name, int val) { int hIndex = 0; if( HPMHooks.count.HP_script_set_reg_ref_num_pre ) { - void (*preHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, int *val); + void (*preHookFunc) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_ref_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_ref_num_pre[hIndex].func; - preHookFunc(st, n, &num, name, &val); + preHookFunc(&st, &n, &num, &name, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62335,10 +62555,10 @@ void HP_script_set_reg_ref_num(struct script_state *st, struct reg_db *n, int64 HPMHooks.source.script.set_reg_ref_num(st, n, num, name, val); } if( HPMHooks.count.HP_script_set_reg_ref_num_post ) { - void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, int *val); + void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 num, const char *name, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_ref_num_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_ref_num_post[hIndex].func; - postHookFunc(st, n, &num, name, &val); + postHookFunc(st, n, num, name, val); } } return; @@ -62346,11 +62566,11 @@ void HP_script_set_reg_ref_num(struct script_state *st, struct reg_db *n, int64 void HP_script_set_reg_scope_num(struct script_state *st, struct reg_db *n, int64 num, const char *name, int val) { int hIndex = 0; if( HPMHooks.count.HP_script_set_reg_scope_num_pre ) { - void (*preHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, int *val); + void (*preHookFunc) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_scope_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_scope_num_pre[hIndex].func; - preHookFunc(st, n, &num, name, &val); + preHookFunc(&st, &n, &num, &name, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62361,10 +62581,10 @@ void HP_script_set_reg_scope_num(struct script_state *st, struct reg_db *n, int6 HPMHooks.source.script.set_reg_scope_num(st, n, num, name, val); } if( HPMHooks.count.HP_script_set_reg_scope_num_post ) { - void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, int *val); + void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 num, const char *name, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_scope_num_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_scope_num_post[hIndex].func; - postHookFunc(st, n, &num, name, &val); + postHookFunc(st, n, num, name, val); } } return; @@ -62372,11 +62592,11 @@ void HP_script_set_reg_scope_num(struct script_state *st, struct reg_db *n, int6 void HP_script_set_reg_npc_num(struct script_state *st, struct reg_db *n, int64 num, const char *name, int val) { int hIndex = 0; if( HPMHooks.count.HP_script_set_reg_npc_num_pre ) { - void (*preHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, int *val); + void (*preHookFunc) (struct script_state **st, struct reg_db **n, int64 *num, const char **name, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_npc_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_npc_num_pre[hIndex].func; - preHookFunc(st, n, &num, name, &val); + preHookFunc(&st, &n, &num, &name, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62387,10 +62607,10 @@ void HP_script_set_reg_npc_num(struct script_state *st, struct reg_db *n, int64 HPMHooks.source.script.set_reg_npc_num(st, n, num, name, val); } if( HPMHooks.count.HP_script_set_reg_npc_num_post ) { - void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 *num, const char *name, int *val); + void (*postHookFunc) (struct script_state *st, struct reg_db *n, int64 num, const char *name, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_npc_num_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_npc_num_post[hIndex].func; - postHookFunc(st, n, &num, name, &val); + postHookFunc(st, n, num, name, val); } } return; @@ -62398,11 +62618,11 @@ void HP_script_set_reg_npc_num(struct script_state *st, struct reg_db *n, int64 void HP_script_set_reg_instance_num(struct script_state *st, int64 num, const char *name, int val) { int hIndex = 0; if( HPMHooks.count.HP_script_set_reg_instance_num_pre ) { - void (*preHookFunc) (struct script_state *st, int64 *num, const char *name, int *val); + void (*preHookFunc) (struct script_state **st, int64 *num, const char **name, int *val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_instance_num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_instance_num_pre[hIndex].func; - preHookFunc(st, &num, name, &val); + preHookFunc(&st, &num, &name, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62413,10 +62633,10 @@ void HP_script_set_reg_instance_num(struct script_state *st, int64 num, const ch HPMHooks.source.script.set_reg_instance_num(st, num, name, val); } if( HPMHooks.count.HP_script_set_reg_instance_num_post ) { - void (*postHookFunc) (struct script_state *st, int64 *num, const char *name, int *val); + void (*postHookFunc) (struct script_state *st, int64 num, const char *name, int val); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_instance_num_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_instance_num_post[hIndex].func; - postHookFunc(st, &num, name, &val); + postHookFunc(st, num, name, val); } } return; @@ -62424,11 +62644,11 @@ void HP_script_set_reg_instance_num(struct script_state *st, int64 num, const ch void HP_script_stack_expand(struct script_stack *stack) { int hIndex = 0; if( HPMHooks.count.HP_script_stack_expand_pre ) { - void (*preHookFunc) (struct script_stack *stack); + void (*preHookFunc) (struct script_stack **stack); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_stack_expand_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_stack_expand_pre[hIndex].func; - preHookFunc(stack); + preHookFunc(&stack); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62451,11 +62671,11 @@ struct script_data* HP_script_push_retinfo(struct script_stack *stack, struct sc int hIndex = 0; struct script_data* retVal___ = NULL; if( HPMHooks.count.HP_script_push_retinfo_pre ) { - struct script_data* (*preHookFunc) (struct script_stack *stack, struct script_retinfo *ri, struct reg_db *ref); + struct script_data* (*preHookFunc) (struct script_stack **stack, struct script_retinfo **ri, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_retinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_push_retinfo_pre[hIndex].func; - retVal___ = preHookFunc(stack, ri, ref); + retVal___ = preHookFunc(&stack, &ri, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62477,11 +62697,11 @@ struct script_data* HP_script_push_retinfo(struct script_stack *stack, struct sc void HP_script_op_3(struct script_state *st, int op) { int hIndex = 0; if( HPMHooks.count.HP_script_op_3_pre ) { - void (*preHookFunc) (struct script_state *st, int *op); + void (*preHookFunc) (struct script_state **st, int *op); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_3_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_op_3_pre[hIndex].func; - preHookFunc(st, &op); + preHookFunc(&st, &op); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62492,10 +62712,10 @@ void HP_script_op_3(struct script_state *st, int op) { HPMHooks.source.script.op_3(st, op); } if( HPMHooks.count.HP_script_op_3_post ) { - void (*postHookFunc) (struct script_state *st, int *op); + void (*postHookFunc) (struct script_state *st, int op); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_3_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_op_3_post[hIndex].func; - postHookFunc(st, &op); + postHookFunc(st, op); } } return; @@ -62503,11 +62723,11 @@ void HP_script_op_3(struct script_state *st, int op) { void HP_script_op_2str(struct script_state *st, int op, const char *s1, const char *s2) { int hIndex = 0; if( HPMHooks.count.HP_script_op_2str_pre ) { - void (*preHookFunc) (struct script_state *st, int *op, const char *s1, const char *s2); + void (*preHookFunc) (struct script_state **st, int *op, const char **s1, const char **s2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_2str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_op_2str_pre[hIndex].func; - preHookFunc(st, &op, s1, s2); + preHookFunc(&st, &op, &s1, &s2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62518,10 +62738,10 @@ void HP_script_op_2str(struct script_state *st, int op, const char *s1, const ch HPMHooks.source.script.op_2str(st, op, s1, s2); } if( HPMHooks.count.HP_script_op_2str_post ) { - void (*postHookFunc) (struct script_state *st, int *op, const char *s1, const char *s2); + void (*postHookFunc) (struct script_state *st, int op, const char *s1, const char *s2); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_2str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_op_2str_post[hIndex].func; - postHookFunc(st, &op, s1, s2); + postHookFunc(st, op, s1, s2); } } return; @@ -62529,11 +62749,11 @@ void HP_script_op_2str(struct script_state *st, int op, const char *s1, const ch void HP_script_op_2num(struct script_state *st, int op, int i1, int i2) { int hIndex = 0; if( HPMHooks.count.HP_script_op_2num_pre ) { - void (*preHookFunc) (struct script_state *st, int *op, int *i1, int *i2); + void (*preHookFunc) (struct script_state **st, int *op, int *i1, int *i2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_2num_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_op_2num_pre[hIndex].func; - preHookFunc(st, &op, &i1, &i2); + preHookFunc(&st, &op, &i1, &i2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62544,10 +62764,10 @@ void HP_script_op_2num(struct script_state *st, int op, int i1, int i2) { HPMHooks.source.script.op_2num(st, op, i1, i2); } if( HPMHooks.count.HP_script_op_2num_post ) { - void (*postHookFunc) (struct script_state *st, int *op, int *i1, int *i2); + void (*postHookFunc) (struct script_state *st, int op, int i1, int i2); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_2num_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_op_2num_post[hIndex].func; - postHookFunc(st, &op, &i1, &i2); + postHookFunc(st, op, i1, i2); } } return; @@ -62555,11 +62775,11 @@ void HP_script_op_2num(struct script_state *st, int op, int i1, int i2) { void HP_script_op_2(struct script_state *st, int op) { int hIndex = 0; if( HPMHooks.count.HP_script_op_2_pre ) { - void (*preHookFunc) (struct script_state *st, int *op); + void (*preHookFunc) (struct script_state **st, int *op); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_op_2_pre[hIndex].func; - preHookFunc(st, &op); + preHookFunc(&st, &op); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62570,10 +62790,10 @@ void HP_script_op_2(struct script_state *st, int op) { HPMHooks.source.script.op_2(st, op); } if( HPMHooks.count.HP_script_op_2_post ) { - void (*postHookFunc) (struct script_state *st, int *op); + void (*postHookFunc) (struct script_state *st, int op); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_op_2_post[hIndex].func; - postHookFunc(st, &op); + postHookFunc(st, op); } } return; @@ -62581,11 +62801,11 @@ void HP_script_op_2(struct script_state *st, int op) { void HP_script_op_1(struct script_state *st, int op) { int hIndex = 0; if( HPMHooks.count.HP_script_op_1_pre ) { - void (*preHookFunc) (struct script_state *st, int *op); + void (*preHookFunc) (struct script_state **st, int *op); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_1_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_op_1_pre[hIndex].func; - preHookFunc(st, &op); + preHookFunc(&st, &op); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62596,10 +62816,10 @@ void HP_script_op_1(struct script_state *st, int op) { HPMHooks.source.script.op_1(st, op); } if( HPMHooks.count.HP_script_op_1_post ) { - void (*postHookFunc) (struct script_state *st, int *op); + void (*postHookFunc) (struct script_state *st, int op); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_op_1_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_op_1_post[hIndex].func; - postHookFunc(st, &op); + postHookFunc(st, op); } } return; @@ -62607,11 +62827,11 @@ void HP_script_op_1(struct script_state *st, int op) { void HP_script_check_buildin_argtype(struct script_state *st, int func) { int hIndex = 0; if( HPMHooks.count.HP_script_check_buildin_argtype_pre ) { - void (*preHookFunc) (struct script_state *st, int *func); + void (*preHookFunc) (struct script_state **st, int *func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_check_buildin_argtype_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_check_buildin_argtype_pre[hIndex].func; - preHookFunc(st, &func); + preHookFunc(&st, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62622,10 +62842,10 @@ void HP_script_check_buildin_argtype(struct script_state *st, int func) { HPMHooks.source.script.check_buildin_argtype(st, func); } if( HPMHooks.count.HP_script_check_buildin_argtype_post ) { - void (*postHookFunc) (struct script_state *st, int *func); + void (*postHookFunc) (struct script_state *st, int func); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_check_buildin_argtype_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_check_buildin_argtype_post[hIndex].func; - postHookFunc(st, &func); + postHookFunc(st, func); } } return; @@ -62633,11 +62853,11 @@ void HP_script_check_buildin_argtype(struct script_state *st, int func) { void HP_script_detach_state(struct script_state *st, bool dequeue_event) { int hIndex = 0; if( HPMHooks.count.HP_script_detach_state_pre ) { - void (*preHookFunc) (struct script_state *st, bool *dequeue_event); + void (*preHookFunc) (struct script_state **st, bool *dequeue_event); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_detach_state_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_detach_state_pre[hIndex].func; - preHookFunc(st, &dequeue_event); + preHookFunc(&st, &dequeue_event); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62648,24 +62868,24 @@ void HP_script_detach_state(struct script_state *st, bool dequeue_event) { HPMHooks.source.script.detach_state(st, dequeue_event); } if( HPMHooks.count.HP_script_detach_state_post ) { - void (*postHookFunc) (struct script_state *st, bool *dequeue_event); + void (*postHookFunc) (struct script_state *st, bool dequeue_event); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_detach_state_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_detach_state_post[hIndex].func; - postHookFunc(st, &dequeue_event); + postHookFunc(st, dequeue_event); } } return; } -int HP_script_db_free_code_sub(DBKey key, DBData *data, va_list ap) { +int HP_script_db_free_code_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_db_free_code_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_db_free_code_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_db_free_code_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -62679,11 +62899,11 @@ int HP_script_db_free_code_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_script_db_free_code_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_db_free_code_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_script_db_free_code_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -62692,11 +62912,11 @@ int HP_script_db_free_code_sub(DBKey key, DBData *data, va_list ap) { void HP_script_add_autobonus(const char *autobonus) { int hIndex = 0; if( HPMHooks.count.HP_script_add_autobonus_pre ) { - void (*preHookFunc) (const char *autobonus); + void (*preHookFunc) (const char **autobonus); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_add_autobonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_add_autobonus_pre[hIndex].func; - preHookFunc(autobonus); + preHookFunc(&autobonus); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62719,11 +62939,11 @@ int HP_script_menu_countoptions(const char *str, int max_count, int *total) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_menu_countoptions_pre ) { - int (*preHookFunc) (const char *str, int *max_count, int *total); + int (*preHookFunc) (const char **str, int *max_count, int **total); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_menu_countoptions_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_menu_countoptions_pre[hIndex].func; - retVal___ = preHookFunc(str, &max_count, total); + retVal___ = preHookFunc(&str, &max_count, &total); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62734,10 +62954,10 @@ int HP_script_menu_countoptions(const char *str, int max_count, int *total) { retVal___ = HPMHooks.source.script.menu_countoptions(str, max_count, total); } if( HPMHooks.count.HP_script_menu_countoptions_post ) { - int (*postHookFunc) (int retVal___, const char *str, int *max_count, int *total); + int (*postHookFunc) (int retVal___, const char *str, int max_count, int *total); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_menu_countoptions_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_menu_countoptions_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &max_count, total); + retVal___ = postHookFunc(retVal___, str, max_count, total); } } return retVal___; @@ -62746,12 +62966,12 @@ int HP_script_buildin_areawarp_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_areawarp_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_areawarp_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_areawarp_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -62779,12 +62999,12 @@ int HP_script_buildin_areapercentheal_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_areapercentheal_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_areapercentheal_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_areapercentheal_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -62811,11 +63031,11 @@ int HP_script_buildin_areapercentheal_sub(struct block_list *bl, va_list ap) { void HP_script_buildin_delitem_delete(struct map_session_data *sd, int idx, int *amount, bool delete_items) { int hIndex = 0; if( HPMHooks.count.HP_script_buildin_delitem_delete_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *idx, int *amount, bool *delete_items); + void (*preHookFunc) (struct map_session_data **sd, int *idx, int **amount, bool *delete_items); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_delitem_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_buildin_delitem_delete_pre[hIndex].func; - preHookFunc(sd, &idx, amount, &delete_items); + preHookFunc(&sd, &idx, &amount, &delete_items); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62826,10 +63046,10 @@ void HP_script_buildin_delitem_delete(struct map_session_data *sd, int idx, int HPMHooks.source.script.buildin_delitem_delete(sd, idx, amount, delete_items); } if( HPMHooks.count.HP_script_buildin_delitem_delete_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *idx, int *amount, bool *delete_items); + void (*postHookFunc) (struct map_session_data *sd, int idx, int *amount, bool delete_items); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_delitem_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_buildin_delitem_delete_post[hIndex].func; - postHookFunc(sd, &idx, amount, &delete_items); + postHookFunc(sd, idx, amount, delete_items); } } return; @@ -62838,11 +63058,11 @@ bool HP_script_buildin_delitem_search(struct map_session_data *sd, struct item * int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_script_buildin_delitem_search_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, struct item *it, bool *exact_match); + bool (*preHookFunc) (struct map_session_data **sd, struct item **it, bool *exact_match); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_delitem_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_buildin_delitem_search_pre[hIndex].func; - retVal___ = preHookFunc(sd, it, &exact_match); + retVal___ = preHookFunc(&sd, &it, &exact_match); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62853,10 +63073,10 @@ bool HP_script_buildin_delitem_search(struct map_session_data *sd, struct item * retVal___ = HPMHooks.source.script.buildin_delitem_search(sd, it, exact_match); } if( HPMHooks.count.HP_script_buildin_delitem_search_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, struct item *it, bool *exact_match); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, struct item *it, bool exact_match); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_delitem_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_buildin_delitem_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, it, &exact_match); + retVal___ = postHookFunc(retVal___, sd, it, exact_match); } } return retVal___; @@ -62865,12 +63085,12 @@ int HP_script_buildin_killmonster_sub_strip(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_killmonster_sub_strip_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_killmonster_sub_strip_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_killmonster_sub_strip_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -62898,12 +63118,12 @@ int HP_script_buildin_killmonster_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_killmonster_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_killmonster_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_killmonster_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -62931,12 +63151,12 @@ int HP_script_buildin_killmonsterall_sub_strip(struct block_list *bl, va_list ap int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_killmonsterall_sub_strip_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_killmonsterall_sub_strip_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_killmonsterall_sub_strip_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -62964,12 +63184,12 @@ int HP_script_buildin_killmonsterall_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_killmonsterall_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_killmonsterall_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_killmonsterall_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -62997,12 +63217,12 @@ int HP_script_buildin_announce_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_announce_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_announce_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_announce_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63030,12 +63250,12 @@ int HP_script_buildin_getareausers_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_getareausers_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_getareausers_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_getareausers_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63063,12 +63283,12 @@ int HP_script_buildin_getareadropitem_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_getareadropitem_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_getareadropitem_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_getareadropitem_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63096,12 +63316,12 @@ int HP_script_mapflag_pvp_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_mapflag_pvp_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_mapflag_pvp_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_mapflag_pvp_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63129,12 +63349,12 @@ int HP_script_buildin_pvpoff_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_pvpoff_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_pvpoff_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_pvpoff_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63162,12 +63382,12 @@ int HP_script_buildin_maprespawnguildid_sub_pc(struct map_session_data *sd, va_l int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_maprespawnguildid_sub_pc_pre ) { - int (*preHookFunc) (struct map_session_data *sd, va_list ap); + int (*preHookFunc) (struct map_session_data **sd, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_maprespawnguildid_sub_pc_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_maprespawnguildid_sub_pc_pre[hIndex].func; - retVal___ = preHookFunc(sd, ap___copy); + retVal___ = preHookFunc(&sd, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63195,12 +63415,12 @@ int HP_script_buildin_maprespawnguildid_sub_mob(struct block_list *bl, va_list a int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_maprespawnguildid_sub_mob_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_maprespawnguildid_sub_mob_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_maprespawnguildid_sub_mob_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63228,12 +63448,12 @@ int HP_script_buildin_mobcount_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_mobcount_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_mobcount_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_mobcount_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63261,12 +63481,12 @@ int HP_script_playbgm_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_playbgm_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_playbgm_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63294,12 +63514,12 @@ int HP_script_playbgm_foreachpc_sub(struct map_session_data *sd, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_playbgm_foreachpc_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, va_list args); + int (*preHookFunc) (struct map_session_data **sd, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_foreachpc_sub_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_script_playbgm_foreachpc_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, args___copy); + retVal___ = preHookFunc(&sd, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -63327,12 +63547,12 @@ int HP_script_soundeffect_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_soundeffect_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_soundeffect_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_soundeffect_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63356,15 +63576,15 @@ int HP_script_soundeffect_sub(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_script_buildin_query_sql_sub(struct script_state *st, Sql *handle) { +int HP_script_buildin_query_sql_sub(struct script_state *st, struct Sql *handle) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_query_sql_sub_pre ) { - int (*preHookFunc) (struct script_state *st, Sql *handle); + int (*preHookFunc) (struct script_state **st, struct Sql **handle); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_query_sql_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_buildin_query_sql_sub_pre[hIndex].func; - retVal___ = preHookFunc(st, handle); + retVal___ = preHookFunc(&st, &handle); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63375,7 +63595,7 @@ int HP_script_buildin_query_sql_sub(struct script_state *st, Sql *handle) { retVal___ = HPMHooks.source.script.buildin_query_sql_sub(st, handle); } if( HPMHooks.count.HP_script_buildin_query_sql_sub_post ) { - int (*postHookFunc) (int retVal___, struct script_state *st, Sql *handle); + int (*postHookFunc) (int retVal___, struct script_state *st, struct Sql *handle); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_query_sql_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_buildin_query_sql_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, handle); @@ -63387,12 +63607,12 @@ int HP_script_buildin_instance_warpall_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_instance_warpall_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_instance_warpall_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_instance_warpall_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63420,12 +63640,12 @@ int HP_script_buildin_mobuseskill_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_buildin_mobuseskill_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_buildin_mobuseskill_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_buildin_mobuseskill_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63453,12 +63673,12 @@ int HP_script_cleanfloor_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_cleanfloor_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_cleanfloor_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_cleanfloor_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63486,11 +63706,11 @@ int HP_script_run_func(struct script_state *st) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_run_func_pre ) { - int (*preHookFunc) (struct script_state *st); + int (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_func_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_func_pre[hIndex].func; - retVal___ = preHookFunc(st); + retVal___ = preHookFunc(&st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63513,11 +63733,11 @@ const char* HP_script_getfuncname(struct script_state *st) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_getfuncname_pre ) { - const char* (*preHookFunc) (struct script_state *st); + const char* (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_getfuncname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_getfuncname_pre[hIndex].func; - retVal___ = preHookFunc(st); + retVal___ = preHookFunc(&st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63540,11 +63760,11 @@ unsigned int HP_script_calc_hash_ci(const char *p) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_script_calc_hash_ci_pre ) { - unsigned int (*preHookFunc) (const char *p); + unsigned int (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_calc_hash_ci_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_calc_hash_ci_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63567,11 +63787,11 @@ struct reg_db* HP_script_array_src(struct script_state *st, struct map_session_d int hIndex = 0; struct reg_db* retVal___ = NULL; if( HPMHooks.count.HP_script_array_src_pre ) { - struct reg_db* (*preHookFunc) (struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); + struct reg_db* (*preHookFunc) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_src_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_array_src_pre[hIndex].func; - retVal___ = preHookFunc(st, sd, name, ref); + retVal___ = preHookFunc(&st, &sd, &name, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63593,11 +63813,11 @@ struct reg_db* HP_script_array_src(struct script_state *st, struct map_session_d void HP_script_array_update(struct reg_db *src, int64 num, bool empty) { int hIndex = 0; if( HPMHooks.count.HP_script_array_update_pre ) { - void (*preHookFunc) (struct reg_db *src, int64 *num, bool *empty); + void (*preHookFunc) (struct reg_db **src, int64 *num, bool *empty); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_update_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_array_update_pre[hIndex].func; - preHookFunc(src, &num, &empty); + preHookFunc(&src, &num, &empty); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63608,10 +63828,10 @@ void HP_script_array_update(struct reg_db *src, int64 num, bool empty) { HPMHooks.source.script.array_update(src, num, empty); } if( HPMHooks.count.HP_script_array_update_post ) { - void (*postHookFunc) (struct reg_db *src, int64 *num, bool *empty); + void (*postHookFunc) (struct reg_db *src, int64 num, bool empty); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_update_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_array_update_post[hIndex].func; - postHookFunc(src, &num, &empty); + postHookFunc(src, num, empty); } } return; @@ -63619,11 +63839,11 @@ void HP_script_array_update(struct reg_db *src, int64 num, bool empty) { void HP_script_array_delete(struct reg_db *src, struct script_array *sa) { int hIndex = 0; if( HPMHooks.count.HP_script_array_delete_pre ) { - void (*preHookFunc) (struct reg_db *src, struct script_array *sa); + void (*preHookFunc) (struct reg_db **src, struct script_array **sa); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_array_delete_pre[hIndex].func; - preHookFunc(src, sa); + preHookFunc(&src, &sa); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63645,11 +63865,11 @@ void HP_script_array_delete(struct reg_db *src, struct script_array *sa) { void HP_script_array_remove_member(struct reg_db *src, struct script_array *sa, unsigned int idx) { int hIndex = 0; if( HPMHooks.count.HP_script_array_remove_member_pre ) { - void (*preHookFunc) (struct reg_db *src, struct script_array *sa, unsigned int *idx); + void (*preHookFunc) (struct reg_db **src, struct script_array **sa, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_remove_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_array_remove_member_pre[hIndex].func; - preHookFunc(src, sa, &idx); + preHookFunc(&src, &sa, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63660,10 +63880,10 @@ void HP_script_array_remove_member(struct reg_db *src, struct script_array *sa, HPMHooks.source.script.array_remove_member(src, sa, idx); } if( HPMHooks.count.HP_script_array_remove_member_post ) { - void (*postHookFunc) (struct reg_db *src, struct script_array *sa, unsigned int *idx); + void (*postHookFunc) (struct reg_db *src, struct script_array *sa, unsigned int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_remove_member_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_array_remove_member_post[hIndex].func; - postHookFunc(src, sa, &idx); + postHookFunc(src, sa, idx); } } return; @@ -63671,11 +63891,11 @@ void HP_script_array_remove_member(struct reg_db *src, struct script_array *sa, void HP_script_array_add_member(struct script_array *sa, unsigned int idx) { int hIndex = 0; if( HPMHooks.count.HP_script_array_add_member_pre ) { - void (*preHookFunc) (struct script_array *sa, unsigned int *idx); + void (*preHookFunc) (struct script_array **sa, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_add_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_array_add_member_pre[hIndex].func; - preHookFunc(sa, &idx); + preHookFunc(&sa, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63686,10 +63906,10 @@ void HP_script_array_add_member(struct script_array *sa, unsigned int idx) { HPMHooks.source.script.array_add_member(sa, idx); } if( HPMHooks.count.HP_script_array_add_member_post ) { - void (*postHookFunc) (struct script_array *sa, unsigned int *idx); + void (*postHookFunc) (struct script_array *sa, unsigned int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_add_member_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_array_add_member_post[hIndex].func; - postHookFunc(sa, &idx); + postHookFunc(sa, idx); } } return; @@ -63698,11 +63918,11 @@ unsigned int HP_script_array_size(struct script_state *st, struct map_session_da int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_script_array_size_pre ) { - unsigned int (*preHookFunc) (struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); + unsigned int (*preHookFunc) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_size_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_array_size_pre[hIndex].func; - retVal___ = preHookFunc(st, sd, name, ref); + retVal___ = preHookFunc(&st, &sd, &name, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63725,11 +63945,11 @@ unsigned int HP_script_array_highest_key(struct script_state *st, struct map_ses int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_script_array_highest_key_pre ) { - unsigned int (*preHookFunc) (struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); + unsigned int (*preHookFunc) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_highest_key_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_array_highest_key_pre[hIndex].func; - retVal___ = preHookFunc(st, sd, name, ref); + retVal___ = preHookFunc(&st, &sd, &name, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63748,16 +63968,16 @@ unsigned int HP_script_array_highest_key(struct script_state *st, struct map_ses } return retVal___; } -int HP_script_array_free_db(DBKey key, DBData *data, va_list ap) { +int HP_script_array_free_db(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_array_free_db_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_free_db_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_array_free_db_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63771,11 +63991,11 @@ int HP_script_array_free_db(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_script_array_free_db_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_free_db_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_script_array_free_db_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -63784,11 +64004,11 @@ int HP_script_array_free_db(DBKey key, DBData *data, va_list ap) { void HP_script_array_ensure_zero(struct script_state *st, struct map_session_data *sd, int64 uid, struct reg_db *ref) { int hIndex = 0; if( HPMHooks.count.HP_script_array_ensure_zero_pre ) { - void (*preHookFunc) (struct script_state *st, struct map_session_data *sd, int64 *uid, struct reg_db *ref); + void (*preHookFunc) (struct script_state **st, struct map_session_data **sd, int64 *uid, struct reg_db **ref); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_ensure_zero_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_array_ensure_zero_pre[hIndex].func; - preHookFunc(st, sd, &uid, ref); + preHookFunc(&st, &sd, &uid, &ref); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63799,10 +64019,10 @@ void HP_script_array_ensure_zero(struct script_state *st, struct map_session_dat HPMHooks.source.script.array_ensure_zero(st, sd, uid, ref); } if( HPMHooks.count.HP_script_array_ensure_zero_post ) { - void (*postHookFunc) (struct script_state *st, struct map_session_data *sd, int64 *uid, struct reg_db *ref); + void (*postHookFunc) (struct script_state *st, struct map_session_data *sd, int64 uid, struct reg_db *ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_ensure_zero_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_array_ensure_zero_post[hIndex].func; - postHookFunc(st, sd, &uid, ref); + postHookFunc(st, sd, uid, ref); } } return; @@ -63810,11 +64030,11 @@ void HP_script_array_ensure_zero(struct script_state *st, struct map_session_dat void HP_script_reg_destroy_single(struct map_session_data *sd, int64 reg, struct script_reg_state *data) { int hIndex = 0; if( HPMHooks.count.HP_script_reg_destroy_single_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int64 *reg, struct script_reg_state *data); + void (*preHookFunc) (struct map_session_data **sd, int64 *reg, struct script_reg_state **data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reg_destroy_single_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_reg_destroy_single_pre[hIndex].func; - preHookFunc(sd, ®, data); + preHookFunc(&sd, ®, &data); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63825,24 +64045,24 @@ void HP_script_reg_destroy_single(struct map_session_data *sd, int64 reg, struct HPMHooks.source.script.reg_destroy_single(sd, reg, data); } if( HPMHooks.count.HP_script_reg_destroy_single_post ) { - void (*postHookFunc) (struct map_session_data *sd, int64 *reg, struct script_reg_state *data); + void (*postHookFunc) (struct map_session_data *sd, int64 reg, struct script_reg_state *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reg_destroy_single_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_reg_destroy_single_post[hIndex].func; - postHookFunc(sd, ®, data); + postHookFunc(sd, reg, data); } } return; } -int HP_script_reg_destroy(DBKey key, DBData *data, va_list ap) { +int HP_script_reg_destroy(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_reg_destroy_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reg_destroy_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_reg_destroy_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -63856,11 +64076,11 @@ int HP_script_reg_destroy(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_script_reg_destroy_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reg_destroy_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_script_reg_destroy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -63884,10 +64104,10 @@ void HP_script_generic_ui_array_expand(unsigned int plus) { HPMHooks.source.script.generic_ui_array_expand(plus); } if( HPMHooks.count.HP_script_generic_ui_array_expand_post ) { - void (*postHookFunc) (unsigned int *plus); + void (*postHookFunc) (unsigned int plus); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_generic_ui_array_expand_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_generic_ui_array_expand_post[hIndex].func; - postHookFunc(&plus); + postHookFunc(plus); } } return; @@ -63896,11 +64116,11 @@ unsigned int* HP_script_array_cpy_list(struct script_array *sa) { int hIndex = 0; unsigned int* retVal___ = NULL; if( HPMHooks.count.HP_script_array_cpy_list_pre ) { - unsigned int* (*preHookFunc) (struct script_array *sa); + unsigned int* (*preHookFunc) (struct script_array **sa); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_cpy_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_array_cpy_list_pre[hIndex].func; - retVal___ = preHookFunc(sa); + retVal___ = preHookFunc(&sa); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63949,11 +64169,11 @@ unsigned short HP_script_mapindexname2id(struct script_state *st, const char *na int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_script_mapindexname2id_pre ) { - unsigned short (*preHookFunc) (struct script_state *st, const char *name); + unsigned short (*preHookFunc) (struct script_state **st, const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_mapindexname2id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_mapindexname2id_pre[hIndex].func; - retVal___ = preHookFunc(st, name); + retVal___ = preHookFunc(&st, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -63976,11 +64196,11 @@ int HP_script_string_dup(char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_string_dup_pre ) { - int (*preHookFunc) (char *str); + int (*preHookFunc) (char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_string_dup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_string_dup_pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64028,11 +64248,11 @@ void HP_script_load_translations(void) { void HP_script_load_translation(const char *file, uint8 lang_id, uint32 *total) { int hIndex = 0; if( HPMHooks.count.HP_script_load_translation_pre ) { - void (*preHookFunc) (const char *file, uint8 *lang_id, uint32 *total); + void (*preHookFunc) (const char **file, uint8 *lang_id, uint32 **total); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_load_translation_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_load_translation_pre[hIndex].func; - preHookFunc(file, &lang_id, total); + preHookFunc(&file, &lang_id, &total); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64043,24 +64263,24 @@ void HP_script_load_translation(const char *file, uint8 lang_id, uint32 *total) HPMHooks.source.script.load_translation(file, lang_id, total); } if( HPMHooks.count.HP_script_load_translation_post ) { - void (*postHookFunc) (const char *file, uint8 *lang_id, uint32 *total); + void (*postHookFunc) (const char *file, uint8 lang_id, uint32 *total); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_load_translation_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_load_translation_post[hIndex].func; - postHookFunc(file, &lang_id, total); + postHookFunc(file, lang_id, total); } } return; } -int HP_script_translation_db_destroyer(DBKey key, DBData *data, va_list ap) { +int HP_script_translation_db_destroyer(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_translation_db_destroyer_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_translation_db_destroyer_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_script_translation_db_destroyer_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -64074,11 +64294,11 @@ int HP_script_translation_db_destroyer(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_script_translation_db_destroyer_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_translation_db_destroyer_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_script_translation_db_destroyer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -64102,10 +64322,10 @@ void HP_script_clear_translations(bool reload) { HPMHooks.source.script.clear_translations(reload); } if( HPMHooks.count.HP_script_clear_translations_post ) { - void (*postHookFunc) (bool *reload); + void (*postHookFunc) (bool reload); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_clear_translations_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_clear_translations_post[hIndex].func; - postHookFunc(&reload); + postHookFunc(reload); } } return; @@ -64129,10 +64349,10 @@ int HP_script_parse_cleanup_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.script.parse_cleanup_timer(tid, tick, id, data); } if( HPMHooks.count.HP_script_parse_cleanup_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_cleanup_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_parse_cleanup_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -64141,11 +64361,11 @@ uint8 HP_script_add_language(const char *name) { int hIndex = 0; uint8 retVal___ = 0; if( HPMHooks.count.HP_script_add_language_pre ) { - uint8 (*preHookFunc) (const char *name); + uint8 (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_add_language_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_add_language_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64168,11 +64388,11 @@ const char* HP_script_get_translation_file_name(const char *file) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_script_get_translation_file_name_pre ) { - const char* (*preHookFunc) (const char *file); + const char* (*preHookFunc) (const char **file); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_translation_file_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_translation_file_name_pre[hIndex].func; - retVal___ = preHookFunc(file); + retVal___ = preHookFunc(&file); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64220,11 +64440,11 @@ void HP_script_parser_clean_leftovers(void) { void HP_script_run_use_script(struct map_session_data *sd, struct item_data *data, int oid) { int hIndex = 0; if( HPMHooks.count.HP_script_run_use_script_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct item_data *data, int *oid); + void (*preHookFunc) (struct map_session_data **sd, struct item_data **data, int *oid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_use_script_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_use_script_pre[hIndex].func; - preHookFunc(sd, data, &oid); + preHookFunc(&sd, &data, &oid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64235,10 +64455,10 @@ void HP_script_run_use_script(struct map_session_data *sd, struct item_data *dat HPMHooks.source.script.run_use_script(sd, data, oid); } if( HPMHooks.count.HP_script_run_use_script_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct item_data *data, int *oid); + void (*postHookFunc) (struct map_session_data *sd, struct item_data *data, int oid); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_use_script_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_run_use_script_post[hIndex].func; - postHookFunc(sd, data, &oid); + postHookFunc(sd, data, oid); } } return; @@ -64246,11 +64466,11 @@ void HP_script_run_use_script(struct map_session_data *sd, struct item_data *dat void HP_script_run_item_equip_script(struct map_session_data *sd, struct item_data *data, int oid) { int hIndex = 0; if( HPMHooks.count.HP_script_run_item_equip_script_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct item_data *data, int *oid); + void (*preHookFunc) (struct map_session_data **sd, struct item_data **data, int *oid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_equip_script_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_item_equip_script_pre[hIndex].func; - preHookFunc(sd, data, &oid); + preHookFunc(&sd, &data, &oid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64261,10 +64481,10 @@ void HP_script_run_item_equip_script(struct map_session_data *sd, struct item_da HPMHooks.source.script.run_item_equip_script(sd, data, oid); } if( HPMHooks.count.HP_script_run_item_equip_script_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct item_data *data, int *oid); + void (*postHookFunc) (struct map_session_data *sd, struct item_data *data, int oid); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_equip_script_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_run_item_equip_script_post[hIndex].func; - postHookFunc(sd, data, &oid); + postHookFunc(sd, data, oid); } } return; @@ -64272,11 +64492,11 @@ void HP_script_run_item_equip_script(struct map_session_data *sd, struct item_da void HP_script_run_item_unequip_script(struct map_session_data *sd, struct item_data *data, int oid) { int hIndex = 0; if( HPMHooks.count.HP_script_run_item_unequip_script_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct item_data *data, int *oid); + void (*preHookFunc) (struct map_session_data **sd, struct item_data **data, int *oid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_unequip_script_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_item_unequip_script_pre[hIndex].func; - preHookFunc(sd, data, &oid); + preHookFunc(&sd, &data, &oid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64287,24 +64507,24 @@ void HP_script_run_item_unequip_script(struct map_session_data *sd, struct item_ HPMHooks.source.script.run_item_unequip_script(sd, data, oid); } if( HPMHooks.count.HP_script_run_item_unequip_script_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct item_data *data, int *oid); + void (*postHookFunc) (struct map_session_data *sd, struct item_data *data, int oid); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_unequip_script_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_run_item_unequip_script_post[hIndex].func; - postHookFunc(sd, data, &oid); + postHookFunc(sd, data, oid); } } return; } -/* searchstore */ +/* searchstore_interface */ bool HP_searchstore_open(struct map_session_data *sd, unsigned int uses, unsigned short effect) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_searchstore_open_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, unsigned int *uses, unsigned short *effect); + bool (*preHookFunc) (struct map_session_data **sd, unsigned int *uses, unsigned short *effect); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_open_pre[hIndex].func; - retVal___ = preHookFunc(sd, &uses, &effect); + retVal___ = preHookFunc(&sd, &uses, &effect); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64315,10 +64535,10 @@ bool HP_searchstore_open(struct map_session_data *sd, unsigned int uses, unsigne retVal___ = HPMHooks.source.searchstore.open(sd, uses, effect); } if( HPMHooks.count.HP_searchstore_open_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned int *uses, unsigned short *effect); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned int uses, unsigned short effect); for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_open_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_searchstore_open_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &uses, &effect); + retVal___ = postHookFunc(retVal___, sd, uses, effect); } } return retVal___; @@ -64326,11 +64546,11 @@ bool HP_searchstore_open(struct map_session_data *sd, unsigned int uses, unsigne void HP_searchstore_query(struct map_session_data *sd, unsigned char type, unsigned int min_price, unsigned int max_price, const unsigned short *itemlist, unsigned int item_count, const unsigned short *cardlist, unsigned int card_count) { int hIndex = 0; if( HPMHooks.count.HP_searchstore_query_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned char *type, unsigned int *min_price, unsigned int *max_price, const unsigned short *itemlist, unsigned int *item_count, const unsigned short *cardlist, unsigned int *card_count); + void (*preHookFunc) (struct map_session_data **sd, unsigned char *type, unsigned int *min_price, unsigned int *max_price, const unsigned short **itemlist, unsigned int *item_count, const unsigned short **cardlist, unsigned int *card_count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_query_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_query_pre[hIndex].func; - preHookFunc(sd, &type, &min_price, &max_price, itemlist, &item_count, cardlist, &card_count); + preHookFunc(&sd, &type, &min_price, &max_price, &itemlist, &item_count, &cardlist, &card_count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64341,10 +64561,10 @@ void HP_searchstore_query(struct map_session_data *sd, unsigned char type, unsig HPMHooks.source.searchstore.query(sd, type, min_price, max_price, itemlist, item_count, cardlist, card_count); } if( HPMHooks.count.HP_searchstore_query_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned char *type, unsigned int *min_price, unsigned int *max_price, const unsigned short *itemlist, unsigned int *item_count, const unsigned short *cardlist, unsigned int *card_count); + void (*postHookFunc) (struct map_session_data *sd, unsigned char type, unsigned int min_price, unsigned int max_price, const unsigned short *itemlist, unsigned int item_count, const unsigned short *cardlist, unsigned int card_count); for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_query_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_searchstore_query_post[hIndex].func; - postHookFunc(sd, &type, &min_price, &max_price, itemlist, &item_count, cardlist, &card_count); + postHookFunc(sd, type, min_price, max_price, itemlist, item_count, cardlist, card_count); } } return; @@ -64353,11 +64573,11 @@ bool HP_searchstore_querynext(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_searchstore_querynext_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_querynext_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_querynext_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64379,11 +64599,11 @@ bool HP_searchstore_querynext(struct map_session_data *sd) { void HP_searchstore_next(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_searchstore_next_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_next_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_next_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64405,11 +64625,11 @@ void HP_searchstore_next(struct map_session_data *sd) { void HP_searchstore_clear(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_searchstore_clear_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_clear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_clear_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64431,11 +64651,11 @@ void HP_searchstore_clear(struct map_session_data *sd) { void HP_searchstore_close(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_searchstore_close_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_close_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_close_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64457,11 +64677,11 @@ void HP_searchstore_close(struct map_session_data *sd) { void HP_searchstore_click(struct map_session_data *sd, int account_id, int store_id, unsigned short nameid) { int hIndex = 0; if( HPMHooks.count.HP_searchstore_click_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *account_id, int *store_id, unsigned short *nameid); + void (*preHookFunc) (struct map_session_data **sd, int *account_id, int *store_id, unsigned short *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_click_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_click_pre[hIndex].func; - preHookFunc(sd, &account_id, &store_id, &nameid); + preHookFunc(&sd, &account_id, &store_id, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64472,10 +64692,10 @@ void HP_searchstore_click(struct map_session_data *sd, int account_id, int store HPMHooks.source.searchstore.click(sd, account_id, store_id, nameid); } if( HPMHooks.count.HP_searchstore_click_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *account_id, int *store_id, unsigned short *nameid); + void (*postHookFunc) (struct map_session_data *sd, int account_id, int store_id, unsigned short nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_click_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_searchstore_click_post[hIndex].func; - postHookFunc(sd, &account_id, &store_id, &nameid); + postHookFunc(sd, account_id, store_id, nameid); } } return; @@ -64484,11 +64704,11 @@ bool HP_searchstore_queryremote(struct map_session_data *sd, int account_id) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_searchstore_queryremote_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *account_id); + bool (*preHookFunc) (struct map_session_data **sd, int *account_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_queryremote_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_queryremote_pre[hIndex].func; - retVal___ = preHookFunc(sd, &account_id); + retVal___ = preHookFunc(&sd, &account_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64499,10 +64719,10 @@ bool HP_searchstore_queryremote(struct map_session_data *sd, int account_id) { retVal___ = HPMHooks.source.searchstore.queryremote(sd, account_id); } if( HPMHooks.count.HP_searchstore_queryremote_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *account_id); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int account_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_queryremote_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_searchstore_queryremote_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &account_id); + retVal___ = postHookFunc(retVal___, sd, account_id); } } return retVal___; @@ -64510,11 +64730,11 @@ bool HP_searchstore_queryremote(struct map_session_data *sd, int account_id) { void HP_searchstore_clearremote(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_searchstore_clearremote_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_clearremote_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_clearremote_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64537,11 +64757,11 @@ bool HP_searchstore_result(struct map_session_data *sd, unsigned int store_id, i int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_searchstore_result_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, unsigned int *store_id, int *account_id, const char *store_name, unsigned short *nameid, unsigned short *amount, unsigned int *price, const short *card, unsigned char *refine); + bool (*preHookFunc) (struct map_session_data **sd, unsigned int *store_id, int *account_id, const char **store_name, unsigned short *nameid, unsigned short *amount, unsigned int *price, const short **card, unsigned char *refine); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_result_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_searchstore_result_pre[hIndex].func; - retVal___ = preHookFunc(sd, &store_id, &account_id, store_name, &nameid, &amount, &price, card, &refine); + retVal___ = preHookFunc(&sd, &store_id, &account_id, &store_name, &nameid, &amount, &price, &card, &refine); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64552,15 +64772,15 @@ bool HP_searchstore_result(struct map_session_data *sd, unsigned int store_id, i retVal___ = HPMHooks.source.searchstore.result(sd, store_id, account_id, store_name, nameid, amount, price, card, refine); } if( HPMHooks.count.HP_searchstore_result_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned int *store_id, int *account_id, const char *store_name, unsigned short *nameid, unsigned short *amount, unsigned int *price, const short *card, unsigned char *refine); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, unsigned short nameid, unsigned short amount, unsigned int price, const short *card, unsigned char refine); for(hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_result_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_searchstore_result_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &store_id, &account_id, store_name, &nameid, &amount, &price, card, &refine); + retVal___ = postHookFunc(retVal___, sd, store_id, account_id, store_name, nameid, amount, price, card, refine); } } return retVal___; } -/* showmsg */ +/* showmsg_interface */ void HP_showmsg_init(void) { int hIndex = 0; if( HPMHooks.count.HP_showmsg_init_pre ) { @@ -64643,12 +64863,12 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_showmsg_showMessageV_pre ) { - int (*preHookFunc) (const char *string, va_list ap); + int (*preHookFunc) (const char **string, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_showMessageV_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_showmsg_showMessageV_pre[hIndex].func; - retVal___ = preHookFunc(string, ap___copy); + retVal___ = preHookFunc(&string, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -64672,7 +64892,7 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { } return retVal___; } -/* skill */ +/* skill_interface */ int HP_skill_init(bool minimal) { int hIndex = 0; int retVal___ = 0; @@ -64692,10 +64912,10 @@ int HP_skill_init(bool minimal) { retVal___ = HPMHooks.source.skill.init(minimal); } if( HPMHooks.count.HP_skill_init_post ) { - int (*postHookFunc) (int retVal___, bool *minimal); + int (*postHookFunc) (int retVal___, bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &minimal); + retVal___ = postHookFunc(retVal___, minimal); } } return retVal___; @@ -64771,10 +64991,10 @@ void HP_skill_read_db(bool minimal) { HPMHooks.source.skill.read_db(minimal); } if( HPMHooks.count.HP_skill_read_db_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_read_db_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_read_db_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -64798,10 +65018,10 @@ int HP_skill_get_index(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_index(skill_id); } if( HPMHooks.count.HP_skill_get_index_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_index_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_index_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -64825,10 +65045,10 @@ int HP_skill_get_type(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_type(skill_id); } if( HPMHooks.count.HP_skill_get_type_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_type_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_type_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -64852,10 +65072,10 @@ int HP_skill_get_hit(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_hit(skill_id); } if( HPMHooks.count.HP_skill_get_hit_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_hit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_hit_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -64879,10 +65099,10 @@ int HP_skill_get_inf(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_inf(skill_id); } if( HPMHooks.count.HP_skill_get_inf_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_inf_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_inf_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -64906,10 +65126,10 @@ int HP_skill_get_ele(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_ele(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_ele_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_ele_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_ele_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -64933,10 +65153,10 @@ int HP_skill_get_nk(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_nk(skill_id); } if( HPMHooks.count.HP_skill_get_nk_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_nk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_nk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -64960,10 +65180,10 @@ int HP_skill_get_max(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_max(skill_id); } if( HPMHooks.count.HP_skill_get_max_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_max_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_max_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -64987,10 +65207,10 @@ int HP_skill_get_range(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_range(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_range_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_range_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_range_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -64999,11 +65219,11 @@ int HP_skill_get_range2(struct block_list *bl, uint16 skill_id, uint16 skill_lv) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_get_range2_pre ) { - int (*preHookFunc) (struct block_list *bl, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct block_list **bl, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_range2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_get_range2_pre[hIndex].func; - retVal___ = preHookFunc(bl, &skill_id, &skill_lv); + retVal___ = preHookFunc(&bl, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -65014,10 +65234,10 @@ int HP_skill_get_range2(struct block_list *bl, uint16 skill_id, uint16 skill_lv) retVal___ = HPMHooks.source.skill.get_range2(bl, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_range2_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct block_list *bl, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_range2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_range2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, bl, skill_id, skill_lv); } } return retVal___; @@ -65041,10 +65261,10 @@ int HP_skill_get_splash(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_splash(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_splash_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_splash_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_splash_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65068,10 +65288,10 @@ int HP_skill_get_hp(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_hp(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_hp_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_hp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_hp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65095,10 +65315,10 @@ int HP_skill_get_mhp(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_mhp(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_mhp_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_mhp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_mhp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65122,10 +65342,10 @@ int HP_skill_get_sp(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_sp(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_sp_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_sp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_sp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65149,10 +65369,10 @@ int HP_skill_get_state(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_state(skill_id); } if( HPMHooks.count.HP_skill_get_state_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_state_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_state_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65176,10 +65396,10 @@ int HP_skill_get_spiritball(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_spiritball(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_spiritball_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_spiritball_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_spiritball_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65203,10 +65423,10 @@ int HP_skill_get_zeny(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_zeny(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_zeny_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_zeny_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_zeny_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65230,10 +65450,10 @@ int HP_skill_get_num(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_num(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_num_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_num_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_num_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65257,10 +65477,10 @@ int HP_skill_get_cast(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_cast(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_cast_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_cast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_cast_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65284,10 +65504,10 @@ int HP_skill_get_delay(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_delay(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_delay_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_delay_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_delay_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65311,10 +65531,10 @@ int HP_skill_get_walkdelay(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_walkdelay(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_walkdelay_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_walkdelay_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_walkdelay_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65338,10 +65558,10 @@ int HP_skill_get_time(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_time(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_time_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_time_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_time_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65365,10 +65585,10 @@ int HP_skill_get_time2(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_time2(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_time2_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_time2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_time2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65392,10 +65612,10 @@ int HP_skill_get_castnodex(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_castnodex(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_castnodex_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_castnodex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_castnodex_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65419,10 +65639,10 @@ int HP_skill_get_delaynodex(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_delaynodex(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_delaynodex_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_delaynodex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_delaynodex_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65446,10 +65666,10 @@ int HP_skill_get_castdef(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_castdef(skill_id); } if( HPMHooks.count.HP_skill_get_castdef_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_castdef_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_castdef_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65473,10 +65693,10 @@ int HP_skill_get_weapontype(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_weapontype(skill_id); } if( HPMHooks.count.HP_skill_get_weapontype_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_weapontype_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_weapontype_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65500,10 +65720,10 @@ int HP_skill_get_ammotype(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_ammotype(skill_id); } if( HPMHooks.count.HP_skill_get_ammotype_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_ammotype_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_ammotype_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65527,10 +65747,10 @@ int HP_skill_get_ammo_qty(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_ammo_qty(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_ammo_qty_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_ammo_qty_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_ammo_qty_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65554,10 +65774,10 @@ int HP_skill_get_unit_id(uint16 skill_id, int flag) { retVal___ = HPMHooks.source.skill.get_unit_id(skill_id, flag); } if( HPMHooks.count.HP_skill_get_unit_id_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, int *flag); + int (*postHookFunc) (int retVal___, uint16 skill_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_unit_id_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &flag); + retVal___ = postHookFunc(retVal___, skill_id, flag); } } return retVal___; @@ -65581,10 +65801,10 @@ int HP_skill_get_inf2(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_inf2(skill_id); } if( HPMHooks.count.HP_skill_get_inf2_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_inf2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_inf2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65608,10 +65828,10 @@ int HP_skill_get_castcancel(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_castcancel(skill_id); } if( HPMHooks.count.HP_skill_get_castcancel_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_castcancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_castcancel_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65635,10 +65855,10 @@ int HP_skill_get_maxcount(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_maxcount(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_maxcount_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_maxcount_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_maxcount_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65662,10 +65882,10 @@ int HP_skill_get_blewcount(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_blewcount(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_blewcount_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_blewcount_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_blewcount_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65689,10 +65909,10 @@ int HP_skill_get_unit_flag(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_unit_flag(skill_id); } if( HPMHooks.count.HP_skill_get_unit_flag_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_flag_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_unit_flag_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65716,10 +65936,10 @@ int HP_skill_get_unit_target(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_unit_target(skill_id); } if( HPMHooks.count.HP_skill_get_unit_target_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_target_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_unit_target_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65743,10 +65963,10 @@ int HP_skill_get_unit_interval(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_unit_interval(skill_id); } if( HPMHooks.count.HP_skill_get_unit_interval_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_interval_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_unit_interval_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65770,10 +65990,10 @@ int HP_skill_get_unit_bl_target(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_unit_bl_target(skill_id); } if( HPMHooks.count.HP_skill_get_unit_bl_target_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_bl_target_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_unit_bl_target_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65797,10 +66017,10 @@ int HP_skill_get_unit_layout_type(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_unit_layout_type(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_unit_layout_type_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_layout_type_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_unit_layout_type_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65824,10 +66044,10 @@ int HP_skill_get_unit_range(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_unit_range(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_unit_range_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_range_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_unit_range_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65851,10 +66071,10 @@ int HP_skill_get_cooldown(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_cooldown(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_cooldown_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_cooldown_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_cooldown_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -65878,10 +66098,10 @@ int HP_skill_tree_get_max(uint16 skill_id, int b_class) { retVal___ = HPMHooks.source.skill.tree_get_max(skill_id, b_class); } if( HPMHooks.count.HP_skill_tree_get_max_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, int *b_class); + int (*postHookFunc) (int retVal___, uint16 skill_id, int b_class); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_tree_get_max_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_tree_get_max_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &b_class); + retVal___ = postHookFunc(retVal___, skill_id, b_class); } } return retVal___; @@ -65905,10 +66125,10 @@ const char* HP_skill_get_name(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_name(skill_id); } if( HPMHooks.count.HP_skill_get_name_post ) { - const char* (*postHookFunc) (const char* retVal___, uint16 *skill_id); + const char* (*postHookFunc) (const char* retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_name_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65932,10 +66152,10 @@ const char* HP_skill_get_desc(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_desc(skill_id); } if( HPMHooks.count.HP_skill_get_desc_post ) { - const char* (*postHookFunc) (const char* retVal___, uint16 *skill_id); + const char* (*postHookFunc) (const char* retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_desc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_desc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -65943,11 +66163,11 @@ const char* HP_skill_get_desc(uint16 skill_id) { void HP_skill_chk(uint16 *skill_id) { int hIndex = 0; if( HPMHooks.count.HP_skill_chk_pre ) { - void (*preHookFunc) (uint16 *skill_id); + void (*preHookFunc) (uint16 **skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_chk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_chk_pre[hIndex].func; - preHookFunc(skill_id); + preHookFunc(&skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -65985,10 +66205,10 @@ int HP_skill_get_casttype(uint16 skill_id) { retVal___ = HPMHooks.source.skill.get_casttype(skill_id); } if( HPMHooks.count.HP_skill_get_casttype_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id); + int (*postHookFunc) (int retVal___, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_casttype_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_casttype_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -66012,10 +66232,10 @@ int HP_skill_get_casttype2(uint16 index) { retVal___ = HPMHooks.source.skill.get_casttype2(index); } if( HPMHooks.count.HP_skill_get_casttype2_post ) { - int (*postHookFunc) (int retVal___, uint16 *index); + int (*postHookFunc) (int retVal___, uint16 index); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_casttype2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_casttype2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &index); + retVal___ = postHookFunc(retVal___, index); } } return retVal___; @@ -66039,10 +66259,10 @@ bool HP_skill_is_combo(int skill_id) { retVal___ = HPMHooks.source.skill.is_combo(skill_id); } if( HPMHooks.count.HP_skill_is_combo_post ) { - bool (*postHookFunc) (bool retVal___, int *skill_id); + bool (*postHookFunc) (bool retVal___, int skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_is_combo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_is_combo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -66051,11 +66271,11 @@ int HP_skill_name2id(const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_name2id_pre ) { - int (*preHookFunc) (const char *name); + int (*preHookFunc) (const char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_name2id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_name2id_pre[hIndex].func; - retVal___ = preHookFunc(name); + retVal___ = preHookFunc(&name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66078,11 +66298,11 @@ int HP_skill_isammotype(struct map_session_data *sd, int skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_isammotype_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *skill_id); + int (*preHookFunc) (struct map_session_data **sd, int *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_isammotype_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_isammotype_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id); + retVal___ = preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66093,10 +66313,10 @@ int HP_skill_isammotype(struct map_session_data *sd, int skill_id) { retVal___ = HPMHooks.source.skill.isammotype(sd, skill_id); } if( HPMHooks.count.HP_skill_isammotype_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_isammotype_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_isammotype_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id); + retVal___ = postHookFunc(retVal___, sd, skill_id); } } return retVal___; @@ -66120,10 +66340,10 @@ int HP_skill_castend_id(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.skill.castend_id(tid, tick, id, data); } if( HPMHooks.count.HP_skill_castend_id_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_castend_id_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -66147,10 +66367,10 @@ int HP_skill_castend_pos(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.skill.castend_pos(tid, tick, id, data); } if( HPMHooks.count.HP_skill_castend_pos_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_pos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_castend_pos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -66159,11 +66379,11 @@ int HP_skill_castend_map(struct map_session_data *sd, uint16 skill_id, const cha int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_castend_map_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, const char *mapname); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, const char **mapname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_map_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_map_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, mapname); + retVal___ = preHookFunc(&sd, &skill_id, &mapname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66174,10 +66394,10 @@ int HP_skill_castend_map(struct map_session_data *sd, uint16 skill_id, const cha retVal___ = HPMHooks.source.skill.castend_map(sd, skill_id, mapname); } if( HPMHooks.count.HP_skill_castend_map_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, const char *mapname); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id, const char *mapname); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_map_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_castend_map_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, mapname); + retVal___ = postHookFunc(retVal___, sd, skill_id, mapname); } } return retVal___; @@ -66186,11 +66406,11 @@ int HP_skill_cleartimerskill(struct block_list *src) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_cleartimerskill_pre ) { - int (*preHookFunc) (struct block_list *src); + int (*preHookFunc) (struct block_list **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_cleartimerskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_cleartimerskill_pre[hIndex].func; - retVal___ = preHookFunc(src); + retVal___ = preHookFunc(&src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66213,11 +66433,11 @@ int HP_skill_addtimerskill(struct block_list *src, int64 tick, int target, int x int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_addtimerskill_pre ) { - int (*preHookFunc) (struct block_list *src, int64 *tick, int *target, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int *type, int *flag); + int (*preHookFunc) (struct block_list **src, int64 *tick, int *target, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int *type, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_addtimerskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_addtimerskill_pre[hIndex].func; - retVal___ = preHookFunc(src, &tick, &target, &x, &y, &skill_id, &skill_lv, &type, &flag); + retVal___ = preHookFunc(&src, &tick, &target, &x, &y, &skill_id, &skill_lv, &type, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66228,10 +66448,10 @@ int HP_skill_addtimerskill(struct block_list *src, int64 tick, int target, int x retVal___ = HPMHooks.source.skill.addtimerskill(src, tick, target, x, y, skill_id, skill_lv, type, flag); } if( HPMHooks.count.HP_skill_addtimerskill_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, int64 *tick, int *target, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int *type, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, int64 tick, int target, int x, int y, uint16 skill_id, uint16 skill_lv, int type, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_addtimerskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_addtimerskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &tick, &target, &x, &y, &skill_id, &skill_lv, &type, &flag); + retVal___ = postHookFunc(retVal___, src, tick, target, x, y, skill_id, skill_lv, type, flag); } } return retVal___; @@ -66240,11 +66460,11 @@ int HP_skill_additional_effect(struct block_list *src, struct block_list *bl, ui int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_additional_effect_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int *dmg_lv, int64 *tick); + int (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int *dmg_lv, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_additional_effect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_additional_effect_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &skill_id, &skill_lv, &attack_type, &dmg_lv, &tick); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &attack_type, &dmg_lv, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66255,10 +66475,10 @@ int HP_skill_additional_effect(struct block_list *src, struct block_list *bl, ui retVal___ = HPMHooks.source.skill.additional_effect(src, bl, skill_id, skill_lv, attack_type, dmg_lv, tick); } if( HPMHooks.count.HP_skill_additional_effect_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int *dmg_lv, int64 *tick); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int dmg_lv, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_additional_effect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_additional_effect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &skill_id, &skill_lv, &attack_type, &dmg_lv, &tick); + retVal___ = postHookFunc(retVal___, src, bl, skill_id, skill_lv, attack_type, dmg_lv, tick); } } return retVal___; @@ -66267,11 +66487,11 @@ int HP_skill_counter_additional_effect(struct block_list *src, struct block_list int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_counter_additional_effect_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int64 *tick); + int (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_counter_additional_effect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_counter_additional_effect_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &skill_id, &skill_lv, &attack_type, &tick); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &attack_type, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66282,10 +66502,10 @@ int HP_skill_counter_additional_effect(struct block_list *src, struct block_list retVal___ = HPMHooks.source.skill.counter_additional_effect(src, bl, skill_id, skill_lv, attack_type, tick); } if( HPMHooks.count.HP_skill_counter_additional_effect_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int64 *tick); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_counter_additional_effect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_counter_additional_effect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &skill_id, &skill_lv, &attack_type, &tick); + retVal___ = postHookFunc(retVal___, src, bl, skill_id, skill_lv, attack_type, tick); } } return retVal___; @@ -66294,11 +66514,11 @@ int HP_skill_blown(struct block_list *src, struct block_list *target, int count, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_blown_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, int *count, int8 *dir, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **target, int *count, int8 *dir, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_blown_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &count, &dir, &flag); + retVal___ = preHookFunc(&src, &target, &count, &dir, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66309,10 +66529,10 @@ int HP_skill_blown(struct block_list *src, struct block_list *target, int count, retVal___ = HPMHooks.source.skill.blown(src, target, count, dir, flag); } if( HPMHooks.count.HP_skill_blown_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int *count, int8 *dir, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int count, int8 dir, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blown_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_blown_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &count, &dir, &flag); + retVal___ = postHookFunc(retVal___, src, target, count, dir, flag); } } return retVal___; @@ -66321,11 +66541,11 @@ int HP_skill_break_equip(struct block_list *bl, unsigned short where, int rate, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_break_equip_pre ) { - int (*preHookFunc) (struct block_list *bl, unsigned short *where, int *rate, int *flag); + int (*preHookFunc) (struct block_list **bl, unsigned short *where, int *rate, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_break_equip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_break_equip_pre[hIndex].func; - retVal___ = preHookFunc(bl, &where, &rate, &flag); + retVal___ = preHookFunc(&bl, &where, &rate, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66336,10 +66556,10 @@ int HP_skill_break_equip(struct block_list *bl, unsigned short where, int rate, retVal___ = HPMHooks.source.skill.break_equip(bl, where, rate, flag); } if( HPMHooks.count.HP_skill_break_equip_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned short *where, int *rate, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned short where, int rate, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_break_equip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_break_equip_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &where, &rate, &flag); + retVal___ = postHookFunc(retVal___, bl, where, rate, flag); } } return retVal___; @@ -66348,11 +66568,11 @@ int HP_skill_strip_equip(struct block_list *bl, unsigned short where, int rate, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_strip_equip_pre ) { - int (*preHookFunc) (struct block_list *bl, unsigned short *where, int *rate, int *lv, int *time); + int (*preHookFunc) (struct block_list **bl, unsigned short *where, int *rate, int *lv, int *time); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_strip_equip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_strip_equip_pre[hIndex].func; - retVal___ = preHookFunc(bl, &where, &rate, &lv, &time); + retVal___ = preHookFunc(&bl, &where, &rate, &lv, &time); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66363,10 +66583,10 @@ int HP_skill_strip_equip(struct block_list *bl, unsigned short where, int rate, retVal___ = HPMHooks.source.skill.strip_equip(bl, where, rate, lv, time); } if( HPMHooks.count.HP_skill_strip_equip_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned short *where, int *rate, int *lv, int *time); + int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned short where, int rate, int lv, int time); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_strip_equip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_strip_equip_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &where, &rate, &lv, &time); + retVal___ = postHookFunc(retVal___, bl, where, rate, lv, time); } } return retVal___; @@ -66390,10 +66610,10 @@ struct skill_unit_group* HP_skill_id2group(int group_id) { retVal___ = HPMHooks.source.skill.id2group(group_id); } if( HPMHooks.count.HP_skill_id2group_post ) { - struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, int *group_id); + struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, int group_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_id2group_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_id2group_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &group_id); + retVal___ = postHookFunc(retVal___, group_id); } } return retVal___; @@ -66402,11 +66622,11 @@ struct skill_unit_group* HP_skill_unitsetting(struct block_list *src, uint16 ski int hIndex = 0; struct skill_unit_group* retVal___ = NULL; if( HPMHooks.count.HP_skill_unitsetting_pre ) { - struct skill_unit_group* (*preHookFunc) (struct block_list *src, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *flag); + struct skill_unit_group* (*preHookFunc) (struct block_list **src, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitsetting_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unitsetting_pre[hIndex].func; - retVal___ = preHookFunc(src, &skill_id, &skill_lv, &x, &y, &flag); + retVal___ = preHookFunc(&src, &skill_id, &skill_lv, &x, &y, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66417,10 +66637,10 @@ struct skill_unit_group* HP_skill_unitsetting(struct block_list *src, uint16 ski retVal___ = HPMHooks.source.skill.unitsetting(src, skill_id, skill_lv, x, y, flag); } if( HPMHooks.count.HP_skill_unitsetting_post ) { - struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, struct block_list *src, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *flag); + struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, struct block_list *src, uint16 skill_id, uint16 skill_lv, short x, short y, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitsetting_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unitsetting_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &skill_id, &skill_lv, &x, &y, &flag); + retVal___ = postHookFunc(retVal___, src, skill_id, skill_lv, x, y, flag); } } return retVal___; @@ -66429,11 +66649,11 @@ struct skill_unit* HP_skill_initunit(struct skill_unit_group *group, int idx, in int hIndex = 0; struct skill_unit* retVal___ = NULL; if( HPMHooks.count.HP_skill_initunit_pre ) { - struct skill_unit* (*preHookFunc) (struct skill_unit_group *group, int *idx, int *x, int *y, int *val1, int *val2); + struct skill_unit* (*preHookFunc) (struct skill_unit_group **group, int *idx, int *x, int *y, int *val1, int *val2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_initunit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_initunit_pre[hIndex].func; - retVal___ = preHookFunc(group, &idx, &x, &y, &val1, &val2); + retVal___ = preHookFunc(&group, &idx, &x, &y, &val1, &val2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66444,10 +66664,10 @@ struct skill_unit* HP_skill_initunit(struct skill_unit_group *group, int idx, in retVal___ = HPMHooks.source.skill.initunit(group, idx, x, y, val1, val2); } if( HPMHooks.count.HP_skill_initunit_post ) { - struct skill_unit* (*postHookFunc) (struct skill_unit* retVal___, struct skill_unit_group *group, int *idx, int *x, int *y, int *val1, int *val2); + struct skill_unit* (*postHookFunc) (struct skill_unit* retVal___, struct skill_unit_group *group, int idx, int x, int y, int val1, int val2); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_initunit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_initunit_post[hIndex].func; - retVal___ = postHookFunc(retVal___, group, &idx, &x, &y, &val1, &val2); + retVal___ = postHookFunc(retVal___, group, idx, x, y, val1, val2); } } return retVal___; @@ -66456,11 +66676,11 @@ int HP_skill_delunit(struct skill_unit *su) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_delunit_pre ) { - int (*preHookFunc) (struct skill_unit *su); + int (*preHookFunc) (struct skill_unit **su); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_delunit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_delunit_pre[hIndex].func; - retVal___ = preHookFunc(su); + retVal___ = preHookFunc(&su); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66483,11 +66703,11 @@ struct skill_unit_group* HP_skill_init_unitgroup(struct block_list *src, int cou int hIndex = 0; struct skill_unit_group* retVal___ = NULL; if( HPMHooks.count.HP_skill_init_unitgroup_pre ) { - struct skill_unit_group* (*preHookFunc) (struct block_list *src, int *count, uint16 *skill_id, uint16 *skill_lv, int *unit_id, int *limit, int *interval); + struct skill_unit_group* (*preHookFunc) (struct block_list **src, int *count, uint16 *skill_id, uint16 *skill_lv, int *unit_id, int *limit, int *interval); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_init_unitgroup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_init_unitgroup_pre[hIndex].func; - retVal___ = preHookFunc(src, &count, &skill_id, &skill_lv, &unit_id, &limit, &interval); + retVal___ = preHookFunc(&src, &count, &skill_id, &skill_lv, &unit_id, &limit, &interval); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66498,10 +66718,10 @@ struct skill_unit_group* HP_skill_init_unitgroup(struct block_list *src, int cou retVal___ = HPMHooks.source.skill.init_unitgroup(src, count, skill_id, skill_lv, unit_id, limit, interval); } if( HPMHooks.count.HP_skill_init_unitgroup_post ) { - struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, struct block_list *src, int *count, uint16 *skill_id, uint16 *skill_lv, int *unit_id, int *limit, int *interval); + struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, struct block_list *src, int count, uint16 skill_id, uint16 skill_lv, int unit_id, int limit, int interval); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_init_unitgroup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_init_unitgroup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &count, &skill_id, &skill_lv, &unit_id, &limit, &interval); + retVal___ = postHookFunc(retVal___, src, count, skill_id, skill_lv, unit_id, limit, interval); } } return retVal___; @@ -66510,11 +66730,11 @@ int HP_skill_del_unitgroup(struct skill_unit_group *group, const char *file, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_del_unitgroup_pre ) { - int (*preHookFunc) (struct skill_unit_group *group, const char *file, int *line, const char *func); + int (*preHookFunc) (struct skill_unit_group **group, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_del_unitgroup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_del_unitgroup_pre[hIndex].func; - retVal___ = preHookFunc(group, file, &line, func); + retVal___ = preHookFunc(&group, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66525,10 +66745,10 @@ int HP_skill_del_unitgroup(struct skill_unit_group *group, const char *file, int retVal___ = HPMHooks.source.skill.del_unitgroup(group, file, line, func); } if( HPMHooks.count.HP_skill_del_unitgroup_post ) { - int (*postHookFunc) (int retVal___, struct skill_unit_group *group, const char *file, int *line, const char *func); + int (*postHookFunc) (int retVal___, struct skill_unit_group *group, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_del_unitgroup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_del_unitgroup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, group, file, &line, func); + retVal___ = postHookFunc(retVal___, group, file, line, func); } } return retVal___; @@ -66537,11 +66757,11 @@ int HP_skill_clear_unitgroup(struct block_list *src) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_clear_unitgroup_pre ) { - int (*preHookFunc) (struct block_list *src); + int (*preHookFunc) (struct block_list **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_clear_unitgroup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_clear_unitgroup_pre[hIndex].func; - retVal___ = preHookFunc(src); + retVal___ = preHookFunc(&src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66564,11 +66784,11 @@ int HP_skill_clear_group(struct block_list *bl, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_clear_group_pre ) { - int (*preHookFunc) (struct block_list *bl, int *flag); + int (*preHookFunc) (struct block_list **bl, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_clear_group_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_clear_group_pre[hIndex].func; - retVal___ = preHookFunc(bl, &flag); + retVal___ = preHookFunc(&bl, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66579,10 +66799,10 @@ int HP_skill_clear_group(struct block_list *bl, int flag) { retVal___ = HPMHooks.source.skill.clear_group(bl, flag); } if( HPMHooks.count.HP_skill_clear_group_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *bl, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_clear_group_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_clear_group_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &flag); + retVal___ = postHookFunc(retVal___, bl, flag); } } return retVal___; @@ -66591,11 +66811,11 @@ int HP_skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int64 t int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_onplace_pre ) { - int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, int64 *tick); + int (*preHookFunc) (struct skill_unit **src, struct block_list **bl, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_onplace_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unit_onplace_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &tick); + retVal___ = preHookFunc(&src, &bl, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66606,10 +66826,10 @@ int HP_skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int64 t retVal___ = HPMHooks.source.skill.unit_onplace(src, bl, tick); } if( HPMHooks.count.HP_skill_unit_onplace_post ) { - int (*postHookFunc) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 *tick); + int (*postHookFunc) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_onplace_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unit_onplace_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &tick); + retVal___ = postHookFunc(retVal___, src, bl, tick); } } return retVal___; @@ -66618,11 +66838,11 @@ int HP_skill_unit_ondamaged(struct skill_unit *src, struct block_list *bl, int64 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_ondamaged_pre ) { - int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, int64 *damage, int64 *tick); + int (*preHookFunc) (struct skill_unit **src, struct block_list **bl, int64 *damage, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_ondamaged_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unit_ondamaged_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &damage, &tick); + retVal___ = preHookFunc(&src, &bl, &damage, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66633,10 +66853,10 @@ int HP_skill_unit_ondamaged(struct skill_unit *src, struct block_list *bl, int64 retVal___ = HPMHooks.source.skill.unit_ondamaged(src, bl, damage, tick); } if( HPMHooks.count.HP_skill_unit_ondamaged_post ) { - int (*postHookFunc) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 *damage, int64 *tick); + int (*postHookFunc) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 damage, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_ondamaged_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unit_ondamaged_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &damage, &tick); + retVal___ = postHookFunc(retVal___, src, bl, damage, tick); } } return retVal___; @@ -66645,11 +66865,11 @@ int HP_skill_cast_fix(struct block_list *bl, uint16 skill_id, uint16 skill_lv) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_cast_fix_pre ) { - int (*preHookFunc) (struct block_list *bl, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct block_list **bl, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_cast_fix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_cast_fix_pre[hIndex].func; - retVal___ = preHookFunc(bl, &skill_id, &skill_lv); + retVal___ = preHookFunc(&bl, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66660,10 +66880,10 @@ int HP_skill_cast_fix(struct block_list *bl, uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.cast_fix(bl, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_cast_fix_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct block_list *bl, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_cast_fix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_cast_fix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, bl, skill_id, skill_lv); } } return retVal___; @@ -66672,11 +66892,11 @@ int HP_skill_cast_fix_sc(struct block_list *bl, int time) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_cast_fix_sc_pre ) { - int (*preHookFunc) (struct block_list *bl, int *time); + int (*preHookFunc) (struct block_list **bl, int *time); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_cast_fix_sc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_cast_fix_sc_pre[hIndex].func; - retVal___ = preHookFunc(bl, &time); + retVal___ = preHookFunc(&bl, &time); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66687,10 +66907,10 @@ int HP_skill_cast_fix_sc(struct block_list *bl, int time) { retVal___ = HPMHooks.source.skill.cast_fix_sc(bl, time); } if( HPMHooks.count.HP_skill_cast_fix_sc_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *time); + int (*postHookFunc) (int retVal___, struct block_list *bl, int time); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_cast_fix_sc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_cast_fix_sc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &time); + retVal___ = postHookFunc(retVal___, bl, time); } } return retVal___; @@ -66699,11 +66919,11 @@ int HP_skill_vf_cast_fix(struct block_list *bl, double time, uint16 skill_id, ui int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_vf_cast_fix_pre ) { - int (*preHookFunc) (struct block_list *bl, double *time, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct block_list **bl, double *time, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_vf_cast_fix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_vf_cast_fix_pre[hIndex].func; - retVal___ = preHookFunc(bl, &time, &skill_id, &skill_lv); + retVal___ = preHookFunc(&bl, &time, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66714,10 +66934,10 @@ int HP_skill_vf_cast_fix(struct block_list *bl, double time, uint16 skill_id, ui retVal___ = HPMHooks.source.skill.vf_cast_fix(bl, time, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_vf_cast_fix_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, double *time, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct block_list *bl, double time, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_vf_cast_fix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_vf_cast_fix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &time, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, bl, time, skill_id, skill_lv); } } return retVal___; @@ -66726,11 +66946,11 @@ int HP_skill_delay_fix(struct block_list *bl, uint16 skill_id, uint16 skill_lv) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_delay_fix_pre ) { - int (*preHookFunc) (struct block_list *bl, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct block_list **bl, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_delay_fix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_delay_fix_pre[hIndex].func; - retVal___ = preHookFunc(bl, &skill_id, &skill_lv); + retVal___ = preHookFunc(&bl, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66741,10 +66961,10 @@ int HP_skill_delay_fix(struct block_list *bl, uint16 skill_id, uint16 skill_lv) retVal___ = HPMHooks.source.skill.delay_fix(bl, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_delay_fix_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct block_list *bl, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_delay_fix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_delay_fix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, bl, skill_id, skill_lv); } } return retVal___; @@ -66753,11 +66973,11 @@ int HP_skill_check_condition_castbegin(struct map_session_data *sd, uint16 skill int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_condition_castbegin_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_castbegin_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_condition_castbegin_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, &skill_lv); + retVal___ = preHookFunc(&sd, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66768,10 +66988,10 @@ int HP_skill_check_condition_castbegin(struct map_session_data *sd, uint16 skill retVal___ = HPMHooks.source.skill.check_condition_castbegin(sd, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_check_condition_castbegin_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_castbegin_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_check_condition_castbegin_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, sd, skill_id, skill_lv); } } return retVal___; @@ -66780,11 +67000,11 @@ int HP_skill_check_condition_castend(struct map_session_data *sd, uint16 skill_i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_condition_castend_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_castend_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_condition_castend_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, &skill_lv); + retVal___ = preHookFunc(&sd, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66795,10 +67015,10 @@ int HP_skill_check_condition_castend(struct map_session_data *sd, uint16 skill_i retVal___ = HPMHooks.source.skill.check_condition_castend(sd, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_check_condition_castend_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_castend_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_check_condition_castend_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, sd, skill_id, skill_lv); } } return retVal___; @@ -66807,11 +67027,11 @@ int HP_skill_consume_requirement(struct map_session_data *sd, uint16 skill_id, u int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_consume_requirement_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, short *type); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv, short *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_consume_requirement_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_consume_requirement_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, &skill_lv, &type); + retVal___ = preHookFunc(&sd, &skill_id, &skill_lv, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66822,24 +67042,23 @@ int HP_skill_consume_requirement(struct map_session_data *sd, uint16 skill_id, u retVal___ = HPMHooks.source.skill.consume_requirement(sd, skill_id, skill_lv, type); } if( HPMHooks.count.HP_skill_consume_requirement_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, short *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_consume_requirement_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_consume_requirement_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, &skill_lv, &type); + retVal___ = postHookFunc(retVal___, sd, skill_id, skill_lv, type); } } return retVal___; } struct skill_condition HP_skill_get_requirement(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) { int hIndex = 0; - struct skill_condition retVal___; - memset(&retVal___, '\0', sizeof(struct skill_condition)); + struct skill_condition retVal___ = { 0 }; if( HPMHooks.count.HP_skill_get_requirement_pre ) { - struct skill_condition (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + struct skill_condition (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_requirement_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_get_requirement_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, &skill_lv); + retVal___ = preHookFunc(&sd, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66850,10 +67069,10 @@ struct skill_condition HP_skill_get_requirement(struct map_session_data *sd, uin retVal___ = HPMHooks.source.skill.get_requirement(sd, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_requirement_post ) { - struct skill_condition (*postHookFunc) (struct skill_condition retVal___, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + struct skill_condition (*postHookFunc) (struct skill_condition retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_requirement_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_requirement_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, sd, skill_id, skill_lv); } } return retVal___; @@ -66862,11 +67081,11 @@ int HP_skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, uint int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_pc_partner_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, int *range, int *cast_flag); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 **skill_lv, int *range, int *cast_flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_pc_partner_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_pc_partner_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, skill_lv, &range, &cast_flag); + retVal___ = preHookFunc(&sd, &skill_id, &skill_lv, &range, &cast_flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66877,10 +67096,10 @@ int HP_skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, uint retVal___ = HPMHooks.source.skill.check_pc_partner(sd, skill_id, skill_lv, range, cast_flag); } if( HPMHooks.count.HP_skill_check_pc_partner_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, int *range, int *cast_flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 *skill_lv, int range, int cast_flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_pc_partner_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_check_pc_partner_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, skill_lv, &range, &cast_flag); + retVal___ = postHookFunc(retVal___, sd, skill_id, skill_lv, range, cast_flag); } } return retVal___; @@ -66889,11 +67108,11 @@ int HP_skill_unit_move(struct block_list *bl, int64 tick, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_move_pre ) { - int (*preHookFunc) (struct block_list *bl, int64 *tick, int *flag); + int (*preHookFunc) (struct block_list **bl, int64 *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_move_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unit_move_pre[hIndex].func; - retVal___ = preHookFunc(bl, &tick, &flag); + retVal___ = preHookFunc(&bl, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66904,10 +67123,10 @@ int HP_skill_unit_move(struct block_list *bl, int64 tick, int flag) { retVal___ = HPMHooks.source.skill.unit_move(bl, tick, flag); } if( HPMHooks.count.HP_skill_unit_move_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int64 *tick, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *bl, int64 tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_move_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unit_move_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &tick, &flag); + retVal___ = postHookFunc(retVal___, bl, tick, flag); } } return retVal___; @@ -66916,11 +67135,11 @@ int HP_skill_unit_onleft(uint16 skill_id, struct block_list *bl, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_onleft_pre ) { - int (*preHookFunc) (uint16 *skill_id, struct block_list *bl, int64 *tick); + int (*preHookFunc) (uint16 *skill_id, struct block_list **bl, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_onleft_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unit_onleft_pre[hIndex].func; - retVal___ = preHookFunc(&skill_id, bl, &tick); + retVal___ = preHookFunc(&skill_id, &bl, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66931,10 +67150,10 @@ int HP_skill_unit_onleft(uint16 skill_id, struct block_list *bl, int64 tick) { retVal___ = HPMHooks.source.skill.unit_onleft(skill_id, bl, tick); } if( HPMHooks.count.HP_skill_unit_onleft_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, struct block_list *bl, int64 *tick); + int (*postHookFunc) (int retVal___, uint16 skill_id, struct block_list *bl, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_onleft_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unit_onleft_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, bl, &tick); + retVal___ = postHookFunc(retVal___, skill_id, bl, tick); } } return retVal___; @@ -66943,11 +67162,11 @@ int HP_skill_unit_onout(struct skill_unit *src, struct block_list *bl, int64 tic int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_onout_pre ) { - int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, int64 *tick); + int (*preHookFunc) (struct skill_unit **src, struct block_list **bl, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_onout_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unit_onout_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &tick); + retVal___ = preHookFunc(&src, &bl, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66958,10 +67177,10 @@ int HP_skill_unit_onout(struct skill_unit *src, struct block_list *bl, int64 tic retVal___ = HPMHooks.source.skill.unit_onout(src, bl, tick); } if( HPMHooks.count.HP_skill_unit_onout_post ) { - int (*postHookFunc) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 *tick); + int (*postHookFunc) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_onout_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unit_onout_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &tick); + retVal___ = postHookFunc(retVal___, src, bl, tick); } } return retVal___; @@ -66970,11 +67189,11 @@ int HP_skill_unit_move_unit_group(struct skill_unit_group *group, int16 m, int16 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_move_unit_group_pre ) { - int (*preHookFunc) (struct skill_unit_group *group, int16 *m, int16 *dx, int16 *dy); + int (*preHookFunc) (struct skill_unit_group **group, int16 *m, int16 *dx, int16 *dy); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_move_unit_group_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unit_move_unit_group_pre[hIndex].func; - retVal___ = preHookFunc(group, &m, &dx, &dy); + retVal___ = preHookFunc(&group, &m, &dx, &dy); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -66985,10 +67204,10 @@ int HP_skill_unit_move_unit_group(struct skill_unit_group *group, int16 m, int16 retVal___ = HPMHooks.source.skill.unit_move_unit_group(group, m, dx, dy); } if( HPMHooks.count.HP_skill_unit_move_unit_group_post ) { - int (*postHookFunc) (int retVal___, struct skill_unit_group *group, int16 *m, int16 *dx, int16 *dy); + int (*postHookFunc) (int retVal___, struct skill_unit_group *group, int16 m, int16 dx, int16 dy); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_move_unit_group_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unit_move_unit_group_post[hIndex].func; - retVal___ = postHookFunc(retVal___, group, &m, &dx, &dy); + retVal___ = postHookFunc(retVal___, group, m, dx, dy); } } return retVal___; @@ -66997,11 +67216,11 @@ int HP_skill_sit(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_sit_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_sit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_sit_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67012,10 +67231,10 @@ int HP_skill_sit(struct map_session_data *sd, int type) { retVal___ = HPMHooks.source.skill.sit(sd, type); } if( HPMHooks.count.HP_skill_sit_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_sit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_sit_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, type); } } return retVal___; @@ -67023,11 +67242,11 @@ int HP_skill_sit(struct map_session_data *sd, int type) { void HP_skill_brandishspear(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) { int hIndex = 0; if( HPMHooks.count.HP_skill_brandishspear_pre ) { - void (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + void (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_brandishspear_pre[hIndex].func; - preHookFunc(src, bl, &skill_id, &skill_lv, &tick, &flag); + preHookFunc(&src, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67038,10 +67257,10 @@ void HP_skill_brandishspear(struct block_list *src, struct block_list *bl, uint1 HPMHooks.source.skill.brandishspear(src, bl, skill_id, skill_lv, tick, flag); } if( HPMHooks.count.HP_skill_brandishspear_post ) { - void (*postHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + void (*postHookFunc) (struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_brandishspear_post[hIndex].func; - postHookFunc(src, bl, &skill_id, &skill_lv, &tick, &flag); + postHookFunc(src, bl, skill_id, skill_lv, tick, flag); } } return; @@ -67049,11 +67268,11 @@ void HP_skill_brandishspear(struct block_list *src, struct block_list *bl, uint1 void HP_skill_repairweapon(struct map_session_data *sd, int idx) { int hIndex = 0; if( HPMHooks.count.HP_skill_repairweapon_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *idx); + void (*preHookFunc) (struct map_session_data **sd, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_repairweapon_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_repairweapon_pre[hIndex].func; - preHookFunc(sd, &idx); + preHookFunc(&sd, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67064,10 +67283,10 @@ void HP_skill_repairweapon(struct map_session_data *sd, int idx) { HPMHooks.source.skill.repairweapon(sd, idx); } if( HPMHooks.count.HP_skill_repairweapon_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *idx); + void (*postHookFunc) (struct map_session_data *sd, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_repairweapon_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_repairweapon_post[hIndex].func; - postHookFunc(sd, &idx); + postHookFunc(sd, idx); } } return; @@ -67075,11 +67294,11 @@ void HP_skill_repairweapon(struct map_session_data *sd, int idx) { void HP_skill_identify(struct map_session_data *sd, int idx) { int hIndex = 0; if( HPMHooks.count.HP_skill_identify_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *idx); + void (*preHookFunc) (struct map_session_data **sd, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_identify_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_identify_pre[hIndex].func; - preHookFunc(sd, &idx); + preHookFunc(&sd, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67090,10 +67309,10 @@ void HP_skill_identify(struct map_session_data *sd, int idx) { HPMHooks.source.skill.identify(sd, idx); } if( HPMHooks.count.HP_skill_identify_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *idx); + void (*postHookFunc) (struct map_session_data *sd, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_identify_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_identify_post[hIndex].func; - postHookFunc(sd, &idx); + postHookFunc(sd, idx); } } return; @@ -67101,11 +67320,11 @@ void HP_skill_identify(struct map_session_data *sd, int idx) { void HP_skill_weaponrefine(struct map_session_data *sd, int idx) { int hIndex = 0; if( HPMHooks.count.HP_skill_weaponrefine_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *idx); + void (*preHookFunc) (struct map_session_data **sd, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_weaponrefine_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_weaponrefine_pre[hIndex].func; - preHookFunc(sd, &idx); + preHookFunc(&sd, &idx); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67116,10 +67335,10 @@ void HP_skill_weaponrefine(struct map_session_data *sd, int idx) { HPMHooks.source.skill.weaponrefine(sd, idx); } if( HPMHooks.count.HP_skill_weaponrefine_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *idx); + void (*postHookFunc) (struct map_session_data *sd, int idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_weaponrefine_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_weaponrefine_post[hIndex].func; - postHookFunc(sd, &idx); + postHookFunc(sd, idx); } } return; @@ -67128,11 +67347,11 @@ int HP_skill_autospell(struct map_session_data *md, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_autospell_pre ) { - int (*preHookFunc) (struct map_session_data *md, uint16 *skill_id); + int (*preHookFunc) (struct map_session_data **md, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_autospell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_autospell_pre[hIndex].func; - retVal___ = preHookFunc(md, &skill_id); + retVal___ = preHookFunc(&md, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67143,10 +67362,10 @@ int HP_skill_autospell(struct map_session_data *md, uint16 skill_id) { retVal___ = HPMHooks.source.skill.autospell(md, skill_id); } if( HPMHooks.count.HP_skill_autospell_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *md, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *md, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_autospell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_autospell_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &skill_id); + retVal___ = postHookFunc(retVal___, md, skill_id); } } return retVal___; @@ -67155,11 +67374,11 @@ int HP_skill_calc_heal(struct block_list *src, struct block_list *target, uint16 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_calc_heal_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, bool *heal); + int (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, bool *heal); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_calc_heal_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_calc_heal_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &skill_id, &skill_lv, &heal); + retVal___ = preHookFunc(&src, &target, &skill_id, &skill_lv, &heal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67170,10 +67389,10 @@ int HP_skill_calc_heal(struct block_list *src, struct block_list *target, uint16 retVal___ = HPMHooks.source.skill.calc_heal(src, target, skill_id, skill_lv, heal); } if( HPMHooks.count.HP_skill_calc_heal_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, bool *heal); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, bool heal); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_calc_heal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_calc_heal_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &skill_id, &skill_lv, &heal); + retVal___ = postHookFunc(retVal___, src, target, skill_id, skill_lv, heal); } } return retVal___; @@ -67182,11 +67401,11 @@ bool HP_skill_check_cloaking(struct block_list *bl, struct status_change_entry * int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_check_cloaking_pre ) { - bool (*preHookFunc) (struct block_list *bl, struct status_change_entry *sce); + bool (*preHookFunc) (struct block_list **bl, struct status_change_entry **sce); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_cloaking_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_cloaking_pre[hIndex].func; - retVal___ = preHookFunc(bl, sce); + retVal___ = preHookFunc(&bl, &sce); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67209,12 +67428,12 @@ int HP_skill_check_cloaking_end(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_cloaking_end_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_cloaking_end_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_check_cloaking_end_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -67242,11 +67461,11 @@ bool HP_skill_can_cloak(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_can_cloak_pre ) { - bool (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_can_cloak_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_can_cloak_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67269,11 +67488,11 @@ int HP_skill_enchant_elemental_end(struct block_list *bl, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_enchant_elemental_end_pre ) { - int (*preHookFunc) (struct block_list *bl, int *type); + int (*preHookFunc) (struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_enchant_elemental_end_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_enchant_elemental_end_pre[hIndex].func; - retVal___ = preHookFunc(bl, &type); + retVal___ = preHookFunc(&bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67284,10 +67503,10 @@ int HP_skill_enchant_elemental_end(struct block_list *bl, int type) { retVal___ = HPMHooks.source.skill.enchant_elemental_end(bl, type); } if( HPMHooks.count.HP_skill_enchant_elemental_end_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *type); + int (*postHookFunc) (int retVal___, struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_enchant_elemental_end_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_enchant_elemental_end_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &type); + retVal___ = postHookFunc(retVal___, bl, type); } } return retVal___; @@ -67296,11 +67515,11 @@ int HP_skill_not_ok(uint16 skill_id, struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_not_ok_pre ) { - int (*preHookFunc) (uint16 *skill_id, struct map_session_data *sd); + int (*preHookFunc) (uint16 *skill_id, struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_not_ok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_not_ok_pre[hIndex].func; - retVal___ = preHookFunc(&skill_id, sd); + retVal___ = preHookFunc(&skill_id, &sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67311,10 +67530,10 @@ int HP_skill_not_ok(uint16 skill_id, struct map_session_data *sd) { retVal___ = HPMHooks.source.skill.not_ok(skill_id, sd); } if( HPMHooks.count.HP_skill_not_ok_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, struct map_session_data *sd); + int (*postHookFunc) (int retVal___, uint16 skill_id, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_not_ok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_not_ok_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, sd); + retVal___ = postHookFunc(retVal___, skill_id, sd); } } return retVal___; @@ -67323,11 +67542,11 @@ int HP_skill_not_ok_hom(uint16 skill_id, struct homun_data *hd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_not_ok_hom_pre ) { - int (*preHookFunc) (uint16 *skill_id, struct homun_data *hd); + int (*preHookFunc) (uint16 *skill_id, struct homun_data **hd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_not_ok_hom_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_not_ok_hom_pre[hIndex].func; - retVal___ = preHookFunc(&skill_id, hd); + retVal___ = preHookFunc(&skill_id, &hd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67338,10 +67557,10 @@ int HP_skill_not_ok_hom(uint16 skill_id, struct homun_data *hd) { retVal___ = HPMHooks.source.skill.not_ok_hom(skill_id, hd); } if( HPMHooks.count.HP_skill_not_ok_hom_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, struct homun_data *hd); + int (*postHookFunc) (int retVal___, uint16 skill_id, struct homun_data *hd); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_not_ok_hom_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_not_ok_hom_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, hd); + retVal___ = postHookFunc(retVal___, skill_id, hd); } } return retVal___; @@ -67350,11 +67569,11 @@ int HP_skill_not_ok_mercenary(uint16 skill_id, struct mercenary_data *md) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_not_ok_mercenary_pre ) { - int (*preHookFunc) (uint16 *skill_id, struct mercenary_data *md); + int (*preHookFunc) (uint16 *skill_id, struct mercenary_data **md); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_not_ok_mercenary_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_not_ok_mercenary_pre[hIndex].func; - retVal___ = preHookFunc(&skill_id, md); + retVal___ = preHookFunc(&skill_id, &md); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67365,10 +67584,10 @@ int HP_skill_not_ok_mercenary(uint16 skill_id, struct mercenary_data *md) { retVal___ = HPMHooks.source.skill.not_ok_mercenary(skill_id, md); } if( HPMHooks.count.HP_skill_not_ok_mercenary_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, struct mercenary_data *md); + int (*postHookFunc) (int retVal___, uint16 skill_id, struct mercenary_data *md); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_not_ok_mercenary_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_not_ok_mercenary_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, md); + retVal___ = postHookFunc(retVal___, skill_id, md); } } return retVal___; @@ -67377,12 +67596,12 @@ int HP_skill_chastle_mob_changetarget(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_chastle_mob_changetarget_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_chastle_mob_changetarget_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_chastle_mob_changetarget_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -67410,11 +67629,11 @@ int HP_skill_can_produce_mix(struct map_session_data *sd, int nameid, int trigge int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_can_produce_mix_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *nameid, int *trigger, int *qty); + int (*preHookFunc) (struct map_session_data **sd, int *nameid, int *trigger, int *qty); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_can_produce_mix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_can_produce_mix_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid, &trigger, &qty); + retVal___ = preHookFunc(&sd, &nameid, &trigger, &qty); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67425,10 +67644,10 @@ int HP_skill_can_produce_mix(struct map_session_data *sd, int nameid, int trigge retVal___ = HPMHooks.source.skill.can_produce_mix(sd, nameid, trigger, qty); } if( HPMHooks.count.HP_skill_can_produce_mix_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *nameid, int *trigger, int *qty); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int nameid, int trigger, int qty); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_can_produce_mix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_can_produce_mix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid, &trigger, &qty); + retVal___ = postHookFunc(retVal___, sd, nameid, trigger, qty); } } return retVal___; @@ -67437,11 +67656,11 @@ int HP_skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int namei int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_produce_mix_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *nameid, int *slot1, int *slot2, int *slot3, int *qty); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, int *nameid, int *slot1, int *slot2, int *slot3, int *qty); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_produce_mix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_produce_mix_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, &nameid, &slot1, &slot2, &slot3, &qty); + retVal___ = preHookFunc(&sd, &skill_id, &nameid, &slot1, &slot2, &slot3, &qty); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67452,10 +67671,10 @@ int HP_skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int namei retVal___ = HPMHooks.source.skill.produce_mix(sd, skill_id, nameid, slot1, slot2, slot3, qty); } if( HPMHooks.count.HP_skill_produce_mix_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, int *nameid, int *slot1, int *slot2, int *slot3, int *qty); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id, int nameid, int slot1, int slot2, int slot3, int qty); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_produce_mix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_produce_mix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, &nameid, &slot1, &slot2, &slot3, &qty); + retVal___ = postHookFunc(retVal___, sd, skill_id, nameid, slot1, slot2, slot3, qty); } } return retVal___; @@ -67464,11 +67683,11 @@ int HP_skill_arrow_create(struct map_session_data *sd, int nameid) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_arrow_create_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *nameid); + int (*preHookFunc) (struct map_session_data **sd, int *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_arrow_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_arrow_create_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid); + retVal___ = preHookFunc(&sd, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67479,10 +67698,10 @@ int HP_skill_arrow_create(struct map_session_data *sd, int nameid) { retVal___ = HPMHooks.source.skill.arrow_create(sd, nameid); } if( HPMHooks.count.HP_skill_arrow_create_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *nameid); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_arrow_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_arrow_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid); + retVal___ = postHookFunc(retVal___, sd, nameid); } } return retVal___; @@ -67491,11 +67710,11 @@ int HP_skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_castend_nodamage_id_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_nodamage_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_nodamage_id_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &skill_id, &skill_lv, &tick, &flag); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67506,10 +67725,10 @@ int HP_skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, retVal___ = HPMHooks.source.skill.castend_nodamage_id(src, bl, skill_id, skill_lv, tick, flag); } if( HPMHooks.count.HP_skill_castend_nodamage_id_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_nodamage_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_castend_nodamage_id_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &skill_id, &skill_lv, &tick, &flag); + retVal___ = postHookFunc(retVal___, src, bl, skill_id, skill_lv, tick, flag); } } return retVal___; @@ -67518,11 +67737,11 @@ int HP_skill_castend_damage_id(struct block_list *src, struct block_list *bl, ui int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_castend_damage_id_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_damage_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_damage_id_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &skill_id, &skill_lv, &tick, &flag); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67533,10 +67752,10 @@ int HP_skill_castend_damage_id(struct block_list *src, struct block_list *bl, ui retVal___ = HPMHooks.source.skill.castend_damage_id(src, bl, skill_id, skill_lv, tick, flag); } if( HPMHooks.count.HP_skill_castend_damage_id_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_damage_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_castend_damage_id_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &skill_id, &skill_lv, &tick, &flag); + retVal___ = postHookFunc(retVal___, src, bl, skill_id, skill_lv, tick, flag); } } return retVal___; @@ -67545,11 +67764,11 @@ int HP_skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill_id, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_castend_pos2_pre ) { - int (*preHookFunc) (struct block_list *src, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*preHookFunc) (struct block_list **src, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_pos2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_pos2_pre[hIndex].func; - retVal___ = preHookFunc(src, &x, &y, &skill_id, &skill_lv, &tick, &flag); + retVal___ = preHookFunc(&src, &x, &y, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67560,10 +67779,10 @@ int HP_skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill_id, retVal___ = HPMHooks.source.skill.castend_pos2(src, x, y, skill_id, skill_lv, tick, flag); } if( HPMHooks.count.HP_skill_castend_pos2_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, int x, int y, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_pos2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_castend_pos2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &x, &y, &skill_id, &skill_lv, &tick, &flag); + retVal___ = postHookFunc(retVal___, src, x, y, skill_id, skill_lv, tick, flag); } } return retVal___; @@ -67572,11 +67791,11 @@ int HP_skill_blockpc_start(struct map_session_data *sd, uint16 skill_id, int tic int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_blockpc_start_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *tick); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, int *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockpc_start_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_blockpc_start_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, &tick); + retVal___ = preHookFunc(&sd, &skill_id, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67587,10 +67806,10 @@ int HP_skill_blockpc_start(struct map_session_data *sd, uint16 skill_id, int tic retVal___ = HPMHooks.source.skill.blockpc_start(sd, skill_id, tick); } if( HPMHooks.count.HP_skill_blockpc_start_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, int *tick); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id, int tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockpc_start_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_blockpc_start_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, &tick); + retVal___ = postHookFunc(retVal___, sd, skill_id, tick); } } return retVal___; @@ -67599,11 +67818,11 @@ int HP_skill_blockhomun_start(struct homun_data *hd, uint16 skill_id, int tick) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_blockhomun_start_pre ) { - int (*preHookFunc) (struct homun_data *hd, uint16 *skill_id, int *tick); + int (*preHookFunc) (struct homun_data **hd, uint16 *skill_id, int *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockhomun_start_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_blockhomun_start_pre[hIndex].func; - retVal___ = preHookFunc(hd, &skill_id, &tick); + retVal___ = preHookFunc(&hd, &skill_id, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67614,10 +67833,10 @@ int HP_skill_blockhomun_start(struct homun_data *hd, uint16 skill_id, int tick) retVal___ = HPMHooks.source.skill.blockhomun_start(hd, skill_id, tick); } if( HPMHooks.count.HP_skill_blockhomun_start_post ) { - int (*postHookFunc) (int retVal___, struct homun_data *hd, uint16 *skill_id, int *tick); + int (*postHookFunc) (int retVal___, struct homun_data *hd, uint16 skill_id, int tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockhomun_start_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_blockhomun_start_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &skill_id, &tick); + retVal___ = postHookFunc(retVal___, hd, skill_id, tick); } } return retVal___; @@ -67626,11 +67845,11 @@ int HP_skill_blockmerc_start(struct mercenary_data *md, uint16 skill_id, int tic int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_blockmerc_start_pre ) { - int (*preHookFunc) (struct mercenary_data *md, uint16 *skill_id, int *tick); + int (*preHookFunc) (struct mercenary_data **md, uint16 *skill_id, int *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockmerc_start_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_blockmerc_start_pre[hIndex].func; - retVal___ = preHookFunc(md, &skill_id, &tick); + retVal___ = preHookFunc(&md, &skill_id, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67641,10 +67860,10 @@ int HP_skill_blockmerc_start(struct mercenary_data *md, uint16 skill_id, int tic retVal___ = HPMHooks.source.skill.blockmerc_start(md, skill_id, tick); } if( HPMHooks.count.HP_skill_blockmerc_start_post ) { - int (*postHookFunc) (int retVal___, struct mercenary_data *md, uint16 *skill_id, int *tick); + int (*postHookFunc) (int retVal___, struct mercenary_data *md, uint16 skill_id, int tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockmerc_start_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_blockmerc_start_post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &skill_id, &tick); + retVal___ = postHookFunc(retVal___, md, skill_id, tick); } } return retVal___; @@ -67653,11 +67872,11 @@ int HP_skill_attack(int attack_type, struct block_list *src, struct block_list * int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_attack_pre ) { - int (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*preHookFunc) (int *attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_attack_pre[hIndex].func; - retVal___ = preHookFunc(&attack_type, src, dsrc, bl, &skill_id, &skill_lv, &tick, &flag); + retVal___ = preHookFunc(&attack_type, &src, &dsrc, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67668,10 +67887,10 @@ int HP_skill_attack(int attack_type, struct block_list *src, struct block_list * retVal___ = HPMHooks.source.skill.attack(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag); } if( HPMHooks.count.HP_skill_attack_post ) { - int (*postHookFunc) (int retVal___, int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*postHookFunc) (int retVal___, int attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_attack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &attack_type, src, dsrc, bl, &skill_id, &skill_lv, &tick, &flag); + retVal___ = postHookFunc(retVal___, attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag); } } return retVal___; @@ -67680,12 +67899,12 @@ int HP_skill_attack_area(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_attack_area_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_area_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_attack_area_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -67713,12 +67932,12 @@ int HP_skill_area_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_area_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_area_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_area_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -67746,11 +67965,11 @@ int HP_skill_area_sub_count(struct block_list *src, struct block_list *target, u int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_area_sub_count_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_area_sub_count_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_area_sub_count_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &skill_id, &skill_lv, &tick, &flag); + retVal___ = preHookFunc(&src, &target, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67761,10 +67980,10 @@ int HP_skill_area_sub_count(struct block_list *src, struct block_list *target, u retVal___ = HPMHooks.source.skill.area_sub_count(src, target, skill_id, skill_lv, tick, flag); } if( HPMHooks.count.HP_skill_area_sub_count_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_area_sub_count_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_area_sub_count_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &skill_id, &skill_lv, &tick, &flag); + retVal___ = postHookFunc(retVal___, src, target, skill_id, skill_lv, tick, flag); } } return retVal___; @@ -67773,11 +67992,11 @@ int HP_skill_check_unit_range(struct block_list *bl, int x, int y, uint16 skill_ int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_unit_range_pre ) { - int (*preHookFunc) (struct block_list *bl, int *x, int *y, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct block_list **bl, int *x, int *y, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_unit_range_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_unit_range_pre[hIndex].func; - retVal___ = preHookFunc(bl, &x, &y, &skill_id, &skill_lv); + retVal___ = preHookFunc(&bl, &x, &y, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67788,10 +68007,10 @@ int HP_skill_check_unit_range(struct block_list *bl, int x, int y, uint16 skill_ retVal___ = HPMHooks.source.skill.check_unit_range(bl, x, y, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_check_unit_range_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *x, int *y, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct block_list *bl, int x, int y, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_unit_range_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_check_unit_range_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &x, &y, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, bl, x, y, skill_id, skill_lv); } } return retVal___; @@ -67800,12 +68019,12 @@ int HP_skill_check_unit_range_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_unit_range_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_unit_range_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_check_unit_range_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -67833,11 +68052,11 @@ int HP_skill_check_unit_range2(struct block_list *bl, int x, int y, uint16 skill int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_unit_range2_pre ) { - int (*preHookFunc) (struct block_list *bl, int *x, int *y, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct block_list **bl, int *x, int *y, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_unit_range2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_unit_range2_pre[hIndex].func; - retVal___ = preHookFunc(bl, &x, &y, &skill_id, &skill_lv); + retVal___ = preHookFunc(&bl, &x, &y, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67848,10 +68067,10 @@ int HP_skill_check_unit_range2(struct block_list *bl, int x, int y, uint16 skill retVal___ = HPMHooks.source.skill.check_unit_range2(bl, x, y, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_check_unit_range2_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *x, int *y, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct block_list *bl, int x, int y, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_unit_range2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_check_unit_range2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &x, &y, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, bl, x, y, skill_id, skill_lv); } } return retVal___; @@ -67860,12 +68079,12 @@ int HP_skill_check_unit_range2_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_unit_range2_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_unit_range2_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_check_unit_range2_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -67892,11 +68111,11 @@ int HP_skill_check_unit_range2_sub(struct block_list *bl, va_list ap) { void HP_skill_toggle_magicpower(struct block_list *bl, uint16 skill_id) { int hIndex = 0; if( HPMHooks.count.HP_skill_toggle_magicpower_pre ) { - void (*preHookFunc) (struct block_list *bl, uint16 *skill_id); + void (*preHookFunc) (struct block_list **bl, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_toggle_magicpower_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_toggle_magicpower_pre[hIndex].func; - preHookFunc(bl, &skill_id); + preHookFunc(&bl, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67907,10 +68126,10 @@ void HP_skill_toggle_magicpower(struct block_list *bl, uint16 skill_id) { HPMHooks.source.skill.toggle_magicpower(bl, skill_id); } if( HPMHooks.count.HP_skill_toggle_magicpower_post ) { - void (*postHookFunc) (struct block_list *bl, uint16 *skill_id); + void (*postHookFunc) (struct block_list *bl, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_toggle_magicpower_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_toggle_magicpower_post[hIndex].func; - postHookFunc(bl, &skill_id); + postHookFunc(bl, skill_id); } } return; @@ -67919,11 +68138,11 @@ int HP_skill_magic_reflect(struct block_list *src, struct block_list *bl, int ty int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_magic_reflect_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *bl, int *type); + int (*preHookFunc) (struct block_list **src, struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_magic_reflect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_magic_reflect_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &type); + retVal___ = preHookFunc(&src, &bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67934,10 +68153,10 @@ int HP_skill_magic_reflect(struct block_list *src, struct block_list *bl, int ty retVal___ = HPMHooks.source.skill.magic_reflect(src, bl, type); } if( HPMHooks.count.HP_skill_magic_reflect_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, int *type); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_magic_reflect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_magic_reflect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &type); + retVal___ = postHookFunc(retVal___, src, bl, type); } } return retVal___; @@ -67946,11 +68165,11 @@ int HP_skill_onskillusage(struct map_session_data *sd, struct block_list *bl, ui int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_onskillusage_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct block_list *bl, uint16 *skill_id, int64 *tick); + int (*preHookFunc) (struct map_session_data **sd, struct block_list **bl, uint16 *skill_id, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_onskillusage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_onskillusage_pre[hIndex].func; - retVal___ = preHookFunc(sd, bl, &skill_id, &tick); + retVal___ = preHookFunc(&sd, &bl, &skill_id, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -67961,10 +68180,10 @@ int HP_skill_onskillusage(struct map_session_data *sd, struct block_list *bl, ui retVal___ = HPMHooks.source.skill.onskillusage(sd, bl, skill_id, tick); } if( HPMHooks.count.HP_skill_onskillusage_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct block_list *bl, uint16 *skill_id, int64 *tick); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct block_list *bl, uint16 skill_id, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_onskillusage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_onskillusage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, bl, &skill_id, &tick); + retVal___ = postHookFunc(retVal___, sd, bl, skill_id, tick); } } return retVal___; @@ -67973,12 +68192,12 @@ int HP_skill_cell_overlap(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_cell_overlap_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_cell_overlap_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_cell_overlap_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68021,10 +68240,10 @@ int HP_skill_timerskill(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.skill.timerskill(tid, tick, id, data); } if( HPMHooks.count.HP_skill_timerskill_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_timerskill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_timerskill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -68033,12 +68252,12 @@ int HP_skill_trap_splash(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_trap_splash_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_trap_splash_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_trap_splash_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68066,11 +68285,11 @@ int HP_skill_check_condition_mercenary(struct block_list *bl, int skill_id, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_condition_mercenary_pre ) { - int (*preHookFunc) (struct block_list *bl, int *skill_id, int *lv, int *type); + int (*preHookFunc) (struct block_list **bl, int *skill_id, int *lv, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_mercenary_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_condition_mercenary_pre[hIndex].func; - retVal___ = preHookFunc(bl, &skill_id, &lv, &type); + retVal___ = preHookFunc(&bl, &skill_id, &lv, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68081,10 +68300,10 @@ int HP_skill_check_condition_mercenary(struct block_list *bl, int skill_id, int retVal___ = HPMHooks.source.skill.check_condition_mercenary(bl, skill_id, lv, type); } if( HPMHooks.count.HP_skill_check_condition_mercenary_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *skill_id, int *lv, int *type); + int (*postHookFunc) (int retVal___, struct block_list *bl, int skill_id, int lv, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_mercenary_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_check_condition_mercenary_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &skill_id, &lv, &type); + retVal___ = postHookFunc(retVal___, bl, skill_id, lv, type); } } return retVal___; @@ -68093,11 +68312,11 @@ struct skill_unit_group* HP_skill_locate_element_field(struct block_list *bl) { int hIndex = 0; struct skill_unit_group* retVal___ = NULL; if( HPMHooks.count.HP_skill_locate_element_field_pre ) { - struct skill_unit_group* (*preHookFunc) (struct block_list *bl); + struct skill_unit_group* (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_locate_element_field_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_locate_element_field_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68120,12 +68339,12 @@ int HP_skill_graffitiremover(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_graffitiremover_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_graffitiremover_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_graffitiremover_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68153,12 +68372,12 @@ int HP_skill_activate_reverberation(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_activate_reverberation_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_activate_reverberation_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_activate_reverberation_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68186,12 +68405,12 @@ int HP_skill_dance_overlap_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_dance_overlap_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_dance_overlap_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_dance_overlap_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68219,11 +68438,11 @@ int HP_skill_dance_overlap(struct skill_unit *su, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_dance_overlap_pre ) { - int (*preHookFunc) (struct skill_unit *su, int *flag); + int (*preHookFunc) (struct skill_unit **su, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_dance_overlap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_dance_overlap_pre[hIndex].func; - retVal___ = preHookFunc(su, &flag); + retVal___ = preHookFunc(&su, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68234,10 +68453,10 @@ int HP_skill_dance_overlap(struct skill_unit *su, int flag) { retVal___ = HPMHooks.source.skill.dance_overlap(su, flag); } if( HPMHooks.count.HP_skill_dance_overlap_post ) { - int (*postHookFunc) (int retVal___, struct skill_unit *su, int *flag); + int (*postHookFunc) (int retVal___, struct skill_unit *su, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_dance_overlap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_dance_overlap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, su, &flag); + retVal___ = postHookFunc(retVal___, su, flag); } } return retVal___; @@ -68246,11 +68465,11 @@ struct s_skill_unit_layout* HP_skill_get_unit_layout(uint16 skill_id, uint16 ski int hIndex = 0; struct s_skill_unit_layout* retVal___ = NULL; if( HPMHooks.count.HP_skill_get_unit_layout_pre ) { - struct s_skill_unit_layout* (*preHookFunc) (uint16 *skill_id, uint16 *skill_lv, struct block_list *src, int *x, int *y); + struct s_skill_unit_layout* (*preHookFunc) (uint16 *skill_id, uint16 *skill_lv, struct block_list **src, int *x, int *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_layout_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_get_unit_layout_pre[hIndex].func; - retVal___ = preHookFunc(&skill_id, &skill_lv, src, &x, &y); + retVal___ = preHookFunc(&skill_id, &skill_lv, &src, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68261,10 +68480,10 @@ struct s_skill_unit_layout* HP_skill_get_unit_layout(uint16 skill_id, uint16 ski retVal___ = HPMHooks.source.skill.get_unit_layout(skill_id, skill_lv, src, x, y); } if( HPMHooks.count.HP_skill_get_unit_layout_post ) { - struct s_skill_unit_layout* (*postHookFunc) (struct s_skill_unit_layout* retVal___, uint16 *skill_id, uint16 *skill_lv, struct block_list *src, int *x, int *y); + struct s_skill_unit_layout* (*postHookFunc) (struct s_skill_unit_layout* retVal___, uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_layout_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_unit_layout_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv, src, &x, &y); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv, src, x, y); } } return retVal___; @@ -68273,12 +68492,12 @@ int HP_skill_frostjoke_scream(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_frostjoke_scream_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_frostjoke_scream_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_frostjoke_scream_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68306,12 +68525,12 @@ int HP_skill_greed(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_greed_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_greed_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_greed_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68339,12 +68558,12 @@ int HP_skill_destroy_trap(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_destroy_trap_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_destroy_trap_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_destroy_trap_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68372,11 +68591,11 @@ struct skill_unit_group_tickset* HP_skill_unitgrouptickset_search(struct block_l int hIndex = 0; struct skill_unit_group_tickset* retVal___ = NULL; if( HPMHooks.count.HP_skill_unitgrouptickset_search_pre ) { - struct skill_unit_group_tickset* (*preHookFunc) (struct block_list *bl, struct skill_unit_group *group, int64 *tick); + struct skill_unit_group_tickset* (*preHookFunc) (struct block_list **bl, struct skill_unit_group **group, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitgrouptickset_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unitgrouptickset_search_pre[hIndex].func; - retVal___ = preHookFunc(bl, group, &tick); + retVal___ = preHookFunc(&bl, &group, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68387,10 +68606,10 @@ struct skill_unit_group_tickset* HP_skill_unitgrouptickset_search(struct block_l retVal___ = HPMHooks.source.skill.unitgrouptickset_search(bl, group, tick); } if( HPMHooks.count.HP_skill_unitgrouptickset_search_post ) { - struct skill_unit_group_tickset* (*postHookFunc) (struct skill_unit_group_tickset* retVal___, struct block_list *bl, struct skill_unit_group *group, int64 *tick); + struct skill_unit_group_tickset* (*postHookFunc) (struct skill_unit_group_tickset* retVal___, struct block_list *bl, struct skill_unit_group *group, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitgrouptickset_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unitgrouptickset_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, group, &tick); + retVal___ = postHookFunc(retVal___, bl, group, tick); } } return retVal___; @@ -68399,11 +68618,11 @@ bool HP_skill_dance_switch(struct skill_unit *su, int flag) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_dance_switch_pre ) { - bool (*preHookFunc) (struct skill_unit *su, int *flag); + bool (*preHookFunc) (struct skill_unit **su, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_dance_switch_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_dance_switch_pre[hIndex].func; - retVal___ = preHookFunc(su, &flag); + retVal___ = preHookFunc(&su, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68414,10 +68633,10 @@ bool HP_skill_dance_switch(struct skill_unit *su, int flag) { retVal___ = HPMHooks.source.skill.dance_switch(su, flag); } if( HPMHooks.count.HP_skill_dance_switch_post ) { - bool (*postHookFunc) (bool retVal___, struct skill_unit *su, int *flag); + bool (*postHookFunc) (bool retVal___, struct skill_unit *su, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_dance_switch_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_dance_switch_post[hIndex].func; - retVal___ = postHookFunc(retVal___, su, &flag); + retVal___ = postHookFunc(retVal___, su, flag); } } return retVal___; @@ -68426,12 +68645,12 @@ int HP_skill_check_condition_char_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_condition_char_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_char_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_check_condition_char_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68459,12 +68678,12 @@ int HP_skill_check_condition_mob_master_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_condition_mob_master_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_mob_master_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_check_condition_mob_master_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68491,11 +68710,11 @@ int HP_skill_check_condition_mob_master_sub(struct block_list *bl, va_list ap) { void HP_skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int16 y) { int hIndex = 0; if( HPMHooks.count.HP_skill_brandishspear_first_pre ) { - void (*preHookFunc) (struct square *tc, uint8 *dir, int16 *x, int16 *y); + void (*preHookFunc) (struct square **tc, uint8 *dir, int16 *x, int16 *y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_first_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_brandishspear_first_pre[hIndex].func; - preHookFunc(tc, &dir, &x, &y); + preHookFunc(&tc, &dir, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68506,10 +68725,10 @@ void HP_skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int16 y HPMHooks.source.skill.brandishspear_first(tc, dir, x, y); } if( HPMHooks.count.HP_skill_brandishspear_first_post ) { - void (*postHookFunc) (struct square *tc, uint8 *dir, int16 *x, int16 *y); + void (*postHookFunc) (struct square *tc, uint8 dir, int16 x, int16 y); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_first_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_brandishspear_first_post[hIndex].func; - postHookFunc(tc, &dir, &x, &y); + postHookFunc(tc, dir, x, y); } } return; @@ -68517,11 +68736,11 @@ void HP_skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int16 y void HP_skill_brandishspear_dir(struct square *tc, uint8 dir, int are) { int hIndex = 0; if( HPMHooks.count.HP_skill_brandishspear_dir_pre ) { - void (*preHookFunc) (struct square *tc, uint8 *dir, int *are); + void (*preHookFunc) (struct square **tc, uint8 *dir, int *are); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_brandishspear_dir_pre[hIndex].func; - preHookFunc(tc, &dir, &are); + preHookFunc(&tc, &dir, &are); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68532,10 +68751,10 @@ void HP_skill_brandishspear_dir(struct square *tc, uint8 dir, int are) { HPMHooks.source.skill.brandishspear_dir(tc, dir, are); } if( HPMHooks.count.HP_skill_brandishspear_dir_post ) { - void (*postHookFunc) (struct square *tc, uint8 *dir, int *are); + void (*postHookFunc) (struct square *tc, uint8 dir, int are); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_dir_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_brandishspear_dir_post[hIndex].func; - postHookFunc(tc, &dir, &are); + postHookFunc(tc, dir, are); } } return; @@ -68559,10 +68778,10 @@ int HP_skill_get_fixed_cast(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_fixed_cast(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_fixed_cast_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_fixed_cast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_fixed_cast_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -68571,12 +68790,12 @@ int HP_skill_sit_count(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_sit_count_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_sit_count_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_sit_count_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68604,12 +68823,12 @@ int HP_skill_sit_in(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_sit_in_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_sit_in_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_sit_in_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68637,12 +68856,12 @@ int HP_skill_sit_out(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_sit_out_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_sit_out_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_sit_out_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68669,11 +68888,11 @@ int HP_skill_sit_out(struct block_list *bl, va_list ap) { void HP_skill_unitsetmapcell(struct skill_unit *src, uint16 skill_id, uint16 skill_lv, cell_t cell, bool flag) { int hIndex = 0; if( HPMHooks.count.HP_skill_unitsetmapcell_pre ) { - void (*preHookFunc) (struct skill_unit *src, uint16 *skill_id, uint16 *skill_lv, cell_t *cell, bool *flag); + void (*preHookFunc) (struct skill_unit **src, uint16 *skill_id, uint16 *skill_lv, cell_t *cell, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitsetmapcell_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unitsetmapcell_pre[hIndex].func; - preHookFunc(src, &skill_id, &skill_lv, &cell, &flag); + preHookFunc(&src, &skill_id, &skill_lv, &cell, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68684,10 +68903,10 @@ void HP_skill_unitsetmapcell(struct skill_unit *src, uint16 skill_id, uint16 ski HPMHooks.source.skill.unitsetmapcell(src, skill_id, skill_lv, cell, flag); } if( HPMHooks.count.HP_skill_unitsetmapcell_post ) { - void (*postHookFunc) (struct skill_unit *src, uint16 *skill_id, uint16 *skill_lv, cell_t *cell, bool *flag); + void (*postHookFunc) (struct skill_unit *src, uint16 skill_id, uint16 skill_lv, cell_t cell, bool flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitsetmapcell_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unitsetmapcell_post[hIndex].func; - postHookFunc(src, &skill_id, &skill_lv, &cell, &flag); + postHookFunc(src, skill_id, skill_lv, cell, flag); } } return; @@ -68696,11 +68915,11 @@ int HP_skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_onplace_timer_pre ) { - int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, int64 *tick); + int (*preHookFunc) (struct skill_unit **src, struct block_list **bl, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_onplace_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unit_onplace_timer_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &tick); + retVal___ = preHookFunc(&src, &bl, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68711,10 +68930,10 @@ int HP_skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, i retVal___ = HPMHooks.source.skill.unit_onplace_timer(src, bl, tick); } if( HPMHooks.count.HP_skill_unit_onplace_timer_post ) { - int (*postHookFunc) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 *tick); + int (*postHookFunc) (int retVal___, struct skill_unit *src, struct block_list *bl, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_onplace_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unit_onplace_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &tick); + retVal___ = postHookFunc(retVal___, src, bl, tick); } } return retVal___; @@ -68723,12 +68942,12 @@ int HP_skill_unit_effect(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_effect_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_effect_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_unit_effect_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68756,12 +68975,12 @@ int HP_skill_unit_timer_sub_onplace(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_timer_sub_onplace_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_timer_sub_onplace_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_unit_timer_sub_onplace_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68789,12 +69008,12 @@ int HP_skill_unit_move_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_move_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_move_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_unit_move_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68837,10 +69056,10 @@ int HP_skill_blockpc_end(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.skill.blockpc_end(tid, tick, id, data); } if( HPMHooks.count.HP_skill_blockpc_end_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockpc_end_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_blockpc_end_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -68864,10 +69083,10 @@ int HP_skill_blockhomun_end(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.skill.blockhomun_end(tid, tick, id, data); } if( HPMHooks.count.HP_skill_blockhomun_end_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockhomun_end_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_blockhomun_end_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -68891,10 +69110,10 @@ int HP_skill_blockmerc_end(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.skill.blockmerc_end(tid, tick, id, data); } if( HPMHooks.count.HP_skill_blockmerc_end_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockmerc_end_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_blockmerc_end_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -68903,11 +69122,11 @@ int HP_skill_split_atoi(char *str, int *val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_split_atoi_pre ) { - int (*preHookFunc) (char *str, int *val); + int (*preHookFunc) (char **str, int **val); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_split_atoi_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_split_atoi_pre[hIndex].func; - retVal___ = preHookFunc(str, val); + retVal___ = preHookFunc(&str, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -68945,24 +69164,24 @@ int HP_skill_unit_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.skill.unit_timer(tid, tick, id, data); } if( HPMHooks.count.HP_skill_unit_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_unit_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; } -int HP_skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) { +int HP_skill_unit_timer_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_timer_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_timer_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_unit_timer_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -68976,11 +69195,11 @@ int HP_skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_skill_unit_timer_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_timer_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_skill_unit_timer_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } @@ -69016,11 +69235,11 @@ bool HP_skill_parse_row_skilldb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_skilldb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_skilldb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_skilldb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69031,10 +69250,10 @@ bool HP_skill_parse_row_skilldb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_skilldb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_skilldb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_skilldb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_skilldb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69043,11 +69262,11 @@ bool HP_skill_parse_row_requiredb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_requiredb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_requiredb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_requiredb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69058,10 +69277,10 @@ bool HP_skill_parse_row_requiredb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_requiredb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_requiredb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_requiredb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_requiredb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69070,11 +69289,11 @@ bool HP_skill_parse_row_castdb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_castdb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_castdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_castdb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69085,10 +69304,10 @@ bool HP_skill_parse_row_castdb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_castdb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_castdb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_castdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_castdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69097,11 +69316,11 @@ bool HP_skill_parse_row_castnodexdb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_castnodexdb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_castnodexdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_castnodexdb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69112,10 +69331,10 @@ bool HP_skill_parse_row_castnodexdb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_castnodexdb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_castnodexdb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_castnodexdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_castnodexdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69124,11 +69343,11 @@ bool HP_skill_parse_row_unitdb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_unitdb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_unitdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_unitdb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69139,10 +69358,10 @@ bool HP_skill_parse_row_unitdb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_unitdb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_unitdb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_unitdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_unitdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69151,11 +69370,11 @@ bool HP_skill_parse_row_producedb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_producedb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_producedb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_producedb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69166,10 +69385,10 @@ bool HP_skill_parse_row_producedb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_producedb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_producedb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_producedb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_producedb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69178,11 +69397,11 @@ bool HP_skill_parse_row_createarrowdb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_createarrowdb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_createarrowdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_createarrowdb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69193,10 +69412,10 @@ bool HP_skill_parse_row_createarrowdb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_createarrowdb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_createarrowdb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_createarrowdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_createarrowdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69205,11 +69424,11 @@ bool HP_skill_parse_row_abradb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_abradb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_abradb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_abradb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69220,10 +69439,10 @@ bool HP_skill_parse_row_abradb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_abradb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_abradb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_abradb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_abradb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69232,11 +69451,11 @@ bool HP_skill_parse_row_spellbookdb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_spellbookdb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_spellbookdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_spellbookdb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69247,10 +69466,10 @@ bool HP_skill_parse_row_spellbookdb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_spellbookdb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_spellbookdb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_spellbookdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_spellbookdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69259,11 +69478,11 @@ bool HP_skill_parse_row_magicmushroomdb(char *split[], int column, int current) int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_magicmushroomdb_pre ) { - bool (*preHookFunc) (char *split[], int *column, int *current); + bool (*preHookFunc) (char **split[], int *column, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_magicmushroomdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_magicmushroomdb_pre[hIndex].func; - retVal___ = preHookFunc(split, &column, ¤t); + retVal___ = preHookFunc(&split, &column, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69274,10 +69493,10 @@ bool HP_skill_parse_row_magicmushroomdb(char *split[], int column, int current) retVal___ = HPMHooks.source.skill.parse_row_magicmushroomdb(split, column, current); } if( HPMHooks.count.HP_skill_parse_row_magicmushroomdb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *column, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int column, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_magicmushroomdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_magicmushroomdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &column, ¤t); + retVal___ = postHookFunc(retVal___, split, column, current); } } return retVal___; @@ -69286,11 +69505,11 @@ bool HP_skill_parse_row_reproducedb(char *split[], int column, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_reproducedb_pre ) { - bool (*preHookFunc) (char *split[], int *column, int *current); + bool (*preHookFunc) (char **split[], int *column, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_reproducedb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_reproducedb_pre[hIndex].func; - retVal___ = preHookFunc(split, &column, ¤t); + retVal___ = preHookFunc(&split, &column, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69301,10 +69520,10 @@ bool HP_skill_parse_row_reproducedb(char *split[], int column, int current) { retVal___ = HPMHooks.source.skill.parse_row_reproducedb(split, column, current); } if( HPMHooks.count.HP_skill_parse_row_reproducedb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *column, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int column, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_reproducedb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_reproducedb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &column, ¤t); + retVal___ = postHookFunc(retVal___, split, column, current); } } return retVal___; @@ -69313,11 +69532,11 @@ bool HP_skill_parse_row_improvisedb(char *split[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_improvisedb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_improvisedb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_improvisedb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69328,10 +69547,10 @@ bool HP_skill_parse_row_improvisedb(char *split[], int columns, int current) { retVal___ = HPMHooks.source.skill.parse_row_improvisedb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_improvisedb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_improvisedb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_improvisedb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69340,11 +69559,11 @@ bool HP_skill_parse_row_changematerialdb(char *split[], int columns, int current int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_parse_row_changematerialdb_pre ) { - bool (*preHookFunc) (char *split[], int *columns, int *current); + bool (*preHookFunc) (char **split[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_changematerialdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_parse_row_changematerialdb_pre[hIndex].func; - retVal___ = preHookFunc(split, &columns, ¤t); + retVal___ = preHookFunc(&split, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69355,10 +69574,10 @@ bool HP_skill_parse_row_changematerialdb(char *split[], int columns, int current retVal___ = HPMHooks.source.skill.parse_row_changematerialdb(split, columns, current); } if( HPMHooks.count.HP_skill_parse_row_changematerialdb_post ) { - bool (*postHookFunc) (bool retVal___, char *split[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *split[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_parse_row_changematerialdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_parse_row_changematerialdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, split, &columns, ¤t); + retVal___ = postHookFunc(retVal___, split, columns, current); } } return retVal___; @@ -69366,11 +69585,11 @@ bool HP_skill_parse_row_changematerialdb(char *split[], int columns, int current void HP_skill_usave_add(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) { int hIndex = 0; if( HPMHooks.count.HP_skill_usave_add_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + void (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_usave_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_usave_add_pre[hIndex].func; - preHookFunc(sd, &skill_id, &skill_lv); + preHookFunc(&sd, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69381,10 +69600,10 @@ void HP_skill_usave_add(struct map_session_data *sd, uint16 skill_id, uint16 ski HPMHooks.source.skill.usave_add(sd, skill_id, skill_lv); } if( HPMHooks.count.HP_skill_usave_add_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + void (*postHookFunc) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_usave_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_usave_add_post[hIndex].func; - postHookFunc(sd, &skill_id, &skill_lv); + postHookFunc(sd, skill_id, skill_lv); } } return; @@ -69392,11 +69611,11 @@ void HP_skill_usave_add(struct map_session_data *sd, uint16 skill_id, uint16 ski void HP_skill_usave_trigger(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_skill_usave_trigger_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_usave_trigger_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_usave_trigger_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69418,11 +69637,11 @@ void HP_skill_usave_trigger(struct map_session_data *sd) { void HP_skill_cooldown_load(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_skill_cooldown_load_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_cooldown_load_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_cooldown_load_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69445,11 +69664,11 @@ int HP_skill_spellbook(struct map_session_data *sd, int nameid) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_spellbook_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *nameid); + int (*preHookFunc) (struct map_session_data **sd, int *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_spellbook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_spellbook_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid); + retVal___ = preHookFunc(&sd, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69460,10 +69679,10 @@ int HP_skill_spellbook(struct map_session_data *sd, int nameid) { retVal___ = HPMHooks.source.skill.spellbook(sd, nameid); } if( HPMHooks.count.HP_skill_spellbook_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *nameid); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_spellbook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_spellbook_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid); + retVal___ = postHookFunc(retVal___, sd, nameid); } } return retVal___; @@ -69472,11 +69691,11 @@ int HP_skill_block_check(struct block_list *bl, enum sc_type type, uint16 skill_ int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_block_check_pre ) { - int (*preHookFunc) (struct block_list *bl, enum sc_type *type, uint16 *skill_id); + int (*preHookFunc) (struct block_list **bl, enum sc_type *type, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_block_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_block_check_pre[hIndex].func; - retVal___ = preHookFunc(bl, &type, &skill_id); + retVal___ = preHookFunc(&bl, &type, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69487,10 +69706,10 @@ int HP_skill_block_check(struct block_list *bl, enum sc_type type, uint16 skill_ retVal___ = HPMHooks.source.skill.block_check(bl, type, skill_id); } if( HPMHooks.count.HP_skill_block_check_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, enum sc_type *type, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct block_list *bl, enum sc_type type, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_block_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_block_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &type, &skill_id); + retVal___ = postHookFunc(retVal___, bl, type, skill_id); } } return retVal___; @@ -69499,12 +69718,12 @@ int HP_skill_detonator(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_detonator_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_detonator_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_skill_detonator_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -69532,11 +69751,11 @@ bool HP_skill_check_camouflage(struct block_list *bl, struct status_change_entry int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_check_camouflage_pre ) { - bool (*preHookFunc) (struct block_list *bl, struct status_change_entry *sce); + bool (*preHookFunc) (struct block_list **bl, struct status_change_entry **sce); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_camouflage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_camouflage_pre[hIndex].func; - retVal___ = preHookFunc(bl, sce); + retVal___ = preHookFunc(&bl, &sce); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69559,11 +69778,11 @@ int HP_skill_magicdecoy(struct map_session_data *sd, int nameid) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_magicdecoy_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *nameid); + int (*preHookFunc) (struct map_session_data **sd, int *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_magicdecoy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_magicdecoy_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid); + retVal___ = preHookFunc(&sd, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69574,10 +69793,10 @@ int HP_skill_magicdecoy(struct map_session_data *sd, int nameid) { retVal___ = HPMHooks.source.skill.magicdecoy(sd, nameid); } if( HPMHooks.count.HP_skill_magicdecoy_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *nameid); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_magicdecoy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_magicdecoy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid); + retVal___ = postHookFunc(retVal___, sd, nameid); } } return retVal___; @@ -69586,11 +69805,11 @@ int HP_skill_poisoningweapon(struct map_session_data *sd, int nameid) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_poisoningweapon_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *nameid); + int (*preHookFunc) (struct map_session_data **sd, int *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_poisoningweapon_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_poisoningweapon_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid); + retVal___ = preHookFunc(&sd, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69601,10 +69820,10 @@ int HP_skill_poisoningweapon(struct map_session_data *sd, int nameid) { retVal___ = HPMHooks.source.skill.poisoningweapon(sd, nameid); } if( HPMHooks.count.HP_skill_poisoningweapon_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *nameid); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_poisoningweapon_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_poisoningweapon_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid); + retVal___ = postHookFunc(retVal___, sd, nameid); } } return retVal___; @@ -69613,11 +69832,11 @@ int HP_skill_select_menu(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_select_menu_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_select_menu_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_select_menu_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id); + retVal___ = preHookFunc(&sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69628,10 +69847,10 @@ int HP_skill_select_menu(struct map_session_data *sd, uint16 skill_id) { retVal___ = HPMHooks.source.skill.select_menu(sd, skill_id); } if( HPMHooks.count.HP_skill_select_menu_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_select_menu_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_select_menu_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id); + retVal___ = postHookFunc(retVal___, sd, skill_id); } } return retVal___; @@ -69640,11 +69859,11 @@ int HP_skill_elementalanalysis(struct map_session_data *sd, uint16 skill_lv, con int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_elementalanalysis_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_lv, const struct itemlist *item_list); + int (*preHookFunc) (struct map_session_data **sd, uint16 *skill_lv, const struct itemlist **item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_elementalanalysis_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_elementalanalysis_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_lv, item_list); + retVal___ = preHookFunc(&sd, &skill_lv, &item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69655,10 +69874,10 @@ int HP_skill_elementalanalysis(struct map_session_data *sd, uint16 skill_lv, con retVal___ = HPMHooks.source.skill.elementalanalysis(sd, skill_lv, item_list); } if( HPMHooks.count.HP_skill_elementalanalysis_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_lv, const struct itemlist *item_list); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 skill_lv, const struct itemlist *item_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_elementalanalysis_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_elementalanalysis_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_lv, item_list); + retVal___ = postHookFunc(retVal___, sd, skill_lv, item_list); } } return retVal___; @@ -69667,11 +69886,11 @@ int HP_skill_changematerial(struct map_session_data *sd, const struct itemlist * int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_changematerial_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const struct itemlist *item_list); + int (*preHookFunc) (struct map_session_data **sd, const struct itemlist **item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_changematerial_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_changematerial_pre[hIndex].func; - retVal___ = preHookFunc(sd, item_list); + retVal___ = preHookFunc(&sd, &item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69709,10 +69928,10 @@ int HP_skill_get_elemental_type(uint16 skill_id, uint16 skill_lv) { retVal___ = HPMHooks.source.skill.get_elemental_type(skill_id, skill_lv); } if( HPMHooks.count.HP_skill_get_elemental_type_post ) { - int (*postHookFunc) (int retVal___, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_elemental_type_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_get_elemental_type_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, skill_id, skill_lv); } } return retVal___; @@ -69720,11 +69939,11 @@ int HP_skill_get_elemental_type(uint16 skill_id, uint16 skill_lv) { void HP_skill_cooldown_save(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_skill_cooldown_save_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_cooldown_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_cooldown_save_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69774,11 +69993,11 @@ bool HP_skill_check_shadowform(struct block_list *bl, int64 damage, int hit) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_check_shadowform_pre ) { - bool (*preHookFunc) (struct block_list *bl, int64 *damage, int *hit); + bool (*preHookFunc) (struct block_list **bl, int64 *damage, int *hit); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_shadowform_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_shadowform_pre[hIndex].func; - retVal___ = preHookFunc(bl, &damage, &hit); + retVal___ = preHookFunc(&bl, &damage, &hit); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69789,10 +70008,10 @@ bool HP_skill_check_shadowform(struct block_list *bl, int64 damage, int hit) { retVal___ = HPMHooks.source.skill.check_shadowform(bl, damage, hit); } if( HPMHooks.count.HP_skill_check_shadowform_post ) { - bool (*postHookFunc) (bool retVal___, struct block_list *bl, int64 *damage, int *hit); + bool (*postHookFunc) (bool retVal___, struct block_list *bl, int64 damage, int hit); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_shadowform_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_check_shadowform_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &damage, &hit); + retVal___ = postHookFunc(retVal___, bl, damage, hit); } } return retVal___; @@ -69801,11 +70020,11 @@ bool HP_skill_castend_damage_id_unknown(struct block_list *src, struct block_lis int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_castend_damage_id_unknown_pre ) { - bool (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, struct status_data *tstatus, struct status_change *sc); + bool (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, struct status_data **tstatus, struct status_change **sc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_damage_id_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_damage_id_unknown_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, skill_id, skill_lv, tick, flag, tstatus, sc); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &tick, &flag, &tstatus, &sc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69827,11 +70046,11 @@ bool HP_skill_castend_damage_id_unknown(struct block_list *src, struct block_lis void HP_skill_additional_effect_unknown(struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int *dmg_lv, int64 *tick) { int hIndex = 0; if( HPMHooks.count.HP_skill_additional_effect_unknown_pre ) { - void (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int *dmg_lv, int64 *tick); + void (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int **attack_type, int **dmg_lv, int64 **tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_additional_effect_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_additional_effect_unknown_pre[hIndex].func; - preHookFunc(src, bl, skill_id, skill_lv, attack_type, dmg_lv, tick); + preHookFunc(&src, &bl, &skill_id, &skill_lv, &attack_type, &dmg_lv, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69853,11 +70072,11 @@ void HP_skill_additional_effect_unknown(struct block_list *src, struct block_lis void HP_skill_counter_additional_effect_unknown(struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int64 *tick) { int hIndex = 0; if( HPMHooks.count.HP_skill_counter_additional_effect_unknown_pre ) { - void (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int64 *tick); + void (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int **attack_type, int64 **tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_counter_additional_effect_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_counter_additional_effect_unknown_pre[hIndex].func; - preHookFunc(src, bl, skill_id, skill_lv, attack_type, tick); + preHookFunc(&src, &bl, &skill_id, &skill_lv, &attack_type, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69879,11 +70098,11 @@ void HP_skill_counter_additional_effect_unknown(struct block_list *src, struct b void HP_skill_attack_combo1_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, struct status_change_entry *sce, int *combo) { int hIndex = 0; if( HPMHooks.count.HP_skill_attack_combo1_unknown_pre ) { - void (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, struct status_change_entry *sce, int *combo); + void (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, struct status_change_entry **sce, int **combo); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_combo1_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_attack_combo1_unknown_pre[hIndex].func; - preHookFunc(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag, sce, combo); + preHookFunc(&attack_type, &src, &dsrc, &bl, &skill_id, &skill_lv, &tick, &flag, &sce, &combo); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69905,11 +70124,11 @@ void HP_skill_attack_combo1_unknown(int *attack_type, struct block_list *src, st void HP_skill_attack_combo2_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *combo) { int hIndex = 0; if( HPMHooks.count.HP_skill_attack_combo2_unknown_pre ) { - void (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *combo); + void (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **combo); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_combo2_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_attack_combo2_unknown_pre[hIndex].func; - preHookFunc(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag, combo); + preHookFunc(&attack_type, &src, &dsrc, &bl, &skill_id, &skill_lv, &tick, &flag, &combo); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69931,11 +70150,11 @@ void HP_skill_attack_combo2_unknown(int *attack_type, struct block_list *src, st void HP_skill_attack_display_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage) { int hIndex = 0; if( HPMHooks.count.HP_skill_attack_display_unknown_pre ) { - void (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage); + void (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **type, struct Damage **dmg, int64 **damage); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_display_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_attack_display_unknown_pre[hIndex].func; - preHookFunc(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag, type, dmg, damage); + preHookFunc(&attack_type, &src, &dsrc, &bl, &skill_id, &skill_lv, &tick, &flag, &type, &dmg, &damage); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69958,11 +70177,11 @@ int HP_skill_attack_copy_unknown(int *attack_type, struct block_list *src, struc int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_attack_copy_unknown_pre ) { - int (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_copy_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_attack_copy_unknown_pre[hIndex].func; - retVal___ = preHookFunc(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag); + retVal___ = preHookFunc(&attack_type, &src, &dsrc, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69985,11 +70204,11 @@ int HP_skill_attack_dir_unknown(int *attack_type, struct block_list *src, struct int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_attack_dir_unknown_pre ) { - int (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + int (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_dir_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_attack_dir_unknown_pre[hIndex].func; - retVal___ = preHookFunc(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag); + retVal___ = preHookFunc(&attack_type, &src, &dsrc, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70011,11 +70230,11 @@ int HP_skill_attack_dir_unknown(int *attack_type, struct block_list *src, struct void HP_skill_attack_blow_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, int8 *dir) { int hIndex = 0; if( HPMHooks.count.HP_skill_attack_blow_unknown_pre ) { - void (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, int8 *dir); + void (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **type, struct Damage **dmg, int64 **damage, int8 **dir); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_blow_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_attack_blow_unknown_pre[hIndex].func; - preHookFunc(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag, type, dmg, damage, dir); + preHookFunc(&attack_type, &src, &dsrc, &bl, &skill_id, &skill_lv, &tick, &flag, &type, &dmg, &damage, &dir); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70037,11 +70256,11 @@ void HP_skill_attack_blow_unknown(int *attack_type, struct block_list *src, stru void HP_skill_attack_post_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag) { int hIndex = 0; if( HPMHooks.count.HP_skill_attack_post_unknown_pre ) { - void (*preHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + void (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_post_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_attack_post_unknown_pre[hIndex].func; - preHookFunc(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag); + preHookFunc(&attack_type, &src, &dsrc, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70064,11 +70283,11 @@ bool HP_skill_timerskill_dead_unknown(struct block_list *src, struct unit_data * int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_timerskill_dead_unknown_pre ) { - bool (*preHookFunc) (struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl); + bool (*preHookFunc) (struct block_list **src, struct unit_data **ud, struct skill_timerskill **skl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_timerskill_dead_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_timerskill_dead_unknown_pre[hIndex].func; - retVal___ = preHookFunc(src, ud, skl); + retVal___ = preHookFunc(&src, &ud, &skl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70090,11 +70309,11 @@ bool HP_skill_timerskill_dead_unknown(struct block_list *src, struct unit_data * void HP_skill_timerskill_target_unknown(int tid, int64 tick, struct block_list *src, struct block_list *target, struct unit_data *ud, struct skill_timerskill *skl) { int hIndex = 0; if( HPMHooks.count.HP_skill_timerskill_target_unknown_pre ) { - void (*preHookFunc) (int *tid, int64 *tick, struct block_list *src, struct block_list *target, struct unit_data *ud, struct skill_timerskill *skl); + void (*preHookFunc) (int *tid, int64 *tick, struct block_list **src, struct block_list **target, struct unit_data **ud, struct skill_timerskill **skl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_timerskill_target_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_timerskill_target_unknown_pre[hIndex].func; - preHookFunc(&tid, &tick, src, target, ud, skl); + preHookFunc(&tid, &tick, &src, &target, &ud, &skl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70105,10 +70324,10 @@ void HP_skill_timerskill_target_unknown(int tid, int64 tick, struct block_list * HPMHooks.source.skill.timerskill_target_unknown(tid, tick, src, target, ud, skl); } if( HPMHooks.count.HP_skill_timerskill_target_unknown_post ) { - void (*postHookFunc) (int *tid, int64 *tick, struct block_list *src, struct block_list *target, struct unit_data *ud, struct skill_timerskill *skl); + void (*postHookFunc) (int tid, int64 tick, struct block_list *src, struct block_list *target, struct unit_data *ud, struct skill_timerskill *skl); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_timerskill_target_unknown_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_timerskill_target_unknown_post[hIndex].func; - postHookFunc(&tid, &tick, src, target, ud, skl); + postHookFunc(tid, tick, src, target, ud, skl); } } return; @@ -70116,11 +70335,11 @@ void HP_skill_timerskill_target_unknown(int tid, int64 tick, struct block_list * void HP_skill_timerskill_notarget_unknown(int tid, int64 tick, struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl) { int hIndex = 0; if( HPMHooks.count.HP_skill_timerskill_notarget_unknown_pre ) { - void (*preHookFunc) (int *tid, int64 *tick, struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl); + void (*preHookFunc) (int *tid, int64 *tick, struct block_list **src, struct unit_data **ud, struct skill_timerskill **skl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_timerskill_notarget_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_timerskill_notarget_unknown_pre[hIndex].func; - preHookFunc(&tid, &tick, src, ud, skl); + preHookFunc(&tid, &tick, &src, &ud, &skl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70131,10 +70350,10 @@ void HP_skill_timerskill_notarget_unknown(int tid, int64 tick, struct block_list HPMHooks.source.skill.timerskill_notarget_unknown(tid, tick, src, ud, skl); } if( HPMHooks.count.HP_skill_timerskill_notarget_unknown_post ) { - void (*postHookFunc) (int *tid, int64 *tick, struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl); + void (*postHookFunc) (int tid, int64 tick, struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_timerskill_notarget_unknown_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_timerskill_notarget_unknown_post[hIndex].func; - postHookFunc(&tid, &tick, src, ud, skl); + postHookFunc(tid, tick, src, ud, skl); } } return; @@ -70158,10 +70377,10 @@ bool HP_skill_cleartimerskill_exception(int skill_id) { retVal___ = HPMHooks.source.skill.cleartimerskill_exception(skill_id); } if( HPMHooks.count.HP_skill_cleartimerskill_exception_post ) { - bool (*postHookFunc) (bool retVal___, int *skill_id); + bool (*postHookFunc) (bool retVal___, int skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_cleartimerskill_exception_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_cleartimerskill_exception_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -70170,11 +70389,11 @@ bool HP_skill_castend_id_unknown(struct unit_data *ud, struct block_list *src, s int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_castend_id_unknown_pre ) { - bool (*preHookFunc) (struct unit_data *ud, struct block_list *src, struct block_list *target); + bool (*preHookFunc) (struct unit_data **ud, struct block_list **src, struct block_list **target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_id_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_id_unknown_pre[hIndex].func; - retVal___ = preHookFunc(ud, src, target); + retVal___ = preHookFunc(&ud, &src, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70197,11 +70416,11 @@ bool HP_skill_castend_nodamage_id_dead_unknown(struct block_list *src, struct bl int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_castend_nodamage_id_dead_unknown_pre ) { - bool (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + bool (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_nodamage_id_dead_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_nodamage_id_dead_unknown_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, skill_id, skill_lv, tick, flag); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70224,11 +70443,11 @@ bool HP_skill_castend_nodamage_id_undead_unknown(struct block_list *src, struct int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_castend_nodamage_id_undead_unknown_pre ) { - bool (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + bool (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_nodamage_id_undead_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_nodamage_id_undead_unknown_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, skill_id, skill_lv, tick, flag); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70251,11 +70470,11 @@ bool HP_skill_castend_nodamage_id_mado_unknown(struct block_list *src, struct bl int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_castend_nodamage_id_mado_unknown_pre ) { - bool (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + bool (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_nodamage_id_mado_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_nodamage_id_mado_unknown_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, skill_id, skill_lv, tick, flag); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70278,11 +70497,11 @@ bool HP_skill_castend_nodamage_id_unknown(struct block_list *src, struct block_l int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_castend_nodamage_id_unknown_pre ) { - bool (*preHookFunc) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + bool (*preHookFunc) (struct block_list **src, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_nodamage_id_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_nodamage_id_unknown_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, skill_id, skill_lv, tick, flag); + retVal___ = preHookFunc(&src, &bl, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70304,11 +70523,11 @@ bool HP_skill_castend_nodamage_id_unknown(struct block_list *src, struct block_l void HP_skill_castend_pos2_effect_unknown(struct block_list *src, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag) { int hIndex = 0; if( HPMHooks.count.HP_skill_castend_pos2_effect_unknown_pre ) { - void (*preHookFunc) (struct block_list *src, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + void (*preHookFunc) (struct block_list **src, int **x, int **y, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_pos2_effect_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_pos2_effect_unknown_pre[hIndex].func; - preHookFunc(src, x, y, skill_id, skill_lv, tick, flag); + preHookFunc(&src, &x, &y, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70331,11 +70550,11 @@ bool HP_skill_castend_pos2_unknown(struct block_list *src, int *x, int *y, uint1 int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_castend_pos2_unknown_pre ) { - bool (*preHookFunc) (struct block_list *src, int *x, int *y, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); + bool (*preHookFunc) (struct block_list **src, int **x, int **y, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_pos2_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_pos2_unknown_pre[hIndex].func; - retVal___ = preHookFunc(src, x, y, skill_id, skill_lv, tick, flag); + retVal___ = preHookFunc(&src, &x, &y, &skill_id, &skill_lv, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70357,11 +70576,11 @@ bool HP_skill_castend_pos2_unknown(struct block_list *src, int *x, int *y, uint1 void HP_skill_unitsetting1_unknown(struct block_list *src, uint16 *skill_id, uint16 *skill_lv, int16 *x, int16 *y, int *flag, int *val1, int *val2, int *val3) { int hIndex = 0; if( HPMHooks.count.HP_skill_unitsetting1_unknown_pre ) { - void (*preHookFunc) (struct block_list *src, uint16 *skill_id, uint16 *skill_lv, int16 *x, int16 *y, int *flag, int *val1, int *val2, int *val3); + void (*preHookFunc) (struct block_list **src, uint16 **skill_id, uint16 **skill_lv, int16 **x, int16 **y, int **flag, int **val1, int **val2, int **val3); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitsetting1_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unitsetting1_unknown_pre[hIndex].func; - preHookFunc(src, skill_id, skill_lv, x, y, flag, val1, val2, val3); + preHookFunc(&src, &skill_id, &skill_lv, &x, &y, &flag, &val1, &val2, &val3); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70383,11 +70602,11 @@ void HP_skill_unitsetting1_unknown(struct block_list *src, uint16 *skill_id, uin void HP_skill_unitsetting2_unknown(struct block_list *src, uint16 *skill_id, uint16 *skill_lv, int16 *x, int16 *y, int *flag, int *unit_flag, int *val1, int *val2, int *val3, struct skill_unit_group *group) { int hIndex = 0; if( HPMHooks.count.HP_skill_unitsetting2_unknown_pre ) { - void (*preHookFunc) (struct block_list *src, uint16 *skill_id, uint16 *skill_lv, int16 *x, int16 *y, int *flag, int *unit_flag, int *val1, int *val2, int *val3, struct skill_unit_group *group); + void (*preHookFunc) (struct block_list **src, uint16 **skill_id, uint16 **skill_lv, int16 **x, int16 **y, int **flag, int **unit_flag, int **val1, int **val2, int **val3, struct skill_unit_group **group); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitsetting2_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unitsetting2_unknown_pre[hIndex].func; - preHookFunc(src, skill_id, skill_lv, x, y, flag, unit_flag, val1, val2, val3, group); + preHookFunc(&src, &skill_id, &skill_lv, &x, &y, &flag, &unit_flag, &val1, &val2, &val3, &group); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70409,11 +70628,11 @@ void HP_skill_unitsetting2_unknown(struct block_list *src, uint16 *skill_id, uin void HP_skill_unit_onplace_unknown(struct skill_unit *src, struct block_list *bl, int64 *tick) { int hIndex = 0; if( HPMHooks.count.HP_skill_unit_onplace_unknown_pre ) { - void (*preHookFunc) (struct skill_unit *src, struct block_list *bl, int64 *tick); + void (*preHookFunc) (struct skill_unit **src, struct block_list **bl, int64 **tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_onplace_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unit_onplace_unknown_pre[hIndex].func; - preHookFunc(src, bl, tick); + preHookFunc(&src, &bl, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70436,11 +70655,11 @@ int HP_skill_check_condition_castbegin_off_unknown(struct status_change *sc, uin int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_condition_castbegin_off_unknown_pre ) { - int (*preHookFunc) (struct status_change *sc, uint16 *skill_id); + int (*preHookFunc) (struct status_change **sc, uint16 **skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_castbegin_off_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_condition_castbegin_off_unknown_pre[hIndex].func; - retVal___ = preHookFunc(sc, skill_id); + retVal___ = preHookFunc(&sc, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70463,11 +70682,11 @@ int HP_skill_check_condition_castbegin_mount_unknown(struct status_change *sc, u int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_condition_castbegin_mount_unknown_pre ) { - int (*preHookFunc) (struct status_change *sc, uint16 *skill_id); + int (*preHookFunc) (struct status_change **sc, uint16 **skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_castbegin_mount_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_condition_castbegin_mount_unknown_pre[hIndex].func; - retVal___ = preHookFunc(sc, skill_id); + retVal___ = preHookFunc(&sc, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70490,11 +70709,11 @@ int HP_skill_check_condition_castbegin_madogear_unknown(struct status_change *sc int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_condition_castbegin_madogear_unknown_pre ) { - int (*preHookFunc) (struct status_change *sc, uint16 *skill_id); + int (*preHookFunc) (struct status_change **sc, uint16 **skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_castbegin_madogear_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_condition_castbegin_madogear_unknown_pre[hIndex].func; - retVal___ = preHookFunc(sc, skill_id); + retVal___ = preHookFunc(&sc, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70517,11 +70736,11 @@ int HP_skill_check_condition_castbegin_unknown(struct status_change *sc, uint16 int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_check_condition_castbegin_unknown_pre ) { - int (*preHookFunc) (struct status_change *sc, uint16 *skill_id); + int (*preHookFunc) (struct status_change **sc, uint16 **skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_castbegin_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_condition_castbegin_unknown_pre[hIndex].func; - retVal___ = preHookFunc(sc, skill_id); + retVal___ = preHookFunc(&sc, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70543,11 +70762,11 @@ int HP_skill_check_condition_castbegin_unknown(struct status_change *sc, uint16 void HP_skill_check_condition_castend_unknown(struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv) { int hIndex = 0; if( HPMHooks.count.HP_skill_check_condition_castend_unknown_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv); + void (*preHookFunc) (struct map_session_data **sd, uint16 **skill_id, uint16 **skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_condition_castend_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_check_condition_castend_unknown_pre[hIndex].func; - preHookFunc(sd, skill_id, skill_lv); + preHookFunc(&sd, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70570,11 +70789,11 @@ bool HP_skill_get_requirement_off_unknown(struct status_change *sc, uint16 *skil int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_get_requirement_off_unknown_pre ) { - bool (*preHookFunc) (struct status_change *sc, uint16 *skill_id); + bool (*preHookFunc) (struct status_change **sc, uint16 **skill_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_requirement_off_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_get_requirement_off_unknown_pre[hIndex].func; - retVal___ = preHookFunc(sc, skill_id); + retVal___ = preHookFunc(&sc, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70597,11 +70816,11 @@ bool HP_skill_get_requirement_item_unknown(struct status_change *sc, struct map_ int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_skill_get_requirement_item_unknown_pre ) { - bool (*preHookFunc) (struct status_change *sc, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, uint16 *idx, int *i); + bool (*preHookFunc) (struct status_change **sc, struct map_session_data **sd, uint16 **skill_id, uint16 **skill_lv, uint16 **idx, int **i); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_requirement_item_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_get_requirement_item_unknown_pre[hIndex].func; - retVal___ = preHookFunc(sc, sd, skill_id, skill_lv, idx, i); + retVal___ = preHookFunc(&sc, &sd, &skill_id, &skill_lv, &idx, &i); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70623,11 +70842,11 @@ bool HP_skill_get_requirement_item_unknown(struct status_change *sc, struct map_ void HP_skill_get_requirement_unknown(struct status_change *sc, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, struct skill_condition *req) { int hIndex = 0; if( HPMHooks.count.HP_skill_get_requirement_unknown_pre ) { - void (*preHookFunc) (struct status_change *sc, struct map_session_data *sd, uint16 *skill_id, uint16 *skill_lv, struct skill_condition *req); + void (*preHookFunc) (struct status_change **sc, struct map_session_data **sd, uint16 **skill_id, uint16 **skill_lv, struct skill_condition **req); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_requirement_unknown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_get_requirement_unknown_pre[hIndex].func; - preHookFunc(sc, sd, skill_id, skill_lv, req); + preHookFunc(&sc, &sd, &skill_id, &skill_lv, &req); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70646,7 +70865,7 @@ void HP_skill_get_requirement_unknown(struct status_change *sc, struct map_sessi } return; } -/* sockt */ +/* socket_interface */ void HP_sockt_init(void) { int hIndex = 0; if( HPMHooks.count.HP_sockt_init_pre ) { @@ -70718,10 +70937,10 @@ int HP_sockt_perform(int next) { retVal___ = HPMHooks.source.sockt.perform(next); } if( HPMHooks.count.HP_sockt_perform_post ) { - int (*postHookFunc) (int retVal___, int *next); + int (*postHookFunc) (int retVal___, int next); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_perform_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_perform_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &next); + retVal___ = postHookFunc(retVal___, next); } } return retVal___; @@ -70744,10 +70963,10 @@ void HP_sockt_datasync(int fd, bool send) { HPMHooks.source.sockt.datasync(fd, send); } if( HPMHooks.count.HP_sockt_datasync_post ) { - void (*postHookFunc) (int *fd, bool *send); + void (*postHookFunc) (int fd, bool send); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_datasync_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_datasync_post[hIndex].func; - postHookFunc(&fd, &send); + postHookFunc(fd, send); } } return; @@ -70771,10 +70990,10 @@ int HP_sockt_make_listen_bind(uint32 ip, uint16 port) { retVal___ = HPMHooks.source.sockt.make_listen_bind(ip, port); } if( HPMHooks.count.HP_sockt_make_listen_bind_post ) { - int (*postHookFunc) (int retVal___, uint32 *ip, uint16 *port); + int (*postHookFunc) (int retVal___, uint32 ip, uint16 port); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_make_listen_bind_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_make_listen_bind_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, &port); + retVal___ = postHookFunc(retVal___, ip, port); } } return retVal___; @@ -70783,11 +71002,11 @@ int HP_sockt_make_connection(uint32 ip, uint16 port, struct hSockOpt *opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_make_connection_pre ) { - int (*preHookFunc) (uint32 *ip, uint16 *port, struct hSockOpt *opt); + int (*preHookFunc) (uint32 *ip, uint16 *port, struct hSockOpt **opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_make_connection_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_make_connection_pre[hIndex].func; - retVal___ = preHookFunc(&ip, &port, opt); + retVal___ = preHookFunc(&ip, &port, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70798,10 +71017,10 @@ int HP_sockt_make_connection(uint32 ip, uint16 port, struct hSockOpt *opt) { retVal___ = HPMHooks.source.sockt.make_connection(ip, port, opt); } if( HPMHooks.count.HP_sockt_make_connection_post ) { - int (*postHookFunc) (int retVal___, uint32 *ip, uint16 *port, struct hSockOpt *opt); + int (*postHookFunc) (int retVal___, uint32 ip, uint16 port, struct hSockOpt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_make_connection_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_make_connection_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, &port, opt); + retVal___ = postHookFunc(retVal___, ip, port, opt); } } return retVal___; @@ -70825,10 +71044,10 @@ int HP_sockt_realloc_fifo(int fd, unsigned int rfifo_size, unsigned int wfifo_si retVal___ = HPMHooks.source.sockt.realloc_fifo(fd, rfifo_size, wfifo_size); } if( HPMHooks.count.HP_sockt_realloc_fifo_post ) { - int (*postHookFunc) (int retVal___, int *fd, unsigned int *rfifo_size, unsigned int *wfifo_size); + int (*postHookFunc) (int retVal___, int fd, unsigned int rfifo_size, unsigned int wfifo_size); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_realloc_fifo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_realloc_fifo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &rfifo_size, &wfifo_size); + retVal___ = postHookFunc(retVal___, fd, rfifo_size, wfifo_size); } } return retVal___; @@ -70852,10 +71071,10 @@ int HP_sockt_realloc_writefifo(int fd, size_t addition) { retVal___ = HPMHooks.source.sockt.realloc_writefifo(fd, addition); } if( HPMHooks.count.HP_sockt_realloc_writefifo_post ) { - int (*postHookFunc) (int retVal___, int *fd, size_t *addition); + int (*postHookFunc) (int retVal___, int fd, size_t addition); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_realloc_writefifo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_realloc_writefifo_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &addition); + retVal___ = postHookFunc(retVal___, fd, addition); } } return retVal___; @@ -70879,10 +71098,10 @@ int HP_sockt_wfifoset(int fd, size_t len) { retVal___ = HPMHooks.source.sockt.wfifoset(fd, len); } if( HPMHooks.count.HP_sockt_wfifoset_post ) { - int (*postHookFunc) (int retVal___, int *fd, size_t *len); + int (*postHookFunc) (int retVal___, int fd, size_t len); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_wfifoset_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_wfifoset_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &len); + retVal___ = postHookFunc(retVal___, fd, len); } } return retVal___; @@ -70906,10 +71125,10 @@ int HP_sockt_rfifoskip(int fd, size_t len) { retVal___ = HPMHooks.source.sockt.rfifoskip(fd, len); } if( HPMHooks.count.HP_sockt_rfifoskip_post ) { - int (*postHookFunc) (int retVal___, int *fd, size_t *len); + int (*postHookFunc) (int retVal___, int fd, size_t len); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_rfifoskip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_rfifoskip_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, &len); + retVal___ = postHookFunc(retVal___, fd, len); } } return retVal___; @@ -70932,10 +71151,10 @@ void HP_sockt_close(int fd) { HPMHooks.source.sockt.close(fd); } if( HPMHooks.count.HP_sockt_close_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_close_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_close_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -70959,10 +71178,10 @@ bool HP_sockt_session_is_valid(int fd) { retVal___ = HPMHooks.source.sockt.session_is_valid(fd); } if( HPMHooks.count.HP_sockt_session_is_valid_post ) { - bool (*postHookFunc) (bool retVal___, int *fd); + bool (*postHookFunc) (bool retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_session_is_valid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_session_is_valid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -70986,10 +71205,10 @@ bool HP_sockt_session_is_active(int fd) { retVal___ = HPMHooks.source.sockt.session_is_active(fd); } if( HPMHooks.count.HP_sockt_session_is_active_post ) { - bool (*postHookFunc) (bool retVal___, int *fd); + bool (*postHookFunc) (bool retVal___, int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_session_is_active_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_session_is_active_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + retVal___ = postHookFunc(retVal___, fd); } } return retVal___; @@ -71012,10 +71231,10 @@ void HP_sockt_flush(int fd) { HPMHooks.source.sockt.flush(fd); } if( HPMHooks.count.HP_sockt_flush_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_flush_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_flush_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -71064,10 +71283,10 @@ void HP_sockt_set_nonblocking(int fd, unsigned long yes) { HPMHooks.source.sockt.set_nonblocking(fd, yes); } if( HPMHooks.count.HP_sockt_set_nonblocking_post ) { - void (*postHookFunc) (int *fd, unsigned long *yes); + void (*postHookFunc) (int fd, unsigned long yes); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_set_nonblocking_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_set_nonblocking_post[hIndex].func; - postHookFunc(&fd, &yes); + postHookFunc(fd, yes); } } return; @@ -71090,10 +71309,10 @@ void HP_sockt_set_defaultparse(ParseFunc defaultparse) { HPMHooks.source.sockt.set_defaultparse(defaultparse); } if( HPMHooks.count.HP_sockt_set_defaultparse_post ) { - void (*postHookFunc) (ParseFunc *defaultparse); + void (*postHookFunc) (ParseFunc defaultparse); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_set_defaultparse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_set_defaultparse_post[hIndex].func; - postHookFunc(&defaultparse); + postHookFunc(defaultparse); } } return; @@ -71102,11 +71321,11 @@ uint32 HP_sockt_host2ip(const char *hostname) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_sockt_host2ip_pre ) { - uint32 (*preHookFunc) (const char *hostname); + uint32 (*preHookFunc) (const char **hostname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_host2ip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_host2ip_pre[hIndex].func; - retVal___ = preHookFunc(hostname); + retVal___ = preHookFunc(&hostname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71129,11 +71348,11 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_sockt_ip2str_pre ) { - const char* (*preHookFunc) (uint32 *ip, char *ip_str); + const char* (*preHookFunc) (uint32 *ip, char **ip_str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_ip2str_pre[hIndex].func; - retVal___ = preHookFunc(&ip, ip_str); + retVal___ = preHookFunc(&ip, &ip_str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71144,10 +71363,10 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { retVal___ = HPMHooks.source.sockt.ip2str(ip, ip_str); } if( HPMHooks.count.HP_sockt_ip2str_post ) { - const char* (*postHookFunc) (const char* retVal___, uint32 *ip, char *ip_str); + const char* (*postHookFunc) (const char* retVal___, uint32 ip, char *ip_str); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_ip2str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, ip_str); + retVal___ = postHookFunc(retVal___, ip, ip_str); } } return retVal___; @@ -71156,11 +71375,11 @@ uint32 HP_sockt_str2ip(const char *ip_str) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_sockt_str2ip_pre ) { - uint32 (*preHookFunc) (const char *ip_str); + uint32 (*preHookFunc) (const char **ip_str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_str2ip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_str2ip_pre[hIndex].func; - retVal___ = preHookFunc(ip_str); + retVal___ = preHookFunc(&ip_str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71198,10 +71417,10 @@ uint16 HP_sockt_ntows(uint16 netshort) { retVal___ = HPMHooks.source.sockt.ntows(netshort); } if( HPMHooks.count.HP_sockt_ntows_post ) { - uint16 (*postHookFunc) (uint16 retVal___, uint16 *netshort); + uint16 (*postHookFunc) (uint16 retVal___, uint16 netshort); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ntows_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_ntows_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &netshort); + retVal___ = postHookFunc(retVal___, netshort); } } return retVal___; @@ -71210,11 +71429,11 @@ int HP_sockt_getips(uint32 *ips, int max) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_getips_pre ) { - int (*preHookFunc) (uint32 *ips, int *max); + int (*preHookFunc) (uint32 **ips, int *max); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_getips_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_getips_pre[hIndex].func; - retVal___ = preHookFunc(ips, &max); + retVal___ = preHookFunc(&ips, &max); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71225,10 +71444,10 @@ int HP_sockt_getips(uint32 *ips, int max) { retVal___ = HPMHooks.source.sockt.getips(ips, max); } if( HPMHooks.count.HP_sockt_getips_post ) { - int (*postHookFunc) (int retVal___, uint32 *ips, int *max); + int (*postHookFunc) (int retVal___, uint32 *ips, int max); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_getips_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_getips_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ips, &max); + retVal___ = postHookFunc(retVal___, ips, max); } } return retVal___; @@ -71251,10 +71470,10 @@ void HP_sockt_eof(int fd) { HPMHooks.source.sockt.eof(fd); } if( HPMHooks.count.HP_sockt_eof_post ) { - void (*postHookFunc) (int *fd); + void (*postHookFunc) (int fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_eof_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_eof_post[hIndex].func; - postHookFunc(&fd); + postHookFunc(fd); } } return; @@ -71263,11 +71482,11 @@ uint32 HP_sockt_lan_subnet_check(uint32 ip, struct s_subnet *info) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_sockt_lan_subnet_check_pre ) { - uint32 (*preHookFunc) (uint32 *ip, struct s_subnet *info); + uint32 (*preHookFunc) (uint32 *ip, struct s_subnet **info); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_lan_subnet_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_lan_subnet_check_pre[hIndex].func; - retVal___ = preHookFunc(&ip, info); + retVal___ = preHookFunc(&ip, &info); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71278,10 +71497,10 @@ uint32 HP_sockt_lan_subnet_check(uint32 ip, struct s_subnet *info) { retVal___ = HPMHooks.source.sockt.lan_subnet_check(ip, info); } if( HPMHooks.count.HP_sockt_lan_subnet_check_post ) { - uint32 (*postHookFunc) (uint32 retVal___, uint32 *ip, struct s_subnet *info); + uint32 (*postHookFunc) (uint32 retVal___, uint32 ip, struct s_subnet *info); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_lan_subnet_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_lan_subnet_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip, info); + retVal___ = postHookFunc(retVal___, ip, info); } } return retVal___; @@ -71305,10 +71524,10 @@ bool HP_sockt_allowed_ip_check(uint32 ip) { retVal___ = HPMHooks.source.sockt.allowed_ip_check(ip); } if( HPMHooks.count.HP_sockt_allowed_ip_check_post ) { - bool (*postHookFunc) (bool retVal___, uint32 *ip); + bool (*postHookFunc) (bool retVal___, uint32 ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_allowed_ip_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_allowed_ip_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip); + retVal___ = postHookFunc(retVal___, ip); } } return retVal___; @@ -71332,10 +71551,10 @@ bool HP_sockt_trusted_ip_check(uint32 ip) { retVal___ = HPMHooks.source.sockt.trusted_ip_check(ip); } if( HPMHooks.count.HP_sockt_trusted_ip_check_post ) { - bool (*postHookFunc) (bool retVal___, uint32 *ip); + bool (*postHookFunc) (bool retVal___, uint32 ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_trusted_ip_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_trusted_ip_check_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &ip); + retVal___ = postHookFunc(retVal___, ip); } } return retVal___; @@ -71344,11 +71563,11 @@ int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vec int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) { - int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*preHookFunc) (struct config_setting_t **t, struct s_subnet_vector **list, const char **filename, const char **groupname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func; - retVal___ = preHookFunc(t, list, filename, groupname); + retVal___ = preHookFunc(&t, &list, &filename, &groupname); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71370,11 +71589,11 @@ int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vec void HP_sockt_net_config_read(const char *filename) { int hIndex = 0; if( HPMHooks.count.HP_sockt_net_config_read_pre ) { - void (*preHookFunc) (const char *filename); + void (*preHookFunc) (const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_net_config_read_pre[hIndex].func; - preHookFunc(filename); + preHookFunc(&filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71393,16 +71612,16 @@ void HP_sockt_net_config_read(const char *filename) { } return; } -/* SQL */ -int HP_SQL_Connect(Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db) { +/* sql_interface */ +int HP_SQL_Connect(struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_Connect_pre ) { - int (*preHookFunc) (Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db); + int (*preHookFunc) (struct Sql **self, const char **user, const char **passwd, const char **host, uint16 *port, const char **db); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Connect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_Connect_pre[hIndex].func; - retVal___ = preHookFunc(self, user, passwd, host, &port, db); + retVal___ = preHookFunc(&self, &user, &passwd, &host, &port, &db); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71413,23 +71632,23 @@ int HP_SQL_Connect(Sql *self, const char *user, const char *passwd, const char * retVal___ = HPMHooks.source.SQL.Connect(self, user, passwd, host, port, db); } if( HPMHooks.count.HP_SQL_Connect_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Connect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_Connect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, user, passwd, host, &port, db); + retVal___ = postHookFunc(retVal___, self, user, passwd, host, port, db); } } return retVal___; } -int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) { +int HP_SQL_GetTimeout(struct Sql *self, uint32 *out_timeout) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_GetTimeout_pre ) { - int (*preHookFunc) (Sql *self, uint32 *out_timeout); + int (*preHookFunc) (struct Sql **self, uint32 **out_timeout); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetTimeout_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_GetTimeout_pre[hIndex].func; - retVal___ = preHookFunc(self, out_timeout); + retVal___ = preHookFunc(&self, &out_timeout); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71440,7 +71659,7 @@ int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) { retVal___ = HPMHooks.source.SQL.GetTimeout(self, out_timeout); } if( HPMHooks.count.HP_SQL_GetTimeout_post ) { - int (*postHookFunc) (int retVal___, Sql *self, uint32 *out_timeout); + int (*postHookFunc) (int retVal___, struct Sql *self, uint32 *out_timeout); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetTimeout_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_GetTimeout_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, out_timeout); @@ -71448,15 +71667,15 @@ int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) { } return retVal___; } -int HP_SQL_GetColumnNames(Sql *self, const char *table, char *out_buf, size_t buf_len, char sep) { +int HP_SQL_GetColumnNames(struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_GetColumnNames_pre ) { - int (*preHookFunc) (Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep); + int (*preHookFunc) (struct Sql **self, const char **table, char **out_buf, size_t *buf_len, char *sep); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetColumnNames_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_GetColumnNames_pre[hIndex].func; - retVal___ = preHookFunc(self, table, out_buf, &buf_len, &sep); + retVal___ = preHookFunc(&self, &table, &out_buf, &buf_len, &sep); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71467,23 +71686,23 @@ int HP_SQL_GetColumnNames(Sql *self, const char *table, char *out_buf, size_t bu retVal___ = HPMHooks.source.SQL.GetColumnNames(self, table, out_buf, buf_len, sep); } if( HPMHooks.count.HP_SQL_GetColumnNames_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetColumnNames_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_GetColumnNames_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, table, out_buf, &buf_len, &sep); + retVal___ = postHookFunc(retVal___, self, table, out_buf, buf_len, sep); } } return retVal___; } -int HP_SQL_SetEncoding(Sql *self, const char *encoding) { +int HP_SQL_SetEncoding(struct Sql *self, const char *encoding) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_SetEncoding_pre ) { - int (*preHookFunc) (Sql *self, const char *encoding); + int (*preHookFunc) (struct Sql **self, const char **encoding); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_SetEncoding_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_SetEncoding_pre[hIndex].func; - retVal___ = preHookFunc(self, encoding); + retVal___ = preHookFunc(&self, &encoding); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71494,7 +71713,7 @@ int HP_SQL_SetEncoding(Sql *self, const char *encoding) { retVal___ = HPMHooks.source.SQL.SetEncoding(self, encoding); } if( HPMHooks.count.HP_SQL_SetEncoding_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *encoding); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *encoding); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_SetEncoding_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_SetEncoding_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, encoding); @@ -71502,15 +71721,15 @@ int HP_SQL_SetEncoding(Sql *self, const char *encoding) { } return retVal___; } -int HP_SQL_Ping(Sql *self) { +int HP_SQL_Ping(struct Sql *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_Ping_pre ) { - int (*preHookFunc) (Sql *self); + int (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Ping_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_Ping_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71521,7 +71740,7 @@ int HP_SQL_Ping(Sql *self) { retVal___ = HPMHooks.source.SQL.Ping(self); } if( HPMHooks.count.HP_SQL_Ping_post ) { - int (*postHookFunc) (int retVal___, Sql *self); + int (*postHookFunc) (int retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Ping_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_Ping_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -71529,15 +71748,15 @@ int HP_SQL_Ping(Sql *self) { } return retVal___; } -size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) { +size_t HP_SQL_EscapeString(struct Sql *self, char *out_to, const char *from) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_EscapeString_pre ) { - size_t (*preHookFunc) (Sql *self, char *out_to, const char *from); + size_t (*preHookFunc) (struct Sql **self, char **out_to, const char **from); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeString_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_EscapeString_pre[hIndex].func; - retVal___ = preHookFunc(self, out_to, from); + retVal___ = preHookFunc(&self, &out_to, &from); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71548,7 +71767,7 @@ size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) { retVal___ = HPMHooks.source.SQL.EscapeString(self, out_to, from); } if( HPMHooks.count.HP_SQL_EscapeString_post ) { - size_t (*postHookFunc) (size_t retVal___, Sql *self, char *out_to, const char *from); + size_t (*postHookFunc) (size_t retVal___, struct Sql *self, char *out_to, const char *from); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeString_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_EscapeString_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, out_to, from); @@ -71556,15 +71775,15 @@ size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) { } return retVal___; } -size_t HP_SQL_EscapeStringLen(Sql *self, char *out_to, const char *from, size_t from_len) { +size_t HP_SQL_EscapeStringLen(struct Sql *self, char *out_to, const char *from, size_t from_len) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_EscapeStringLen_pre ) { - size_t (*preHookFunc) (Sql *self, char *out_to, const char *from, size_t *from_len); + size_t (*preHookFunc) (struct Sql **self, char **out_to, const char **from, size_t *from_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeStringLen_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_EscapeStringLen_pre[hIndex].func; - retVal___ = preHookFunc(self, out_to, from, &from_len); + retVal___ = preHookFunc(&self, &out_to, &from, &from_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71575,24 +71794,24 @@ size_t HP_SQL_EscapeStringLen(Sql *self, char *out_to, const char *from, size_t retVal___ = HPMHooks.source.SQL.EscapeStringLen(self, out_to, from, from_len); } if( HPMHooks.count.HP_SQL_EscapeStringLen_post ) { - size_t (*postHookFunc) (size_t retVal___, Sql *self, char *out_to, const char *from, size_t *from_len); + size_t (*postHookFunc) (size_t retVal___, struct Sql *self, char *out_to, const char *from, size_t from_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeStringLen_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_EscapeStringLen_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, out_to, from, &from_len); + retVal___ = postHookFunc(retVal___, self, out_to, from, from_len); } } return retVal___; } -int HP_SQL_QueryV(Sql *self, const char *query, va_list args) { +int HP_SQL_QueryV(struct Sql *self, const char *query, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_QueryV_pre ) { - int (*preHookFunc) (Sql *self, const char *query, va_list args); + int (*preHookFunc) (struct Sql **self, const char **query, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryV_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_SQL_QueryV_pre[hIndex].func; - retVal___ = preHookFunc(self, query, args___copy); + retVal___ = preHookFunc(&self, &query, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -71606,7 +71825,7 @@ int HP_SQL_QueryV(Sql *self, const char *query, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_SQL_QueryV_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *query, va_list args); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *query, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryV_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_SQL_QueryV_post[hIndex].func; @@ -71616,15 +71835,15 @@ int HP_SQL_QueryV(Sql *self, const char *query, va_list args) { } return retVal___; } -int HP_SQL_QueryStr(Sql *self, const char *query) { +int HP_SQL_QueryStr(struct Sql *self, const char *query) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_QueryStr_pre ) { - int (*preHookFunc) (Sql *self, const char *query); + int (*preHookFunc) (struct Sql **self, const char **query); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryStr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_QueryStr_pre[hIndex].func; - retVal___ = preHookFunc(self, query); + retVal___ = preHookFunc(&self, &query); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71635,7 +71854,7 @@ int HP_SQL_QueryStr(Sql *self, const char *query) { retVal___ = HPMHooks.source.SQL.QueryStr(self, query); } if( HPMHooks.count.HP_SQL_QueryStr_post ) { - int (*postHookFunc) (int retVal___, Sql *self, const char *query); + int (*postHookFunc) (int retVal___, struct Sql *self, const char *query); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryStr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_QueryStr_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, query); @@ -71643,15 +71862,15 @@ int HP_SQL_QueryStr(Sql *self, const char *query) { } return retVal___; } -uint64 HP_SQL_LastInsertId(Sql *self) { +uint64 HP_SQL_LastInsertId(struct Sql *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_LastInsertId_pre ) { - uint64 (*preHookFunc) (Sql *self); + uint64 (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_LastInsertId_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_LastInsertId_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71662,7 +71881,7 @@ uint64 HP_SQL_LastInsertId(Sql *self) { retVal___ = HPMHooks.source.SQL.LastInsertId(self); } if( HPMHooks.count.HP_SQL_LastInsertId_post ) { - uint64 (*postHookFunc) (uint64 retVal___, Sql *self); + uint64 (*postHookFunc) (uint64 retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_LastInsertId_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_LastInsertId_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -71670,15 +71889,15 @@ uint64 HP_SQL_LastInsertId(Sql *self) { } return retVal___; } -uint32 HP_SQL_NumColumns(Sql *self) { +uint32 HP_SQL_NumColumns(struct Sql *self) { int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_SQL_NumColumns_pre ) { - uint32 (*preHookFunc) (Sql *self); + uint32 (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumColumns_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_NumColumns_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71689,7 +71908,7 @@ uint32 HP_SQL_NumColumns(Sql *self) { retVal___ = HPMHooks.source.SQL.NumColumns(self); } if( HPMHooks.count.HP_SQL_NumColumns_post ) { - uint32 (*postHookFunc) (uint32 retVal___, Sql *self); + uint32 (*postHookFunc) (uint32 retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumColumns_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_NumColumns_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -71697,15 +71916,15 @@ uint32 HP_SQL_NumColumns(Sql *self) { } return retVal___; } -uint64 HP_SQL_NumRows(Sql *self) { +uint64 HP_SQL_NumRows(struct Sql *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_NumRows_pre ) { - uint64 (*preHookFunc) (Sql *self); + uint64 (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumRows_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_NumRows_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71716,7 +71935,7 @@ uint64 HP_SQL_NumRows(Sql *self) { retVal___ = HPMHooks.source.SQL.NumRows(self); } if( HPMHooks.count.HP_SQL_NumRows_post ) { - uint64 (*postHookFunc) (uint64 retVal___, Sql *self); + uint64 (*postHookFunc) (uint64 retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumRows_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_NumRows_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -71724,15 +71943,15 @@ uint64 HP_SQL_NumRows(Sql *self) { } return retVal___; } -int HP_SQL_NextRow(Sql *self) { +int HP_SQL_NextRow(struct Sql *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_NextRow_pre ) { - int (*preHookFunc) (Sql *self); + int (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NextRow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_NextRow_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71743,7 +71962,7 @@ int HP_SQL_NextRow(Sql *self) { retVal___ = HPMHooks.source.SQL.NextRow(self); } if( HPMHooks.count.HP_SQL_NextRow_post ) { - int (*postHookFunc) (int retVal___, Sql *self); + int (*postHookFunc) (int retVal___, struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NextRow_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_NextRow_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -71751,15 +71970,15 @@ int HP_SQL_NextRow(Sql *self) { } return retVal___; } -int HP_SQL_GetData(Sql *self, size_t col, char **out_buf, size_t *out_len) { +int HP_SQL_GetData(struct Sql *self, size_t col, char **out_buf, size_t *out_len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_GetData_pre ) { - int (*preHookFunc) (Sql *self, size_t *col, char **out_buf, size_t *out_len); + int (*preHookFunc) (struct Sql **self, size_t *col, char ***out_buf, size_t **out_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetData_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_GetData_pre[hIndex].func; - retVal___ = preHookFunc(self, &col, out_buf, out_len); + retVal___ = preHookFunc(&self, &col, &out_buf, &out_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71770,22 +71989,22 @@ int HP_SQL_GetData(Sql *self, size_t col, char **out_buf, size_t *out_len) { retVal___ = HPMHooks.source.SQL.GetData(self, col, out_buf, out_len); } if( HPMHooks.count.HP_SQL_GetData_post ) { - int (*postHookFunc) (int retVal___, Sql *self, size_t *col, char **out_buf, size_t *out_len); + int (*postHookFunc) (int retVal___, struct Sql *self, size_t col, char **out_buf, size_t *out_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetData_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_GetData_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, &col, out_buf, out_len); + retVal___ = postHookFunc(retVal___, self, col, out_buf, out_len); } } return retVal___; } -void HP_SQL_FreeResult(Sql *self) { +void HP_SQL_FreeResult(struct Sql *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_FreeResult_pre ) { - void (*preHookFunc) (Sql *self); + void (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_FreeResult_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_FreeResult_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71796,7 +72015,7 @@ void HP_SQL_FreeResult(Sql *self) { HPMHooks.source.SQL.FreeResult(self); } if( HPMHooks.count.HP_SQL_FreeResult_post ) { - void (*postHookFunc) (Sql *self); + void (*postHookFunc) (struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_FreeResult_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_FreeResult_post[hIndex].func; postHookFunc(self); @@ -71804,14 +72023,14 @@ void HP_SQL_FreeResult(Sql *self) { } return; } -void HP_SQL_ShowDebug_(Sql *self, const char *debug_file, const unsigned long debug_line) { +void HP_SQL_ShowDebug_(struct Sql *self, const char *debug_file, const unsigned long debug_line) { int hIndex = 0; if( HPMHooks.count.HP_SQL_ShowDebug__pre ) { - void (*preHookFunc) (Sql *self, const char *debug_file, const unsigned long *debug_line); + void (*preHookFunc) (struct Sql **self, const char **debug_file, const unsigned long *debug_line); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_ShowDebug__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_ShowDebug__pre[hIndex].func; - preHookFunc(self, debug_file, &debug_line); + preHookFunc(&self, &debug_file, &debug_line); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71822,22 +72041,22 @@ void HP_SQL_ShowDebug_(Sql *self, const char *debug_file, const unsigned long de HPMHooks.source.SQL.ShowDebug_(self, debug_file, debug_line); } if( HPMHooks.count.HP_SQL_ShowDebug__post ) { - void (*postHookFunc) (Sql *self, const char *debug_file, const unsigned long *debug_line); + void (*postHookFunc) (struct Sql *self, const char *debug_file, const unsigned long debug_line); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_ShowDebug__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_ShowDebug__post[hIndex].func; - postHookFunc(self, debug_file, &debug_line); + postHookFunc(self, debug_file, debug_line); } } return; } -void HP_SQL_Free(Sql *self) { +void HP_SQL_Free(struct Sql *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_Free_pre ) { - void (*preHookFunc) (Sql *self); + void (*preHookFunc) (struct Sql **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_Free_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71848,7 +72067,7 @@ void HP_SQL_Free(Sql *self) { HPMHooks.source.SQL.Free(self); } if( HPMHooks.count.HP_SQL_Free_post ) { - void (*postHookFunc) (Sql *self); + void (*postHookFunc) (struct Sql *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Free_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_Free_post[hIndex].func; postHookFunc(self); @@ -71883,15 +72102,15 @@ struct Sql* HP_SQL_Malloc(void) { } return retVal___; } -struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) { +struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { int hIndex = 0; struct SqlStmt* retVal___ = NULL; if( HPMHooks.count.HP_SQL_StmtMalloc_pre ) { - struct SqlStmt* (*preHookFunc) (Sql *sql); + struct SqlStmt* (*preHookFunc) (struct Sql **sql); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_pre[hIndex].func; - retVal___ = preHookFunc(sql); + retVal___ = preHookFunc(&sql); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71902,7 +72121,7 @@ struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) { retVal___ = HPMHooks.source.SQL.StmtMalloc(sql); } if( HPMHooks.count.HP_SQL_StmtMalloc_post ) { - struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, Sql *sql); + struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, struct Sql *sql); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, sql); @@ -71910,16 +72129,16 @@ struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) { } return retVal___; } -int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) { +int HP_SQL_StmtPrepareV(struct SqlStmt *self, const char *query, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtPrepareV_pre ) { - int (*preHookFunc) (SqlStmt *self, const char *query, va_list args); + int (*preHookFunc) (struct SqlStmt **self, const char **query, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareV_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_SQL_StmtPrepareV_pre[hIndex].func; - retVal___ = preHookFunc(self, query, args___copy); + retVal___ = preHookFunc(&self, &query, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -71933,7 +72152,7 @@ int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) { va_end(args___copy); } if( HPMHooks.count.HP_SQL_StmtPrepareV_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, const char *query, va_list args); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, const char *query, va_list args); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareV_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); postHookFunc = HPMHooks.list.HP_SQL_StmtPrepareV_post[hIndex].func; @@ -71943,15 +72162,15 @@ int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) { } return retVal___; } -int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) { +int HP_SQL_StmtPrepareStr(struct SqlStmt *self, const char *query) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtPrepareStr_pre ) { - int (*preHookFunc) (SqlStmt *self, const char *query); + int (*preHookFunc) (struct SqlStmt **self, const char **query); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareStr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtPrepareStr_pre[hIndex].func; - retVal___ = preHookFunc(self, query); + retVal___ = preHookFunc(&self, &query); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71962,7 +72181,7 @@ int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) { retVal___ = HPMHooks.source.SQL.StmtPrepareStr(self, query); } if( HPMHooks.count.HP_SQL_StmtPrepareStr_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, const char *query); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, const char *query); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareStr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtPrepareStr_post[hIndex].func; retVal___ = postHookFunc(retVal___, self, query); @@ -71970,15 +72189,15 @@ int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) { } return retVal___; } -size_t HP_SQL_StmtNumParams(SqlStmt *self) { +size_t HP_SQL_StmtNumParams(struct SqlStmt *self) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNumParams_pre ) { - size_t (*preHookFunc) (SqlStmt *self); + size_t (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumParams_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNumParams_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -71989,7 +72208,7 @@ size_t HP_SQL_StmtNumParams(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNumParams(self); } if( HPMHooks.count.HP_SQL_StmtNumParams_post ) { - size_t (*postHookFunc) (size_t retVal___, SqlStmt *self); + size_t (*postHookFunc) (size_t retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumParams_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNumParams_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -71997,15 +72216,15 @@ size_t HP_SQL_StmtNumParams(SqlStmt *self) { } return retVal___; } -int HP_SQL_StmtBindParam(SqlStmt *self, size_t idx, SqlDataType buffer_type, void *buffer, size_t buffer_len) { +int HP_SQL_StmtBindParam(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtBindParam_pre ) { - int (*preHookFunc) (SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len); + int (*preHookFunc) (struct SqlStmt **self, size_t *idx, enum SqlDataType *buffer_type, const void **buffer, size_t *buffer_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindParam_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtBindParam_pre[hIndex].func; - retVal___ = preHookFunc(self, &idx, &buffer_type, buffer, &buffer_len); + retVal___ = preHookFunc(&self, &idx, &buffer_type, &buffer, &buffer_len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72016,23 +72235,23 @@ int HP_SQL_StmtBindParam(SqlStmt *self, size_t idx, SqlDataType buffer_type, voi retVal___ = HPMHooks.source.SQL.StmtBindParam(self, idx, buffer_type, buffer, buffer_len); } if( HPMHooks.count.HP_SQL_StmtBindParam_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindParam_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtBindParam_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, &idx, &buffer_type, buffer, &buffer_len); + retVal___ = postHookFunc(retVal___, self, idx, buffer_type, buffer, buffer_len); } } return retVal___; } -int HP_SQL_StmtExecute(SqlStmt *self) { +int HP_SQL_StmtExecute(struct SqlStmt *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtExecute_pre ) { - int (*preHookFunc) (SqlStmt *self); + int (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtExecute_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtExecute_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72043,7 +72262,7 @@ int HP_SQL_StmtExecute(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtExecute(self); } if( HPMHooks.count.HP_SQL_StmtExecute_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self); + int (*postHookFunc) (int retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtExecute_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtExecute_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -72051,15 +72270,15 @@ int HP_SQL_StmtExecute(SqlStmt *self) { } return retVal___; } -uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) { +uint64 HP_SQL_StmtLastInsertId(struct SqlStmt *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtLastInsertId_pre ) { - uint64 (*preHookFunc) (SqlStmt *self); + uint64 (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtLastInsertId_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtLastInsertId_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72070,7 +72289,7 @@ uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtLastInsertId(self); } if( HPMHooks.count.HP_SQL_StmtLastInsertId_post ) { - uint64 (*postHookFunc) (uint64 retVal___, SqlStmt *self); + uint64 (*postHookFunc) (uint64 retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtLastInsertId_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtLastInsertId_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -72078,15 +72297,15 @@ uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) { } return retVal___; } -size_t HP_SQL_StmtNumColumns(SqlStmt *self) { +size_t HP_SQL_StmtNumColumns(struct SqlStmt *self) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNumColumns_pre ) { - size_t (*preHookFunc) (SqlStmt *self); + size_t (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumColumns_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNumColumns_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72097,7 +72316,7 @@ size_t HP_SQL_StmtNumColumns(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNumColumns(self); } if( HPMHooks.count.HP_SQL_StmtNumColumns_post ) { - size_t (*postHookFunc) (size_t retVal___, SqlStmt *self); + size_t (*postHookFunc) (size_t retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumColumns_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNumColumns_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -72105,15 +72324,15 @@ size_t HP_SQL_StmtNumColumns(SqlStmt *self) { } return retVal___; } -int HP_SQL_StmtBindColumn(SqlStmt *self, size_t idx, SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) { +int HP_SQL_StmtBindColumn(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtBindColumn_pre ) { - int (*preHookFunc) (SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null); + int (*preHookFunc) (struct SqlStmt **self, size_t *idx, enum SqlDataType *buffer_type, void **buffer, size_t *buffer_len, uint32 **out_length, int8 **out_is_null); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindColumn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtBindColumn_pre[hIndex].func; - retVal___ = preHookFunc(self, &idx, &buffer_type, buffer, &buffer_len, out_length, out_is_null); + retVal___ = preHookFunc(&self, &idx, &buffer_type, &buffer, &buffer_len, &out_length, &out_is_null); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72124,23 +72343,23 @@ int HP_SQL_StmtBindColumn(SqlStmt *self, size_t idx, SqlDataType buffer_type, vo retVal___ = HPMHooks.source.SQL.StmtBindColumn(self, idx, buffer_type, buffer, buffer_len, out_length, out_is_null); } if( HPMHooks.count.HP_SQL_StmtBindColumn_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null); + int (*postHookFunc) (int retVal___, struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindColumn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtBindColumn_post[hIndex].func; - retVal___ = postHookFunc(retVal___, self, &idx, &buffer_type, buffer, &buffer_len, out_length, out_is_null); + retVal___ = postHookFunc(retVal___, self, idx, buffer_type, buffer, buffer_len, out_length, out_is_null); } } return retVal___; } -uint64 HP_SQL_StmtNumRows(SqlStmt *self) { +uint64 HP_SQL_StmtNumRows(struct SqlStmt *self) { int hIndex = 0; uint64 retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNumRows_pre ) { - uint64 (*preHookFunc) (SqlStmt *self); + uint64 (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumRows_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNumRows_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72151,7 +72370,7 @@ uint64 HP_SQL_StmtNumRows(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNumRows(self); } if( HPMHooks.count.HP_SQL_StmtNumRows_post ) { - uint64 (*postHookFunc) (uint64 retVal___, SqlStmt *self); + uint64 (*postHookFunc) (uint64 retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumRows_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNumRows_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -72159,15 +72378,15 @@ uint64 HP_SQL_StmtNumRows(SqlStmt *self) { } return retVal___; } -int HP_SQL_StmtNextRow(SqlStmt *self) { +int HP_SQL_StmtNextRow(struct SqlStmt *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_SQL_StmtNextRow_pre ) { - int (*preHookFunc) (SqlStmt *self); + int (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNextRow_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtNextRow_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72178,7 +72397,7 @@ int HP_SQL_StmtNextRow(SqlStmt *self) { retVal___ = HPMHooks.source.SQL.StmtNextRow(self); } if( HPMHooks.count.HP_SQL_StmtNextRow_post ) { - int (*postHookFunc) (int retVal___, SqlStmt *self); + int (*postHookFunc) (int retVal___, struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNextRow_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtNextRow_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -72186,14 +72405,14 @@ int HP_SQL_StmtNextRow(SqlStmt *self) { } return retVal___; } -void HP_SQL_StmtFreeResult(SqlStmt *self) { +void HP_SQL_StmtFreeResult(struct SqlStmt *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_StmtFreeResult_pre ) { - void (*preHookFunc) (SqlStmt *self); + void (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFreeResult_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtFreeResult_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72204,7 +72423,7 @@ void HP_SQL_StmtFreeResult(SqlStmt *self) { HPMHooks.source.SQL.StmtFreeResult(self); } if( HPMHooks.count.HP_SQL_StmtFreeResult_post ) { - void (*postHookFunc) (SqlStmt *self); + void (*postHookFunc) (struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFreeResult_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtFreeResult_post[hIndex].func; postHookFunc(self); @@ -72212,14 +72431,14 @@ void HP_SQL_StmtFreeResult(SqlStmt *self) { } return; } -void HP_SQL_StmtFree(SqlStmt *self) { +void HP_SQL_StmtFree(struct SqlStmt *self) { int hIndex = 0; if( HPMHooks.count.HP_SQL_StmtFree_pre ) { - void (*preHookFunc) (SqlStmt *self); + void (*preHookFunc) (struct SqlStmt **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFree_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtFree_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72230,7 +72449,7 @@ void HP_SQL_StmtFree(SqlStmt *self) { HPMHooks.source.SQL.StmtFree(self); } if( HPMHooks.count.HP_SQL_StmtFree_post ) { - void (*postHookFunc) (SqlStmt *self); + void (*postHookFunc) (struct SqlStmt *self); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFree_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtFree_post[hIndex].func; postHookFunc(self); @@ -72238,14 +72457,14 @@ void HP_SQL_StmtFree(SqlStmt *self) { } return; } -void HP_SQL_StmtShowDebug_(SqlStmt *self, const char *debug_file, const unsigned long debug_line) { +void HP_SQL_StmtShowDebug_(struct SqlStmt *self, const char *debug_file, const unsigned long debug_line) { int hIndex = 0; if( HPMHooks.count.HP_SQL_StmtShowDebug__pre ) { - void (*preHookFunc) (SqlStmt *self, const char *debug_file, const unsigned long *debug_line); + void (*preHookFunc) (struct SqlStmt **self, const char **debug_file, const unsigned long *debug_line); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtShowDebug__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_SQL_StmtShowDebug__pre[hIndex].func; - preHookFunc(self, debug_file, &debug_line); + preHookFunc(&self, &debug_file, &debug_line); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72256,15 +72475,15 @@ void HP_SQL_StmtShowDebug_(SqlStmt *self, const char *debug_file, const unsigned HPMHooks.source.SQL.StmtShowDebug_(self, debug_file, debug_line); } if( HPMHooks.count.HP_SQL_StmtShowDebug__post ) { - void (*postHookFunc) (SqlStmt *self, const char *debug_file, const unsigned long *debug_line); + void (*postHookFunc) (struct SqlStmt *self, const char *debug_file, const unsigned long debug_line); for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtShowDebug__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_SQL_StmtShowDebug__post[hIndex].func; - postHookFunc(self, debug_file, &debug_line); + postHookFunc(self, debug_file, debug_line); } } return; } -/* status */ +/* status_interface */ int HP_status_init(bool minimal) { int hIndex = 0; int retVal___ = 0; @@ -72284,10 +72503,10 @@ int HP_status_init(bool minimal) { retVal___ = HPMHooks.source.status.init(minimal); } if( HPMHooks.count.HP_status_init_post ) { - int (*postHookFunc) (int retVal___, bool *minimal); + int (*postHookFunc) (int retVal___, bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &minimal); + retVal___ = postHookFunc(retVal___, minimal); } } return retVal___; @@ -72337,10 +72556,10 @@ int HP_status_get_refine_chance(enum refine_type wlv, int refine) { retVal___ = HPMHooks.source.status.get_refine_chance(wlv, refine); } if( HPMHooks.count.HP_status_get_refine_chance_post ) { - int (*postHookFunc) (int retVal___, enum refine_type *wlv, int *refine); + int (*postHookFunc) (int retVal___, enum refine_type wlv, int refine); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_refine_chance_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_refine_chance_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &wlv, &refine); + retVal___ = postHookFunc(retVal___, wlv, refine); } } return retVal___; @@ -72364,10 +72583,10 @@ sc_type HP_status_skill2sc(int skill_id) { retVal___ = HPMHooks.source.status.skill2sc(skill_id); } if( HPMHooks.count.HP_status_skill2sc_post ) { - sc_type (*postHookFunc) (sc_type retVal___, int *skill_id); + sc_type (*postHookFunc) (sc_type retVal___, int skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_skill2sc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_skill2sc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &skill_id); + retVal___ = postHookFunc(retVal___, skill_id); } } return retVal___; @@ -72391,10 +72610,10 @@ int HP_status_sc2skill(sc_type sc) { retVal___ = HPMHooks.source.status.sc2skill(sc); } if( HPMHooks.count.HP_status_sc2skill_post ) { - int (*postHookFunc) (int retVal___, sc_type *sc); + int (*postHookFunc) (int retVal___, sc_type sc); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_sc2skill_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_sc2skill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &sc); + retVal___ = postHookFunc(retVal___, sc); } } return retVal___; @@ -72418,10 +72637,10 @@ unsigned int HP_status_sc2scb_flag(sc_type sc) { retVal___ = HPMHooks.source.status.sc2scb_flag(sc); } if( HPMHooks.count.HP_status_sc2scb_flag_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, sc_type *sc); + unsigned int (*postHookFunc) (unsigned int retVal___, sc_type sc); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_sc2scb_flag_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_sc2scb_flag_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &sc); + retVal___ = postHookFunc(retVal___, sc); } } return retVal___; @@ -72445,10 +72664,10 @@ int HP_status_type2relevant_bl_types(int type) { retVal___ = HPMHooks.source.status.type2relevant_bl_types(type); } if( HPMHooks.count.HP_status_type2relevant_bl_types_post ) { - int (*postHookFunc) (int retVal___, int *type); + int (*postHookFunc) (int retVal___, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_type2relevant_bl_types_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_type2relevant_bl_types_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &type); + retVal___ = postHookFunc(retVal___, type); } } return retVal___; @@ -72472,10 +72691,10 @@ int HP_status_get_sc_type(sc_type idx) { retVal___ = HPMHooks.source.status.get_sc_type(idx); } if( HPMHooks.count.HP_status_get_sc_type_post ) { - int (*postHookFunc) (int retVal___, sc_type *idx); + int (*postHookFunc) (int retVal___, sc_type idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_type_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_sc_type_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &idx); + retVal___ = postHookFunc(retVal___, idx); } } return retVal___; @@ -72484,11 +72703,11 @@ int HP_status_damage(struct block_list *src, struct block_list *target, int64 hp int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_damage_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, int64 *hp, int64 *sp, int *walkdelay, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **target, int64 *hp, int64 *sp, int *walkdelay, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_damage_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &hp, &sp, &walkdelay, &flag); + retVal___ = preHookFunc(&src, &target, &hp, &sp, &walkdelay, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72499,10 +72718,10 @@ int HP_status_damage(struct block_list *src, struct block_list *target, int64 hp retVal___ = HPMHooks.source.status.damage(src, target, hp, sp, walkdelay, flag); } if( HPMHooks.count.HP_status_damage_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int64 *hp, int64 *sp, int *walkdelay, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int64 hp, int64 sp, int walkdelay, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &hp, &sp, &walkdelay, &flag); + retVal___ = postHookFunc(retVal___, src, target, hp, sp, walkdelay, flag); } } return retVal___; @@ -72511,11 +72730,11 @@ int HP_status_charge(struct block_list *bl, int64 hp, int64 sp) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_charge_pre ) { - int (*preHookFunc) (struct block_list *bl, int64 *hp, int64 *sp); + int (*preHookFunc) (struct block_list **bl, int64 *hp, int64 *sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_charge_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_charge_pre[hIndex].func; - retVal___ = preHookFunc(bl, &hp, &sp); + retVal___ = preHookFunc(&bl, &hp, &sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72526,10 +72745,10 @@ int HP_status_charge(struct block_list *bl, int64 hp, int64 sp) { retVal___ = HPMHooks.source.status.charge(bl, hp, sp); } if( HPMHooks.count.HP_status_charge_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int64 *hp, int64 *sp); + int (*postHookFunc) (int retVal___, struct block_list *bl, int64 hp, int64 sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_charge_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_charge_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &hp, &sp); + retVal___ = postHookFunc(retVal___, bl, hp, sp); } } return retVal___; @@ -72538,11 +72757,11 @@ int HP_status_percent_change(struct block_list *src, struct block_list *target, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_percent_change_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, signed char *hp_rate, signed char *sp_rate, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **target, signed char *hp_rate, signed char *sp_rate, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_percent_change_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_percent_change_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &hp_rate, &sp_rate, &flag); + retVal___ = preHookFunc(&src, &target, &hp_rate, &sp_rate, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72553,10 +72772,10 @@ int HP_status_percent_change(struct block_list *src, struct block_list *target, retVal___ = HPMHooks.source.status.percent_change(src, target, hp_rate, sp_rate, flag); } if( HPMHooks.count.HP_status_percent_change_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, signed char *hp_rate, signed char *sp_rate, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, signed char hp_rate, signed char sp_rate, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_percent_change_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_percent_change_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &hp_rate, &sp_rate, &flag); + retVal___ = postHookFunc(retVal___, src, target, hp_rate, sp_rate, flag); } } return retVal___; @@ -72565,11 +72784,11 @@ int HP_status_set_hp(struct block_list *bl, unsigned int hp, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_set_hp_pre ) { - int (*preHookFunc) (struct block_list *bl, unsigned int *hp, int *flag); + int (*preHookFunc) (struct block_list **bl, unsigned int *hp, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_set_hp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_set_hp_pre[hIndex].func; - retVal___ = preHookFunc(bl, &hp, &flag); + retVal___ = preHookFunc(&bl, &hp, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72580,10 +72799,10 @@ int HP_status_set_hp(struct block_list *bl, unsigned int hp, int flag) { retVal___ = HPMHooks.source.status.set_hp(bl, hp, flag); } if( HPMHooks.count.HP_status_set_hp_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned int *hp, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned int hp, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_set_hp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_set_hp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &hp, &flag); + retVal___ = postHookFunc(retVal___, bl, hp, flag); } } return retVal___; @@ -72592,11 +72811,11 @@ int HP_status_set_sp(struct block_list *bl, unsigned int sp, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_set_sp_pre ) { - int (*preHookFunc) (struct block_list *bl, unsigned int *sp, int *flag); + int (*preHookFunc) (struct block_list **bl, unsigned int *sp, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_set_sp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_set_sp_pre[hIndex].func; - retVal___ = preHookFunc(bl, &sp, &flag); + retVal___ = preHookFunc(&bl, &sp, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72607,10 +72826,10 @@ int HP_status_set_sp(struct block_list *bl, unsigned int sp, int flag) { retVal___ = HPMHooks.source.status.set_sp(bl, sp, flag); } if( HPMHooks.count.HP_status_set_sp_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned int *sp, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned int sp, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_set_sp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_set_sp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &sp, &flag); + retVal___ = postHookFunc(retVal___, bl, sp, flag); } } return retVal___; @@ -72619,11 +72838,11 @@ int HP_status_heal(struct block_list *bl, int64 hp, int64 sp, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_heal_pre ) { - int (*preHookFunc) (struct block_list *bl, int64 *hp, int64 *sp, int *flag); + int (*preHookFunc) (struct block_list **bl, int64 *hp, int64 *sp, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_heal_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_heal_pre[hIndex].func; - retVal___ = preHookFunc(bl, &hp, &sp, &flag); + retVal___ = preHookFunc(&bl, &hp, &sp, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72634,10 +72853,10 @@ int HP_status_heal(struct block_list *bl, int64 hp, int64 sp, int flag) { retVal___ = HPMHooks.source.status.heal(bl, hp, sp, flag); } if( HPMHooks.count.HP_status_heal_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int64 *hp, int64 *sp, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *bl, int64 hp, int64 sp, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_heal_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_heal_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &hp, &sp, &flag); + retVal___ = postHookFunc(retVal___, bl, hp, sp, flag); } } return retVal___; @@ -72646,11 +72865,11 @@ int HP_status_revive(struct block_list *bl, unsigned char per_hp, unsigned char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_revive_pre ) { - int (*preHookFunc) (struct block_list *bl, unsigned char *per_hp, unsigned char *per_sp); + int (*preHookFunc) (struct block_list **bl, unsigned char *per_hp, unsigned char *per_sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_revive_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_revive_pre[hIndex].func; - retVal___ = preHookFunc(bl, &per_hp, &per_sp); + retVal___ = preHookFunc(&bl, &per_hp, &per_sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72661,10 +72880,10 @@ int HP_status_revive(struct block_list *bl, unsigned char per_hp, unsigned char retVal___ = HPMHooks.source.status.revive(bl, per_hp, per_sp); } if( HPMHooks.count.HP_status_revive_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned char *per_hp, unsigned char *per_sp); + int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned char per_hp, unsigned char per_sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_revive_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_revive_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &per_hp, &per_sp); + retVal___ = postHookFunc(retVal___, bl, per_hp, per_sp); } } return retVal___; @@ -72673,11 +72892,11 @@ int HP_status_fixed_revive(struct block_list *bl, unsigned int per_hp, unsigned int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_fixed_revive_pre ) { - int (*preHookFunc) (struct block_list *bl, unsigned int *per_hp, unsigned int *per_sp); + int (*preHookFunc) (struct block_list **bl, unsigned int *per_hp, unsigned int *per_sp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_fixed_revive_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_fixed_revive_pre[hIndex].func; - retVal___ = preHookFunc(bl, &per_hp, &per_sp); + retVal___ = preHookFunc(&bl, &per_hp, &per_sp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72688,10 +72907,10 @@ int HP_status_fixed_revive(struct block_list *bl, unsigned int per_hp, unsigned retVal___ = HPMHooks.source.status.fixed_revive(bl, per_hp, per_sp); } if( HPMHooks.count.HP_status_fixed_revive_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned int *per_hp, unsigned int *per_sp); + int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned int per_hp, unsigned int per_sp); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_fixed_revive_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_fixed_revive_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &per_hp, &per_sp); + retVal___ = postHookFunc(retVal___, bl, per_hp, per_sp); } } return retVal___; @@ -72700,11 +72919,11 @@ struct regen_data* HP_status_get_regen_data(struct block_list *bl) { int hIndex = 0; struct regen_data* retVal___ = NULL; if( HPMHooks.count.HP_status_get_regen_data_pre ) { - struct regen_data* (*preHookFunc) (struct block_list *bl); + struct regen_data* (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_regen_data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_regen_data_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72727,11 +72946,11 @@ struct status_data* HP_status_get_status_data(struct block_list *bl) { int hIndex = 0; struct status_data* retVal___ = NULL; if( HPMHooks.count.HP_status_get_status_data_pre ) { - struct status_data* (*preHookFunc) (struct block_list *bl); + struct status_data* (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_status_data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_status_data_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72754,11 +72973,11 @@ struct status_data* HP_status_get_base_status(struct block_list *bl) { int hIndex = 0; struct status_data* retVal___ = NULL; if( HPMHooks.count.HP_status_get_base_status_pre ) { - struct status_data* (*preHookFunc) (struct block_list *bl); + struct status_data* (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_base_status_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_base_status_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72777,15 +72996,15 @@ struct status_data* HP_status_get_base_status(struct block_list *bl) { } return retVal___; } -const char* HP_status_get_name(struct block_list *bl) { +const char* HP_status_get_name(const struct block_list *bl) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_status_get_name_pre ) { - const char* (*preHookFunc) (struct block_list *bl); + const char* (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_name_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72796,7 +73015,7 @@ const char* HP_status_get_name(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_name(bl); } if( HPMHooks.count.HP_status_get_name_post ) { - const char* (*postHookFunc) (const char* retVal___, struct block_list *bl); + const char* (*postHookFunc) (const char* retVal___, const struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -72804,15 +73023,15 @@ const char* HP_status_get_name(struct block_list *bl) { } return retVal___; } -int HP_status_get_class(struct block_list *bl) { +int HP_status_get_class(const struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_class_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_class_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_class_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72823,7 +73042,7 @@ int HP_status_get_class(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_class(bl); } if( HPMHooks.count.HP_status_get_class_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl); + int (*postHookFunc) (int retVal___, const struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_class_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_class_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -72831,15 +73050,15 @@ int HP_status_get_class(struct block_list *bl) { } return retVal___; } -int HP_status_get_lv(struct block_list *bl) { +int HP_status_get_lv(const struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_lv_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_lv_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_lv_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72850,7 +73069,7 @@ int HP_status_get_lv(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_lv(bl); } if( HPMHooks.count.HP_status_get_lv_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl); + int (*postHookFunc) (int retVal___, const struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_lv_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_lv_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -72862,11 +73081,11 @@ defType HP_status_get_def(struct block_list *bl) { int hIndex = 0; defType retVal___ = 0; if( HPMHooks.count.HP_status_get_def_pre ) { - defType (*preHookFunc) (struct block_list *bl); + defType (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_def_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_def_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72889,11 +73108,11 @@ unsigned short HP_status_get_speed(struct block_list *bl) { int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_get_speed_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl); + unsigned short (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_speed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_speed_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72916,11 +73135,11 @@ unsigned char HP_status_calc_attack_element(struct block_list *bl, struct status int hIndex = 0; unsigned char retVal___ = 0; if( HPMHooks.count.HP_status_calc_attack_element_pre ) { - unsigned char (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *element); + unsigned char (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *element); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_attack_element_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_attack_element_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &element); + retVal___ = preHookFunc(&bl, &sc, &element); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72931,23 +73150,23 @@ unsigned char HP_status_calc_attack_element(struct block_list *bl, struct status retVal___ = HPMHooks.source.status.calc_attack_element(bl, sc, element); } if( HPMHooks.count.HP_status_calc_attack_element_post ) { - unsigned char (*postHookFunc) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int *element); + unsigned char (*postHookFunc) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int element); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_attack_element_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_attack_element_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &element); + retVal___ = postHookFunc(retVal___, bl, sc, element); } } return retVal___; } -int HP_status_get_party_id(struct block_list *bl) { +int HP_status_get_party_id(const struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_party_id_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_party_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_party_id_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72958,7 +73177,7 @@ int HP_status_get_party_id(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_party_id(bl); } if( HPMHooks.count.HP_status_get_party_id_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl); + int (*postHookFunc) (int retVal___, const struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_party_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_party_id_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -72966,15 +73185,15 @@ int HP_status_get_party_id(struct block_list *bl) { } return retVal___; } -int HP_status_get_guild_id(struct block_list *bl) { +int HP_status_get_guild_id(const struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_guild_id_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_guild_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_guild_id_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -72985,7 +73204,7 @@ int HP_status_get_guild_id(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_guild_id(bl); } if( HPMHooks.count.HP_status_get_guild_id_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl); + int (*postHookFunc) (int retVal___, const struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_guild_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_guild_id_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -72993,15 +73212,15 @@ int HP_status_get_guild_id(struct block_list *bl) { } return retVal___; } -int HP_status_get_emblem_id(struct block_list *bl) { +int HP_status_get_emblem_id(const struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_emblem_id_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_emblem_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_emblem_id_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73012,7 +73231,7 @@ int HP_status_get_emblem_id(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_emblem_id(bl); } if( HPMHooks.count.HP_status_get_emblem_id_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl); + int (*postHookFunc) (int retVal___, const struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_emblem_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_emblem_id_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -73020,15 +73239,15 @@ int HP_status_get_emblem_id(struct block_list *bl) { } return retVal___; } -int HP_status_get_mexp(struct block_list *bl) { +int HP_status_get_mexp(const struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_mexp_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_mexp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_mexp_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73039,7 +73258,7 @@ int HP_status_get_mexp(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_mexp(bl); } if( HPMHooks.count.HP_status_get_mexp_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl); + int (*postHookFunc) (int retVal___, const struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_mexp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_mexp_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -73047,15 +73266,15 @@ int HP_status_get_mexp(struct block_list *bl) { } return retVal___; } -int HP_status_get_race2(struct block_list *bl) { +int HP_status_get_race2(const struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_race2_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_race2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_race2_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73066,7 +73285,7 @@ int HP_status_get_race2(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_race2(bl); } if( HPMHooks.count.HP_status_get_race2_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl); + int (*postHookFunc) (int retVal___, const struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_race2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_race2_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -73078,11 +73297,11 @@ struct view_data* HP_status_get_viewdata(struct block_list *bl) { int hIndex = 0; struct view_data* retVal___ = NULL; if( HPMHooks.count.HP_status_get_viewdata_pre ) { - struct view_data* (*preHookFunc) (struct block_list *bl); + struct view_data* (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_viewdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_viewdata_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73104,11 +73323,11 @@ struct view_data* HP_status_get_viewdata(struct block_list *bl) { void HP_status_set_viewdata(struct block_list *bl, int class_) { int hIndex = 0; if( HPMHooks.count.HP_status_set_viewdata_pre ) { - void (*preHookFunc) (struct block_list *bl, int *class_); + void (*preHookFunc) (struct block_list **bl, int *class_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_set_viewdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_set_viewdata_pre[hIndex].func; - preHookFunc(bl, &class_); + preHookFunc(&bl, &class_); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73119,10 +73338,10 @@ void HP_status_set_viewdata(struct block_list *bl, int class_) { HPMHooks.source.status.set_viewdata(bl, class_); } if( HPMHooks.count.HP_status_set_viewdata_post ) { - void (*postHookFunc) (struct block_list *bl, int *class_); + void (*postHookFunc) (struct block_list *bl, int class_); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_set_viewdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_set_viewdata_post[hIndex].func; - postHookFunc(bl, &class_); + postHookFunc(bl, class_); } } return; @@ -73130,11 +73349,11 @@ void HP_status_set_viewdata(struct block_list *bl, int class_) { void HP_status_change_init(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_status_change_init_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_change_init_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73157,11 +73376,11 @@ struct status_change* HP_status_get_sc(struct block_list *bl) { int hIndex = 0; struct status_change* retVal___ = NULL; if( HPMHooks.count.HP_status_get_sc_pre ) { - struct status_change* (*preHookFunc) (struct block_list *bl); + struct status_change* (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_sc_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73184,11 +73403,11 @@ int HP_status_isdead(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_isdead_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_isdead_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_isdead_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73211,11 +73430,11 @@ int HP_status_isimmune(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_isimmune_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_isimmune_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_isimmune_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73238,11 +73457,11 @@ int HP_status_get_sc_def(struct block_list *src, struct block_list *bl, enum sc_ int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_sc_def_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *bl, enum sc_type *type, int *rate, int *tick, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *rate, int *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_def_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_sc_def_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &type, &rate, &tick, &flag); + retVal___ = preHookFunc(&src, &bl, &type, &rate, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73253,10 +73472,10 @@ int HP_status_get_sc_def(struct block_list *src, struct block_list *bl, enum sc_ retVal___ = HPMHooks.source.status.get_sc_def(src, bl, type, rate, tick, flag); } if( HPMHooks.count.HP_status_get_sc_def_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type *type, int *rate, int *tick, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_def_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_sc_def_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &type, &rate, &tick, &flag); + retVal___ = postHookFunc(retVal___, src, bl, type, rate, tick, flag); } } return retVal___; @@ -73265,11 +73484,11 @@ int HP_status_change_start(struct block_list *src, struct block_list *bl, enum s int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_change_start_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_change_start_pre[hIndex].func; - retVal___ = preHookFunc(src, bl, &type, &rate, &val1, &val2, &val3, &val4, &tick, &flag); + retVal___ = preHookFunc(&src, &bl, &type, &rate, &val1, &val2, &val3, &val4, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73280,10 +73499,10 @@ int HP_status_change_start(struct block_list *src, struct block_list *bl, enum s retVal___ = HPMHooks.source.status.change_start(src, bl, type, rate, val1, val2, val3, val4, tick, flag); } if( HPMHooks.count.HP_status_change_start_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_change_start_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, bl, &type, &rate, &val1, &val2, &val3, &val4, &tick, &flag); + retVal___ = postHookFunc(retVal___, src, bl, type, rate, val1, val2, val3, val4, tick, flag); } } return retVal___; @@ -73292,11 +73511,11 @@ int HP_status_change_end_(struct block_list *bl, enum sc_type type, int tid, con int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_change_end__pre ) { - int (*preHookFunc) (struct block_list *bl, enum sc_type *type, int *tid, const char *file, int *line); + int (*preHookFunc) (struct block_list **bl, enum sc_type *type, int *tid, const char **file, int *line); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_end__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_change_end__pre[hIndex].func; - retVal___ = preHookFunc(bl, &type, &tid, file, &line); + retVal___ = preHookFunc(&bl, &type, &tid, &file, &line); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73307,10 +73526,10 @@ int HP_status_change_end_(struct block_list *bl, enum sc_type type, int tid, con retVal___ = HPMHooks.source.status.change_end_(bl, type, tid, file, line); } if( HPMHooks.count.HP_status_change_end__post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, enum sc_type *type, int *tid, const char *file, int *line); + int (*postHookFunc) (int retVal___, struct block_list *bl, enum sc_type type, int tid, const char *file, int line); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_end__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_change_end__post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &type, &tid, file, &line); + retVal___ = postHookFunc(retVal___, bl, type, tid, file, line); } } return retVal___; @@ -73334,10 +73553,10 @@ int HP_status_kaahi_heal_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.status.kaahi_heal_timer(tid, tick, id, data); } if( HPMHooks.count.HP_status_kaahi_heal_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_kaahi_heal_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_kaahi_heal_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -73361,10 +73580,10 @@ int HP_status_change_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.status.change_timer(tid, tick, id, data); } if( HPMHooks.count.HP_status_change_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_change_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -73373,12 +73592,12 @@ int HP_status_change_timer_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_change_timer_sub_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); + int (*preHookFunc) (struct block_list **bl, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_timer_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_status_change_timer_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); + retVal___ = preHookFunc(&bl, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -73406,11 +73625,11 @@ int HP_status_change_clear(struct block_list *bl, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_change_clear_pre ) { - int (*preHookFunc) (struct block_list *bl, int *type); + int (*preHookFunc) (struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_clear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_change_clear_pre[hIndex].func; - retVal___ = preHookFunc(bl, &type); + retVal___ = preHookFunc(&bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73421,10 +73640,10 @@ int HP_status_change_clear(struct block_list *bl, int type) { retVal___ = HPMHooks.source.status.change_clear(bl, type); } if( HPMHooks.count.HP_status_change_clear_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *type); + int (*postHookFunc) (int retVal___, struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_clear_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_change_clear_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &type); + retVal___ = postHookFunc(retVal___, bl, type); } } return retVal___; @@ -73433,11 +73652,11 @@ int HP_status_change_clear_buffs(struct block_list *bl, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_change_clear_buffs_pre ) { - int (*preHookFunc) (struct block_list *bl, int *type); + int (*preHookFunc) (struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_clear_buffs_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_change_clear_buffs_pre[hIndex].func; - retVal___ = preHookFunc(bl, &type); + retVal___ = preHookFunc(&bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73448,10 +73667,10 @@ int HP_status_change_clear_buffs(struct block_list *bl, int type) { retVal___ = HPMHooks.source.status.change_clear_buffs(bl, type); } if( HPMHooks.count.HP_status_change_clear_buffs_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *type); + int (*postHookFunc) (int retVal___, struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_clear_buffs_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_change_clear_buffs_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &type); + retVal___ = postHookFunc(retVal___, bl, type); } } return retVal___; @@ -73459,11 +73678,11 @@ int HP_status_change_clear_buffs(struct block_list *bl, int type) { void HP_status_calc_bl_(struct block_list *bl, enum scb_flag flag, enum e_status_calc_opt opt) { int hIndex = 0; if( HPMHooks.count.HP_status_calc_bl__pre ) { - void (*preHookFunc) (struct block_list *bl, enum scb_flag *flag, enum e_status_calc_opt *opt); + void (*preHookFunc) (struct block_list **bl, enum scb_flag *flag, enum e_status_calc_opt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_bl__pre[hIndex].func; - preHookFunc(bl, &flag, &opt); + preHookFunc(&bl, &flag, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73474,10 +73693,10 @@ void HP_status_calc_bl_(struct block_list *bl, enum scb_flag flag, enum e_status HPMHooks.source.status.calc_bl_(bl, flag, opt); } if( HPMHooks.count.HP_status_calc_bl__post ) { - void (*postHookFunc) (struct block_list *bl, enum scb_flag *flag, enum e_status_calc_opt *opt); + void (*postHookFunc) (struct block_list *bl, enum scb_flag flag, enum e_status_calc_opt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_bl__post[hIndex].func; - postHookFunc(bl, &flag, &opt); + postHookFunc(bl, flag, opt); } } return; @@ -73486,11 +73705,11 @@ int HP_status_calc_mob_(struct mob_data *md, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_mob__pre ) { - int (*preHookFunc) (struct mob_data *md, enum e_status_calc_opt *opt); + int (*preHookFunc) (struct mob_data **md, enum e_status_calc_opt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mob__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_mob__pre[hIndex].func; - retVal___ = preHookFunc(md, &opt); + retVal___ = preHookFunc(&md, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73501,10 +73720,10 @@ int HP_status_calc_mob_(struct mob_data *md, enum e_status_calc_opt opt) { retVal___ = HPMHooks.source.status.calc_mob_(md, opt); } if( HPMHooks.count.HP_status_calc_mob__post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, enum e_status_calc_opt *opt); + int (*postHookFunc) (int retVal___, struct mob_data *md, enum e_status_calc_opt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mob__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_mob__post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &opt); + retVal___ = postHookFunc(retVal___, md, opt); } } return retVal___; @@ -73513,11 +73732,11 @@ int HP_status_calc_pet_(struct pet_data *pd, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_pet__pre ) { - int (*preHookFunc) (struct pet_data *pd, enum e_status_calc_opt *opt); + int (*preHookFunc) (struct pet_data **pd, enum e_status_calc_opt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pet__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_pet__pre[hIndex].func; - retVal___ = preHookFunc(pd, &opt); + retVal___ = preHookFunc(&pd, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73528,10 +73747,10 @@ int HP_status_calc_pet_(struct pet_data *pd, enum e_status_calc_opt opt) { retVal___ = HPMHooks.source.status.calc_pet_(pd, opt); } if( HPMHooks.count.HP_status_calc_pet__post ) { - int (*postHookFunc) (int retVal___, struct pet_data *pd, enum e_status_calc_opt *opt); + int (*postHookFunc) (int retVal___, struct pet_data *pd, enum e_status_calc_opt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pet__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_pet__post[hIndex].func; - retVal___ = postHookFunc(retVal___, pd, &opt); + retVal___ = postHookFunc(retVal___, pd, opt); } } return retVal___; @@ -73540,11 +73759,11 @@ int HP_status_calc_pc_(struct map_session_data *sd, enum e_status_calc_opt opt) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_pc__pre ) { - int (*preHookFunc) (struct map_session_data *sd, enum e_status_calc_opt *opt); + int (*preHookFunc) (struct map_session_data **sd, enum e_status_calc_opt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pc__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_pc__pre[hIndex].func; - retVal___ = preHookFunc(sd, &opt); + retVal___ = preHookFunc(&sd, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73555,10 +73774,10 @@ int HP_status_calc_pc_(struct map_session_data *sd, enum e_status_calc_opt opt) retVal___ = HPMHooks.source.status.calc_pc_(sd, opt); } if( HPMHooks.count.HP_status_calc_pc__post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum e_status_calc_opt *opt); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum e_status_calc_opt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pc__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_pc__post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &opt); + retVal___ = postHookFunc(retVal___, sd, opt); } } return retVal___; @@ -73566,11 +73785,11 @@ int HP_status_calc_pc_(struct map_session_data *sd, enum e_status_calc_opt opt) void HP_status_calc_pc_additional(struct map_session_data *sd, enum e_status_calc_opt opt) { int hIndex = 0; if( HPMHooks.count.HP_status_calc_pc_additional_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum e_status_calc_opt *opt); + void (*preHookFunc) (struct map_session_data **sd, enum e_status_calc_opt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pc_additional_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_pc_additional_pre[hIndex].func; - preHookFunc(sd, &opt); + preHookFunc(&sd, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73581,10 +73800,10 @@ void HP_status_calc_pc_additional(struct map_session_data *sd, enum e_status_cal HPMHooks.source.status.calc_pc_additional(sd, opt); } if( HPMHooks.count.HP_status_calc_pc_additional_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum e_status_calc_opt *opt); + void (*postHookFunc) (struct map_session_data *sd, enum e_status_calc_opt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pc_additional_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_pc_additional_post[hIndex].func; - postHookFunc(sd, &opt); + postHookFunc(sd, opt); } } return; @@ -73593,11 +73812,11 @@ int HP_status_calc_homunculus_(struct homun_data *hd, enum e_status_calc_opt opt int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_homunculus__pre ) { - int (*preHookFunc) (struct homun_data *hd, enum e_status_calc_opt *opt); + int (*preHookFunc) (struct homun_data **hd, enum e_status_calc_opt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_homunculus__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_homunculus__pre[hIndex].func; - retVal___ = preHookFunc(hd, &opt); + retVal___ = preHookFunc(&hd, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73608,10 +73827,10 @@ int HP_status_calc_homunculus_(struct homun_data *hd, enum e_status_calc_opt opt retVal___ = HPMHooks.source.status.calc_homunculus_(hd, opt); } if( HPMHooks.count.HP_status_calc_homunculus__post ) { - int (*postHookFunc) (int retVal___, struct homun_data *hd, enum e_status_calc_opt *opt); + int (*postHookFunc) (int retVal___, struct homun_data *hd, enum e_status_calc_opt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_homunculus__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_homunculus__post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &opt); + retVal___ = postHookFunc(retVal___, hd, opt); } } return retVal___; @@ -73620,11 +73839,11 @@ int HP_status_calc_mercenary_(struct mercenary_data *md, enum e_status_calc_opt int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_mercenary__pre ) { - int (*preHookFunc) (struct mercenary_data *md, enum e_status_calc_opt *opt); + int (*preHookFunc) (struct mercenary_data **md, enum e_status_calc_opt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mercenary__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_mercenary__pre[hIndex].func; - retVal___ = preHookFunc(md, &opt); + retVal___ = preHookFunc(&md, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73635,10 +73854,10 @@ int HP_status_calc_mercenary_(struct mercenary_data *md, enum e_status_calc_opt retVal___ = HPMHooks.source.status.calc_mercenary_(md, opt); } if( HPMHooks.count.HP_status_calc_mercenary__post ) { - int (*postHookFunc) (int retVal___, struct mercenary_data *md, enum e_status_calc_opt *opt); + int (*postHookFunc) (int retVal___, struct mercenary_data *md, enum e_status_calc_opt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mercenary__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_mercenary__post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &opt); + retVal___ = postHookFunc(retVal___, md, opt); } } return retVal___; @@ -73647,11 +73866,11 @@ int HP_status_calc_elemental_(struct elemental_data *ed, enum e_status_calc_opt int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_elemental__pre ) { - int (*preHookFunc) (struct elemental_data *ed, enum e_status_calc_opt *opt); + int (*preHookFunc) (struct elemental_data **ed, enum e_status_calc_opt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_elemental__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_elemental__pre[hIndex].func; - retVal___ = preHookFunc(ed, &opt); + retVal___ = preHookFunc(&ed, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73662,10 +73881,10 @@ int HP_status_calc_elemental_(struct elemental_data *ed, enum e_status_calc_opt retVal___ = HPMHooks.source.status.calc_elemental_(ed, opt); } if( HPMHooks.count.HP_status_calc_elemental__post ) { - int (*postHookFunc) (int retVal___, struct elemental_data *ed, enum e_status_calc_opt *opt); + int (*postHookFunc) (int retVal___, struct elemental_data *ed, enum e_status_calc_opt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_elemental__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_elemental__post[hIndex].func; - retVal___ = postHookFunc(retVal___, ed, &opt); + retVal___ = postHookFunc(retVal___, ed, opt); } } return retVal___; @@ -73673,11 +73892,11 @@ int HP_status_calc_elemental_(struct elemental_data *ed, enum e_status_calc_opt void HP_status_calc_misc(struct block_list *bl, struct status_data *st, int level) { int hIndex = 0; if( HPMHooks.count.HP_status_calc_misc_pre ) { - void (*preHookFunc) (struct block_list *bl, struct status_data *st, int *level); + void (*preHookFunc) (struct block_list **bl, struct status_data **st, int *level); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_misc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_misc_pre[hIndex].func; - preHookFunc(bl, st, &level); + preHookFunc(&bl, &st, &level); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73688,10 +73907,10 @@ void HP_status_calc_misc(struct block_list *bl, struct status_data *st, int leve HPMHooks.source.status.calc_misc(bl, st, level); } if( HPMHooks.count.HP_status_calc_misc_post ) { - void (*postHookFunc) (struct block_list *bl, struct status_data *st, int *level); + void (*postHookFunc) (struct block_list *bl, struct status_data *st, int level); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_misc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_misc_post[hIndex].func; - postHookFunc(bl, st, &level); + postHookFunc(bl, st, level); } } return; @@ -73699,11 +73918,11 @@ void HP_status_calc_misc(struct block_list *bl, struct status_data *st, int leve void HP_status_calc_regen(struct block_list *bl, struct status_data *st, struct regen_data *regen) { int hIndex = 0; if( HPMHooks.count.HP_status_calc_regen_pre ) { - void (*preHookFunc) (struct block_list *bl, struct status_data *st, struct regen_data *regen); + void (*preHookFunc) (struct block_list **bl, struct status_data **st, struct regen_data **regen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_regen_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_regen_pre[hIndex].func; - preHookFunc(bl, st, regen); + preHookFunc(&bl, &st, ®en); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73725,11 +73944,11 @@ void HP_status_calc_regen(struct block_list *bl, struct status_data *st, struct void HP_status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, struct status_change *sc) { int hIndex = 0; if( HPMHooks.count.HP_status_calc_regen_rate_pre ) { - void (*preHookFunc) (struct block_list *bl, struct regen_data *regen, struct status_change *sc); + void (*preHookFunc) (struct block_list **bl, struct regen_data **regen, struct status_change **sc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_regen_rate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_regen_rate_pre[hIndex].func; - preHookFunc(bl, regen, sc); + preHookFunc(&bl, ®en, &sc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73752,11 +73971,11 @@ int HP_status_check_skilluse(struct block_list *src, struct block_list *target, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_check_skilluse_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, uint16 *skill_id, int *flag); + int (*preHookFunc) (struct block_list **src, struct block_list **target, uint16 *skill_id, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_check_skilluse_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_check_skilluse_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &skill_id, &flag); + retVal___ = preHookFunc(&src, &target, &skill_id, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73767,10 +73986,10 @@ int HP_status_check_skilluse(struct block_list *src, struct block_list *target, retVal___ = HPMHooks.source.status.check_skilluse(src, target, skill_id, flag); } if( HPMHooks.count.HP_status_check_skilluse_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, uint16 *skill_id, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, uint16 skill_id, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_check_skilluse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_check_skilluse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &skill_id, &flag); + retVal___ = postHookFunc(retVal___, src, target, skill_id, flag); } } return retVal___; @@ -73779,11 +73998,11 @@ int HP_status_check_visibility(struct block_list *src, struct block_list *target int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_check_visibility_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target); + int (*preHookFunc) (struct block_list **src, struct block_list **target); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_check_visibility_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_check_visibility_pre[hIndex].func; - retVal___ = preHookFunc(src, target); + retVal___ = preHookFunc(&src, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73806,11 +74025,11 @@ int HP_status_change_spread(struct block_list *src, struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_change_spread_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *bl); + int (*preHookFunc) (struct block_list **src, struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_spread_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_change_spread_pre[hIndex].func; - retVal___ = preHookFunc(src, bl); + retVal___ = preHookFunc(&src, &bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73833,11 +74052,11 @@ defType HP_status_calc_def(struct block_list *bl, struct status_change *sc, int int hIndex = 0; defType retVal___ = 0; if( HPMHooks.count.HP_status_calc_def_pre ) { - defType (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *def, bool *viewable); + defType (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *def, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_def_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_def_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &def, &viewable); + retVal___ = preHookFunc(&bl, &sc, &def, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73848,10 +74067,10 @@ defType HP_status_calc_def(struct block_list *bl, struct status_change *sc, int retVal___ = HPMHooks.source.status.calc_def(bl, sc, def, viewable); } if( HPMHooks.count.HP_status_calc_def_post ) { - defType (*postHookFunc) (defType retVal___, struct block_list *bl, struct status_change *sc, int *def, bool *viewable); + defType (*postHookFunc) (defType retVal___, struct block_list *bl, struct status_change *sc, int def, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_def_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_def_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &def, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, def, viewable); } } return retVal___; @@ -73860,11 +74079,11 @@ short HP_status_calc_def2(struct block_list *bl, struct status_change *sc, int d int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_status_calc_def2_pre ) { - short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *def2, bool *viewable); + short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *def2, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_def2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_def2_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &def2, &viewable); + retVal___ = preHookFunc(&bl, &sc, &def2, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73875,10 +74094,10 @@ short HP_status_calc_def2(struct block_list *bl, struct status_change *sc, int d retVal___ = HPMHooks.source.status.calc_def2(bl, sc, def2, viewable); } if( HPMHooks.count.HP_status_calc_def2_post ) { - short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, int *def2, bool *viewable); + short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, int def2, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_def2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_def2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &def2, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, def2, viewable); } } return retVal___; @@ -73887,11 +74106,11 @@ defType HP_status_calc_mdef(struct block_list *bl, struct status_change *sc, int int hIndex = 0; defType retVal___ = 0; if( HPMHooks.count.HP_status_calc_mdef_pre ) { - defType (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *mdef, bool *viewable); + defType (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *mdef, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mdef_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_mdef_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &mdef, &viewable); + retVal___ = preHookFunc(&bl, &sc, &mdef, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73902,10 +74121,10 @@ defType HP_status_calc_mdef(struct block_list *bl, struct status_change *sc, int retVal___ = HPMHooks.source.status.calc_mdef(bl, sc, mdef, viewable); } if( HPMHooks.count.HP_status_calc_mdef_post ) { - defType (*postHookFunc) (defType retVal___, struct block_list *bl, struct status_change *sc, int *mdef, bool *viewable); + defType (*postHookFunc) (defType retVal___, struct block_list *bl, struct status_change *sc, int mdef, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mdef_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_mdef_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &mdef, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, mdef, viewable); } } return retVal___; @@ -73914,11 +74133,11 @@ short HP_status_calc_mdef2(struct block_list *bl, struct status_change *sc, int int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_status_calc_mdef2_pre ) { - short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *mdef2, bool *viewable); + short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *mdef2, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mdef2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_mdef2_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &mdef2, &viewable); + retVal___ = preHookFunc(&bl, &sc, &mdef2, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73929,10 +74148,10 @@ short HP_status_calc_mdef2(struct block_list *bl, struct status_change *sc, int retVal___ = HPMHooks.source.status.calc_mdef2(bl, sc, mdef2, viewable); } if( HPMHooks.count.HP_status_calc_mdef2_post ) { - short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, int *mdef2, bool *viewable); + short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, int mdef2, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mdef2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_mdef2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &mdef2, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, mdef2, viewable); } } return retVal___; @@ -73941,11 +74160,11 @@ unsigned short HP_status_calc_batk(struct block_list *bl, struct status_change * int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_batk_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *batk, bool *viewable); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *batk, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_batk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_batk_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &batk, &viewable); + retVal___ = preHookFunc(&bl, &sc, &batk, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73956,10 +74175,10 @@ unsigned short HP_status_calc_batk(struct block_list *bl, struct status_change * retVal___ = HPMHooks.source.status.calc_batk(bl, sc, batk, viewable); } if( HPMHooks.count.HP_status_calc_batk_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *batk, bool *viewable); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int batk, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_batk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_batk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &batk, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, batk, viewable); } } return retVal___; @@ -73968,11 +74187,11 @@ unsigned short HP_status_base_matk(struct block_list *bl, const struct status_da int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_base_matk_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, const struct status_data *st, int *level); + unsigned short (*preHookFunc) (struct block_list **bl, const struct status_data **st, int *level); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_base_matk_pre[hIndex].func; - retVal___ = preHookFunc(bl, st, &level); + retVal___ = preHookFunc(&bl, &st, &level); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -73983,10 +74202,10 @@ unsigned short HP_status_base_matk(struct block_list *bl, const struct status_da retVal___ = HPMHooks.source.status.base_matk(bl, st, level); } if( HPMHooks.count.HP_status_base_matk_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, const struct status_data *st, int *level); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, const struct status_data *st, int level); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_base_matk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, st, &level); + retVal___ = postHookFunc(retVal___, bl, st, level); } } return retVal___; @@ -73995,11 +74214,11 @@ int HP_status_get_weapon_atk(struct block_list *src, struct weapon_atk *watk, in int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_weapon_atk_pre ) { - int (*preHookFunc) (struct block_list *src, struct weapon_atk *watk, int *flag); + int (*preHookFunc) (struct block_list **src, struct weapon_atk **watk, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_weapon_atk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_weapon_atk_pre[hIndex].func; - retVal___ = preHookFunc(src, watk, &flag); + retVal___ = preHookFunc(&src, &watk, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74010,10 +74229,10 @@ int HP_status_get_weapon_atk(struct block_list *src, struct weapon_atk *watk, in retVal___ = HPMHooks.source.status.get_weapon_atk(src, watk, flag); } if( HPMHooks.count.HP_status_get_weapon_atk_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct weapon_atk *watk, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct weapon_atk *watk, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_weapon_atk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_weapon_atk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, watk, &flag); + retVal___ = postHookFunc(retVal___, src, watk, flag); } } return retVal___; @@ -74022,11 +74241,11 @@ int HP_status_get_total_mdef(struct block_list *src) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_total_mdef_pre ) { - int (*preHookFunc) (struct block_list *src); + int (*preHookFunc) (struct block_list **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_total_mdef_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_total_mdef_pre[hIndex].func; - retVal___ = preHookFunc(src); + retVal___ = preHookFunc(&src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74049,11 +74268,11 @@ int HP_status_get_total_def(struct block_list *src) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_total_def_pre ) { - int (*preHookFunc) (struct block_list *src); + int (*preHookFunc) (struct block_list **src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_total_def_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_total_def_pre[hIndex].func; - retVal___ = preHookFunc(src); + retVal___ = preHookFunc(&src); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74076,11 +74295,11 @@ int HP_status_get_matk(struct block_list *src, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_matk_pre ) { - int (*preHookFunc) (struct block_list *src, int *flag); + int (*preHookFunc) (struct block_list **src, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_matk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_matk_pre[hIndex].func; - retVal___ = preHookFunc(src, &flag); + retVal___ = preHookFunc(&src, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74091,10 +74310,10 @@ int HP_status_get_matk(struct block_list *src, int flag) { retVal___ = HPMHooks.source.status.get_matk(src, flag); } if( HPMHooks.count.HP_status_get_matk_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_matk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_matk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &flag); + retVal___ = postHookFunc(retVal___, src, flag); } } return retVal___; @@ -74102,11 +74321,11 @@ int HP_status_get_matk(struct block_list *src, int flag) { void HP_status_update_matk(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_status_update_matk_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_update_matk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_update_matk_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74208,11 +74427,11 @@ int HP_status_base_amotion_pc(struct map_session_data *sd, struct status_data *s int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_base_amotion_pc_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct status_data *st); + int (*preHookFunc) (struct map_session_data **sd, struct status_data **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_base_amotion_pc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_base_amotion_pc_pre[hIndex].func; - retVal___ = preHookFunc(sd, st); + retVal___ = preHookFunc(&sd, &st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74235,11 +74454,11 @@ unsigned short HP_status_base_atk(const struct block_list *bl, const struct stat int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_base_atk_pre ) { - unsigned short (*preHookFunc) (const struct block_list *bl, const struct status_data *st); + unsigned short (*preHookFunc) (const struct block_list **bl, const struct status_data **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_base_atk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_base_atk_pre[hIndex].func; - retVal___ = preHookFunc(bl, st); + retVal___ = preHookFunc(&bl, &st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74258,15 +74477,15 @@ unsigned short HP_status_base_atk(const struct block_list *bl, const struct stat } return retVal___; } -unsigned int HP_status_get_base_maxhp(struct map_session_data *sd, struct status_data *st) { +unsigned int HP_status_get_base_maxhp(const struct map_session_data *sd, const struct status_data *st) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_status_get_base_maxhp_pre ) { - unsigned int (*preHookFunc) (struct map_session_data *sd, struct status_data *st); + unsigned int (*preHookFunc) (const struct map_session_data **sd, const struct status_data **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_base_maxhp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_base_maxhp_pre[hIndex].func; - retVal___ = preHookFunc(sd, st); + retVal___ = preHookFunc(&sd, &st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74277,7 +74496,7 @@ unsigned int HP_status_get_base_maxhp(struct map_session_data *sd, struct status retVal___ = HPMHooks.source.status.get_base_maxhp(sd, st); } if( HPMHooks.count.HP_status_get_base_maxhp_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, struct map_session_data *sd, struct status_data *st); + unsigned int (*postHookFunc) (unsigned int retVal___, const struct map_session_data *sd, const struct status_data *st); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_base_maxhp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_base_maxhp_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, st); @@ -74285,15 +74504,15 @@ unsigned int HP_status_get_base_maxhp(struct map_session_data *sd, struct status } return retVal___; } -unsigned int HP_status_get_base_maxsp(struct map_session_data *sd, struct status_data *st) { +unsigned int HP_status_get_base_maxsp(const struct map_session_data *sd, const struct status_data *st) { int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_status_get_base_maxsp_pre ) { - unsigned int (*preHookFunc) (struct map_session_data *sd, struct status_data *st); + unsigned int (*preHookFunc) (const struct map_session_data **sd, const struct status_data **st); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_base_maxsp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_base_maxsp_pre[hIndex].func; - retVal___ = preHookFunc(sd, st); + retVal___ = preHookFunc(&sd, &st); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74304,7 +74523,7 @@ unsigned int HP_status_get_base_maxsp(struct map_session_data *sd, struct status retVal___ = HPMHooks.source.status.get_base_maxsp(sd, st); } if( HPMHooks.count.HP_status_get_base_maxsp_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, struct map_session_data *sd, struct status_data *st); + unsigned int (*postHookFunc) (unsigned int retVal___, const struct map_session_data *sd, const struct status_data *st); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_base_maxsp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_base_maxsp_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, st); @@ -74316,11 +74535,11 @@ int HP_status_calc_npc_(struct npc_data *nd, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_npc__pre ) { - int (*preHookFunc) (struct npc_data *nd, enum e_status_calc_opt *opt); + int (*preHookFunc) (struct npc_data **nd, enum e_status_calc_opt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_npc__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_npc__pre[hIndex].func; - retVal___ = preHookFunc(nd, &opt); + retVal___ = preHookFunc(&nd, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74331,10 +74550,10 @@ int HP_status_calc_npc_(struct npc_data *nd, enum e_status_calc_opt opt) { retVal___ = HPMHooks.source.status.calc_npc_(nd, opt); } if( HPMHooks.count.HP_status_calc_npc__post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd, enum e_status_calc_opt *opt); + int (*postHookFunc) (int retVal___, struct npc_data *nd, enum e_status_calc_opt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_npc__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_npc__post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, &opt); + retVal___ = postHookFunc(retVal___, nd, opt); } } return retVal___; @@ -74343,11 +74562,11 @@ unsigned short HP_status_calc_str(struct block_list *bl, struct status_change *s int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_str_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *str); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_str_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &str); + retVal___ = preHookFunc(&bl, &sc, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74358,10 +74577,10 @@ unsigned short HP_status_calc_str(struct block_list *bl, struct status_change *s retVal___ = HPMHooks.source.status.calc_str(bl, sc, str); } if( HPMHooks.count.HP_status_calc_str_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *str); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int str); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &str); + retVal___ = postHookFunc(retVal___, bl, sc, str); } } return retVal___; @@ -74370,11 +74589,11 @@ unsigned short HP_status_calc_agi(struct block_list *bl, struct status_change *s int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_agi_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *agi); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *agi); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_agi_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_agi_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &agi); + retVal___ = preHookFunc(&bl, &sc, &agi); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74385,10 +74604,10 @@ unsigned short HP_status_calc_agi(struct block_list *bl, struct status_change *s retVal___ = HPMHooks.source.status.calc_agi(bl, sc, agi); } if( HPMHooks.count.HP_status_calc_agi_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *agi); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int agi); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_agi_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_agi_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &agi); + retVal___ = postHookFunc(retVal___, bl, sc, agi); } } return retVal___; @@ -74397,11 +74616,11 @@ unsigned short HP_status_calc_vit(struct block_list *bl, struct status_change *s int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_vit_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *vit); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *vit); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_vit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_vit_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &vit); + retVal___ = preHookFunc(&bl, &sc, &vit); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74412,10 +74631,10 @@ unsigned short HP_status_calc_vit(struct block_list *bl, struct status_change *s retVal___ = HPMHooks.source.status.calc_vit(bl, sc, vit); } if( HPMHooks.count.HP_status_calc_vit_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *vit); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int vit); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_vit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_vit_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &vit); + retVal___ = postHookFunc(retVal___, bl, sc, vit); } } return retVal___; @@ -74424,11 +74643,11 @@ unsigned short HP_status_calc_int(struct block_list *bl, struct status_change *s int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_int_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *int_); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *int_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_int_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &int_); + retVal___ = preHookFunc(&bl, &sc, &int_); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74439,10 +74658,10 @@ unsigned short HP_status_calc_int(struct block_list *bl, struct status_change *s retVal___ = HPMHooks.source.status.calc_int(bl, sc, int_); } if( HPMHooks.count.HP_status_calc_int_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *int_); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int int_); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_int_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &int_); + retVal___ = postHookFunc(retVal___, bl, sc, int_); } } return retVal___; @@ -74451,11 +74670,11 @@ unsigned short HP_status_calc_dex(struct block_list *bl, struct status_change *s int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_dex_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *dex); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *dex); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_dex_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_dex_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &dex); + retVal___ = preHookFunc(&bl, &sc, &dex); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74466,10 +74685,10 @@ unsigned short HP_status_calc_dex(struct block_list *bl, struct status_change *s retVal___ = HPMHooks.source.status.calc_dex(bl, sc, dex); } if( HPMHooks.count.HP_status_calc_dex_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *dex); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int dex); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_dex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_dex_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &dex); + retVal___ = postHookFunc(retVal___, bl, sc, dex); } } return retVal___; @@ -74478,11 +74697,11 @@ unsigned short HP_status_calc_luk(struct block_list *bl, struct status_change *s int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_luk_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *luk); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *luk); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_luk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_luk_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &luk); + retVal___ = preHookFunc(&bl, &sc, &luk); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74493,10 +74712,10 @@ unsigned short HP_status_calc_luk(struct block_list *bl, struct status_change *s retVal___ = HPMHooks.source.status.calc_luk(bl, sc, luk); } if( HPMHooks.count.HP_status_calc_luk_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *luk); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int luk); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_luk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_luk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &luk); + retVal___ = postHookFunc(retVal___, bl, sc, luk); } } return retVal___; @@ -74505,11 +74724,11 @@ unsigned short HP_status_calc_watk(struct block_list *bl, struct status_change * int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_watk_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *watk, bool *viewable); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *watk, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_watk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_watk_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &watk, &viewable); + retVal___ = preHookFunc(&bl, &sc, &watk, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74520,10 +74739,10 @@ unsigned short HP_status_calc_watk(struct block_list *bl, struct status_change * retVal___ = HPMHooks.source.status.calc_watk(bl, sc, watk, viewable); } if( HPMHooks.count.HP_status_calc_watk_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *watk, bool *viewable); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int watk, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_watk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_watk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &watk, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, watk, viewable); } } return retVal___; @@ -74532,11 +74751,11 @@ unsigned short HP_status_calc_matk(struct block_list *bl, struct status_change * int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_matk_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *matk, bool *viewable); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *matk, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_matk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_matk_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &matk, &viewable); + retVal___ = preHookFunc(&bl, &sc, &matk, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74547,10 +74766,10 @@ unsigned short HP_status_calc_matk(struct block_list *bl, struct status_change * retVal___ = HPMHooks.source.status.calc_matk(bl, sc, matk, viewable); } if( HPMHooks.count.HP_status_calc_matk_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *matk, bool *viewable); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int matk, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_matk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_matk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &matk, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, matk, viewable); } } return retVal___; @@ -74559,11 +74778,11 @@ signed short HP_status_calc_hit(struct block_list *bl, struct status_change *sc, int hIndex = 0; signed short retVal___ = 0; if( HPMHooks.count.HP_status_calc_hit_pre ) { - signed short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *hit, bool *viewable); + signed short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *hit, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_hit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_hit_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &hit, &viewable); + retVal___ = preHookFunc(&bl, &sc, &hit, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74574,10 +74793,10 @@ signed short HP_status_calc_hit(struct block_list *bl, struct status_change *sc, retVal___ = HPMHooks.source.status.calc_hit(bl, sc, hit, viewable); } if( HPMHooks.count.HP_status_calc_hit_post ) { - signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int *hit, bool *viewable); + signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int hit, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_hit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_hit_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &hit, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, hit, viewable); } } return retVal___; @@ -74586,11 +74805,11 @@ signed short HP_status_calc_critical(struct block_list *bl, struct status_change int hIndex = 0; signed short retVal___ = 0; if( HPMHooks.count.HP_status_calc_critical_pre ) { - signed short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *critical, bool *viewable); + signed short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *critical, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_critical_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_critical_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &critical, &viewable); + retVal___ = preHookFunc(&bl, &sc, &critical, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74601,10 +74820,10 @@ signed short HP_status_calc_critical(struct block_list *bl, struct status_change retVal___ = HPMHooks.source.status.calc_critical(bl, sc, critical, viewable); } if( HPMHooks.count.HP_status_calc_critical_post ) { - signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int *critical, bool *viewable); + signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int critical, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_critical_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_critical_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &critical, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, critical, viewable); } } return retVal___; @@ -74613,11 +74832,11 @@ signed short HP_status_calc_flee(struct block_list *bl, struct status_change *sc int hIndex = 0; signed short retVal___ = 0; if( HPMHooks.count.HP_status_calc_flee_pre ) { - signed short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *flee, bool *viewable); + signed short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *flee, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_flee_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_flee_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &flee, &viewable); + retVal___ = preHookFunc(&bl, &sc, &flee, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74628,10 +74847,10 @@ signed short HP_status_calc_flee(struct block_list *bl, struct status_change *sc retVal___ = HPMHooks.source.status.calc_flee(bl, sc, flee, viewable); } if( HPMHooks.count.HP_status_calc_flee_post ) { - signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int *flee, bool *viewable); + signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int flee, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_flee_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_flee_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &flee, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, flee, viewable); } } return retVal___; @@ -74640,11 +74859,11 @@ signed short HP_status_calc_flee2(struct block_list *bl, struct status_change *s int hIndex = 0; signed short retVal___ = 0; if( HPMHooks.count.HP_status_calc_flee2_pre ) { - signed short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *flee2, bool *viewable); + signed short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *flee2, bool *viewable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_flee2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_flee2_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &flee2, &viewable); + retVal___ = preHookFunc(&bl, &sc, &flee2, &viewable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74655,10 +74874,10 @@ signed short HP_status_calc_flee2(struct block_list *bl, struct status_change *s retVal___ = HPMHooks.source.status.calc_flee2(bl, sc, flee2, viewable); } if( HPMHooks.count.HP_status_calc_flee2_post ) { - signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int *flee2, bool *viewable); + signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int flee2, bool viewable); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_flee2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_flee2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &flee2, &viewable); + retVal___ = postHookFunc(retVal___, bl, sc, flee2, viewable); } } return retVal___; @@ -74667,11 +74886,11 @@ unsigned short HP_status_calc_speed(struct block_list *bl, struct status_change int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_speed_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *speed); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *speed); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_speed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_speed_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &speed); + retVal___ = preHookFunc(&bl, &sc, &speed); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74682,10 +74901,10 @@ unsigned short HP_status_calc_speed(struct block_list *bl, struct status_change retVal___ = HPMHooks.source.status.calc_speed(bl, sc, speed); } if( HPMHooks.count.HP_status_calc_speed_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *speed); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int speed); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_speed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_speed_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &speed); + retVal___ = postHookFunc(retVal___, bl, sc, speed); } } return retVal___; @@ -74694,11 +74913,11 @@ short HP_status_calc_aspd_rate(struct block_list *bl, struct status_change *sc, int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_status_calc_aspd_rate_pre ) { - short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *aspd_rate); + short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *aspd_rate); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_aspd_rate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_aspd_rate_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &aspd_rate); + retVal___ = preHookFunc(&bl, &sc, &aspd_rate); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74709,10 +74928,10 @@ short HP_status_calc_aspd_rate(struct block_list *bl, struct status_change *sc, retVal___ = HPMHooks.source.status.calc_aspd_rate(bl, sc, aspd_rate); } if( HPMHooks.count.HP_status_calc_aspd_rate_post ) { - short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, int *aspd_rate); + short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, int aspd_rate); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_aspd_rate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_aspd_rate_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &aspd_rate); + retVal___ = postHookFunc(retVal___, bl, sc, aspd_rate); } } return retVal___; @@ -74721,11 +74940,11 @@ unsigned short HP_status_calc_dmotion(struct block_list *bl, struct status_chang int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_dmotion_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *dmotion); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *dmotion); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_dmotion_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_dmotion_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &dmotion); + retVal___ = preHookFunc(&bl, &sc, &dmotion); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74736,10 +74955,10 @@ unsigned short HP_status_calc_dmotion(struct block_list *bl, struct status_chang retVal___ = HPMHooks.source.status.calc_dmotion(bl, sc, dmotion); } if( HPMHooks.count.HP_status_calc_dmotion_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *dmotion); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int dmotion); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_dmotion_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_dmotion_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &dmotion); + retVal___ = postHookFunc(retVal___, bl, sc, dmotion); } } return retVal___; @@ -74748,11 +74967,11 @@ short HP_status_calc_aspd(struct block_list *bl, struct status_change *sc, short int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_status_calc_aspd_pre ) { - short (*preHookFunc) (struct block_list *bl, struct status_change *sc, short *flag); + short (*preHookFunc) (struct block_list **bl, struct status_change **sc, short *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_aspd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_aspd_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &flag); + retVal___ = preHookFunc(&bl, &sc, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74763,10 +74982,10 @@ short HP_status_calc_aspd(struct block_list *bl, struct status_change *sc, short retVal___ = HPMHooks.source.status.calc_aspd(bl, sc, flag); } if( HPMHooks.count.HP_status_calc_aspd_post ) { - short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, short *flag); + short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, short flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_aspd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_aspd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &flag); + retVal___ = postHookFunc(retVal___, bl, sc, flag); } } return retVal___; @@ -74775,11 +74994,11 @@ short HP_status_calc_fix_aspd(struct block_list *bl, struct status_change *sc, i int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_status_calc_fix_aspd_pre ) { - short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *aspd); + short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *aspd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_fix_aspd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_fix_aspd_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &aspd); + retVal___ = preHookFunc(&bl, &sc, &aspd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74790,10 +75009,10 @@ short HP_status_calc_fix_aspd(struct block_list *bl, struct status_change *sc, i retVal___ = HPMHooks.source.status.calc_fix_aspd(bl, sc, aspd); } if( HPMHooks.count.HP_status_calc_fix_aspd_post ) { - short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, int *aspd); + short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, int aspd); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_fix_aspd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_fix_aspd_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &aspd); + retVal___ = postHookFunc(retVal___, bl, sc, aspd); } } return retVal___; @@ -74802,11 +75021,11 @@ unsigned int HP_status_calc_maxhp(struct block_list *bl, struct status_change *s int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_status_calc_maxhp_pre ) { - unsigned int (*preHookFunc) (struct block_list *bl, struct status_change *sc, uint64 *maxhp); + unsigned int (*preHookFunc) (struct block_list **bl, struct status_change **sc, uint64 *maxhp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_maxhp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_maxhp_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &maxhp); + retVal___ = preHookFunc(&bl, &sc, &maxhp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74817,10 +75036,10 @@ unsigned int HP_status_calc_maxhp(struct block_list *bl, struct status_change *s retVal___ = HPMHooks.source.status.calc_maxhp(bl, sc, maxhp); } if( HPMHooks.count.HP_status_calc_maxhp_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, struct block_list *bl, struct status_change *sc, uint64 *maxhp); + unsigned int (*postHookFunc) (unsigned int retVal___, struct block_list *bl, struct status_change *sc, uint64 maxhp); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_maxhp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_maxhp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &maxhp); + retVal___ = postHookFunc(retVal___, bl, sc, maxhp); } } return retVal___; @@ -74829,11 +75048,11 @@ unsigned int HP_status_calc_maxsp(struct block_list *bl, struct status_change *s int hIndex = 0; unsigned int retVal___ = 0; if( HPMHooks.count.HP_status_calc_maxsp_pre ) { - unsigned int (*preHookFunc) (struct block_list *bl, struct status_change *sc, unsigned int *maxsp); + unsigned int (*preHookFunc) (struct block_list **bl, struct status_change **sc, unsigned int *maxsp); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_maxsp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_maxsp_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &maxsp); + retVal___ = preHookFunc(&bl, &sc, &maxsp); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74844,10 +75063,10 @@ unsigned int HP_status_calc_maxsp(struct block_list *bl, struct status_change *s retVal___ = HPMHooks.source.status.calc_maxsp(bl, sc, maxsp); } if( HPMHooks.count.HP_status_calc_maxsp_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, struct block_list *bl, struct status_change *sc, unsigned int *maxsp); + unsigned int (*postHookFunc) (unsigned int retVal___, struct block_list *bl, struct status_change *sc, unsigned int maxsp); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_maxsp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_maxsp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &maxsp); + retVal___ = postHookFunc(retVal___, bl, sc, maxsp); } } return retVal___; @@ -74856,11 +75075,11 @@ unsigned char HP_status_calc_element(struct block_list *bl, struct status_change int hIndex = 0; unsigned char retVal___ = 0; if( HPMHooks.count.HP_status_calc_element_pre ) { - unsigned char (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *element); + unsigned char (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *element); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_element_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_element_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &element); + retVal___ = preHookFunc(&bl, &sc, &element); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74871,10 +75090,10 @@ unsigned char HP_status_calc_element(struct block_list *bl, struct status_change retVal___ = HPMHooks.source.status.calc_element(bl, sc, element); } if( HPMHooks.count.HP_status_calc_element_post ) { - unsigned char (*postHookFunc) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int *element); + unsigned char (*postHookFunc) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int element); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_element_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_element_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &element); + retVal___ = postHookFunc(retVal___, bl, sc, element); } } return retVal___; @@ -74883,11 +75102,11 @@ unsigned char HP_status_calc_element_lv(struct block_list *bl, struct status_cha int hIndex = 0; unsigned char retVal___ = 0; if( HPMHooks.count.HP_status_calc_element_lv_pre ) { - unsigned char (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *lv); + unsigned char (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_element_lv_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_element_lv_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &lv); + retVal___ = preHookFunc(&bl, &sc, &lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74898,10 +75117,10 @@ unsigned char HP_status_calc_element_lv(struct block_list *bl, struct status_cha retVal___ = HPMHooks.source.status.calc_element_lv(bl, sc, lv); } if( HPMHooks.count.HP_status_calc_element_lv_post ) { - unsigned char (*postHookFunc) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int *lv); + unsigned char (*postHookFunc) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_element_lv_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_element_lv_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &lv); + retVal___ = postHookFunc(retVal___, bl, sc, lv); } } return retVal___; @@ -74910,11 +75129,11 @@ uint32 HP_status_calc_mode(const struct block_list *bl, const struct status_chan int hIndex = 0; uint32 retVal___ = 0; if( HPMHooks.count.HP_status_calc_mode_pre ) { - uint32 (*preHookFunc) (const struct block_list *bl, const struct status_change *sc, uint32 *mode); + uint32 (*preHookFunc) (const struct block_list **bl, const struct status_change **sc, uint32 *mode); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mode_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_mode_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &mode); + retVal___ = preHookFunc(&bl, &sc, &mode); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74925,10 +75144,10 @@ uint32 HP_status_calc_mode(const struct block_list *bl, const struct status_chan retVal___ = HPMHooks.source.status.calc_mode(bl, sc, mode); } if( HPMHooks.count.HP_status_calc_mode_post ) { - uint32 (*postHookFunc) (uint32 retVal___, const struct block_list *bl, const struct status_change *sc, uint32 *mode); + uint32 (*postHookFunc) (uint32 retVal___, const struct block_list *bl, const struct status_change *sc, uint32 mode); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mode_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_mode_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &mode); + retVal___ = postHookFunc(retVal___, bl, sc, mode); } } return retVal___; @@ -74937,11 +75156,11 @@ unsigned short HP_status_calc_ematk(struct block_list *bl, struct status_change int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_calc_ematk_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *matk); + unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *matk); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_ematk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_ematk_pre[hIndex].func; - retVal___ = preHookFunc(bl, sc, &matk); + retVal___ = preHookFunc(&bl, &sc, &matk); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74952,10 +75171,10 @@ unsigned short HP_status_calc_ematk(struct block_list *bl, struct status_change retVal___ = HPMHooks.source.status.calc_ematk(bl, sc, matk); } if( HPMHooks.count.HP_status_calc_ematk_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *matk); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int matk); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_ematk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_ematk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sc, &matk); + retVal___ = postHookFunc(retVal___, bl, sc, matk); } } return retVal___; @@ -74963,11 +75182,11 @@ unsigned short HP_status_calc_ematk(struct block_list *bl, struct status_change void HP_status_calc_bl_main(struct block_list *bl, int flag) { int hIndex = 0; if( HPMHooks.count.HP_status_calc_bl_main_pre ) { - void (*preHookFunc) (struct block_list *bl, int *flag); + void (*preHookFunc) (struct block_list **bl, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl_main_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_bl_main_pre[hIndex].func; - preHookFunc(bl, &flag); + preHookFunc(&bl, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -74978,10 +75197,10 @@ void HP_status_calc_bl_main(struct block_list *bl, int flag) { HPMHooks.source.status.calc_bl_main(bl, flag); } if( HPMHooks.count.HP_status_calc_bl_main_post ) { - void (*postHookFunc) (struct block_list *bl, int *flag); + void (*postHookFunc) (struct block_list *bl, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl_main_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_bl_main_post[hIndex].func; - postHookFunc(bl, &flag); + postHookFunc(bl, flag); } } return; @@ -74989,11 +75208,11 @@ void HP_status_calc_bl_main(struct block_list *bl, int flag) { void HP_status_display_add(struct map_session_data *sd, enum sc_type type, int dval1, int dval2, int dval3) { int hIndex = 0; if( HPMHooks.count.HP_status_display_add_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum sc_type *type, int *dval1, int *dval2, int *dval3); + void (*preHookFunc) (struct map_session_data **sd, enum sc_type *type, int *dval1, int *dval2, int *dval3); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_display_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_display_add_pre[hIndex].func; - preHookFunc(sd, &type, &dval1, &dval2, &dval3); + preHookFunc(&sd, &type, &dval1, &dval2, &dval3); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75004,10 +75223,10 @@ void HP_status_display_add(struct map_session_data *sd, enum sc_type type, int d HPMHooks.source.status.display_add(sd, type, dval1, dval2, dval3); } if( HPMHooks.count.HP_status_display_add_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum sc_type *type, int *dval1, int *dval2, int *dval3); + void (*postHookFunc) (struct map_session_data *sd, enum sc_type type, int dval1, int dval2, int dval3); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_display_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_display_add_post[hIndex].func; - postHookFunc(sd, &type, &dval1, &dval2, &dval3); + postHookFunc(sd, type, dval1, dval2, dval3); } } return; @@ -75015,11 +75234,11 @@ void HP_status_display_add(struct map_session_data *sd, enum sc_type type, int d void HP_status_display_remove(struct map_session_data *sd, enum sc_type type) { int hIndex = 0; if( HPMHooks.count.HP_status_display_remove_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum sc_type *type); + void (*preHookFunc) (struct map_session_data **sd, enum sc_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_display_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_display_remove_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75030,10 +75249,10 @@ void HP_status_display_remove(struct map_session_data *sd, enum sc_type type) { HPMHooks.source.status.display_remove(sd, type); } if( HPMHooks.count.HP_status_display_remove_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum sc_type *type); + void (*postHookFunc) (struct map_session_data *sd, enum sc_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_display_remove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_display_remove_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -75042,12 +75261,12 @@ int HP_status_natural_heal(struct block_list *bl, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_natural_heal_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list args); + int (*preHookFunc) (struct block_list **bl, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_natural_heal_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_status_natural_heal_pre[hIndex].func; - retVal___ = preHookFunc(bl, args___copy); + retVal___ = preHookFunc(&bl, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -75090,10 +75309,10 @@ int HP_status_natural_heal_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.status.natural_heal_timer(tid, tick, id, data); } if( HPMHooks.count.HP_status_natural_heal_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_natural_heal_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_natural_heal_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -75102,11 +75321,11 @@ bool HP_status_readdb_job2(char *fields[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_status_readdb_job2_pre ) { - bool (*preHookFunc) (char *fields[], int *columns, int *current); + bool (*preHookFunc) (char **fields[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_job2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_readdb_job2_pre[hIndex].func; - retVal___ = preHookFunc(fields, &columns, ¤t); + retVal___ = preHookFunc(&fields, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75117,10 +75336,10 @@ bool HP_status_readdb_job2(char *fields[], int columns, int current) { retVal___ = HPMHooks.source.status.readdb_job2(fields, columns, current); } if( HPMHooks.count.HP_status_readdb_job2_post ) { - bool (*postHookFunc) (bool retVal___, char *fields[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *fields[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_job2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_readdb_job2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, fields, &columns, ¤t); + retVal___ = postHookFunc(retVal___, fields, columns, current); } } return retVal___; @@ -75129,11 +75348,11 @@ bool HP_status_readdb_sizefix(char *fields[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_status_readdb_sizefix_pre ) { - bool (*preHookFunc) (char *fields[], int *columns, int *current); + bool (*preHookFunc) (char **fields[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_sizefix_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_readdb_sizefix_pre[hIndex].func; - retVal___ = preHookFunc(fields, &columns, ¤t); + retVal___ = preHookFunc(&fields, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75144,10 +75363,10 @@ bool HP_status_readdb_sizefix(char *fields[], int columns, int current) { retVal___ = HPMHooks.source.status.readdb_sizefix(fields, columns, current); } if( HPMHooks.count.HP_status_readdb_sizefix_post ) { - bool (*postHookFunc) (bool retVal___, char *fields[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *fields[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_sizefix_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_readdb_sizefix_post[hIndex].func; - retVal___ = postHookFunc(retVal___, fields, &columns, ¤t); + retVal___ = postHookFunc(retVal___, fields, columns, current); } } return retVal___; @@ -75156,11 +75375,11 @@ int HP_status_readdb_refine_libconfig(const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_readdb_refine_libconfig_pre ) { - int (*preHookFunc) (const char *filename); + int (*preHookFunc) (const char **filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_pre[hIndex].func; - retVal___ = preHookFunc(filename); + retVal___ = preHookFunc(&filename); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75183,11 +75402,11 @@ int HP_status_readdb_refine_libconfig_sub(struct config_setting_t *r, const char int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre ) { - int (*preHookFunc) (struct config_setting_t *r, const char *name, const char *source); + int (*preHookFunc) (struct config_setting_t **r, const char **name, const char **source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_sub_pre[hIndex].func; - retVal___ = preHookFunc(r, name, source); + retVal___ = preHookFunc(&r, &name, &source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75210,11 +75429,11 @@ bool HP_status_readdb_scconfig(char *fields[], int columns, int current) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_status_readdb_scconfig_pre ) { - bool (*preHookFunc) (char *fields[], int *columns, int *current); + bool (*preHookFunc) (char **fields[], int *columns, int *current); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_scconfig_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_readdb_scconfig_pre[hIndex].func; - retVal___ = preHookFunc(fields, &columns, ¤t); + retVal___ = preHookFunc(&fields, &columns, ¤t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75225,10 +75444,10 @@ bool HP_status_readdb_scconfig(char *fields[], int columns, int current) { retVal___ = HPMHooks.source.status.readdb_scconfig(fields, columns, current); } if( HPMHooks.count.HP_status_readdb_scconfig_post ) { - bool (*postHookFunc) (bool retVal___, char *fields[], int *columns, int *current); + bool (*postHookFunc) (bool retVal___, char *fields[], int columns, int current); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_scconfig_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_readdb_scconfig_post[hIndex].func; - retVal___ = postHookFunc(retVal___, fields, &columns, ¤t); + retVal___ = postHookFunc(retVal___, fields, columns, current); } } return retVal___; @@ -75262,11 +75481,11 @@ void HP_status_read_job_db(void) { void HP_status_read_job_db_sub(int idx, const char *name, struct config_setting_t *jdb) { int hIndex = 0; if( HPMHooks.count.HP_status_read_job_db_sub_pre ) { - void (*preHookFunc) (int *idx, const char *name, struct config_setting_t *jdb); + void (*preHookFunc) (int *idx, const char **name, struct config_setting_t **jdb); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_read_job_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_read_job_db_sub_pre[hIndex].func; - preHookFunc(&idx, name, jdb); + preHookFunc(&idx, &name, &jdb); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75277,15 +75496,15 @@ void HP_status_read_job_db_sub(int idx, const char *name, struct config_setting_ HPMHooks.source.status.read_job_db_sub(idx, name, jdb); } if( HPMHooks.count.HP_status_read_job_db_sub_post ) { - void (*postHookFunc) (int *idx, const char *name, struct config_setting_t *jdb); + void (*postHookFunc) (int idx, const char *name, struct config_setting_t *jdb); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_read_job_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_read_job_db_sub_post[hIndex].func; - postHookFunc(&idx, name, jdb); + postHookFunc(idx, name, jdb); } } return; } -/* storage */ +/* storage_interface */ void HP_storage_reconnect(void) { int hIndex = 0; if( HPMHooks.count.HP_storage_reconnect_pre ) { @@ -75316,11 +75535,11 @@ int HP_storage_delitem(struct map_session_data *sd, int n, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_storage_delitem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *n, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_delitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_delitem_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, &amount); + retVal___ = preHookFunc(&sd, &n, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75331,10 +75550,10 @@ int HP_storage_delitem(struct map_session_data *sd, int n, int amount) { retVal___ = HPMHooks.source.storage.delitem(sd, n, amount); } if( HPMHooks.count.HP_storage_delitem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_delitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_storage_delitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, &amount); + retVal___ = postHookFunc(retVal___, sd, n, amount); } } return retVal___; @@ -75343,11 +75562,11 @@ int HP_storage_open(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_storage_open_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_open_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75370,11 +75589,11 @@ int HP_storage_add(struct map_session_data *sd, int index, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_storage_add_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_add_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index, &amount); + retVal___ = preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75385,10 +75604,10 @@ int HP_storage_add(struct map_session_data *sd, int index, int amount) { retVal___ = HPMHooks.source.storage.add(sd, index, amount); } if( HPMHooks.count.HP_storage_add_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *index, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_storage_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index, &amount); + retVal___ = postHookFunc(retVal___, sd, index, amount); } } return retVal___; @@ -75397,11 +75616,11 @@ int HP_storage_get(struct map_session_data *sd, int index, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_storage_get_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_get_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_get_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index, &amount); + retVal___ = preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75412,10 +75631,10 @@ int HP_storage_get(struct map_session_data *sd, int index, int amount) { retVal___ = HPMHooks.source.storage.get(sd, index, amount); } if( HPMHooks.count.HP_storage_get_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *index, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_get_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_storage_get_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index, &amount); + retVal___ = postHookFunc(retVal___, sd, index, amount); } } return retVal___; @@ -75424,11 +75643,11 @@ int HP_storage_additem(struct map_session_data *sd, struct item *item_data, int int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_storage_additem_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct item *item_data, int *amount); + int (*preHookFunc) (struct map_session_data **sd, struct item **item_data, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_additem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_additem_pre[hIndex].func; - retVal___ = preHookFunc(sd, item_data, &amount); + retVal___ = preHookFunc(&sd, &item_data, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75439,10 +75658,10 @@ int HP_storage_additem(struct map_session_data *sd, struct item *item_data, int retVal___ = HPMHooks.source.storage.additem(sd, item_data, amount); } if( HPMHooks.count.HP_storage_additem_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct item *item_data, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct item *item_data, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_additem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_storage_additem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, item_data, &amount); + retVal___ = postHookFunc(retVal___, sd, item_data, amount); } } return retVal___; @@ -75451,11 +75670,11 @@ int HP_storage_addfromcart(struct map_session_data *sd, int index, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_storage_addfromcart_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_addfromcart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_addfromcart_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index, &amount); + retVal___ = preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75466,10 +75685,10 @@ int HP_storage_addfromcart(struct map_session_data *sd, int index, int amount) { retVal___ = HPMHooks.source.storage.addfromcart(sd, index, amount); } if( HPMHooks.count.HP_storage_addfromcart_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *index, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_addfromcart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_storage_addfromcart_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index, &amount); + retVal___ = postHookFunc(retVal___, sd, index, amount); } } return retVal___; @@ -75478,11 +75697,11 @@ int HP_storage_gettocart(struct map_session_data *sd, int index, int amount) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_storage_gettocart_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_gettocart_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_gettocart_pre[hIndex].func; - retVal___ = preHookFunc(sd, &index, &amount); + retVal___ = preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75493,10 +75712,10 @@ int HP_storage_gettocart(struct map_session_data *sd, int index, int amount) { retVal___ = HPMHooks.source.storage.gettocart(sd, index, amount); } if( HPMHooks.count.HP_storage_gettocart_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *index, int *amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_gettocart_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_storage_gettocart_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &index, &amount); + retVal___ = postHookFunc(retVal___, sd, index, amount); } } return retVal___; @@ -75504,11 +75723,11 @@ int HP_storage_gettocart(struct map_session_data *sd, int index, int amount) { void HP_storage_close(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_storage_close_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_close_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_close_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75530,11 +75749,11 @@ void HP_storage_close(struct map_session_data *sd) { void HP_storage_pc_quit(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_storage_pc_quit_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *flag); + void (*preHookFunc) (struct map_session_data **sd, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_pc_quit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_pc_quit_pre[hIndex].func; - preHookFunc(sd, &flag); + preHookFunc(&sd, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75545,10 +75764,10 @@ void HP_storage_pc_quit(struct map_session_data *sd, int flag) { HPMHooks.source.storage.pc_quit(sd, flag); } if( HPMHooks.count.HP_storage_pc_quit_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *flag); + void (*postHookFunc) (struct map_session_data *sd, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_pc_quit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_storage_pc_quit_post[hIndex].func; - postHookFunc(sd, &flag); + postHookFunc(sd, flag); } } return; @@ -75557,11 +75776,11 @@ int HP_storage_comp_item(const void *i1_, const void *i2_) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_storage_comp_item_pre ) { - int (*preHookFunc) (const void *i1_, const void *i2_); + int (*preHookFunc) (const void **i1_, const void **i2_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_comp_item_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_comp_item_pre[hIndex].func; - retVal___ = preHookFunc(i1_, i2_); + retVal___ = preHookFunc(&i1_, &i2_); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75583,11 +75802,11 @@ int HP_storage_comp_item(const void *i1_, const void *i2_) { void HP_storage_sortitem(struct item *items, unsigned int size) { int hIndex = 0; if( HPMHooks.count.HP_storage_sortitem_pre ) { - void (*preHookFunc) (struct item *items, unsigned int *size); + void (*preHookFunc) (struct item **items, unsigned int *size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_sortitem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_storage_sortitem_pre[hIndex].func; - preHookFunc(items, &size); + preHookFunc(&items, &size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75598,24 +75817,24 @@ void HP_storage_sortitem(struct item *items, unsigned int size) { HPMHooks.source.storage.sortitem(items, size); } if( HPMHooks.count.HP_storage_sortitem_post ) { - void (*postHookFunc) (struct item *items, unsigned int *size); + void (*postHookFunc) (struct item *items, unsigned int size); for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_sortitem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_storage_sortitem_post[hIndex].func; - postHookFunc(items, &size); + postHookFunc(items, size); } } return; } -int HP_storage_reconnect_sub(DBKey key, DBData *data, va_list ap) { +int HP_storage_reconnect_sub(union DBKey key, struct DBData *data, va_list ap) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_storage_reconnect_sub_pre ) { - int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_reconnect_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); preHookFunc = HPMHooks.list.HP_storage_reconnect_sub_pre[hIndex].func; - retVal___ = preHookFunc(&key, data, ap___copy); + retVal___ = preHookFunc(&key, &data, ap___copy); va_end(ap___copy); } if( *HPMforce_return ) { @@ -75629,17 +75848,17 @@ int HP_storage_reconnect_sub(DBKey key, DBData *data, va_list ap) { va_end(ap___copy); } if( HPMHooks.count.HP_storage_reconnect_sub_post ) { - int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap); for(hIndex = 0; hIndex < HPMHooks.count.HP_storage_reconnect_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); postHookFunc = HPMHooks.list.HP_storage_reconnect_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + retVal___ = postHookFunc(retVal___, key, data, ap___copy); va_end(ap___copy); } } return retVal___; } -/* StrBuf */ +/* stringbuf_interface */ StringBuf* HP_StrBuf_Malloc(void) { int hIndex = 0; StringBuf* retVal___ = NULL; @@ -75670,11 +75889,11 @@ StringBuf* HP_StrBuf_Malloc(void) { void HP_StrBuf_Init(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Init_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Init_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75697,12 +75916,12 @@ int HP_StrBuf_Vprintf(StringBuf *self, const char *fmt, va_list args) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_Vprintf_pre ) { - int (*preHookFunc) (StringBuf *self, const char *fmt, va_list args); + int (*preHookFunc) (StringBuf **self, const char **fmt, va_list args); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Vprintf_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); preHookFunc = HPMHooks.list.HP_StrBuf_Vprintf_pre[hIndex].func; - retVal___ = preHookFunc(self, fmt, args___copy); + retVal___ = preHookFunc(&self, &fmt, args___copy); va_end(args___copy); } if( *HPMforce_return ) { @@ -75730,11 +75949,11 @@ int HP_StrBuf_Append(StringBuf *self, const StringBuf *sbuf) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_Append_pre ) { - int (*preHookFunc) (StringBuf *self, const StringBuf *sbuf); + int (*preHookFunc) (StringBuf **self, const StringBuf **sbuf); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Append_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Append_pre[hIndex].func; - retVal___ = preHookFunc(self, sbuf); + retVal___ = preHookFunc(&self, &sbuf); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75757,11 +75976,11 @@ int HP_StrBuf_AppendStr(StringBuf *self, const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_AppendStr_pre ) { - int (*preHookFunc) (StringBuf *self, const char *str); + int (*preHookFunc) (StringBuf **self, const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_AppendStr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_AppendStr_pre[hIndex].func; - retVal___ = preHookFunc(self, str); + retVal___ = preHookFunc(&self, &str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75784,11 +76003,11 @@ int HP_StrBuf_Length(StringBuf *self) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_StrBuf_Length_pre ) { - int (*preHookFunc) (StringBuf *self); + int (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Length_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Length_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75811,11 +76030,11 @@ char* HP_StrBuf_Value(StringBuf *self) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_StrBuf_Value_pre ) { - char* (*preHookFunc) (StringBuf *self); + char* (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Value_pre[hIndex].func; - retVal___ = preHookFunc(self); + retVal___ = preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75837,11 +76056,11 @@ char* HP_StrBuf_Value(StringBuf *self) { void HP_StrBuf_Clear(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Clear_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Clear_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Clear_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75863,11 +76082,11 @@ void HP_StrBuf_Clear(StringBuf *self) { void HP_StrBuf_Destroy(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Destroy_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Destroy_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75889,11 +76108,11 @@ void HP_StrBuf_Destroy(StringBuf *self) { void HP_StrBuf_Free(StringBuf *self) { int hIndex = 0; if( HPMHooks.count.HP_StrBuf_Free_pre ) { - void (*preHookFunc) (StringBuf *self); + void (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_StrBuf_Free_pre[hIndex].func; - preHookFunc(self); + preHookFunc(&self); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75912,16 +76131,16 @@ void HP_StrBuf_Free(StringBuf *self) { } return; } -/* strlib */ +/* strlib_interface */ char* HP_strlib_jstrescape(char *pt) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_jstrescape_pre ) { - char* (*preHookFunc) (char *pt); + char* (*preHookFunc) (char **pt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_jstrescape_pre[hIndex].func; - retVal___ = preHookFunc(pt); + retVal___ = preHookFunc(&pt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75944,11 +76163,11 @@ char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_jstrescapecpy_pre ) { - char* (*preHookFunc) (char *pt, const char *spt); + char* (*preHookFunc) (char **pt, const char **spt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_pre[hIndex].func; - retVal___ = preHookFunc(pt, spt); + retVal___ = preHookFunc(&pt, &spt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75971,11 +76190,11 @@ int HP_strlib_jmemescapecpy(char *pt, const char *spt, int size) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_jmemescapecpy_pre ) { - int (*preHookFunc) (char *pt, const char *spt, int *size); + int (*preHookFunc) (char **pt, const char **spt, int *size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jmemescapecpy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_jmemescapecpy_pre[hIndex].func; - retVal___ = preHookFunc(pt, spt, &size); + retVal___ = preHookFunc(&pt, &spt, &size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -75986,10 +76205,10 @@ int HP_strlib_jmemescapecpy(char *pt, const char *spt, int size) { retVal___ = HPMHooks.source.strlib.jmemescapecpy(pt, spt, size); } if( HPMHooks.count.HP_strlib_jmemescapecpy_post ) { - int (*postHookFunc) (int retVal___, char *pt, const char *spt, int *size); + int (*postHookFunc) (int retVal___, char *pt, const char *spt, int size); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jmemescapecpy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_jmemescapecpy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, pt, spt, &size); + retVal___ = postHookFunc(retVal___, pt, spt, size); } } return retVal___; @@ -75998,11 +76217,11 @@ int HP_strlib_remove_control_chars_(char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_remove_control_chars__pre ) { - int (*preHookFunc) (char *str); + int (*preHookFunc) (char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_remove_control_chars__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_remove_control_chars__pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76025,11 +76244,11 @@ char* HP_strlib_trim_(char *str) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_trim__pre ) { - char* (*preHookFunc) (char *str); + char* (*preHookFunc) (char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_trim__pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76052,11 +76271,11 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_normalize_name__pre ) { - char* (*preHookFunc) (char *str, const char *delims); + char* (*preHookFunc) (char **str, const char **delims); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_normalize_name__pre[hIndex].func; - retVal___ = preHookFunc(str, delims); + retVal___ = preHookFunc(&str, &delims); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76079,11 +76298,11 @@ const char* HP_strlib_stristr_(const char *haystack, const char *needle) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_stristr__pre ) { - const char* (*preHookFunc) (const char *haystack, const char *needle); + const char* (*preHookFunc) (const char **haystack, const char **needle); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_stristr__pre[hIndex].func; - retVal___ = preHookFunc(haystack, needle); + retVal___ = preHookFunc(&haystack, &needle); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76106,11 +76325,11 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_strlib_strnlen__pre ) { - size_t (*preHookFunc) (const char *string, size_t *maxlen); + size_t (*preHookFunc) (const char **string, size_t *maxlen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strnlen__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_strnlen__pre[hIndex].func; - retVal___ = preHookFunc(string, &maxlen); + retVal___ = preHookFunc(&string, &maxlen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76121,10 +76340,10 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { retVal___ = HPMHooks.source.strlib.strnlen_(string, maxlen); } if( HPMHooks.count.HP_strlib_strnlen__post ) { - size_t (*postHookFunc) (size_t retVal___, const char *string, size_t *maxlen); + size_t (*postHookFunc) (size_t retVal___, const char *string, size_t maxlen); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strnlen__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_strnlen__post[hIndex].func; - retVal___ = postHookFunc(retVal___, string, &maxlen); + retVal___ = postHookFunc(retVal___, string, maxlen); } } return retVal___; @@ -76133,11 +76352,11 @@ char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_strtok_r__pre ) { - char* (*preHookFunc) (char *s1, const char *s2, char **lasts); + char* (*preHookFunc) (char **s1, const char **s2, char ***lasts); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_strtok_r__pre[hIndex].func; - retVal___ = preHookFunc(s1, s2, lasts); + retVal___ = preHookFunc(&s1, &s2, &lasts); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76160,11 +76379,11 @@ int HP_strlib_e_mail_check_(char *email) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_e_mail_check__pre ) { - int (*preHookFunc) (char *email); + int (*preHookFunc) (char **email); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_e_mail_check__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_e_mail_check__pre[hIndex].func; - retVal___ = preHookFunc(email); + retVal___ = preHookFunc(&email); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76187,11 +76406,11 @@ int HP_strlib_config_switch_(const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_config_switch__pre ) { - int (*preHookFunc) (const char *str); + int (*preHookFunc) (const char **str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_config_switch__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_config_switch__pre[hIndex].func; - retVal___ = preHookFunc(str); + retVal___ = preHookFunc(&str); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76214,11 +76433,11 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_strlib_safestrncpy__pre ) { - char* (*preHookFunc) (char *dst, const char *src, size_t *n); + char* (*preHookFunc) (char **dst, const char **src, size_t *n); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_safestrncpy__pre[hIndex].func; - retVal___ = preHookFunc(dst, src, &n); + retVal___ = preHookFunc(&dst, &src, &n); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76229,10 +76448,10 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { retVal___ = HPMHooks.source.strlib.safestrncpy_(dst, src, n); } if( HPMHooks.count.HP_strlib_safestrncpy__post ) { - char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t *n); + char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t n); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_safestrncpy__post[hIndex].func; - retVal___ = postHookFunc(retVal___, dst, src, &n); + retVal___ = postHookFunc(retVal___, dst, src, n); } } return retVal___; @@ -76241,11 +76460,11 @@ size_t HP_strlib_safestrnlen_(const char *string, size_t maxlen) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_strlib_safestrnlen__pre ) { - size_t (*preHookFunc) (const char *string, size_t *maxlen); + size_t (*preHookFunc) (const char **string, size_t *maxlen); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrnlen__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_safestrnlen__pre[hIndex].func; - retVal___ = preHookFunc(string, &maxlen); + retVal___ = preHookFunc(&string, &maxlen); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76256,10 +76475,10 @@ size_t HP_strlib_safestrnlen_(const char *string, size_t maxlen) { retVal___ = HPMHooks.source.strlib.safestrnlen_(string, maxlen); } if( HPMHooks.count.HP_strlib_safestrnlen__post ) { - size_t (*postHookFunc) (size_t retVal___, const char *string, size_t *maxlen); + size_t (*postHookFunc) (size_t retVal___, const char *string, size_t maxlen); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrnlen__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_safestrnlen__post[hIndex].func; - retVal___ = postHookFunc(retVal___, string, &maxlen); + retVal___ = postHookFunc(retVal___, string, maxlen); } } return retVal___; @@ -76268,11 +76487,11 @@ int HP_strlib_strline_(const char *str, size_t pos) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_strlib_strline__pre ) { - int (*preHookFunc) (const char *str, size_t *pos); + int (*preHookFunc) (const char **str, size_t *pos); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strline__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_strline__pre[hIndex].func; - retVal___ = preHookFunc(str, &pos); + retVal___ = preHookFunc(&str, &pos); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76283,23 +76502,23 @@ int HP_strlib_strline_(const char *str, size_t pos) { retVal___ = HPMHooks.source.strlib.strline_(str, pos); } if( HPMHooks.count.HP_strlib_strline__post ) { - int (*postHookFunc) (int retVal___, const char *str, size_t *pos); + int (*postHookFunc) (int retVal___, const char *str, size_t pos); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strline__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_strline__post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &pos); + retVal___ = postHookFunc(retVal___, str, pos); } } return retVal___; } -bool HP_strlib_bin2hex_(char *output, unsigned char *input, size_t count) { +bool HP_strlib_bin2hex_(char *output, const unsigned char *input, size_t count) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_strlib_bin2hex__pre ) { - bool (*preHookFunc) (char *output, unsigned char *input, size_t *count); + bool (*preHookFunc) (char **output, const unsigned char **input, size_t *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_bin2hex__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_strlib_bin2hex__pre[hIndex].func; - retVal___ = preHookFunc(output, input, &count); + retVal___ = preHookFunc(&output, &input, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76310,24 +76529,24 @@ bool HP_strlib_bin2hex_(char *output, unsigned char *input, size_t count) { retVal___ = HPMHooks.source.strlib.bin2hex_(output, input, count); } if( HPMHooks.count.HP_strlib_bin2hex__post ) { - bool (*postHookFunc) (bool retVal___, char *output, unsigned char *input, size_t *count); + bool (*postHookFunc) (bool retVal___, char *output, const unsigned char *input, size_t count); for(hIndex = 0; hIndex < HPMHooks.count.HP_strlib_bin2hex__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_strlib_bin2hex__post[hIndex].func; - retVal___ = postHookFunc(retVal___, output, input, &count); + retVal___ = postHookFunc(retVal___, output, input, count); } } return retVal___; } -/* sv */ +/* sv_interface */ int HP_sv_parse_next(struct s_svstate *svstate) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sv_parse_next_pre ) { - int (*preHookFunc) (struct s_svstate *svstate); + int (*preHookFunc) (struct s_svstate **svstate); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_parse_next_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_parse_next_pre[hIndex].func; - retVal___ = preHookFunc(svstate); + retVal___ = preHookFunc(&svstate); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76350,11 +76569,11 @@ int HP_sv_parse(const char *str, int len, int startoff, char delim, int *out_pos int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sv_parse_pre ) { - int (*preHookFunc) (const char *str, int *len, int *startoff, char *delim, int *out_pos, int *npos, enum e_svopt *opt); + int (*preHookFunc) (const char **str, int *len, int *startoff, char *delim, int **out_pos, int *npos, enum e_svopt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_parse_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_parse_pre[hIndex].func; - retVal___ = preHookFunc(str, &len, &startoff, &delim, out_pos, &npos, &opt); + retVal___ = preHookFunc(&str, &len, &startoff, &delim, &out_pos, &npos, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76365,10 +76584,10 @@ int HP_sv_parse(const char *str, int len, int startoff, char delim, int *out_pos retVal___ = HPMHooks.source.sv.parse(str, len, startoff, delim, out_pos, npos, opt); } if( HPMHooks.count.HP_sv_parse_post ) { - int (*postHookFunc) (int retVal___, const char *str, int *len, int *startoff, char *delim, int *out_pos, int *npos, enum e_svopt *opt); + int (*postHookFunc) (int retVal___, const char *str, int len, int startoff, char delim, int *out_pos, int npos, enum e_svopt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_parse_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_parse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &len, &startoff, &delim, out_pos, &npos, &opt); + retVal___ = postHookFunc(retVal___, str, len, startoff, delim, out_pos, npos, opt); } } return retVal___; @@ -76377,11 +76596,11 @@ int HP_sv_split(char *str, int len, int startoff, char delim, char **out_fields, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sv_split_pre ) { - int (*preHookFunc) (char *str, int *len, int *startoff, char *delim, char **out_fields, int *nfields, enum e_svopt *opt); + int (*preHookFunc) (char **str, int *len, int *startoff, char *delim, char ***out_fields, int *nfields, enum e_svopt *opt); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_split_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_split_pre[hIndex].func; - retVal___ = preHookFunc(str, &len, &startoff, &delim, out_fields, &nfields, &opt); + retVal___ = preHookFunc(&str, &len, &startoff, &delim, &out_fields, &nfields, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76392,10 +76611,10 @@ int HP_sv_split(char *str, int len, int startoff, char delim, char **out_fields, retVal___ = HPMHooks.source.sv.split(str, len, startoff, delim, out_fields, nfields, opt); } if( HPMHooks.count.HP_sv_split_post ) { - int (*postHookFunc) (int retVal___, char *str, int *len, int *startoff, char *delim, char **out_fields, int *nfields, enum e_svopt *opt); + int (*postHookFunc) (int retVal___, char *str, int len, int startoff, char delim, char **out_fields, int nfields, enum e_svopt opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_split_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_split_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, &len, &startoff, &delim, out_fields, &nfields, &opt); + retVal___ = postHookFunc(retVal___, str, len, startoff, delim, out_fields, nfields, opt); } } return retVal___; @@ -76404,11 +76623,11 @@ size_t HP_sv_escape_c(char *out_dest, const char *src, size_t len, const char *e int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_sv_escape_c_pre ) { - size_t (*preHookFunc) (char *out_dest, const char *src, size_t *len, const char *escapes); + size_t (*preHookFunc) (char **out_dest, const char **src, size_t *len, const char **escapes); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_escape_c_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_escape_c_pre[hIndex].func; - retVal___ = preHookFunc(out_dest, src, &len, escapes); + retVal___ = preHookFunc(&out_dest, &src, &len, &escapes); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76419,10 +76638,10 @@ size_t HP_sv_escape_c(char *out_dest, const char *src, size_t len, const char *e retVal___ = HPMHooks.source.sv.escape_c(out_dest, src, len, escapes); } if( HPMHooks.count.HP_sv_escape_c_post ) { - size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t *len, const char *escapes); + size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t len, const char *escapes); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_escape_c_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_escape_c_post[hIndex].func; - retVal___ = postHookFunc(retVal___, out_dest, src, &len, escapes); + retVal___ = postHookFunc(retVal___, out_dest, src, len, escapes); } } return retVal___; @@ -76431,11 +76650,11 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { int hIndex = 0; size_t retVal___ = 0; if( HPMHooks.count.HP_sv_unescape_c_pre ) { - size_t (*preHookFunc) (char *out_dest, const char *src, size_t *len); + size_t (*preHookFunc) (char **out_dest, const char **src, size_t *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_unescape_c_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_unescape_c_pre[hIndex].func; - retVal___ = preHookFunc(out_dest, src, &len); + retVal___ = preHookFunc(&out_dest, &src, &len); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76446,10 +76665,10 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { retVal___ = HPMHooks.source.sv.unescape_c(out_dest, src, len); } if( HPMHooks.count.HP_sv_unescape_c_post ) { - size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t *len); + size_t (*postHookFunc) (size_t retVal___, char *out_dest, const char *src, size_t len); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_unescape_c_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_unescape_c_post[hIndex].func; - retVal___ = postHookFunc(retVal___, out_dest, src, &len); + retVal___ = postHookFunc(retVal___, out_dest, src, len); } } return retVal___; @@ -76458,11 +76677,11 @@ const char* HP_sv_skip_escaped_c(const char *p) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_sv_skip_escaped_c_pre ) { - const char* (*preHookFunc) (const char *p); + const char* (*preHookFunc) (const char **p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_pre[hIndex].func; - retVal___ = preHookFunc(p); + retVal___ = preHookFunc(&p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76485,11 +76704,11 @@ bool HP_sv_readdb(const char *directory, const char *filename, char delim, int m int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_sv_readdb_pre ) { - bool (*preHookFunc) (const char *directory, const char *filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); + bool (*preHookFunc) (const char **directory, const char **filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( **parseproc ) (char *fields[], int columns, int current)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_readdb_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sv_readdb_pre[hIndex].func; - retVal___ = preHookFunc(directory, filename, &delim, &mincols, &maxcols, &maxrows, parseproc); + retVal___ = preHookFunc(&directory, &filename, &delim, &mincols, &maxcols, &maxrows, &parseproc); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -76500,15 +76719,15 @@ bool HP_sv_readdb(const char *directory, const char *filename, char delim, int m retVal___ = HPMHooks.source.sv.readdb(directory, filename, delim, mincols, maxcols, maxrows, parseproc); } if( HPMHooks.count.HP_sv_readdb_post ) { - bool (*postHookFunc) (bool retVal___, const char *directory, const char *filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); + bool (*postHookFunc) (bool retVal___, const char *directory, const char *filename, char delim, int mincols, int maxcols, int maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); for(hIndex = 0; hIndex < HPMHooks.count.HP_sv_readdb_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sv_readdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___, directory, filename, &delim, &mincols, &maxcols, &maxrows, parseproc); + retVal___ = postHookFunc(retVal___, directory, filename, delim, mincols, maxcols, maxrows, parseproc); } } return retVal___; } -/* sysinfo */ +/* sysinfo_interface */ int HP_sysinfo_getpagesize(void) { int hIndex = 0; int retVal___ = 0; @@ -76992,7 +77211,7 @@ void HP_sysinfo_final(void) { } return; } -/* timer */ +/* timer_interface */ int64 HP_timer_gettick(void) { int hIndex = 0; int64 retVal___ = 0; @@ -77066,10 +77285,10 @@ int HP_timer_add(int64 tick, TimerFunc func, int id, intptr_t data) { retVal___ = HPMHooks.source.timer.add(tick, func, id, data); } if( HPMHooks.count.HP_timer_add_post ) { - int (*postHookFunc) (int retVal___, int64 *tick, TimerFunc *func, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick, &func, &id, &data); + retVal___ = postHookFunc(retVal___, tick, func, id, data); } } return retVal___; @@ -77093,10 +77312,10 @@ int HP_timer_add_interval(int64 tick, TimerFunc func, int id, intptr_t data, int retVal___ = HPMHooks.source.timer.add_interval(tick, func, id, data, interval); } if( HPMHooks.count.HP_timer_add_interval_post ) { - int (*postHookFunc) (int retVal___, int64 *tick, TimerFunc *func, int *id, intptr_t *data, int *interval); + int (*postHookFunc) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data, int interval); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_interval_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_add_interval_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick, &func, &id, &data, &interval); + retVal___ = postHookFunc(retVal___, tick, func, id, data, interval); } } return retVal___; @@ -77120,10 +77339,10 @@ const struct TimerData* HP_timer_get(int tid) { retVal___ = HPMHooks.source.timer.get(tid); } if( HPMHooks.count.HP_timer_get_post ) { - const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int *tid); + const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int tid); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_get_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid); + retVal___ = postHookFunc(retVal___, tid); } } return retVal___; @@ -77147,10 +77366,10 @@ int HP_timer_delete(int tid, TimerFunc func) { retVal___ = HPMHooks.source.timer.delete(tid, func); } if( HPMHooks.count.HP_timer_delete_post ) { - int (*postHookFunc) (int retVal___, int *tid, TimerFunc *func); + int (*postHookFunc) (int retVal___, int tid, TimerFunc func); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_delete_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &func); + retVal___ = postHookFunc(retVal___, tid, func); } } return retVal___; @@ -77174,10 +77393,10 @@ int64 HP_timer_addtick(int tid, int64 tick) { retVal___ = HPMHooks.source.timer.addtick(tid, tick); } if( HPMHooks.count.HP_timer_addtick_post ) { - int64 (*postHookFunc) (int64 retVal___, int *tid, int64 *tick); + int64 (*postHookFunc) (int64 retVal___, int tid, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_addtick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_addtick_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick); + retVal___ = postHookFunc(retVal___, tid, tick); } } return retVal___; @@ -77201,10 +77420,10 @@ int64 HP_timer_settick(int tid, int64 tick) { retVal___ = HPMHooks.source.timer.settick(tid, tick); } if( HPMHooks.count.HP_timer_settick_post ) { - int64 (*postHookFunc) (int64 retVal___, int *tid, int64 *tick); + int64 (*postHookFunc) (int64 retVal___, int tid, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_settick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_settick_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick); + retVal___ = postHookFunc(retVal___, tid, tick); } } return retVal___; @@ -77213,11 +77432,11 @@ int HP_timer_add_func_list(TimerFunc func, char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_timer_add_func_list_pre ) { - int (*preHookFunc) (TimerFunc *func, char *name); + int (*preHookFunc) (TimerFunc *func, char **name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_func_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_timer_add_func_list_pre[hIndex].func; - retVal___ = preHookFunc(&func, name); + retVal___ = preHookFunc(&func, &name); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77228,10 +77447,10 @@ int HP_timer_add_func_list(TimerFunc func, char *name) { retVal___ = HPMHooks.source.timer.add_func_list(func, name); } if( HPMHooks.count.HP_timer_add_func_list_post ) { - int (*postHookFunc) (int retVal___, TimerFunc *func, char *name); + int (*postHookFunc) (int retVal___, TimerFunc func, char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_add_func_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_add_func_list_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &func, name); + retVal___ = postHookFunc(retVal___, func, name); } } return retVal___; @@ -77282,10 +77501,10 @@ int HP_timer_perform(int64 tick) { retVal___ = HPMHooks.source.timer.perform(tick); } if( HPMHooks.count.HP_timer_perform_post ) { - int (*postHookFunc) (int retVal___, int64 *tick); + int (*postHookFunc) (int retVal___, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_timer_perform_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_timer_perform_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tick); + retVal___ = postHookFunc(retVal___, tick); } } return retVal___; @@ -77342,15 +77561,15 @@ void HP_timer_final(void) { } return; } -/* trade */ +/* trade_interface */ void HP_trade_request(struct map_session_data *sd, struct map_session_data *target_sd) { int hIndex = 0; if( HPMHooks.count.HP_trade_request_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct map_session_data *target_sd); + void (*preHookFunc) (struct map_session_data **sd, struct map_session_data **target_sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_request_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_trade_request_pre[hIndex].func; - preHookFunc(sd, target_sd); + preHookFunc(&sd, &target_sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77372,11 +77591,11 @@ void HP_trade_request(struct map_session_data *sd, struct map_session_data *targ void HP_trade_ack(struct map_session_data *sd, int type) { int hIndex = 0; if( HPMHooks.count.HP_trade_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *type); + void (*preHookFunc) (struct map_session_data **sd, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_trade_ack_pre[hIndex].func; - preHookFunc(sd, &type); + preHookFunc(&sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77387,10 +77606,10 @@ void HP_trade_ack(struct map_session_data *sd, int type) { HPMHooks.source.trade.ack(sd, type); } if( HPMHooks.count.HP_trade_ack_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *type); + void (*postHookFunc) (struct map_session_data *sd, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_trade_ack_post[hIndex].func; - postHookFunc(sd, &type); + postHookFunc(sd, type); } } return; @@ -77399,11 +77618,11 @@ int HP_trade_check_impossible(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_trade_check_impossible_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_check_impossible_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_trade_check_impossible_pre[hIndex].func; - retVal___ = preHookFunc(sd); + retVal___ = preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77426,11 +77645,11 @@ int HP_trade_check(struct map_session_data *sd, struct map_session_data *tsd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_trade_check_pre ) { - int (*preHookFunc) (struct map_session_data *sd, struct map_session_data *tsd); + int (*preHookFunc) (struct map_session_data **sd, struct map_session_data **tsd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_trade_check_pre[hIndex].func; - retVal___ = preHookFunc(sd, tsd); + retVal___ = preHookFunc(&sd, &tsd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77452,11 +77671,11 @@ int HP_trade_check(struct map_session_data *sd, struct map_session_data *tsd) { void HP_trade_additem(struct map_session_data *sd, short index, short amount) { int hIndex = 0; if( HPMHooks.count.HP_trade_additem_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *index, short *amount); + void (*preHookFunc) (struct map_session_data **sd, short *index, short *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_additem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_trade_additem_pre[hIndex].func; - preHookFunc(sd, &index, &amount); + preHookFunc(&sd, &index, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77467,10 +77686,10 @@ void HP_trade_additem(struct map_session_data *sd, short index, short amount) { HPMHooks.source.trade.additem(sd, index, amount); } if( HPMHooks.count.HP_trade_additem_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *index, short *amount); + void (*postHookFunc) (struct map_session_data *sd, short index, short amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_additem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_trade_additem_post[hIndex].func; - postHookFunc(sd, &index, &amount); + postHookFunc(sd, index, amount); } } return; @@ -77478,11 +77697,11 @@ void HP_trade_additem(struct map_session_data *sd, short index, short amount) { void HP_trade_addzeny(struct map_session_data *sd, int amount) { int hIndex = 0; if( HPMHooks.count.HP_trade_addzeny_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *amount); + void (*preHookFunc) (struct map_session_data **sd, int *amount); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_addzeny_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_trade_addzeny_pre[hIndex].func; - preHookFunc(sd, &amount); + preHookFunc(&sd, &amount); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77493,10 +77712,10 @@ void HP_trade_addzeny(struct map_session_data *sd, int amount) { HPMHooks.source.trade.addzeny(sd, amount); } if( HPMHooks.count.HP_trade_addzeny_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *amount); + void (*postHookFunc) (struct map_session_data *sd, int amount); for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_addzeny_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_trade_addzeny_post[hIndex].func; - postHookFunc(sd, &amount); + postHookFunc(sd, amount); } } return; @@ -77504,11 +77723,11 @@ void HP_trade_addzeny(struct map_session_data *sd, int amount) { void HP_trade_ok(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_trade_ok_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_ok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_trade_ok_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77530,11 +77749,11 @@ void HP_trade_ok(struct map_session_data *sd) { void HP_trade_cancel(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_trade_cancel_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_cancel_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_trade_cancel_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77556,11 +77775,11 @@ void HP_trade_cancel(struct map_session_data *sd) { void HP_trade_commit(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_trade_commit_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_trade_commit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_trade_commit_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77579,7 +77798,7 @@ void HP_trade_commit(struct map_session_data *sd) { } return; } -/* unit */ +/* unit_interface */ int HP_unit_init(bool minimal) { int hIndex = 0; int retVal___ = 0; @@ -77599,10 +77818,10 @@ int HP_unit_init(bool minimal) { retVal___ = HPMHooks.source.unit.init(minimal); } if( HPMHooks.count.HP_unit_init_post ) { - int (*postHookFunc) (int retVal___, bool *minimal); + int (*postHookFunc) (int retVal___, bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &minimal); + retVal___ = postHookFunc(retVal___, minimal); } } return retVal___; @@ -77638,11 +77857,11 @@ struct unit_data* HP_unit_bl2ud(struct block_list *bl) { int hIndex = 0; struct unit_data* retVal___ = NULL; if( HPMHooks.count.HP_unit_bl2ud_pre ) { - struct unit_data* (*preHookFunc) (struct block_list *bl); + struct unit_data* (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_bl2ud_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_bl2ud_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77665,11 +77884,11 @@ struct unit_data* HP_unit_bl2ud2(struct block_list *bl) { int hIndex = 0; struct unit_data* retVal___ = NULL; if( HPMHooks.count.HP_unit_bl2ud2_pre ) { - struct unit_data* (*preHookFunc) (struct block_list *bl); + struct unit_data* (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_bl2ud2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_bl2ud2_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77688,6 +77907,32 @@ struct unit_data* HP_unit_bl2ud2(struct block_list *bl) { } return retVal___; } +void HP_unit_init_ud(struct unit_data *ud) { + int hIndex = 0; + if( HPMHooks.count.HP_unit_init_ud_pre ) { + void (*preHookFunc) (struct unit_data **ud); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_init_ud_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_unit_init_ud_pre[hIndex].func; + preHookFunc(&ud); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.unit.init_ud(ud); + } + if( HPMHooks.count.HP_unit_init_ud_post ) { + void (*postHookFunc) (struct unit_data *ud); + for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_init_ud_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_unit_init_ud_post[hIndex].func; + postHookFunc(ud); + } + } + return; +} int HP_unit_attack_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; @@ -77707,10 +77952,10 @@ int HP_unit_attack_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.unit.attack_timer(tid, tick, id, data); } if( HPMHooks.count.HP_unit_attack_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_attack_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_attack_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -77734,10 +77979,10 @@ int HP_unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.unit.walktoxy_timer(tid, tick, id, data); } if( HPMHooks.count.HP_unit_walktoxy_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_walktoxy_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -77746,11 +77991,11 @@ int HP_unit_walktoxy_sub(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_walktoxy_sub_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_walktoxy_sub_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77788,10 +78033,10 @@ int HP_unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.unit.delay_walktoxy_timer(tid, tick, id, data); } if( HPMHooks.count.HP_unit_delay_walktoxy_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_delay_walktoxy_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_delay_walktoxy_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -77800,11 +78045,11 @@ int HP_unit_walktoxy(struct block_list *bl, short x, short y, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_walktoxy_pre ) { - int (*preHookFunc) (struct block_list *bl, short *x, short *y, int *flag); + int (*preHookFunc) (struct block_list **bl, short *x, short *y, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_walktoxy_pre[hIndex].func; - retVal___ = preHookFunc(bl, &x, &y, &flag); + retVal___ = preHookFunc(&bl, &x, &y, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77815,10 +78060,10 @@ int HP_unit_walktoxy(struct block_list *bl, short x, short y, int flag) { retVal___ = HPMHooks.source.unit.walktoxy(bl, x, y, flag); } if( HPMHooks.count.HP_unit_walktoxy_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, short *x, short *y, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *bl, short x, short y, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_walktoxy_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &x, &y, &flag); + retVal___ = postHookFunc(retVal___, bl, x, y, flag); } } return retVal___; @@ -77842,10 +78087,10 @@ int HP_unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.unit.walktobl_sub(tid, tick, id, data); } if( HPMHooks.count.HP_unit_walktobl_sub_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktobl_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_walktobl_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -77854,11 +78099,11 @@ int HP_unit_walktobl(struct block_list *bl, struct block_list *tbl, int range, i int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_walktobl_pre ) { - int (*preHookFunc) (struct block_list *bl, struct block_list *tbl, int *range, int *flag); + int (*preHookFunc) (struct block_list **bl, struct block_list **tbl, int *range, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktobl_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_walktobl_pre[hIndex].func; - retVal___ = preHookFunc(bl, tbl, &range, &flag); + retVal___ = preHookFunc(&bl, &tbl, &range, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77869,10 +78114,10 @@ int HP_unit_walktobl(struct block_list *bl, struct block_list *tbl, int range, i retVal___ = HPMHooks.source.unit.walktobl(bl, tbl, range, flag); } if( HPMHooks.count.HP_unit_walktobl_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, struct block_list *tbl, int *range, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *bl, struct block_list *tbl, int range, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktobl_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_walktobl_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, tbl, &range, &flag); + retVal___ = postHookFunc(retVal___, bl, tbl, range, flag); } } return retVal___; @@ -77881,11 +78126,11 @@ bool HP_unit_run(struct block_list *bl, struct map_session_data *sd, enum sc_typ int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_unit_run_pre ) { - bool (*preHookFunc) (struct block_list *bl, struct map_session_data *sd, enum sc_type *type); + bool (*preHookFunc) (struct block_list **bl, struct map_session_data **sd, enum sc_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_run_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_run_pre[hIndex].func; - retVal___ = preHookFunc(bl, sd, &type); + retVal___ = preHookFunc(&bl, &sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77896,10 +78141,10 @@ bool HP_unit_run(struct block_list *bl, struct map_session_data *sd, enum sc_typ retVal___ = HPMHooks.source.unit.run(bl, sd, type); } if( HPMHooks.count.HP_unit_run_post ) { - bool (*postHookFunc) (bool retVal___, struct block_list *bl, struct map_session_data *sd, enum sc_type *type); + bool (*postHookFunc) (bool retVal___, struct block_list *bl, struct map_session_data *sd, enum sc_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_run_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_run_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, sd, &type); + retVal___ = postHookFunc(retVal___, bl, sd, type); } } return retVal___; @@ -77907,11 +78152,11 @@ bool HP_unit_run(struct block_list *bl, struct map_session_data *sd, enum sc_typ void HP_unit_run_hit(struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type type) { int hIndex = 0; if( HPMHooks.count.HP_unit_run_hit_pre ) { - void (*preHookFunc) (struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type *type); + void (*preHookFunc) (struct block_list **bl, struct status_change **sc, struct map_session_data **sd, enum sc_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_run_hit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_run_hit_pre[hIndex].func; - preHookFunc(bl, sc, sd, &type); + preHookFunc(&bl, &sc, &sd, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77922,10 +78167,10 @@ void HP_unit_run_hit(struct block_list *bl, struct status_change *sc, struct map HPMHooks.source.unit.run_hit(bl, sc, sd, type); } if( HPMHooks.count.HP_unit_run_hit_post ) { - void (*postHookFunc) (struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type *type); + void (*postHookFunc) (struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_run_hit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_run_hit_post[hIndex].func; - postHookFunc(bl, sc, sd, &type); + postHookFunc(bl, sc, sd, type); } } return; @@ -77934,11 +78179,11 @@ int HP_unit_escape(struct block_list *bl, struct block_list *target, short dist) int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_escape_pre ) { - int (*preHookFunc) (struct block_list *bl, struct block_list *target, short *dist); + int (*preHookFunc) (struct block_list **bl, struct block_list **target, short *dist); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_escape_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_escape_pre[hIndex].func; - retVal___ = preHookFunc(bl, target, &dist); + retVal___ = preHookFunc(&bl, &target, &dist); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77949,10 +78194,10 @@ int HP_unit_escape(struct block_list *bl, struct block_list *target, short dist) retVal___ = HPMHooks.source.unit.escape(bl, target, dist); } if( HPMHooks.count.HP_unit_escape_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, struct block_list *target, short *dist); + int (*postHookFunc) (int retVal___, struct block_list *bl, struct block_list *target, short dist); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_escape_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_escape_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, target, &dist); + retVal___ = postHookFunc(retVal___, bl, target, dist); } } return retVal___; @@ -77961,11 +78206,11 @@ int HP_unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, b int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_movepos_pre ) { - int (*preHookFunc) (struct block_list *bl, short *dst_x, short *dst_y, int *easy, bool *checkpath); + int (*preHookFunc) (struct block_list **bl, short *dst_x, short *dst_y, int *easy, bool *checkpath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_movepos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_movepos_pre[hIndex].func; - retVal___ = preHookFunc(bl, &dst_x, &dst_y, &easy, &checkpath); + retVal___ = preHookFunc(&bl, &dst_x, &dst_y, &easy, &checkpath); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -77976,10 +78221,10 @@ int HP_unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, b retVal___ = HPMHooks.source.unit.movepos(bl, dst_x, dst_y, easy, checkpath); } if( HPMHooks.count.HP_unit_movepos_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, short *dst_x, short *dst_y, int *easy, bool *checkpath); + int (*postHookFunc) (int retVal___, struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_movepos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_movepos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &dst_x, &dst_y, &easy, &checkpath); + retVal___ = postHookFunc(retVal___, bl, dst_x, dst_y, easy, checkpath); } } return retVal___; @@ -77988,11 +78233,11 @@ int HP_unit_setdir(struct block_list *bl, unsigned char dir) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_setdir_pre ) { - int (*preHookFunc) (struct block_list *bl, unsigned char *dir); + int (*preHookFunc) (struct block_list **bl, unsigned char *dir); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_setdir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_setdir_pre[hIndex].func; - retVal___ = preHookFunc(bl, &dir); + retVal___ = preHookFunc(&bl, &dir); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78003,10 +78248,10 @@ int HP_unit_setdir(struct block_list *bl, unsigned char dir) { retVal___ = HPMHooks.source.unit.setdir(bl, dir); } if( HPMHooks.count.HP_unit_setdir_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned char *dir); + int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned char dir); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_setdir_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_setdir_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &dir); + retVal___ = postHookFunc(retVal___, bl, dir); } } return retVal___; @@ -78015,11 +78260,11 @@ uint8 HP_unit_getdir(struct block_list *bl) { int hIndex = 0; uint8 retVal___ = 0; if( HPMHooks.count.HP_unit_getdir_pre ) { - uint8 (*preHookFunc) (struct block_list *bl); + uint8 (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_getdir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_getdir_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78042,11 +78287,11 @@ int HP_unit_blown(struct block_list *bl, int dx, int dy, int count, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_blown_pre ) { - int (*preHookFunc) (struct block_list *bl, int *dx, int *dy, int *count, int *flag); + int (*preHookFunc) (struct block_list **bl, int *dx, int *dy, int *count, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_blown_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_blown_pre[hIndex].func; - retVal___ = preHookFunc(bl, &dx, &dy, &count, &flag); + retVal___ = preHookFunc(&bl, &dx, &dy, &count, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78057,10 +78302,10 @@ int HP_unit_blown(struct block_list *bl, int dx, int dy, int count, int flag) { retVal___ = HPMHooks.source.unit.blown(bl, dx, dy, count, flag); } if( HPMHooks.count.HP_unit_blown_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *dx, int *dy, int *count, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *bl, int dx, int dy, int count, int flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_blown_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_blown_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &dx, &dy, &count, &flag); + retVal___ = postHookFunc(retVal___, bl, dx, dy, count, flag); } } return retVal___; @@ -78069,11 +78314,11 @@ int HP_unit_warp(struct block_list *bl, short m, short x, short y, clr_type type int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_warp_pre ) { - int (*preHookFunc) (struct block_list *bl, short *m, short *x, short *y, clr_type *type); + int (*preHookFunc) (struct block_list **bl, short *m, short *x, short *y, clr_type *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_warp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_warp_pre[hIndex].func; - retVal___ = preHookFunc(bl, &m, &x, &y, &type); + retVal___ = preHookFunc(&bl, &m, &x, &y, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78084,10 +78329,10 @@ int HP_unit_warp(struct block_list *bl, short m, short x, short y, clr_type type retVal___ = HPMHooks.source.unit.warp(bl, m, x, y, type); } if( HPMHooks.count.HP_unit_warp_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, short *m, short *x, short *y, clr_type *type); + int (*postHookFunc) (int retVal___, struct block_list *bl, short m, short x, short y, clr_type type); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_warp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_warp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &m, &x, &y, &type); + retVal___ = postHookFunc(retVal___, bl, m, x, y, type); } } return retVal___; @@ -78096,11 +78341,11 @@ int HP_unit_stop_walking(struct block_list *bl, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_stop_walking_pre ) { - int (*preHookFunc) (struct block_list *bl, int *type); + int (*preHookFunc) (struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_stop_walking_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_stop_walking_pre[hIndex].func; - retVal___ = preHookFunc(bl, &type); + retVal___ = preHookFunc(&bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78111,10 +78356,10 @@ int HP_unit_stop_walking(struct block_list *bl, int type) { retVal___ = HPMHooks.source.unit.stop_walking(bl, type); } if( HPMHooks.count.HP_unit_stop_walking_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *type); + int (*postHookFunc) (int retVal___, struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_stop_walking_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_stop_walking_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &type); + retVal___ = postHookFunc(retVal___, bl, type); } } return retVal___; @@ -78123,11 +78368,11 @@ int HP_unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_id, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_skilluse_id_pre ) { - int (*preHookFunc) (struct block_list *src, int *target_id, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct block_list **src, int *target_id, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skilluse_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_skilluse_id_pre[hIndex].func; - retVal___ = preHookFunc(src, &target_id, &skill_id, &skill_lv); + retVal___ = preHookFunc(&src, &target_id, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78138,10 +78383,10 @@ int HP_unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_id, retVal___ = HPMHooks.source.unit.skilluse_id(src, target_id, skill_id, skill_lv); } if( HPMHooks.count.HP_unit_skilluse_id_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, int *target_id, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skilluse_id_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_skilluse_id_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &target_id, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, src, target_id, skill_id, skill_lv); } } return retVal___; @@ -78165,10 +78410,10 @@ int HP_unit_step_timer(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.unit.step_timer(tid, tick, id, data); } if( HPMHooks.count.HP_unit_step_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_step_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_step_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -78176,11 +78421,11 @@ int HP_unit_step_timer(int tid, int64 tick, int id, intptr_t data) { void HP_unit_stop_stepaction(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_unit_stop_stepaction_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_stop_stepaction_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_stop_stepaction_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78203,11 +78448,11 @@ int HP_unit_is_walking(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_is_walking_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_is_walking_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_is_walking_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78230,11 +78475,11 @@ int HP_unit_can_move(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_can_move_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_can_move_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_can_move_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78272,10 +78517,10 @@ int HP_unit_resume_running(int tid, int64 tick, int id, intptr_t data) { retVal___ = HPMHooks.source.unit.resume_running(tid, tick, id, data); } if( HPMHooks.count.HP_unit_resume_running_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_resume_running_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_resume_running_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + retVal___ = postHookFunc(retVal___, tid, tick, id, data); } } return retVal___; @@ -78284,11 +78529,11 @@ int HP_unit_set_walkdelay(struct block_list *bl, int64 tick, int delay, int type int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_set_walkdelay_pre ) { - int (*preHookFunc) (struct block_list *bl, int64 *tick, int *delay, int *type); + int (*preHookFunc) (struct block_list **bl, int64 *tick, int *delay, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_set_walkdelay_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_set_walkdelay_pre[hIndex].func; - retVal___ = preHookFunc(bl, &tick, &delay, &type); + retVal___ = preHookFunc(&bl, &tick, &delay, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78299,10 +78544,10 @@ int HP_unit_set_walkdelay(struct block_list *bl, int64 tick, int delay, int type retVal___ = HPMHooks.source.unit.set_walkdelay(bl, tick, delay, type); } if( HPMHooks.count.HP_unit_set_walkdelay_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int64 *tick, int *delay, int *type); + int (*postHookFunc) (int retVal___, struct block_list *bl, int64 tick, int delay, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_set_walkdelay_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_set_walkdelay_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &tick, &delay, &type); + retVal___ = postHookFunc(retVal___, bl, tick, delay, type); } } return retVal___; @@ -78311,11 +78556,11 @@ int HP_unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_skilluse_id2_pre ) { - int (*preHookFunc) (struct block_list *src, int *target_id, uint16 *skill_id, uint16 *skill_lv, int *casttime, int *castcancel); + int (*preHookFunc) (struct block_list **src, int *target_id, uint16 *skill_id, uint16 *skill_lv, int *casttime, int *castcancel); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skilluse_id2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_skilluse_id2_pre[hIndex].func; - retVal___ = preHookFunc(src, &target_id, &skill_id, &skill_lv, &casttime, &castcancel); + retVal___ = preHookFunc(&src, &target_id, &skill_id, &skill_lv, &casttime, &castcancel); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78326,10 +78571,10 @@ int HP_unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, retVal___ = HPMHooks.source.unit.skilluse_id2(src, target_id, skill_id, skill_lv, casttime, castcancel); } if( HPMHooks.count.HP_unit_skilluse_id2_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, int *target_id, uint16 *skill_id, uint16 *skill_lv, int *casttime, int *castcancel); + int (*postHookFunc) (int retVal___, struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skilluse_id2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_skilluse_id2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &target_id, &skill_id, &skill_lv, &casttime, &castcancel); + retVal___ = postHookFunc(retVal___, src, target_id, skill_id, skill_lv, casttime, castcancel); } } return retVal___; @@ -78338,11 +78583,11 @@ int HP_unit_skilluse_pos(struct block_list *src, short skill_x, short skill_y, u int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_skilluse_pos_pre ) { - int (*preHookFunc) (struct block_list *src, short *skill_x, short *skill_y, uint16 *skill_id, uint16 *skill_lv); + int (*preHookFunc) (struct block_list **src, short *skill_x, short *skill_y, uint16 *skill_id, uint16 *skill_lv); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skilluse_pos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_skilluse_pos_pre[hIndex].func; - retVal___ = preHookFunc(src, &skill_x, &skill_y, &skill_id, &skill_lv); + retVal___ = preHookFunc(&src, &skill_x, &skill_y, &skill_id, &skill_lv); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78353,10 +78598,10 @@ int HP_unit_skilluse_pos(struct block_list *src, short skill_x, short skill_y, u retVal___ = HPMHooks.source.unit.skilluse_pos(src, skill_x, skill_y, skill_id, skill_lv); } if( HPMHooks.count.HP_unit_skilluse_pos_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, short *skill_x, short *skill_y, uint16 *skill_id, uint16 *skill_lv); + int (*postHookFunc) (int retVal___, struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skilluse_pos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_skilluse_pos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &skill_x, &skill_y, &skill_id, &skill_lv); + retVal___ = postHookFunc(retVal___, src, skill_x, skill_y, skill_id, skill_lv); } } return retVal___; @@ -78365,11 +78610,11 @@ int HP_unit_skilluse_pos2(struct block_list *src, short skill_x, short skill_y, int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_skilluse_pos2_pre ) { - int (*preHookFunc) (struct block_list *src, short *skill_x, short *skill_y, uint16 *skill_id, uint16 *skill_lv, int *casttime, int *castcancel); + int (*preHookFunc) (struct block_list **src, short *skill_x, short *skill_y, uint16 *skill_id, uint16 *skill_lv, int *casttime, int *castcancel); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skilluse_pos2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_skilluse_pos2_pre[hIndex].func; - retVal___ = preHookFunc(src, &skill_x, &skill_y, &skill_id, &skill_lv, &casttime, &castcancel); + retVal___ = preHookFunc(&src, &skill_x, &skill_y, &skill_id, &skill_lv, &casttime, &castcancel); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78380,10 +78625,10 @@ int HP_unit_skilluse_pos2(struct block_list *src, short skill_x, short skill_y, retVal___ = HPMHooks.source.unit.skilluse_pos2(src, skill_x, skill_y, skill_id, skill_lv, casttime, castcancel); } if( HPMHooks.count.HP_unit_skilluse_pos2_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, short *skill_x, short *skill_y, uint16 *skill_id, uint16 *skill_lv, int *casttime, int *castcancel); + int (*postHookFunc) (int retVal___, struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skilluse_pos2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_skilluse_pos2_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &skill_x, &skill_y, &skill_id, &skill_lv, &casttime, &castcancel); + retVal___ = postHookFunc(retVal___, src, skill_x, skill_y, skill_id, skill_lv, casttime, castcancel); } } return retVal___; @@ -78392,11 +78637,11 @@ int HP_unit_set_target(struct unit_data *ud, int target_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_set_target_pre ) { - int (*preHookFunc) (struct unit_data *ud, int *target_id); + int (*preHookFunc) (struct unit_data **ud, int *target_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_set_target_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_set_target_pre[hIndex].func; - retVal___ = preHookFunc(ud, &target_id); + retVal___ = preHookFunc(&ud, &target_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78407,10 +78652,10 @@ int HP_unit_set_target(struct unit_data *ud, int target_id) { retVal___ = HPMHooks.source.unit.set_target(ud, target_id); } if( HPMHooks.count.HP_unit_set_target_post ) { - int (*postHookFunc) (int retVal___, struct unit_data *ud, int *target_id); + int (*postHookFunc) (int retVal___, struct unit_data *ud, int target_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_set_target_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_set_target_post[hIndex].func; - retVal___ = postHookFunc(retVal___, ud, &target_id); + retVal___ = postHookFunc(retVal___, ud, target_id); } } return retVal___; @@ -78418,11 +78663,11 @@ int HP_unit_set_target(struct unit_data *ud, int target_id) { void HP_unit_stop_attack(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_unit_stop_attack_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_stop_attack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_stop_attack_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78445,11 +78690,11 @@ int HP_unit_unattackable(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_unattackable_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_unattackable_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_unattackable_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78472,11 +78717,11 @@ int HP_unit_attack(struct block_list *src, int target_id, int continuous) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_attack_pre ) { - int (*preHookFunc) (struct block_list *src, int *target_id, int *continuous); + int (*preHookFunc) (struct block_list **src, int *target_id, int *continuous); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_attack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_attack_pre[hIndex].func; - retVal___ = preHookFunc(src, &target_id, &continuous); + retVal___ = preHookFunc(&src, &target_id, &continuous); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78487,10 +78732,10 @@ int HP_unit_attack(struct block_list *src, int target_id, int continuous) { retVal___ = HPMHooks.source.unit.attack(src, target_id, continuous); } if( HPMHooks.count.HP_unit_attack_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, int *target_id, int *continuous); + int (*postHookFunc) (int retVal___, struct block_list *src, int target_id, int continuous); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_attack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_attack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &target_id, &continuous); + retVal___ = postHookFunc(retVal___, src, target_id, continuous); } } return retVal___; @@ -78499,11 +78744,11 @@ int HP_unit_cancel_combo(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_cancel_combo_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_cancel_combo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_cancel_combo_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78526,11 +78771,11 @@ bool HP_unit_can_reach_pos(struct block_list *bl, int x, int y, int easy) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_unit_can_reach_pos_pre ) { - bool (*preHookFunc) (struct block_list *bl, int *x, int *y, int *easy); + bool (*preHookFunc) (struct block_list **bl, int *x, int *y, int *easy); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_can_reach_pos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_can_reach_pos_pre[hIndex].func; - retVal___ = preHookFunc(bl, &x, &y, &easy); + retVal___ = preHookFunc(&bl, &x, &y, &easy); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78541,10 +78786,10 @@ bool HP_unit_can_reach_pos(struct block_list *bl, int x, int y, int easy) { retVal___ = HPMHooks.source.unit.can_reach_pos(bl, x, y, easy); } if( HPMHooks.count.HP_unit_can_reach_pos_post ) { - bool (*postHookFunc) (bool retVal___, struct block_list *bl, int *x, int *y, int *easy); + bool (*postHookFunc) (bool retVal___, struct block_list *bl, int x, int y, int easy); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_can_reach_pos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_can_reach_pos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &x, &y, &easy); + retVal___ = postHookFunc(retVal___, bl, x, y, easy); } } return retVal___; @@ -78553,11 +78798,11 @@ bool HP_unit_can_reach_bl(struct block_list *bl, struct block_list *tbl, int ran int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_unit_can_reach_bl_pre ) { - bool (*preHookFunc) (struct block_list *bl, struct block_list *tbl, int *range, int *easy, short *x, short *y); + bool (*preHookFunc) (struct block_list **bl, struct block_list **tbl, int *range, int *easy, short **x, short **y); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_can_reach_bl_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_can_reach_bl_pre[hIndex].func; - retVal___ = preHookFunc(bl, tbl, &range, &easy, x, y); + retVal___ = preHookFunc(&bl, &tbl, &range, &easy, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78568,10 +78813,10 @@ bool HP_unit_can_reach_bl(struct block_list *bl, struct block_list *tbl, int ran retVal___ = HPMHooks.source.unit.can_reach_bl(bl, tbl, range, easy, x, y); } if( HPMHooks.count.HP_unit_can_reach_bl_post ) { - bool (*postHookFunc) (bool retVal___, struct block_list *bl, struct block_list *tbl, int *range, int *easy, short *x, short *y); + bool (*postHookFunc) (bool retVal___, struct block_list *bl, struct block_list *tbl, int range, int easy, short *x, short *y); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_can_reach_bl_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_can_reach_bl_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, tbl, &range, &easy, x, y); + retVal___ = postHookFunc(retVal___, bl, tbl, range, easy, x, y); } } return retVal___; @@ -78580,11 +78825,11 @@ int HP_unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_calc_pos_pre ) { - int (*preHookFunc) (struct block_list *bl, int *tx, int *ty, uint8 *dir); + int (*preHookFunc) (struct block_list **bl, int *tx, int *ty, uint8 *dir); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_calc_pos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_calc_pos_pre[hIndex].func; - retVal___ = preHookFunc(bl, &tx, &ty, &dir); + retVal___ = preHookFunc(&bl, &tx, &ty, &dir); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78595,10 +78840,10 @@ int HP_unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir) { retVal___ = HPMHooks.source.unit.calc_pos(bl, tx, ty, dir); } if( HPMHooks.count.HP_unit_calc_pos_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *tx, int *ty, uint8 *dir); + int (*postHookFunc) (int retVal___, struct block_list *bl, int tx, int ty, uint8 dir); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_calc_pos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_calc_pos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &tx, &ty, &dir); + retVal___ = postHookFunc(retVal___, bl, tx, ty, dir); } } return retVal___; @@ -78607,11 +78852,11 @@ int HP_unit_attack_timer_sub(struct block_list *src, int tid, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_attack_timer_sub_pre ) { - int (*preHookFunc) (struct block_list *src, int *tid, int64 *tick); + int (*preHookFunc) (struct block_list **src, int *tid, int64 *tick); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_attack_timer_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_attack_timer_sub_pre[hIndex].func; - retVal___ = preHookFunc(src, &tid, &tick); + retVal___ = preHookFunc(&src, &tid, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78622,10 +78867,10 @@ int HP_unit_attack_timer_sub(struct block_list *src, int tid, int64 tick) { retVal___ = HPMHooks.source.unit.attack_timer_sub(src, tid, tick); } if( HPMHooks.count.HP_unit_attack_timer_sub_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, int *tid, int64 *tick); + int (*postHookFunc) (int retVal___, struct block_list *src, int tid, int64 tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_attack_timer_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_attack_timer_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, &tid, &tick); + retVal___ = postHookFunc(retVal___, src, tid, tick); } } return retVal___; @@ -78634,11 +78879,11 @@ int HP_unit_skillcastcancel(struct block_list *bl, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_skillcastcancel_pre ) { - int (*preHookFunc) (struct block_list *bl, int *type); + int (*preHookFunc) (struct block_list **bl, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skillcastcancel_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_skillcastcancel_pre[hIndex].func; - retVal___ = preHookFunc(bl, &type); + retVal___ = preHookFunc(&bl, &type); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78649,10 +78894,10 @@ int HP_unit_skillcastcancel(struct block_list *bl, int type) { retVal___ = HPMHooks.source.unit.skillcastcancel(bl, type); } if( HPMHooks.count.HP_unit_skillcastcancel_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, int *type); + int (*postHookFunc) (int retVal___, struct block_list *bl, int type); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_skillcastcancel_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_skillcastcancel_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &type); + retVal___ = postHookFunc(retVal___, bl, type); } } return retVal___; @@ -78660,11 +78905,11 @@ int HP_unit_skillcastcancel(struct block_list *bl, int type) { void HP_unit_dataset(struct block_list *bl) { int hIndex = 0; if( HPMHooks.count.HP_unit_dataset_pre ) { - void (*preHookFunc) (struct block_list *bl); + void (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_dataset_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_dataset_pre[hIndex].func; - preHookFunc(bl); + preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78687,11 +78932,11 @@ int HP_unit_counttargeted(struct block_list *bl) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_counttargeted_pre ) { - int (*preHookFunc) (struct block_list *bl); + int (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_counttargeted_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_counttargeted_pre[hIndex].func; - retVal___ = preHookFunc(bl); + retVal___ = preHookFunc(&bl); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78714,11 +78959,11 @@ int HP_unit_fixdamage(struct block_list *src, struct block_list *target, int sde int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_fixdamage_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); + int (*preHookFunc) (struct block_list **src, struct block_list **target, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_fixdamage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_fixdamage_pre[hIndex].func; - retVal___ = preHookFunc(src, target, &sdelay, &ddelay, &damage, &div, &type, &damage2); + retVal___ = preHookFunc(&src, &target, &sdelay, &ddelay, &damage, &div, &type, &damage2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78729,10 +78974,10 @@ int HP_unit_fixdamage(struct block_list *src, struct block_list *target, int sde retVal___ = HPMHooks.source.unit.fixdamage(src, target, sdelay, ddelay, damage, div, type, damage2); } if( HPMHooks.count.HP_unit_fixdamage_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_fixdamage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_fixdamage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &sdelay, &ddelay, &damage, &div, &type, &damage2); + retVal___ = postHookFunc(retVal___, src, target, sdelay, ddelay, damage, div, type, damage2); } } return retVal___; @@ -78741,11 +78986,11 @@ int HP_unit_changeviewsize(struct block_list *bl, short size) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_changeviewsize_pre ) { - int (*preHookFunc) (struct block_list *bl, short *size); + int (*preHookFunc) (struct block_list **bl, short *size); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_changeviewsize_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_changeviewsize_pre[hIndex].func; - retVal___ = preHookFunc(bl, &size); + retVal___ = preHookFunc(&bl, &size); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78756,10 +79001,10 @@ int HP_unit_changeviewsize(struct block_list *bl, short size) { retVal___ = HPMHooks.source.unit.changeviewsize(bl, size); } if( HPMHooks.count.HP_unit_changeviewsize_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, short *size); + int (*postHookFunc) (int retVal___, struct block_list *bl, short size); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_changeviewsize_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_changeviewsize_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &size); + retVal___ = postHookFunc(retVal___, bl, size); } } return retVal___; @@ -78768,11 +79013,11 @@ int HP_unit_remove_map(struct block_list *bl, clr_type clrtype, const char *file int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_remove_map_pre ) { - int (*preHookFunc) (struct block_list *bl, clr_type *clrtype, const char *file, int *line, const char *func); + int (*preHookFunc) (struct block_list **bl, clr_type *clrtype, const char **file, int *line, const char **func); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_remove_map_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_remove_map_pre[hIndex].func; - retVal___ = preHookFunc(bl, &clrtype, file, &line, func); + retVal___ = preHookFunc(&bl, &clrtype, &file, &line, &func); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78783,10 +79028,10 @@ int HP_unit_remove_map(struct block_list *bl, clr_type clrtype, const char *file retVal___ = HPMHooks.source.unit.remove_map(bl, clrtype, file, line, func); } if( HPMHooks.count.HP_unit_remove_map_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, clr_type *clrtype, const char *file, int *line, const char *func); + int (*postHookFunc) (int retVal___, struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_remove_map_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_remove_map_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &clrtype, file, &line, func); + retVal___ = postHookFunc(retVal___, bl, clrtype, file, line, func); } } return retVal___; @@ -78794,11 +79039,11 @@ int HP_unit_remove_map(struct block_list *bl, clr_type clrtype, const char *file void HP_unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype) { int hIndex = 0; if( HPMHooks.count.HP_unit_remove_map_pc_pre ) { - void (*preHookFunc) (struct map_session_data *sd, clr_type *clrtype); + void (*preHookFunc) (struct map_session_data **sd, clr_type *clrtype); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_remove_map_pc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_remove_map_pc_pre[hIndex].func; - preHookFunc(sd, &clrtype); + preHookFunc(&sd, &clrtype); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78809,10 +79054,10 @@ void HP_unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype) { HPMHooks.source.unit.remove_map_pc(sd, clrtype); } if( HPMHooks.count.HP_unit_remove_map_pc_post ) { - void (*postHookFunc) (struct map_session_data *sd, clr_type *clrtype); + void (*postHookFunc) (struct map_session_data *sd, clr_type clrtype); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_remove_map_pc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_remove_map_pc_post[hIndex].func; - postHookFunc(sd, &clrtype); + postHookFunc(sd, clrtype); } } return; @@ -78820,11 +79065,11 @@ void HP_unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype) { void HP_unit_free_pc(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_unit_free_pc_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_free_pc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_free_pc_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78847,11 +79092,11 @@ int HP_unit_free(struct block_list *bl, clr_type clrtype) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_free_pre ) { - int (*preHookFunc) (struct block_list *bl, clr_type *clrtype); + int (*preHookFunc) (struct block_list **bl, clr_type *clrtype); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_free_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_free_pre[hIndex].func; - retVal___ = preHookFunc(bl, &clrtype); + retVal___ = preHookFunc(&bl, &clrtype); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78862,15 +79107,15 @@ int HP_unit_free(struct block_list *bl, clr_type clrtype) { retVal___ = HPMHooks.source.unit.free(bl, clrtype); } if( HPMHooks.count.HP_unit_free_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, clr_type *clrtype); + int (*postHookFunc) (int retVal___, struct block_list *bl, clr_type clrtype); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_free_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_free_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &clrtype); + retVal___ = postHookFunc(retVal___, bl, clrtype); } } return retVal___; } -/* vending */ +/* vending_interface */ void HP_vending_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_vending_init_pre ) { @@ -78889,10 +79134,10 @@ void HP_vending_init(bool minimal) { HPMHooks.source.vending.init(minimal); } if( HPMHooks.count.HP_vending_init_post ) { - void (*postHookFunc) (bool *minimal); + void (*postHookFunc) (bool minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_vending_init_post[hIndex].func; - postHookFunc(&minimal); + postHookFunc(minimal); } } return; @@ -78926,11 +79171,11 @@ void HP_vending_final(void) { void HP_vending_close(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_vending_close_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_close_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_vending_close_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(&sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78952,11 +79197,11 @@ void HP_vending_close(struct map_session_data *sd) { void HP_vending_open(struct map_session_data *sd, const char *message, const uint8 *data, int count) { int hIndex = 0; if( HPMHooks.count.HP_vending_open_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *message, const uint8 *data, int *count); + void (*preHookFunc) (struct map_session_data **sd, const char **message, const uint8 **data, int *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_open_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_vending_open_pre[hIndex].func; - preHookFunc(sd, message, data, &count); + preHookFunc(&sd, &message, &data, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78967,10 +79212,10 @@ void HP_vending_open(struct map_session_data *sd, const char *message, const uin HPMHooks.source.vending.open(sd, message, data, count); } if( HPMHooks.count.HP_vending_open_post ) { - void (*postHookFunc) (struct map_session_data *sd, const char *message, const uint8 *data, int *count); + void (*postHookFunc) (struct map_session_data *sd, const char *message, const uint8 *data, int count); for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_open_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_vending_open_post[hIndex].func; - postHookFunc(sd, message, data, &count); + postHookFunc(sd, message, data, count); } } return; @@ -78978,11 +79223,11 @@ void HP_vending_open(struct map_session_data *sd, const char *message, const uin void HP_vending_list(struct map_session_data *sd, unsigned int id) { int hIndex = 0; if( HPMHooks.count.HP_vending_list_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned int *id); + void (*preHookFunc) (struct map_session_data **sd, unsigned int *id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_list_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_vending_list_pre[hIndex].func; - preHookFunc(sd, &id); + preHookFunc(&sd, &id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -78993,10 +79238,10 @@ void HP_vending_list(struct map_session_data *sd, unsigned int id) { HPMHooks.source.vending.list(sd, id); } if( HPMHooks.count.HP_vending_list_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned int *id); + void (*postHookFunc) (struct map_session_data *sd, unsigned int id); for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_list_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_vending_list_post[hIndex].func; - postHookFunc(sd, &id); + postHookFunc(sd, id); } } return; @@ -79004,11 +79249,11 @@ void HP_vending_list(struct map_session_data *sd, unsigned int id) { void HP_vending_purchase(struct map_session_data *sd, int aid, unsigned int uid, const uint8 *data, int count) { int hIndex = 0; if( HPMHooks.count.HP_vending_purchase_pre ) { - void (*preHookFunc) (struct map_session_data *sd, int *aid, unsigned int *uid, const uint8 *data, int *count); + void (*preHookFunc) (struct map_session_data **sd, int *aid, unsigned int *uid, const uint8 **data, int *count); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_purchase_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_vending_purchase_pre[hIndex].func; - preHookFunc(sd, &aid, &uid, data, &count); + preHookFunc(&sd, &aid, &uid, &data, &count); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -79019,10 +79264,10 @@ void HP_vending_purchase(struct map_session_data *sd, int aid, unsigned int uid, HPMHooks.source.vending.purchase(sd, aid, uid, data, count); } if( HPMHooks.count.HP_vending_purchase_post ) { - void (*postHookFunc) (struct map_session_data *sd, int *aid, unsigned int *uid, const uint8 *data, int *count); + void (*postHookFunc) (struct map_session_data *sd, int aid, unsigned int uid, const uint8 *data, int count); for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_purchase_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_vending_purchase_post[hIndex].func; - postHookFunc(sd, &aid, &uid, data, &count); + postHookFunc(sd, aid, uid, data, count); } } return; @@ -79031,11 +79276,11 @@ bool HP_vending_search(struct map_session_data *sd, unsigned short nameid) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_vending_search_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, unsigned short *nameid); + bool (*preHookFunc) (struct map_session_data **sd, unsigned short *nameid); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_search_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_vending_search_pre[hIndex].func; - retVal___ = preHookFunc(sd, &nameid); + retVal___ = preHookFunc(&sd, &nameid); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -79046,10 +79291,10 @@ bool HP_vending_search(struct map_session_data *sd, unsigned short nameid) { retVal___ = HPMHooks.source.vending.search(sd, nameid); } if( HPMHooks.count.HP_vending_search_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned short *nameid); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned short nameid); for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_search_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_vending_search_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &nameid); + retVal___ = postHookFunc(retVal___, sd, nameid); } } return retVal___; @@ -79058,11 +79303,11 @@ bool HP_vending_searchall(struct map_session_data *sd, const struct s_search_sto int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_vending_searchall_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, const struct s_search_store_search *s); + bool (*preHookFunc) (struct map_session_data **sd, const struct s_search_store_search **s); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_searchall_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_vending_searchall_pre[hIndex].func; - retVal___ = preHookFunc(sd, s); + retVal___ = preHookFunc(&sd, &s); } if( *HPMforce_return ) { *HPMforce_return = false; diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index 3fe38b6bc..42d6d821c 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2013-2015 Hercules Dev Team +# Copyright (C) 2013-2016 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -46,7 +46,8 @@ ALLPLUGINS = $(filter-out HPMHooking, $(basename $(wildcard *.c))) $(HPMHOOKING) PLUGINS = sample db2sql HPMHooking_char HPMHooking_login HPMHooking_map $(MYPLUGINS) COMMON_D = ../common -COMMON_H = $(wildcard $(COMMON_D)/*.h) +# Includes private headers (plugins might need them) +COMMON_H = $(wildcard $(COMMON_D)/*.h) ../plugins/HPMHooking.h COMMON_INCLUDE = -I.. THIRDPARTY_INCLUDE = -I../../3rdparty diff --git a/src/plugins/constdb2doc.c b/src/plugins/constdb2doc.c index 1d5f37ad5..cb0b82278 100644 --- a/src/plugins/constdb2doc.c +++ b/src/plugins/constdb2doc.c @@ -93,6 +93,10 @@ void constdb2doc_constdb(void) script->hardcoded_constants(); fprintf(out_fp, "\n"); + fprintf(out_fp, "## Parameters (source)\n\n"); + script->load_parameters(); + fprintf(out_fp, "\n"); + /* Unlink */ script->set_constant = script_set_constant; script->constdb_comment = script_constdb_comment; diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c index 86708ebbc..510a56e2c 100644 --- a/src/plugins/db2sql.c +++ b/src/plugins/db2sql.c @@ -25,6 +25,7 @@ #include "common/memmgr.h" #include "common/mmo.h" #include "common/nullpo.h" +#include "common/sql.h" #include "common/strlib.h" #include "map/battle.h" #include "map/itemdb.h" diff --git a/src/plugins/dbghelpplug.c b/src/plugins/dbghelpplug.c index 6c02b1a12..cf8be0901 100644 --- a/src/plugins/dbghelpplug.c +++ b/src/plugins/dbghelpplug.c @@ -446,17 +446,17 @@ Dhp__PrintProcessInfo( fprintf(log_file, "eip=%08x esp=%08x ebp=%08x iopl=%1x %s %s %s %s %s %s %s %s %s %s\n", context->Eip, context->Esp, context->Ebp, - (context->EFlags >> 12) & 3, // IOPL level value - context->EFlags & 0x00100000 ? "vip" : " ", // VIP (virtual interrupt pending) - context->EFlags & 0x00080000 ? "vif" : " ", // VIF (virtual interrupt flag) - context->EFlags & 0x00000800 ? "ov" : "nv", // VIF (virtual interrupt flag) - context->EFlags & 0x00000400 ? "dn" : "up", // OF (overflow flag) - context->EFlags & 0x00000200 ? "ei" : "di", // IF (interrupt enable flag) - context->EFlags & 0x00000080 ? "ng" : "pl", // SF (sign flag) - context->EFlags & 0x00000040 ? "zr" : "nz", // ZF (zero flag) - context->EFlags & 0x00000010 ? "ac" : "na", // AF (aux carry flag) - context->EFlags & 0x00000004 ? "po" : "pe", // PF (parity flag) - context->EFlags & 0x00000001 ? "cy" : "nc"); // CF (carry flag) + (context->EFlags >> 12) & 3, // IOPL level value + (context->EFlags & 0x00100000) ? "vip" : " ", // VIP (virtual interrupt pending) + (context->EFlags & 0x00080000) ? "vif" : " ", // VIF (virtual interrupt flag) + (context->EFlags & 0x00000800) ? "ov" : "nv", // VIF (virtual interrupt flag) + (context->EFlags & 0x00000400) ? "dn" : "up", // OF (overflow flag) + (context->EFlags & 0x00000200) ? "ei" : "di", // IF (interrupt enable flag) + (context->EFlags & 0x00000080) ? "ng" : "pl", // SF (sign flag) + (context->EFlags & 0x00000040) ? "zr" : "nz", // ZF (zero flag) + (context->EFlags & 0x00000010) ? "ac" : "na", // AF (aux carry flag) + (context->EFlags & 0x00000004) ? "po" : "pe", // PF (parity flag) + (context->EFlags & 0x00000001) ? "cy" : "nc"); // CF (carry flag) } if( context->ContextFlags & CONTEXT_SEGMENTS ) { @@ -467,8 +467,7 @@ Dhp__PrintProcessInfo( context->SegDs, context->SegEs, context->SegFs, - context->SegGs, - context->EFlags); + context->SegGs); if( context->ContextFlags & CONTEXT_CONTROL ) fprintf(log_file, " efl=%08x", @@ -951,7 +950,6 @@ Dhp__PrintDataValue( // ULONG64 length = 0; DWORD basetype; - BOOL isValid = TRUE; assert( pInterData != NULL ); log_file = pInterData->log_file; @@ -1260,7 +1258,7 @@ Dhp__PrintDataInfo( } else if( pSymInfo->Flags & SYMFLAG_REGISTER ) { - scope = ( pSymInfo->Flags & SYMFLAG_PARAMETER ? PARAM : LOCAL ); // register, optimized out(?) + scope = (pSymInfo->Flags & SYMFLAG_PARAMETER) ? PARAM : LOCAL; // register, optimized out(?) } else { diff --git a/src/plugins/sample.c b/src/plugins/sample.c index 8fba2f4df..b1ff4b39f 100644 --- a/src/plugins/sample.c +++ b/src/plugins/sample.c @@ -29,6 +29,7 @@ #include "map/pc.h" #include "map/script.h" +#include "plugins/HPMHooking.h" #include "common/HPMDataCheck.h" /* should always be the last Hercules file included! (if you don't make it last, it'll intentionally break compile time) */ #include <stdio.h> @@ -113,20 +114,23 @@ void sample_packet0f3(int fd) { } int my_pc_dropitem_storage;/* storage var */ /* my custom prehook for pc_dropitem, checks if amount of item being dropped is higher than 1 and if so cap it to 1 and store the value of how much it was */ -int my_pc_dropitem_pre(struct map_session_data *sd,int *n,int *amount) { +int my_pc_dropitem_pre(struct map_session_data **sd, int *n, int *amount) +{ my_pc_dropitem_storage = 0; - if( *amount > 1 ) { + if (*amount > 1) { my_pc_dropitem_storage = *amount; *amount = 1; } return 0; } /* postHook receive retVal as the first param, allows posthook to act accordingly to whatever the original was going to return */ -int my_pc_dropitem_post(int retVal, struct map_session_data *sd,int *n,int *amount) { - if( retVal != 1 ) return retVal;/* we don't do anything if pc_dropitem didn't return 1 (success) */ - if( my_pc_dropitem_storage ) {/* signs whether pre-hook did this */ +int my_pc_dropitem_post(int retVal, struct map_session_data *sd, int n, int amount) +{ + if (retVal != 1) + return retVal;/* we don't do anything if pc_dropitem didn't return 1 (success) */ + if (my_pc_dropitem_storage) {/* signs whether pre-hook did this */ char output[99]; - safesnprintf(output,99,"[ Warning ] you can only drop 1 item at a time, capped from %d to 1",my_pc_dropitem_storage); + safesnprintf(output, 99, "[ Warning ] you can only drop 1 item at a time, capped from %d to 1", my_pc_dropitem_storage); clif->messagecolor_self(sd->fd, COLOR_RED, output); } return 1; @@ -199,13 +203,13 @@ HPExport void plugin_init (void) { /* in this sample we add a PreHook to pc->dropitem */ /* to identify whether the item being dropped is on amount higher than 1 */ /* if so, it stores the amount on a variable (my_pc_dropitem_storage) and changes the amount to 1 */ - addHookPre("pc->dropitem",my_pc_dropitem_pre); + addHookPre(pc, dropitem, my_pc_dropitem_pre); /* in this sample we add a PostHook to pc->dropitem */ /* if the original pc->dropitem was successful and the amount stored on my_pc_dropitem_storage is higher than 1, */ /* our posthook will display a message to the user about the cap */ /* - by checking whether it was successful (retVal value) it allows for the originals conditions to take place */ - addHookPost("pc->dropitem",my_pc_dropitem_post); + addHookPost(pc, dropitem, my_pc_dropitem_post); } } /* triggered when server starts loading, before any server-specific data is set */ diff --git a/src/test/Makefile.in b/src/test/Makefile.in index 6d2187733..c8006e5cf 100644 --- a/src/test/Makefile.in +++ b/src/test/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team +# Copyright (C) 2012-2016 Hercules Dev Team # Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ CONFIG_D = ../config CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) COMMON_D = ../common -COMMON_H = $(wildcard $(COMMON_D)/*.h) +COMMON_H = $(filter-out %.p.h, $(wildcard $(COMMON_D)/*.h)) SYSINFO_INC = $(COMMON_D)/sysinfo.inc COMMON_INCLUDE = -I.. diff --git a/src/test/test_libconfig.c b/src/test/test_libconfig.c index a3b233b98..e0a470e21 100644 --- a/src/test/test_libconfig.c +++ b/src/test/test_libconfig.c @@ -113,6 +113,7 @@ static const char *test_libconfig_read(void) libconfig->destroy(&config); return "Unable to read from file '" FILENAME "'."; } + fclose(fp); #undef FILENAME if (config.root == NULL) { libconfig->destroy(&config); @@ -200,7 +201,6 @@ static const char *test_libconfig_set_include_dir(void) static const char *test_libconfig_lookup(void) { struct config_t config; - struct config_setting_t *t = NULL; int32 i32; int64 i64; double f; @@ -221,12 +221,12 @@ static const char *test_libconfig_lookup(void) return "Unable to parse configuration."; } - if ((t = libconfig->lookup(&config, "Setting_Int")) == NULL) { + if (libconfig->lookup(&config, "Setting_Int") == NULL) { libconfig->destroy(&config); return "libconfig->lookup failed."; } - if ((t = libconfig->setting_lookup(config.root, "Setting_Int")) == NULL) { + if (libconfig->setting_lookup(config.root, "Setting_Int") == NULL) { libconfig->destroy(&config); return "libconfig->setting_lookup failed."; } diff --git a/src/test/test_spinlock.c b/src/test/test_spinlock.c index 38186a975..6ffc4eafc 100644 --- a/src/test/test_spinlock.c +++ b/src/test/test_spinlock.c @@ -91,9 +91,9 @@ int do_init(int argc, char **argv){ // Everything fine? if (val != (THRC*PERINC)) { - printf("FAILED! (Result: %u, Expected: %u)\n", val, (THRC*PERINC)); + printf("FAILED! (Result: %u, Expected: %d)\n", val, (THRC*PERINC)); } else { - printf("OK! (Result: %u, Expected: %u)\n", val, (THRC*PERINC)); + printf("OK! (Result: %u, Expected: %d)\n", val, (THRC*PERINC)); ok++; } diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in index 614ede4b7..eb1362780 100644 --- a/src/tool/Makefile.in +++ b/src/tool/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team +# Copyright (C) 2012-2016 Hercules Dev Team # Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ CONFIG_D = ../config CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) COMMON_D = ../common -COMMON_H = $(wildcard $(COMMON_D)/*.h) +COMMON_H = $(filter-out %.p.h, $(wildcard $(COMMON_D)/*.h)) SYSINFO_INC = $(COMMON_D)/sysinfo.inc COMMON_INCLUDE = -I.. |