*menu_key = 0;
for (int i = start; menu_data[i].level >= level; i++) {
char com_key_str[3];
- concptr str;
if (menu_data[i].level > level) {
continue;
}
com_key_str[0] = '\0';
}
- str = format("| %c) %-*s %2s | ", *menu_key + 'a', max_len, menu_data[i].name, com_key_str);
+ const auto str = format("| %c) %-*s %2s | ", *menu_key + 'a', max_len, menu_data[i].name, com_key_str);
term_putstr(col0, row1++, -1, TERM_WHITE, str);
if (describer->insc) {
char tmp[MAX_INSCRIPTION + 1] = "";
angband_strcat(tmp, describer->insc, MAX_INSCRIPTION);
- angband_strcat(buff, format("に「%s」", tmp), MAX_INSCRIPTION + 6);
+ angband_strcat(buff, format("に「%s」", tmp).data(), MAX_INSCRIPTION + 6);
if (angband_strstr(describer->insc, "%%all")) {
strcat(buff, "(%%allは全能力を表す英字の記号で置換)");
}
if (describer->insc) {
- strncat(buff, format("and inscribe \"%s\"", describer->insc), 80);
+ strncat(buff, format("and inscribe \"%s\"", describer->insc).data(), 80);
if (angband_strstr(describer->insc, "%all")) {
strcat(buff, ", replacing %all with code string representing all abilities,");
}
autopick_type an_entry, *entry = &an_entry;
- concptr str1 = nullptr, str2 = nullptr;
+ std::string str1, str2;
for (int j = 0; j < DESCRIPT_HGT; j++) {
term_erase(0, tb->hgt + 2 + j, tb->wid);
}
}
}
- if (str1) {
+ if (!str1.empty()) {
prt(str1, tb->hgt + 1 + 1, 0);
}
- if (str2) {
+ if (!str2.empty()) {
prt(str2, tb->hgt + 1 + 2, 0);
}
}
if (IS_FLG(FLG_MORE_DICE)) {
ADD_KEY(KEY_MORE_THAN);
- strcat(ptr, format("%d", entry->dice));
+ strcat(ptr, format("%d", entry->dice).data());
ADD_KEY(KEY_DICE);
}
if (IS_FLG(FLG_MORE_BONUS)) {
ADD_KEY(KEY_MORE_BONUS);
- strcat(ptr, format("%d", entry->bonus));
+ strcat(ptr, format("%d", entry->bonus).data());
ADD_KEY(KEY_MORE_BONUS2);
}
string_free(*search_strp);
char buf[MAX_NLEN + 20];
describe_flavor(player_ptr, buf, *o_handle, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
- *search_strp = string_make(format("<%s>", buf));
+ *search_strp = string_make(format("<%s>", buf).data());
return true;
}
string_free(*search_strp);
char buf[MAX_NLEN + 20];
describe_flavor(player_ptr, buf, *o_handle, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
- *search_strp = string_make(format("<%s>", buf));
+ *search_strp = string_make(format("<%s>", buf).data());
return true;
}
tb->cx = 0;
insert_return_code(tb);
string_free(tb->lines_list[tb->cy]);
- tb->lines_list[tb->cy] = string_make(format("P:%s", tmp));
+ tb->lines_list[tb->cy] = string_make(format("P:%s", tmp).data());
i = macro_find_exact(buf);
if (i == -1) {
insert_return_code(tb);
string_free(tb->lines_list[tb->cy]);
- tb->lines_list[tb->cy] = string_make(format("A:%s", tmp));
+ tb->lines_list[tb->cy] = string_make(format("A:%s", tmp).data());
return true;
}
tb->cx = 0;
insert_return_code(tb);
string_free(tb->lines_list[tb->cy]);
- tb->lines_list[tb->cy] = string_make(format("C:%d:%s", mode, tmp));
+ tb->lines_list[tb->cy] = string_make(format("C:%d:%s", mode, tmp).data());
concptr act = keymap_act[mode][(byte)(buf[0])];
if (act) {
insert_return_code(tb);
string_free(tb->lines_list[tb->cy]);
- tb->lines_list[tb->cy] = string_make(format("A:%s", tmp));
+ tb->lines_list[tb->cy] = string_make(format("A:%s", tmp).data());
return true;
}
#include "util/angband-files.h"
#include "util/string-processor.h"
#include "view/display-messages.h"
+#include <stdexcept>
/*!
* @brief Load an autopick preference file
{
GAME_TEXT buf[80];
init_autopick();
- angband_strcpy(buf, pickpref_filename(player_ptr, PT_WITH_PNAME), sizeof(buf));
+ angband_strcpy(buf, pickpref_filename(player_ptr, PT_WITH_PNAME).data(), sizeof(buf));
errr err = process_autopick_file(player_ptr, buf);
if (err == 0 && disp_mes) {
msg_format(_("%sを読み込みました。", "Loaded '%s'."), buf);
}
if (err < 0) {
- angband_strcpy(buf, pickpref_filename(player_ptr, PT_DEFAULT), sizeof(buf));
+ angband_strcpy(buf, pickpref_filename(player_ptr, PT_DEFAULT).data(), sizeof(buf));
err = process_autopick_file(player_ptr, buf);
if (err == 0 && disp_mes) {
msg_format(_("%sを読み込みました。", "Loaded '%s'."), buf);
/*!
* @brief Get file name for autopick preference
*/
-concptr pickpref_filename(PlayerType *player_ptr, int filename_mode)
+std::string pickpref_filename(PlayerType *player_ptr, int filename_mode)
{
static const char namebase[] = _("picktype", "pickpref");
return format("%s-%s.prf", namebase, player_ptr->base_name);
default:
- return nullptr;
+ throw std::invalid_argument(format("The value of argument 'filename_mode' is invalid: %d", filename_mode));
}
}
_("自動拾いのユーザー設定ファイルがまだ書かれていないので、", "Since user pref file for autopick is not yet created,"),
_("基本的な自動拾い設定ファイルをlib/pref/picktype.prfからコピーします。", "the default setting is loaded from lib/pref/pickpref.prf ."), nullptr };
- concptr filename = pickpref_filename(player_ptr, PT_DEFAULT);
+ const auto filename = pickpref_filename(player_ptr, PT_DEFAULT);
for (int i = 0; messages[i]; i++) {
msg_print(messages[i]);
}
msg_print(nullptr);
char buf[1024];
- path_build(buf, sizeof(buf), ANGBAND_DIR_USER, filename);
+ path_build(buf, sizeof(buf), ANGBAND_DIR_USER, filename.data());
FILE *user_fp;
user_fp = angband_fopen(buf, "w");
if (!user_fp) {
}
fprintf(user_fp, "#***\n\n\n");
- path_build(buf, sizeof(buf), ANGBAND_DIR_PREF, filename);
+ path_build(buf, sizeof(buf), ANGBAND_DIR_PREF, filename.data());
FILE *pref_fp;
pref_fp = angband_fopen(buf, "r");
{
/* Try a filename with player name */
*filename_mode_p = PT_WITH_PNAME;
- char buf[1024];
- strcpy(buf, pickpref_filename(player_ptr, *filename_mode_p));
- std::vector<concptr> lines_list = read_text_lines(buf);
+ auto filename = pickpref_filename(player_ptr, *filename_mode_p);
+ std::vector<concptr> lines_list = read_text_lines(filename.data());
if (lines_list.empty()) {
*filename_mode_p = PT_DEFAULT;
- strcpy(buf, pickpref_filename(player_ptr, *filename_mode_p));
- lines_list = read_text_lines(buf);
+ filename = pickpref_filename(player_ptr, *filename_mode_p);
+ lines_list = read_text_lines(filename.data());
}
if (lines_list.empty()) {
prepare_default_pickpref(player_ptr);
- lines_list = read_text_lines(buf);
+ lines_list = read_text_lines(filename.data());
}
if (lines_list.empty()) {
#include "system/angband.h"
+#include <string>
#include <vector>
class PlayerType;
void autopick_load_pref(PlayerType *player_ptr, bool disp_mes);
std::vector<concptr> read_pickpref_text_lines(PlayerType *player_ptr, int *filename_mode_p);
bool write_text_lines(concptr filename, concptr *lines_list);
-concptr pickpref_filename(PlayerType *player_ptr, int filename_mode);
+std::string pickpref_filename(PlayerType *player_ptr, int filename_mode);
static bool clear_auto_register(PlayerType *player_ptr)
{
char pref_file[1024];
- path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_WITH_PNAME));
+ path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_WITH_PNAME).data());
FILE *pref_fff;
pref_fff = angband_fopen(pref_file, "r");
if (!pref_fff) {
- path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_DEFAULT));
+ path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_DEFAULT).data());
pref_fff = angband_fopen(pref_file, "r");
}
char buf[1024];
char pref_file[1024];
FILE *pref_fff;
- path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_WITH_PNAME));
+ path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_WITH_PNAME).data());
pref_fff = angband_fopen(pref_file, "r");
if (!pref_fff) {
- path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_DEFAULT));
+ path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_DEFAULT).data());
pref_fff = angband_fopen(pref_file, "r");
}
GAME_TEXT vir_name[20];
int tester = player_ptr->virtues[v_nr];
strcpy(vir_name, virtue[(player_ptr->vir_types[v_nr]) - 1]);
- concptr vir_val = show_actual_value ? format(" (%d)", tester) : "";
+ const std::string vir_val_str = format(" (%d)", tester);
+ const auto vir_val = show_actual_value ? vir_val_str.data() : "";
if (player_ptr->vir_types[v_nr] == 0 || player_ptr->vir_types[v_nr] > MAX_VIRTUE) {
fprintf(out_file, _("おっと。%sの情報なし。", "Oops. No info about %s."), vir_name);
}
exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, buf);
if (player_ptr->realm1) {
strnfmt(buf, sizeof(buf), _("%s魔法の領域に%s%sを選択した。", "%schose %s%s."), indent, realm_names[player_ptr->realm1],
- player_ptr->realm2 ? format(_("と%s", " and %s realms"), realm_names[player_ptr->realm2]) : _("", " realm"));
+ player_ptr->realm2 ? format(_("と%s", " and %s realms"), realm_names[player_ptr->realm2]).data() : _("", " realm"));
exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, buf);
}
if (player_ptr->element) {
const auto &mp = monster_powers.at(spell);
auto need_mana = mod_need_mana(player_ptr, mp.smana, 0, REALM_NONE);
auto chance = calculate_blue_magic_failure_probability(player_ptr, mp, need_mana);
- char psi_desc[80];
- close_blue_magic_name(psi_desc, sizeof(psi_desc), i, menu_line);
- angband_strcat(psi_desc, format(" %-26s %3d %3d%%%s", mp.name, need_mana, chance, learnt_info(player_ptr, spell).data()), sizeof(psi_desc));
+ char header[80];
+ close_blue_magic_name(header, sizeof(header), i, menu_line);
+ const auto info = learnt_info(player_ptr, spell);
+ const auto psi_desc = format("%s %-26s %3d %3d%%%s", header, mp.name, need_mana, chance, info.data());
prt(psi_desc, y_base + i + 1, x_base);
}
auto &rpi = rc_ptr->power_desc[ctr];
dummy.append(
format("%-30.30s %2d %4d %3d%% %s", rpi.racial_name.data(), rpi.min_level, rpi.cost, 100 - racial_chance(player_ptr, &rc_ptr->power_desc[ctr]),
- rpi.info.data()));
+ rpi.info.data())
+ .data());
prt(dummy, 2 + y, x);
}
* @param base 固定値
* @return フォーマットに従い整形された文字列
*/
-concptr info_string_dice(concptr str, DICE_NUMBER dice, DICE_SID sides, int base)
+std::string info_string_dice(concptr str, DICE_NUMBER dice, DICE_SID sides, int base)
{
/* Fix value */
if (!dice) {
* @param base 固定値
* @return フォーマットに従い整形された文字列
*/
-concptr info_damage(DICE_NUMBER dice, DICE_SID sides, int base)
+std::string info_damage(DICE_NUMBER dice, DICE_SID sides, int base)
{
return info_string_dice(_("損傷:", "dam "), dice, sides, base);
}
* @param sides ダイス目
* @return フォーマットに従い整形された文字列
*/
-concptr info_duration(int base, DICE_SID sides)
+std::string info_duration(int base, DICE_SID sides)
{
return format(_("期間:%d+1d%d", "dur %d+1d%d"), base, sides);
}
* @param range 効果範囲
* @return フォーマットに従い整形された文字列
*/
-concptr info_range(POSITION range)
+std::string info_range(POSITION range)
{
return format(_("範囲:%d", "range %d"), range);
}
* @param base 固定値
* @return フォーマットに従い整形された文字列
*/
-concptr info_heal(DICE_NUMBER dice, DICE_SID sides, int base)
+std::string info_heal(DICE_NUMBER dice, DICE_SID sides, int base)
{
return info_string_dice(_("回復:", "heal "), dice, sides, base);
}
* @param sides ダイス目
* @return フォーマットに従い整形された文字列
*/
-concptr info_delay(int base, DICE_SID sides)
+std::string info_delay(int base, DICE_SID sides)
{
return format(_("遅延:%d+1d%d", "delay %d+1d%d"), base, sides);
}
* @param dam 固定値
* @return フォーマットに従い整形された文字列
*/
-concptr info_multi_damage(int dam)
+std::string info_multi_damage(int dam)
{
return format(_("損傷:各%d", "dam %d each"), dam);
}
* @param sides ダイス目
* @return フォーマットに従い整形された文字列
*/
-concptr info_multi_damage_dice(DICE_NUMBER dice, DICE_SID sides)
+std::string info_multi_damage_dice(DICE_NUMBER dice, DICE_SID sides)
{
return format(_("損傷:各%dd%d", "dam %dd%d each"), dice, sides);
}
* @param power 固定値
* @return フォーマットに従い整形された文字列
*/
-concptr info_power(int power)
+std::string info_power(int power)
{
return format(_("効力:%d", "power %d"), power);
}
/*
* Generate power info string such as "power 1d100"
*/
-concptr info_power_dice(DICE_NUMBER dice, DICE_SID sides)
+std::string info_power_dice(DICE_NUMBER dice, DICE_SID sides)
{
return format(_("効力:%dd%d", "power %dd%d"), dice, sides);
}
* @param rad 効果半径
* @return フォーマットに従い整形された文字列
*/
-concptr info_radius(POSITION rad)
+std::string info_radius(POSITION rad)
{
return format(_("半径:%d", "rad %d"), rad);
}
* @param weight 最大重量
* @return フォーマットに従い整形された文字列
*/
-concptr info_weight(WEIGHT weight)
+std::string info_weight(WEIGHT weight)
{
#ifdef JP
return format("最大重量:%d.%dkg", lb_to_kg_integer(weight), lb_to_kg_fraction(weight));
#pragma once
#include "system/angband.h"
+#include <string>
extern concptr KWD_DAM; //!< 効果文字列: 損傷 / dam
extern concptr KWD_RANGE; //!< 効果文字列: 射程 / dir
extern const uint32_t fake_spell_flags[4];
-concptr info_string_dice(concptr str, DICE_NUMBER dice, DICE_SID sides, int base);
-concptr info_damage(DICE_NUMBER dice, DICE_SID sides, int base);
-concptr info_duration(int base, DICE_SID sides);
-concptr info_range(POSITION range);
-concptr info_heal(DICE_NUMBER dice, DICE_SID sides, int base);
-concptr info_delay(int base, DICE_SID sides);
-concptr info_multi_damage(int dam);
-concptr info_multi_damage_dice(DICE_NUMBER dice, DICE_SID sides);
-concptr info_power(int power);
-concptr info_power_dice(DICE_NUMBER dice, DICE_SID sides);
-concptr info_radius(POSITION rad);
-concptr info_weight(WEIGHT weight);
+std::string info_string_dice(concptr str, DICE_NUMBER dice, DICE_SID sides, int base);
+std::string info_damage(DICE_NUMBER dice, DICE_SID sides, int base);
+std::string info_duration(int base, DICE_SID sides);
+std::string info_range(POSITION range);
+std::string info_heal(DICE_NUMBER dice, DICE_SID sides, int base);
+std::string info_delay(int base, DICE_SID sides);
+std::string info_multi_damage(int dam);
+std::string info_multi_damage_dice(DICE_NUMBER dice, DICE_SID sides);
+std::string info_power(int power);
+std::string info_power_dice(DICE_NUMBER dice, DICE_SID sides);
+std::string info_radius(POSITION rad);
+std::string info_weight(WEIGHT weight);
class PlayerType;
void do_cmd_browse(PlayerType *player_ptr);
static int cx_save = 0;
static int cy_save = 0;
autopick_type an_entry, *entry = &an_entry;
- char buf[MAX_LINELEN];
int i;
int key = -1;
static int32_t old_autosave_turn = 0L;
}
screen_load();
- strcpy(buf, pickpref_filename(player_ptr, tb->filename_mode));
+ const auto filename = pickpref_filename(player_ptr, tb->filename_mode);
if (quit == APE_QUIT_AND_SAVE) {
- write_text_lines(buf, tb->lines_list.data());
+ write_text_lines(filename.data(), tb->lines_list.data());
}
free_text_lines(tb->lines_list);
string_free(tb->last_destroyed);
kill_yank_chain(tb);
- process_autopick_file(player_ptr, buf);
+ process_autopick_file(player_ptr, filename.data());
w_ptr->start_time = (uint32_t)time(nullptr);
cx_save = tb->cx;
cy_save = tb->cy;
dummy.append(
format(_(" %-22.22s 充填:%2d/%2d%3d%%", " %-22.22s (%2d/%2d) %3d%%"), baseitems_info[bi_id].name.data(),
item.charge ? (item.charge - 1) / (EATER_ROD_CHARGE * baseitems_info[bi_id].pval) + 1 : 0,
- item.count, chance));
+ item.count, chance)
+ .data());
if (item.charge > baseitems_info[bi_id].pval * (item.count - 1) * EATER_ROD_CHARGE) {
col = TERM_RED;
}
} else {
dummy.append(
format(" %-22.22s %2d/%2d %3d%%", baseitems_info[bi_id].name.data(), (int16_t)(item.charge / EATER_CHARGE),
- item.count, chance));
+ item.count, chance)
+ .data());
if (item.charge < EATER_CHARGE) {
col = TERM_RED;
}
if (player_ptr->levitation) {
msg_print(msg_levitation);
- take_hit(player_ptr, DAMAGE_NOESCAPE, damage, format(_("%sの上に浮遊したダメージ", "flying over %s"), terrains_info[g_ptr->get_feat_mimic()].name.data()));
+ take_hit(player_ptr, DAMAGE_NOESCAPE, damage, format(_("%sの上に浮遊したダメージ", "flying over %s"), terrains_info[g_ptr->get_feat_mimic()].name.data()).data());
if (additional_effect != nullptr) {
additional_effect(player_ptr, damage);
* @brief チェックサム情報を出力 / Get check sum in string form
* @return チェックサム情報の文字列
*/
-static concptr get_check_sum(void)
+static std::string get_check_sum(void)
{
return format("%02x%02x%02x%02x%02x%02x%02x%02x%02x", terrains_header.checksum, baseitems_header.checksum,
artifacts_header.checksum, egos_header.checksum, monraces_header.checksum, dungeons_header.checksum,
dump_aux_equipment_inventory(player_ptr, fff);
dump_aux_home_museum(player_ptr, fff);
- fprintf(fff, _(" [チェックサム: \"%s\"]\n\n", " [Check Sum: \"%s\"]\n\n"), get_check_sum());
+ fprintf(fff, _(" [チェックサム: \"%s\"]\n\n", " [Check Sum: \"%s\"]\n\n"), get_check_sum().data());
}
#ifdef SAFE_SETUID_POSIX
if (auto ret = setuid(getuid()); ret != 0) {
auto msg = _("setuid(): 正しく許可が取れません！ エラーコード：%d", "setuid(): cannot set permissions correctly! Error code: %d");
- quit(format(msg, ret));
+ quit_fmt(msg, ret);
}
if (auto ret = setgid(getgid()); ret != 0) {
auto msg = _("setgid(): 正しく許可が取れません！ エラーコード：%d", "setgid(): cannot set permissions correctly! Error code: %d");
- quit(format(msg, ret));
+ quit_fmt(msg, ret);
}
#else
if (auto ret = setreuid(geteuid(), getuid()); ret != 0) {
auto msg = _("setreuid(): 正しく許可が取れません！ エラーコード：%d", "setreuid(): cannot set permissions correctly! Error code: %d");
- quit(format(msg, ret));
+ quit_fmt(msg, ret);
}
if (auto ret = setregid(getegid(), getgid()); ret != 0) {
auto msg = _("setregid(): 正しく許可が取れません！ エラーコード：%d", "setregid(): cannot set permissions correctly! Error code: %d");
- quit(format(msg, ret));
+ quit_fmt(msg, ret);
}
#endif
#endif
#ifdef SAFE_SETUID_POSIX
if (auto ret = setuid(player_ptr->player_euid); ret != 0) {
auto msg = _("setuid(): 正しく許可が取れません！ エラーコード：%d", "setuid(): cannot set permissions correctly! Error code: %d");
- quit(format(msg, ret));
+ quit_fmt(msg, ret);
}
if (auto ret = setgid(player_ptr->player_egid); ret != 0) {
auto msg = _("setgid(): 正しく許可が取れません！ エラーコード：%d", "setgid(): cannot set permissions correctly! Error code: %d");
- quit(format(msg, ret));
+ quit_fmt(msg, ret);
}
#else
(void)player_ptr;
if (auto ret = setreuid(geteuid(), getuid()); ret != 0) {
auto msg = _("setreuid(): 正しく許可が取れません！ エラーコード：%d", "setreuid(): cannot set permissions correctly! Error code: %d");
- quit(format(msg, ret));
+ quit_fmt(msg, ret);
}
if (auto ret = setregid(getegid(), getgid()); ret != 0) {
auto msg = _("setregid(): 正しく許可が取れません！ エラーコード：%d", "setregid(): cannot set permissions correctly! Error code: %d");
- quit(format(msg, ret));
+ quit_fmt(msg, ret);
}
#endif
#else
break;
}
case DIARY_STAIR: {
- concptr to = inside_quest(q_idx) && (quest_type::is_fixed(q_idx) && !((q_idx == QuestId::OBERON) || (q_idx == QuestId::SERPENT)))
- ? _("地上", "the surface")
- : !(player_ptr->current_floor_ptr->dun_level + num)
- ? _("地上", "the surface")
- : format(_("%d階", "level %d"), player_ptr->current_floor_ptr->dun_level + num);
- fprintf(fff, _(" %2d:%02d %20s %sへ%s。\n", " %2d:%02d %20s %s %s.\n"), hour, min, note_level.data(), _(to, note), _(note, to));
+ auto to = inside_quest(q_idx) && (quest_type::is_fixed(q_idx) && !((q_idx == QuestId::OBERON) || (q_idx == QuestId::SERPENT)))
+ ? _("地上", "the surface")
+ : !(player_ptr->current_floor_ptr->dun_level + num)
+ ? _("地上", "the surface")
+ : format(_("%d階", "level %d"), player_ptr->current_floor_ptr->dun_level + num);
+ fprintf(fff, _(" %2d:%02d %20s %sへ%s。\n", " %2d:%02d %20s %s %s.\n"), hour, min, note_level.data(), _(to.data(), note), _(note, to.data()));
break;
}
case DIARY_RECALL: {
}
case DIARY_WIZ_TELE: {
const auto &floor_ref = *player_ptr->current_floor_ptr;
- concptr to = !floor_ref.is_in_dungeon()
- ? _("地上", "the surface")
- : format(_("%d階(%s)", "level %d of %s"), floor_ref.dun_level, dungeons_info[player_ptr->dungeon_idx].name.data());
- fprintf(fff, _(" %2d:%02d %20s %sへとウィザード・テレポートで移動した。\n", " %2d:%02d %20s wizard-teleported to %s.\n"), hour, min, note_level.data(), to);
+ auto to = !floor_ref.is_in_dungeon()
+ ? _("地上", "the surface")
+ : format(_("%d階(%s)", "level %d of %s"), floor_ref.dun_level, dungeons_info[player_ptr->dungeon_idx].name.data());
+ fprintf(fff, _(" %2d:%02d %20s %sへとウィザード・テレポートで移動した。\n", " %2d:%02d %20s wizard-teleported to %s.\n"), hour, min, note_level.data(), to.data());
break;
}
case DIARY_PAT_TELE: {
const auto &floor_ref = *player_ptr->current_floor_ptr;
- concptr to = !floor_ref.is_in_dungeon()
- ? _("地上", "the surface")
- : format(_("%d階(%s)", "level %d of %s"), floor_ref.dun_level, dungeons_info[player_ptr->dungeon_idx].name.data());
- fprintf(fff, _(" %2d:%02d %20s %sへとパターンの力で移動した。\n", " %2d:%02d %20s used Pattern to teleport to %s.\n"), hour, min, note_level.data(), to);
+ auto to = !floor_ref.is_in_dungeon()
+ ? _("地上", "the surface")
+ : format(_("%d階(%s)", "level %d of %s"), floor_ref.dun_level, dungeons_info[player_ptr->dungeon_idx].name.data());
+ fprintf(fff, _(" %2d:%02d %20s %sへとパターンの力で移動した。\n", " %2d:%02d %20s used Pattern to teleport to %s.\n"), hour, min, note_level.data(), to.data());
break;
}
case DIARY_LEVELUP: {
}
if (act & DO_DISPLAY) {
- fprintf(fff, "%11s", format("[%s]", tmp));
+ fprintf(fff, "%11s", format("[%s]", tmp).data());
} else {
- fprintf(fff, "%11s", format("(%s)", tmp));
+ fprintf(fff, "%11s", format("(%s)", tmp).data());
}
tmp = autopick_line_from_entry(&item);
t_friends++;
monster_desc(player_ptr, pet_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
- fprintf(fff, "%s (%s)\n", pet_name, look_mon_desc(m_ptr, 0x00));
+ fprintf(fff, "%s (%s)\n", pet_name, look_mon_desc(m_ptr, 0x00).data());
}
int show_upkeep = calculate_upkeep(player_ptr);
i++;
if (i >= argc) {
- quit(format("Missing size specifier for -%s", left ? "left" : "right"));
+ quit_fmt("Missing size specifier for -%s", left ? "left" : "right");
}
arg = argv[i];
tmp = strchr(arg, 'x');
if (!tmp) {
- quit(format("Expected something like -%s 60x27,* for two %s hand terminals of 60 columns, the first 27 lines and the second whatever is left.", left ? "left" : "right", left ? "left" : "right"));
+ quit_fmt("Expected something like -%s 60x27,* for two %s hand terminals of 60 columns, the first 27 lines and the second whatever is left.", left ? "left" : "right", left ? "left" : "right");
}
cx = atoi(arg);
remaining.cx -= cx;
cy = remaining.y + remaining.cy - y;
}
if (next_term >= MAX_TERM_DATA) {
- quit(format("Too many terminals. Only %d are allowed.", MAX_TERM_DATA));
+ quit_fmt("Too many terminals. Only %d are allowed.", MAX_TERM_DATA);
}
if (cy <= 0) {
- quit(format("Out of bounds in -%s: %d is too large (%d rows max for this strip)",
- left ? "left" : "right", cys[j], remaining.cy));
+ quit_fmt("Out of bounds in -%s: %d is too large (%d rows max for this strip)",
+ left ? "left" : "right", cys[j], remaining.cy);
}
data[next_term++].r = rect(x, y, cx, cy);
y += cy + spacer_cy;
i++;
if (i >= argc) {
- quit(format("Missing size specifier for -%s", top ? "top" : "bottom"));
+ quit_fmt("Missing size specifier for -%s", top ? "top" : "bottom");
}
arg = argv[i];
tmp = strchr(arg, 'x');
if (!tmp) {
- quit(format("Expected something like -%s *x7 for a single %s terminal of 7 lines using as many columns as are available.", top ? "top" : "bottom", top ? "top" : "bottom"));
+ quit_fmt("Expected something like -%s *x7 for a single %s terminal of 7 lines using as many columns as are available.", top ? "top" : "bottom", top ? "top" : "bottom");
}
tmp++;
cy = atoi(tmp);
cx = remaining.x + remaining.cx - x;
}
if (next_term >= MAX_TERM_DATA) {
- quit(format("Too many terminals. Only %d are allowed.", MAX_TERM_DATA));
+ quit_fmt("Too many terminals. Only %d are allowed.", MAX_TERM_DATA);
}
if (cx <= 0) {
- quit(format("Out of bounds in -%s: %d is too large (%d cols max for this strip)",
- top ? "top" : "bottom", cxs[j], remaining.cx));
+ quit_fmt("Out of bounds in -%s: %d is too large (%d cols max for this strip)",
+ top ? "top" : "bottom", cxs[j], remaining.cx);
}
data[next_term++].r = rect(x, y, cx, cy);
x += cx + spacer_cx;
XWMHints *wh;
#endif
- font = getenv(format("ANGBAND_X11_FONT_%d", i));
+ font = getenv(format("ANGBAND_X11_FONT_%d", i).data());
if (!font) {
font = getenv("ANGBAND_X11_FONT");
}
}
}
- str = getenv(format("ANGBAND_X11_AT_X_%d", i));
+ str = getenv(format("ANGBAND_X11_AT_X_%d", i).data());
x = (str != nullptr) ? atoi(str) : -1;
- str = getenv(format("ANGBAND_X11_AT_Y_%d", i));
+ str = getenv(format("ANGBAND_X11_AT_Y_%d", i).data());
y = (str != nullptr) ? atoi(str) : -1;
- str = getenv(format("ANGBAND_X11_COLS_%d", i));
+ str = getenv(format("ANGBAND_X11_COLS_%d", i).data());
val = (str != nullptr) ? atoi(str) : -1;
if (val > 0) {
cols = val;
}
- str = getenv(format("ANGBAND_X11_ROWS_%d", i));
+ str = getenv(format("ANGBAND_X11_ROWS_%d", i).data());
val = (str != nullptr) ? atoi(str) : -1;
if (val > 0) {
rows = val;
}
}
- str = getenv(format("ANGBAND_X11_IBOX_%d", i));
+ str = getenv(format("ANGBAND_X11_IBOX_%d", i).data());
val = (str != nullptr) ? atoi(str) : -1;
if (val > 0) {
ox = val;
}
- str = getenv(format("ANGBAND_X11_IBOY_%d", i));
+ str = getenv(format("ANGBAND_X11_IBOY_%d", i).data());
val = (str != nullptr) ? atoi(str) : -1;
if (val > 0) {
oy = val;
auto *fp = angband_fopen(buf, "r");
if (!fp) {
- quit(format(_("'%s'ファイルをオープンできません。", "Cannot open '%s' file."), filename));
+ quit_fmt(_("'%s'ファイルをオープンできません。", "Cannot open '%s' file."), filename);
}
constexpr auto info_is_vector = is_vector_v<InfoType>;
msg_format(_("レコード %d は '%s' エラーがあります。", "Record %d contains a '%s' error."), error_idx, oops);
msg_format(_("構文 '%s'。", "Parsing '%s'."), buf);
msg_print(nullptr);
- quit(format(_("'%s'ファイルにエラー", "Error in '%s' file."), filename));
+ quit_fmt(_("'%s'ファイルにエラー", "Error in '%s' file."), filename);
}
if constexpr (info_is_vector) {
mam_ptr->act = silly_attacks2[randint0(MAX_SILLY_ATTACK)];
}
- strfmt(temp, mam_ptr->act, mam_ptr->t_name);
+ strnfmt(temp, sizeof(temp), mam_ptr->act, mam_ptr->t_name);
msg_format("%^sは%s", mam_ptr->m_name, temp);
#else
if (mam_ptr->do_silly_attack) {
mam_ptr->act = silly_attacks[randint0(MAX_SILLY_ATTACK)];
- strfmt(temp, "%s %s.", mam_ptr->act, mam_ptr->t_name);
+ strnfmt(temp, sizeof(temp), "%s %s.", mam_ptr->act, mam_ptr->t_name);
} else {
- strfmt(temp, mam_ptr->act, mam_ptr->t_name);
+ strnfmt(temp, sizeof(temp), mam_ptr->act, mam_ptr->t_name);
}
msg_format("%^s %s", mam_ptr->m_name, temp);
* @param spell_idx 呪文番号
* @return 説明文
*/
-static concptr get_element_tip(PlayerType *player_ptr, int spell_idx)
+static std::string get_element_tip(PlayerType *player_ptr, int spell_idx)
{
auto realm = i2enum<ElementRealmType>(player_ptr->element);
auto spell = i2enum<ElementSpells>(spell_idx);
term_erase(12, 18, 255);
term_erase(12, 17, 255);
term_erase(12, 16, 255);
- shape_buffer(get_element_tip(player_ptr, n), 62, temp, sizeof(temp));
+ shape_buffer(get_element_tip(player_ptr, n).data(), 62, temp, sizeof(temp));
for (int j = 0, line = 17; temp[j]; j += (1 + strlen(&temp[j]))) {
prt(&temp[j], line, 15);
line++;
}
if ((mode & MD_IGNORE_HALLU) && !m_ptr->is_original_ap()) {
- strcat(desc, format("(%s)", monraces_info[m_ptr->r_idx].name.data()));
+ strcat(desc, format("(%s)", monraces_info[m_ptr->r_idx].name.data()).data());
}
/* Handle the Possessive as a special afterthought */
#include "timed-effect/timed-effects.h"
#include "view/display-messages.h"
-mspell_cast_msg::mspell_cast_msg(concptr to_player_true, concptr to_mons_true, concptr to_player_false, concptr to_mons_false)
- : to_player_true(to_player_true)
- , to_mons_true(to_mons_true)
- , to_player_false(to_player_false)
- , to_mons_false(to_mons_false)
-{
-}
-
mspell_cast_msg_blind::mspell_cast_msg_blind(concptr blind, concptr to_player, concptr to_mons)
: blind(blind)
, to_player(to_player)
class PlayerType;
struct mspell_cast_msg {
- mspell_cast_msg(concptr to_player_true, concptr to_mons_true, concptr to_player_false, concptr to_mons_false);
+ template <typename T, typename U, typename V, typename W>
+ mspell_cast_msg(T &&to_player_true, U &&to_mons_true, V &&to_player_false, W &&to_mons_false)
+ : to_player_true(std::forward<T>(to_player_true))
+ , to_mons_true(std::forward<U>(to_mons_true))
+ , to_player_false(std::forward<V>(to_player_false))
+ , to_mons_false(std::forward<W>(to_mons_false))
+ {
+ }
mspell_cast_msg() = default;
- concptr to_player_true; /*!< msg_flagがTRUEかつプレイヤー対象*/
- concptr to_mons_true; /*!< msg_flagがTRUEかつモンスター対象*/
- concptr to_player_false; /*!< msg_flagがFALSEかつプレイヤー対象*/
- concptr to_mons_false; /*!< msg_flagがFALSEかつモンスター対象*/
+ std::string to_player_true; /*!< msg_flagがTRUEかつプレイヤー対象*/
+ std::string to_mons_true; /*!< msg_flagがTRUEかつモンスター対象*/
+ std::string to_player_false; /*!< msg_flagがFALSEかつプレイヤー対象*/
+ std::string to_mons_false; /*!< msg_flagがFALSEかつモンスター対象*/
};
struct mspell_cast_msg_blind {
screen_save();
auto q = format("book-%d_jp.txt", this->o_ptr->bi_key.sval());
describe_flavor(this->player_ptr, o_name, this->o_ptr, OD_NAME_ONLY);
- (void)path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, q);
+ (void)path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, q.data());
(void)show_file(this->player_ptr, true, buf, o_name, 0, 0);
screen_load();
return false;
* @param with_value 徳の情報と一緒に表示する時だけtrue
* @return アライメントの表記を返す。
*/
-concptr PlayerAlignment::get_alignment_description(bool with_value)
+std::string PlayerAlignment::get_alignment_description(bool with_value)
{
auto s = alignment_label();
if (with_value || show_actual_value) {
#pragma once
#include "system/angband.h"
+#include <string>
class PlayerType;
class PlayerAlignment {
public:
PlayerAlignment(PlayerType *player_ptr);
virtual ~PlayerAlignment() = default;
- concptr get_alignment_description(bool with_value = false);
+ std::string get_alignment_description(bool with_value = false);
void update_alignment();
private:
int nasty_chance = 6;
int type;
patron_reward effect;
- concptr reward = nullptr;
+ std::string reward;
GAME_TEXT o_name[MAX_NLEN];
int count = 0;
msg_format(_("「あー、あー、答えは %d/%d。質問は何？」", "'Uh... uh... the answer's %d/%d, what's the question?'"), type, effect);
}
}
- if (reward) {
- exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, format(_("パトロンの報酬で%s", "The patron rewarded you with %s."), reward));
+ if (!reward.empty()) {
+ const auto note = format(_("パトロンの報酬で%s", "The patron rewarded you with %s."), reward.data());
+ exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, note.data());
}
}
if (death_message[0] == '\0') {
#ifdef JP
- strcpy(death_message, format("あなたは%sました。", android ? "壊れ" : "死に"));
+ strcpy(death_message, format("あなたは%sました。", android ? "壊れ" : "死に").data());
#else
strcpy(death_message, android ? "You are broken." : "You die.");
#endif
put_str(center_string(format("Killed on Level %d", player_ptr->current_floor_ptr->dun_level)), 14, 11);
char buf[160];
- shape_buffer(format("by %s.", player_ptr->died_from.data()), GRAVE_LINE_WIDTH + 1, buf, sizeof(buf));
+ shape_buffer(format("by %s.", player_ptr->died_from.data()).data(), GRAVE_LINE_WIDTH + 1, buf, sizeof(buf));
put_str(center_string(buf), 15, 11);
char *t = buf + strlen(buf) + 1;
if (!*t) {
}
if (player_cast) {
- take_hit(player_ptr, DAMAGE_GENO, randint1(dam_side), format(_("%^sの呪文を唱えた疲労", "the strain of casting %^s"), spell_name));
+ take_hit(player_ptr, DAMAGE_GENO, randint1(dam_side), format(_("%^sの呪文を唱えた疲労", "the strain of casting %^s"), spell_name).data());
}
move_cursor_relative(player_ptr->y, player_ptr->x);
auto price_ask = price_item(player_ptr, o_ptr, ot_ptr->inflate, false, store_num);
price_ask *= o_ptr->number;
- concptr s = format(_("買値 $%ld で買いますか？", "Do you buy for $%ld? "), static_cast<long>(price_ask));
+ const auto s = format(_("買値 $%ld で買いますか？", "Do you buy for $%ld? "), static_cast<long>(price_ask));
if (get_check_strict(player_ptr, s, CHECK_DEFAULT_Y)) {
return price_ask;
}
#include "view/display-messages.h"
#include "world/world.h"
#include <algorithm>
+#include <sstream>
#include <stdexcept>
#include <string>
#include <utility>
return static_cast<short>(atoi(zz.data()));
}
-static std::string_view bind_rumor_name(std::string &base, concptr fullname)
+static std::string bind_rumor_name(std::string_view base, concptr fullname)
{
- auto *s = strstr(base.data(), "{Name}");
- if (s) {
- s[0] = '\0';
- return format("%s%s%s", base.data(), fullname, (s + 6));
+ if (const auto pos = base.find("{Name}");
+ pos != std::string::npos) {
+ const auto head = base.substr(0, pos);
+ const auto tail = base.substr(pos + 6);
+ std::stringstream ss;
+ ss << head << fullname << tail;
+ return ss.str();
}
- return base;
+ return std::string(base);
}
/*
throw std::runtime_error("Unknown token exists in rumor.txt");
}
- auto base = std::string(tokens[2]);
- const auto rumor_msg = bind_rumor_name(base, fullname);
+ const auto rumor_msg = bind_rumor_name(tokens[2], fullname);
msg_print(rumor_msg);
if (rumor_eff_format) {
msg_print(nullptr);
price_ask = std::min(price_ask, ot_ptr->max_cost);
price_ask *= o_ptr->number;
- concptr s = format(_("売値 $%ld で売りますか？", "Do you sell for $%ld? "), static_cast<long>(price_ask));
+ const auto s = format(_("売値 $%ld で売りますか？", "Do you sell for $%ld? "), static_cast<long>(price_ask));
if (get_check_strict(player_ptr, s, CHECK_DEFAULT_Y)) {
return price_ask;
}
OBJECT_IDX next_o_idx;
FEAT_IDX feat;
TerrainType *f_ptr;
- concptr name;
+ std::string name;
};
static eg_type *initialize_eg_type(PlayerType *player_ptr, eg_type *eg_ptr, POSITION y, POSITION x, target_type mode, concptr info)
}
std::string acount = evaluate_monster_exp(player_ptr, eg_ptr->m_ptr);
+ const auto mon_desc = look_mon_desc(eg_ptr->m_ptr, 0x01);
#ifdef JP
- strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "[%s]%s%s(%s)%s%s [r思 %s%s]", acount.data(), eg_ptr->s1, m_name, look_mon_desc(eg_ptr->m_ptr, 0x01), eg_ptr->s2, eg_ptr->s3,
+ strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "[%s]%s%s(%s)%s%s [r思 %s%s]", acount.data(), eg_ptr->s1, m_name, mon_desc.data(), eg_ptr->s2, eg_ptr->s3,
eg_ptr->x_info, eg_ptr->info);
#else
- strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "[%s]%s%s%s%s(%s) [r, %s%s]", acount.data(), eg_ptr->s1, eg_ptr->s2, eg_ptr->s3, m_name, look_mon_desc(eg_ptr->m_ptr, 0x01),
+ strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "[%s]%s%s%s%s(%s) [r, %s%s]", acount.data(), eg_ptr->s1, eg_ptr->s2, eg_ptr->s3, m_name, mon_desc.data(),
eg_ptr->x_info, eg_ptr->info);
#endif
prt(eg_ptr->out_val, 0, 0);
return CONTINUOUS_DESCRIPTION;
}
-static concptr decide_target_floor(PlayerType *player_ptr, eg_type *eg_ptr)
+static std::string decide_target_floor(PlayerType *player_ptr, eg_type *eg_ptr)
{
if (eg_ptr->f_ptr->flags.has(TerrainCharacteristics::QUEST_ENTER)) {
QuestId old_quest = player_ptr->current_floor_ptr->quest_number;
{
if (!w_ptr->wizard) {
#ifdef JP
- strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "%s%s%s%s[%s]", eg_ptr->s1, eg_ptr->name, eg_ptr->s2, eg_ptr->s3, eg_ptr->info);
+ strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "%s%s%s%s[%s]", eg_ptr->s1, eg_ptr->name.data(), eg_ptr->s2, eg_ptr->s3, eg_ptr->info);
#else
- strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "%s%s%s%s [%s]", eg_ptr->s1, eg_ptr->s2, eg_ptr->s3, eg_ptr->name, eg_ptr->info);
+ strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "%s%s%s%s [%s]", eg_ptr->s1, eg_ptr->s2, eg_ptr->s3, eg_ptr->name.data(), eg_ptr->info);
#endif
return;
}
}
#ifdef JP
- strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "%s%s%s%s[%s] %x %s %d %d %d (%d,%d) %d", eg_ptr->s1, eg_ptr->name, eg_ptr->s2, eg_ptr->s3, eg_ptr->info,
+ strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "%s%s%s%s[%s] %x %s %d %d %d (%d,%d) %d", eg_ptr->s1, eg_ptr->name.data(), eg_ptr->s2, eg_ptr->s3, eg_ptr->info,
(uint)eg_ptr->g_ptr->info, f_idx_str.data(), eg_ptr->g_ptr->dists[FLOW_NORMAL], eg_ptr->g_ptr->costs[FLOW_NORMAL], eg_ptr->g_ptr->when, (int)eg_ptr->y,
(int)eg_ptr->x, travel.cost[eg_ptr->y][eg_ptr->x]);
#else
- strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "%s%s%s%s [%s] %x %s %d %d %d (%d,%d)", eg_ptr->s1, eg_ptr->s2, eg_ptr->s3, eg_ptr->name, eg_ptr->info, eg_ptr->g_ptr->info,
+ strnfmt(eg_ptr->out_val, sizeof(eg_ptr->out_val), "%s%s%s%s [%s] %x %s %d %d %d (%d,%d)", eg_ptr->s1, eg_ptr->s2, eg_ptr->s3, eg_ptr->name.data(), eg_ptr->info, eg_ptr->g_ptr->info,
f_idx_str.data(), eg_ptr->g_ptr->dists[FLOW_NORMAL], eg_ptr->g_ptr->costs[FLOW_NORMAL], eg_ptr->g_ptr->when, (int)eg_ptr->y, (int)eg_ptr->x);
#endif
}
return;
}
- for (auto s = str.begin(); s != str.end(); s++) {
+ for (auto s = str.data(); *s != '\0'; ++s) {
char ch;
#ifdef JP
int k_flag = iskanji(*s);
return n;
}
-/*
- * Do a vstrnfmt (see above) into a (growable) static buffer.
- * This buffer is usable for very short term formatting of results.
- */
-char *vformat(concptr fmt, va_list vp)
+std::string vformat(concptr fmt, va_list vp)
{
/* Initial allocation */
- static std::vector<char> format_buf(1024);
-
- /* Null format yields last result */
- if (!fmt) {
- return format_buf.data();
- }
+ std::vector<char> format_buf(1024);
/* Keep going until successful */
while (true) {
format_buf.resize(format_buf.size() * 2);
}
- /* Return the new buffer */
- return format_buf.data();
+ /* Return the new string */
+ return std::string(format_buf.data());
}
/*
}
/*
- * Do a vstrnfmt (see above) into a buffer of unknown size.
- * Since the buffer size is unknown, the user better verify the args.
- */
-uint strfmt(char *buf, concptr fmt, ...)
-{
- uint len;
-
- va_list vp;
-
- /* Begin the Varargs Stuff */
- va_start(vp, fmt);
-
- /* Build the string, assume 32K buffer */
- len = vstrnfmt(buf, 32767, fmt, vp);
-
- /* End the Varargs Stuff */
- va_end(vp);
-
- /* Return the number of bytes written */
- return len;
-}
-
-/*
* Do a vstrnfmt() into (see above) into a (growable) static buffer.
* This buffer is usable for very short term formatting of results.
* Note that the buffer is (technically) writable, but only up to
* the length of the string contained inside it.
*/
-char *format(concptr fmt, ...)
+std::string format(concptr fmt, ...)
{
- char *res;
va_list vp;
/* Begin the Varargs Stuff */
va_start(vp, fmt);
/* Format the args */
- res = vformat(fmt, vp);
+ auto res = vformat(fmt, vp);
/* End the Varargs Stuff */
va_end(vp);
*/
void plog_fmt(concptr fmt, ...)
{
- char *res;
va_list vp;
/* Begin the Varargs Stuff */
va_start(vp, fmt);
/* Format the args */
- res = vformat(fmt, vp);
+ auto res = vformat(fmt, vp);
/* End the Varargs Stuff */
va_end(vp);
/* Call plog */
- plog(res);
+ plog(res.data());
}
/*
*/
void quit_fmt(concptr fmt, ...)
{
- char *res;
va_list vp;
/* Begin the Varargs Stuff */
va_start(vp, fmt);
/* Format */
- res = vformat(fmt, vp);
+ auto res = vformat(fmt, vp);
/* End the Varargs Stuff */
va_end(vp);
/* Call quit() */
- quit(res);
+ quit(res.data());
}
/*
*/
void core_fmt(concptr fmt, ...)
{
- char *res;
va_list vp;
/* Begin the Varargs Stuff */
va_start(vp, fmt);
/* If requested, Do a virtual fprintf to stderr */
- res = vformat(fmt, vp);
+ auto res = vformat(fmt, vp);
/* End the Varargs Stuff */
va_end(vp);
/* Call core() */
- core(res);
+ core(res.data());
}
#define INCLUDED_Z_FORM_H
#include "system/h-basic.h"
+#include <string>
/*
* This file provides functions very similar to "sprintf()", but which
/* Simple interface to "vstrnfmt()" */
extern uint strnfmt(char *buf, uint max, concptr fmt, ...);
-/* Simple interface to "vstrnfmt()", assuming infinite length */
-extern uint strfmt(char *buf, concptr fmt, ...);
-
/* Format arguments into a static resizing buffer */
-extern char *vformat(concptr fmt, va_list vp);
+extern std::string vformat(concptr fmt, va_list vp);
/* Simple interface to "vformat()" */
-extern char *format(concptr fmt, ...);
+extern std::string format(concptr fmt, ...);
/* Vararg interface to "plog()", using "format()" */
extern void plog_fmt(concptr fmt, ...);
/*
* Monster health description
*/
-concptr look_mon_desc(MonsterEntity *m_ptr, BIT_FLAGS mode)
+std::string look_mon_desc(MonsterEntity *m_ptr, BIT_FLAGS mode)
{
bool living = monster_living(m_ptr->ap_r_idx);
int perc = m_ptr->maxhp > 0 ? 100L * m_ptr->hp / m_ptr->maxhp : 0;
#pragma once
#include "system/angband.h"
+#include <string>
class MonsterEntity;
-concptr look_mon_desc(MonsterEntity *m_ptr, BIT_FLAGS mode);
+std::string look_mon_desc(MonsterEntity *m_ptr, BIT_FLAGS mode);
display_player_one_line(ENTRY_SHOTS, format("%d.%02d", shots, shot_frac), TERM_L_BLUE);
- concptr desc;
+ std::string desc;
if ((damage[0] + damage[1]) == 0) {
desc = "nil!";
} else {
spoil_out(format("Ac:%d ", r_ptr->ac));
spoil_out(format("Exp:%ld\n", (long)(r_ptr->mexp)));
output_monster_spoiler(r_idx, roff_func);
- spoil_out(nullptr);
+ spoil_out({}, true);
}
return ferror(spoiler_file) || angband_fclose(spoiler_file) ? SpoilerOutputResultType::FILE_CLOSE_FAILED
* @brief 文字列をファイルポインタに出力する /
* Buffer text to the given file. (-SHAWN-)
* This is basically c_roff() from mon-desc.c with a few changes.
- * @param str 文字列参照ポインタ
+ * @param sv 文字列
+ * @param flush_buffer trueならバッファの内容をフラッシュし、改行を書き込む。strは無視される。
*/
-void spoil_out(concptr str)
+void spoil_out(std::string_view sv, bool flush_buffer)
{
concptr r;
- static char roff_buf[256];
- static char roff_waiting_buf[256];
+ static char roff_buf[256]{};
+ static char roff_waiting_buf[256]{};
#ifdef JP
bool iskanji_flag = false;
static char *roff_p = roff_buf;
static char *roff_s = nullptr;
static bool waiting_output = false;
- if (!str) {
+ if (flush_buffer) {
if (waiting_output) {
fputs(roff_waiting_buf, spoiler_file);
waiting_output = false;
return;
}
- for (; *str; str++) {
+ for (auto str = sv.data(); *str != '\0'; ++str) {
#ifdef JP
char cbak;
bool k_flag = iskanji((unsigned char)(*str));
#include "system/angband.h"
#include "wizard/spoiler-table.h"
+#include <string_view>
/* MAX_LINE_LEN specifies when a line should wrap. */
#define MAX_LINE_LEN 75
void spoiler_blanklines(int n);
void spoiler_underline(concptr str);
-void spoil_out(concptr str);
+void spoil_out(std::string_view sv, bool flush_buffer = false);
OSDN Git Service
