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/skill.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/skill.c')
| -rw-r--r-- | src/map/skill.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 1ab8ce871..118279e7b 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -18006,7 +18006,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, MSG_RUNE_STONE_MAX_AMOUNT); + clif->msgtable(sd, MSG_RUNESTONE_MAKEERROR_OVERCOUNT); return 0; } else { /** @@ -18534,13 +18534,13 @@ int skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int nameid, clif->additem(sd,0,0,flag); map->addflooritem(&sd->bl, &tmp_item, tmp_item.amount, sd->bl.m, sd->bl.x, sd->bl.y, 0, 0, 0, 0, false); } - clif->msgtable_skill(sd, skill_id, MSG_SKILL_FAILURE); + clif->msgtable_skill(sd, skill_id, MSG_SKILL_FAIL); } break; case GN_MAKEBOMB: case GN_S_PHARMACY: case GN_CHANGEMATERIAL: - clif->msgtable_skill(sd, skill_id, MSG_SKILL_FAILURE); + clif->msgtable_skill(sd, skill_id, MSG_SKILL_FAIL); break; default: if( skill->dbs->produce_db[idx].itemlv > 10 && skill->dbs->produce_db[idx].itemlv <= 20 ) @@ -18876,7 +18876,7 @@ int skill_changematerial(struct map_session_data *sd, const struct itemlist *ite amount = entry->amount; nameid = sd->status.inventory[idx].nameid; if (nameid > 0 && sd->status.inventory[idx].identify == 0) { - clif->msgtable_skill(sd, GN_CHANGEMATERIAL, MSG_SKILL_ITEM_NEED_IDENTIFY); + clif->msgtable_skill(sd, GN_CHANGEMATERIAL, MSG_SKILL_FAIL_MATERIAL_IDENTITY); return 0; } if( nameid == skill->dbs->produce_db[i].mat_id[j] && (amount-p*skill->dbs->produce_db[i].mat_amount[j]) >= skill->dbs->produce_db[i].mat_amount[j] @@ -18898,7 +18898,7 @@ int skill_changematerial(struct map_session_data *sd, const struct itemlist *ite } if( p == 0) - clif->msgtable_skill(sd, GN_CHANGEMATERIAL, MSG_SKILL_ITEM_NOT_FOUND); + clif->msgtable_skill(sd, GN_CHANGEMATERIAL, MSG_SKILL_RECIPE_NOTEXIST); return 0; } |