diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc | 52 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HookingPoints.inc | 13 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.Hooks.inc | 1080 |
3 files changed, 778 insertions, 367 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index d26779ccb..9c4c5bc55 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -61,6 +61,8 @@ struct { struct HPMHookPoint *HP_atcommand_doload_post; struct HPMHookPoint *HP_atcommand_base_commands_pre; struct HPMHookPoint *HP_atcommand_base_commands_post; + struct HPMHookPoint *HP_atcommand_add_pre; + struct HPMHookPoint *HP_atcommand_add_post; struct HPMHookPoint *HP_battle_init_pre; struct HPMHookPoint *HP_battle_init_post; struct HPMHookPoint *HP_battle_final_pre; @@ -2097,6 +2099,8 @@ struct { struct HPMHookPoint *HP_instance_init_post; struct HPMHookPoint *HP_instance_final_pre; struct HPMHookPoint *HP_instance_final_post; + struct HPMHookPoint *HP_instance_reload_pre; + struct HPMHookPoint *HP_instance_reload_post; struct HPMHookPoint *HP_instance_create_pre; struct HPMHookPoint *HP_instance_create_post; struct HPMHookPoint *HP_instance_add_map_pre; @@ -2107,6 +2111,12 @@ struct { struct HPMHookPoint *HP_instance_map2imap_post; struct HPMHookPoint *HP_instance_mapid2imapid_pre; struct HPMHookPoint *HP_instance_mapid2imapid_post; + struct HPMHookPoint *HP_instance_mapname2imap_pre; + struct HPMHookPoint *HP_instance_mapname2imap_post; + struct HPMHookPoint *HP_instance_map_npcsub_pre; + struct HPMHookPoint *HP_instance_map_npcsub_post; + struct HPMHookPoint *HP_instance_init_npc_pre; + struct HPMHookPoint *HP_instance_init_npc_post; struct HPMHookPoint *HP_instance_destroy_pre; struct HPMHookPoint *HP_instance_destroy_post; struct HPMHookPoint *HP_instance_start_pre; @@ -2847,6 +2857,12 @@ struct { struct HPMHookPoint *HP_map_addblcell_post; struct HPMHookPoint *HP_map_delblcell_pre; struct HPMHookPoint *HP_map_delblcell_post; + struct HPMHookPoint *HP_map_get_new_bonus_id_pre; + struct HPMHookPoint *HP_map_get_new_bonus_id_post; + struct HPMHookPoint *HP_map_add_questinfo_pre; + struct HPMHookPoint *HP_map_add_questinfo_post; + struct HPMHookPoint *HP_map_remove_questinfo_pre; + struct HPMHookPoint *HP_map_remove_questinfo_post; struct HPMHookPoint *HP_mapit_alloc_pre; struct HPMHookPoint *HP_mapit_alloc_post; struct HPMHookPoint *HP_mapit_free_pre; @@ -3235,6 +3251,10 @@ struct { struct HPMHookPoint *HP_npc_delsrcfile_post; struct HPMHookPoint *HP_npc_parsename_pre; struct HPMHookPoint *HP_npc_parsename_post; + struct HPMHookPoint *HP_npc_parseview_pre; + struct HPMHookPoint *HP_npc_parseview_post; + struct HPMHookPoint *HP_npc_viewisid_pre; + struct HPMHookPoint *HP_npc_viewisid_post; struct HPMHookPoint *HP_npc_add_warp_pre; struct HPMHookPoint *HP_npc_add_warp_post; struct HPMHookPoint *HP_npc_parse_warp_pre; @@ -3785,6 +3805,10 @@ struct { struct HPMHookPoint *HP_pc_bank_deposit_post; struct HPMHookPoint *HP_pc_bank_withdraw_pre; struct HPMHookPoint *HP_pc_bank_withdraw_post; + struct HPMHookPoint *HP_pc_rental_expire_pre; + struct HPMHookPoint *HP_pc_rental_expire_post; + struct HPMHookPoint *HP_pc_scdata_received_pre; + struct HPMHookPoint *HP_pc_scdata_received_post; struct HPMHookPoint *HP_pet_init_pre; struct HPMHookPoint *HP_pet_init_post; struct HPMHookPoint *HP_pet_final_pre; @@ -4511,6 +4535,8 @@ struct { struct HPMHookPoint *HP_skill_maelstrom_suction_post; struct HPMHookPoint *HP_skill_get_new_group_id_pre; struct HPMHookPoint *HP_skill_get_new_group_id_post; + struct HPMHookPoint *HP_skill_check_shadowform_pre; + struct HPMHookPoint *HP_skill_check_shadowform_post; struct HPMHookPoint *HP_status_init_pre; struct HPMHookPoint *HP_status_init_post; struct HPMHookPoint *HP_status_final_pre; @@ -4938,6 +4964,8 @@ struct { int HP_atcommand_doload_post; int HP_atcommand_base_commands_pre; int HP_atcommand_base_commands_post; + int HP_atcommand_add_pre; + int HP_atcommand_add_post; int HP_battle_init_pre; int HP_battle_init_post; int HP_battle_final_pre; @@ -6974,6 +7002,8 @@ struct { int HP_instance_init_post; int HP_instance_final_pre; int HP_instance_final_post; + int HP_instance_reload_pre; + int HP_instance_reload_post; int HP_instance_create_pre; int HP_instance_create_post; int HP_instance_add_map_pre; @@ -6984,6 +7014,12 @@ struct { int HP_instance_map2imap_post; int HP_instance_mapid2imapid_pre; int HP_instance_mapid2imapid_post; + int HP_instance_mapname2imap_pre; + int HP_instance_mapname2imap_post; + int HP_instance_map_npcsub_pre; + int HP_instance_map_npcsub_post; + int HP_instance_init_npc_pre; + int HP_instance_init_npc_post; int HP_instance_destroy_pre; int HP_instance_destroy_post; int HP_instance_start_pre; @@ -7724,6 +7760,12 @@ struct { int HP_map_addblcell_post; int HP_map_delblcell_pre; int HP_map_delblcell_post; + int HP_map_get_new_bonus_id_pre; + int HP_map_get_new_bonus_id_post; + int HP_map_add_questinfo_pre; + int HP_map_add_questinfo_post; + int HP_map_remove_questinfo_pre; + int HP_map_remove_questinfo_post; int HP_mapit_alloc_pre; int HP_mapit_alloc_post; int HP_mapit_free_pre; @@ -8112,6 +8154,10 @@ struct { int HP_npc_delsrcfile_post; int HP_npc_parsename_pre; int HP_npc_parsename_post; + int HP_npc_parseview_pre; + int HP_npc_parseview_post; + int HP_npc_viewisid_pre; + int HP_npc_viewisid_post; int HP_npc_add_warp_pre; int HP_npc_add_warp_post; int HP_npc_parse_warp_pre; @@ -8662,6 +8708,10 @@ struct { int HP_pc_bank_deposit_post; int HP_pc_bank_withdraw_pre; int HP_pc_bank_withdraw_post; + int HP_pc_rental_expire_pre; + int HP_pc_rental_expire_post; + int HP_pc_scdata_received_pre; + int HP_pc_scdata_received_post; int HP_pet_init_pre; int HP_pet_init_post; int HP_pet_final_pre; @@ -9388,6 +9438,8 @@ struct { int HP_skill_maelstrom_suction_post; int HP_skill_get_new_group_id_pre; int HP_skill_get_new_group_id_post; + int HP_skill_check_shadowform_pre; + int HP_skill_check_shadowform_post; int HP_status_init_pre; int HP_status_init_post; int HP_status_final_pre; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index 7f7d9d40d..75fcdac54 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -34,6 +34,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(atcommand->cmd_db_clear_sub, HP_atcommand_cmd_db_clear_sub) }, { HP_POP(atcommand->doload, HP_atcommand_doload) }, { HP_POP(atcommand->base_commands, HP_atcommand_base_commands) }, + { HP_POP(atcommand->add, HP_atcommand_add) }, /* battle */ { HP_POP(battle->init, HP_battle_init) }, { HP_POP(battle->final, HP_battle_final) }, @@ -1064,11 +1065,15 @@ struct HookingPointData HookingPoints[] = { /* instance */ { HP_POP(instance->init, HP_instance_init) }, { HP_POP(instance->final, HP_instance_final) }, + { HP_POP(instance->reload, HP_instance_reload) }, { HP_POP(instance->create, HP_instance_create) }, { HP_POP(instance->add_map, HP_instance_add_map) }, { HP_POP(instance->del_map, HP_instance_del_map) }, { HP_POP(instance->map2imap, HP_instance_map2imap) }, { HP_POP(instance->mapid2imapid, HP_instance_mapid2imapid) }, + { HP_POP(instance->mapname2imap, HP_instance_mapname2imap) }, + { HP_POP(instance->map_npcsub, HP_instance_map_npcsub) }, + { HP_POP(instance->init_npc, HP_instance_init_npc) }, { HP_POP(instance->destroy, HP_instance_destroy) }, { HP_POP(instance->start, HP_instance_start) }, { HP_POP(instance->check_idle, HP_instance_check_idle) }, @@ -1445,6 +1450,9 @@ struct HookingPointData HookingPoints[] = { { HP_POP(map->arg_next_value, HP_map_arg_next_value) }, { HP_POP(map->addblcell, HP_map_addblcell) }, { HP_POP(map->delblcell, HP_map_delblcell) }, + { HP_POP(map->get_new_bonus_id, HP_map_get_new_bonus_id) }, + { HP_POP(map->add_questinfo, HP_map_add_questinfo) }, + { HP_POP(map->remove_questinfo, HP_map_remove_questinfo) }, /* mapit */ { HP_POP(mapit->alloc, HP_mapit_alloc) }, { HP_POP(mapit->free, HP_mapit_free) }, @@ -1644,6 +1652,8 @@ struct HookingPointData HookingPoints[] = { { HP_POP(npc->addsrcfile, HP_npc_addsrcfile) }, { HP_POP(npc->delsrcfile, HP_npc_delsrcfile) }, { HP_POP(npc->parsename, HP_npc_parsename) }, + { HP_POP(npc->parseview, HP_npc_parseview) }, + { HP_POP(npc->viewisid, HP_npc_viewisid) }, { HP_POP(npc->add_warp, HP_npc_add_warp) }, { HP_POP(npc->parse_warp, HP_npc_parse_warp) }, { HP_POP(npc->parse_shop, HP_npc_parse_shop) }, @@ -1922,6 +1932,8 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pc->removecombo, HP_pc_removecombo) }, { HP_POP(pc->bank_deposit, HP_pc_bank_deposit) }, { HP_POP(pc->bank_withdraw, HP_pc_bank_withdraw) }, + { HP_POP(pc->rental_expire, HP_pc_rental_expire) }, + { HP_POP(pc->scdata_received, HP_pc_scdata_received) }, /* pet */ { HP_POP(pet->init, HP_pet_init) }, { HP_POP(pet->final, HP_pet_final) }, @@ -2290,6 +2302,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(skill->cooldown_save, HP_skill_cooldown_save) }, { HP_POP(skill->maelstrom_suction, HP_skill_maelstrom_suction) }, { HP_POP(skill->get_new_group_id, HP_skill_get_new_group_id) }, + { HP_POP(skill->check_shadowform, HP_skill_check_shadowform) }, /* status */ { HP_POP(status->init, HP_status_init) }, { HP_POP(status->final, HP_status_final) }, diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index 8823eedae..178369035 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -763,6 +763,32 @@ void HP_atcommand_base_commands(void) { } return; } +bool HP_atcommand_add(char *name, AtCommandFunc func) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_atcommand_add_pre ) { + bool (*preHookFunc) (char *name, AtCommandFunc *func); + for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_add_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_atcommand_add_pre[hIndex].func; + retVal___ = preHookFunc(name, &func); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.atcommand.add(name, func); + } + if( HPMHooks.count.HP_atcommand_add_post ) { + bool (*postHookFunc) (bool retVal___, char *name, AtCommandFunc *func); + 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); + } + } + return retVal___; +} /* battle */ void HP_battle_init(void) { int hIndex = 0; @@ -919,11 +945,11 @@ int64 HP_battle_calc_bg_damage(struct block_list *src, struct block_list *bl, in } return retVal___; } -enum damage_lv HP_battle_weapon_attack(struct block_list *bl, struct block_list *target, unsigned int tick, int flag) { +enum damage_lv HP_battle_weapon_attack(struct block_list *bl, struct block_list *target, int64 tick, int flag) { 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, unsigned int *tick, int *flag); + enum damage_lv (*preHookFunc) (struct block_list *bl, struct block_list *target, int64 *tick, int *flag); 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); @@ -937,7 +963,7 @@ 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, unsigned int *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); @@ -972,11 +998,11 @@ struct Damage HP_battle_calc_weapon_attack(struct block_list *src, struct block_ } return retVal___; } -int HP_battle_delay_damage(unsigned int 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 HP_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) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_delay_damage_pre ) { - int (*preHookFunc) (unsigned int *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); 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); @@ -990,7 +1016,7 @@ int HP_battle_delay_damage(unsigned int tick, int amotion, struct block_list *sr 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___, unsigned int *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); @@ -1612,11 +1638,11 @@ int HP_battle_get_enemy_area_sub(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_battle_delay_damage_sub(int tid, unsigned int tick, int id, intptr_t data) { +int HP_battle_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_battle_delay_damage_sub_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_delay_damage_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_delay_damage_sub_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -1630,7 +1656,7 @@ int HP_battle_delay_damage_sub(int tid, unsigned int 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, unsigned int *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); @@ -2264,11 +2290,11 @@ void HP_bg_begin(struct bg_arena *arena) { } return; } -int HP_bg_begin_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_bg_begin_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_bg_begin_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_begin_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_begin_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -2282,7 +2308,7 @@ int HP_bg_begin_timer(int tid, unsigned int 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, unsigned int *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); @@ -2315,11 +2341,11 @@ void HP_bg_queue_pregame(struct bg_arena *arena) { } return; } -int HP_bg_fillup_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_bg_fillup_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_bg_fillup_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_fillup_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_fillup_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -2333,7 +2359,7 @@ int HP_bg_fillup_timer(int tid, unsigned int 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, unsigned int *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); @@ -2734,11 +2760,11 @@ int HP_bg_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) { } return retVal___; } -int HP_bg_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_bg_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_bg_send_xy_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_xy_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_send_xy_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -2752,7 +2778,7 @@ int HP_bg_send_xy_timer(int tid, unsigned int 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, unsigned int *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); @@ -4309,11 +4335,11 @@ bool HP_chrif_sd_to_auth(TBL_PC *sd, enum sd_state state) { } return retVal___; } -int HP_chrif_check_connect_char_server(int tid, unsigned int tick, int id, intptr_t data) { +int HP_chrif_check_connect_char_server(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chrif_check_connect_char_server_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_check_connect_char_server_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_check_connect_char_server_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -4327,7 +4353,7 @@ int HP_chrif_check_connect_char_server(int tid, unsigned int tick, int id, intpt 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, unsigned int *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); @@ -4507,11 +4533,11 @@ int HP_chrif_auth_db_final(DBKey key, DBData *data, va_list ap) { } return retVal___; } -int HP_chrif_send_usercount_tochar(int tid, unsigned int tick, int id, intptr_t data) { +int HP_chrif_send_usercount_tochar(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chrif_send_usercount_tochar_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_send_usercount_tochar_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_send_usercount_tochar_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -4525,7 +4551,7 @@ int HP_chrif_send_usercount_tochar(int tid, unsigned int tick, int id, intptr_t 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, unsigned int *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); @@ -4533,11 +4559,11 @@ int HP_chrif_send_usercount_tochar(int tid, unsigned int tick, int id, intptr_t } return retVal___; } -int HP_chrif_auth_db_cleanup(int tid, unsigned int tick, int id, intptr_t data) { +int HP_chrif_auth_db_cleanup(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chrif_auth_db_cleanup_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_db_cleanup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_auth_db_cleanup_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -4551,7 +4577,7 @@ int HP_chrif_auth_db_cleanup(int tid, unsigned int 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, unsigned int *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); @@ -5790,13 +5816,13 @@ void HP_clif_cart_delitem(struct map_session_data *sd, int n, int amount) { } return; } -void HP_clif_equipitemack(struct map_session_data *sd, int n, int pos, int ok) { +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, int *ok); + void (*preHookFunc) (struct map_session_data *sd, int *n, int *pos, enum e_EQUIP_ITEM_ACK *result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_equipitemack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_equipitemack_pre[hIndex].func; - preHookFunc(sd, &n, &pos, &ok); + preHookFunc(sd, &n, &pos, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5804,24 +5830,24 @@ void HP_clif_equipitemack(struct map_session_data *sd, int n, int pos, int ok) { } } { - HPMHooks.source.clif.equipitemack(sd, n, pos, ok); + 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, int *ok); + 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, &ok); + postHookFunc(sd, &n, &pos, &result); } } return; } -void HP_clif_unequipitemack(struct map_session_data *sd, int n, int pos, int ok) { +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, int *ok); + void (*preHookFunc) (struct map_session_data *sd, int *n, int *pos, enum e_UNEQUIP_ITEM_ACK *result); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_unequipitemack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_unequipitemack_pre[hIndex].func; - preHookFunc(sd, &n, &pos, &ok); + preHookFunc(sd, &n, &pos, &result); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5829,13 +5855,13 @@ void HP_clif_unequipitemack(struct map_session_data *sd, int n, int pos, int ok) } } { - HPMHooks.source.clif.unequipitemack(sd, n, pos, ok); + 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, int *ok); + 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, &ok); + postHookFunc(sd, &n, &pos, &result); } } return; @@ -6090,10 +6116,10 @@ void HP_clif_clearunit_area(struct block_list *bl, clr_type type) { } return; } -void HP_clif_clearunit_delayed(struct block_list *bl, clr_type type, unsigned int tick) { +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, unsigned int *tick); + void (*preHookFunc) (struct block_list *bl, clr_type *type, int64 *tick); 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); @@ -6107,7 +6133,7 @@ void HP_clif_clearunit_delayed(struct block_list *bl, clr_type type, unsigned in 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, unsigned int *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); @@ -6440,11 +6466,11 @@ void HP_clif_skillunit_update(struct block_list *bl) { } return; } -int HP_clif_clearunit_delayed_sub(int tid, unsigned int tick, int id, intptr_t data) { +int HP_clif_clearunit_delayed_sub(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_clearunit_delayed_sub_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_delayed_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_clearunit_delayed_sub_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -6458,7 +6484,7 @@ int HP_clif_clearunit_delayed_sub(int tid, unsigned int tick, int id, intptr_t d 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, unsigned int *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); @@ -7400,11 +7426,11 @@ void HP_clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x, } return; } -int HP_clif_damage(struct block_list *src, struct block_list *dst, unsigned int tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2) { +int HP_clif_damage(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_damage_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *dst, unsigned int *tick, int *sdelay, int *ddelay, int64 *damage, int *div, int *type, int64 *damage2); + int (*preHookFunc) (struct block_list *src, struct block_list *dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, int *type, int64 *damage2); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_damage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_damage_pre[hIndex].func; retVal___ = preHookFunc(src, dst, &tick, &sdelay, &ddelay, &damage, &div, &type, &damage2); @@ -7418,7 +7444,7 @@ int HP_clif_damage(struct block_list *src, struct block_list *dst, unsigned int retVal___ = HPMHooks.source.clif.damage(src, dst, tick, 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, unsigned int *tick, int *sdelay, int *ddelay, int64 *damage, int *div, int *type, int64 *damage2); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, int *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, &tick, &sdelay, &ddelay, &damage, &div, &type, &damage2); @@ -7815,13 +7841,13 @@ void HP_clif_skill_fail(struct map_session_data *sd, uint16 skill_id, enum usesk } return; } -void HP_clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsigned int tick) { +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 *tick); + void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, unsigned int *duration); 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, &tick); + preHookFunc(sd, &skill_id, &duration); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7829,13 +7855,13 @@ void HP_clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, unsign } } { - HPMHooks.source.clif.skill_cooldown(sd, skill_id, tick); + 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 *tick); + 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, &tick); + postHookFunc(sd, &skill_id, &duration); } } return; @@ -9454,11 +9480,11 @@ void HP_clif_charnameupdate(struct map_session_data *ssd) { } return; } -int HP_clif_delayquit(int tid, unsigned int tick, int id, intptr_t data) { +int HP_clif_delayquit(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_delayquit_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delayquit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_delayquit_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -9472,7 +9498,7 @@ int HP_clif_delayquit(int tid, unsigned int 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, unsigned int *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); @@ -9880,11 +9906,11 @@ void HP_clif_callpartner(struct map_session_data *sd) { } return; } -int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, unsigned int tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type) { +int HP_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) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_skill_damage_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *dst, unsigned int *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); 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); @@ -9898,7 +9924,7 @@ int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, unsigne 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, unsigned int *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); @@ -9932,10 +9958,10 @@ int HP_clif_skill_nodamage(struct block_list *src, struct block_list *dst, uint1 } return retVal___; } -void HP_clif_skill_poseffect(struct block_list *src, uint16 skill_id, int val, int x, int y, int tick) { +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, int *tick); + void (*preHookFunc) (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_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skill_poseffect_pre[hIndex].func; preHookFunc(src, &skill_id, &val, &x, &y, &tick); @@ -9949,7 +9975,7 @@ 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, int *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); @@ -15746,10 +15772,10 @@ void HP_clif_readbook(int fd, int book_id, int page) { } return; } -void HP_clif_notify_time(struct map_session_data *sd, unsigned long time) { +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, unsigned long *time); + void (*preHookFunc) (struct map_session_data *sd, int64 *time); 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); @@ -15763,7 +15789,7 @@ void HP_clif_notify_time(struct map_session_data *sd, unsigned long time) { HPMHooks.source.clif.notify_time(sd, time); } if( HPMHooks.count.HP_clif_notify_time_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned long *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); @@ -15846,11 +15872,11 @@ void HP_clif_bc_ready(void) { } return; } -int HP_clif_undisguise_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_clif_undisguise_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_undisguise_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_undisguise_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_undisguise_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -15864,7 +15890,7 @@ int HP_clif_undisguise_timer(int tid, unsigned int 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, unsigned int *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); @@ -16572,10 +16598,10 @@ void HP_clif_pActionRequest(int fd, struct map_session_data *sd) { } return; } -void HP_clif_pActionRequest_sub(struct map_session_data *sd, int action_type, int target_id, unsigned int tick) { +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, unsigned int *tick); + void (*preHookFunc) (struct map_session_data *sd, int *action_type, int *target_id, int64 *tick); 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); @@ -16589,7 +16615,7 @@ 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, unsigned int *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); @@ -17422,10 +17448,10 @@ void HP_clif_pUseSkillToId(int fd, struct map_session_data *sd) { } return; } -void HP_clif_pUseSkillToId_homun(struct homun_data *hd, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, int target_id) { +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, unsigned int *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); 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); @@ -17439,7 +17465,7 @@ 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, unsigned int *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); @@ -17447,10 +17473,10 @@ void HP_clif_pUseSkillToId_homun(struct homun_data *hd, struct map_session_data } return; } -void HP_clif_pUseSkillToId_mercenary(struct mercenary_data *md, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, int target_id) { +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, unsigned int *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); 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); @@ -17464,7 +17490,7 @@ 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, unsigned int *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); @@ -17522,10 +17548,10 @@ void HP_clif_pUseSkillToPosSub(int fd, struct map_session_data *sd, uint16 skill } return; } -void HP_clif_pUseSkillToPos_homun(struct homun_data *hd, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo) { +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, unsigned int *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); 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); @@ -17539,7 +17565,7 @@ 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, unsigned int *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); @@ -17547,10 +17573,10 @@ void HP_clif_pUseSkillToPos_homun(struct homun_data *hd, struct map_session_data } return; } -void HP_clif_pUseSkillToPos_mercenary(struct mercenary_data *md, struct map_session_data *sd, unsigned int tick, uint16 skill_id, uint16 skill_lv, short x, short y, int skillmoreinfo) { +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, unsigned int *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); 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); @@ -17564,7 +17590,7 @@ 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, unsigned int *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); @@ -22417,11 +22443,11 @@ int HP_elemental_clean_effect(struct elemental_data *ed) { } return retVal___; } -int HP_elemental_action(struct elemental_data *ed, struct block_list *bl, unsigned int tick) { +int HP_elemental_action(struct elemental_data *ed, struct block_list *bl, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_action_pre ) { - int (*preHookFunc) (struct elemental_data *ed, struct block_list *bl, unsigned int *tick); + int (*preHookFunc) (struct elemental_data *ed, struct block_list *bl, int64 *tick); 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); @@ -22435,7 +22461,7 @@ int HP_elemental_action(struct elemental_data *ed, struct block_list *bl, unsign 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, unsigned int *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); @@ -22597,11 +22623,11 @@ void HP_elemental_summon_init(struct elemental_data *ed) { } return; } -int HP_elemental_summon_end_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_elemental_summon_end_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_summon_end_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_summon_end_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_summon_end_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -22615,7 +22641,7 @@ int HP_elemental_summon_end_timer(int tid, unsigned int tick, int id, intptr_t d 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, unsigned int *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); @@ -22655,11 +22681,11 @@ int HP_elemental_ai_sub_timer_activesearch(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_data *sd, unsigned int tick) { +int HP_elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_data *sd, int64 tick) { 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, unsigned int *tick); + int (*preHookFunc) (struct elemental_data *ed, struct map_session_data *sd, int64 *tick); 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); @@ -22673,7 +22699,7 @@ 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, unsigned int *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); @@ -22713,11 +22739,11 @@ int HP_elemental_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) { } return retVal___; } -int HP_elemental_ai_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_elemental_ai_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_ai_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_ai_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_ai_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -22731,7 +22757,7 @@ int HP_elemental_ai_timer(int tid, unsigned int 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, unsigned int *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); @@ -24520,11 +24546,11 @@ void HP_guild_aura_refresh(struct map_session_data *sd, uint16 skill_id, uint16 } return; } -int HP_guild_payexp_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_guild_payexp_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_payexp_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_payexp_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_payexp_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -24538,7 +24564,7 @@ int HP_guild_payexp_timer(int tid, unsigned int 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, unsigned int *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); @@ -24688,11 +24714,11 @@ int HP_guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) { } return retVal___; } -int HP_guild_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_guild_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_send_xy_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_send_xy_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_send_xy_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -24706,7 +24732,7 @@ int HP_guild_send_xy_timer(int tid, unsigned int 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, unsigned int *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); @@ -26106,11 +26132,11 @@ bool HP_homun_feed(struct map_session_data *sd, struct homun_data *hd) { } return retVal___; } -int HP_homun_hunger_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_homun_hunger_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_hunger_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_hunger_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_hunger_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -26124,7 +26150,7 @@ int HP_homun_hunger_timer(int tid, unsigned int 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, unsigned int *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); @@ -26694,6 +26720,31 @@ void HP_instance_final(void) { } return; } +void HP_instance_reload(void) { + int hIndex = 0; + if( HPMHooks.count.HP_instance_reload_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_reload_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_instance_reload_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.instance.reload(); + } + if( HPMHooks.count.HP_instance_reload_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_reload_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_instance_reload_post[hIndex].func; + postHookFunc(); + } + } + return; +} int HP_instance_create(int party_id, const char *name, enum instance_owner_type type) { int hIndex = 0; int retVal___ = 0; @@ -26823,6 +26874,96 @@ int HP_instance_mapid2imapid(int16 m, int instance_id) { } return retVal___; } +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); + 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); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + 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); + 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); + } + } + return retVal___; +} +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); + 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); + va_end(args___copy); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + va_list args___copy; va_copy(args___copy, args); + retVal___ = HPMHooks.source.instance.map_npcsub(bl, args___copy); + va_end(args___copy); + } + if( HPMHooks.count.HP_instance_map_npcsub_post ) { + int (*postHookFunc) (int retVal___, struct block_list *bl, va_list args); + for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_map_npcsub_post; hIndex++ ) { + va_list args___copy; va_copy(args___copy, args); + postHookFunc = HPMHooks.list.HP_instance_map_npcsub_post[hIndex].func; + retVal___ = postHookFunc(retVal___, bl, args___copy); + va_end(args___copy); + } + } + return retVal___; +} +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); + 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); + va_end(args___copy); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + va_list args___copy; va_copy(args___copy, args); + retVal___ = HPMHooks.source.instance.init_npc(bl, args___copy); + va_end(args___copy); + } + if( HPMHooks.count.HP_instance_init_npc_post ) { + int (*postHookFunc) (int retVal___, struct block_list *bl, va_list args); + for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_init_npc_post; hIndex++ ) { + va_list args___copy; va_copy(args___copy, args); + postHookFunc = HPMHooks.list.HP_instance_init_npc_post[hIndex].func; + retVal___ = postHookFunc(retVal___, bl, args___copy); + va_end(args___copy); + } + } + return retVal___; +} void HP_instance_destroy(int instance_id) { int hIndex = 0; if( HPMHooks.count.HP_instance_destroy_pre ) { @@ -26974,11 +27115,11 @@ bool HP_instance_valid(int instance_id) { } return retVal___; } -int HP_instance_destroy_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_instance_destroy_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_instance_destroy_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_destroy_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_instance_destroy_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -26992,7 +27133,7 @@ int HP_instance_destroy_timer(int tid, unsigned int 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, unsigned int *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); @@ -30453,11 +30594,11 @@ struct irc_func* HP_ircbot_func_search(char *function_name) { } return retVal___; } -int HP_ircbot_connect_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_ircbot_connect_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_ircbot_connect_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_connect_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_connect_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -30471,7 +30612,7 @@ int HP_ircbot_connect_timer(int tid, unsigned int 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, unsigned int *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); @@ -30479,11 +30620,11 @@ int HP_ircbot_connect_timer(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_ircbot_identify_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_ircbot_identify_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_ircbot_identify_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_identify_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_identify_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -30497,7 +30638,7 @@ int HP_ircbot_identify_timer(int tid, unsigned int 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, unsigned int *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); @@ -30505,11 +30646,11 @@ int HP_ircbot_identify_timer(int tid, unsigned int tick, int id, intptr_t data) } return retVal___; } -int HP_ircbot_join_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_ircbot_join_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_ircbot_join_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_join_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_join_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -30523,7 +30664,7 @@ int HP_ircbot_join_timer(int tid, unsigned int 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, unsigned int *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); @@ -33491,11 +33632,11 @@ int HP_map_delblock(struct block_list *bl) { } return retVal___; } -int HP_map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) { +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, unsigned int *tick); + int (*preHookFunc) (struct block_list *bl, int *x1, int *y1, int64 *tick); 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); @@ -33509,7 +33650,7 @@ int HP_map_moveblock(struct block_list *bl, int x1, int y1, unsigned int 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, unsigned int *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); @@ -33673,11 +33814,11 @@ bool HP_map_addnpc(int16 m, struct npc_data *nd) { } return retVal___; } -int HP_map_clearflooritem_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_map_clearflooritem_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_clearflooritem_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_clearflooritem_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_clearflooritem_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -33691,7 +33832,7 @@ int HP_map_clearflooritem_timer(int tid, unsigned int tick, int id, intptr_t dat retVal___ = HPMHooks.source.map.clearflooritem_timer(tid, tick, id, data); } if( HPMHooks.count.HP_map_clearflooritem_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, unsigned int *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); @@ -33699,11 +33840,11 @@ int HP_map_clearflooritem_timer(int tid, unsigned int tick, int id, intptr_t dat } return retVal___; } -int HP_map_removemobs_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_map_removemobs_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_removemobs_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_removemobs_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_removemobs_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -33717,7 +33858,7 @@ int HP_map_removemobs_timer(int tid, unsigned int 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, unsigned int *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); @@ -35308,11 +35449,11 @@ void HP_map_do_shutdown(void) { } return; } -int HP_map_freeblock_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_map_freeblock_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_freeblock_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_freeblock_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_freeblock_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -35326,7 +35467,7 @@ int HP_map_freeblock_timer(int tid, unsigned int 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, unsigned int *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); @@ -36471,6 +36612,83 @@ void HP_map_delblcell(struct block_list *bl) { } return; } +int HP_map_get_new_bonus_id(void) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_map_get_new_bonus_id_pre ) { + int (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_map_get_new_bonus_id_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_map_get_new_bonus_id_pre[hIndex].func; + retVal___ = preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.map.get_new_bonus_id(); + } + if( HPMHooks.count.HP_map_get_new_bonus_id_post ) { + int (*postHookFunc) (int retVal___); + for(hIndex = 0; hIndex < HPMHooks.count.HP_map_get_new_bonus_id_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_map_get_new_bonus_id_post[hIndex].func; + retVal___ = postHookFunc(retVal___); + } + } + return retVal___; +} +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); + 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); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.map.add_questinfo(m, qi); + } + if( HPMHooks.count.HP_map_add_questinfo_post ) { + 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); + } + } + return; +} +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); + 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); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + 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); + 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); + } + } + return retVal___; +} /* mapit */ struct s_mapiterator* HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types) { int hIndex = 0; @@ -36858,11 +37076,11 @@ void HP_mapreg_save(void) { } return; } -int HP_mapreg_save_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_mapreg_save_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapreg_save_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_save_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapreg_save_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -36876,7 +37094,7 @@ int HP_mapreg_save_timer(int tid, unsigned int 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, unsigned int *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); @@ -37505,11 +37723,11 @@ int HP_mercenary_search_index(int class_) { } return retVal___; } -int HP_mercenary_contract_end_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_mercenary_contract_end_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_contract_end_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_contract_end_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_contract_end_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -37523,7 +37741,7 @@ int HP_mercenary_contract_end_timer(int tid, unsigned int tick, int id, intptr_t 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, unsigned int *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); @@ -37739,11 +37957,11 @@ int HP_mob_makedummymobdb(int p1) { } return retVal___; } -int HP_mob_spawn_guardian_sub(int tid, unsigned int tick, int id, intptr_t data) { +int HP_mob_spawn_guardian_sub(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_spawn_guardian_sub_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_guardian_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_spawn_guardian_sub_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -37757,7 +37975,7 @@ int HP_mob_spawn_guardian_sub(int tid, unsigned int 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, unsigned int *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); @@ -38263,11 +38481,11 @@ int HP_mob_linksearch(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_mob_delayspawn(int tid, unsigned int tick, int id, intptr_t data) { +int HP_mob_delayspawn(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_delayspawn_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_delayspawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_delayspawn_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -38281,7 +38499,7 @@ int HP_mob_delayspawn(int tid, unsigned int 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, unsigned int *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); @@ -38585,11 +38803,11 @@ int HP_mob_warpchase_sub(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_mob_ai_sub_hard_slavemob(struct mob_data *md, unsigned int tick) { +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, unsigned int *tick); + int (*preHookFunc) (struct mob_data *md, int64 *tick); 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); @@ -38603,7 +38821,7 @@ int HP_mob_ai_sub_hard_slavemob(struct mob_data *md, unsigned int 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, unsigned int *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); @@ -38611,11 +38829,11 @@ int HP_mob_ai_sub_hard_slavemob(struct mob_data *md, unsigned int tick) { } return retVal___; } -int HP_mob_unlocktarget(struct mob_data *md, unsigned int tick) { +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, unsigned int *tick); + int (*preHookFunc) (struct mob_data *md, int64 *tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_unlocktarget_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_unlocktarget_pre[hIndex].func; retVal___ = preHookFunc(md, &tick); @@ -38629,7 +38847,7 @@ int HP_mob_unlocktarget(struct mob_data *md, unsigned int tick) { retVal___ = HPMHooks.source.mob.unlocktarget(md, tick); } if( HPMHooks.count.HP_mob_unlocktarget_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, unsigned int *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); @@ -38637,11 +38855,11 @@ int HP_mob_unlocktarget(struct mob_data *md, unsigned int tick) { } return retVal___; } -int HP_mob_randomwalk(struct mob_data *md, unsigned int tick) { +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, unsigned int *tick); + int (*preHookFunc) (struct mob_data *md, int64 *tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_randomwalk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_randomwalk_pre[hIndex].func; retVal___ = preHookFunc(md, &tick); @@ -38655,7 +38873,7 @@ int HP_mob_randomwalk(struct mob_data *md, unsigned int tick) { retVal___ = HPMHooks.source.mob.randomwalk(md, tick); } if( HPMHooks.count.HP_mob_randomwalk_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, unsigned int *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); @@ -38689,11 +38907,11 @@ int HP_mob_warpchase(struct mob_data *md, struct block_list *target) { } return retVal___; } -bool HP_mob_ai_sub_hard(struct mob_data *md, unsigned int tick) { +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, unsigned int *tick); + bool (*preHookFunc) (struct mob_data *md, int64 *tick); 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); @@ -38707,7 +38925,7 @@ bool HP_mob_ai_sub_hard(struct mob_data *md, unsigned int 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, unsigned int *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); @@ -38811,11 +39029,11 @@ int HP_mob_ai_sub_lazy(struct mob_data *md, va_list args) { } return retVal___; } -int HP_mob_ai_lazy(int tid, unsigned int tick, int id, intptr_t data) { +int HP_mob_ai_lazy(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_lazy_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_lazy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_ai_lazy_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -38829,7 +39047,7 @@ int HP_mob_ai_lazy(int tid, unsigned int 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, unsigned int *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); @@ -38837,11 +39055,11 @@ int HP_mob_ai_lazy(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_mob_ai_hard(int tid, unsigned int tick, int id, intptr_t data) { +int HP_mob_ai_hard(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_ai_hard_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_ai_hard_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_ai_hard_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -38855,7 +39073,7 @@ int HP_mob_ai_hard(int tid, unsigned int 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, unsigned int *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); @@ -38915,11 +39133,11 @@ struct item_drop* HP_mob_setlootitem(struct item *item) { } return retVal___; } -int HP_mob_delay_item_drop(int tid, unsigned int tick, int id, intptr_t data) { +int HP_mob_delay_item_drop(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_delay_item_drop_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_delay_item_drop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_delay_item_drop_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -38933,7 +39151,7 @@ int HP_mob_delay_item_drop(int tid, unsigned int 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, unsigned int *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); @@ -38966,11 +39184,11 @@ void HP_mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, struct } return; } -int HP_mob_timer_delete(int tid, unsigned int tick, int id, intptr_t data) { +int HP_mob_timer_delete(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_timer_delete_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_timer_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_timer_delete_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -38984,7 +39202,7 @@ int HP_mob_timer_delete(int tid, unsigned int 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, unsigned int *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); @@ -39050,11 +39268,11 @@ int HP_mob_deleteslave(struct mob_data *md) { } return retVal___; } -int HP_mob_respawn(int tid, unsigned int tick, int id, intptr_t data) { +int HP_mob_respawn(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_respawn_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_respawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_respawn_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -39068,7 +39286,7 @@ int HP_mob_respawn(int tid, unsigned int 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, unsigned int *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); @@ -39564,11 +39782,11 @@ struct mob_data* HP_mob_getfriendstatus(struct mob_data *md, int cond1, int cond } return retVal___; } -int HP_mob_skill_use(struct mob_data *md, unsigned int tick, int event) { +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, unsigned int *tick, int *event); + int (*preHookFunc) (struct mob_data *md, int64 *tick, int *event); 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); @@ -39582,7 +39800,7 @@ int HP_mob_skill_use(struct mob_data *md, unsigned int 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, unsigned int *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); @@ -39590,11 +39808,11 @@ int HP_mob_skill_use(struct mob_data *md, unsigned int tick, int event) { } return retVal___; } -int HP_mob_skill_event(struct mob_data *md, struct block_list *src, unsigned int tick, int flag) { +int HP_mob_skill_event(struct mob_data *md, struct block_list *src, int64 tick, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_skill_event_pre ) { - int (*preHookFunc) (struct mob_data *md, struct block_list *src, unsigned int *tick, int *flag); + int (*preHookFunc) (struct mob_data *md, struct block_list *src, int64 *tick, int *flag); 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); @@ -39608,7 +39826,7 @@ int HP_mob_skill_event(struct mob_data *md, struct block_list *src, unsigned int 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, unsigned int *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); @@ -40649,11 +40867,11 @@ int HP_npc_event_doall(const char *name) { } return retVal___; } -int HP_npc_event_do_clock(int tid, unsigned int tick, int id, intptr_t data) { +int HP_npc_event_do_clock(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_event_do_clock_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_event_do_clock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_event_do_clock_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -40667,7 +40885,7 @@ int HP_npc_event_do_clock(int tid, unsigned int 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, unsigned int *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); @@ -40726,11 +40944,11 @@ int HP_npc_timerevent_export(struct npc_data *nd, int i) { } return retVal___; } -int HP_npc_timerevent(int tid, unsigned int tick, int id, intptr_t data) { +int HP_npc_timerevent(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_timerevent_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_timerevent_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_timerevent_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -40744,7 +40962,7 @@ int HP_npc_timerevent(int tid, unsigned int 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, unsigned int *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); @@ -40829,11 +41047,11 @@ void HP_npc_timerevent_quit(struct map_session_data *sd) { } return; } -int HP_npc_gettimerevent_tick(struct npc_data *nd) { +int64 HP_npc_gettimerevent_tick(struct npc_data *nd) { int hIndex = 0; - int retVal___ = 0; + int64 retVal___ = 0; if( HPMHooks.count.HP_npc_gettimerevent_tick_pre ) { - int (*preHookFunc) (struct npc_data *nd); + int64 (*preHookFunc) (struct npc_data *nd); 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); @@ -40847,7 +41065,7 @@ int HP_npc_gettimerevent_tick(struct npc_data *nd) { retVal___ = HPMHooks.source.npc.gettimerevent_tick(nd); } if( HPMHooks.count.HP_npc_gettimerevent_tick_post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd); + int64 (*postHookFunc) (int64 retVal___, struct npc_data *nd); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_gettimerevent_tick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_gettimerevent_tick_post[hIndex].func; retVal___ = postHookFunc(retVal___, nd); @@ -41627,6 +41845,58 @@ void HP_npc_parsename(struct npc_data *nd, const char *name, const char *start, } return; } +int HP_npc_parseview(const char *w4, const char *start, const char *buffer, const char *filepath) { + 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); + 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); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.npc.parseview(w4, start, buffer, filepath); + } + if( HPMHooks.count.HP_npc_parseview_post ) { + int (*postHookFunc) (int retVal___, const char *w4, const char *start, const char *buffer, const char *filepath); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parseview_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_parseview_post[hIndex].func; + retVal___ = postHookFunc(retVal___, w4, start, buffer, filepath); + } + } + return retVal___; +} +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); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_viewisid_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_viewisid_pre[hIndex].func; + retVal___ = preHookFunc(viewid); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.npc.viewisid(viewid); + } + if( HPMHooks.count.HP_npc_viewisid_post ) { + bool (*postHookFunc) (bool retVal___, const char *viewid); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_viewisid_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_viewisid_post[hIndex].func; + retVal___ = postHookFunc(retVal___, viewid); + } + } + return retVal___; +} struct npc_data* HP_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) { int hIndex = 0; struct npc_data* retVal___ = NULL; @@ -42387,11 +42657,11 @@ void HP_npc_debug_warps(void) { } return; } -int HP_npc_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_npc_secure_timeout_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_secure_timeout_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_secure_timeout_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_secure_timeout_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -42405,7 +42675,7 @@ int HP_npc_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t dat 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, unsigned int *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); @@ -43505,11 +43775,11 @@ int HP_party_vforeachsamemap(int ( *func ) (struct block_list *, va_list), struc } return retVal___; } -int HP_party_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_party_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_send_xy_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_send_xy_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_send_xy_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -43523,7 +43793,7 @@ int HP_party_send_xy_timer(int tid, unsigned int 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, unsigned int *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); @@ -45171,11 +45441,11 @@ int HP_pc_exeautobonus(struct map_session_data *sd, struct s_autobonus *bonus) { } return retVal___; } -int HP_pc_endautobonus(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_endautobonus(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_endautobonus_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_endautobonus_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_endautobonus_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -45189,7 +45459,7 @@ int HP_pc_endautobonus(int tid, unsigned int 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, unsigned int *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); @@ -47014,11 +47284,11 @@ int HP_pc_calc_pvprank(struct map_session_data *sd) { } return retVal___; } -int HP_pc_calc_pvprank_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_calc_pvprank_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_calc_pvprank_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_calc_pvprank_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_calc_pvprank_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -47032,7 +47302,7 @@ int HP_pc_calc_pvprank_timer(int tid, unsigned int 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, unsigned int *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); @@ -47606,11 +47876,11 @@ int HP_pc_readdb(void) { } return retVal___; } -int HP_pc_map_day_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_map_day_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_map_day_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_map_day_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_map_day_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -47624,7 +47894,7 @@ int HP_pc_map_day_timer(int tid, unsigned int 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, unsigned int *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); @@ -47632,11 +47902,11 @@ int HP_pc_map_day_timer(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_pc_map_night_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_map_night_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_map_night_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_map_night_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_map_night_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -47650,7 +47920,7 @@ int HP_pc_map_night_timer(int tid, unsigned int 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, unsigned int *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); @@ -48017,11 +48287,11 @@ int HP_pc_calc_skillpoint(struct map_session_data *sd) { } return retVal___; } -int HP_pc_invincible_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_invincible_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_invincible_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_invincible_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_invincible_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -48035,7 +48305,7 @@ int HP_pc_invincible_timer(int tid, unsigned int 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, unsigned int *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); @@ -48043,11 +48313,11 @@ int HP_pc_invincible_timer(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_pc_spiritball_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_spiritball_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_spiritball_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_spiritball_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_spiritball_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -48061,7 +48331,7 @@ int HP_pc_spiritball_timer(int tid, unsigned int 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, unsigned int *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); @@ -48101,11 +48371,11 @@ int HP_pc_check_banding(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_pc_inventory_rental_end(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_inventory_rental_end(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_inventory_rental_end_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_inventory_rental_end_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_inventory_rental_end_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -48119,7 +48389,7 @@ int HP_pc_inventory_rental_end(int tid, unsigned int 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, unsigned int *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); @@ -48307,11 +48577,11 @@ void HP_pc_calcexp(struct map_session_data *sd, unsigned int *base_exp, unsigned } return; } -int HP_pc_respawn_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_respawn_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_respawn_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_respawn_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_respawn_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -48325,7 +48595,7 @@ int HP_pc_respawn_timer(int tid, unsigned int 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, unsigned int *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); @@ -48417,11 +48687,11 @@ int HP_pc_setstat(struct map_session_data *sd, int type, int val) { } return retVal___; } -int HP_pc_eventtimer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_eventtimer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_eventtimer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_eventtimer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_eventtimer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -48435,7 +48705,7 @@ int HP_pc_eventtimer(int tid, unsigned int 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, unsigned int *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); @@ -48475,11 +48745,11 @@ int HP_pc_daynight_timer_sub(struct map_session_data *sd, va_list ap) { } return retVal___; } -int HP_pc_charm_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_charm_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_charm_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_charm_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_charm_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -48493,7 +48763,7 @@ int HP_pc_charm_timer(int tid, unsigned int 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, unsigned int *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); @@ -48527,11 +48797,11 @@ bool HP_pc_readdb_levelpenalty(char *fields[], int columns, int current) { } return retVal___; } -int HP_pc_autosave(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_autosave(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_autosave_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autosave_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_autosave_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -48545,7 +48815,7 @@ int HP_pc_autosave(int tid, unsigned int 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, unsigned int *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); @@ -48553,11 +48823,11 @@ int HP_pc_autosave(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_pc_follow_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pc_follow_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_follow_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_follow_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_follow_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -48571,7 +48841,7 @@ int HP_pc_follow_timer(int tid, unsigned int 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, unsigned int *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); @@ -48790,6 +49060,56 @@ void HP_pc_bank_withdraw(struct map_session_data *sd, int money) { } return; } +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); + 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); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.rental_expire(sd, i); + } + if( HPMHooks.count.HP_pc_rental_expire_post ) { + 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); + } + } + return; +} +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); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_scdata_received_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_scdata_received_pre[hIndex].func; + preHookFunc(sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.scdata_received(sd); + } + if( HPMHooks.count.HP_pc_scdata_received_post ) { + void (*postHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_scdata_received_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_scdata_received_post[hIndex].func; + postHookFunc(sd); + } + } + return; +} /* pet */ int HP_pet_init(void) { int hIndex = 0; @@ -49024,11 +49344,11 @@ int HP_pet_sc_check(struct map_session_data *sd, int type) { } return retVal___; } -int HP_pet_hungry(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pet_hungry(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_hungry_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_hungry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_hungry_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -49042,7 +49362,7 @@ int HP_pet_hungry(int tid, unsigned int 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, unsigned int *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); @@ -49524,11 +49844,11 @@ int HP_pet_equipitem(struct map_session_data *sd, int index) { } return retVal___; } -int HP_pet_randomwalk(struct pet_data *pd, unsigned int tick) { +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, unsigned int *tick); + int (*preHookFunc) (struct pet_data *pd, int64 *tick); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_randomwalk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_randomwalk_pre[hIndex].func; retVal___ = preHookFunc(pd, &tick); @@ -49542,7 +49862,7 @@ int HP_pet_randomwalk(struct pet_data *pd, unsigned int tick) { retVal___ = HPMHooks.source.pet.randomwalk(pd, tick); } if( HPMHooks.count.HP_pet_randomwalk_post ) { - int (*postHookFunc) (int retVal___, struct pet_data *pd, unsigned int *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); @@ -49550,11 +49870,11 @@ int HP_pet_randomwalk(struct pet_data *pd, unsigned int tick) { } return retVal___; } -int HP_pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, unsigned int tick) { +int HP_pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int64 tick) { 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, unsigned int *tick); + int (*preHookFunc) (struct pet_data *pd, struct map_session_data *sd, int64 *tick); 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); @@ -49568,7 +49888,7 @@ int HP_pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, unsigne 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, unsigned int *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); @@ -49608,11 +49928,11 @@ int HP_pet_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) { } return retVal___; } -int HP_pet_ai_hard(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pet_ai_hard(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_ai_hard_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_ai_hard_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_ai_hard_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -49626,7 +49946,7 @@ int HP_pet_ai_hard(int tid, unsigned int 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, unsigned int *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); @@ -49634,11 +49954,11 @@ int HP_pet_ai_hard(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_pet_delay_item_drop(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pet_delay_item_drop(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_delay_item_drop_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_delay_item_drop_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_delay_item_drop_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -49652,7 +49972,7 @@ int HP_pet_delay_item_drop(int tid, unsigned int 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, unsigned int *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); @@ -49686,11 +50006,11 @@ int HP_pet_lootitem_drop(struct pet_data *pd, struct map_session_data *sd) { } return retVal___; } -int HP_pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pet_skill_bonus_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_skill_bonus_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_skill_bonus_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_skill_bonus_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -49704,7 +50024,7 @@ int HP_pet_skill_bonus_timer(int tid, unsigned int 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, unsigned int *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); @@ -49712,11 +50032,11 @@ int HP_pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data) } return retVal___; } -int HP_pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pet_recovery_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_recovery_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_recovery_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_recovery_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -49730,7 +50050,7 @@ int HP_pet_recovery_timer(int tid, unsigned int 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, unsigned int *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); @@ -49738,11 +50058,11 @@ int HP_pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_pet_heal_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pet_heal_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_heal_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_heal_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_heal_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -49756,7 +50076,7 @@ int HP_pet_heal_timer(int tid, unsigned int tick, int id, intptr_t data) { retVal___ = HPMHooks.source.pet.heal_timer(tid, tick, id, data); } if( HPMHooks.count.HP_pet_heal_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, unsigned int *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_heal_timer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_heal_timer_post[hIndex].func; retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); @@ -49764,11 +50084,11 @@ int HP_pet_heal_timer(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_pet_skill_support_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_skill_support_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_skill_support_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_skill_support_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -49782,7 +50102,7 @@ int HP_pet_skill_support_timer(int tid, unsigned int 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, unsigned int *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); @@ -50821,11 +51141,11 @@ void HP_script_run_main(struct script_state *st) { } return; } -int HP_script_run_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_script_run_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_run_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_run_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_run_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -50839,7 +51159,7 @@ int HP_script_run_timer(int tid, unsigned int 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, unsigned int *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); @@ -54910,11 +55230,11 @@ int HP_skill_isammotype(struct map_session_data *sd, int skill) { } return retVal___; } -int HP_skill_castend_id(int tid, unsigned int tick, int id, intptr_t data) { +int HP_skill_castend_id(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_castend_id_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_id_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_id_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -54928,7 +55248,7 @@ int HP_skill_castend_id(int tid, unsigned int 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, unsigned int *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); @@ -54936,11 +55256,11 @@ int HP_skill_castend_id(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_skill_castend_pos(int tid, unsigned int tick, int id, intptr_t data) { +int HP_skill_castend_pos(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_castend_pos_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_castend_pos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_pos_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -54954,7 +55274,7 @@ int HP_skill_castend_pos(int tid, unsigned int 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, unsigned int *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); @@ -55014,11 +55334,11 @@ int HP_skill_cleartimerskill(struct block_list *src) { } return retVal___; } -int HP_skill_addtimerskill(struct block_list *src, unsigned int tick, int target, int x, int y, uint16 skill_id, uint16 skill_lv, int type, int flag) { +int HP_skill_addtimerskill(struct block_list *src, int64 tick, int target, int x, int y, uint16 skill_id, uint16 skill_lv, int type, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_addtimerskill_pre ) { - int (*preHookFunc) (struct block_list *src, unsigned int *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); 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); @@ -55032,7 +55352,7 @@ int HP_skill_addtimerskill(struct block_list *src, unsigned int tick, int target 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, unsigned int *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); @@ -55040,11 +55360,11 @@ int HP_skill_addtimerskill(struct block_list *src, unsigned int tick, int target } return retVal___; } -int HP_skill_additional_effect(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int dmg_lv, unsigned int tick) { +int HP_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) { 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, unsigned int *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); 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); @@ -55058,7 +55378,7 @@ 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, unsigned int *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); @@ -55066,11 +55386,11 @@ int HP_skill_additional_effect(struct block_list *src, struct block_list *bl, ui } return retVal___; } -int HP_skill_counter_additional_effect(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, unsigned int tick) { +int HP_skill_counter_additional_effect(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int64 tick) { 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, unsigned int *tick); + int (*preHookFunc) (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_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_counter_additional_effect_pre[hIndex].func; retVal___ = preHookFunc(src, bl, &skill_id, &skill_lv, &attack_type, &tick); @@ -55084,7 +55404,7 @@ 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, unsigned int *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); @@ -55378,11 +55698,11 @@ int HP_skill_clear_group(struct block_list *bl, int flag) { } return retVal___; } -int HP_skill_unit_onplace(struct skill_unit *src, struct block_list *bl, unsigned int tick) { +int HP_skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_onplace_pre ) { - int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, unsigned int *tick); + int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, int64 *tick); 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); @@ -55396,7 +55716,7 @@ int HP_skill_unit_onplace(struct skill_unit *src, struct block_list *bl, unsigne 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, unsigned int *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); @@ -55404,11 +55724,11 @@ int HP_skill_unit_onplace(struct skill_unit *src, struct block_list *bl, unsigne } return retVal___; } -int HP_skill_unit_ondamaged(struct skill_unit *src, struct block_list *bl, int64 damage, unsigned int tick) { +int HP_skill_unit_ondamaged(struct skill_unit *src, struct block_list *bl, int64 damage, int64 tick) { 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, unsigned int *tick); + int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, int64 *damage, int64 *tick); 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); @@ -55422,7 +55742,7 @@ 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, unsigned int *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); @@ -55665,11 +55985,11 @@ int HP_skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, uint } return retVal___; } -int HP_skill_unit_move(struct block_list *bl, unsigned int tick, int flag) { +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, unsigned int *tick, int *flag); + int (*preHookFunc) (struct block_list *bl, int64 *tick, int *flag); 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); @@ -55683,7 +56003,7 @@ int HP_skill_unit_move(struct block_list *bl, unsigned int 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, unsigned int *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); @@ -55691,11 +56011,11 @@ int HP_skill_unit_move(struct block_list *bl, unsigned int tick, int flag) { } return retVal___; } -int HP_skill_unit_onleft(uint16 skill_id, struct block_list *bl, unsigned int tick) { +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, unsigned int *tick); + int (*preHookFunc) (uint16 *skill_id, struct block_list *bl, int64 *tick); 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); @@ -55709,7 +56029,7 @@ int HP_skill_unit_onleft(uint16 skill_id, struct block_list *bl, unsigned int ti 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, unsigned int *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); @@ -55717,11 +56037,11 @@ int HP_skill_unit_onleft(uint16 skill_id, struct block_list *bl, unsigned int ti } return retVal___; } -int HP_skill_unit_onout(struct skill_unit *src, struct block_list *bl, unsigned int tick) { +int HP_skill_unit_onout(struct skill_unit *src, struct block_list *bl, int64 tick) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_onout_pre ) { - int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, unsigned int *tick); + int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, int64 *tick); 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); @@ -55735,7 +56055,7 @@ int HP_skill_unit_onout(struct skill_unit *src, struct block_list *bl, unsigned 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, unsigned int *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); @@ -55795,10 +56115,10 @@ int HP_skill_sit(struct map_session_data *sd, int type) { } return retVal___; } -void HP_skill_brandishspear(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag) { +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, unsigned int *tick, int *flag); + void (*preHookFunc) (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_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_brandishspear_pre[hIndex].func; preHookFunc(src, bl, &skill_id, &skill_lv, &tick, &flag); @@ -55812,7 +56132,7 @@ 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, unsigned int *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); @@ -56187,11 +56507,11 @@ int HP_skill_arrow_create(struct map_session_data *sd, int nameid) { } return retVal___; } -int HP_skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag) { +int HP_skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) { 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, unsigned int *tick, int *flag); + int (*preHookFunc) (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_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_nodamage_id_pre[hIndex].func; retVal___ = preHookFunc(src, bl, &skill_id, &skill_lv, &tick, &flag); @@ -56205,7 +56525,7 @@ 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, unsigned int *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); @@ -56213,11 +56533,11 @@ int HP_skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, } return retVal___; } -int HP_skill_castend_damage_id(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag) { +int HP_skill_castend_damage_id(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) { 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, unsigned int *tick, int *flag); + int (*preHookFunc) (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_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_damage_id_pre[hIndex].func; retVal___ = preHookFunc(src, bl, &skill_id, &skill_lv, &tick, &flag); @@ -56231,7 +56551,7 @@ 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, unsigned int *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); @@ -56239,11 +56559,11 @@ int HP_skill_castend_damage_id(struct block_list *src, struct block_list *bl, ui } return retVal___; } -int HP_skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag) { +int HP_skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) { 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, unsigned int *tick, int *flag); + int (*preHookFunc) (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_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_castend_pos2_pre[hIndex].func; retVal___ = preHookFunc(src, &x, &y, &skill_id, &skill_lv, &tick, &flag); @@ -56257,7 +56577,7 @@ 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, unsigned int *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); @@ -56265,14 +56585,14 @@ int HP_skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill_id, } return retVal___; } -int HP_skill_blockpc_start(struct map_session_data *sd, uint16 skill_id, int tick, bool load) { +int HP_skill_blockpc_start(struct map_session_data *sd, uint16 skill_id, int tick) { 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, bool *load); + int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *tick); 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, &load); + retVal___ = preHookFunc(sd, &skill_id, &tick); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -56280,13 +56600,13 @@ 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, load); + 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, bool *load); + 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, &load); + retVal___ = postHookFunc(retVal___, sd, &skill_id, &tick); } } return retVal___; @@ -56343,11 +56663,11 @@ int HP_skill_blockmerc_start(struct mercenary_data *md, uint16 skill_id, int tic } return retVal___; } -int HP_skill_attack(int attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag) { +int HP_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) { 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, unsigned int *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); 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); @@ -56361,7 +56681,7 @@ 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, unsigned int *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); @@ -56433,11 +56753,11 @@ int HP_skill_area_sub(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_skill_area_sub_count(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, unsigned int tick, int flag) { +int HP_skill_area_sub_count(struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) { 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, unsigned int *tick, int *flag); + int (*preHookFunc) (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_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_area_sub_count_pre[hIndex].func; retVal___ = preHookFunc(src, target, &skill_id, &skill_lv, &tick, &flag); @@ -56451,7 +56771,7 @@ 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, unsigned int *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); @@ -56626,11 +56946,11 @@ int HP_skill_magic_reflect(struct block_list *src, struct block_list *bl, int ty } return retVal___; } -int HP_skill_onskillusage(struct map_session_data *sd, struct block_list *bl, uint16 skill_id, unsigned int tick) { +int HP_skill_onskillusage(struct map_session_data *sd, struct block_list *bl, uint16 skill_id, int64 tick) { 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, unsigned int *tick); + int (*preHookFunc) (struct map_session_data *sd, struct block_list *bl, uint16 *skill_id, int64 *tick); 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); @@ -56644,7 +56964,7 @@ 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, unsigned int *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); @@ -56684,11 +57004,11 @@ int HP_skill_cell_overlap(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_skill_timerskill(int tid, unsigned int tick, int id, intptr_t data) { +int HP_skill_timerskill(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_timerskill_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_timerskill_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_timerskill_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -56702,7 +57022,7 @@ int HP_skill_timerskill(int tid, unsigned int 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, unsigned int *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); @@ -57070,11 +57390,11 @@ int HP_skill_icewall_block(struct block_list *bl, va_list ap) { } return retVal___; } -struct skill_unit_group_tickset* HP_skill_unitgrouptickset_search(struct block_list *bl, struct skill_unit_group *group, int tick) { +struct skill_unit_group_tickset* HP_skill_unitgrouptickset_search(struct block_list *bl, struct skill_unit_group *group, int64 tick) { 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, int *tick); + struct skill_unit_group_tickset* (*preHookFunc) (struct block_list *bl, struct skill_unit_group *group, int64 *tick); 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); @@ -57088,7 +57408,7 @@ 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, int *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); @@ -57383,11 +57703,11 @@ void HP_skill_unitsetmapcell(struct skill_unit *src, uint16 skill_id, uint16 ski } return; } -int HP_skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, unsigned int tick) { +int HP_skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int64 tick) { 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, unsigned int *tick); + int (*preHookFunc) (struct skill_unit *src, struct block_list *bl, int64 *tick); 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); @@ -57401,7 +57721,7 @@ int HP_skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, u 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, unsigned int *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); @@ -57505,11 +57825,11 @@ int HP_skill_unit_move_sub(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_skill_blockpc_end(int tid, unsigned int tick, int id, intptr_t data) { +int HP_skill_blockpc_end(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_blockpc_end_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockpc_end_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_blockpc_end_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -57523,7 +57843,7 @@ int HP_skill_blockpc_end(int tid, unsigned int 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, unsigned int *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); @@ -57531,11 +57851,11 @@ int HP_skill_blockpc_end(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_skill_blockhomun_end(int tid, unsigned int tick, int id, intptr_t data) { +int HP_skill_blockhomun_end(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_blockhomun_end_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockhomun_end_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_blockhomun_end_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -57549,7 +57869,7 @@ int HP_skill_blockhomun_end(int tid, unsigned int 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, unsigned int *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); @@ -57557,11 +57877,11 @@ int HP_skill_blockhomun_end(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_skill_blockmerc_end(int tid, unsigned int tick, int id, intptr_t data) { +int HP_skill_blockmerc_end(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_blockmerc_end_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockmerc_end_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_blockmerc_end_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -57575,7 +57895,7 @@ int HP_skill_blockmerc_end(int tid, unsigned int 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, unsigned int *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); @@ -57609,11 +57929,11 @@ int HP_skill_split_atoi(char *str, int *val) { } return retVal___; } -int HP_skill_unit_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_skill_unit_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_unit_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_unit_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_unit_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -57627,7 +57947,7 @@ int HP_skill_unit_timer(int tid, unsigned int 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, unsigned int *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); @@ -58454,6 +58774,32 @@ int HP_skill_get_new_group_id(void) { } return retVal___; } +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); + 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); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + 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); + 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); + } + } + return retVal___; +} /* status */ int HP_status_init(void) { int hIndex = 0; @@ -59440,11 +59786,11 @@ int HP_status_change_end_(struct block_list *bl, enum sc_type type, int tid, con } return retVal___; } -int HP_status_kaahi_heal_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_status_kaahi_heal_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_kaahi_heal_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_kaahi_heal_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_kaahi_heal_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -59458,7 +59804,7 @@ int HP_status_kaahi_heal_timer(int tid, unsigned int 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, unsigned int *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); @@ -59466,11 +59812,11 @@ int HP_status_kaahi_heal_timer(int tid, unsigned int tick, int id, intptr_t data } return retVal___; } -int HP_status_change_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_status_change_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_change_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_change_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -59484,7 +59830,7 @@ int HP_status_change_timer(int tid, unsigned int 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, unsigned int *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); @@ -61106,11 +61452,11 @@ int HP_status_natural_heal(struct block_list *bl, va_list args) { } return retVal___; } -int HP_status_natural_heal_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_status_natural_heal_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_natural_heal_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_natural_heal_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_natural_heal_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -61124,7 +61470,7 @@ int HP_status_natural_heal_timer(int tid, unsigned int tick, int id, intptr_t da 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, unsigned int *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); @@ -61936,11 +62282,11 @@ struct unit_data* HP_unit_bl2ud2(struct block_list *bl) { } return retVal___; } -int HP_unit_attack_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_unit_attack_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_attack_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_attack_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_attack_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -61954,7 +62300,7 @@ int HP_unit_attack_timer(int tid, unsigned int 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, unsigned int *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); @@ -61962,11 +62308,11 @@ int HP_unit_attack_timer(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_walktoxy_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_walktoxy_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -61980,7 +62326,7 @@ int HP_unit_walktoxy_timer(int tid, unsigned int 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, unsigned int *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); @@ -62014,11 +62360,11 @@ int HP_unit_walktoxy_sub(struct block_list *bl) { } return retVal___; } -int HP_unit_delay_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data) { +int HP_unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_delay_walktoxy_timer_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_delay_walktoxy_timer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_delay_walktoxy_timer_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -62032,7 +62378,7 @@ int HP_unit_delay_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t da 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, unsigned int *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); @@ -62066,11 +62412,11 @@ int HP_unit_walktoxy(struct block_list *bl, short x, short y, int flag) { } return retVal___; } -int HP_unit_walktobl_sub(int tid, unsigned int tick, int id, intptr_t data) { +int HP_unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_walktobl_sub_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktobl_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_walktobl_sub_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -62084,7 +62430,7 @@ int HP_unit_walktobl_sub(int tid, unsigned int 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, unsigned int *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); @@ -62430,11 +62776,11 @@ int HP_unit_can_move(struct block_list *bl) { } return retVal___; } -int HP_unit_resume_running(int tid, unsigned int tick, int id, intptr_t data) { +int HP_unit_resume_running(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_resume_running_pre ) { - int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data); + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_resume_running_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_resume_running_pre[hIndex].func; retVal___ = preHookFunc(&tid, &tick, &id, &data); @@ -62448,7 +62794,7 @@ int HP_unit_resume_running(int tid, unsigned int 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, unsigned int *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); @@ -62456,11 +62802,11 @@ int HP_unit_resume_running(int tid, unsigned int tick, int id, intptr_t data) { } return retVal___; } -int HP_unit_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int type) { +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, unsigned int *tick, int *delay, int *type); + int (*preHookFunc) (struct block_list *bl, int64 *tick, int *delay, int *type); 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); @@ -62474,7 +62820,7 @@ int HP_unit_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, i 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, unsigned int *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); @@ -62768,11 +63114,11 @@ int HP_unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir) { } return retVal___; } -int HP_unit_attack_timer_sub(struct block_list *src, int tid, unsigned int tick) { +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, unsigned int *tick); + int (*preHookFunc) (struct block_list *src, int *tid, int64 *tick); 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); @@ -62786,7 +63132,7 @@ int HP_unit_attack_timer_sub(struct block_list *src, int tid, unsigned int 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, unsigned int *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); @@ -62871,11 +63217,11 @@ int HP_unit_counttargeted(struct block_list *bl) { } return retVal___; } -int HP_unit_fixdamage(struct block_list *src, struct block_list *target, unsigned int tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2) { +int HP_unit_fixdamage(struct block_list *src, struct block_list *target, int64 tick, int sdelay, int ddelay, int64 damage, int div, int type, int64 damage2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_fixdamage_pre ) { - int (*preHookFunc) (struct block_list *src, struct block_list *target, unsigned int *tick, int *sdelay, int *ddelay, int64 *damage, int *div, int *type, int64 *damage2); + int (*preHookFunc) (struct block_list *src, struct block_list *target, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, int *type, int64 *damage2); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_fixdamage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_fixdamage_pre[hIndex].func; retVal___ = preHookFunc(src, target, &tick, &sdelay, &ddelay, &damage, &div, &type, &damage2); @@ -62889,7 +63235,7 @@ int HP_unit_fixdamage(struct block_list *src, struct block_list *target, unsigne retVal___ = HPMHooks.source.unit.fixdamage(src, target, tick, 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, unsigned int *tick, int *sdelay, int *ddelay, int64 *damage, int *div, int *type, int64 *damage2); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, int *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, &tick, &sdelay, &ddelay, &damage, &div, &type, &damage2); |