diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-05-11 06:24:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-05-29 05:01:37 +0300 |
| commit | 73b971c66f460f5a1dcb600097b2551434f8726f (patch) | |
| tree | 2dc277c64d8c4c1346d0e1cfc11704efb0c6ba71 /src/map/clif.c | |
| parent | d4213cd795a6a5e3241d1f3d9de147a11bf21097 (diff) | |
| download | hercules-73b971c66f460f5a1dcb600097b2551434f8726f.tar.gz hercules-73b971c66f460f5a1dcb600097b2551434f8726f.tar.bz2 hercules-73b971c66f460f5a1dcb600097b2551434f8726f.tar.xz hercules-73b971c66f460f5a1dcb600097b2551434f8726f.zip | |
Fix wrong values in clif_messages enum.
Also use official constant names with custom prefix in clif_messages enum.
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index bf7c31460..2546b07b3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5639,7 +5639,7 @@ void clif_cooking_list(struct map_session_data *sd, int trigger, uint16 skill_id if( skill_id != AM_PHARMACY ) { // AM_PHARMACY is used to Cooking. // It fails. #if PACKETVER >= 20090922 - clif->msgtable_skill(sd, skill_id, MSG_COOKING_LIST_FAIL); + clif->msgtable_skill(sd, skill_id, MSG_SKILL_MATERIAL_FAIL); #else WFIFOW(fd,2) = 6 + 2 * c; WFIFOSET(fd,WFIFOW(fd,2)); @@ -10917,7 +10917,7 @@ void clif_parse_NpcClicked(int fd,struct map_session_data *sd) } if (sd->npc_id || sd->state.workinprogress & 2) { #if PACKETVER >= 20110309 - clif->msgtable(sd, MSG_NPC_WORK_IN_PROGRESS); + clif->msgtable(sd, MSG_BUSY); #else clif->messagecolor_self(fd, COLOR_WHITE, msg_fd(fd, 48)); #endif @@ -10934,7 +10934,7 @@ void clif_parse_NpcClicked(int fd,struct map_session_data *sd) case BL_NPC: if (sd->ud.skill_id < RK_ENCHANTBLADE && sd->ud.skilltimer != INVALID_TIMER) { // TODO: should only work with none 3rd job skills #if PACKETVER >= 20110309 - clif->msgtable(sd, MSG_NPC_WORK_IN_PROGRESS); + clif->msgtable(sd, MSG_BUSY); #else clif->messagecolor_self(fd, COLOR_WHITE, msg_fd(fd, 48)); #endif @@ -11331,7 +11331,7 @@ void clif_parse_ChangeCart(int fd, struct map_session_data *sd) if (sd->npc_id || sd->state.workinprogress & 1) { #if PACKETVER >= 20110309 - clif->msgtable(sd, MSG_NPC_WORK_IN_PROGRESS); + clif->msgtable(sd, MSG_BUSY); #else clif->messagecolor_self(fd, COLOR_WHITE, msg_fd(fd, 48)); #endif @@ -11542,7 +11542,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) if (sd->npc_id || sd->state.workinprogress & 1) { #if PACKETVER >= 20110309 - clif->msgtable(sd, MSG_NPC_WORK_IN_PROGRESS); + clif->msgtable(sd, MSG_BUSY); #else clif->messagecolor_self(fd, COLOR_WHITE, msg_fd(fd, 48)); #endif @@ -11641,7 +11641,7 @@ void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uint16 ski if (sd->state.workinprogress & 1) { #if PACKETVER >= 20110309 - clif->msgtable(sd, MSG_NPC_WORK_IN_PROGRESS); + clif->msgtable(sd, MSG_BUSY); #else clif->messagecolor_self(fd, COLOR_WHITE, msg_fd(fd, 48)); #endif @@ -16136,7 +16136,7 @@ void clif_parse_ViewPlayerEquip(int fd, struct map_session_data* sd) { if( tsd->status.show_equip || pc_has_permission(sd, PC_PERM_VIEW_EQUIPMENT) ) clif->viewequip_ack(sd, tsd); else - clif->msgtable(sd, MSG_EQUIP_NOT_PUBLIC); + clif->msgtable(sd, MSG_OPEN_EQUIPEDITEM_REFUSED); } void clif_parse_cz_config(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); @@ -16661,7 +16661,7 @@ void clif_parse_mercenary_action(int fd, struct map_session_data* sd) /// 3 = Your mercenary soldier has ran away. void clif_mercenary_message(struct map_session_data* sd, int message) { - clif->msgtable(sd, MSG_MERCENARY_EXPIRED + message); + clif->msgtable(sd, MSG_MER_FINISH + message); } /// Notification about the remaining time of a rental item (ZC_CASH_TIME_COUNTER). |