diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/HPMHooking.c | 10 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.GetSymbol.inc | 1 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc | 545 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HookingPoints.inc | 4939 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.Hooks.inc | 5519 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.sources.inc | 1 | ||||
| -rw-r--r-- | src/plugins/Makefile.in | 27 | ||||
| -rw-r--r-- | src/plugins/db2sql.c | 265 | ||||
| -rw-r--r-- | src/plugins/sample.c | 61 |
9 files changed, 7022 insertions, 4346 deletions
diff --git a/src/plugins/HPMHooking.c b/src/plugins/HPMHooking.c index 8b4f06ae0..e6e698383 100644 --- a/src/plugins/HPMHooking.c +++ b/src/plugins/HPMHooking.c @@ -46,6 +46,8 @@ #include "../map/mail.h" #include "../map/irc-bot.h" +#include "../common/HPMDataCheck.h" + HPExport struct hplugin_info pinfo = { "HPMHooking", // Plugin name SERVER_TYPE_MAP,// Which server types this plugin works with? @@ -53,8 +55,7 @@ HPExport struct hplugin_info pinfo = { HPM_VERSION, // HPM Version (don't change, macro is automatically updated) }; -#define HP_POP(x) #x , (void**)(&x) -#define HP_POP2(x) (void*)x +#define HP_POP(x,y) #x , (void**)(&x) , (void*)y , 0 DBMap *hp_db;/* hooking points db -- for quick lookup */ struct HookingPointData { @@ -150,7 +151,7 @@ void HPM_HP_final(void) { void HPM_HP_load(void) { #include "../plugins/HPMHooking/HPMHooking.HookingPoints.inc" - int i, len = ARRAYLENGTH(HookingPoints); + int i, len = ARRAYLENGTH(HookingPoints), idx = 0; memset(&HPMHooks,0,sizeof(struct HPMHooksCore)); @@ -163,6 +164,9 @@ void HPM_HP_load(void) { memcpy(hpd, &HookingPoints[i], sizeof(struct HookingPointData)); + hpd->idx = idx; + idx += 2; + strdb_put(hp_db, HookingPoints[i].name, hpd); HPMHooks.data.total++; diff --git a/src/plugins/HPMHooking/HPMHooking.GetSymbol.inc b/src/plugins/HPMHooking/HPMHooking.GetSymbol.inc index c3845675c..8482b9f80 100644 --- a/src/plugins/HPMHooking/HPMHooking.GetSymbol.inc +++ b/src/plugins/HPMHooking/HPMHooking.GetSymbol.inc @@ -30,6 +30,7 @@ if( !(mob = GET_SYMBOL("mob") ) ) return false; if( !(npc = GET_SYMBOL("npc") ) ) return false; if( !(party = GET_SYMBOL("party") ) ) return false; if( !(path = GET_SYMBOL("path") ) ) return false; +if( !(pcg = GET_SYMBOL("pc_groups") ) ) return false; if( !(pc = GET_SYMBOL("pc") ) ) return false; if( !(pet = GET_SYMBOL("pet") ) ) return false; if( !(quest = GET_SYMBOL("quest") ) ) return false; diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index ea5e2405f..5bc9f7da0 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -9,8 +9,8 @@ struct { struct HPMHookPoint *HP_atcommand_init_post; struct HPMHookPoint *HP_atcommand_final_pre; struct HPMHookPoint *HP_atcommand_final_post; - struct HPMHookPoint *HP_atcommand_parse_pre; - struct HPMHookPoint *HP_atcommand_parse_post; + struct HPMHookPoint *HP_atcommand_exec_pre; + struct HPMHookPoint *HP_atcommand_exec_post; struct HPMHookPoint *HP_atcommand_create_pre; struct HPMHookPoint *HP_atcommand_create_post; struct HPMHookPoint *HP_atcommand_can_use_pre; @@ -61,6 +61,10 @@ 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_atcommand_msg_pre; + struct HPMHookPoint *HP_atcommand_msg_post; struct HPMHookPoint *HP_battle_init_pre; struct HPMHookPoint *HP_battle_init_post; struct HPMHookPoint *HP_battle_final_pre; @@ -81,8 +85,8 @@ struct { struct HPMHookPoint *HP_battle_delay_damage_post; struct HPMHookPoint *HP_battle_drain_pre; struct HPMHookPoint *HP_battle_drain_post; - struct HPMHookPoint *HP_battle_calc_return_damage_pre; - struct HPMHookPoint *HP_battle_calc_return_damage_post; + struct HPMHookPoint *HP_battle_reflect_damage_pre; + struct HPMHookPoint *HP_battle_reflect_damage_post; struct HPMHookPoint *HP_battle_attr_ratio_pre; struct HPMHookPoint *HP_battle_attr_ratio_post; struct HPMHookPoint *HP_battle_attr_fix_pre; @@ -93,6 +97,8 @@ struct { struct HPMHookPoint *HP_battle_calc_elefix_post; struct HPMHookPoint *HP_battle_calc_masteryfix_pre; struct HPMHookPoint *HP_battle_calc_masteryfix_post; + struct HPMHookPoint *HP_battle_calc_chorusbonus_pre; + struct HPMHookPoint *HP_battle_calc_chorusbonus_post; struct HPMHookPoint *HP_battle_calc_skillratio_pre; struct HPMHookPoint *HP_battle_calc_skillratio_post; struct HPMHookPoint *HP_battle_calc_sizefix_pre; @@ -257,10 +263,10 @@ struct { struct HPMHookPoint *HP_chat_trigger_event_post; struct HPMHookPoint *HP_chat_create_pre; struct HPMHookPoint *HP_chat_create_post; - struct HPMHookPoint *HP_chrif_final_pre; - struct HPMHookPoint *HP_chrif_final_post; struct HPMHookPoint *HP_chrif_init_pre; struct HPMHookPoint *HP_chrif_init_post; + struct HPMHookPoint *HP_chrif_final_pre; + struct HPMHookPoint *HP_chrif_final_post; struct HPMHookPoint *HP_chrif_setuserid_pre; struct HPMHookPoint *HP_chrif_setuserid_post; struct HPMHookPoint *HP_chrif_setpasswd_pre; @@ -309,8 +315,6 @@ struct { struct HPMHookPoint *HP_chrif_save_scdata_post; struct HPMHookPoint *HP_chrif_ragsrvinfo_pre; struct HPMHookPoint *HP_chrif_ragsrvinfo_post; - struct HPMHookPoint *HP_chrif_char_offline_pre; - struct HPMHookPoint *HP_chrif_char_offline_post; struct HPMHookPoint *HP_chrif_char_offline_nsd_pre; struct HPMHookPoint *HP_chrif_char_offline_nsd_post; struct HPMHookPoint *HP_chrif_char_reset_offline_pre; @@ -327,8 +331,8 @@ struct { struct HPMHookPoint *HP_chrif_removefriend_post; struct HPMHookPoint *HP_chrif_send_report_pre; struct HPMHookPoint *HP_chrif_send_report_post; - struct HPMHookPoint *HP_chrif_flush_fifo_pre; - struct HPMHookPoint *HP_chrif_flush_fifo_post; + struct HPMHookPoint *HP_chrif_flush_pre; + struct HPMHookPoint *HP_chrif_flush_post; struct HPMHookPoint *HP_chrif_skillid2idx_pre; struct HPMHookPoint *HP_chrif_skillid2idx_post; struct HPMHookPoint *HP_chrif_sd_to_auth_pre; @@ -367,8 +371,8 @@ struct { struct HPMHookPoint *HP_chrif_changedsex_post; struct HPMHookPoint *HP_chrif_divorceack_pre; struct HPMHookPoint *HP_chrif_divorceack_post; - struct HPMHookPoint *HP_chrif_accountban_pre; - struct HPMHookPoint *HP_chrif_accountban_post; + struct HPMHookPoint *HP_chrif_idbanned_pre; + struct HPMHookPoint *HP_chrif_idbanned_post; struct HPMHookPoint *HP_chrif_recvfamelist_pre; struct HPMHookPoint *HP_chrif_recvfamelist_post; struct HPMHookPoint *HP_chrif_load_scdata_pre; @@ -395,6 +399,10 @@ struct { struct HPMHookPoint *HP_chrif_on_disconnect_post; struct HPMHookPoint *HP_chrif_parse_pre; struct HPMHookPoint *HP_chrif_parse_post; + struct HPMHookPoint *HP_chrif_save_scdata_single_pre; + struct HPMHookPoint *HP_chrif_save_scdata_single_post; + struct HPMHookPoint *HP_chrif_del_scdata_single_pre; + struct HPMHookPoint *HP_chrif_del_scdata_single_post; struct HPMHookPoint *HP_clif_init_pre; struct HPMHookPoint *HP_clif_init_post; struct HPMHookPoint *HP_clif_final_pre; @@ -467,6 +475,8 @@ struct { struct HPMHookPoint *HP_clif_cashshop_load_post; struct HPMHookPoint *HP_clif_package_announce_pre; struct HPMHookPoint *HP_clif_package_announce_post; + struct HPMHookPoint *HP_clif_item_drop_announce_pre; + struct HPMHookPoint *HP_clif_item_drop_announce_post; struct HPMHookPoint *HP_clif_clearunit_single_pre; struct HPMHookPoint *HP_clif_clearunit_single_post; struct HPMHookPoint *HP_clif_clearunit_area_pre; @@ -493,8 +503,6 @@ struct { struct HPMHookPoint *HP_clif_refreshlook_post; struct HPMHookPoint *HP_clif_class_change_pre; struct HPMHookPoint *HP_clif_class_change_post; - struct HPMHookPoint *HP_clif_skill_setunit_pre; - struct HPMHookPoint *HP_clif_skill_setunit_post; struct HPMHookPoint *HP_clif_skill_delunit_pre; struct HPMHookPoint *HP_clif_skill_delunit_post; struct HPMHookPoint *HP_clif_skillunit_update_pre; @@ -521,6 +529,8 @@ struct { struct HPMHookPoint *HP_clif_clearchar_skillunit_post; struct HPMHookPoint *HP_clif_getareachar_pre; struct HPMHookPoint *HP_clif_getareachar_post; + struct HPMHookPoint *HP_clif_graffiti_entry_pre; + struct HPMHookPoint *HP_clif_graffiti_entry_post; struct HPMHookPoint *HP_clif_spawn_pre; struct HPMHookPoint *HP_clif_spawn_post; struct HPMHookPoint *HP_clif_changemap_pre; @@ -691,8 +701,6 @@ struct { struct HPMHookPoint *HP_clif_equiptickack_post; struct HPMHookPoint *HP_clif_viewequip_ack_pre; struct HPMHookPoint *HP_clif_viewequip_ack_post; - struct HPMHookPoint *HP_clif_viewequip_fail_pre; - struct HPMHookPoint *HP_clif_viewequip_fail_post; struct HPMHookPoint *HP_clif_equpcheckbox_pre; struct HPMHookPoint *HP_clif_equpcheckbox_post; struct HPMHookPoint *HP_clif_displayexp_pre; @@ -849,8 +857,6 @@ struct { struct HPMHookPoint *HP_clif_wis_message_post; struct HPMHookPoint *HP_clif_wis_end_pre; struct HPMHookPoint *HP_clif_wis_end_post; - struct HPMHookPoint *HP_clif_disp_onlyself_pre; - struct HPMHookPoint *HP_clif_disp_onlyself_post; struct HPMHookPoint *HP_clif_disp_message_pre; struct HPMHookPoint *HP_clif_disp_message_post; struct HPMHookPoint *HP_clif_broadcast_pre; @@ -885,6 +891,8 @@ struct { struct HPMHookPoint *HP_clif_wisall_post; struct HPMHookPoint *HP_clif_PMIgnoreList_pre; struct HPMHookPoint *HP_clif_PMIgnoreList_post; + struct HPMHookPoint *HP_clif_ShowScript_pre; + struct HPMHookPoint *HP_clif_ShowScript_post; struct HPMHookPoint *HP_clif_traderequest_pre; struct HPMHookPoint *HP_clif_traderequest_post; struct HPMHookPoint *HP_clif_tradestart_pre; @@ -1001,8 +1009,6 @@ struct { struct HPMHookPoint *HP_clif_guild_notice_post; struct HPMHookPoint *HP_clif_guild_message_pre; struct HPMHookPoint *HP_clif_guild_message_post; - struct HPMHookPoint *HP_clif_guild_skillup_pre; - struct HPMHookPoint *HP_clif_guild_skillup_post; struct HPMHookPoint *HP_clif_guild_reqalliance_pre; struct HPMHookPoint *HP_clif_guild_reqalliance_post; struct HPMHookPoint *HP_clif_guild_allianceack_pre; @@ -1271,6 +1277,22 @@ struct { struct HPMHookPoint *HP_clif_chsys_gjoin_post; struct HPMHookPoint *HP_clif_chsys_gleave_pre; struct HPMHookPoint *HP_clif_chsys_gleave_post; + struct HPMHookPoint *HP_clif_bank_deposit_pre; + struct HPMHookPoint *HP_clif_bank_deposit_post; + struct HPMHookPoint *HP_clif_bank_withdraw_pre; + struct HPMHookPoint *HP_clif_bank_withdraw_post; + struct HPMHookPoint *HP_clif_show_modifiers_pre; + struct HPMHookPoint *HP_clif_show_modifiers_post; + struct HPMHookPoint *HP_clif_notify_bounditem_pre; + struct HPMHookPoint *HP_clif_notify_bounditem_post; + struct HPMHookPoint *HP_clif_delay_damage_pre; + struct HPMHookPoint *HP_clif_delay_damage_post; + struct HPMHookPoint *HP_clif_delay_damage_sub_pre; + struct HPMHookPoint *HP_clif_delay_damage_sub_post; + struct HPMHookPoint *HP_clif_npc_market_open_pre; + struct HPMHookPoint *HP_clif_npc_market_open_post; + struct HPMHookPoint *HP_clif_npc_market_purchase_ack_pre; + struct HPMHookPoint *HP_clif_npc_market_purchase_ack_post; struct HPMHookPoint *HP_clif_pWantToConnection_pre; struct HPMHookPoint *HP_clif_pWantToConnection_post; struct HPMHookPoint *HP_clif_pLoadEndAck_pre; @@ -1549,6 +1571,8 @@ struct { struct HPMHookPoint *HP_clif_pGMReqAccountName_post; struct HPMHookPoint *HP_clif_pGMChangeMapType_pre; struct HPMHookPoint *HP_clif_pGMChangeMapType_post; + struct HPMHookPoint *HP_clif_pGMFullStrip_pre; + struct HPMHookPoint *HP_clif_pGMFullStrip_post; struct HPMHookPoint *HP_clif_pPMIgnore_pre; struct HPMHookPoint *HP_clif_pPMIgnore_post; struct HPMHookPoint *HP_clif_pPMIgnoreAll_pre; @@ -1699,6 +1723,22 @@ struct { struct HPMHookPoint *HP_clif_pPartyBookingRefuseVolunteer_post; struct HPMHookPoint *HP_clif_pPartyBookingCancelVolunteer_pre; struct HPMHookPoint *HP_clif_pPartyBookingCancelVolunteer_post; + struct HPMHookPoint *HP_clif_pBankDeposit_pre; + struct HPMHookPoint *HP_clif_pBankDeposit_post; + struct HPMHookPoint *HP_clif_pBankWithdraw_pre; + struct HPMHookPoint *HP_clif_pBankWithdraw_post; + struct HPMHookPoint *HP_clif_pBankCheck_pre; + struct HPMHookPoint *HP_clif_pBankCheck_post; + struct HPMHookPoint *HP_clif_pBankOpen_pre; + struct HPMHookPoint *HP_clif_pBankOpen_post; + struct HPMHookPoint *HP_clif_pBankClose_pre; + struct HPMHookPoint *HP_clif_pBankClose_post; + struct HPMHookPoint *HP_clif_pNPCShopClosed_pre; + struct HPMHookPoint *HP_clif_pNPCShopClosed_post; + struct HPMHookPoint *HP_clif_pNPCMarketClosed_pre; + struct HPMHookPoint *HP_clif_pNPCMarketClosed_post; + struct HPMHookPoint *HP_clif_pNPCMarketPurchase_pre; + struct HPMHookPoint *HP_clif_pNPCMarketPurchase_post; struct HPMHookPoint *HP_duel_create_pre; struct HPMHookPoint *HP_duel_create_post; struct HPMHookPoint *HP_duel_invite_pre; @@ -1917,6 +1957,8 @@ struct { struct HPMHookPoint *HP_guild_flags_clear_post; struct HPMHookPoint *HP_guild_aura_refresh_pre; struct HPMHookPoint *HP_guild_aura_refresh_post; + struct HPMHookPoint *HP_guild_retrieveitembound_pre; + struct HPMHookPoint *HP_guild_retrieveitembound_post; struct HPMHookPoint *HP_guild_payexp_timer_pre; struct HPMHookPoint *HP_guild_payexp_timer_post; struct HPMHookPoint *HP_guild_sd_check_pre; @@ -2081,6 +2123,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; @@ -2091,6 +2135,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; @@ -2179,6 +2229,8 @@ struct { struct HPMHookPoint *HP_intif_guild_castle_dataload_post; struct HPMHookPoint *HP_intif_guild_castle_datasave_pre; struct HPMHookPoint *HP_intif_guild_castle_datasave_post; + struct HPMHookPoint *HP_intif_itembound_req_pre; + struct HPMHookPoint *HP_intif_itembound_req_post; struct HPMHookPoint *HP_intif_request_petdata_pre; struct HPMHookPoint *HP_intif_request_petdata_post; struct HPMHookPoint *HP_intif_save_petdata_pre; @@ -2335,6 +2387,8 @@ struct { struct HPMHookPoint *HP_intif_pAuctionMessage_post; struct HPMHookPoint *HP_intif_pAuctionBid_pre; struct HPMHookPoint *HP_intif_pAuctionBid_post; + struct HPMHookPoint *HP_intif_pItembound_ack_pre; + struct HPMHookPoint *HP_intif_pItembound_ack_post; struct HPMHookPoint *HP_intif_pMercenaryReceived_pre; struct HPMHookPoint *HP_intif_pMercenaryReceived_post; struct HPMHookPoint *HP_intif_pMercenaryDeleted_pre; @@ -2403,8 +2457,6 @@ struct { struct HPMHookPoint *HP_itemdb_reload_post; struct HPMHookPoint *HP_itemdb_name_constants_pre; struct HPMHookPoint *HP_itemdb_name_constants_post; - struct HPMHookPoint *HP_itemdb_force_name_constants_pre; - struct HPMHookPoint *HP_itemdb_force_name_constants_post; struct HPMHookPoint *HP_itemdb_read_groups_pre; struct HPMHookPoint *HP_itemdb_read_groups_post; struct HPMHookPoint *HP_itemdb_read_chains_pre; @@ -2425,8 +2477,6 @@ struct { struct HPMHookPoint *HP_itemdb_load_post; struct HPMHookPoint *HP_itemdb_search_pre; struct HPMHookPoint *HP_itemdb_search_post; - struct HPMHookPoint *HP_itemdb_parse_dbrow_pre; - struct HPMHookPoint *HP_itemdb_parse_dbrow_post; struct HPMHookPoint *HP_itemdb_exists_pre; struct HPMHookPoint *HP_itemdb_exists_post; struct HPMHookPoint *HP_itemdb_in_group_pre; @@ -2501,12 +2551,16 @@ struct { struct HPMHookPoint *HP_itemdb_read_combos_post; struct HPMHookPoint *HP_itemdb_gendercheck_pre; struct HPMHookPoint *HP_itemdb_gendercheck_post; - struct HPMHookPoint *HP_itemdb_re_split_atoi_pre; - struct HPMHookPoint *HP_itemdb_re_split_atoi_post; - struct HPMHookPoint *HP_itemdb_readdb_pre; - struct HPMHookPoint *HP_itemdb_readdb_post; - struct HPMHookPoint *HP_itemdb_read_sqldb_pre; - struct HPMHookPoint *HP_itemdb_read_sqldb_post; + struct HPMHookPoint *HP_itemdb_validate_entry_pre; + struct HPMHookPoint *HP_itemdb_validate_entry_post; + struct HPMHookPoint *HP_itemdb_readdb_sql_sub_pre; + struct HPMHookPoint *HP_itemdb_readdb_sql_sub_post; + struct HPMHookPoint *HP_itemdb_readdb_libconfig_sub_pre; + struct HPMHookPoint *HP_itemdb_readdb_libconfig_sub_post; + struct HPMHookPoint *HP_itemdb_readdb_libconfig_pre; + struct HPMHookPoint *HP_itemdb_readdb_libconfig_post; + struct HPMHookPoint *HP_itemdb_readdb_sql_pre; + struct HPMHookPoint *HP_itemdb_readdb_sql_post; struct HPMHookPoint *HP_itemdb_unique_id_pre; struct HPMHookPoint *HP_itemdb_unique_id_post; struct HPMHookPoint *HP_itemdb_uid_load_pre; @@ -2517,6 +2571,10 @@ struct { struct HPMHookPoint *HP_itemdb_destroy_item_data_post; struct HPMHookPoint *HP_itemdb_final_sub_pre; struct HPMHookPoint *HP_itemdb_final_sub_post; + struct HPMHookPoint *HP_itemdb_clear_pre; + struct HPMHookPoint *HP_itemdb_clear_post; + struct HPMHookPoint *HP_itemdb_id2combo_pre; + struct HPMHookPoint *HP_itemdb_id2combo_post; struct HPMHookPoint *HP_logs_pick_pc_pre; struct HPMHookPoint *HP_logs_pick_pc_post; struct HPMHookPoint *HP_logs_pick_mob_pre; @@ -2831,6 +2889,14 @@ 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_map_merge_zone_pre; + struct HPMHookPoint *HP_map_merge_zone_post; struct HPMHookPoint *HP_mapit_alloc_pre; struct HPMHookPoint *HP_mapit_alloc_post; struct HPMHookPoint *HP_mapit_free_pre; @@ -3085,6 +3151,8 @@ struct { struct HPMHookPoint *HP_mob_readdb_post; struct HPMHookPoint *HP_mob_read_sqldb_pre; struct HPMHookPoint *HP_mob_read_sqldb_post; + struct HPMHookPoint *HP_mob_name_constants_pre; + struct HPMHookPoint *HP_mob_name_constants_post; struct HPMHookPoint *HP_mob_readdb_mobavail_pre; struct HPMHookPoint *HP_mob_readdb_mobavail_post; struct HPMHookPoint *HP_mob_read_randommonster_pre; @@ -3219,6 +3287,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; @@ -3277,6 +3349,24 @@ struct { struct HPMHookPoint *HP_npc_debug_warps_sub_post; struct HPMHookPoint *HP_npc_debug_warps_pre; struct HPMHookPoint *HP_npc_debug_warps_post; + struct HPMHookPoint *HP_npc_trader_count_funds_pre; + struct HPMHookPoint *HP_npc_trader_count_funds_post; + struct HPMHookPoint *HP_npc_trader_pay_pre; + struct HPMHookPoint *HP_npc_trader_pay_post; + struct HPMHookPoint *HP_npc_trader_update_pre; + struct HPMHookPoint *HP_npc_trader_update_post; + struct HPMHookPoint *HP_npc_market_buylist_pre; + struct HPMHookPoint *HP_npc_market_buylist_post; + struct HPMHookPoint *HP_npc_trader_open_pre; + struct HPMHookPoint *HP_npc_trader_open_post; + struct HPMHookPoint *HP_npc_market_fromsql_pre; + struct HPMHookPoint *HP_npc_market_fromsql_post; + struct HPMHookPoint *HP_npc_market_tosql_pre; + struct HPMHookPoint *HP_npc_market_tosql_post; + struct HPMHookPoint *HP_npc_market_delfromsql_pre; + struct HPMHookPoint *HP_npc_market_delfromsql_post; + struct HPMHookPoint *HP_npc_market_delfromsql_sub_pre; + struct HPMHookPoint *HP_npc_market_delfromsql_sub_post; struct HPMHookPoint *HP_npc_secure_timeout_timer_pre; struct HPMHookPoint *HP_npc_secure_timeout_timer_post; struct HPMHookPoint *HP_party_init_pre; @@ -3347,6 +3437,8 @@ struct { struct HPMHookPoint *HP_party_send_dot_remove_post; struct HPMHookPoint *HP_party_sub_count_pre; struct HPMHookPoint *HP_party_sub_count_post; + struct HPMHookPoint *HP_party_sub_count_chorus_pre; + struct HPMHookPoint *HP_party_sub_count_chorus_post; struct HPMHookPoint *HP_party_booking_register_pre; struct HPMHookPoint *HP_party_booking_register_post; struct HPMHookPoint *HP_party_booking_update_pre; @@ -3385,6 +3477,28 @@ struct { struct HPMHookPoint *HP_path_check_distance_post; struct HPMHookPoint *HP_path_distance_pre; struct HPMHookPoint *HP_path_distance_post; + struct HPMHookPoint *HP_pcg_init_pre; + struct HPMHookPoint *HP_pcg_init_post; + struct HPMHookPoint *HP_pcg_final_pre; + struct HPMHookPoint *HP_pcg_final_post; + struct HPMHookPoint *HP_pcg_reload_pre; + struct HPMHookPoint *HP_pcg_reload_post; + struct HPMHookPoint *HP_pcg_get_dummy_group_pre; + struct HPMHookPoint *HP_pcg_get_dummy_group_post; + struct HPMHookPoint *HP_pcg_exists_pre; + struct HPMHookPoint *HP_pcg_exists_post; + struct HPMHookPoint *HP_pcg_id2group_pre; + struct HPMHookPoint *HP_pcg_id2group_post; + struct HPMHookPoint *HP_pcg_has_permission_pre; + struct HPMHookPoint *HP_pcg_has_permission_post; + struct HPMHookPoint *HP_pcg_should_log_commands_pre; + struct HPMHookPoint *HP_pcg_should_log_commands_post; + struct HPMHookPoint *HP_pcg_get_name_pre; + struct HPMHookPoint *HP_pcg_get_name_post; + struct HPMHookPoint *HP_pcg_get_level_pre; + struct HPMHookPoint *HP_pcg_get_level_post; + struct HPMHookPoint *HP_pcg_get_idx_pre; + struct HPMHookPoint *HP_pcg_get_idx_post; struct HPMHookPoint *HP_pc_init_pre; struct HPMHookPoint *HP_pc_init_post; struct HPMHookPoint *HP_pc_final_pre; @@ -3393,14 +3507,12 @@ struct { struct HPMHookPoint *HP_pc_get_dummy_sd_post; struct HPMHookPoint *HP_pc_class2idx_pre; struct HPMHookPoint *HP_pc_class2idx_post; - struct HPMHookPoint *HP_pc_get_group_level_pre; - struct HPMHookPoint *HP_pc_get_group_level_post; struct HPMHookPoint *HP_pc_can_give_items_pre; struct HPMHookPoint *HP_pc_can_give_items_post; + struct HPMHookPoint *HP_pc_can_give_bound_items_pre; + struct HPMHookPoint *HP_pc_can_give_bound_items_post; struct HPMHookPoint *HP_pc_can_use_command_pre; struct HPMHookPoint *HP_pc_can_use_command_post; - struct HPMHookPoint *HP_pc_has_permission_pre; - struct HPMHookPoint *HP_pc_has_permission_post; struct HPMHookPoint *HP_pc_set_group_pre; struct HPMHookPoint *HP_pc_set_group_post; struct HPMHookPoint *HP_pc_should_log_commands_pre; @@ -3543,6 +3655,8 @@ struct { struct HPMHookPoint *HP_pc_gets_status_point_post; struct HPMHookPoint *HP_pc_need_status_point_pre; struct HPMHookPoint *HP_pc_need_status_point_post; + struct HPMHookPoint *HP_pc_maxparameterincrease_pre; + struct HPMHookPoint *HP_pc_maxparameterincrease_post; struct HPMHookPoint *HP_pc_statusup_pre; struct HPMHookPoint *HP_pc_statusup_post; struct HPMHookPoint *HP_pc_statusup2_pre; @@ -3765,6 +3879,32 @@ struct { struct HPMHookPoint *HP_pc_calcweapontype_post; struct HPMHookPoint *HP_pc_removecombo_pre; struct HPMHookPoint *HP_pc_removecombo_post; + struct HPMHookPoint *HP_pc_bank_deposit_pre; + 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_pc_bound_clear_pre; + struct HPMHookPoint *HP_pc_bound_clear_post; + struct HPMHookPoint *HP_pc_expiration_timer_pre; + struct HPMHookPoint *HP_pc_expiration_timer_post; + struct HPMHookPoint *HP_pc_global_expiration_timer_pre; + struct HPMHookPoint *HP_pc_global_expiration_timer_post; + struct HPMHookPoint *HP_pc_expire_check_pre; + struct HPMHookPoint *HP_pc_expire_check_post; + struct HPMHookPoint *HP_pc_autotrade_load_pre; + struct HPMHookPoint *HP_pc_autotrade_load_post; + struct HPMHookPoint *HP_pc_autotrade_update_pre; + struct HPMHookPoint *HP_pc_autotrade_update_post; + struct HPMHookPoint *HP_pc_autotrade_start_pre; + struct HPMHookPoint *HP_pc_autotrade_start_post; + struct HPMHookPoint *HP_pc_autotrade_prepare_pre; + struct HPMHookPoint *HP_pc_autotrade_prepare_post; + struct HPMHookPoint *HP_pc_autotrade_populate_pre; + struct HPMHookPoint *HP_pc_autotrade_populate_post; struct HPMHookPoint *HP_pet_init_pre; struct HPMHookPoint *HP_pet_init_post; struct HPMHookPoint *HP_pet_final_pre; @@ -3845,10 +3985,12 @@ struct { struct HPMHookPoint *HP_pet_read_db_post; struct HPMHookPoint *HP_quest_init_pre; struct HPMHookPoint *HP_quest_init_post; + struct HPMHookPoint *HP_quest_final_pre; + struct HPMHookPoint *HP_quest_final_post; struct HPMHookPoint *HP_quest_reload_pre; struct HPMHookPoint *HP_quest_reload_post; - struct HPMHookPoint *HP_quest_search_db_pre; - struct HPMHookPoint *HP_quest_search_db_post; + struct HPMHookPoint *HP_quest_db_pre; + struct HPMHookPoint *HP_quest_db_post; struct HPMHookPoint *HP_quest_pc_login_pre; struct HPMHookPoint *HP_quest_pc_login_post; struct HPMHookPoint *HP_quest_add_pre; @@ -3865,6 +4007,8 @@ struct { struct HPMHookPoint *HP_quest_update_status_post; struct HPMHookPoint *HP_quest_check_pre; struct HPMHookPoint *HP_quest_check_post; + struct HPMHookPoint *HP_quest_clear_pre; + struct HPMHookPoint *HP_quest_clear_post; struct HPMHookPoint *HP_quest_read_db_pre; struct HPMHookPoint *HP_quest_read_db_post; struct HPMHookPoint *HP_script_init_pre; @@ -3875,6 +4019,8 @@ struct { struct HPMHookPoint *HP_script_reload_post; struct HPMHookPoint *HP_script_parse_pre; struct HPMHookPoint *HP_script_parse_post; + struct HPMHookPoint *HP_script_add_builtin_pre; + struct HPMHookPoint *HP_script_add_builtin_post; struct HPMHookPoint *HP_script_parse_builtin_pre; struct HPMHookPoint *HP_script_parse_builtin_post; struct HPMHookPoint *HP_script_parse_subexpr_pre; @@ -3911,8 +4057,6 @@ struct { struct HPMHookPoint *HP_script_set_constant_post; struct HPMHookPoint *HP_script_set_constant2_pre; struct HPMHookPoint *HP_script_set_constant2_post; - struct HPMHookPoint *HP_script_set_constant_force_pre; - struct HPMHookPoint *HP_script_set_constant_force_post; struct HPMHookPoint *HP_script_get_constant_pre; struct HPMHookPoint *HP_script_get_constant_post; struct HPMHookPoint *HP_script_label_add_pre; @@ -3985,8 +4129,6 @@ struct { struct HPMHookPoint *HP_script_reportdata_post; struct HPMHookPoint *HP_script_reportfunc_pre; struct HPMHookPoint *HP_script_reportfunc_post; - struct HPMHookPoint *HP_script_disp_error_message2_pre; - struct HPMHookPoint *HP_script_disp_error_message2_post; struct HPMHookPoint *HP_script_disp_warning_message_pre; struct HPMHookPoint *HP_script_disp_warning_message_post; struct HPMHookPoint *HP_script_check_event_pre; @@ -4031,8 +4173,6 @@ struct { struct HPMHookPoint *HP_script_stack_expand_post; struct HPMHookPoint *HP_script_push_retinfo_pre; struct HPMHookPoint *HP_script_push_retinfo_post; - struct HPMHookPoint *HP_script_pop_val_pre; - struct HPMHookPoint *HP_script_pop_val_post; struct HPMHookPoint *HP_script_op_3_pre; struct HPMHookPoint *HP_script_op_3_post; struct HPMHookPoint *HP_script_op_2str_pre; @@ -4057,8 +4197,6 @@ struct { struct HPMHookPoint *HP_script_buildin_areawarp_sub_post; struct HPMHookPoint *HP_script_buildin_areapercentheal_sub_pre; struct HPMHookPoint *HP_script_buildin_areapercentheal_sub_post; - struct HPMHookPoint *HP_script_getarraysize_pre; - struct HPMHookPoint *HP_script_getarraysize_post; struct HPMHookPoint *HP_script_buildin_delitem_delete_pre; struct HPMHookPoint *HP_script_buildin_delitem_delete_post; struct HPMHookPoint *HP_script_buildin_delitem_search_pre; @@ -4087,16 +4225,14 @@ struct { struct HPMHookPoint *HP_script_buildin_maprespawnguildid_sub_mob_post; struct HPMHookPoint *HP_script_buildin_mobcount_sub_pre; struct HPMHookPoint *HP_script_buildin_mobcount_sub_post; - struct HPMHookPoint *HP_script_playBGM_sub_pre; - struct HPMHookPoint *HP_script_playBGM_sub_post; - struct HPMHookPoint *HP_script_playBGM_foreachpc_sub_pre; - struct HPMHookPoint *HP_script_playBGM_foreachpc_sub_post; + struct HPMHookPoint *HP_script_playbgm_sub_pre; + struct HPMHookPoint *HP_script_playbgm_sub_post; + struct HPMHookPoint *HP_script_playbgm_foreachpc_sub_pre; + struct HPMHookPoint *HP_script_playbgm_foreachpc_sub_post; struct HPMHookPoint *HP_script_soundeffect_sub_pre; struct HPMHookPoint *HP_script_soundeffect_sub_post; struct HPMHookPoint *HP_script_buildin_query_sql_sub_pre; struct HPMHookPoint *HP_script_buildin_query_sql_sub_post; - struct HPMHookPoint *HP_script_axtoi_pre; - struct HPMHookPoint *HP_script_axtoi_post; struct HPMHookPoint *HP_script_buildin_instance_warpall_sub_pre; struct HPMHookPoint *HP_script_buildin_instance_warpall_sub_post; struct HPMHookPoint *HP_script_buildin_mobuseskill_sub_pre; @@ -4105,6 +4241,36 @@ struct { struct HPMHookPoint *HP_script_cleanfloor_sub_post; struct HPMHookPoint *HP_script_run_func_pre; struct HPMHookPoint *HP_script_run_func_post; + struct HPMHookPoint *HP_script_getfuncname_pre; + struct HPMHookPoint *HP_script_getfuncname_post; + struct HPMHookPoint *HP_script_calc_hash_ci_pre; + struct HPMHookPoint *HP_script_calc_hash_ci_post; + struct HPMHookPoint *HP_script_array_src_pre; + struct HPMHookPoint *HP_script_array_src_post; + struct HPMHookPoint *HP_script_array_update_pre; + struct HPMHookPoint *HP_script_array_update_post; + struct HPMHookPoint *HP_script_array_delete_pre; + struct HPMHookPoint *HP_script_array_delete_post; + struct HPMHookPoint *HP_script_array_remove_member_pre; + struct HPMHookPoint *HP_script_array_remove_member_post; + struct HPMHookPoint *HP_script_array_add_member_pre; + struct HPMHookPoint *HP_script_array_add_member_post; + struct HPMHookPoint *HP_script_array_size_pre; + struct HPMHookPoint *HP_script_array_size_post; + struct HPMHookPoint *HP_script_array_highest_key_pre; + struct HPMHookPoint *HP_script_array_highest_key_post; + struct HPMHookPoint *HP_script_array_free_db_pre; + struct HPMHookPoint *HP_script_array_free_db_post; + struct HPMHookPoint *HP_script_array_ensure_zero_pre; + struct HPMHookPoint *HP_script_array_ensure_zero_post; + struct HPMHookPoint *HP_script_reg_destroy_single_pre; + struct HPMHookPoint *HP_script_reg_destroy_single_post; + struct HPMHookPoint *HP_script_reg_destroy_pre; + struct HPMHookPoint *HP_script_reg_destroy_post; + struct HPMHookPoint *HP_script_generic_ui_array_expand_pre; + struct HPMHookPoint *HP_script_generic_ui_array_expand_post; + struct HPMHookPoint *HP_script_array_cpy_list_pre; + struct HPMHookPoint *HP_script_array_cpy_list_post; struct HPMHookPoint *HP_searchstore_open_pre; struct HPMHookPoint *HP_searchstore_open_post; struct HPMHookPoint *HP_searchstore_query_pre; @@ -4487,10 +4653,10 @@ struct { struct HPMHookPoint *HP_skill_get_elemental_type_post; struct HPMHookPoint *HP_skill_cooldown_save_pre; struct HPMHookPoint *HP_skill_cooldown_save_post; - struct HPMHookPoint *HP_skill_maelstrom_suction_pre; - 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; @@ -4521,6 +4687,8 @@ struct { struct HPMHookPoint *HP_status_heal_post; struct HPMHookPoint *HP_status_revive_pre; struct HPMHookPoint *HP_status_revive_post; + struct HPMHookPoint *HP_status_fixed_revive_pre; + struct HPMHookPoint *HP_status_fixed_revive_post; struct HPMHookPoint *HP_status_get_regen_data_pre; struct HPMHookPoint *HP_status_get_regen_data_post; struct HPMHookPoint *HP_status_get_status_data_pre; @@ -4866,8 +5034,8 @@ struct { int HP_atcommand_init_post; int HP_atcommand_final_pre; int HP_atcommand_final_post; - int HP_atcommand_parse_pre; - int HP_atcommand_parse_post; + int HP_atcommand_exec_pre; + int HP_atcommand_exec_post; int HP_atcommand_create_pre; int HP_atcommand_create_post; int HP_atcommand_can_use_pre; @@ -4918,6 +5086,10 @@ 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_atcommand_msg_pre; + int HP_atcommand_msg_post; int HP_battle_init_pre; int HP_battle_init_post; int HP_battle_final_pre; @@ -4938,8 +5110,8 @@ struct { int HP_battle_delay_damage_post; int HP_battle_drain_pre; int HP_battle_drain_post; - int HP_battle_calc_return_damage_pre; - int HP_battle_calc_return_damage_post; + int HP_battle_reflect_damage_pre; + int HP_battle_reflect_damage_post; int HP_battle_attr_ratio_pre; int HP_battle_attr_ratio_post; int HP_battle_attr_fix_pre; @@ -4950,6 +5122,8 @@ struct { int HP_battle_calc_elefix_post; int HP_battle_calc_masteryfix_pre; int HP_battle_calc_masteryfix_post; + int HP_battle_calc_chorusbonus_pre; + int HP_battle_calc_chorusbonus_post; int HP_battle_calc_skillratio_pre; int HP_battle_calc_skillratio_post; int HP_battle_calc_sizefix_pre; @@ -5114,10 +5288,10 @@ struct { int HP_chat_trigger_event_post; int HP_chat_create_pre; int HP_chat_create_post; - int HP_chrif_final_pre; - int HP_chrif_final_post; int HP_chrif_init_pre; int HP_chrif_init_post; + int HP_chrif_final_pre; + int HP_chrif_final_post; int HP_chrif_setuserid_pre; int HP_chrif_setuserid_post; int HP_chrif_setpasswd_pre; @@ -5166,8 +5340,6 @@ struct { int HP_chrif_save_scdata_post; int HP_chrif_ragsrvinfo_pre; int HP_chrif_ragsrvinfo_post; - int HP_chrif_char_offline_pre; - int HP_chrif_char_offline_post; int HP_chrif_char_offline_nsd_pre; int HP_chrif_char_offline_nsd_post; int HP_chrif_char_reset_offline_pre; @@ -5184,8 +5356,8 @@ struct { int HP_chrif_removefriend_post; int HP_chrif_send_report_pre; int HP_chrif_send_report_post; - int HP_chrif_flush_fifo_pre; - int HP_chrif_flush_fifo_post; + int HP_chrif_flush_pre; + int HP_chrif_flush_post; int HP_chrif_skillid2idx_pre; int HP_chrif_skillid2idx_post; int HP_chrif_sd_to_auth_pre; @@ -5224,8 +5396,8 @@ struct { int HP_chrif_changedsex_post; int HP_chrif_divorceack_pre; int HP_chrif_divorceack_post; - int HP_chrif_accountban_pre; - int HP_chrif_accountban_post; + int HP_chrif_idbanned_pre; + int HP_chrif_idbanned_post; int HP_chrif_recvfamelist_pre; int HP_chrif_recvfamelist_post; int HP_chrif_load_scdata_pre; @@ -5252,6 +5424,10 @@ struct { int HP_chrif_on_disconnect_post; int HP_chrif_parse_pre; int HP_chrif_parse_post; + int HP_chrif_save_scdata_single_pre; + int HP_chrif_save_scdata_single_post; + int HP_chrif_del_scdata_single_pre; + int HP_chrif_del_scdata_single_post; int HP_clif_init_pre; int HP_clif_init_post; int HP_clif_final_pre; @@ -5324,6 +5500,8 @@ struct { int HP_clif_cashshop_load_post; int HP_clif_package_announce_pre; int HP_clif_package_announce_post; + int HP_clif_item_drop_announce_pre; + int HP_clif_item_drop_announce_post; int HP_clif_clearunit_single_pre; int HP_clif_clearunit_single_post; int HP_clif_clearunit_area_pre; @@ -5350,8 +5528,6 @@ struct { int HP_clif_refreshlook_post; int HP_clif_class_change_pre; int HP_clif_class_change_post; - int HP_clif_skill_setunit_pre; - int HP_clif_skill_setunit_post; int HP_clif_skill_delunit_pre; int HP_clif_skill_delunit_post; int HP_clif_skillunit_update_pre; @@ -5378,6 +5554,8 @@ struct { int HP_clif_clearchar_skillunit_post; int HP_clif_getareachar_pre; int HP_clif_getareachar_post; + int HP_clif_graffiti_entry_pre; + int HP_clif_graffiti_entry_post; int HP_clif_spawn_pre; int HP_clif_spawn_post; int HP_clif_changemap_pre; @@ -5548,8 +5726,6 @@ struct { int HP_clif_equiptickack_post; int HP_clif_viewequip_ack_pre; int HP_clif_viewequip_ack_post; - int HP_clif_viewequip_fail_pre; - int HP_clif_viewequip_fail_post; int HP_clif_equpcheckbox_pre; int HP_clif_equpcheckbox_post; int HP_clif_displayexp_pre; @@ -5706,8 +5882,6 @@ struct { int HP_clif_wis_message_post; int HP_clif_wis_end_pre; int HP_clif_wis_end_post; - int HP_clif_disp_onlyself_pre; - int HP_clif_disp_onlyself_post; int HP_clif_disp_message_pre; int HP_clif_disp_message_post; int HP_clif_broadcast_pre; @@ -5742,6 +5916,8 @@ struct { int HP_clif_wisall_post; int HP_clif_PMIgnoreList_pre; int HP_clif_PMIgnoreList_post; + int HP_clif_ShowScript_pre; + int HP_clif_ShowScript_post; int HP_clif_traderequest_pre; int HP_clif_traderequest_post; int HP_clif_tradestart_pre; @@ -5858,8 +6034,6 @@ struct { int HP_clif_guild_notice_post; int HP_clif_guild_message_pre; int HP_clif_guild_message_post; - int HP_clif_guild_skillup_pre; - int HP_clif_guild_skillup_post; int HP_clif_guild_reqalliance_pre; int HP_clif_guild_reqalliance_post; int HP_clif_guild_allianceack_pre; @@ -6128,6 +6302,22 @@ struct { int HP_clif_chsys_gjoin_post; int HP_clif_chsys_gleave_pre; int HP_clif_chsys_gleave_post; + int HP_clif_bank_deposit_pre; + int HP_clif_bank_deposit_post; + int HP_clif_bank_withdraw_pre; + int HP_clif_bank_withdraw_post; + int HP_clif_show_modifiers_pre; + int HP_clif_show_modifiers_post; + int HP_clif_notify_bounditem_pre; + int HP_clif_notify_bounditem_post; + int HP_clif_delay_damage_pre; + int HP_clif_delay_damage_post; + int HP_clif_delay_damage_sub_pre; + int HP_clif_delay_damage_sub_post; + int HP_clif_npc_market_open_pre; + int HP_clif_npc_market_open_post; + int HP_clif_npc_market_purchase_ack_pre; + int HP_clif_npc_market_purchase_ack_post; int HP_clif_pWantToConnection_pre; int HP_clif_pWantToConnection_post; int HP_clif_pLoadEndAck_pre; @@ -6406,6 +6596,8 @@ struct { int HP_clif_pGMReqAccountName_post; int HP_clif_pGMChangeMapType_pre; int HP_clif_pGMChangeMapType_post; + int HP_clif_pGMFullStrip_pre; + int HP_clif_pGMFullStrip_post; int HP_clif_pPMIgnore_pre; int HP_clif_pPMIgnore_post; int HP_clif_pPMIgnoreAll_pre; @@ -6556,6 +6748,22 @@ struct { int HP_clif_pPartyBookingRefuseVolunteer_post; int HP_clif_pPartyBookingCancelVolunteer_pre; int HP_clif_pPartyBookingCancelVolunteer_post; + int HP_clif_pBankDeposit_pre; + int HP_clif_pBankDeposit_post; + int HP_clif_pBankWithdraw_pre; + int HP_clif_pBankWithdraw_post; + int HP_clif_pBankCheck_pre; + int HP_clif_pBankCheck_post; + int HP_clif_pBankOpen_pre; + int HP_clif_pBankOpen_post; + int HP_clif_pBankClose_pre; + int HP_clif_pBankClose_post; + int HP_clif_pNPCShopClosed_pre; + int HP_clif_pNPCShopClosed_post; + int HP_clif_pNPCMarketClosed_pre; + int HP_clif_pNPCMarketClosed_post; + int HP_clif_pNPCMarketPurchase_pre; + int HP_clif_pNPCMarketPurchase_post; int HP_duel_create_pre; int HP_duel_create_post; int HP_duel_invite_pre; @@ -6774,6 +6982,8 @@ struct { int HP_guild_flags_clear_post; int HP_guild_aura_refresh_pre; int HP_guild_aura_refresh_post; + int HP_guild_retrieveitembound_pre; + int HP_guild_retrieveitembound_post; int HP_guild_payexp_timer_pre; int HP_guild_payexp_timer_post; int HP_guild_sd_check_pre; @@ -6938,6 +7148,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; @@ -6948,6 +7160,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; @@ -7036,6 +7254,8 @@ struct { int HP_intif_guild_castle_dataload_post; int HP_intif_guild_castle_datasave_pre; int HP_intif_guild_castle_datasave_post; + int HP_intif_itembound_req_pre; + int HP_intif_itembound_req_post; int HP_intif_request_petdata_pre; int HP_intif_request_petdata_post; int HP_intif_save_petdata_pre; @@ -7192,6 +7412,8 @@ struct { int HP_intif_pAuctionMessage_post; int HP_intif_pAuctionBid_pre; int HP_intif_pAuctionBid_post; + int HP_intif_pItembound_ack_pre; + int HP_intif_pItembound_ack_post; int HP_intif_pMercenaryReceived_pre; int HP_intif_pMercenaryReceived_post; int HP_intif_pMercenaryDeleted_pre; @@ -7260,8 +7482,6 @@ struct { int HP_itemdb_reload_post; int HP_itemdb_name_constants_pre; int HP_itemdb_name_constants_post; - int HP_itemdb_force_name_constants_pre; - int HP_itemdb_force_name_constants_post; int HP_itemdb_read_groups_pre; int HP_itemdb_read_groups_post; int HP_itemdb_read_chains_pre; @@ -7282,8 +7502,6 @@ struct { int HP_itemdb_load_post; int HP_itemdb_search_pre; int HP_itemdb_search_post; - int HP_itemdb_parse_dbrow_pre; - int HP_itemdb_parse_dbrow_post; int HP_itemdb_exists_pre; int HP_itemdb_exists_post; int HP_itemdb_in_group_pre; @@ -7358,12 +7576,16 @@ struct { int HP_itemdb_read_combos_post; int HP_itemdb_gendercheck_pre; int HP_itemdb_gendercheck_post; - int HP_itemdb_re_split_atoi_pre; - int HP_itemdb_re_split_atoi_post; - int HP_itemdb_readdb_pre; - int HP_itemdb_readdb_post; - int HP_itemdb_read_sqldb_pre; - int HP_itemdb_read_sqldb_post; + int HP_itemdb_validate_entry_pre; + int HP_itemdb_validate_entry_post; + int HP_itemdb_readdb_sql_sub_pre; + int HP_itemdb_readdb_sql_sub_post; + int HP_itemdb_readdb_libconfig_sub_pre; + int HP_itemdb_readdb_libconfig_sub_post; + int HP_itemdb_readdb_libconfig_pre; + int HP_itemdb_readdb_libconfig_post; + int HP_itemdb_readdb_sql_pre; + int HP_itemdb_readdb_sql_post; int HP_itemdb_unique_id_pre; int HP_itemdb_unique_id_post; int HP_itemdb_uid_load_pre; @@ -7374,6 +7596,10 @@ struct { int HP_itemdb_destroy_item_data_post; int HP_itemdb_final_sub_pre; int HP_itemdb_final_sub_post; + int HP_itemdb_clear_pre; + int HP_itemdb_clear_post; + int HP_itemdb_id2combo_pre; + int HP_itemdb_id2combo_post; int HP_logs_pick_pc_pre; int HP_logs_pick_pc_post; int HP_logs_pick_mob_pre; @@ -7688,6 +7914,14 @@ 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_map_merge_zone_pre; + int HP_map_merge_zone_post; int HP_mapit_alloc_pre; int HP_mapit_alloc_post; int HP_mapit_free_pre; @@ -7942,6 +8176,8 @@ struct { int HP_mob_readdb_post; int HP_mob_read_sqldb_pre; int HP_mob_read_sqldb_post; + int HP_mob_name_constants_pre; + int HP_mob_name_constants_post; int HP_mob_readdb_mobavail_pre; int HP_mob_readdb_mobavail_post; int HP_mob_read_randommonster_pre; @@ -8076,6 +8312,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; @@ -8134,6 +8374,24 @@ struct { int HP_npc_debug_warps_sub_post; int HP_npc_debug_warps_pre; int HP_npc_debug_warps_post; + int HP_npc_trader_count_funds_pre; + int HP_npc_trader_count_funds_post; + int HP_npc_trader_pay_pre; + int HP_npc_trader_pay_post; + int HP_npc_trader_update_pre; + int HP_npc_trader_update_post; + int HP_npc_market_buylist_pre; + int HP_npc_market_buylist_post; + int HP_npc_trader_open_pre; + int HP_npc_trader_open_post; + int HP_npc_market_fromsql_pre; + int HP_npc_market_fromsql_post; + int HP_npc_market_tosql_pre; + int HP_npc_market_tosql_post; + int HP_npc_market_delfromsql_pre; + int HP_npc_market_delfromsql_post; + int HP_npc_market_delfromsql_sub_pre; + int HP_npc_market_delfromsql_sub_post; int HP_npc_secure_timeout_timer_pre; int HP_npc_secure_timeout_timer_post; int HP_party_init_pre; @@ -8204,6 +8462,8 @@ struct { int HP_party_send_dot_remove_post; int HP_party_sub_count_pre; int HP_party_sub_count_post; + int HP_party_sub_count_chorus_pre; + int HP_party_sub_count_chorus_post; int HP_party_booking_register_pre; int HP_party_booking_register_post; int HP_party_booking_update_pre; @@ -8242,6 +8502,28 @@ struct { int HP_path_check_distance_post; int HP_path_distance_pre; int HP_path_distance_post; + int HP_pcg_init_pre; + int HP_pcg_init_post; + int HP_pcg_final_pre; + int HP_pcg_final_post; + int HP_pcg_reload_pre; + int HP_pcg_reload_post; + int HP_pcg_get_dummy_group_pre; + int HP_pcg_get_dummy_group_post; + int HP_pcg_exists_pre; + int HP_pcg_exists_post; + int HP_pcg_id2group_pre; + int HP_pcg_id2group_post; + int HP_pcg_has_permission_pre; + int HP_pcg_has_permission_post; + int HP_pcg_should_log_commands_pre; + int HP_pcg_should_log_commands_post; + int HP_pcg_get_name_pre; + int HP_pcg_get_name_post; + int HP_pcg_get_level_pre; + int HP_pcg_get_level_post; + int HP_pcg_get_idx_pre; + int HP_pcg_get_idx_post; int HP_pc_init_pre; int HP_pc_init_post; int HP_pc_final_pre; @@ -8250,14 +8532,12 @@ struct { int HP_pc_get_dummy_sd_post; int HP_pc_class2idx_pre; int HP_pc_class2idx_post; - int HP_pc_get_group_level_pre; - int HP_pc_get_group_level_post; int HP_pc_can_give_items_pre; int HP_pc_can_give_items_post; + int HP_pc_can_give_bound_items_pre; + int HP_pc_can_give_bound_items_post; int HP_pc_can_use_command_pre; int HP_pc_can_use_command_post; - int HP_pc_has_permission_pre; - int HP_pc_has_permission_post; int HP_pc_set_group_pre; int HP_pc_set_group_post; int HP_pc_should_log_commands_pre; @@ -8400,6 +8680,8 @@ struct { int HP_pc_gets_status_point_post; int HP_pc_need_status_point_pre; int HP_pc_need_status_point_post; + int HP_pc_maxparameterincrease_pre; + int HP_pc_maxparameterincrease_post; int HP_pc_statusup_pre; int HP_pc_statusup_post; int HP_pc_statusup2_pre; @@ -8622,6 +8904,32 @@ struct { int HP_pc_calcweapontype_post; int HP_pc_removecombo_pre; int HP_pc_removecombo_post; + int HP_pc_bank_deposit_pre; + 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_pc_bound_clear_pre; + int HP_pc_bound_clear_post; + int HP_pc_expiration_timer_pre; + int HP_pc_expiration_timer_post; + int HP_pc_global_expiration_timer_pre; + int HP_pc_global_expiration_timer_post; + int HP_pc_expire_check_pre; + int HP_pc_expire_check_post; + int HP_pc_autotrade_load_pre; + int HP_pc_autotrade_load_post; + int HP_pc_autotrade_update_pre; + int HP_pc_autotrade_update_post; + int HP_pc_autotrade_start_pre; + int HP_pc_autotrade_start_post; + int HP_pc_autotrade_prepare_pre; + int HP_pc_autotrade_prepare_post; + int HP_pc_autotrade_populate_pre; + int HP_pc_autotrade_populate_post; int HP_pet_init_pre; int HP_pet_init_post; int HP_pet_final_pre; @@ -8702,10 +9010,12 @@ struct { int HP_pet_read_db_post; int HP_quest_init_pre; int HP_quest_init_post; + int HP_quest_final_pre; + int HP_quest_final_post; int HP_quest_reload_pre; int HP_quest_reload_post; - int HP_quest_search_db_pre; - int HP_quest_search_db_post; + int HP_quest_db_pre; + int HP_quest_db_post; int HP_quest_pc_login_pre; int HP_quest_pc_login_post; int HP_quest_add_pre; @@ -8722,6 +9032,8 @@ struct { int HP_quest_update_status_post; int HP_quest_check_pre; int HP_quest_check_post; + int HP_quest_clear_pre; + int HP_quest_clear_post; int HP_quest_read_db_pre; int HP_quest_read_db_post; int HP_script_init_pre; @@ -8732,6 +9044,8 @@ struct { int HP_script_reload_post; int HP_script_parse_pre; int HP_script_parse_post; + int HP_script_add_builtin_pre; + int HP_script_add_builtin_post; int HP_script_parse_builtin_pre; int HP_script_parse_builtin_post; int HP_script_parse_subexpr_pre; @@ -8768,8 +9082,6 @@ struct { int HP_script_set_constant_post; int HP_script_set_constant2_pre; int HP_script_set_constant2_post; - int HP_script_set_constant_force_pre; - int HP_script_set_constant_force_post; int HP_script_get_constant_pre; int HP_script_get_constant_post; int HP_script_label_add_pre; @@ -8842,8 +9154,6 @@ struct { int HP_script_reportdata_post; int HP_script_reportfunc_pre; int HP_script_reportfunc_post; - int HP_script_disp_error_message2_pre; - int HP_script_disp_error_message2_post; int HP_script_disp_warning_message_pre; int HP_script_disp_warning_message_post; int HP_script_check_event_pre; @@ -8888,8 +9198,6 @@ struct { int HP_script_stack_expand_post; int HP_script_push_retinfo_pre; int HP_script_push_retinfo_post; - int HP_script_pop_val_pre; - int HP_script_pop_val_post; int HP_script_op_3_pre; int HP_script_op_3_post; int HP_script_op_2str_pre; @@ -8914,8 +9222,6 @@ struct { int HP_script_buildin_areawarp_sub_post; int HP_script_buildin_areapercentheal_sub_pre; int HP_script_buildin_areapercentheal_sub_post; - int HP_script_getarraysize_pre; - int HP_script_getarraysize_post; int HP_script_buildin_delitem_delete_pre; int HP_script_buildin_delitem_delete_post; int HP_script_buildin_delitem_search_pre; @@ -8944,16 +9250,14 @@ struct { int HP_script_buildin_maprespawnguildid_sub_mob_post; int HP_script_buildin_mobcount_sub_pre; int HP_script_buildin_mobcount_sub_post; - int HP_script_playBGM_sub_pre; - int HP_script_playBGM_sub_post; - int HP_script_playBGM_foreachpc_sub_pre; - int HP_script_playBGM_foreachpc_sub_post; + int HP_script_playbgm_sub_pre; + int HP_script_playbgm_sub_post; + int HP_script_playbgm_foreachpc_sub_pre; + int HP_script_playbgm_foreachpc_sub_post; int HP_script_soundeffect_sub_pre; int HP_script_soundeffect_sub_post; int HP_script_buildin_query_sql_sub_pre; int HP_script_buildin_query_sql_sub_post; - int HP_script_axtoi_pre; - int HP_script_axtoi_post; int HP_script_buildin_instance_warpall_sub_pre; int HP_script_buildin_instance_warpall_sub_post; int HP_script_buildin_mobuseskill_sub_pre; @@ -8962,6 +9266,36 @@ struct { int HP_script_cleanfloor_sub_post; int HP_script_run_func_pre; int HP_script_run_func_post; + int HP_script_getfuncname_pre; + int HP_script_getfuncname_post; + int HP_script_calc_hash_ci_pre; + int HP_script_calc_hash_ci_post; + int HP_script_array_src_pre; + int HP_script_array_src_post; + int HP_script_array_update_pre; + int HP_script_array_update_post; + int HP_script_array_delete_pre; + int HP_script_array_delete_post; + int HP_script_array_remove_member_pre; + int HP_script_array_remove_member_post; + int HP_script_array_add_member_pre; + int HP_script_array_add_member_post; + int HP_script_array_size_pre; + int HP_script_array_size_post; + int HP_script_array_highest_key_pre; + int HP_script_array_highest_key_post; + int HP_script_array_free_db_pre; + int HP_script_array_free_db_post; + int HP_script_array_ensure_zero_pre; + int HP_script_array_ensure_zero_post; + int HP_script_reg_destroy_single_pre; + int HP_script_reg_destroy_single_post; + int HP_script_reg_destroy_pre; + int HP_script_reg_destroy_post; + int HP_script_generic_ui_array_expand_pre; + int HP_script_generic_ui_array_expand_post; + int HP_script_array_cpy_list_pre; + int HP_script_array_cpy_list_post; int HP_searchstore_open_pre; int HP_searchstore_open_post; int HP_searchstore_query_pre; @@ -9344,10 +9678,10 @@ struct { int HP_skill_get_elemental_type_post; int HP_skill_cooldown_save_pre; int HP_skill_cooldown_save_post; - int HP_skill_maelstrom_suction_pre; - 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; @@ -9378,6 +9712,8 @@ struct { int HP_status_heal_post; int HP_status_revive_pre; int HP_status_revive_post; + int HP_status_fixed_revive_pre; + int HP_status_fixed_revive_post; int HP_status_get_regen_data_pre; int HP_status_get_regen_data_post; int HP_status_get_status_data_pre; @@ -9745,6 +10081,7 @@ struct { struct npc_interface npc; struct party_interface party; struct path_interface path; + struct pc_groups_interface pcg; struct pc_interface pc; struct pet_interface pet; struct quest_interface quest; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index 0eaaf4b93..9cd73bce8 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -6,2469 +6,2554 @@ struct HookingPointData HookingPoints[] = { /* atcommand */ - { HP_POP(atcommand->init), HP_POP2(HP_atcommand_init), 0 }, - { HP_POP(atcommand->final), HP_POP2(HP_atcommand_final), 2 }, - { HP_POP(atcommand->parse), HP_POP2(HP_atcommand_parse), 4 }, - { HP_POP(atcommand->create), HP_POP2(HP_atcommand_create), 6 }, - { HP_POP(atcommand->can_use), HP_POP2(HP_atcommand_can_use), 8 }, - { HP_POP(atcommand->can_use2), HP_POP2(HP_atcommand_can_use2), 10 }, - { HP_POP(atcommand->load_groups), HP_POP2(HP_atcommand_load_groups), 12 }, - { HP_POP(atcommand->exists), HP_POP2(HP_atcommand_exists), 14 }, - { HP_POP(atcommand->msg_read), HP_POP2(HP_atcommand_msg_read), 16 }, - { HP_POP(atcommand->final_msg), HP_POP2(HP_atcommand_final_msg), 18 }, - { HP_POP(atcommand->get_bind_byname), HP_POP2(HP_atcommand_get_bind_byname), 20 }, - { HP_POP(atcommand->get_info_byname), HP_POP2(HP_atcommand_get_info_byname), 22 }, - { HP_POP(atcommand->check_alias), HP_POP2(HP_atcommand_check_alias), 24 }, - { HP_POP(atcommand->get_suggestions), HP_POP2(HP_atcommand_get_suggestions), 26 }, - { HP_POP(atcommand->config_read), HP_POP2(HP_atcommand_config_read), 28 }, - { HP_POP(atcommand->stopattack), HP_POP2(HP_atcommand_stopattack), 30 }, - { HP_POP(atcommand->pvpoff_sub), HP_POP2(HP_atcommand_pvpoff_sub), 32 }, - { HP_POP(atcommand->pvpon_sub), HP_POP2(HP_atcommand_pvpon_sub), 34 }, - { HP_POP(atcommand->atkillmonster_sub), HP_POP2(HP_atcommand_atkillmonster_sub), 36 }, - { HP_POP(atcommand->raise_sub), HP_POP2(HP_atcommand_raise_sub), 38 }, - { HP_POP(atcommand->get_jail_time), HP_POP2(HP_atcommand_get_jail_time), 40 }, - { HP_POP(atcommand->cleanfloor_sub), HP_POP2(HP_atcommand_cleanfloor_sub), 42 }, - { HP_POP(atcommand->mutearea_sub), HP_POP2(HP_atcommand_mutearea_sub), 44 }, - { HP_POP(atcommand->commands_sub), HP_POP2(HP_atcommand_commands_sub), 46 }, - { HP_POP(atcommand->cmd_db_clear), HP_POP2(HP_atcommand_cmd_db_clear), 48 }, - { HP_POP(atcommand->cmd_db_clear_sub), HP_POP2(HP_atcommand_cmd_db_clear_sub), 50 }, - { HP_POP(atcommand->doload), HP_POP2(HP_atcommand_doload), 52 }, - { HP_POP(atcommand->base_commands), HP_POP2(HP_atcommand_base_commands), 54 }, + { HP_POP(atcommand->init, HP_atcommand_init) }, + { HP_POP(atcommand->final, HP_atcommand_final) }, + { HP_POP(atcommand->exec, HP_atcommand_exec) }, + { HP_POP(atcommand->create, HP_atcommand_create) }, + { HP_POP(atcommand->can_use, HP_atcommand_can_use) }, + { HP_POP(atcommand->can_use2, HP_atcommand_can_use2) }, + { HP_POP(atcommand->load_groups, HP_atcommand_load_groups) }, + { HP_POP(atcommand->exists, HP_atcommand_exists) }, + { HP_POP(atcommand->msg_read, HP_atcommand_msg_read) }, + { HP_POP(atcommand->final_msg, HP_atcommand_final_msg) }, + { HP_POP(atcommand->get_bind_byname, HP_atcommand_get_bind_byname) }, + { HP_POP(atcommand->get_info_byname, HP_atcommand_get_info_byname) }, + { HP_POP(atcommand->check_alias, HP_atcommand_check_alias) }, + { HP_POP(atcommand->get_suggestions, HP_atcommand_get_suggestions) }, + { HP_POP(atcommand->config_read, HP_atcommand_config_read) }, + { HP_POP(atcommand->stopattack, HP_atcommand_stopattack) }, + { HP_POP(atcommand->pvpoff_sub, HP_atcommand_pvpoff_sub) }, + { HP_POP(atcommand->pvpon_sub, HP_atcommand_pvpon_sub) }, + { HP_POP(atcommand->atkillmonster_sub, HP_atcommand_atkillmonster_sub) }, + { HP_POP(atcommand->raise_sub, HP_atcommand_raise_sub) }, + { HP_POP(atcommand->get_jail_time, HP_atcommand_get_jail_time) }, + { HP_POP(atcommand->cleanfloor_sub, HP_atcommand_cleanfloor_sub) }, + { HP_POP(atcommand->mutearea_sub, HP_atcommand_mutearea_sub) }, + { HP_POP(atcommand->commands_sub, HP_atcommand_commands_sub) }, + { HP_POP(atcommand->cmd_db_clear, HP_atcommand_cmd_db_clear) }, + { 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) }, + { HP_POP(atcommand->msg, HP_atcommand_msg) }, /* battle */ - { HP_POP(battle->init), HP_POP2(HP_battle_init), 56 }, - { HP_POP(battle->final), HP_POP2(HP_battle_final), 58 }, - { HP_POP(battle->calc_attack), HP_POP2(HP_battle_calc_attack), 60 }, - { HP_POP(battle->calc_damage), HP_POP2(HP_battle_calc_damage), 62 }, - { HP_POP(battle->calc_gvg_damage), HP_POP2(HP_battle_calc_gvg_damage), 64 }, - { HP_POP(battle->calc_bg_damage), HP_POP2(HP_battle_calc_bg_damage), 66 }, - { HP_POP(battle->weapon_attack), HP_POP2(HP_battle_weapon_attack), 68 }, - { HP_POP(battle->calc_weapon_attack), HP_POP2(HP_battle_calc_weapon_attack), 70 }, - { HP_POP(battle->delay_damage), HP_POP2(HP_battle_delay_damage), 72 }, - { HP_POP(battle->drain), HP_POP2(HP_battle_drain), 74 }, - { HP_POP(battle->calc_return_damage), HP_POP2(HP_battle_calc_return_damage), 76 }, - { HP_POP(battle->attr_ratio), HP_POP2(HP_battle_attr_ratio), 78 }, - { HP_POP(battle->attr_fix), HP_POP2(HP_battle_attr_fix), 80 }, - { HP_POP(battle->calc_cardfix), HP_POP2(HP_battle_calc_cardfix), 82 }, - { HP_POP(battle->calc_elefix), HP_POP2(HP_battle_calc_elefix), 84 }, - { HP_POP(battle->calc_masteryfix), HP_POP2(HP_battle_calc_masteryfix), 86 }, - { HP_POP(battle->calc_skillratio), HP_POP2(HP_battle_calc_skillratio), 88 }, - { HP_POP(battle->calc_sizefix), HP_POP2(HP_battle_calc_sizefix), 90 }, - { HP_POP(battle->calc_weapon_damage), HP_POP2(HP_battle_calc_weapon_damage), 92 }, - { HP_POP(battle->calc_defense), HP_POP2(HP_battle_calc_defense), 94 }, - { HP_POP(battle->get_master), HP_POP2(HP_battle_get_master), 96 }, - { HP_POP(battle->get_targeted), HP_POP2(HP_battle_get_targeted), 98 }, - { HP_POP(battle->get_enemy), HP_POP2(HP_battle_get_enemy), 100 }, - { HP_POP(battle->get_target), HP_POP2(HP_battle_get_target), 102 }, - { HP_POP(battle->get_current_skill), HP_POP2(HP_battle_get_current_skill), 104 }, - { HP_POP(battle->check_undead), HP_POP2(HP_battle_check_undead), 106 }, - { HP_POP(battle->check_target), HP_POP2(HP_battle_check_target), 108 }, - { HP_POP(battle->check_range), HP_POP2(HP_battle_check_range), 110 }, - { HP_POP(battle->consume_ammo), HP_POP2(HP_battle_consume_ammo), 112 }, - { HP_POP(battle->get_targeted_sub), HP_POP2(HP_battle_get_targeted_sub), 114 }, - { HP_POP(battle->get_enemy_sub), HP_POP2(HP_battle_get_enemy_sub), 116 }, - { HP_POP(battle->get_enemy_area_sub), HP_POP2(HP_battle_get_enemy_area_sub), 118 }, - { HP_POP(battle->delay_damage_sub), HP_POP2(HP_battle_delay_damage_sub), 120 }, - { HP_POP(battle->blewcount_bonus), HP_POP2(HP_battle_blewcount_bonus), 122 }, - { HP_POP(battle->range_type), HP_POP2(HP_battle_range_type), 124 }, - { HP_POP(battle->calc_base_damage), HP_POP2(HP_battle_calc_base_damage), 126 }, - { HP_POP(battle->calc_base_damage2), HP_POP2(HP_battle_calc_base_damage2), 128 }, - { HP_POP(battle->calc_misc_attack), HP_POP2(HP_battle_calc_misc_attack), 130 }, - { HP_POP(battle->calc_magic_attack), HP_POP2(HP_battle_calc_magic_attack), 132 }, - { HP_POP(battle->adjust_skill_damage), HP_POP2(HP_battle_adjust_skill_damage), 134 }, - { HP_POP(battle->add_mastery), HP_POP2(HP_battle_add_mastery), 136 }, - { HP_POP(battle->calc_drain), HP_POP2(HP_battle_calc_drain), 138 }, - { HP_POP(battle->config_read), HP_POP2(HP_battle_config_read), 140 }, - { HP_POP(battle->config_set_defaults), HP_POP2(HP_battle_config_set_defaults), 142 }, - { HP_POP(battle->config_set_value), HP_POP2(HP_battle_config_set_value), 144 }, - { HP_POP(battle->config_get_value), HP_POP2(HP_battle_config_get_value), 146 }, - { HP_POP(battle->config_adjust), HP_POP2(HP_battle_config_adjust), 148 }, - { HP_POP(battle->get_enemy_area), HP_POP2(HP_battle_get_enemy_area), 150 }, - { HP_POP(battle->damage_area), HP_POP2(HP_battle_damage_area), 152 }, + { HP_POP(battle->init, HP_battle_init) }, + { HP_POP(battle->final, HP_battle_final) }, + { HP_POP(battle->calc_attack, HP_battle_calc_attack) }, + { HP_POP(battle->calc_damage, HP_battle_calc_damage) }, + { HP_POP(battle->calc_gvg_damage, HP_battle_calc_gvg_damage) }, + { HP_POP(battle->calc_bg_damage, HP_battle_calc_bg_damage) }, + { HP_POP(battle->weapon_attack, HP_battle_weapon_attack) }, + { HP_POP(battle->calc_weapon_attack, HP_battle_calc_weapon_attack) }, + { HP_POP(battle->delay_damage, HP_battle_delay_damage) }, + { HP_POP(battle->drain, HP_battle_drain) }, + { HP_POP(battle->reflect_damage, HP_battle_reflect_damage) }, + { HP_POP(battle->attr_ratio, HP_battle_attr_ratio) }, + { HP_POP(battle->attr_fix, HP_battle_attr_fix) }, + { HP_POP(battle->calc_cardfix, HP_battle_calc_cardfix) }, + { HP_POP(battle->calc_elefix, HP_battle_calc_elefix) }, + { HP_POP(battle->calc_masteryfix, HP_battle_calc_masteryfix) }, + { HP_POP(battle->calc_chorusbonus, HP_battle_calc_chorusbonus) }, + { HP_POP(battle->calc_skillratio, HP_battle_calc_skillratio) }, + { HP_POP(battle->calc_sizefix, HP_battle_calc_sizefix) }, + { HP_POP(battle->calc_weapon_damage, HP_battle_calc_weapon_damage) }, + { HP_POP(battle->calc_defense, HP_battle_calc_defense) }, + { HP_POP(battle->get_master, HP_battle_get_master) }, + { HP_POP(battle->get_targeted, HP_battle_get_targeted) }, + { HP_POP(battle->get_enemy, HP_battle_get_enemy) }, + { HP_POP(battle->get_target, HP_battle_get_target) }, + { HP_POP(battle->get_current_skill, HP_battle_get_current_skill) }, + { HP_POP(battle->check_undead, HP_battle_check_undead) }, + { HP_POP(battle->check_target, HP_battle_check_target) }, + { HP_POP(battle->check_range, HP_battle_check_range) }, + { HP_POP(battle->consume_ammo, HP_battle_consume_ammo) }, + { HP_POP(battle->get_targeted_sub, HP_battle_get_targeted_sub) }, + { HP_POP(battle->get_enemy_sub, HP_battle_get_enemy_sub) }, + { HP_POP(battle->get_enemy_area_sub, HP_battle_get_enemy_area_sub) }, + { HP_POP(battle->delay_damage_sub, HP_battle_delay_damage_sub) }, + { HP_POP(battle->blewcount_bonus, HP_battle_blewcount_bonus) }, + { HP_POP(battle->range_type, HP_battle_range_type) }, + { HP_POP(battle->calc_base_damage, HP_battle_calc_base_damage) }, + { HP_POP(battle->calc_base_damage2, HP_battle_calc_base_damage2) }, + { HP_POP(battle->calc_misc_attack, HP_battle_calc_misc_attack) }, + { HP_POP(battle->calc_magic_attack, HP_battle_calc_magic_attack) }, + { HP_POP(battle->adjust_skill_damage, HP_battle_adjust_skill_damage) }, + { HP_POP(battle->add_mastery, HP_battle_add_mastery) }, + { HP_POP(battle->calc_drain, HP_battle_calc_drain) }, + { HP_POP(battle->config_read, HP_battle_config_read) }, + { HP_POP(battle->config_set_defaults, HP_battle_config_set_defaults) }, + { HP_POP(battle->config_set_value, HP_battle_config_set_value) }, + { HP_POP(battle->config_get_value, HP_battle_config_get_value) }, + { HP_POP(battle->config_adjust, HP_battle_config_adjust) }, + { HP_POP(battle->get_enemy_area, HP_battle_get_enemy_area) }, + { HP_POP(battle->damage_area, HP_battle_damage_area) }, /* bg */ - { HP_POP(bg->init), HP_POP2(HP_bg_init), 154 }, - { HP_POP(bg->final), HP_POP2(HP_bg_final), 156 }, - { HP_POP(bg->name2arena), HP_POP2(HP_bg_name2arena), 158 }, - { HP_POP(bg->queue_add), HP_POP2(HP_bg_queue_add), 160 }, - { HP_POP(bg->can_queue), HP_POP2(HP_bg_can_queue), 162 }, - { HP_POP(bg->id2pos), HP_POP2(HP_bg_id2pos), 164 }, - { HP_POP(bg->queue_pc_cleanup), HP_POP2(HP_bg_queue_pc_cleanup), 166 }, - { HP_POP(bg->begin), HP_POP2(HP_bg_begin), 168 }, - { HP_POP(bg->begin_timer), HP_POP2(HP_bg_begin_timer), 170 }, - { HP_POP(bg->queue_pregame), HP_POP2(HP_bg_queue_pregame), 172 }, - { HP_POP(bg->fillup_timer), HP_POP2(HP_bg_fillup_timer), 174 }, - { HP_POP(bg->queue_ready_ack), HP_POP2(HP_bg_queue_ready_ack), 176 }, - { HP_POP(bg->match_over), HP_POP2(HP_bg_match_over), 178 }, - { HP_POP(bg->queue_check), HP_POP2(HP_bg_queue_check), 180 }, - { HP_POP(bg->team_search), HP_POP2(HP_bg_team_search), 182 }, - { HP_POP(bg->getavailablesd), HP_POP2(HP_bg_getavailablesd), 184 }, - { HP_POP(bg->team_delete), HP_POP2(HP_bg_team_delete), 186 }, - { HP_POP(bg->team_warp), HP_POP2(HP_bg_team_warp), 188 }, - { HP_POP(bg->send_dot_remove), HP_POP2(HP_bg_send_dot_remove), 190 }, - { HP_POP(bg->team_join), HP_POP2(HP_bg_team_join), 192 }, - { HP_POP(bg->team_leave), HP_POP2(HP_bg_team_leave), 194 }, - { HP_POP(bg->member_respawn), HP_POP2(HP_bg_member_respawn), 196 }, - { HP_POP(bg->create), HP_POP2(HP_bg_create), 198 }, - { HP_POP(bg->team_get_id), HP_POP2(HP_bg_team_get_id), 200 }, - { HP_POP(bg->send_message), HP_POP2(HP_bg_send_message), 202 }, - { HP_POP(bg->send_xy_timer_sub), HP_POP2(HP_bg_send_xy_timer_sub), 204 }, - { HP_POP(bg->send_xy_timer), HP_POP2(HP_bg_send_xy_timer), 206 }, - { HP_POP(bg->config_read), HP_POP2(HP_bg_config_read), 208 }, + { HP_POP(bg->init, HP_bg_init) }, + { HP_POP(bg->final, HP_bg_final) }, + { HP_POP(bg->name2arena, HP_bg_name2arena) }, + { HP_POP(bg->queue_add, HP_bg_queue_add) }, + { HP_POP(bg->can_queue, HP_bg_can_queue) }, + { HP_POP(bg->id2pos, HP_bg_id2pos) }, + { HP_POP(bg->queue_pc_cleanup, HP_bg_queue_pc_cleanup) }, + { HP_POP(bg->begin, HP_bg_begin) }, + { HP_POP(bg->begin_timer, HP_bg_begin_timer) }, + { HP_POP(bg->queue_pregame, HP_bg_queue_pregame) }, + { HP_POP(bg->fillup_timer, HP_bg_fillup_timer) }, + { HP_POP(bg->queue_ready_ack, HP_bg_queue_ready_ack) }, + { HP_POP(bg->match_over, HP_bg_match_over) }, + { HP_POP(bg->queue_check, HP_bg_queue_check) }, + { HP_POP(bg->team_search, HP_bg_team_search) }, + { HP_POP(bg->getavailablesd, HP_bg_getavailablesd) }, + { HP_POP(bg->team_delete, HP_bg_team_delete) }, + { HP_POP(bg->team_warp, HP_bg_team_warp) }, + { HP_POP(bg->send_dot_remove, HP_bg_send_dot_remove) }, + { HP_POP(bg->team_join, HP_bg_team_join) }, + { HP_POP(bg->team_leave, HP_bg_team_leave) }, + { HP_POP(bg->member_respawn, HP_bg_member_respawn) }, + { HP_POP(bg->create, HP_bg_create) }, + { HP_POP(bg->team_get_id, HP_bg_team_get_id) }, + { HP_POP(bg->send_message, HP_bg_send_message) }, + { HP_POP(bg->send_xy_timer_sub, HP_bg_send_xy_timer_sub) }, + { HP_POP(bg->send_xy_timer, HP_bg_send_xy_timer) }, + { HP_POP(bg->config_read, HP_bg_config_read) }, /* buyingstore */ - { HP_POP(buyingstore->setup), HP_POP2(HP_buyingstore_setup), 210 }, - { HP_POP(buyingstore->create), HP_POP2(HP_buyingstore_create), 212 }, - { HP_POP(buyingstore->close), HP_POP2(HP_buyingstore_close), 214 }, - { HP_POP(buyingstore->open), HP_POP2(HP_buyingstore_open), 216 }, - { HP_POP(buyingstore->trade), HP_POP2(HP_buyingstore_trade), 218 }, - { HP_POP(buyingstore->search), HP_POP2(HP_buyingstore_search), 220 }, - { HP_POP(buyingstore->searchall), HP_POP2(HP_buyingstore_searchall), 222 }, - { HP_POP(buyingstore->getuid), HP_POP2(HP_buyingstore_getuid), 224 }, + { HP_POP(buyingstore->setup, HP_buyingstore_setup) }, + { HP_POP(buyingstore->create, HP_buyingstore_create) }, + { HP_POP(buyingstore->close, HP_buyingstore_close) }, + { HP_POP(buyingstore->open, HP_buyingstore_open) }, + { HP_POP(buyingstore->trade, HP_buyingstore_trade) }, + { HP_POP(buyingstore->search, HP_buyingstore_search) }, + { HP_POP(buyingstore->searchall, HP_buyingstore_searchall) }, + { HP_POP(buyingstore->getuid, HP_buyingstore_getuid) }, /* chat */ - { HP_POP(chat->create_pc_chat), HP_POP2(HP_chat_create_pc_chat), 226 }, - { HP_POP(chat->join), HP_POP2(HP_chat_join), 228 }, - { HP_POP(chat->leave), HP_POP2(HP_chat_leave), 230 }, - { HP_POP(chat->change_owner), HP_POP2(HP_chat_change_owner), 232 }, - { HP_POP(chat->change_status), HP_POP2(HP_chat_change_status), 234 }, - { HP_POP(chat->kick), HP_POP2(HP_chat_kick), 236 }, - { HP_POP(chat->create_npc_chat), HP_POP2(HP_chat_create_npc_chat), 238 }, - { HP_POP(chat->delete_npc_chat), HP_POP2(HP_chat_delete_npc_chat), 240 }, - { HP_POP(chat->enable_event), HP_POP2(HP_chat_enable_event), 242 }, - { HP_POP(chat->disable_event), HP_POP2(HP_chat_disable_event), 244 }, - { HP_POP(chat->npc_kick_all), HP_POP2(HP_chat_npc_kick_all), 246 }, - { HP_POP(chat->trigger_event), HP_POP2(HP_chat_trigger_event), 248 }, - { HP_POP(chat->create), HP_POP2(HP_chat_create), 250 }, + { HP_POP(chat->create_pc_chat, HP_chat_create_pc_chat) }, + { HP_POP(chat->join, HP_chat_join) }, + { HP_POP(chat->leave, HP_chat_leave) }, + { HP_POP(chat->change_owner, HP_chat_change_owner) }, + { HP_POP(chat->change_status, HP_chat_change_status) }, + { HP_POP(chat->kick, HP_chat_kick) }, + { HP_POP(chat->create_npc_chat, HP_chat_create_npc_chat) }, + { HP_POP(chat->delete_npc_chat, HP_chat_delete_npc_chat) }, + { HP_POP(chat->enable_event, HP_chat_enable_event) }, + { HP_POP(chat->disable_event, HP_chat_disable_event) }, + { HP_POP(chat->npc_kick_all, HP_chat_npc_kick_all) }, + { HP_POP(chat->trigger_event, HP_chat_trigger_event) }, + { HP_POP(chat->create, HP_chat_create) }, /* chrif */ - { HP_POP(chrif->final), HP_POP2(HP_chrif_final), 252 }, - { HP_POP(chrif->init), HP_POP2(HP_chrif_init), 254 }, - { HP_POP(chrif->setuserid), HP_POP2(HP_chrif_setuserid), 256 }, - { HP_POP(chrif->setpasswd), HP_POP2(HP_chrif_setpasswd), 258 }, - { HP_POP(chrif->checkdefaultlogin), HP_POP2(HP_chrif_checkdefaultlogin), 260 }, - { HP_POP(chrif->setip), HP_POP2(HP_chrif_setip), 262 }, - { HP_POP(chrif->setport), HP_POP2(HP_chrif_setport), 264 }, - { HP_POP(chrif->isconnected), HP_POP2(HP_chrif_isconnected), 266 }, - { HP_POP(chrif->check_shutdown), HP_POP2(HP_chrif_check_shutdown), 268 }, - { HP_POP(chrif->search), HP_POP2(HP_chrif_search), 270 }, - { HP_POP(chrif->auth_check), HP_POP2(HP_chrif_auth_check), 272 }, - { HP_POP(chrif->auth_delete), HP_POP2(HP_chrif_auth_delete), 274 }, - { HP_POP(chrif->auth_finished), HP_POP2(HP_chrif_auth_finished), 276 }, - { HP_POP(chrif->authreq), HP_POP2(HP_chrif_authreq), 278 }, - { HP_POP(chrif->authok), HP_POP2(HP_chrif_authok), 280 }, - { HP_POP(chrif->scdata_request), HP_POP2(HP_chrif_scdata_request), 282 }, - { HP_POP(chrif->save), HP_POP2(HP_chrif_save), 284 }, - { HP_POP(chrif->charselectreq), HP_POP2(HP_chrif_charselectreq), 286 }, - { HP_POP(chrif->changemapserver), HP_POP2(HP_chrif_changemapserver), 288 }, - { HP_POP(chrif->searchcharid), HP_POP2(HP_chrif_searchcharid), 290 }, - { HP_POP(chrif->changeemail), HP_POP2(HP_chrif_changeemail), 292 }, - { HP_POP(chrif->char_ask_name), HP_POP2(HP_chrif_char_ask_name), 294 }, - { HP_POP(chrif->updatefamelist), HP_POP2(HP_chrif_updatefamelist), 296 }, - { HP_POP(chrif->buildfamelist), HP_POP2(HP_chrif_buildfamelist), 298 }, - { HP_POP(chrif->save_scdata), HP_POP2(HP_chrif_save_scdata), 300 }, - { HP_POP(chrif->ragsrvinfo), HP_POP2(HP_chrif_ragsrvinfo), 302 }, - { HP_POP(chrif->char_offline), HP_POP2(HP_chrif_char_offline), 304 }, - { HP_POP(chrif->char_offline_nsd), HP_POP2(HP_chrif_char_offline_nsd), 306 }, - { HP_POP(chrif->char_reset_offline), HP_POP2(HP_chrif_char_reset_offline), 308 }, - { HP_POP(chrif->send_users_tochar), HP_POP2(HP_chrif_send_users_tochar), 310 }, - { HP_POP(chrif->char_online), HP_POP2(HP_chrif_char_online), 312 }, - { HP_POP(chrif->changesex), HP_POP2(HP_chrif_changesex), 314 }, - { HP_POP(chrif->divorce), HP_POP2(HP_chrif_divorce), 316 }, - { HP_POP(chrif->removefriend), HP_POP2(HP_chrif_removefriend), 318 }, - { HP_POP(chrif->send_report), HP_POP2(HP_chrif_send_report), 320 }, - { HP_POP(chrif->flush_fifo), HP_POP2(HP_chrif_flush_fifo), 322 }, - { HP_POP(chrif->skillid2idx), HP_POP2(HP_chrif_skillid2idx), 324 }, - { HP_POP(chrif->sd_to_auth), HP_POP2(HP_chrif_sd_to_auth), 326 }, - { HP_POP(chrif->check_connect_char_server), HP_POP2(HP_chrif_check_connect_char_server), 328 }, - { HP_POP(chrif->auth_logout), HP_POP2(HP_chrif_auth_logout), 330 }, - { HP_POP(chrif->save_ack), HP_POP2(HP_chrif_save_ack), 332 }, - { HP_POP(chrif->reconnect), HP_POP2(HP_chrif_reconnect), 334 }, - { HP_POP(chrif->auth_db_cleanup_sub), HP_POP2(HP_chrif_auth_db_cleanup_sub), 336 }, - { HP_POP(chrif->char_ask_name_answer), HP_POP2(HP_chrif_char_ask_name_answer), 338 }, - { HP_POP(chrif->auth_db_final), HP_POP2(HP_chrif_auth_db_final), 340 }, - { HP_POP(chrif->send_usercount_tochar), HP_POP2(HP_chrif_send_usercount_tochar), 342 }, - { HP_POP(chrif->auth_db_cleanup), HP_POP2(HP_chrif_auth_db_cleanup), 344 }, - { HP_POP(chrif->connect), HP_POP2(HP_chrif_connect), 346 }, - { HP_POP(chrif->connectack), HP_POP2(HP_chrif_connectack), 348 }, - { HP_POP(chrif->sendmap), HP_POP2(HP_chrif_sendmap), 350 }, - { HP_POP(chrif->sendmapack), HP_POP2(HP_chrif_sendmapack), 352 }, - { HP_POP(chrif->recvmap), HP_POP2(HP_chrif_recvmap), 354 }, - { HP_POP(chrif->changemapserverack), HP_POP2(HP_chrif_changemapserverack), 356 }, - { HP_POP(chrif->changedsex), HP_POP2(HP_chrif_changedsex), 358 }, - { HP_POP(chrif->divorceack), HP_POP2(HP_chrif_divorceack), 360 }, - { HP_POP(chrif->accountban), HP_POP2(HP_chrif_accountban), 362 }, - { HP_POP(chrif->recvfamelist), HP_POP2(HP_chrif_recvfamelist), 364 }, - { HP_POP(chrif->load_scdata), HP_POP2(HP_chrif_load_scdata), 366 }, - { HP_POP(chrif->update_ip), HP_POP2(HP_chrif_update_ip), 368 }, - { HP_POP(chrif->disconnectplayer), HP_POP2(HP_chrif_disconnectplayer), 370 }, - { HP_POP(chrif->removemap), HP_POP2(HP_chrif_removemap), 372 }, - { HP_POP(chrif->updatefamelist_ack), HP_POP2(HP_chrif_updatefamelist_ack), 374 }, - { HP_POP(chrif->keepalive), HP_POP2(HP_chrif_keepalive), 376 }, - { HP_POP(chrif->keepalive_ack), HP_POP2(HP_chrif_keepalive_ack), 378 }, - { HP_POP(chrif->deadopt), HP_POP2(HP_chrif_deadopt), 380 }, - { HP_POP(chrif->authfail), HP_POP2(HP_chrif_authfail), 382 }, - { HP_POP(chrif->on_ready), HP_POP2(HP_chrif_on_ready), 384 }, - { HP_POP(chrif->on_disconnect), HP_POP2(HP_chrif_on_disconnect), 386 }, - { HP_POP(chrif->parse), HP_POP2(HP_chrif_parse), 388 }, + { HP_POP(chrif->init, HP_chrif_init) }, + { HP_POP(chrif->final, HP_chrif_final) }, + { HP_POP(chrif->setuserid, HP_chrif_setuserid) }, + { HP_POP(chrif->setpasswd, HP_chrif_setpasswd) }, + { HP_POP(chrif->checkdefaultlogin, HP_chrif_checkdefaultlogin) }, + { HP_POP(chrif->setip, HP_chrif_setip) }, + { HP_POP(chrif->setport, HP_chrif_setport) }, + { HP_POP(chrif->isconnected, HP_chrif_isconnected) }, + { HP_POP(chrif->check_shutdown, HP_chrif_check_shutdown) }, + { HP_POP(chrif->search, HP_chrif_search) }, + { HP_POP(chrif->auth_check, HP_chrif_auth_check) }, + { HP_POP(chrif->auth_delete, HP_chrif_auth_delete) }, + { HP_POP(chrif->auth_finished, HP_chrif_auth_finished) }, + { HP_POP(chrif->authreq, HP_chrif_authreq) }, + { HP_POP(chrif->authok, HP_chrif_authok) }, + { HP_POP(chrif->scdata_request, HP_chrif_scdata_request) }, + { HP_POP(chrif->save, HP_chrif_save) }, + { HP_POP(chrif->charselectreq, HP_chrif_charselectreq) }, + { HP_POP(chrif->changemapserver, HP_chrif_changemapserver) }, + { HP_POP(chrif->searchcharid, HP_chrif_searchcharid) }, + { HP_POP(chrif->changeemail, HP_chrif_changeemail) }, + { HP_POP(chrif->char_ask_name, HP_chrif_char_ask_name) }, + { HP_POP(chrif->updatefamelist, HP_chrif_updatefamelist) }, + { HP_POP(chrif->buildfamelist, HP_chrif_buildfamelist) }, + { HP_POP(chrif->save_scdata, HP_chrif_save_scdata) }, + { HP_POP(chrif->ragsrvinfo, HP_chrif_ragsrvinfo) }, + { HP_POP(chrif->char_offline_nsd, HP_chrif_char_offline_nsd) }, + { HP_POP(chrif->char_reset_offline, HP_chrif_char_reset_offline) }, + { HP_POP(chrif->send_users_tochar, HP_chrif_send_users_tochar) }, + { HP_POP(chrif->char_online, HP_chrif_char_online) }, + { HP_POP(chrif->changesex, HP_chrif_changesex) }, + { HP_POP(chrif->divorce, HP_chrif_divorce) }, + { HP_POP(chrif->removefriend, HP_chrif_removefriend) }, + { HP_POP(chrif->send_report, HP_chrif_send_report) }, + { HP_POP(chrif->flush, HP_chrif_flush) }, + { HP_POP(chrif->skillid2idx, HP_chrif_skillid2idx) }, + { HP_POP(chrif->sd_to_auth, HP_chrif_sd_to_auth) }, + { HP_POP(chrif->check_connect_char_server, HP_chrif_check_connect_char_server) }, + { HP_POP(chrif->auth_logout, HP_chrif_auth_logout) }, + { HP_POP(chrif->save_ack, HP_chrif_save_ack) }, + { HP_POP(chrif->reconnect, HP_chrif_reconnect) }, + { HP_POP(chrif->auth_db_cleanup_sub, HP_chrif_auth_db_cleanup_sub) }, + { HP_POP(chrif->char_ask_name_answer, HP_chrif_char_ask_name_answer) }, + { HP_POP(chrif->auth_db_final, HP_chrif_auth_db_final) }, + { HP_POP(chrif->send_usercount_tochar, HP_chrif_send_usercount_tochar) }, + { HP_POP(chrif->auth_db_cleanup, HP_chrif_auth_db_cleanup) }, + { HP_POP(chrif->connect, HP_chrif_connect) }, + { HP_POP(chrif->connectack, HP_chrif_connectack) }, + { HP_POP(chrif->sendmap, HP_chrif_sendmap) }, + { HP_POP(chrif->sendmapack, HP_chrif_sendmapack) }, + { HP_POP(chrif->recvmap, HP_chrif_recvmap) }, + { HP_POP(chrif->changemapserverack, HP_chrif_changemapserverack) }, + { HP_POP(chrif->changedsex, HP_chrif_changedsex) }, + { HP_POP(chrif->divorceack, HP_chrif_divorceack) }, + { HP_POP(chrif->idbanned, HP_chrif_idbanned) }, + { HP_POP(chrif->recvfamelist, HP_chrif_recvfamelist) }, + { HP_POP(chrif->load_scdata, HP_chrif_load_scdata) }, + { HP_POP(chrif->update_ip, HP_chrif_update_ip) }, + { HP_POP(chrif->disconnectplayer, HP_chrif_disconnectplayer) }, + { HP_POP(chrif->removemap, HP_chrif_removemap) }, + { HP_POP(chrif->updatefamelist_ack, HP_chrif_updatefamelist_ack) }, + { HP_POP(chrif->keepalive, HP_chrif_keepalive) }, + { HP_POP(chrif->keepalive_ack, HP_chrif_keepalive_ack) }, + { HP_POP(chrif->deadopt, HP_chrif_deadopt) }, + { HP_POP(chrif->authfail, HP_chrif_authfail) }, + { HP_POP(chrif->on_ready, HP_chrif_on_ready) }, + { HP_POP(chrif->on_disconnect, HP_chrif_on_disconnect) }, + { HP_POP(chrif->parse, HP_chrif_parse) }, + { HP_POP(chrif->save_scdata_single, HP_chrif_save_scdata_single) }, + { HP_POP(chrif->del_scdata_single, HP_chrif_del_scdata_single) }, /* clif */ - { HP_POP(clif->init), HP_POP2(HP_clif_init), 390 }, - { HP_POP(clif->final), HP_POP2(HP_clif_final), 392 }, - { HP_POP(clif->setip), HP_POP2(HP_clif_setip), 394 }, - { HP_POP(clif->setbindip), HP_POP2(HP_clif_setbindip), 396 }, - { HP_POP(clif->setport), HP_POP2(HP_clif_setport), 398 }, - { HP_POP(clif->refresh_ip), HP_POP2(HP_clif_refresh_ip), 400 }, - { HP_POP(clif->send), HP_POP2(HP_clif_send), 402 }, - { HP_POP(clif->send_sub), HP_POP2(HP_clif_send_sub), 404 }, - { HP_POP(clif->parse), HP_POP2(HP_clif_parse), 406 }, - { HP_POP(clif->parse_cmd), HP_POP2(HP_clif_parse_cmd), 408 }, - { HP_POP(clif->decrypt_cmd), HP_POP2(HP_clif_decrypt_cmd), 410 }, - { HP_POP(clif->authok), HP_POP2(HP_clif_authok), 412 }, - { HP_POP(clif->authrefuse), HP_POP2(HP_clif_authrefuse), 414 }, - { HP_POP(clif->authfail_fd), HP_POP2(HP_clif_authfail_fd), 416 }, - { HP_POP(clif->charselectok), HP_POP2(HP_clif_charselectok), 418 }, - { HP_POP(clif->dropflooritem), HP_POP2(HP_clif_dropflooritem), 420 }, - { HP_POP(clif->clearflooritem), HP_POP2(HP_clif_clearflooritem), 422 }, - { HP_POP(clif->additem), HP_POP2(HP_clif_additem), 424 }, - { HP_POP(clif->dropitem), HP_POP2(HP_clif_dropitem), 426 }, - { HP_POP(clif->delitem), HP_POP2(HP_clif_delitem), 428 }, - { HP_POP(clif->takeitem), HP_POP2(HP_clif_takeitem), 430 }, - { HP_POP(clif->arrowequip), HP_POP2(HP_clif_arrowequip), 432 }, - { HP_POP(clif->arrow_fail), HP_POP2(HP_clif_arrow_fail), 434 }, - { HP_POP(clif->use_card), HP_POP2(HP_clif_use_card), 436 }, - { HP_POP(clif->cart_additem), HP_POP2(HP_clif_cart_additem), 438 }, - { HP_POP(clif->cart_delitem), HP_POP2(HP_clif_cart_delitem), 440 }, - { HP_POP(clif->equipitemack), HP_POP2(HP_clif_equipitemack), 442 }, - { HP_POP(clif->unequipitemack), HP_POP2(HP_clif_unequipitemack), 444 }, - { HP_POP(clif->useitemack), HP_POP2(HP_clif_useitemack), 446 }, - { HP_POP(clif->addcards), HP_POP2(HP_clif_addcards), 448 }, - { HP_POP(clif->addcards2), HP_POP2(HP_clif_addcards2), 450 }, - { HP_POP(clif->item_sub), HP_POP2(HP_clif_item_sub), 452 }, - { HP_POP(clif->getareachar_item), HP_POP2(HP_clif_getareachar_item), 454 }, - { HP_POP(clif->cart_additem_ack), HP_POP2(HP_clif_cart_additem_ack), 456 }, - { HP_POP(clif->cashshop_load), HP_POP2(HP_clif_cashshop_load), 458 }, - { HP_POP(clif->package_announce), HP_POP2(HP_clif_package_announce), 460 }, - { HP_POP(clif->clearunit_single), HP_POP2(HP_clif_clearunit_single), 462 }, - { HP_POP(clif->clearunit_area), HP_POP2(HP_clif_clearunit_area), 464 }, - { HP_POP(clif->clearunit_delayed), HP_POP2(HP_clif_clearunit_delayed), 466 }, - { HP_POP(clif->walkok), HP_POP2(HP_clif_walkok), 468 }, - { HP_POP(clif->move), HP_POP2(HP_clif_move), 470 }, - { HP_POP(clif->move2), HP_POP2(HP_clif_move2), 472 }, - { HP_POP(clif->blown), HP_POP2(HP_clif_blown), 474 }, - { HP_POP(clif->slide), HP_POP2(HP_clif_slide), 476 }, - { HP_POP(clif->fixpos), HP_POP2(HP_clif_fixpos), 478 }, - { HP_POP(clif->changelook), HP_POP2(HP_clif_changelook), 480 }, - { HP_POP(clif->changetraplook), HP_POP2(HP_clif_changetraplook), 482 }, - { HP_POP(clif->refreshlook), HP_POP2(HP_clif_refreshlook), 484 }, - { HP_POP(clif->class_change), HP_POP2(HP_clif_class_change), 486 }, - { HP_POP(clif->skill_setunit), HP_POP2(HP_clif_skill_setunit), 488 }, - { HP_POP(clif->skill_delunit), HP_POP2(HP_clif_skill_delunit), 490 }, - { HP_POP(clif->skillunit_update), HP_POP2(HP_clif_skillunit_update), 492 }, - { HP_POP(clif->clearunit_delayed_sub), HP_POP2(HP_clif_clearunit_delayed_sub), 494 }, - { HP_POP(clif->set_unit_idle), HP_POP2(HP_clif_set_unit_idle), 496 }, - { HP_POP(clif->spawn_unit), HP_POP2(HP_clif_spawn_unit), 498 }, - { HP_POP(clif->spawn_unit2), HP_POP2(HP_clif_spawn_unit2), 500 }, - { HP_POP(clif->set_unit_idle2), HP_POP2(HP_clif_set_unit_idle2), 502 }, - { HP_POP(clif->set_unit_walking), HP_POP2(HP_clif_set_unit_walking), 504 }, - { HP_POP(clif->calc_walkdelay), HP_POP2(HP_clif_calc_walkdelay), 506 }, - { HP_POP(clif->getareachar_skillunit), HP_POP2(HP_clif_getareachar_skillunit), 508 }, - { HP_POP(clif->getareachar_unit), HP_POP2(HP_clif_getareachar_unit), 510 }, - { HP_POP(clif->clearchar_skillunit), HP_POP2(HP_clif_clearchar_skillunit), 512 }, - { HP_POP(clif->getareachar), HP_POP2(HP_clif_getareachar), 514 }, - { HP_POP(clif->spawn), HP_POP2(HP_clif_spawn), 516 }, - { HP_POP(clif->changemap), HP_POP2(HP_clif_changemap), 518 }, - { HP_POP(clif->changemapcell), HP_POP2(HP_clif_changemapcell), 520 }, - { HP_POP(clif->map_property), HP_POP2(HP_clif_map_property), 522 }, - { HP_POP(clif->pvpset), HP_POP2(HP_clif_pvpset), 524 }, - { HP_POP(clif->map_property_mapall), HP_POP2(HP_clif_map_property_mapall), 526 }, - { HP_POP(clif->bossmapinfo), HP_POP2(HP_clif_bossmapinfo), 528 }, - { HP_POP(clif->map_type), HP_POP2(HP_clif_map_type), 530 }, - { HP_POP(clif->maptypeproperty2), HP_POP2(HP_clif_maptypeproperty2), 532 }, - { HP_POP(clif->changemapserver), HP_POP2(HP_clif_changemapserver), 534 }, - { HP_POP(clif->npcbuysell), HP_POP2(HP_clif_npcbuysell), 536 }, - { HP_POP(clif->buylist), HP_POP2(HP_clif_buylist), 538 }, - { HP_POP(clif->selllist), HP_POP2(HP_clif_selllist), 540 }, - { HP_POP(clif->cashshop_show), HP_POP2(HP_clif_cashshop_show), 542 }, - { HP_POP(clif->npc_buy_result), HP_POP2(HP_clif_npc_buy_result), 544 }, - { HP_POP(clif->npc_sell_result), HP_POP2(HP_clif_npc_sell_result), 546 }, - { HP_POP(clif->cashshop_ack), HP_POP2(HP_clif_cashshop_ack), 548 }, - { HP_POP(clif->scriptmes), HP_POP2(HP_clif_scriptmes), 550 }, - { HP_POP(clif->scriptnext), HP_POP2(HP_clif_scriptnext), 552 }, - { HP_POP(clif->scriptclose), HP_POP2(HP_clif_scriptclose), 554 }, - { HP_POP(clif->scriptmenu), HP_POP2(HP_clif_scriptmenu), 556 }, - { HP_POP(clif->scriptinput), HP_POP2(HP_clif_scriptinput), 558 }, - { HP_POP(clif->scriptinputstr), HP_POP2(HP_clif_scriptinputstr), 560 }, - { HP_POP(clif->cutin), HP_POP2(HP_clif_cutin), 562 }, - { HP_POP(clif->sendfakenpc), HP_POP2(HP_clif_sendfakenpc), 564 }, - { HP_POP(clif->scriptclear), HP_POP2(HP_clif_scriptclear), 566 }, - { HP_POP(clif->viewpoint), HP_POP2(HP_clif_viewpoint), 568 }, - { HP_POP(clif->damage), HP_POP2(HP_clif_damage), 570 }, - { HP_POP(clif->sitting), HP_POP2(HP_clif_sitting), 572 }, - { HP_POP(clif->standing), HP_POP2(HP_clif_standing), 574 }, - { HP_POP(clif->arrow_create_list), HP_POP2(HP_clif_arrow_create_list), 576 }, - { HP_POP(clif->refresh), HP_POP2(HP_clif_refresh), 578 }, - { HP_POP(clif->fame_blacksmith), HP_POP2(HP_clif_fame_blacksmith), 580 }, - { HP_POP(clif->fame_alchemist), HP_POP2(HP_clif_fame_alchemist), 582 }, - { HP_POP(clif->fame_taekwon), HP_POP2(HP_clif_fame_taekwon), 584 }, - { HP_POP(clif->ranklist), HP_POP2(HP_clif_ranklist), 586 }, - { HP_POP(clif->update_rankingpoint), HP_POP2(HP_clif_update_rankingpoint), 588 }, - { HP_POP(clif->pRanklist), HP_POP2(HP_clif_pRanklist), 590 }, - { HP_POP(clif->hotkeys), HP_POP2(HP_clif_hotkeys), 592 }, - { HP_POP(clif->insight), HP_POP2(HP_clif_insight), 594 }, - { HP_POP(clif->outsight), HP_POP2(HP_clif_outsight), 596 }, - { HP_POP(clif->skillcastcancel), HP_POP2(HP_clif_skillcastcancel), 598 }, - { HP_POP(clif->skill_fail), HP_POP2(HP_clif_skill_fail), 600 }, - { HP_POP(clif->skill_cooldown), HP_POP2(HP_clif_skill_cooldown), 602 }, - { HP_POP(clif->skill_memomessage), HP_POP2(HP_clif_skill_memomessage), 604 }, - { HP_POP(clif->skill_mapinfomessage), HP_POP2(HP_clif_skill_mapinfomessage), 606 }, - { HP_POP(clif->skill_produce_mix_list), HP_POP2(HP_clif_skill_produce_mix_list), 608 }, - { HP_POP(clif->cooking_list), HP_POP2(HP_clif_cooking_list), 610 }, - { HP_POP(clif->autospell), HP_POP2(HP_clif_autospell), 612 }, - { HP_POP(clif->combo_delay), HP_POP2(HP_clif_combo_delay), 614 }, - { HP_POP(clif->status_change), HP_POP2(HP_clif_status_change), 616 }, - { HP_POP(clif->insert_card), HP_POP2(HP_clif_insert_card), 618 }, - { HP_POP(clif->inventorylist), HP_POP2(HP_clif_inventorylist), 620 }, - { HP_POP(clif->equiplist), HP_POP2(HP_clif_equiplist), 622 }, - { HP_POP(clif->cartlist), HP_POP2(HP_clif_cartlist), 624 }, - { HP_POP(clif->favorite_item), HP_POP2(HP_clif_favorite_item), 626 }, - { HP_POP(clif->clearcart), HP_POP2(HP_clif_clearcart), 628 }, - { HP_POP(clif->item_identify_list), HP_POP2(HP_clif_item_identify_list), 630 }, - { HP_POP(clif->item_identified), HP_POP2(HP_clif_item_identified), 632 }, - { HP_POP(clif->item_repair_list), HP_POP2(HP_clif_item_repair_list), 634 }, - { HP_POP(clif->item_repaireffect), HP_POP2(HP_clif_item_repaireffect), 636 }, - { HP_POP(clif->item_damaged), HP_POP2(HP_clif_item_damaged), 638 }, - { HP_POP(clif->item_refine_list), HP_POP2(HP_clif_item_refine_list), 640 }, - { HP_POP(clif->item_skill), HP_POP2(HP_clif_item_skill), 642 }, - { HP_POP(clif->mvp_item), HP_POP2(HP_clif_mvp_item), 644 }, - { HP_POP(clif->mvp_exp), HP_POP2(HP_clif_mvp_exp), 646 }, - { HP_POP(clif->mvp_noitem), HP_POP2(HP_clif_mvp_noitem), 648 }, - { HP_POP(clif->changed_dir), HP_POP2(HP_clif_changed_dir), 650 }, - { HP_POP(clif->charnameack), HP_POP2(HP_clif_charnameack), 652 }, - { HP_POP(clif->monster_hp_bar), HP_POP2(HP_clif_monster_hp_bar), 654 }, - { HP_POP(clif->hpmeter), HP_POP2(HP_clif_hpmeter), 656 }, - { HP_POP(clif->hpmeter_single), HP_POP2(HP_clif_hpmeter_single), 658 }, - { HP_POP(clif->hpmeter_sub), HP_POP2(HP_clif_hpmeter_sub), 660 }, - { HP_POP(clif->upgrademessage), HP_POP2(HP_clif_upgrademessage), 662 }, - { HP_POP(clif->get_weapon_view), HP_POP2(HP_clif_get_weapon_view), 664 }, - { HP_POP(clif->gospel_info), HP_POP2(HP_clif_gospel_info), 666 }, - { HP_POP(clif->feel_req), HP_POP2(HP_clif_feel_req), 668 }, - { HP_POP(clif->starskill), HP_POP2(HP_clif_starskill), 670 }, - { HP_POP(clif->feel_info), HP_POP2(HP_clif_feel_info), 672 }, - { HP_POP(clif->hate_info), HP_POP2(HP_clif_hate_info), 674 }, - { HP_POP(clif->mission_info), HP_POP2(HP_clif_mission_info), 676 }, - { HP_POP(clif->feel_hate_reset), HP_POP2(HP_clif_feel_hate_reset), 678 }, - { HP_POP(clif->partytickack), HP_POP2(HP_clif_partytickack), 680 }, - { HP_POP(clif->equiptickack), HP_POP2(HP_clif_equiptickack), 682 }, - { HP_POP(clif->viewequip_ack), HP_POP2(HP_clif_viewequip_ack), 684 }, - { HP_POP(clif->viewequip_fail), HP_POP2(HP_clif_viewequip_fail), 686 }, - { HP_POP(clif->equpcheckbox), HP_POP2(HP_clif_equpcheckbox), 688 }, - { HP_POP(clif->displayexp), HP_POP2(HP_clif_displayexp), 690 }, - { HP_POP(clif->font), HP_POP2(HP_clif_font), 692 }, - { HP_POP(clif->progressbar), HP_POP2(HP_clif_progressbar), 694 }, - { HP_POP(clif->progressbar_abort), HP_POP2(HP_clif_progressbar_abort), 696 }, - { HP_POP(clif->showdigit), HP_POP2(HP_clif_showdigit), 698 }, - { HP_POP(clif->elementalconverter_list), HP_POP2(HP_clif_elementalconverter_list), 700 }, - { HP_POP(clif->spellbook_list), HP_POP2(HP_clif_spellbook_list), 702 }, - { HP_POP(clif->magicdecoy_list), HP_POP2(HP_clif_magicdecoy_list), 704 }, - { HP_POP(clif->poison_list), HP_POP2(HP_clif_poison_list), 706 }, - { HP_POP(clif->autoshadowspell_list), HP_POP2(HP_clif_autoshadowspell_list), 708 }, - { HP_POP(clif->skill_itemlistwindow), HP_POP2(HP_clif_skill_itemlistwindow), 710 }, - { HP_POP(clif->sc_load), HP_POP2(HP_clif_sc_load), 712 }, - { HP_POP(clif->sc_end), HP_POP2(HP_clif_sc_end), 714 }, - { HP_POP(clif->initialstatus), HP_POP2(HP_clif_initialstatus), 716 }, - { HP_POP(clif->cooldown_list), HP_POP2(HP_clif_cooldown_list), 718 }, - { HP_POP(clif->updatestatus), HP_POP2(HP_clif_updatestatus), 720 }, - { HP_POP(clif->changestatus), HP_POP2(HP_clif_changestatus), 722 }, - { HP_POP(clif->statusupack), HP_POP2(HP_clif_statusupack), 724 }, - { HP_POP(clif->movetoattack), HP_POP2(HP_clif_movetoattack), 726 }, - { HP_POP(clif->solved_charname), HP_POP2(HP_clif_solved_charname), 728 }, - { HP_POP(clif->charnameupdate), HP_POP2(HP_clif_charnameupdate), 730 }, - { HP_POP(clif->delayquit), HP_POP2(HP_clif_delayquit), 732 }, - { HP_POP(clif->getareachar_pc), HP_POP2(HP_clif_getareachar_pc), 734 }, - { HP_POP(clif->disconnect_ack), HP_POP2(HP_clif_disconnect_ack), 736 }, - { HP_POP(clif->PVPInfo), HP_POP2(HP_clif_PVPInfo), 738 }, - { HP_POP(clif->blacksmith), HP_POP2(HP_clif_blacksmith), 740 }, - { HP_POP(clif->alchemist), HP_POP2(HP_clif_alchemist), 742 }, - { HP_POP(clif->taekwon), HP_POP2(HP_clif_taekwon), 744 }, - { HP_POP(clif->ranking_pk), HP_POP2(HP_clif_ranking_pk), 746 }, - { HP_POP(clif->quitsave), HP_POP2(HP_clif_quitsave), 748 }, - { HP_POP(clif->misceffect), HP_POP2(HP_clif_misceffect), 750 }, - { HP_POP(clif->changeoption), HP_POP2(HP_clif_changeoption), 752 }, - { HP_POP(clif->changeoption2), HP_POP2(HP_clif_changeoption2), 754 }, - { HP_POP(clif->emotion), HP_POP2(HP_clif_emotion), 756 }, - { HP_POP(clif->talkiebox), HP_POP2(HP_clif_talkiebox), 758 }, - { HP_POP(clif->wedding_effect), HP_POP2(HP_clif_wedding_effect), 760 }, - { HP_POP(clif->divorced), HP_POP2(HP_clif_divorced), 762 }, - { HP_POP(clif->callpartner), HP_POP2(HP_clif_callpartner), 764 }, - { HP_POP(clif->skill_damage), HP_POP2(HP_clif_skill_damage), 766 }, - { HP_POP(clif->skill_nodamage), HP_POP2(HP_clif_skill_nodamage), 768 }, - { HP_POP(clif->skill_poseffect), HP_POP2(HP_clif_skill_poseffect), 770 }, - { HP_POP(clif->skill_estimation), HP_POP2(HP_clif_skill_estimation), 772 }, - { HP_POP(clif->skill_warppoint), HP_POP2(HP_clif_skill_warppoint), 774 }, - { HP_POP(clif->skillcasting), HP_POP2(HP_clif_skillcasting), 776 }, - { HP_POP(clif->produce_effect), HP_POP2(HP_clif_produce_effect), 778 }, - { HP_POP(clif->devotion), HP_POP2(HP_clif_devotion), 780 }, - { HP_POP(clif->spiritball), HP_POP2(HP_clif_spiritball), 782 }, - { HP_POP(clif->spiritball_single), HP_POP2(HP_clif_spiritball_single), 784 }, - { HP_POP(clif->bladestop), HP_POP2(HP_clif_bladestop), 786 }, - { HP_POP(clif->mvp_effect), HP_POP2(HP_clif_mvp_effect), 788 }, - { HP_POP(clif->heal), HP_POP2(HP_clif_heal), 790 }, - { HP_POP(clif->resurrection), HP_POP2(HP_clif_resurrection), 792 }, - { HP_POP(clif->refine), HP_POP2(HP_clif_refine), 794 }, - { HP_POP(clif->weather), HP_POP2(HP_clif_weather), 796 }, - { HP_POP(clif->specialeffect), HP_POP2(HP_clif_specialeffect), 798 }, - { HP_POP(clif->specialeffect_single), HP_POP2(HP_clif_specialeffect_single), 800 }, - { HP_POP(clif->specialeffect_value), HP_POP2(HP_clif_specialeffect_value), 802 }, - { HP_POP(clif->millenniumshield), HP_POP2(HP_clif_millenniumshield), 804 }, - { HP_POP(clif->charm), HP_POP2(HP_clif_charm), 806 }, - { HP_POP(clif->charm_single), HP_POP2(HP_clif_charm_single), 808 }, - { HP_POP(clif->snap), HP_POP2(HP_clif_snap), 810 }, - { HP_POP(clif->weather_check), HP_POP2(HP_clif_weather_check), 812 }, - { HP_POP(clif->playBGM), HP_POP2(HP_clif_playBGM), 814 }, - { HP_POP(clif->soundeffect), HP_POP2(HP_clif_soundeffect), 816 }, - { HP_POP(clif->soundeffectall), HP_POP2(HP_clif_soundeffectall), 818 }, - { HP_POP(clif->GlobalMessage), HP_POP2(HP_clif_GlobalMessage), 820 }, - { HP_POP(clif->createchat), HP_POP2(HP_clif_createchat), 822 }, - { HP_POP(clif->dispchat), HP_POP2(HP_clif_dispchat), 824 }, - { HP_POP(clif->joinchatfail), HP_POP2(HP_clif_joinchatfail), 826 }, - { HP_POP(clif->joinchatok), HP_POP2(HP_clif_joinchatok), 828 }, - { HP_POP(clif->addchat), HP_POP2(HP_clif_addchat), 830 }, - { HP_POP(clif->changechatowner), HP_POP2(HP_clif_changechatowner), 832 }, - { HP_POP(clif->clearchat), HP_POP2(HP_clif_clearchat), 834 }, - { HP_POP(clif->leavechat), HP_POP2(HP_clif_leavechat), 836 }, - { HP_POP(clif->changechatstatus), HP_POP2(HP_clif_changechatstatus), 838 }, - { HP_POP(clif->wis_message), HP_POP2(HP_clif_wis_message), 840 }, - { HP_POP(clif->wis_end), HP_POP2(HP_clif_wis_end), 842 }, - { HP_POP(clif->disp_onlyself), HP_POP2(HP_clif_disp_onlyself), 844 }, - { HP_POP(clif->disp_message), HP_POP2(HP_clif_disp_message), 846 }, - { HP_POP(clif->broadcast), HP_POP2(HP_clif_broadcast), 848 }, - { HP_POP(clif->broadcast2), HP_POP2(HP_clif_broadcast2), 850 }, - { HP_POP(clif->messagecolor), HP_POP2(HP_clif_messagecolor), 852 }, - { HP_POP(clif->disp_overhead), HP_POP2(HP_clif_disp_overhead), 854 }, - { HP_POP(clif->msg), HP_POP2(HP_clif_msg), 856 }, - { HP_POP(clif->msg_value), HP_POP2(HP_clif_msg_value), 858 }, - { HP_POP(clif->msg_skill), HP_POP2(HP_clif_msg_skill), 860 }, - { HP_POP(clif->msgtable), HP_POP2(HP_clif_msgtable), 862 }, - { HP_POP(clif->msgtable_num), HP_POP2(HP_clif_msgtable_num), 864 }, - { HP_POP(clif->message), HP_POP2(HP_clif_message), 866 }, - { HP_POP(clif->messageln), HP_POP2(HP_clif_messageln), 868 }, - { HP_POP(clif->colormes), HP_POP2(HP_clif_colormes), 870 }, - { HP_POP(clif->process_message), HP_POP2(HP_clif_process_message), 872 }, - { HP_POP(clif->wisexin), HP_POP2(HP_clif_wisexin), 874 }, - { HP_POP(clif->wisall), HP_POP2(HP_clif_wisall), 876 }, - { HP_POP(clif->PMIgnoreList), HP_POP2(HP_clif_PMIgnoreList), 878 }, - { HP_POP(clif->traderequest), HP_POP2(HP_clif_traderequest), 880 }, - { HP_POP(clif->tradestart), HP_POP2(HP_clif_tradestart), 882 }, - { HP_POP(clif->tradeadditem), HP_POP2(HP_clif_tradeadditem), 884 }, - { HP_POP(clif->tradeitemok), HP_POP2(HP_clif_tradeitemok), 886 }, - { HP_POP(clif->tradedeal_lock), HP_POP2(HP_clif_tradedeal_lock), 888 }, - { HP_POP(clif->tradecancelled), HP_POP2(HP_clif_tradecancelled), 890 }, - { HP_POP(clif->tradecompleted), HP_POP2(HP_clif_tradecompleted), 892 }, - { HP_POP(clif->tradeundo), HP_POP2(HP_clif_tradeundo), 894 }, - { HP_POP(clif->openvendingreq), HP_POP2(HP_clif_openvendingreq), 896 }, - { HP_POP(clif->showvendingboard), HP_POP2(HP_clif_showvendingboard), 898 }, - { HP_POP(clif->closevendingboard), HP_POP2(HP_clif_closevendingboard), 900 }, - { HP_POP(clif->vendinglist), HP_POP2(HP_clif_vendinglist), 902 }, - { HP_POP(clif->buyvending), HP_POP2(HP_clif_buyvending), 904 }, - { HP_POP(clif->openvending), HP_POP2(HP_clif_openvending), 906 }, - { HP_POP(clif->vendingreport), HP_POP2(HP_clif_vendingreport), 908 }, - { HP_POP(clif->storagelist), HP_POP2(HP_clif_storagelist), 910 }, - { HP_POP(clif->updatestorageamount), HP_POP2(HP_clif_updatestorageamount), 912 }, - { HP_POP(clif->storageitemadded), HP_POP2(HP_clif_storageitemadded), 914 }, - { HP_POP(clif->storageitemremoved), HP_POP2(HP_clif_storageitemremoved), 916 }, - { HP_POP(clif->storageclose), HP_POP2(HP_clif_storageclose), 918 }, - { HP_POP(clif->skillinfoblock), HP_POP2(HP_clif_skillinfoblock), 920 }, - { HP_POP(clif->skillup), HP_POP2(HP_clif_skillup), 922 }, - { HP_POP(clif->skillinfo), HP_POP2(HP_clif_skillinfo), 924 }, - { HP_POP(clif->addskill), HP_POP2(HP_clif_addskill), 926 }, - { HP_POP(clif->deleteskill), HP_POP2(HP_clif_deleteskill), 928 }, - { HP_POP(clif->party_created), HP_POP2(HP_clif_party_created), 930 }, - { HP_POP(clif->party_member_info), HP_POP2(HP_clif_party_member_info), 932 }, - { HP_POP(clif->party_info), HP_POP2(HP_clif_party_info), 934 }, - { HP_POP(clif->party_invite), HP_POP2(HP_clif_party_invite), 936 }, - { HP_POP(clif->party_inviteack), HP_POP2(HP_clif_party_inviteack), 938 }, - { HP_POP(clif->party_option), HP_POP2(HP_clif_party_option), 940 }, - { HP_POP(clif->party_withdraw), HP_POP2(HP_clif_party_withdraw), 942 }, - { HP_POP(clif->party_message), HP_POP2(HP_clif_party_message), 944 }, - { HP_POP(clif->party_xy), HP_POP2(HP_clif_party_xy), 946 }, - { HP_POP(clif->party_xy_single), HP_POP2(HP_clif_party_xy_single), 948 }, - { HP_POP(clif->party_hp), HP_POP2(HP_clif_party_hp), 950 }, - { HP_POP(clif->party_xy_remove), HP_POP2(HP_clif_party_xy_remove), 952 }, - { HP_POP(clif->party_show_picker), HP_POP2(HP_clif_party_show_picker), 954 }, - { HP_POP(clif->partyinvitationstate), HP_POP2(HP_clif_partyinvitationstate), 956 }, - { HP_POP(clif->guild_created), HP_POP2(HP_clif_guild_created), 958 }, - { HP_POP(clif->guild_belonginfo), HP_POP2(HP_clif_guild_belonginfo), 960 }, - { HP_POP(clif->guild_masterormember), HP_POP2(HP_clif_guild_masterormember), 962 }, - { HP_POP(clif->guild_basicinfo), HP_POP2(HP_clif_guild_basicinfo), 964 }, - { HP_POP(clif->guild_allianceinfo), HP_POP2(HP_clif_guild_allianceinfo), 966 }, - { HP_POP(clif->guild_memberlist), HP_POP2(HP_clif_guild_memberlist), 968 }, - { HP_POP(clif->guild_skillinfo), HP_POP2(HP_clif_guild_skillinfo), 970 }, - { HP_POP(clif->guild_send_onlineinfo), HP_POP2(HP_clif_guild_send_onlineinfo), 972 }, - { HP_POP(clif->guild_memberlogin_notice), HP_POP2(HP_clif_guild_memberlogin_notice), 974 }, - { HP_POP(clif->guild_invite), HP_POP2(HP_clif_guild_invite), 976 }, - { HP_POP(clif->guild_inviteack), HP_POP2(HP_clif_guild_inviteack), 978 }, - { HP_POP(clif->guild_leave), HP_POP2(HP_clif_guild_leave), 980 }, - { HP_POP(clif->guild_expulsion), HP_POP2(HP_clif_guild_expulsion), 982 }, - { HP_POP(clif->guild_positionchanged), HP_POP2(HP_clif_guild_positionchanged), 984 }, - { HP_POP(clif->guild_memberpositionchanged), HP_POP2(HP_clif_guild_memberpositionchanged), 986 }, - { HP_POP(clif->guild_emblem), HP_POP2(HP_clif_guild_emblem), 988 }, - { HP_POP(clif->guild_emblem_area), HP_POP2(HP_clif_guild_emblem_area), 990 }, - { HP_POP(clif->guild_notice), HP_POP2(HP_clif_guild_notice), 992 }, - { HP_POP(clif->guild_message), HP_POP2(HP_clif_guild_message), 994 }, - { HP_POP(clif->guild_skillup), HP_POP2(HP_clif_guild_skillup), 996 }, - { HP_POP(clif->guild_reqalliance), HP_POP2(HP_clif_guild_reqalliance), 998 }, - { HP_POP(clif->guild_allianceack), HP_POP2(HP_clif_guild_allianceack), 1000 }, - { HP_POP(clif->guild_delalliance), HP_POP2(HP_clif_guild_delalliance), 1002 }, - { HP_POP(clif->guild_oppositionack), HP_POP2(HP_clif_guild_oppositionack), 1004 }, - { HP_POP(clif->guild_broken), HP_POP2(HP_clif_guild_broken), 1006 }, - { HP_POP(clif->guild_xy), HP_POP2(HP_clif_guild_xy), 1008 }, - { HP_POP(clif->guild_xy_single), HP_POP2(HP_clif_guild_xy_single), 1010 }, - { HP_POP(clif->guild_xy_remove), HP_POP2(HP_clif_guild_xy_remove), 1012 }, - { HP_POP(clif->guild_positionnamelist), HP_POP2(HP_clif_guild_positionnamelist), 1014 }, - { HP_POP(clif->guild_positioninfolist), HP_POP2(HP_clif_guild_positioninfolist), 1016 }, - { HP_POP(clif->guild_expulsionlist), HP_POP2(HP_clif_guild_expulsionlist), 1018 }, - { HP_POP(clif->validate_emblem), HP_POP2(HP_clif_validate_emblem), 1020 }, - { HP_POP(clif->bg_hp), HP_POP2(HP_clif_bg_hp), 1022 }, - { HP_POP(clif->bg_xy), HP_POP2(HP_clif_bg_xy), 1024 }, - { HP_POP(clif->bg_xy_remove), HP_POP2(HP_clif_bg_xy_remove), 1026 }, - { HP_POP(clif->bg_message), HP_POP2(HP_clif_bg_message), 1028 }, - { HP_POP(clif->bg_updatescore), HP_POP2(HP_clif_bg_updatescore), 1030 }, - { HP_POP(clif->bg_updatescore_single), HP_POP2(HP_clif_bg_updatescore_single), 1032 }, - { HP_POP(clif->sendbgemblem_area), HP_POP2(HP_clif_sendbgemblem_area), 1034 }, - { HP_POP(clif->sendbgemblem_single), HP_POP2(HP_clif_sendbgemblem_single), 1036 }, - { HP_POP(clif->instance), HP_POP2(HP_clif_instance), 1038 }, - { HP_POP(clif->instance_join), HP_POP2(HP_clif_instance_join), 1040 }, - { HP_POP(clif->instance_leave), HP_POP2(HP_clif_instance_leave), 1042 }, - { HP_POP(clif->catch_process), HP_POP2(HP_clif_catch_process), 1044 }, - { HP_POP(clif->pet_roulette), HP_POP2(HP_clif_pet_roulette), 1046 }, - { HP_POP(clif->sendegg), HP_POP2(HP_clif_sendegg), 1048 }, - { HP_POP(clif->send_petstatus), HP_POP2(HP_clif_send_petstatus), 1050 }, - { HP_POP(clif->send_petdata), HP_POP2(HP_clif_send_petdata), 1052 }, - { HP_POP(clif->pet_emotion), HP_POP2(HP_clif_pet_emotion), 1054 }, - { HP_POP(clif->pet_food), HP_POP2(HP_clif_pet_food), 1056 }, - { HP_POP(clif->friendslist_toggle_sub), HP_POP2(HP_clif_friendslist_toggle_sub), 1058 }, - { HP_POP(clif->friendslist_send), HP_POP2(HP_clif_friendslist_send), 1060 }, - { HP_POP(clif->friendslist_reqack), HP_POP2(HP_clif_friendslist_reqack), 1062 }, - { HP_POP(clif->friendslist_toggle), HP_POP2(HP_clif_friendslist_toggle), 1064 }, - { HP_POP(clif->friendlist_req), HP_POP2(HP_clif_friendlist_req), 1066 }, - { HP_POP(clif->GM_kickack), HP_POP2(HP_clif_GM_kickack), 1068 }, - { HP_POP(clif->GM_kick), HP_POP2(HP_clif_GM_kick), 1070 }, - { HP_POP(clif->manner_message), HP_POP2(HP_clif_manner_message), 1072 }, - { HP_POP(clif->GM_silence), HP_POP2(HP_clif_GM_silence), 1074 }, - { HP_POP(clif->account_name), HP_POP2(HP_clif_account_name), 1076 }, - { HP_POP(clif->check), HP_POP2(HP_clif_check), 1078 }, - { HP_POP(clif->hominfo), HP_POP2(HP_clif_hominfo), 1080 }, - { HP_POP(clif->homskillinfoblock), HP_POP2(HP_clif_homskillinfoblock), 1082 }, - { HP_POP(clif->homskillup), HP_POP2(HP_clif_homskillup), 1084 }, - { HP_POP(clif->hom_food), HP_POP2(HP_clif_hom_food), 1086 }, - { HP_POP(clif->send_homdata), HP_POP2(HP_clif_send_homdata), 1088 }, - { HP_POP(clif->quest_send_list), HP_POP2(HP_clif_quest_send_list), 1090 }, - { HP_POP(clif->quest_send_mission), HP_POP2(HP_clif_quest_send_mission), 1092 }, - { HP_POP(clif->quest_add), HP_POP2(HP_clif_quest_add), 1094 }, - { HP_POP(clif->quest_delete), HP_POP2(HP_clif_quest_delete), 1096 }, - { HP_POP(clif->quest_update_status), HP_POP2(HP_clif_quest_update_status), 1098 }, - { HP_POP(clif->quest_update_objective), HP_POP2(HP_clif_quest_update_objective), 1100 }, - { HP_POP(clif->quest_show_event), HP_POP2(HP_clif_quest_show_event), 1102 }, - { HP_POP(clif->mail_window), HP_POP2(HP_clif_mail_window), 1104 }, - { HP_POP(clif->mail_read), HP_POP2(HP_clif_mail_read), 1106 }, - { HP_POP(clif->mail_delete), HP_POP2(HP_clif_mail_delete), 1108 }, - { HP_POP(clif->mail_return), HP_POP2(HP_clif_mail_return), 1110 }, - { HP_POP(clif->mail_send), HP_POP2(HP_clif_mail_send), 1112 }, - { HP_POP(clif->mail_new), HP_POP2(HP_clif_mail_new), 1114 }, - { HP_POP(clif->mail_refreshinbox), HP_POP2(HP_clif_mail_refreshinbox), 1116 }, - { HP_POP(clif->mail_getattachment), HP_POP2(HP_clif_mail_getattachment), 1118 }, - { HP_POP(clif->mail_setattachment), HP_POP2(HP_clif_mail_setattachment), 1120 }, - { HP_POP(clif->auction_openwindow), HP_POP2(HP_clif_auction_openwindow), 1122 }, - { HP_POP(clif->auction_results), HP_POP2(HP_clif_auction_results), 1124 }, - { HP_POP(clif->auction_message), HP_POP2(HP_clif_auction_message), 1126 }, - { HP_POP(clif->auction_close), HP_POP2(HP_clif_auction_close), 1128 }, - { HP_POP(clif->auction_setitem), HP_POP2(HP_clif_auction_setitem), 1130 }, - { HP_POP(clif->mercenary_info), HP_POP2(HP_clif_mercenary_info), 1132 }, - { HP_POP(clif->mercenary_skillblock), HP_POP2(HP_clif_mercenary_skillblock), 1134 }, - { HP_POP(clif->mercenary_message), HP_POP2(HP_clif_mercenary_message), 1136 }, - { HP_POP(clif->mercenary_updatestatus), HP_POP2(HP_clif_mercenary_updatestatus), 1138 }, - { HP_POP(clif->rental_time), HP_POP2(HP_clif_rental_time), 1140 }, - { HP_POP(clif->rental_expired), HP_POP2(HP_clif_rental_expired), 1142 }, - { HP_POP(clif->PartyBookingRegisterAck), HP_POP2(HP_clif_PartyBookingRegisterAck), 1144 }, - { HP_POP(clif->PartyBookingDeleteAck), HP_POP2(HP_clif_PartyBookingDeleteAck), 1146 }, - { HP_POP(clif->PartyBookingSearchAck), HP_POP2(HP_clif_PartyBookingSearchAck), 1148 }, - { HP_POP(clif->PartyBookingUpdateNotify), HP_POP2(HP_clif_PartyBookingUpdateNotify), 1150 }, - { HP_POP(clif->PartyBookingDeleteNotify), HP_POP2(HP_clif_PartyBookingDeleteNotify), 1152 }, - { HP_POP(clif->PartyBookingInsertNotify), HP_POP2(HP_clif_PartyBookingInsertNotify), 1154 }, - { HP_POP(clif->PartyRecruitRegisterAck), HP_POP2(HP_clif_PartyRecruitRegisterAck), 1156 }, - { HP_POP(clif->PartyRecruitDeleteAck), HP_POP2(HP_clif_PartyRecruitDeleteAck), 1158 }, - { HP_POP(clif->PartyRecruitSearchAck), HP_POP2(HP_clif_PartyRecruitSearchAck), 1160 }, - { HP_POP(clif->PartyRecruitUpdateNotify), HP_POP2(HP_clif_PartyRecruitUpdateNotify), 1162 }, - { HP_POP(clif->PartyRecruitDeleteNotify), HP_POP2(HP_clif_PartyRecruitDeleteNotify), 1164 }, - { HP_POP(clif->PartyRecruitInsertNotify), HP_POP2(HP_clif_PartyRecruitInsertNotify), 1166 }, - { HP_POP(clif->PartyBookingVolunteerInfo), HP_POP2(HP_clif_PartyBookingVolunteerInfo), 1168 }, - { HP_POP(clif->PartyBookingRefuseVolunteer), HP_POP2(HP_clif_PartyBookingRefuseVolunteer), 1170 }, - { HP_POP(clif->PartyBookingCancelVolunteer), HP_POP2(HP_clif_PartyBookingCancelVolunteer), 1172 }, - { HP_POP(clif->PartyBookingAddFilteringList), HP_POP2(HP_clif_PartyBookingAddFilteringList), 1174 }, - { HP_POP(clif->PartyBookingSubFilteringList), HP_POP2(HP_clif_PartyBookingSubFilteringList), 1176 }, - { HP_POP(clif->buyingstore_open), HP_POP2(HP_clif_buyingstore_open), 1178 }, - { HP_POP(clif->buyingstore_open_failed), HP_POP2(HP_clif_buyingstore_open_failed), 1180 }, - { HP_POP(clif->buyingstore_myitemlist), HP_POP2(HP_clif_buyingstore_myitemlist), 1182 }, - { HP_POP(clif->buyingstore_entry), HP_POP2(HP_clif_buyingstore_entry), 1184 }, - { HP_POP(clif->buyingstore_entry_single), HP_POP2(HP_clif_buyingstore_entry_single), 1186 }, - { HP_POP(clif->buyingstore_disappear_entry), HP_POP2(HP_clif_buyingstore_disappear_entry), 1188 }, - { HP_POP(clif->buyingstore_disappear_entry_single), HP_POP2(HP_clif_buyingstore_disappear_entry_single), 1190 }, - { HP_POP(clif->buyingstore_itemlist), HP_POP2(HP_clif_buyingstore_itemlist), 1192 }, - { HP_POP(clif->buyingstore_trade_failed_buyer), HP_POP2(HP_clif_buyingstore_trade_failed_buyer), 1194 }, - { HP_POP(clif->buyingstore_update_item), HP_POP2(HP_clif_buyingstore_update_item), 1196 }, - { HP_POP(clif->buyingstore_delete_item), HP_POP2(HP_clif_buyingstore_delete_item), 1198 }, - { HP_POP(clif->buyingstore_trade_failed_seller), HP_POP2(HP_clif_buyingstore_trade_failed_seller), 1200 }, - { HP_POP(clif->search_store_info_ack), HP_POP2(HP_clif_search_store_info_ack), 1202 }, - { HP_POP(clif->search_store_info_failed), HP_POP2(HP_clif_search_store_info_failed), 1204 }, - { HP_POP(clif->open_search_store_info), HP_POP2(HP_clif_open_search_store_info), 1206 }, - { HP_POP(clif->search_store_info_click_ack), HP_POP2(HP_clif_search_store_info_click_ack), 1208 }, - { HP_POP(clif->elemental_info), HP_POP2(HP_clif_elemental_info), 1210 }, - { HP_POP(clif->elemental_updatestatus), HP_POP2(HP_clif_elemental_updatestatus), 1212 }, - { HP_POP(clif->bgqueue_ack), HP_POP2(HP_clif_bgqueue_ack), 1214 }, - { HP_POP(clif->bgqueue_notice_delete), HP_POP2(HP_clif_bgqueue_notice_delete), 1216 }, - { HP_POP(clif->bgqueue_update_info), HP_POP2(HP_clif_bgqueue_update_info), 1218 }, - { HP_POP(clif->bgqueue_joined), HP_POP2(HP_clif_bgqueue_joined), 1220 }, - { HP_POP(clif->bgqueue_pcleft), HP_POP2(HP_clif_bgqueue_pcleft), 1222 }, - { HP_POP(clif->bgqueue_battlebegins), HP_POP2(HP_clif_bgqueue_battlebegins), 1224 }, - { HP_POP(clif->adopt_reply), HP_POP2(HP_clif_adopt_reply), 1226 }, - { HP_POP(clif->adopt_request), HP_POP2(HP_clif_adopt_request), 1228 }, - { HP_POP(clif->readbook), HP_POP2(HP_clif_readbook), 1230 }, - { HP_POP(clif->notify_time), HP_POP2(HP_clif_notify_time), 1232 }, - { HP_POP(clif->user_count), HP_POP2(HP_clif_user_count), 1234 }, - { HP_POP(clif->noask_sub), HP_POP2(HP_clif_noask_sub), 1236 }, - { HP_POP(clif->bc_ready), HP_POP2(HP_clif_bc_ready), 1238 }, - { HP_POP(clif->undisguise_timer), HP_POP2(HP_clif_undisguise_timer), 1240 }, - { HP_POP(clif->chsys_create), HP_POP2(HP_clif_chsys_create), 1242 }, - { HP_POP(clif->chsys_msg), HP_POP2(HP_clif_chsys_msg), 1244 }, - { HP_POP(clif->chsys_msg2), HP_POP2(HP_clif_chsys_msg2), 1246 }, - { HP_POP(clif->chsys_send), HP_POP2(HP_clif_chsys_send), 1248 }, - { HP_POP(clif->chsys_join), HP_POP2(HP_clif_chsys_join), 1250 }, - { HP_POP(clif->chsys_left), HP_POP2(HP_clif_chsys_left), 1252 }, - { HP_POP(clif->chsys_delete), HP_POP2(HP_clif_chsys_delete), 1254 }, - { HP_POP(clif->chsys_mjoin), HP_POP2(HP_clif_chsys_mjoin), 1256 }, - { HP_POP(clif->chsys_quit), HP_POP2(HP_clif_chsys_quit), 1258 }, - { HP_POP(clif->chsys_quitg), HP_POP2(HP_clif_chsys_quitg), 1260 }, - { HP_POP(clif->chsys_gjoin), HP_POP2(HP_clif_chsys_gjoin), 1262 }, - { HP_POP(clif->chsys_gleave), HP_POP2(HP_clif_chsys_gleave), 1264 }, - { HP_POP(clif->pWantToConnection), HP_POP2(HP_clif_pWantToConnection), 1266 }, - { HP_POP(clif->pLoadEndAck), HP_POP2(HP_clif_pLoadEndAck), 1268 }, - { HP_POP(clif->pTickSend), HP_POP2(HP_clif_pTickSend), 1270 }, - { HP_POP(clif->pHotkey), HP_POP2(HP_clif_pHotkey), 1272 }, - { HP_POP(clif->pProgressbar), HP_POP2(HP_clif_pProgressbar), 1274 }, - { HP_POP(clif->pWalkToXY), HP_POP2(HP_clif_pWalkToXY), 1276 }, - { HP_POP(clif->pQuitGame), HP_POP2(HP_clif_pQuitGame), 1278 }, - { HP_POP(clif->pGetCharNameRequest), HP_POP2(HP_clif_pGetCharNameRequest), 1280 }, - { HP_POP(clif->pGlobalMessage), HP_POP2(HP_clif_pGlobalMessage), 1282 }, - { HP_POP(clif->pMapMove), HP_POP2(HP_clif_pMapMove), 1284 }, - { HP_POP(clif->pChangeDir), HP_POP2(HP_clif_pChangeDir), 1286 }, - { HP_POP(clif->pEmotion), HP_POP2(HP_clif_pEmotion), 1288 }, - { HP_POP(clif->pHowManyConnections), HP_POP2(HP_clif_pHowManyConnections), 1290 }, - { HP_POP(clif->pActionRequest), HP_POP2(HP_clif_pActionRequest), 1292 }, - { HP_POP(clif->pActionRequest_sub), HP_POP2(HP_clif_pActionRequest_sub), 1294 }, - { HP_POP(clif->pRestart), HP_POP2(HP_clif_pRestart), 1296 }, - { HP_POP(clif->pWisMessage), HP_POP2(HP_clif_pWisMessage), 1298 }, - { HP_POP(clif->pBroadcast), HP_POP2(HP_clif_pBroadcast), 1300 }, - { HP_POP(clif->pTakeItem), HP_POP2(HP_clif_pTakeItem), 1302 }, - { HP_POP(clif->pDropItem), HP_POP2(HP_clif_pDropItem), 1304 }, - { HP_POP(clif->pUseItem), HP_POP2(HP_clif_pUseItem), 1306 }, - { HP_POP(clif->pEquipItem), HP_POP2(HP_clif_pEquipItem), 1308 }, - { HP_POP(clif->pUnequipItem), HP_POP2(HP_clif_pUnequipItem), 1310 }, - { HP_POP(clif->pNpcClicked), HP_POP2(HP_clif_pNpcClicked), 1312 }, - { HP_POP(clif->pNpcBuySellSelected), HP_POP2(HP_clif_pNpcBuySellSelected), 1314 }, - { HP_POP(clif->pNpcBuyListSend), HP_POP2(HP_clif_pNpcBuyListSend), 1316 }, - { HP_POP(clif->pNpcSellListSend), HP_POP2(HP_clif_pNpcSellListSend), 1318 }, - { HP_POP(clif->pCreateChatRoom), HP_POP2(HP_clif_pCreateChatRoom), 1320 }, - { HP_POP(clif->pChatAddMember), HP_POP2(HP_clif_pChatAddMember), 1322 }, - { HP_POP(clif->pChatRoomStatusChange), HP_POP2(HP_clif_pChatRoomStatusChange), 1324 }, - { HP_POP(clif->pChangeChatOwner), HP_POP2(HP_clif_pChangeChatOwner), 1326 }, - { HP_POP(clif->pKickFromChat), HP_POP2(HP_clif_pKickFromChat), 1328 }, - { HP_POP(clif->pChatLeave), HP_POP2(HP_clif_pChatLeave), 1330 }, - { HP_POP(clif->pTradeRequest), HP_POP2(HP_clif_pTradeRequest), 1332 }, - { HP_POP(clif->chann_config_read), HP_POP2(HP_clif_chann_config_read), 1334 }, - { HP_POP(clif->pTradeAck), HP_POP2(HP_clif_pTradeAck), 1336 }, - { HP_POP(clif->pTradeAddItem), HP_POP2(HP_clif_pTradeAddItem), 1338 }, - { HP_POP(clif->pTradeOk), HP_POP2(HP_clif_pTradeOk), 1340 }, - { HP_POP(clif->pTradeCancel), HP_POP2(HP_clif_pTradeCancel), 1342 }, - { HP_POP(clif->pTradeCommit), HP_POP2(HP_clif_pTradeCommit), 1344 }, - { HP_POP(clif->pStopAttack), HP_POP2(HP_clif_pStopAttack), 1346 }, - { HP_POP(clif->pPutItemToCart), HP_POP2(HP_clif_pPutItemToCart), 1348 }, - { HP_POP(clif->pGetItemFromCart), HP_POP2(HP_clif_pGetItemFromCart), 1350 }, - { HP_POP(clif->pRemoveOption), HP_POP2(HP_clif_pRemoveOption), 1352 }, - { HP_POP(clif->pChangeCart), HP_POP2(HP_clif_pChangeCart), 1354 }, - { HP_POP(clif->pStatusUp), HP_POP2(HP_clif_pStatusUp), 1356 }, - { HP_POP(clif->pSkillUp), HP_POP2(HP_clif_pSkillUp), 1358 }, - { HP_POP(clif->pUseSkillToId), HP_POP2(HP_clif_pUseSkillToId), 1360 }, - { HP_POP(clif->pUseSkillToId_homun), HP_POP2(HP_clif_pUseSkillToId_homun), 1362 }, - { HP_POP(clif->pUseSkillToId_mercenary), HP_POP2(HP_clif_pUseSkillToId_mercenary), 1364 }, - { HP_POP(clif->pUseSkillToPos), HP_POP2(HP_clif_pUseSkillToPos), 1366 }, - { HP_POP(clif->pUseSkillToPosSub), HP_POP2(HP_clif_pUseSkillToPosSub), 1368 }, - { HP_POP(clif->pUseSkillToPos_homun), HP_POP2(HP_clif_pUseSkillToPos_homun), 1370 }, - { HP_POP(clif->pUseSkillToPos_mercenary), HP_POP2(HP_clif_pUseSkillToPos_mercenary), 1372 }, - { HP_POP(clif->pUseSkillToPosMoreInfo), HP_POP2(HP_clif_pUseSkillToPosMoreInfo), 1374 }, - { HP_POP(clif->pUseSkillMap), HP_POP2(HP_clif_pUseSkillMap), 1376 }, - { HP_POP(clif->pRequestMemo), HP_POP2(HP_clif_pRequestMemo), 1378 }, - { HP_POP(clif->pProduceMix), HP_POP2(HP_clif_pProduceMix), 1380 }, - { HP_POP(clif->pCooking), HP_POP2(HP_clif_pCooking), 1382 }, - { HP_POP(clif->pRepairItem), HP_POP2(HP_clif_pRepairItem), 1384 }, - { HP_POP(clif->pWeaponRefine), HP_POP2(HP_clif_pWeaponRefine), 1386 }, - { HP_POP(clif->pNpcSelectMenu), HP_POP2(HP_clif_pNpcSelectMenu), 1388 }, - { HP_POP(clif->pNpcNextClicked), HP_POP2(HP_clif_pNpcNextClicked), 1390 }, - { HP_POP(clif->pNpcAmountInput), HP_POP2(HP_clif_pNpcAmountInput), 1392 }, - { HP_POP(clif->pNpcStringInput), HP_POP2(HP_clif_pNpcStringInput), 1394 }, - { HP_POP(clif->pNpcCloseClicked), HP_POP2(HP_clif_pNpcCloseClicked), 1396 }, - { HP_POP(clif->pItemIdentify), HP_POP2(HP_clif_pItemIdentify), 1398 }, - { HP_POP(clif->pSelectArrow), HP_POP2(HP_clif_pSelectArrow), 1400 }, - { HP_POP(clif->pAutoSpell), HP_POP2(HP_clif_pAutoSpell), 1402 }, - { HP_POP(clif->pUseCard), HP_POP2(HP_clif_pUseCard), 1404 }, - { HP_POP(clif->pInsertCard), HP_POP2(HP_clif_pInsertCard), 1406 }, - { HP_POP(clif->pSolveCharName), HP_POP2(HP_clif_pSolveCharName), 1408 }, - { HP_POP(clif->pResetChar), HP_POP2(HP_clif_pResetChar), 1410 }, - { HP_POP(clif->pLocalBroadcast), HP_POP2(HP_clif_pLocalBroadcast), 1412 }, - { HP_POP(clif->pMoveToKafra), HP_POP2(HP_clif_pMoveToKafra), 1414 }, - { HP_POP(clif->pMoveFromKafra), HP_POP2(HP_clif_pMoveFromKafra), 1416 }, - { HP_POP(clif->pMoveToKafraFromCart), HP_POP2(HP_clif_pMoveToKafraFromCart), 1418 }, - { HP_POP(clif->pMoveFromKafraToCart), HP_POP2(HP_clif_pMoveFromKafraToCart), 1420 }, - { HP_POP(clif->pCloseKafra), HP_POP2(HP_clif_pCloseKafra), 1422 }, - { HP_POP(clif->pStoragePassword), HP_POP2(HP_clif_pStoragePassword), 1424 }, - { HP_POP(clif->pCreateParty), HP_POP2(HP_clif_pCreateParty), 1426 }, - { HP_POP(clif->pCreateParty2), HP_POP2(HP_clif_pCreateParty2), 1428 }, - { HP_POP(clif->pPartyInvite), HP_POP2(HP_clif_pPartyInvite), 1430 }, - { HP_POP(clif->pPartyInvite2), HP_POP2(HP_clif_pPartyInvite2), 1432 }, - { HP_POP(clif->pReplyPartyInvite), HP_POP2(HP_clif_pReplyPartyInvite), 1434 }, - { HP_POP(clif->pReplyPartyInvite2), HP_POP2(HP_clif_pReplyPartyInvite2), 1436 }, - { HP_POP(clif->pLeaveParty), HP_POP2(HP_clif_pLeaveParty), 1438 }, - { HP_POP(clif->pRemovePartyMember), HP_POP2(HP_clif_pRemovePartyMember), 1440 }, - { HP_POP(clif->pPartyChangeOption), HP_POP2(HP_clif_pPartyChangeOption), 1442 }, - { HP_POP(clif->pPartyMessage), HP_POP2(HP_clif_pPartyMessage), 1444 }, - { HP_POP(clif->pPartyChangeLeader), HP_POP2(HP_clif_pPartyChangeLeader), 1446 }, - { HP_POP(clif->pPartyBookingRegisterReq), HP_POP2(HP_clif_pPartyBookingRegisterReq), 1448 }, - { HP_POP(clif->pPartyBookingSearchReq), HP_POP2(HP_clif_pPartyBookingSearchReq), 1450 }, - { HP_POP(clif->pPartyBookingDeleteReq), HP_POP2(HP_clif_pPartyBookingDeleteReq), 1452 }, - { HP_POP(clif->pPartyBookingUpdateReq), HP_POP2(HP_clif_pPartyBookingUpdateReq), 1454 }, - { HP_POP(clif->pPartyRecruitRegisterReq), HP_POP2(HP_clif_pPartyRecruitRegisterReq), 1456 }, - { HP_POP(clif->pPartyRecruitSearchReq), HP_POP2(HP_clif_pPartyRecruitSearchReq), 1458 }, - { HP_POP(clif->pPartyRecruitDeleteReq), HP_POP2(HP_clif_pPartyRecruitDeleteReq), 1460 }, - { HP_POP(clif->pPartyRecruitUpdateReq), HP_POP2(HP_clif_pPartyRecruitUpdateReq), 1462 }, - { HP_POP(clif->pCloseVending), HP_POP2(HP_clif_pCloseVending), 1464 }, - { HP_POP(clif->pVendingListReq), HP_POP2(HP_clif_pVendingListReq), 1466 }, - { HP_POP(clif->pPurchaseReq), HP_POP2(HP_clif_pPurchaseReq), 1468 }, - { HP_POP(clif->pPurchaseReq2), HP_POP2(HP_clif_pPurchaseReq2), 1470 }, - { HP_POP(clif->pOpenVending), HP_POP2(HP_clif_pOpenVending), 1472 }, - { HP_POP(clif->pCreateGuild), HP_POP2(HP_clif_pCreateGuild), 1474 }, - { HP_POP(clif->pGuildCheckMaster), HP_POP2(HP_clif_pGuildCheckMaster), 1476 }, - { HP_POP(clif->pGuildRequestInfo), HP_POP2(HP_clif_pGuildRequestInfo), 1478 }, - { HP_POP(clif->pGuildChangePositionInfo), HP_POP2(HP_clif_pGuildChangePositionInfo), 1480 }, - { HP_POP(clif->pGuildChangeMemberPosition), HP_POP2(HP_clif_pGuildChangeMemberPosition), 1482 }, - { HP_POP(clif->pGuildRequestEmblem), HP_POP2(HP_clif_pGuildRequestEmblem), 1484 }, - { HP_POP(clif->pGuildChangeEmblem), HP_POP2(HP_clif_pGuildChangeEmblem), 1486 }, - { HP_POP(clif->pGuildChangeNotice), HP_POP2(HP_clif_pGuildChangeNotice), 1488 }, - { HP_POP(clif->pGuildInvite), HP_POP2(HP_clif_pGuildInvite), 1490 }, - { HP_POP(clif->pGuildReplyInvite), HP_POP2(HP_clif_pGuildReplyInvite), 1492 }, - { HP_POP(clif->pGuildLeave), HP_POP2(HP_clif_pGuildLeave), 1494 }, - { HP_POP(clif->pGuildExpulsion), HP_POP2(HP_clif_pGuildExpulsion), 1496 }, - { HP_POP(clif->pGuildMessage), HP_POP2(HP_clif_pGuildMessage), 1498 }, - { HP_POP(clif->pGuildRequestAlliance), HP_POP2(HP_clif_pGuildRequestAlliance), 1500 }, - { HP_POP(clif->pGuildReplyAlliance), HP_POP2(HP_clif_pGuildReplyAlliance), 1502 }, - { HP_POP(clif->pGuildDelAlliance), HP_POP2(HP_clif_pGuildDelAlliance), 1504 }, - { HP_POP(clif->pGuildOpposition), HP_POP2(HP_clif_pGuildOpposition), 1506 }, - { HP_POP(clif->pGuildBreak), HP_POP2(HP_clif_pGuildBreak), 1508 }, - { HP_POP(clif->pPetMenu), HP_POP2(HP_clif_pPetMenu), 1510 }, - { HP_POP(clif->pCatchPet), HP_POP2(HP_clif_pCatchPet), 1512 }, - { HP_POP(clif->pSelectEgg), HP_POP2(HP_clif_pSelectEgg), 1514 }, - { HP_POP(clif->pSendEmotion), HP_POP2(HP_clif_pSendEmotion), 1516 }, - { HP_POP(clif->pChangePetName), HP_POP2(HP_clif_pChangePetName), 1518 }, - { HP_POP(clif->pGMKick), HP_POP2(HP_clif_pGMKick), 1520 }, - { HP_POP(clif->pGMKickAll), HP_POP2(HP_clif_pGMKickAll), 1522 }, - { HP_POP(clif->pGMShift), HP_POP2(HP_clif_pGMShift), 1524 }, - { HP_POP(clif->pGMRemove2), HP_POP2(HP_clif_pGMRemove2), 1526 }, - { HP_POP(clif->pGMRecall), HP_POP2(HP_clif_pGMRecall), 1528 }, - { HP_POP(clif->pGMRecall2), HP_POP2(HP_clif_pGMRecall2), 1530 }, - { HP_POP(clif->pGM_Monster_Item), HP_POP2(HP_clif_pGM_Monster_Item), 1532 }, - { HP_POP(clif->pGMHide), HP_POP2(HP_clif_pGMHide), 1534 }, - { HP_POP(clif->pGMReqNoChat), HP_POP2(HP_clif_pGMReqNoChat), 1536 }, - { HP_POP(clif->pGMRc), HP_POP2(HP_clif_pGMRc), 1538 }, - { HP_POP(clif->pGMReqAccountName), HP_POP2(HP_clif_pGMReqAccountName), 1540 }, - { HP_POP(clif->pGMChangeMapType), HP_POP2(HP_clif_pGMChangeMapType), 1542 }, - { HP_POP(clif->pPMIgnore), HP_POP2(HP_clif_pPMIgnore), 1544 }, - { HP_POP(clif->pPMIgnoreAll), HP_POP2(HP_clif_pPMIgnoreAll), 1546 }, - { HP_POP(clif->pPMIgnoreList), HP_POP2(HP_clif_pPMIgnoreList), 1548 }, - { HP_POP(clif->pNoviceDoriDori), HP_POP2(HP_clif_pNoviceDoriDori), 1550 }, - { HP_POP(clif->pNoviceExplosionSpirits), HP_POP2(HP_clif_pNoviceExplosionSpirits), 1552 }, - { HP_POP(clif->pFriendsListAdd), HP_POP2(HP_clif_pFriendsListAdd), 1554 }, - { HP_POP(clif->pFriendsListReply), HP_POP2(HP_clif_pFriendsListReply), 1556 }, - { HP_POP(clif->pFriendsListRemove), HP_POP2(HP_clif_pFriendsListRemove), 1558 }, - { HP_POP(clif->pPVPInfo), HP_POP2(HP_clif_pPVPInfo), 1560 }, - { HP_POP(clif->pBlacksmith), HP_POP2(HP_clif_pBlacksmith), 1562 }, - { HP_POP(clif->pAlchemist), HP_POP2(HP_clif_pAlchemist), 1564 }, - { HP_POP(clif->pTaekwon), HP_POP2(HP_clif_pTaekwon), 1566 }, - { HP_POP(clif->pRankingPk), HP_POP2(HP_clif_pRankingPk), 1568 }, - { HP_POP(clif->pFeelSaveOk), HP_POP2(HP_clif_pFeelSaveOk), 1570 }, - { HP_POP(clif->pChangeHomunculusName), HP_POP2(HP_clif_pChangeHomunculusName), 1572 }, - { HP_POP(clif->pHomMoveToMaster), HP_POP2(HP_clif_pHomMoveToMaster), 1574 }, - { HP_POP(clif->pHomMoveTo), HP_POP2(HP_clif_pHomMoveTo), 1576 }, - { HP_POP(clif->pHomAttack), HP_POP2(HP_clif_pHomAttack), 1578 }, - { HP_POP(clif->pHomMenu), HP_POP2(HP_clif_pHomMenu), 1580 }, - { HP_POP(clif->pAutoRevive), HP_POP2(HP_clif_pAutoRevive), 1582 }, - { HP_POP(clif->pCheck), HP_POP2(HP_clif_pCheck), 1584 }, - { HP_POP(clif->pMail_refreshinbox), HP_POP2(HP_clif_pMail_refreshinbox), 1586 }, - { HP_POP(clif->pMail_read), HP_POP2(HP_clif_pMail_read), 1588 }, - { HP_POP(clif->pMail_getattach), HP_POP2(HP_clif_pMail_getattach), 1590 }, - { HP_POP(clif->pMail_delete), HP_POP2(HP_clif_pMail_delete), 1592 }, - { HP_POP(clif->pMail_return), HP_POP2(HP_clif_pMail_return), 1594 }, - { HP_POP(clif->pMail_setattach), HP_POP2(HP_clif_pMail_setattach), 1596 }, - { HP_POP(clif->pMail_winopen), HP_POP2(HP_clif_pMail_winopen), 1598 }, - { HP_POP(clif->pMail_send), HP_POP2(HP_clif_pMail_send), 1600 }, - { HP_POP(clif->pAuction_cancelreg), HP_POP2(HP_clif_pAuction_cancelreg), 1602 }, - { HP_POP(clif->pAuction_setitem), HP_POP2(HP_clif_pAuction_setitem), 1604 }, - { HP_POP(clif->pAuction_register), HP_POP2(HP_clif_pAuction_register), 1606 }, - { HP_POP(clif->pAuction_cancel), HP_POP2(HP_clif_pAuction_cancel), 1608 }, - { HP_POP(clif->pAuction_close), HP_POP2(HP_clif_pAuction_close), 1610 }, - { HP_POP(clif->pAuction_bid), HP_POP2(HP_clif_pAuction_bid), 1612 }, - { HP_POP(clif->pAuction_search), HP_POP2(HP_clif_pAuction_search), 1614 }, - { HP_POP(clif->pAuction_buysell), HP_POP2(HP_clif_pAuction_buysell), 1616 }, - { HP_POP(clif->pcashshop_buy), HP_POP2(HP_clif_pcashshop_buy), 1618 }, - { HP_POP(clif->pAdopt_request), HP_POP2(HP_clif_pAdopt_request), 1620 }, - { HP_POP(clif->pAdopt_reply), HP_POP2(HP_clif_pAdopt_reply), 1622 }, - { HP_POP(clif->pViewPlayerEquip), HP_POP2(HP_clif_pViewPlayerEquip), 1624 }, - { HP_POP(clif->pEquipTick), HP_POP2(HP_clif_pEquipTick), 1626 }, - { HP_POP(clif->pquestStateAck), HP_POP2(HP_clif_pquestStateAck), 1628 }, - { HP_POP(clif->pmercenary_action), HP_POP2(HP_clif_pmercenary_action), 1630 }, - { HP_POP(clif->pBattleChat), HP_POP2(HP_clif_pBattleChat), 1632 }, - { HP_POP(clif->pLessEffect), HP_POP2(HP_clif_pLessEffect), 1634 }, - { HP_POP(clif->pItemListWindowSelected), HP_POP2(HP_clif_pItemListWindowSelected), 1636 }, - { HP_POP(clif->pReqOpenBuyingStore), HP_POP2(HP_clif_pReqOpenBuyingStore), 1638 }, - { HP_POP(clif->pReqCloseBuyingStore), HP_POP2(HP_clif_pReqCloseBuyingStore), 1640 }, - { HP_POP(clif->pReqClickBuyingStore), HP_POP2(HP_clif_pReqClickBuyingStore), 1642 }, - { HP_POP(clif->pReqTradeBuyingStore), HP_POP2(HP_clif_pReqTradeBuyingStore), 1644 }, - { HP_POP(clif->pSearchStoreInfo), HP_POP2(HP_clif_pSearchStoreInfo), 1646 }, - { HP_POP(clif->pSearchStoreInfoNextPage), HP_POP2(HP_clif_pSearchStoreInfoNextPage), 1648 }, - { HP_POP(clif->pCloseSearchStoreInfo), HP_POP2(HP_clif_pCloseSearchStoreInfo), 1650 }, - { HP_POP(clif->pSearchStoreInfoListItemClick), HP_POP2(HP_clif_pSearchStoreInfoListItemClick), 1652 }, - { HP_POP(clif->pDebug), HP_POP2(HP_clif_pDebug), 1654 }, - { HP_POP(clif->pSkillSelectMenu), HP_POP2(HP_clif_pSkillSelectMenu), 1656 }, - { HP_POP(clif->pMoveItem), HP_POP2(HP_clif_pMoveItem), 1658 }, - { HP_POP(clif->pDull), HP_POP2(HP_clif_pDull), 1660 }, - { HP_POP(clif->pBGQueueRegister), HP_POP2(HP_clif_pBGQueueRegister), 1662 }, - { HP_POP(clif->pBGQueueCheckState), HP_POP2(HP_clif_pBGQueueCheckState), 1664 }, - { HP_POP(clif->pBGQueueRevokeReq), HP_POP2(HP_clif_pBGQueueRevokeReq), 1666 }, - { HP_POP(clif->pBGQueueBattleBeginAck), HP_POP2(HP_clif_pBGQueueBattleBeginAck), 1668 }, - { HP_POP(clif->pCashShopOpen), HP_POP2(HP_clif_pCashShopOpen), 1670 }, - { HP_POP(clif->pCashShopClose), HP_POP2(HP_clif_pCashShopClose), 1672 }, - { HP_POP(clif->pCashShopReqTab), HP_POP2(HP_clif_pCashShopReqTab), 1674 }, - { HP_POP(clif->pCashShopSchedule), HP_POP2(HP_clif_pCashShopSchedule), 1676 }, - { HP_POP(clif->pCashShopBuy), HP_POP2(HP_clif_pCashShopBuy), 1678 }, - { HP_POP(clif->pPartyTick), HP_POP2(HP_clif_pPartyTick), 1680 }, - { HP_POP(clif->pGuildInvite2), HP_POP2(HP_clif_pGuildInvite2), 1682 }, - { HP_POP(clif->pPartyBookingAddFilter), HP_POP2(HP_clif_pPartyBookingAddFilter), 1684 }, - { HP_POP(clif->pPartyBookingSubFilter), HP_POP2(HP_clif_pPartyBookingSubFilter), 1686 }, - { HP_POP(clif->pPartyBookingReqVolunteer), HP_POP2(HP_clif_pPartyBookingReqVolunteer), 1688 }, - { HP_POP(clif->pPartyBookingRefuseVolunteer), HP_POP2(HP_clif_pPartyBookingRefuseVolunteer), 1690 }, - { HP_POP(clif->pPartyBookingCancelVolunteer), HP_POP2(HP_clif_pPartyBookingCancelVolunteer), 1692 }, + { HP_POP(clif->init, HP_clif_init) }, + { HP_POP(clif->final, HP_clif_final) }, + { HP_POP(clif->setip, HP_clif_setip) }, + { HP_POP(clif->setbindip, HP_clif_setbindip) }, + { HP_POP(clif->setport, HP_clif_setport) }, + { HP_POP(clif->refresh_ip, HP_clif_refresh_ip) }, + { HP_POP(clif->send, HP_clif_send) }, + { HP_POP(clif->send_sub, HP_clif_send_sub) }, + { HP_POP(clif->parse, HP_clif_parse) }, + { HP_POP(clif->parse_cmd, HP_clif_parse_cmd) }, + { HP_POP(clif->decrypt_cmd, HP_clif_decrypt_cmd) }, + { HP_POP(clif->authok, HP_clif_authok) }, + { HP_POP(clif->authrefuse, HP_clif_authrefuse) }, + { HP_POP(clif->authfail_fd, HP_clif_authfail_fd) }, + { HP_POP(clif->charselectok, HP_clif_charselectok) }, + { HP_POP(clif->dropflooritem, HP_clif_dropflooritem) }, + { HP_POP(clif->clearflooritem, HP_clif_clearflooritem) }, + { HP_POP(clif->additem, HP_clif_additem) }, + { HP_POP(clif->dropitem, HP_clif_dropitem) }, + { HP_POP(clif->delitem, HP_clif_delitem) }, + { HP_POP(clif->takeitem, HP_clif_takeitem) }, + { HP_POP(clif->arrowequip, HP_clif_arrowequip) }, + { HP_POP(clif->arrow_fail, HP_clif_arrow_fail) }, + { HP_POP(clif->use_card, HP_clif_use_card) }, + { HP_POP(clif->cart_additem, HP_clif_cart_additem) }, + { HP_POP(clif->cart_delitem, HP_clif_cart_delitem) }, + { HP_POP(clif->equipitemack, HP_clif_equipitemack) }, + { HP_POP(clif->unequipitemack, HP_clif_unequipitemack) }, + { HP_POP(clif->useitemack, HP_clif_useitemack) }, + { HP_POP(clif->addcards, HP_clif_addcards) }, + { HP_POP(clif->addcards2, HP_clif_addcards2) }, + { HP_POP(clif->item_sub, HP_clif_item_sub) }, + { HP_POP(clif->getareachar_item, HP_clif_getareachar_item) }, + { HP_POP(clif->cart_additem_ack, HP_clif_cart_additem_ack) }, + { HP_POP(clif->cashshop_load, HP_clif_cashshop_load) }, + { HP_POP(clif->package_announce, HP_clif_package_announce) }, + { HP_POP(clif->item_drop_announce, HP_clif_item_drop_announce) }, + { HP_POP(clif->clearunit_single, HP_clif_clearunit_single) }, + { HP_POP(clif->clearunit_area, HP_clif_clearunit_area) }, + { HP_POP(clif->clearunit_delayed, HP_clif_clearunit_delayed) }, + { HP_POP(clif->walkok, HP_clif_walkok) }, + { HP_POP(clif->move, HP_clif_move) }, + { HP_POP(clif->move2, HP_clif_move2) }, + { HP_POP(clif->blown, HP_clif_blown) }, + { HP_POP(clif->slide, HP_clif_slide) }, + { HP_POP(clif->fixpos, HP_clif_fixpos) }, + { HP_POP(clif->changelook, HP_clif_changelook) }, + { HP_POP(clif->changetraplook, HP_clif_changetraplook) }, + { HP_POP(clif->refreshlook, HP_clif_refreshlook) }, + { HP_POP(clif->class_change, HP_clif_class_change) }, + { HP_POP(clif->skill_delunit, HP_clif_skill_delunit) }, + { HP_POP(clif->skillunit_update, HP_clif_skillunit_update) }, + { HP_POP(clif->clearunit_delayed_sub, HP_clif_clearunit_delayed_sub) }, + { HP_POP(clif->set_unit_idle, HP_clif_set_unit_idle) }, + { HP_POP(clif->spawn_unit, HP_clif_spawn_unit) }, + { HP_POP(clif->spawn_unit2, HP_clif_spawn_unit2) }, + { HP_POP(clif->set_unit_idle2, HP_clif_set_unit_idle2) }, + { HP_POP(clif->set_unit_walking, HP_clif_set_unit_walking) }, + { HP_POP(clif->calc_walkdelay, HP_clif_calc_walkdelay) }, + { HP_POP(clif->getareachar_skillunit, HP_clif_getareachar_skillunit) }, + { HP_POP(clif->getareachar_unit, HP_clif_getareachar_unit) }, + { HP_POP(clif->clearchar_skillunit, HP_clif_clearchar_skillunit) }, + { HP_POP(clif->getareachar, HP_clif_getareachar) }, + { HP_POP(clif->graffiti_entry, HP_clif_graffiti_entry) }, + { HP_POP(clif->spawn, HP_clif_spawn) }, + { HP_POP(clif->changemap, HP_clif_changemap) }, + { HP_POP(clif->changemapcell, HP_clif_changemapcell) }, + { HP_POP(clif->map_property, HP_clif_map_property) }, + { HP_POP(clif->pvpset, HP_clif_pvpset) }, + { HP_POP(clif->map_property_mapall, HP_clif_map_property_mapall) }, + { HP_POP(clif->bossmapinfo, HP_clif_bossmapinfo) }, + { HP_POP(clif->map_type, HP_clif_map_type) }, + { HP_POP(clif->maptypeproperty2, HP_clif_maptypeproperty2) }, + { HP_POP(clif->changemapserver, HP_clif_changemapserver) }, + { HP_POP(clif->npcbuysell, HP_clif_npcbuysell) }, + { HP_POP(clif->buylist, HP_clif_buylist) }, + { HP_POP(clif->selllist, HP_clif_selllist) }, + { HP_POP(clif->cashshop_show, HP_clif_cashshop_show) }, + { HP_POP(clif->npc_buy_result, HP_clif_npc_buy_result) }, + { HP_POP(clif->npc_sell_result, HP_clif_npc_sell_result) }, + { HP_POP(clif->cashshop_ack, HP_clif_cashshop_ack) }, + { HP_POP(clif->scriptmes, HP_clif_scriptmes) }, + { HP_POP(clif->scriptnext, HP_clif_scriptnext) }, + { HP_POP(clif->scriptclose, HP_clif_scriptclose) }, + { HP_POP(clif->scriptmenu, HP_clif_scriptmenu) }, + { HP_POP(clif->scriptinput, HP_clif_scriptinput) }, + { HP_POP(clif->scriptinputstr, HP_clif_scriptinputstr) }, + { HP_POP(clif->cutin, HP_clif_cutin) }, + { HP_POP(clif->sendfakenpc, HP_clif_sendfakenpc) }, + { HP_POP(clif->scriptclear, HP_clif_scriptclear) }, + { HP_POP(clif->viewpoint, HP_clif_viewpoint) }, + { HP_POP(clif->damage, HP_clif_damage) }, + { HP_POP(clif->sitting, HP_clif_sitting) }, + { HP_POP(clif->standing, HP_clif_standing) }, + { HP_POP(clif->arrow_create_list, HP_clif_arrow_create_list) }, + { HP_POP(clif->refresh, HP_clif_refresh) }, + { HP_POP(clif->fame_blacksmith, HP_clif_fame_blacksmith) }, + { HP_POP(clif->fame_alchemist, HP_clif_fame_alchemist) }, + { HP_POP(clif->fame_taekwon, HP_clif_fame_taekwon) }, + { HP_POP(clif->ranklist, HP_clif_ranklist) }, + { HP_POP(clif->update_rankingpoint, HP_clif_update_rankingpoint) }, + { HP_POP(clif->pRanklist, HP_clif_pRanklist) }, + { HP_POP(clif->hotkeys, HP_clif_hotkeys) }, + { HP_POP(clif->insight, HP_clif_insight) }, + { HP_POP(clif->outsight, HP_clif_outsight) }, + { HP_POP(clif->skillcastcancel, HP_clif_skillcastcancel) }, + { HP_POP(clif->skill_fail, HP_clif_skill_fail) }, + { HP_POP(clif->skill_cooldown, HP_clif_skill_cooldown) }, + { HP_POP(clif->skill_memomessage, HP_clif_skill_memomessage) }, + { HP_POP(clif->skill_mapinfomessage, HP_clif_skill_mapinfomessage) }, + { HP_POP(clif->skill_produce_mix_list, HP_clif_skill_produce_mix_list) }, + { HP_POP(clif->cooking_list, HP_clif_cooking_list) }, + { HP_POP(clif->autospell, HP_clif_autospell) }, + { HP_POP(clif->combo_delay, HP_clif_combo_delay) }, + { HP_POP(clif->status_change, HP_clif_status_change) }, + { HP_POP(clif->insert_card, HP_clif_insert_card) }, + { HP_POP(clif->inventorylist, HP_clif_inventorylist) }, + { HP_POP(clif->equiplist, HP_clif_equiplist) }, + { HP_POP(clif->cartlist, HP_clif_cartlist) }, + { HP_POP(clif->favorite_item, HP_clif_favorite_item) }, + { HP_POP(clif->clearcart, HP_clif_clearcart) }, + { HP_POP(clif->item_identify_list, HP_clif_item_identify_list) }, + { HP_POP(clif->item_identified, HP_clif_item_identified) }, + { HP_POP(clif->item_repair_list, HP_clif_item_repair_list) }, + { HP_POP(clif->item_repaireffect, HP_clif_item_repaireffect) }, + { HP_POP(clif->item_damaged, HP_clif_item_damaged) }, + { HP_POP(clif->item_refine_list, HP_clif_item_refine_list) }, + { HP_POP(clif->item_skill, HP_clif_item_skill) }, + { HP_POP(clif->mvp_item, HP_clif_mvp_item) }, + { HP_POP(clif->mvp_exp, HP_clif_mvp_exp) }, + { HP_POP(clif->mvp_noitem, HP_clif_mvp_noitem) }, + { HP_POP(clif->changed_dir, HP_clif_changed_dir) }, + { HP_POP(clif->charnameack, HP_clif_charnameack) }, + { HP_POP(clif->monster_hp_bar, HP_clif_monster_hp_bar) }, + { HP_POP(clif->hpmeter, HP_clif_hpmeter) }, + { HP_POP(clif->hpmeter_single, HP_clif_hpmeter_single) }, + { HP_POP(clif->hpmeter_sub, HP_clif_hpmeter_sub) }, + { HP_POP(clif->upgrademessage, HP_clif_upgrademessage) }, + { HP_POP(clif->get_weapon_view, HP_clif_get_weapon_view) }, + { HP_POP(clif->gospel_info, HP_clif_gospel_info) }, + { HP_POP(clif->feel_req, HP_clif_feel_req) }, + { HP_POP(clif->starskill, HP_clif_starskill) }, + { HP_POP(clif->feel_info, HP_clif_feel_info) }, + { HP_POP(clif->hate_info, HP_clif_hate_info) }, + { HP_POP(clif->mission_info, HP_clif_mission_info) }, + { HP_POP(clif->feel_hate_reset, HP_clif_feel_hate_reset) }, + { HP_POP(clif->partytickack, HP_clif_partytickack) }, + { HP_POP(clif->equiptickack, HP_clif_equiptickack) }, + { HP_POP(clif->viewequip_ack, HP_clif_viewequip_ack) }, + { HP_POP(clif->equpcheckbox, HP_clif_equpcheckbox) }, + { HP_POP(clif->displayexp, HP_clif_displayexp) }, + { HP_POP(clif->font, HP_clif_font) }, + { HP_POP(clif->progressbar, HP_clif_progressbar) }, + { HP_POP(clif->progressbar_abort, HP_clif_progressbar_abort) }, + { HP_POP(clif->showdigit, HP_clif_showdigit) }, + { HP_POP(clif->elementalconverter_list, HP_clif_elementalconverter_list) }, + { HP_POP(clif->spellbook_list, HP_clif_spellbook_list) }, + { HP_POP(clif->magicdecoy_list, HP_clif_magicdecoy_list) }, + { HP_POP(clif->poison_list, HP_clif_poison_list) }, + { HP_POP(clif->autoshadowspell_list, HP_clif_autoshadowspell_list) }, + { HP_POP(clif->skill_itemlistwindow, HP_clif_skill_itemlistwindow) }, + { HP_POP(clif->sc_load, HP_clif_sc_load) }, + { HP_POP(clif->sc_end, HP_clif_sc_end) }, + { HP_POP(clif->initialstatus, HP_clif_initialstatus) }, + { HP_POP(clif->cooldown_list, HP_clif_cooldown_list) }, + { HP_POP(clif->updatestatus, HP_clif_updatestatus) }, + { HP_POP(clif->changestatus, HP_clif_changestatus) }, + { HP_POP(clif->statusupack, HP_clif_statusupack) }, + { HP_POP(clif->movetoattack, HP_clif_movetoattack) }, + { HP_POP(clif->solved_charname, HP_clif_solved_charname) }, + { HP_POP(clif->charnameupdate, HP_clif_charnameupdate) }, + { HP_POP(clif->delayquit, HP_clif_delayquit) }, + { HP_POP(clif->getareachar_pc, HP_clif_getareachar_pc) }, + { HP_POP(clif->disconnect_ack, HP_clif_disconnect_ack) }, + { HP_POP(clif->PVPInfo, HP_clif_PVPInfo) }, + { HP_POP(clif->blacksmith, HP_clif_blacksmith) }, + { HP_POP(clif->alchemist, HP_clif_alchemist) }, + { HP_POP(clif->taekwon, HP_clif_taekwon) }, + { HP_POP(clif->ranking_pk, HP_clif_ranking_pk) }, + { HP_POP(clif->quitsave, HP_clif_quitsave) }, + { HP_POP(clif->misceffect, HP_clif_misceffect) }, + { HP_POP(clif->changeoption, HP_clif_changeoption) }, + { HP_POP(clif->changeoption2, HP_clif_changeoption2) }, + { HP_POP(clif->emotion, HP_clif_emotion) }, + { HP_POP(clif->talkiebox, HP_clif_talkiebox) }, + { HP_POP(clif->wedding_effect, HP_clif_wedding_effect) }, + { HP_POP(clif->divorced, HP_clif_divorced) }, + { HP_POP(clif->callpartner, HP_clif_callpartner) }, + { HP_POP(clif->skill_damage, HP_clif_skill_damage) }, + { HP_POP(clif->skill_nodamage, HP_clif_skill_nodamage) }, + { HP_POP(clif->skill_poseffect, HP_clif_skill_poseffect) }, + { HP_POP(clif->skill_estimation, HP_clif_skill_estimation) }, + { HP_POP(clif->skill_warppoint, HP_clif_skill_warppoint) }, + { HP_POP(clif->skillcasting, HP_clif_skillcasting) }, + { HP_POP(clif->produce_effect, HP_clif_produce_effect) }, + { HP_POP(clif->devotion, HP_clif_devotion) }, + { HP_POP(clif->spiritball, HP_clif_spiritball) }, + { HP_POP(clif->spiritball_single, HP_clif_spiritball_single) }, + { HP_POP(clif->bladestop, HP_clif_bladestop) }, + { HP_POP(clif->mvp_effect, HP_clif_mvp_effect) }, + { HP_POP(clif->heal, HP_clif_heal) }, + { HP_POP(clif->resurrection, HP_clif_resurrection) }, + { HP_POP(clif->refine, HP_clif_refine) }, + { HP_POP(clif->weather, HP_clif_weather) }, + { HP_POP(clif->specialeffect, HP_clif_specialeffect) }, + { HP_POP(clif->specialeffect_single, HP_clif_specialeffect_single) }, + { HP_POP(clif->specialeffect_value, HP_clif_specialeffect_value) }, + { HP_POP(clif->millenniumshield, HP_clif_millenniumshield) }, + { HP_POP(clif->charm, HP_clif_charm) }, + { HP_POP(clif->charm_single, HP_clif_charm_single) }, + { HP_POP(clif->snap, HP_clif_snap) }, + { HP_POP(clif->weather_check, HP_clif_weather_check) }, + { HP_POP(clif->playBGM, HP_clif_playBGM) }, + { HP_POP(clif->soundeffect, HP_clif_soundeffect) }, + { HP_POP(clif->soundeffectall, HP_clif_soundeffectall) }, + { HP_POP(clif->GlobalMessage, HP_clif_GlobalMessage) }, + { HP_POP(clif->createchat, HP_clif_createchat) }, + { HP_POP(clif->dispchat, HP_clif_dispchat) }, + { HP_POP(clif->joinchatfail, HP_clif_joinchatfail) }, + { HP_POP(clif->joinchatok, HP_clif_joinchatok) }, + { HP_POP(clif->addchat, HP_clif_addchat) }, + { HP_POP(clif->changechatowner, HP_clif_changechatowner) }, + { HP_POP(clif->clearchat, HP_clif_clearchat) }, + { HP_POP(clif->leavechat, HP_clif_leavechat) }, + { HP_POP(clif->changechatstatus, HP_clif_changechatstatus) }, + { HP_POP(clif->wis_message, HP_clif_wis_message) }, + { HP_POP(clif->wis_end, HP_clif_wis_end) }, + { HP_POP(clif->disp_message, HP_clif_disp_message) }, + { HP_POP(clif->broadcast, HP_clif_broadcast) }, + { HP_POP(clif->broadcast2, HP_clif_broadcast2) }, + { HP_POP(clif->messagecolor, HP_clif_messagecolor) }, + { HP_POP(clif->disp_overhead, HP_clif_disp_overhead) }, + { HP_POP(clif->msg, HP_clif_msg) }, + { HP_POP(clif->msg_value, HP_clif_msg_value) }, + { HP_POP(clif->msg_skill, HP_clif_msg_skill) }, + { HP_POP(clif->msgtable, HP_clif_msgtable) }, + { HP_POP(clif->msgtable_num, HP_clif_msgtable_num) }, + { HP_POP(clif->message, HP_clif_message) }, + { HP_POP(clif->messageln, HP_clif_messageln) }, + { HP_POP(clif->colormes, HP_clif_colormes) }, + { HP_POP(clif->process_message, HP_clif_process_message) }, + { HP_POP(clif->wisexin, HP_clif_wisexin) }, + { HP_POP(clif->wisall, HP_clif_wisall) }, + { HP_POP(clif->PMIgnoreList, HP_clif_PMIgnoreList) }, + { HP_POP(clif->ShowScript, HP_clif_ShowScript) }, + { HP_POP(clif->traderequest, HP_clif_traderequest) }, + { HP_POP(clif->tradestart, HP_clif_tradestart) }, + { HP_POP(clif->tradeadditem, HP_clif_tradeadditem) }, + { HP_POP(clif->tradeitemok, HP_clif_tradeitemok) }, + { HP_POP(clif->tradedeal_lock, HP_clif_tradedeal_lock) }, + { HP_POP(clif->tradecancelled, HP_clif_tradecancelled) }, + { HP_POP(clif->tradecompleted, HP_clif_tradecompleted) }, + { HP_POP(clif->tradeundo, HP_clif_tradeundo) }, + { HP_POP(clif->openvendingreq, HP_clif_openvendingreq) }, + { HP_POP(clif->showvendingboard, HP_clif_showvendingboard) }, + { HP_POP(clif->closevendingboard, HP_clif_closevendingboard) }, + { HP_POP(clif->vendinglist, HP_clif_vendinglist) }, + { HP_POP(clif->buyvending, HP_clif_buyvending) }, + { HP_POP(clif->openvending, HP_clif_openvending) }, + { HP_POP(clif->vendingreport, HP_clif_vendingreport) }, + { HP_POP(clif->storagelist, HP_clif_storagelist) }, + { HP_POP(clif->updatestorageamount, HP_clif_updatestorageamount) }, + { HP_POP(clif->storageitemadded, HP_clif_storageitemadded) }, + { HP_POP(clif->storageitemremoved, HP_clif_storageitemremoved) }, + { HP_POP(clif->storageclose, HP_clif_storageclose) }, + { HP_POP(clif->skillinfoblock, HP_clif_skillinfoblock) }, + { HP_POP(clif->skillup, HP_clif_skillup) }, + { HP_POP(clif->skillinfo, HP_clif_skillinfo) }, + { HP_POP(clif->addskill, HP_clif_addskill) }, + { HP_POP(clif->deleteskill, HP_clif_deleteskill) }, + { HP_POP(clif->party_created, HP_clif_party_created) }, + { HP_POP(clif->party_member_info, HP_clif_party_member_info) }, + { HP_POP(clif->party_info, HP_clif_party_info) }, + { HP_POP(clif->party_invite, HP_clif_party_invite) }, + { HP_POP(clif->party_inviteack, HP_clif_party_inviteack) }, + { HP_POP(clif->party_option, HP_clif_party_option) }, + { HP_POP(clif->party_withdraw, HP_clif_party_withdraw) }, + { HP_POP(clif->party_message, HP_clif_party_message) }, + { HP_POP(clif->party_xy, HP_clif_party_xy) }, + { HP_POP(clif->party_xy_single, HP_clif_party_xy_single) }, + { HP_POP(clif->party_hp, HP_clif_party_hp) }, + { HP_POP(clif->party_xy_remove, HP_clif_party_xy_remove) }, + { HP_POP(clif->party_show_picker, HP_clif_party_show_picker) }, + { HP_POP(clif->partyinvitationstate, HP_clif_partyinvitationstate) }, + { HP_POP(clif->guild_created, HP_clif_guild_created) }, + { HP_POP(clif->guild_belonginfo, HP_clif_guild_belonginfo) }, + { HP_POP(clif->guild_masterormember, HP_clif_guild_masterormember) }, + { HP_POP(clif->guild_basicinfo, HP_clif_guild_basicinfo) }, + { HP_POP(clif->guild_allianceinfo, HP_clif_guild_allianceinfo) }, + { HP_POP(clif->guild_memberlist, HP_clif_guild_memberlist) }, + { HP_POP(clif->guild_skillinfo, HP_clif_guild_skillinfo) }, + { HP_POP(clif->guild_send_onlineinfo, HP_clif_guild_send_onlineinfo) }, + { HP_POP(clif->guild_memberlogin_notice, HP_clif_guild_memberlogin_notice) }, + { HP_POP(clif->guild_invite, HP_clif_guild_invite) }, + { HP_POP(clif->guild_inviteack, HP_clif_guild_inviteack) }, + { HP_POP(clif->guild_leave, HP_clif_guild_leave) }, + { HP_POP(clif->guild_expulsion, HP_clif_guild_expulsion) }, + { HP_POP(clif->guild_positionchanged, HP_clif_guild_positionchanged) }, + { HP_POP(clif->guild_memberpositionchanged, HP_clif_guild_memberpositionchanged) }, + { HP_POP(clif->guild_emblem, HP_clif_guild_emblem) }, + { HP_POP(clif->guild_emblem_area, HP_clif_guild_emblem_area) }, + { HP_POP(clif->guild_notice, HP_clif_guild_notice) }, + { HP_POP(clif->guild_message, HP_clif_guild_message) }, + { HP_POP(clif->guild_reqalliance, HP_clif_guild_reqalliance) }, + { HP_POP(clif->guild_allianceack, HP_clif_guild_allianceack) }, + { HP_POP(clif->guild_delalliance, HP_clif_guild_delalliance) }, + { HP_POP(clif->guild_oppositionack, HP_clif_guild_oppositionack) }, + { HP_POP(clif->guild_broken, HP_clif_guild_broken) }, + { HP_POP(clif->guild_xy, HP_clif_guild_xy) }, + { HP_POP(clif->guild_xy_single, HP_clif_guild_xy_single) }, + { HP_POP(clif->guild_xy_remove, HP_clif_guild_xy_remove) }, + { HP_POP(clif->guild_positionnamelist, HP_clif_guild_positionnamelist) }, + { HP_POP(clif->guild_positioninfolist, HP_clif_guild_positioninfolist) }, + { HP_POP(clif->guild_expulsionlist, HP_clif_guild_expulsionlist) }, + { HP_POP(clif->validate_emblem, HP_clif_validate_emblem) }, + { HP_POP(clif->bg_hp, HP_clif_bg_hp) }, + { HP_POP(clif->bg_xy, HP_clif_bg_xy) }, + { HP_POP(clif->bg_xy_remove, HP_clif_bg_xy_remove) }, + { HP_POP(clif->bg_message, HP_clif_bg_message) }, + { HP_POP(clif->bg_updatescore, HP_clif_bg_updatescore) }, + { HP_POP(clif->bg_updatescore_single, HP_clif_bg_updatescore_single) }, + { HP_POP(clif->sendbgemblem_area, HP_clif_sendbgemblem_area) }, + { HP_POP(clif->sendbgemblem_single, HP_clif_sendbgemblem_single) }, + { HP_POP(clif->instance, HP_clif_instance) }, + { HP_POP(clif->instance_join, HP_clif_instance_join) }, + { HP_POP(clif->instance_leave, HP_clif_instance_leave) }, + { HP_POP(clif->catch_process, HP_clif_catch_process) }, + { HP_POP(clif->pet_roulette, HP_clif_pet_roulette) }, + { HP_POP(clif->sendegg, HP_clif_sendegg) }, + { HP_POP(clif->send_petstatus, HP_clif_send_petstatus) }, + { HP_POP(clif->send_petdata, HP_clif_send_petdata) }, + { HP_POP(clif->pet_emotion, HP_clif_pet_emotion) }, + { HP_POP(clif->pet_food, HP_clif_pet_food) }, + { HP_POP(clif->friendslist_toggle_sub, HP_clif_friendslist_toggle_sub) }, + { HP_POP(clif->friendslist_send, HP_clif_friendslist_send) }, + { HP_POP(clif->friendslist_reqack, HP_clif_friendslist_reqack) }, + { HP_POP(clif->friendslist_toggle, HP_clif_friendslist_toggle) }, + { HP_POP(clif->friendlist_req, HP_clif_friendlist_req) }, + { HP_POP(clif->GM_kickack, HP_clif_GM_kickack) }, + { HP_POP(clif->GM_kick, HP_clif_GM_kick) }, + { HP_POP(clif->manner_message, HP_clif_manner_message) }, + { HP_POP(clif->GM_silence, HP_clif_GM_silence) }, + { HP_POP(clif->account_name, HP_clif_account_name) }, + { HP_POP(clif->check, HP_clif_check) }, + { HP_POP(clif->hominfo, HP_clif_hominfo) }, + { HP_POP(clif->homskillinfoblock, HP_clif_homskillinfoblock) }, + { HP_POP(clif->homskillup, HP_clif_homskillup) }, + { HP_POP(clif->hom_food, HP_clif_hom_food) }, + { HP_POP(clif->send_homdata, HP_clif_send_homdata) }, + { HP_POP(clif->quest_send_list, HP_clif_quest_send_list) }, + { HP_POP(clif->quest_send_mission, HP_clif_quest_send_mission) }, + { HP_POP(clif->quest_add, HP_clif_quest_add) }, + { HP_POP(clif->quest_delete, HP_clif_quest_delete) }, + { HP_POP(clif->quest_update_status, HP_clif_quest_update_status) }, + { HP_POP(clif->quest_update_objective, HP_clif_quest_update_objective) }, + { HP_POP(clif->quest_show_event, HP_clif_quest_show_event) }, + { HP_POP(clif->mail_window, HP_clif_mail_window) }, + { HP_POP(clif->mail_read, HP_clif_mail_read) }, + { HP_POP(clif->mail_delete, HP_clif_mail_delete) }, + { HP_POP(clif->mail_return, HP_clif_mail_return) }, + { HP_POP(clif->mail_send, HP_clif_mail_send) }, + { HP_POP(clif->mail_new, HP_clif_mail_new) }, + { HP_POP(clif->mail_refreshinbox, HP_clif_mail_refreshinbox) }, + { HP_POP(clif->mail_getattachment, HP_clif_mail_getattachment) }, + { HP_POP(clif->mail_setattachment, HP_clif_mail_setattachment) }, + { HP_POP(clif->auction_openwindow, HP_clif_auction_openwindow) }, + { HP_POP(clif->auction_results, HP_clif_auction_results) }, + { HP_POP(clif->auction_message, HP_clif_auction_message) }, + { HP_POP(clif->auction_close, HP_clif_auction_close) }, + { HP_POP(clif->auction_setitem, HP_clif_auction_setitem) }, + { HP_POP(clif->mercenary_info, HP_clif_mercenary_info) }, + { HP_POP(clif->mercenary_skillblock, HP_clif_mercenary_skillblock) }, + { HP_POP(clif->mercenary_message, HP_clif_mercenary_message) }, + { HP_POP(clif->mercenary_updatestatus, HP_clif_mercenary_updatestatus) }, + { HP_POP(clif->rental_time, HP_clif_rental_time) }, + { HP_POP(clif->rental_expired, HP_clif_rental_expired) }, + { HP_POP(clif->PartyBookingRegisterAck, HP_clif_PartyBookingRegisterAck) }, + { HP_POP(clif->PartyBookingDeleteAck, HP_clif_PartyBookingDeleteAck) }, + { HP_POP(clif->PartyBookingSearchAck, HP_clif_PartyBookingSearchAck) }, + { HP_POP(clif->PartyBookingUpdateNotify, HP_clif_PartyBookingUpdateNotify) }, + { HP_POP(clif->PartyBookingDeleteNotify, HP_clif_PartyBookingDeleteNotify) }, + { HP_POP(clif->PartyBookingInsertNotify, HP_clif_PartyBookingInsertNotify) }, + { HP_POP(clif->PartyRecruitRegisterAck, HP_clif_PartyRecruitRegisterAck) }, + { HP_POP(clif->PartyRecruitDeleteAck, HP_clif_PartyRecruitDeleteAck) }, + { HP_POP(clif->PartyRecruitSearchAck, HP_clif_PartyRecruitSearchAck) }, + { HP_POP(clif->PartyRecruitUpdateNotify, HP_clif_PartyRecruitUpdateNotify) }, + { HP_POP(clif->PartyRecruitDeleteNotify, HP_clif_PartyRecruitDeleteNotify) }, + { HP_POP(clif->PartyRecruitInsertNotify, HP_clif_PartyRecruitInsertNotify) }, + { HP_POP(clif->PartyBookingVolunteerInfo, HP_clif_PartyBookingVolunteerInfo) }, + { HP_POP(clif->PartyBookingRefuseVolunteer, HP_clif_PartyBookingRefuseVolunteer) }, + { HP_POP(clif->PartyBookingCancelVolunteer, HP_clif_PartyBookingCancelVolunteer) }, + { HP_POP(clif->PartyBookingAddFilteringList, HP_clif_PartyBookingAddFilteringList) }, + { HP_POP(clif->PartyBookingSubFilteringList, HP_clif_PartyBookingSubFilteringList) }, + { HP_POP(clif->buyingstore_open, HP_clif_buyingstore_open) }, + { HP_POP(clif->buyingstore_open_failed, HP_clif_buyingstore_open_failed) }, + { HP_POP(clif->buyingstore_myitemlist, HP_clif_buyingstore_myitemlist) }, + { HP_POP(clif->buyingstore_entry, HP_clif_buyingstore_entry) }, + { HP_POP(clif->buyingstore_entry_single, HP_clif_buyingstore_entry_single) }, + { HP_POP(clif->buyingstore_disappear_entry, HP_clif_buyingstore_disappear_entry) }, + { HP_POP(clif->buyingstore_disappear_entry_single, HP_clif_buyingstore_disappear_entry_single) }, + { HP_POP(clif->buyingstore_itemlist, HP_clif_buyingstore_itemlist) }, + { HP_POP(clif->buyingstore_trade_failed_buyer, HP_clif_buyingstore_trade_failed_buyer) }, + { HP_POP(clif->buyingstore_update_item, HP_clif_buyingstore_update_item) }, + { HP_POP(clif->buyingstore_delete_item, HP_clif_buyingstore_delete_item) }, + { HP_POP(clif->buyingstore_trade_failed_seller, HP_clif_buyingstore_trade_failed_seller) }, + { HP_POP(clif->search_store_info_ack, HP_clif_search_store_info_ack) }, + { HP_POP(clif->search_store_info_failed, HP_clif_search_store_info_failed) }, + { HP_POP(clif->open_search_store_info, HP_clif_open_search_store_info) }, + { HP_POP(clif->search_store_info_click_ack, HP_clif_search_store_info_click_ack) }, + { HP_POP(clif->elemental_info, HP_clif_elemental_info) }, + { HP_POP(clif->elemental_updatestatus, HP_clif_elemental_updatestatus) }, + { HP_POP(clif->bgqueue_ack, HP_clif_bgqueue_ack) }, + { HP_POP(clif->bgqueue_notice_delete, HP_clif_bgqueue_notice_delete) }, + { HP_POP(clif->bgqueue_update_info, HP_clif_bgqueue_update_info) }, + { HP_POP(clif->bgqueue_joined, HP_clif_bgqueue_joined) }, + { HP_POP(clif->bgqueue_pcleft, HP_clif_bgqueue_pcleft) }, + { HP_POP(clif->bgqueue_battlebegins, HP_clif_bgqueue_battlebegins) }, + { HP_POP(clif->adopt_reply, HP_clif_adopt_reply) }, + { HP_POP(clif->adopt_request, HP_clif_adopt_request) }, + { HP_POP(clif->readbook, HP_clif_readbook) }, + { HP_POP(clif->notify_time, HP_clif_notify_time) }, + { HP_POP(clif->user_count, HP_clif_user_count) }, + { HP_POP(clif->noask_sub, HP_clif_noask_sub) }, + { HP_POP(clif->bc_ready, HP_clif_bc_ready) }, + { HP_POP(clif->undisguise_timer, HP_clif_undisguise_timer) }, + { HP_POP(clif->chsys_create, HP_clif_chsys_create) }, + { HP_POP(clif->chsys_msg, HP_clif_chsys_msg) }, + { HP_POP(clif->chsys_msg2, HP_clif_chsys_msg2) }, + { HP_POP(clif->chsys_send, HP_clif_chsys_send) }, + { HP_POP(clif->chsys_join, HP_clif_chsys_join) }, + { HP_POP(clif->chsys_left, HP_clif_chsys_left) }, + { HP_POP(clif->chsys_delete, HP_clif_chsys_delete) }, + { HP_POP(clif->chsys_mjoin, HP_clif_chsys_mjoin) }, + { HP_POP(clif->chsys_quit, HP_clif_chsys_quit) }, + { HP_POP(clif->chsys_quitg, HP_clif_chsys_quitg) }, + { HP_POP(clif->chsys_gjoin, HP_clif_chsys_gjoin) }, + { HP_POP(clif->chsys_gleave, HP_clif_chsys_gleave) }, + { HP_POP(clif->bank_deposit, HP_clif_bank_deposit) }, + { HP_POP(clif->bank_withdraw, HP_clif_bank_withdraw) }, + { HP_POP(clif->show_modifiers, HP_clif_show_modifiers) }, + { HP_POP(clif->notify_bounditem, HP_clif_notify_bounditem) }, + { HP_POP(clif->delay_damage, HP_clif_delay_damage) }, + { HP_POP(clif->delay_damage_sub, HP_clif_delay_damage_sub) }, + { HP_POP(clif->npc_market_open, HP_clif_npc_market_open) }, + { HP_POP(clif->npc_market_purchase_ack, HP_clif_npc_market_purchase_ack) }, + { HP_POP(clif->pWantToConnection, HP_clif_pWantToConnection) }, + { HP_POP(clif->pLoadEndAck, HP_clif_pLoadEndAck) }, + { HP_POP(clif->pTickSend, HP_clif_pTickSend) }, + { HP_POP(clif->pHotkey, HP_clif_pHotkey) }, + { HP_POP(clif->pProgressbar, HP_clif_pProgressbar) }, + { HP_POP(clif->pWalkToXY, HP_clif_pWalkToXY) }, + { HP_POP(clif->pQuitGame, HP_clif_pQuitGame) }, + { HP_POP(clif->pGetCharNameRequest, HP_clif_pGetCharNameRequest) }, + { HP_POP(clif->pGlobalMessage, HP_clif_pGlobalMessage) }, + { HP_POP(clif->pMapMove, HP_clif_pMapMove) }, + { HP_POP(clif->pChangeDir, HP_clif_pChangeDir) }, + { HP_POP(clif->pEmotion, HP_clif_pEmotion) }, + { HP_POP(clif->pHowManyConnections, HP_clif_pHowManyConnections) }, + { HP_POP(clif->pActionRequest, HP_clif_pActionRequest) }, + { HP_POP(clif->pActionRequest_sub, HP_clif_pActionRequest_sub) }, + { HP_POP(clif->pRestart, HP_clif_pRestart) }, + { HP_POP(clif->pWisMessage, HP_clif_pWisMessage) }, + { HP_POP(clif->pBroadcast, HP_clif_pBroadcast) }, + { HP_POP(clif->pTakeItem, HP_clif_pTakeItem) }, + { HP_POP(clif->pDropItem, HP_clif_pDropItem) }, + { HP_POP(clif->pUseItem, HP_clif_pUseItem) }, + { HP_POP(clif->pEquipItem, HP_clif_pEquipItem) }, + { HP_POP(clif->pUnequipItem, HP_clif_pUnequipItem) }, + { HP_POP(clif->pNpcClicked, HP_clif_pNpcClicked) }, + { HP_POP(clif->pNpcBuySellSelected, HP_clif_pNpcBuySellSelected) }, + { HP_POP(clif->pNpcBuyListSend, HP_clif_pNpcBuyListSend) }, + { HP_POP(clif->pNpcSellListSend, HP_clif_pNpcSellListSend) }, + { HP_POP(clif->pCreateChatRoom, HP_clif_pCreateChatRoom) }, + { HP_POP(clif->pChatAddMember, HP_clif_pChatAddMember) }, + { HP_POP(clif->pChatRoomStatusChange, HP_clif_pChatRoomStatusChange) }, + { HP_POP(clif->pChangeChatOwner, HP_clif_pChangeChatOwner) }, + { HP_POP(clif->pKickFromChat, HP_clif_pKickFromChat) }, + { HP_POP(clif->pChatLeave, HP_clif_pChatLeave) }, + { HP_POP(clif->pTradeRequest, HP_clif_pTradeRequest) }, + { HP_POP(clif->chann_config_read, HP_clif_chann_config_read) }, + { HP_POP(clif->pTradeAck, HP_clif_pTradeAck) }, + { HP_POP(clif->pTradeAddItem, HP_clif_pTradeAddItem) }, + { HP_POP(clif->pTradeOk, HP_clif_pTradeOk) }, + { HP_POP(clif->pTradeCancel, HP_clif_pTradeCancel) }, + { HP_POP(clif->pTradeCommit, HP_clif_pTradeCommit) }, + { HP_POP(clif->pStopAttack, HP_clif_pStopAttack) }, + { HP_POP(clif->pPutItemToCart, HP_clif_pPutItemToCart) }, + { HP_POP(clif->pGetItemFromCart, HP_clif_pGetItemFromCart) }, + { HP_POP(clif->pRemoveOption, HP_clif_pRemoveOption) }, + { HP_POP(clif->pChangeCart, HP_clif_pChangeCart) }, + { HP_POP(clif->pStatusUp, HP_clif_pStatusUp) }, + { HP_POP(clif->pSkillUp, HP_clif_pSkillUp) }, + { HP_POP(clif->pUseSkillToId, HP_clif_pUseSkillToId) }, + { HP_POP(clif->pUseSkillToId_homun, HP_clif_pUseSkillToId_homun) }, + { HP_POP(clif->pUseSkillToId_mercenary, HP_clif_pUseSkillToId_mercenary) }, + { HP_POP(clif->pUseSkillToPos, HP_clif_pUseSkillToPos) }, + { HP_POP(clif->pUseSkillToPosSub, HP_clif_pUseSkillToPosSub) }, + { HP_POP(clif->pUseSkillToPos_homun, HP_clif_pUseSkillToPos_homun) }, + { HP_POP(clif->pUseSkillToPos_mercenary, HP_clif_pUseSkillToPos_mercenary) }, + { HP_POP(clif->pUseSkillToPosMoreInfo, HP_clif_pUseSkillToPosMoreInfo) }, + { HP_POP(clif->pUseSkillMap, HP_clif_pUseSkillMap) }, + { HP_POP(clif->pRequestMemo, HP_clif_pRequestMemo) }, + { HP_POP(clif->pProduceMix, HP_clif_pProduceMix) }, + { HP_POP(clif->pCooking, HP_clif_pCooking) }, + { HP_POP(clif->pRepairItem, HP_clif_pRepairItem) }, + { HP_POP(clif->pWeaponRefine, HP_clif_pWeaponRefine) }, + { HP_POP(clif->pNpcSelectMenu, HP_clif_pNpcSelectMenu) }, + { HP_POP(clif->pNpcNextClicked, HP_clif_pNpcNextClicked) }, + { HP_POP(clif->pNpcAmountInput, HP_clif_pNpcAmountInput) }, + { HP_POP(clif->pNpcStringInput, HP_clif_pNpcStringInput) }, + { HP_POP(clif->pNpcCloseClicked, HP_clif_pNpcCloseClicked) }, + { HP_POP(clif->pItemIdentify, HP_clif_pItemIdentify) }, + { HP_POP(clif->pSelectArrow, HP_clif_pSelectArrow) }, + { HP_POP(clif->pAutoSpell, HP_clif_pAutoSpell) }, + { HP_POP(clif->pUseCard, HP_clif_pUseCard) }, + { HP_POP(clif->pInsertCard, HP_clif_pInsertCard) }, + { HP_POP(clif->pSolveCharName, HP_clif_pSolveCharName) }, + { HP_POP(clif->pResetChar, HP_clif_pResetChar) }, + { HP_POP(clif->pLocalBroadcast, HP_clif_pLocalBroadcast) }, + { HP_POP(clif->pMoveToKafra, HP_clif_pMoveToKafra) }, + { HP_POP(clif->pMoveFromKafra, HP_clif_pMoveFromKafra) }, + { HP_POP(clif->pMoveToKafraFromCart, HP_clif_pMoveToKafraFromCart) }, + { HP_POP(clif->pMoveFromKafraToCart, HP_clif_pMoveFromKafraToCart) }, + { HP_POP(clif->pCloseKafra, HP_clif_pCloseKafra) }, + { HP_POP(clif->pStoragePassword, HP_clif_pStoragePassword) }, + { HP_POP(clif->pCreateParty, HP_clif_pCreateParty) }, + { HP_POP(clif->pCreateParty2, HP_clif_pCreateParty2) }, + { HP_POP(clif->pPartyInvite, HP_clif_pPartyInvite) }, + { HP_POP(clif->pPartyInvite2, HP_clif_pPartyInvite2) }, + { HP_POP(clif->pReplyPartyInvite, HP_clif_pReplyPartyInvite) }, + { HP_POP(clif->pReplyPartyInvite2, HP_clif_pReplyPartyInvite2) }, + { HP_POP(clif->pLeaveParty, HP_clif_pLeaveParty) }, + { HP_POP(clif->pRemovePartyMember, HP_clif_pRemovePartyMember) }, + { HP_POP(clif->pPartyChangeOption, HP_clif_pPartyChangeOption) }, + { HP_POP(clif->pPartyMessage, HP_clif_pPartyMessage) }, + { HP_POP(clif->pPartyChangeLeader, HP_clif_pPartyChangeLeader) }, + { HP_POP(clif->pPartyBookingRegisterReq, HP_clif_pPartyBookingRegisterReq) }, + { HP_POP(clif->pPartyBookingSearchReq, HP_clif_pPartyBookingSearchReq) }, + { HP_POP(clif->pPartyBookingDeleteReq, HP_clif_pPartyBookingDeleteReq) }, + { HP_POP(clif->pPartyBookingUpdateReq, HP_clif_pPartyBookingUpdateReq) }, + { HP_POP(clif->pPartyRecruitRegisterReq, HP_clif_pPartyRecruitRegisterReq) }, + { HP_POP(clif->pPartyRecruitSearchReq, HP_clif_pPartyRecruitSearchReq) }, + { HP_POP(clif->pPartyRecruitDeleteReq, HP_clif_pPartyRecruitDeleteReq) }, + { HP_POP(clif->pPartyRecruitUpdateReq, HP_clif_pPartyRecruitUpdateReq) }, + { HP_POP(clif->pCloseVending, HP_clif_pCloseVending) }, + { HP_POP(clif->pVendingListReq, HP_clif_pVendingListReq) }, + { HP_POP(clif->pPurchaseReq, HP_clif_pPurchaseReq) }, + { HP_POP(clif->pPurchaseReq2, HP_clif_pPurchaseReq2) }, + { HP_POP(clif->pOpenVending, HP_clif_pOpenVending) }, + { HP_POP(clif->pCreateGuild, HP_clif_pCreateGuild) }, + { HP_POP(clif->pGuildCheckMaster, HP_clif_pGuildCheckMaster) }, + { HP_POP(clif->pGuildRequestInfo, HP_clif_pGuildRequestInfo) }, + { HP_POP(clif->pGuildChangePositionInfo, HP_clif_pGuildChangePositionInfo) }, + { HP_POP(clif->pGuildChangeMemberPosition, HP_clif_pGuildChangeMemberPosition) }, + { HP_POP(clif->pGuildRequestEmblem, HP_clif_pGuildRequestEmblem) }, + { HP_POP(clif->pGuildChangeEmblem, HP_clif_pGuildChangeEmblem) }, + { HP_POP(clif->pGuildChangeNotice, HP_clif_pGuildChangeNotice) }, + { HP_POP(clif->pGuildInvite, HP_clif_pGuildInvite) }, + { HP_POP(clif->pGuildReplyInvite, HP_clif_pGuildReplyInvite) }, + { HP_POP(clif->pGuildLeave, HP_clif_pGuildLeave) }, + { HP_POP(clif->pGuildExpulsion, HP_clif_pGuildExpulsion) }, + { HP_POP(clif->pGuildMessage, HP_clif_pGuildMessage) }, + { HP_POP(clif->pGuildRequestAlliance, HP_clif_pGuildRequestAlliance) }, + { HP_POP(clif->pGuildReplyAlliance, HP_clif_pGuildReplyAlliance) }, + { HP_POP(clif->pGuildDelAlliance, HP_clif_pGuildDelAlliance) }, + { HP_POP(clif->pGuildOpposition, HP_clif_pGuildOpposition) }, + { HP_POP(clif->pGuildBreak, HP_clif_pGuildBreak) }, + { HP_POP(clif->pPetMenu, HP_clif_pPetMenu) }, + { HP_POP(clif->pCatchPet, HP_clif_pCatchPet) }, + { HP_POP(clif->pSelectEgg, HP_clif_pSelectEgg) }, + { HP_POP(clif->pSendEmotion, HP_clif_pSendEmotion) }, + { HP_POP(clif->pChangePetName, HP_clif_pChangePetName) }, + { HP_POP(clif->pGMKick, HP_clif_pGMKick) }, + { HP_POP(clif->pGMKickAll, HP_clif_pGMKickAll) }, + { HP_POP(clif->pGMShift, HP_clif_pGMShift) }, + { HP_POP(clif->pGMRemove2, HP_clif_pGMRemove2) }, + { HP_POP(clif->pGMRecall, HP_clif_pGMRecall) }, + { HP_POP(clif->pGMRecall2, HP_clif_pGMRecall2) }, + { HP_POP(clif->pGM_Monster_Item, HP_clif_pGM_Monster_Item) }, + { HP_POP(clif->pGMHide, HP_clif_pGMHide) }, + { HP_POP(clif->pGMReqNoChat, HP_clif_pGMReqNoChat) }, + { HP_POP(clif->pGMRc, HP_clif_pGMRc) }, + { HP_POP(clif->pGMReqAccountName, HP_clif_pGMReqAccountName) }, + { HP_POP(clif->pGMChangeMapType, HP_clif_pGMChangeMapType) }, + { HP_POP(clif->pGMFullStrip, HP_clif_pGMFullStrip) }, + { HP_POP(clif->pPMIgnore, HP_clif_pPMIgnore) }, + { HP_POP(clif->pPMIgnoreAll, HP_clif_pPMIgnoreAll) }, + { HP_POP(clif->pPMIgnoreList, HP_clif_pPMIgnoreList) }, + { HP_POP(clif->pNoviceDoriDori, HP_clif_pNoviceDoriDori) }, + { HP_POP(clif->pNoviceExplosionSpirits, HP_clif_pNoviceExplosionSpirits) }, + { HP_POP(clif->pFriendsListAdd, HP_clif_pFriendsListAdd) }, + { HP_POP(clif->pFriendsListReply, HP_clif_pFriendsListReply) }, + { HP_POP(clif->pFriendsListRemove, HP_clif_pFriendsListRemove) }, + { HP_POP(clif->pPVPInfo, HP_clif_pPVPInfo) }, + { HP_POP(clif->pBlacksmith, HP_clif_pBlacksmith) }, + { HP_POP(clif->pAlchemist, HP_clif_pAlchemist) }, + { HP_POP(clif->pTaekwon, HP_clif_pTaekwon) }, + { HP_POP(clif->pRankingPk, HP_clif_pRankingPk) }, + { HP_POP(clif->pFeelSaveOk, HP_clif_pFeelSaveOk) }, + { HP_POP(clif->pChangeHomunculusName, HP_clif_pChangeHomunculusName) }, + { HP_POP(clif->pHomMoveToMaster, HP_clif_pHomMoveToMaster) }, + { HP_POP(clif->pHomMoveTo, HP_clif_pHomMoveTo) }, + { HP_POP(clif->pHomAttack, HP_clif_pHomAttack) }, + { HP_POP(clif->pHomMenu, HP_clif_pHomMenu) }, + { HP_POP(clif->pAutoRevive, HP_clif_pAutoRevive) }, + { HP_POP(clif->pCheck, HP_clif_pCheck) }, + { HP_POP(clif->pMail_refreshinbox, HP_clif_pMail_refreshinbox) }, + { HP_POP(clif->pMail_read, HP_clif_pMail_read) }, + { HP_POP(clif->pMail_getattach, HP_clif_pMail_getattach) }, + { HP_POP(clif->pMail_delete, HP_clif_pMail_delete) }, + { HP_POP(clif->pMail_return, HP_clif_pMail_return) }, + { HP_POP(clif->pMail_setattach, HP_clif_pMail_setattach) }, + { HP_POP(clif->pMail_winopen, HP_clif_pMail_winopen) }, + { HP_POP(clif->pMail_send, HP_clif_pMail_send) }, + { HP_POP(clif->pAuction_cancelreg, HP_clif_pAuction_cancelreg) }, + { HP_POP(clif->pAuction_setitem, HP_clif_pAuction_setitem) }, + { HP_POP(clif->pAuction_register, HP_clif_pAuction_register) }, + { HP_POP(clif->pAuction_cancel, HP_clif_pAuction_cancel) }, + { HP_POP(clif->pAuction_close, HP_clif_pAuction_close) }, + { HP_POP(clif->pAuction_bid, HP_clif_pAuction_bid) }, + { HP_POP(clif->pAuction_search, HP_clif_pAuction_search) }, + { HP_POP(clif->pAuction_buysell, HP_clif_pAuction_buysell) }, + { HP_POP(clif->pcashshop_buy, HP_clif_pcashshop_buy) }, + { HP_POP(clif->pAdopt_request, HP_clif_pAdopt_request) }, + { HP_POP(clif->pAdopt_reply, HP_clif_pAdopt_reply) }, + { HP_POP(clif->pViewPlayerEquip, HP_clif_pViewPlayerEquip) }, + { HP_POP(clif->pEquipTick, HP_clif_pEquipTick) }, + { HP_POP(clif->pquestStateAck, HP_clif_pquestStateAck) }, + { HP_POP(clif->pmercenary_action, HP_clif_pmercenary_action) }, + { HP_POP(clif->pBattleChat, HP_clif_pBattleChat) }, + { HP_POP(clif->pLessEffect, HP_clif_pLessEffect) }, + { HP_POP(clif->pItemListWindowSelected, HP_clif_pItemListWindowSelected) }, + { HP_POP(clif->pReqOpenBuyingStore, HP_clif_pReqOpenBuyingStore) }, + { HP_POP(clif->pReqCloseBuyingStore, HP_clif_pReqCloseBuyingStore) }, + { HP_POP(clif->pReqClickBuyingStore, HP_clif_pReqClickBuyingStore) }, + { HP_POP(clif->pReqTradeBuyingStore, HP_clif_pReqTradeBuyingStore) }, + { HP_POP(clif->pSearchStoreInfo, HP_clif_pSearchStoreInfo) }, + { HP_POP(clif->pSearchStoreInfoNextPage, HP_clif_pSearchStoreInfoNextPage) }, + { HP_POP(clif->pCloseSearchStoreInfo, HP_clif_pCloseSearchStoreInfo) }, + { HP_POP(clif->pSearchStoreInfoListItemClick, HP_clif_pSearchStoreInfoListItemClick) }, + { HP_POP(clif->pDebug, HP_clif_pDebug) }, + { HP_POP(clif->pSkillSelectMenu, HP_clif_pSkillSelectMenu) }, + { HP_POP(clif->pMoveItem, HP_clif_pMoveItem) }, + { HP_POP(clif->pDull, HP_clif_pDull) }, + { HP_POP(clif->pBGQueueRegister, HP_clif_pBGQueueRegister) }, + { HP_POP(clif->pBGQueueCheckState, HP_clif_pBGQueueCheckState) }, + { HP_POP(clif->pBGQueueRevokeReq, HP_clif_pBGQueueRevokeReq) }, + { HP_POP(clif->pBGQueueBattleBeginAck, HP_clif_pBGQueueBattleBeginAck) }, + { HP_POP(clif->pCashShopOpen, HP_clif_pCashShopOpen) }, + { HP_POP(clif->pCashShopClose, HP_clif_pCashShopClose) }, + { HP_POP(clif->pCashShopReqTab, HP_clif_pCashShopReqTab) }, + { HP_POP(clif->pCashShopSchedule, HP_clif_pCashShopSchedule) }, + { HP_POP(clif->pCashShopBuy, HP_clif_pCashShopBuy) }, + { HP_POP(clif->pPartyTick, HP_clif_pPartyTick) }, + { HP_POP(clif->pGuildInvite2, HP_clif_pGuildInvite2) }, + { HP_POP(clif->pPartyBookingAddFilter, HP_clif_pPartyBookingAddFilter) }, + { HP_POP(clif->pPartyBookingSubFilter, HP_clif_pPartyBookingSubFilter) }, + { HP_POP(clif->pPartyBookingReqVolunteer, HP_clif_pPartyBookingReqVolunteer) }, + { HP_POP(clif->pPartyBookingRefuseVolunteer, HP_clif_pPartyBookingRefuseVolunteer) }, + { HP_POP(clif->pPartyBookingCancelVolunteer, HP_clif_pPartyBookingCancelVolunteer) }, + { HP_POP(clif->pBankDeposit, HP_clif_pBankDeposit) }, + { HP_POP(clif->pBankWithdraw, HP_clif_pBankWithdraw) }, + { HP_POP(clif->pBankCheck, HP_clif_pBankCheck) }, + { HP_POP(clif->pBankOpen, HP_clif_pBankOpen) }, + { HP_POP(clif->pBankClose, HP_clif_pBankClose) }, + { HP_POP(clif->pNPCShopClosed, HP_clif_pNPCShopClosed) }, + { HP_POP(clif->pNPCMarketClosed, HP_clif_pNPCMarketClosed) }, + { HP_POP(clif->pNPCMarketPurchase, HP_clif_pNPCMarketPurchase) }, /* duel */ - { HP_POP(duel->create), HP_POP2(HP_duel_create), 1694 }, - { HP_POP(duel->invite), HP_POP2(HP_duel_invite), 1696 }, - { HP_POP(duel->accept), HP_POP2(HP_duel_accept), 1698 }, - { HP_POP(duel->reject), HP_POP2(HP_duel_reject), 1700 }, - { HP_POP(duel->leave), HP_POP2(HP_duel_leave), 1702 }, - { HP_POP(duel->showinfo), HP_POP2(HP_duel_showinfo), 1704 }, - { HP_POP(duel->checktime), HP_POP2(HP_duel_checktime), 1706 }, - { HP_POP(duel->init), HP_POP2(HP_duel_init), 1708 }, - { HP_POP(duel->final), HP_POP2(HP_duel_final), 1710 }, + { HP_POP(duel->create, HP_duel_create) }, + { HP_POP(duel->invite, HP_duel_invite) }, + { HP_POP(duel->accept, HP_duel_accept) }, + { HP_POP(duel->reject, HP_duel_reject) }, + { HP_POP(duel->leave, HP_duel_leave) }, + { HP_POP(duel->showinfo, HP_duel_showinfo) }, + { HP_POP(duel->checktime, HP_duel_checktime) }, + { HP_POP(duel->init, HP_duel_init) }, + { HP_POP(duel->final, HP_duel_final) }, /* elemental */ - { HP_POP(elemental->init), HP_POP2(HP_elemental_init), 1712 }, - { HP_POP(elemental->final), HP_POP2(HP_elemental_final), 1714 }, - { HP_POP(elemental->class), HP_POP2(HP_elemental_class), 1716 }, - { HP_POP(elemental->get_viewdata), HP_POP2(HP_elemental_get_viewdata), 1718 }, - { HP_POP(elemental->create), HP_POP2(HP_elemental_create), 1720 }, - { HP_POP(elemental->data_received), HP_POP2(HP_elemental_data_received), 1722 }, - { HP_POP(elemental->save), HP_POP2(HP_elemental_save), 1724 }, - { HP_POP(elemental->change_mode_ack), HP_POP2(HP_elemental_change_mode_ack), 1726 }, - { HP_POP(elemental->change_mode), HP_POP2(HP_elemental_change_mode), 1728 }, - { HP_POP(elemental->heal), HP_POP2(HP_elemental_heal), 1730 }, - { HP_POP(elemental->dead), HP_POP2(HP_elemental_dead), 1732 }, - { HP_POP(elemental->delete), HP_POP2(HP_elemental_delete), 1734 }, - { HP_POP(elemental->summon_stop), HP_POP2(HP_elemental_summon_stop), 1736 }, - { HP_POP(elemental->get_lifetime), HP_POP2(HP_elemental_get_lifetime), 1738 }, - { HP_POP(elemental->unlocktarget), HP_POP2(HP_elemental_unlocktarget), 1740 }, - { HP_POP(elemental->skillnotok), HP_POP2(HP_elemental_skillnotok), 1742 }, - { HP_POP(elemental->set_target), HP_POP2(HP_elemental_set_target), 1744 }, - { HP_POP(elemental->clean_single_effect), HP_POP2(HP_elemental_clean_single_effect), 1746 }, - { HP_POP(elemental->clean_effect), HP_POP2(HP_elemental_clean_effect), 1748 }, - { HP_POP(elemental->action), HP_POP2(HP_elemental_action), 1750 }, - { HP_POP(elemental->skill_get_requirements), HP_POP2(HP_elemental_skill_get_requirements), 1752 }, - { HP_POP(elemental->read_skilldb), HP_POP2(HP_elemental_read_skilldb), 1754 }, - { HP_POP(elemental->reload_db), HP_POP2(HP_elemental_reload_db), 1756 }, - { HP_POP(elemental->reload_skilldb), HP_POP2(HP_elemental_reload_skilldb), 1758 }, - { HP_POP(elemental->search_index), HP_POP2(HP_elemental_search_index), 1760 }, - { HP_POP(elemental->summon_init), HP_POP2(HP_elemental_summon_init), 1762 }, - { HP_POP(elemental->summon_end_timer), HP_POP2(HP_elemental_summon_end_timer), 1764 }, - { HP_POP(elemental->ai_sub_timer_activesearch), HP_POP2(HP_elemental_ai_sub_timer_activesearch), 1766 }, - { HP_POP(elemental->ai_sub_timer), HP_POP2(HP_elemental_ai_sub_timer), 1768 }, - { HP_POP(elemental->ai_sub_foreachclient), HP_POP2(HP_elemental_ai_sub_foreachclient), 1770 }, - { HP_POP(elemental->ai_timer), HP_POP2(HP_elemental_ai_timer), 1772 }, - { HP_POP(elemental->read_db), HP_POP2(HP_elemental_read_db), 1774 }, + { HP_POP(elemental->init, HP_elemental_init) }, + { HP_POP(elemental->final, HP_elemental_final) }, + { HP_POP(elemental->class, HP_elemental_class) }, + { HP_POP(elemental->get_viewdata, HP_elemental_get_viewdata) }, + { HP_POP(elemental->create, HP_elemental_create) }, + { HP_POP(elemental->data_received, HP_elemental_data_received) }, + { HP_POP(elemental->save, HP_elemental_save) }, + { HP_POP(elemental->change_mode_ack, HP_elemental_change_mode_ack) }, + { HP_POP(elemental->change_mode, HP_elemental_change_mode) }, + { HP_POP(elemental->heal, HP_elemental_heal) }, + { HP_POP(elemental->dead, HP_elemental_dead) }, + { HP_POP(elemental->delete, HP_elemental_delete) }, + { HP_POP(elemental->summon_stop, HP_elemental_summon_stop) }, + { HP_POP(elemental->get_lifetime, HP_elemental_get_lifetime) }, + { HP_POP(elemental->unlocktarget, HP_elemental_unlocktarget) }, + { HP_POP(elemental->skillnotok, HP_elemental_skillnotok) }, + { HP_POP(elemental->set_target, HP_elemental_set_target) }, + { HP_POP(elemental->clean_single_effect, HP_elemental_clean_single_effect) }, + { HP_POP(elemental->clean_effect, HP_elemental_clean_effect) }, + { HP_POP(elemental->action, HP_elemental_action) }, + { HP_POP(elemental->skill_get_requirements, HP_elemental_skill_get_requirements) }, + { HP_POP(elemental->read_skilldb, HP_elemental_read_skilldb) }, + { HP_POP(elemental->reload_db, HP_elemental_reload_db) }, + { HP_POP(elemental->reload_skilldb, HP_elemental_reload_skilldb) }, + { HP_POP(elemental->search_index, HP_elemental_search_index) }, + { HP_POP(elemental->summon_init, HP_elemental_summon_init) }, + { HP_POP(elemental->summon_end_timer, HP_elemental_summon_end_timer) }, + { HP_POP(elemental->ai_sub_timer_activesearch, HP_elemental_ai_sub_timer_activesearch) }, + { HP_POP(elemental->ai_sub_timer, HP_elemental_ai_sub_timer) }, + { HP_POP(elemental->ai_sub_foreachclient, HP_elemental_ai_sub_foreachclient) }, + { HP_POP(elemental->ai_timer, HP_elemental_ai_timer) }, + { HP_POP(elemental->read_db, HP_elemental_read_db) }, /* guild */ - { HP_POP(guild->init), HP_POP2(HP_guild_init), 1776 }, - { HP_POP(guild->final), HP_POP2(HP_guild_final), 1778 }, - { HP_POP(guild->skill_get_max), HP_POP2(HP_guild_skill_get_max), 1780 }, - { HP_POP(guild->checkskill), HP_POP2(HP_guild_checkskill), 1782 }, - { HP_POP(guild->check_skill_require), HP_POP2(HP_guild_check_skill_require), 1784 }, - { HP_POP(guild->checkcastles), HP_POP2(HP_guild_checkcastles), 1786 }, - { HP_POP(guild->isallied), HP_POP2(HP_guild_isallied), 1788 }, - { HP_POP(guild->search), HP_POP2(HP_guild_search), 1790 }, - { HP_POP(guild->searchname), HP_POP2(HP_guild_searchname), 1792 }, - { HP_POP(guild->castle_search), HP_POP2(HP_guild_castle_search), 1794 }, - { HP_POP(guild->mapname2gc), HP_POP2(HP_guild_mapname2gc), 1796 }, - { HP_POP(guild->mapindex2gc), HP_POP2(HP_guild_mapindex2gc), 1798 }, - { HP_POP(guild->getavailablesd), HP_POP2(HP_guild_getavailablesd), 1800 }, - { HP_POP(guild->getindex), HP_POP2(HP_guild_getindex), 1802 }, - { HP_POP(guild->getposition), HP_POP2(HP_guild_getposition), 1804 }, - { HP_POP(guild->payexp), HP_POP2(HP_guild_payexp), 1806 }, - { HP_POP(guild->getexp), HP_POP2(HP_guild_getexp), 1808 }, - { HP_POP(guild->create), HP_POP2(HP_guild_create), 1810 }, - { HP_POP(guild->created), HP_POP2(HP_guild_created), 1812 }, - { HP_POP(guild->request_info), HP_POP2(HP_guild_request_info), 1814 }, - { HP_POP(guild->recv_noinfo), HP_POP2(HP_guild_recv_noinfo), 1816 }, - { HP_POP(guild->recv_info), HP_POP2(HP_guild_recv_info), 1818 }, - { HP_POP(guild->npc_request_info), HP_POP2(HP_guild_npc_request_info), 1820 }, - { HP_POP(guild->invite), HP_POP2(HP_guild_invite), 1822 }, - { HP_POP(guild->reply_invite), HP_POP2(HP_guild_reply_invite), 1824 }, - { HP_POP(guild->member_joined), HP_POP2(HP_guild_member_joined), 1826 }, - { HP_POP(guild->member_added), HP_POP2(HP_guild_member_added), 1828 }, - { HP_POP(guild->leave), HP_POP2(HP_guild_leave), 1830 }, - { HP_POP(guild->member_withdraw), HP_POP2(HP_guild_member_withdraw), 1832 }, - { HP_POP(guild->expulsion), HP_POP2(HP_guild_expulsion), 1834 }, - { HP_POP(guild->skillup), HP_POP2(HP_guild_skillup), 1836 }, - { HP_POP(guild->block_skill), HP_POP2(HP_guild_block_skill), 1838 }, - { HP_POP(guild->reqalliance), HP_POP2(HP_guild_reqalliance), 1840 }, - { HP_POP(guild->reply_reqalliance), HP_POP2(HP_guild_reply_reqalliance), 1842 }, - { HP_POP(guild->allianceack), HP_POP2(HP_guild_allianceack), 1844 }, - { HP_POP(guild->delalliance), HP_POP2(HP_guild_delalliance), 1846 }, - { HP_POP(guild->opposition), HP_POP2(HP_guild_opposition), 1848 }, - { HP_POP(guild->check_alliance), HP_POP2(HP_guild_check_alliance), 1850 }, - { HP_POP(guild->send_memberinfoshort), HP_POP2(HP_guild_send_memberinfoshort), 1852 }, - { HP_POP(guild->recv_memberinfoshort), HP_POP2(HP_guild_recv_memberinfoshort), 1854 }, - { HP_POP(guild->change_memberposition), HP_POP2(HP_guild_change_memberposition), 1856 }, - { HP_POP(guild->memberposition_changed), HP_POP2(HP_guild_memberposition_changed), 1858 }, - { HP_POP(guild->change_position), HP_POP2(HP_guild_change_position), 1860 }, - { HP_POP(guild->position_changed), HP_POP2(HP_guild_position_changed), 1862 }, - { HP_POP(guild->change_notice), HP_POP2(HP_guild_change_notice), 1864 }, - { HP_POP(guild->notice_changed), HP_POP2(HP_guild_notice_changed), 1866 }, - { HP_POP(guild->change_emblem), HP_POP2(HP_guild_change_emblem), 1868 }, - { HP_POP(guild->emblem_changed), HP_POP2(HP_guild_emblem_changed), 1870 }, - { HP_POP(guild->send_message), HP_POP2(HP_guild_send_message), 1872 }, - { HP_POP(guild->recv_message), HP_POP2(HP_guild_recv_message), 1874 }, - { HP_POP(guild->send_dot_remove), HP_POP2(HP_guild_send_dot_remove), 1876 }, - { HP_POP(guild->skillupack), HP_POP2(HP_guild_skillupack), 1878 }, - { HP_POP(guild->dobreak), HP_POP2(HP_guild_dobreak), 1880 }, - { HP_POP(guild->broken), HP_POP2(HP_guild_broken), 1882 }, - { HP_POP(guild->gm_change), HP_POP2(HP_guild_gm_change), 1884 }, - { HP_POP(guild->gm_changed), HP_POP2(HP_guild_gm_changed), 1886 }, - { HP_POP(guild->castle_map_init), HP_POP2(HP_guild_castle_map_init), 1888 }, - { HP_POP(guild->castledatasave), HP_POP2(HP_guild_castledatasave), 1890 }, - { HP_POP(guild->castledataloadack), HP_POP2(HP_guild_castledataloadack), 1892 }, - { HP_POP(guild->castle_reconnect), HP_POP2(HP_guild_castle_reconnect), 1894 }, - { HP_POP(guild->agit_start), HP_POP2(HP_guild_agit_start), 1896 }, - { HP_POP(guild->agit_end), HP_POP2(HP_guild_agit_end), 1898 }, - { HP_POP(guild->agit2_start), HP_POP2(HP_guild_agit2_start), 1900 }, - { HP_POP(guild->agit2_end), HP_POP2(HP_guild_agit2_end), 1902 }, - { HP_POP(guild->flag_add), HP_POP2(HP_guild_flag_add), 1904 }, - { HP_POP(guild->flag_remove), HP_POP2(HP_guild_flag_remove), 1906 }, - { HP_POP(guild->flags_clear), HP_POP2(HP_guild_flags_clear), 1908 }, - { HP_POP(guild->aura_refresh), HP_POP2(HP_guild_aura_refresh), 1910 }, - { HP_POP(guild->payexp_timer), HP_POP2(HP_guild_payexp_timer), 1912 }, - { HP_POP(guild->sd_check), HP_POP2(HP_guild_sd_check), 1914 }, - { HP_POP(guild->read_guildskill_tree_db), HP_POP2(HP_guild_read_guildskill_tree_db), 1916 }, - { HP_POP(guild->read_castledb), HP_POP2(HP_guild_read_castledb), 1918 }, - { HP_POP(guild->payexp_timer_sub), HP_POP2(HP_guild_payexp_timer_sub), 1920 }, - { HP_POP(guild->send_xy_timer_sub), HP_POP2(HP_guild_send_xy_timer_sub), 1922 }, - { HP_POP(guild->send_xy_timer), HP_POP2(HP_guild_send_xy_timer), 1924 }, - { HP_POP(guild->create_expcache), HP_POP2(HP_guild_create_expcache), 1926 }, - { HP_POP(guild->eventlist_db_final), HP_POP2(HP_guild_eventlist_db_final), 1928 }, - { HP_POP(guild->expcache_db_final), HP_POP2(HP_guild_expcache_db_final), 1930 }, - { HP_POP(guild->castle_db_final), HP_POP2(HP_guild_castle_db_final), 1932 }, - { HP_POP(guild->broken_sub), HP_POP2(HP_guild_broken_sub), 1934 }, - { HP_POP(guild->castle_broken_sub), HP_POP2(HP_guild_castle_broken_sub), 1936 }, - { HP_POP(guild->makemember), HP_POP2(HP_guild_makemember), 1938 }, - { HP_POP(guild->check_member), HP_POP2(HP_guild_check_member), 1940 }, - { HP_POP(guild->get_alliance_count), HP_POP2(HP_guild_get_alliance_count), 1942 }, - { HP_POP(guild->castle_reconnect_sub), HP_POP2(HP_guild_castle_reconnect_sub), 1944 }, + { HP_POP(guild->init, HP_guild_init) }, + { HP_POP(guild->final, HP_guild_final) }, + { HP_POP(guild->skill_get_max, HP_guild_skill_get_max) }, + { HP_POP(guild->checkskill, HP_guild_checkskill) }, + { HP_POP(guild->check_skill_require, HP_guild_check_skill_require) }, + { HP_POP(guild->checkcastles, HP_guild_checkcastles) }, + { HP_POP(guild->isallied, HP_guild_isallied) }, + { HP_POP(guild->search, HP_guild_search) }, + { HP_POP(guild->searchname, HP_guild_searchname) }, + { HP_POP(guild->castle_search, HP_guild_castle_search) }, + { HP_POP(guild->mapname2gc, HP_guild_mapname2gc) }, + { HP_POP(guild->mapindex2gc, HP_guild_mapindex2gc) }, + { HP_POP(guild->getavailablesd, HP_guild_getavailablesd) }, + { HP_POP(guild->getindex, HP_guild_getindex) }, + { HP_POP(guild->getposition, HP_guild_getposition) }, + { HP_POP(guild->payexp, HP_guild_payexp) }, + { HP_POP(guild->getexp, HP_guild_getexp) }, + { HP_POP(guild->create, HP_guild_create) }, + { HP_POP(guild->created, HP_guild_created) }, + { HP_POP(guild->request_info, HP_guild_request_info) }, + { HP_POP(guild->recv_noinfo, HP_guild_recv_noinfo) }, + { HP_POP(guild->recv_info, HP_guild_recv_info) }, + { HP_POP(guild->npc_request_info, HP_guild_npc_request_info) }, + { HP_POP(guild->invite, HP_guild_invite) }, + { HP_POP(guild->reply_invite, HP_guild_reply_invite) }, + { HP_POP(guild->member_joined, HP_guild_member_joined) }, + { HP_POP(guild->member_added, HP_guild_member_added) }, + { HP_POP(guild->leave, HP_guild_leave) }, + { HP_POP(guild->member_withdraw, HP_guild_member_withdraw) }, + { HP_POP(guild->expulsion, HP_guild_expulsion) }, + { HP_POP(guild->skillup, HP_guild_skillup) }, + { HP_POP(guild->block_skill, HP_guild_block_skill) }, + { HP_POP(guild->reqalliance, HP_guild_reqalliance) }, + { HP_POP(guild->reply_reqalliance, HP_guild_reply_reqalliance) }, + { HP_POP(guild->allianceack, HP_guild_allianceack) }, + { HP_POP(guild->delalliance, HP_guild_delalliance) }, + { HP_POP(guild->opposition, HP_guild_opposition) }, + { HP_POP(guild->check_alliance, HP_guild_check_alliance) }, + { HP_POP(guild->send_memberinfoshort, HP_guild_send_memberinfoshort) }, + { HP_POP(guild->recv_memberinfoshort, HP_guild_recv_memberinfoshort) }, + { HP_POP(guild->change_memberposition, HP_guild_change_memberposition) }, + { HP_POP(guild->memberposition_changed, HP_guild_memberposition_changed) }, + { HP_POP(guild->change_position, HP_guild_change_position) }, + { HP_POP(guild->position_changed, HP_guild_position_changed) }, + { HP_POP(guild->change_notice, HP_guild_change_notice) }, + { HP_POP(guild->notice_changed, HP_guild_notice_changed) }, + { HP_POP(guild->change_emblem, HP_guild_change_emblem) }, + { HP_POP(guild->emblem_changed, HP_guild_emblem_changed) }, + { HP_POP(guild->send_message, HP_guild_send_message) }, + { HP_POP(guild->recv_message, HP_guild_recv_message) }, + { HP_POP(guild->send_dot_remove, HP_guild_send_dot_remove) }, + { HP_POP(guild->skillupack, HP_guild_skillupack) }, + { HP_POP(guild->dobreak, HP_guild_dobreak) }, + { HP_POP(guild->broken, HP_guild_broken) }, + { HP_POP(guild->gm_change, HP_guild_gm_change) }, + { HP_POP(guild->gm_changed, HP_guild_gm_changed) }, + { HP_POP(guild->castle_map_init, HP_guild_castle_map_init) }, + { HP_POP(guild->castledatasave, HP_guild_castledatasave) }, + { HP_POP(guild->castledataloadack, HP_guild_castledataloadack) }, + { HP_POP(guild->castle_reconnect, HP_guild_castle_reconnect) }, + { HP_POP(guild->agit_start, HP_guild_agit_start) }, + { HP_POP(guild->agit_end, HP_guild_agit_end) }, + { HP_POP(guild->agit2_start, HP_guild_agit2_start) }, + { HP_POP(guild->agit2_end, HP_guild_agit2_end) }, + { HP_POP(guild->flag_add, HP_guild_flag_add) }, + { HP_POP(guild->flag_remove, HP_guild_flag_remove) }, + { HP_POP(guild->flags_clear, HP_guild_flags_clear) }, + { HP_POP(guild->aura_refresh, HP_guild_aura_refresh) }, + { HP_POP(guild->retrieveitembound, HP_guild_retrieveitembound) }, + { HP_POP(guild->payexp_timer, HP_guild_payexp_timer) }, + { HP_POP(guild->sd_check, HP_guild_sd_check) }, + { HP_POP(guild->read_guildskill_tree_db, HP_guild_read_guildskill_tree_db) }, + { HP_POP(guild->read_castledb, HP_guild_read_castledb) }, + { HP_POP(guild->payexp_timer_sub, HP_guild_payexp_timer_sub) }, + { HP_POP(guild->send_xy_timer_sub, HP_guild_send_xy_timer_sub) }, + { HP_POP(guild->send_xy_timer, HP_guild_send_xy_timer) }, + { HP_POP(guild->create_expcache, HP_guild_create_expcache) }, + { HP_POP(guild->eventlist_db_final, HP_guild_eventlist_db_final) }, + { HP_POP(guild->expcache_db_final, HP_guild_expcache_db_final) }, + { HP_POP(guild->castle_db_final, HP_guild_castle_db_final) }, + { HP_POP(guild->broken_sub, HP_guild_broken_sub) }, + { HP_POP(guild->castle_broken_sub, HP_guild_castle_broken_sub) }, + { HP_POP(guild->makemember, HP_guild_makemember) }, + { HP_POP(guild->check_member, HP_guild_check_member) }, + { HP_POP(guild->get_alliance_count, HP_guild_get_alliance_count) }, + { HP_POP(guild->castle_reconnect_sub, HP_guild_castle_reconnect_sub) }, /* gstorage */ - { HP_POP(gstorage->id2storage), HP_POP2(HP_gstorage_id2storage), 1946 }, - { HP_POP(gstorage->id2storage2), HP_POP2(HP_gstorage_id2storage2), 1948 }, - { HP_POP(gstorage->init), HP_POP2(HP_gstorage_init), 1950 }, - { HP_POP(gstorage->final), HP_POP2(HP_gstorage_final), 1952 }, - { HP_POP(gstorage->delete), HP_POP2(HP_gstorage_delete), 1954 }, - { HP_POP(gstorage->open), HP_POP2(HP_gstorage_open), 1956 }, - { HP_POP(gstorage->additem), HP_POP2(HP_gstorage_additem), 1958 }, - { HP_POP(gstorage->delitem), HP_POP2(HP_gstorage_delitem), 1960 }, - { HP_POP(gstorage->add), HP_POP2(HP_gstorage_add), 1962 }, - { HP_POP(gstorage->get), HP_POP2(HP_gstorage_get), 1964 }, - { HP_POP(gstorage->addfromcart), HP_POP2(HP_gstorage_addfromcart), 1966 }, - { HP_POP(gstorage->gettocart), HP_POP2(HP_gstorage_gettocart), 1968 }, - { HP_POP(gstorage->close), HP_POP2(HP_gstorage_close), 1970 }, - { HP_POP(gstorage->pc_quit), HP_POP2(HP_gstorage_pc_quit), 1972 }, - { HP_POP(gstorage->save), HP_POP2(HP_gstorage_save), 1974 }, - { HP_POP(gstorage->saved), HP_POP2(HP_gstorage_saved), 1976 }, - { HP_POP(gstorage->create), HP_POP2(HP_gstorage_create), 1978 }, + { HP_POP(gstorage->id2storage, HP_gstorage_id2storage) }, + { HP_POP(gstorage->id2storage2, HP_gstorage_id2storage2) }, + { HP_POP(gstorage->init, HP_gstorage_init) }, + { HP_POP(gstorage->final, HP_gstorage_final) }, + { HP_POP(gstorage->delete, HP_gstorage_delete) }, + { HP_POP(gstorage->open, HP_gstorage_open) }, + { HP_POP(gstorage->additem, HP_gstorage_additem) }, + { HP_POP(gstorage->delitem, HP_gstorage_delitem) }, + { HP_POP(gstorage->add, HP_gstorage_add) }, + { HP_POP(gstorage->get, HP_gstorage_get) }, + { HP_POP(gstorage->addfromcart, HP_gstorage_addfromcart) }, + { HP_POP(gstorage->gettocart, HP_gstorage_gettocart) }, + { HP_POP(gstorage->close, HP_gstorage_close) }, + { HP_POP(gstorage->pc_quit, HP_gstorage_pc_quit) }, + { HP_POP(gstorage->save, HP_gstorage_save) }, + { HP_POP(gstorage->saved, HP_gstorage_saved) }, + { HP_POP(gstorage->create, HP_gstorage_create) }, /* homun */ - { HP_POP(homun->init), HP_POP2(HP_homun_init), 1980 }, - { HP_POP(homun->final), HP_POP2(HP_homun_final), 1982 }, - { HP_POP(homun->reload), HP_POP2(HP_homun_reload), 1984 }, - { HP_POP(homun->reload_skill), HP_POP2(HP_homun_reload_skill), 1986 }, - { HP_POP(homun->get_viewdata), HP_POP2(HP_homun_get_viewdata), 1988 }, - { HP_POP(homun->class2type), HP_POP2(HP_homun_class2type), 1990 }, - { HP_POP(homun->damaged), HP_POP2(HP_homun_damaged), 1992 }, - { HP_POP(homun->dead), HP_POP2(HP_homun_dead), 1994 }, - { HP_POP(homun->vaporize), HP_POP2(HP_homun_vaporize), 1996 }, - { HP_POP(homun->delete), HP_POP2(HP_homun_delete), 1998 }, - { HP_POP(homun->checkskill), HP_POP2(HP_homun_checkskill), 2000 }, - { HP_POP(homun->calc_skilltree), HP_POP2(HP_homun_calc_skilltree), 2002 }, - { HP_POP(homun->skill_tree_get_max), HP_POP2(HP_homun_skill_tree_get_max), 2004 }, - { HP_POP(homun->skillup), HP_POP2(HP_homun_skillup), 2006 }, - { HP_POP(homun->levelup), HP_POP2(HP_homun_levelup), 2008 }, - { HP_POP(homun->change_class), HP_POP2(HP_homun_change_class), 2010 }, - { HP_POP(homun->evolve), HP_POP2(HP_homun_evolve), 2012 }, - { HP_POP(homun->mutate), HP_POP2(HP_homun_mutate), 2014 }, - { HP_POP(homun->gainexp), HP_POP2(HP_homun_gainexp), 2016 }, - { HP_POP(homun->add_intimacy), HP_POP2(HP_homun_add_intimacy), 2018 }, - { HP_POP(homun->consume_intimacy), HP_POP2(HP_homun_consume_intimacy), 2020 }, - { HP_POP(homun->healed), HP_POP2(HP_homun_healed), 2022 }, - { HP_POP(homun->save), HP_POP2(HP_homun_save), 2024 }, - { HP_POP(homun->menu), HP_POP2(HP_homun_menu), 2026 }, - { HP_POP(homun->feed), HP_POP2(HP_homun_feed), 2028 }, - { HP_POP(homun->hunger_timer), HP_POP2(HP_homun_hunger_timer), 2030 }, - { HP_POP(homun->hunger_timer_delete), HP_POP2(HP_homun_hunger_timer_delete), 2032 }, - { HP_POP(homun->change_name), HP_POP2(HP_homun_change_name), 2034 }, - { HP_POP(homun->change_name_ack), HP_POP2(HP_homun_change_name_ack), 2036 }, - { HP_POP(homun->db_search), HP_POP2(HP_homun_db_search), 2038 }, - { HP_POP(homun->create), HP_POP2(HP_homun_create), 2040 }, - { HP_POP(homun->init_timers), HP_POP2(HP_homun_init_timers), 2042 }, - { HP_POP(homun->call), HP_POP2(HP_homun_call), 2044 }, - { HP_POP(homun->recv_data), HP_POP2(HP_homun_recv_data), 2046 }, - { HP_POP(homun->creation_request), HP_POP2(HP_homun_creation_request), 2048 }, - { HP_POP(homun->ressurect), HP_POP2(HP_homun_ressurect), 2050 }, - { HP_POP(homun->revive), HP_POP2(HP_homun_revive), 2052 }, - { HP_POP(homun->stat_reset), HP_POP2(HP_homun_stat_reset), 2054 }, - { HP_POP(homun->shuffle), HP_POP2(HP_homun_shuffle), 2056 }, - { HP_POP(homun->read_db_sub), HP_POP2(HP_homun_read_db_sub), 2058 }, - { HP_POP(homun->read_db), HP_POP2(HP_homun_read_db), 2060 }, - { HP_POP(homun->read_skill_db_sub), HP_POP2(HP_homun_read_skill_db_sub), 2062 }, - { HP_POP(homun->skill_db_read), HP_POP2(HP_homun_skill_db_read), 2064 }, - { HP_POP(homun->exp_db_read), HP_POP2(HP_homun_exp_db_read), 2066 }, - { HP_POP(homun->addspiritball), HP_POP2(HP_homun_addspiritball), 2068 }, - { HP_POP(homun->delspiritball), HP_POP2(HP_homun_delspiritball), 2070 }, + { HP_POP(homun->init, HP_homun_init) }, + { HP_POP(homun->final, HP_homun_final) }, + { HP_POP(homun->reload, HP_homun_reload) }, + { HP_POP(homun->reload_skill, HP_homun_reload_skill) }, + { HP_POP(homun->get_viewdata, HP_homun_get_viewdata) }, + { HP_POP(homun->class2type, HP_homun_class2type) }, + { HP_POP(homun->damaged, HP_homun_damaged) }, + { HP_POP(homun->dead, HP_homun_dead) }, + { HP_POP(homun->vaporize, HP_homun_vaporize) }, + { HP_POP(homun->delete, HP_homun_delete) }, + { HP_POP(homun->checkskill, HP_homun_checkskill) }, + { HP_POP(homun->calc_skilltree, HP_homun_calc_skilltree) }, + { HP_POP(homun->skill_tree_get_max, HP_homun_skill_tree_get_max) }, + { HP_POP(homun->skillup, HP_homun_skillup) }, + { HP_POP(homun->levelup, HP_homun_levelup) }, + { HP_POP(homun->change_class, HP_homun_change_class) }, + { HP_POP(homun->evolve, HP_homun_evolve) }, + { HP_POP(homun->mutate, HP_homun_mutate) }, + { HP_POP(homun->gainexp, HP_homun_gainexp) }, + { HP_POP(homun->add_intimacy, HP_homun_add_intimacy) }, + { HP_POP(homun->consume_intimacy, HP_homun_consume_intimacy) }, + { HP_POP(homun->healed, HP_homun_healed) }, + { HP_POP(homun->save, HP_homun_save) }, + { HP_POP(homun->menu, HP_homun_menu) }, + { HP_POP(homun->feed, HP_homun_feed) }, + { HP_POP(homun->hunger_timer, HP_homun_hunger_timer) }, + { HP_POP(homun->hunger_timer_delete, HP_homun_hunger_timer_delete) }, + { HP_POP(homun->change_name, HP_homun_change_name) }, + { HP_POP(homun->change_name_ack, HP_homun_change_name_ack) }, + { HP_POP(homun->db_search, HP_homun_db_search) }, + { HP_POP(homun->create, HP_homun_create) }, + { HP_POP(homun->init_timers, HP_homun_init_timers) }, + { HP_POP(homun->call, HP_homun_call) }, + { HP_POP(homun->recv_data, HP_homun_recv_data) }, + { HP_POP(homun->creation_request, HP_homun_creation_request) }, + { HP_POP(homun->ressurect, HP_homun_ressurect) }, + { HP_POP(homun->revive, HP_homun_revive) }, + { HP_POP(homun->stat_reset, HP_homun_stat_reset) }, + { HP_POP(homun->shuffle, HP_homun_shuffle) }, + { HP_POP(homun->read_db_sub, HP_homun_read_db_sub) }, + { HP_POP(homun->read_db, HP_homun_read_db) }, + { HP_POP(homun->read_skill_db_sub, HP_homun_read_skill_db_sub) }, + { HP_POP(homun->skill_db_read, HP_homun_skill_db_read) }, + { HP_POP(homun->exp_db_read, HP_homun_exp_db_read) }, + { HP_POP(homun->addspiritball, HP_homun_addspiritball) }, + { HP_POP(homun->delspiritball, HP_homun_delspiritball) }, /* instance */ - { HP_POP(instance->init), HP_POP2(HP_instance_init), 2072 }, - { HP_POP(instance->final), HP_POP2(HP_instance_final), 2074 }, - { HP_POP(instance->create), HP_POP2(HP_instance_create), 2076 }, - { HP_POP(instance->add_map), HP_POP2(HP_instance_add_map), 2078 }, - { HP_POP(instance->del_map), HP_POP2(HP_instance_del_map), 2080 }, - { HP_POP(instance->map2imap), HP_POP2(HP_instance_map2imap), 2082 }, - { HP_POP(instance->mapid2imapid), HP_POP2(HP_instance_mapid2imapid), 2084 }, - { HP_POP(instance->destroy), HP_POP2(HP_instance_destroy), 2086 }, - { HP_POP(instance->start), HP_POP2(HP_instance_start), 2088 }, - { HP_POP(instance->check_idle), HP_POP2(HP_instance_check_idle), 2090 }, - { HP_POP(instance->check_kick), HP_POP2(HP_instance_check_kick), 2092 }, - { HP_POP(instance->set_timeout), HP_POP2(HP_instance_set_timeout), 2094 }, - { HP_POP(instance->valid), HP_POP2(HP_instance_valid), 2096 }, - { HP_POP(instance->destroy_timer), HP_POP2(HP_instance_destroy_timer), 2098 }, + { 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) }, + { HP_POP(instance->check_kick, HP_instance_check_kick) }, + { HP_POP(instance->set_timeout, HP_instance_set_timeout) }, + { HP_POP(instance->valid, HP_instance_valid) }, + { HP_POP(instance->destroy_timer, HP_instance_destroy_timer) }, /* intif */ - { HP_POP(intif->parse), HP_POP2(HP_intif_parse), 2100 }, - { HP_POP(intif->create_pet), HP_POP2(HP_intif_create_pet), 2102 }, - { HP_POP(intif->broadcast), HP_POP2(HP_intif_broadcast), 2104 }, - { HP_POP(intif->broadcast2), HP_POP2(HP_intif_broadcast2), 2106 }, - { HP_POP(intif->main_message), HP_POP2(HP_intif_main_message), 2108 }, - { HP_POP(intif->wis_message), HP_POP2(HP_intif_wis_message), 2110 }, - { HP_POP(intif->wis_message_to_gm), HP_POP2(HP_intif_wis_message_to_gm), 2112 }, - { HP_POP(intif->saveregistry), HP_POP2(HP_intif_saveregistry), 2114 }, - { HP_POP(intif->request_registry), HP_POP2(HP_intif_request_registry), 2116 }, - { HP_POP(intif->request_guild_storage), HP_POP2(HP_intif_request_guild_storage), 2118 }, - { HP_POP(intif->send_guild_storage), HP_POP2(HP_intif_send_guild_storage), 2120 }, - { HP_POP(intif->create_party), HP_POP2(HP_intif_create_party), 2122 }, - { HP_POP(intif->request_partyinfo), HP_POP2(HP_intif_request_partyinfo), 2124 }, - { HP_POP(intif->party_addmember), HP_POP2(HP_intif_party_addmember), 2126 }, - { HP_POP(intif->party_changeoption), HP_POP2(HP_intif_party_changeoption), 2128 }, - { HP_POP(intif->party_leave), HP_POP2(HP_intif_party_leave), 2130 }, - { HP_POP(intif->party_changemap), HP_POP2(HP_intif_party_changemap), 2132 }, - { HP_POP(intif->break_party), HP_POP2(HP_intif_break_party), 2134 }, - { HP_POP(intif->party_message), HP_POP2(HP_intif_party_message), 2136 }, - { HP_POP(intif->party_leaderchange), HP_POP2(HP_intif_party_leaderchange), 2138 }, - { HP_POP(intif->guild_create), HP_POP2(HP_intif_guild_create), 2140 }, - { HP_POP(intif->guild_request_info), HP_POP2(HP_intif_guild_request_info), 2142 }, - { HP_POP(intif->guild_addmember), HP_POP2(HP_intif_guild_addmember), 2144 }, - { HP_POP(intif->guild_leave), HP_POP2(HP_intif_guild_leave), 2146 }, - { HP_POP(intif->guild_memberinfoshort), HP_POP2(HP_intif_guild_memberinfoshort), 2148 }, - { HP_POP(intif->guild_break), HP_POP2(HP_intif_guild_break), 2150 }, - { HP_POP(intif->guild_message), HP_POP2(HP_intif_guild_message), 2152 }, - { HP_POP(intif->guild_change_gm), HP_POP2(HP_intif_guild_change_gm), 2154 }, - { HP_POP(intif->guild_change_basicinfo), HP_POP2(HP_intif_guild_change_basicinfo), 2156 }, - { HP_POP(intif->guild_change_memberinfo), HP_POP2(HP_intif_guild_change_memberinfo), 2158 }, - { HP_POP(intif->guild_position), HP_POP2(HP_intif_guild_position), 2160 }, - { HP_POP(intif->guild_skillup), HP_POP2(HP_intif_guild_skillup), 2162 }, - { HP_POP(intif->guild_alliance), HP_POP2(HP_intif_guild_alliance), 2164 }, - { HP_POP(intif->guild_notice), HP_POP2(HP_intif_guild_notice), 2166 }, - { HP_POP(intif->guild_emblem), HP_POP2(HP_intif_guild_emblem), 2168 }, - { HP_POP(intif->guild_castle_dataload), HP_POP2(HP_intif_guild_castle_dataload), 2170 }, - { HP_POP(intif->guild_castle_datasave), HP_POP2(HP_intif_guild_castle_datasave), 2172 }, - { HP_POP(intif->request_petdata), HP_POP2(HP_intif_request_petdata), 2174 }, - { HP_POP(intif->save_petdata), HP_POP2(HP_intif_save_petdata), 2176 }, - { HP_POP(intif->delete_petdata), HP_POP2(HP_intif_delete_petdata), 2178 }, - { HP_POP(intif->rename), HP_POP2(HP_intif_rename), 2180 }, - { HP_POP(intif->homunculus_create), HP_POP2(HP_intif_homunculus_create), 2182 }, - { HP_POP(intif->homunculus_requestload), HP_POP2(HP_intif_homunculus_requestload), 2184 }, - { HP_POP(intif->homunculus_requestsave), HP_POP2(HP_intif_homunculus_requestsave), 2186 }, - { HP_POP(intif->homunculus_requestdelete), HP_POP2(HP_intif_homunculus_requestdelete), 2188 }, - { HP_POP(intif->request_questlog), HP_POP2(HP_intif_request_questlog), 2190 }, - { HP_POP(intif->quest_save), HP_POP2(HP_intif_quest_save), 2192 }, - { HP_POP(intif->mercenary_create), HP_POP2(HP_intif_mercenary_create), 2194 }, - { HP_POP(intif->mercenary_request), HP_POP2(HP_intif_mercenary_request), 2196 }, - { HP_POP(intif->mercenary_delete), HP_POP2(HP_intif_mercenary_delete), 2198 }, - { HP_POP(intif->mercenary_save), HP_POP2(HP_intif_mercenary_save), 2200 }, - { HP_POP(intif->Mail_requestinbox), HP_POP2(HP_intif_Mail_requestinbox), 2202 }, - { HP_POP(intif->Mail_read), HP_POP2(HP_intif_Mail_read), 2204 }, - { HP_POP(intif->Mail_getattach), HP_POP2(HP_intif_Mail_getattach), 2206 }, - { HP_POP(intif->Mail_delete), HP_POP2(HP_intif_Mail_delete), 2208 }, - { HP_POP(intif->Mail_return), HP_POP2(HP_intif_Mail_return), 2210 }, - { HP_POP(intif->Mail_send), HP_POP2(HP_intif_Mail_send), 2212 }, - { HP_POP(intif->Auction_requestlist), HP_POP2(HP_intif_Auction_requestlist), 2214 }, - { HP_POP(intif->Auction_register), HP_POP2(HP_intif_Auction_register), 2216 }, - { HP_POP(intif->Auction_cancel), HP_POP2(HP_intif_Auction_cancel), 2218 }, - { HP_POP(intif->Auction_close), HP_POP2(HP_intif_Auction_close), 2220 }, - { HP_POP(intif->Auction_bid), HP_POP2(HP_intif_Auction_bid), 2222 }, - { HP_POP(intif->elemental_create), HP_POP2(HP_intif_elemental_create), 2224 }, - { HP_POP(intif->elemental_request), HP_POP2(HP_intif_elemental_request), 2226 }, - { HP_POP(intif->elemental_delete), HP_POP2(HP_intif_elemental_delete), 2228 }, - { HP_POP(intif->elemental_save), HP_POP2(HP_intif_elemental_save), 2230 }, - { HP_POP(intif->request_accinfo), HP_POP2(HP_intif_request_accinfo), 2232 }, - { HP_POP(intif->CheckForCharServer), HP_POP2(HP_intif_CheckForCharServer), 2234 }, - { HP_POP(intif->pWisMessage), HP_POP2(HP_intif_pWisMessage), 2236 }, - { HP_POP(intif->pWisEnd), HP_POP2(HP_intif_pWisEnd), 2238 }, - { HP_POP(intif->pWisToGM_sub), HP_POP2(HP_intif_pWisToGM_sub), 2240 }, - { HP_POP(intif->pWisToGM), HP_POP2(HP_intif_pWisToGM), 2242 }, - { HP_POP(intif->pRegisters), HP_POP2(HP_intif_pRegisters), 2244 }, - { HP_POP(intif->pChangeNameOk), HP_POP2(HP_intif_pChangeNameOk), 2246 }, - { HP_POP(intif->pMessageToFD), HP_POP2(HP_intif_pMessageToFD), 2248 }, - { HP_POP(intif->pLoadGuildStorage), HP_POP2(HP_intif_pLoadGuildStorage), 2250 }, - { HP_POP(intif->pSaveGuildStorage), HP_POP2(HP_intif_pSaveGuildStorage), 2252 }, - { HP_POP(intif->pPartyCreated), HP_POP2(HP_intif_pPartyCreated), 2254 }, - { HP_POP(intif->pPartyInfo), HP_POP2(HP_intif_pPartyInfo), 2256 }, - { HP_POP(intif->pPartyMemberAdded), HP_POP2(HP_intif_pPartyMemberAdded), 2258 }, - { HP_POP(intif->pPartyOptionChanged), HP_POP2(HP_intif_pPartyOptionChanged), 2260 }, - { HP_POP(intif->pPartyMemberWithdraw), HP_POP2(HP_intif_pPartyMemberWithdraw), 2262 }, - { HP_POP(intif->pPartyMove), HP_POP2(HP_intif_pPartyMove), 2264 }, - { HP_POP(intif->pPartyBroken), HP_POP2(HP_intif_pPartyBroken), 2266 }, - { HP_POP(intif->pPartyMessage), HP_POP2(HP_intif_pPartyMessage), 2268 }, - { HP_POP(intif->pGuildCreated), HP_POP2(HP_intif_pGuildCreated), 2270 }, - { HP_POP(intif->pGuildInfo), HP_POP2(HP_intif_pGuildInfo), 2272 }, - { HP_POP(intif->pGuildMemberAdded), HP_POP2(HP_intif_pGuildMemberAdded), 2274 }, - { HP_POP(intif->pGuildMemberWithdraw), HP_POP2(HP_intif_pGuildMemberWithdraw), 2276 }, - { HP_POP(intif->pGuildMemberInfoShort), HP_POP2(HP_intif_pGuildMemberInfoShort), 2278 }, - { HP_POP(intif->pGuildBroken), HP_POP2(HP_intif_pGuildBroken), 2280 }, - { HP_POP(intif->pGuildMessage), HP_POP2(HP_intif_pGuildMessage), 2282 }, - { HP_POP(intif->pGuildBasicInfoChanged), HP_POP2(HP_intif_pGuildBasicInfoChanged), 2284 }, - { HP_POP(intif->pGuildMemberInfoChanged), HP_POP2(HP_intif_pGuildMemberInfoChanged), 2286 }, - { HP_POP(intif->pGuildPosition), HP_POP2(HP_intif_pGuildPosition), 2288 }, - { HP_POP(intif->pGuildSkillUp), HP_POP2(HP_intif_pGuildSkillUp), 2290 }, - { HP_POP(intif->pGuildAlliance), HP_POP2(HP_intif_pGuildAlliance), 2292 }, - { HP_POP(intif->pGuildNotice), HP_POP2(HP_intif_pGuildNotice), 2294 }, - { HP_POP(intif->pGuildEmblem), HP_POP2(HP_intif_pGuildEmblem), 2296 }, - { HP_POP(intif->pGuildCastleDataLoad), HP_POP2(HP_intif_pGuildCastleDataLoad), 2298 }, - { HP_POP(intif->pGuildMasterChanged), HP_POP2(HP_intif_pGuildMasterChanged), 2300 }, - { HP_POP(intif->pQuestLog), HP_POP2(HP_intif_pQuestLog), 2302 }, - { HP_POP(intif->pQuestSave), HP_POP2(HP_intif_pQuestSave), 2304 }, - { HP_POP(intif->pMailInboxReceived), HP_POP2(HP_intif_pMailInboxReceived), 2306 }, - { HP_POP(intif->pMailNew), HP_POP2(HP_intif_pMailNew), 2308 }, - { HP_POP(intif->pMailGetAttach), HP_POP2(HP_intif_pMailGetAttach), 2310 }, - { HP_POP(intif->pMailDelete), HP_POP2(HP_intif_pMailDelete), 2312 }, - { HP_POP(intif->pMailReturn), HP_POP2(HP_intif_pMailReturn), 2314 }, - { HP_POP(intif->pMailSend), HP_POP2(HP_intif_pMailSend), 2316 }, - { HP_POP(intif->pAuctionResults), HP_POP2(HP_intif_pAuctionResults), 2318 }, - { HP_POP(intif->pAuctionRegister), HP_POP2(HP_intif_pAuctionRegister), 2320 }, - { HP_POP(intif->pAuctionCancel), HP_POP2(HP_intif_pAuctionCancel), 2322 }, - { HP_POP(intif->pAuctionClose), HP_POP2(HP_intif_pAuctionClose), 2324 }, - { HP_POP(intif->pAuctionMessage), HP_POP2(HP_intif_pAuctionMessage), 2326 }, - { HP_POP(intif->pAuctionBid), HP_POP2(HP_intif_pAuctionBid), 2328 }, - { HP_POP(intif->pMercenaryReceived), HP_POP2(HP_intif_pMercenaryReceived), 2330 }, - { HP_POP(intif->pMercenaryDeleted), HP_POP2(HP_intif_pMercenaryDeleted), 2332 }, - { HP_POP(intif->pMercenarySaved), HP_POP2(HP_intif_pMercenarySaved), 2334 }, - { HP_POP(intif->pElementalReceived), HP_POP2(HP_intif_pElementalReceived), 2336 }, - { HP_POP(intif->pElementalDeleted), HP_POP2(HP_intif_pElementalDeleted), 2338 }, - { HP_POP(intif->pElementalSaved), HP_POP2(HP_intif_pElementalSaved), 2340 }, - { HP_POP(intif->pCreatePet), HP_POP2(HP_intif_pCreatePet), 2342 }, - { HP_POP(intif->pRecvPetData), HP_POP2(HP_intif_pRecvPetData), 2344 }, - { HP_POP(intif->pSavePetOk), HP_POP2(HP_intif_pSavePetOk), 2346 }, - { HP_POP(intif->pDeletePetOk), HP_POP2(HP_intif_pDeletePetOk), 2348 }, - { HP_POP(intif->pCreateHomunculus), HP_POP2(HP_intif_pCreateHomunculus), 2350 }, - { HP_POP(intif->pRecvHomunculusData), HP_POP2(HP_intif_pRecvHomunculusData), 2352 }, - { HP_POP(intif->pSaveHomunculusOk), HP_POP2(HP_intif_pSaveHomunculusOk), 2354 }, - { HP_POP(intif->pDeleteHomunculusOk), HP_POP2(HP_intif_pDeleteHomunculusOk), 2356 }, + { HP_POP(intif->parse, HP_intif_parse) }, + { HP_POP(intif->create_pet, HP_intif_create_pet) }, + { HP_POP(intif->broadcast, HP_intif_broadcast) }, + { HP_POP(intif->broadcast2, HP_intif_broadcast2) }, + { HP_POP(intif->main_message, HP_intif_main_message) }, + { HP_POP(intif->wis_message, HP_intif_wis_message) }, + { HP_POP(intif->wis_message_to_gm, HP_intif_wis_message_to_gm) }, + { HP_POP(intif->saveregistry, HP_intif_saveregistry) }, + { HP_POP(intif->request_registry, HP_intif_request_registry) }, + { HP_POP(intif->request_guild_storage, HP_intif_request_guild_storage) }, + { HP_POP(intif->send_guild_storage, HP_intif_send_guild_storage) }, + { HP_POP(intif->create_party, HP_intif_create_party) }, + { HP_POP(intif->request_partyinfo, HP_intif_request_partyinfo) }, + { HP_POP(intif->party_addmember, HP_intif_party_addmember) }, + { HP_POP(intif->party_changeoption, HP_intif_party_changeoption) }, + { HP_POP(intif->party_leave, HP_intif_party_leave) }, + { HP_POP(intif->party_changemap, HP_intif_party_changemap) }, + { HP_POP(intif->break_party, HP_intif_break_party) }, + { HP_POP(intif->party_message, HP_intif_party_message) }, + { HP_POP(intif->party_leaderchange, HP_intif_party_leaderchange) }, + { HP_POP(intif->guild_create, HP_intif_guild_create) }, + { HP_POP(intif->guild_request_info, HP_intif_guild_request_info) }, + { HP_POP(intif->guild_addmember, HP_intif_guild_addmember) }, + { HP_POP(intif->guild_leave, HP_intif_guild_leave) }, + { HP_POP(intif->guild_memberinfoshort, HP_intif_guild_memberinfoshort) }, + { HP_POP(intif->guild_break, HP_intif_guild_break) }, + { HP_POP(intif->guild_message, HP_intif_guild_message) }, + { HP_POP(intif->guild_change_gm, HP_intif_guild_change_gm) }, + { HP_POP(intif->guild_change_basicinfo, HP_intif_guild_change_basicinfo) }, + { HP_POP(intif->guild_change_memberinfo, HP_intif_guild_change_memberinfo) }, + { HP_POP(intif->guild_position, HP_intif_guild_position) }, + { HP_POP(intif->guild_skillup, HP_intif_guild_skillup) }, + { HP_POP(intif->guild_alliance, HP_intif_guild_alliance) }, + { HP_POP(intif->guild_notice, HP_intif_guild_notice) }, + { HP_POP(intif->guild_emblem, HP_intif_guild_emblem) }, + { HP_POP(intif->guild_castle_dataload, HP_intif_guild_castle_dataload) }, + { HP_POP(intif->guild_castle_datasave, HP_intif_guild_castle_datasave) }, + { HP_POP(intif->itembound_req, HP_intif_itembound_req) }, + { HP_POP(intif->request_petdata, HP_intif_request_petdata) }, + { HP_POP(intif->save_petdata, HP_intif_save_petdata) }, + { HP_POP(intif->delete_petdata, HP_intif_delete_petdata) }, + { HP_POP(intif->rename, HP_intif_rename) }, + { HP_POP(intif->homunculus_create, HP_intif_homunculus_create) }, + { HP_POP(intif->homunculus_requestload, HP_intif_homunculus_requestload) }, + { HP_POP(intif->homunculus_requestsave, HP_intif_homunculus_requestsave) }, + { HP_POP(intif->homunculus_requestdelete, HP_intif_homunculus_requestdelete) }, + { HP_POP(intif->request_questlog, HP_intif_request_questlog) }, + { HP_POP(intif->quest_save, HP_intif_quest_save) }, + { HP_POP(intif->mercenary_create, HP_intif_mercenary_create) }, + { HP_POP(intif->mercenary_request, HP_intif_mercenary_request) }, + { HP_POP(intif->mercenary_delete, HP_intif_mercenary_delete) }, + { HP_POP(intif->mercenary_save, HP_intif_mercenary_save) }, + { HP_POP(intif->Mail_requestinbox, HP_intif_Mail_requestinbox) }, + { HP_POP(intif->Mail_read, HP_intif_Mail_read) }, + { HP_POP(intif->Mail_getattach, HP_intif_Mail_getattach) }, + { HP_POP(intif->Mail_delete, HP_intif_Mail_delete) }, + { HP_POP(intif->Mail_return, HP_intif_Mail_return) }, + { HP_POP(intif->Mail_send, HP_intif_Mail_send) }, + { HP_POP(intif->Auction_requestlist, HP_intif_Auction_requestlist) }, + { HP_POP(intif->Auction_register, HP_intif_Auction_register) }, + { HP_POP(intif->Auction_cancel, HP_intif_Auction_cancel) }, + { HP_POP(intif->Auction_close, HP_intif_Auction_close) }, + { HP_POP(intif->Auction_bid, HP_intif_Auction_bid) }, + { HP_POP(intif->elemental_create, HP_intif_elemental_create) }, + { HP_POP(intif->elemental_request, HP_intif_elemental_request) }, + { HP_POP(intif->elemental_delete, HP_intif_elemental_delete) }, + { HP_POP(intif->elemental_save, HP_intif_elemental_save) }, + { HP_POP(intif->request_accinfo, HP_intif_request_accinfo) }, + { HP_POP(intif->CheckForCharServer, HP_intif_CheckForCharServer) }, + { HP_POP(intif->pWisMessage, HP_intif_pWisMessage) }, + { HP_POP(intif->pWisEnd, HP_intif_pWisEnd) }, + { HP_POP(intif->pWisToGM_sub, HP_intif_pWisToGM_sub) }, + { HP_POP(intif->pWisToGM, HP_intif_pWisToGM) }, + { HP_POP(intif->pRegisters, HP_intif_pRegisters) }, + { HP_POP(intif->pChangeNameOk, HP_intif_pChangeNameOk) }, + { HP_POP(intif->pMessageToFD, HP_intif_pMessageToFD) }, + { HP_POP(intif->pLoadGuildStorage, HP_intif_pLoadGuildStorage) }, + { HP_POP(intif->pSaveGuildStorage, HP_intif_pSaveGuildStorage) }, + { HP_POP(intif->pPartyCreated, HP_intif_pPartyCreated) }, + { HP_POP(intif->pPartyInfo, HP_intif_pPartyInfo) }, + { HP_POP(intif->pPartyMemberAdded, HP_intif_pPartyMemberAdded) }, + { HP_POP(intif->pPartyOptionChanged, HP_intif_pPartyOptionChanged) }, + { HP_POP(intif->pPartyMemberWithdraw, HP_intif_pPartyMemberWithdraw) }, + { HP_POP(intif->pPartyMove, HP_intif_pPartyMove) }, + { HP_POP(intif->pPartyBroken, HP_intif_pPartyBroken) }, + { HP_POP(intif->pPartyMessage, HP_intif_pPartyMessage) }, + { HP_POP(intif->pGuildCreated, HP_intif_pGuildCreated) }, + { HP_POP(intif->pGuildInfo, HP_intif_pGuildInfo) }, + { HP_POP(intif->pGuildMemberAdded, HP_intif_pGuildMemberAdded) }, + { HP_POP(intif->pGuildMemberWithdraw, HP_intif_pGuildMemberWithdraw) }, + { HP_POP(intif->pGuildMemberInfoShort, HP_intif_pGuildMemberInfoShort) }, + { HP_POP(intif->pGuildBroken, HP_intif_pGuildBroken) }, + { HP_POP(intif->pGuildMessage, HP_intif_pGuildMessage) }, + { HP_POP(intif->pGuildBasicInfoChanged, HP_intif_pGuildBasicInfoChanged) }, + { HP_POP(intif->pGuildMemberInfoChanged, HP_intif_pGuildMemberInfoChanged) }, + { HP_POP(intif->pGuildPosition, HP_intif_pGuildPosition) }, + { HP_POP(intif->pGuildSkillUp, HP_intif_pGuildSkillUp) }, + { HP_POP(intif->pGuildAlliance, HP_intif_pGuildAlliance) }, + { HP_POP(intif->pGuildNotice, HP_intif_pGuildNotice) }, + { HP_POP(intif->pGuildEmblem, HP_intif_pGuildEmblem) }, + { HP_POP(intif->pGuildCastleDataLoad, HP_intif_pGuildCastleDataLoad) }, + { HP_POP(intif->pGuildMasterChanged, HP_intif_pGuildMasterChanged) }, + { HP_POP(intif->pQuestLog, HP_intif_pQuestLog) }, + { HP_POP(intif->pQuestSave, HP_intif_pQuestSave) }, + { HP_POP(intif->pMailInboxReceived, HP_intif_pMailInboxReceived) }, + { HP_POP(intif->pMailNew, HP_intif_pMailNew) }, + { HP_POP(intif->pMailGetAttach, HP_intif_pMailGetAttach) }, + { HP_POP(intif->pMailDelete, HP_intif_pMailDelete) }, + { HP_POP(intif->pMailReturn, HP_intif_pMailReturn) }, + { HP_POP(intif->pMailSend, HP_intif_pMailSend) }, + { HP_POP(intif->pAuctionResults, HP_intif_pAuctionResults) }, + { HP_POP(intif->pAuctionRegister, HP_intif_pAuctionRegister) }, + { HP_POP(intif->pAuctionCancel, HP_intif_pAuctionCancel) }, + { HP_POP(intif->pAuctionClose, HP_intif_pAuctionClose) }, + { HP_POP(intif->pAuctionMessage, HP_intif_pAuctionMessage) }, + { HP_POP(intif->pAuctionBid, HP_intif_pAuctionBid) }, + { HP_POP(intif->pItembound_ack, HP_intif_pItembound_ack) }, + { HP_POP(intif->pMercenaryReceived, HP_intif_pMercenaryReceived) }, + { HP_POP(intif->pMercenaryDeleted, HP_intif_pMercenaryDeleted) }, + { HP_POP(intif->pMercenarySaved, HP_intif_pMercenarySaved) }, + { HP_POP(intif->pElementalReceived, HP_intif_pElementalReceived) }, + { HP_POP(intif->pElementalDeleted, HP_intif_pElementalDeleted) }, + { HP_POP(intif->pElementalSaved, HP_intif_pElementalSaved) }, + { HP_POP(intif->pCreatePet, HP_intif_pCreatePet) }, + { HP_POP(intif->pRecvPetData, HP_intif_pRecvPetData) }, + { HP_POP(intif->pSavePetOk, HP_intif_pSavePetOk) }, + { HP_POP(intif->pDeletePetOk, HP_intif_pDeletePetOk) }, + { HP_POP(intif->pCreateHomunculus, HP_intif_pCreateHomunculus) }, + { HP_POP(intif->pRecvHomunculusData, HP_intif_pRecvHomunculusData) }, + { HP_POP(intif->pSaveHomunculusOk, HP_intif_pSaveHomunculusOk) }, + { HP_POP(intif->pDeleteHomunculusOk, HP_intif_pDeleteHomunculusOk) }, /* ircbot */ - { HP_POP(ircbot->init), HP_POP2(HP_ircbot_init), 2358 }, - { HP_POP(ircbot->final), HP_POP2(HP_ircbot_final), 2360 }, - { HP_POP(ircbot->parse), HP_POP2(HP_ircbot_parse), 2362 }, - { HP_POP(ircbot->parse_sub), HP_POP2(HP_ircbot_parse_sub), 2364 }, - { HP_POP(ircbot->parse_source), HP_POP2(HP_ircbot_parse_source), 2366 }, - { HP_POP(ircbot->func_search), HP_POP2(HP_ircbot_func_search), 2368 }, - { HP_POP(ircbot->connect_timer), HP_POP2(HP_ircbot_connect_timer), 2370 }, - { HP_POP(ircbot->identify_timer), HP_POP2(HP_ircbot_identify_timer), 2372 }, - { HP_POP(ircbot->join_timer), HP_POP2(HP_ircbot_join_timer), 2374 }, - { HP_POP(ircbot->send), HP_POP2(HP_ircbot_send), 2376 }, - { HP_POP(ircbot->relay), HP_POP2(HP_ircbot_relay), 2378 }, - { HP_POP(ircbot->pong), HP_POP2(HP_ircbot_pong), 2380 }, - { HP_POP(ircbot->privmsg), HP_POP2(HP_ircbot_privmsg), 2382 }, - { HP_POP(ircbot->userjoin), HP_POP2(HP_ircbot_userjoin), 2384 }, - { HP_POP(ircbot->userleave), HP_POP2(HP_ircbot_userleave), 2386 }, - { HP_POP(ircbot->usernick), HP_POP2(HP_ircbot_usernick), 2388 }, + { HP_POP(ircbot->init, HP_ircbot_init) }, + { HP_POP(ircbot->final, HP_ircbot_final) }, + { HP_POP(ircbot->parse, HP_ircbot_parse) }, + { HP_POP(ircbot->parse_sub, HP_ircbot_parse_sub) }, + { HP_POP(ircbot->parse_source, HP_ircbot_parse_source) }, + { HP_POP(ircbot->func_search, HP_ircbot_func_search) }, + { HP_POP(ircbot->connect_timer, HP_ircbot_connect_timer) }, + { HP_POP(ircbot->identify_timer, HP_ircbot_identify_timer) }, + { HP_POP(ircbot->join_timer, HP_ircbot_join_timer) }, + { HP_POP(ircbot->send, HP_ircbot_send) }, + { HP_POP(ircbot->relay, HP_ircbot_relay) }, + { HP_POP(ircbot->pong, HP_ircbot_pong) }, + { HP_POP(ircbot->privmsg, HP_ircbot_privmsg) }, + { HP_POP(ircbot->userjoin, HP_ircbot_userjoin) }, + { HP_POP(ircbot->userleave, HP_ircbot_userleave) }, + { HP_POP(ircbot->usernick, HP_ircbot_usernick) }, /* itemdb */ - { HP_POP(itemdb->init), HP_POP2(HP_itemdb_init), 2390 }, - { HP_POP(itemdb->final), HP_POP2(HP_itemdb_final), 2392 }, - { HP_POP(itemdb->reload), HP_POP2(HP_itemdb_reload), 2394 }, - { HP_POP(itemdb->name_constants), HP_POP2(HP_itemdb_name_constants), 2396 }, - { HP_POP(itemdb->force_name_constants), HP_POP2(HP_itemdb_force_name_constants), 2398 }, - { HP_POP(itemdb->read_groups), HP_POP2(HP_itemdb_read_groups), 2400 }, - { HP_POP(itemdb->read_chains), HP_POP2(HP_itemdb_read_chains), 2402 }, - { HP_POP(itemdb->read_packages), HP_POP2(HP_itemdb_read_packages), 2404 }, - { HP_POP(itemdb->write_cached_packages), HP_POP2(HP_itemdb_write_cached_packages), 2406 }, - { HP_POP(itemdb->read_cached_packages), HP_POP2(HP_itemdb_read_cached_packages), 2408 }, - { HP_POP(itemdb->name2id), HP_POP2(HP_itemdb_name2id), 2410 }, - { HP_POP(itemdb->search_name), HP_POP2(HP_itemdb_search_name), 2412 }, - { HP_POP(itemdb->search_name_array), HP_POP2(HP_itemdb_search_name_array), 2414 }, - { HP_POP(itemdb->load), HP_POP2(HP_itemdb_load), 2416 }, - { HP_POP(itemdb->search), HP_POP2(HP_itemdb_search), 2418 }, - { HP_POP(itemdb->parse_dbrow), HP_POP2(HP_itemdb_parse_dbrow), 2420 }, - { HP_POP(itemdb->exists), HP_POP2(HP_itemdb_exists), 2422 }, - { HP_POP(itemdb->in_group), HP_POP2(HP_itemdb_in_group), 2424 }, - { HP_POP(itemdb->group_item), HP_POP2(HP_itemdb_group_item), 2426 }, - { HP_POP(itemdb->chain_item), HP_POP2(HP_itemdb_chain_item), 2428 }, - { HP_POP(itemdb->package_item), HP_POP2(HP_itemdb_package_item), 2430 }, - { HP_POP(itemdb->searchname_sub), HP_POP2(HP_itemdb_searchname_sub), 2432 }, - { HP_POP(itemdb->searchname_array_sub), HP_POP2(HP_itemdb_searchname_array_sub), 2434 }, - { HP_POP(itemdb->searchrandomid), HP_POP2(HP_itemdb_searchrandomid), 2436 }, - { HP_POP(itemdb->typename), HP_POP2(HP_itemdb_typename), 2438 }, - { HP_POP(itemdb->jobid2mapid), HP_POP2(HP_itemdb_jobid2mapid), 2440 }, - { HP_POP(itemdb->create_dummy_data), HP_POP2(HP_itemdb_create_dummy_data), 2442 }, - { HP_POP(itemdb->create_item_data), HP_POP2(HP_itemdb_create_item_data), 2444 }, - { HP_POP(itemdb->isequip), HP_POP2(HP_itemdb_isequip), 2446 }, - { HP_POP(itemdb->isequip2), HP_POP2(HP_itemdb_isequip2), 2448 }, - { HP_POP(itemdb->isstackable), HP_POP2(HP_itemdb_isstackable), 2450 }, - { HP_POP(itemdb->isstackable2), HP_POP2(HP_itemdb_isstackable2), 2452 }, - { HP_POP(itemdb->isdropable_sub), HP_POP2(HP_itemdb_isdropable_sub), 2454 }, - { HP_POP(itemdb->cantrade_sub), HP_POP2(HP_itemdb_cantrade_sub), 2456 }, - { HP_POP(itemdb->canpartnertrade_sub), HP_POP2(HP_itemdb_canpartnertrade_sub), 2458 }, - { HP_POP(itemdb->cansell_sub), HP_POP2(HP_itemdb_cansell_sub), 2460 }, - { HP_POP(itemdb->cancartstore_sub), HP_POP2(HP_itemdb_cancartstore_sub), 2462 }, - { HP_POP(itemdb->canstore_sub), HP_POP2(HP_itemdb_canstore_sub), 2464 }, - { HP_POP(itemdb->canguildstore_sub), HP_POP2(HP_itemdb_canguildstore_sub), 2466 }, - { HP_POP(itemdb->canmail_sub), HP_POP2(HP_itemdb_canmail_sub), 2468 }, - { HP_POP(itemdb->canauction_sub), HP_POP2(HP_itemdb_canauction_sub), 2470 }, - { HP_POP(itemdb->isrestricted), HP_POP2(HP_itemdb_isrestricted), 2472 }, - { HP_POP(itemdb->isidentified), HP_POP2(HP_itemdb_isidentified), 2474 }, - { HP_POP(itemdb->isidentified2), HP_POP2(HP_itemdb_isidentified2), 2476 }, - { HP_POP(itemdb->read_itemavail), HP_POP2(HP_itemdb_read_itemavail), 2478 }, - { HP_POP(itemdb->read_itemtrade), HP_POP2(HP_itemdb_read_itemtrade), 2480 }, - { HP_POP(itemdb->read_itemdelay), HP_POP2(HP_itemdb_read_itemdelay), 2482 }, - { HP_POP(itemdb->read_stack), HP_POP2(HP_itemdb_read_stack), 2484 }, - { HP_POP(itemdb->read_buyingstore), HP_POP2(HP_itemdb_read_buyingstore), 2486 }, - { HP_POP(itemdb->read_nouse), HP_POP2(HP_itemdb_read_nouse), 2488 }, - { HP_POP(itemdb->combo_split_atoi), HP_POP2(HP_itemdb_combo_split_atoi), 2490 }, - { HP_POP(itemdb->read_combos), HP_POP2(HP_itemdb_read_combos), 2492 }, - { HP_POP(itemdb->gendercheck), HP_POP2(HP_itemdb_gendercheck), 2494 }, - { HP_POP(itemdb->re_split_atoi), HP_POP2(HP_itemdb_re_split_atoi), 2496 }, - { HP_POP(itemdb->readdb), HP_POP2(HP_itemdb_readdb), 2498 }, - { HP_POP(itemdb->read_sqldb), HP_POP2(HP_itemdb_read_sqldb), 2500 }, - { HP_POP(itemdb->unique_id), HP_POP2(HP_itemdb_unique_id), 2502 }, - { HP_POP(itemdb->uid_load), HP_POP2(HP_itemdb_uid_load), 2504 }, - { HP_POP(itemdb->read), HP_POP2(HP_itemdb_read), 2506 }, - { HP_POP(itemdb->destroy_item_data), HP_POP2(HP_itemdb_destroy_item_data), 2508 }, - { HP_POP(itemdb->final_sub), HP_POP2(HP_itemdb_final_sub), 2510 }, + { HP_POP(itemdb->init, HP_itemdb_init) }, + { HP_POP(itemdb->final, HP_itemdb_final) }, + { HP_POP(itemdb->reload, HP_itemdb_reload) }, + { HP_POP(itemdb->name_constants, HP_itemdb_name_constants) }, + { HP_POP(itemdb->read_groups, HP_itemdb_read_groups) }, + { HP_POP(itemdb->read_chains, HP_itemdb_read_chains) }, + { HP_POP(itemdb->read_packages, HP_itemdb_read_packages) }, + { HP_POP(itemdb->write_cached_packages, HP_itemdb_write_cached_packages) }, + { HP_POP(itemdb->read_cached_packages, HP_itemdb_read_cached_packages) }, + { HP_POP(itemdb->name2id, HP_itemdb_name2id) }, + { HP_POP(itemdb->search_name, HP_itemdb_search_name) }, + { HP_POP(itemdb->search_name_array, HP_itemdb_search_name_array) }, + { HP_POP(itemdb->load, HP_itemdb_load) }, + { HP_POP(itemdb->search, HP_itemdb_search) }, + { HP_POP(itemdb->exists, HP_itemdb_exists) }, + { HP_POP(itemdb->in_group, HP_itemdb_in_group) }, + { HP_POP(itemdb->group_item, HP_itemdb_group_item) }, + { HP_POP(itemdb->chain_item, HP_itemdb_chain_item) }, + { HP_POP(itemdb->package_item, HP_itemdb_package_item) }, + { HP_POP(itemdb->searchname_sub, HP_itemdb_searchname_sub) }, + { HP_POP(itemdb->searchname_array_sub, HP_itemdb_searchname_array_sub) }, + { HP_POP(itemdb->searchrandomid, HP_itemdb_searchrandomid) }, + { HP_POP(itemdb->typename, HP_itemdb_typename) }, + { HP_POP(itemdb->jobid2mapid, HP_itemdb_jobid2mapid) }, + { HP_POP(itemdb->create_dummy_data, HP_itemdb_create_dummy_data) }, + { HP_POP(itemdb->create_item_data, HP_itemdb_create_item_data) }, + { HP_POP(itemdb->isequip, HP_itemdb_isequip) }, + { HP_POP(itemdb->isequip2, HP_itemdb_isequip2) }, + { HP_POP(itemdb->isstackable, HP_itemdb_isstackable) }, + { HP_POP(itemdb->isstackable2, HP_itemdb_isstackable2) }, + { HP_POP(itemdb->isdropable_sub, HP_itemdb_isdropable_sub) }, + { HP_POP(itemdb->cantrade_sub, HP_itemdb_cantrade_sub) }, + { HP_POP(itemdb->canpartnertrade_sub, HP_itemdb_canpartnertrade_sub) }, + { HP_POP(itemdb->cansell_sub, HP_itemdb_cansell_sub) }, + { HP_POP(itemdb->cancartstore_sub, HP_itemdb_cancartstore_sub) }, + { HP_POP(itemdb->canstore_sub, HP_itemdb_canstore_sub) }, + { HP_POP(itemdb->canguildstore_sub, HP_itemdb_canguildstore_sub) }, + { HP_POP(itemdb->canmail_sub, HP_itemdb_canmail_sub) }, + { HP_POP(itemdb->canauction_sub, HP_itemdb_canauction_sub) }, + { HP_POP(itemdb->isrestricted, HP_itemdb_isrestricted) }, + { HP_POP(itemdb->isidentified, HP_itemdb_isidentified) }, + { HP_POP(itemdb->isidentified2, HP_itemdb_isidentified2) }, + { HP_POP(itemdb->read_itemavail, HP_itemdb_read_itemavail) }, + { HP_POP(itemdb->read_itemtrade, HP_itemdb_read_itemtrade) }, + { HP_POP(itemdb->read_itemdelay, HP_itemdb_read_itemdelay) }, + { HP_POP(itemdb->read_stack, HP_itemdb_read_stack) }, + { HP_POP(itemdb->read_buyingstore, HP_itemdb_read_buyingstore) }, + { HP_POP(itemdb->read_nouse, HP_itemdb_read_nouse) }, + { HP_POP(itemdb->combo_split_atoi, HP_itemdb_combo_split_atoi) }, + { HP_POP(itemdb->read_combos, HP_itemdb_read_combos) }, + { HP_POP(itemdb->gendercheck, HP_itemdb_gendercheck) }, + { HP_POP(itemdb->validate_entry, HP_itemdb_validate_entry) }, + { HP_POP(itemdb->readdb_sql_sub, HP_itemdb_readdb_sql_sub) }, + { HP_POP(itemdb->readdb_libconfig_sub, HP_itemdb_readdb_libconfig_sub) }, + { HP_POP(itemdb->readdb_libconfig, HP_itemdb_readdb_libconfig) }, + { HP_POP(itemdb->readdb_sql, HP_itemdb_readdb_sql) }, + { HP_POP(itemdb->unique_id, HP_itemdb_unique_id) }, + { HP_POP(itemdb->uid_load, HP_itemdb_uid_load) }, + { HP_POP(itemdb->read, HP_itemdb_read) }, + { HP_POP(itemdb->destroy_item_data, HP_itemdb_destroy_item_data) }, + { HP_POP(itemdb->final_sub, HP_itemdb_final_sub) }, + { HP_POP(itemdb->clear, HP_itemdb_clear) }, + { HP_POP(itemdb->id2combo, HP_itemdb_id2combo) }, /* logs */ - { HP_POP(logs->pick_pc), HP_POP2(HP_logs_pick_pc), 2512 }, - { HP_POP(logs->pick_mob), HP_POP2(HP_logs_pick_mob), 2514 }, - { HP_POP(logs->zeny), HP_POP2(HP_logs_zeny), 2516 }, - { HP_POP(logs->npc), HP_POP2(HP_logs_npc), 2518 }, - { HP_POP(logs->chat), HP_POP2(HP_logs_chat), 2520 }, - { HP_POP(logs->atcommand), HP_POP2(HP_logs_atcommand), 2522 }, - { HP_POP(logs->branch), HP_POP2(HP_logs_branch), 2524 }, - { HP_POP(logs->mvpdrop), HP_POP2(HP_logs_mvpdrop), 2526 }, - { HP_POP(logs->pick_sub), HP_POP2(HP_logs_pick_sub), 2528 }, - { HP_POP(logs->zeny_sub), HP_POP2(HP_logs_zeny_sub), 2530 }, - { HP_POP(logs->npc_sub), HP_POP2(HP_logs_npc_sub), 2532 }, - { HP_POP(logs->chat_sub), HP_POP2(HP_logs_chat_sub), 2534 }, - { HP_POP(logs->atcommand_sub), HP_POP2(HP_logs_atcommand_sub), 2536 }, - { HP_POP(logs->branch_sub), HP_POP2(HP_logs_branch_sub), 2538 }, - { HP_POP(logs->mvpdrop_sub), HP_POP2(HP_logs_mvpdrop_sub), 2540 }, - { HP_POP(logs->config_read), HP_POP2(HP_logs_config_read), 2542 }, - { HP_POP(logs->config_done), HP_POP2(HP_logs_config_done), 2544 }, - { HP_POP(logs->sql_init), HP_POP2(HP_logs_sql_init), 2546 }, - { HP_POP(logs->sql_final), HP_POP2(HP_logs_sql_final), 2548 }, - { HP_POP(logs->picktype2char), HP_POP2(HP_logs_picktype2char), 2550 }, - { HP_POP(logs->chattype2char), HP_POP2(HP_logs_chattype2char), 2552 }, - { HP_POP(logs->should_log_item), HP_POP2(HP_logs_should_log_item), 2554 }, + { HP_POP(logs->pick_pc, HP_logs_pick_pc) }, + { HP_POP(logs->pick_mob, HP_logs_pick_mob) }, + { HP_POP(logs->zeny, HP_logs_zeny) }, + { HP_POP(logs->npc, HP_logs_npc) }, + { HP_POP(logs->chat, HP_logs_chat) }, + { HP_POP(logs->atcommand, HP_logs_atcommand) }, + { HP_POP(logs->branch, HP_logs_branch) }, + { HP_POP(logs->mvpdrop, HP_logs_mvpdrop) }, + { HP_POP(logs->pick_sub, HP_logs_pick_sub) }, + { HP_POP(logs->zeny_sub, HP_logs_zeny_sub) }, + { HP_POP(logs->npc_sub, HP_logs_npc_sub) }, + { HP_POP(logs->chat_sub, HP_logs_chat_sub) }, + { HP_POP(logs->atcommand_sub, HP_logs_atcommand_sub) }, + { HP_POP(logs->branch_sub, HP_logs_branch_sub) }, + { HP_POP(logs->mvpdrop_sub, HP_logs_mvpdrop_sub) }, + { HP_POP(logs->config_read, HP_logs_config_read) }, + { HP_POP(logs->config_done, HP_logs_config_done) }, + { HP_POP(logs->sql_init, HP_logs_sql_init) }, + { HP_POP(logs->sql_final, HP_logs_sql_final) }, + { HP_POP(logs->picktype2char, HP_logs_picktype2char) }, + { HP_POP(logs->chattype2char, HP_logs_chattype2char) }, + { HP_POP(logs->should_log_item, HP_logs_should_log_item) }, /* mail */ - { HP_POP(mail->clear), HP_POP2(HP_mail_clear), 2556 }, - { HP_POP(mail->removeitem), HP_POP2(HP_mail_removeitem), 2558 }, - { HP_POP(mail->removezeny), HP_POP2(HP_mail_removezeny), 2560 }, - { HP_POP(mail->setitem), HP_POP2(HP_mail_setitem), 2562 }, - { HP_POP(mail->setattachment), HP_POP2(HP_mail_setattachment), 2564 }, - { HP_POP(mail->getattachment), HP_POP2(HP_mail_getattachment), 2566 }, - { HP_POP(mail->openmail), HP_POP2(HP_mail_openmail), 2568 }, - { HP_POP(mail->deliveryfail), HP_POP2(HP_mail_deliveryfail), 2570 }, - { HP_POP(mail->invalid_operation), HP_POP2(HP_mail_invalid_operation), 2572 }, + { HP_POP(mail->clear, HP_mail_clear) }, + { HP_POP(mail->removeitem, HP_mail_removeitem) }, + { HP_POP(mail->removezeny, HP_mail_removezeny) }, + { HP_POP(mail->setitem, HP_mail_setitem) }, + { HP_POP(mail->setattachment, HP_mail_setattachment) }, + { HP_POP(mail->getattachment, HP_mail_getattachment) }, + { HP_POP(mail->openmail, HP_mail_openmail) }, + { HP_POP(mail->deliveryfail, HP_mail_deliveryfail) }, + { HP_POP(mail->invalid_operation, HP_mail_invalid_operation) }, /* map */ - { HP_POP(map->zone_init), HP_POP2(HP_map_zone_init), 2574 }, - { HP_POP(map->zone_remove), HP_POP2(HP_map_zone_remove), 2576 }, - { HP_POP(map->zone_apply), HP_POP2(HP_map_zone_apply), 2578 }, - { HP_POP(map->zone_change), HP_POP2(HP_map_zone_change), 2580 }, - { HP_POP(map->zone_change2), HP_POP2(HP_map_zone_change2), 2582 }, - { HP_POP(map->getcell), HP_POP2(HP_map_getcell), 2584 }, - { HP_POP(map->setgatcell), HP_POP2(HP_map_setgatcell), 2586 }, - { HP_POP(map->cellfromcache), HP_POP2(HP_map_cellfromcache), 2588 }, - { HP_POP(map->setusers), HP_POP2(HP_map_setusers), 2590 }, - { HP_POP(map->getusers), HP_POP2(HP_map_getusers), 2592 }, - { HP_POP(map->usercount), HP_POP2(HP_map_usercount), 2594 }, - { HP_POP(map->freeblock), HP_POP2(HP_map_freeblock), 2596 }, - { HP_POP(map->freeblock_lock), HP_POP2(HP_map_freeblock_lock), 2598 }, - { HP_POP(map->freeblock_unlock), HP_POP2(HP_map_freeblock_unlock), 2600 }, - { HP_POP(map->addblock), HP_POP2(HP_map_addblock), 2602 }, - { HP_POP(map->delblock), HP_POP2(HP_map_delblock), 2604 }, - { HP_POP(map->moveblock), HP_POP2(HP_map_moveblock), 2606 }, - { HP_POP(map->count_oncell), HP_POP2(HP_map_count_oncell), 2608 }, - { HP_POP(map->find_skill_unit_oncell), HP_POP2(HP_map_find_skill_unit_oncell), 2610 }, - { HP_POP(map->get_new_object_id), HP_POP2(HP_map_get_new_object_id), 2612 }, - { HP_POP(map->search_freecell), HP_POP2(HP_map_search_freecell), 2614 }, - { HP_POP(map->quit), HP_POP2(HP_map_quit), 2616 }, - { HP_POP(map->addnpc), HP_POP2(HP_map_addnpc), 2618 }, - { HP_POP(map->clearflooritem_timer), HP_POP2(HP_map_clearflooritem_timer), 2620 }, - { HP_POP(map->removemobs_timer), HP_POP2(HP_map_removemobs_timer), 2622 }, - { HP_POP(map->clearflooritem), HP_POP2(HP_map_clearflooritem), 2624 }, - { HP_POP(map->addflooritem), HP_POP2(HP_map_addflooritem), 2626 }, - { HP_POP(map->addnickdb), HP_POP2(HP_map_addnickdb), 2628 }, - { HP_POP(map->delnickdb), HP_POP2(HP_map_delnickdb), 2630 }, - { HP_POP(map->reqnickdb), HP_POP2(HP_map_reqnickdb), 2632 }, - { HP_POP(map->charid2nick), HP_POP2(HP_map_charid2nick), 2634 }, - { HP_POP(map->charid2sd), HP_POP2(HP_map_charid2sd), 2636 }, - { HP_POP(map->vforeachpc), HP_POP2(HP_map_vforeachpc), 2638 }, - { HP_POP(map->vforeachmob), HP_POP2(HP_map_vforeachmob), 2640 }, - { HP_POP(map->vforeachnpc), HP_POP2(HP_map_vforeachnpc), 2642 }, - { HP_POP(map->vforeachregen), HP_POP2(HP_map_vforeachregen), 2644 }, - { HP_POP(map->vforeachiddb), HP_POP2(HP_map_vforeachiddb), 2646 }, - { HP_POP(map->vforeachinrange), HP_POP2(HP_map_vforeachinrange), 2648 }, - { HP_POP(map->vforeachinshootrange), HP_POP2(HP_map_vforeachinshootrange), 2650 }, - { HP_POP(map->vforeachinarea), HP_POP2(HP_map_vforeachinarea), 2652 }, - { HP_POP(map->vforcountinrange), HP_POP2(HP_map_vforcountinrange), 2654 }, - { HP_POP(map->vforcountinarea), HP_POP2(HP_map_vforcountinarea), 2656 }, - { HP_POP(map->vforeachinmovearea), HP_POP2(HP_map_vforeachinmovearea), 2658 }, - { HP_POP(map->vforeachincell), HP_POP2(HP_map_vforeachincell), 2660 }, - { HP_POP(map->vforeachinpath), HP_POP2(HP_map_vforeachinpath), 2662 }, - { HP_POP(map->vforeachinmap), HP_POP2(HP_map_vforeachinmap), 2664 }, - { HP_POP(map->vforeachininstance), HP_POP2(HP_map_vforeachininstance), 2666 }, - { HP_POP(map->id2sd), HP_POP2(HP_map_id2sd), 2668 }, - { HP_POP(map->id2md), HP_POP2(HP_map_id2md), 2670 }, - { HP_POP(map->id2nd), HP_POP2(HP_map_id2nd), 2672 }, - { HP_POP(map->id2hd), HP_POP2(HP_map_id2hd), 2674 }, - { HP_POP(map->id2mc), HP_POP2(HP_map_id2mc), 2676 }, - { HP_POP(map->id2cd), HP_POP2(HP_map_id2cd), 2678 }, - { HP_POP(map->id2bl), HP_POP2(HP_map_id2bl), 2680 }, - { HP_POP(map->blid_exists), HP_POP2(HP_map_blid_exists), 2682 }, - { HP_POP(map->mapindex2mapid), HP_POP2(HP_map_mapindex2mapid), 2684 }, - { HP_POP(map->mapname2mapid), HP_POP2(HP_map_mapname2mapid), 2686 }, - { HP_POP(map->mapname2ipport), HP_POP2(HP_map_mapname2ipport), 2688 }, - { HP_POP(map->setipport), HP_POP2(HP_map_setipport), 2690 }, - { HP_POP(map->eraseipport), HP_POP2(HP_map_eraseipport), 2692 }, - { HP_POP(map->eraseallipport), HP_POP2(HP_map_eraseallipport), 2694 }, - { HP_POP(map->addiddb), HP_POP2(HP_map_addiddb), 2696 }, - { HP_POP(map->deliddb), HP_POP2(HP_map_deliddb), 2698 }, - { HP_POP(map->nick2sd), HP_POP2(HP_map_nick2sd), 2700 }, - { HP_POP(map->getmob_boss), HP_POP2(HP_map_getmob_boss), 2702 }, - { HP_POP(map->id2boss), HP_POP2(HP_map_id2boss), 2704 }, - { HP_POP(map->reloadnpc), HP_POP2(HP_map_reloadnpc), 2706 }, - { HP_POP(map->check_dir), HP_POP2(HP_map_check_dir), 2708 }, - { HP_POP(map->calc_dir), HP_POP2(HP_map_calc_dir), 2710 }, - { HP_POP(map->random_dir), HP_POP2(HP_map_random_dir), 2712 }, - { HP_POP(map->cleanup_sub), HP_POP2(HP_map_cleanup_sub), 2714 }, - { HP_POP(map->delmap), HP_POP2(HP_map_delmap), 2716 }, - { HP_POP(map->flags_init), HP_POP2(HP_map_flags_init), 2718 }, - { HP_POP(map->iwall_set), HP_POP2(HP_map_iwall_set), 2720 }, - { HP_POP(map->iwall_get), HP_POP2(HP_map_iwall_get), 2722 }, - { HP_POP(map->iwall_remove), HP_POP2(HP_map_iwall_remove), 2724 }, - { HP_POP(map->addmobtolist), HP_POP2(HP_map_addmobtolist), 2726 }, - { HP_POP(map->spawnmobs), HP_POP2(HP_map_spawnmobs), 2728 }, - { HP_POP(map->removemobs), HP_POP2(HP_map_removemobs), 2730 }, - { HP_POP(map->addmap2db), HP_POP2(HP_map_addmap2db), 2732 }, - { HP_POP(map->removemapdb), HP_POP2(HP_map_removemapdb), 2734 }, - { HP_POP(map->clean), HP_POP2(HP_map_clean), 2736 }, - { HP_POP(map->do_shutdown), HP_POP2(HP_map_do_shutdown), 2738 }, - { HP_POP(map->freeblock_timer), HP_POP2(HP_map_freeblock_timer), 2740 }, - { HP_POP(map->searchrandfreecell), HP_POP2(HP_map_searchrandfreecell), 2742 }, - { HP_POP(map->count_sub), HP_POP2(HP_map_count_sub), 2744 }, - { HP_POP(map->create_charid2nick), HP_POP2(HP_map_create_charid2nick), 2746 }, - { HP_POP(map->removemobs_sub), HP_POP2(HP_map_removemobs_sub), 2748 }, - { HP_POP(map->gat2cell), HP_POP2(HP_map_gat2cell), 2750 }, - { HP_POP(map->cell2gat), HP_POP2(HP_map_cell2gat), 2752 }, - { HP_POP(map->getcellp), HP_POP2(HP_map_getcellp), 2754 }, - { HP_POP(map->setcell), HP_POP2(HP_map_setcell), 2756 }, - { HP_POP(map->sub_getcellp), HP_POP2(HP_map_sub_getcellp), 2758 }, - { HP_POP(map->sub_setcell), HP_POP2(HP_map_sub_setcell), 2760 }, - { HP_POP(map->iwall_nextxy), HP_POP2(HP_map_iwall_nextxy), 2762 }, - { HP_POP(map->create_map_data_other_server), HP_POP2(HP_map_create_map_data_other_server), 2764 }, - { HP_POP(map->eraseallipport_sub), HP_POP2(HP_map_eraseallipport_sub), 2766 }, - { HP_POP(map->init_mapcache), HP_POP2(HP_map_init_mapcache), 2768 }, - { HP_POP(map->readfromcache), HP_POP2(HP_map_readfromcache), 2770 }, - { HP_POP(map->addmap), HP_POP2(HP_map_addmap), 2772 }, - { HP_POP(map->delmapid), HP_POP2(HP_map_delmapid), 2774 }, - { HP_POP(map->zone_db_clear), HP_POP2(HP_map_zone_db_clear), 2776 }, - { HP_POP(map->list_final), HP_POP2(HP_map_list_final), 2778 }, - { HP_POP(map->waterheight), HP_POP2(HP_map_waterheight), 2780 }, - { HP_POP(map->readgat), HP_POP2(HP_map_readgat), 2782 }, - { HP_POP(map->readallmaps), HP_POP2(HP_map_readallmaps), 2784 }, - { HP_POP(map->config_read), HP_POP2(HP_map_config_read), 2786 }, - { HP_POP(map->config_read_sub), HP_POP2(HP_map_config_read_sub), 2788 }, - { HP_POP(map->reloadnpc_sub), HP_POP2(HP_map_reloadnpc_sub), 2790 }, - { HP_POP(map->inter_config_read), HP_POP2(HP_map_inter_config_read), 2792 }, - { HP_POP(map->sql_init), HP_POP2(HP_map_sql_init), 2794 }, - { HP_POP(map->sql_close), HP_POP2(HP_map_sql_close), 2796 }, - { HP_POP(map->zone_mf_cache), HP_POP2(HP_map_zone_mf_cache), 2798 }, - { HP_POP(map->zone_str2itemid), HP_POP2(HP_map_zone_str2itemid), 2800 }, - { HP_POP(map->zone_str2skillid), HP_POP2(HP_map_zone_str2skillid), 2802 }, - { HP_POP(map->zone_bl_type), HP_POP2(HP_map_zone_bl_type), 2804 }, - { HP_POP(map->read_zone_db), HP_POP2(HP_map_read_zone_db), 2806 }, - { HP_POP(map->db_final), HP_POP2(HP_map_db_final), 2808 }, - { HP_POP(map->nick_db_final), HP_POP2(HP_map_nick_db_final), 2810 }, - { HP_POP(map->cleanup_db_sub), HP_POP2(HP_map_cleanup_db_sub), 2812 }, - { HP_POP(map->abort_sub), HP_POP2(HP_map_abort_sub), 2814 }, - { HP_POP(map->helpscreen), HP_POP2(HP_map_helpscreen), 2816 }, - { HP_POP(map->versionscreen), HP_POP2(HP_map_versionscreen), 2818 }, - { HP_POP(map->arg_next_value), HP_POP2(HP_map_arg_next_value), 2820 }, - { HP_POP(map->addblcell), HP_POP2(HP_map_addblcell), 2822 }, - { HP_POP(map->delblcell), HP_POP2(HP_map_delblcell), 2824 }, + { HP_POP(map->zone_init, HP_map_zone_init) }, + { HP_POP(map->zone_remove, HP_map_zone_remove) }, + { HP_POP(map->zone_apply, HP_map_zone_apply) }, + { HP_POP(map->zone_change, HP_map_zone_change) }, + { HP_POP(map->zone_change2, HP_map_zone_change2) }, + { HP_POP(map->getcell, HP_map_getcell) }, + { HP_POP(map->setgatcell, HP_map_setgatcell) }, + { HP_POP(map->cellfromcache, HP_map_cellfromcache) }, + { HP_POP(map->setusers, HP_map_setusers) }, + { HP_POP(map->getusers, HP_map_getusers) }, + { HP_POP(map->usercount, HP_map_usercount) }, + { HP_POP(map->freeblock, HP_map_freeblock) }, + { HP_POP(map->freeblock_lock, HP_map_freeblock_lock) }, + { HP_POP(map->freeblock_unlock, HP_map_freeblock_unlock) }, + { HP_POP(map->addblock, HP_map_addblock) }, + { HP_POP(map->delblock, HP_map_delblock) }, + { HP_POP(map->moveblock, HP_map_moveblock) }, + { HP_POP(map->count_oncell, HP_map_count_oncell) }, + { HP_POP(map->find_skill_unit_oncell, HP_map_find_skill_unit_oncell) }, + { HP_POP(map->get_new_object_id, HP_map_get_new_object_id) }, + { HP_POP(map->search_freecell, HP_map_search_freecell) }, + { HP_POP(map->quit, HP_map_quit) }, + { HP_POP(map->addnpc, HP_map_addnpc) }, + { HP_POP(map->clearflooritem_timer, HP_map_clearflooritem_timer) }, + { HP_POP(map->removemobs_timer, HP_map_removemobs_timer) }, + { HP_POP(map->clearflooritem, HP_map_clearflooritem) }, + { HP_POP(map->addflooritem, HP_map_addflooritem) }, + { HP_POP(map->addnickdb, HP_map_addnickdb) }, + { HP_POP(map->delnickdb, HP_map_delnickdb) }, + { HP_POP(map->reqnickdb, HP_map_reqnickdb) }, + { HP_POP(map->charid2nick, HP_map_charid2nick) }, + { HP_POP(map->charid2sd, HP_map_charid2sd) }, + { HP_POP(map->vforeachpc, HP_map_vforeachpc) }, + { HP_POP(map->vforeachmob, HP_map_vforeachmob) }, + { HP_POP(map->vforeachnpc, HP_map_vforeachnpc) }, + { HP_POP(map->vforeachregen, HP_map_vforeachregen) }, + { HP_POP(map->vforeachiddb, HP_map_vforeachiddb) }, + { HP_POP(map->vforeachinrange, HP_map_vforeachinrange) }, + { HP_POP(map->vforeachinshootrange, HP_map_vforeachinshootrange) }, + { HP_POP(map->vforeachinarea, HP_map_vforeachinarea) }, + { HP_POP(map->vforcountinrange, HP_map_vforcountinrange) }, + { HP_POP(map->vforcountinarea, HP_map_vforcountinarea) }, + { HP_POP(map->vforeachinmovearea, HP_map_vforeachinmovearea) }, + { HP_POP(map->vforeachincell, HP_map_vforeachincell) }, + { HP_POP(map->vforeachinpath, HP_map_vforeachinpath) }, + { HP_POP(map->vforeachinmap, HP_map_vforeachinmap) }, + { HP_POP(map->vforeachininstance, HP_map_vforeachininstance) }, + { HP_POP(map->id2sd, HP_map_id2sd) }, + { HP_POP(map->id2md, HP_map_id2md) }, + { HP_POP(map->id2nd, HP_map_id2nd) }, + { HP_POP(map->id2hd, HP_map_id2hd) }, + { HP_POP(map->id2mc, HP_map_id2mc) }, + { HP_POP(map->id2cd, HP_map_id2cd) }, + { HP_POP(map->id2bl, HP_map_id2bl) }, + { HP_POP(map->blid_exists, HP_map_blid_exists) }, + { HP_POP(map->mapindex2mapid, HP_map_mapindex2mapid) }, + { HP_POP(map->mapname2mapid, HP_map_mapname2mapid) }, + { HP_POP(map->mapname2ipport, HP_map_mapname2ipport) }, + { HP_POP(map->setipport, HP_map_setipport) }, + { HP_POP(map->eraseipport, HP_map_eraseipport) }, + { HP_POP(map->eraseallipport, HP_map_eraseallipport) }, + { HP_POP(map->addiddb, HP_map_addiddb) }, + { HP_POP(map->deliddb, HP_map_deliddb) }, + { HP_POP(map->nick2sd, HP_map_nick2sd) }, + { HP_POP(map->getmob_boss, HP_map_getmob_boss) }, + { HP_POP(map->id2boss, HP_map_id2boss) }, + { HP_POP(map->reloadnpc, HP_map_reloadnpc) }, + { HP_POP(map->check_dir, HP_map_check_dir) }, + { HP_POP(map->calc_dir, HP_map_calc_dir) }, + { HP_POP(map->random_dir, HP_map_random_dir) }, + { HP_POP(map->cleanup_sub, HP_map_cleanup_sub) }, + { HP_POP(map->delmap, HP_map_delmap) }, + { HP_POP(map->flags_init, HP_map_flags_init) }, + { HP_POP(map->iwall_set, HP_map_iwall_set) }, + { HP_POP(map->iwall_get, HP_map_iwall_get) }, + { HP_POP(map->iwall_remove, HP_map_iwall_remove) }, + { HP_POP(map->addmobtolist, HP_map_addmobtolist) }, + { HP_POP(map->spawnmobs, HP_map_spawnmobs) }, + { HP_POP(map->removemobs, HP_map_removemobs) }, + { HP_POP(map->addmap2db, HP_map_addmap2db) }, + { HP_POP(map->removemapdb, HP_map_removemapdb) }, + { HP_POP(map->clean, HP_map_clean) }, + { HP_POP(map->do_shutdown, HP_map_do_shutdown) }, + { HP_POP(map->freeblock_timer, HP_map_freeblock_timer) }, + { HP_POP(map->searchrandfreecell, HP_map_searchrandfreecell) }, + { HP_POP(map->count_sub, HP_map_count_sub) }, + { HP_POP(map->create_charid2nick, HP_map_create_charid2nick) }, + { HP_POP(map->removemobs_sub, HP_map_removemobs_sub) }, + { HP_POP(map->gat2cell, HP_map_gat2cell) }, + { HP_POP(map->cell2gat, HP_map_cell2gat) }, + { HP_POP(map->getcellp, HP_map_getcellp) }, + { HP_POP(map->setcell, HP_map_setcell) }, + { HP_POP(map->sub_getcellp, HP_map_sub_getcellp) }, + { HP_POP(map->sub_setcell, HP_map_sub_setcell) }, + { HP_POP(map->iwall_nextxy, HP_map_iwall_nextxy) }, + { HP_POP(map->create_map_data_other_server, HP_map_create_map_data_other_server) }, + { HP_POP(map->eraseallipport_sub, HP_map_eraseallipport_sub) }, + { HP_POP(map->init_mapcache, HP_map_init_mapcache) }, + { HP_POP(map->readfromcache, HP_map_readfromcache) }, + { HP_POP(map->addmap, HP_map_addmap) }, + { HP_POP(map->delmapid, HP_map_delmapid) }, + { HP_POP(map->zone_db_clear, HP_map_zone_db_clear) }, + { HP_POP(map->list_final, HP_map_list_final) }, + { HP_POP(map->waterheight, HP_map_waterheight) }, + { HP_POP(map->readgat, HP_map_readgat) }, + { HP_POP(map->readallmaps, HP_map_readallmaps) }, + { HP_POP(map->config_read, HP_map_config_read) }, + { HP_POP(map->config_read_sub, HP_map_config_read_sub) }, + { HP_POP(map->reloadnpc_sub, HP_map_reloadnpc_sub) }, + { HP_POP(map->inter_config_read, HP_map_inter_config_read) }, + { HP_POP(map->sql_init, HP_map_sql_init) }, + { HP_POP(map->sql_close, HP_map_sql_close) }, + { HP_POP(map->zone_mf_cache, HP_map_zone_mf_cache) }, + { HP_POP(map->zone_str2itemid, HP_map_zone_str2itemid) }, + { HP_POP(map->zone_str2skillid, HP_map_zone_str2skillid) }, + { HP_POP(map->zone_bl_type, HP_map_zone_bl_type) }, + { HP_POP(map->read_zone_db, HP_map_read_zone_db) }, + { HP_POP(map->db_final, HP_map_db_final) }, + { HP_POP(map->nick_db_final, HP_map_nick_db_final) }, + { HP_POP(map->cleanup_db_sub, HP_map_cleanup_db_sub) }, + { HP_POP(map->abort_sub, HP_map_abort_sub) }, + { HP_POP(map->helpscreen, HP_map_helpscreen) }, + { HP_POP(map->versionscreen, HP_map_versionscreen) }, + { 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) }, + { HP_POP(map->merge_zone, HP_map_merge_zone) }, /* mapit */ - { HP_POP(mapit->alloc), HP_POP2(HP_mapit_alloc), 2826 }, - { HP_POP(mapit->free), HP_POP2(HP_mapit_free), 2828 }, - { HP_POP(mapit->first), HP_POP2(HP_mapit_first), 2830 }, - { HP_POP(mapit->last), HP_POP2(HP_mapit_last), 2832 }, - { HP_POP(mapit->next), HP_POP2(HP_mapit_next), 2834 }, - { HP_POP(mapit->prev), HP_POP2(HP_mapit_prev), 2836 }, - { HP_POP(mapit->exists), HP_POP2(HP_mapit_exists), 2838 }, + { HP_POP(mapit->alloc, HP_mapit_alloc) }, + { HP_POP(mapit->free, HP_mapit_free) }, + { HP_POP(mapit->first, HP_mapit_first) }, + { HP_POP(mapit->last, HP_mapit_last) }, + { HP_POP(mapit->next, HP_mapit_next) }, + { HP_POP(mapit->prev, HP_mapit_prev) }, + { HP_POP(mapit->exists, HP_mapit_exists) }, /* mapreg */ - { HP_POP(mapreg->init), HP_POP2(HP_mapreg_init), 2840 }, - { HP_POP(mapreg->final), HP_POP2(HP_mapreg_final), 2842 }, - { HP_POP(mapreg->readreg), HP_POP2(HP_mapreg_readreg), 2844 }, - { HP_POP(mapreg->readregstr), HP_POP2(HP_mapreg_readregstr), 2846 }, - { HP_POP(mapreg->setreg), HP_POP2(HP_mapreg_setreg), 2848 }, - { HP_POP(mapreg->setregstr), HP_POP2(HP_mapreg_setregstr), 2850 }, - { HP_POP(mapreg->load), HP_POP2(HP_mapreg_load), 2852 }, - { HP_POP(mapreg->save), HP_POP2(HP_mapreg_save), 2854 }, - { HP_POP(mapreg->save_timer), HP_POP2(HP_mapreg_save_timer), 2856 }, - { HP_POP(mapreg->reload), HP_POP2(HP_mapreg_reload), 2858 }, - { HP_POP(mapreg->config_read), HP_POP2(HP_mapreg_config_read), 2860 }, + { HP_POP(mapreg->init, HP_mapreg_init) }, + { HP_POP(mapreg->final, HP_mapreg_final) }, + { HP_POP(mapreg->readreg, HP_mapreg_readreg) }, + { HP_POP(mapreg->readregstr, HP_mapreg_readregstr) }, + { HP_POP(mapreg->setreg, HP_mapreg_setreg) }, + { HP_POP(mapreg->setregstr, HP_mapreg_setregstr) }, + { HP_POP(mapreg->load, HP_mapreg_load) }, + { HP_POP(mapreg->save, HP_mapreg_save) }, + { HP_POP(mapreg->save_timer, HP_mapreg_save_timer) }, + { HP_POP(mapreg->reload, HP_mapreg_reload) }, + { HP_POP(mapreg->config_read, HP_mapreg_config_read) }, /* mercenary */ - { HP_POP(mercenary->init), HP_POP2(HP_mercenary_init), 2862 }, - { HP_POP(mercenary->class), HP_POP2(HP_mercenary_class), 2864 }, - { HP_POP(mercenary->get_viewdata), HP_POP2(HP_mercenary_get_viewdata), 2866 }, - { HP_POP(mercenary->create), HP_POP2(HP_mercenary_create), 2868 }, - { HP_POP(mercenary->data_received), HP_POP2(HP_mercenary_data_received), 2870 }, - { HP_POP(mercenary->save), HP_POP2(HP_mercenary_save), 2872 }, - { HP_POP(mercenary->heal), HP_POP2(HP_mercenary_heal), 2874 }, - { HP_POP(mercenary->dead), HP_POP2(HP_mercenary_dead), 2876 }, - { HP_POP(mercenary->delete), HP_POP2(HP_mercenary_delete), 2878 }, - { HP_POP(mercenary->contract_stop), HP_POP2(HP_mercenary_contract_stop), 2880 }, - { HP_POP(mercenary->get_lifetime), HP_POP2(HP_mercenary_get_lifetime), 2882 }, - { HP_POP(mercenary->get_guild), HP_POP2(HP_mercenary_get_guild), 2884 }, - { HP_POP(mercenary->get_faith), HP_POP2(HP_mercenary_get_faith), 2886 }, - { HP_POP(mercenary->set_faith), HP_POP2(HP_mercenary_set_faith), 2888 }, - { HP_POP(mercenary->get_calls), HP_POP2(HP_mercenary_get_calls), 2890 }, - { HP_POP(mercenary->set_calls), HP_POP2(HP_mercenary_set_calls), 2892 }, - { HP_POP(mercenary->kills), HP_POP2(HP_mercenary_kills), 2894 }, - { HP_POP(mercenary->checkskill), HP_POP2(HP_mercenary_checkskill), 2896 }, - { HP_POP(mercenary->read_db), HP_POP2(HP_mercenary_read_db), 2898 }, - { HP_POP(mercenary->read_skilldb), HP_POP2(HP_mercenary_read_skilldb), 2900 }, - { HP_POP(mercenary->killbonus), HP_POP2(HP_mercenary_killbonus), 2902 }, - { HP_POP(mercenary->search_index), HP_POP2(HP_mercenary_search_index), 2904 }, - { HP_POP(mercenary->contract_end_timer), HP_POP2(HP_mercenary_contract_end_timer), 2906 }, - { HP_POP(mercenary->read_db_sub), HP_POP2(HP_mercenary_read_db_sub), 2908 }, - { HP_POP(mercenary->read_skill_db_sub), HP_POP2(HP_mercenary_read_skill_db_sub), 2910 }, + { HP_POP(mercenary->init, HP_mercenary_init) }, + { HP_POP(mercenary->class, HP_mercenary_class) }, + { HP_POP(mercenary->get_viewdata, HP_mercenary_get_viewdata) }, + { HP_POP(mercenary->create, HP_mercenary_create) }, + { HP_POP(mercenary->data_received, HP_mercenary_data_received) }, + { HP_POP(mercenary->save, HP_mercenary_save) }, + { HP_POP(mercenary->heal, HP_mercenary_heal) }, + { HP_POP(mercenary->dead, HP_mercenary_dead) }, + { HP_POP(mercenary->delete, HP_mercenary_delete) }, + { HP_POP(mercenary->contract_stop, HP_mercenary_contract_stop) }, + { HP_POP(mercenary->get_lifetime, HP_mercenary_get_lifetime) }, + { HP_POP(mercenary->get_guild, HP_mercenary_get_guild) }, + { HP_POP(mercenary->get_faith, HP_mercenary_get_faith) }, + { HP_POP(mercenary->set_faith, HP_mercenary_set_faith) }, + { HP_POP(mercenary->get_calls, HP_mercenary_get_calls) }, + { HP_POP(mercenary->set_calls, HP_mercenary_set_calls) }, + { HP_POP(mercenary->kills, HP_mercenary_kills) }, + { HP_POP(mercenary->checkskill, HP_mercenary_checkskill) }, + { HP_POP(mercenary->read_db, HP_mercenary_read_db) }, + { HP_POP(mercenary->read_skilldb, HP_mercenary_read_skilldb) }, + { HP_POP(mercenary->killbonus, HP_mercenary_killbonus) }, + { HP_POP(mercenary->search_index, HP_mercenary_search_index) }, + { HP_POP(mercenary->contract_end_timer, HP_mercenary_contract_end_timer) }, + { HP_POP(mercenary->read_db_sub, HP_mercenary_read_db_sub) }, + { HP_POP(mercenary->read_skill_db_sub, HP_mercenary_read_skill_db_sub) }, /* mob */ - { HP_POP(mob->init), HP_POP2(HP_mob_init), 2912 }, - { HP_POP(mob->final), HP_POP2(HP_mob_final), 2914 }, - { HP_POP(mob->reload), HP_POP2(HP_mob_reload), 2916 }, - { HP_POP(mob->db), HP_POP2(HP_mob_db), 2918 }, - { HP_POP(mob->chat), HP_POP2(HP_mob_chat), 2920 }, - { HP_POP(mob->makedummymobdb), HP_POP2(HP_mob_makedummymobdb), 2922 }, - { HP_POP(mob->spawn_guardian_sub), HP_POP2(HP_mob_spawn_guardian_sub), 2924 }, - { HP_POP(mob->skill_id2skill_idx), HP_POP2(HP_mob_skill_id2skill_idx), 2926 }, - { HP_POP(mob->db_searchname), HP_POP2(HP_mob_db_searchname), 2928 }, - { HP_POP(mob->db_searchname_array_sub), HP_POP2(HP_mob_db_searchname_array_sub), 2930 }, - { HP_POP(mob->mvptomb_create), HP_POP2(HP_mob_mvptomb_create), 2932 }, - { HP_POP(mob->mvptomb_destroy), HP_POP2(HP_mob_mvptomb_destroy), 2934 }, - { HP_POP(mob->db_searchname_array), HP_POP2(HP_mob_db_searchname_array), 2936 }, - { HP_POP(mob->db_checkid), HP_POP2(HP_mob_db_checkid), 2938 }, - { HP_POP(mob->get_viewdata), HP_POP2(HP_mob_get_viewdata), 2940 }, - { HP_POP(mob->parse_dataset), HP_POP2(HP_mob_parse_dataset), 2942 }, - { HP_POP(mob->spawn_dataset), HP_POP2(HP_mob_spawn_dataset), 2944 }, - { HP_POP(mob->get_random_id), HP_POP2(HP_mob_get_random_id), 2946 }, - { HP_POP(mob->ksprotected), HP_POP2(HP_mob_ksprotected), 2948 }, - { HP_POP(mob->once_spawn_sub), HP_POP2(HP_mob_once_spawn_sub), 2950 }, - { HP_POP(mob->once_spawn), HP_POP2(HP_mob_once_spawn), 2952 }, - { HP_POP(mob->once_spawn_area), HP_POP2(HP_mob_once_spawn_area), 2954 }, - { HP_POP(mob->spawn_guardian), HP_POP2(HP_mob_spawn_guardian), 2956 }, - { HP_POP(mob->spawn_bg), HP_POP2(HP_mob_spawn_bg), 2958 }, - { HP_POP(mob->can_reach), HP_POP2(HP_mob_can_reach), 2960 }, - { HP_POP(mob->linksearch), HP_POP2(HP_mob_linksearch), 2962 }, - { HP_POP(mob->delayspawn), HP_POP2(HP_mob_delayspawn), 2964 }, - { HP_POP(mob->setdelayspawn), HP_POP2(HP_mob_setdelayspawn), 2966 }, - { HP_POP(mob->count_sub), HP_POP2(HP_mob_count_sub), 2968 }, - { HP_POP(mob->spawn), HP_POP2(HP_mob_spawn), 2970 }, - { HP_POP(mob->can_changetarget), HP_POP2(HP_mob_can_changetarget), 2972 }, - { HP_POP(mob->target), HP_POP2(HP_mob_target), 2974 }, - { HP_POP(mob->ai_sub_hard_activesearch), HP_POP2(HP_mob_ai_sub_hard_activesearch), 2976 }, - { HP_POP(mob->ai_sub_hard_changechase), HP_POP2(HP_mob_ai_sub_hard_changechase), 2978 }, - { HP_POP(mob->ai_sub_hard_bg_ally), HP_POP2(HP_mob_ai_sub_hard_bg_ally), 2980 }, - { HP_POP(mob->ai_sub_hard_lootsearch), HP_POP2(HP_mob_ai_sub_hard_lootsearch), 2982 }, - { HP_POP(mob->warpchase_sub), HP_POP2(HP_mob_warpchase_sub), 2984 }, - { HP_POP(mob->ai_sub_hard_slavemob), HP_POP2(HP_mob_ai_sub_hard_slavemob), 2986 }, - { HP_POP(mob->unlocktarget), HP_POP2(HP_mob_unlocktarget), 2988 }, - { HP_POP(mob->randomwalk), HP_POP2(HP_mob_randomwalk), 2990 }, - { HP_POP(mob->warpchase), HP_POP2(HP_mob_warpchase), 2992 }, - { HP_POP(mob->ai_sub_hard), HP_POP2(HP_mob_ai_sub_hard), 2994 }, - { HP_POP(mob->ai_sub_hard_timer), HP_POP2(HP_mob_ai_sub_hard_timer), 2996 }, - { HP_POP(mob->ai_sub_foreachclient), HP_POP2(HP_mob_ai_sub_foreachclient), 2998 }, - { HP_POP(mob->ai_sub_lazy), HP_POP2(HP_mob_ai_sub_lazy), 3000 }, - { HP_POP(mob->ai_lazy), HP_POP2(HP_mob_ai_lazy), 3002 }, - { HP_POP(mob->ai_hard), HP_POP2(HP_mob_ai_hard), 3004 }, - { HP_POP(mob->setdropitem), HP_POP2(HP_mob_setdropitem), 3006 }, - { HP_POP(mob->setlootitem), HP_POP2(HP_mob_setlootitem), 3008 }, - { HP_POP(mob->delay_item_drop), HP_POP2(HP_mob_delay_item_drop), 3010 }, - { HP_POP(mob->item_drop), HP_POP2(HP_mob_item_drop), 3012 }, - { HP_POP(mob->timer_delete), HP_POP2(HP_mob_timer_delete), 3014 }, - { HP_POP(mob->deleteslave_sub), HP_POP2(HP_mob_deleteslave_sub), 3016 }, - { HP_POP(mob->deleteslave), HP_POP2(HP_mob_deleteslave), 3018 }, - { HP_POP(mob->respawn), HP_POP2(HP_mob_respawn), 3020 }, - { HP_POP(mob->log_damage), HP_POP2(HP_mob_log_damage), 3022 }, - { HP_POP(mob->damage), HP_POP2(HP_mob_damage), 3024 }, - { HP_POP(mob->dead), HP_POP2(HP_mob_dead), 3026 }, - { HP_POP(mob->revive), HP_POP2(HP_mob_revive), 3028 }, - { HP_POP(mob->guardian_guildchange), HP_POP2(HP_mob_guardian_guildchange), 3030 }, - { HP_POP(mob->random_class), HP_POP2(HP_mob_random_class), 3032 }, - { HP_POP(mob->class_change), HP_POP2(HP_mob_class_change), 3034 }, - { HP_POP(mob->heal), HP_POP2(HP_mob_heal), 3036 }, - { HP_POP(mob->warpslave_sub), HP_POP2(HP_mob_warpslave_sub), 3038 }, - { HP_POP(mob->warpslave), HP_POP2(HP_mob_warpslave), 3040 }, - { HP_POP(mob->countslave_sub), HP_POP2(HP_mob_countslave_sub), 3042 }, - { HP_POP(mob->countslave), HP_POP2(HP_mob_countslave), 3044 }, - { HP_POP(mob->summonslave), HP_POP2(HP_mob_summonslave), 3046 }, - { HP_POP(mob->getfriendhprate_sub), HP_POP2(HP_mob_getfriendhprate_sub), 3048 }, - { HP_POP(mob->getfriendhprate), HP_POP2(HP_mob_getfriendhprate), 3050 }, - { HP_POP(mob->getmasterhpltmaxrate), HP_POP2(HP_mob_getmasterhpltmaxrate), 3052 }, - { HP_POP(mob->getfriendstatus_sub), HP_POP2(HP_mob_getfriendstatus_sub), 3054 }, - { HP_POP(mob->getfriendstatus), HP_POP2(HP_mob_getfriendstatus), 3056 }, - { HP_POP(mob->skill_use), HP_POP2(HP_mob_skill_use), 3058 }, - { HP_POP(mob->skill_event), HP_POP2(HP_mob_skill_event), 3060 }, - { HP_POP(mob->is_clone), HP_POP2(HP_mob_is_clone), 3062 }, - { HP_POP(mob->clone_spawn), HP_POP2(HP_mob_clone_spawn), 3064 }, - { HP_POP(mob->clone_delete), HP_POP2(HP_mob_clone_delete), 3066 }, - { HP_POP(mob->drop_adjust), HP_POP2(HP_mob_drop_adjust), 3068 }, - { HP_POP(mob->item_dropratio_adjust), HP_POP2(HP_mob_item_dropratio_adjust), 3070 }, - { HP_POP(mob->parse_dbrow), HP_POP2(HP_mob_parse_dbrow), 3072 }, - { HP_POP(mob->readdb_sub), HP_POP2(HP_mob_readdb_sub), 3074 }, - { HP_POP(mob->readdb), HP_POP2(HP_mob_readdb), 3076 }, - { HP_POP(mob->read_sqldb), HP_POP2(HP_mob_read_sqldb), 3078 }, - { HP_POP(mob->readdb_mobavail), HP_POP2(HP_mob_readdb_mobavail), 3080 }, - { HP_POP(mob->read_randommonster), HP_POP2(HP_mob_read_randommonster), 3082 }, - { HP_POP(mob->parse_row_chatdb), HP_POP2(HP_mob_parse_row_chatdb), 3084 }, - { HP_POP(mob->readchatdb), HP_POP2(HP_mob_readchatdb), 3086 }, - { HP_POP(mob->parse_row_mobskilldb), HP_POP2(HP_mob_parse_row_mobskilldb), 3088 }, - { HP_POP(mob->readskilldb), HP_POP2(HP_mob_readskilldb), 3090 }, - { HP_POP(mob->read_sqlskilldb), HP_POP2(HP_mob_read_sqlskilldb), 3092 }, - { HP_POP(mob->readdb_race2), HP_POP2(HP_mob_readdb_race2), 3094 }, - { HP_POP(mob->readdb_itemratio), HP_POP2(HP_mob_readdb_itemratio), 3096 }, - { HP_POP(mob->load), HP_POP2(HP_mob_load), 3098 }, - { HP_POP(mob->clear_spawninfo), HP_POP2(HP_mob_clear_spawninfo), 3100 }, + { HP_POP(mob->init, HP_mob_init) }, + { HP_POP(mob->final, HP_mob_final) }, + { HP_POP(mob->reload, HP_mob_reload) }, + { HP_POP(mob->db, HP_mob_db) }, + { HP_POP(mob->chat, HP_mob_chat) }, + { HP_POP(mob->makedummymobdb, HP_mob_makedummymobdb) }, + { HP_POP(mob->spawn_guardian_sub, HP_mob_spawn_guardian_sub) }, + { HP_POP(mob->skill_id2skill_idx, HP_mob_skill_id2skill_idx) }, + { HP_POP(mob->db_searchname, HP_mob_db_searchname) }, + { HP_POP(mob->db_searchname_array_sub, HP_mob_db_searchname_array_sub) }, + { HP_POP(mob->mvptomb_create, HP_mob_mvptomb_create) }, + { HP_POP(mob->mvptomb_destroy, HP_mob_mvptomb_destroy) }, + { HP_POP(mob->db_searchname_array, HP_mob_db_searchname_array) }, + { HP_POP(mob->db_checkid, HP_mob_db_checkid) }, + { HP_POP(mob->get_viewdata, HP_mob_get_viewdata) }, + { HP_POP(mob->parse_dataset, HP_mob_parse_dataset) }, + { HP_POP(mob->spawn_dataset, HP_mob_spawn_dataset) }, + { HP_POP(mob->get_random_id, HP_mob_get_random_id) }, + { HP_POP(mob->ksprotected, HP_mob_ksprotected) }, + { HP_POP(mob->once_spawn_sub, HP_mob_once_spawn_sub) }, + { HP_POP(mob->once_spawn, HP_mob_once_spawn) }, + { HP_POP(mob->once_spawn_area, HP_mob_once_spawn_area) }, + { HP_POP(mob->spawn_guardian, HP_mob_spawn_guardian) }, + { HP_POP(mob->spawn_bg, HP_mob_spawn_bg) }, + { HP_POP(mob->can_reach, HP_mob_can_reach) }, + { HP_POP(mob->linksearch, HP_mob_linksearch) }, + { HP_POP(mob->delayspawn, HP_mob_delayspawn) }, + { HP_POP(mob->setdelayspawn, HP_mob_setdelayspawn) }, + { HP_POP(mob->count_sub, HP_mob_count_sub) }, + { HP_POP(mob->spawn, HP_mob_spawn) }, + { HP_POP(mob->can_changetarget, HP_mob_can_changetarget) }, + { HP_POP(mob->target, HP_mob_target) }, + { HP_POP(mob->ai_sub_hard_activesearch, HP_mob_ai_sub_hard_activesearch) }, + { HP_POP(mob->ai_sub_hard_changechase, HP_mob_ai_sub_hard_changechase) }, + { HP_POP(mob->ai_sub_hard_bg_ally, HP_mob_ai_sub_hard_bg_ally) }, + { HP_POP(mob->ai_sub_hard_lootsearch, HP_mob_ai_sub_hard_lootsearch) }, + { HP_POP(mob->warpchase_sub, HP_mob_warpchase_sub) }, + { HP_POP(mob->ai_sub_hard_slavemob, HP_mob_ai_sub_hard_slavemob) }, + { HP_POP(mob->unlocktarget, HP_mob_unlocktarget) }, + { HP_POP(mob->randomwalk, HP_mob_randomwalk) }, + { HP_POP(mob->warpchase, HP_mob_warpchase) }, + { HP_POP(mob->ai_sub_hard, HP_mob_ai_sub_hard) }, + { HP_POP(mob->ai_sub_hard_timer, HP_mob_ai_sub_hard_timer) }, + { HP_POP(mob->ai_sub_foreachclient, HP_mob_ai_sub_foreachclient) }, + { HP_POP(mob->ai_sub_lazy, HP_mob_ai_sub_lazy) }, + { HP_POP(mob->ai_lazy, HP_mob_ai_lazy) }, + { HP_POP(mob->ai_hard, HP_mob_ai_hard) }, + { HP_POP(mob->setdropitem, HP_mob_setdropitem) }, + { HP_POP(mob->setlootitem, HP_mob_setlootitem) }, + { HP_POP(mob->delay_item_drop, HP_mob_delay_item_drop) }, + { HP_POP(mob->item_drop, HP_mob_item_drop) }, + { HP_POP(mob->timer_delete, HP_mob_timer_delete) }, + { HP_POP(mob->deleteslave_sub, HP_mob_deleteslave_sub) }, + { HP_POP(mob->deleteslave, HP_mob_deleteslave) }, + { HP_POP(mob->respawn, HP_mob_respawn) }, + { HP_POP(mob->log_damage, HP_mob_log_damage) }, + { HP_POP(mob->damage, HP_mob_damage) }, + { HP_POP(mob->dead, HP_mob_dead) }, + { HP_POP(mob->revive, HP_mob_revive) }, + { HP_POP(mob->guardian_guildchange, HP_mob_guardian_guildchange) }, + { HP_POP(mob->random_class, HP_mob_random_class) }, + { HP_POP(mob->class_change, HP_mob_class_change) }, + { HP_POP(mob->heal, HP_mob_heal) }, + { HP_POP(mob->warpslave_sub, HP_mob_warpslave_sub) }, + { HP_POP(mob->warpslave, HP_mob_warpslave) }, + { HP_POP(mob->countslave_sub, HP_mob_countslave_sub) }, + { HP_POP(mob->countslave, HP_mob_countslave) }, + { HP_POP(mob->summonslave, HP_mob_summonslave) }, + { HP_POP(mob->getfriendhprate_sub, HP_mob_getfriendhprate_sub) }, + { HP_POP(mob->getfriendhprate, HP_mob_getfriendhprate) }, + { HP_POP(mob->getmasterhpltmaxrate, HP_mob_getmasterhpltmaxrate) }, + { HP_POP(mob->getfriendstatus_sub, HP_mob_getfriendstatus_sub) }, + { HP_POP(mob->getfriendstatus, HP_mob_getfriendstatus) }, + { HP_POP(mob->skill_use, HP_mob_skill_use) }, + { HP_POP(mob->skill_event, HP_mob_skill_event) }, + { HP_POP(mob->is_clone, HP_mob_is_clone) }, + { HP_POP(mob->clone_spawn, HP_mob_clone_spawn) }, + { HP_POP(mob->clone_delete, HP_mob_clone_delete) }, + { HP_POP(mob->drop_adjust, HP_mob_drop_adjust) }, + { HP_POP(mob->item_dropratio_adjust, HP_mob_item_dropratio_adjust) }, + { HP_POP(mob->parse_dbrow, HP_mob_parse_dbrow) }, + { HP_POP(mob->readdb_sub, HP_mob_readdb_sub) }, + { HP_POP(mob->readdb, HP_mob_readdb) }, + { HP_POP(mob->read_sqldb, HP_mob_read_sqldb) }, + { HP_POP(mob->name_constants, HP_mob_name_constants) }, + { HP_POP(mob->readdb_mobavail, HP_mob_readdb_mobavail) }, + { HP_POP(mob->read_randommonster, HP_mob_read_randommonster) }, + { HP_POP(mob->parse_row_chatdb, HP_mob_parse_row_chatdb) }, + { HP_POP(mob->readchatdb, HP_mob_readchatdb) }, + { HP_POP(mob->parse_row_mobskilldb, HP_mob_parse_row_mobskilldb) }, + { HP_POP(mob->readskilldb, HP_mob_readskilldb) }, + { HP_POP(mob->read_sqlskilldb, HP_mob_read_sqlskilldb) }, + { HP_POP(mob->readdb_race2, HP_mob_readdb_race2) }, + { HP_POP(mob->readdb_itemratio, HP_mob_readdb_itemratio) }, + { HP_POP(mob->load, HP_mob_load) }, + { HP_POP(mob->clear_spawninfo, HP_mob_clear_spawninfo) }, /* npc */ - { HP_POP(npc->init), HP_POP2(HP_npc_init), 3102 }, - { HP_POP(npc->final), HP_POP2(HP_npc_final), 3104 }, - { HP_POP(npc->get_new_npc_id), HP_POP2(HP_npc_get_new_npc_id), 3106 }, - { HP_POP(npc->get_viewdata), HP_POP2(HP_npc_get_viewdata), 3108 }, - { HP_POP(npc->isnear_sub), HP_POP2(HP_npc_isnear_sub), 3110 }, - { HP_POP(npc->isnear), HP_POP2(HP_npc_isnear), 3112 }, - { HP_POP(npc->ontouch_event), HP_POP2(HP_npc_ontouch_event), 3114 }, - { HP_POP(npc->ontouch2_event), HP_POP2(HP_npc_ontouch2_event), 3116 }, - { HP_POP(npc->enable_sub), HP_POP2(HP_npc_enable_sub), 3118 }, - { HP_POP(npc->enable), HP_POP2(HP_npc_enable), 3120 }, - { HP_POP(npc->name2id), HP_POP2(HP_npc_name2id), 3122 }, - { HP_POP(npc->event_dequeue), HP_POP2(HP_npc_event_dequeue), 3124 }, - { HP_POP(npc->event_export_create), HP_POP2(HP_npc_event_export_create), 3126 }, - { HP_POP(npc->event_export), HP_POP2(HP_npc_event_export), 3128 }, - { HP_POP(npc->event_sub), HP_POP2(HP_npc_event_sub), 3130 }, - { HP_POP(npc->event_doall_sub), HP_POP2(HP_npc_event_doall_sub), 3132 }, - { HP_POP(npc->event_do), HP_POP2(HP_npc_event_do), 3134 }, - { HP_POP(npc->event_doall_id), HP_POP2(HP_npc_event_doall_id), 3136 }, - { HP_POP(npc->event_doall), HP_POP2(HP_npc_event_doall), 3138 }, - { HP_POP(npc->event_do_clock), HP_POP2(HP_npc_event_do_clock), 3140 }, - { HP_POP(npc->event_do_oninit), HP_POP2(HP_npc_event_do_oninit), 3142 }, - { HP_POP(npc->timerevent_export), HP_POP2(HP_npc_timerevent_export), 3144 }, - { HP_POP(npc->timerevent), HP_POP2(HP_npc_timerevent), 3146 }, - { HP_POP(npc->timerevent_start), HP_POP2(HP_npc_timerevent_start), 3148 }, - { HP_POP(npc->timerevent_stop), HP_POP2(HP_npc_timerevent_stop), 3150 }, - { HP_POP(npc->timerevent_quit), HP_POP2(HP_npc_timerevent_quit), 3152 }, - { HP_POP(npc->gettimerevent_tick), HP_POP2(HP_npc_gettimerevent_tick), 3154 }, - { HP_POP(npc->settimerevent_tick), HP_POP2(HP_npc_settimerevent_tick), 3156 }, - { HP_POP(npc->event), HP_POP2(HP_npc_event), 3158 }, - { HP_POP(npc->touch_areanpc_sub), HP_POP2(HP_npc_touch_areanpc_sub), 3160 }, - { HP_POP(npc->touchnext_areanpc), HP_POP2(HP_npc_touchnext_areanpc), 3162 }, - { HP_POP(npc->touch_areanpc), HP_POP2(HP_npc_touch_areanpc), 3164 }, - { HP_POP(npc->touch_areanpc2), HP_POP2(HP_npc_touch_areanpc2), 3166 }, - { HP_POP(npc->check_areanpc), HP_POP2(HP_npc_check_areanpc), 3168 }, - { HP_POP(npc->checknear), HP_POP2(HP_npc_checknear), 3170 }, - { HP_POP(npc->globalmessage), HP_POP2(HP_npc_globalmessage), 3172 }, - { HP_POP(npc->run_tomb), HP_POP2(HP_npc_run_tomb), 3174 }, - { HP_POP(npc->click), HP_POP2(HP_npc_click), 3176 }, - { HP_POP(npc->scriptcont), HP_POP2(HP_npc_scriptcont), 3178 }, - { HP_POP(npc->buysellsel), HP_POP2(HP_npc_buysellsel), 3180 }, - { HP_POP(npc->cashshop_buylist), HP_POP2(HP_npc_cashshop_buylist), 3182 }, - { HP_POP(npc->buylist_sub), HP_POP2(HP_npc_buylist_sub), 3184 }, - { HP_POP(npc->cashshop_buy), HP_POP2(HP_npc_cashshop_buy), 3186 }, - { HP_POP(npc->buylist), HP_POP2(HP_npc_buylist), 3188 }, - { HP_POP(npc->selllist_sub), HP_POP2(HP_npc_selllist_sub), 3190 }, - { HP_POP(npc->selllist), HP_POP2(HP_npc_selllist), 3192 }, - { HP_POP(npc->remove_map), HP_POP2(HP_npc_remove_map), 3194 }, - { HP_POP(npc->unload_ev), HP_POP2(HP_npc_unload_ev), 3196 }, - { HP_POP(npc->unload_ev_label), HP_POP2(HP_npc_unload_ev_label), 3198 }, - { HP_POP(npc->unload_dup_sub), HP_POP2(HP_npc_unload_dup_sub), 3200 }, - { HP_POP(npc->unload_duplicates), HP_POP2(HP_npc_unload_duplicates), 3202 }, - { HP_POP(npc->unload), HP_POP2(HP_npc_unload), 3204 }, - { HP_POP(npc->clearsrcfile), HP_POP2(HP_npc_clearsrcfile), 3206 }, - { HP_POP(npc->addsrcfile), HP_POP2(HP_npc_addsrcfile), 3208 }, - { HP_POP(npc->delsrcfile), HP_POP2(HP_npc_delsrcfile), 3210 }, - { HP_POP(npc->parsename), HP_POP2(HP_npc_parsename), 3212 }, - { HP_POP(npc->add_warp), HP_POP2(HP_npc_add_warp), 3214 }, - { HP_POP(npc->parse_warp), HP_POP2(HP_npc_parse_warp), 3216 }, - { HP_POP(npc->parse_shop), HP_POP2(HP_npc_parse_shop), 3218 }, - { HP_POP(npc->convertlabel_db), HP_POP2(HP_npc_convertlabel_db), 3220 }, - { HP_POP(npc->skip_script), HP_POP2(HP_npc_skip_script), 3222 }, - { HP_POP(npc->parse_script), HP_POP2(HP_npc_parse_script), 3224 }, - { HP_POP(npc->parse_duplicate), HP_POP2(HP_npc_parse_duplicate), 3226 }, - { HP_POP(npc->duplicate4instance), HP_POP2(HP_npc_duplicate4instance), 3228 }, - { HP_POP(npc->setcells), HP_POP2(HP_npc_setcells), 3230 }, - { HP_POP(npc->unsetcells_sub), HP_POP2(HP_npc_unsetcells_sub), 3232 }, - { HP_POP(npc->unsetcells), HP_POP2(HP_npc_unsetcells), 3234 }, - { HP_POP(npc->movenpc), HP_POP2(HP_npc_movenpc), 3236 }, - { HP_POP(npc->setdisplayname), HP_POP2(HP_npc_setdisplayname), 3238 }, - { HP_POP(npc->setclass), HP_POP2(HP_npc_setclass), 3240 }, - { HP_POP(npc->do_atcmd_event), HP_POP2(HP_npc_do_atcmd_event), 3242 }, - { HP_POP(npc->parse_function), HP_POP2(HP_npc_parse_function), 3244 }, - { HP_POP(npc->parse_mob2), HP_POP2(HP_npc_parse_mob2), 3246 }, - { HP_POP(npc->parse_mob), HP_POP2(HP_npc_parse_mob), 3248 }, - { HP_POP(npc->parse_mapflag), HP_POP2(HP_npc_parse_mapflag), 3250 }, - { HP_POP(npc->parsesrcfile), HP_POP2(HP_npc_parsesrcfile), 3252 }, - { HP_POP(npc->script_event), HP_POP2(HP_npc_script_event), 3254 }, - { HP_POP(npc->read_event_script), HP_POP2(HP_npc_read_event_script), 3256 }, - { HP_POP(npc->path_db_clear_sub), HP_POP2(HP_npc_path_db_clear_sub), 3258 }, - { HP_POP(npc->ev_label_db_clear_sub), HP_POP2(HP_npc_ev_label_db_clear_sub), 3260 }, - { HP_POP(npc->reload), HP_POP2(HP_npc_reload), 3262 }, - { HP_POP(npc->unloadfile), HP_POP2(HP_npc_unloadfile), 3264 }, - { HP_POP(npc->do_clear_npc), HP_POP2(HP_npc_do_clear_npc), 3266 }, - { HP_POP(npc->debug_warps_sub), HP_POP2(HP_npc_debug_warps_sub), 3268 }, - { HP_POP(npc->debug_warps), HP_POP2(HP_npc_debug_warps), 3270 }, - { HP_POP(npc->secure_timeout_timer), HP_POP2(HP_npc_secure_timeout_timer), 3272 }, + { HP_POP(npc->init, HP_npc_init) }, + { HP_POP(npc->final, HP_npc_final) }, + { HP_POP(npc->get_new_npc_id, HP_npc_get_new_npc_id) }, + { HP_POP(npc->get_viewdata, HP_npc_get_viewdata) }, + { HP_POP(npc->isnear_sub, HP_npc_isnear_sub) }, + { HP_POP(npc->isnear, HP_npc_isnear) }, + { HP_POP(npc->ontouch_event, HP_npc_ontouch_event) }, + { HP_POP(npc->ontouch2_event, HP_npc_ontouch2_event) }, + { HP_POP(npc->enable_sub, HP_npc_enable_sub) }, + { HP_POP(npc->enable, HP_npc_enable) }, + { HP_POP(npc->name2id, HP_npc_name2id) }, + { HP_POP(npc->event_dequeue, HP_npc_event_dequeue) }, + { HP_POP(npc->event_export_create, HP_npc_event_export_create) }, + { HP_POP(npc->event_export, HP_npc_event_export) }, + { HP_POP(npc->event_sub, HP_npc_event_sub) }, + { HP_POP(npc->event_doall_sub, HP_npc_event_doall_sub) }, + { HP_POP(npc->event_do, HP_npc_event_do) }, + { HP_POP(npc->event_doall_id, HP_npc_event_doall_id) }, + { HP_POP(npc->event_doall, HP_npc_event_doall) }, + { HP_POP(npc->event_do_clock, HP_npc_event_do_clock) }, + { HP_POP(npc->event_do_oninit, HP_npc_event_do_oninit) }, + { HP_POP(npc->timerevent_export, HP_npc_timerevent_export) }, + { HP_POP(npc->timerevent, HP_npc_timerevent) }, + { HP_POP(npc->timerevent_start, HP_npc_timerevent_start) }, + { HP_POP(npc->timerevent_stop, HP_npc_timerevent_stop) }, + { HP_POP(npc->timerevent_quit, HP_npc_timerevent_quit) }, + { HP_POP(npc->gettimerevent_tick, HP_npc_gettimerevent_tick) }, + { HP_POP(npc->settimerevent_tick, HP_npc_settimerevent_tick) }, + { HP_POP(npc->event, HP_npc_event) }, + { HP_POP(npc->touch_areanpc_sub, HP_npc_touch_areanpc_sub) }, + { HP_POP(npc->touchnext_areanpc, HP_npc_touchnext_areanpc) }, + { HP_POP(npc->touch_areanpc, HP_npc_touch_areanpc) }, + { HP_POP(npc->touch_areanpc2, HP_npc_touch_areanpc2) }, + { HP_POP(npc->check_areanpc, HP_npc_check_areanpc) }, + { HP_POP(npc->checknear, HP_npc_checknear) }, + { HP_POP(npc->globalmessage, HP_npc_globalmessage) }, + { HP_POP(npc->run_tomb, HP_npc_run_tomb) }, + { HP_POP(npc->click, HP_npc_click) }, + { HP_POP(npc->scriptcont, HP_npc_scriptcont) }, + { HP_POP(npc->buysellsel, HP_npc_buysellsel) }, + { HP_POP(npc->cashshop_buylist, HP_npc_cashshop_buylist) }, + { HP_POP(npc->buylist_sub, HP_npc_buylist_sub) }, + { HP_POP(npc->cashshop_buy, HP_npc_cashshop_buy) }, + { HP_POP(npc->buylist, HP_npc_buylist) }, + { HP_POP(npc->selllist_sub, HP_npc_selllist_sub) }, + { HP_POP(npc->selllist, HP_npc_selllist) }, + { HP_POP(npc->remove_map, HP_npc_remove_map) }, + { HP_POP(npc->unload_ev, HP_npc_unload_ev) }, + { HP_POP(npc->unload_ev_label, HP_npc_unload_ev_label) }, + { HP_POP(npc->unload_dup_sub, HP_npc_unload_dup_sub) }, + { HP_POP(npc->unload_duplicates, HP_npc_unload_duplicates) }, + { HP_POP(npc->unload, HP_npc_unload) }, + { HP_POP(npc->clearsrcfile, HP_npc_clearsrcfile) }, + { 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) }, + { HP_POP(npc->convertlabel_db, HP_npc_convertlabel_db) }, + { HP_POP(npc->skip_script, HP_npc_skip_script) }, + { HP_POP(npc->parse_script, HP_npc_parse_script) }, + { HP_POP(npc->parse_duplicate, HP_npc_parse_duplicate) }, + { HP_POP(npc->duplicate4instance, HP_npc_duplicate4instance) }, + { HP_POP(npc->setcells, HP_npc_setcells) }, + { HP_POP(npc->unsetcells_sub, HP_npc_unsetcells_sub) }, + { HP_POP(npc->unsetcells, HP_npc_unsetcells) }, + { HP_POP(npc->movenpc, HP_npc_movenpc) }, + { HP_POP(npc->setdisplayname, HP_npc_setdisplayname) }, + { HP_POP(npc->setclass, HP_npc_setclass) }, + { HP_POP(npc->do_atcmd_event, HP_npc_do_atcmd_event) }, + { HP_POP(npc->parse_function, HP_npc_parse_function) }, + { HP_POP(npc->parse_mob2, HP_npc_parse_mob2) }, + { HP_POP(npc->parse_mob, HP_npc_parse_mob) }, + { HP_POP(npc->parse_mapflag, HP_npc_parse_mapflag) }, + { HP_POP(npc->parsesrcfile, HP_npc_parsesrcfile) }, + { HP_POP(npc->script_event, HP_npc_script_event) }, + { HP_POP(npc->read_event_script, HP_npc_read_event_script) }, + { HP_POP(npc->path_db_clear_sub, HP_npc_path_db_clear_sub) }, + { HP_POP(npc->ev_label_db_clear_sub, HP_npc_ev_label_db_clear_sub) }, + { HP_POP(npc->reload, HP_npc_reload) }, + { HP_POP(npc->unloadfile, HP_npc_unloadfile) }, + { HP_POP(npc->do_clear_npc, HP_npc_do_clear_npc) }, + { HP_POP(npc->debug_warps_sub, HP_npc_debug_warps_sub) }, + { HP_POP(npc->debug_warps, HP_npc_debug_warps) }, + { HP_POP(npc->trader_count_funds, HP_npc_trader_count_funds) }, + { HP_POP(npc->trader_pay, HP_npc_trader_pay) }, + { HP_POP(npc->trader_update, HP_npc_trader_update) }, + { HP_POP(npc->market_buylist, HP_npc_market_buylist) }, + { HP_POP(npc->trader_open, HP_npc_trader_open) }, + { HP_POP(npc->market_fromsql, HP_npc_market_fromsql) }, + { HP_POP(npc->market_tosql, HP_npc_market_tosql) }, + { HP_POP(npc->market_delfromsql, HP_npc_market_delfromsql) }, + { HP_POP(npc->market_delfromsql_sub, HP_npc_market_delfromsql_sub) }, + { HP_POP(npc->secure_timeout_timer, HP_npc_secure_timeout_timer) }, /* party */ - { HP_POP(party->init), HP_POP2(HP_party_init), 3274 }, - { HP_POP(party->final), HP_POP2(HP_party_final), 3276 }, - { HP_POP(party->search), HP_POP2(HP_party_search), 3278 }, - { HP_POP(party->searchname), HP_POP2(HP_party_searchname), 3280 }, - { HP_POP(party->getmemberid), HP_POP2(HP_party_getmemberid), 3282 }, - { HP_POP(party->getavailablesd), HP_POP2(HP_party_getavailablesd), 3284 }, - { HP_POP(party->create), HP_POP2(HP_party_create), 3286 }, - { HP_POP(party->created), HP_POP2(HP_party_created), 3288 }, - { HP_POP(party->request_info), HP_POP2(HP_party_request_info), 3290 }, - { HP_POP(party->invite), HP_POP2(HP_party_invite), 3292 }, - { HP_POP(party->member_joined), HP_POP2(HP_party_member_joined), 3294 }, - { HP_POP(party->member_added), HP_POP2(HP_party_member_added), 3296 }, - { HP_POP(party->leave), HP_POP2(HP_party_leave), 3298 }, - { HP_POP(party->removemember), HP_POP2(HP_party_removemember), 3300 }, - { HP_POP(party->member_withdraw), HP_POP2(HP_party_member_withdraw), 3302 }, - { HP_POP(party->reply_invite), HP_POP2(HP_party_reply_invite), 3304 }, - { HP_POP(party->recv_noinfo), HP_POP2(HP_party_recv_noinfo), 3306 }, - { HP_POP(party->recv_info), HP_POP2(HP_party_recv_info), 3308 }, - { HP_POP(party->recv_movemap), HP_POP2(HP_party_recv_movemap), 3310 }, - { HP_POP(party->broken), HP_POP2(HP_party_broken), 3312 }, - { HP_POP(party->optionchanged), HP_POP2(HP_party_optionchanged), 3314 }, - { HP_POP(party->changeoption), HP_POP2(HP_party_changeoption), 3316 }, - { HP_POP(party->changeleader), HP_POP2(HP_party_changeleader), 3318 }, - { HP_POP(party->send_movemap), HP_POP2(HP_party_send_movemap), 3320 }, - { HP_POP(party->send_levelup), HP_POP2(HP_party_send_levelup), 3322 }, - { HP_POP(party->send_logout), HP_POP2(HP_party_send_logout), 3324 }, - { HP_POP(party->send_message), HP_POP2(HP_party_send_message), 3326 }, - { HP_POP(party->recv_message), HP_POP2(HP_party_recv_message), 3328 }, - { HP_POP(party->skill_check), HP_POP2(HP_party_skill_check), 3330 }, - { HP_POP(party->send_xy_clear), HP_POP2(HP_party_send_xy_clear), 3332 }, - { HP_POP(party->exp_share), HP_POP2(HP_party_exp_share), 3334 }, - { HP_POP(party->share_loot), HP_POP2(HP_party_share_loot), 3336 }, - { HP_POP(party->send_dot_remove), HP_POP2(HP_party_send_dot_remove), 3338 }, - { HP_POP(party->sub_count), HP_POP2(HP_party_sub_count), 3340 }, - { HP_POP(party->booking_register), HP_POP2(HP_party_booking_register), 3342 }, - { HP_POP(party->booking_update), HP_POP2(HP_party_booking_update), 3344 }, - { HP_POP(party->booking_search), HP_POP2(HP_party_booking_search), 3346 }, - { HP_POP(party->recruit_register), HP_POP2(HP_party_recruit_register), 3348 }, - { HP_POP(party->recruit_update), HP_POP2(HP_party_recruit_update), 3350 }, - { HP_POP(party->recruit_search), HP_POP2(HP_party_recruit_search), 3352 }, - { HP_POP(party->booking_delete), HP_POP2(HP_party_booking_delete), 3354 }, - { HP_POP(party->vforeachsamemap), HP_POP2(HP_party_vforeachsamemap), 3356 }, - { HP_POP(party->send_xy_timer), HP_POP2(HP_party_send_xy_timer), 3358 }, - { HP_POP(party->fill_member), HP_POP2(HP_party_fill_member), 3360 }, - { HP_POP(party->sd_check), HP_POP2(HP_party_sd_check), 3362 }, - { HP_POP(party->check_state), HP_POP2(HP_party_check_state), 3364 }, - { HP_POP(party->create_booking_data), HP_POP2(HP_party_create_booking_data), 3366 }, - { HP_POP(party->db_final), HP_POP2(HP_party_db_final), 3368 }, + { HP_POP(party->init, HP_party_init) }, + { HP_POP(party->final, HP_party_final) }, + { HP_POP(party->search, HP_party_search) }, + { HP_POP(party->searchname, HP_party_searchname) }, + { HP_POP(party->getmemberid, HP_party_getmemberid) }, + { HP_POP(party->getavailablesd, HP_party_getavailablesd) }, + { HP_POP(party->create, HP_party_create) }, + { HP_POP(party->created, HP_party_created) }, + { HP_POP(party->request_info, HP_party_request_info) }, + { HP_POP(party->invite, HP_party_invite) }, + { HP_POP(party->member_joined, HP_party_member_joined) }, + { HP_POP(party->member_added, HP_party_member_added) }, + { HP_POP(party->leave, HP_party_leave) }, + { HP_POP(party->removemember, HP_party_removemember) }, + { HP_POP(party->member_withdraw, HP_party_member_withdraw) }, + { HP_POP(party->reply_invite, HP_party_reply_invite) }, + { HP_POP(party->recv_noinfo, HP_party_recv_noinfo) }, + { HP_POP(party->recv_info, HP_party_recv_info) }, + { HP_POP(party->recv_movemap, HP_party_recv_movemap) }, + { HP_POP(party->broken, HP_party_broken) }, + { HP_POP(party->optionchanged, HP_party_optionchanged) }, + { HP_POP(party->changeoption, HP_party_changeoption) }, + { HP_POP(party->changeleader, HP_party_changeleader) }, + { HP_POP(party->send_movemap, HP_party_send_movemap) }, + { HP_POP(party->send_levelup, HP_party_send_levelup) }, + { HP_POP(party->send_logout, HP_party_send_logout) }, + { HP_POP(party->send_message, HP_party_send_message) }, + { HP_POP(party->recv_message, HP_party_recv_message) }, + { HP_POP(party->skill_check, HP_party_skill_check) }, + { HP_POP(party->send_xy_clear, HP_party_send_xy_clear) }, + { HP_POP(party->exp_share, HP_party_exp_share) }, + { HP_POP(party->share_loot, HP_party_share_loot) }, + { HP_POP(party->send_dot_remove, HP_party_send_dot_remove) }, + { HP_POP(party->sub_count, HP_party_sub_count) }, + { HP_POP(party->sub_count_chorus, HP_party_sub_count_chorus) }, + { HP_POP(party->booking_register, HP_party_booking_register) }, + { HP_POP(party->booking_update, HP_party_booking_update) }, + { HP_POP(party->booking_search, HP_party_booking_search) }, + { HP_POP(party->recruit_register, HP_party_recruit_register) }, + { HP_POP(party->recruit_update, HP_party_recruit_update) }, + { HP_POP(party->recruit_search, HP_party_recruit_search) }, + { HP_POP(party->booking_delete, HP_party_booking_delete) }, + { HP_POP(party->vforeachsamemap, HP_party_vforeachsamemap) }, + { HP_POP(party->send_xy_timer, HP_party_send_xy_timer) }, + { HP_POP(party->fill_member, HP_party_fill_member) }, + { HP_POP(party->sd_check, HP_party_sd_check) }, + { HP_POP(party->check_state, HP_party_check_state) }, + { HP_POP(party->create_booking_data, HP_party_create_booking_data) }, + { HP_POP(party->db_final, HP_party_db_final) }, /* path */ - { HP_POP(path->blownpos), HP_POP2(HP_path_blownpos), 3370 }, - { HP_POP(path->search), HP_POP2(HP_path_search), 3372 }, - { HP_POP(path->search_long), HP_POP2(HP_path_search_long), 3374 }, - { HP_POP(path->check_distance), HP_POP2(HP_path_check_distance), 3376 }, - { HP_POP(path->distance), HP_POP2(HP_path_distance), 3378 }, + { HP_POP(path->blownpos, HP_path_blownpos) }, + { HP_POP(path->search, HP_path_search) }, + { HP_POP(path->search_long, HP_path_search_long) }, + { HP_POP(path->check_distance, HP_path_check_distance) }, + { HP_POP(path->distance, HP_path_distance) }, +/* pcg */ + { HP_POP(pcg->init, HP_pcg_init) }, + { HP_POP(pcg->final, HP_pcg_final) }, + { HP_POP(pcg->reload, HP_pcg_reload) }, + { HP_POP(pcg->get_dummy_group, HP_pcg_get_dummy_group) }, + { HP_POP(pcg->exists, HP_pcg_exists) }, + { HP_POP(pcg->id2group, HP_pcg_id2group) }, + { HP_POP(pcg->has_permission, HP_pcg_has_permission) }, + { HP_POP(pcg->should_log_commands, HP_pcg_should_log_commands) }, + { HP_POP(pcg->get_name, HP_pcg_get_name) }, + { HP_POP(pcg->get_level, HP_pcg_get_level) }, + { HP_POP(pcg->get_idx, HP_pcg_get_idx) }, /* pc */ - { HP_POP(pc->init), HP_POP2(HP_pc_init), 3380 }, - { HP_POP(pc->final), HP_POP2(HP_pc_final), 3382 }, - { HP_POP(pc->get_dummy_sd), HP_POP2(HP_pc_get_dummy_sd), 3384 }, - { HP_POP(pc->class2idx), HP_POP2(HP_pc_class2idx), 3386 }, - { HP_POP(pc->get_group_level), HP_POP2(HP_pc_get_group_level), 3388 }, - { HP_POP(pc->can_give_items), HP_POP2(HP_pc_can_give_items), 3390 }, - { HP_POP(pc->can_use_command), HP_POP2(HP_pc_can_use_command), 3392 }, - { HP_POP(pc->has_permission), HP_POP2(HP_pc_has_permission), 3394 }, - { HP_POP(pc->set_group), HP_POP2(HP_pc_set_group), 3396 }, - { HP_POP(pc->should_log_commands), HP_POP2(HP_pc_should_log_commands), 3398 }, - { HP_POP(pc->setrestartvalue), HP_POP2(HP_pc_setrestartvalue), 3400 }, - { HP_POP(pc->makesavestatus), HP_POP2(HP_pc_makesavestatus), 3402 }, - { HP_POP(pc->respawn), HP_POP2(HP_pc_respawn), 3404 }, - { HP_POP(pc->setnewpc), HP_POP2(HP_pc_setnewpc), 3406 }, - { HP_POP(pc->authok), HP_POP2(HP_pc_authok), 3408 }, - { HP_POP(pc->authfail), HP_POP2(HP_pc_authfail), 3410 }, - { HP_POP(pc->reg_received), HP_POP2(HP_pc_reg_received), 3412 }, - { HP_POP(pc->isequip), HP_POP2(HP_pc_isequip), 3414 }, - { HP_POP(pc->equippoint), HP_POP2(HP_pc_equippoint), 3416 }, - { HP_POP(pc->setinventorydata), HP_POP2(HP_pc_setinventorydata), 3418 }, - { HP_POP(pc->checkskill), HP_POP2(HP_pc_checkskill), 3420 }, - { HP_POP(pc->checkskill2), HP_POP2(HP_pc_checkskill2), 3422 }, - { HP_POP(pc->checkallowskill), HP_POP2(HP_pc_checkallowskill), 3424 }, - { HP_POP(pc->checkequip), HP_POP2(HP_pc_checkequip), 3426 }, - { HP_POP(pc->calc_skilltree), HP_POP2(HP_pc_calc_skilltree), 3428 }, - { HP_POP(pc->calc_skilltree_normalize_job), HP_POP2(HP_pc_calc_skilltree_normalize_job), 3430 }, - { HP_POP(pc->clean_skilltree), HP_POP2(HP_pc_clean_skilltree), 3432 }, - { HP_POP(pc->setpos), HP_POP2(HP_pc_setpos), 3434 }, - { HP_POP(pc->setsavepoint), HP_POP2(HP_pc_setsavepoint), 3436 }, - { HP_POP(pc->randomwarp), HP_POP2(HP_pc_randomwarp), 3438 }, - { HP_POP(pc->memo), HP_POP2(HP_pc_memo), 3440 }, - { HP_POP(pc->checkadditem), HP_POP2(HP_pc_checkadditem), 3442 }, - { HP_POP(pc->inventoryblank), HP_POP2(HP_pc_inventoryblank), 3444 }, - { HP_POP(pc->search_inventory), HP_POP2(HP_pc_search_inventory), 3446 }, - { HP_POP(pc->payzeny), HP_POP2(HP_pc_payzeny), 3448 }, - { HP_POP(pc->additem), HP_POP2(HP_pc_additem), 3450 }, - { HP_POP(pc->getzeny), HP_POP2(HP_pc_getzeny), 3452 }, - { HP_POP(pc->delitem), HP_POP2(HP_pc_delitem), 3454 }, - { HP_POP(pc->paycash), HP_POP2(HP_pc_paycash), 3456 }, - { HP_POP(pc->getcash), HP_POP2(HP_pc_getcash), 3458 }, - { HP_POP(pc->cart_additem), HP_POP2(HP_pc_cart_additem), 3460 }, - { HP_POP(pc->cart_delitem), HP_POP2(HP_pc_cart_delitem), 3462 }, - { HP_POP(pc->putitemtocart), HP_POP2(HP_pc_putitemtocart), 3464 }, - { HP_POP(pc->getitemfromcart), HP_POP2(HP_pc_getitemfromcart), 3466 }, - { HP_POP(pc->cartitem_amount), HP_POP2(HP_pc_cartitem_amount), 3468 }, - { HP_POP(pc->takeitem), HP_POP2(HP_pc_takeitem), 3470 }, - { HP_POP(pc->dropitem), HP_POP2(HP_pc_dropitem), 3472 }, - { HP_POP(pc->isequipped), HP_POP2(HP_pc_isequipped), 3474 }, - { HP_POP(pc->can_Adopt), HP_POP2(HP_pc_can_Adopt), 3476 }, - { HP_POP(pc->adoption), HP_POP2(HP_pc_adoption), 3478 }, - { HP_POP(pc->updateweightstatus), HP_POP2(HP_pc_updateweightstatus), 3480 }, - { HP_POP(pc->addautobonus), HP_POP2(HP_pc_addautobonus), 3482 }, - { HP_POP(pc->exeautobonus), HP_POP2(HP_pc_exeautobonus), 3484 }, - { HP_POP(pc->endautobonus), HP_POP2(HP_pc_endautobonus), 3486 }, - { HP_POP(pc->delautobonus), HP_POP2(HP_pc_delautobonus), 3488 }, - { HP_POP(pc->bonus), HP_POP2(HP_pc_bonus), 3490 }, - { HP_POP(pc->bonus2), HP_POP2(HP_pc_bonus2), 3492 }, - { HP_POP(pc->bonus3), HP_POP2(HP_pc_bonus3), 3494 }, - { HP_POP(pc->bonus4), HP_POP2(HP_pc_bonus4), 3496 }, - { HP_POP(pc->bonus5), HP_POP2(HP_pc_bonus5), 3498 }, - { HP_POP(pc->skill), HP_POP2(HP_pc_skill), 3500 }, - { HP_POP(pc->insert_card), HP_POP2(HP_pc_insert_card), 3502 }, - { HP_POP(pc->steal_item), HP_POP2(HP_pc_steal_item), 3504 }, - { HP_POP(pc->steal_coin), HP_POP2(HP_pc_steal_coin), 3506 }, - { HP_POP(pc->modifybuyvalue), HP_POP2(HP_pc_modifybuyvalue), 3508 }, - { HP_POP(pc->modifysellvalue), HP_POP2(HP_pc_modifysellvalue), 3510 }, - { HP_POP(pc->follow), HP_POP2(HP_pc_follow), 3512 }, - { HP_POP(pc->stop_following), HP_POP2(HP_pc_stop_following), 3514 }, - { HP_POP(pc->maxbaselv), HP_POP2(HP_pc_maxbaselv), 3516 }, - { HP_POP(pc->maxjoblv), HP_POP2(HP_pc_maxjoblv), 3518 }, - { HP_POP(pc->checkbaselevelup), HP_POP2(HP_pc_checkbaselevelup), 3520 }, - { HP_POP(pc->checkjoblevelup), HP_POP2(HP_pc_checkjoblevelup), 3522 }, - { HP_POP(pc->gainexp), HP_POP2(HP_pc_gainexp), 3524 }, - { HP_POP(pc->nextbaseexp), HP_POP2(HP_pc_nextbaseexp), 3526 }, - { HP_POP(pc->thisbaseexp), HP_POP2(HP_pc_thisbaseexp), 3528 }, - { HP_POP(pc->nextjobexp), HP_POP2(HP_pc_nextjobexp), 3530 }, - { HP_POP(pc->thisjobexp), HP_POP2(HP_pc_thisjobexp), 3532 }, - { HP_POP(pc->gets_status_point), HP_POP2(HP_pc_gets_status_point), 3534 }, - { HP_POP(pc->need_status_point), HP_POP2(HP_pc_need_status_point), 3536 }, - { HP_POP(pc->statusup), HP_POP2(HP_pc_statusup), 3538 }, - { HP_POP(pc->statusup2), HP_POP2(HP_pc_statusup2), 3540 }, - { HP_POP(pc->skillup), HP_POP2(HP_pc_skillup), 3542 }, - { HP_POP(pc->allskillup), HP_POP2(HP_pc_allskillup), 3544 }, - { HP_POP(pc->resetlvl), HP_POP2(HP_pc_resetlvl), 3546 }, - { HP_POP(pc->resetstate), HP_POP2(HP_pc_resetstate), 3548 }, - { HP_POP(pc->resetskill), HP_POP2(HP_pc_resetskill), 3550 }, - { HP_POP(pc->resetfeel), HP_POP2(HP_pc_resetfeel), 3552 }, - { HP_POP(pc->resethate), HP_POP2(HP_pc_resethate), 3554 }, - { HP_POP(pc->equipitem), HP_POP2(HP_pc_equipitem), 3556 }, - { HP_POP(pc->unequipitem), HP_POP2(HP_pc_unequipitem), 3558 }, - { HP_POP(pc->checkitem), HP_POP2(HP_pc_checkitem), 3560 }, - { HP_POP(pc->useitem), HP_POP2(HP_pc_useitem), 3562 }, - { HP_POP(pc->skillatk_bonus), HP_POP2(HP_pc_skillatk_bonus), 3564 }, - { HP_POP(pc->skillheal_bonus), HP_POP2(HP_pc_skillheal_bonus), 3566 }, - { HP_POP(pc->skillheal2_bonus), HP_POP2(HP_pc_skillheal2_bonus), 3568 }, - { HP_POP(pc->damage), HP_POP2(HP_pc_damage), 3570 }, - { HP_POP(pc->dead), HP_POP2(HP_pc_dead), 3572 }, - { HP_POP(pc->revive), HP_POP2(HP_pc_revive), 3574 }, - { HP_POP(pc->heal), HP_POP2(HP_pc_heal), 3576 }, - { HP_POP(pc->itemheal), HP_POP2(HP_pc_itemheal), 3578 }, - { HP_POP(pc->percentheal), HP_POP2(HP_pc_percentheal), 3580 }, - { HP_POP(pc->jobchange), HP_POP2(HP_pc_jobchange), 3582 }, - { HP_POP(pc->setoption), HP_POP2(HP_pc_setoption), 3584 }, - { HP_POP(pc->setcart), HP_POP2(HP_pc_setcart), 3586 }, - { HP_POP(pc->setfalcon), HP_POP2(HP_pc_setfalcon), 3588 }, - { HP_POP(pc->setriding), HP_POP2(HP_pc_setriding), 3590 }, - { HP_POP(pc->setmadogear), HP_POP2(HP_pc_setmadogear), 3592 }, - { HP_POP(pc->changelook), HP_POP2(HP_pc_changelook), 3594 }, - { HP_POP(pc->equiplookall), HP_POP2(HP_pc_equiplookall), 3596 }, - { HP_POP(pc->readparam), HP_POP2(HP_pc_readparam), 3598 }, - { HP_POP(pc->setparam), HP_POP2(HP_pc_setparam), 3600 }, - { HP_POP(pc->readreg), HP_POP2(HP_pc_readreg), 3602 }, - { HP_POP(pc->setreg), HP_POP2(HP_pc_setreg), 3604 }, - { HP_POP(pc->readregstr), HP_POP2(HP_pc_readregstr), 3606 }, - { HP_POP(pc->setregstr), HP_POP2(HP_pc_setregstr), 3608 }, - { HP_POP(pc->readregistry), HP_POP2(HP_pc_readregistry), 3610 }, - { HP_POP(pc->setregistry), HP_POP2(HP_pc_setregistry), 3612 }, - { HP_POP(pc->readregistry_str), HP_POP2(HP_pc_readregistry_str), 3614 }, - { HP_POP(pc->setregistry_str), HP_POP2(HP_pc_setregistry_str), 3616 }, - { HP_POP(pc->addeventtimer), HP_POP2(HP_pc_addeventtimer), 3618 }, - { HP_POP(pc->deleventtimer), HP_POP2(HP_pc_deleventtimer), 3620 }, - { HP_POP(pc->cleareventtimer), HP_POP2(HP_pc_cleareventtimer), 3622 }, - { HP_POP(pc->addeventtimercount), HP_POP2(HP_pc_addeventtimercount), 3624 }, - { HP_POP(pc->calc_pvprank), HP_POP2(HP_pc_calc_pvprank), 3626 }, - { HP_POP(pc->calc_pvprank_timer), HP_POP2(HP_pc_calc_pvprank_timer), 3628 }, - { HP_POP(pc->ismarried), HP_POP2(HP_pc_ismarried), 3630 }, - { HP_POP(pc->marriage), HP_POP2(HP_pc_marriage), 3632 }, - { HP_POP(pc->divorce), HP_POP2(HP_pc_divorce), 3634 }, - { HP_POP(pc->get_partner), HP_POP2(HP_pc_get_partner), 3636 }, - { HP_POP(pc->get_father), HP_POP2(HP_pc_get_father), 3638 }, - { HP_POP(pc->get_mother), HP_POP2(HP_pc_get_mother), 3640 }, - { HP_POP(pc->get_child), HP_POP2(HP_pc_get_child), 3642 }, - { HP_POP(pc->bleeding), HP_POP2(HP_pc_bleeding), 3644 }, - { HP_POP(pc->regen), HP_POP2(HP_pc_regen), 3646 }, - { HP_POP(pc->setstand), HP_POP2(HP_pc_setstand), 3648 }, - { HP_POP(pc->candrop), HP_POP2(HP_pc_candrop), 3650 }, - { HP_POP(pc->jobid2mapid), HP_POP2(HP_pc_jobid2mapid), 3652 }, - { HP_POP(pc->mapid2jobid), HP_POP2(HP_pc_mapid2jobid), 3654 }, - { HP_POP(pc->job_name), HP_POP2(HP_pc_job_name), 3656 }, - { HP_POP(pc->setinvincibletimer), HP_POP2(HP_pc_setinvincibletimer), 3658 }, - { HP_POP(pc->delinvincibletimer), HP_POP2(HP_pc_delinvincibletimer), 3660 }, - { HP_POP(pc->addspiritball), HP_POP2(HP_pc_addspiritball), 3662 }, - { HP_POP(pc->delspiritball), HP_POP2(HP_pc_delspiritball), 3664 }, - { HP_POP(pc->addfame), HP_POP2(HP_pc_addfame), 3666 }, - { HP_POP(pc->famerank), HP_POP2(HP_pc_famerank), 3668 }, - { HP_POP(pc->set_hate_mob), HP_POP2(HP_pc_set_hate_mob), 3670 }, - { HP_POP(pc->readdb), HP_POP2(HP_pc_readdb), 3672 }, - { HP_POP(pc->map_day_timer), HP_POP2(HP_pc_map_day_timer), 3674 }, - { HP_POP(pc->map_night_timer), HP_POP2(HP_pc_map_night_timer), 3676 }, - { HP_POP(pc->inventory_rentals), HP_POP2(HP_pc_inventory_rentals), 3678 }, - { HP_POP(pc->inventory_rental_clear), HP_POP2(HP_pc_inventory_rental_clear), 3680 }, - { HP_POP(pc->inventory_rental_add), HP_POP2(HP_pc_inventory_rental_add), 3682 }, - { HP_POP(pc->disguise), HP_POP2(HP_pc_disguise), 3684 }, - { HP_POP(pc->isautolooting), HP_POP2(HP_pc_isautolooting), 3686 }, - { HP_POP(pc->overheat), HP_POP2(HP_pc_overheat), 3688 }, - { HP_POP(pc->banding), HP_POP2(HP_pc_banding), 3690 }, - { HP_POP(pc->itemcd_do), HP_POP2(HP_pc_itemcd_do), 3692 }, - { HP_POP(pc->load_combo), HP_POP2(HP_pc_load_combo), 3694 }, - { HP_POP(pc->add_charm), HP_POP2(HP_pc_add_charm), 3696 }, - { HP_POP(pc->del_charm), HP_POP2(HP_pc_del_charm), 3698 }, - { HP_POP(pc->baselevelchanged), HP_POP2(HP_pc_baselevelchanged), 3700 }, - { HP_POP(pc->level_penalty_mod), HP_POP2(HP_pc_level_penalty_mod), 3702 }, - { HP_POP(pc->calc_skillpoint), HP_POP2(HP_pc_calc_skillpoint), 3704 }, - { HP_POP(pc->invincible_timer), HP_POP2(HP_pc_invincible_timer), 3706 }, - { HP_POP(pc->spiritball_timer), HP_POP2(HP_pc_spiritball_timer), 3708 }, - { HP_POP(pc->check_banding), HP_POP2(HP_pc_check_banding), 3710 }, - { HP_POP(pc->inventory_rental_end), HP_POP2(HP_pc_inventory_rental_end), 3712 }, - { HP_POP(pc->check_skilltree), HP_POP2(HP_pc_check_skilltree), 3714 }, - { HP_POP(pc->bonus_autospell), HP_POP2(HP_pc_bonus_autospell), 3716 }, - { HP_POP(pc->bonus_autospell_onskill), HP_POP2(HP_pc_bonus_autospell_onskill), 3718 }, - { HP_POP(pc->bonus_addeff), HP_POP2(HP_pc_bonus_addeff), 3720 }, - { HP_POP(pc->bonus_addeff_onskill), HP_POP2(HP_pc_bonus_addeff_onskill), 3722 }, - { HP_POP(pc->bonus_item_drop), HP_POP2(HP_pc_bonus_item_drop), 3724 }, - { HP_POP(pc->calcexp), HP_POP2(HP_pc_calcexp), 3726 }, - { HP_POP(pc->respawn_timer), HP_POP2(HP_pc_respawn_timer), 3728 }, - { HP_POP(pc->jobchange_killclone), HP_POP2(HP_pc_jobchange_killclone), 3730 }, - { HP_POP(pc->getstat), HP_POP2(HP_pc_getstat), 3732 }, - { HP_POP(pc->setstat), HP_POP2(HP_pc_setstat), 3734 }, - { HP_POP(pc->eventtimer), HP_POP2(HP_pc_eventtimer), 3736 }, - { HP_POP(pc->daynight_timer_sub), HP_POP2(HP_pc_daynight_timer_sub), 3738 }, - { HP_POP(pc->charm_timer), HP_POP2(HP_pc_charm_timer), 3740 }, - { HP_POP(pc->readdb_levelpenalty), HP_POP2(HP_pc_readdb_levelpenalty), 3742 }, - { HP_POP(pc->autosave), HP_POP2(HP_pc_autosave), 3744 }, - { HP_POP(pc->follow_timer), HP_POP2(HP_pc_follow_timer), 3746 }, - { HP_POP(pc->read_skill_tree), HP_POP2(HP_pc_read_skill_tree), 3748 }, - { HP_POP(pc->isUseitem), HP_POP2(HP_pc_isUseitem), 3750 }, - { HP_POP(pc->show_steal), HP_POP2(HP_pc_show_steal), 3752 }, - { HP_POP(pc->checkcombo), HP_POP2(HP_pc_checkcombo), 3754 }, - { HP_POP(pc->calcweapontype), HP_POP2(HP_pc_calcweapontype), 3756 }, - { HP_POP(pc->removecombo), HP_POP2(HP_pc_removecombo), 3758 }, + { HP_POP(pc->init, HP_pc_init) }, + { HP_POP(pc->final, HP_pc_final) }, + { HP_POP(pc->get_dummy_sd, HP_pc_get_dummy_sd) }, + { HP_POP(pc->class2idx, HP_pc_class2idx) }, + { HP_POP(pc->can_give_items, HP_pc_can_give_items) }, + { HP_POP(pc->can_give_bound_items, HP_pc_can_give_bound_items) }, + { HP_POP(pc->can_use_command, HP_pc_can_use_command) }, + { HP_POP(pc->set_group, HP_pc_set_group) }, + { HP_POP(pc->should_log_commands, HP_pc_should_log_commands) }, + { HP_POP(pc->setrestartvalue, HP_pc_setrestartvalue) }, + { HP_POP(pc->makesavestatus, HP_pc_makesavestatus) }, + { HP_POP(pc->respawn, HP_pc_respawn) }, + { HP_POP(pc->setnewpc, HP_pc_setnewpc) }, + { HP_POP(pc->authok, HP_pc_authok) }, + { HP_POP(pc->authfail, HP_pc_authfail) }, + { HP_POP(pc->reg_received, HP_pc_reg_received) }, + { HP_POP(pc->isequip, HP_pc_isequip) }, + { HP_POP(pc->equippoint, HP_pc_equippoint) }, + { HP_POP(pc->setinventorydata, HP_pc_setinventorydata) }, + { HP_POP(pc->checkskill, HP_pc_checkskill) }, + { HP_POP(pc->checkskill2, HP_pc_checkskill2) }, + { HP_POP(pc->checkallowskill, HP_pc_checkallowskill) }, + { HP_POP(pc->checkequip, HP_pc_checkequip) }, + { HP_POP(pc->calc_skilltree, HP_pc_calc_skilltree) }, + { HP_POP(pc->calc_skilltree_normalize_job, HP_pc_calc_skilltree_normalize_job) }, + { HP_POP(pc->clean_skilltree, HP_pc_clean_skilltree) }, + { HP_POP(pc->setpos, HP_pc_setpos) }, + { HP_POP(pc->setsavepoint, HP_pc_setsavepoint) }, + { HP_POP(pc->randomwarp, HP_pc_randomwarp) }, + { HP_POP(pc->memo, HP_pc_memo) }, + { HP_POP(pc->checkadditem, HP_pc_checkadditem) }, + { HP_POP(pc->inventoryblank, HP_pc_inventoryblank) }, + { HP_POP(pc->search_inventory, HP_pc_search_inventory) }, + { HP_POP(pc->payzeny, HP_pc_payzeny) }, + { HP_POP(pc->additem, HP_pc_additem) }, + { HP_POP(pc->getzeny, HP_pc_getzeny) }, + { HP_POP(pc->delitem, HP_pc_delitem) }, + { HP_POP(pc->paycash, HP_pc_paycash) }, + { HP_POP(pc->getcash, HP_pc_getcash) }, + { HP_POP(pc->cart_additem, HP_pc_cart_additem) }, + { HP_POP(pc->cart_delitem, HP_pc_cart_delitem) }, + { HP_POP(pc->putitemtocart, HP_pc_putitemtocart) }, + { HP_POP(pc->getitemfromcart, HP_pc_getitemfromcart) }, + { HP_POP(pc->cartitem_amount, HP_pc_cartitem_amount) }, + { HP_POP(pc->takeitem, HP_pc_takeitem) }, + { HP_POP(pc->dropitem, HP_pc_dropitem) }, + { HP_POP(pc->isequipped, HP_pc_isequipped) }, + { HP_POP(pc->can_Adopt, HP_pc_can_Adopt) }, + { HP_POP(pc->adoption, HP_pc_adoption) }, + { HP_POP(pc->updateweightstatus, HP_pc_updateweightstatus) }, + { HP_POP(pc->addautobonus, HP_pc_addautobonus) }, + { HP_POP(pc->exeautobonus, HP_pc_exeautobonus) }, + { HP_POP(pc->endautobonus, HP_pc_endautobonus) }, + { HP_POP(pc->delautobonus, HP_pc_delautobonus) }, + { HP_POP(pc->bonus, HP_pc_bonus) }, + { HP_POP(pc->bonus2, HP_pc_bonus2) }, + { HP_POP(pc->bonus3, HP_pc_bonus3) }, + { HP_POP(pc->bonus4, HP_pc_bonus4) }, + { HP_POP(pc->bonus5, HP_pc_bonus5) }, + { HP_POP(pc->skill, HP_pc_skill) }, + { HP_POP(pc->insert_card, HP_pc_insert_card) }, + { HP_POP(pc->steal_item, HP_pc_steal_item) }, + { HP_POP(pc->steal_coin, HP_pc_steal_coin) }, + { HP_POP(pc->modifybuyvalue, HP_pc_modifybuyvalue) }, + { HP_POP(pc->modifysellvalue, HP_pc_modifysellvalue) }, + { HP_POP(pc->follow, HP_pc_follow) }, + { HP_POP(pc->stop_following, HP_pc_stop_following) }, + { HP_POP(pc->maxbaselv, HP_pc_maxbaselv) }, + { HP_POP(pc->maxjoblv, HP_pc_maxjoblv) }, + { HP_POP(pc->checkbaselevelup, HP_pc_checkbaselevelup) }, + { HP_POP(pc->checkjoblevelup, HP_pc_checkjoblevelup) }, + { HP_POP(pc->gainexp, HP_pc_gainexp) }, + { HP_POP(pc->nextbaseexp, HP_pc_nextbaseexp) }, + { HP_POP(pc->thisbaseexp, HP_pc_thisbaseexp) }, + { HP_POP(pc->nextjobexp, HP_pc_nextjobexp) }, + { HP_POP(pc->thisjobexp, HP_pc_thisjobexp) }, + { HP_POP(pc->gets_status_point, HP_pc_gets_status_point) }, + { HP_POP(pc->need_status_point, HP_pc_need_status_point) }, + { HP_POP(pc->maxparameterincrease, HP_pc_maxparameterincrease) }, + { HP_POP(pc->statusup, HP_pc_statusup) }, + { HP_POP(pc->statusup2, HP_pc_statusup2) }, + { HP_POP(pc->skillup, HP_pc_skillup) }, + { HP_POP(pc->allskillup, HP_pc_allskillup) }, + { HP_POP(pc->resetlvl, HP_pc_resetlvl) }, + { HP_POP(pc->resetstate, HP_pc_resetstate) }, + { HP_POP(pc->resetskill, HP_pc_resetskill) }, + { HP_POP(pc->resetfeel, HP_pc_resetfeel) }, + { HP_POP(pc->resethate, HP_pc_resethate) }, + { HP_POP(pc->equipitem, HP_pc_equipitem) }, + { HP_POP(pc->unequipitem, HP_pc_unequipitem) }, + { HP_POP(pc->checkitem, HP_pc_checkitem) }, + { HP_POP(pc->useitem, HP_pc_useitem) }, + { HP_POP(pc->skillatk_bonus, HP_pc_skillatk_bonus) }, + { HP_POP(pc->skillheal_bonus, HP_pc_skillheal_bonus) }, + { HP_POP(pc->skillheal2_bonus, HP_pc_skillheal2_bonus) }, + { HP_POP(pc->damage, HP_pc_damage) }, + { HP_POP(pc->dead, HP_pc_dead) }, + { HP_POP(pc->revive, HP_pc_revive) }, + { HP_POP(pc->heal, HP_pc_heal) }, + { HP_POP(pc->itemheal, HP_pc_itemheal) }, + { HP_POP(pc->percentheal, HP_pc_percentheal) }, + { HP_POP(pc->jobchange, HP_pc_jobchange) }, + { HP_POP(pc->setoption, HP_pc_setoption) }, + { HP_POP(pc->setcart, HP_pc_setcart) }, + { HP_POP(pc->setfalcon, HP_pc_setfalcon) }, + { HP_POP(pc->setriding, HP_pc_setriding) }, + { HP_POP(pc->setmadogear, HP_pc_setmadogear) }, + { HP_POP(pc->changelook, HP_pc_changelook) }, + { HP_POP(pc->equiplookall, HP_pc_equiplookall) }, + { HP_POP(pc->readparam, HP_pc_readparam) }, + { HP_POP(pc->setparam, HP_pc_setparam) }, + { HP_POP(pc->readreg, HP_pc_readreg) }, + { HP_POP(pc->setreg, HP_pc_setreg) }, + { HP_POP(pc->readregstr, HP_pc_readregstr) }, + { HP_POP(pc->setregstr, HP_pc_setregstr) }, + { HP_POP(pc->readregistry, HP_pc_readregistry) }, + { HP_POP(pc->setregistry, HP_pc_setregistry) }, + { HP_POP(pc->readregistry_str, HP_pc_readregistry_str) }, + { HP_POP(pc->setregistry_str, HP_pc_setregistry_str) }, + { HP_POP(pc->addeventtimer, HP_pc_addeventtimer) }, + { HP_POP(pc->deleventtimer, HP_pc_deleventtimer) }, + { HP_POP(pc->cleareventtimer, HP_pc_cleareventtimer) }, + { HP_POP(pc->addeventtimercount, HP_pc_addeventtimercount) }, + { HP_POP(pc->calc_pvprank, HP_pc_calc_pvprank) }, + { HP_POP(pc->calc_pvprank_timer, HP_pc_calc_pvprank_timer) }, + { HP_POP(pc->ismarried, HP_pc_ismarried) }, + { HP_POP(pc->marriage, HP_pc_marriage) }, + { HP_POP(pc->divorce, HP_pc_divorce) }, + { HP_POP(pc->get_partner, HP_pc_get_partner) }, + { HP_POP(pc->get_father, HP_pc_get_father) }, + { HP_POP(pc->get_mother, HP_pc_get_mother) }, + { HP_POP(pc->get_child, HP_pc_get_child) }, + { HP_POP(pc->bleeding, HP_pc_bleeding) }, + { HP_POP(pc->regen, HP_pc_regen) }, + { HP_POP(pc->setstand, HP_pc_setstand) }, + { HP_POP(pc->candrop, HP_pc_candrop) }, + { HP_POP(pc->jobid2mapid, HP_pc_jobid2mapid) }, + { HP_POP(pc->mapid2jobid, HP_pc_mapid2jobid) }, + { HP_POP(pc->job_name, HP_pc_job_name) }, + { HP_POP(pc->setinvincibletimer, HP_pc_setinvincibletimer) }, + { HP_POP(pc->delinvincibletimer, HP_pc_delinvincibletimer) }, + { HP_POP(pc->addspiritball, HP_pc_addspiritball) }, + { HP_POP(pc->delspiritball, HP_pc_delspiritball) }, + { HP_POP(pc->addfame, HP_pc_addfame) }, + { HP_POP(pc->famerank, HP_pc_famerank) }, + { HP_POP(pc->set_hate_mob, HP_pc_set_hate_mob) }, + { HP_POP(pc->readdb, HP_pc_readdb) }, + { HP_POP(pc->map_day_timer, HP_pc_map_day_timer) }, + { HP_POP(pc->map_night_timer, HP_pc_map_night_timer) }, + { HP_POP(pc->inventory_rentals, HP_pc_inventory_rentals) }, + { HP_POP(pc->inventory_rental_clear, HP_pc_inventory_rental_clear) }, + { HP_POP(pc->inventory_rental_add, HP_pc_inventory_rental_add) }, + { HP_POP(pc->disguise, HP_pc_disguise) }, + { HP_POP(pc->isautolooting, HP_pc_isautolooting) }, + { HP_POP(pc->overheat, HP_pc_overheat) }, + { HP_POP(pc->banding, HP_pc_banding) }, + { HP_POP(pc->itemcd_do, HP_pc_itemcd_do) }, + { HP_POP(pc->load_combo, HP_pc_load_combo) }, + { HP_POP(pc->add_charm, HP_pc_add_charm) }, + { HP_POP(pc->del_charm, HP_pc_del_charm) }, + { HP_POP(pc->baselevelchanged, HP_pc_baselevelchanged) }, + { HP_POP(pc->level_penalty_mod, HP_pc_level_penalty_mod) }, + { HP_POP(pc->calc_skillpoint, HP_pc_calc_skillpoint) }, + { HP_POP(pc->invincible_timer, HP_pc_invincible_timer) }, + { HP_POP(pc->spiritball_timer, HP_pc_spiritball_timer) }, + { HP_POP(pc->check_banding, HP_pc_check_banding) }, + { HP_POP(pc->inventory_rental_end, HP_pc_inventory_rental_end) }, + { HP_POP(pc->check_skilltree, HP_pc_check_skilltree) }, + { HP_POP(pc->bonus_autospell, HP_pc_bonus_autospell) }, + { HP_POP(pc->bonus_autospell_onskill, HP_pc_bonus_autospell_onskill) }, + { HP_POP(pc->bonus_addeff, HP_pc_bonus_addeff) }, + { HP_POP(pc->bonus_addeff_onskill, HP_pc_bonus_addeff_onskill) }, + { HP_POP(pc->bonus_item_drop, HP_pc_bonus_item_drop) }, + { HP_POP(pc->calcexp, HP_pc_calcexp) }, + { HP_POP(pc->respawn_timer, HP_pc_respawn_timer) }, + { HP_POP(pc->jobchange_killclone, HP_pc_jobchange_killclone) }, + { HP_POP(pc->getstat, HP_pc_getstat) }, + { HP_POP(pc->setstat, HP_pc_setstat) }, + { HP_POP(pc->eventtimer, HP_pc_eventtimer) }, + { HP_POP(pc->daynight_timer_sub, HP_pc_daynight_timer_sub) }, + { HP_POP(pc->charm_timer, HP_pc_charm_timer) }, + { HP_POP(pc->readdb_levelpenalty, HP_pc_readdb_levelpenalty) }, + { HP_POP(pc->autosave, HP_pc_autosave) }, + { HP_POP(pc->follow_timer, HP_pc_follow_timer) }, + { HP_POP(pc->read_skill_tree, HP_pc_read_skill_tree) }, + { HP_POP(pc->isUseitem, HP_pc_isUseitem) }, + { HP_POP(pc->show_steal, HP_pc_show_steal) }, + { HP_POP(pc->checkcombo, HP_pc_checkcombo) }, + { HP_POP(pc->calcweapontype, HP_pc_calcweapontype) }, + { 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) }, + { HP_POP(pc->bound_clear, HP_pc_bound_clear) }, + { HP_POP(pc->expiration_timer, HP_pc_expiration_timer) }, + { HP_POP(pc->global_expiration_timer, HP_pc_global_expiration_timer) }, + { HP_POP(pc->expire_check, HP_pc_expire_check) }, + { HP_POP(pc->autotrade_load, HP_pc_autotrade_load) }, + { HP_POP(pc->autotrade_update, HP_pc_autotrade_update) }, + { HP_POP(pc->autotrade_start, HP_pc_autotrade_start) }, + { HP_POP(pc->autotrade_prepare, HP_pc_autotrade_prepare) }, + { HP_POP(pc->autotrade_populate, HP_pc_autotrade_populate) }, /* pet */ - { HP_POP(pet->init), HP_POP2(HP_pet_init), 3760 }, - { HP_POP(pet->final), HP_POP2(HP_pet_final), 3762 }, - { HP_POP(pet->hungry_val), HP_POP2(HP_pet_hungry_val), 3764 }, - { HP_POP(pet->set_intimate), HP_POP2(HP_pet_set_intimate), 3766 }, - { HP_POP(pet->create_egg), HP_POP2(HP_pet_create_egg), 3768 }, - { HP_POP(pet->unlocktarget), HP_POP2(HP_pet_unlocktarget), 3770 }, - { HP_POP(pet->attackskill), HP_POP2(HP_pet_attackskill), 3772 }, - { HP_POP(pet->target_check), HP_POP2(HP_pet_target_check), 3774 }, - { HP_POP(pet->sc_check), HP_POP2(HP_pet_sc_check), 3776 }, - { HP_POP(pet->hungry), HP_POP2(HP_pet_hungry), 3778 }, - { HP_POP(pet->search_petDB_index), HP_POP2(HP_pet_search_petDB_index), 3780 }, - { HP_POP(pet->hungry_timer_delete), HP_POP2(HP_pet_hungry_timer_delete), 3782 }, - { HP_POP(pet->performance), HP_POP2(HP_pet_performance), 3784 }, - { HP_POP(pet->return_egg), HP_POP2(HP_pet_return_egg), 3786 }, - { HP_POP(pet->data_init), HP_POP2(HP_pet_data_init), 3788 }, - { HP_POP(pet->birth_process), HP_POP2(HP_pet_birth_process), 3790 }, - { HP_POP(pet->recv_petdata), HP_POP2(HP_pet_recv_petdata), 3792 }, - { HP_POP(pet->select_egg), HP_POP2(HP_pet_select_egg), 3794 }, - { HP_POP(pet->catch_process1), HP_POP2(HP_pet_catch_process1), 3796 }, - { HP_POP(pet->catch_process2), HP_POP2(HP_pet_catch_process2), 3798 }, - { HP_POP(pet->get_egg), HP_POP2(HP_pet_get_egg), 3800 }, - { HP_POP(pet->unequipitem), HP_POP2(HP_pet_unequipitem), 3802 }, - { HP_POP(pet->food), HP_POP2(HP_pet_food), 3804 }, - { HP_POP(pet->ai_sub_hard_lootsearch), HP_POP2(HP_pet_ai_sub_hard_lootsearch), 3806 }, - { HP_POP(pet->menu), HP_POP2(HP_pet_menu), 3808 }, - { HP_POP(pet->change_name), HP_POP2(HP_pet_change_name), 3810 }, - { HP_POP(pet->change_name_ack), HP_POP2(HP_pet_change_name_ack), 3812 }, - { HP_POP(pet->equipitem), HP_POP2(HP_pet_equipitem), 3814 }, - { HP_POP(pet->randomwalk), HP_POP2(HP_pet_randomwalk), 3816 }, - { HP_POP(pet->ai_sub_hard), HP_POP2(HP_pet_ai_sub_hard), 3818 }, - { HP_POP(pet->ai_sub_foreachclient), HP_POP2(HP_pet_ai_sub_foreachclient), 3820 }, - { HP_POP(pet->ai_hard), HP_POP2(HP_pet_ai_hard), 3822 }, - { HP_POP(pet->delay_item_drop), HP_POP2(HP_pet_delay_item_drop), 3824 }, - { HP_POP(pet->lootitem_drop), HP_POP2(HP_pet_lootitem_drop), 3826 }, - { HP_POP(pet->skill_bonus_timer), HP_POP2(HP_pet_skill_bonus_timer), 3828 }, - { HP_POP(pet->recovery_timer), HP_POP2(HP_pet_recovery_timer), 3830 }, - { HP_POP(pet->heal_timer), HP_POP2(HP_pet_heal_timer), 3832 }, - { HP_POP(pet->skill_support_timer), HP_POP2(HP_pet_skill_support_timer), 3834 }, - { HP_POP(pet->read_db), HP_POP2(HP_pet_read_db), 3836 }, + { HP_POP(pet->init, HP_pet_init) }, + { HP_POP(pet->final, HP_pet_final) }, + { HP_POP(pet->hungry_val, HP_pet_hungry_val) }, + { HP_POP(pet->set_intimate, HP_pet_set_intimate) }, + { HP_POP(pet->create_egg, HP_pet_create_egg) }, + { HP_POP(pet->unlocktarget, HP_pet_unlocktarget) }, + { HP_POP(pet->attackskill, HP_pet_attackskill) }, + { HP_POP(pet->target_check, HP_pet_target_check) }, + { HP_POP(pet->sc_check, HP_pet_sc_check) }, + { HP_POP(pet->hungry, HP_pet_hungry) }, + { HP_POP(pet->search_petDB_index, HP_pet_search_petDB_index) }, + { HP_POP(pet->hungry_timer_delete, HP_pet_hungry_timer_delete) }, + { HP_POP(pet->performance, HP_pet_performance) }, + { HP_POP(pet->return_egg, HP_pet_return_egg) }, + { HP_POP(pet->data_init, HP_pet_data_init) }, + { HP_POP(pet->birth_process, HP_pet_birth_process) }, + { HP_POP(pet->recv_petdata, HP_pet_recv_petdata) }, + { HP_POP(pet->select_egg, HP_pet_select_egg) }, + { HP_POP(pet->catch_process1, HP_pet_catch_process1) }, + { HP_POP(pet->catch_process2, HP_pet_catch_process2) }, + { HP_POP(pet->get_egg, HP_pet_get_egg) }, + { HP_POP(pet->unequipitem, HP_pet_unequipitem) }, + { HP_POP(pet->food, HP_pet_food) }, + { HP_POP(pet->ai_sub_hard_lootsearch, HP_pet_ai_sub_hard_lootsearch) }, + { HP_POP(pet->menu, HP_pet_menu) }, + { HP_POP(pet->change_name, HP_pet_change_name) }, + { HP_POP(pet->change_name_ack, HP_pet_change_name_ack) }, + { HP_POP(pet->equipitem, HP_pet_equipitem) }, + { HP_POP(pet->randomwalk, HP_pet_randomwalk) }, + { HP_POP(pet->ai_sub_hard, HP_pet_ai_sub_hard) }, + { HP_POP(pet->ai_sub_foreachclient, HP_pet_ai_sub_foreachclient) }, + { HP_POP(pet->ai_hard, HP_pet_ai_hard) }, + { HP_POP(pet->delay_item_drop, HP_pet_delay_item_drop) }, + { HP_POP(pet->lootitem_drop, HP_pet_lootitem_drop) }, + { HP_POP(pet->skill_bonus_timer, HP_pet_skill_bonus_timer) }, + { HP_POP(pet->recovery_timer, HP_pet_recovery_timer) }, + { HP_POP(pet->heal_timer, HP_pet_heal_timer) }, + { HP_POP(pet->skill_support_timer, HP_pet_skill_support_timer) }, + { HP_POP(pet->read_db, HP_pet_read_db) }, /* quest */ - { HP_POP(quest->init), HP_POP2(HP_quest_init), 3838 }, - { HP_POP(quest->reload), HP_POP2(HP_quest_reload), 3840 }, - { HP_POP(quest->search_db), HP_POP2(HP_quest_search_db), 3842 }, - { HP_POP(quest->pc_login), HP_POP2(HP_quest_pc_login), 3844 }, - { HP_POP(quest->add), HP_POP2(HP_quest_add), 3846 }, - { HP_POP(quest->change), HP_POP2(HP_quest_change), 3848 }, - { HP_POP(quest->delete), HP_POP2(HP_quest_delete), 3850 }, - { HP_POP(quest->update_objective_sub), HP_POP2(HP_quest_update_objective_sub), 3852 }, - { HP_POP(quest->update_objective), HP_POP2(HP_quest_update_objective), 3854 }, - { HP_POP(quest->update_status), HP_POP2(HP_quest_update_status), 3856 }, - { HP_POP(quest->check), HP_POP2(HP_quest_check), 3858 }, - { HP_POP(quest->read_db), HP_POP2(HP_quest_read_db), 3860 }, + { HP_POP(quest->init, HP_quest_init) }, + { HP_POP(quest->final, HP_quest_final) }, + { HP_POP(quest->reload, HP_quest_reload) }, + { HP_POP(quest->db, HP_quest_db) }, + { HP_POP(quest->pc_login, HP_quest_pc_login) }, + { HP_POP(quest->add, HP_quest_add) }, + { HP_POP(quest->change, HP_quest_change) }, + { HP_POP(quest->delete, HP_quest_delete) }, + { HP_POP(quest->update_objective_sub, HP_quest_update_objective_sub) }, + { HP_POP(quest->update_objective, HP_quest_update_objective) }, + { HP_POP(quest->update_status, HP_quest_update_status) }, + { HP_POP(quest->check, HP_quest_check) }, + { HP_POP(quest->clear, HP_quest_clear) }, + { HP_POP(quest->read_db, HP_quest_read_db) }, /* script */ - { HP_POP(script->init), HP_POP2(HP_script_init), 3862 }, - { HP_POP(script->final), HP_POP2(HP_script_final), 3864 }, - { HP_POP(script->reload), HP_POP2(HP_script_reload), 3866 }, - { HP_POP(script->parse), HP_POP2(HP_script_parse), 3868 }, - { HP_POP(script->parse_builtin), HP_POP2(HP_script_parse_builtin), 3870 }, - { HP_POP(script->parse_subexpr), HP_POP2(HP_script_parse_subexpr), 3872 }, - { HP_POP(script->skip_space), HP_POP2(HP_script_skip_space), 3874 }, - { HP_POP(script->error), HP_POP2(HP_script_error), 3876 }, - { HP_POP(script->warning), HP_POP2(HP_script_warning), 3878 }, - { HP_POP(script->addScript), HP_POP2(HP_script_addScript), 3880 }, - { HP_POP(script->conv_num), HP_POP2(HP_script_conv_num), 3882 }, - { HP_POP(script->conv_str), HP_POP2(HP_script_conv_str), 3884 }, - { HP_POP(script->rid2sd), HP_POP2(HP_script_rid2sd), 3886 }, - { HP_POP(script->detach_rid), HP_POP2(HP_script_detach_rid), 3888 }, - { HP_POP(script->push_val), HP_POP2(HP_script_push_val), 3890 }, - { HP_POP(script->get_val), HP_POP2(HP_script_get_val), 3892 }, - { HP_POP(script->get_val2), HP_POP2(HP_script_get_val2), 3894 }, - { HP_POP(script->push_str), HP_POP2(HP_script_push_str), 3896 }, - { HP_POP(script->push_copy), HP_POP2(HP_script_push_copy), 3898 }, - { HP_POP(script->pop_stack), HP_POP2(HP_script_pop_stack), 3900 }, - { HP_POP(script->set_constant), HP_POP2(HP_script_set_constant), 3902 }, - { HP_POP(script->set_constant2), HP_POP2(HP_script_set_constant2), 3904 }, - { HP_POP(script->set_constant_force), HP_POP2(HP_script_set_constant_force), 3906 }, - { HP_POP(script->get_constant), HP_POP2(HP_script_get_constant), 3908 }, - { HP_POP(script->label_add), HP_POP2(HP_script_label_add), 3910 }, - { HP_POP(script->run), HP_POP2(HP_script_run), 3912 }, - { HP_POP(script->run_main), HP_POP2(HP_script_run_main), 3914 }, - { HP_POP(script->run_timer), HP_POP2(HP_script_run_timer), 3916 }, - { HP_POP(script->set_var), HP_POP2(HP_script_set_var), 3918 }, - { HP_POP(script->stop_instances), HP_POP2(HP_script_stop_instances), 3920 }, - { HP_POP(script->free_code), HP_POP2(HP_script_free_code), 3922 }, - { HP_POP(script->free_vars), HP_POP2(HP_script_free_vars), 3924 }, - { HP_POP(script->alloc_state), HP_POP2(HP_script_alloc_state), 3926 }, - { HP_POP(script->free_state), HP_POP2(HP_script_free_state), 3928 }, - { HP_POP(script->run_autobonus), HP_POP2(HP_script_run_autobonus), 3930 }, - { HP_POP(script->cleararray_pc), HP_POP2(HP_script_cleararray_pc), 3932 }, - { HP_POP(script->setarray_pc), HP_POP2(HP_script_setarray_pc), 3934 }, - { HP_POP(script->config_read), HP_POP2(HP_script_config_read), 3936 }, - { HP_POP(script->add_str), HP_POP2(HP_script_add_str), 3938 }, - { HP_POP(script->get_str), HP_POP2(HP_script_get_str), 3940 }, - { HP_POP(script->search_str), HP_POP2(HP_script_search_str), 3942 }, - { HP_POP(script->setd_sub), HP_POP2(HP_script_setd_sub), 3944 }, - { HP_POP(script->attach_state), HP_POP2(HP_script_attach_state), 3946 }, - { HP_POP(script->queue), HP_POP2(HP_script_queue), 3948 }, - { HP_POP(script->queue_add), HP_POP2(HP_script_queue_add), 3950 }, - { HP_POP(script->queue_del), HP_POP2(HP_script_queue_del), 3952 }, - { HP_POP(script->queue_remove), HP_POP2(HP_script_queue_remove), 3954 }, - { HP_POP(script->queue_create), HP_POP2(HP_script_queue_create), 3956 }, - { HP_POP(script->queue_clear), HP_POP2(HP_script_queue_clear), 3958 }, - { HP_POP(script->parse_curly_close), HP_POP2(HP_script_parse_curly_close), 3960 }, - { HP_POP(script->parse_syntax_close), HP_POP2(HP_script_parse_syntax_close), 3962 }, - { HP_POP(script->parse_syntax_close_sub), HP_POP2(HP_script_parse_syntax_close_sub), 3964 }, - { HP_POP(script->parse_syntax), HP_POP2(HP_script_parse_syntax), 3966 }, - { HP_POP(script->get_com), HP_POP2(HP_script_get_com), 3968 }, - { HP_POP(script->get_num), HP_POP2(HP_script_get_num), 3970 }, - { HP_POP(script->op2name), HP_POP2(HP_script_op2name), 3972 }, - { HP_POP(script->reportsrc), HP_POP2(HP_script_reportsrc), 3974 }, - { HP_POP(script->reportdata), HP_POP2(HP_script_reportdata), 3976 }, - { HP_POP(script->reportfunc), HP_POP2(HP_script_reportfunc), 3978 }, - { HP_POP(script->disp_error_message2), HP_POP2(HP_script_disp_error_message2), 3980 }, - { HP_POP(script->disp_warning_message), HP_POP2(HP_script_disp_warning_message), 3982 }, - { HP_POP(script->check_event), HP_POP2(HP_script_check_event), 3984 }, - { HP_POP(script->calc_hash), HP_POP2(HP_script_calc_hash), 3986 }, - { HP_POP(script->addb), HP_POP2(HP_script_addb), 3988 }, - { HP_POP(script->addc), HP_POP2(HP_script_addc), 3990 }, - { HP_POP(script->addi), HP_POP2(HP_script_addi), 3992 }, - { HP_POP(script->addl), HP_POP2(HP_script_addl), 3994 }, - { HP_POP(script->set_label), HP_POP2(HP_script_set_label), 3996 }, - { HP_POP(script->skip_word), HP_POP2(HP_script_skip_word), 3998 }, - { HP_POP(script->add_word), HP_POP2(HP_script_add_word), 4000 }, - { HP_POP(script->parse_callfunc), HP_POP2(HP_script_parse_callfunc), 4002 }, - { HP_POP(script->parse_nextline), HP_POP2(HP_script_parse_nextline), 4004 }, - { HP_POP(script->parse_variable), HP_POP2(HP_script_parse_variable), 4006 }, - { HP_POP(script->parse_simpleexpr), HP_POP2(HP_script_parse_simpleexpr), 4008 }, - { HP_POP(script->parse_expr), HP_POP2(HP_script_parse_expr), 4010 }, - { HP_POP(script->parse_line), HP_POP2(HP_script_parse_line), 4012 }, - { HP_POP(script->read_constdb), HP_POP2(HP_script_read_constdb), 4014 }, - { HP_POP(script->print_line), HP_POP2(HP_script_print_line), 4016 }, - { HP_POP(script->errorwarning_sub), HP_POP2(HP_script_errorwarning_sub), 4018 }, - { HP_POP(script->set_reg), HP_POP2(HP_script_set_reg), 4020 }, - { HP_POP(script->stack_expand), HP_POP2(HP_script_stack_expand), 4022 }, - { HP_POP(script->push_retinfo), HP_POP2(HP_script_push_retinfo), 4024 }, - { HP_POP(script->pop_val), HP_POP2(HP_script_pop_val), 4026 }, - { HP_POP(script->op_3), HP_POP2(HP_script_op_3), 4028 }, - { HP_POP(script->op_2str), HP_POP2(HP_script_op_2str), 4030 }, - { HP_POP(script->op_2num), HP_POP2(HP_script_op_2num), 4032 }, - { HP_POP(script->op_2), HP_POP2(HP_script_op_2), 4034 }, - { HP_POP(script->op_1), HP_POP2(HP_script_op_1), 4036 }, - { HP_POP(script->check_buildin_argtype), HP_POP2(HP_script_check_buildin_argtype), 4038 }, - { HP_POP(script->detach_state), HP_POP2(HP_script_detach_state), 4040 }, - { HP_POP(script->db_free_code_sub), HP_POP2(HP_script_db_free_code_sub), 4042 }, - { HP_POP(script->add_autobonus), HP_POP2(HP_script_add_autobonus), 4044 }, - { HP_POP(script->menu_countoptions), HP_POP2(HP_script_menu_countoptions), 4046 }, - { HP_POP(script->buildin_areawarp_sub), HP_POP2(HP_script_buildin_areawarp_sub), 4048 }, - { HP_POP(script->buildin_areapercentheal_sub), HP_POP2(HP_script_buildin_areapercentheal_sub), 4050 }, - { HP_POP(script->getarraysize), HP_POP2(HP_script_getarraysize), 4052 }, - { HP_POP(script->buildin_delitem_delete), HP_POP2(HP_script_buildin_delitem_delete), 4054 }, - { HP_POP(script->buildin_delitem_search), HP_POP2(HP_script_buildin_delitem_search), 4056 }, - { HP_POP(script->buildin_killmonster_sub_strip), HP_POP2(HP_script_buildin_killmonster_sub_strip), 4058 }, - { HP_POP(script->buildin_killmonster_sub), HP_POP2(HP_script_buildin_killmonster_sub), 4060 }, - { HP_POP(script->buildin_killmonsterall_sub_strip), HP_POP2(HP_script_buildin_killmonsterall_sub_strip), 4062 }, - { HP_POP(script->buildin_killmonsterall_sub), HP_POP2(HP_script_buildin_killmonsterall_sub), 4064 }, - { HP_POP(script->buildin_announce_sub), HP_POP2(HP_script_buildin_announce_sub), 4066 }, - { HP_POP(script->buildin_getareausers_sub), HP_POP2(HP_script_buildin_getareausers_sub), 4068 }, - { HP_POP(script->buildin_getareadropitem_sub), HP_POP2(HP_script_buildin_getareadropitem_sub), 4070 }, - { HP_POP(script->mapflag_pvp_sub), HP_POP2(HP_script_mapflag_pvp_sub), 4072 }, - { HP_POP(script->buildin_pvpoff_sub), HP_POP2(HP_script_buildin_pvpoff_sub), 4074 }, - { HP_POP(script->buildin_maprespawnguildid_sub_pc), HP_POP2(HP_script_buildin_maprespawnguildid_sub_pc), 4076 }, - { HP_POP(script->buildin_maprespawnguildid_sub_mob), HP_POP2(HP_script_buildin_maprespawnguildid_sub_mob), 4078 }, - { HP_POP(script->buildin_mobcount_sub), HP_POP2(HP_script_buildin_mobcount_sub), 4080 }, - { HP_POP(script->playBGM_sub), HP_POP2(HP_script_playBGM_sub), 4082 }, - { HP_POP(script->playBGM_foreachpc_sub), HP_POP2(HP_script_playBGM_foreachpc_sub), 4084 }, - { HP_POP(script->soundeffect_sub), HP_POP2(HP_script_soundeffect_sub), 4086 }, - { HP_POP(script->buildin_query_sql_sub), HP_POP2(HP_script_buildin_query_sql_sub), 4088 }, - { HP_POP(script->axtoi), HP_POP2(HP_script_axtoi), 4090 }, - { HP_POP(script->buildin_instance_warpall_sub), HP_POP2(HP_script_buildin_instance_warpall_sub), 4092 }, - { HP_POP(script->buildin_mobuseskill_sub), HP_POP2(HP_script_buildin_mobuseskill_sub), 4094 }, - { HP_POP(script->cleanfloor_sub), HP_POP2(HP_script_cleanfloor_sub), 4096 }, - { HP_POP(script->run_func), HP_POP2(HP_script_run_func), 4098 }, + { HP_POP(script->init, HP_script_init) }, + { HP_POP(script->final, HP_script_final) }, + { HP_POP(script->reload, HP_script_reload) }, + { HP_POP(script->parse, HP_script_parse) }, + { HP_POP(script->add_builtin, HP_script_add_builtin) }, + { HP_POP(script->parse_builtin, HP_script_parse_builtin) }, + { HP_POP(script->parse_subexpr, HP_script_parse_subexpr) }, + { HP_POP(script->skip_space, HP_script_skip_space) }, + { HP_POP(script->error, HP_script_error) }, + { HP_POP(script->warning, HP_script_warning) }, + { HP_POP(script->addScript, HP_script_addScript) }, + { HP_POP(script->conv_num, HP_script_conv_num) }, + { HP_POP(script->conv_str, HP_script_conv_str) }, + { HP_POP(script->rid2sd, HP_script_rid2sd) }, + { HP_POP(script->detach_rid, HP_script_detach_rid) }, + { HP_POP(script->push_val, HP_script_push_val) }, + { HP_POP(script->get_val, HP_script_get_val) }, + { HP_POP(script->get_val2, HP_script_get_val2) }, + { HP_POP(script->push_str, HP_script_push_str) }, + { HP_POP(script->push_copy, HP_script_push_copy) }, + { HP_POP(script->pop_stack, HP_script_pop_stack) }, + { HP_POP(script->set_constant, HP_script_set_constant) }, + { HP_POP(script->set_constant2, HP_script_set_constant2) }, + { HP_POP(script->get_constant, HP_script_get_constant) }, + { HP_POP(script->label_add, HP_script_label_add) }, + { HP_POP(script->run, HP_script_run) }, + { HP_POP(script->run_main, HP_script_run_main) }, + { HP_POP(script->run_timer, HP_script_run_timer) }, + { HP_POP(script->set_var, HP_script_set_var) }, + { HP_POP(script->stop_instances, HP_script_stop_instances) }, + { HP_POP(script->free_code, HP_script_free_code) }, + { HP_POP(script->free_vars, HP_script_free_vars) }, + { HP_POP(script->alloc_state, HP_script_alloc_state) }, + { HP_POP(script->free_state, HP_script_free_state) }, + { HP_POP(script->run_autobonus, HP_script_run_autobonus) }, + { HP_POP(script->cleararray_pc, HP_script_cleararray_pc) }, + { HP_POP(script->setarray_pc, HP_script_setarray_pc) }, + { HP_POP(script->config_read, HP_script_config_read) }, + { HP_POP(script->add_str, HP_script_add_str) }, + { HP_POP(script->get_str, HP_script_get_str) }, + { HP_POP(script->search_str, HP_script_search_str) }, + { HP_POP(script->setd_sub, HP_script_setd_sub) }, + { HP_POP(script->attach_state, HP_script_attach_state) }, + { HP_POP(script->queue, HP_script_queue) }, + { HP_POP(script->queue_add, HP_script_queue_add) }, + { HP_POP(script->queue_del, HP_script_queue_del) }, + { HP_POP(script->queue_remove, HP_script_queue_remove) }, + { HP_POP(script->queue_create, HP_script_queue_create) }, + { HP_POP(script->queue_clear, HP_script_queue_clear) }, + { HP_POP(script->parse_curly_close, HP_script_parse_curly_close) }, + { HP_POP(script->parse_syntax_close, HP_script_parse_syntax_close) }, + { HP_POP(script->parse_syntax_close_sub, HP_script_parse_syntax_close_sub) }, + { HP_POP(script->parse_syntax, HP_script_parse_syntax) }, + { HP_POP(script->get_com, HP_script_get_com) }, + { HP_POP(script->get_num, HP_script_get_num) }, + { HP_POP(script->op2name, HP_script_op2name) }, + { HP_POP(script->reportsrc, HP_script_reportsrc) }, + { HP_POP(script->reportdata, HP_script_reportdata) }, + { HP_POP(script->reportfunc, HP_script_reportfunc) }, + { HP_POP(script->disp_warning_message, HP_script_disp_warning_message) }, + { HP_POP(script->check_event, HP_script_check_event) }, + { HP_POP(script->calc_hash, HP_script_calc_hash) }, + { HP_POP(script->addb, HP_script_addb) }, + { HP_POP(script->addc, HP_script_addc) }, + { HP_POP(script->addi, HP_script_addi) }, + { HP_POP(script->addl, HP_script_addl) }, + { HP_POP(script->set_label, HP_script_set_label) }, + { HP_POP(script->skip_word, HP_script_skip_word) }, + { HP_POP(script->add_word, HP_script_add_word) }, + { HP_POP(script->parse_callfunc, HP_script_parse_callfunc) }, + { HP_POP(script->parse_nextline, HP_script_parse_nextline) }, + { HP_POP(script->parse_variable, HP_script_parse_variable) }, + { HP_POP(script->parse_simpleexpr, HP_script_parse_simpleexpr) }, + { HP_POP(script->parse_expr, HP_script_parse_expr) }, + { HP_POP(script->parse_line, HP_script_parse_line) }, + { HP_POP(script->read_constdb, HP_script_read_constdb) }, + { HP_POP(script->print_line, HP_script_print_line) }, + { HP_POP(script->errorwarning_sub, HP_script_errorwarning_sub) }, + { HP_POP(script->set_reg, HP_script_set_reg) }, + { HP_POP(script->stack_expand, HP_script_stack_expand) }, + { HP_POP(script->push_retinfo, HP_script_push_retinfo) }, + { HP_POP(script->op_3, HP_script_op_3) }, + { HP_POP(script->op_2str, HP_script_op_2str) }, + { HP_POP(script->op_2num, HP_script_op_2num) }, + { HP_POP(script->op_2, HP_script_op_2) }, + { HP_POP(script->op_1, HP_script_op_1) }, + { HP_POP(script->check_buildin_argtype, HP_script_check_buildin_argtype) }, + { HP_POP(script->detach_state, HP_script_detach_state) }, + { HP_POP(script->db_free_code_sub, HP_script_db_free_code_sub) }, + { HP_POP(script->add_autobonus, HP_script_add_autobonus) }, + { HP_POP(script->menu_countoptions, HP_script_menu_countoptions) }, + { HP_POP(script->buildin_areawarp_sub, HP_script_buildin_areawarp_sub) }, + { HP_POP(script->buildin_areapercentheal_sub, HP_script_buildin_areapercentheal_sub) }, + { HP_POP(script->buildin_delitem_delete, HP_script_buildin_delitem_delete) }, + { HP_POP(script->buildin_delitem_search, HP_script_buildin_delitem_search) }, + { HP_POP(script->buildin_killmonster_sub_strip, HP_script_buildin_killmonster_sub_strip) }, + { HP_POP(script->buildin_killmonster_sub, HP_script_buildin_killmonster_sub) }, + { HP_POP(script->buildin_killmonsterall_sub_strip, HP_script_buildin_killmonsterall_sub_strip) }, + { HP_POP(script->buildin_killmonsterall_sub, HP_script_buildin_killmonsterall_sub) }, + { HP_POP(script->buildin_announce_sub, HP_script_buildin_announce_sub) }, + { HP_POP(script->buildin_getareausers_sub, HP_script_buildin_getareausers_sub) }, + { HP_POP(script->buildin_getareadropitem_sub, HP_script_buildin_getareadropitem_sub) }, + { HP_POP(script->mapflag_pvp_sub, HP_script_mapflag_pvp_sub) }, + { HP_POP(script->buildin_pvpoff_sub, HP_script_buildin_pvpoff_sub) }, + { HP_POP(script->buildin_maprespawnguildid_sub_pc, HP_script_buildin_maprespawnguildid_sub_pc) }, + { HP_POP(script->buildin_maprespawnguildid_sub_mob, HP_script_buildin_maprespawnguildid_sub_mob) }, + { HP_POP(script->buildin_mobcount_sub, HP_script_buildin_mobcount_sub) }, + { HP_POP(script->playbgm_sub, HP_script_playbgm_sub) }, + { HP_POP(script->playbgm_foreachpc_sub, HP_script_playbgm_foreachpc_sub) }, + { HP_POP(script->soundeffect_sub, HP_script_soundeffect_sub) }, + { HP_POP(script->buildin_query_sql_sub, HP_script_buildin_query_sql_sub) }, + { HP_POP(script->buildin_instance_warpall_sub, HP_script_buildin_instance_warpall_sub) }, + { HP_POP(script->buildin_mobuseskill_sub, HP_script_buildin_mobuseskill_sub) }, + { HP_POP(script->cleanfloor_sub, HP_script_cleanfloor_sub) }, + { HP_POP(script->run_func, HP_script_run_func) }, + { HP_POP(script->getfuncname, HP_script_getfuncname) }, + { HP_POP(script->calc_hash_ci, HP_script_calc_hash_ci) }, + { HP_POP(script->array_src, HP_script_array_src) }, + { HP_POP(script->array_update, HP_script_array_update) }, + { HP_POP(script->array_delete, HP_script_array_delete) }, + { HP_POP(script->array_remove_member, HP_script_array_remove_member) }, + { HP_POP(script->array_add_member, HP_script_array_add_member) }, + { HP_POP(script->array_size, HP_script_array_size) }, + { HP_POP(script->array_highest_key, HP_script_array_highest_key) }, + { HP_POP(script->array_free_db, HP_script_array_free_db) }, + { HP_POP(script->array_ensure_zero, HP_script_array_ensure_zero) }, + { HP_POP(script->reg_destroy_single, HP_script_reg_destroy_single) }, + { HP_POP(script->reg_destroy, HP_script_reg_destroy) }, + { HP_POP(script->generic_ui_array_expand, HP_script_generic_ui_array_expand) }, + { HP_POP(script->array_cpy_list, HP_script_array_cpy_list) }, /* searchstore */ - { HP_POP(searchstore->open), HP_POP2(HP_searchstore_open), 4100 }, - { HP_POP(searchstore->query), HP_POP2(HP_searchstore_query), 4102 }, - { HP_POP(searchstore->querynext), HP_POP2(HP_searchstore_querynext), 4104 }, - { HP_POP(searchstore->next), HP_POP2(HP_searchstore_next), 4106 }, - { HP_POP(searchstore->clear), HP_POP2(HP_searchstore_clear), 4108 }, - { HP_POP(searchstore->close), HP_POP2(HP_searchstore_close), 4110 }, - { HP_POP(searchstore->click), HP_POP2(HP_searchstore_click), 4112 }, - { HP_POP(searchstore->queryremote), HP_POP2(HP_searchstore_queryremote), 4114 }, - { HP_POP(searchstore->clearremote), HP_POP2(HP_searchstore_clearremote), 4116 }, - { HP_POP(searchstore->result), HP_POP2(HP_searchstore_result), 4118 }, + { HP_POP(searchstore->open, HP_searchstore_open) }, + { HP_POP(searchstore->query, HP_searchstore_query) }, + { HP_POP(searchstore->querynext, HP_searchstore_querynext) }, + { HP_POP(searchstore->next, HP_searchstore_next) }, + { HP_POP(searchstore->clear, HP_searchstore_clear) }, + { HP_POP(searchstore->close, HP_searchstore_close) }, + { HP_POP(searchstore->click, HP_searchstore_click) }, + { HP_POP(searchstore->queryremote, HP_searchstore_queryremote) }, + { HP_POP(searchstore->clearremote, HP_searchstore_clearremote) }, + { HP_POP(searchstore->result, HP_searchstore_result) }, /* skill */ - { HP_POP(skill->init), HP_POP2(HP_skill_init), 4120 }, - { HP_POP(skill->final), HP_POP2(HP_skill_final), 4122 }, - { HP_POP(skill->reload), HP_POP2(HP_skill_reload), 4124 }, - { HP_POP(skill->read_db), HP_POP2(HP_skill_read_db), 4126 }, - { HP_POP(skill->get_index), HP_POP2(HP_skill_get_index), 4128 }, - { HP_POP(skill->get_type), HP_POP2(HP_skill_get_type), 4130 }, - { HP_POP(skill->get_hit), HP_POP2(HP_skill_get_hit), 4132 }, - { HP_POP(skill->get_inf), HP_POP2(HP_skill_get_inf), 4134 }, - { HP_POP(skill->get_ele), HP_POP2(HP_skill_get_ele), 4136 }, - { HP_POP(skill->get_nk), HP_POP2(HP_skill_get_nk), 4138 }, - { HP_POP(skill->get_max), HP_POP2(HP_skill_get_max), 4140 }, - { HP_POP(skill->get_range), HP_POP2(HP_skill_get_range), 4142 }, - { HP_POP(skill->get_range2), HP_POP2(HP_skill_get_range2), 4144 }, - { HP_POP(skill->get_splash), HP_POP2(HP_skill_get_splash), 4146 }, - { HP_POP(skill->get_hp), HP_POP2(HP_skill_get_hp), 4148 }, - { HP_POP(skill->get_mhp), HP_POP2(HP_skill_get_mhp), 4150 }, - { HP_POP(skill->get_sp), HP_POP2(HP_skill_get_sp), 4152 }, - { HP_POP(skill->get_state), HP_POP2(HP_skill_get_state), 4154 }, - { HP_POP(skill->get_spiritball), HP_POP2(HP_skill_get_spiritball), 4156 }, - { HP_POP(skill->get_zeny), HP_POP2(HP_skill_get_zeny), 4158 }, - { HP_POP(skill->get_num), HP_POP2(HP_skill_get_num), 4160 }, - { HP_POP(skill->get_cast), HP_POP2(HP_skill_get_cast), 4162 }, - { HP_POP(skill->get_delay), HP_POP2(HP_skill_get_delay), 4164 }, - { HP_POP(skill->get_walkdelay), HP_POP2(HP_skill_get_walkdelay), 4166 }, - { HP_POP(skill->get_time), HP_POP2(HP_skill_get_time), 4168 }, - { HP_POP(skill->get_time2), HP_POP2(HP_skill_get_time2), 4170 }, - { HP_POP(skill->get_castnodex), HP_POP2(HP_skill_get_castnodex), 4172 }, - { HP_POP(skill->get_delaynodex), HP_POP2(HP_skill_get_delaynodex), 4174 }, - { HP_POP(skill->get_castdef), HP_POP2(HP_skill_get_castdef), 4176 }, - { HP_POP(skill->get_weapontype), HP_POP2(HP_skill_get_weapontype), 4178 }, - { HP_POP(skill->get_ammotype), HP_POP2(HP_skill_get_ammotype), 4180 }, - { HP_POP(skill->get_ammo_qty), HP_POP2(HP_skill_get_ammo_qty), 4182 }, - { HP_POP(skill->get_unit_id), HP_POP2(HP_skill_get_unit_id), 4184 }, - { HP_POP(skill->get_inf2), HP_POP2(HP_skill_get_inf2), 4186 }, - { HP_POP(skill->get_castcancel), HP_POP2(HP_skill_get_castcancel), 4188 }, - { HP_POP(skill->get_maxcount), HP_POP2(HP_skill_get_maxcount), 4190 }, - { HP_POP(skill->get_blewcount), HP_POP2(HP_skill_get_blewcount), 4192 }, - { HP_POP(skill->get_unit_flag), HP_POP2(HP_skill_get_unit_flag), 4194 }, - { HP_POP(skill->get_unit_target), HP_POP2(HP_skill_get_unit_target), 4196 }, - { HP_POP(skill->get_unit_interval), HP_POP2(HP_skill_get_unit_interval), 4198 }, - { HP_POP(skill->get_unit_bl_target), HP_POP2(HP_skill_get_unit_bl_target), 4200 }, - { HP_POP(skill->get_unit_layout_type), HP_POP2(HP_skill_get_unit_layout_type), 4202 }, - { HP_POP(skill->get_unit_range), HP_POP2(HP_skill_get_unit_range), 4204 }, - { HP_POP(skill->get_cooldown), HP_POP2(HP_skill_get_cooldown), 4206 }, - { HP_POP(skill->tree_get_max), HP_POP2(HP_skill_tree_get_max), 4208 }, - { HP_POP(skill->get_name), HP_POP2(HP_skill_get_name), 4210 }, - { HP_POP(skill->get_desc), HP_POP2(HP_skill_get_desc), 4212 }, - { HP_POP(skill->chk), HP_POP2(HP_skill_chk), 4214 }, - { HP_POP(skill->get_casttype), HP_POP2(HP_skill_get_casttype), 4216 }, - { HP_POP(skill->get_casttype2), HP_POP2(HP_skill_get_casttype2), 4218 }, - { HP_POP(skill->name2id), HP_POP2(HP_skill_name2id), 4220 }, - { HP_POP(skill->isammotype), HP_POP2(HP_skill_isammotype), 4222 }, - { HP_POP(skill->castend_id), HP_POP2(HP_skill_castend_id), 4224 }, - { HP_POP(skill->castend_pos), HP_POP2(HP_skill_castend_pos), 4226 }, - { HP_POP(skill->castend_map), HP_POP2(HP_skill_castend_map), 4228 }, - { HP_POP(skill->cleartimerskill), HP_POP2(HP_skill_cleartimerskill), 4230 }, - { HP_POP(skill->addtimerskill), HP_POP2(HP_skill_addtimerskill), 4232 }, - { HP_POP(skill->additional_effect), HP_POP2(HP_skill_additional_effect), 4234 }, - { HP_POP(skill->counter_additional_effect), HP_POP2(HP_skill_counter_additional_effect), 4236 }, - { HP_POP(skill->blown), HP_POP2(HP_skill_blown), 4238 }, - { HP_POP(skill->break_equip), HP_POP2(HP_skill_break_equip), 4240 }, - { HP_POP(skill->strip_equip), HP_POP2(HP_skill_strip_equip), 4242 }, - { HP_POP(skill->id2group), HP_POP2(HP_skill_id2group), 4244 }, - { HP_POP(skill->unitsetting), HP_POP2(HP_skill_unitsetting), 4246 }, - { HP_POP(skill->initunit), HP_POP2(HP_skill_initunit), 4248 }, - { HP_POP(skill->delunit), HP_POP2(HP_skill_delunit), 4250 }, - { HP_POP(skill->init_unitgroup), HP_POP2(HP_skill_init_unitgroup), 4252 }, - { HP_POP(skill->del_unitgroup), HP_POP2(HP_skill_del_unitgroup), 4254 }, - { HP_POP(skill->clear_unitgroup), HP_POP2(HP_skill_clear_unitgroup), 4256 }, - { HP_POP(skill->clear_group), HP_POP2(HP_skill_clear_group), 4258 }, - { HP_POP(skill->unit_onplace), HP_POP2(HP_skill_unit_onplace), 4260 }, - { HP_POP(skill->unit_ondamaged), HP_POP2(HP_skill_unit_ondamaged), 4262 }, - { HP_POP(skill->cast_fix), HP_POP2(HP_skill_cast_fix), 4264 }, - { HP_POP(skill->cast_fix_sc), HP_POP2(HP_skill_cast_fix_sc), 4266 }, - { HP_POP(skill->vf_cast_fix), HP_POP2(HP_skill_vf_cast_fix), 4268 }, - { HP_POP(skill->delay_fix), HP_POP2(HP_skill_delay_fix), 4270 }, - { HP_POP(skill->check_condition_castbegin), HP_POP2(HP_skill_check_condition_castbegin), 4272 }, - { HP_POP(skill->check_condition_castend), HP_POP2(HP_skill_check_condition_castend), 4274 }, - { HP_POP(skill->consume_requirement), HP_POP2(HP_skill_consume_requirement), 4276 }, - { HP_POP(skill->get_requirement), HP_POP2(HP_skill_get_requirement), 4278 }, - { HP_POP(skill->check_pc_partner), HP_POP2(HP_skill_check_pc_partner), 4280 }, - { HP_POP(skill->unit_move), HP_POP2(HP_skill_unit_move), 4282 }, - { HP_POP(skill->unit_onleft), HP_POP2(HP_skill_unit_onleft), 4284 }, - { HP_POP(skill->unit_onout), HP_POP2(HP_skill_unit_onout), 4286 }, - { HP_POP(skill->unit_move_unit_group), HP_POP2(HP_skill_unit_move_unit_group), 4288 }, - { HP_POP(skill->sit), HP_POP2(HP_skill_sit), 4290 }, - { HP_POP(skill->brandishspear), HP_POP2(HP_skill_brandishspear), 4292 }, - { HP_POP(skill->repairweapon), HP_POP2(HP_skill_repairweapon), 4294 }, - { HP_POP(skill->identify), HP_POP2(HP_skill_identify), 4296 }, - { HP_POP(skill->weaponrefine), HP_POP2(HP_skill_weaponrefine), 4298 }, - { HP_POP(skill->autospell), HP_POP2(HP_skill_autospell), 4300 }, - { HP_POP(skill->calc_heal), HP_POP2(HP_skill_calc_heal), 4302 }, - { HP_POP(skill->check_cloaking), HP_POP2(HP_skill_check_cloaking), 4304 }, - { HP_POP(skill->enchant_elemental_end), HP_POP2(HP_skill_enchant_elemental_end), 4306 }, - { HP_POP(skill->not_ok), HP_POP2(HP_skill_not_ok), 4308 }, - { HP_POP(skill->not_ok_hom), HP_POP2(HP_skill_not_ok_hom), 4310 }, - { HP_POP(skill->not_ok_mercenary), HP_POP2(HP_skill_not_ok_mercenary), 4312 }, - { HP_POP(skill->chastle_mob_changetarget), HP_POP2(HP_skill_chastle_mob_changetarget), 4314 }, - { HP_POP(skill->can_produce_mix), HP_POP2(HP_skill_can_produce_mix), 4316 }, - { HP_POP(skill->produce_mix), HP_POP2(HP_skill_produce_mix), 4318 }, - { HP_POP(skill->arrow_create), HP_POP2(HP_skill_arrow_create), 4320 }, - { HP_POP(skill->castend_nodamage_id), HP_POP2(HP_skill_castend_nodamage_id), 4322 }, - { HP_POP(skill->castend_damage_id), HP_POP2(HP_skill_castend_damage_id), 4324 }, - { HP_POP(skill->castend_pos2), HP_POP2(HP_skill_castend_pos2), 4326 }, - { HP_POP(skill->blockpc_start), HP_POP2(HP_skill_blockpc_start), 4328 }, - { HP_POP(skill->blockhomun_start), HP_POP2(HP_skill_blockhomun_start), 4330 }, - { HP_POP(skill->blockmerc_start), HP_POP2(HP_skill_blockmerc_start), 4332 }, - { HP_POP(skill->attack), HP_POP2(HP_skill_attack), 4334 }, - { HP_POP(skill->attack_area), HP_POP2(HP_skill_attack_area), 4336 }, - { HP_POP(skill->area_sub), HP_POP2(HP_skill_area_sub), 4338 }, - { HP_POP(skill->area_sub_count), HP_POP2(HP_skill_area_sub_count), 4340 }, - { HP_POP(skill->check_unit_range), HP_POP2(HP_skill_check_unit_range), 4342 }, - { HP_POP(skill->check_unit_range_sub), HP_POP2(HP_skill_check_unit_range_sub), 4344 }, - { HP_POP(skill->check_unit_range2), HP_POP2(HP_skill_check_unit_range2), 4346 }, - { HP_POP(skill->check_unit_range2_sub), HP_POP2(HP_skill_check_unit_range2_sub), 4348 }, - { HP_POP(skill->toggle_magicpower), HP_POP2(HP_skill_toggle_magicpower), 4350 }, - { HP_POP(skill->magic_reflect), HP_POP2(HP_skill_magic_reflect), 4352 }, - { HP_POP(skill->onskillusage), HP_POP2(HP_skill_onskillusage), 4354 }, - { HP_POP(skill->cell_overlap), HP_POP2(HP_skill_cell_overlap), 4356 }, - { HP_POP(skill->timerskill), HP_POP2(HP_skill_timerskill), 4358 }, - { HP_POP(skill->trap_splash), HP_POP2(HP_skill_trap_splash), 4360 }, - { HP_POP(skill->check_condition_mercenary), HP_POP2(HP_skill_check_condition_mercenary), 4362 }, - { HP_POP(skill->locate_element_field), HP_POP2(HP_skill_locate_element_field), 4364 }, - { HP_POP(skill->graffitiremover), HP_POP2(HP_skill_graffitiremover), 4366 }, - { HP_POP(skill->activate_reverberation), HP_POP2(HP_skill_activate_reverberation), 4368 }, - { HP_POP(skill->dance_overlap_sub), HP_POP2(HP_skill_dance_overlap_sub), 4370 }, - { HP_POP(skill->dance_overlap), HP_POP2(HP_skill_dance_overlap), 4372 }, - { HP_POP(skill->get_unit_layout), HP_POP2(HP_skill_get_unit_layout), 4374 }, - { HP_POP(skill->frostjoke_scream), HP_POP2(HP_skill_frostjoke_scream), 4376 }, - { HP_POP(skill->greed), HP_POP2(HP_skill_greed), 4378 }, - { HP_POP(skill->destroy_trap), HP_POP2(HP_skill_destroy_trap), 4380 }, - { HP_POP(skill->icewall_block), HP_POP2(HP_skill_icewall_block), 4382 }, - { HP_POP(skill->unitgrouptickset_search), HP_POP2(HP_skill_unitgrouptickset_search), 4384 }, - { HP_POP(skill->dance_switch), HP_POP2(HP_skill_dance_switch), 4386 }, - { HP_POP(skill->check_condition_char_sub), HP_POP2(HP_skill_check_condition_char_sub), 4388 }, - { HP_POP(skill->check_condition_mob_master_sub), HP_POP2(HP_skill_check_condition_mob_master_sub), 4390 }, - { HP_POP(skill->brandishspear_first), HP_POP2(HP_skill_brandishspear_first), 4392 }, - { HP_POP(skill->brandishspear_dir), HP_POP2(HP_skill_brandishspear_dir), 4394 }, - { HP_POP(skill->get_fixed_cast), HP_POP2(HP_skill_get_fixed_cast), 4396 }, - { HP_POP(skill->sit_count), HP_POP2(HP_skill_sit_count), 4398 }, - { HP_POP(skill->sit_in), HP_POP2(HP_skill_sit_in), 4400 }, - { HP_POP(skill->sit_out), HP_POP2(HP_skill_sit_out), 4402 }, - { HP_POP(skill->unitsetmapcell), HP_POP2(HP_skill_unitsetmapcell), 4404 }, - { HP_POP(skill->unit_onplace_timer), HP_POP2(HP_skill_unit_onplace_timer), 4406 }, - { HP_POP(skill->unit_effect), HP_POP2(HP_skill_unit_effect), 4408 }, - { HP_POP(skill->unit_timer_sub_onplace), HP_POP2(HP_skill_unit_timer_sub_onplace), 4410 }, - { HP_POP(skill->unit_move_sub), HP_POP2(HP_skill_unit_move_sub), 4412 }, - { HP_POP(skill->blockpc_end), HP_POP2(HP_skill_blockpc_end), 4414 }, - { HP_POP(skill->blockhomun_end), HP_POP2(HP_skill_blockhomun_end), 4416 }, - { HP_POP(skill->blockmerc_end), HP_POP2(HP_skill_blockmerc_end), 4418 }, - { HP_POP(skill->split_atoi), HP_POP2(HP_skill_split_atoi), 4420 }, - { HP_POP(skill->unit_timer), HP_POP2(HP_skill_unit_timer), 4422 }, - { HP_POP(skill->unit_timer_sub), HP_POP2(HP_skill_unit_timer_sub), 4424 }, - { HP_POP(skill->init_unit_layout), HP_POP2(HP_skill_init_unit_layout), 4426 }, - { HP_POP(skill->parse_row_skilldb), HP_POP2(HP_skill_parse_row_skilldb), 4428 }, - { HP_POP(skill->parse_row_requiredb), HP_POP2(HP_skill_parse_row_requiredb), 4430 }, - { HP_POP(skill->parse_row_castdb), HP_POP2(HP_skill_parse_row_castdb), 4432 }, - { HP_POP(skill->parse_row_castnodexdb), HP_POP2(HP_skill_parse_row_castnodexdb), 4434 }, - { HP_POP(skill->parse_row_unitdb), HP_POP2(HP_skill_parse_row_unitdb), 4436 }, - { HP_POP(skill->parse_row_producedb), HP_POP2(HP_skill_parse_row_producedb), 4438 }, - { HP_POP(skill->parse_row_createarrowdb), HP_POP2(HP_skill_parse_row_createarrowdb), 4440 }, - { HP_POP(skill->parse_row_abradb), HP_POP2(HP_skill_parse_row_abradb), 4442 }, - { HP_POP(skill->parse_row_spellbookdb), HP_POP2(HP_skill_parse_row_spellbookdb), 4444 }, - { HP_POP(skill->parse_row_magicmushroomdb), HP_POP2(HP_skill_parse_row_magicmushroomdb), 4446 }, - { HP_POP(skill->parse_row_reproducedb), HP_POP2(HP_skill_parse_row_reproducedb), 4448 }, - { HP_POP(skill->parse_row_improvisedb), HP_POP2(HP_skill_parse_row_improvisedb), 4450 }, - { HP_POP(skill->parse_row_changematerialdb), HP_POP2(HP_skill_parse_row_changematerialdb), 4452 }, - { HP_POP(skill->usave_add), HP_POP2(HP_skill_usave_add), 4454 }, - { HP_POP(skill->usave_trigger), HP_POP2(HP_skill_usave_trigger), 4456 }, - { HP_POP(skill->cooldown_load), HP_POP2(HP_skill_cooldown_load), 4458 }, - { HP_POP(skill->spellbook), HP_POP2(HP_skill_spellbook), 4460 }, - { HP_POP(skill->block_check), HP_POP2(HP_skill_block_check), 4462 }, - { HP_POP(skill->detonator), HP_POP2(HP_skill_detonator), 4464 }, - { HP_POP(skill->check_camouflage), HP_POP2(HP_skill_check_camouflage), 4466 }, - { HP_POP(skill->magicdecoy), HP_POP2(HP_skill_magicdecoy), 4468 }, - { HP_POP(skill->poisoningweapon), HP_POP2(HP_skill_poisoningweapon), 4470 }, - { HP_POP(skill->select_menu), HP_POP2(HP_skill_select_menu), 4472 }, - { HP_POP(skill->elementalanalysis), HP_POP2(HP_skill_elementalanalysis), 4474 }, - { HP_POP(skill->changematerial), HP_POP2(HP_skill_changematerial), 4476 }, - { HP_POP(skill->get_elemental_type), HP_POP2(HP_skill_get_elemental_type), 4478 }, - { HP_POP(skill->cooldown_save), HP_POP2(HP_skill_cooldown_save), 4480 }, - { HP_POP(skill->maelstrom_suction), HP_POP2(HP_skill_maelstrom_suction), 4482 }, - { HP_POP(skill->get_new_group_id), HP_POP2(HP_skill_get_new_group_id), 4484 }, + { HP_POP(skill->init, HP_skill_init) }, + { HP_POP(skill->final, HP_skill_final) }, + { HP_POP(skill->reload, HP_skill_reload) }, + { HP_POP(skill->read_db, HP_skill_read_db) }, + { HP_POP(skill->get_index, HP_skill_get_index) }, + { HP_POP(skill->get_type, HP_skill_get_type) }, + { HP_POP(skill->get_hit, HP_skill_get_hit) }, + { HP_POP(skill->get_inf, HP_skill_get_inf) }, + { HP_POP(skill->get_ele, HP_skill_get_ele) }, + { HP_POP(skill->get_nk, HP_skill_get_nk) }, + { HP_POP(skill->get_max, HP_skill_get_max) }, + { HP_POP(skill->get_range, HP_skill_get_range) }, + { HP_POP(skill->get_range2, HP_skill_get_range2) }, + { HP_POP(skill->get_splash, HP_skill_get_splash) }, + { HP_POP(skill->get_hp, HP_skill_get_hp) }, + { HP_POP(skill->get_mhp, HP_skill_get_mhp) }, + { HP_POP(skill->get_sp, HP_skill_get_sp) }, + { HP_POP(skill->get_state, HP_skill_get_state) }, + { HP_POP(skill->get_spiritball, HP_skill_get_spiritball) }, + { HP_POP(skill->get_zeny, HP_skill_get_zeny) }, + { HP_POP(skill->get_num, HP_skill_get_num) }, + { HP_POP(skill->get_cast, HP_skill_get_cast) }, + { HP_POP(skill->get_delay, HP_skill_get_delay) }, + { HP_POP(skill->get_walkdelay, HP_skill_get_walkdelay) }, + { HP_POP(skill->get_time, HP_skill_get_time) }, + { HP_POP(skill->get_time2, HP_skill_get_time2) }, + { HP_POP(skill->get_castnodex, HP_skill_get_castnodex) }, + { HP_POP(skill->get_delaynodex, HP_skill_get_delaynodex) }, + { HP_POP(skill->get_castdef, HP_skill_get_castdef) }, + { HP_POP(skill->get_weapontype, HP_skill_get_weapontype) }, + { HP_POP(skill->get_ammotype, HP_skill_get_ammotype) }, + { HP_POP(skill->get_ammo_qty, HP_skill_get_ammo_qty) }, + { HP_POP(skill->get_unit_id, HP_skill_get_unit_id) }, + { HP_POP(skill->get_inf2, HP_skill_get_inf2) }, + { HP_POP(skill->get_castcancel, HP_skill_get_castcancel) }, + { HP_POP(skill->get_maxcount, HP_skill_get_maxcount) }, + { HP_POP(skill->get_blewcount, HP_skill_get_blewcount) }, + { HP_POP(skill->get_unit_flag, HP_skill_get_unit_flag) }, + { HP_POP(skill->get_unit_target, HP_skill_get_unit_target) }, + { HP_POP(skill->get_unit_interval, HP_skill_get_unit_interval) }, + { HP_POP(skill->get_unit_bl_target, HP_skill_get_unit_bl_target) }, + { HP_POP(skill->get_unit_layout_type, HP_skill_get_unit_layout_type) }, + { HP_POP(skill->get_unit_range, HP_skill_get_unit_range) }, + { HP_POP(skill->get_cooldown, HP_skill_get_cooldown) }, + { HP_POP(skill->tree_get_max, HP_skill_tree_get_max) }, + { HP_POP(skill->get_name, HP_skill_get_name) }, + { HP_POP(skill->get_desc, HP_skill_get_desc) }, + { HP_POP(skill->chk, HP_skill_chk) }, + { HP_POP(skill->get_casttype, HP_skill_get_casttype) }, + { HP_POP(skill->get_casttype2, HP_skill_get_casttype2) }, + { HP_POP(skill->name2id, HP_skill_name2id) }, + { HP_POP(skill->isammotype, HP_skill_isammotype) }, + { HP_POP(skill->castend_id, HP_skill_castend_id) }, + { HP_POP(skill->castend_pos, HP_skill_castend_pos) }, + { HP_POP(skill->castend_map, HP_skill_castend_map) }, + { HP_POP(skill->cleartimerskill, HP_skill_cleartimerskill) }, + { HP_POP(skill->addtimerskill, HP_skill_addtimerskill) }, + { HP_POP(skill->additional_effect, HP_skill_additional_effect) }, + { HP_POP(skill->counter_additional_effect, HP_skill_counter_additional_effect) }, + { HP_POP(skill->blown, HP_skill_blown) }, + { HP_POP(skill->break_equip, HP_skill_break_equip) }, + { HP_POP(skill->strip_equip, HP_skill_strip_equip) }, + { HP_POP(skill->id2group, HP_skill_id2group) }, + { HP_POP(skill->unitsetting, HP_skill_unitsetting) }, + { HP_POP(skill->initunit, HP_skill_initunit) }, + { HP_POP(skill->delunit, HP_skill_delunit) }, + { HP_POP(skill->init_unitgroup, HP_skill_init_unitgroup) }, + { HP_POP(skill->del_unitgroup, HP_skill_del_unitgroup) }, + { HP_POP(skill->clear_unitgroup, HP_skill_clear_unitgroup) }, + { HP_POP(skill->clear_group, HP_skill_clear_group) }, + { HP_POP(skill->unit_onplace, HP_skill_unit_onplace) }, + { HP_POP(skill->unit_ondamaged, HP_skill_unit_ondamaged) }, + { HP_POP(skill->cast_fix, HP_skill_cast_fix) }, + { HP_POP(skill->cast_fix_sc, HP_skill_cast_fix_sc) }, + { HP_POP(skill->vf_cast_fix, HP_skill_vf_cast_fix) }, + { HP_POP(skill->delay_fix, HP_skill_delay_fix) }, + { HP_POP(skill->check_condition_castbegin, HP_skill_check_condition_castbegin) }, + { HP_POP(skill->check_condition_castend, HP_skill_check_condition_castend) }, + { HP_POP(skill->consume_requirement, HP_skill_consume_requirement) }, + { HP_POP(skill->get_requirement, HP_skill_get_requirement) }, + { HP_POP(skill->check_pc_partner, HP_skill_check_pc_partner) }, + { HP_POP(skill->unit_move, HP_skill_unit_move) }, + { HP_POP(skill->unit_onleft, HP_skill_unit_onleft) }, + { HP_POP(skill->unit_onout, HP_skill_unit_onout) }, + { HP_POP(skill->unit_move_unit_group, HP_skill_unit_move_unit_group) }, + { HP_POP(skill->sit, HP_skill_sit) }, + { HP_POP(skill->brandishspear, HP_skill_brandishspear) }, + { HP_POP(skill->repairweapon, HP_skill_repairweapon) }, + { HP_POP(skill->identify, HP_skill_identify) }, + { HP_POP(skill->weaponrefine, HP_skill_weaponrefine) }, + { HP_POP(skill->autospell, HP_skill_autospell) }, + { HP_POP(skill->calc_heal, HP_skill_calc_heal) }, + { HP_POP(skill->check_cloaking, HP_skill_check_cloaking) }, + { HP_POP(skill->enchant_elemental_end, HP_skill_enchant_elemental_end) }, + { HP_POP(skill->not_ok, HP_skill_not_ok) }, + { HP_POP(skill->not_ok_hom, HP_skill_not_ok_hom) }, + { HP_POP(skill->not_ok_mercenary, HP_skill_not_ok_mercenary) }, + { HP_POP(skill->chastle_mob_changetarget, HP_skill_chastle_mob_changetarget) }, + { HP_POP(skill->can_produce_mix, HP_skill_can_produce_mix) }, + { HP_POP(skill->produce_mix, HP_skill_produce_mix) }, + { HP_POP(skill->arrow_create, HP_skill_arrow_create) }, + { HP_POP(skill->castend_nodamage_id, HP_skill_castend_nodamage_id) }, + { HP_POP(skill->castend_damage_id, HP_skill_castend_damage_id) }, + { HP_POP(skill->castend_pos2, HP_skill_castend_pos2) }, + { HP_POP(skill->blockpc_start, HP_skill_blockpc_start) }, + { HP_POP(skill->blockhomun_start, HP_skill_blockhomun_start) }, + { HP_POP(skill->blockmerc_start, HP_skill_blockmerc_start) }, + { HP_POP(skill->attack, HP_skill_attack) }, + { HP_POP(skill->attack_area, HP_skill_attack_area) }, + { HP_POP(skill->area_sub, HP_skill_area_sub) }, + { HP_POP(skill->area_sub_count, HP_skill_area_sub_count) }, + { HP_POP(skill->check_unit_range, HP_skill_check_unit_range) }, + { HP_POP(skill->check_unit_range_sub, HP_skill_check_unit_range_sub) }, + { HP_POP(skill->check_unit_range2, HP_skill_check_unit_range2) }, + { HP_POP(skill->check_unit_range2_sub, HP_skill_check_unit_range2_sub) }, + { HP_POP(skill->toggle_magicpower, HP_skill_toggle_magicpower) }, + { HP_POP(skill->magic_reflect, HP_skill_magic_reflect) }, + { HP_POP(skill->onskillusage, HP_skill_onskillusage) }, + { HP_POP(skill->cell_overlap, HP_skill_cell_overlap) }, + { HP_POP(skill->timerskill, HP_skill_timerskill) }, + { HP_POP(skill->trap_splash, HP_skill_trap_splash) }, + { HP_POP(skill->check_condition_mercenary, HP_skill_check_condition_mercenary) }, + { HP_POP(skill->locate_element_field, HP_skill_locate_element_field) }, + { HP_POP(skill->graffitiremover, HP_skill_graffitiremover) }, + { HP_POP(skill->activate_reverberation, HP_skill_activate_reverberation) }, + { HP_POP(skill->dance_overlap_sub, HP_skill_dance_overlap_sub) }, + { HP_POP(skill->dance_overlap, HP_skill_dance_overlap) }, + { HP_POP(skill->get_unit_layout, HP_skill_get_unit_layout) }, + { HP_POP(skill->frostjoke_scream, HP_skill_frostjoke_scream) }, + { HP_POP(skill->greed, HP_skill_greed) }, + { HP_POP(skill->destroy_trap, HP_skill_destroy_trap) }, + { HP_POP(skill->icewall_block, HP_skill_icewall_block) }, + { HP_POP(skill->unitgrouptickset_search, HP_skill_unitgrouptickset_search) }, + { HP_POP(skill->dance_switch, HP_skill_dance_switch) }, + { HP_POP(skill->check_condition_char_sub, HP_skill_check_condition_char_sub) }, + { HP_POP(skill->check_condition_mob_master_sub, HP_skill_check_condition_mob_master_sub) }, + { HP_POP(skill->brandishspear_first, HP_skill_brandishspear_first) }, + { HP_POP(skill->brandishspear_dir, HP_skill_brandishspear_dir) }, + { HP_POP(skill->get_fixed_cast, HP_skill_get_fixed_cast) }, + { HP_POP(skill->sit_count, HP_skill_sit_count) }, + { HP_POP(skill->sit_in, HP_skill_sit_in) }, + { HP_POP(skill->sit_out, HP_skill_sit_out) }, + { HP_POP(skill->unitsetmapcell, HP_skill_unitsetmapcell) }, + { HP_POP(skill->unit_onplace_timer, HP_skill_unit_onplace_timer) }, + { HP_POP(skill->unit_effect, HP_skill_unit_effect) }, + { HP_POP(skill->unit_timer_sub_onplace, HP_skill_unit_timer_sub_onplace) }, + { HP_POP(skill->unit_move_sub, HP_skill_unit_move_sub) }, + { HP_POP(skill->blockpc_end, HP_skill_blockpc_end) }, + { HP_POP(skill->blockhomun_end, HP_skill_blockhomun_end) }, + { HP_POP(skill->blockmerc_end, HP_skill_blockmerc_end) }, + { HP_POP(skill->split_atoi, HP_skill_split_atoi) }, + { HP_POP(skill->unit_timer, HP_skill_unit_timer) }, + { HP_POP(skill->unit_timer_sub, HP_skill_unit_timer_sub) }, + { HP_POP(skill->init_unit_layout, HP_skill_init_unit_layout) }, + { HP_POP(skill->parse_row_skilldb, HP_skill_parse_row_skilldb) }, + { HP_POP(skill->parse_row_requiredb, HP_skill_parse_row_requiredb) }, + { HP_POP(skill->parse_row_castdb, HP_skill_parse_row_castdb) }, + { HP_POP(skill->parse_row_castnodexdb, HP_skill_parse_row_castnodexdb) }, + { HP_POP(skill->parse_row_unitdb, HP_skill_parse_row_unitdb) }, + { HP_POP(skill->parse_row_producedb, HP_skill_parse_row_producedb) }, + { HP_POP(skill->parse_row_createarrowdb, HP_skill_parse_row_createarrowdb) }, + { HP_POP(skill->parse_row_abradb, HP_skill_parse_row_abradb) }, + { HP_POP(skill->parse_row_spellbookdb, HP_skill_parse_row_spellbookdb) }, + { HP_POP(skill->parse_row_magicmushroomdb, HP_skill_parse_row_magicmushroomdb) }, + { HP_POP(skill->parse_row_reproducedb, HP_skill_parse_row_reproducedb) }, + { HP_POP(skill->parse_row_improvisedb, HP_skill_parse_row_improvisedb) }, + { HP_POP(skill->parse_row_changematerialdb, HP_skill_parse_row_changematerialdb) }, + { HP_POP(skill->usave_add, HP_skill_usave_add) }, + { HP_POP(skill->usave_trigger, HP_skill_usave_trigger) }, + { HP_POP(skill->cooldown_load, HP_skill_cooldown_load) }, + { HP_POP(skill->spellbook, HP_skill_spellbook) }, + { HP_POP(skill->block_check, HP_skill_block_check) }, + { HP_POP(skill->detonator, HP_skill_detonator) }, + { HP_POP(skill->check_camouflage, HP_skill_check_camouflage) }, + { HP_POP(skill->magicdecoy, HP_skill_magicdecoy) }, + { HP_POP(skill->poisoningweapon, HP_skill_poisoningweapon) }, + { HP_POP(skill->select_menu, HP_skill_select_menu) }, + { HP_POP(skill->elementalanalysis, HP_skill_elementalanalysis) }, + { HP_POP(skill->changematerial, HP_skill_changematerial) }, + { HP_POP(skill->get_elemental_type, HP_skill_get_elemental_type) }, + { HP_POP(skill->cooldown_save, HP_skill_cooldown_save) }, + { 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_POP2(HP_status_init), 4486 }, - { HP_POP(status->final), HP_POP2(HP_status_final), 4488 }, - { HP_POP(status->get_refine_chance), HP_POP2(HP_status_get_refine_chance), 4490 }, - { HP_POP(status->skill2sc), HP_POP2(HP_status_skill2sc), 4492 }, - { HP_POP(status->sc2skill), HP_POP2(HP_status_sc2skill), 4494 }, - { HP_POP(status->sc2scb_flag), HP_POP2(HP_status_sc2scb_flag), 4496 }, - { HP_POP(status->type2relevant_bl_types), HP_POP2(HP_status_type2relevant_bl_types), 4498 }, - { HP_POP(status->get_sc_type), HP_POP2(HP_status_get_sc_type), 4500 }, - { HP_POP(status->damage), HP_POP2(HP_status_damage), 4502 }, - { HP_POP(status->charge), HP_POP2(HP_status_charge), 4504 }, - { HP_POP(status->percent_change), HP_POP2(HP_status_percent_change), 4506 }, - { HP_POP(status->set_hp), HP_POP2(HP_status_set_hp), 4508 }, - { HP_POP(status->set_sp), HP_POP2(HP_status_set_sp), 4510 }, - { HP_POP(status->heal), HP_POP2(HP_status_heal), 4512 }, - { HP_POP(status->revive), HP_POP2(HP_status_revive), 4514 }, - { HP_POP(status->get_regen_data), HP_POP2(HP_status_get_regen_data), 4516 }, - { HP_POP(status->get_status_data), HP_POP2(HP_status_get_status_data), 4518 }, - { HP_POP(status->get_base_status), HP_POP2(HP_status_get_base_status), 4520 }, - { HP_POP(status->get_name), HP_POP2(HP_status_get_name), 4522 }, - { HP_POP(status->get_class), HP_POP2(HP_status_get_class), 4524 }, - { HP_POP(status->get_lv), HP_POP2(HP_status_get_lv), 4526 }, - { HP_POP(status->get_def), HP_POP2(HP_status_get_def), 4528 }, - { HP_POP(status->get_speed), HP_POP2(HP_status_get_speed), 4530 }, - { HP_POP(status->calc_attack_element), HP_POP2(HP_status_calc_attack_element), 4532 }, - { HP_POP(status->get_party_id), HP_POP2(HP_status_get_party_id), 4534 }, - { HP_POP(status->get_guild_id), HP_POP2(HP_status_get_guild_id), 4536 }, - { HP_POP(status->get_emblem_id), HP_POP2(HP_status_get_emblem_id), 4538 }, - { HP_POP(status->get_mexp), HP_POP2(HP_status_get_mexp), 4540 }, - { HP_POP(status->get_race2), HP_POP2(HP_status_get_race2), 4542 }, - { HP_POP(status->get_viewdata), HP_POP2(HP_status_get_viewdata), 4544 }, - { HP_POP(status->set_viewdata), HP_POP2(HP_status_set_viewdata), 4546 }, - { HP_POP(status->change_init), HP_POP2(HP_status_change_init), 4548 }, - { HP_POP(status->get_sc), HP_POP2(HP_status_get_sc), 4550 }, - { HP_POP(status->isdead), HP_POP2(HP_status_isdead), 4552 }, - { HP_POP(status->isimmune), HP_POP2(HP_status_isimmune), 4554 }, - { HP_POP(status->get_sc_def), HP_POP2(HP_status_get_sc_def), 4556 }, - { HP_POP(status->change_start), HP_POP2(HP_status_change_start), 4558 }, - { HP_POP(status->change_end_), HP_POP2(HP_status_change_end_), 4560 }, - { HP_POP(status->kaahi_heal_timer), HP_POP2(HP_status_kaahi_heal_timer), 4562 }, - { HP_POP(status->change_timer), HP_POP2(HP_status_change_timer), 4564 }, - { HP_POP(status->change_timer_sub), HP_POP2(HP_status_change_timer_sub), 4566 }, - { HP_POP(status->change_clear), HP_POP2(HP_status_change_clear), 4568 }, - { HP_POP(status->change_clear_buffs), HP_POP2(HP_status_change_clear_buffs), 4570 }, - { HP_POP(status->calc_bl_), HP_POP2(HP_status_calc_bl_), 4572 }, - { HP_POP(status->calc_mob_), HP_POP2(HP_status_calc_mob_), 4574 }, - { HP_POP(status->calc_pet_), HP_POP2(HP_status_calc_pet_), 4576 }, - { HP_POP(status->calc_pc_), HP_POP2(HP_status_calc_pc_), 4578 }, - { HP_POP(status->calc_homunculus_), HP_POP2(HP_status_calc_homunculus_), 4580 }, - { HP_POP(status->calc_mercenary_), HP_POP2(HP_status_calc_mercenary_), 4582 }, - { HP_POP(status->calc_elemental_), HP_POP2(HP_status_calc_elemental_), 4584 }, - { HP_POP(status->calc_misc), HP_POP2(HP_status_calc_misc), 4586 }, - { HP_POP(status->calc_regen), HP_POP2(HP_status_calc_regen), 4588 }, - { HP_POP(status->calc_regen_rate), HP_POP2(HP_status_calc_regen_rate), 4590 }, - { HP_POP(status->check_skilluse), HP_POP2(HP_status_check_skilluse), 4592 }, - { HP_POP(status->check_visibility), HP_POP2(HP_status_check_visibility), 4594 }, - { HP_POP(status->change_spread), HP_POP2(HP_status_change_spread), 4596 }, - { HP_POP(status->calc_def), HP_POP2(HP_status_calc_def), 4598 }, - { HP_POP(status->calc_def2), HP_POP2(HP_status_calc_def2), 4600 }, - { HP_POP(status->calc_mdef), HP_POP2(HP_status_calc_mdef), 4602 }, - { HP_POP(status->calc_mdef2), HP_POP2(HP_status_calc_mdef2), 4604 }, - { HP_POP(status->calc_batk), HP_POP2(HP_status_calc_batk), 4606 }, - { HP_POP(status->base_matk), HP_POP2(HP_status_base_matk), 4608 }, - { HP_POP(status->get_weapon_atk), HP_POP2(HP_status_get_weapon_atk), 4610 }, - { HP_POP(status->get_total_mdef), HP_POP2(HP_status_get_total_mdef), 4612 }, - { HP_POP(status->get_total_def), HP_POP2(HP_status_get_total_def), 4614 }, - { HP_POP(status->get_matk), HP_POP2(HP_status_get_matk), 4616 }, - { HP_POP(status->readdb), HP_POP2(HP_status_readdb), 4618 }, - { HP_POP(status->initChangeTables), HP_POP2(HP_status_initChangeTables), 4620 }, - { HP_POP(status->initDummyData), HP_POP2(HP_status_initDummyData), 4622 }, - { HP_POP(status->base_amotion_pc), HP_POP2(HP_status_base_amotion_pc), 4624 }, - { HP_POP(status->base_atk), HP_POP2(HP_status_base_atk), 4626 }, - { HP_POP(status->calc_sigma), HP_POP2(HP_status_calc_sigma), 4628 }, - { HP_POP(status->base_pc_maxhp), HP_POP2(HP_status_base_pc_maxhp), 4630 }, - { HP_POP(status->base_pc_maxsp), HP_POP2(HP_status_base_pc_maxsp), 4632 }, - { HP_POP(status->calc_npc_), HP_POP2(HP_status_calc_npc_), 4634 }, - { HP_POP(status->calc_str), HP_POP2(HP_status_calc_str), 4636 }, - { HP_POP(status->calc_agi), HP_POP2(HP_status_calc_agi), 4638 }, - { HP_POP(status->calc_vit), HP_POP2(HP_status_calc_vit), 4640 }, - { HP_POP(status->calc_int), HP_POP2(HP_status_calc_int), 4642 }, - { HP_POP(status->calc_dex), HP_POP2(HP_status_calc_dex), 4644 }, - { HP_POP(status->calc_luk), HP_POP2(HP_status_calc_luk), 4646 }, - { HP_POP(status->calc_watk), HP_POP2(HP_status_calc_watk), 4648 }, - { HP_POP(status->calc_matk), HP_POP2(HP_status_calc_matk), 4650 }, - { HP_POP(status->calc_hit), HP_POP2(HP_status_calc_hit), 4652 }, - { HP_POP(status->calc_critical), HP_POP2(HP_status_calc_critical), 4654 }, - { HP_POP(status->calc_flee), HP_POP2(HP_status_calc_flee), 4656 }, - { HP_POP(status->calc_flee2), HP_POP2(HP_status_calc_flee2), 4658 }, - { HP_POP(status->calc_speed), HP_POP2(HP_status_calc_speed), 4660 }, - { HP_POP(status->calc_aspd_rate), HP_POP2(HP_status_calc_aspd_rate), 4662 }, - { HP_POP(status->calc_dmotion), HP_POP2(HP_status_calc_dmotion), 4664 }, - { HP_POP(status->calc_aspd), HP_POP2(HP_status_calc_aspd), 4666 }, - { HP_POP(status->calc_fix_aspd), HP_POP2(HP_status_calc_fix_aspd), 4668 }, - { HP_POP(status->calc_maxhp), HP_POP2(HP_status_calc_maxhp), 4670 }, - { HP_POP(status->calc_maxsp), HP_POP2(HP_status_calc_maxsp), 4672 }, - { HP_POP(status->calc_element), HP_POP2(HP_status_calc_element), 4674 }, - { HP_POP(status->calc_element_lv), HP_POP2(HP_status_calc_element_lv), 4676 }, - { HP_POP(status->calc_mode), HP_POP2(HP_status_calc_mode), 4678 }, - { HP_POP(status->calc_ematk), HP_POP2(HP_status_calc_ematk), 4680 }, - { HP_POP(status->calc_bl_main), HP_POP2(HP_status_calc_bl_main), 4682 }, - { HP_POP(status->display_add), HP_POP2(HP_status_display_add), 4684 }, - { HP_POP(status->display_remove), HP_POP2(HP_status_display_remove), 4686 }, - { HP_POP(status->natural_heal), HP_POP2(HP_status_natural_heal), 4688 }, - { HP_POP(status->natural_heal_timer), HP_POP2(HP_status_natural_heal_timer), 4690 }, - { HP_POP(status->readdb_job1), HP_POP2(HP_status_readdb_job1), 4692 }, - { HP_POP(status->readdb_job2), HP_POP2(HP_status_readdb_job2), 4694 }, - { HP_POP(status->readdb_sizefix), HP_POP2(HP_status_readdb_sizefix), 4696 }, - { HP_POP(status->readdb_refine), HP_POP2(HP_status_readdb_refine), 4698 }, - { HP_POP(status->readdb_scconfig), HP_POP2(HP_status_readdb_scconfig), 4700 }, + { HP_POP(status->init, HP_status_init) }, + { HP_POP(status->final, HP_status_final) }, + { HP_POP(status->get_refine_chance, HP_status_get_refine_chance) }, + { HP_POP(status->skill2sc, HP_status_skill2sc) }, + { HP_POP(status->sc2skill, HP_status_sc2skill) }, + { HP_POP(status->sc2scb_flag, HP_status_sc2scb_flag) }, + { HP_POP(status->type2relevant_bl_types, HP_status_type2relevant_bl_types) }, + { HP_POP(status->get_sc_type, HP_status_get_sc_type) }, + { HP_POP(status->damage, HP_status_damage) }, + { HP_POP(status->charge, HP_status_charge) }, + { HP_POP(status->percent_change, HP_status_percent_change) }, + { HP_POP(status->set_hp, HP_status_set_hp) }, + { HP_POP(status->set_sp, HP_status_set_sp) }, + { HP_POP(status->heal, HP_status_heal) }, + { HP_POP(status->revive, HP_status_revive) }, + { HP_POP(status->fixed_revive, HP_status_fixed_revive) }, + { HP_POP(status->get_regen_data, HP_status_get_regen_data) }, + { HP_POP(status->get_status_data, HP_status_get_status_data) }, + { HP_POP(status->get_base_status, HP_status_get_base_status) }, + { HP_POP(status->get_name, HP_status_get_name) }, + { HP_POP(status->get_class, HP_status_get_class) }, + { HP_POP(status->get_lv, HP_status_get_lv) }, + { HP_POP(status->get_def, HP_status_get_def) }, + { HP_POP(status->get_speed, HP_status_get_speed) }, + { HP_POP(status->calc_attack_element, HP_status_calc_attack_element) }, + { HP_POP(status->get_party_id, HP_status_get_party_id) }, + { HP_POP(status->get_guild_id, HP_status_get_guild_id) }, + { HP_POP(status->get_emblem_id, HP_status_get_emblem_id) }, + { HP_POP(status->get_mexp, HP_status_get_mexp) }, + { HP_POP(status->get_race2, HP_status_get_race2) }, + { HP_POP(status->get_viewdata, HP_status_get_viewdata) }, + { HP_POP(status->set_viewdata, HP_status_set_viewdata) }, + { HP_POP(status->change_init, HP_status_change_init) }, + { HP_POP(status->get_sc, HP_status_get_sc) }, + { HP_POP(status->isdead, HP_status_isdead) }, + { HP_POP(status->isimmune, HP_status_isimmune) }, + { HP_POP(status->get_sc_def, HP_status_get_sc_def) }, + { HP_POP(status->change_start, HP_status_change_start) }, + { HP_POP(status->change_end_, HP_status_change_end_) }, + { HP_POP(status->kaahi_heal_timer, HP_status_kaahi_heal_timer) }, + { HP_POP(status->change_timer, HP_status_change_timer) }, + { HP_POP(status->change_timer_sub, HP_status_change_timer_sub) }, + { HP_POP(status->change_clear, HP_status_change_clear) }, + { HP_POP(status->change_clear_buffs, HP_status_change_clear_buffs) }, + { HP_POP(status->calc_bl_, HP_status_calc_bl_) }, + { HP_POP(status->calc_mob_, HP_status_calc_mob_) }, + { HP_POP(status->calc_pet_, HP_status_calc_pet_) }, + { HP_POP(status->calc_pc_, HP_status_calc_pc_) }, + { HP_POP(status->calc_homunculus_, HP_status_calc_homunculus_) }, + { HP_POP(status->calc_mercenary_, HP_status_calc_mercenary_) }, + { HP_POP(status->calc_elemental_, HP_status_calc_elemental_) }, + { HP_POP(status->calc_misc, HP_status_calc_misc) }, + { HP_POP(status->calc_regen, HP_status_calc_regen) }, + { HP_POP(status->calc_regen_rate, HP_status_calc_regen_rate) }, + { HP_POP(status->check_skilluse, HP_status_check_skilluse) }, + { HP_POP(status->check_visibility, HP_status_check_visibility) }, + { HP_POP(status->change_spread, HP_status_change_spread) }, + { HP_POP(status->calc_def, HP_status_calc_def) }, + { HP_POP(status->calc_def2, HP_status_calc_def2) }, + { HP_POP(status->calc_mdef, HP_status_calc_mdef) }, + { HP_POP(status->calc_mdef2, HP_status_calc_mdef2) }, + { HP_POP(status->calc_batk, HP_status_calc_batk) }, + { HP_POP(status->base_matk, HP_status_base_matk) }, + { HP_POP(status->get_weapon_atk, HP_status_get_weapon_atk) }, + { HP_POP(status->get_total_mdef, HP_status_get_total_mdef) }, + { HP_POP(status->get_total_def, HP_status_get_total_def) }, + { HP_POP(status->get_matk, HP_status_get_matk) }, + { HP_POP(status->readdb, HP_status_readdb) }, + { HP_POP(status->initChangeTables, HP_status_initChangeTables) }, + { HP_POP(status->initDummyData, HP_status_initDummyData) }, + { HP_POP(status->base_amotion_pc, HP_status_base_amotion_pc) }, + { HP_POP(status->base_atk, HP_status_base_atk) }, + { HP_POP(status->calc_sigma, HP_status_calc_sigma) }, + { HP_POP(status->base_pc_maxhp, HP_status_base_pc_maxhp) }, + { HP_POP(status->base_pc_maxsp, HP_status_base_pc_maxsp) }, + { HP_POP(status->calc_npc_, HP_status_calc_npc_) }, + { HP_POP(status->calc_str, HP_status_calc_str) }, + { HP_POP(status->calc_agi, HP_status_calc_agi) }, + { HP_POP(status->calc_vit, HP_status_calc_vit) }, + { HP_POP(status->calc_int, HP_status_calc_int) }, + { HP_POP(status->calc_dex, HP_status_calc_dex) }, + { HP_POP(status->calc_luk, HP_status_calc_luk) }, + { HP_POP(status->calc_watk, HP_status_calc_watk) }, + { HP_POP(status->calc_matk, HP_status_calc_matk) }, + { HP_POP(status->calc_hit, HP_status_calc_hit) }, + { HP_POP(status->calc_critical, HP_status_calc_critical) }, + { HP_POP(status->calc_flee, HP_status_calc_flee) }, + { HP_POP(status->calc_flee2, HP_status_calc_flee2) }, + { HP_POP(status->calc_speed, HP_status_calc_speed) }, + { HP_POP(status->calc_aspd_rate, HP_status_calc_aspd_rate) }, + { HP_POP(status->calc_dmotion, HP_status_calc_dmotion) }, + { HP_POP(status->calc_aspd, HP_status_calc_aspd) }, + { HP_POP(status->calc_fix_aspd, HP_status_calc_fix_aspd) }, + { HP_POP(status->calc_maxhp, HP_status_calc_maxhp) }, + { HP_POP(status->calc_maxsp, HP_status_calc_maxsp) }, + { HP_POP(status->calc_element, HP_status_calc_element) }, + { HP_POP(status->calc_element_lv, HP_status_calc_element_lv) }, + { HP_POP(status->calc_mode, HP_status_calc_mode) }, + { HP_POP(status->calc_ematk, HP_status_calc_ematk) }, + { HP_POP(status->calc_bl_main, HP_status_calc_bl_main) }, + { HP_POP(status->display_add, HP_status_display_add) }, + { HP_POP(status->display_remove, HP_status_display_remove) }, + { HP_POP(status->natural_heal, HP_status_natural_heal) }, + { HP_POP(status->natural_heal_timer, HP_status_natural_heal_timer) }, + { HP_POP(status->readdb_job1, HP_status_readdb_job1) }, + { HP_POP(status->readdb_job2, HP_status_readdb_job2) }, + { HP_POP(status->readdb_sizefix, HP_status_readdb_sizefix) }, + { HP_POP(status->readdb_refine, HP_status_readdb_refine) }, + { HP_POP(status->readdb_scconfig, HP_status_readdb_scconfig) }, /* storage */ - { HP_POP(storage->reconnect), HP_POP2(HP_storage_reconnect), 4702 }, - { HP_POP(storage->delitem), HP_POP2(HP_storage_delitem), 4704 }, - { HP_POP(storage->open), HP_POP2(HP_storage_open), 4706 }, - { HP_POP(storage->add), HP_POP2(HP_storage_add), 4708 }, - { HP_POP(storage->get), HP_POP2(HP_storage_get), 4710 }, - { HP_POP(storage->additem), HP_POP2(HP_storage_additem), 4712 }, - { HP_POP(storage->addfromcart), HP_POP2(HP_storage_addfromcart), 4714 }, - { HP_POP(storage->gettocart), HP_POP2(HP_storage_gettocart), 4716 }, - { HP_POP(storage->close), HP_POP2(HP_storage_close), 4718 }, - { HP_POP(storage->pc_quit), HP_POP2(HP_storage_pc_quit), 4720 }, - { HP_POP(storage->comp_item), HP_POP2(HP_storage_comp_item), 4722 }, - { HP_POP(storage->sortitem), HP_POP2(HP_storage_sortitem), 4724 }, - { HP_POP(storage->reconnect_sub), HP_POP2(HP_storage_reconnect_sub), 4726 }, + { HP_POP(storage->reconnect, HP_storage_reconnect) }, + { HP_POP(storage->delitem, HP_storage_delitem) }, + { HP_POP(storage->open, HP_storage_open) }, + { HP_POP(storage->add, HP_storage_add) }, + { HP_POP(storage->get, HP_storage_get) }, + { HP_POP(storage->additem, HP_storage_additem) }, + { HP_POP(storage->addfromcart, HP_storage_addfromcart) }, + { HP_POP(storage->gettocart, HP_storage_gettocart) }, + { HP_POP(storage->close, HP_storage_close) }, + { HP_POP(storage->pc_quit, HP_storage_pc_quit) }, + { HP_POP(storage->comp_item, HP_storage_comp_item) }, + { HP_POP(storage->sortitem, HP_storage_sortitem) }, + { HP_POP(storage->reconnect_sub, HP_storage_reconnect_sub) }, /* trade */ - { HP_POP(trade->request), HP_POP2(HP_trade_request), 4728 }, - { HP_POP(trade->ack), HP_POP2(HP_trade_ack), 4730 }, - { HP_POP(trade->check_impossible), HP_POP2(HP_trade_check_impossible), 4732 }, - { HP_POP(trade->check), HP_POP2(HP_trade_check), 4734 }, - { HP_POP(trade->additem), HP_POP2(HP_trade_additem), 4736 }, - { HP_POP(trade->addzeny), HP_POP2(HP_trade_addzeny), 4738 }, - { HP_POP(trade->ok), HP_POP2(HP_trade_ok), 4740 }, - { HP_POP(trade->cancel), HP_POP2(HP_trade_cancel), 4742 }, - { HP_POP(trade->commit), HP_POP2(HP_trade_commit), 4744 }, + { HP_POP(trade->request, HP_trade_request) }, + { HP_POP(trade->ack, HP_trade_ack) }, + { HP_POP(trade->check_impossible, HP_trade_check_impossible) }, + { HP_POP(trade->check, HP_trade_check) }, + { HP_POP(trade->additem, HP_trade_additem) }, + { HP_POP(trade->addzeny, HP_trade_addzeny) }, + { HP_POP(trade->ok, HP_trade_ok) }, + { HP_POP(trade->cancel, HP_trade_cancel) }, + { HP_POP(trade->commit, HP_trade_commit) }, /* unit */ - { HP_POP(unit->init), HP_POP2(HP_unit_init), 4746 }, - { HP_POP(unit->final), HP_POP2(HP_unit_final), 4748 }, - { HP_POP(unit->bl2ud), HP_POP2(HP_unit_bl2ud), 4750 }, - { HP_POP(unit->bl2ud2), HP_POP2(HP_unit_bl2ud2), 4752 }, - { HP_POP(unit->attack_timer), HP_POP2(HP_unit_attack_timer), 4754 }, - { HP_POP(unit->walktoxy_timer), HP_POP2(HP_unit_walktoxy_timer), 4756 }, - { HP_POP(unit->walktoxy_sub), HP_POP2(HP_unit_walktoxy_sub), 4758 }, - { HP_POP(unit->delay_walktoxy_timer), HP_POP2(HP_unit_delay_walktoxy_timer), 4760 }, - { HP_POP(unit->walktoxy), HP_POP2(HP_unit_walktoxy), 4762 }, - { HP_POP(unit->walktobl_sub), HP_POP2(HP_unit_walktobl_sub), 4764 }, - { HP_POP(unit->walktobl), HP_POP2(HP_unit_walktobl), 4766 }, - { HP_POP(unit->run), HP_POP2(HP_unit_run), 4768 }, - { HP_POP(unit->wugdash), HP_POP2(HP_unit_wugdash), 4770 }, - { HP_POP(unit->escape), HP_POP2(HP_unit_escape), 4772 }, - { HP_POP(unit->movepos), HP_POP2(HP_unit_movepos), 4774 }, - { HP_POP(unit->setdir), HP_POP2(HP_unit_setdir), 4776 }, - { HP_POP(unit->getdir), HP_POP2(HP_unit_getdir), 4778 }, - { HP_POP(unit->blown), HP_POP2(HP_unit_blown), 4780 }, - { HP_POP(unit->warp), HP_POP2(HP_unit_warp), 4782 }, - { HP_POP(unit->stop_walking), HP_POP2(HP_unit_stop_walking), 4784 }, - { HP_POP(unit->skilluse_id), HP_POP2(HP_unit_skilluse_id), 4786 }, - { HP_POP(unit->is_walking), HP_POP2(HP_unit_is_walking), 4788 }, - { HP_POP(unit->can_move), HP_POP2(HP_unit_can_move), 4790 }, - { HP_POP(unit->resume_running), HP_POP2(HP_unit_resume_running), 4792 }, - { HP_POP(unit->set_walkdelay), HP_POP2(HP_unit_set_walkdelay), 4794 }, - { HP_POP(unit->skilluse_id2), HP_POP2(HP_unit_skilluse_id2), 4796 }, - { HP_POP(unit->skilluse_pos), HP_POP2(HP_unit_skilluse_pos), 4798 }, - { HP_POP(unit->skilluse_pos2), HP_POP2(HP_unit_skilluse_pos2), 4800 }, - { HP_POP(unit->set_target), HP_POP2(HP_unit_set_target), 4802 }, - { HP_POP(unit->stop_attack), HP_POP2(HP_unit_stop_attack), 4804 }, - { HP_POP(unit->unattackable), HP_POP2(HP_unit_unattackable), 4806 }, - { HP_POP(unit->attack), HP_POP2(HP_unit_attack), 4808 }, - { HP_POP(unit->cancel_combo), HP_POP2(HP_unit_cancel_combo), 4810 }, - { HP_POP(unit->can_reach_pos), HP_POP2(HP_unit_can_reach_pos), 4812 }, - { HP_POP(unit->can_reach_bl), HP_POP2(HP_unit_can_reach_bl), 4814 }, - { HP_POP(unit->calc_pos), HP_POP2(HP_unit_calc_pos), 4816 }, - { HP_POP(unit->attack_timer_sub), HP_POP2(HP_unit_attack_timer_sub), 4818 }, - { HP_POP(unit->skillcastcancel), HP_POP2(HP_unit_skillcastcancel), 4820 }, - { HP_POP(unit->dataset), HP_POP2(HP_unit_dataset), 4822 }, - { HP_POP(unit->counttargeted), HP_POP2(HP_unit_counttargeted), 4824 }, - { HP_POP(unit->fixdamage), HP_POP2(HP_unit_fixdamage), 4826 }, - { HP_POP(unit->changeviewsize), HP_POP2(HP_unit_changeviewsize), 4828 }, - { HP_POP(unit->remove_map), HP_POP2(HP_unit_remove_map), 4830 }, - { HP_POP(unit->remove_map_pc), HP_POP2(HP_unit_remove_map_pc), 4832 }, - { HP_POP(unit->free_pc), HP_POP2(HP_unit_free_pc), 4834 }, - { HP_POP(unit->free), HP_POP2(HP_unit_free), 4836 }, + { HP_POP(unit->init, HP_unit_init) }, + { HP_POP(unit->final, HP_unit_final) }, + { HP_POP(unit->bl2ud, HP_unit_bl2ud) }, + { HP_POP(unit->bl2ud2, HP_unit_bl2ud2) }, + { HP_POP(unit->attack_timer, HP_unit_attack_timer) }, + { HP_POP(unit->walktoxy_timer, HP_unit_walktoxy_timer) }, + { HP_POP(unit->walktoxy_sub, HP_unit_walktoxy_sub) }, + { HP_POP(unit->delay_walktoxy_timer, HP_unit_delay_walktoxy_timer) }, + { HP_POP(unit->walktoxy, HP_unit_walktoxy) }, + { HP_POP(unit->walktobl_sub, HP_unit_walktobl_sub) }, + { HP_POP(unit->walktobl, HP_unit_walktobl) }, + { HP_POP(unit->run, HP_unit_run) }, + { HP_POP(unit->wugdash, HP_unit_wugdash) }, + { HP_POP(unit->escape, HP_unit_escape) }, + { HP_POP(unit->movepos, HP_unit_movepos) }, + { HP_POP(unit->setdir, HP_unit_setdir) }, + { HP_POP(unit->getdir, HP_unit_getdir) }, + { HP_POP(unit->blown, HP_unit_blown) }, + { HP_POP(unit->warp, HP_unit_warp) }, + { HP_POP(unit->stop_walking, HP_unit_stop_walking) }, + { HP_POP(unit->skilluse_id, HP_unit_skilluse_id) }, + { HP_POP(unit->is_walking, HP_unit_is_walking) }, + { HP_POP(unit->can_move, HP_unit_can_move) }, + { HP_POP(unit->resume_running, HP_unit_resume_running) }, + { HP_POP(unit->set_walkdelay, HP_unit_set_walkdelay) }, + { HP_POP(unit->skilluse_id2, HP_unit_skilluse_id2) }, + { HP_POP(unit->skilluse_pos, HP_unit_skilluse_pos) }, + { HP_POP(unit->skilluse_pos2, HP_unit_skilluse_pos2) }, + { HP_POP(unit->set_target, HP_unit_set_target) }, + { HP_POP(unit->stop_attack, HP_unit_stop_attack) }, + { HP_POP(unit->unattackable, HP_unit_unattackable) }, + { HP_POP(unit->attack, HP_unit_attack) }, + { HP_POP(unit->cancel_combo, HP_unit_cancel_combo) }, + { HP_POP(unit->can_reach_pos, HP_unit_can_reach_pos) }, + { HP_POP(unit->can_reach_bl, HP_unit_can_reach_bl) }, + { HP_POP(unit->calc_pos, HP_unit_calc_pos) }, + { HP_POP(unit->attack_timer_sub, HP_unit_attack_timer_sub) }, + { HP_POP(unit->skillcastcancel, HP_unit_skillcastcancel) }, + { HP_POP(unit->dataset, HP_unit_dataset) }, + { HP_POP(unit->counttargeted, HP_unit_counttargeted) }, + { HP_POP(unit->fixdamage, HP_unit_fixdamage) }, + { HP_POP(unit->changeviewsize, HP_unit_changeviewsize) }, + { HP_POP(unit->remove_map, HP_unit_remove_map) }, + { HP_POP(unit->remove_map_pc, HP_unit_remove_map_pc) }, + { HP_POP(unit->free_pc, HP_unit_free_pc) }, + { HP_POP(unit->free, HP_unit_free) }, /* vending */ - { HP_POP(vending->init), HP_POP2(HP_vending_init), 4838 }, - { HP_POP(vending->final), HP_POP2(HP_vending_final), 4840 }, - { HP_POP(vending->close), HP_POP2(HP_vending_close), 4842 }, - { HP_POP(vending->open), HP_POP2(HP_vending_open), 4844 }, - { HP_POP(vending->list), HP_POP2(HP_vending_list), 4846 }, - { HP_POP(vending->purchase), HP_POP2(HP_vending_purchase), 4848 }, - { HP_POP(vending->search), HP_POP2(HP_vending_search), 4850 }, - { HP_POP(vending->searchall), HP_POP2(HP_vending_searchall), 4852 }, + { HP_POP(vending->init, HP_vending_init) }, + { HP_POP(vending->final, HP_vending_final) }, + { HP_POP(vending->close, HP_vending_close) }, + { HP_POP(vending->open, HP_vending_open) }, + { HP_POP(vending->list, HP_vending_list) }, + { HP_POP(vending->purchase, HP_vending_purchase) }, + { HP_POP(vending->search, HP_vending_search) }, + { HP_POP(vending->searchall, HP_vending_searchall) }, }; int HookingPointsLenMax = 41; diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index 3eafd4dbb..3bc658d24 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -5,13 +5,13 @@ // as it will get overwritten. /* atcommand */ -void HP_atcommand_init(void) { +void HP_atcommand_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -19,13 +19,13 @@ void HP_atcommand_init(void) { } } { - HPMHooks.source.atcommand.init(); + HPMHooks.source.atcommand.init(minimal); } if( HPMHooks.count.HP_atcommand_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -55,14 +55,14 @@ void HP_atcommand_final(void) { } return; } -bool HP_atcommand_parse(const int fd, struct map_session_data *sd, const char *message, int type) { +bool HP_atcommand_exec(const int fd, struct map_session_data *sd, const char *message, bool player_invoked) { int hIndex = 0; bool retVal___ = false; - if( HPMHooks.count.HP_atcommand_parse_pre ) { - bool (*preHookFunc) (const int *fd, struct map_session_data *sd, const char *message, int *type); - for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_parse_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_atcommand_parse_pre[hIndex].func; - retVal___ = preHookFunc(&fd, sd, message, &type); + if( HPMHooks.count.HP_atcommand_exec_pre ) { + bool (*preHookFunc) (const int *fd, struct map_session_data *sd, const char *message, bool *player_invoked); + for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_exec_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_atcommand_exec_pre[hIndex].func; + retVal___ = preHookFunc(&fd, sd, message, &player_invoked); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -70,13 +70,13 @@ bool HP_atcommand_parse(const int fd, struct map_session_data *sd, const char *m } } { - retVal___ = HPMHooks.source.atcommand.parse(fd, sd, message, type); + retVal___ = HPMHooks.source.atcommand.exec(fd, sd, message, player_invoked); } - if( HPMHooks.count.HP_atcommand_parse_post ) { - bool (*postHookFunc) (bool retVal___, const int *fd, struct map_session_data *sd, const char *message, int *type); - for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_parse_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_atcommand_parse_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd, sd, message, &type); + if( HPMHooks.count.HP_atcommand_exec_post ) { + bool (*postHookFunc) (bool retVal___, const int *fd, struct map_session_data *sd, const char *message, bool *player_invoked); + for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_exec_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_atcommand_exec_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &fd, sd, message, &player_invoked); } } return retVal___; @@ -210,11 +210,11 @@ AtCommandInfo* HP_atcommand_exists(const char *name) { } return retVal___; } -int HP_atcommand_msg_read(const char *cfgName) { +bool HP_atcommand_msg_read(const char *cfgName) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_atcommand_msg_read_pre ) { - int (*preHookFunc) (const char *cfgName); + bool (*preHookFunc) (const char *cfgName); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msg_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_msg_read_pre[hIndex].func; retVal___ = preHookFunc(cfgName); @@ -228,7 +228,7 @@ int HP_atcommand_msg_read(const char *cfgName) { retVal___ = HPMHooks.source.atcommand.msg_read(cfgName); } if( HPMHooks.count.HP_atcommand_msg_read_post ) { - int (*postHookFunc) (int retVal___, const char *cfgName); + bool (*postHookFunc) (bool retVal___, const char *cfgName); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msg_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_msg_read_post[hIndex].func; retVal___ = postHookFunc(retVal___, cfgName); @@ -763,14 +763,66 @@ void HP_atcommand_base_commands(void) { } return; } +bool HP_atcommand_add(char *name, AtCommandFunc func, bool replace) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_atcommand_add_pre ) { + bool (*preHookFunc) (char *name, AtCommandFunc *func, bool *replace); + for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_add_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_atcommand_add_pre[hIndex].func; + retVal___ = preHookFunc(name, &func, &replace); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.atcommand.add(name, func, replace); + } + if( HPMHooks.count.HP_atcommand_add_post ) { + bool (*postHookFunc) (bool retVal___, char *name, AtCommandFunc *func, bool *replace); + for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_add_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_atcommand_add_post[hIndex].func; + retVal___ = postHookFunc(retVal___, name, &func, &replace); + } + } + return retVal___; +} +const char* HP_atcommand_msg(int msg_number) { + int hIndex = 0; + const char* retVal___ = NULL; + if( HPMHooks.count.HP_atcommand_msg_pre ) { + const char* (*preHookFunc) (int *msg_number); + for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msg_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_atcommand_msg_pre[hIndex].func; + retVal___ = preHookFunc(&msg_number); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.atcommand.msg(msg_number); + } + if( HPMHooks.count.HP_atcommand_msg_post ) { + const char* (*postHookFunc) (const char* retVal___, int *msg_number); + for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msg_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_atcommand_msg_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &msg_number); + } + } + return retVal___; +} /* battle */ -void HP_battle_init(void) { +void HP_battle_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_battle_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -778,13 +830,13 @@ void HP_battle_init(void) { } } { - HPMHooks.source.battle.init(); + HPMHooks.source.battle.init(minimal); } if( HPMHooks.count.HP_battle_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -919,11 +971,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 +989,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 +1024,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 +1042,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); @@ -1023,31 +1075,30 @@ void HP_battle_drain(struct map_session_data *sd, struct block_list *tbl, int64 } return; } -int64 HP_battle_calc_return_damage(struct block_list *bl, struct block_list *src, int64 *p1, int flag, uint16 skill_id, int *rdelay) { +void HP_battle_reflect_damage(struct block_list *target, struct block_list *src, struct Damage *wd, uint16 skill_id) { int hIndex = 0; - int64 retVal___ = 0; - if( HPMHooks.count.HP_battle_calc_return_damage_pre ) { - int64 (*preHookFunc) (struct block_list *bl, struct block_list *src, int64 *p1, int *flag, uint16 *skill_id, int *rdelay); - for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_return_damage_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_battle_calc_return_damage_pre[hIndex].func; - retVal___ = preHookFunc(bl, src, p1, &flag, &skill_id, rdelay); + if( HPMHooks.count.HP_battle_reflect_damage_pre ) { + void (*preHookFunc) (struct block_list *target, struct block_list *src, struct Damage *wd, uint16 *skill_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_reflect_damage_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_battle_reflect_damage_pre[hIndex].func; + preHookFunc(target, src, wd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.battle.calc_return_damage(bl, src, p1, flag, skill_id, rdelay); + HPMHooks.source.battle.reflect_damage(target, src, wd, skill_id); } - if( HPMHooks.count.HP_battle_calc_return_damage_post ) { - int64 (*postHookFunc) (int64 retVal___, struct block_list *bl, struct block_list *src, int64 *p1, int *flag, uint16 *skill_id, int *rdelay); - for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_return_damage_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_battle_calc_return_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, src, p1, &flag, &skill_id, rdelay); + if( HPMHooks.count.HP_battle_reflect_damage_post ) { + void (*postHookFunc) (struct block_list *target, struct block_list *src, struct Damage *wd, uint16 *skill_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_reflect_damage_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_battle_reflect_damage_post[hIndex].func; + postHookFunc(target, src, wd, &skill_id); } } - return retVal___; + return; } int HP_battle_attr_ratio(int atk_elem, int def_type, int def_lv) { int hIndex = 0; @@ -1179,6 +1230,32 @@ int64 HP_battle_calc_masteryfix(struct block_list *src, struct block_list *targe } return retVal___; } +int HP_battle_calc_chorusbonus(struct map_session_data *sd) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_battle_calc_chorusbonus_pre ) { + int (*preHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_chorusbonus_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_battle_calc_chorusbonus_pre[hIndex].func; + retVal___ = preHookFunc(sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.battle.calc_chorusbonus(sd); + } + if( HPMHooks.count.HP_battle_calc_chorusbonus_post ) { + int (*postHookFunc) (int retVal___, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_calc_chorusbonus_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_battle_calc_chorusbonus_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sd); + } + } + return retVal___; +} int HP_battle_calc_skillratio(int attack_type, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int skillratio, int flag) { int hIndex = 0; int retVal___ = 0; @@ -1413,11 +1490,11 @@ int HP_battle_get_current_skill(struct block_list *bl) { } return retVal___; } -int HP_battle_check_undead(int race, int element) { +bool HP_battle_check_undead(int race, int element) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_battle_check_undead_pre ) { - int (*preHookFunc) (int *race, int *element); + bool (*preHookFunc) (int *race, int *element); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_check_undead_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_battle_check_undead_pre[hIndex].func; retVal___ = preHookFunc(&race, &element); @@ -1431,7 +1508,7 @@ int HP_battle_check_undead(int race, int element) { retVal___ = HPMHooks.source.battle.check_undead(race, element); } if( HPMHooks.count.HP_battle_check_undead_post ) { - int (*postHookFunc) (int retVal___, int *race, int *element); + bool (*postHookFunc) (bool retVal___, int *race, int *element); for(hIndex = 0; hIndex < HPMHooks.count.HP_battle_check_undead_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_battle_check_undead_post[hIndex].func; retVal___ = postHookFunc(retVal___, &race, &element); @@ -1612,11 +1689,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 +1707,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); @@ -2061,13 +2138,13 @@ int HP_battle_damage_area(struct block_list *bl, va_list ap) { return retVal___; } /* bg */ -void HP_bg_init(void) { +void HP_bg_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_bg_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2075,13 +2152,13 @@ void HP_bg_init(void) { } } { - HPMHooks.source.bg.init(); + HPMHooks.source.bg.init(minimal); } if( HPMHooks.count.HP_bg_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -2264,11 +2341,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 +2359,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 +2392,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 +2410,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); @@ -2468,11 +2545,11 @@ struct map_session_data* HP_bg_getavailablesd(struct battleground_data *bgd) { } return retVal___; } -int HP_bg_team_delete(int bg_id) { +bool HP_bg_team_delete(int bg_id) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_bg_team_delete_pre ) { - int (*preHookFunc) (int *bg_id); + bool (*preHookFunc) (int *bg_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_team_delete_pre[hIndex].func; retVal___ = preHookFunc(&bg_id); @@ -2486,7 +2563,7 @@ int HP_bg_team_delete(int bg_id) { retVal___ = HPMHooks.source.bg.team_delete(bg_id); } if( HPMHooks.count.HP_bg_team_delete_post ) { - int (*postHookFunc) (int retVal___, int *bg_id); + bool (*postHookFunc) (bool retVal___, int *bg_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_team_delete_post[hIndex].func; retVal___ = postHookFunc(retVal___, &bg_id); @@ -2494,14 +2571,14 @@ int HP_bg_team_delete(int bg_id) { } return retVal___; } -int HP_bg_team_warp(int bg_id, unsigned short mapindex, short x, short y) { +bool HP_bg_team_warp(int bg_id, unsigned short map_index, short x, short y) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_bg_team_warp_pre ) { - int (*preHookFunc) (int *bg_id, unsigned short *mapindex, short *x, short *y); + bool (*preHookFunc) (int *bg_id, unsigned short *map_index, short *x, short *y); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_warp_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_team_warp_pre[hIndex].func; - retVal___ = preHookFunc(&bg_id, &mapindex, &x, &y); + retVal___ = preHookFunc(&bg_id, &map_index, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2509,48 +2586,47 @@ int HP_bg_team_warp(int bg_id, unsigned short mapindex, short x, short y) { } } { - retVal___ = HPMHooks.source.bg.team_warp(bg_id, mapindex, x, y); + retVal___ = HPMHooks.source.bg.team_warp(bg_id, map_index, x, y); } if( HPMHooks.count.HP_bg_team_warp_post ) { - int (*postHookFunc) (int retVal___, int *bg_id, unsigned short *mapindex, short *x, short *y); + bool (*postHookFunc) (bool retVal___, int *bg_id, unsigned short *map_index, short *x, short *y); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_warp_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_team_warp_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &bg_id, &mapindex, &x, &y); + retVal___ = postHookFunc(retVal___, &bg_id, &map_index, &x, &y); } } return retVal___; } -int HP_bg_send_dot_remove(struct map_session_data *sd) { +void HP_bg_send_dot_remove(struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_bg_send_dot_remove_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_dot_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_send_dot_remove_pre[hIndex].func; - retVal___ = preHookFunc(sd); + preHookFunc(sd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.bg.send_dot_remove(sd); + HPMHooks.source.bg.send_dot_remove(sd); } if( HPMHooks.count.HP_bg_send_dot_remove_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); + void (*postHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_dot_remove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_send_dot_remove_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd); + postHookFunc(sd); } } - return retVal___; + return; } -int HP_bg_team_join(int bg_id, struct map_session_data *sd) { +bool HP_bg_team_join(int bg_id, struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_bg_team_join_pre ) { - int (*preHookFunc) (int *bg_id, struct map_session_data *sd); + bool (*preHookFunc) (int *bg_id, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_join_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_team_join_pre[hIndex].func; retVal___ = preHookFunc(&bg_id, sd); @@ -2564,7 +2640,7 @@ int HP_bg_team_join(int bg_id, struct map_session_data *sd) { retVal___ = HPMHooks.source.bg.team_join(bg_id, sd); } if( HPMHooks.count.HP_bg_team_join_post ) { - int (*postHookFunc) (int retVal___, int *bg_id, struct map_session_data *sd); + bool (*postHookFunc) (bool retVal___, int *bg_id, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_join_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_team_join_post[hIndex].func; retVal___ = postHookFunc(retVal___, &bg_id, sd); @@ -2598,11 +2674,11 @@ int HP_bg_team_leave(struct map_session_data *sd, int flag) { } return retVal___; } -int HP_bg_member_respawn(struct map_session_data *sd) { +bool HP_bg_member_respawn(struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_bg_member_respawn_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_member_respawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_member_respawn_pre[hIndex].func; retVal___ = preHookFunc(sd); @@ -2616,7 +2692,7 @@ int HP_bg_member_respawn(struct map_session_data *sd) { retVal___ = HPMHooks.source.bg.member_respawn(sd); } if( HPMHooks.count.HP_bg_member_respawn_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_member_respawn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_member_respawn_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); @@ -2624,14 +2700,14 @@ int HP_bg_member_respawn(struct map_session_data *sd) { } return retVal___; } -int HP_bg_create(unsigned short mapindex, short rx, short ry, const char *ev, const char *dev) { +int HP_bg_create(unsigned short map_index, short rx, short ry, const char *ev, const char *dev) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_bg_create_pre ) { - int (*preHookFunc) (unsigned short *mapindex, short *rx, short *ry, const char *ev, const char *dev); + int (*preHookFunc) (unsigned short *map_index, short *rx, short *ry, const char *ev, const char *dev); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_create_pre[hIndex].func; - retVal___ = preHookFunc(&mapindex, &rx, &ry, ev, dev); + retVal___ = preHookFunc(&map_index, &rx, &ry, ev, dev); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -2639,13 +2715,13 @@ int HP_bg_create(unsigned short mapindex, short rx, short ry, const char *ev, co } } { - retVal___ = HPMHooks.source.bg.create(mapindex, rx, ry, ev, dev); + retVal___ = HPMHooks.source.bg.create(map_index, rx, ry, ev, dev); } if( HPMHooks.count.HP_bg_create_post ) { - int (*postHookFunc) (int retVal___, unsigned short *mapindex, short *rx, short *ry, const char *ev, const char *dev); + int (*postHookFunc) (int retVal___, unsigned short *map_index, short *rx, short *ry, const char *ev, const char *dev); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_create_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &mapindex, &rx, &ry, ev, dev); + retVal___ = postHookFunc(retVal___, &map_index, &rx, &ry, ev, dev); } } return retVal___; @@ -2676,11 +2752,11 @@ int HP_bg_team_get_id(struct block_list *bl) { } return retVal___; } -int HP_bg_send_message(struct map_session_data *sd, const char *mes, int len) { +bool HP_bg_send_message(struct map_session_data *sd, const char *mes, int len) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_bg_send_message_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *mes, int *len); + bool (*preHookFunc) (struct map_session_data *sd, const char *mes, int *len); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_send_message_pre[hIndex].func; retVal___ = preHookFunc(sd, mes, &len); @@ -2694,7 +2770,7 @@ int HP_bg_send_message(struct map_session_data *sd, const char *mes, int len) { retVal___ = HPMHooks.source.bg.send_message(sd, mes, len); } if( HPMHooks.count.HP_bg_send_message_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *mes, int *len); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *mes, int *len); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_send_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_send_message_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, mes, &len); @@ -2734,11 +2810,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 +2828,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); @@ -2991,11 +3067,11 @@ unsigned int HP_buyingstore_getuid(void) { return retVal___; } /* chat */ -int HP_chat_create_pc_chat(struct map_session_data *sd, const char *title, const char *pass, int limit, bool pub) { +bool HP_chat_create_pc_chat(struct map_session_data *sd, const char *title, const char *pass, int limit, bool pub) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_create_pc_chat_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); + bool (*preHookFunc) (struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_pc_chat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_create_pc_chat_pre[hIndex].func; retVal___ = preHookFunc(sd, title, pass, &limit, &pub); @@ -3009,7 +3085,7 @@ int HP_chat_create_pc_chat(struct map_session_data *sd, const char *title, const retVal___ = HPMHooks.source.chat.create_pc_chat(sd, title, pass, limit, pub); } if( HPMHooks.count.HP_chat_create_pc_chat_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_pc_chat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_create_pc_chat_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, title, pass, &limit, &pub); @@ -3017,11 +3093,11 @@ int HP_chat_create_pc_chat(struct map_session_data *sd, const char *title, const } return retVal___; } -int HP_chat_join(struct map_session_data *sd, int chatid, const char *pass) { +bool HP_chat_join(struct map_session_data *sd, int chatid, const char *pass) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_join_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *chatid, const char *pass); + bool (*preHookFunc) (struct map_session_data *sd, int *chatid, const char *pass); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_join_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_join_pre[hIndex].func; retVal___ = preHookFunc(sd, &chatid, pass); @@ -3035,7 +3111,7 @@ int HP_chat_join(struct map_session_data *sd, int chatid, const char *pass) { retVal___ = HPMHooks.source.chat.join(sd, chatid, pass); } if( HPMHooks.count.HP_chat_join_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *chatid, const char *pass); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *chatid, const char *pass); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_join_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_join_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &chatid, pass); @@ -3069,11 +3145,11 @@ int HP_chat_leave(struct map_session_data *sd, bool kicked) { } return retVal___; } -int HP_chat_change_owner(struct map_session_data *sd, const char *nextownername) { +bool HP_chat_change_owner(struct map_session_data *sd, const char *nextownername) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_change_owner_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *nextownername); + bool (*preHookFunc) (struct map_session_data *sd, const char *nextownername); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_change_owner_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_change_owner_pre[hIndex].func; retVal___ = preHookFunc(sd, nextownername); @@ -3087,7 +3163,7 @@ int HP_chat_change_owner(struct map_session_data *sd, const char *nextownername) retVal___ = HPMHooks.source.chat.change_owner(sd, nextownername); } if( HPMHooks.count.HP_chat_change_owner_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *nextownername); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *nextownername); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_change_owner_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_change_owner_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, nextownername); @@ -3095,11 +3171,11 @@ int HP_chat_change_owner(struct map_session_data *sd, const char *nextownername) } return retVal___; } -int HP_chat_change_status(struct map_session_data *sd, const char *title, const char *pass, int limit, bool pub) { +bool HP_chat_change_status(struct map_session_data *sd, const char *title, const char *pass, int limit, bool pub) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_change_status_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); + bool (*preHookFunc) (struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_change_status_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_change_status_pre[hIndex].func; retVal___ = preHookFunc(sd, title, pass, &limit, &pub); @@ -3113,7 +3189,7 @@ int HP_chat_change_status(struct map_session_data *sd, const char *title, const retVal___ = HPMHooks.source.chat.change_status(sd, title, pass, limit, pub); } if( HPMHooks.count.HP_chat_change_status_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *title, const char *pass, int *limit, bool *pub); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_change_status_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_change_status_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, title, pass, &limit, &pub); @@ -3121,11 +3197,11 @@ int HP_chat_change_status(struct map_session_data *sd, const char *title, const } return retVal___; } -int HP_chat_kick(struct map_session_data *sd, const char *kickusername) { +bool HP_chat_kick(struct map_session_data *sd, const char *kickusername) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_kick_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *kickusername); + bool (*preHookFunc) (struct map_session_data *sd, const char *kickusername); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_kick_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_kick_pre[hIndex].func; retVal___ = preHookFunc(sd, kickusername); @@ -3139,7 +3215,7 @@ int HP_chat_kick(struct map_session_data *sd, const char *kickusername) { retVal___ = HPMHooks.source.chat.kick(sd, kickusername); } if( HPMHooks.count.HP_chat_kick_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *kickusername); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *kickusername); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_kick_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_kick_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, kickusername); @@ -3147,11 +3223,11 @@ int HP_chat_kick(struct map_session_data *sd, const char *kickusername) { } return retVal___; } -int HP_chat_create_npc_chat(struct npc_data *nd, const char *title, int limit, bool pub, int trigger, const char *ev, int zeny, int minLvl, int maxLvl) { +bool HP_chat_create_npc_chat(struct npc_data *nd, const char *title, int limit, bool pub, int trigger, const char *ev, int zeny, int minLvl, int maxLvl) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_create_npc_chat_pre ) { - int (*preHookFunc) (struct npc_data *nd, const char *title, int *limit, bool *pub, int *trigger, const char *ev, int *zeny, int *minLvl, int *maxLvl); + bool (*preHookFunc) (struct npc_data *nd, const char *title, int *limit, bool *pub, int *trigger, const char *ev, int *zeny, int *minLvl, int *maxLvl); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_npc_chat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_create_npc_chat_pre[hIndex].func; retVal___ = preHookFunc(nd, title, &limit, &pub, &trigger, ev, &zeny, &minLvl, &maxLvl); @@ -3165,7 +3241,7 @@ int HP_chat_create_npc_chat(struct npc_data *nd, const char *title, int limit, b retVal___ = HPMHooks.source.chat.create_npc_chat(nd, title, limit, pub, trigger, ev, zeny, minLvl, maxLvl); } if( HPMHooks.count.HP_chat_create_npc_chat_post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd, const char *title, int *limit, bool *pub, int *trigger, const char *ev, int *zeny, int *minLvl, int *maxLvl); + bool (*postHookFunc) (bool retVal___, struct npc_data *nd, const char *title, int *limit, bool *pub, int *trigger, const char *ev, int *zeny, int *minLvl, int *maxLvl); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_npc_chat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_create_npc_chat_post[hIndex].func; retVal___ = postHookFunc(retVal___, nd, title, &limit, &pub, &trigger, ev, &zeny, &minLvl, &maxLvl); @@ -3173,11 +3249,11 @@ int HP_chat_create_npc_chat(struct npc_data *nd, const char *title, int limit, b } return retVal___; } -int HP_chat_delete_npc_chat(struct npc_data *nd) { +bool HP_chat_delete_npc_chat(struct npc_data *nd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_delete_npc_chat_pre ) { - int (*preHookFunc) (struct npc_data *nd); + bool (*preHookFunc) (struct npc_data *nd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_delete_npc_chat_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_delete_npc_chat_pre[hIndex].func; retVal___ = preHookFunc(nd); @@ -3191,7 +3267,7 @@ int HP_chat_delete_npc_chat(struct npc_data *nd) { retVal___ = HPMHooks.source.chat.delete_npc_chat(nd); } if( HPMHooks.count.HP_chat_delete_npc_chat_post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd); + bool (*postHookFunc) (bool retVal___, struct npc_data *nd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_delete_npc_chat_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_delete_npc_chat_post[hIndex].func; retVal___ = postHookFunc(retVal___, nd); @@ -3199,11 +3275,11 @@ int HP_chat_delete_npc_chat(struct npc_data *nd) { } return retVal___; } -int HP_chat_enable_event(struct chat_data *cd) { +bool HP_chat_enable_event(struct chat_data *cd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_enable_event_pre ) { - int (*preHookFunc) (struct chat_data *cd); + bool (*preHookFunc) (struct chat_data *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_enable_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_enable_event_pre[hIndex].func; retVal___ = preHookFunc(cd); @@ -3217,7 +3293,7 @@ int HP_chat_enable_event(struct chat_data *cd) { retVal___ = HPMHooks.source.chat.enable_event(cd); } if( HPMHooks.count.HP_chat_enable_event_post ) { - int (*postHookFunc) (int retVal___, struct chat_data *cd); + bool (*postHookFunc) (bool retVal___, struct chat_data *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_enable_event_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_enable_event_post[hIndex].func; retVal___ = postHookFunc(retVal___, cd); @@ -3225,11 +3301,11 @@ int HP_chat_enable_event(struct chat_data *cd) { } return retVal___; } -int HP_chat_disable_event(struct chat_data *cd) { +bool HP_chat_disable_event(struct chat_data *cd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_disable_event_pre ) { - int (*preHookFunc) (struct chat_data *cd); + bool (*preHookFunc) (struct chat_data *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_disable_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_disable_event_pre[hIndex].func; retVal___ = preHookFunc(cd); @@ -3243,7 +3319,7 @@ int HP_chat_disable_event(struct chat_data *cd) { retVal___ = HPMHooks.source.chat.disable_event(cd); } if( HPMHooks.count.HP_chat_disable_event_post ) { - int (*postHookFunc) (int retVal___, struct chat_data *cd); + bool (*postHookFunc) (bool retVal___, struct chat_data *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_disable_event_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_disable_event_post[hIndex].func; retVal___ = postHookFunc(retVal___, cd); @@ -3251,11 +3327,11 @@ int HP_chat_disable_event(struct chat_data *cd) { } return retVal___; } -int HP_chat_npc_kick_all(struct chat_data *cd) { +bool HP_chat_npc_kick_all(struct chat_data *cd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_npc_kick_all_pre ) { - int (*preHookFunc) (struct chat_data *cd); + bool (*preHookFunc) (struct chat_data *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_npc_kick_all_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_npc_kick_all_pre[hIndex].func; retVal___ = preHookFunc(cd); @@ -3269,7 +3345,7 @@ int HP_chat_npc_kick_all(struct chat_data *cd) { retVal___ = HPMHooks.source.chat.npc_kick_all(cd); } if( HPMHooks.count.HP_chat_npc_kick_all_post ) { - int (*postHookFunc) (int retVal___, struct chat_data *cd); + bool (*postHookFunc) (bool retVal___, struct chat_data *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_npc_kick_all_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_npc_kick_all_post[hIndex].func; retVal___ = postHookFunc(retVal___, cd); @@ -3277,11 +3353,11 @@ int HP_chat_npc_kick_all(struct chat_data *cd) { } return retVal___; } -int HP_chat_trigger_event(struct chat_data *cd) { +bool HP_chat_trigger_event(struct chat_data *cd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chat_trigger_event_pre ) { - int (*preHookFunc) (struct chat_data *cd); + bool (*preHookFunc) (struct chat_data *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_trigger_event_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chat_trigger_event_pre[hIndex].func; retVal___ = preHookFunc(cd); @@ -3295,7 +3371,7 @@ int HP_chat_trigger_event(struct chat_data *cd) { retVal___ = HPMHooks.source.chat.trigger_event(cd); } if( HPMHooks.count.HP_chat_trigger_event_post ) { - int (*postHookFunc) (int retVal___, struct chat_data *cd); + bool (*postHookFunc) (bool retVal___, struct chat_data *cd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chat_trigger_event_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chat_trigger_event_post[hIndex].func; retVal___ = postHookFunc(retVal___, cd); @@ -3330,57 +3406,55 @@ struct chat_data* HP_chat_create(struct block_list *bl, const char *title, const return retVal___; } /* chrif */ -int HP_chrif_final(void) { +void HP_chrif_init(bool minimal) { int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_chrif_final_pre ) { - int (*preHookFunc) (void); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_final_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_chrif_final_pre[hIndex].func; - retVal___ = preHookFunc(); + if( HPMHooks.count.HP_chrif_init_pre ) { + void (*preHookFunc) (bool *minimal); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_init_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_chrif_init_pre[hIndex].func; + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.final(); + HPMHooks.source.chrif.init(minimal); } - if( HPMHooks.count.HP_chrif_final_post ) { - int (*postHookFunc) (int retVal___); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_final_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_chrif_final_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + if( HPMHooks.count.HP_chrif_init_post ) { + void (*postHookFunc) (bool *minimal); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_init_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_chrif_init_post[hIndex].func; + postHookFunc(&minimal); } } - return retVal___; + return; } -int HP_chrif_init(void) { +void HP_chrif_final(void) { int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_chrif_init_pre ) { - int (*preHookFunc) (void); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_init_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_chrif_init_pre[hIndex].func; - retVal___ = preHookFunc(); + if( HPMHooks.count.HP_chrif_final_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_final_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_chrif_final_pre[hIndex].func; + preHookFunc(); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.init(); + HPMHooks.source.chrif.final(); } - if( HPMHooks.count.HP_chrif_init_post ) { - int (*postHookFunc) (int retVal___); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_init_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_chrif_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + if( HPMHooks.count.HP_chrif_final_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_final_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_chrif_final_post[hIndex].func; + postHookFunc(); } } - return retVal___; + return; } void HP_chrif_setuserid(char *id) { int hIndex = 0; @@ -3457,11 +3531,11 @@ void HP_chrif_checkdefaultlogin(void) { } return; } -int HP_chrif_setip(const char *ip) { +bool HP_chrif_setip(const char *ip) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_setip_pre ) { - int (*preHookFunc) (const char *ip); + bool (*preHookFunc) (const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_setip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_setip_pre[hIndex].func; retVal___ = preHookFunc(ip); @@ -3475,7 +3549,7 @@ int HP_chrif_setip(const char *ip) { retVal___ = HPMHooks.source.chrif.setip(ip); } if( HPMHooks.count.HP_chrif_setip_post ) { - int (*postHookFunc) (int retVal___, const char *ip); + bool (*postHookFunc) (bool retVal___, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_setip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_setip_post[hIndex].func; retVal___ = postHookFunc(retVal___, ip); @@ -3663,13 +3737,13 @@ bool HP_chrif_auth_finished(struct map_session_data *sd) { } return retVal___; } -void HP_chrif_authreq(struct map_session_data *sd) { +void HP_chrif_authreq(struct map_session_data *sd, bool hstandalone) { int hIndex = 0; if( HPMHooks.count.HP_chrif_authreq_pre ) { - void (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data *sd, bool *hstandalone); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_authreq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_authreq_pre[hIndex].func; - preHookFunc(sd); + preHookFunc(sd, &hstandalone); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -3677,13 +3751,13 @@ void HP_chrif_authreq(struct map_session_data *sd) { } } { - HPMHooks.source.chrif.authreq(sd); + HPMHooks.source.chrif.authreq(sd, hstandalone); } if( HPMHooks.count.HP_chrif_authreq_post ) { - void (*postHookFunc) (struct map_session_data *sd); + void (*postHookFunc) (struct map_session_data *sd, bool *hstandalone); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_authreq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_authreq_post[hIndex].func; - postHookFunc(sd); + postHookFunc(sd, &hstandalone); } } return; @@ -3713,11 +3787,11 @@ void HP_chrif_authok(int fd) { } return; } -int HP_chrif_scdata_request(int account_id, int char_id) { +bool HP_chrif_scdata_request(int account_id, int char_id) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_scdata_request_pre ) { - int (*preHookFunc) (int *account_id, int *char_id); + bool (*preHookFunc) (int *account_id, int *char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_scdata_request_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_scdata_request_pre[hIndex].func; retVal___ = preHookFunc(&account_id, &char_id); @@ -3731,7 +3805,7 @@ int HP_chrif_scdata_request(int account_id, int char_id) { retVal___ = HPMHooks.source.chrif.scdata_request(account_id, char_id); } if( HPMHooks.count.HP_chrif_scdata_request_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *char_id); + bool (*postHookFunc) (bool retVal___, int *account_id, int *char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_scdata_request_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_scdata_request_post[hIndex].func; retVal___ = postHookFunc(retVal___, &account_id, &char_id); @@ -3739,11 +3813,11 @@ int HP_chrif_scdata_request(int account_id, int char_id) { } return retVal___; } -int HP_chrif_save(struct map_session_data *sd, int flag) { +bool HP_chrif_save(struct map_session_data *sd, int flag) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_save_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *flag); + bool (*preHookFunc) (struct map_session_data *sd, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_save_pre[hIndex].func; retVal___ = preHookFunc(sd, &flag); @@ -3757,7 +3831,7 @@ int HP_chrif_save(struct map_session_data *sd, int flag) { retVal___ = HPMHooks.source.chrif.save(sd, flag); } if( HPMHooks.count.HP_chrif_save_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *flag); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_save_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &flag); @@ -3765,11 +3839,11 @@ int HP_chrif_save(struct map_session_data *sd, int flag) { } return retVal___; } -int HP_chrif_charselectreq(struct map_session_data *sd, uint32 s_ip) { +bool HP_chrif_charselectreq(struct map_session_data *sd, uint32 s_ip) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_charselectreq_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint32 *s_ip); + bool (*preHookFunc) (struct map_session_data *sd, uint32 *s_ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_charselectreq_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_charselectreq_pre[hIndex].func; retVal___ = preHookFunc(sd, &s_ip); @@ -3783,7 +3857,7 @@ int HP_chrif_charselectreq(struct map_session_data *sd, uint32 s_ip) { retVal___ = HPMHooks.source.chrif.charselectreq(sd, s_ip); } if( HPMHooks.count.HP_chrif_charselectreq_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint32 *s_ip); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, uint32 *s_ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_charselectreq_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_charselectreq_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &s_ip); @@ -3791,11 +3865,11 @@ int HP_chrif_charselectreq(struct map_session_data *sd, uint32 s_ip) { } return retVal___; } -int HP_chrif_changemapserver(struct map_session_data *sd, uint32 ip, uint16 port) { +bool HP_chrif_changemapserver(struct map_session_data *sd, uint32 ip, uint16 port) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_changemapserver_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint32 *ip, uint16 *port); + bool (*preHookFunc) (struct map_session_data *sd, uint32 *ip, uint16 *port); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changemapserver_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_changemapserver_pre[hIndex].func; retVal___ = preHookFunc(sd, &ip, &port); @@ -3809,7 +3883,7 @@ int HP_chrif_changemapserver(struct map_session_data *sd, uint32 ip, uint16 port retVal___ = HPMHooks.source.chrif.changemapserver(sd, ip, port); } if( HPMHooks.count.HP_chrif_changemapserver_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint32 *ip, uint16 *port); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, uint32 *ip, uint16 *port); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changemapserver_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changemapserver_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &ip, &port); @@ -3817,11 +3891,11 @@ int HP_chrif_changemapserver(struct map_session_data *sd, uint32 ip, uint16 port } return retVal___; } -int HP_chrif_searchcharid(int char_id) { +bool HP_chrif_searchcharid(int char_id) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_searchcharid_pre ) { - int (*preHookFunc) (int *char_id); + bool (*preHookFunc) (int *char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_searchcharid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_searchcharid_pre[hIndex].func; retVal___ = preHookFunc(&char_id); @@ -3835,7 +3909,7 @@ int HP_chrif_searchcharid(int char_id) { retVal___ = HPMHooks.source.chrif.searchcharid(char_id); } if( HPMHooks.count.HP_chrif_searchcharid_post ) { - int (*postHookFunc) (int retVal___, int *char_id); + bool (*postHookFunc) (bool retVal___, int *char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_searchcharid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_searchcharid_post[hIndex].func; retVal___ = postHookFunc(retVal___, &char_id); @@ -3843,11 +3917,11 @@ int HP_chrif_searchcharid(int char_id) { } return retVal___; } -int HP_chrif_changeemail(int id, const char *actual_email, const char *new_email) { +bool HP_chrif_changeemail(int id, const char *actual_email, const char *new_email) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_changeemail_pre ) { - int (*preHookFunc) (int *id, const char *actual_email, const char *new_email); + bool (*preHookFunc) (int *id, const char *actual_email, const char *new_email); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changeemail_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_changeemail_pre[hIndex].func; retVal___ = preHookFunc(&id, actual_email, new_email); @@ -3861,7 +3935,7 @@ int HP_chrif_changeemail(int id, const char *actual_email, const char *new_email retVal___ = HPMHooks.source.chrif.changeemail(id, actual_email, new_email); } if( HPMHooks.count.HP_chrif_changeemail_post ) { - int (*postHookFunc) (int retVal___, int *id, const char *actual_email, const char *new_email); + bool (*postHookFunc) (bool retVal___, int *id, const char *actual_email, const char *new_email); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changeemail_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changeemail_post[hIndex].func; retVal___ = postHookFunc(retVal___, &id, actual_email, new_email); @@ -3869,11 +3943,11 @@ int HP_chrif_changeemail(int id, const char *actual_email, const char *new_email } return retVal___; } -int HP_chrif_char_ask_name(int acc, const char *character_name, unsigned short operation_type, int year, int month, int day, int hour, int minute, int second) { +bool HP_chrif_char_ask_name(int acc, const char *character_name, unsigned short operation_type, int year, int month, int day, int hour, int minute, int second) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_char_ask_name_pre ) { - int (*preHookFunc) (int *acc, const char *character_name, unsigned short *operation_type, int *year, int *month, int *day, int *hour, int *minute, int *second); + bool (*preHookFunc) (int *acc, const char *character_name, unsigned short *operation_type, int *year, int *month, int *day, int *hour, int *minute, int *second); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_ask_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_char_ask_name_pre[hIndex].func; retVal___ = preHookFunc(&acc, character_name, &operation_type, &year, &month, &day, &hour, &minute, &second); @@ -3887,7 +3961,7 @@ int HP_chrif_char_ask_name(int acc, const char *character_name, unsigned short o retVal___ = HPMHooks.source.chrif.char_ask_name(acc, character_name, operation_type, year, month, day, hour, minute, second); } if( HPMHooks.count.HP_chrif_char_ask_name_post ) { - int (*postHookFunc) (int retVal___, int *acc, const char *character_name, unsigned short *operation_type, int *year, int *month, int *day, int *hour, int *minute, int *second); + bool (*postHookFunc) (bool retVal___, int *acc, const char *character_name, unsigned short *operation_type, int *year, int *month, int *day, int *hour, int *minute, int *second); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_ask_name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_char_ask_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, &acc, character_name, &operation_type, &year, &month, &day, &hour, &minute, &second); @@ -3921,11 +3995,11 @@ int HP_chrif_updatefamelist(struct map_session_data *sd) { } return retVal___; } -int HP_chrif_buildfamelist(void) { +bool HP_chrif_buildfamelist(void) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_buildfamelist_pre ) { - int (*preHookFunc) (void); + bool (*preHookFunc) (void); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_buildfamelist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_buildfamelist_pre[hIndex].func; retVal___ = preHookFunc(); @@ -3939,7 +4013,7 @@ int HP_chrif_buildfamelist(void) { retVal___ = HPMHooks.source.chrif.buildfamelist(); } if( HPMHooks.count.HP_chrif_buildfamelist_post ) { - int (*postHookFunc) (int retVal___); + bool (*postHookFunc) (bool retVal___); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_buildfamelist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_buildfamelist_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -3947,11 +4021,11 @@ int HP_chrif_buildfamelist(void) { } return retVal___; } -int HP_chrif_save_scdata(struct map_session_data *sd) { +bool HP_chrif_save_scdata(struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_save_scdata_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_scdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_save_scdata_pre[hIndex].func; retVal___ = preHookFunc(sd); @@ -3965,7 +4039,7 @@ int HP_chrif_save_scdata(struct map_session_data *sd) { retVal___ = HPMHooks.source.chrif.save_scdata(sd); } if( HPMHooks.count.HP_chrif_save_scdata_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_scdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_save_scdata_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); @@ -3973,11 +4047,11 @@ int HP_chrif_save_scdata(struct map_session_data *sd) { } return retVal___; } -int HP_chrif_ragsrvinfo(int base_rate, int job_rate, int drop_rate) { +bool HP_chrif_ragsrvinfo(int base_rate, int job_rate, int drop_rate) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_ragsrvinfo_pre ) { - int (*preHookFunc) (int *base_rate, int *job_rate, int *drop_rate); + bool (*preHookFunc) (int *base_rate, int *job_rate, int *drop_rate); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_ragsrvinfo_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_ragsrvinfo_pre[hIndex].func; retVal___ = preHookFunc(&base_rate, &job_rate, &drop_rate); @@ -3991,7 +4065,7 @@ int HP_chrif_ragsrvinfo(int base_rate, int job_rate, int drop_rate) { retVal___ = HPMHooks.source.chrif.ragsrvinfo(base_rate, job_rate, drop_rate); } if( HPMHooks.count.HP_chrif_ragsrvinfo_post ) { - int (*postHookFunc) (int retVal___, int *base_rate, int *job_rate, int *drop_rate); + bool (*postHookFunc) (bool retVal___, int *base_rate, int *job_rate, int *drop_rate); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_ragsrvinfo_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_ragsrvinfo_post[hIndex].func; retVal___ = postHookFunc(retVal___, &base_rate, &job_rate, &drop_rate); @@ -3999,37 +4073,11 @@ int HP_chrif_ragsrvinfo(int base_rate, int job_rate, int drop_rate) { } return retVal___; } -int HP_chrif_char_offline(struct map_session_data *sd) { - int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_chrif_char_offline_pre ) { - int (*preHookFunc) (struct map_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_offline_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_chrif_char_offline_pre[hIndex].func; - retVal___ = preHookFunc(sd); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.chrif.char_offline(sd); - } - if( HPMHooks.count.HP_chrif_char_offline_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_offline_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_chrif_char_offline_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd); - } - } - return retVal___; -} -int HP_chrif_char_offline_nsd(int account_id, int char_id) { +bool HP_chrif_char_offline_nsd(int account_id, int char_id) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_char_offline_nsd_pre ) { - int (*preHookFunc) (int *account_id, int *char_id); + bool (*preHookFunc) (int *account_id, int *char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_offline_nsd_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_char_offline_nsd_pre[hIndex].func; retVal___ = preHookFunc(&account_id, &char_id); @@ -4043,7 +4091,7 @@ int HP_chrif_char_offline_nsd(int account_id, int char_id) { retVal___ = HPMHooks.source.chrif.char_offline_nsd(account_id, char_id); } if( HPMHooks.count.HP_chrif_char_offline_nsd_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *char_id); + bool (*postHookFunc) (bool retVal___, int *account_id, int *char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_offline_nsd_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_char_offline_nsd_post[hIndex].func; retVal___ = postHookFunc(retVal___, &account_id, &char_id); @@ -4051,11 +4099,11 @@ int HP_chrif_char_offline_nsd(int account_id, int char_id) { } return retVal___; } -int HP_chrif_char_reset_offline(void) { +bool HP_chrif_char_reset_offline(void) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_char_reset_offline_pre ) { - int (*preHookFunc) (void); + bool (*preHookFunc) (void); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_reset_offline_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_char_reset_offline_pre[hIndex].func; retVal___ = preHookFunc(); @@ -4069,7 +4117,7 @@ int HP_chrif_char_reset_offline(void) { retVal___ = HPMHooks.source.chrif.char_reset_offline(); } if( HPMHooks.count.HP_chrif_char_reset_offline_post ) { - int (*postHookFunc) (int retVal___); + bool (*postHookFunc) (bool retVal___); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_reset_offline_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_char_reset_offline_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -4077,11 +4125,11 @@ int HP_chrif_char_reset_offline(void) { } return retVal___; } -int HP_chrif_send_users_tochar(void) { +bool HP_chrif_send_users_tochar(void) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_send_users_tochar_pre ) { - int (*preHookFunc) (void); + bool (*preHookFunc) (void); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_send_users_tochar_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_send_users_tochar_pre[hIndex].func; retVal___ = preHookFunc(); @@ -4095,7 +4143,7 @@ int HP_chrif_send_users_tochar(void) { retVal___ = HPMHooks.source.chrif.send_users_tochar(); } if( HPMHooks.count.HP_chrif_send_users_tochar_post ) { - int (*postHookFunc) (int retVal___); + bool (*postHookFunc) (bool retVal___); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_send_users_tochar_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_send_users_tochar_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -4103,11 +4151,11 @@ int HP_chrif_send_users_tochar(void) { } return retVal___; } -int HP_chrif_char_online(struct map_session_data *sd) { +bool HP_chrif_char_online(struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_char_online_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_online_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_char_online_pre[hIndex].func; retVal___ = preHookFunc(sd); @@ -4121,7 +4169,7 @@ int HP_chrif_char_online(struct map_session_data *sd) { retVal___ = HPMHooks.source.chrif.char_online(sd); } if( HPMHooks.count.HP_chrif_char_online_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_online_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_char_online_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); @@ -4129,11 +4177,11 @@ int HP_chrif_char_online(struct map_session_data *sd) { } return retVal___; } -int HP_chrif_changesex(struct map_session_data *sd) { +bool HP_chrif_changesex(struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_changesex_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + bool (*preHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changesex_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_changesex_pre[hIndex].func; retVal___ = preHookFunc(sd); @@ -4147,7 +4195,7 @@ int HP_chrif_changesex(struct map_session_data *sd) { retVal___ = HPMHooks.source.chrif.changesex(sd); } if( HPMHooks.count.HP_chrif_changesex_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changesex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changesex_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); @@ -4155,11 +4203,11 @@ int HP_chrif_changesex(struct map_session_data *sd) { } return retVal___; } -int HP_chrif_divorce(int partner_id1, int partner_id2) { +bool HP_chrif_divorce(int partner_id1, int partner_id2) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_divorce_pre ) { - int (*preHookFunc) (int *partner_id1, int *partner_id2); + bool (*preHookFunc) (int *partner_id1, int *partner_id2); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_divorce_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_divorce_pre[hIndex].func; retVal___ = preHookFunc(&partner_id1, &partner_id2); @@ -4173,7 +4221,7 @@ int HP_chrif_divorce(int partner_id1, int partner_id2) { retVal___ = HPMHooks.source.chrif.divorce(partner_id1, partner_id2); } if( HPMHooks.count.HP_chrif_divorce_post ) { - int (*postHookFunc) (int retVal___, int *partner_id1, int *partner_id2); + bool (*postHookFunc) (bool retVal___, int *partner_id1, int *partner_id2); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_divorce_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_divorce_post[hIndex].func; retVal___ = postHookFunc(retVal___, &partner_id1, &partner_id2); @@ -4181,11 +4229,11 @@ int HP_chrif_divorce(int partner_id1, int partner_id2) { } return retVal___; } -int HP_chrif_removefriend(int char_id, int friend_id) { +bool HP_chrif_removefriend(int char_id, int friend_id) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_removefriend_pre ) { - int (*preHookFunc) (int *char_id, int *friend_id); + bool (*preHookFunc) (int *char_id, int *friend_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_removefriend_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_removefriend_pre[hIndex].func; retVal___ = preHookFunc(&char_id, &friend_id); @@ -4199,7 +4247,7 @@ int HP_chrif_removefriend(int char_id, int friend_id) { retVal___ = HPMHooks.source.chrif.removefriend(char_id, friend_id); } if( HPMHooks.count.HP_chrif_removefriend_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *friend_id); + bool (*postHookFunc) (bool retVal___, int *char_id, int *friend_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_removefriend_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_removefriend_post[hIndex].func; retVal___ = postHookFunc(retVal___, &char_id, &friend_id); @@ -4232,13 +4280,13 @@ void HP_chrif_send_report(char *buf, int len) { } return; } -int HP_chrif_flush_fifo(void) { +bool HP_chrif_flush(void) { int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_chrif_flush_fifo_pre ) { - int (*preHookFunc) (void); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_flush_fifo_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_chrif_flush_fifo_pre[hIndex].func; + bool retVal___ = false; + if( HPMHooks.count.HP_chrif_flush_pre ) { + bool (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_flush_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_chrif_flush_pre[hIndex].func; retVal___ = preHookFunc(); } if( *HPMforce_return ) { @@ -4247,12 +4295,12 @@ int HP_chrif_flush_fifo(void) { } } { - retVal___ = HPMHooks.source.chrif.flush_fifo(); + retVal___ = HPMHooks.source.chrif.flush(); } - if( HPMHooks.count.HP_chrif_flush_fifo_post ) { - int (*postHookFunc) (int retVal___); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_flush_fifo_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_chrif_flush_fifo_post[hIndex].func; + if( HPMHooks.count.HP_chrif_flush_post ) { + bool (*postHookFunc) (bool retVal___); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_flush_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_chrif_flush_post[hIndex].func; retVal___ = postHookFunc(retVal___); } } @@ -4309,11 +4357,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 +4375,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); @@ -4450,30 +4498,31 @@ int HP_chrif_auth_db_cleanup_sub(DBKey key, DBData *data, va_list ap) { } return retVal___; } -void HP_chrif_char_ask_name_answer(int acc, const char *player_name, uint16 type, uint16 answer) { +bool HP_chrif_char_ask_name_answer(int acc, const char *player_name, uint16 type, uint16 answer) { int hIndex = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_char_ask_name_answer_pre ) { - void (*preHookFunc) (int *acc, const char *player_name, uint16 *type, uint16 *answer); + bool (*preHookFunc) (int *acc, const char *player_name, uint16 *type, uint16 *answer); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_ask_name_answer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_char_ask_name_answer_pre[hIndex].func; - preHookFunc(&acc, player_name, &type, &answer); + retVal___ = preHookFunc(&acc, player_name, &type, &answer); } if( *HPMforce_return ) { *HPMforce_return = false; - return; + return retVal___; } } { - HPMHooks.source.chrif.char_ask_name_answer(acc, player_name, type, answer); + retVal___ = HPMHooks.source.chrif.char_ask_name_answer(acc, player_name, type, answer); } if( HPMHooks.count.HP_chrif_char_ask_name_answer_post ) { - void (*postHookFunc) (int *acc, const char *player_name, uint16 *type, uint16 *answer); + bool (*postHookFunc) (bool retVal___, int *acc, const char *player_name, uint16 *type, uint16 *answer); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_char_ask_name_answer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_char_ask_name_answer_post[hIndex].func; - postHookFunc(&acc, player_name, &type, &answer); + retVal___ = postHookFunc(retVal___, &acc, player_name, &type, &answer); } } - return; + return retVal___; } int HP_chrif_auth_db_final(DBKey key, DBData *data, va_list ap) { int hIndex = 0; @@ -4507,11 +4556,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 +4574,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 +4582,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 +4600,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); @@ -4559,141 +4608,136 @@ int HP_chrif_auth_db_cleanup(int tid, unsigned int tick, int id, intptr_t data) } return retVal___; } -int HP_chrif_connect(int fd) { +void HP_chrif_connect(int fd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_chrif_connect_pre ) { - int (*preHookFunc) (int *fd); + void (*preHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_connect_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_connect_pre[hIndex].func; - retVal___ = preHookFunc(&fd); + preHookFunc(&fd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.connect(fd); + HPMHooks.source.chrif.connect(fd); } if( HPMHooks.count.HP_chrif_connect_post ) { - int (*postHookFunc) (int retVal___, int *fd); + void (*postHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_connect_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_connect_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + postHookFunc(&fd); } } - return retVal___; + return; } -int HP_chrif_connectack(int fd) { +void HP_chrif_connectack(int fd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_chrif_connectack_pre ) { - int (*preHookFunc) (int *fd); + void (*preHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_connectack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_connectack_pre[hIndex].func; - retVal___ = preHookFunc(&fd); + preHookFunc(&fd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.connectack(fd); + HPMHooks.source.chrif.connectack(fd); } if( HPMHooks.count.HP_chrif_connectack_post ) { - int (*postHookFunc) (int retVal___, int *fd); + void (*postHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_connectack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_connectack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + postHookFunc(&fd); } } - return retVal___; + return; } -int HP_chrif_sendmap(int fd) { +void HP_chrif_sendmap(int fd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_chrif_sendmap_pre ) { - int (*preHookFunc) (int *fd); + void (*preHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_sendmap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_sendmap_pre[hIndex].func; - retVal___ = preHookFunc(&fd); + preHookFunc(&fd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.sendmap(fd); + HPMHooks.source.chrif.sendmap(fd); } if( HPMHooks.count.HP_chrif_sendmap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + void (*postHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_sendmap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_sendmap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + postHookFunc(&fd); } } - return retVal___; + return; } -int HP_chrif_sendmapack(int fd) { +void HP_chrif_sendmapack(int fd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_chrif_sendmapack_pre ) { - int (*preHookFunc) (int *fd); + void (*preHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_sendmapack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_sendmapack_pre[hIndex].func; - retVal___ = preHookFunc(&fd); + preHookFunc(&fd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.sendmapack(fd); + HPMHooks.source.chrif.sendmapack(fd); } if( HPMHooks.count.HP_chrif_sendmapack_post ) { - int (*postHookFunc) (int retVal___, int *fd); + void (*postHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_sendmapack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_sendmapack_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + postHookFunc(&fd); } } - return retVal___; + return; } -int HP_chrif_recvmap(int fd) { +void HP_chrif_recvmap(int fd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_chrif_recvmap_pre ) { - int (*preHookFunc) (int *fd); + void (*preHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_recvmap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_recvmap_pre[hIndex].func; - retVal___ = preHookFunc(&fd); + preHookFunc(&fd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.recvmap(fd); + HPMHooks.source.chrif.recvmap(fd); } if( HPMHooks.count.HP_chrif_recvmap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + void (*postHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_recvmap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_recvmap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + postHookFunc(&fd); } } - return retVal___; + return; } -int HP_chrif_changemapserverack(int account_id, int login_id1, int login_id2, int char_id, short map_index, short x, short y, uint32 ip, uint16 port) { +bool HP_chrif_changemapserverack(int account_id, int login_id1, int login_id2, int char_id, short map_index, short x, short y, uint32 ip, uint16 port) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_changemapserverack_pre ) { - int (*preHookFunc) (int *account_id, int *login_id1, int *login_id2, int *char_id, short *map_index, short *x, short *y, uint32 *ip, uint16 *port); + bool (*preHookFunc) (int *account_id, int *login_id1, int *login_id2, int *char_id, short *map_index, short *x, short *y, uint32 *ip, uint16 *port); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changemapserverack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_changemapserverack_pre[hIndex].func; retVal___ = preHookFunc(&account_id, &login_id1, &login_id2, &char_id, &map_index, &x, &y, &ip, &port); @@ -4707,7 +4751,7 @@ int HP_chrif_changemapserverack(int account_id, int login_id1, int login_id2, in retVal___ = HPMHooks.source.chrif.changemapserverack(account_id, login_id1, login_id2, char_id, map_index, x, y, ip, port); } if( HPMHooks.count.HP_chrif_changemapserverack_post ) { - int (*postHookFunc) (int retVal___, int *account_id, int *login_id1, int *login_id2, int *char_id, short *map_index, short *x, short *y, uint32 *ip, uint16 *port); + bool (*postHookFunc) (bool retVal___, int *account_id, int *login_id1, int *login_id2, int *char_id, short *map_index, short *x, short *y, uint32 *ip, uint16 *port); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changemapserverack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changemapserverack_post[hIndex].func; retVal___ = postHookFunc(retVal___, &account_id, &login_id1, &login_id2, &char_id, &map_index, &x, &y, &ip, &port); @@ -4715,37 +4759,36 @@ int HP_chrif_changemapserverack(int account_id, int login_id1, int login_id2, in } return retVal___; } -int HP_chrif_changedsex(int fd) { +void HP_chrif_changedsex(int fd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_chrif_changedsex_pre ) { - int (*preHookFunc) (int *fd); + void (*preHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changedsex_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_changedsex_pre[hIndex].func; - retVal___ = preHookFunc(&fd); + preHookFunc(&fd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.changedsex(fd); + HPMHooks.source.chrif.changedsex(fd); } if( HPMHooks.count.HP_chrif_changedsex_post ) { - int (*postHookFunc) (int retVal___, int *fd); + void (*postHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_changedsex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_changedsex_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + postHookFunc(&fd); } } - return retVal___; + return; } -int HP_chrif_divorceack(int char_id, int partner_id) { +bool HP_chrif_divorceack(int char_id, int partner_id) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_divorceack_pre ) { - int (*preHookFunc) (int *char_id, int *partner_id); + bool (*preHookFunc) (int *char_id, int *partner_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_divorceack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_divorceack_pre[hIndex].func; retVal___ = preHookFunc(&char_id, &partner_id); @@ -4759,7 +4802,7 @@ int HP_chrif_divorceack(int char_id, int partner_id) { retVal___ = HPMHooks.source.chrif.divorceack(char_id, partner_id); } if( HPMHooks.count.HP_chrif_divorceack_post ) { - int (*postHookFunc) (int retVal___, int *char_id, int *partner_id); + bool (*postHookFunc) (bool retVal___, int *char_id, int *partner_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_divorceack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_divorceack_post[hIndex].func; retVal___ = postHookFunc(retVal___, &char_id, &partner_id); @@ -4767,63 +4810,61 @@ int HP_chrif_divorceack(int char_id, int partner_id) { } return retVal___; } -int HP_chrif_accountban(int fd) { +void HP_chrif_idbanned(int fd) { int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_chrif_accountban_pre ) { - int (*preHookFunc) (int *fd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_accountban_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_chrif_accountban_pre[hIndex].func; - retVal___ = preHookFunc(&fd); + if( HPMHooks.count.HP_chrif_idbanned_pre ) { + void (*preHookFunc) (int *fd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_idbanned_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_chrif_idbanned_pre[hIndex].func; + preHookFunc(&fd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.accountban(fd); + HPMHooks.source.chrif.idbanned(fd); } - if( HPMHooks.count.HP_chrif_accountban_post ) { - int (*postHookFunc) (int retVal___, int *fd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_accountban_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_chrif_accountban_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + if( HPMHooks.count.HP_chrif_idbanned_post ) { + void (*postHookFunc) (int *fd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_idbanned_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_chrif_idbanned_post[hIndex].func; + postHookFunc(&fd); } } - return retVal___; + return; } -int HP_chrif_recvfamelist(int fd) { +void HP_chrif_recvfamelist(int fd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_chrif_recvfamelist_pre ) { - int (*preHookFunc) (int *fd); + void (*preHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_recvfamelist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_recvfamelist_pre[hIndex].func; - retVal___ = preHookFunc(&fd); + preHookFunc(&fd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.recvfamelist(fd); + HPMHooks.source.chrif.recvfamelist(fd); } if( HPMHooks.count.HP_chrif_recvfamelist_post ) { - int (*postHookFunc) (int retVal___, int *fd); + void (*postHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_recvfamelist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_recvfamelist_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + postHookFunc(&fd); } } - return retVal___; + return; } -int HP_chrif_load_scdata(int fd) { +bool HP_chrif_load_scdata(int fd) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_chrif_load_scdata_pre ) { - int (*preHookFunc) (int *fd); + bool (*preHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_load_scdata_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_load_scdata_pre[hIndex].func; retVal___ = preHookFunc(&fd); @@ -4837,7 +4878,7 @@ int HP_chrif_load_scdata(int fd) { retVal___ = HPMHooks.source.chrif.load_scdata(fd); } if( HPMHooks.count.HP_chrif_load_scdata_post ) { - int (*postHookFunc) (int retVal___, int *fd); + bool (*postHookFunc) (bool retVal___, int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_load_scdata_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_load_scdata_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd); @@ -4896,31 +4937,30 @@ int HP_chrif_disconnectplayer(int fd) { } return retVal___; } -int HP_chrif_removemap(int fd) { +void HP_chrif_removemap(int fd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_chrif_removemap_pre ) { - int (*preHookFunc) (int *fd); + void (*preHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_removemap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_removemap_pre[hIndex].func; - retVal___ = preHookFunc(&fd); + preHookFunc(&fd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.removemap(fd); + HPMHooks.source.chrif.removemap(fd); } if( HPMHooks.count.HP_chrif_removemap_post ) { - int (*postHookFunc) (int retVal___, int *fd); + void (*postHookFunc) (int *fd); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_removemap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_removemap_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &fd); + postHookFunc(&fd); } } - return retVal___; + return; } int HP_chrif_updatefamelist_ack(int fd) { int hIndex = 0; @@ -4998,31 +5038,30 @@ void HP_chrif_keepalive_ack(int fd) { } return; } -int HP_chrif_deadopt(int father_id, int mother_id, int child_id) { +void HP_chrif_deadopt(int father_id, int mother_id, int child_id) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_chrif_deadopt_pre ) { - int (*preHookFunc) (int *father_id, int *mother_id, int *child_id); + void (*preHookFunc) (int *father_id, int *mother_id, int *child_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_deadopt_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chrif_deadopt_pre[hIndex].func; - retVal___ = preHookFunc(&father_id, &mother_id, &child_id); + preHookFunc(&father_id, &mother_id, &child_id); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.chrif.deadopt(father_id, mother_id, child_id); + HPMHooks.source.chrif.deadopt(father_id, mother_id, child_id); } if( HPMHooks.count.HP_chrif_deadopt_post ) { - int (*postHookFunc) (int retVal___, int *father_id, int *mother_id, int *child_id); + void (*postHookFunc) (int *father_id, int *mother_id, int *child_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_deadopt_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chrif_deadopt_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &father_id, &mother_id, &child_id); + postHookFunc(&father_id, &mother_id, &child_id); } } - return retVal___; + return; } void HP_chrif_authfail(int fd) { int hIndex = 0; @@ -5125,15 +5164,65 @@ int HP_chrif_parse(int fd) { } return retVal___; } +void HP_chrif_save_scdata_single(int account_id, int char_id, short type, struct status_change_entry *sce) { + int hIndex = 0; + if( HPMHooks.count.HP_chrif_save_scdata_single_pre ) { + void (*preHookFunc) (int *account_id, int *char_id, short *type, struct status_change_entry *sce); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_scdata_single_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_chrif_save_scdata_single_pre[hIndex].func; + preHookFunc(&account_id, &char_id, &type, sce); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.chrif.save_scdata_single(account_id, char_id, type, sce); + } + if( HPMHooks.count.HP_chrif_save_scdata_single_post ) { + void (*postHookFunc) (int *account_id, int *char_id, short *type, struct status_change_entry *sce); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_save_scdata_single_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_chrif_save_scdata_single_post[hIndex].func; + postHookFunc(&account_id, &char_id, &type, sce); + } + } + return; +} +void HP_chrif_del_scdata_single(int account_id, int char_id, short type) { + int hIndex = 0; + if( HPMHooks.count.HP_chrif_del_scdata_single_pre ) { + void (*preHookFunc) (int *account_id, int *char_id, short *type); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_del_scdata_single_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_chrif_del_scdata_single_pre[hIndex].func; + preHookFunc(&account_id, &char_id, &type); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.chrif.del_scdata_single(account_id, char_id, type); + } + if( HPMHooks.count.HP_chrif_del_scdata_single_post ) { + void (*postHookFunc) (int *account_id, int *char_id, short *type); + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_del_scdata_single_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_chrif_del_scdata_single_post[hIndex].func; + postHookFunc(&account_id, &char_id, &type); + } + } + return; +} /* clif */ -int HP_clif_init(void) { +int HP_clif_init(bool minimal) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_clif_init_pre ) { - int (*preHookFunc) (void); + int (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_init_pre[hIndex].func; - retVal___ = preHookFunc(); + retVal___ = preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -5141,13 +5230,13 @@ int HP_clif_init(void) { } } { - retVal___ = HPMHooks.source.clif.init(); + retVal___ = HPMHooks.source.clif.init(minimal); } if( HPMHooks.count.HP_clif_init_post ) { - int (*postHookFunc) (int retVal___); + int (*postHookFunc) (int retVal___, bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + retVal___ = postHookFunc(retVal___, &minimal); } } return retVal___; @@ -5177,11 +5266,11 @@ void HP_clif_final(void) { } return; } -int HP_clif_setip(const char *ip) { +bool HP_clif_setip(const char *ip) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_clif_setip_pre ) { - int (*preHookFunc) (const char *ip); + bool (*preHookFunc) (const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_setip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_setip_pre[hIndex].func; retVal___ = preHookFunc(ip); @@ -5195,7 +5284,7 @@ int HP_clif_setip(const char *ip) { retVal___ = HPMHooks.source.clif.setip(ip); } if( HPMHooks.count.HP_clif_setip_post ) { - int (*postHookFunc) (int retVal___, const char *ip); + bool (*postHookFunc) (bool retVal___, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_setip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_setip_post[hIndex].func; retVal___ = postHookFunc(retVal___, ip); @@ -5203,30 +5292,31 @@ int HP_clif_setip(const char *ip) { } return retVal___; } -void HP_clif_setbindip(const char *ip) { +bool HP_clif_setbindip(const char *ip) { int hIndex = 0; + bool retVal___ = false; if( HPMHooks.count.HP_clif_setbindip_pre ) { - void (*preHookFunc) (const char *ip); + bool (*preHookFunc) (const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_setbindip_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_setbindip_pre[hIndex].func; - preHookFunc(ip); + retVal___ = preHookFunc(ip); } if( *HPMforce_return ) { *HPMforce_return = false; - return; + return retVal___; } } { - HPMHooks.source.clif.setbindip(ip); + retVal___ = HPMHooks.source.clif.setbindip(ip); } if( HPMHooks.count.HP_clif_setbindip_post ) { - void (*postHookFunc) (const char *ip); + bool (*postHookFunc) (bool retVal___, const char *ip); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_setbindip_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_setbindip_post[hIndex].func; - postHookFunc(ip); + retVal___ = postHookFunc(retVal___, ip); } } - return; + return retVal___; } void HP_clif_setport(uint16 port) { int hIndex = 0; @@ -5279,11 +5369,11 @@ uint32 HP_clif_refresh_ip(void) { } return retVal___; } -int HP_clif_send(const void *buf, int len, struct block_list *bl, enum send_target type) { +bool HP_clif_send(const void *buf, int len, struct block_list *bl, enum send_target type) { int hIndex = 0; - int retVal___ = 0; + bool retVal___ = false; if( HPMHooks.count.HP_clif_send_pre ) { - int (*preHookFunc) (const void *buf, int *len, struct block_list *bl, enum send_target *type); + bool (*preHookFunc) (const void *buf, int *len, struct block_list *bl, enum send_target *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_send_pre[hIndex].func; retVal___ = preHookFunc(buf, &len, bl, &type); @@ -5297,7 +5387,7 @@ int HP_clif_send(const void *buf, int len, struct block_list *bl, enum send_targ retVal___ = HPMHooks.source.clif.send(buf, len, bl, type); } if( HPMHooks.count.HP_clif_send_post ) { - int (*postHookFunc) (int retVal___, const void *buf, int *len, struct block_list *bl, enum send_target *type); + bool (*postHookFunc) (bool retVal___, const void *buf, int *len, struct block_list *bl, enum send_target *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_send_post[hIndex].func; retVal___ = postHookFunc(retVal___, buf, &len, bl, &type); @@ -5790,13 +5880,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 +5894,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 +5919,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; @@ -6040,6 +6130,31 @@ void HP_clif_package_announce(struct map_session_data *sd, unsigned short nameid } return; } +void HP_clif_item_drop_announce(struct map_session_data *sd, unsigned short nameid, char *monsterName) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_item_drop_announce_pre ) { + void (*preHookFunc) (struct map_session_data *sd, unsigned short *nameid, char *monsterName); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_drop_announce_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_item_drop_announce_pre[hIndex].func; + preHookFunc(sd, &nameid, monsterName); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.item_drop_announce(sd, nameid, monsterName); + } + if( HPMHooks.count.HP_clif_item_drop_announce_post ) { + void (*postHookFunc) (struct map_session_data *sd, unsigned short *nameid, char *monsterName); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_drop_announce_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_item_drop_announce_post[hIndex].func; + postHookFunc(sd, &nameid, monsterName); + } + } + return; +} void HP_clif_clearunit_single(int id, clr_type type, int fd) { int hIndex = 0; if( HPMHooks.count.HP_clif_clearunit_single_pre ) { @@ -6090,10 +6205,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 +6222,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); @@ -6365,31 +6480,6 @@ void HP_clif_class_change(struct block_list *bl, int class_, int type) { } return; } -void HP_clif_skill_setunit(struct skill_unit *su) { - int hIndex = 0; - if( HPMHooks.count.HP_clif_skill_setunit_pre ) { - void (*preHookFunc) (struct skill_unit *su); - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_setunit_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_clif_skill_setunit_pre[hIndex].func; - preHookFunc(su); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.clif.skill_setunit(su); - } - if( HPMHooks.count.HP_clif_skill_setunit_post ) { - void (*postHookFunc) (struct skill_unit *su); - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_setunit_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_clif_skill_setunit_post[hIndex].func; - postHookFunc(su); - } - } - return; -} void HP_clif_skill_delunit(struct skill_unit *su) { int hIndex = 0; if( HPMHooks.count.HP_clif_skill_delunit_pre ) { @@ -6440,11 +6530,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 +6548,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); @@ -6617,13 +6707,13 @@ int HP_clif_calc_walkdelay(struct block_list *bl, int delay, int type, int damag } return retVal___; } -void HP_clif_getareachar_skillunit(struct map_session_data *sd, struct skill_unit *su) { +void HP_clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *su, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_getareachar_skillunit_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct skill_unit *su); + void (*preHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_skillunit_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_getareachar_skillunit_pre[hIndex].func; - preHookFunc(sd, su); + preHookFunc(bl, su, &target); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -6631,13 +6721,13 @@ void HP_clif_getareachar_skillunit(struct map_session_data *sd, struct skill_uni } } { - HPMHooks.source.clif.getareachar_skillunit(sd, su); + HPMHooks.source.clif.getareachar_skillunit(bl, su, target); } if( HPMHooks.count.HP_clif_getareachar_skillunit_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct skill_unit *su); + void (*postHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_getareachar_skillunit_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_getareachar_skillunit_post[hIndex].func; - postHookFunc(sd, su); + postHookFunc(bl, su, &target); } } return; @@ -6724,11 +6814,36 @@ int HP_clif_getareachar(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_clif_spawn(struct block_list *bl) { +void HP_clif_graffiti_entry(struct block_list *bl, struct skill_unit *su, enum send_target target) { int hIndex = 0; - int retVal___ = 0; + if( HPMHooks.count.HP_clif_graffiti_entry_pre ) { + void (*preHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_graffiti_entry_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_graffiti_entry_pre[hIndex].func; + preHookFunc(bl, su, &target); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.graffiti_entry(bl, su, target); + } + if( HPMHooks.count.HP_clif_graffiti_entry_post ) { + void (*postHookFunc) (struct block_list *bl, struct skill_unit *su, enum send_target *target); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_graffiti_entry_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_graffiti_entry_post[hIndex].func; + postHookFunc(bl, su, &target); + } + } + return; +} +bool HP_clif_spawn(struct block_list *bl) { + int hIndex = 0; + bool retVal___ = false; if( HPMHooks.count.HP_clif_spawn_pre ) { - int (*preHookFunc) (struct block_list *bl); + bool (*preHookFunc) (struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_spawn_pre[hIndex].func; retVal___ = preHookFunc(bl); @@ -6742,7 +6857,7 @@ int HP_clif_spawn(struct block_list *bl) { retVal___ = HPMHooks.source.clif.spawn(bl); } if( HPMHooks.count.HP_clif_spawn_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl); + bool (*postHookFunc) (bool retVal___, struct block_list *bl); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spawn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_spawn_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -7400,14 +7515,14 @@ 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, int sdelay, int ddelay, int64 damage, short div, unsigned char 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, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *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); + retVal___ = preHookFunc(src, dst, &sdelay, &ddelay, &damage, &div, &type, &damage2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7415,13 +7530,13 @@ 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); + retVal___ = HPMHooks.source.clif.damage(src, dst, sdelay, ddelay, damage, div, type, damage2); } if( HPMHooks.count.HP_clif_damage_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, 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, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_damage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_damage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, dst, &tick, &sdelay, &ddelay, &damage, &div, &type, &damage2); + retVal___ = postHookFunc(retVal___, src, dst, &sdelay, &ddelay, &damage, &div, &type, &damage2); } } return retVal___; @@ -7815,13 +7930,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 +7944,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; @@ -8873,31 +8988,6 @@ void HP_clif_viewequip_ack(struct map_session_data *sd, struct map_session_data } return; } -void HP_clif_viewequip_fail(struct map_session_data *sd) { - int hIndex = 0; - if( HPMHooks.count.HP_clif_viewequip_fail_pre ) { - void (*preHookFunc) (struct map_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_viewequip_fail_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_clif_viewequip_fail_pre[hIndex].func; - preHookFunc(sd); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.clif.viewequip_fail(sd); - } - if( HPMHooks.count.HP_clif_viewequip_fail_post ) { - void (*postHookFunc) (struct map_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_viewequip_fail_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_clif_viewequip_fail_post[hIndex].func; - postHookFunc(sd); - } - } - return; -} void HP_clif_equpcheckbox(struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_equpcheckbox_pre ) { @@ -8973,10 +9063,10 @@ void HP_clif_font(struct map_session_data *sd) { } return; } -void HP_clif_progressbar(struct map_session_data *sd, unsigned long color, unsigned int second) { +void HP_clif_progressbar(struct map_session_data *sd, unsigned int color, unsigned int second) { int hIndex = 0; if( HPMHooks.count.HP_clif_progressbar_pre ) { - void (*preHookFunc) (struct map_session_data *sd, unsigned long *color, unsigned int *second); + void (*preHookFunc) (struct map_session_data *sd, unsigned int *color, unsigned int *second); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_progressbar_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_progressbar_pre[hIndex].func; preHookFunc(sd, &color, &second); @@ -8990,7 +9080,7 @@ void HP_clif_progressbar(struct map_session_data *sd, unsigned long color, unsig HPMHooks.source.clif.progressbar(sd, color, second); } if( HPMHooks.count.HP_clif_progressbar_post ) { - void (*postHookFunc) (struct map_session_data *sd, unsigned long *color, unsigned int *second); + void (*postHookFunc) (struct map_session_data *sd, unsigned int *color, unsigned int *second); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_progressbar_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_progressbar_post[hIndex].func; postHookFunc(sd, &color, &second); @@ -9454,11 +9544,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 +9562,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 +9970,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 +9988,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 +10022,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 +10039,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); @@ -10357,13 +10447,13 @@ void HP_clif_specialeffect_value(struct block_list *bl, int effect_id, int num, } return; } -void HP_clif_millenniumshield(struct map_session_data *sd, short shields) { +void HP_clif_millenniumshield(struct block_list *bl, short shields) { int hIndex = 0; if( HPMHooks.count.HP_clif_millenniumshield_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *shields); + void (*preHookFunc) (struct block_list *bl, short *shields); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_millenniumshield_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_millenniumshield_pre[hIndex].func; - preHookFunc(sd, &shields); + preHookFunc(bl, &shields); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10371,13 +10461,13 @@ void HP_clif_millenniumshield(struct map_session_data *sd, short shields) { } } { - HPMHooks.source.clif.millenniumshield(sd, shields); + HPMHooks.source.clif.millenniumshield(bl, shields); } if( HPMHooks.count.HP_clif_millenniumshield_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *shields); + void (*postHookFunc) (struct block_list *bl, short *shields); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_millenniumshield_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_millenniumshield_post[hIndex].func; - postHookFunc(sd, &shields); + postHookFunc(bl, &shields); } } return; @@ -10807,10 +10897,10 @@ void HP_clif_changechatstatus(struct chat_data *cd) { } return; } -void HP_clif_wis_message(int fd, const char *nick, const char *mes, int mes_len) { +void HP_clif_wis_message(int fd, const char *nick, const char *mes, size_t mes_len) { int hIndex = 0; if( HPMHooks.count.HP_clif_wis_message_pre ) { - void (*preHookFunc) (int *fd, const char *nick, const char *mes, int *mes_len); + void (*preHookFunc) (int *fd, const char *nick, const char *mes, size_t *mes_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wis_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_wis_message_pre[hIndex].func; preHookFunc(&fd, nick, mes, &mes_len); @@ -10824,7 +10914,7 @@ void HP_clif_wis_message(int fd, const char *nick, const char *mes, int mes_len) HPMHooks.source.clif.wis_message(fd, nick, mes, mes_len); } if( HPMHooks.count.HP_clif_wis_message_post ) { - void (*postHookFunc) (int *fd, const char *nick, const char *mes, int *mes_len); + void (*postHookFunc) (int *fd, const char *nick, const char *mes, size_t *mes_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_wis_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_wis_message_post[hIndex].func; postHookFunc(&fd, nick, mes, &mes_len); @@ -10857,35 +10947,10 @@ void HP_clif_wis_end(int fd, int flag) { } return; } -void HP_clif_disp_onlyself(struct map_session_data *sd, const char *mes, int len) { - int hIndex = 0; - if( HPMHooks.count.HP_clif_disp_onlyself_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *mes, int *len); - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_disp_onlyself_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_clif_disp_onlyself_pre[hIndex].func; - preHookFunc(sd, mes, &len); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.clif.disp_onlyself(sd, mes, len); - } - if( HPMHooks.count.HP_clif_disp_onlyself_post ) { - void (*postHookFunc) (struct map_session_data *sd, const char *mes, int *len); - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_disp_onlyself_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_clif_disp_onlyself_post[hIndex].func; - postHookFunc(sd, mes, &len); - } - } - return; -} -void HP_clif_disp_message(struct block_list *src, const char *mes, int len, enum send_target target) { +void HP_clif_disp_message(struct block_list *src, const char *mes, size_t len, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_disp_message_pre ) { - void (*preHookFunc) (struct block_list *src, const char *mes, int *len, enum send_target *target); + void (*preHookFunc) (struct block_list *src, const char *mes, size_t *len, enum send_target *target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_disp_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_disp_message_pre[hIndex].func; preHookFunc(src, mes, &len, &target); @@ -10899,7 +10964,7 @@ void HP_clif_disp_message(struct block_list *src, const char *mes, int len, enum HPMHooks.source.clif.disp_message(src, mes, len, target); } if( HPMHooks.count.HP_clif_disp_message_post ) { - void (*postHookFunc) (struct block_list *src, const char *mes, int *len, enum send_target *target); + void (*postHookFunc) (struct block_list *src, const char *mes, size_t *len, enum send_target *target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_disp_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_disp_message_post[hIndex].func; postHookFunc(src, mes, &len, &target); @@ -10907,10 +10972,10 @@ void HP_clif_disp_message(struct block_list *src, const char *mes, int len, enum } return; } -void HP_clif_broadcast(struct block_list *bl, const char *mes, int len, int type, enum send_target target) { +void HP_clif_broadcast(struct block_list *bl, const char *mes, size_t len, int type, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_broadcast_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *mes, int *len, int *type, enum send_target *target); + void (*preHookFunc) (struct block_list *bl, const char *mes, size_t *len, int *type, enum send_target *target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_broadcast_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_broadcast_pre[hIndex].func; preHookFunc(bl, mes, &len, &type, &target); @@ -10924,7 +10989,7 @@ void HP_clif_broadcast(struct block_list *bl, const char *mes, int len, int type HPMHooks.source.clif.broadcast(bl, mes, len, type, target); } if( HPMHooks.count.HP_clif_broadcast_post ) { - void (*postHookFunc) (struct block_list *bl, const char *mes, int *len, int *type, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, const char *mes, size_t *len, int *type, enum send_target *target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_broadcast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_broadcast_post[hIndex].func; postHookFunc(bl, mes, &len, &type, &target); @@ -10932,10 +10997,10 @@ void HP_clif_broadcast(struct block_list *bl, const char *mes, int len, int type } return; } -void HP_clif_broadcast2(struct block_list *bl, const char *mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target) { +void HP_clif_broadcast2(struct block_list *bl, const char *mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target) { int hIndex = 0; if( HPMHooks.count.HP_clif_broadcast2_pre ) { - void (*preHookFunc) (struct block_list *bl, const char *mes, int *len, unsigned long *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, enum send_target *target); + void (*preHookFunc) (struct block_list *bl, const char *mes, size_t *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, enum send_target *target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_broadcast2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_broadcast2_pre[hIndex].func; preHookFunc(bl, mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &target); @@ -10949,7 +11014,7 @@ void HP_clif_broadcast2(struct block_list *bl, const char *mes, int len, unsigne HPMHooks.source.clif.broadcast2(bl, mes, len, fontColor, fontType, fontSize, fontAlign, fontY, target); } if( HPMHooks.count.HP_clif_broadcast2_post ) { - void (*postHookFunc) (struct block_list *bl, const char *mes, int *len, unsigned long *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, enum send_target *target); + void (*postHookFunc) (struct block_list *bl, const char *mes, size_t *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, enum send_target *target); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_broadcast2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_broadcast2_post[hIndex].func; postHookFunc(bl, mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &target); @@ -10957,10 +11022,10 @@ void HP_clif_broadcast2(struct block_list *bl, const char *mes, int len, unsigne } return; } -void HP_clif_messagecolor(struct block_list *bl, unsigned long color, const char *msg) { +void HP_clif_messagecolor(struct block_list *bl, unsigned int color, const char *msg) { int hIndex = 0; if( HPMHooks.count.HP_clif_messagecolor_pre ) { - void (*preHookFunc) (struct block_list *bl, unsigned long *color, const char *msg); + void (*preHookFunc) (struct block_list *bl, unsigned int *color, const char *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_messagecolor_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_messagecolor_pre[hIndex].func; preHookFunc(bl, &color, msg); @@ -10974,7 +11039,7 @@ void HP_clif_messagecolor(struct block_list *bl, unsigned long color, const char HPMHooks.source.clif.messagecolor(bl, color, msg); } if( HPMHooks.count.HP_clif_messagecolor_post ) { - void (*postHookFunc) (struct block_list *bl, unsigned long *color, const char *msg); + void (*postHookFunc) (struct block_list *bl, unsigned int *color, const char *msg); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_messagecolor_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_messagecolor_post[hIndex].func; postHookFunc(bl, &color, msg); @@ -11208,11 +11273,11 @@ int HP_clif_colormes(int fd, enum clif_colors color, const char *msg) { } return retVal___; } -bool HP_clif_process_message(struct map_session_data *sd, int format, char **name_, int *namelen_, char **message_, int *messagelen_) { +bool HP_clif_process_message(struct map_session_data *sd, int format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_clif_process_message_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *format, char **name_, int *namelen_, char **message_, int *messagelen_); + bool (*preHookFunc) (struct map_session_data *sd, int *format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_process_message_pre[hIndex].func; retVal___ = preHookFunc(sd, &format, name_, namelen_, message_, messagelen_); @@ -11226,7 +11291,7 @@ bool HP_clif_process_message(struct map_session_data *sd, int format, char **nam retVal___ = HPMHooks.source.clif.process_message(sd, format, name_, namelen_, message_, messagelen_); } if( HPMHooks.count.HP_clif_process_message_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *format, char **name_, int *namelen_, char **message_, int *messagelen_); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_process_message_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &format, name_, namelen_, message_, messagelen_); @@ -11309,6 +11374,31 @@ void HP_clif_PMIgnoreList(struct map_session_data *sd) { } return; } +void HP_clif_ShowScript(struct block_list *bl, const char *message) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_ShowScript_pre ) { + void (*preHookFunc) (struct block_list *bl, const char *message); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_ShowScript_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_ShowScript_pre[hIndex].func; + preHookFunc(bl, message); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.ShowScript(bl, message); + } + if( HPMHooks.count.HP_clif_ShowScript_post ) { + void (*postHookFunc) (struct block_list *bl, const char *message); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_ShowScript_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_ShowScript_post[hIndex].func; + postHookFunc(bl, message); + } + } + return; +} void HP_clif_traderequest(struct map_session_data *sd, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_traderequest_pre ) { @@ -11834,13 +11924,13 @@ void HP_clif_skillinfoblock(struct map_session_data *sd) { } return; } -void HP_clif_skillup(struct map_session_data *sd, uint16 skill_id) { +void HP_clif_skillup(struct map_session_data *sd, uint16 skill_id, int skill_lv, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_skillup_pre ) { - void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id); + void (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *skill_lv, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_skillup_pre[hIndex].func; - preHookFunc(sd, &skill_id); + preHookFunc(sd, &skill_id, &skill_lv, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -11848,13 +11938,13 @@ void HP_clif_skillup(struct map_session_data *sd, uint16 skill_id) { } } { - HPMHooks.source.clif.skillup(sd, skill_id); + HPMHooks.source.clif.skillup(sd, skill_id, skill_lv, flag); } if( HPMHooks.count.HP_clif_skillup_post ) { - void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id); + void (*postHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *skill_lv, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_skillup_post[hIndex].func; - postHookFunc(sd, &skill_id); + postHookFunc(sd, &skill_id, &skill_lv, &flag); } } return; @@ -12759,32 +12849,6 @@ void HP_clif_guild_message(struct guild *g, int account_id, const char *mes, int } return; } -int HP_clif_guild_skillup(struct map_session_data *sd, uint16 skill_id, int lv) { - int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_clif_guild_skillup_pre ) { - int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *lv); - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_skillup_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_clif_guild_skillup_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill_id, &lv); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.clif.guild_skillup(sd, skill_id, lv); - } - if( HPMHooks.count.HP_clif_guild_skillup_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, int *lv); - for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_skillup_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_clif_guild_skillup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill_id, &lv); - } - } - return retVal___; -} void HP_clif_guild_reqalliance(struct map_session_data *sd, int account_id, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_reqalliance_pre ) { @@ -13161,10 +13225,10 @@ void HP_clif_bg_xy_remove(struct map_session_data *sd) { } return; } -void HP_clif_bg_message(struct battleground_data *bgd, int src_id, const char *name, const char *mes, int len) { +void HP_clif_bg_message(struct battleground_data *bgd, int src_id, const char *name, const char *mes, size_t len) { int hIndex = 0; if( HPMHooks.count.HP_clif_bg_message_pre ) { - void (*preHookFunc) (struct battleground_data *bgd, int *src_id, const char *name, const char *mes, int *len); + void (*preHookFunc) (struct battleground_data *bgd, int *src_id, const char *name, const char *mes, size_t *len); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bg_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bg_message_pre[hIndex].func; preHookFunc(bgd, &src_id, name, mes, &len); @@ -13178,7 +13242,7 @@ void HP_clif_bg_message(struct battleground_data *bgd, int src_id, const char *n HPMHooks.source.clif.bg_message(bgd, src_id, name, mes, len); } if( HPMHooks.count.HP_clif_bg_message_post ) { - void (*postHookFunc) (struct battleground_data *bgd, int *src_id, const char *name, const char *mes, int *len); + void (*postHookFunc) (struct battleground_data *bgd, int *src_id, const char *name, const char *mes, size_t *len); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bg_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bg_message_post[hIndex].func; postHookFunc(bgd, &src_id, name, mes, &len); @@ -13844,31 +13908,30 @@ void HP_clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int fla } return; } -int HP_clif_homskillinfoblock(struct map_session_data *sd) { +void HP_clif_homskillinfoblock(struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_clif_homskillinfoblock_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_homskillinfoblock_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_homskillinfoblock_pre[hIndex].func; - retVal___ = preHookFunc(sd); + preHookFunc(sd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.clif.homskillinfoblock(sd); + HPMHooks.source.clif.homskillinfoblock(sd); } if( HPMHooks.count.HP_clif_homskillinfoblock_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); + void (*postHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_homskillinfoblock_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_homskillinfoblock_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd); + postHookFunc(sd); } } - return retVal___; + return; } void HP_clif_homskillup(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; @@ -13895,31 +13958,30 @@ void HP_clif_homskillup(struct map_session_data *sd, uint16 skill_id) { } return; } -int HP_clif_hom_food(struct map_session_data *sd, int foodid, int fail) { +void HP_clif_hom_food(struct map_session_data *sd, int foodid, int fail) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_clif_hom_food_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *foodid, int *fail); + void (*preHookFunc) (struct map_session_data *sd, int *foodid, int *fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hom_food_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_hom_food_pre[hIndex].func; - retVal___ = preHookFunc(sd, &foodid, &fail); + preHookFunc(sd, &foodid, &fail); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.clif.hom_food(sd, foodid, fail); + HPMHooks.source.clif.hom_food(sd, foodid, fail); } if( HPMHooks.count.HP_clif_hom_food_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *foodid, int *fail); + void (*postHookFunc) (struct map_session_data *sd, int *foodid, int *fail); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_hom_food_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_hom_food_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &foodid, &fail); + postHookFunc(sd, &foodid, &fail); } } - return retVal___; + return; } void HP_clif_send_homdata(struct map_session_data *sd, int state, int param) { int hIndex = 0; @@ -13996,13 +14058,13 @@ void HP_clif_quest_send_mission(struct map_session_data *sd) { } return; } -void HP_clif_quest_add(struct map_session_data *sd, struct quest *qd, int index) { +void HP_clif_quest_add(struct map_session_data *sd, struct quest *qd) { int hIndex = 0; if( HPMHooks.count.HP_clif_quest_add_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct quest *qd, int *index); + void (*preHookFunc) (struct map_session_data *sd, struct quest *qd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quest_add_pre[hIndex].func; - preHookFunc(sd, qd, &index); + preHookFunc(sd, qd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14010,13 +14072,13 @@ void HP_clif_quest_add(struct map_session_data *sd, struct quest *qd, int index) } } { - HPMHooks.source.clif.quest_add(sd, qd, index); + HPMHooks.source.clif.quest_add(sd, qd); } if( HPMHooks.count.HP_clif_quest_add_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct quest *qd, int *index); + void (*postHookFunc) (struct map_session_data *sd, struct quest *qd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_quest_add_post[hIndex].func; - postHookFunc(sd, qd, &index); + postHookFunc(sd, qd); } } return; @@ -14071,13 +14133,13 @@ void HP_clif_quest_update_status(struct map_session_data *sd, int quest_id, bool } return; } -void HP_clif_quest_update_objective(struct map_session_data *sd, struct quest *qd, int index) { +void HP_clif_quest_update_objective(struct map_session_data *sd, struct quest *qd) { int hIndex = 0; if( HPMHooks.count.HP_clif_quest_update_objective_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct quest *qd, int *index); + void (*preHookFunc) (struct map_session_data *sd, struct quest *qd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_update_objective_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_quest_update_objective_pre[hIndex].func; - preHookFunc(sd, qd, &index); + preHookFunc(sd, qd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -14085,13 +14147,13 @@ void HP_clif_quest_update_objective(struct map_session_data *sd, struct quest *q } } { - HPMHooks.source.clif.quest_update_objective(sd, qd, index); + HPMHooks.source.clif.quest_update_objective(sd, qd); } if( HPMHooks.count.HP_clif_quest_update_objective_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct quest *qd, int *index); + void (*postHookFunc) (struct map_session_data *sd, struct quest *qd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_quest_update_objective_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_quest_update_objective_post[hIndex].func; - postHookFunc(sd, qd, &index); + postHookFunc(sd, qd); } } return; @@ -14946,10 +15008,10 @@ void HP_clif_PartyBookingVolunteerInfo(int index, struct map_session_data *sd) { } return; } -void HP_clif_PartyBookingRefuseVolunteer(unsigned long aid, struct map_session_data *sd) { +void HP_clif_PartyBookingRefuseVolunteer(unsigned int aid, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_PartyBookingRefuseVolunteer_pre ) { - void (*preHookFunc) (unsigned long *aid, struct map_session_data *sd); + void (*preHookFunc) (unsigned int *aid, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingRefuseVolunteer_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_PartyBookingRefuseVolunteer_pre[hIndex].func; preHookFunc(&aid, sd); @@ -14963,7 +15025,7 @@ void HP_clif_PartyBookingRefuseVolunteer(unsigned long aid, struct map_session_d HPMHooks.source.clif.PartyBookingRefuseVolunteer(aid, sd); } if( HPMHooks.count.HP_clif_PartyBookingRefuseVolunteer_post ) { - void (*postHookFunc) (unsigned long *aid, struct map_session_data *sd); + void (*postHookFunc) (unsigned int *aid, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyBookingRefuseVolunteer_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_PartyBookingRefuseVolunteer_post[hIndex].func; postHookFunc(&aid, sd); @@ -15721,10 +15783,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); @@ -15738,7 +15800,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); @@ -15821,11 +15883,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); @@ -15839,7 +15901,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); @@ -16147,6 +16209,208 @@ void HP_clif_chsys_gleave(struct guild *g1, struct guild *g2) { } return; } +void HP_clif_bank_deposit(struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK reason) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_bank_deposit_pre ) { + void (*preHookFunc) (struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK *reason); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_deposit_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_bank_deposit_pre[hIndex].func; + preHookFunc(sd, &reason); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.bank_deposit(sd, reason); + } + if( HPMHooks.count.HP_clif_bank_deposit_post ) { + void (*postHookFunc) (struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK *reason); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_deposit_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_bank_deposit_post[hIndex].func; + postHookFunc(sd, &reason); + } + } + return; +} +void HP_clif_bank_withdraw(struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK reason) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_bank_withdraw_pre ) { + void (*preHookFunc) (struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK *reason); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_withdraw_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_bank_withdraw_pre[hIndex].func; + preHookFunc(sd, &reason); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.bank_withdraw(sd, reason); + } + if( HPMHooks.count.HP_clif_bank_withdraw_post ) { + void (*postHookFunc) (struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK *reason); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_withdraw_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_bank_withdraw_post[hIndex].func; + postHookFunc(sd, &reason); + } + } + return; +} +void HP_clif_show_modifiers(struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_show_modifiers_pre ) { + void (*preHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_show_modifiers_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_show_modifiers_pre[hIndex].func; + preHookFunc(sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.show_modifiers(sd); + } + if( HPMHooks.count.HP_clif_show_modifiers_post ) { + void (*postHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_show_modifiers_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_show_modifiers_post[hIndex].func; + postHookFunc(sd); + } + } + return; +} +void HP_clif_notify_bounditem(struct map_session_data *sd, unsigned short index) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_notify_bounditem_pre ) { + void (*preHookFunc) (struct map_session_data *sd, unsigned short *index); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_notify_bounditem_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_notify_bounditem_pre[hIndex].func; + preHookFunc(sd, &index); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.notify_bounditem(sd, index); + } + if( HPMHooks.count.HP_clif_notify_bounditem_post ) { + void (*postHookFunc) (struct map_session_data *sd, unsigned short *index); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_notify_bounditem_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_notify_bounditem_post[hIndex].func; + postHookFunc(sd, &index); + } + } + return; +} +int HP_clif_delay_damage(int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_clif_delay_damage_pre ) { + int (*preHookFunc) (int64 *tick, struct block_list *src, struct block_list *dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_delay_damage_pre[hIndex].func; + retVal___ = preHookFunc(&tick, src, dst, &sdelay, &ddelay, &in_damage, &div, &type); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.clif.delay_damage(tick, src, dst, sdelay, ddelay, in_damage, div, type); + } + if( HPMHooks.count.HP_clif_delay_damage_post ) { + int (*postHookFunc) (int retVal___, int64 *tick, struct block_list *src, struct block_list *dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_delay_damage_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &tick, src, dst, &sdelay, &ddelay, &in_damage, &div, &type); + } + } + return retVal___; +} +int HP_clif_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_clif_delay_damage_sub_pre ) { + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_sub_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_delay_damage_sub_pre[hIndex].func; + retVal___ = preHookFunc(&tid, &tick, &id, &data); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.clif.delay_damage_sub(tid, tick, id, data); + } + if( HPMHooks.count.HP_clif_delay_damage_sub_post ) { + int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_sub_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_delay_damage_sub_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + } + } + return retVal___; +} +void HP_clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_npc_market_open_pre ) { + void (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_open_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_npc_market_open_pre[hIndex].func; + preHookFunc(sd, nd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.npc_market_open(sd, nd); + } + if( HPMHooks.count.HP_clif_npc_market_open_post ) { + void (*postHookFunc) (struct map_session_data *sd, struct npc_data *nd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_open_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_npc_market_open_post[hIndex].func; + postHookFunc(sd, nd); + } + } + return; +} +void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, struct packet_npc_market_purchase *req, unsigned char response) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_npc_market_purchase_ack_pre ) { + void (*preHookFunc) (struct map_session_data *sd, struct packet_npc_market_purchase *req, unsigned char *response); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_pre[hIndex].func; + preHookFunc(sd, req, &response); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.npc_market_purchase_ack(sd, req, response); + } + if( HPMHooks.count.HP_clif_npc_market_purchase_ack_post ) { + void (*postHookFunc) (struct map_session_data *sd, struct packet_npc_market_purchase *req, unsigned char *response); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_post[hIndex].func; + postHookFunc(sd, req, &response); + } + } + return; +} void HP_clif_pWantToConnection(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pWantToConnection_pre ) { @@ -16497,10 +16761,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); @@ -16514,7 +16778,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); @@ -17347,10 +17611,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); @@ -17364,7 +17628,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); @@ -17372,10 +17636,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); @@ -17389,7 +17653,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); @@ -17447,10 +17711,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); @@ -17464,7 +17728,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); @@ -17472,10 +17736,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); @@ -17489,7 +17753,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); @@ -19622,6 +19886,31 @@ void HP_clif_pGMChangeMapType(int fd, struct map_session_data *sd) { } return; } +void HP_clif_pGMFullStrip(int fd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_pGMFullStrip_pre ) { + void (*preHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMFullStrip_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_pGMFullStrip_pre[hIndex].func; + preHookFunc(&fd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.pGMFullStrip(fd, sd); + } + if( HPMHooks.count.HP_clif_pGMFullStrip_post ) { + void (*postHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGMFullStrip_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_pGMFullStrip_post[hIndex].func; + postHookFunc(&fd, sd); + } + } + return; +} void HP_clif_pPMIgnore(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pPMIgnore_pre ) { @@ -21497,6 +21786,206 @@ void HP_clif_pPartyBookingCancelVolunteer(int fd, struct map_session_data *sd) { } return; } +void HP_clif_pBankDeposit(int fd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_pBankDeposit_pre ) { + void (*preHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankDeposit_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_pBankDeposit_pre[hIndex].func; + preHookFunc(&fd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.pBankDeposit(fd, sd); + } + if( HPMHooks.count.HP_clif_pBankDeposit_post ) { + void (*postHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankDeposit_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_pBankDeposit_post[hIndex].func; + postHookFunc(&fd, sd); + } + } + return; +} +void HP_clif_pBankWithdraw(int fd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_pBankWithdraw_pre ) { + void (*preHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankWithdraw_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_pBankWithdraw_pre[hIndex].func; + preHookFunc(&fd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.pBankWithdraw(fd, sd); + } + if( HPMHooks.count.HP_clif_pBankWithdraw_post ) { + void (*postHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankWithdraw_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_pBankWithdraw_post[hIndex].func; + postHookFunc(&fd, sd); + } + } + return; +} +void HP_clif_pBankCheck(int fd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_pBankCheck_pre ) { + void (*preHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankCheck_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_pBankCheck_pre[hIndex].func; + preHookFunc(&fd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.pBankCheck(fd, sd); + } + if( HPMHooks.count.HP_clif_pBankCheck_post ) { + void (*postHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankCheck_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_pBankCheck_post[hIndex].func; + postHookFunc(&fd, sd); + } + } + return; +} +void HP_clif_pBankOpen(int fd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_pBankOpen_pre ) { + void (*preHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankOpen_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_pBankOpen_pre[hIndex].func; + preHookFunc(&fd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.pBankOpen(fd, sd); + } + if( HPMHooks.count.HP_clif_pBankOpen_post ) { + void (*postHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankOpen_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_pBankOpen_post[hIndex].func; + postHookFunc(&fd, sd); + } + } + return; +} +void HP_clif_pBankClose(int fd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_pBankClose_pre ) { + void (*preHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankClose_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_pBankClose_pre[hIndex].func; + preHookFunc(&fd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.pBankClose(fd, sd); + } + if( HPMHooks.count.HP_clif_pBankClose_post ) { + void (*postHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankClose_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_pBankClose_post[hIndex].func; + postHookFunc(&fd, sd); + } + } + return; +} +void HP_clif_pNPCShopClosed(int fd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_pNPCShopClosed_pre ) { + void (*preHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCShopClosed_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_pNPCShopClosed_pre[hIndex].func; + preHookFunc(&fd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.pNPCShopClosed(fd, sd); + } + if( HPMHooks.count.HP_clif_pNPCShopClosed_post ) { + void (*postHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCShopClosed_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_pNPCShopClosed_post[hIndex].func; + postHookFunc(&fd, sd); + } + } + return; +} +void HP_clif_pNPCMarketClosed(int fd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_pNPCMarketClosed_pre ) { + void (*preHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCMarketClosed_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_pNPCMarketClosed_pre[hIndex].func; + preHookFunc(&fd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.pNPCMarketClosed(fd, sd); + } + if( HPMHooks.count.HP_clif_pNPCMarketClosed_post ) { + void (*postHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCMarketClosed_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_pNPCMarketClosed_post[hIndex].func; + postHookFunc(&fd, sd); + } + } + return; +} +void HP_clif_pNPCMarketPurchase(int fd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_pNPCMarketPurchase_pre ) { + void (*preHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCMarketPurchase_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_pNPCMarketPurchase_pre[hIndex].func; + preHookFunc(&fd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.pNPCMarketPurchase(fd, sd); + } + if( HPMHooks.count.HP_clif_pNPCMarketPurchase_post ) { + void (*postHookFunc) (int *fd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCMarketPurchase_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_pNPCMarketPurchase_post[hIndex].func; + postHookFunc(&fd, sd); + } + } + return; +} /* duel */ int HP_duel_create(struct map_session_data *sd, const unsigned int maxpl) { int hIndex = 0; @@ -21675,13 +22164,13 @@ int HP_duel_checktime(struct map_session_data *sd) { } return retVal___; } -void HP_duel_init(void) { +void HP_duel_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_duel_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_duel_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21689,13 +22178,13 @@ void HP_duel_init(void) { } } { - HPMHooks.source.duel.init(); + HPMHooks.source.duel.init(minimal); } if( HPMHooks.count.HP_duel_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_duel_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_duel_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -21726,14 +22215,14 @@ void HP_duel_final(void) { return; } /* elemental */ -int HP_elemental_init(void) { +int HP_elemental_init(bool minimal) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_init_pre ) { - int (*preHookFunc) (void); + int (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_init_pre[hIndex].func; - retVal___ = preHookFunc(); + retVal___ = preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -21741,13 +22230,13 @@ int HP_elemental_init(void) { } } { - retVal___ = HPMHooks.source.elemental.init(); + retVal___ = HPMHooks.source.elemental.init(minimal); } if( HPMHooks.count.HP_elemental_init_post ) { - int (*postHookFunc) (int retVal___); + int (*postHookFunc) (int retVal___, bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + retVal___ = postHookFunc(retVal___, &minimal); } } return retVal___; @@ -22217,11 +22706,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); @@ -22235,7 +22724,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); @@ -22397,11 +22886,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); @@ -22415,7 +22904,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); @@ -22455,11 +22944,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); @@ -22473,7 +22962,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); @@ -22513,11 +23002,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); @@ -22531,7 +23020,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); @@ -22566,13 +23055,13 @@ int HP_elemental_read_db(void) { return retVal___; } /* guild */ -void HP_guild_init(void) { +void HP_guild_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_guild_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22580,13 +23069,13 @@ void HP_guild_init(void) { } } { - HPMHooks.source.guild.init(); + HPMHooks.source.guild.init(minimal); } if( HPMHooks.count.HP_guild_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -22850,14 +23339,14 @@ struct guild_castle* HP_guild_mapname2gc(const char *mapname) { } return retVal___; } -struct guild_castle* HP_guild_mapindex2gc(short mapindex) { +struct guild_castle* HP_guild_mapindex2gc(short map_index) { int hIndex = 0; struct guild_castle* retVal___ = NULL; if( HPMHooks.count.HP_guild_mapindex2gc_pre ) { - struct guild_castle* (*preHookFunc) (short *mapindex); + struct guild_castle* (*preHookFunc) (short *map_index); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_mapindex2gc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_mapindex2gc_pre[hIndex].func; - retVal___ = preHookFunc(&mapindex); + retVal___ = preHookFunc(&map_index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -22865,13 +23354,13 @@ struct guild_castle* HP_guild_mapindex2gc(short mapindex) { } } { - retVal___ = HPMHooks.source.guild.mapindex2gc(mapindex); + retVal___ = HPMHooks.source.guild.mapindex2gc(map_index); } if( HPMHooks.count.HP_guild_mapindex2gc_post ) { - struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, short *mapindex); + struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, short *map_index); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_mapindex2gc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_mapindex2gc_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &mapindex); + retVal___ = postHookFunc(retVal___, &map_index); } } return retVal___; @@ -24320,11 +24809,36 @@ 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) { +void HP_guild_retrieveitembound(int char_id, int aid, int guild_id) { + int hIndex = 0; + if( HPMHooks.count.HP_guild_retrieveitembound_pre ) { + void (*preHookFunc) (int *char_id, int *aid, int *guild_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_retrieveitembound_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_guild_retrieveitembound_pre[hIndex].func; + preHookFunc(&char_id, &aid, &guild_id); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.guild.retrieveitembound(char_id, aid, guild_id); + } + if( HPMHooks.count.HP_guild_retrieveitembound_post ) { + void (*postHookFunc) (int *char_id, int *aid, int *guild_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_retrieveitembound_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_guild_retrieveitembound_post[hIndex].func; + postHookFunc(&char_id, &aid, &guild_id); + } + } + return; +} +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); @@ -24338,7 +24852,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); @@ -24488,11 +25002,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); @@ -24506,7 +25020,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); @@ -24868,13 +25382,13 @@ struct guild_storage* HP_gstorage_id2storage2(int guild_id) { } return retVal___; } -void HP_gstorage_init(void) { +void HP_gstorage_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_gstorage_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_gstorage_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -24882,13 +25396,13 @@ void HP_gstorage_init(void) { } } { - HPMHooks.source.gstorage.init(); + HPMHooks.source.gstorage.init(minimal); } if( HPMHooks.count.HP_gstorage_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_gstorage_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -25264,13 +25778,13 @@ DBData HP_gstorage_create(DBKey key, va_list args) { return retVal___; } /* homun */ -void HP_homun_init(void) { +void HP_homun_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_homun_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -25278,13 +25792,13 @@ void HP_homun_init(void) { } } { - HPMHooks.source.homun.init(); + HPMHooks.source.homun.init(minimal); } if( HPMHooks.count.HP_homun_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -25467,11 +25981,11 @@ int HP_homun_dead(struct homun_data *hd) { } return retVal___; } -int HP_homun_vaporize(struct map_session_data *sd, int flag) { +int HP_homun_vaporize(struct map_session_data *sd, enum homun_state flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_vaporize_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *flag); + int (*preHookFunc) (struct map_session_data *sd, enum homun_state *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_vaporize_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_vaporize_pre[hIndex].func; retVal___ = preHookFunc(sd, &flag); @@ -25485,7 +25999,7 @@ int HP_homun_vaporize(struct map_session_data *sd, int flag) { retVal___ = HPMHooks.source.homun.vaporize(sd, flag); } if( HPMHooks.count.HP_homun_vaporize_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum homun_state *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_vaporize_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_vaporize_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &flag); @@ -25906,11 +26420,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); @@ -25924,7 +26438,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); @@ -26444,13 +26958,13 @@ void HP_homun_delspiritball(struct homun_data *hd, int count, int type) { return; } /* instance */ -void HP_instance_init(void) { +void HP_instance_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_instance_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_instance_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26458,13 +26972,13 @@ void HP_instance_init(void) { } } { - HPMHooks.source.instance.init(); + HPMHooks.source.instance.init(minimal); } if( HPMHooks.count.HP_instance_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_instance_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_instance_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -26494,6 +27008,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; @@ -26623,6 +27162,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 ) { @@ -26774,11 +27403,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); @@ -26792,7 +27421,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); @@ -26853,11 +27482,11 @@ int HP_intif_create_pet(int account_id, int char_id, short pet_type, short pet_l } return retVal___; } -int HP_intif_broadcast(const char *mes, int len, int type) { +int HP_intif_broadcast(const char *mes, size_t len, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_broadcast_pre ) { - int (*preHookFunc) (const char *mes, int *len, int *type); + int (*preHookFunc) (const char *mes, size_t *len, int *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_broadcast_pre[hIndex].func; retVal___ = preHookFunc(mes, &len, &type); @@ -26871,7 +27500,7 @@ int HP_intif_broadcast(const char *mes, int len, int type) { retVal___ = HPMHooks.source.intif.broadcast(mes, len, type); } if( HPMHooks.count.HP_intif_broadcast_post ) { - int (*postHookFunc) (int retVal___, const char *mes, int *len, int *type); + int (*postHookFunc) (int retVal___, const char *mes, size_t *len, int *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_broadcast_post[hIndex].func; retVal___ = postHookFunc(retVal___, mes, &len, &type); @@ -26879,11 +27508,11 @@ int HP_intif_broadcast(const char *mes, int len, int type) { } return retVal___; } -int HP_intif_broadcast2(const char *mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY) { +int HP_intif_broadcast2(const char *mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_broadcast2_pre ) { - int (*preHookFunc) (const char *mes, int *len, unsigned long *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY); + int (*preHookFunc) (const char *mes, size_t *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_broadcast2_pre[hIndex].func; retVal___ = preHookFunc(mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY); @@ -26897,7 +27526,7 @@ int HP_intif_broadcast2(const char *mes, int len, unsigned long fontColor, short retVal___ = HPMHooks.source.intif.broadcast2(mes, len, fontColor, fontType, fontSize, fontAlign, fontY); } if( HPMHooks.count.HP_intif_broadcast2_post ) { - int (*postHookFunc) (int retVal___, const char *mes, int *len, unsigned long *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY); + int (*postHookFunc) (int retVal___, const char *mes, size_t *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_broadcast2_post[hIndex].func; retVal___ = postHookFunc(retVal___, mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY); @@ -26931,11 +27560,11 @@ int HP_intif_main_message(struct map_session_data *sd, const char *message) { } return retVal___; } -int HP_intif_wis_message(struct map_session_data *sd, char *nick, char *mes, int mes_len) { +int HP_intif_wis_message(struct map_session_data *sd, char *nick, char *mes, size_t mes_len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_wis_message_pre ) { - int (*preHookFunc) (struct map_session_data *sd, char *nick, char *mes, int *mes_len); + int (*preHookFunc) (struct map_session_data *sd, char *nick, char *mes, size_t *mes_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_wis_message_pre[hIndex].func; retVal___ = preHookFunc(sd, nick, mes, &mes_len); @@ -26949,7 +27578,7 @@ int HP_intif_wis_message(struct map_session_data *sd, char *nick, char *mes, int retVal___ = HPMHooks.source.intif.wis_message(sd, nick, mes, mes_len); } if( HPMHooks.count.HP_intif_wis_message_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, char *nick, char *mes, int *mes_len); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, char *nick, char *mes, size_t *mes_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_wis_message_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, nick, mes, &mes_len); @@ -26983,14 +27612,14 @@ int HP_intif_wis_message_to_gm(char *Wisp_name, int permission, char *mes) { } return retVal___; } -int HP_intif_saveregistry(struct map_session_data *sd, int type) { +int HP_intif_saveregistry(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_saveregistry_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type); + int (*preHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_saveregistry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_saveregistry_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(sd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -26998,13 +27627,13 @@ int HP_intif_saveregistry(struct map_session_data *sd, int type) { } } { - retVal___ = HPMHooks.source.intif.saveregistry(sd, type); + retVal___ = HPMHooks.source.intif.saveregistry(sd); } if( HPMHooks.count.HP_intif_saveregistry_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_saveregistry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_saveregistry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd); } } return retVal___; @@ -27503,11 +28132,11 @@ int HP_intif_guild_message(int guild_id, int account_id, const char *mes, int le } return retVal___; } -int HP_intif_guild_change_gm(int guild_id, const char *name, int len) { +int HP_intif_guild_change_gm(int guild_id, const char *name, size_t len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_guild_change_gm_pre ) { - int (*preHookFunc) (int *guild_id, const char *name, int *len); + int (*preHookFunc) (int *guild_id, const char *name, size_t *len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_change_gm_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_guild_change_gm_pre[hIndex].func; retVal___ = preHookFunc(&guild_id, name, &len); @@ -27521,7 +28150,7 @@ int HP_intif_guild_change_gm(int guild_id, const char *name, int len) { retVal___ = HPMHooks.source.intif.guild_change_gm(guild_id, name, len); } if( HPMHooks.count.HP_intif_guild_change_gm_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, const char *name, int *len); + int (*postHookFunc) (int retVal___, int *guild_id, const char *name, size_t *len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_change_gm_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_guild_change_gm_post[hIndex].func; retVal___ = postHookFunc(retVal___, &guild_id, name, &len); @@ -27763,6 +28392,31 @@ int HP_intif_guild_castle_datasave(int castle_id, int index, int value) { } return retVal___; } +void HP_intif_itembound_req(int char_id, int aid, int guild_id) { + int hIndex = 0; + if( HPMHooks.count.HP_intif_itembound_req_pre ) { + void (*preHookFunc) (int *char_id, int *aid, int *guild_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_itembound_req_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_intif_itembound_req_pre[hIndex].func; + preHookFunc(&char_id, &aid, &guild_id); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.intif.itembound_req(char_id, aid, guild_id); + } + if( HPMHooks.count.HP_intif_itembound_req_post ) { + void (*postHookFunc) (int *char_id, int *aid, int *guild_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_itembound_req_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_intif_itembound_req_post[hIndex].func; + postHookFunc(&char_id, &aid, &guild_id); + } + } + return; +} int HP_intif_request_petdata(int account_id, int char_id, int pet_id) { int hIndex = 0; int retVal___ = 0; @@ -27971,31 +28625,30 @@ int HP_intif_homunculus_requestdelete(int homun_id) { } return retVal___; } -int HP_intif_request_questlog(struct map_session_data *sd) { +void HP_intif_request_questlog(struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_intif_request_questlog_pre ) { - int (*preHookFunc) (struct map_session_data *sd); + void (*preHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_questlog_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_request_questlog_pre[hIndex].func; - retVal___ = preHookFunc(sd); + preHookFunc(sd); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.intif.request_questlog(sd); + HPMHooks.source.intif.request_questlog(sd); } if( HPMHooks.count.HP_intif_request_questlog_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); + void (*postHookFunc) (struct map_session_data *sd); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_questlog_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_request_questlog_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd); + postHookFunc(sd); } } - return retVal___; + return; } int HP_intif_quest_save(struct map_session_data *sd) { int hIndex = 0; @@ -29750,6 +30403,31 @@ void HP_intif_pAuctionBid(int fd) { } return; } +void HP_intif_pItembound_ack(int fd) { + int hIndex = 0; + if( HPMHooks.count.HP_intif_pItembound_ack_pre ) { + void (*preHookFunc) (int *fd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pItembound_ack_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_intif_pItembound_ack_pre[hIndex].func; + preHookFunc(&fd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.intif.pItembound_ack(fd); + } + if( HPMHooks.count.HP_intif_pItembound_ack_post ) { + void (*postHookFunc) (int *fd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_pItembound_ack_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_intif_pItembound_ack_post[hIndex].func; + postHookFunc(&fd); + } + } + return; +} void HP_intif_pMercenaryReceived(int fd) { int hIndex = 0; if( HPMHooks.count.HP_intif_pMercenaryReceived_pre ) { @@ -30101,13 +30779,13 @@ void HP_intif_pDeleteHomunculusOk(int fd) { return; } /* ircbot */ -void HP_ircbot_init(void) { +void HP_ircbot_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_ircbot_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_ircbot_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30115,13 +30793,13 @@ void HP_ircbot_init(void) { } } { - HPMHooks.source.ircbot.init(); + HPMHooks.source.ircbot.init(minimal); } if( HPMHooks.count.HP_ircbot_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_ircbot_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -30253,11 +30931,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); @@ -30271,7 +30949,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); @@ -30279,11 +30957,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); @@ -30297,7 +30975,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); @@ -30305,11 +30983,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); @@ -30323,7 +31001,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); @@ -30507,13 +31185,13 @@ void HP_ircbot_usernick(int fd, char *cmd, char *source, char *target, char *msg return; } /* itemdb */ -void HP_itemdb_init(void) { +void HP_itemdb_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -30521,13 +31199,13 @@ void HP_itemdb_init(void) { } } { - HPMHooks.source.itemdb.init(); + HPMHooks.source.itemdb.init(minimal); } if( HPMHooks.count.HP_itemdb_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -30607,31 +31285,6 @@ void HP_itemdb_name_constants(void) { } return; } -void HP_itemdb_force_name_constants(void) { - int hIndex = 0; - if( HPMHooks.count.HP_itemdb_force_name_constants_pre ) { - void (*preHookFunc) (void); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_force_name_constants_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_itemdb_force_name_constants_pre[hIndex].func; - preHookFunc(); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.itemdb.force_name_constants(); - } - if( HPMHooks.count.HP_itemdb_force_name_constants_post ) { - void (*postHookFunc) (void); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_force_name_constants_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_itemdb_force_name_constants_post[hIndex].func; - postHookFunc(); - } - } - return; -} void HP_itemdb_read_groups(void) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_read_groups_pre ) { @@ -30888,32 +31541,6 @@ struct item_data* HP_itemdb_search(int nameid) { } return retVal___; } -int HP_itemdb_parse_dbrow(char **str, const char *source, int line, int scriptopt) { - int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_itemdb_parse_dbrow_pre ) { - int (*preHookFunc) (char **str, const char *source, int *line, int *scriptopt); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_parse_dbrow_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_itemdb_parse_dbrow_pre[hIndex].func; - retVal___ = preHookFunc(str, source, &line, &scriptopt); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.itemdb.parse_dbrow(str, source, line, scriptopt); - } - if( HPMHooks.count.HP_itemdb_parse_dbrow_post ) { - int (*postHookFunc) (int retVal___, char **str, const char *source, int *line, int *scriptopt); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_parse_dbrow_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_itemdb_parse_dbrow_post[hIndex].func; - retVal___ = postHookFunc(retVal___, str, source, &line, &scriptopt); - } - } - return retVal___; -} struct item_data* HP_itemdb_exists(int nameid) { int hIndex = 0; struct item_data* retVal___ = NULL; @@ -31884,39 +32511,40 @@ int HP_itemdb_gendercheck(struct item_data *id) { } return retVal___; } -void HP_itemdb_re_split_atoi(char *str, int *atk, int *matk) { +int HP_itemdb_validate_entry(struct item_data *entry, int n, const char *source) { int hIndex = 0; - if( HPMHooks.count.HP_itemdb_re_split_atoi_pre ) { - void (*preHookFunc) (char *str, int *atk, int *matk); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_re_split_atoi_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_itemdb_re_split_atoi_pre[hIndex].func; - preHookFunc(str, atk, matk); + int retVal___ = 0; + if( HPMHooks.count.HP_itemdb_validate_entry_pre ) { + int (*preHookFunc) (struct item_data *entry, int *n, const char *source); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_validate_entry_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_itemdb_validate_entry_pre[hIndex].func; + retVal___ = preHookFunc(entry, &n, source); } if( *HPMforce_return ) { *HPMforce_return = false; - return; + return retVal___; } } { - HPMHooks.source.itemdb.re_split_atoi(str, atk, matk); + retVal___ = HPMHooks.source.itemdb.validate_entry(entry, n, source); } - if( HPMHooks.count.HP_itemdb_re_split_atoi_post ) { - void (*postHookFunc) (char *str, int *atk, int *matk); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_re_split_atoi_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_itemdb_re_split_atoi_post[hIndex].func; - postHookFunc(str, atk, matk); + if( HPMHooks.count.HP_itemdb_validate_entry_post ) { + int (*postHookFunc) (int retVal___, struct item_data *entry, int *n, const char *source); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_validate_entry_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_itemdb_validate_entry_post[hIndex].func; + retVal___ = postHookFunc(retVal___, entry, &n, source); } } - return; + return retVal___; } -int HP_itemdb_readdb(void) { +int HP_itemdb_readdb_sql_sub(Sql *handle, int n, const char *source) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_itemdb_readdb_pre ) { - int (*preHookFunc) (void); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_itemdb_readdb_pre[hIndex].func; - retVal___ = preHookFunc(); + if( HPMHooks.count.HP_itemdb_readdb_sql_sub_pre ) { + int (*preHookFunc) (Sql *handle, int *n, const char *source); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_sub_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_sub_pre[hIndex].func; + retVal___ = preHookFunc(handle, &n, source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31924,25 +32552,25 @@ int HP_itemdb_readdb(void) { } } { - retVal___ = HPMHooks.source.itemdb.readdb(); + retVal___ = HPMHooks.source.itemdb.readdb_sql_sub(handle, n, source); } - if( HPMHooks.count.HP_itemdb_readdb_post ) { - int (*postHookFunc) (int retVal___); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_itemdb_readdb_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + if( HPMHooks.count.HP_itemdb_readdb_sql_sub_post ) { + int (*postHookFunc) (int retVal___, Sql *handle, int *n, const char *source); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_sub_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_sub_post[hIndex].func; + retVal___ = postHookFunc(retVal___, handle, &n, source); } } return retVal___; } -int HP_itemdb_read_sqldb(void) { +int HP_itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_itemdb_read_sqldb_pre ) { - int (*preHookFunc) (void); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_sqldb_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_itemdb_read_sqldb_pre[hIndex].func; - retVal___ = preHookFunc(); + if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre ) { + int (*preHookFunc) (config_setting_t *it, int *n, const char *source); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_pre[hIndex].func; + retVal___ = preHookFunc(it, &n, source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -31950,13 +32578,65 @@ int HP_itemdb_read_sqldb(void) { } } { - retVal___ = HPMHooks.source.itemdb.read_sqldb(); + retVal___ = HPMHooks.source.itemdb.readdb_libconfig_sub(it, n, source); } - if( HPMHooks.count.HP_itemdb_read_sqldb_post ) { - int (*postHookFunc) (int retVal___); - for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_sqldb_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_itemdb_read_sqldb_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post ) { + int (*postHookFunc) (int retVal___, config_setting_t *it, int *n, const char *source); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_post[hIndex].func; + retVal___ = postHookFunc(retVal___, it, &n, source); + } + } + return retVal___; +} +int HP_itemdb_readdb_libconfig(const char *filename) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_itemdb_readdb_libconfig_pre ) { + int (*preHookFunc) (const char *filename); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_pre[hIndex].func; + retVal___ = preHookFunc(filename); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.itemdb.readdb_libconfig(filename); + } + if( HPMHooks.count.HP_itemdb_readdb_libconfig_post ) { + int (*postHookFunc) (int retVal___, const char *filename); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_post[hIndex].func; + retVal___ = postHookFunc(retVal___, filename); + } + } + return retVal___; +} +int HP_itemdb_readdb_sql(const char *tablename) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_itemdb_readdb_sql_pre ) { + int (*preHookFunc) (const char *tablename); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_pre[hIndex].func; + retVal___ = preHookFunc(tablename); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.itemdb.readdb_sql(tablename); + } + if( HPMHooks.count.HP_itemdb_readdb_sql_post ) { + int (*postHookFunc) (int retVal___, const char *tablename); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_post[hIndex].func; + retVal___ = postHookFunc(retVal___, tablename); } } return retVal___; @@ -32013,13 +32693,13 @@ int HP_itemdb_uid_load(void) { } return retVal___; } -void HP_itemdb_read(void) { +void HP_itemdb_read(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_read_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_read_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -32027,13 +32707,13 @@ void HP_itemdb_read(void) { } } { - HPMHooks.source.itemdb.read(); + HPMHooks.source.itemdb.read(minimal); } if( HPMHooks.count.HP_itemdb_read_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_read_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -32095,6 +32775,57 @@ int HP_itemdb_final_sub(DBKey key, DBData *data, va_list ap) { } return retVal___; } +void HP_itemdb_clear(bool total) { + int hIndex = 0; + if( HPMHooks.count.HP_itemdb_clear_pre ) { + void (*preHookFunc) (bool *total); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_clear_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_itemdb_clear_pre[hIndex].func; + preHookFunc(&total); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.itemdb.clear(total); + } + if( HPMHooks.count.HP_itemdb_clear_post ) { + void (*postHookFunc) (bool *total); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_clear_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_itemdb_clear_post[hIndex].func; + postHookFunc(&total); + } + } + return; +} +struct item_combo* HP_itemdb_id2combo(unsigned short id) { + int hIndex = 0; + struct item_combo* retVal___ = NULL; + if( HPMHooks.count.HP_itemdb_id2combo_pre ) { + struct item_combo* (*preHookFunc) (unsigned short *id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_id2combo_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_itemdb_id2combo_pre[hIndex].func; + retVal___ = preHookFunc(&id); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.itemdb.id2combo(id); + } + if( HPMHooks.count.HP_itemdb_id2combo_post ) { + struct item_combo* (*postHookFunc) (struct item_combo* retVal___, unsigned short *id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_id2combo_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_itemdb_id2combo_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &id); + } + } + return retVal___; +} /* logs */ void HP_logs_pick_pc(struct map_session_data *sd, e_log_pick_type type, int amount, struct item *itm, struct item_data *data) { int hIndex = 0; @@ -33291,11 +34022,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); @@ -33309,7 +34040,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); @@ -33473,11 +34204,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); @@ -33491,7 +34222,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); @@ -33499,11 +34230,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); @@ -33517,7 +34248,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); @@ -34386,14 +35117,14 @@ bool HP_map_blid_exists(int id) { } return retVal___; } -int16 HP_map_mapindex2mapid(unsigned short mapindex) { +int16 HP_map_mapindex2mapid(unsigned short map_index) { int hIndex = 0; int16 retVal___ = 0; if( HPMHooks.count.HP_map_mapindex2mapid_pre ) { - int16 (*preHookFunc) (unsigned short *mapindex); + int16 (*preHookFunc) (unsigned short *map_index); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_mapindex2mapid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_mapindex2mapid_pre[hIndex].func; - retVal___ = preHookFunc(&mapindex); + retVal___ = preHookFunc(&map_index); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34401,13 +35132,13 @@ int16 HP_map_mapindex2mapid(unsigned short mapindex) { } } { - retVal___ = HPMHooks.source.map.mapindex2mapid(mapindex); + retVal___ = HPMHooks.source.map.mapindex2mapid(map_index); } if( HPMHooks.count.HP_map_mapindex2mapid_post ) { - int16 (*postHookFunc) (int16 retVal___, unsigned short *mapindex); + int16 (*postHookFunc) (int16 retVal___, unsigned short *map_index); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_mapindex2mapid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_mapindex2mapid_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &mapindex); + retVal___ = postHookFunc(retVal___, &map_index); } } return retVal___; @@ -34464,14 +35195,14 @@ int HP_map_mapname2ipport(unsigned short name, uint32 *ip, uint16 *port) { } return retVal___; } -int HP_map_setipport(unsigned short mapindex, uint32 ip, uint16 port) { +int HP_map_setipport(unsigned short map_index, uint32 ip, uint16 port) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_setipport_pre ) { - int (*preHookFunc) (unsigned short *mapindex, uint32 *ip, uint16 *port); + int (*preHookFunc) (unsigned short *map_index, uint32 *ip, uint16 *port); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_setipport_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_setipport_pre[hIndex].func; - retVal___ = preHookFunc(&mapindex, &ip, &port); + retVal___ = preHookFunc(&map_index, &ip, &port); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34479,25 +35210,25 @@ int HP_map_setipport(unsigned short mapindex, uint32 ip, uint16 port) { } } { - retVal___ = HPMHooks.source.map.setipport(mapindex, ip, port); + retVal___ = HPMHooks.source.map.setipport(map_index, ip, port); } if( HPMHooks.count.HP_map_setipport_post ) { - int (*postHookFunc) (int retVal___, unsigned short *mapindex, uint32 *ip, uint16 *port); + int (*postHookFunc) (int retVal___, unsigned short *map_index, uint32 *ip, uint16 *port); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_setipport_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_setipport_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &mapindex, &ip, &port); + retVal___ = postHookFunc(retVal___, &map_index, &ip, &port); } } return retVal___; } -int HP_map_eraseipport(unsigned short mapindex, uint32 ip, uint16 port) { +int HP_map_eraseipport(unsigned short map_index, uint32 ip, uint16 port) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_eraseipport_pre ) { - int (*preHookFunc) (unsigned short *mapindex, uint32 *ip, uint16 *port); + int (*preHookFunc) (unsigned short *map_index, uint32 *ip, uint16 *port); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_eraseipport_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_eraseipport_pre[hIndex].func; - retVal___ = preHookFunc(&mapindex, &ip, &port); + retVal___ = preHookFunc(&map_index, &ip, &port); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -34505,13 +35236,13 @@ int HP_map_eraseipport(unsigned short mapindex, uint32 ip, uint16 port) { } } { - retVal___ = HPMHooks.source.map.eraseipport(mapindex, ip, port); + retVal___ = HPMHooks.source.map.eraseipport(map_index, ip, port); } if( HPMHooks.count.HP_map_eraseipport_post ) { - int (*postHookFunc) (int retVal___, unsigned short *mapindex, uint32 *ip, uint16 *port); + int (*postHookFunc) (int retVal___, unsigned short *map_index, uint32 *ip, uint16 *port); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_eraseipport_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_eraseipport_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &mapindex, &ip, &port); + retVal___ = postHookFunc(retVal___, &map_index, &ip, &port); } } return retVal___; @@ -35108,11 +35839,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); @@ -35126,7 +35857,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); @@ -35554,11 +36285,11 @@ int HP_map_readfromcache(struct map_data *m, char *buffer) { } return retVal___; } -int HP_map_addmap(char *mapname) { +int HP_map_addmap(const char *mapname) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_map_addmap_pre ) { - int (*preHookFunc) (char *mapname); + int (*preHookFunc) (const char *mapname); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addmap_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_addmap_pre[hIndex].func; retVal___ = preHookFunc(mapname); @@ -35572,7 +36303,7 @@ int HP_map_addmap(char *mapname) { retVal___ = HPMHooks.source.map.addmap(mapname); } if( HPMHooks.count.HP_map_addmap_post ) { - int (*postHookFunc) (int retVal___, char *mapname); + int (*postHookFunc) (int retVal___, const char *mapname); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addmap_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_addmap_post[hIndex].func; retVal___ = postHookFunc(retVal___, mapname); @@ -36195,14 +36926,14 @@ void HP_map_versionscreen(bool do_exit) { } return; } -bool HP_map_arg_next_value(const char *option, int i, int argc) { +bool HP_map_arg_next_value(const char *option, int i, int argc, bool must) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_map_arg_next_value_pre ) { - bool (*preHookFunc) (const char *option, int *i, int *argc); + bool (*preHookFunc) (const char *option, int *i, int *argc, bool *must); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_arg_next_value_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_map_arg_next_value_pre[hIndex].func; - retVal___ = preHookFunc(option, &i, &argc); + retVal___ = preHookFunc(option, &i, &argc, &must); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36210,13 +36941,13 @@ bool HP_map_arg_next_value(const char *option, int i, int argc) { } } { - retVal___ = HPMHooks.source.map.arg_next_value(option, i, argc); + retVal___ = HPMHooks.source.map.arg_next_value(option, i, argc, must); } if( HPMHooks.count.HP_map_arg_next_value_post ) { - bool (*postHookFunc) (bool retVal___, const char *option, int *i, int *argc); + bool (*postHookFunc) (bool retVal___, const char *option, int *i, int *argc, bool *must); for(hIndex = 0; hIndex < HPMHooks.count.HP_map_arg_next_value_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_map_arg_next_value_post[hIndex].func; - retVal___ = postHookFunc(retVal___, option, &i, &argc); + retVal___ = postHookFunc(retVal___, option, &i, &argc, &must); } } return retVal___; @@ -36271,6 +37002,109 @@ 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___; +} +struct map_zone_data* HP_map_merge_zone(struct map_zone_data *main, struct map_zone_data *other) { + int hIndex = 0; + struct map_zone_data* retVal___ = NULL; + if( HPMHooks.count.HP_map_merge_zone_pre ) { + struct map_zone_data* (*preHookFunc) (struct map_zone_data *main, struct map_zone_data *other); + for(hIndex = 0; hIndex < HPMHooks.count.HP_map_merge_zone_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_map_merge_zone_pre[hIndex].func; + retVal___ = preHookFunc(main, other); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.map.merge_zone(main, other); + } + if( HPMHooks.count.HP_map_merge_zone_post ) { + struct map_zone_data* (*postHookFunc) (struct map_zone_data* retVal___, struct map_zone_data *main, struct map_zone_data *other); + for(hIndex = 0; hIndex < HPMHooks.count.HP_map_merge_zone_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_map_merge_zone_post[hIndex].func; + retVal___ = postHookFunc(retVal___, main, other); + } + } + return retVal___; +} /* mapit */ struct s_mapiterator* HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types) { int hIndex = 0; @@ -36504,11 +37338,11 @@ void HP_mapreg_final(void) { } return; } -int HP_mapreg_readreg(int uid) { +int HP_mapreg_readreg(int64 uid) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapreg_readreg_pre ) { - int (*preHookFunc) (int *uid); + int (*preHookFunc) (int64 *uid); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_readreg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapreg_readreg_pre[hIndex].func; retVal___ = preHookFunc(&uid); @@ -36522,7 +37356,7 @@ int HP_mapreg_readreg(int uid) { retVal___ = HPMHooks.source.mapreg.readreg(uid); } if( HPMHooks.count.HP_mapreg_readreg_post ) { - int (*postHookFunc) (int retVal___, int *uid); + int (*postHookFunc) (int retVal___, int64 *uid); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_readreg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapreg_readreg_post[hIndex].func; retVal___ = postHookFunc(retVal___, &uid); @@ -36530,11 +37364,11 @@ int HP_mapreg_readreg(int uid) { } return retVal___; } -char* HP_mapreg_readregstr(int uid) { +char* HP_mapreg_readregstr(int64 uid) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_mapreg_readregstr_pre ) { - char* (*preHookFunc) (int *uid); + char* (*preHookFunc) (int64 *uid); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_readregstr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapreg_readregstr_pre[hIndex].func; retVal___ = preHookFunc(&uid); @@ -36548,7 +37382,7 @@ char* HP_mapreg_readregstr(int uid) { retVal___ = HPMHooks.source.mapreg.readregstr(uid); } if( HPMHooks.count.HP_mapreg_readregstr_post ) { - char* (*postHookFunc) (char* retVal___, int *uid); + char* (*postHookFunc) (char* retVal___, int64 *uid); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_readregstr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapreg_readregstr_post[hIndex].func; retVal___ = postHookFunc(retVal___, &uid); @@ -36556,11 +37390,11 @@ char* HP_mapreg_readregstr(int uid) { } return retVal___; } -bool HP_mapreg_setreg(int uid, int val) { +bool HP_mapreg_setreg(int64 uid, int val) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapreg_setreg_pre ) { - bool (*preHookFunc) (int *uid, int *val); + bool (*preHookFunc) (int64 *uid, int *val); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_setreg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapreg_setreg_pre[hIndex].func; retVal___ = preHookFunc(&uid, &val); @@ -36574,7 +37408,7 @@ bool HP_mapreg_setreg(int uid, int val) { retVal___ = HPMHooks.source.mapreg.setreg(uid, val); } if( HPMHooks.count.HP_mapreg_setreg_post ) { - bool (*postHookFunc) (bool retVal___, int *uid, int *val); + bool (*postHookFunc) (bool retVal___, int64 *uid, int *val); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_setreg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapreg_setreg_post[hIndex].func; retVal___ = postHookFunc(retVal___, &uid, &val); @@ -36582,11 +37416,11 @@ bool HP_mapreg_setreg(int uid, int val) { } return retVal___; } -bool HP_mapreg_setregstr(int uid, const char *str) { +bool HP_mapreg_setregstr(int64 uid, const char *str) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapreg_setregstr_pre ) { - bool (*preHookFunc) (int *uid, const char *str); + bool (*preHookFunc) (int64 *uid, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_setregstr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapreg_setregstr_pre[hIndex].func; retVal___ = preHookFunc(&uid, str); @@ -36600,7 +37434,7 @@ bool HP_mapreg_setregstr(int uid, const char *str) { retVal___ = HPMHooks.source.mapreg.setregstr(uid, str); } if( HPMHooks.count.HP_mapreg_setregstr_post ) { - bool (*postHookFunc) (bool retVal___, int *uid, const char *str); + bool (*postHookFunc) (bool retVal___, int64 *uid, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_setregstr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapreg_setregstr_post[hIndex].func; retVal___ = postHookFunc(retVal___, &uid, str); @@ -36658,11 +37492,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); @@ -36676,7 +37510,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); @@ -36736,13 +37570,13 @@ bool HP_mapreg_config_read(const char *w1, const char *w2) { return retVal___; } /* mercenary */ -void HP_mercenary_init(void) { +void HP_mercenary_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_mercenary_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36750,13 +37584,13 @@ void HP_mercenary_init(void) { } } { - HPMHooks.source.mercenary.init(); + HPMHooks.source.mercenary.init(minimal); } if( HPMHooks.count.HP_mercenary_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -37305,11 +38139,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); @@ -37323,7 +38157,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); @@ -37384,14 +38218,14 @@ bool HP_mercenary_read_skill_db_sub(char *str[], int columns, int current) { return retVal___; } /* mob */ -int HP_mob_init(void) { +int HP_mob_init(bool mimimal) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_init_pre ) { - int (*preHookFunc) (void); + int (*preHookFunc) (bool *mimimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_init_pre[hIndex].func; - retVal___ = preHookFunc(); + retVal___ = preHookFunc(&mimimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37399,13 +38233,13 @@ int HP_mob_init(void) { } } { - retVal___ = HPMHooks.source.mob.init(); + retVal___ = HPMHooks.source.mob.init(mimimal); } if( HPMHooks.count.HP_mob_init_post ) { - int (*postHookFunc) (int retVal___); + int (*postHookFunc) (int retVal___, bool *mimimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + retVal___ = postHookFunc(retVal___, &mimimal); } } return retVal___; @@ -37539,11 +38373,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); @@ -37557,7 +38391,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); @@ -37617,14 +38451,14 @@ int HP_mob_db_searchname(const char *str) { } return retVal___; } -int HP_mob_db_searchname_array_sub(struct mob_db *mob, const char *str, int flag) { +int HP_mob_db_searchname_array_sub(struct mob_db *monster, const char *str, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_db_searchname_array_sub_pre ) { - int (*preHookFunc) (struct mob_db *mob, const char *str, int *flag); + int (*preHookFunc) (struct mob_db *monster, const char *str, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_searchname_array_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_db_searchname_array_sub_pre[hIndex].func; - retVal___ = preHookFunc(mob, str, &flag); + retVal___ = preHookFunc(monster, str, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -37632,13 +38466,13 @@ int HP_mob_db_searchname_array_sub(struct mob_db *mob, const char *str, int flag } } { - retVal___ = HPMHooks.source.mob.db_searchname_array_sub(mob, str, flag); + retVal___ = HPMHooks.source.mob.db_searchname_array_sub(monster, str, flag); } if( HPMHooks.count.HP_mob_db_searchname_array_sub_post ) { - int (*postHookFunc) (int retVal___, struct mob_db *mob, const char *str, int *flag); + int (*postHookFunc) (int retVal___, struct mob_db *monster, const char *str, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_searchname_array_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_db_searchname_array_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, mob, str, &flag); + retVal___ = postHookFunc(retVal___, monster, str, &flag); } } return retVal___; @@ -38063,11 +38897,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); @@ -38081,7 +38915,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); @@ -38385,11 +39219,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); @@ -38403,7 +39237,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); @@ -38411,11 +39245,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); @@ -38429,7 +39263,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); @@ -38437,11 +39271,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); @@ -38455,7 +39289,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); @@ -38489,11 +39323,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); @@ -38507,7 +39341,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); @@ -38611,11 +39445,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); @@ -38629,7 +39463,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); @@ -38637,11 +39471,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); @@ -38655,7 +39489,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); @@ -38715,11 +39549,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); @@ -38733,7 +39567,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); @@ -38766,11 +39600,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); @@ -38784,7 +39618,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); @@ -38850,11 +39684,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); @@ -38868,7 +39702,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); @@ -39364,11 +40198,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); @@ -39382,7 +40216,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); @@ -39390,11 +40224,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); @@ -39408,7 +40242,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); @@ -39648,6 +40482,31 @@ int HP_mob_read_sqldb(void) { } return retVal___; } +void HP_mob_name_constants(void) { + int hIndex = 0; + if( HPMHooks.count.HP_mob_name_constants_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_name_constants_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_mob_name_constants_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.mob.name_constants(); + } + if( HPMHooks.count.HP_mob_name_constants_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_name_constants_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_mob_name_constants_post[hIndex].func; + postHookFunc(); + } + } + return; +} bool HP_mob_readdb_mobavail(char *str[], int columns, int current) { int hIndex = 0; bool retVal___ = false; @@ -39880,13 +40739,13 @@ bool HP_mob_readdb_itemratio(char *str[], int columns, int current) { } return retVal___; } -void HP_mob_load(void) { +void HP_mob_load(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_mob_load_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_load_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_load_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39894,13 +40753,13 @@ void HP_mob_load(void) { } } { - HPMHooks.source.mob.load(); + HPMHooks.source.mob.load(minimal); } if( HPMHooks.count.HP_mob_load_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_load_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_load_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -39931,14 +40790,14 @@ void HP_mob_clear_spawninfo(void) { return; } /* npc */ -int HP_npc_init(void) { +int HP_npc_init(bool minimal) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_init_pre ) { - int (*preHookFunc) (void); + int (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_init_pre[hIndex].func; - retVal___ = preHookFunc(); + retVal___ = preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -39946,13 +40805,13 @@ int HP_npc_init(void) { } } { - retVal___ = HPMHooks.source.npc.init(); + retVal___ = HPMHooks.source.npc.init(minimal); } if( HPMHooks.count.HP_npc_init_post ) { - int (*postHookFunc) (int retVal___); + int (*postHookFunc) (int retVal___, bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + retVal___ = postHookFunc(retVal___, &minimal); } } return retVal___; @@ -40449,11 +41308,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); @@ -40467,7 +41326,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); @@ -40526,11 +41385,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); @@ -40544,7 +41403,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); @@ -40629,11 +41488,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); @@ -40647,7 +41506,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); @@ -41427,6 +42286,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; @@ -41556,14 +42467,14 @@ const char* HP_npc_skip_script(const char *start, const char *buffer, const char } return retVal___; } -const char* HP_npc_parse_script(char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, bool runOnInit) { +const char* HP_npc_parse_script(char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int options) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_npc_parse_script_pre ) { - const char* (*preHookFunc) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, bool *runOnInit); + const char* (*preHookFunc) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *options); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_script_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parse_script_pre[hIndex].func; - retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, &runOnInit); + retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -41571,13 +42482,13 @@ const char* HP_npc_parse_script(char *w1, char *w2, char *w3, char *w4, const ch } } { - retVal___ = HPMHooks.source.npc.parse_script(w1, w2, w3, w4, start, buffer, filepath, runOnInit); + retVal___ = HPMHooks.source.npc.parse_script(w1, w2, w3, w4, start, buffer, filepath, options); } if( HPMHooks.count.HP_npc_parse_script_post ) { - const char* (*postHookFunc) (const char* retVal___, char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, bool *runOnInit); + const char* (*postHookFunc) (const char* retVal___, char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *options); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_script_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_parse_script_post[hIndex].func; - retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, &runOnInit); + retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, &options); } } return retVal___; @@ -41920,30 +42831,31 @@ const char* HP_npc_parse_mapflag(char *w1, char *w2, char *w3, char *w4, const c } return retVal___; } -void HP_npc_parsesrcfile(const char *filepath, bool runOnInit) { +int HP_npc_parsesrcfile(const char *filepath, bool runOnInit) { int hIndex = 0; + int retVal___ = 0; if( HPMHooks.count.HP_npc_parsesrcfile_pre ) { - void (*preHookFunc) (const char *filepath, bool *runOnInit); + int (*preHookFunc) (const char *filepath, bool *runOnInit); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parsesrcfile_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_parsesrcfile_pre[hIndex].func; - preHookFunc(filepath, &runOnInit); + retVal___ = preHookFunc(filepath, &runOnInit); } if( *HPMforce_return ) { *HPMforce_return = false; - return; + return retVal___; } } { - HPMHooks.source.npc.parsesrcfile(filepath, runOnInit); + retVal___ = HPMHooks.source.npc.parsesrcfile(filepath, runOnInit); } if( HPMHooks.count.HP_npc_parsesrcfile_post ) { - void (*postHookFunc) (const char *filepath, bool *runOnInit); + int (*postHookFunc) (int retVal___, const char *filepath, bool *runOnInit); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parsesrcfile_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_parsesrcfile_post[hIndex].func; - postHookFunc(filepath, &runOnInit); + retVal___ = postHookFunc(retVal___, filepath, &runOnInit); } } - return; + return retVal___; } int HP_npc_script_event(struct map_session_data *sd, enum npce_event type) { int hIndex = 0; @@ -42187,11 +43099,239 @@ void HP_npc_debug_warps(void) { } return; } -int HP_npc_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data) { +void HP_npc_trader_count_funds(struct npc_data *nd, struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_npc_trader_count_funds_pre ) { + void (*preHookFunc) (struct npc_data *nd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_count_funds_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_trader_count_funds_pre[hIndex].func; + preHookFunc(nd, sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.npc.trader_count_funds(nd, sd); + } + if( HPMHooks.count.HP_npc_trader_count_funds_post ) { + void (*postHookFunc) (struct npc_data *nd, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_count_funds_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_trader_count_funds_post[hIndex].func; + postHookFunc(nd, sd); + } + } + return; +} +bool HP_npc_trader_pay(struct npc_data *nd, struct map_session_data *sd, int price, int points) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_npc_trader_pay_pre ) { + bool (*preHookFunc) (struct npc_data *nd, struct map_session_data *sd, int *price, int *points); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_pay_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_trader_pay_pre[hIndex].func; + retVal___ = preHookFunc(nd, sd, &price, &points); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.npc.trader_pay(nd, sd, price, points); + } + if( HPMHooks.count.HP_npc_trader_pay_post ) { + bool (*postHookFunc) (bool retVal___, struct npc_data *nd, struct map_session_data *sd, int *price, int *points); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_pay_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_trader_pay_post[hIndex].func; + retVal___ = postHookFunc(retVal___, nd, sd, &price, &points); + } + } + return retVal___; +} +void HP_npc_trader_update(int master) { + int hIndex = 0; + if( HPMHooks.count.HP_npc_trader_update_pre ) { + void (*preHookFunc) (int *master); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_update_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_trader_update_pre[hIndex].func; + preHookFunc(&master); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.npc.trader_update(master); + } + if( HPMHooks.count.HP_npc_trader_update_post ) { + void (*postHookFunc) (int *master); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_update_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_trader_update_post[hIndex].func; + postHookFunc(&master); + } + } + return; +} +int HP_npc_market_buylist(struct map_session_data *sd, unsigned short list_size, struct packet_npc_market_purchase *p) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_npc_market_buylist_pre ) { + int (*preHookFunc) (struct map_session_data *sd, unsigned short *list_size, struct packet_npc_market_purchase *p); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_buylist_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_market_buylist_pre[hIndex].func; + retVal___ = preHookFunc(sd, &list_size, p); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.npc.market_buylist(sd, list_size, p); + } + if( HPMHooks.count.HP_npc_market_buylist_post ) { + int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short *list_size, struct packet_npc_market_purchase *p); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_buylist_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_market_buylist_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sd, &list_size, p); + } + } + return retVal___; +} +bool HP_npc_trader_open(struct map_session_data *sd, struct npc_data *nd) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_npc_trader_open_pre ) { + bool (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_open_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_trader_open_pre[hIndex].func; + retVal___ = preHookFunc(sd, nd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.npc.trader_open(sd, nd); + } + if( HPMHooks.count.HP_npc_trader_open_post ) { + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, struct npc_data *nd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_trader_open_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_trader_open_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sd, nd); + } + } + return retVal___; +} +void HP_npc_market_fromsql(void) { + int hIndex = 0; + if( HPMHooks.count.HP_npc_market_fromsql_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_fromsql_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_market_fromsql_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.npc.market_fromsql(); + } + if( HPMHooks.count.HP_npc_market_fromsql_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_fromsql_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_market_fromsql_post[hIndex].func; + postHookFunc(); + } + } + return; +} +void HP_npc_market_tosql(struct npc_data *nd, unsigned short index) { + int hIndex = 0; + if( HPMHooks.count.HP_npc_market_tosql_pre ) { + void (*preHookFunc) (struct npc_data *nd, unsigned short *index); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_tosql_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_market_tosql_pre[hIndex].func; + preHookFunc(nd, &index); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.npc.market_tosql(nd, index); + } + if( HPMHooks.count.HP_npc_market_tosql_post ) { + void (*postHookFunc) (struct npc_data *nd, unsigned short *index); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_tosql_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_market_tosql_post[hIndex].func; + postHookFunc(nd, &index); + } + } + return; +} +void HP_npc_market_delfromsql(struct npc_data *nd, unsigned short index) { + int hIndex = 0; + if( HPMHooks.count.HP_npc_market_delfromsql_pre ) { + void (*preHookFunc) (struct npc_data *nd, unsigned short *index); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_delfromsql_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_market_delfromsql_pre[hIndex].func; + preHookFunc(nd, &index); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.npc.market_delfromsql(nd, index); + } + if( HPMHooks.count.HP_npc_market_delfromsql_post ) { + void (*postHookFunc) (struct npc_data *nd, unsigned short *index); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_delfromsql_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_market_delfromsql_post[hIndex].func; + postHookFunc(nd, &index); + } + } + return; +} +void HP_npc_market_delfromsql_sub(const char *npcname, unsigned short index) { + int hIndex = 0; + if( HPMHooks.count.HP_npc_market_delfromsql_sub_pre ) { + void (*preHookFunc) (const char *npcname, unsigned short *index); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_delfromsql_sub_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_market_delfromsql_sub_pre[hIndex].func; + preHookFunc(npcname, &index); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.npc.market_delfromsql_sub(npcname, index); + } + if( HPMHooks.count.HP_npc_market_delfromsql_sub_post ) { + void (*postHookFunc) (const char *npcname, unsigned short *index); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_delfromsql_sub_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_market_delfromsql_sub_post[hIndex].func; + postHookFunc(npcname, &index); + } + } + return; +} +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); @@ -42205,7 +43345,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); @@ -42214,13 +43354,13 @@ int HP_npc_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t dat return retVal___; } /* party */ -void HP_party_init(void) { +void HP_party_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_party_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -42228,13 +43368,13 @@ void HP_party_init(void) { } } { - HPMHooks.source.party.init(); + HPMHooks.source.party.init(minimal); } if( HPMHooks.count.HP_party_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -43097,6 +44237,38 @@ int HP_party_sub_count(struct block_list *bl, va_list ap) { } return retVal___; } +int HP_party_sub_count_chorus(struct block_list *bl, va_list ap) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_party_sub_count_chorus_pre ) { + int (*preHookFunc) (struct block_list *bl, va_list ap); + for(hIndex = 0; hIndex < HPMHooks.count.HP_party_sub_count_chorus_pre; hIndex++ ) { + va_list ap___copy; va_copy(ap___copy, ap); + preHookFunc = HPMHooks.list.HP_party_sub_count_chorus_pre[hIndex].func; + retVal___ = preHookFunc(bl, ap___copy); + va_end(ap___copy); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + va_list ap___copy; va_copy(ap___copy, ap); + retVal___ = HPMHooks.source.party.sub_count_chorus(bl, ap___copy); + va_end(ap___copy); + } + if( HPMHooks.count.HP_party_sub_count_chorus_post ) { + int (*postHookFunc) (int retVal___, struct block_list *bl, va_list ap); + for(hIndex = 0; hIndex < HPMHooks.count.HP_party_sub_count_chorus_post; hIndex++ ) { + va_list ap___copy; va_copy(ap___copy, ap); + postHookFunc = HPMHooks.list.HP_party_sub_count_chorus_post[hIndex].func; + retVal___ = postHookFunc(retVal___, bl, ap___copy); + va_end(ap___copy); + } + } + return retVal___; +} void HP_party_booking_register(struct map_session_data *sd, short level, short mapid, short *job) { int hIndex = 0; if( HPMHooks.count.HP_party_booking_register_pre ) { @@ -43305,11 +44477,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); @@ -43323,7 +44495,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); @@ -43596,14 +44768,298 @@ unsigned int HP_path_distance(int dx, int dy) { } return retVal___; } +/* pcg */ +void HP_pcg_init(void) { + int hIndex = 0; + if( HPMHooks.count.HP_pcg_init_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_init_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_init_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pcg.init(); + } + if( HPMHooks.count.HP_pcg_init_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_init_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_init_post[hIndex].func; + postHookFunc(); + } + } + return; +} +void HP_pcg_final(void) { + int hIndex = 0; + if( HPMHooks.count.HP_pcg_final_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_final_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_final_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pcg.final(); + } + if( HPMHooks.count.HP_pcg_final_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_final_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_final_post[hIndex].func; + postHookFunc(); + } + } + return; +} +void HP_pcg_reload(void) { + int hIndex = 0; + if( HPMHooks.count.HP_pcg_reload_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_reload_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_reload_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pcg.reload(); + } + if( HPMHooks.count.HP_pcg_reload_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_reload_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_reload_post[hIndex].func; + postHookFunc(); + } + } + return; +} +GroupSettings* HP_pcg_get_dummy_group(void) { + int hIndex = 0; + GroupSettings* retVal___ = NULL; + if( HPMHooks.count.HP_pcg_get_dummy_group_pre ) { + GroupSettings* (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_dummy_group_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_get_dummy_group_pre[hIndex].func; + retVal___ = preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pcg.get_dummy_group(); + } + if( HPMHooks.count.HP_pcg_get_dummy_group_post ) { + GroupSettings* (*postHookFunc) (GroupSettings* retVal___); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_dummy_group_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_get_dummy_group_post[hIndex].func; + retVal___ = postHookFunc(retVal___); + } + } + return retVal___; +} +bool HP_pcg_exists(int group_id) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_pcg_exists_pre ) { + bool (*preHookFunc) (int *group_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_exists_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_exists_pre[hIndex].func; + retVal___ = preHookFunc(&group_id); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pcg.exists(group_id); + } + if( HPMHooks.count.HP_pcg_exists_post ) { + bool (*postHookFunc) (bool retVal___, int *group_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_exists_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_exists_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &group_id); + } + } + return retVal___; +} +GroupSettings* HP_pcg_id2group(int group_id) { + int hIndex = 0; + GroupSettings* retVal___ = NULL; + if( HPMHooks.count.HP_pcg_id2group_pre ) { + GroupSettings* (*preHookFunc) (int *group_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_id2group_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_id2group_pre[hIndex].func; + retVal___ = preHookFunc(&group_id); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pcg.id2group(group_id); + } + if( HPMHooks.count.HP_pcg_id2group_post ) { + GroupSettings* (*postHookFunc) (GroupSettings* retVal___, int *group_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_id2group_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_id2group_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &group_id); + } + } + return retVal___; +} +bool HP_pcg_has_permission(GroupSettings *group, unsigned int permission) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_pcg_has_permission_pre ) { + bool (*preHookFunc) (GroupSettings *group, unsigned int *permission); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_has_permission_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_has_permission_pre[hIndex].func; + retVal___ = preHookFunc(group, &permission); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pcg.has_permission(group, permission); + } + if( HPMHooks.count.HP_pcg_has_permission_post ) { + bool (*postHookFunc) (bool retVal___, GroupSettings *group, unsigned int *permission); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_has_permission_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_has_permission_post[hIndex].func; + retVal___ = postHookFunc(retVal___, group, &permission); + } + } + return retVal___; +} +bool HP_pcg_should_log_commands(GroupSettings *group) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_pcg_should_log_commands_pre ) { + bool (*preHookFunc) (GroupSettings *group); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_should_log_commands_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_should_log_commands_pre[hIndex].func; + retVal___ = preHookFunc(group); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pcg.should_log_commands(group); + } + if( HPMHooks.count.HP_pcg_should_log_commands_post ) { + bool (*postHookFunc) (bool retVal___, GroupSettings *group); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_should_log_commands_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_should_log_commands_post[hIndex].func; + retVal___ = postHookFunc(retVal___, group); + } + } + return retVal___; +} +const char* HP_pcg_get_name(GroupSettings *group) { + int hIndex = 0; + const char* retVal___ = NULL; + if( HPMHooks.count.HP_pcg_get_name_pre ) { + const char* (*preHookFunc) (GroupSettings *group); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_name_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_get_name_pre[hIndex].func; + retVal___ = preHookFunc(group); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pcg.get_name(group); + } + if( HPMHooks.count.HP_pcg_get_name_post ) { + const char* (*postHookFunc) (const char* retVal___, GroupSettings *group); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_name_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_get_name_post[hIndex].func; + retVal___ = postHookFunc(retVal___, group); + } + } + return retVal___; +} +int HP_pcg_get_level(GroupSettings *group) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_pcg_get_level_pre ) { + int (*preHookFunc) (GroupSettings *group); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_level_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_get_level_pre[hIndex].func; + retVal___ = preHookFunc(group); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pcg.get_level(group); + } + if( HPMHooks.count.HP_pcg_get_level_post ) { + int (*postHookFunc) (int retVal___, GroupSettings *group); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_level_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_get_level_post[hIndex].func; + retVal___ = postHookFunc(retVal___, group); + } + } + return retVal___; +} +int HP_pcg_get_idx(GroupSettings *group) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_pcg_get_idx_pre ) { + int (*preHookFunc) (GroupSettings *group); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_idx_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pcg_get_idx_pre[hIndex].func; + retVal___ = preHookFunc(group); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pcg.get_idx(group); + } + if( HPMHooks.count.HP_pcg_get_idx_post ) { + int (*postHookFunc) (int retVal___, GroupSettings *group); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_idx_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pcg_get_idx_post[hIndex].func; + retVal___ = postHookFunc(retVal___, group); + } + } + return retVal___; +} /* pc */ -void HP_pc_init(void) { +void HP_pc_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_pc_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -43611,13 +45067,13 @@ void HP_pc_init(void) { } } { - HPMHooks.source.pc.init(); + HPMHooks.source.pc.init(minimal); } if( HPMHooks.count.HP_pc_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -43699,13 +45155,13 @@ int HP_pc_class2idx(int class_) { } return retVal___; } -int HP_pc_get_group_level(struct map_session_data *sd) { +bool HP_pc_can_give_items(struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_pc_get_group_level_pre ) { - int (*preHookFunc) (struct map_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_group_level_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_pc_get_group_level_pre[hIndex].func; + bool retVal___ = false; + if( HPMHooks.count.HP_pc_can_give_items_pre ) { + bool (*preHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_give_items_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_can_give_items_pre[hIndex].func; retVal___ = preHookFunc(sd); } if( *HPMforce_return ) { @@ -43714,24 +45170,24 @@ int HP_pc_get_group_level(struct map_session_data *sd) { } } { - retVal___ = HPMHooks.source.pc.get_group_level(sd); + retVal___ = HPMHooks.source.pc.can_give_items(sd); } - if( HPMHooks.count.HP_pc_get_group_level_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_group_level_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_pc_get_group_level_post[hIndex].func; + if( HPMHooks.count.HP_pc_can_give_items_post ) { + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_give_items_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_can_give_items_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); } } return retVal___; } -bool HP_pc_can_give_items(struct map_session_data *sd) { +bool HP_pc_can_give_bound_items(struct map_session_data *sd) { int hIndex = 0; bool retVal___ = false; - if( HPMHooks.count.HP_pc_can_give_items_pre ) { + if( HPMHooks.count.HP_pc_can_give_bound_items_pre ) { bool (*preHookFunc) (struct map_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_give_items_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_pc_can_give_items_pre[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_give_bound_items_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_can_give_bound_items_pre[hIndex].func; retVal___ = preHookFunc(sd); } if( *HPMforce_return ) { @@ -43740,12 +45196,12 @@ bool HP_pc_can_give_items(struct map_session_data *sd) { } } { - retVal___ = HPMHooks.source.pc.can_give_items(sd); + retVal___ = HPMHooks.source.pc.can_give_bound_items(sd); } - if( HPMHooks.count.HP_pc_can_give_items_post ) { + if( HPMHooks.count.HP_pc_can_give_bound_items_post ) { bool (*postHookFunc) (bool retVal___, struct map_session_data *sd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_give_items_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_pc_can_give_items_post[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_can_give_bound_items_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_can_give_bound_items_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); } } @@ -43777,32 +45233,6 @@ bool HP_pc_can_use_command(struct map_session_data *sd, const char *command) { } return retVal___; } -bool HP_pc_has_permission(struct map_session_data *sd, enum e_pc_permission permission) { - int hIndex = 0; - bool retVal___ = false; - if( HPMHooks.count.HP_pc_has_permission_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, enum e_pc_permission *permission); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_has_permission_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_pc_has_permission_pre[hIndex].func; - retVal___ = preHookFunc(sd, &permission); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.pc.has_permission(sd, permission); - } - if( HPMHooks.count.HP_pc_has_permission_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, enum e_pc_permission *permission); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_has_permission_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_pc_has_permission_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &permission); - } - } - return retVal___; -} int HP_pc_set_group(struct map_session_data *sd, int group_id) { int hIndex = 0; int retVal___ = 0; @@ -44295,14 +45725,14 @@ int HP_pc_clean_skilltree(struct map_session_data *sd) { } return retVal___; } -int HP_pc_setpos(struct map_session_data *sd, unsigned short mapindex, int x, int y, clr_type clrtype) { +int HP_pc_setpos(struct map_session_data *sd, unsigned short map_index, int x, int y, clr_type clrtype) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setpos_pre ) { - int (*preHookFunc) (struct map_session_data *sd, unsigned short *mapindex, int *x, int *y, clr_type *clrtype); + int (*preHookFunc) (struct map_session_data *sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setpos_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setpos_pre[hIndex].func; - retVal___ = preHookFunc(sd, &mapindex, &x, &y, &clrtype); + retVal___ = preHookFunc(sd, &map_index, &x, &y, &clrtype); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44310,25 +45740,25 @@ int HP_pc_setpos(struct map_session_data *sd, unsigned short mapindex, int x, in } } { - retVal___ = HPMHooks.source.pc.setpos(sd, mapindex, x, y, clrtype); + retVal___ = HPMHooks.source.pc.setpos(sd, map_index, x, y, clrtype); } if( HPMHooks.count.HP_pc_setpos_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short *mapindex, int *x, int *y, clr_type *clrtype); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setpos_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setpos_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &mapindex, &x, &y, &clrtype); + retVal___ = postHookFunc(retVal___, sd, &map_index, &x, &y, &clrtype); } } return retVal___; } -int HP_pc_setsavepoint(struct map_session_data *sd, short mapindex, int x, int y) { +int HP_pc_setsavepoint(struct map_session_data *sd, short map_index, int x, int y) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setsavepoint_pre ) { - int (*preHookFunc) (struct map_session_data *sd, short *mapindex, int *x, int *y); + int (*preHookFunc) (struct map_session_data *sd, short *map_index, int *x, int *y); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setsavepoint_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setsavepoint_pre[hIndex].func; - retVal___ = preHookFunc(sd, &mapindex, &x, &y); + retVal___ = preHookFunc(sd, &map_index, &x, &y); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -44336,13 +45766,13 @@ int HP_pc_setsavepoint(struct map_session_data *sd, short mapindex, int x, int y } } { - retVal___ = HPMHooks.source.pc.setsavepoint(sd, mapindex, x, y); + retVal___ = HPMHooks.source.pc.setsavepoint(sd, map_index, x, y); } if( HPMHooks.count.HP_pc_setsavepoint_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, short *mapindex, int *x, int *y); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, short *map_index, int *x, int *y); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setsavepoint_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setsavepoint_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &mapindex, &x, &y); + retVal___ = postHookFunc(retVal___, sd, &map_index, &x, &y); } } return retVal___; @@ -44971,11 +46401,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); @@ -44989,7 +46419,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); @@ -45647,14 +47077,40 @@ int HP_pc_need_status_point(struct map_session_data *sd, int type, int val) { } return retVal___; } -int HP_pc_statusup(struct map_session_data *sd, int type) { +int HP_pc_maxparameterincrease(struct map_session_data *sd, int type) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_pc_statusup_pre ) { + if( HPMHooks.count.HP_pc_maxparameterincrease_pre ) { int (*preHookFunc) (struct map_session_data *sd, int *type); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_maxparameterincrease_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_maxparameterincrease_pre[hIndex].func; + retVal___ = preHookFunc(sd, &type); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pc.maxparameterincrease(sd, type); + } + if( HPMHooks.count.HP_pc_maxparameterincrease_post ) { + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_maxparameterincrease_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_maxparameterincrease_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sd, &type); + } + } + return retVal___; +} +bool HP_pc_statusup(struct map_session_data *sd, int type, int increase) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_pc_statusup_pre ) { + bool (*preHookFunc) (struct map_session_data *sd, int *type, int *increase); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_statusup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_statusup_pre[hIndex].func; - retVal___ = preHookFunc(sd, &type); + retVal___ = preHookFunc(sd, &type, &increase); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -45662,13 +47118,13 @@ int HP_pc_statusup(struct map_session_data *sd, int type) { } } { - retVal___ = HPMHooks.source.pc.statusup(sd, type); + retVal___ = HPMHooks.source.pc.statusup(sd, type, increase); } if( HPMHooks.count.HP_pc_statusup_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *type, int *increase); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_statusup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_statusup_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &type); + retVal___ = postHookFunc(retVal___, sd, &type, &increase); } } return retVal___; @@ -46476,11 +47932,11 @@ int HP_pc_setparam(struct map_session_data *sd, int type, int val) { } return retVal___; } -int HP_pc_readreg(struct map_session_data *sd, int reg) { +int HP_pc_readreg(struct map_session_data *sd, int64 reg) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_readreg_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *reg); + int (*preHookFunc) (struct map_session_data *sd, int64 *reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readreg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readreg_pre[hIndex].func; retVal___ = preHookFunc(sd, ®); @@ -46494,7 +47950,7 @@ int HP_pc_readreg(struct map_session_data *sd, int reg) { retVal___ = HPMHooks.source.pc.readreg(sd, reg); } if( HPMHooks.count.HP_pc_readreg_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *reg); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 *reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readreg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readreg_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, ®); @@ -46502,37 +47958,36 @@ int HP_pc_readreg(struct map_session_data *sd, int reg) { } return retVal___; } -int HP_pc_setreg(struct map_session_data *sd, int reg, int val) { +void HP_pc_setreg(struct map_session_data *sd, int64 reg, int val) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_pc_setreg_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *reg, int *val); + void (*preHookFunc) (struct map_session_data *sd, int64 *reg, int *val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setreg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setreg_pre[hIndex].func; - retVal___ = preHookFunc(sd, ®, &val); + preHookFunc(sd, ®, &val); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.pc.setreg(sd, reg, val); + HPMHooks.source.pc.setreg(sd, reg, val); } if( HPMHooks.count.HP_pc_setreg_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *reg, int *val); + void (*postHookFunc) (struct map_session_data *sd, int64 *reg, int *val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setreg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setreg_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, ®, &val); + postHookFunc(sd, ®, &val); } } - return retVal___; + return; } -char* HP_pc_readregstr(struct map_session_data *sd, int reg) { +char* HP_pc_readregstr(struct map_session_data *sd, int64 reg) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_pc_readregstr_pre ) { - char* (*preHookFunc) (struct map_session_data *sd, int *reg); + char* (*preHookFunc) (struct map_session_data *sd, int64 *reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregstr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readregstr_pre[hIndex].func; retVal___ = preHookFunc(sd, ®); @@ -46546,7 +48001,7 @@ char* HP_pc_readregstr(struct map_session_data *sd, int reg) { retVal___ = HPMHooks.source.pc.readregstr(sd, reg); } if( HPMHooks.count.HP_pc_readregstr_post ) { - char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, int *reg); + char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, int64 *reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregstr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readregstr_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, ®); @@ -46554,40 +48009,39 @@ char* HP_pc_readregstr(struct map_session_data *sd, int reg) { } return retVal___; } -int HP_pc_setregstr(struct map_session_data *sd, int reg, const char *str) { +void HP_pc_setregstr(struct map_session_data *sd, int64 reg, const char *str) { int hIndex = 0; - int retVal___ = 0; if( HPMHooks.count.HP_pc_setregstr_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *reg, const char *str); + void (*preHookFunc) (struct map_session_data *sd, int64 *reg, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregstr_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setregstr_pre[hIndex].func; - retVal___ = preHookFunc(sd, ®, str); + preHookFunc(sd, ®, str); } if( *HPMforce_return ) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.pc.setregstr(sd, reg, str); + HPMHooks.source.pc.setregstr(sd, reg, str); } if( HPMHooks.count.HP_pc_setregstr_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *reg, const char *str); + void (*postHookFunc) (struct map_session_data *sd, int64 *reg, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregstr_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setregstr_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, ®, str); + postHookFunc(sd, ®, str); } } - return retVal___; + return; } -int HP_pc_readregistry(struct map_session_data *sd, const char *reg, int type) { +int HP_pc_readregistry(struct map_session_data *sd, int64 reg) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_readregistry_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *reg, int *type); + int (*preHookFunc) (struct map_session_data *sd, int64 *reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readregistry_pre[hIndex].func; - retVal___ = preHookFunc(sd, reg, &type); + retVal___ = preHookFunc(sd, ®); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46595,25 +48049,25 @@ int HP_pc_readregistry(struct map_session_data *sd, const char *reg, int type) { } } { - retVal___ = HPMHooks.source.pc.readregistry(sd, reg, type); + retVal___ = HPMHooks.source.pc.readregistry(sd, reg); } if( HPMHooks.count.HP_pc_readregistry_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *reg, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 *reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readregistry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, reg, &type); + retVal___ = postHookFunc(retVal___, sd, ®); } } return retVal___; } -int HP_pc_setregistry(struct map_session_data *sd, const char *reg, int val, int type) { +int HP_pc_setregistry(struct map_session_data *sd, int64 reg, int val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setregistry_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *reg, int *val, int *type); + int (*preHookFunc) (struct map_session_data *sd, int64 *reg, int *val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregistry_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setregistry_pre[hIndex].func; - retVal___ = preHookFunc(sd, reg, &val, &type); + retVal___ = preHookFunc(sd, ®, &val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46621,25 +48075,25 @@ int HP_pc_setregistry(struct map_session_data *sd, const char *reg, int val, int } } { - retVal___ = HPMHooks.source.pc.setregistry(sd, reg, val, type); + retVal___ = HPMHooks.source.pc.setregistry(sd, reg, val); } if( HPMHooks.count.HP_pc_setregistry_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *reg, int *val, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 *reg, int *val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregistry_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setregistry_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, reg, &val, &type); + retVal___ = postHookFunc(retVal___, sd, ®, &val); } } return retVal___; } -char* HP_pc_readregistry_str(struct map_session_data *sd, const char *reg, int type) { +char* HP_pc_readregistry_str(struct map_session_data *sd, int64 reg) { int hIndex = 0; char* retVal___ = NULL; if( HPMHooks.count.HP_pc_readregistry_str_pre ) { - char* (*preHookFunc) (struct map_session_data *sd, const char *reg, int *type); + char* (*preHookFunc) (struct map_session_data *sd, int64 *reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_readregistry_str_pre[hIndex].func; - retVal___ = preHookFunc(sd, reg, &type); + retVal___ = preHookFunc(sd, ®); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46647,25 +48101,25 @@ char* HP_pc_readregistry_str(struct map_session_data *sd, const char *reg, int t } } { - retVal___ = HPMHooks.source.pc.readregistry_str(sd, reg, type); + retVal___ = HPMHooks.source.pc.readregistry_str(sd, reg); } if( HPMHooks.count.HP_pc_readregistry_str_post ) { - char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, const char *reg, int *type); + char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, int64 *reg); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_readregistry_str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, reg, &type); + retVal___ = postHookFunc(retVal___, sd, ®); } } return retVal___; } -int HP_pc_setregistry_str(struct map_session_data *sd, const char *reg, const char *val, int type) { +int HP_pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_setregistry_str_pre ) { - int (*preHookFunc) (struct map_session_data *sd, const char *reg, const char *val, int *type); + int (*preHookFunc) (struct map_session_data *sd, int64 *reg, const char *val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregistry_str_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_setregistry_str_pre[hIndex].func; - retVal___ = preHookFunc(sd, reg, val, &type); + retVal___ = preHookFunc(sd, ®, val); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46673,13 +48127,13 @@ int HP_pc_setregistry_str(struct map_session_data *sd, const char *reg, const ch } } { - retVal___ = HPMHooks.source.pc.setregistry_str(sd, reg, val, type); + retVal___ = HPMHooks.source.pc.setregistry_str(sd, reg, val); } if( HPMHooks.count.HP_pc_setregistry_str_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *reg, const char *val, int *type); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 *reg, const char *val); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setregistry_str_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_setregistry_str_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, reg, val, &type); + retVal___ = postHookFunc(retVal___, sd, ®, val); } } return retVal___; @@ -46814,11 +48268,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); @@ -46832,7 +48286,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); @@ -47406,11 +48860,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); @@ -47424,7 +48878,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); @@ -47432,11 +48886,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); @@ -47450,7 +48904,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); @@ -47817,11 +49271,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); @@ -47835,7 +49289,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); @@ -47843,11 +49297,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); @@ -47861,7 +49315,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); @@ -47901,11 +49355,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); @@ -47919,7 +49373,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); @@ -48107,11 +49561,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); @@ -48125,7 +49579,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); @@ -48217,11 +49671,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); @@ -48235,7 +49689,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); @@ -48275,11 +49729,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); @@ -48293,7 +49747,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); @@ -48327,11 +49781,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); @@ -48345,7 +49799,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); @@ -48353,11 +49807,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); @@ -48371,7 +49825,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); @@ -48540,15 +49994,342 @@ int HP_pc_removecombo(struct map_session_data *sd, struct item_data *data) { } return retVal___; } +void HP_pc_bank_deposit(struct map_session_data *sd, int money) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_bank_deposit_pre ) { + void (*preHookFunc) (struct map_session_data *sd, int *money); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_deposit_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_bank_deposit_pre[hIndex].func; + preHookFunc(sd, &money); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.bank_deposit(sd, money); + } + if( HPMHooks.count.HP_pc_bank_deposit_post ) { + void (*postHookFunc) (struct map_session_data *sd, int *money); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_deposit_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_bank_deposit_post[hIndex].func; + postHookFunc(sd, &money); + } + } + return; +} +void HP_pc_bank_withdraw(struct map_session_data *sd, int money) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_bank_withdraw_pre ) { + void (*preHookFunc) (struct map_session_data *sd, int *money); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_withdraw_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_bank_withdraw_pre[hIndex].func; + preHookFunc(sd, &money); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.bank_withdraw(sd, money); + } + if( HPMHooks.count.HP_pc_bank_withdraw_post ) { + void (*postHookFunc) (struct map_session_data *sd, int *money); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_withdraw_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_bank_withdraw_post[hIndex].func; + postHookFunc(sd, &money); + } + } + 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; +} +void HP_pc_bound_clear(struct map_session_data *sd, enum e_item_bound_type type) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_bound_clear_pre ) { + void (*preHookFunc) (struct map_session_data *sd, enum e_item_bound_type *type); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bound_clear_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_bound_clear_pre[hIndex].func; + preHookFunc(sd, &type); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.bound_clear(sd, type); + } + if( HPMHooks.count.HP_pc_bound_clear_post ) { + void (*postHookFunc) (struct map_session_data *sd, enum e_item_bound_type *type); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bound_clear_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_bound_clear_post[hIndex].func; + postHookFunc(sd, &type); + } + } + return; +} +int HP_pc_expiration_timer(int tid, int64 tick, int id, intptr_t data) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_pc_expiration_timer_pre ) { + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_expiration_timer_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_expiration_timer_pre[hIndex].func; + retVal___ = preHookFunc(&tid, &tick, &id, &data); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pc.expiration_timer(tid, tick, id, data); + } + if( HPMHooks.count.HP_pc_expiration_timer_post ) { + int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_expiration_timer_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_expiration_timer_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + } + } + return retVal___; +} +int HP_pc_global_expiration_timer(int tid, int64 tick, int id, intptr_t data) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_pc_global_expiration_timer_pre ) { + int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_global_expiration_timer_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_global_expiration_timer_pre[hIndex].func; + retVal___ = preHookFunc(&tid, &tick, &id, &data); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.pc.global_expiration_timer(tid, tick, id, data); + } + if( HPMHooks.count.HP_pc_global_expiration_timer_post ) { + int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_global_expiration_timer_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_global_expiration_timer_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); + } + } + return retVal___; +} +void HP_pc_expire_check(struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_expire_check_pre ) { + void (*preHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_expire_check_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_expire_check_pre[hIndex].func; + preHookFunc(sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.expire_check(sd); + } + if( HPMHooks.count.HP_pc_expire_check_post ) { + void (*postHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_expire_check_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_expire_check_post[hIndex].func; + postHookFunc(sd); + } + } + return; +} +void HP_pc_autotrade_load(void) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_autotrade_load_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_load_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_autotrade_load_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.autotrade_load(); + } + if( HPMHooks.count.HP_pc_autotrade_load_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_load_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_autotrade_load_post[hIndex].func; + postHookFunc(); + } + } + return; +} +void HP_pc_autotrade_update(struct map_session_data *sd, enum e_pc_autotrade_update_action action) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_autotrade_update_pre ) { + void (*preHookFunc) (struct map_session_data *sd, enum e_pc_autotrade_update_action *action); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_update_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_autotrade_update_pre[hIndex].func; + preHookFunc(sd, &action); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.autotrade_update(sd, action); + } + if( HPMHooks.count.HP_pc_autotrade_update_post ) { + void (*postHookFunc) (struct map_session_data *sd, enum e_pc_autotrade_update_action *action); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_update_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_autotrade_update_post[hIndex].func; + postHookFunc(sd, &action); + } + } + return; +} +void HP_pc_autotrade_start(struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_autotrade_start_pre ) { + void (*preHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_start_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_autotrade_start_pre[hIndex].func; + preHookFunc(sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.autotrade_start(sd); + } + if( HPMHooks.count.HP_pc_autotrade_start_post ) { + void (*postHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_start_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_autotrade_start_post[hIndex].func; + postHookFunc(sd); + } + } + return; +} +void HP_pc_autotrade_prepare(struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_autotrade_prepare_pre ) { + void (*preHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_prepare_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_autotrade_prepare_pre[hIndex].func; + preHookFunc(sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.autotrade_prepare(sd); + } + if( HPMHooks.count.HP_pc_autotrade_prepare_post ) { + void (*postHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_prepare_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_autotrade_prepare_post[hIndex].func; + postHookFunc(sd); + } + } + return; +} +void HP_pc_autotrade_populate(struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_autotrade_populate_pre ) { + void (*preHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_populate_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_autotrade_populate_pre[hIndex].func; + preHookFunc(sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.autotrade_populate(sd); + } + if( HPMHooks.count.HP_pc_autotrade_populate_post ) { + void (*postHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_autotrade_populate_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_autotrade_populate_post[hIndex].func; + postHookFunc(sd); + } + } + return; +} /* pet */ -int HP_pet_init(void) { +int HP_pet_init(bool minimal) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_init_pre ) { - int (*preHookFunc) (void); + int (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_init_pre[hIndex].func; - retVal___ = preHookFunc(); + retVal___ = preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48556,13 +50337,13 @@ int HP_pet_init(void) { } } { - retVal___ = HPMHooks.source.pet.init(); + retVal___ = HPMHooks.source.pet.init(minimal); } if( HPMHooks.count.HP_pet_init_post ) { - int (*postHookFunc) (int retVal___); + int (*postHookFunc) (int retVal___, bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + retVal___ = postHookFunc(retVal___, &minimal); } } return retVal___; @@ -48774,11 +50555,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); @@ -48792,7 +50573,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); @@ -49274,11 +51055,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); @@ -49292,7 +51073,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); @@ -49300,11 +51081,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); @@ -49318,7 +51099,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); @@ -49358,11 +51139,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); @@ -49376,7 +51157,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); @@ -49384,11 +51165,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); @@ -49402,7 +51183,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); @@ -49436,11 +51217,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); @@ -49454,7 +51235,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); @@ -49462,11 +51243,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); @@ -49480,7 +51261,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); @@ -49488,11 +51269,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); @@ -49506,7 +51287,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); @@ -49514,11 +51295,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); @@ -49532,7 +51313,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); @@ -49567,13 +51348,13 @@ int HP_pet_read_db(void) { return retVal___; } /* quest */ -void HP_quest_init(void) { +void HP_quest_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_quest_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49581,12 +51362,37 @@ void HP_quest_init(void) { } } { - HPMHooks.source.quest.init(); + HPMHooks.source.quest.init(minimal); } if( HPMHooks.count.HP_quest_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_init_post[hIndex].func; + postHookFunc(&minimal); + } + } + return; +} +void HP_quest_final(void) { + int hIndex = 0; + if( HPMHooks.count.HP_quest_final_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_final_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_quest_final_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.quest.final(); + } + if( HPMHooks.count.HP_quest_final_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_final_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_quest_final_post[hIndex].func; postHookFunc(); } } @@ -49617,13 +51423,13 @@ void HP_quest_reload(void) { } return; } -int HP_quest_search_db(int quest_id) { +struct quest_db* HP_quest_db(int quest_id) { int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_quest_search_db_pre ) { - int (*preHookFunc) (int *quest_id); - for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_search_db_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_quest_search_db_pre[hIndex].func; + struct quest_db* retVal___ = NULL; + if( HPMHooks.count.HP_quest_db_pre ) { + struct quest_db* (*preHookFunc) (int *quest_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_db_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_quest_db_pre[hIndex].func; retVal___ = preHookFunc(&quest_id); } if( *HPMforce_return ) { @@ -49632,12 +51438,12 @@ int HP_quest_search_db(int quest_id) { } } { - retVal___ = HPMHooks.source.quest.search_db(quest_id); + retVal___ = HPMHooks.source.quest.db(quest_id); } - if( HPMHooks.count.HP_quest_search_db_post ) { - int (*postHookFunc) (int retVal___, int *quest_id); - for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_search_db_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_quest_search_db_post[hIndex].func; + if( HPMHooks.count.HP_quest_db_post ) { + struct quest_db* (*postHookFunc) (struct quest_db* retVal___, int *quest_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_db_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_quest_db_post[hIndex].func; retVal___ = postHookFunc(retVal___, &quest_id); } } @@ -49804,11 +51610,11 @@ void HP_quest_update_objective(TBL_PC *sd, int mob_id) { } return; } -int HP_quest_update_status(TBL_PC *sd, int quest_id, quest_state qs) { +int HP_quest_update_status(TBL_PC *sd, int quest_id, enum quest_state qs) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_quest_update_status_pre ) { - int (*preHookFunc) (TBL_PC *sd, int *quest_id, quest_state *qs); + int (*preHookFunc) (TBL_PC *sd, int *quest_id, enum quest_state *qs); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_update_status_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_update_status_pre[hIndex].func; retVal___ = preHookFunc(sd, &quest_id, &qs); @@ -49822,7 +51628,7 @@ int HP_quest_update_status(TBL_PC *sd, int quest_id, quest_state qs) { retVal___ = HPMHooks.source.quest.update_status(sd, quest_id, qs); } if( HPMHooks.count.HP_quest_update_status_post ) { - int (*postHookFunc) (int retVal___, TBL_PC *sd, int *quest_id, quest_state *qs); + int (*postHookFunc) (int retVal___, TBL_PC *sd, int *quest_id, enum quest_state *qs); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_update_status_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_update_status_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &quest_id, &qs); @@ -49830,11 +51636,11 @@ int HP_quest_update_status(TBL_PC *sd, int quest_id, quest_state qs) { } return retVal___; } -int HP_quest_check(TBL_PC *sd, int quest_id, quest_check_type type) { +int HP_quest_check(TBL_PC *sd, int quest_id, enum quest_check_type type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_quest_check_pre ) { - int (*preHookFunc) (TBL_PC *sd, int *quest_id, quest_check_type *type); + int (*preHookFunc) (TBL_PC *sd, int *quest_id, enum quest_check_type *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_check_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_check_pre[hIndex].func; retVal___ = preHookFunc(sd, &quest_id, &type); @@ -49848,7 +51654,7 @@ int HP_quest_check(TBL_PC *sd, int quest_id, quest_check_type type) { retVal___ = HPMHooks.source.quest.check(sd, quest_id, type); } if( HPMHooks.count.HP_quest_check_post ) { - int (*postHookFunc) (int retVal___, TBL_PC *sd, int *quest_id, quest_check_type *type); + int (*postHookFunc) (int retVal___, TBL_PC *sd, int *quest_id, enum quest_check_type *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_check_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_check_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &quest_id, &type); @@ -49856,6 +51662,31 @@ int HP_quest_check(TBL_PC *sd, int quest_id, quest_check_type type) { } return retVal___; } +void HP_quest_clear(void) { + int hIndex = 0; + if( HPMHooks.count.HP_quest_clear_pre ) { + void (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_clear_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_quest_clear_pre[hIndex].func; + preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.quest.clear(); + } + if( HPMHooks.count.HP_quest_clear_post ) { + void (*postHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_clear_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_quest_clear_post[hIndex].func; + postHookFunc(); + } + } + return; +} int HP_quest_read_db(void) { int hIndex = 0; int retVal___ = 0; @@ -49883,13 +51714,13 @@ int HP_quest_read_db(void) { return retVal___; } /* script */ -void HP_script_init(void) { +void HP_script_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_script_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49897,13 +51728,13 @@ void HP_script_init(void) { } } { - HPMHooks.source.script.init(); + HPMHooks.source.script.init(minimal); } if( HPMHooks.count.HP_script_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -49985,6 +51816,32 @@ struct script_code* HP_script_parse(const char *src, const char *file, int line, } return retVal___; } +bool HP_script_add_builtin(const struct script_function *buildin, bool override) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_script_add_builtin_pre ) { + bool (*preHookFunc) (const struct script_function *buildin, bool *override); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_add_builtin_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_add_builtin_pre[hIndex].func; + retVal___ = preHookFunc(buildin, &override); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.add_builtin(buildin, override); + } + if( HPMHooks.count.HP_script_add_builtin_post ) { + bool (*postHookFunc) (bool retVal___, const struct script_function *buildin, bool *override); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_add_builtin_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_add_builtin_post[hIndex].func; + retVal___ = postHookFunc(retVal___, buildin, &override); + } + } + return retVal___; +} void HP_script_parse_builtin(void) { int hIndex = 0; if( HPMHooks.count.HP_script_parse_builtin_pre ) { @@ -50241,11 +52098,11 @@ void HP_script_detach_rid(struct script_state *st) { } return; } -struct script_data* HP_script_push_val(struct script_stack *stack, enum c_op type, int val, struct DBMap **ref) { +struct script_data* HP_script_push_val(struct script_stack *stack, enum c_op type, int64 val, struct DBMap **ref) { int hIndex = 0; struct script_data* retVal___ = NULL; if( HPMHooks.count.HP_script_push_val_pre ) { - struct script_data* (*preHookFunc) (struct script_stack *stack, enum c_op *type, int *val, struct DBMap **ref); + struct script_data* (*preHookFunc) (struct script_stack *stack, enum c_op *type, int64 *val, struct DBMap **ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_val_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_push_val_pre[hIndex].func; retVal___ = preHookFunc(stack, &type, &val, ref); @@ -50259,7 +52116,7 @@ struct script_data* HP_script_push_val(struct script_stack *stack, enum c_op typ retVal___ = HPMHooks.source.script.push_val(stack, type, val, ref); } if( HPMHooks.count.HP_script_push_val_post ) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, enum c_op *type, int *val, struct DBMap **ref); + struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, enum c_op *type, int64 *val, struct DBMap **ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_push_val_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_push_val_post[hIndex].func; retVal___ = postHookFunc(retVal___, stack, &type, &val, ref); @@ -50267,36 +52124,37 @@ struct script_data* HP_script_push_val(struct script_stack *stack, enum c_op typ } return retVal___; } -void HP_script_get_val(struct script_state *st, struct script_data *data) { +struct script_data* HP_script_get_val(struct script_state *st, struct script_data *data) { int hIndex = 0; + struct script_data* retVal___ = NULL; if( HPMHooks.count.HP_script_get_val_pre ) { - void (*preHookFunc) (struct script_state *st, struct script_data *data); + struct script_data* (*preHookFunc) (struct script_state *st, struct script_data *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val_pre[hIndex].func; - preHookFunc(st, data); + retVal___ = preHookFunc(st, data); } if( *HPMforce_return ) { *HPMforce_return = false; - return; + return retVal___; } } { - HPMHooks.source.script.get_val(st, data); + retVal___ = HPMHooks.source.script.get_val(st, data); } if( HPMHooks.count.HP_script_get_val_post ) { - void (*postHookFunc) (struct script_state *st, struct script_data *data); + struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_state *st, struct script_data *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_get_val_post[hIndex].func; - postHookFunc(st, data); + retVal___ = postHookFunc(retVal___, st, data); } } - return; + return retVal___; } -void* HP_script_get_val2(struct script_state *st, int uid, struct DBMap **ref) { +void* HP_script_get_val2(struct script_state *st, int64 uid, struct DBMap **ref) { int hIndex = 0; void* retVal___ = NULL; if( HPMHooks.count.HP_script_get_val2_pre ) { - void* (*preHookFunc) (struct script_state *st, int *uid, struct DBMap **ref); + void* (*preHookFunc) (struct script_state *st, int64 *uid, struct DBMap **ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val2_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_get_val2_pre[hIndex].func; retVal___ = preHookFunc(st, &uid, ref); @@ -50310,7 +52168,7 @@ void* HP_script_get_val2(struct script_state *st, int uid, struct DBMap **ref) { retVal___ = HPMHooks.source.script.get_val2(st, uid, ref); } if( HPMHooks.count.HP_script_get_val2_post ) { - void* (*postHookFunc) (void* retVal___, struct script_state *st, int *uid, struct DBMap **ref); + void* (*postHookFunc) (void* retVal___, struct script_state *st, int64 *uid, struct DBMap **ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val2_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_get_val2_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, &uid, ref); @@ -50445,31 +52303,6 @@ void HP_script_set_constant2(const char *name, int value, bool isparameter) { } return; } -void HP_script_set_constant_force(const char *name, int value, bool isparameter) { - int hIndex = 0; - if( HPMHooks.count.HP_script_set_constant_force_pre ) { - void (*preHookFunc) (const char *name, int *value, bool *isparameter); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant_force_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_script_set_constant_force_pre[hIndex].func; - preHookFunc(name, &value, &isparameter); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.script.set_constant_force(name, value, isparameter); - } - if( HPMHooks.count.HP_script_set_constant_force_post ) { - void (*postHookFunc) (const char *name, int *value, bool *isparameter); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant_force_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_script_set_constant_force_post[hIndex].func; - postHookFunc(name, &value, &isparameter); - } - } - return; -} bool HP_script_get_constant(const char *name, int *value) { int hIndex = 0; bool retVal___ = false; @@ -50571,11 +52404,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); @@ -50589,7 +52422,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); @@ -50799,10 +52632,10 @@ void HP_script_cleararray_pc(struct map_session_data *sd, const char *varname, v } return; } -void HP_script_setarray_pc(struct map_session_data *sd, const char *varname, uint8 idx, void *value, int *refcache) { +void HP_script_setarray_pc(struct map_session_data *sd, const char *varname, uint32 idx, void *value, int *refcache) { int hIndex = 0; if( HPMHooks.count.HP_script_setarray_pc_pre ) { - void (*preHookFunc) (struct map_session_data *sd, const char *varname, uint8 *idx, void *value, int *refcache); + void (*preHookFunc) (struct map_session_data *sd, const char *varname, uint32 *idx, void *value, int *refcache); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_setarray_pc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_setarray_pc_pre[hIndex].func; preHookFunc(sd, varname, &idx, value, refcache); @@ -50816,7 +52649,7 @@ void HP_script_setarray_pc(struct map_session_data *sd, const char *varname, uin HPMHooks.source.script.setarray_pc(sd, varname, idx, value, refcache); } if( HPMHooks.count.HP_script_setarray_pc_post ) { - void (*postHookFunc) (struct map_session_data *sd, const char *varname, uint8 *idx, void *value, int *refcache); + void (*postHookFunc) (struct map_session_data *sd, const char *varname, uint32 *idx, void *value, int *refcache); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_setarray_pc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_setarray_pc_post[hIndex].func; postHookFunc(sd, varname, &idx, value, refcache); @@ -51390,31 +53223,6 @@ void HP_script_reportfunc(struct script_state *st) { } return; } -void HP_script_disp_error_message2(const char *mes, const char *pos, int report) { - int hIndex = 0; - if( HPMHooks.count.HP_script_disp_error_message2_pre ) { - void (*preHookFunc) (const char *mes, const char *pos, int *report); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_disp_error_message2_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_script_disp_error_message2_pre[hIndex].func; - preHookFunc(mes, pos, &report); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return; - } - } - { - HPMHooks.source.script.disp_error_message2(mes, pos, report); - } - if( HPMHooks.count.HP_script_disp_error_message2_post ) { - void (*postHookFunc) (const char *mes, const char *pos, int *report); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_disp_error_message2_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_script_disp_error_message2_post[hIndex].func; - postHookFunc(mes, pos, &report); - } - } - return; -} void HP_script_disp_warning_message(const char *mes, const char *pos) { int hIndex = 0; if( HPMHooks.count.HP_script_disp_warning_message_pre ) { @@ -51899,11 +53707,11 @@ void HP_script_errorwarning_sub(StringBuf *buf, const char *src, const char *fil } return; } -int HP_script_set_reg(struct script_state *st, TBL_PC *sd, int num, const char *name, const void *value, struct DBMap **ref) { +int HP_script_set_reg(struct script_state *st, TBL_PC *sd, int64 num, const char *name, const void *value, struct DBMap **ref) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_script_set_reg_pre ) { - int (*preHookFunc) (struct script_state *st, TBL_PC *sd, int *num, const char *name, const void *value, struct DBMap **ref); + int (*preHookFunc) (struct script_state *st, TBL_PC *sd, int64 *num, const char *name, const void *value, struct DBMap **ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_script_set_reg_pre[hIndex].func; retVal___ = preHookFunc(st, sd, &num, name, value, ref); @@ -51917,7 +53725,7 @@ int HP_script_set_reg(struct script_state *st, TBL_PC *sd, int num, const char * retVal___ = HPMHooks.source.script.set_reg(st, sd, num, name, value, ref); } if( HPMHooks.count.HP_script_set_reg_post ) { - int (*postHookFunc) (int retVal___, struct script_state *st, TBL_PC *sd, int *num, const char *name, const void *value, struct DBMap **ref); + int (*postHookFunc) (int retVal___, struct script_state *st, TBL_PC *sd, int64 *num, const char *name, const void *value, struct DBMap **ref); for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_reg_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_script_set_reg_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, sd, &num, name, value, ref); @@ -51976,32 +53784,6 @@ struct script_data* HP_script_push_retinfo(struct script_stack *stack, struct sc } return retVal___; } -int HP_script_pop_val(struct script_state *st) { - int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_script_pop_val_pre ) { - int (*preHookFunc) (struct script_state *st); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_pop_val_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_script_pop_val_pre[hIndex].func; - retVal___ = preHookFunc(st); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.script.pop_val(st); - } - if( HPMHooks.count.HP_script_pop_val_post ) { - int (*postHookFunc) (int retVal___, struct script_state *st); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_pop_val_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_script_pop_val_post[hIndex].func; - retVal___ = postHookFunc(retVal___, st); - } - } - return retVal___; -} void HP_script_op_3(struct script_state *st, int op) { int hIndex = 0; if( HPMHooks.count.HP_script_op_3_pre ) { @@ -52324,32 +54106,6 @@ int HP_script_buildin_areapercentheal_sub(struct block_list *bl, va_list ap) { } return retVal___; } -int32 HP_script_getarraysize(struct script_state *st, int32 id, int32 idx, int isstring, struct DBMap **ref) { - int hIndex = 0; - int32 retVal___ = 0; - if( HPMHooks.count.HP_script_getarraysize_pre ) { - int32 (*preHookFunc) (struct script_state *st, int32 *id, int32 *idx, int *isstring, struct DBMap **ref); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_getarraysize_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_script_getarraysize_pre[hIndex].func; - retVal___ = preHookFunc(st, &id, &idx, &isstring, ref); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.script.getarraysize(st, id, idx, isstring, ref); - } - if( HPMHooks.count.HP_script_getarraysize_post ) { - int32 (*postHookFunc) (int32 retVal___, struct script_state *st, int32 *id, int32 *idx, int *isstring, struct DBMap **ref); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_getarraysize_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_script_getarraysize_post[hIndex].func; - retVal___ = postHookFunc(retVal___, st, &id, &idx, &isstring, ref); - } - } - return retVal___; -} void HP_script_buildin_delitem_delete(struct map_session_data *sd, int idx, int *amount, bool delete_items) { int hIndex = 0; if( HPMHooks.count.HP_script_buildin_delitem_delete_pre ) { @@ -52785,14 +54541,14 @@ int HP_script_buildin_mobcount_sub(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_script_playBGM_sub(struct block_list *bl, va_list ap) { +int HP_script_playbgm_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_script_playBGM_sub_pre ) { + if( HPMHooks.count.HP_script_playbgm_sub_pre ) { int (*preHookFunc) (struct block_list *bl, va_list ap); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_sub_pre; hIndex++ ) { + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); - preHookFunc = HPMHooks.list.HP_script_playBGM_sub_pre[hIndex].func; + preHookFunc = HPMHooks.list.HP_script_playbgm_sub_pre[hIndex].func; retVal___ = preHookFunc(bl, ap___copy); va_end(ap___copy); } @@ -52803,28 +54559,28 @@ int HP_script_playBGM_sub(struct block_list *bl, va_list ap) { } { va_list ap___copy; va_copy(ap___copy, ap); - retVal___ = HPMHooks.source.script.playBGM_sub(bl, ap___copy); + retVal___ = HPMHooks.source.script.playbgm_sub(bl, ap___copy); va_end(ap___copy); } - if( HPMHooks.count.HP_script_playBGM_sub_post ) { + if( HPMHooks.count.HP_script_playbgm_sub_post ) { int (*postHookFunc) (int retVal___, struct block_list *bl, va_list ap); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_sub_post; hIndex++ ) { + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); - postHookFunc = HPMHooks.list.HP_script_playBGM_sub_post[hIndex].func; + postHookFunc = HPMHooks.list.HP_script_playbgm_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_script_playBGM_foreachpc_sub(struct map_session_data *sd, va_list args) { +int HP_script_playbgm_foreachpc_sub(struct map_session_data *sd, va_list args) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_script_playBGM_foreachpc_sub_pre ) { + if( HPMHooks.count.HP_script_playbgm_foreachpc_sub_pre ) { int (*preHookFunc) (struct map_session_data *sd, va_list args); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_foreachpc_sub_pre; hIndex++ ) { + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_foreachpc_sub_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); - preHookFunc = HPMHooks.list.HP_script_playBGM_foreachpc_sub_pre[hIndex].func; + preHookFunc = HPMHooks.list.HP_script_playbgm_foreachpc_sub_pre[hIndex].func; retVal___ = preHookFunc(sd, args___copy); va_end(args___copy); } @@ -52835,14 +54591,14 @@ int HP_script_playBGM_foreachpc_sub(struct map_session_data *sd, va_list args) { } { va_list args___copy; va_copy(args___copy, args); - retVal___ = HPMHooks.source.script.playBGM_foreachpc_sub(sd, args___copy); + retVal___ = HPMHooks.source.script.playbgm_foreachpc_sub(sd, args___copy); va_end(args___copy); } - if( HPMHooks.count.HP_script_playBGM_foreachpc_sub_post ) { + if( HPMHooks.count.HP_script_playbgm_foreachpc_sub_post ) { int (*postHookFunc) (int retVal___, struct map_session_data *sd, va_list args); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_foreachpc_sub_post; hIndex++ ) { + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_foreachpc_sub_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); - postHookFunc = HPMHooks.list.HP_script_playBGM_foreachpc_sub_post[hIndex].func; + postHookFunc = HPMHooks.list.HP_script_playbgm_foreachpc_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, args___copy); va_end(args___copy); } @@ -52907,32 +54663,6 @@ int HP_script_buildin_query_sql_sub(struct script_state *st, Sql *handle) { } return retVal___; } -int HP_script_axtoi(const char *hexStg) { - int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_script_axtoi_pre ) { - int (*preHookFunc) (const char *hexStg); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_axtoi_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_script_axtoi_pre[hIndex].func; - retVal___ = preHookFunc(hexStg); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.script.axtoi(hexStg); - } - if( HPMHooks.count.HP_script_axtoi_post ) { - int (*postHookFunc) (int retVal___, const char *hexStg); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_axtoi_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_script_axtoi_post[hIndex].func; - retVal___ = postHookFunc(retVal___, hexStg); - } - } - return retVal___; -} int HP_script_buildin_instance_warpall_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; @@ -53055,6 +54785,401 @@ int HP_script_run_func(struct script_state *st) { } return retVal___; } +const char* HP_script_getfuncname(struct script_state *st) { + int hIndex = 0; + const char* retVal___ = NULL; + if( HPMHooks.count.HP_script_getfuncname_pre ) { + const char* (*preHookFunc) (struct script_state *st); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_getfuncname_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_getfuncname_pre[hIndex].func; + retVal___ = preHookFunc(st); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.getfuncname(st); + } + if( HPMHooks.count.HP_script_getfuncname_post ) { + const char* (*postHookFunc) (const char* retVal___, struct script_state *st); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_getfuncname_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_getfuncname_post[hIndex].func; + retVal___ = postHookFunc(retVal___, st); + } + } + return retVal___; +} +unsigned int HP_script_calc_hash_ci(const char *p) { + int hIndex = 0; + unsigned int retVal___ = 0; + if( HPMHooks.count.HP_script_calc_hash_ci_pre ) { + unsigned int (*preHookFunc) (const char *p); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_calc_hash_ci_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_calc_hash_ci_pre[hIndex].func; + retVal___ = preHookFunc(p); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.calc_hash_ci(p); + } + if( HPMHooks.count.HP_script_calc_hash_ci_post ) { + unsigned int (*postHookFunc) (unsigned int retVal___, const char *p); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_calc_hash_ci_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_calc_hash_ci_post[hIndex].func; + retVal___ = postHookFunc(retVal___, p); + } + } + return retVal___; +} +struct DBMap* HP_script_array_src(struct script_state *st, struct map_session_data *sd, const char *name, struct DBMap **ref) { + int hIndex = 0; + struct DBMap* retVal___ = NULL; + if( HPMHooks.count.HP_script_array_src_pre ) { + struct DBMap* (*preHookFunc) (struct script_state *st, struct map_session_data *sd, const char *name, struct DBMap **ref); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_src_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_array_src_pre[hIndex].func; + retVal___ = preHookFunc(st, sd, name, ref); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.array_src(st, sd, name, ref); + } + if( HPMHooks.count.HP_script_array_src_post ) { + struct DBMap* (*postHookFunc) (struct DBMap* retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct DBMap **ref); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_src_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_array_src_post[hIndex].func; + retVal___ = postHookFunc(retVal___, st, sd, name, ref); + } + } + return retVal___; +} +void HP_script_array_update(struct DBMap **src, int64 num, bool empty) { + int hIndex = 0; + if( HPMHooks.count.HP_script_array_update_pre ) { + void (*preHookFunc) (struct DBMap **src, int64 *num, bool *empty); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_update_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_array_update_pre[hIndex].func; + preHookFunc(src, &num, &empty); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.script.array_update(src, num, empty); + } + if( HPMHooks.count.HP_script_array_update_post ) { + void (*postHookFunc) (struct DBMap **src, int64 *num, bool *empty); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_update_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_array_update_post[hIndex].func; + postHookFunc(src, &num, &empty); + } + } + return; +} +void HP_script_array_delete(struct DBMap *src, struct script_array *sa) { + int hIndex = 0; + if( HPMHooks.count.HP_script_array_delete_pre ) { + void (*preHookFunc) (struct DBMap *src, struct script_array *sa); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_delete_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_array_delete_pre[hIndex].func; + preHookFunc(src, sa); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.script.array_delete(src, sa); + } + if( HPMHooks.count.HP_script_array_delete_post ) { + void (*postHookFunc) (struct DBMap *src, struct script_array *sa); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_delete_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_array_delete_post[hIndex].func; + postHookFunc(src, sa); + } + } + return; +} +void HP_script_array_remove_member(struct DBMap *src, struct script_array *sa, unsigned int idx) { + int hIndex = 0; + if( HPMHooks.count.HP_script_array_remove_member_pre ) { + void (*preHookFunc) (struct DBMap *src, struct script_array *sa, unsigned int *idx); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_remove_member_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_array_remove_member_pre[hIndex].func; + preHookFunc(src, sa, &idx); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.script.array_remove_member(src, sa, idx); + } + if( HPMHooks.count.HP_script_array_remove_member_post ) { + void (*postHookFunc) (struct DBMap *src, struct script_array *sa, unsigned int *idx); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_remove_member_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_array_remove_member_post[hIndex].func; + postHookFunc(src, sa, &idx); + } + } + return; +} +void HP_script_array_add_member(struct script_array *sa, unsigned int idx) { + int hIndex = 0; + if( HPMHooks.count.HP_script_array_add_member_pre ) { + void (*preHookFunc) (struct script_array *sa, unsigned int *idx); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_add_member_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_array_add_member_pre[hIndex].func; + preHookFunc(sa, &idx); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.script.array_add_member(sa, idx); + } + if( HPMHooks.count.HP_script_array_add_member_post ) { + void (*postHookFunc) (struct script_array *sa, unsigned int *idx); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_add_member_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_array_add_member_post[hIndex].func; + postHookFunc(sa, &idx); + } + } + return; +} +unsigned int HP_script_array_size(struct script_state *st, struct map_session_data *sd, const char *name, struct DBMap **ref) { + int hIndex = 0; + unsigned int retVal___ = 0; + if( HPMHooks.count.HP_script_array_size_pre ) { + unsigned int (*preHookFunc) (struct script_state *st, struct map_session_data *sd, const char *name, struct DBMap **ref); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_size_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_array_size_pre[hIndex].func; + retVal___ = preHookFunc(st, sd, name, ref); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.array_size(st, sd, name, ref); + } + if( HPMHooks.count.HP_script_array_size_post ) { + unsigned int (*postHookFunc) (unsigned int retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct DBMap **ref); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_size_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_array_size_post[hIndex].func; + retVal___ = postHookFunc(retVal___, st, sd, name, ref); + } + } + return retVal___; +} +unsigned int HP_script_array_highest_key(struct script_state *st, struct map_session_data *sd, const char *name, struct DBMap **ref) { + int hIndex = 0; + unsigned int retVal___ = 0; + if( HPMHooks.count.HP_script_array_highest_key_pre ) { + unsigned int (*preHookFunc) (struct script_state *st, struct map_session_data *sd, const char *name, struct DBMap **ref); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_highest_key_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_array_highest_key_pre[hIndex].func; + retVal___ = preHookFunc(st, sd, name, ref); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.array_highest_key(st, sd, name, ref); + } + if( HPMHooks.count.HP_script_array_highest_key_post ) { + unsigned int (*postHookFunc) (unsigned int retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct DBMap **ref); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_highest_key_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_array_highest_key_post[hIndex].func; + retVal___ = postHookFunc(retVal___, st, sd, name, ref); + } + } + return retVal___; +} +int HP_script_array_free_db(DBKey key, DBData *data, va_list ap) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_script_array_free_db_pre ) { + int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_free_db_pre; hIndex++ ) { + va_list ap___copy; va_copy(ap___copy, ap); + preHookFunc = HPMHooks.list.HP_script_array_free_db_pre[hIndex].func; + retVal___ = preHookFunc(&key, data, ap___copy); + va_end(ap___copy); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + va_list ap___copy; va_copy(ap___copy, ap); + retVal___ = HPMHooks.source.script.array_free_db(key, data, ap___copy); + va_end(ap___copy); + } + if( HPMHooks.count.HP_script_array_free_db_post ) { + int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_free_db_post; hIndex++ ) { + va_list ap___copy; va_copy(ap___copy, ap); + postHookFunc = HPMHooks.list.HP_script_array_free_db_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + va_end(ap___copy); + } + } + return retVal___; +} +void HP_script_array_ensure_zero(struct script_state *st, struct map_session_data *sd, int64 uid, struct DBMap **ref) { + int hIndex = 0; + if( HPMHooks.count.HP_script_array_ensure_zero_pre ) { + void (*preHookFunc) (struct script_state *st, struct map_session_data *sd, int64 *uid, struct DBMap **ref); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_ensure_zero_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_array_ensure_zero_pre[hIndex].func; + preHookFunc(st, sd, &uid, ref); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.script.array_ensure_zero(st, sd, uid, ref); + } + if( HPMHooks.count.HP_script_array_ensure_zero_post ) { + void (*postHookFunc) (struct script_state *st, struct map_session_data *sd, int64 *uid, struct DBMap **ref); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_ensure_zero_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_array_ensure_zero_post[hIndex].func; + postHookFunc(st, sd, &uid, ref); + } + } + return; +} +void HP_script_reg_destroy_single(struct map_session_data *sd, int64 reg, struct script_reg_state *data) { + int hIndex = 0; + if( HPMHooks.count.HP_script_reg_destroy_single_pre ) { + void (*preHookFunc) (struct map_session_data *sd, int64 *reg, struct script_reg_state *data); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reg_destroy_single_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_reg_destroy_single_pre[hIndex].func; + preHookFunc(sd, ®, data); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.script.reg_destroy_single(sd, reg, data); + } + if( HPMHooks.count.HP_script_reg_destroy_single_post ) { + void (*postHookFunc) (struct map_session_data *sd, int64 *reg, struct script_reg_state *data); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reg_destroy_single_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_reg_destroy_single_post[hIndex].func; + postHookFunc(sd, ®, data); + } + } + return; +} +int HP_script_reg_destroy(DBKey key, DBData *data, va_list ap) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_script_reg_destroy_pre ) { + int (*preHookFunc) (DBKey *key, DBData *data, va_list ap); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reg_destroy_pre; hIndex++ ) { + va_list ap___copy; va_copy(ap___copy, ap); + preHookFunc = HPMHooks.list.HP_script_reg_destroy_pre[hIndex].func; + retVal___ = preHookFunc(&key, data, ap___copy); + va_end(ap___copy); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + va_list ap___copy; va_copy(ap___copy, ap); + retVal___ = HPMHooks.source.script.reg_destroy(key, data, ap___copy); + va_end(ap___copy); + } + if( HPMHooks.count.HP_script_reg_destroy_post ) { + int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_reg_destroy_post; hIndex++ ) { + va_list ap___copy; va_copy(ap___copy, ap); + postHookFunc = HPMHooks.list.HP_script_reg_destroy_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &key, data, ap___copy); + va_end(ap___copy); + } + } + return retVal___; +} +void HP_script_generic_ui_array_expand(unsigned int plus) { + int hIndex = 0; + if( HPMHooks.count.HP_script_generic_ui_array_expand_pre ) { + void (*preHookFunc) (unsigned int *plus); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_generic_ui_array_expand_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_generic_ui_array_expand_pre[hIndex].func; + preHookFunc(&plus); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.script.generic_ui_array_expand(plus); + } + if( HPMHooks.count.HP_script_generic_ui_array_expand_post ) { + void (*postHookFunc) (unsigned int *plus); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_generic_ui_array_expand_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_generic_ui_array_expand_post[hIndex].func; + postHookFunc(&plus); + } + } + return; +} +unsigned int* HP_script_array_cpy_list(struct script_array *sa) { + int hIndex = 0; + unsigned int* retVal___ = NULL; + if( HPMHooks.count.HP_script_array_cpy_list_pre ) { + unsigned int* (*preHookFunc) (struct script_array *sa); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_cpy_list_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_array_cpy_list_pre[hIndex].func; + retVal___ = preHookFunc(sa); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.array_cpy_list(sa); + } + if( HPMHooks.count.HP_script_array_cpy_list_post ) { + unsigned int* (*postHookFunc) (unsigned int* retVal___, struct script_array *sa); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_array_cpy_list_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_array_cpy_list_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sa); + } + } + return retVal___; +} /* searchstore */ bool HP_searchstore_open(struct map_session_data *sd, unsigned int uses, unsigned short effect) { int hIndex = 0; @@ -53311,14 +55436,14 @@ bool HP_searchstore_result(struct map_session_data *sd, unsigned int store_id, i return retVal___; } /* skill */ -int HP_skill_init(void) { +int HP_skill_init(bool minimal) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_init_pre ) { - int (*preHookFunc) (void); + int (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_init_pre[hIndex].func; - retVal___ = preHookFunc(); + retVal___ = preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53326,13 +55451,13 @@ int HP_skill_init(void) { } } { - retVal___ = HPMHooks.source.skill.init(); + retVal___ = HPMHooks.source.skill.init(minimal); } if( HPMHooks.count.HP_skill_init_post ) { - int (*postHookFunc) (int retVal___); + int (*postHookFunc) (int retVal___, bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + retVal___ = postHookFunc(retVal___, &minimal); } } return retVal___; @@ -53388,13 +55513,13 @@ void HP_skill_reload(void) { } return; } -void HP_skill_read_db(void) { +void HP_skill_read_db(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_skill_read_db_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_read_db_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_read_db_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -53402,13 +55527,13 @@ void HP_skill_read_db(void) { } } { - HPMHooks.source.skill.read_db(); + HPMHooks.source.skill.read_db(minimal); } if( HPMHooks.count.HP_skill_read_db_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_read_db_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_read_db_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; @@ -54634,14 +56759,14 @@ int HP_skill_name2id(const char *name) { } return retVal___; } -int HP_skill_isammotype(struct map_session_data *sd, int skill) { +int HP_skill_isammotype(struct map_session_data *sd, int skill_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_isammotype_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *skill); + int (*preHookFunc) (struct map_session_data *sd, int *skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_isammotype_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_isammotype_pre[hIndex].func; - retVal___ = preHookFunc(sd, &skill); + retVal___ = preHookFunc(sd, &skill_id); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -54649,22 +56774,22 @@ int HP_skill_isammotype(struct map_session_data *sd, int skill) { } } { - retVal___ = HPMHooks.source.skill.isammotype(sd, skill); + retVal___ = HPMHooks.source.skill.isammotype(sd, skill_id); } if( HPMHooks.count.HP_skill_isammotype_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *skill); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *skill_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_isammotype_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_isammotype_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &skill); + retVal___ = postHookFunc(retVal___, sd, &skill_id); } } 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); @@ -54678,7 +56803,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); @@ -54686,11 +56811,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); @@ -54704,7 +56829,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); @@ -54764,11 +56889,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); @@ -54782,7 +56907,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); @@ -54790,11 +56915,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); @@ -54808,7 +56933,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); @@ -54816,11 +56941,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); @@ -54834,7 +56959,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); @@ -55128,11 +57253,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); @@ -55146,7 +57271,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); @@ -55154,11 +57279,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); @@ -55172,7 +57297,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); @@ -55415,11 +57540,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); @@ -55433,7 +57558,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); @@ -55441,11 +57566,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); @@ -55459,7 +57584,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); @@ -55467,11 +57592,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); @@ -55485,7 +57610,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); @@ -55545,10 +57670,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); @@ -55562,7 +57687,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); @@ -55937,11 +58062,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); @@ -55955,7 +58080,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); @@ -55963,11 +58088,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); @@ -55981,7 +58106,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); @@ -55989,11 +58114,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); @@ -56007,7 +58132,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); @@ -56015,14 +58140,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; @@ -56030,13 +58155,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___; @@ -56093,11 +58218,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); @@ -56111,7 +58236,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); @@ -56183,11 +58308,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); @@ -56201,7 +58326,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); @@ -56376,11 +58501,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); @@ -56394,7 +58519,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); @@ -56434,11 +58559,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); @@ -56452,7 +58577,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); @@ -56820,11 +58945,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); @@ -56838,7 +58963,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); @@ -57133,11 +59258,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); @@ -57151,7 +59276,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); @@ -57255,11 +59380,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); @@ -57273,7 +59398,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); @@ -57281,11 +59406,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); @@ -57299,7 +59424,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); @@ -57307,11 +59432,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); @@ -57325,7 +59450,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); @@ -57359,11 +59484,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); @@ -57377,7 +59502,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); @@ -58146,16 +60271,14 @@ void HP_skill_cooldown_save(struct map_session_data *sd) { } return; } -int HP_skill_maelstrom_suction(struct block_list *bl, va_list ap) { +int HP_skill_get_new_group_id(void) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_skill_maelstrom_suction_pre ) { - int (*preHookFunc) (struct block_list *bl, va_list ap); - for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_maelstrom_suction_pre; hIndex++ ) { - va_list ap___copy; va_copy(ap___copy, ap); - preHookFunc = HPMHooks.list.HP_skill_maelstrom_suction_pre[hIndex].func; - retVal___ = preHookFunc(bl, ap___copy); - va_end(ap___copy); + if( HPMHooks.count.HP_skill_get_new_group_id_pre ) { + int (*preHookFunc) (void); + for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_new_group_id_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_skill_get_new_group_id_pre[hIndex].func; + retVal___ = preHookFunc(); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58163,29 +60286,25 @@ int HP_skill_maelstrom_suction(struct block_list *bl, va_list ap) { } } { - va_list ap___copy; va_copy(ap___copy, ap); - retVal___ = HPMHooks.source.skill.maelstrom_suction(bl, ap___copy); - va_end(ap___copy); + retVal___ = HPMHooks.source.skill.get_new_group_id(); } - if( HPMHooks.count.HP_skill_maelstrom_suction_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, va_list ap); - for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_maelstrom_suction_post; hIndex++ ) { - va_list ap___copy; va_copy(ap___copy, ap); - postHookFunc = HPMHooks.list.HP_skill_maelstrom_suction_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, ap___copy); - va_end(ap___copy); + if( HPMHooks.count.HP_skill_get_new_group_id_post ) { + int (*postHookFunc) (int retVal___); + for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_new_group_id_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_skill_get_new_group_id_post[hIndex].func; + retVal___ = postHookFunc(retVal___); } } return retVal___; } -int HP_skill_get_new_group_id(void) { +bool HP_skill_check_shadowform(struct block_list *bl, int64 damage, int hit) { int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_skill_get_new_group_id_pre ) { - int (*preHookFunc) (void); - for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_new_group_id_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_skill_get_new_group_id_pre[hIndex].func; - retVal___ = preHookFunc(); + 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; @@ -58193,26 +60312,26 @@ int HP_skill_get_new_group_id(void) { } } { - retVal___ = HPMHooks.source.skill.get_new_group_id(); + retVal___ = HPMHooks.source.skill.check_shadowform(bl, damage, hit); } - if( HPMHooks.count.HP_skill_get_new_group_id_post ) { - int (*postHookFunc) (int retVal___); - for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_new_group_id_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_skill_get_new_group_id_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + 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 HP_status_init(bool minimal) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_init_pre ) { - int (*preHookFunc) (void); + int (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_init_pre[hIndex].func; - retVal___ = preHookFunc(); + retVal___ = preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -58220,13 +60339,13 @@ int HP_status_init(void) { } } { - retVal___ = HPMHooks.source.status.init(); + retVal___ = HPMHooks.source.status.init(minimal); } if( HPMHooks.count.HP_status_init_post ) { - int (*postHookFunc) (int retVal___); + int (*postHookFunc) (int retVal___, bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + retVal___ = postHookFunc(retVal___, &minimal); } } return retVal___; @@ -58594,6 +60713,32 @@ int HP_status_revive(struct block_list *bl, unsigned char per_hp, unsigned char } return retVal___; } +int HP_status_fixed_revive(struct block_list *bl, unsigned int per_hp, unsigned int per_sp) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_status_fixed_revive_pre ) { + int (*preHookFunc) (struct block_list *bl, unsigned int *per_hp, unsigned int *per_sp); + for(hIndex = 0; hIndex < HPMHooks.count.HP_status_fixed_revive_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_status_fixed_revive_pre[hIndex].func; + retVal___ = preHookFunc(bl, &per_hp, &per_sp); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.status.fixed_revive(bl, per_hp, per_sp); + } + if( HPMHooks.count.HP_status_fixed_revive_post ) { + int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned int *per_hp, unsigned int *per_sp); + for(hIndex = 0; hIndex < HPMHooks.count.HP_status_fixed_revive_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_status_fixed_revive_post[hIndex].func; + retVal___ = postHookFunc(retVal___, bl, &per_hp, &per_sp); + } + } + return retVal___; +} struct regen_data* HP_status_get_regen_data(struct block_list *bl) { int hIndex = 0; struct regen_data* retVal___ = NULL; @@ -59112,14 +61257,14 @@ int HP_status_isimmune(struct block_list *bl) { } return retVal___; } -int HP_status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int tick, int flag) { +int HP_status_get_sc_def(struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int tick, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_get_sc_def_pre ) { - int (*preHookFunc) (struct block_list *bl, enum sc_type *type, int *rate, int *tick, int *flag); + int (*preHookFunc) (struct block_list *src, struct block_list *bl, enum sc_type *type, int *rate, int *tick, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_def_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_get_sc_def_pre[hIndex].func; - retVal___ = preHookFunc(bl, &type, &rate, &tick, &flag); + retVal___ = preHookFunc(src, bl, &type, &rate, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59127,25 +61272,25 @@ int HP_status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int } } { - retVal___ = HPMHooks.source.status.get_sc_def(bl, type, rate, tick, flag); + retVal___ = HPMHooks.source.status.get_sc_def(src, bl, type, rate, tick, flag); } if( HPMHooks.count.HP_status_get_sc_def_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, enum sc_type *type, int *rate, int *tick, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type *type, int *rate, int *tick, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_def_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_get_sc_def_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &type, &rate, &tick, &flag); + retVal___ = postHookFunc(retVal___, src, bl, &type, &rate, &tick, &flag); } } return retVal___; } -int HP_status_change_start(struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int flag) { +int HP_status_change_start(struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_change_start_pre ) { - int (*preHookFunc) (struct block_list *bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag); + int (*preHookFunc) (struct block_list *src, struct block_list *bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_change_start_pre[hIndex].func; - retVal___ = preHookFunc(bl, &type, &rate, &val1, &val2, &val3, &val4, &tick, &flag); + retVal___ = preHookFunc(src, bl, &type, &rate, &val1, &val2, &val3, &val4, &tick, &flag); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59153,13 +61298,13 @@ int HP_status_change_start(struct block_list *bl, enum sc_type type, int rate, i } } { - retVal___ = HPMHooks.source.status.change_start(bl, type, rate, val1, val2, val3, val4, tick, flag); + retVal___ = HPMHooks.source.status.change_start(src, bl, type, rate, val1, val2, val3, val4, tick, flag); } if( HPMHooks.count.HP_status_change_start_post ) { - int (*postHookFunc) (int retVal___, struct block_list *bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_change_start_post[hIndex].func; - retVal___ = postHookFunc(retVal___, bl, &type, &rate, &val1, &val2, &val3, &val4, &tick, &flag); + retVal___ = postHookFunc(retVal___, src, bl, &type, &rate, &val1, &val2, &val3, &val4, &tick, &flag); } } return retVal___; @@ -59190,11 +61335,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); @@ -59208,7 +61353,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); @@ -59216,11 +61361,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); @@ -59234,7 +61379,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); @@ -59326,13 +61471,13 @@ int HP_status_change_clear_buffs(struct block_list *bl, int type) { } return retVal___; } -void HP_status_calc_bl_(struct block_list *bl, enum scb_flag flag, bool first) { +void HP_status_calc_bl_(struct block_list *bl, enum scb_flag flag, enum e_status_calc_opt opt) { int hIndex = 0; if( HPMHooks.count.HP_status_calc_bl__pre ) { - void (*preHookFunc) (struct block_list *bl, enum scb_flag *flag, bool *first); + void (*preHookFunc) (struct block_list *bl, enum scb_flag *flag, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_bl__pre[hIndex].func; - preHookFunc(bl, &flag, &first); + preHookFunc(bl, &flag, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59340,25 +61485,25 @@ void HP_status_calc_bl_(struct block_list *bl, enum scb_flag flag, bool first) { } } { - HPMHooks.source.status.calc_bl_(bl, flag, first); + HPMHooks.source.status.calc_bl_(bl, flag, opt); } if( HPMHooks.count.HP_status_calc_bl__post ) { - void (*postHookFunc) (struct block_list *bl, enum scb_flag *flag, bool *first); + void (*postHookFunc) (struct block_list *bl, enum scb_flag *flag, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_bl__post[hIndex].func; - postHookFunc(bl, &flag, &first); + postHookFunc(bl, &flag, &opt); } } return; } -int HP_status_calc_mob_(struct mob_data *md, bool first) { +int HP_status_calc_mob_(struct mob_data *md, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_mob__pre ) { - int (*preHookFunc) (struct mob_data *md, bool *first); + int (*preHookFunc) (struct mob_data *md, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mob__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_mob__pre[hIndex].func; - retVal___ = preHookFunc(md, &first); + retVal___ = preHookFunc(md, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59366,25 +61511,25 @@ int HP_status_calc_mob_(struct mob_data *md, bool first) { } } { - retVal___ = HPMHooks.source.status.calc_mob_(md, first); + retVal___ = HPMHooks.source.status.calc_mob_(md, opt); } if( HPMHooks.count.HP_status_calc_mob__post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, bool *first); + int (*postHookFunc) (int retVal___, struct mob_data *md, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mob__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_mob__post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &first); + retVal___ = postHookFunc(retVal___, md, &opt); } } return retVal___; } -int HP_status_calc_pet_(struct pet_data *pd, bool first) { +int HP_status_calc_pet_(struct pet_data *pd, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_pet__pre ) { - int (*preHookFunc) (struct pet_data *pd, bool *first); + int (*preHookFunc) (struct pet_data *pd, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pet__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_pet__pre[hIndex].func; - retVal___ = preHookFunc(pd, &first); + retVal___ = preHookFunc(pd, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59392,25 +61537,25 @@ int HP_status_calc_pet_(struct pet_data *pd, bool first) { } } { - retVal___ = HPMHooks.source.status.calc_pet_(pd, first); + retVal___ = HPMHooks.source.status.calc_pet_(pd, opt); } if( HPMHooks.count.HP_status_calc_pet__post ) { - int (*postHookFunc) (int retVal___, struct pet_data *pd, bool *first); + int (*postHookFunc) (int retVal___, struct pet_data *pd, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pet__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_pet__post[hIndex].func; - retVal___ = postHookFunc(retVal___, pd, &first); + retVal___ = postHookFunc(retVal___, pd, &opt); } } return retVal___; } -int HP_status_calc_pc_(struct map_session_data *sd, bool first) { +int HP_status_calc_pc_(struct map_session_data *sd, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_pc__pre ) { - int (*preHookFunc) (struct map_session_data *sd, bool *first); + int (*preHookFunc) (struct map_session_data *sd, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pc__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_pc__pre[hIndex].func; - retVal___ = preHookFunc(sd, &first); + retVal___ = preHookFunc(sd, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59418,25 +61563,25 @@ int HP_status_calc_pc_(struct map_session_data *sd, bool first) { } } { - retVal___ = HPMHooks.source.status.calc_pc_(sd, first); + retVal___ = HPMHooks.source.status.calc_pc_(sd, opt); } if( HPMHooks.count.HP_status_calc_pc__post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, bool *first); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_pc__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_pc__post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &first); + retVal___ = postHookFunc(retVal___, sd, &opt); } } return retVal___; } -int HP_status_calc_homunculus_(struct homun_data *hd, bool first) { +int HP_status_calc_homunculus_(struct homun_data *hd, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_homunculus__pre ) { - int (*preHookFunc) (struct homun_data *hd, bool *first); + int (*preHookFunc) (struct homun_data *hd, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_homunculus__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_homunculus__pre[hIndex].func; - retVal___ = preHookFunc(hd, &first); + retVal___ = preHookFunc(hd, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59444,25 +61589,25 @@ int HP_status_calc_homunculus_(struct homun_data *hd, bool first) { } } { - retVal___ = HPMHooks.source.status.calc_homunculus_(hd, first); + retVal___ = HPMHooks.source.status.calc_homunculus_(hd, opt); } if( HPMHooks.count.HP_status_calc_homunculus__post ) { - int (*postHookFunc) (int retVal___, struct homun_data *hd, bool *first); + int (*postHookFunc) (int retVal___, struct homun_data *hd, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_homunculus__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_homunculus__post[hIndex].func; - retVal___ = postHookFunc(retVal___, hd, &first); + retVal___ = postHookFunc(retVal___, hd, &opt); } } return retVal___; } -int HP_status_calc_mercenary_(struct mercenary_data *md, bool first) { +int HP_status_calc_mercenary_(struct mercenary_data *md, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_mercenary__pre ) { - int (*preHookFunc) (struct mercenary_data *md, bool *first); + int (*preHookFunc) (struct mercenary_data *md, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mercenary__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_mercenary__pre[hIndex].func; - retVal___ = preHookFunc(md, &first); + retVal___ = preHookFunc(md, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59470,25 +61615,25 @@ int HP_status_calc_mercenary_(struct mercenary_data *md, bool first) { } } { - retVal___ = HPMHooks.source.status.calc_mercenary_(md, first); + retVal___ = HPMHooks.source.status.calc_mercenary_(md, opt); } if( HPMHooks.count.HP_status_calc_mercenary__post ) { - int (*postHookFunc) (int retVal___, struct mercenary_data *md, bool *first); + int (*postHookFunc) (int retVal___, struct mercenary_data *md, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mercenary__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_mercenary__post[hIndex].func; - retVal___ = postHookFunc(retVal___, md, &first); + retVal___ = postHookFunc(retVal___, md, &opt); } } return retVal___; } -int HP_status_calc_elemental_(struct elemental_data *ed, bool first) { +int HP_status_calc_elemental_(struct elemental_data *ed, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_elemental__pre ) { - int (*preHookFunc) (struct elemental_data *ed, bool *first); + int (*preHookFunc) (struct elemental_data *ed, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_elemental__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_elemental__pre[hIndex].func; - retVal___ = preHookFunc(ed, &first); + retVal___ = preHookFunc(ed, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59496,24 +61641,24 @@ int HP_status_calc_elemental_(struct elemental_data *ed, bool first) { } } { - retVal___ = HPMHooks.source.status.calc_elemental_(ed, first); + retVal___ = HPMHooks.source.status.calc_elemental_(ed, opt); } if( HPMHooks.count.HP_status_calc_elemental__post ) { - int (*postHookFunc) (int retVal___, struct elemental_data *ed, bool *first); + int (*postHookFunc) (int retVal___, struct elemental_data *ed, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_elemental__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_elemental__post[hIndex].func; - retVal___ = postHookFunc(retVal___, ed, &first); + retVal___ = postHookFunc(retVal___, ed, &opt); } } return retVal___; } -void HP_status_calc_misc(struct block_list *bl, struct status_data *status, int level) { +void HP_status_calc_misc(struct block_list *bl, struct status_data *st, int level) { int hIndex = 0; if( HPMHooks.count.HP_status_calc_misc_pre ) { - void (*preHookFunc) (struct block_list *bl, struct status_data *status, int *level); + void (*preHookFunc) (struct block_list *bl, struct status_data *st, int *level); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_misc_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_misc_pre[hIndex].func; - preHookFunc(bl, status, &level); + preHookFunc(bl, st, &level); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -59521,13 +61666,13 @@ void HP_status_calc_misc(struct block_list *bl, struct status_data *status, int } } { - HPMHooks.source.status.calc_misc(bl, status, level); + HPMHooks.source.status.calc_misc(bl, st, level); } if( HPMHooks.count.HP_status_calc_misc_post ) { - void (*postHookFunc) (struct block_list *bl, struct status_data *status, int *level); + void (*postHookFunc) (struct block_list *bl, struct status_data *st, int *level); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_misc_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_misc_post[hIndex].func; - postHookFunc(bl, status, &level); + postHookFunc(bl, st, &level); } } return; @@ -60125,14 +62270,14 @@ unsigned int HP_status_base_pc_maxsp(struct map_session_data *sd, struct status_ } return retVal___; } -int HP_status_calc_npc_(struct npc_data *nd, bool first) { +int HP_status_calc_npc_(struct npc_data *nd, enum e_status_calc_opt opt) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_calc_npc__pre ) { - int (*preHookFunc) (struct npc_data *nd, bool *first); + int (*preHookFunc) (struct npc_data *nd, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_npc__pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_npc__pre[hIndex].func; - retVal___ = preHookFunc(nd, &first); + retVal___ = preHookFunc(nd, &opt); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -60140,13 +62285,13 @@ int HP_status_calc_npc_(struct npc_data *nd, bool first) { } } { - retVal___ = HPMHooks.source.status.calc_npc_(nd, first); + retVal___ = HPMHooks.source.status.calc_npc_(nd, opt); } if( HPMHooks.count.HP_status_calc_npc__post ) { - int (*postHookFunc) (int retVal___, struct npc_data *nd, bool *first); + int (*postHookFunc) (int retVal___, struct npc_data *nd, enum e_status_calc_opt *opt); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_npc__post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_npc__post[hIndex].func; - retVal___ = postHookFunc(retVal___, nd, &first); + retVal___ = postHookFunc(retVal___, nd, &opt); } } return retVal___; @@ -60856,11 +63001,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); @@ -60874,7 +63019,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); @@ -61582,14 +63727,14 @@ void HP_trade_commit(struct map_session_data *sd) { return; } /* unit */ -int HP_unit_init(void) { +int HP_unit_init(bool minimal) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_unit_init_pre ) { - int (*preHookFunc) (void); + int (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_unit_init_pre[hIndex].func; - retVal___ = preHookFunc(); + retVal___ = preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -61597,13 +63742,13 @@ int HP_unit_init(void) { } } { - retVal___ = HPMHooks.source.unit.init(); + retVal___ = HPMHooks.source.unit.init(minimal); } if( HPMHooks.count.HP_unit_init_post ) { - int (*postHookFunc) (int retVal___); + int (*postHookFunc) (int retVal___, bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_init_post[hIndex].func; - retVal___ = postHookFunc(retVal___); + retVal___ = postHookFunc(retVal___, &minimal); } } return retVal___; @@ -61686,11 +63831,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); @@ -61704,7 +63849,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); @@ -61712,11 +63857,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); @@ -61730,7 +63875,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); @@ -61764,11 +63909,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); @@ -61782,7 +63927,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); @@ -61816,11 +63961,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); @@ -61834,7 +63979,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); @@ -62180,11 +64325,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); @@ -62198,7 +64343,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); @@ -62206,11 +64351,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); @@ -62224,7 +64369,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); @@ -62518,11 +64663,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); @@ -62536,7 +64681,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); @@ -62621,14 +64766,14 @@ 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, int sdelay, int ddelay, int64 damage, short div, unsigned char 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, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *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); + retVal___ = preHookFunc(src, target, &sdelay, &ddelay, &damage, &div, &type, &damage2); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62636,13 +64781,13 @@ 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); + retVal___ = HPMHooks.source.unit.fixdamage(src, target, sdelay, ddelay, damage, div, type, damage2); } if( HPMHooks.count.HP_unit_fixdamage_post ) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, 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, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); for(hIndex = 0; hIndex < HPMHooks.count.HP_unit_fixdamage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_unit_fixdamage_post[hIndex].func; - retVal___ = postHookFunc(retVal___, src, target, &tick, &sdelay, &ddelay, &damage, &div, &type, &damage2); + retVal___ = postHookFunc(retVal___, src, target, &sdelay, &ddelay, &damage, &div, &type, &damage2); } } return retVal___; @@ -62776,13 +64921,13 @@ int HP_unit_free(struct block_list *bl, clr_type clrtype) { return retVal___; } /* vending */ -void HP_vending_init(void) { +void HP_vending_init(bool minimal) { int hIndex = 0; if( HPMHooks.count.HP_vending_init_pre ) { - void (*preHookFunc) (void); + void (*preHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_vending_init_pre[hIndex].func; - preHookFunc(); + preHookFunc(&minimal); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -62790,13 +64935,13 @@ void HP_vending_init(void) { } } { - HPMHooks.source.vending.init(); + HPMHooks.source.vending.init(minimal); } if( HPMHooks.count.HP_vending_init_post ) { - void (*postHookFunc) (void); + void (*postHookFunc) (bool *minimal); for(hIndex = 0; hIndex < HPMHooks.count.HP_vending_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_vending_init_post[hIndex].func; - postHookFunc(); + postHookFunc(&minimal); } } return; diff --git a/src/plugins/HPMHooking/HPMHooking.sources.inc b/src/plugins/HPMHooking/HPMHooking.sources.inc index e6dd89814..53bb6bcad 100644 --- a/src/plugins/HPMHooking/HPMHooking.sources.inc +++ b/src/plugins/HPMHooking/HPMHooking.sources.inc @@ -30,6 +30,7 @@ memcpy(&HPMHooks.source.mob, mob, sizeof(struct mob_interface)); memcpy(&HPMHooks.source.npc, npc, sizeof(struct npc_interface)); memcpy(&HPMHooks.source.party, party, sizeof(struct party_interface)); memcpy(&HPMHooks.source.path, path, sizeof(struct path_interface)); +memcpy(&HPMHooks.source.pcg, pcg, sizeof(struct pc_groups_interface)); memcpy(&HPMHooks.source.pc, pc, sizeof(struct pc_interface)); memcpy(&HPMHooks.source.pet, pet, sizeof(struct pet_interface)); memcpy(&HPMHooks.source.quest, quest, sizeof(struct quest_interface)); diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index 53f44a0b4..0f1698d2a 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -6,6 +6,11 @@ # # # MYPLUGINS = my_cool_plugin my_second_plugin # # # +# This is only needed if you want to build your plugin through # +# 'make plugins' or 'make all'. If you don't add it to this list, # +# you will still be able to build your plugin through # +# 'make plugin.my_plugin' # +# # # Note: DO NOT include the .c extension!!! # MYPLUGINS = @@ -13,13 +18,21 @@ MYPLUGINS = # # ######### DO NOT EDIT ANYTHING BELOW THIS LINE!!! ################## +# All plugins in the src/plugins directory +ALLPLUGINS = $(basename $(wildcard *.c)) + +# Plugins that will be built through 'make plugins' or 'make all' PLUGINS = sample db2sql HPMHooking $(MYPLUGINS) -COMMON_H = $(shell ls ../common/*.h) -CONFIG_H = $(shell ls ../config/*.h ../config/*/*.h) -MAP_H = $(shell ls ../map/*.h) -CHAR_H = $(shell ls ../char/*.h) -LOGIN_H = $(shell ls ../login/*.h) +COMMON_D = ../common +COMMON_H = $(wildcard $(COMMON_D)/*.h) + +CONFIG_D = ../config +CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) + +MAP_H = $(wildcard ../map/*.h) +CHAR_H = $(wildcard ../char/*.h) +LOGIN_H = $(wildcard ../login/*.h) ALL_H = $(COMMON_H) $(CONFIG_H) $(MAP_H) $(CHAR_H) $(LOGIN_H) @SET_MAKE@ @@ -28,11 +41,11 @@ CC = @CC@ export CC ##################################################################### -.PHONY: all $(PLUGINS) clean buildclean help +.PHONY: all $(ALLPLUGINS) clean buildclean help all: $(PLUGINS) Makefile -$(PLUGINS): %: ../../plugins/%@DLLEXT@ +$(ALLPLUGINS): %: ../../plugins/%@DLLEXT@ buildclean: @echo " CLEAN plugins (build temp files)" diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c index d769a601e..46d654e0d 100644 --- a/src/plugins/db2sql.c +++ b/src/plugins/db2sql.c @@ -5,7 +5,9 @@ #include "../common/strlib.h" #include "../common/timer.h" #include "../common/HPMi.h" +#include "../common/malloc.h" #include "../common/mmo.h" +#include "../common/conf.h" #include "../config/core.h" #include "../map/clif.h" #include "../map/pc.h" @@ -14,125 +16,194 @@ #include <stdio.h> #include <stdlib.h> +#include "../common/HPMDataCheck.h" + HPExport struct hplugin_info pinfo = { - "DB2SQL", // Plugin name - SERVER_TYPE_MAP,// Which server types this plugin works with? - "0.4", // Plugin version - HPM_VERSION, // HPM Version (don't change, macro is automatically updated) + "DB2SQL", // Plugin name + SERVER_TYPE_MAP, // Which server types this plugin works with? + "0.5", // Plugin version + HPM_VERSION, // HPM Version (don't change, macro is automatically updated) }; -SqlStmt* stmt; +struct { + FILE *fp; + struct { + char *p; + size_t len; + } buf[4]; + char *db_name; +} tosql; +bool torun = false; -int (*parse_dbrow)(char** str, const char* source, int line, int scriptopt); +int (*itemdb_readdb_libconfig_sub) (config_setting_t *it, int n, const char *source); -char* trimbraces(char* str) { - size_t start; - size_t end; - - if( str == NULL ) - return str; - - for( start = 0; str[start] && str[start] == '{'; ++start ) - ; - for( end = strlen(str); start < end && str[end-1] && (str[end-1] == '}' || str[end-1] == '\n'); --end ) - ; - if( start == end ) - *str = '\0'; - else { - str[end] = '\0'; - memmove(str,str+start,end-start+1); - trim(str); +void hstr(const char *str) { + if( strlen(str) > tosql.buf[3].len ) { + tosql.buf[3].len = tosql.buf[3].len + strlen(str) + 1000; + RECREATE(tosql.buf[3].p,char,tosql.buf[3].len); } - return str; + safestrncpy(tosql.buf[3].p,str,strlen(str)); + normalize_name(tosql.buf[3].p,"\t\n "); } -int db2sql(char** str, const char* source, int line, int scriptopt) { +int db2sql(config_setting_t *entry, int n, const char *source) { struct item_data *it = NULL; - unsigned char offset = 0; -#ifdef RENEWAL - if( map->db_use_sql_item_db ) offset = 1; -#endif // RENEWAL - if( (it = itemdb->exists(parse_dbrow(str,source,line,scriptopt))) ) { - /* renewal has the 'matk' and 'equip_level' is now 'equip_level_min', and there is a new 'equip_level_max' field */ -#ifdef RENEWAL - if( SQL_SUCCESS != SQL->StmtPrepare(stmt, "REPLACE INTO `%s` (`id`,`name_english`,`name_japanese`,`type`,`price_buy`,`price_sell`,`weight`,`atk`,`matk`,`defence`,`range`,`slots`,`equip_jobs`,`equip_upper`,`equip_genders`,`equip_locations`,`weapon_level`,`equip_level_min`,`equip_level_max`,`refineable`,`view`,`script`,`equip_script`,`unequip_script`) VALUES ('%u',?,?,'%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u',?,?,?)",map->item_db_re_db, - it->nameid,it->flag.delay_consume?IT_DELAYCONSUME:it->type,it->value_buy,it->value_sell,it->weight,it->atk,it->matk,it->def,it->range,it->slot,(unsigned int)strtoul(str[11+offset],NULL,0),atoi(str[12+offset]),atoi(str[13+offset]),atoi(str[14+offset]),it->wlv,it->elv,it->elvmax,atoi(str[17+offset]),it->look) ) -#else // not RENEWAL - if( SQL_SUCCESS != SQL->StmtPrepare(stmt, "REPLACE INTO `%s` (`id`,`name_english`,`name_japanese`,`type`,`price_buy`,`price_sell`,`weight`,`atk`,`defence`,`range`,`slots`,`equip_jobs`,`equip_upper`,`equip_genders`,`equip_locations`,`weapon_level`,`equip_level`,`refineable`,`view`,`script`,`equip_script`,`unequip_script`) VALUES ('%u',?,?,'%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u',?,?,?)",map->item_db_db, - it->nameid,it->flag.delay_consume?IT_DELAYCONSUME:it->type,it->value_buy,it->value_sell,it->weight,it->atk,it->def,it->range,it->slot,(unsigned int)strtoul(str[11],NULL,0),atoi(str[12]),atoi(str[13]),atoi(str[14]),it->wlv,it->elv,atoi(str[17]),it->look) ) -#endif // RENEWAL - SqlStmt_ShowDebug(stmt); - else { - if ( SQL_SUCCESS != SQL->StmtBindParam(stmt, 0, SQLDT_STRING, it->name, strlen(it->name)) ) - SqlStmt_ShowDebug(stmt); - else { - if ( SQL_SUCCESS != SQL->StmtBindParam(stmt, 1, SQLDT_STRING, it->jname, strlen(it->jname)) ) - SqlStmt_ShowDebug(stmt); - else { -#ifdef RENEWAL - if( map->db_use_sql_item_db ) offset += 1; -#endif // RENEWAL - if( it->script ) trimbraces(str[19+offset]); - if ( SQL_SUCCESS != SQL->StmtBindParam(stmt, 2, SQLDT_STRING, it->script?str[19+offset]:"", it->script?strlen(str[19+offset]):0) ) - SqlStmt_ShowDebug(stmt); - else { - if( it->equip_script ) trimbraces(str[20+offset]); - if ( SQL_SUCCESS != SQL->StmtBindParam(stmt, 3, SQLDT_STRING, it->equip_script?str[20+offset]:"", it->equip_script?strlen(str[20+offset]):0) ) - SqlStmt_ShowDebug(stmt); - else { - if( it->unequip_script ) trimbraces(str[21+offset]); - if ( SQL_SUCCESS != SQL->StmtBindParam(stmt, 4, SQLDT_STRING, it->unequip_script?str[21+offset]:"", it->unequip_script?strlen(str[21+offset]):0) ) - SqlStmt_ShowDebug(stmt); - else { - if( SQL_SUCCESS != SQL->StmtExecute(stmt) ) - SqlStmt_ShowDebug(stmt); - } - } - } - } - } - } - return it->nameid; - } - return 0; -} + + if( (it = itemdb->exists(itemdb_readdb_libconfig_sub(entry,n,source))) ) { + char e_name[ITEM_NAME_LENGTH*2+1], e_jname[ITEM_NAME_LENGTH*2+1]; + const char *bonus = NULL; + char *str; + int i32; + unsigned int ui32, job = 0, upper = 0; + config_setting_t *t = NULL; -CPCMD(db2sql) { + SQL->EscapeString(NULL, e_name, it->name); + SQL->EscapeString(NULL, e_jname, it->jname); + if( it->script ) { libconfig->setting_lookup_string(entry, "Script", &bonus); hstr(bonus); str = tosql.buf[3].p; if ( strlen(str) > tosql.buf[0].len ) { tosql.buf[0].len = tosql.buf[0].len + strlen(str) + 1000; RECREATE(tosql.buf[0].p,char,tosql.buf[0].len); } SQL->EscapeString(NULL, tosql.buf[0].p, str); } + if( it->equip_script ) { libconfig->setting_lookup_string(entry, "OnEquipScript", &bonus); hstr(bonus); str = tosql.buf[3].p; if ( strlen(str) > tosql.buf[1].len ) { tosql.buf[1].len = tosql.buf[1].len + strlen(str) + 1000; RECREATE(tosql.buf[1].p,char,tosql.buf[1].len); } SQL->EscapeString(NULL, tosql.buf[1].p, str); } + if( it->unequip_script ) { libconfig->setting_lookup_string(entry, "OnUnequipScript", &bonus); hstr(bonus); str = tosql.buf[3].p; if ( strlen(str) > tosql.buf[2].len ) { tosql.buf[2].len = tosql.buf[2].len + strlen(str) + 1000; RECREATE(tosql.buf[2].p,char,tosql.buf[2].len); } SQL->EscapeString(NULL, tosql.buf[2].p, str); } + + if( libconfig->setting_lookup_int(entry, "Job", &i32) ) // This is an unsigned value, do not check for >= 0 + ui32 = (unsigned int)i32; + else + ui32 = UINT_MAX; + + job = ui32; + + if( libconfig->setting_lookup_int(entry, "Upper", &i32) && i32 >= 0 ) + ui32 = (unsigned int)i32; + else + ui32 = ITEMUPPER_ALL; + + upper = ui32; + + /* check if we have the equip_level_max, if so we send it -- otherwise we send NULL */ + if( (t = libconfig->setting_get_member(entry, "EquipLv")) && config_setting_is_aggregate(t) && libconfig->setting_length(t) >= 2 ) + fprintf(tosql.fp,"REPLACE INTO `%s` VALUES ('%u','%s','%s','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%s','%s','%s');\n", + tosql.db_name,it->nameid,e_name,e_jname,it->flag.delay_consume?IT_DELAYCONSUME:it->type,it->value_buy,it->value_sell,it->weight,it->atk,it->matk,it->def,it->range,it->slot,job,upper,it->sex,it->equip,it->wlv,it->elv,it->elvmax,it->flag.no_refine?0:1,it->look,it->flag.bindonequip?1:0,it->script?tosql.buf[0].p:"",it->equip_script?tosql.buf[1].p:"",it->unequip_script?tosql.buf[2].p:""); + else + fprintf(tosql.fp,"REPLACE INTO `%s` VALUES ('%u','%s','%s','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u','%u',NULL,'%u','%u','%u','%s','%s','%s');\n", + tosql.db_name,it->nameid,e_name,e_jname,it->flag.delay_consume?IT_DELAYCONSUME:it->type,it->value_buy,it->value_sell,it->weight,it->atk,it->matk,it->def,it->range,it->slot,job,upper,it->sex,it->equip,it->wlv,it->elv,it->flag.no_refine?0:1,it->look,it->flag.bindonequip?1:0,it->script?tosql.buf[0].p:"",it->equip_script?tosql.buf[1].p:"",it->unequip_script?tosql.buf[2].p:""); + } + return it?it->nameid:0; +} +void totable(void) { + fprintf(tosql.fp,"#\n" + "# Table structure for table `%s`\n" + "#\n" + "\n" + "DROP TABLE IF EXISTS `%s`;\n" + "CREATE TABLE `%s` (\n" + " `id` smallint(5) unsigned NOT NULL DEFAULT '0',\n" + " `name_english` varchar(50) NOT NULL DEFAULT '',\n" + " `name_japanese` varchar(50) NOT NULL DEFAULT '',\n" + " `type` tinyint(2) unsigned NOT NULL DEFAULT '0',\n" + " `price_buy` mediumint(10) DEFAULT NULL,\n" + " `price_sell` mediumint(10) DEFAULT NULL,\n" + " `weight` smallint(5) unsigned DEFAULT NULL,\n" + " `atk` smallint(5) unsigned DEFAULT NULL,\n" + " `matk` smallint(5) unsigned DEFAULT NULL,\n" + " `defence` smallint(5) unsigned DEFAULT NULL,\n" + " `range` tinyint(2) unsigned DEFAULT NULL,\n" + " `slots` tinyint(2) unsigned DEFAULT NULL,\n" + " `equip_jobs` int(12) unsigned DEFAULT NULL,\n" + " `equip_upper` tinyint(8) unsigned DEFAULT NULL,\n" + " `equip_genders` tinyint(2) unsigned DEFAULT NULL,\n" + " `equip_locations` smallint(4) unsigned DEFAULT NULL,\n" + " `weapon_level` tinyint(2) unsigned DEFAULT NULL,\n" + " `equip_level_min` smallint(5) unsigned DEFAULT NULL,\n" + " `equip_level_max` smallint(5) unsigned DEFAULT NULL,\n" + " `refineable` tinyint(1) unsigned DEFAULT NULL,\n" + " `view` smallint(3) unsigned DEFAULT NULL,\n" + " `bindonequip` tinyint(1) unsigned DEFAULT NULL,\n" + " `script` text,\n" + " `equip_script` text,\n" + " `unequip_script` text,\n" + " PRIMARY KEY (`id`)\n" + ") ENGINE=MyISAM;\n" + "\n",tosql.db_name,tosql.db_name,tosql.db_name); +} +void do_db2sql(void) { if( map->db_use_sql_item_db ) { ShowInfo("db2sql: this should not be used with 'db_use_sql_item_db' enabled, skipping...\n"); return; } - stmt = SQL->StmtMalloc(mysql_handle); - if( stmt == NULL ) { - SqlStmt_ShowDebug(stmt); - return; - } - /* link */ - parse_dbrow = itemdb->parse_dbrow; - itemdb->parse_dbrow = db2sql; - /* empty table */ -#ifdef RENEWAL - if ( SQL_ERROR == SQL->Query(mysql_handle, "DELETE FROM `%s`", map->item_db_re_db ) ) -#else // not RENEWAL - if ( SQL_ERROR == SQL->Query(mysql_handle, "DELETE FROM `%s`", map->item_db_db) ) -#endif // RENEWAL - Sql_ShowDebug(mysql_handle); - else { - itemdb->reload(); - } + itemdb_readdb_libconfig_sub = itemdb->readdb_libconfig_sub; + itemdb->readdb_libconfig_sub = db2sql; + /* */ + + if ((tosql.fp = fopen("sql-files/item_db_re.sql", "wt+")) == NULL) { + ShowError("itemdb_tosql: File not found \"%s\".\n", "sql-files/item_db_re.sql"); + return; + } + + tosql.db_name = map->item_db_re_db; + totable(); + + memset(&tosql.buf, 0, sizeof(tosql.buf) ); + + itemdb->clear(false); + itemdb->readdb_libconfig("re/item_db.conf"); + + fclose(tosql.fp); + + if ((tosql.fp = fopen("sql-files/item_db.sql", "wt+")) == NULL) { + ShowError("itemdb_tosql: File not found \"%s\".\n", "sql-files/item_db.sql"); + return; + } + + tosql.db_name = map->item_db_db; + totable(); + + itemdb->clear(false); + itemdb->readdb_libconfig("pre-re/item_db.conf"); + + fclose(tosql.fp); + + if ((tosql.fp = fopen("sql-files/item_db2.sql", "wt+")) == NULL) { + ShowError("itemdb_tosql: File not found \"%s\".\n", "sql-files/item_db2.sql"); + return; + } + + tosql.db_name = map->item_db2_db; + totable(); + + itemdb->clear(false); + itemdb->readdb_libconfig("item_db2.conf"); + + fclose(tosql.fp); + /* unlink */ - itemdb->parse_dbrow = parse_dbrow; + itemdb->readdb_libconfig_sub = itemdb_readdb_libconfig_sub; - SQL->StmtFree(stmt); + if( tosql.buf[0].p ) aFree(tosql.buf[0].p); + if( tosql.buf[1].p ) aFree(tosql.buf[1].p); + if( tosql.buf[2].p ) aFree(tosql.buf[2].p); + if( tosql.buf[3].p ) aFree(tosql.buf[3].p); } - -HPExport void plugin_init (void) { +CPCMD(db2sql) { + do_db2sql(); +} +void db2sql_arg(char *param) { + map->minimal = torun = true; +} +HPExport void server_preinit (void) { SQL = GET_SYMBOL("SQL"); itemdb = GET_SYMBOL("itemdb"); map = GET_SYMBOL("map"); strlib = GET_SYMBOL("strlib"); + iMalloc = GET_SYMBOL("iMalloc"); + libconfig = GET_SYMBOL("libconfig"); + - HPMi->addCPCommand("server:tools:db2sql",CPCMD_A(db2sql)); + addArg("--db2sql",false,db2sql_arg,NULL); +} +HPExport void plugin_init (void) { + addCPCommand("server:tools:db2sql",db2sql); +} +HPExport void server_online (void) { + if( torun ) + do_db2sql(); } diff --git a/src/plugins/sample.c b/src/plugins/sample.c index d1a95c71d..750ab31f9 100644 --- a/src/plugins/sample.c +++ b/src/plugins/sample.c @@ -14,6 +14,8 @@ #include "../map/pc.h" #include "../map/clif.h" +#include "../common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */ + HPExport struct hplugin_info pinfo = { "Sample", // Plugin name SERVER_TYPE_MAP,// Which server types this plugin works with? @@ -36,6 +38,7 @@ struct sample_data_struct { struct point lastMSGPosition; unsigned int someNumber; }; + /* sample packet implementation */ /* cmd 0xf3 - it is a client-server existent id, for clif_parse_GlobalMessage */ /* in this sample we do nothing and simply redirect */ @@ -48,7 +51,7 @@ void sample_packet0f3(int fd) { ShowInfo("sample_packet0f3: Hello World! received 0xf3 for '%s', redirecting!\n",sd->status.name); /* sample usage of appending data to a socket_data (session[]) entry */ - if( !(data = HPMi->getFromSession(session[fd],HPMi->pid,0)) ) { + if( !(data = getFromSession(session[fd],0)) ) { CREATE(data,struct sample_data_struct,1); data->lastMSGPosition.map = sd->status.last_point.map; @@ -57,17 +60,17 @@ void sample_packet0f3(int fd) { data->someNumber = rand()%777; ShowInfo("Created Appended session[] data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); - HPMi->addToSession(session[fd],data,HPMi->pid,0,true); + addToSession(session[fd],data,0,true); } else { ShowInfo("Existent Appended session[] data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); if( rand()%4 == 2 ) { ShowInfo("Removing Appended session[] data\n"); - HPMi->removeFromSession(session[fd],HPMi->pid,0); + removeFromSession(session[fd],0); } } /* sample usage of appending data to a map_session_data (sd) entry */ - if( !(data = HPMi->getFromMSD(sd,HPMi->pid,0)) ) { + if( !(data = getFromMSD(sd,0)) ) { CREATE(data,struct sample_data_struct,1); data->lastMSGPosition.map = sd->status.last_point.map; @@ -76,12 +79,12 @@ void sample_packet0f3(int fd) { data->someNumber = rand()%777; ShowInfo("Created Appended map_session_data data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); - HPMi->addToMSD(sd,data,HPMi->pid,0,true); + addToMSD(sd,data,0,true); } else { ShowInfo("Existent Appended map_session_data data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); if( rand()%4 == 2 ) { ShowInfo("Removing Appended map_session_data data\n"); - HPMi->removeFromMSD(sd,HPMi->pid,0); + removeFromMSD(sd,0); } } @@ -108,6 +111,10 @@ int my_pc_dropitem_post(int retVal, struct map_session_data *sd,int *n,int *amou } return 1; } +void parse_my_setting(const char *val) { + ShowDebug("Received 'my_setting:%s'\n",val); + /* do anything with the var e.g. config_switch(val) */ +} /* run when server starts */ HPExport void plugin_init (void) { char *server_type; @@ -124,7 +131,7 @@ HPExport void plugin_init (void) { script = GET_SYMBOL("script"); clif = GET_SYMBOL("clif"); pc = GET_SYMBOL("pc"); - + /* session[] */ session = GET_SYMBOL("session"); @@ -138,31 +145,43 @@ HPExport void plugin_init (void) { ShowInfo ("I'm being run from the '%s' filename\n", server_name); - if( HPMi->addCommand != NULL ) {//link our '@sample' command - HPMi->addCommand("sample",ACMD_A(sample)); - } + /* addAtcommand("command-key",command-function) tells map server to call ACMD(sample) when "sample" command is used */ + /* - it will print a warning when used on a non-map-server plugin */ + addAtcommand("sample",sample);//link our '@sample' command - if( HPMi->addScript != NULL ) {//link our 'sample' script command - HPMi->addScript("sample","i",BUILDIN_A(sample)); - } + /* addScriptCommand("script-command-name","script-command-params-info",script-function) tells map server to call BUILDIN(sample) for the "sample(i)" command */ + /* - it will print a warning when used on a non-map-server plugin */ + addScriptCommand("sample","i",sample); - if( HPMi->addCPCommand != NULL ) {//link our 'sample' console command - HPMi->addCPCommand("this:is:a:sample",CPCMD_A(sample)); - } - - if( HPMi->addPacket != NULL ) {//link our 'sample' packet to map-server - HPMi->addPacket(0xf3,-1,sample_packet0f3,hpClif_Parse,HPMi->pid); - } + /* addCPCommand("console-command-name",command-function) tells server to call CPCMD(sample) for the 'this is a sample <optional-args>' console call */ + /* in "console-command-name" usage of ':' indicates a category, for example 'this:is:a:sample' translates to 'this is a sample', + * therefore 'this -> is -> a -> sample', it can be used to aggregate multiple commands under the same category or to append commands to existing categories + * categories inherit the special keyword 'help' which prints the subsequent commands, e.g. 'server help' prints all categories and commands under 'server' + * therefore 'this help' would inform about 'is (category) -> a (category) -> sample (command)'*/ + addCPCommand("this:is:a:sample",sample); + /* addPacket(packetID,packetLength,packetFunction,packetIncomingPoint) */ + /* adds packetID of packetLength (-1 for dynamic length where length is defined in the packet { packetID (2 Byte) , packetLength (2 Byte) , ... }) + * to trigger packetFunction in the packetIncomingPoint section ( available points listed in enum HPluginPacketHookingPoints within src/common/HPMi.h ) */ + addPacket(0xf3,-1,sample_packet0f3,hpClif_Parse); + /* in this sample we add a PreHook to pc->dropitem */ /* to identify whether the item being dropped is on amount higher than 1 */ /* if so, it stores the amount on a variable (my_pc_dropitem_storage) and changes the amount to 1 */ addHookPre("pc->dropitem",my_pc_dropitem_pre); + /* in this sample we add a PostHook to pc->dropitem */ /* if the original pc->dropitem was successful and the amount stored on my_pc_dropitem_storage is higher than 1, */ /* our posthook will display a message to the user about the cap */ /* - by checking whether it was successful (retVal value) it allows for the originals conditions to take place */ - addHookPost("pc->dropitem",my_pc_dropitem_post); + addHookPost("pc->dropitem",my_pc_dropitem_post); +} +/* triggered when server starts loading, before any server-specific data is set */ +HPExport void server_preinit (void) { + /* makes map server listen to mysetting:value in any "battleconf" file (including imported or custom ones) */ + /* value is not limited to numbers, its passed to our plugins handler (parse_my_setting) as const char *, + * and thus can be manipulated at will */ + addBattleConf("my_setting",parse_my_setting); } /* run when server is ready (online) */ HPExport void server_online (void) { |