diff options
Diffstat (limited to 'src/map/clif.h')
| -rw-r--r-- | src/map/clif.h | 66 |
1 files changed, 54 insertions, 12 deletions
diff --git a/src/map/clif.h b/src/map/clif.h index 20ecf8e8d..1dffc2711 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -550,19 +550,36 @@ enum CZ_CONFIG { CZ_CONFIG_PET_AUTOFEEDING = 2, CZ_CONFIG_HOMUNCULUS_AUTOFEEDING = 3, }; + /** * Client UI types * used with packet 0xAE2 to request the client to open a specific ui **/ -enum ui_types { - BANK_UI = 0, - STYLIST_UI, - CAPTCHA_UI, - MACRO_UI, - TIPBOX_UI = 5, - RENEWQUEST_UI, - ATTENDANCE_UI +enum zc_ui_types { +#if PACKETVER >= 20150128 + ZC_BANK_UI = 0, + ZC_STYLIST_UI = 1, + ZC_CAPTCHA_UI = 2, + ZC_MACRO_UI = 3, +#endif + zc_ui_unused = 4, // for avoid compilation errors +#if PACKETVER >= 20171122 + ZC_TIPBOX_UI = 5, + ZC_RENEWQUEST_UI = 6, + ZC_ATTENDANCE_UI = 7 +#endif +}; + +/** +* Client to server open ui request types (packet 0x0a68) +**/ +enum cz_ui_types { + CZ_STYLIST_UI = 1, + //unknown = 2, + //unknown = 3, + CZ_ATTENDANCE_UI = 5 }; + /** * Private Airship Responds **/ @@ -575,6 +592,17 @@ enum private_airship { P_AIRSHIP_ITEM_INVALID }; +/** Pet Evolution Results */ +enum pet_evolution_result { + PET_EVOL_UNKNOWN = 0x0, + PET_EVOL_NO_CALLPET = 0x1, + PET_EVOL_NO_PETEGG = 0x2, + PET_EVOL_NO_RECIPE = 0x3, + PET_EVOL_NO_MATERIAL = 0x4, + PET_EVOL_RG_FAMILIAR = 0x5, + PET_EVOL_SUCCESS = 0x6, +}; + /** * Structures **/ @@ -616,6 +644,14 @@ struct stylist_data_entry { VECTOR_DECL(struct stylist_data_entry) stylist_data[MAX_STYLIST_TYPE]; /** +* Stylist Shop Responds +**/ +enum stylist_shop { + STYLIST_SHOP_SUCCESS, + STYLIST_SHOP_FAILURE +}; + +/** * Clif.c Interface **/ struct clif_interface { @@ -662,6 +698,7 @@ struct clif_interface { unsigned short (*decrypt_cmd) ( int cmd, struct map_session_data *sd ); /* auth */ void (*authok) (struct map_session_data *sd); + void (*auth_error) (int fd, int errorCode); void (*authrefuse) (int fd, uint8 error_code); void (*authfail_fd) (int fd, int type); void (*charselectok) (int id, uint8 ok); @@ -723,6 +760,7 @@ struct clif_interface { bool (*spawn) (struct block_list *bl); /* map-related */ void (*changemap) (struct map_session_data *sd, short m, int x, int y); + void (*changemap_airship) (struct map_session_data *sd, short m, int x, int y); void (*changemapcell) (int fd, int16 m, int x, int y, int type, enum send_target target); void (*map_property) (struct map_session_data* sd, enum map_property property); void (*pvpset) (struct map_session_data *sd, int pvprank, int pvpnum,int type); @@ -732,6 +770,7 @@ struct clif_interface { void (*maptypeproperty2) (struct block_list *bl,enum send_target t); /* multi-map-server */ void (*changemapserver) (struct map_session_data* sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port); + void (*changemapserver_airship) (struct map_session_data* sd, unsigned short map_index, int x, int y, uint32 ip, uint16 port); /* npc-shop-related */ void (*npcbuysell) (struct map_session_data* sd, int id); void (*buylist) (struct map_session_data *sd, struct npc_data *nd); @@ -809,7 +848,7 @@ struct clif_interface { void (*mission_info) (struct map_session_data *sd, int mob_id, unsigned char progress); void (*feel_hate_reset) (struct map_session_data *sd); void (*partytickack) (struct map_session_data* sd, bool flag); - void (*zc_config) (struct map_session_data *sd, int type, int flag); + void (*zc_config) (struct map_session_data *sd, enum CZ_CONFIG type, int flag); void (*viewequip_ack) (struct map_session_data* sd, struct map_session_data* tsd); void (*equpcheckbox) (struct map_session_data* sd); void (*displayexp) (struct map_session_data *sd, uint64 exp, char type, bool is_quest); @@ -900,7 +939,8 @@ struct clif_interface { void (*broadcast2) (struct block_list *bl, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target); void (*messagecolor_self) (int fd, uint32 color, const char *msg); void (*messagecolor) (struct block_list* bl, uint32 color, const char* msg); - void (*disp_overhead) (struct block_list *bl, const char* mes); + void (*disp_overhead) (struct block_list *bl, const char *mes, enum send_target target, struct block_list *target_bl); + void (*notify_playerchat) (struct block_list *bl, const char *mes); void (*msgtable) (struct map_session_data* sd, enum clif_messages msg_id); void (*msgtable_num) (struct map_session_data *sd, enum clif_messages msg_id, int value); void (*msgtable_skill) (struct map_session_data *sd, uint16 skill_id, enum clif_messages msg_id); @@ -1444,7 +1484,7 @@ struct clif_interface { bool (*attendance_timediff) (struct map_session_data *sd); time_t (*attendance_getendtime) (void); void (*pOpenUIRequest) (int fd, struct map_session_data *sd); - void (*open_ui) (struct map_session_data *sd, int8 UIType); + void (*open_ui) (struct map_session_data *sd, enum cz_ui_types uiType); void (*pAttendanceRewardRequest) (int fd, struct map_session_data *sd); void (*ui_action) (struct map_session_data *sd, int32 UIType, int32 data); void (*pPrivateAirshipRequest) (int fd, struct map_session_data *sd); @@ -1458,7 +1498,9 @@ struct clif_interface { void (*stylist_send_rodexitem) (struct map_session_data *sd, int16 itemid); void (*pReqStyleChange) (int fd, struct map_session_data *sd); void (*cz_req_style_change_sub) (struct map_session_data *sd, int type, int16 idx, bool isitem); - void (*style_change_response) (struct map_session_data *sd, int8 flag); + void (*style_change_response) (struct map_session_data *sd, enum stylist_shop flag); + void (*pPetEvolution) (int fd, struct map_session_data *sd); + void (*petEvolutionResult) (int fd, enum pet_evolution_result result); }; #ifdef HERCULES_CORE |