diff options
| author | Haru <haru@dotalux.com> | 2019-10-18 13:15:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 13:15:22 +0200 |
| commit | ad460000f3f4af4dba1cdc2d9ce466b81c2dcf08 (patch) | |
| tree | 9cef997bc7c05216c156f4b517802ecdf2931ca3 /src/map/skill.c | |
| parent | be66e6f50c078cb712b8152357325fdaa6d9f35f (diff) | |
| parent | b7b3080c9edec4c2f7d34b4d77b08646d46100eb (diff) | |
| download | hercules-ad460000f3f4af4dba1cdc2d9ce466b81c2dcf08.tar.gz hercules-ad460000f3f4af4dba1cdc2d9ce466b81c2dcf08.tar.bz2 hercules-ad460000f3f4af4dba1cdc2d9ce466b81c2dcf08.tar.xz hercules-ad460000f3f4af4dba1cdc2d9ce466b81c2dcf08.zip | |
Merge pull request #2152 from dastgirp/clif_messages
Moved hardcoded messages to conf
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index ad27ef0e3..60d5a397d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7205,7 +7205,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * // custom hack to make the mob display the skill, because these skills don't show the skill use text themselves //NOTE: mobs don't have the sprite animation that is used when performing this skill (will cause glitches) char temp[70]; - snprintf(temp, sizeof(temp), "%s : %s !!", md->name, skill->get_desc(skill_id)); + snprintf(temp, sizeof(temp), msg_txt(882), md->name, skill->get_desc(skill_id)); // %s : %s !! clif->disp_overhead(&md->bl, temp, AREA_CHAT_WOC, NULL); } break; @@ -14669,7 +14669,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s if (map->foreachinrange(mob->count_sub, &sd->bl, skill->get_splash(skill_id, skill_lv), BL_MOB, MOBID_EMPELIUM, MOBID_S_EMPEL_1, MOBID_S_EMPEL_2)) { char output[128]; - sprintf(output, "You're too close to a stone or emperium to do this skill"); /* TODO official response? or message.conf it */ + sprintf(output, "%s", msg_txt(883)); /* TODO official response */ // You are too close to a stone or emperium to do this skill clif->messagecolor_self(sd->fd, COLOR_RED, output); return 0; } @@ -15116,7 +15116,7 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski return 0; } else if( sd->status.inventory[i].amount < require.ammo_qty ) { char e_msg[100]; - sprintf(e_msg,"Skill Failed. [%s] requires %dx %s.", + sprintf(e_msg, msg_txt(884), // Skill Failed. [%s] requires %dx %s. skill->get_desc(skill_id), require.ammo_qty, itemdb_jname(sd->status.inventory[i].nameid)); |