diff options
| author | Haru <haru@dotalux.com> | 2015-05-18 01:09:37 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-05-18 01:14:22 +0200 |
| commit | 3f06bc2bded05a27e1982d1e71c0983009a2f701 (patch) | |
| tree | 99ea6f365dc77db7f28f08c13f30059bf67c6d3b /src/map/skill.c | |
| parent | ab6adbcc802233ced064ae75a5f11695a4140fb8 (diff) | |
| download | hercules-3f06bc2bded05a27e1982d1e71c0983009a2f701.tar.gz hercules-3f06bc2bded05a27e1982d1e71c0983009a2f701.tar.bz2 hercules-3f06bc2bded05a27e1982d1e71c0983009a2f701.tar.xz hercules-3f06bc2bded05a27e1982d1e71c0983009a2f701.zip | |
Removed duplicates of clif->msgtable
- Removed clif->msgtable, and renamed clif->msg to clif->msgtable.
- Removed clif->msgtable_num, and renamed clif->msg_value to clif->msgtable_num
- Renamed clif->msg_skill to clif->msgtable_skill
- Removed clif_viewequip_fail
- Replaced hardcoded message IDs with constants (see enum clif_messages)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 64b0cebe8..41d872b77 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -16906,7 +16906,7 @@ int skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int nameid, for( i = 0; i < MAX_INVENTORY; i++ ) { if( sd->status.inventory[i].nameid == nameid ) { if( sd->status.inventory[i].amount >= data->stack.amount ) { - clif->msgtable(sd->fd,0x61b); + clif->msgtable(sd, MSG_RUNE_STONE_MAX_AMOUNT); return 0; } else { /** @@ -17363,7 +17363,7 @@ int skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int nameid, break; } if( k ){ - clif->msg_skill(sd,skill_id,0x627); + clif->msgtable_skill(sd, skill_id, MSG_SKILL_SUCCESS); return 1; } } else if (tmp_item.amount) { //Success @@ -17372,7 +17372,7 @@ int skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int nameid, map->addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); } if( skill_id == GN_MIX_COOKING || skill_id == GN_MAKEBOMB || skill_id == GN_S_PHARMACY ) - clif->msg_skill(sd,skill_id,0x627); + clif->msgtable_skill(sd, skill_id, MSG_SKILL_SUCCESS); return 1; } } @@ -17431,13 +17431,13 @@ int skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int nameid, clif->additem(sd,0,0,flag); map->addflooritem(&tmp_item,tmp_item.amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); } - clif->msg_skill(sd,skill_id,0x628); + clif->msgtable_skill(sd, skill_id, MSG_SKILL_FAILURE); } break; case GN_MAKEBOMB: case GN_S_PHARMACY: case GN_CHANGEMATERIAL: - clif->msg_skill(sd,skill_id,0x628); + clif->msgtable_skill(sd, skill_id, MSG_SKILL_FAILURE); break; default: if( skill->produce_db[idx].itemlv > 10 && skill->produce_db[idx].itemlv <= 20 ) @@ -17747,7 +17747,7 @@ int skill_changematerial(struct map_session_data *sd, int n, unsigned short *ite nameid = sd->status.inventory[idx].nameid; amount = item_list[k*2+1]; if( nameid > 0 && sd->status.inventory[idx].identify == 0 ){ - clif->msg_skill(sd,GN_CHANGEMATERIAL,0x62D); + clif->msgtable_skill(sd, GN_CHANGEMATERIAL, MSG_SKILL_ITEM_NEED_IDENTIFY); return 0; } if( nameid == skill->produce_db[i].mat_id[j] && (amount-p*skill->produce_db[i].mat_amount[j]) >= skill->produce_db[i].mat_amount[j] @@ -17769,7 +17769,7 @@ int skill_changematerial(struct map_session_data *sd, int n, unsigned short *ite } if( p == 0) - clif->msg_skill(sd,GN_CHANGEMATERIAL,0x623); + clif->msgtable_skill(sd, GN_CHANGEMATERIAL, MSG_SKILL_ITEM_NOT_FOUND); return 0; } |