From 31bff051ee3c353fb7ee5e544d68feeaefd4941f Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 16 Nov 2014 02:01:45 +0100 Subject: Moved mapif_s into mapif.c Signed-off-by: Haru --- src/char/mapif.c | 2 + src/char/mapif.h | 338 +++++++++++++++++++++++++++---------------------------- 2 files changed, 171 insertions(+), 169 deletions(-) (limited to 'src/char') diff --git a/src/char/mapif.c b/src/char/mapif.c index 1cd4c3ea5..65f2984fd 100644 --- a/src/char/mapif.c +++ b/src/char/mapif.c @@ -188,6 +188,8 @@ int mapif_parse_RegistryRequest(int fd); void mapif_namechange_ack(int fd, int account_id, int char_id, int type, int flag, const char *const name); int mapif_parse_NameChangeRequest(int fd); +struct mapif_interface mapif_s; + void mapif_defaults(void) { mapif = &mapif_s; diff --git a/src/char/mapif.h b/src/char/mapif.h index dcb60d547..f9c06256d 100644 --- a/src/char/mapif.h +++ b/src/char/mapif.h @@ -21,175 +21,175 @@ struct WisData; * mapif interface **/ struct mapif_interface { - void (*ban) (int id, unsigned int flag, int status); - void (*server_init) (int id); - void (*server_destroy) (int id); - void (*server_reset) (int id); - void (*on_disconnect) (int id); - void (*on_parse_accinfo) (int account_id, int u_fd, int u_aid, int u_group, int map_fd); - void (*char_ban) (int char_id, time_t timestamp); - int (*sendall) (unsigned char *buf, unsigned int len); - int (*sendallwos) (int sfd, unsigned char *buf, unsigned int len); - int (*send) (int fd, unsigned char *buf, unsigned int len); - void (*send_users_count) (int users); - void (*auction_message) (int char_id, unsigned char result); - void (*auction_sendlist) (int fd, int char_id, short count, short pages, unsigned char *buf); - void (*parse_auction_requestlist) (int fd); - void (*auction_register) (int fd, struct auction_data *auction); - void (*parse_auction_register) (int fd); - void (*auction_cancel) (int fd, int char_id, unsigned char result); - void (*parse_auction_cancel) (int fd); - void (*auction_close) (int fd, int char_id, unsigned char result); - void (*parse_auction_close) (int fd); - void (*auction_bid) (int fd, int char_id, int bid, unsigned char result); - void (*parse_auction_bid) (int fd); - bool (*elemental_save) (struct s_elemental* ele); - bool (*elemental_load) (int ele_id, int char_id, struct s_elemental *ele); - bool (*elemental_delete) (int ele_id); - void (*elemental_send) (int fd, struct s_elemental *ele, unsigned char flag); - void (*parse_elemental_create) (int fd, struct s_elemental* ele); - void (*parse_elemental_load) (int fd, int ele_id, int char_id); - void (*elemental_deleted) (int fd, unsigned char flag); - void (*parse_elemental_delete) (int fd, int ele_id); - void (*elemental_saved) (int fd, unsigned char flag); - void (*parse_elemental_save) (int fd, struct s_elemental* ele); - int (*guild_created) (int fd, int account_id, struct guild *g); - int (*guild_noinfo) (int fd, int guild_id); - int (*guild_info) (int fd, struct guild *g); - int (*guild_memberadded) (int fd, int guild_id, int account_id, int char_id, int flag); - int (*guild_withdraw) (int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes); - int (*guild_memberinfoshort) (struct guild *g, int idx); - int (*guild_broken) (int guild_id, int flag); - int (*guild_message) (int guild_id,int account_id,char *mes,int len, int sfd); - int (*guild_basicinfochanged) (int guild_id, int type, const void *data, int len); - int (*guild_memberinfochanged) (int guild_id, int account_id, int char_id, int type, const void *data, int len); - int (*guild_skillupack) (int guild_id, uint16 skill_id, int account_id); - int (*guild_alliance) (int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2); - int (*guild_position) (struct guild *g, int idx); - int (*guild_notice) (struct guild *g); - int (*guild_emblem) (struct guild *g); - int (*guild_master_changed) (struct guild *g, int aid, int cid); - int (*guild_castle_dataload) (int fd, int sz, int *castle_ids); - int (*parse_CreateGuild) (int fd,int account_id,char *name,struct guild_member *master); - int (*parse_GuildInfo) (int fd, int guild_id); - int (*parse_GuildAddMember) (int fd, int guild_id, struct guild_member *m); - int (*parse_GuildLeave) (int fd, int guild_id, int account_id, int char_id, int flag, const char *mes); - int (*parse_GuildChangeMemberInfoShort) (int fd, int guild_id, int account_id, int char_id, int online, int lv, int class_); - int (*parse_BreakGuild) (int fd, int guild_id); - int (*parse_GuildMessage) (int fd, int guild_id, int account_id, char *mes, int len); - int (*parse_GuildBasicInfoChange) (int fd, int guild_id, int type, const void *data, int len); - int (*parse_GuildMemberInfoChange) (int fd, int guild_id, int account_id, int char_id, int type, const char *data, int len); - int (*parse_GuildPosition) (int fd, int guild_id, int idx, struct guild_position *p); - int (*parse_GuildSkillUp) (int fd, int guild_id, uint16 skill_id, int account_id, int max); - int (*parse_GuildDeleteAlliance) (struct guild *g, int guild_id, int account_id1, int account_id2, int flag); - int (*parse_GuildAlliance) (int fd, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag); - int (*parse_GuildNotice) (int fd, int guild_id, const char *mes1, const char *mes2); - int (*parse_GuildEmblem) (int fd, int len, int guild_id, int dummy, const char *data); - int (*parse_GuildCastleDataLoad) (int fd, int len, int *castle_ids); - int (*parse_GuildCastleDataSave) (int fd, int castle_id, int index, int value); - int (*parse_GuildMasterChange) (int fd, int guild_id, const char* name, int len); - void (*homunculus_created) (int fd, int account_id, struct s_homunculus *sh, unsigned char flag); - void (*homunculus_deleted) (int fd, int flag); - void (*homunculus_loaded) (int fd, int account_id, struct s_homunculus *hd); - void (*homunculus_saved) (int fd, int account_id, bool flag); - void (*homunculus_renamed) (int fd, int account_id, int char_id, unsigned char flag, char* name); - bool (*homunculus_save) (struct s_homunculus* hd); - bool (*homunculus_load) (int homun_id, struct s_homunculus* hd); - bool (*homunculus_delete) (int homun_id); - bool (*homunculus_rename) (char *name); - void (*parse_homunculus_create) (int fd, int len, int account_id, struct s_homunculus* phd); - void (*parse_homunculus_delete) (int fd, int homun_id); - void (*parse_homunculus_load) (int fd, int account_id, int homun_id); - void (*parse_homunculus_save) (int fd, int len, int account_id, struct s_homunculus* phd); - void (*parse_homunculus_rename) (int fd, int account_id, int char_id, char* name); - void (*mail_sendinbox) (int fd, int char_id, unsigned char flag, struct mail_data *md); - void (*parse_mail_requestinbox) (int fd); - void (*parse_mail_read) (int fd); - void (*mail_sendattach) (int fd, int char_id, struct mail_message *msg); - void (*mail_getattach) (int fd, int char_id, int mail_id); - void (*parse_mail_getattach) (int fd); - void (*mail_delete) (int fd, int char_id, int mail_id, bool failed); - void (*parse_mail_delete) (int fd); - void (*mail_new) (struct mail_message *msg); - void (*mail_return) (int fd, int char_id, int mail_id, int new_mail); - void (*parse_mail_return) (int fd); - void (*mail_send) (int fd, struct mail_message* msg); - void (*parse_mail_send) (int fd); - bool (*mercenary_save) (struct s_mercenary* merc); - bool (*mercenary_load) (int merc_id, int char_id, struct s_mercenary *merc); - bool (*mercenary_delete) (int merc_id); - void (*mercenary_send) (int fd, struct s_mercenary *merc, unsigned char flag); - void (*parse_mercenary_create) (int fd, struct s_mercenary* merc); - void (*parse_mercenary_load) (int fd, int merc_id, int char_id); - void (*mercenary_deleted) (int fd, unsigned char flag); - void (*parse_mercenary_delete) (int fd, int merc_id); - void (*mercenary_saved) (int fd, unsigned char flag); - void (*parse_mercenary_save) (int fd, struct s_mercenary* merc); - int (*party_created) (int fd, int account_id, int char_id, struct party *p); - void (*party_noinfo) (int fd, int party_id, int char_id); - void (*party_info) (int fd, struct party* p, int char_id); - int (*party_memberadded) (int fd, int party_id, int account_id, int char_id, int flag); - int (*party_optionchanged) (int fd, struct party *p, int account_id, int flag); - int (*party_withdraw) (int party_id,int account_id, int char_id); - int (*party_membermoved) (struct party *p, int idx); - int (*party_broken) (int party_id, int flag); - int (*party_message) (int party_id, int account_id, char *mes, int len, int sfd); - int (*parse_CreateParty) (int fd, char *name, int item, int item2, struct party_member *leader); - void (*parse_PartyInfo) (int fd, int party_id, int char_id); - int (*parse_PartyAddMember) (int fd, int party_id, struct party_member *member); - int (*parse_PartyChangeOption) (int fd,int party_id,int account_id,int exp,int item); - int (*parse_PartyLeave) (int fd, int party_id, int account_id, int char_id); - int (*parse_PartyChangeMap) (int fd, int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv); - int (*parse_BreakParty) (int fd, int party_id); - int (*parse_PartyMessage) (int fd, int party_id, int account_id, char *mes, int len); - int (*parse_PartyLeaderChange) (int fd, int party_id, int account_id, int char_id); - int (*pet_created) (int fd, int account_id, struct s_pet *p); - int (*pet_info) (int fd, int account_id, struct s_pet *p); - int (*pet_noinfo) (int fd, int account_id); - int (*save_pet_ack) (int fd, int account_id, int flag); - int (*delete_pet_ack) (int fd, int flag); - int (*create_pet) (int fd, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id, - short pet_equip, short intimate, short hungry, char rename_flag, char incubate, char *pet_name); - int (*load_pet) (int fd, int account_id, int char_id, int pet_id); - int (*save_pet) (int fd, int account_id, struct s_pet *data); - int (*delete_pet) (int fd, int pet_id); - int (*parse_CreatePet) (int fd); - int (*parse_LoadPet) (int fd); - int (*parse_SavePet) (int fd); - int (*parse_DeletePet) (int fd); - struct quest *(*quests_fromsql) (int char_id, int *count); - bool (*quest_delete) (int char_id, int quest_id); - bool (*quest_add) (int char_id, struct quest qd); - bool (*quest_update) (int char_id, struct quest qd); - void (*quest_save_ack) (int fd, int char_id, bool success); - int (*parse_quest_save) (int fd); - void (*send_quests) (int fd, int char_id, struct quest *tmp_questlog, int num_quests); - int (*parse_quest_load) (int fd); - int (*load_guild_storage) (int fd, int account_id, int guild_id, char flag); - int (*save_guild_storage_ack) (int fd, int account_id, int guild_id, int fail); - int (*parse_LoadGuildStorage) (int fd); - int (*parse_SaveGuildStorage) (int fd); - int (*itembound_ack) (int fd, int aid, int guild_id); - int (*parse_ItemBoundRetrieve_sub) (int fd); - void (*parse_ItemBoundRetrieve) (int fd); - void (*parse_accinfo) (int fd); - void (*parse_accinfo2) (bool success, int map_fd, int u_fd, int u_aid, int account_id, const char *userid, const char *user_pass, - const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int group_id, int logincount, int state); - int (*broadcast) (unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd); - int (*wis_message) (struct WisData *wd); - void (*wis_response) (int fd, unsigned char *src, int flag); - int (*wis_end) (struct WisData *wd, int flag); - int (*account_reg_reply) (int fd,int account_id,int char_id, int type); - int (*disconnectplayer) (int fd, int account_id, int char_id, int reason); - int (*parse_broadcast) (int fd); - int (*parse_WisRequest) (int fd); - int (*parse_WisReply) (int fd); - int (*parse_WisToGM) (int fd); - int (*parse_Registry) (int fd); - int (*parse_RegistryRequest) (int fd); - void (*namechange_ack) (int fd, int account_id, int char_id, int type, int flag, const char *name); - int (*parse_NameChangeRequest) (int fd); -} mapif_s; + void (*ban) (int id, unsigned int flag, int status); + void (*server_init) (int id); + void (*server_destroy) (int id); + void (*server_reset) (int id); + void (*on_disconnect) (int id); + void (*on_parse_accinfo) (int account_id, int u_fd, int u_aid, int u_group, int map_fd); + void (*char_ban) (int char_id, time_t timestamp); + int (*sendall) (unsigned char *buf, unsigned int len); + int (*sendallwos) (int sfd, unsigned char *buf, unsigned int len); + int (*send) (int fd, unsigned char *buf, unsigned int len); + void (*send_users_count) (int users); + void (*auction_message) (int char_id, unsigned char result); + void (*auction_sendlist) (int fd, int char_id, short count, short pages, unsigned char *buf); + void (*parse_auction_requestlist) (int fd); + void (*auction_register) (int fd, struct auction_data *auction); + void (*parse_auction_register) (int fd); + void (*auction_cancel) (int fd, int char_id, unsigned char result); + void (*parse_auction_cancel) (int fd); + void (*auction_close) (int fd, int char_id, unsigned char result); + void (*parse_auction_close) (int fd); + void (*auction_bid) (int fd, int char_id, int bid, unsigned char result); + void (*parse_auction_bid) (int fd); + bool (*elemental_save) (struct s_elemental* ele); + bool (*elemental_load) (int ele_id, int char_id, struct s_elemental *ele); + bool (*elemental_delete) (int ele_id); + void (*elemental_send) (int fd, struct s_elemental *ele, unsigned char flag); + void (*parse_elemental_create) (int fd, struct s_elemental* ele); + void (*parse_elemental_load) (int fd, int ele_id, int char_id); + void (*elemental_deleted) (int fd, unsigned char flag); + void (*parse_elemental_delete) (int fd, int ele_id); + void (*elemental_saved) (int fd, unsigned char flag); + void (*parse_elemental_save) (int fd, struct s_elemental* ele); + int (*guild_created) (int fd, int account_id, struct guild *g); + int (*guild_noinfo) (int fd, int guild_id); + int (*guild_info) (int fd, struct guild *g); + int (*guild_memberadded) (int fd, int guild_id, int account_id, int char_id, int flag); + int (*guild_withdraw) (int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes); + int (*guild_memberinfoshort) (struct guild *g, int idx); + int (*guild_broken) (int guild_id, int flag); + int (*guild_message) (int guild_id,int account_id,char *mes,int len, int sfd); + int (*guild_basicinfochanged) (int guild_id, int type, const void *data, int len); + int (*guild_memberinfochanged) (int guild_id, int account_id, int char_id, int type, const void *data, int len); + int (*guild_skillupack) (int guild_id, uint16 skill_id, int account_id); + int (*guild_alliance) (int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2); + int (*guild_position) (struct guild *g, int idx); + int (*guild_notice) (struct guild *g); + int (*guild_emblem) (struct guild *g); + int (*guild_master_changed) (struct guild *g, int aid, int cid); + int (*guild_castle_dataload) (int fd, int sz, int *castle_ids); + int (*parse_CreateGuild) (int fd,int account_id,char *name,struct guild_member *master); + int (*parse_GuildInfo) (int fd, int guild_id); + int (*parse_GuildAddMember) (int fd, int guild_id, struct guild_member *m); + int (*parse_GuildLeave) (int fd, int guild_id, int account_id, int char_id, int flag, const char *mes); + int (*parse_GuildChangeMemberInfoShort) (int fd, int guild_id, int account_id, int char_id, int online, int lv, int class_); + int (*parse_BreakGuild) (int fd, int guild_id); + int (*parse_GuildMessage) (int fd, int guild_id, int account_id, char *mes, int len); + int (*parse_GuildBasicInfoChange) (int fd, int guild_id, int type, const void *data, int len); + int (*parse_GuildMemberInfoChange) (int fd, int guild_id, int account_id, int char_id, int type, const char *data, int len); + int (*parse_GuildPosition) (int fd, int guild_id, int idx, struct guild_position *p); + int (*parse_GuildSkillUp) (int fd, int guild_id, uint16 skill_id, int account_id, int max); + int (*parse_GuildDeleteAlliance) (struct guild *g, int guild_id, int account_id1, int account_id2, int flag); + int (*parse_GuildAlliance) (int fd, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag); + int (*parse_GuildNotice) (int fd, int guild_id, const char *mes1, const char *mes2); + int (*parse_GuildEmblem) (int fd, int len, int guild_id, int dummy, const char *data); + int (*parse_GuildCastleDataLoad) (int fd, int len, int *castle_ids); + int (*parse_GuildCastleDataSave) (int fd, int castle_id, int index, int value); + int (*parse_GuildMasterChange) (int fd, int guild_id, const char* name, int len); + void (*homunculus_created) (int fd, int account_id, struct s_homunculus *sh, unsigned char flag); + void (*homunculus_deleted) (int fd, int flag); + void (*homunculus_loaded) (int fd, int account_id, struct s_homunculus *hd); + void (*homunculus_saved) (int fd, int account_id, bool flag); + void (*homunculus_renamed) (int fd, int account_id, int char_id, unsigned char flag, char* name); + bool (*homunculus_save) (struct s_homunculus* hd); + bool (*homunculus_load) (int homun_id, struct s_homunculus* hd); + bool (*homunculus_delete) (int homun_id); + bool (*homunculus_rename) (char *name); + void (*parse_homunculus_create) (int fd, int len, int account_id, struct s_homunculus* phd); + void (*parse_homunculus_delete) (int fd, int homun_id); + void (*parse_homunculus_load) (int fd, int account_id, int homun_id); + void (*parse_homunculus_save) (int fd, int len, int account_id, struct s_homunculus* phd); + void (*parse_homunculus_rename) (int fd, int account_id, int char_id, char* name); + void (*mail_sendinbox) (int fd, int char_id, unsigned char flag, struct mail_data *md); + void (*parse_mail_requestinbox) (int fd); + void (*parse_mail_read) (int fd); + void (*mail_sendattach) (int fd, int char_id, struct mail_message *msg); + void (*mail_getattach) (int fd, int char_id, int mail_id); + void (*parse_mail_getattach) (int fd); + void (*mail_delete) (int fd, int char_id, int mail_id, bool failed); + void (*parse_mail_delete) (int fd); + void (*mail_new) (struct mail_message *msg); + void (*mail_return) (int fd, int char_id, int mail_id, int new_mail); + void (*parse_mail_return) (int fd); + void (*mail_send) (int fd, struct mail_message* msg); + void (*parse_mail_send) (int fd); + bool (*mercenary_save) (struct s_mercenary* merc); + bool (*mercenary_load) (int merc_id, int char_id, struct s_mercenary *merc); + bool (*mercenary_delete) (int merc_id); + void (*mercenary_send) (int fd, struct s_mercenary *merc, unsigned char flag); + void (*parse_mercenary_create) (int fd, struct s_mercenary* merc); + void (*parse_mercenary_load) (int fd, int merc_id, int char_id); + void (*mercenary_deleted) (int fd, unsigned char flag); + void (*parse_mercenary_delete) (int fd, int merc_id); + void (*mercenary_saved) (int fd, unsigned char flag); + void (*parse_mercenary_save) (int fd, struct s_mercenary* merc); + int (*party_created) (int fd, int account_id, int char_id, struct party *p); + void (*party_noinfo) (int fd, int party_id, int char_id); + void (*party_info) (int fd, struct party* p, int char_id); + int (*party_memberadded) (int fd, int party_id, int account_id, int char_id, int flag); + int (*party_optionchanged) (int fd, struct party *p, int account_id, int flag); + int (*party_withdraw) (int party_id,int account_id, int char_id); + int (*party_membermoved) (struct party *p, int idx); + int (*party_broken) (int party_id, int flag); + int (*party_message) (int party_id, int account_id, char *mes, int len, int sfd); + int (*parse_CreateParty) (int fd, char *name, int item, int item2, struct party_member *leader); + void (*parse_PartyInfo) (int fd, int party_id, int char_id); + int (*parse_PartyAddMember) (int fd, int party_id, struct party_member *member); + int (*parse_PartyChangeOption) (int fd,int party_id,int account_id,int exp,int item); + int (*parse_PartyLeave) (int fd, int party_id, int account_id, int char_id); + int (*parse_PartyChangeMap) (int fd, int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv); + int (*parse_BreakParty) (int fd, int party_id); + int (*parse_PartyMessage) (int fd, int party_id, int account_id, char *mes, int len); + int (*parse_PartyLeaderChange) (int fd, int party_id, int account_id, int char_id); + int (*pet_created) (int fd, int account_id, struct s_pet *p); + int (*pet_info) (int fd, int account_id, struct s_pet *p); + int (*pet_noinfo) (int fd, int account_id); + int (*save_pet_ack) (int fd, int account_id, int flag); + int (*delete_pet_ack) (int fd, int flag); + int (*create_pet) (int fd, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id, + short pet_equip, short intimate, short hungry, char rename_flag, char incubate, char *pet_name); + int (*load_pet) (int fd, int account_id, int char_id, int pet_id); + int (*save_pet) (int fd, int account_id, struct s_pet *data); + int (*delete_pet) (int fd, int pet_id); + int (*parse_CreatePet) (int fd); + int (*parse_LoadPet) (int fd); + int (*parse_SavePet) (int fd); + int (*parse_DeletePet) (int fd); + struct quest *(*quests_fromsql) (int char_id, int *count); + bool (*quest_delete) (int char_id, int quest_id); + bool (*quest_add) (int char_id, struct quest qd); + bool (*quest_update) (int char_id, struct quest qd); + void (*quest_save_ack) (int fd, int char_id, bool success); + int (*parse_quest_save) (int fd); + void (*send_quests) (int fd, int char_id, struct quest *tmp_questlog, int num_quests); + int (*parse_quest_load) (int fd); + int (*load_guild_storage) (int fd, int account_id, int guild_id, char flag); + int (*save_guild_storage_ack) (int fd, int account_id, int guild_id, int fail); + int (*parse_LoadGuildStorage) (int fd); + int (*parse_SaveGuildStorage) (int fd); + int (*itembound_ack) (int fd, int aid, int guild_id); + int (*parse_ItemBoundRetrieve_sub) (int fd); + void (*parse_ItemBoundRetrieve) (int fd); + void (*parse_accinfo) (int fd); + void (*parse_accinfo2) (bool success, int map_fd, int u_fd, int u_aid, int account_id, const char *userid, const char *user_pass, + const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int group_id, int logincount, int state); + int (*broadcast) (unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd); + int (*wis_message) (struct WisData *wd); + void (*wis_response) (int fd, unsigned char *src, int flag); + int (*wis_end) (struct WisData *wd, int flag); + int (*account_reg_reply) (int fd,int account_id,int char_id, int type); + int (*disconnectplayer) (int fd, int account_id, int char_id, int reason); + int (*parse_broadcast) (int fd); + int (*parse_WisRequest) (int fd); + int (*parse_WisReply) (int fd); + int (*parse_WisToGM) (int fd); + int (*parse_Registry) (int fd); + int (*parse_RegistryRequest) (int fd); + void (*namechange_ack) (int fd, int account_id, int char_id, int type, int flag, const char *name); + int (*parse_NameChangeRequest) (int fd); +}; struct mapif_interface *mapif; -- cgit v1.2.3-60-g2f50