From a0182347e7ada1f8c695b4c1269758f26e34f232 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sun, 13 Jan 2019 17:15:07 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38861=20cptr=E3=80=80=E3=82=92?= =?utf8?q?=E3=80=80concptr=E3=81=AB=E6=94=B9=E5=90=8D=20/=20rename=20cptr?= =?utf8?q?=20to=20concptr.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/artifact.c | 4 +- src/autopick.c | 96 +++++++++--------- src/avatar.c | 2 +- src/birth.c | 36 +++---- src/bldg.c | 34 +++---- src/cave.c | 6 +- src/chuukei.c | 10 +- src/cmd-activate.c | 12 +-- src/cmd-eat.c | 4 +- src/cmd-item.c | 22 ++-- src/cmd-pet.c | 2 +- src/cmd-quaff.c | 2 +- src/cmd-read.c | 4 +- src/cmd-spell.c | 26 ++--- src/cmd-spell.h | 24 ++--- src/cmd-usestaff.c | 2 +- src/cmd-zaprod.c | 2 +- src/cmd-zapwand.c | 2 +- src/cmd1.c | 2 +- src/cmd2.c | 12 +-- src/cmd4.c | 114 ++++++++++----------- src/cmd5.c | 18 ++-- src/dungeon.c | 16 +-- src/effects.c | 16 +-- src/externs.h | 276 +++++++++++++++++++++++++------------------------- src/files.c | 62 ++++++------ src/flavor.c | 32 +++--- src/floor-generate.c | 4 +- src/h-type.h | 4 +- src/hissatsu.c | 4 +- src/history.h | 2 +- src/inet.c | 6 +- src/init1.c | 90 ++++++++-------- src/init2.c | 24 ++--- src/japanese.c | 18 ++-- src/load.c | 2 +- src/maid-x11.c | 2 +- src/main-cap.c | 2 +- src/main-dos.c | 4 +- src/main-gcu.c | 12 +-- src/main-mac.c | 16 +-- src/main-win.c | 64 ++++++------ src/main-x11.c | 38 +++---- src/main-xaw.c | 2 +- src/main.c | 10 +- src/mane.c | 10 +- src/melee1.c | 10 +- src/mind.c | 18 ++-- src/monster-process.c | 6 +- src/monster1.c | 18 ++-- src/monster2.c | 16 +-- src/mspells3.c | 20 ++-- src/mspells4.c | 24 ++--- src/mutation.c | 4 +- src/object1.c | 44 ++++---- src/object2.c | 20 ++-- src/player-damage.c | 8 +- src/player-damage.h | 8 +- src/player-status.c | 2 +- src/player-status.h | 2 +- src/racial.c | 8 +- src/realm-arcane.c | 2 +- src/realm-arcane.h | 2 +- src/realm-chaos.c | 2 +- src/realm-chaos.h | 2 +- src/realm-craft.c | 2 +- src/realm-craft.h | 2 +- src/realm-crusade.c | 2 +- src/realm-crusade.h | 2 +- src/realm-daemon.c | 2 +- src/realm-daemon.h | 2 +- src/realm-death.c | 2 +- src/realm-death.h | 2 +- src/realm-hex.c | 8 +- src/realm-hex.h | 2 +- src/realm-hissatsu.c | 2 +- src/realm-hissatsu.h | 2 +- src/realm-life.c | 2 +- src/realm-life.h | 2 +- src/realm-nature.c | 2 +- src/realm-nature.h | 2 +- src/realm-song.c | 2 +- src/realm-song.h | 2 +- src/realm-sorcery.c | 2 +- src/realm-sorcery.h | 2 +- src/realm-trump.c | 2 +- src/realm-trump.h | 2 +- src/report.c | 20 ++-- src/rooms-pitnest.c | 4 +- src/rooms-vault.c | 4 +- src/save.c | 4 +- src/scores.c | 2 +- src/selfinfo.c | 6 +- src/snipe.c | 6 +- src/spells-summon.c | 2 +- src/spells1.c | 18 ++-- src/spells2.c | 12 +-- src/spells3.c | 30 +++--- src/store.c | 62 ++++++------ src/tables.c | 42 ++++---- src/trap.c | 8 +- src/types.h | 50 ++++----- src/util.c | 166 +++++++++++++++--------------- src/variable.c | 60 +++++------ src/wild.c | 8 +- src/wizard1.c | 68 ++++++------- src/wizard2.c | 20 ++-- src/xtra1.c | 22 ++-- src/xtra2.c | 36 +++---- src/z-form.c | 28 ++--- src/z-form.h | 16 +-- src/z-term.c | 12 +-- src/z-term.h | 12 +-- src/z-util.c | 20 ++-- src/z-util.h | 22 ++-- src/z-virt.c | 6 +- src/z-virt.h | 4 +- 117 files changed, 1094 insertions(+), 1094 deletions(-) diff --git a/src/artifact.c b/src/artifact.c index efff71519..a79048ccb 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -1689,7 +1689,7 @@ static void get_random_name(object_type *o_ptr, char *return_name, bool armour, } else { - cptr filename; + concptr filename; switch (armour) { @@ -2015,7 +2015,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll) if (a_scroll) { GAME_TEXT dummy_name[MAX_NLEN] = ""; - cptr ask_msg = _("このアーティファクトを何と名付けますか？", "What do you want to call the artifact? "); + concptr ask_msg = _("このアーティファクトを何と名付けますか？", "What do you want to call the artifact? "); /* Identify it fully */ object_aware(o_ptr); diff --git a/src/autopick.c b/src/autopick.c index d79a26d73..e13f4eaf7 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -202,13 +202,13 @@ static GAME_TEXT KEY_BOOTS[] = "boots"; /* * A function to create new entry */ -static bool autopick_new_entry(autopick_type *entry, cptr str, bool allow_default) +static bool autopick_new_entry(autopick_type *entry, concptr str, bool allow_default) { - cptr insc; + concptr insc; int i; byte act = 0; char buf[MAX_LINELEN]; - cptr prev_ptr, ptr, old_ptr; + concptr prev_ptr, ptr, old_ptr; int prev_flg; if (str[0] && str[1] == ':') switch (str[0]) @@ -731,7 +731,7 @@ static void init_autopick(void) /* * Get file name for autopick preference */ -static cptr pickpref_filename(int filename_mode) +static concptr pickpref_filename(int filename_mode) { static const char namebase[] = _("picktype", "pickpref"); @@ -872,7 +872,7 @@ errr process_autopick_file_command(char *buf) /* * Reconstruct preference line from entry */ -cptr autopick_line_from_entry(autopick_type *entry) +concptr autopick_line_from_entry(autopick_type *entry) { char buf[MAX_LINELEN]; char *ptr; @@ -996,9 +996,9 @@ cptr autopick_line_from_entry(autopick_type *entry) /* * Reconstruct preference line from entry and kill entry */ -static cptr autopick_line_from_entry_kill(autopick_type *entry) +static concptr autopick_line_from_entry_kill(autopick_type *entry) { - cptr ptr = autopick_line_from_entry(entry); + concptr ptr = autopick_line_from_entry(entry); /* Free memory for original entry */ autopick_free_entry(entry); @@ -1011,10 +1011,10 @@ static cptr autopick_line_from_entry_kill(autopick_type *entry) * A function for Auto-picker/destroyer * Examine whether the object matches to the entry */ -static bool is_autopick_aux(object_type *o_ptr, autopick_type *entry, cptr o_name) +static bool is_autopick_aux(object_type *o_ptr, autopick_type *entry, concptr o_name) { int j; - cptr ptr = entry->name; + concptr ptr = entry->name; /*** Unaware items ***/ if (IS_FLG(FLG_UNAWARE) && object_is_aware(o_ptr)) @@ -1906,7 +1906,7 @@ bool autopick_autoregister(object_type *o_ptr) /* Already registered */ if (match_autopick != -1) { - cptr what; + concptr what; byte act = autopick_list[match_autopick].action; if (act & DO_AUTOPICK) what = _("自動で拾う", "auto-pickup"); @@ -2057,13 +2057,13 @@ typedef struct { byte mark; object_type *search_o_ptr; - cptr search_str; - cptr last_destroyed; + concptr search_str; + concptr last_destroyed; chain_str_type *yank; bool yank_eol; - cptr *lines_list; + concptr *lines_list; byte states[MAX_LINES]; u16b dirty_flags; @@ -2092,15 +2092,15 @@ typedef struct { */ static void describe_autopick(char *buff, autopick_type *entry) { - cptr str = entry->name; + concptr str = entry->name; byte act = entry->action; - cptr insc = entry->insc; + concptr insc = entry->insc; int i; bool top = FALSE; #ifdef JP - cptr before_str[100], body_str; + concptr before_str[100], body_str; int before_n = 0; body_str = "アイテム"; @@ -2386,7 +2386,7 @@ static void describe_autopick(char *buff, autopick_type *entry) #else /* JP */ - cptr before_str[20], after_str[20], which_str[20], whose_str[20], body_str; + concptr before_str[20], after_str[20], which_str[20], whose_str[20], body_str; int before_n = 0, after_n = 0, which_n = 0, whose_n = 0; body_str = "items"; @@ -2731,9 +2731,9 @@ static void describe_autopick(char *buff, autopick_type *entry) /* * Read whole lines of a file to memory */ -static cptr *read_text_lines(cptr filename) +static concptr *read_text_lines(concptr filename) { - cptr *lines_list = NULL; + concptr *lines_list = NULL; FILE *fff; int lines = 0; @@ -2747,7 +2747,7 @@ static cptr *read_text_lines(cptr filename) if (fff) { /* Allocate list of pointers */ - C_MAKE(lines_list, MAX_LINES, cptr); + C_MAKE(lines_list, MAX_LINES, concptr); /* Parse it */ while (0 == my_fgets(fff, buf, sizeof(buf))) @@ -2771,7 +2771,7 @@ static cptr *read_text_lines(cptr filename) */ static void prepare_default_pickpref(void) { - const cptr messages[] = { + const concptr messages[] = { _("あなたは「自動拾いエディタ」を初めて起動しました。", "You have activated the Auto-Picker Editor for the first time."), _("自動拾いのユーザー設定ファイルがまだ書かれていないので、", "Since user pref file for autopick is not yet created,"), _("基本的な自動拾い設定ファイルをlib/pref/picktype.prfからコピーします。", "the default setting is loaded from lib/pref/pickpref.prf ."), @@ -2782,7 +2782,7 @@ static void prepare_default_pickpref(void) FILE *pref_fp; FILE *user_fp; int i; - cptr filename = pickpref_filename(PT_DEFAULT); + concptr filename = pickpref_filename(PT_DEFAULT); /* Display messages */ for (i = 0; messages[i]; i++) msg_print(messages[i]); @@ -2828,10 +2828,10 @@ static void prepare_default_pickpref(void) * Read an autopick prefence file to memory * Prepare default if no user file is found */ -static cptr *read_pickpref_text_lines(int *filename_mode_p) +static concptr *read_pickpref_text_lines(int *filename_mode_p) { char buf[1024]; - cptr *lines_list; + concptr *lines_list; /* Try a filename with player name */ *filename_mode_p = PT_WITH_PNAME; @@ -2860,7 +2860,7 @@ static cptr *read_pickpref_text_lines(int *filename_mode_p) if (!lines_list) { /* Allocate list of pointers */ - C_MAKE(lines_list, MAX_LINES, cptr); + C_MAKE(lines_list, MAX_LINES, concptr); lines_list[0] = string_make(""); } return lines_list; @@ -2870,7 +2870,7 @@ static cptr *read_pickpref_text_lines(int *filename_mode_p) /* * Write whole lines of memory to a file. */ -static bool write_text_lines(cptr filename, cptr *lines_list) +static bool write_text_lines(concptr filename, concptr *lines_list) { FILE *fff; @@ -2898,7 +2898,7 @@ static bool write_text_lines(cptr filename, cptr *lines_list) /* * Free memory of lines_list. */ -static void free_text_lines(cptr *lines_list) +static void free_text_lines(concptr *lines_list) { int lines; @@ -2906,7 +2906,7 @@ static void free_text_lines(cptr *lines_list) string_free(lines_list[lines]); /* free list of pointers */ - C_KILL(lines_list, MAX_LINES, cptr); + C_KILL(lines_list, MAX_LINES, concptr); } @@ -3148,7 +3148,7 @@ static void add_keyword(text_body_type *tb, BIT_FLAGS flg) */ static void check_expression_line(text_body_type *tb, int y) { - cptr s = tb->lines_list[y]; + concptr s = tb->lines_list[y]; if ((s[0] == '?' && s[1] == ':') || (tb->states[y] & LSTAT_BYPASS)) @@ -3240,7 +3240,7 @@ static bool insert_return_code(text_body_type *tb) static bool entry_from_choosed_object(autopick_type *entry) { object_type *o_ptr; - cptr q, s; + concptr q, s; q = _("どのアイテムを登録しますか? ", "Enter which item? "); s = _("アイテムを持っていない。", "You have nothing to enter."); @@ -3255,11 +3255,11 @@ static bool entry_from_choosed_object(autopick_type *entry) /* * Choose an item for search */ -static byte get_object_for_search(object_type **o_handle, cptr *search_strp) +static byte get_object_for_search(object_type **o_handle, concptr *search_strp) { char buf[MAX_NLEN+20]; object_type *o_ptr; - cptr q, s; + concptr q, s; q = _("どのアイテムを検索しますか? ", "Enter which item? "); s = _("アイテムを持っていない。", "You have nothing to enter."); @@ -3278,7 +3278,7 @@ static byte get_object_for_search(object_type **o_handle, cptr *search_strp) /* * Prepare for search by destroyed object */ -static byte get_destroyed_object_for_search(object_type **o_handle, cptr *search_strp) +static byte get_destroyed_object_for_search(object_type **o_handle, concptr *search_strp) { char buf[MAX_NLEN+20]; @@ -3296,7 +3296,7 @@ static byte get_destroyed_object_for_search(object_type **o_handle, cptr *search /* * Choose an item or string for search */ -static byte get_string_for_search(object_type **o_handle, cptr *search_strp) +static byte get_string_for_search(object_type **o_handle, concptr *search_strp) { int pos = 0; @@ -3671,7 +3671,7 @@ static void search_for_object(text_body_type *tb, object_type *o_ptr, bool forwa /* * Search next line matches to the string */ -static void search_for_string(text_body_type *tb, cptr search_str, bool forward) +static void search_for_string(text_body_type *tb, concptr search_str, bool forward) { int bypassed_cy = -1; int bypassed_cx = 0; @@ -3681,7 +3681,7 @@ static void search_for_string(text_body_type *tb, cptr search_str, bool forward) while (TRUE) { - cptr pos; + concptr pos; /* End of list? */ if (forward) @@ -3984,7 +3984,7 @@ static GAME_TEXT MN_NOUN[] = "Keywords (noun)"; typedef struct { - cptr name; + concptr name; int level; int key; int com_id; @@ -4184,7 +4184,7 @@ static int do_command_menu(int level, int start) for (i = start; menu_data[i].level >= level; i++) { char com_key_str[3]; - cptr str; + concptr str; /* Ignore lower level sub menus */ if (menu_data[i].level > level) continue; @@ -4254,7 +4254,7 @@ static int do_command_menu(int level, int start) } -static chain_str_type *new_chain_str(cptr str) +static chain_str_type *new_chain_str(concptr str) { chain_str_type *chain; @@ -4287,7 +4287,7 @@ static void kill_yank_chain(text_body_type *tb) } -static void add_str_to_yank(text_body_type *tb, cptr str) +static void add_str_to_yank(text_body_type *tb, concptr str) { chain_str_type *chain; @@ -4485,8 +4485,8 @@ static void draw_text_editor(text_body_type *tb) for (y = 0; tb->lines_list[y]; y++) { char f; - cptr v; - cptr s = tb->lines_list[y]; + concptr v; + concptr s = tb->lines_list[y]; char *ss, *s_keep; int s_len; @@ -4534,7 +4534,7 @@ static void draw_text_editor(text_body_type *tb) { int j; int leftcol = 0; - cptr msg; + concptr msg; byte color; int y = tb->upper+i; @@ -4620,7 +4620,7 @@ static void draw_text_editor(text_body_type *tb) if (tb->old_cy != tb->cy || (tb->dirty_flags & (DIRTY_ALL | DIRTY_NOT_FOUND | DIRTY_NO_SEARCH)) || tb->dirty_line == tb->cy) { autopick_type an_entry, *entry = &an_entry; - cptr str1 = NULL, str2 = NULL; + concptr str1 = NULL, str2 = NULL; /* Clear information line */ @@ -4703,7 +4703,7 @@ static void draw_text_editor(text_body_type *tb) { char buf[MAX_LINELEN]; char temp[MAX_LINELEN]; - cptr t; + concptr t; describe_autopick(buf, entry); @@ -4747,7 +4747,7 @@ static void draw_text_editor(text_body_type *tb) static void kill_line_segment(text_body_type *tb, int y, int x0, int x1, bool whole) { char buf[MAX_LINELEN]; - cptr s = tb->lines_list[y]; + concptr s = tb->lines_list[y]; char *d = buf; int x; @@ -4877,7 +4877,7 @@ static bool insert_keymap_line(text_body_type *tb) char tmp[1024]; char buf[2]; BIT_FLAGS mode; - cptr act; + concptr act; /* Roguelike */ if (rogue_like_commands) @@ -5266,7 +5266,7 @@ static bool do_editor_command(text_body_type *tb, int com_id) /* Paste text */ while (chain) { - cptr yank_str = chain->s; + concptr yank_str = chain->s; char buf[MAX_LINELEN]; int i; diff --git a/src/avatar.c b/src/avatar.c index 51eae4b31..778e47b4f 100644 --- a/src/avatar.c +++ b/src/avatar.c @@ -19,7 +19,7 @@ /*! * 徳の名称 / The names of the virtues */ -cptr virtue[MAX_VIRTUE] = +concptr virtue[MAX_VIRTUE] = { _("情", "Compassion"), _("誉", "Honour"), diff --git a/src/birth.c b/src/birth.c index 0bbbad818..206f843d8 100644 --- a/src/birth.c +++ b/src/birth.c @@ -44,7 +44,7 @@ /*! 種族の解説メッセージテーブル */ -static cptr race_jouhou[MAX_RACES] = +static concptr race_jouhou[MAX_RACES] = { #ifdef JP "人間は基本となるキャラクタです。他の全ての種族は人間と比較されます。人間はどんな職業に就くこともでき、どの職業でも平均的にこなせます。人間は寿命が短いため、レベル上昇が他のどんな種族よりも早くなる傾向があります。また、特別な修正や特性は持っていません。", @@ -201,7 +201,7 @@ static cptr race_jouhou[MAX_RACES] = }; /*! 職業の解説メッセージテーブル */ -static cptr class_jouhou[MAX_CLASS] = +static concptr class_jouhou[MAX_CLASS] = { #ifdef JP "戦士は、直面する問題のほとんどを細切れに叩き切ることで解決するキャラクタです。が、時折退却して魔法の道具の世話になることもあります。不運にも、高レベルなアイテムの多くは彼らが扱える範囲を越えています。", @@ -321,7 +321,7 @@ static cptr class_jouhou[MAX_CLASS] = }; /*! 性格の解説メッセージテーブル */ -static cptr seikaku_jouhou[MAX_SEIKAKU] = +static concptr seikaku_jouhou[MAX_SEIKAKU] = { #ifdef JP "ふつうは、特に特筆するべき部分がない性格です。あらゆる技能を平均的にこなします。", @@ -378,7 +378,7 @@ static cptr seikaku_jouhou[MAX_SEIKAKU] = }; /*! 魔法領域の詳細解説メッセージテーブル */ -static cptr realm_jouhou[VALID_REALM] = +static concptr realm_jouhou[VALID_REALM] = { #ifdef JP "生命は回復能力に優れた魔法です。治療や防御、感知魔法が多く含まれていますが、攻撃呪文もわずかに持っています。特に高レベルの呪文にはアンデッドを塵に帰す力をあると言われています。", @@ -437,7 +437,7 @@ static cptr realm_jouhou[VALID_REALM] = }; /*! 魔法領域の簡易解説メッセージテーブル */ -static cptr realm_subinfo[VALID_REALM] = +static concptr realm_subinfo[VALID_REALM] = { #ifdef JP "感知と防御と回復に優れています", @@ -503,7 +503,7 @@ static void birth_quit(void) * @param helpfile ファイル名 * @return なし */ -static void show_help(cptr helpfile) +static void show_help(concptr helpfile) { screen_save(); (void)show_file(TRUE, helpfile, NULL, 0, 0); @@ -771,7 +771,7 @@ static bool get_player_realms(void) while (1) { char temp[80*10]; - cptr t; + concptr t; count = 0; p_ptr->realm1 = choose_realm(realm_choices1[p_ptr->pclass], &count); @@ -819,7 +819,7 @@ static bool get_player_realms(void) while (1) { char temp[80*8]; - cptr t; + concptr t; count = 0; p_ptr->realm2 = choose_realm(realm_choices2[p_ptr->pclass], &count); @@ -2469,7 +2469,7 @@ void player_outfit(void) static bool get_player_race(void) { int k, n, cs, os; - cptr str; + concptr str; char c; char sym[MAX_RACES]; char p2 = ')'; @@ -2632,7 +2632,7 @@ static bool get_player_class(void) char sym[MAX_CLASS_CHOICE]; char p2 = ')'; char buf[80], cur[80]; - cptr str; + concptr str; /* Extra info */ @@ -2805,7 +2805,7 @@ static bool get_player_seikaku(void) char p2 = ')'; char buf[80], cur[80]; char tmp[64]; - cptr str; + concptr str; /* Extra info */ clear_from(10); @@ -3239,7 +3239,7 @@ static bool get_chara_limits(void) int max_percent, min_percent; char c; char buf[80], cur[80]; - cptr itemname[] = { + concptr itemname[] = { _("年齢", "age"), _("身長(インチ)", "height"), _("体重(ポンド)", "weight"), @@ -3517,7 +3517,7 @@ static char *histpref_buf = NULL; * @brief 生い立ちメッセージの内容をバッファに加える。 / Hook function for reading the histpref.prf file. * @return なし */ -void add_history_from_pref_line(cptr t) +void add_history_from_pref_line(concptr t) { /* Do nothing if the buffer is not ready */ if (!histpref_buf) return; @@ -3844,7 +3844,7 @@ static bool player_birth_aux(void) bool flag = FALSE; bool prev = FALSE; - cptr str; + concptr str; char c; @@ -4001,7 +4001,7 @@ static bool player_birth_aux(void) while(1) { char temp[80*10]; - cptr t; + concptr t; if (!get_player_race()) return FALSE; @@ -4037,7 +4037,7 @@ static bool player_birth_aux(void) while(1) { char temp[80*9]; - cptr t; + concptr t; if (!get_player_class()) return FALSE; @@ -4072,7 +4072,7 @@ static bool player_birth_aux(void) while(1) { char temp[80*8]; - cptr t; + concptr t; if (!get_player_seikaku()) return FALSE; @@ -4655,7 +4655,7 @@ void dump_yourself(FILE *fff) { char temp[80*10]; int i; - cptr t; + concptr t; if (!fff) return; diff --git a/src/bldg.c b/src/bldg.c index fd3bd6a21..0dd12fe7a 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -217,7 +217,7 @@ static void show_building(building_type* bldg) static void arena_comm(int cmd) { monster_race *r_ptr; - cptr name; + concptr name; switch (cmd) @@ -730,8 +730,8 @@ static void display_cards(void) int i, j; char suitcolor[4] = {TERM_YELLOW, TERM_L_RED, TERM_L_BLUE, TERM_L_GREEN}; #ifdef JP - cptr suit[4] = {"★", "●", "¶", "†"}; - cptr card_grph[13][7] = {{"Ａ %s ", + concptr suit[4] = {"★", "●", "¶", "†"}; + concptr card_grph[13][7] = {{"Ａ %s ", " 変 ", " 愚 ", " 蛮 ", @@ -822,7 +822,7 @@ static void display_cards(void) " υ ∂ ", " σ ノ %s", " Ｋ"}}; - cptr joker_grph[7] = { " ", + concptr joker_grph[7] = { " ", " Ｊ ", " Ｏ ", " Ｋ ", @@ -832,8 +832,8 @@ static void display_cards(void) #else - cptr suit[4] = {"[]", "qp", "<>", "db"}; - cptr card_grph[13][7] = {{"A %s ", + concptr suit[4] = {"[]", "qp", "<>", "db"}; + concptr card_grph[13][7] = {{"A %s ", " He ", " ng ", " ba ", @@ -924,7 +924,7 @@ static void display_cards(void) " c & ", " v__/ %s", " K"}}; - cptr joker_grph[7] = { " ", + concptr joker_grph[7] = { " ", " J ", " O ", " K ", @@ -1046,7 +1046,7 @@ static bool gamble_comm(int cmd) s32b oldgold; char out_val[160], tmp_str[80], again; - cptr p; + concptr p; screen_save(); @@ -1454,7 +1454,7 @@ static bool kakutoujou(void) s32b maxbet; s32b wager; char out_val[160], tmp_str[80]; - cptr p; + concptr p; if ((turn - old_battle) > TURNS_PER_TICK*250) { @@ -1626,7 +1626,7 @@ static void shoukinkubi(void) for (i = 0; i < MAX_KUBI; i++) { byte color; - cptr done_mark; + concptr done_mark; monster_race *r_ptr = &r_info[(kubi_r_idx[i] > 10000 ? kubi_r_idx[i] - 10000 : kubi_r_idx[i])]; if (kubi_r_idx[i] > 10000) @@ -2064,7 +2064,7 @@ static void castle_quest(void) IDX q_index = 0; monster_race *r_ptr; quest_type *q_ptr; - cptr name; + concptr name; clear_bldg(4, 18); @@ -2354,7 +2354,7 @@ static u32b calc_expect_dice(u32b dam, int mult, int div, bool force, WEIGHT wei * the current +dam of the player.\n * @return なし */ -static void show_weapon_dmg(int r, int c, int mindice, int maxdice, int blows, int dam_bonus, cptr attr, byte color) +static void show_weapon_dmg(int r, int c, int mindice, int maxdice, int blows, int dam_bonus, concptr attr, byte color) { GAME_TEXT tmp_str[80]; int mindam, maxdam; @@ -2659,7 +2659,7 @@ static PRICE compare_weapons(PRICE bcost) object_type *o_ptr[2]; object_type orig_weapon; object_type *i_ptr; - cptr q, s; + concptr q, s; TERM_LEN row = 2; TERM_LEN wid = 38, mgn = 2; bool old_character_xtra = character_xtra; @@ -2938,7 +2938,7 @@ static PRICE repair_broken_weapon_aux(PRICE bcost) int i, dd_bonus, ds_bonus; KIND_OBJECT_IDX k_idx; char basenm[MAX_NLEN]; - cptr q, s; + concptr q, s; int row = 7; clear_bldg(0, 22); @@ -3203,7 +3203,7 @@ static bool enchant_item(PRICE cost, HIT_PROB to_hit, HIT_POINT to_dam, ARMOUR_C OBJECT_IDX item; bool okay = FALSE; object_type *o_ptr; - cptr q, s; + concptr q, s; int maxenchant = (p_ptr->lev / 5); char tmp_str[MAX_NLEN]; @@ -3308,7 +3308,7 @@ static void building_recharge(void) DEPTH lev; object_type *o_ptr; object_kind *k_ptr; - cptr q, s; + concptr q, s; PRICE price; PARAMETER_VALUE charges; int max_charges; @@ -4385,7 +4385,7 @@ void do_cmd_bldg(void) /*! * @brief クエスト突入時のメッセージテーブル / Array of places to find an inscription */ -static cptr find_quest[] = +static concptr find_quest[] = { _("床にメッセージが刻まれている:", "You find the following inscription in the floor"), _("壁にメッセージが刻まれている:", "You see a message inscribed in the wall"), diff --git a/src/cave.c b/src/cave.c index 76d30ee6b..923190a11 100644 --- a/src/cave.c +++ b/src/cave.c @@ -1799,7 +1799,7 @@ void prt_path(POSITION y, POSITION x) } -static cptr simplify_list[][2] = +static concptr simplify_list[][2] = { #ifdef JP {"の魔法書", ""}, @@ -1845,7 +1845,7 @@ static void display_shortened_item_name(object_type *o_ptr, int y) int i; for (i = 0; simplify_list[i][1]; i++) { - cptr org_w = simplify_list[i][0]; + concptr org_w = simplify_list[i][0]; if (*org_w == '^') { @@ -1858,7 +1858,7 @@ static void display_shortened_item_name(object_type *o_ptr, int y) if (!strncmp(c, org_w, strlen(org_w))) { char *s = c; - cptr tmp = simplify_list[i][1]; + concptr tmp = simplify_list[i][1]; while (*tmp) *s++ = *tmp++; tmp = c + strlen(org_w); diff --git a/src/chuukei.c b/src/chuukei.c index 445268f92..840e0383b 100644 --- a/src/chuukei.c +++ b/src/chuukei.c @@ -104,7 +104,7 @@ static errr (*old_xtra_hook)(int n, int v); static errr (*old_curs_hook)(int x, int y); static errr (*old_bigcurs_hook)(int x, int y); static errr (*old_wipe_hook)(int x, int y, int n); -static errr (*old_text_hook)(int x, int y, int n, TERM_COLOR a, cptr s); +static errr (*old_text_hook)(int x, int y, int n, TERM_COLOR a, concptr s); static void disable_chuukei_server(void) { @@ -285,7 +285,7 @@ void flush_ringbuf(void) } -static int read_chuukei_prf(cptr prf_name) +static int read_chuukei_prf(concptr prf_name) { char buf[1024]; FILE *fp; @@ -522,7 +522,7 @@ static bool string_is_repeat(char *str, int len) return (TRUE); } -static errr send_text_to_chuukei_server(TERM_LEN x, TERM_LEN y, int len, TERM_COLOR col, cptr str) +static errr send_text_to_chuukei_server(TERM_LEN x, TERM_LEN y, int len, TERM_COLOR col, concptr str) { char buf[1024]; char buf2[1024]; @@ -1085,7 +1085,7 @@ void browse_chuukei() } #endif /* CHUUKEI */ -void prepare_browse_movie_aux(cptr filename) +void prepare_browse_movie_aux(concptr filename) { movie_fd = fd_open(filename, O_RDONLY); @@ -1094,7 +1094,7 @@ void prepare_browse_movie_aux(cptr filename) init_buffer(); } -void prepare_browse_movie(cptr filename) +void prepare_browse_movie(concptr filename) { char buf[1024]; path_build(buf, sizeof(buf), ANGBAND_DIR_USER, filename); diff --git a/src/cmd-activate.c b/src/cmd-activate.c index d84745845..1b3383f34 100644 --- a/src/cmd-activate.c +++ b/src/cmd-activate.c @@ -237,7 +237,7 @@ void do_cmd_activate_aux(INVENTORY_IDX item) o_ptr->xtra5 = (XTRA16)cap_maxhp; if (cap_nickname) { - cptr t; + concptr t; char *s; char buf[80] = ""; @@ -289,7 +289,7 @@ void do_cmd_activate_aux(INVENTORY_IDX item) if (o_ptr->inscription) { char buf[80]; - cptr t; + concptr t; #ifndef JP bool quote = FALSE; #endif @@ -365,7 +365,7 @@ void do_cmd_activate_aux(INVENTORY_IDX item) void do_cmd_activate(void) { OBJECT_IDX item; - cptr q, s; + concptr q, s; if (p_ptr->wild_mode) return; @@ -402,7 +402,7 @@ static bool activate_dragon_breath(object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; /* for resistance flags */ int type[20]; - cptr name[20]; + concptr name[20]; int i, t, n = 0; DIRECTION dir; @@ -444,7 +444,7 @@ bool activate_artifact(object_type *o_ptr) PLAYER_LEVEL plev = p_ptr->lev; int k, dummy = 0; DIRECTION dir; - cptr name = k_name + k_info[o_ptr->k_idx].name; + concptr name = k_name + k_info[o_ptr->k_idx].name; const activation_type* const act_ptr = find_activation_info(o_ptr); /* Paranoia */ @@ -1657,7 +1657,7 @@ bool activate_artifact(object_type *o_ptr) { int count = 0, i; monster_type *m_ptr; - cptr kakusan = ""; + concptr kakusan = ""; if (summon_named_creature(0, p_ptr->y, p_ptr->x, MON_SUKE, PM_FORCE_PET)) { diff --git a/src/cmd-eat.c b/src/cmd-eat.c index db3179fc0..e0afdea2d 100644 --- a/src/cmd-eat.c +++ b/src/cmd-eat.c @@ -338,7 +338,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item) prace_is_(RACE_SPECTRE)) && (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND)) { - cptr staff; + concptr staff; if (o_ptr->tval == TV_STAFF && (item < 0) && (o_ptr->number > 1)) @@ -498,7 +498,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item) void do_cmd_eat_food(void) { OBJECT_IDX item; - cptr q, s; + concptr q, s; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) { diff --git a/src/cmd-item.c b/src/cmd-item.c index 1b1f0ac05..e30b8d357 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -147,8 +147,8 @@ void do_cmd_wield(void) object_type *q_ptr; object_type *o_ptr; - cptr act; - cptr q, s; + concptr act; + concptr q, s; GAME_TEXT o_name[MAX_NLEN]; @@ -517,7 +517,7 @@ void do_cmd_takeoff(void) { OBJECT_IDX item; object_type *o_ptr; - cptr q, s; + concptr q, s; if (p_ptr->special_defense & KATA_MUSOU) { @@ -583,7 +583,7 @@ void do_cmd_drop(void) object_type *o_ptr; - cptr q, s; + concptr q, s; if (p_ptr->special_defense & KATA_MUSOU) { @@ -678,7 +678,7 @@ void do_cmd_destroy(void) GAME_TEXT o_name[MAX_NLEN]; char out_val[MAX_NLEN+40]; - cptr q, s; + concptr q, s; if (p_ptr->special_defense & KATA_MUSOU) { @@ -867,7 +867,7 @@ void do_cmd_observe(void) OBJECT_IDX item; object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; - cptr q, s; + concptr q, s; q = _("どのアイテムを調べますか? ", "Examine which item? "); s = _("調べられるアイテムがない。", "You have nothing to examine."); @@ -898,7 +898,7 @@ void do_cmd_uninscribe(void) { OBJECT_IDX item; object_type *o_ptr; - cptr q, s; + concptr q, s; q = _("どのアイテムの銘を消しますか? ", "Un-inscribe which item? "); s = _("銘を消せるアイテムがない。", "You have nothing to un-inscribe."); @@ -940,7 +940,7 @@ void do_cmd_inscribe(void) object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; char out_val[80]; - cptr q, s; + concptr q, s; q = _("どのアイテムに銘を刻みますか? ", "Inscribe which item? "); s = _("銘を刻めるアイテムがない。", "You have nothing to inscribe."); @@ -1014,7 +1014,7 @@ static void do_cmd_refill_lamp(void) object_type *o_ptr; object_type *j_ptr; - cptr q, s; + concptr q, s; /* Restrict the choices */ item_tester_hook = item_tester_refill_lantern; @@ -1101,7 +1101,7 @@ static void do_cmd_refill_torch(void) object_type *o_ptr; object_type *j_ptr; - cptr q, s; + concptr q, s; /* Restrict the choices */ item_tester_hook = item_tester_refill_torch; @@ -1744,7 +1744,7 @@ void do_cmd_use(void) { OBJECT_IDX item; object_type *o_ptr; - cptr q, s; + concptr q, s; if (p_ptr->wild_mode) { diff --git a/src/cmd-pet.c b/src/cmd-pet.c index 632926a1e..e69e6f967 100644 --- a/src/cmd-pet.c +++ b/src/cmd-pet.c @@ -512,7 +512,7 @@ void do_cmd_pet(void) COMMAND_CODE i = 0; int num; int powers[36]; - cptr power_desc[36]; + concptr power_desc[36]; bool flag, redraw; char choice; char out_val[160]; diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c index a73b21177..c675afff0 100644 --- a/src/cmd-quaff.c +++ b/src/cmd-quaff.c @@ -616,7 +616,7 @@ void do_cmd_quaff_potion_aux(INVENTORY_IDX item) void do_cmd_quaff_potion(void) { OBJECT_IDX item; - cptr q, s; + concptr q, s; if (p_ptr->wild_mode) { diff --git a/src/cmd-read.c b/src/cmd-read.c index bb0a992c2..c408a3d5d 100644 --- a/src/cmd-read.c +++ b/src/cmd-read.c @@ -532,7 +532,7 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known) } else if (o_ptr->tval==TV_PARCHMENT) { - cptr q; + concptr q; GAME_TEXT o_name[MAX_NLEN]; char buf[1024]; screen_save(); @@ -610,7 +610,7 @@ void do_cmd_read_scroll(void) { object_type *o_ptr; OBJECT_IDX item; - cptr q, s; + concptr q, s; if (p_ptr->wild_mode) { diff --git a/src/cmd-spell.c b/src/cmd-spell.c index 7eb5eacad..3e1610224 100644 --- a/src/cmd-spell.c +++ b/src/cmd-spell.c @@ -32,7 +32,7 @@ * @param base 固定値 * @return フォーマットに従い整形された文字列 */ -cptr info_string_dice(cptr str, DICE_NUMBER dice, DICE_SID sides, int base) +concptr info_string_dice(concptr str, DICE_NUMBER dice, DICE_SID sides, int base) { /* Fix value */ if (!dice) @@ -55,7 +55,7 @@ cptr info_string_dice(cptr str, DICE_NUMBER dice, DICE_SID sides, int base) * @param base 固定値 * @return フォーマットに従い整形された文字列 */ -cptr info_damage(DICE_NUMBER dice, DICE_SID sides, int base) +concptr info_damage(DICE_NUMBER dice, DICE_SID sides, int base) { return info_string_dice(_("損傷:", "dam "), dice, sides, base); } @@ -66,7 +66,7 @@ cptr info_damage(DICE_NUMBER dice, DICE_SID sides, int base) * @param sides ダイス目 * @return フォーマットに従い整形された文字列 */ -cptr info_duration(int base, DICE_SID sides) +concptr info_duration(int base, DICE_SID sides) { return format(_("期間:%d+1d%d", "dur %d+1d%d"), base, sides); } @@ -76,7 +76,7 @@ cptr info_duration(int base, DICE_SID sides) * @param range 効果範囲 * @return フォーマットに従い整形された文字列 */ -cptr info_range(POSITION range) +concptr info_range(POSITION range) { return format(_("範囲:%d", "range %d"), range); } @@ -88,7 +88,7 @@ cptr info_range(POSITION range) * @param base 固定値 * @return フォーマットに従い整形された文字列 */ -cptr info_heal(DICE_NUMBER dice, DICE_SID sides, int base) +concptr info_heal(DICE_NUMBER dice, DICE_SID sides, int base) { return info_string_dice(_("回復:", "heal "), dice, sides, base); } @@ -99,7 +99,7 @@ cptr info_heal(DICE_NUMBER dice, DICE_SID sides, int base) * @param sides ダイス目 * @return フォーマットに従い整形された文字列 */ -cptr info_delay(int base, DICE_SID sides) +concptr info_delay(int base, DICE_SID sides) { return format(_("遅延:%d+1d%d", "delay %d+1d%d"), base, sides); } @@ -110,7 +110,7 @@ cptr info_delay(int base, DICE_SID sides) * @param dam 固定値 * @return フォーマットに従い整形された文字列 */ -cptr info_multi_damage(HIT_POINT dam) +concptr info_multi_damage(HIT_POINT dam) { return format(_("損傷:各%d", "dam %d each"), dam); } @@ -122,7 +122,7 @@ cptr info_multi_damage(HIT_POINT dam) * @param sides ダイス目 * @return フォーマットに従い整形された文字列 */ -cptr info_multi_damage_dice(DICE_NUMBER dice, DICE_SID sides) +concptr info_multi_damage_dice(DICE_NUMBER dice, DICE_SID sides) { return format(_("損傷:各%dd%d", "dam %dd%d each"), dice, sides); } @@ -132,7 +132,7 @@ cptr info_multi_damage_dice(DICE_NUMBER dice, DICE_SID sides) * @param power 固定値 * @return フォーマットに従い整形された文字列 */ -cptr info_power(int power) +concptr info_power(int power) { return format(_("効力:%d", "power %d"), power); } @@ -147,7 +147,7 @@ cptr info_power(int power) /* * Generate power info string such as "power 1d100" */ -cptr info_power_dice(DICE_NUMBER dice, DICE_SID sides) +concptr info_power_dice(DICE_NUMBER dice, DICE_SID sides) { return format(_("効力:%dd%d", "power %dd%d"), dice, sides); } @@ -158,7 +158,7 @@ cptr info_power_dice(DICE_NUMBER dice, DICE_SID sides) * @param rad 効果半径 * @return フォーマットに従い整形された文字列 */ -cptr info_radius(POSITION rad) +concptr info_radius(POSITION rad) { return format(_("半径:%d", "rad %d"), rad); } @@ -169,7 +169,7 @@ cptr info_radius(POSITION rad) * @param weight 最大重量 * @return フォーマットに従い整形された文字列 */ -cptr info_weight(WEIGHT weight) +concptr info_weight(WEIGHT weight) { #ifdef JP return format("最大重量:%d.%dkg", lbtokg1(weight), lbtokg2(weight)); @@ -185,7 +185,7 @@ cptr info_weight(WEIGHT weight) * @param mode 求める処理 * @return 各領域魔法に各種テキストを求めた場合は文字列参照ポインタ、そうでない場合はNULLポインタを返す。 */ -cptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode) +concptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode) { switch (realm) { diff --git a/src/cmd-spell.h b/src/cmd-spell.h index 24144a25c..fc77f5e7c 100644 --- a/src/cmd-spell.h +++ b/src/cmd-spell.h @@ -1,13 +1,13 @@  -extern cptr info_string_dice(cptr str, DICE_NUMBER dice, DICE_SID sides, int base); -extern cptr info_damage(DICE_NUMBER dice, DICE_SID sides, int base); -extern cptr info_duration(int base, DICE_SID sides); -extern cptr info_range(POSITION range); -extern cptr info_heal(DICE_NUMBER dice, DICE_SID sides, int base); -extern cptr info_delay(int base, DICE_SID sides); -extern cptr info_multi_damage(HIT_POINT dam); -extern cptr info_multi_damage_dice(DICE_NUMBER dice, DICE_SID sides); -extern cptr info_power(int power); -extern cptr info_power_dice(DICE_NUMBER dice, DICE_SID sides); -extern cptr info_radius(POSITION rad); -extern cptr info_weight(WEIGHT weight); +extern concptr info_string_dice(concptr str, DICE_NUMBER dice, DICE_SID sides, int base); +extern concptr info_damage(DICE_NUMBER dice, DICE_SID sides, int base); +extern concptr info_duration(int base, DICE_SID sides); +extern concptr info_range(POSITION range); +extern concptr info_heal(DICE_NUMBER dice, DICE_SID sides, int base); +extern concptr info_delay(int base, DICE_SID sides); +extern concptr info_multi_damage(HIT_POINT dam); +extern concptr info_multi_damage_dice(DICE_NUMBER dice, DICE_SID sides); +extern concptr info_power(int power); +extern concptr info_power_dice(DICE_NUMBER dice, DICE_SID sides); +extern concptr info_radius(POSITION rad); +extern concptr info_weight(WEIGHT weight); diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c index 51c129c06..f2375c528 100644 --- a/src/cmd-usestaff.c +++ b/src/cmd-usestaff.c @@ -471,7 +471,7 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item) void do_cmd_use_staff(void) { OBJECT_IDX item; - cptr q, s; + concptr q, s; if (p_ptr->wild_mode) { diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c index b48b4125c..671ffd51d 100644 --- a/src/cmd-zaprod.c +++ b/src/cmd-zaprod.c @@ -395,7 +395,7 @@ void do_cmd_zap_rod_aux(INVENTORY_IDX item) void do_cmd_zap_rod(void) { OBJECT_IDX item; - cptr q, s; + concptr q, s; if (p_ptr->wild_mode) { diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c index 2e066d1e8..7db51e778 100644 --- a/src/cmd-zapwand.c +++ b/src/cmd-zapwand.c @@ -452,7 +452,7 @@ void do_cmd_aim_wand_aux(INVENTORY_IDX item) void do_cmd_aim_wand(void) { OBJECT_IDX item; - cptr q, s; + concptr q, s; if (p_ptr->wild_mode) return; diff --git a/src/cmd1.c b/src/cmd1.c index 5ad507714..6fe3d66ac 100644 --- a/src/cmd1.c +++ b/src/cmd1.c @@ -1371,7 +1371,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap) /* Feature code (applying "mimic" field) */ FEAT_IDX feat = get_feat_mimic(c_ptr); feature_type *mimic_f_ptr = &f_info[feat]; - cptr name = f_name + mimic_f_ptr->name; + concptr name = f_name + mimic_f_ptr->name; oktomove = FALSE; diff --git a/src/cmd2.c b/src/cmd2.c index 9e41e80c6..c1fbbb849 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -1014,7 +1014,7 @@ static bool do_cmd_tunnel_aux(POSITION y, POSITION x) cave_type *c_ptr; feature_type *f_ptr, *mimic_f_ptr; int power; - cptr name; + concptr name; bool more = FALSE; /* Verify legality */ @@ -1406,7 +1406,7 @@ bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir) feature_type *f_ptr = &f_info[c_ptr->feat]; /* Access trap name */ - cptr name = (f_name + f_ptr->name); + concptr name = (f_name + f_ptr->name); /* Extract trap "power" */ int power = f_ptr->power; @@ -1597,7 +1597,7 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir) bool more = FALSE; - cptr name = f_name + f_info[get_feat_mimic(c_ptr)].name; + concptr name = f_name + f_info[get_feat_mimic(c_ptr)].name; p_ptr->energy_use = 100; @@ -2117,7 +2117,7 @@ void do_cmd_rest(void) /* Prompt for time if needed */ if (command_arg <= 0) { - cptr p = _("休憩 (0-9999, '*' で HP/MP全快, '&' で必要なだけ): ", + concptr p = _("休憩 (0-9999, '*' で HP/MP全快, '&' で必要なだけ): ", "Rest (0-9999, '*' for HP/SP, '&' as needed): "); @@ -3132,7 +3132,7 @@ void do_cmd_fire(void) { OBJECT_IDX item; object_type *j_ptr, *ammo_ptr; - cptr q, s; + concptr q, s; if(p_ptr->wild_mode) return; @@ -3244,7 +3244,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken) int msec = delay_factor * delay_factor * delay_factor; BIT_FLAGS flgs[TR_FLAG_SIZE]; - cptr q, s; + concptr q, s; bool come_back = FALSE; bool do_drop = TRUE; diff --git a/src/cmd4.c b/src/cmd4.c index d99441f9e..ece0cc166 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -59,7 +59,7 @@ static char auto_dump_footer[] = "# ^^^^^^^== %s ==^^^^^^^"; * Variables for auto dump */ static FILE *auto_dump_stream; -static cptr auto_dump_mark; +static concptr auto_dump_mark; static int auto_dump_line_num; @@ -68,7 +68,7 @@ static int auto_dump_line_num; * Remove old lines automatically generated before. * @param orig_file 消去を行うファイル名 */ -static void remove_auto_dump(cptr orig_file) +static void remove_auto_dump(concptr orig_file) { FILE *tmp_fff, *orig_fff; @@ -230,9 +230,9 @@ static void remove_auto_dump(cptr orig_file) * Dump a formatted line, using "vstrnfmt()". * @param fmt 出力内容 */ -static void auto_dump_printf(cptr fmt, ...) +static void auto_dump_printf(concptr fmt, ...) { - cptr p; + concptr p; va_list vp; char buf[1024]; @@ -264,7 +264,7 @@ static void auto_dump_printf(cptr fmt, ...) * @param mark 出力するヘッダマーク * @return ファイルポインタを取得できたらTRUEを返す */ -static bool open_auto_dump(cptr buf, cptr mark) +static bool open_auto_dump(concptr buf, concptr mark) { char header_mark_str[80]; @@ -337,7 +337,7 @@ static void close_auto_dump(void) * @param num number * @return pointer of suffix string. */ -cptr get_ordinal_number_suffix(int num) +concptr get_ordinal_number_suffix(int num) { num = ABS(num) % 100; switch (num % 10) @@ -363,13 +363,13 @@ cptr get_ordinal_number_suffix(int num) * @param note 日記内容のIDに応じた文字列参照ポインタ * @return エラーID */ -errr do_cmd_write_nikki(int type, int num, cptr note) +errr do_cmd_write_nikki(int type, int num, concptr note) { int day, hour, min; FILE *fff = NULL; GAME_TEXT file_name[MAX_NLEN]; char buf[1024]; - cptr note_level = ""; + concptr note_level = ""; bool do_level = TRUE; char note_level_buf[40]; QUEST_IDX q_idx; @@ -525,7 +525,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note) } case NIKKI_STAIR: { - cptr to; + concptr to; if (q_idx && (is_fixed_quest_idx(q_idx) && !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT)))) { @@ -599,7 +599,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note) } case NIKKI_WIZ_TELE: { - cptr to; + concptr to; if (!dun_level) to = _("地上", "the surface"); else @@ -611,7 +611,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note) } case NIKKI_PAT_TELE: { - cptr to; + concptr to; if (!dun_level) to = _("地上", "the surface"); else @@ -1132,7 +1132,7 @@ void do_cmd_messages(int num_now) char shower_str[81]; char finder_str[81]; char back_str[81]; - cptr shower = NULL; + concptr shower = NULL; int wid, hgt; int num_lines; @@ -1164,7 +1164,7 @@ void do_cmd_messages(int num_now) /* Dump up to 20 lines of messages */ for (j = 0; (j < num_lines) && (i + j < n); j++) { - cptr msg = message_str(i+j); + concptr msg = message_str(i+j); /* Dump the messages, bottom to top */ c_prt((i + j < num_now ? TERM_WHITE : TERM_SLATE), msg, num_lines + 1 - j, 0); @@ -1172,7 +1172,7 @@ void do_cmd_messages(int num_now) /* Hilite "shower" */ if (shower && shower[0]) { - cptr str = msg; + concptr str = msg; /* Display matches */ while ((str = my_strstr(str, shower)) != NULL) @@ -1257,7 +1257,7 @@ void do_cmd_messages(int num_now) /* Scan messages */ for (z = i + 1; z < n; z++) { - cptr msg = message_str(z); + concptr msg = message_str(z); /* Search for it */ if (my_strstr(msg, finder_str)) @@ -1342,7 +1342,7 @@ void do_cmd_messages(int num_now) * @param info 表示メッセージ * @return なし */ -static void do_cmd_options_cheat(cptr info) +static void do_cmd_options_cheat(concptr info) { char ch; int i, k = 0, n = CHEAT_MAX; @@ -1490,7 +1490,7 @@ static s16b toggle_frequency(s16b current) * @param info 表示メッセージ * @return なし */ -static void do_cmd_options_autosave(cptr info) +static void do_cmd_options_autosave(concptr info) { char ch; int i, k = 0, n = 2; @@ -1605,7 +1605,7 @@ static void do_cmd_options_autosave(cptr info) * @param info 表示メッセージ * @return なし */ -void do_cmd_options_aux(int page, cptr info) +void do_cmd_options_aux(int page, concptr info) { char ch; int i, k = 0, n = 0, l; @@ -1781,7 +1781,7 @@ static void do_cmd_options_win(void) { byte a = TERM_WHITE; - cptr s = angband_term_name[j]; + concptr s = angband_term_name[j]; /* Use color */ if (j == x) a = TERM_L_BLUE; @@ -1795,7 +1795,7 @@ static void do_cmd_options_win(void) { byte a = TERM_WHITE; - cptr str = window_flag_desc[i]; + concptr str = window_flag_desc[i]; /* Use color */ if (i == y) a = TERM_L_BLUE; @@ -1921,7 +1921,7 @@ static void do_cmd_options_win(void) static struct opts { char key; - cptr name; + concptr name; int row; } option_fields[OPT_NUM] = @@ -2298,9 +2298,9 @@ void do_cmd_reload_autopick(void) * @param fname ファイル名 * @return なし */ -static errr macro_dump(cptr fname) +static errr macro_dump(concptr fname) { - static cptr mark = "Macro Dump"; + static concptr mark = "Macro Dump"; int i; @@ -2439,9 +2439,9 @@ static void do_cmd_macro_aux_keymap(char *buf) * @return エラーコード * @details */ -static errr keymap_dump(cptr fname) +static errr keymap_dump(concptr fname) { - static cptr mark = "Keymap Dump"; + static concptr mark = "Keymap Dump"; int i; char key[1024]; @@ -2477,7 +2477,7 @@ static errr keymap_dump(cptr fname) /* Dump them */ for (i = 0; i < 256; i++) { - cptr act; + concptr act; /* Loop up the keymap */ act = keymap_act[mode][i]; @@ -2767,7 +2767,7 @@ void do_cmd_macros(void) /* Query a keymap */ else if (i == '7') { - cptr act; + concptr act; /* Prompt */ prt(_("コマンド: キー配置の確認", "Command: Query a keymap"), 16, 0); @@ -2910,7 +2910,7 @@ void do_cmd_macros(void) /*! * @brief キャラクタ色の明暗表現 */ -static cptr lighting_level_str[F_LIT_MAX] = +static concptr lighting_level_str[F_LIT_MAX] = { #ifdef JP "標準色", @@ -2960,7 +2960,7 @@ static bool cmd_visuals_aux(int i, IDX *num, IDX max) * @param choice_msg 選択メッセージ * @return なし */ -static void print_visuals_menu(cptr choice_msg) +static void print_visuals_menu(concptr choice_msg) { prt(_("[ 画面表示の設定 ]", "Interact with Visuals"), 1, 0); @@ -2998,7 +2998,7 @@ void do_cmd_visuals(void) char tmp[160]; char buf[1024]; bool need_redraw = FALSE; - cptr empty_symbol = "<< ? >>"; + concptr empty_symbol = "<< ? >>"; if (use_bigtile) empty_symbol = "<< ?? >>"; @@ -3046,7 +3046,7 @@ void do_cmd_visuals(void) /* Dump monster attr/chars */ case '1': { - static cptr mark = "Monster attr/chars"; + static concptr mark = "Monster attr/chars"; /* Prompt */ prt(_("コマンド: モンスターの[色/文字]をファイルに書き出します", "Command: Dump monster attr/chars"), 15, 0); @@ -3096,7 +3096,7 @@ void do_cmd_visuals(void) /* Dump object attr/chars */ case '2': { - static cptr mark = "Object attr/chars"; + static concptr mark = "Object attr/chars"; KIND_OBJECT_IDX k_idx; /* Prompt */ @@ -3164,7 +3164,7 @@ void do_cmd_visuals(void) /* Dump feature attr/chars */ case '3': { - static cptr mark = "Feature attr/chars"; + static concptr mark = "Feature attr/chars"; /* Prompt */ prt(_("コマンド: 地形の[色/文字]をファイルに書き出します", "Command: Dump feature attr/chars"), 15, 0); @@ -3219,7 +3219,7 @@ void do_cmd_visuals(void) /* Modify monster attr/chars (numeric operation) */ case '4': { - static cptr choice_msg = _("モンスターの[色/文字]を変更します", "Change monster attr/chars"); + static concptr choice_msg = _("モンスターの[色/文字]を変更します", "Change monster attr/chars"); static IDX r = 0; prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0); @@ -3309,7 +3309,7 @@ void do_cmd_visuals(void) /* Modify object attr/chars (numeric operation) */ case '5': { - static cptr choice_msg = _("アイテムの[色/文字]を変更します", "Change object attr/chars"); + static concptr choice_msg = _("アイテムの[色/文字]を変更します", "Change object attr/chars"); static IDX k = 0; prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0); @@ -3399,7 +3399,7 @@ void do_cmd_visuals(void) /* Modify feature attr/chars (numeric operation) */ case '6': { - static cptr choice_msg = _("地形の[色/文字]を変更します", "Change feature attr/chars"); + static concptr choice_msg = _("地形の[色/文字]を変更します", "Change feature attr/chars"); static IDX f = 0; static IDX lighting_level = F_LIT_STANDARD; prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0); @@ -3620,7 +3620,7 @@ void do_cmd_colors(void) /* Dump colors */ else if (i == '2') { - static cptr mark = "Colors"; + static concptr mark = "Colors"; /* Prompt */ prt(_("コマンド: カラーの設定をファイルに書き出します", "Command: Dump colors"), 8, 0); @@ -3651,7 +3651,7 @@ void do_cmd_colors(void) int gv = angband_color_table[i][2]; int bv = angband_color_table[i][3]; - cptr name = _("未知", "unknown"); + concptr name = _("未知", "unknown"); /* Skip non-entries */ if (!kv && !rv && !gv && !bv) continue; @@ -3684,7 +3684,7 @@ void do_cmd_colors(void) /* Hack -- query until done */ while (1) { - cptr name; + concptr name; byte j; /* Clear */ @@ -3799,7 +3799,7 @@ void do_cmd_version(void) /* * Array of feeling strings */ -static cptr do_cmd_feeling_text[11] = +static concptr do_cmd_feeling_text[11] = { _("この階の雰囲気を感じとれなかった...", "Looks like any other level."), _("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."), @@ -3814,7 +3814,7 @@ static cptr do_cmd_feeling_text[11] = _("なんて退屈なところだ...", "What a boring place...") }; -static cptr do_cmd_feeling_text_combat[11] = +static concptr do_cmd_feeling_text_combat[11] = { _("この階の雰囲気を感じとれなかった...", "Looks like any other level."), _("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."), @@ -3829,7 +3829,7 @@ static cptr do_cmd_feeling_text_combat[11] = _("なんて退屈なところだ...", "What a boring place...") }; -static cptr do_cmd_feeling_text_lucky[11] = +static concptr do_cmd_feeling_text_lucky[11] = { _("この階の雰囲気を感じとれなかった...", "Looks like any other level."), _("この階には何か特別なものがあるような気がする。", "You feel there is something special about this level."), @@ -3897,7 +3897,7 @@ void do_cmd_feeling(void) /* * Description of each monster group. */ -static cptr monster_group_text[] = +static concptr monster_group_text[] = { #ifdef JP "ユニーク", /* "Uniques" */ @@ -4030,7 +4030,7 @@ static cptr monster_group_text[] = * Symbols of monsters in each group. Note the "Uniques" group * is handled differently. */ -static cptr monster_group_char[] = +static concptr monster_group_char[] = { (char *) -1L, (char *) -2L, @@ -4134,7 +4134,7 @@ static IDX collect_monsters(IDX grp_cur, IDX mon_idx[], BIT_FLAGS8 mode) int dummy_why; /* Get a list of x_char in this group */ - cptr group_char = monster_group_char[grp_cur]; + concptr group_char = monster_group_char[grp_cur]; /* XXX Hack -- Check if this is the "Uniques" group */ bool grp_unique = (monster_group_char[grp_cur] == (char *) -1L); @@ -4223,7 +4223,7 @@ static IDX collect_monsters(IDX grp_cur, IDX mon_idx[], BIT_FLAGS8 mode) /* * Description of each monster group. */ -static cptr object_group_text[] = +static concptr object_group_text[] = { #ifdef JP "キノコ", /* "Mushrooms" */ @@ -4444,7 +4444,7 @@ static int collect_objects(int grp_cur, IDX object_idx[], BIT_FLAGS8 mode) /* * Description of each feature group. */ -static cptr feature_group_text[] = +static concptr feature_group_text[] = { "terrains", NULL @@ -4646,7 +4646,7 @@ void do_cmd_load_screen(void) -cptr inven_res_label = _(" 酸電火冷毒光闇破轟獄因沌劣 盲怖乱痺透命感消復浮", +concptr inven_res_label = _(" 酸電火冷毒光闇破轟獄因沌劣 盲怖乱痺透命感消復浮", " AcElFiCoPoLiDkShSoNtNxCaDi BlFeCfFaSeHlEpSdRgLv"); @@ -4834,19 +4834,19 @@ void do_cmd_save_screen_html_aux(char *filename, int message) char buf[2048]; int yomikomu = 0; - cptr tags[4] = { + concptr tags[4] = { "HEADER_START:", "HEADER_END:", "FOOTER_START:", "FOOTER_END:", }; - cptr html_head[] = { + concptr html_head[] = { "\n\n", "
",
 		0,
 	};
-	cptr html_foot[] = {
+	concptr html_foot[] = {
 		"
\n", "\n\n", 0, @@ -4905,7 +4905,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message) for (x = 0; x < wid - 1; x++) { int rv, gv, bv; - cptr cc = NULL; + concptr cc = NULL; /* Get the attr/char */ (void)(Term_what(x, y, &a, &c)); @@ -5726,10 +5726,10 @@ void plural_aux(char *Name) } else if (my_strstr(Name, " of ")) { - cptr aider = my_strstr(Name, " of "); + concptr aider = my_strstr(Name, " of "); char dummy[80]; int i = 0; - cptr ctr = Name; + concptr ctr = Name; while (ctr < aider) { @@ -6060,7 +6060,7 @@ static void do_cmd_knowledge_kill_count(void) * @param grp_top 現在の選択リスト最上部ID * @return なし */ -static void display_group_list(int col, int row, int wid, int per_page, IDX grp_idx[], cptr group_text[], int grp_cur, int grp_top) +static void display_group_list(int col, int row, int wid, int per_page, IDX grp_idx[], concptr group_text[], int grp_cur, int grp_top) { int i; @@ -8094,7 +8094,7 @@ static void do_cmd_knowledge_home(void) GAME_TEXT file_name[1024]; store_type *st_ptr; GAME_TEXT o_name[MAX_NLEN]; - cptr paren = ")"; + concptr paren = ")"; process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x); @@ -8193,7 +8193,7 @@ static void do_cmd_knowledge_autopick(void) for (k = 0; k < max_autopick; k++) { - cptr tmp; + concptr tmp; byte act = autopick_list[k].action; if (act & DONT_AUTOPICK) { diff --git a/src/cmd5.c b/src/cmd5.c index 9733446c2..ede88af81 100644 --- a/src/cmd5.c +++ b/src/cmd5.c @@ -18,7 +18,7 @@ * @param tval 魔法書のtval * @return 領域魔法の技能名称を保管した文字列ポインタ */ -cptr spell_category_name(OBJECT_TYPE_VALUE tval) +concptr spell_category_name(OBJECT_TYPE_VALUE tval) { switch (tval) { @@ -50,7 +50,7 @@ cptr spell_category_name(OBJECT_TYPE_VALUE tval) * The "known" should be TRUE for cast/pray, FALSE for study * */ -static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm) +static int get_spell(SPELL_IDX *sn, concptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm) { int i; SPELL_IDX spell = -1; @@ -62,7 +62,7 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool char choice; const magic_type *s_ptr; char out_val[160]; - cptr p; + concptr p; COMMAND_CODE code; #ifdef JP char jverb_buf[128]; @@ -434,7 +434,7 @@ void do_cmd_browse(void) object_type *o_ptr; - cptr q, s; + concptr q, s; /* Warriors are illiterate */ if (!(p_ptr->realm1 || p_ptr->realm2) && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_RED_MAGE)) @@ -595,11 +595,11 @@ void do_cmd_study(void) /* Spells of realm2 will have an increment of +32 */ SPELL_IDX spell = -1; - cptr p = spell_category_name(mp_ptr->spell_book); + concptr p = spell_category_name(mp_ptr->spell_book); object_type *o_ptr; - cptr q, s; + concptr q, s; if (!p_ptr->realm1) { @@ -732,7 +732,7 @@ void do_cmd_study(void) int max_exp = (spell < 32) ? SPELL_EXP_MASTER : SPELL_EXP_EXPERT; int old_exp = p_ptr->spell_exp[spell]; int new_rank = EXP_LEVEL_UNSKILLED; - cptr name = do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell%32, SPELL_NAME); + concptr name = do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell%32, SPELL_NAME); if (old_exp >= max_exp) { @@ -849,10 +849,10 @@ void do_cmd_cast(void) REALM_IDX use_realm; MANA_POINT need_mana; - cptr prayer; + concptr prayer; object_type *o_ptr; const magic_type *s_ptr; - cptr q, s; + concptr q, s; bool over_exerted = FALSE; diff --git a/src/dungeon.c b/src/dungeon.c index 72d79569d..8d1e5ecb3 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -1114,7 +1114,7 @@ static void recharged_notice(object_type *o_ptr) { GAME_TEXT o_name[MAX_NLEN]; - cptr s; + concptr s; /* No inscription */ if (!o_ptr->inscription) return; @@ -1486,7 +1486,7 @@ static void process_world_aux_hp_and_sp(void) } else { - cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; + concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; msg_format(_("%sで火傷した！", "The %s burns you!"), name); take_hit(DAMAGE_NOESCAPE, damage, name, -1); } @@ -1524,7 +1524,7 @@ static void process_world_aux_hp_and_sp(void) } else { - cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; + concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; msg_format(_("%sに凍えた！", "The %s frostbites you!"), name); take_hit(DAMAGE_NOESCAPE, damage, name, -1); } @@ -1562,7 +1562,7 @@ static void process_world_aux_hp_and_sp(void) } else { - cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; + concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; msg_format(_("%sに感電した！", "The %s shocks you!"), name); take_hit(DAMAGE_NOESCAPE, damage, name, -1); } @@ -1600,7 +1600,7 @@ static void process_world_aux_hp_and_sp(void) } else { - cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; + concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; msg_format(_("%sに溶かされた！", "The %s melts you!"), name); take_hit(DAMAGE_NOESCAPE, damage, name, -1); } @@ -1639,7 +1639,7 @@ static void process_world_aux_hp_and_sp(void) } else { - cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; + concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name; msg_format(_("%sに毒された！", "The %s poisons you!"), name); take_hit(DAMAGE_NOESCAPE, damage, name, -1); if (p_ptr->resist_pois) (void)set_poisoned(p_ptr->poisoned + 3); @@ -1702,7 +1702,7 @@ static void process_world_aux_hp_and_sp(void) { if (!IS_INVULN() && !p_ptr->wraith_form && !p_ptr->kabenuke && ((p_ptr->chp > (p_ptr->lev / 5)) || !p_ptr->pass_wall)) { - cptr dam_desc; + concptr dam_desc; cave_no_regen = TRUE; if (p_ptr->pass_wall) @@ -4197,7 +4197,7 @@ static void process_command(void) } else if (p_ptr->anti_magic && (p_ptr->pclass != CLASS_BERSERKER) && (p_ptr->pclass != CLASS_SMITH)) { - cptr which_power = _("魔法", "magic"); + concptr which_power = _("魔法", "magic"); if (p_ptr->pclass == CLASS_MINDCRAFTER) which_power = _("超能力", "psionic powers"); else if (p_ptr->pclass == CLASS_IMITATOR) diff --git a/src/effects.c b/src/effects.c index 8f7a04d85..00a4708d6 100644 --- a/src/effects.c +++ b/src/effects.c @@ -261,7 +261,7 @@ void dispel_player(void) if (music_singing_any() || hex_spelling_any()) { - cptr str = (music_singing_any()) ? _("歌", "singing") : _("呪文", "spelling"); + concptr str = (music_singing_any()) ? _("歌", "singing") : _("呪文", "spelling"); INTERUPTING_SONG_EFFECT(p_ptr) = SINGING_SONG_EFFECT(p_ptr); SINGING_SONG_EFFECT(p_ptr) = MUSIC_NONE; msg_format(_("%sが途切れた。", "Your %s is interrupted."), str); @@ -3604,7 +3604,7 @@ bool hp_player(int num) /* * Array of stat "descriptions" */ -static cptr desc_stat_pos[] = +static concptr desc_stat_pos[] = { _("強く", "strong"), _("知的に", "smart"), @@ -3618,7 +3618,7 @@ static cptr desc_stat_pos[] = /* * Array of stat "descriptions" */ -static cptr desc_stat_neg[] = +static concptr desc_stat_neg[] = { _("弱く", "weak"), _("無知に", "stupid"), @@ -3833,9 +3833,9 @@ void do_poly_wounds(void) /* * Change player race */ -void change_race(CHARACTER_IDX new_race, cptr effect_msg) +void change_race(CHARACTER_IDX new_race, concptr effect_msg) { - cptr title = race_info[new_race].title; + concptr title = race_info[new_race].title; int old_race = p_ptr->prace; #ifdef JP @@ -4040,7 +4040,7 @@ void do_poly_self(void) * setting the player to "dead". */ -int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell) +int take_hit(int damage_type, HIT_POINT damage, concptr hit_from, int monspell) { int old_chp = p_ptr->chp; @@ -4163,7 +4163,7 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell) if (p_ptr->inside_arena) { - cptr m_name = r_name+r_info[arena_info[p_ptr->arena_number].r_idx].name; + concptr m_name = r_name+r_info[arena_info[p_ptr->arena_number].r_idx].name; msg_format(_("あなたは%sの前に敗れ去った。", "You are beaten by %s."), m_name); msg_print(NULL); if (record_arena) do_cmd_write_nikki(NIKKI_ARENA, -1 - p_ptr->arena_number, m_name); @@ -4291,7 +4291,7 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell) int h = Term->hgt; int msg_pos_x[9] = { 5, 7, 9, 12, 14, 17, 19, 21, 23}; int msg_pos_y[9] = { 3, 4, 5, 4, 5, 4, 5, 6, 4}; - cptr str; + concptr str; char* str2; Term_clear(); diff --git a/src/externs.h b/src/externs.h index 89fb9cbf3..2cabbf7b8 100644 --- a/src/externs.h +++ b/src/externs.h @@ -18,11 +18,11 @@ * Automatically generated "variable" declarations */ extern int max_macrotrigger; -extern cptr macro_template; -extern cptr macro_modifier_chr; -extern cptr macro_modifier_name[MAX_MACRO_MOD]; -extern cptr macro_trigger_name[MAX_MACRO_TRIG]; -extern cptr macro_trigger_keycode[2][MAX_MACRO_TRIG]; +extern concptr macro_template; +extern concptr macro_modifier_chr; +extern concptr macro_modifier_name[MAX_MACRO_MOD]; +extern concptr macro_trigger_name[MAX_MACRO_TRIG]; +extern concptr macro_trigger_keycode[2][MAX_MACRO_TRIG]; extern int level_up; @@ -44,7 +44,7 @@ extern const s16b ddx_cdd[8]; extern const s16b ddy_cdd[8]; extern const char hexsym[16]; extern const char listsym[]; -extern const cptr color_char; +extern const concptr color_char; extern const byte adj_mag_study[]; extern const byte adj_mag_mana[]; extern const byte adj_mag_fail[]; @@ -82,45 +82,45 @@ extern const player_race mimic_info[]; extern const u32b fake_spell_flags[4]; extern const s32b realm_choices1[]; extern const s32b realm_choices2[]; -extern const cptr realm_names[]; +extern const concptr realm_names[]; #ifdef JP -extern const cptr E_realm_names[]; +extern const concptr E_realm_names[]; #endif -extern const cptr spell_names[VALID_REALM][32]; +extern const concptr spell_names[VALID_REALM][32]; extern const int chest_traps[64]; -extern const cptr player_title[MAX_CLASS][PY_MAX_LEVEL/5]; -extern const cptr color_names[16]; -extern const cptr stat_names[6]; -extern const cptr stat_names_reduced[6]; -extern const cptr window_flag_desc[32]; -extern const cptr chaos_patrons[MAX_PATRON]; +extern const concptr player_title[MAX_CLASS][PY_MAX_LEVEL/5]; +extern const concptr color_names[16]; +extern const concptr stat_names[6]; +extern const concptr stat_names_reduced[6]; +extern const concptr window_flag_desc[32]; +extern const concptr chaos_patrons[MAX_PATRON]; extern const int chaos_stats[MAX_PATRON]; extern const int chaos_rewards[MAX_PATRON][20]; extern const martial_arts ma_blows[MAX_MA]; extern const int monk_ave_damage[PY_MAX_LEVEL+1][3]; -extern const cptr game_inscriptions[]; +extern const concptr game_inscriptions[]; extern const kamae kamae_shurui[MAX_KAMAE]; extern const kamae kata_shurui[MAX_KATA]; -extern const cptr exp_level_str[5]; -extern const cptr silly_attacks[MAX_SILLY_ATTACK]; +extern const concptr exp_level_str[5]; +extern const concptr silly_attacks[MAX_SILLY_ATTACK]; #ifdef JP -extern const cptr silly_attacks2[MAX_SILLY_ATTACK]; +extern const concptr silly_attacks2[MAX_SILLY_ATTACK]; #endif extern const monster_power monster_powers[MAX_MONSPELLS]; -extern const cptr monster_powers_short[MAX_MONSPELLS]; -extern const cptr ident_info[]; +extern const concptr monster_powers_short[MAX_MONSPELLS]; +extern const concptr ident_info[]; extern const mbe_info_type mbe_info[]; extern const byte feature_action_flags[FF_FLAG_MAX]; extern const dragonbreath_type dragonbreath_info[]; extern const activation_type activation_info[]; -extern const cptr artifact_bias_name[MAX_BIAS]; +extern const concptr artifact_bias_name[MAX_BIAS]; extern const option_type option_info[]; extern const option_type cheat_info[CHEAT_MAX]; extern const option_type autosave_info[2]; /* variable.c */ -extern const cptr copyright[5]; +extern const concptr copyright[5]; extern byte h_ver_major; extern byte h_ver_minor; extern byte h_ver_patch; @@ -246,12 +246,12 @@ extern POSITION_IDX redraw_n; extern POSITION redraw_y[REDRAW_MAX]; extern POSITION redraw_x[REDRAW_MAX]; extern s16b macro__num; -extern cptr *macro__pat; -extern cptr *macro__act; +extern concptr *macro__pat; +extern concptr *macro__act; extern bool *macro__cmd; extern char *macro__buf; extern STR_OFFSET quark__num; -extern cptr *quark__str; +extern concptr *quark__str; extern u32b message__next; extern u32b message__last; extern u32b message__head; @@ -265,8 +265,8 @@ extern BIT_FLAGS window_mask[8]; extern term *angband_term[8]; extern const char angband_term_name[8][16]; extern byte angband_color_table[256][4]; -extern const cptr angband_sound_name[SOUND_MAX]; -extern const cptr angband_music_basic_name[MUSIC_BASIC_MAX]; +extern const concptr angband_sound_name[SOUND_MAX]; +extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX]; extern cave_type *cave[MAX_HGT]; extern saved_floor_type saved_floors[MAX_SAVED_FLOORS]; extern s16b max_floor_id; @@ -286,7 +286,7 @@ extern TERM_COLOR misc_to_attr[256]; extern char misc_to_char[256]; extern TERM_COLOR tval_to_attr[128]; extern char tval_to_char[128]; -extern cptr keymap_act[KEYMAP_MODES][256]; +extern concptr keymap_act[KEYMAP_MODES][256]; extern player_type *p_ptr; extern const player_sex *sp_ptr; extern const player_race *rp_ptr; @@ -317,22 +317,22 @@ extern char *r_text; extern dungeon_info_type *d_info; extern char *d_name; extern char *d_text; -extern cptr ANGBAND_SYS; -extern cptr ANGBAND_KEYBOARD; -extern cptr ANGBAND_GRAF; -extern cptr ANGBAND_DIR; -extern cptr ANGBAND_DIR_APEX; -extern cptr ANGBAND_DIR_BONE; -extern cptr ANGBAND_DIR_DATA; -extern cptr ANGBAND_DIR_EDIT; -extern cptr ANGBAND_DIR_SCRIPT; -extern cptr ANGBAND_DIR_FILE; -extern cptr ANGBAND_DIR_HELP; -extern cptr ANGBAND_DIR_INFO; -extern cptr ANGBAND_DIR_PREF; -extern cptr ANGBAND_DIR_SAVE; -extern cptr ANGBAND_DIR_USER; -extern cptr ANGBAND_DIR_XTRA; +extern concptr ANGBAND_SYS; +extern concptr ANGBAND_KEYBOARD; +extern concptr ANGBAND_GRAF; +extern concptr ANGBAND_DIR; +extern concptr ANGBAND_DIR_APEX; +extern concptr ANGBAND_DIR_BONE; +extern concptr ANGBAND_DIR_DATA; +extern concptr ANGBAND_DIR_EDIT; +extern concptr ANGBAND_DIR_SCRIPT; +extern concptr ANGBAND_DIR_FILE; +extern concptr ANGBAND_DIR_HELP; +extern concptr ANGBAND_DIR_INFO; +extern concptr ANGBAND_DIR_PREF; +extern concptr ANGBAND_DIR_SAVE; +extern concptr ANGBAND_DIR_USER; +extern concptr ANGBAND_DIR_XTRA; extern OBJECT_TYPE_VALUE item_tester_tval; extern bool (*item_tester_hook)(object_type *o_ptr); extern bool (*ang_sort_comp)(vptr u, vptr v, int a, int b); @@ -388,7 +388,7 @@ extern bool new_mane; extern bool mon_fight; extern bool ambush_flag; extern bool generate_encounter; -extern cptr screen_dump; +extern concptr screen_dump; /*** Terrain feature variables ***/ extern FEAT_IDX feat_none; @@ -456,7 +456,7 @@ extern bool use_menu; /* autopick.c */ extern void autopick_load_pref(bool disp_mes); extern errr process_autopick_file_command(char *buf); -extern cptr autopick_line_from_entry(autopick_type *entry); +extern concptr autopick_line_from_entry(autopick_type *entry); extern int is_autopick(object_type *o_ptr); extern void autopick_alter_item(INVENTORY_IDX item, bool destroy); extern void autopick_delayed_alter(void); @@ -465,7 +465,7 @@ extern bool autopick_autoregister(object_type *o_ptr); extern void do_cmd_edit_autopick(void); /* birth.c */ -extern void add_history_from_pref_line(cptr t); +extern void add_history_from_pref_line(concptr t); extern void player_birth(void); extern void get_max_stats(void); extern void get_height_weight(void); @@ -569,15 +569,15 @@ extern void do_cmd_travel(void); /* cmd4.c */ #ifndef JP -extern cptr get_ordinal_number_suffix(int num); +extern concptr get_ordinal_number_suffix(int num); #endif -extern errr do_cmd_write_nikki(int type, int num, cptr note); +extern errr do_cmd_write_nikki(int type, int num, concptr note); extern void do_cmd_nikki(void); extern void do_cmd_redraw(void); extern void do_cmd_change_name(void); extern void do_cmd_message_one(void); extern void do_cmd_messages(int num_now); -extern void do_cmd_options_aux(int page, cptr info); +extern void do_cmd_options_aux(int page, concptr info); extern void do_cmd_options(void); extern void do_cmd_pref(void); extern void do_cmd_reload_autopick(void); @@ -600,14 +600,14 @@ extern void do_cmd_checkquest(void); extern void do_cmd_time(void); /* cmd5.c */ -extern cptr spell_category_name(OBJECT_TYPE_VALUE tval); +extern concptr spell_category_name(OBJECT_TYPE_VALUE tval); extern void do_cmd_browse(void); extern void do_cmd_study(void); extern void do_cmd_cast(void); /* cmd-spell.c */ extern void stop_singing(void); -extern cptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode); extern bool trump_summoning(int num, bool pet, POSITION y, POSITION x, DEPTH lev, int type, BIT_FLAGS mode); /* dungeon.c */ @@ -627,18 +627,18 @@ extern void safe_setuid_grab(void); extern s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode); extern void display_player(int mode); extern errr make_character_dump(FILE *fff); -extern errr file_character(cptr name); +extern errr file_character(concptr name); extern errr process_pref_file_command(char *buf); -extern cptr process_pref_file_expr(char **sp, char *fp); -extern errr process_pref_file(cptr name); -extern errr process_autopick_file(cptr name); -extern errr process_histpref_file(cptr name); +extern concptr process_pref_file_expr(char **sp, char *fp); +extern errr process_pref_file(concptr name); +extern errr process_autopick_file(concptr name); +extern errr process_histpref_file(concptr name); extern void print_equippy(void); extern errr check_time_init(void); extern errr check_load_init(void); extern errr check_time(void); extern errr check_load(void); -extern bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode); +extern bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode); extern void do_cmd_help(void); extern void process_player_name(bool sf); extern void get_name(void); @@ -651,10 +651,10 @@ extern void exit_game_panic(void); extern void signals_ignore_tstp(void); extern void signals_handle_tstp(void); extern void signals_init(void); -extern errr get_rnd_line(cptr file_name, int entry, char *output); +extern errr get_rnd_line(concptr file_name, int entry, char *output); #ifdef JP -extern errr get_rnd_line_jonly(cptr file_name, int entry, char *output, int count); +extern errr get_rnd_line_jonly(concptr file_name, int entry, char *output, int count); #endif extern errr counts_write(int where, u32b count); extern u32b counts_read(int where); @@ -686,17 +686,17 @@ extern bool build_tunnel2(POSITION x1, POSITION y1, POSITION x2, POSITION y2, in /* init1.c */ extern byte color_char_to_attr(char c); -extern s16b f_tag_to_index(cptr str); -extern errr process_dungeon_file(cptr name, int ymin, int xmin, int ymax, int xmax); +extern s16b f_tag_to_index(concptr str); +extern errr process_dungeon_file(concptr name, int ymin, int xmin, int ymax, int xmax); /* init2.c */ extern void init_file_paths(char *path); -extern cptr err_str[PARSE_ERROR_MAX]; +extern concptr err_str[PARSE_ERROR_MAX]; extern errr init_v_info(void); extern errr init_buildings(void); -extern s16b f_tag_to_index_in_init(cptr str); +extern s16b f_tag_to_index_in_init(concptr str); extern void init_angband(void); -extern cptr get_check_sum(void); +extern concptr get_check_sum(void); /* load.c */ extern errr rd_savefile_new(void); @@ -717,7 +717,7 @@ extern bool set_monster_monfear(MONSTER_IDX m_idx, int v); extern bool set_monster_invulner(MONSTER_IDX m_idx, int v, bool energy_need); extern void process_monsters_mtimed(int mtimed_idx); extern void dispel_monster_status(MONSTER_IDX m_idx); -extern void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, cptr note, IDX who); +extern void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, IDX who); extern bool process_the_world(int num, MONSTER_IDX who, bool vs_player); extern void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx); @@ -725,7 +725,7 @@ extern void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx); extern void roff_top(MONRACE_IDX r_idx); extern void screen_roff(MONRACE_IDX r_idx, BIT_FLAGS mode); extern void display_roff(MONRACE_IDX r_idx); -extern void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, cptr str)); +extern void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, concptr str)); extern void create_name(int type, char *name); extern monsterrace_hook_type get_monster_hook(void); @@ -742,9 +742,9 @@ extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dic /* monster2.c */ -extern cptr horror_desc[MAX_SAN_HORROR]; -extern cptr funny_desc[MAX_SAN_FUNNY]; -extern cptr funny_comments[MAX_SAN_COMMENT]; +extern concptr horror_desc[MAX_SAN_HORROR]; +extern concptr funny_desc[MAX_SAN_FUNNY]; +extern concptr funny_comments[MAX_SAN_COMMENT]; extern void set_target(monster_type *m_ptr, POSITION y, POSITION x); extern void reset_target(monster_type *m_ptr); extern monster_race *real_r_ptr(monster_type *m_ptr); @@ -782,14 +782,14 @@ extern int m_bonus(int max, DEPTH level); extern void reset_visuals(void); extern void object_flags(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]); extern void object_flags_known(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]); -extern cptr item_activation(object_type *o_ptr); +extern concptr item_activation(object_type *o_ptr); extern bool screen_object(object_type *o_ptr, BIT_FLAGS mode); extern char index_to_label(int i); extern INVENTORY_IDX label_to_inven(int c); extern INVENTORY_IDX label_to_equip(int c); extern s16b wield_slot(object_type *o_ptr); -extern cptr mention_use(int i); -extern cptr describe_use(int i); +extern concptr mention_use(int i); +extern concptr describe_use(int i); extern bool check_book_realm(const OBJECT_TYPE_VALUE book_tval, const OBJECT_SUBTYPE_VALUE book_sval); extern bool item_tester_okay(object_type *o_ptr); extern void display_inven(void); @@ -798,8 +798,8 @@ extern COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode); extern COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode); extern void toggle_inven_equip(void); extern bool can_get_item(void); -extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode); -extern object_type *choose_object(OBJECT_IDX *idx, cptr q, cptr s, BIT_FLAGS option); +extern bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode); +extern object_type *choose_object(OBJECT_IDX *idx, concptr q, concptr s, BIT_FLAGS option); /* object2.c */ extern void excise_object_idx(OBJECT_IDX o_idx); @@ -856,7 +856,7 @@ extern void do_cmd_kaji(bool only_browse); extern void torch_flags(object_type *o_ptr, BIT_FLAGS *flgs); extern void torch_dice(object_type *o_ptr, DICE_NUMBER *dd, DICE_SID *ds); extern void torch_lost_fuel(object_type *o_ptr); -extern cptr essence_name[]; +extern concptr essence_name[]; /* racial.c */ extern bool gain_magic(void); @@ -872,7 +872,7 @@ extern bool save_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode); extern PERCENTAGE beam_chance(void); extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2); extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, EFFECT_ID typ); -extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell); +extern int take_hit(int damage_type, HIT_POINT damage, concptr kb_str, int monspell); extern u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, EFFECT_ID typ); extern sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, BIT_FLAGS flg); extern POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2); @@ -894,7 +894,7 @@ extern bool detect_monsters_normal(POSITION range); extern bool detect_monsters_invis(POSITION range); extern bool detect_monsters_evil(POSITION range); extern bool detect_monsters_xxx(POSITION range, u32b match_flag); -extern bool detect_monsters_string(POSITION range, cptr); +extern bool detect_monsters_string(POSITION range, concptr); extern bool detect_monsters_nonliving(POSITION range); extern bool detect_monsters_mind(POSITION range); extern bool detect_all(POSITION range); @@ -903,7 +903,7 @@ extern bool speed_monsters(void); extern bool slow_monsters(int power); extern bool sleep_monsters(int power); extern void aggravate_monsters(MONSTER_IDX who); -extern bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, cptr spell_name); +extern bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, concptr spell_name); extern bool symbol_genocide(int power, bool player_cast); extern bool mass_genocide(int power, bool player_cast); extern bool mass_genocide_undead(int power, bool player_cast); @@ -1018,7 +1018,7 @@ extern void teleport_player_away(MONSTER_IDX m_idx, POSITION dis); extern void teleport_player_to(POSITION ny, POSITION nx, BIT_FLAGS mode); extern void teleport_away_followable(MONSTER_IDX m_idx); extern void teleport_level(MONSTER_IDX m_idx); -extern DUNGEON_IDX choose_dungeon(cptr note, POSITION y, POSITION x); +extern DUNGEON_IDX choose_dungeon(concptr note, POSITION y, POSITION x); extern bool recall_player(player_type *creature_ptr, TIME_EFFECT turns); extern bool free_level_recall(player_type *creature_ptr); extern bool reset_recall(void); @@ -1081,23 +1081,23 @@ extern HIT_POINT calc_expect_crit_shot(WEIGHT weight, int plus_ammo,int plus_bow extern HIT_POINT calc_expect_crit(WEIGHT weight, int plus, HIT_POINT dam, s16b meichuu, bool dokubari); /* util.c */ -extern errr path_parse(char *buf, int max, cptr file); -extern errr path_build(char *buf, int max, cptr path, cptr file); -extern FILE *my_fopen(cptr file, cptr mode); +extern errr path_parse(char *buf, int max, concptr file); +extern errr path_build(char *buf, int max, concptr path, concptr file); +extern FILE *my_fopen(concptr file, concptr mode); extern FILE *my_fopen_temp(char *buf, int max); extern errr my_fgets(FILE *fff, char *buf, huge n); -extern errr my_fputs(FILE *fff, cptr buf, huge n); +extern errr my_fputs(FILE *fff, concptr buf, huge n); extern errr my_fclose(FILE *fff); -extern errr fd_kill(cptr file); -extern errr fd_move(cptr file, cptr what); -extern errr fd_copy(cptr file, cptr what); -extern int fd_make(cptr file, BIT_FLAGS mode); -extern int fd_open(cptr file, int flags); +extern errr fd_kill(concptr file); +extern errr fd_move(concptr file, concptr what); +extern errr fd_copy(concptr file, concptr what); +extern int fd_make(concptr file, BIT_FLAGS mode); +extern int fd_open(concptr file, int flags); extern errr fd_lock(int fd, int what); extern errr fd_seek(int fd, huge n); extern errr fd_chop(int fd, huge n); extern errr fd_read(int fd, char *buf, huge n); -extern errr fd_write(int fd, cptr buf, huge n); +extern errr fd_write(int fd, concptr buf, huge n); extern errr fd_close(int fd); extern void flush(void); extern void bell(void); @@ -1105,46 +1105,46 @@ extern errr play_music(int type, int num); extern void select_floor_music(void); extern void sound(int num); extern void move_cursor(int row, int col); -extern void text_to_ascii(char *buf, cptr str); -extern void ascii_to_text(char *buf, cptr str); -extern errr macro_add(cptr pat, cptr act); -extern sint macro_find_exact(cptr pat); +extern void text_to_ascii(char *buf, concptr str); +extern void ascii_to_text(char *buf, concptr str); +extern errr macro_add(concptr pat, concptr act); +extern sint macro_find_exact(concptr pat); extern char inkey(void); -extern cptr quark_str(STR_OFFSET num); +extern concptr quark_str(STR_OFFSET num); extern void quark_init(void); -extern u16b quark_add(cptr str); +extern u16b quark_add(concptr str); extern s32b message_num(void); -extern cptr message_str(int age); -extern void message_add(cptr msg); +extern concptr message_str(int age); +extern void message_add(concptr msg); extern void msg_erase(void); -extern void msg_print(cptr msg); -extern void msg_print_wizard(int cheat_type, cptr msg); +extern void msg_print(concptr msg); +extern void msg_print_wizard(int cheat_type, concptr msg); #ifndef SWIG -extern void msg_format(cptr fmt, ...); -extern void msg_format_wizard(int cheat_type, cptr fmt, ...); +extern void msg_format(concptr fmt, ...); +extern void msg_format_wizard(int cheat_type, concptr fmt, ...); #endif /* SWIG */ extern void screen_save(void); extern void screen_load(void); -extern void c_put_str(TERM_COLOR attr, cptr str, TERM_LEN row, TERM_LEN col); -extern void put_str(cptr str, TERM_LEN row, TERM_LEN col); -extern void c_prt(TERM_COLOR attr, cptr str, TERM_LEN row, TERM_LEN col); -extern void prt(cptr str, TERM_LEN row, TERM_LEN col); -extern void c_roff(TERM_COLOR attr, cptr str); -extern void roff(cptr str); +extern void c_put_str(TERM_COLOR attr, concptr str, TERM_LEN row, TERM_LEN col); +extern void put_str(concptr str, TERM_LEN row, TERM_LEN col); +extern void c_prt(TERM_COLOR attr, concptr str, TERM_LEN row, TERM_LEN col); +extern void prt(concptr str, TERM_LEN row, TERM_LEN col); +extern void c_roff(TERM_COLOR attr, concptr str); +extern void roff(concptr str); extern void clear_from(int row); extern bool askfor_aux(char *buf, int len, bool numpad_cursor); extern bool askfor(char *buf, int len); -extern bool get_string(cptr prompt, char *buf, int len); -extern bool get_check(cptr prompt); -extern bool get_check_strict(cptr prompt, BIT_FLAGS mode); -extern bool get_com(cptr prompt, char *command, bool z_escape); -extern QUANTITY get_quantity(cptr prompt, QUANTITY max); +extern bool get_string(concptr prompt, char *buf, int len); +extern bool get_check(concptr prompt); +extern bool get_check_strict(concptr prompt, BIT_FLAGS mode); +extern bool get_com(concptr prompt, char *command, bool z_escape); +extern QUANTITY get_quantity(concptr prompt, QUANTITY max); extern void pause_line(int row); extern void request_command(int shopping); extern bool is_a_vowel(int ch); extern int get_keymap_dir(char ch); -extern errr type_string(cptr str, uint len); -extern void roff_to_buf(cptr str, int wlen, char *tbuf, size_t bufsize); +extern errr type_string(concptr str, uint len); +extern void roff_to_buf(concptr str, int wlen, char *tbuf, size_t bufsize); #ifdef SORT_R_INFO extern void tag_sort(tag_type elements[], int number); @@ -1155,10 +1155,10 @@ extern byte gamma_table[256]; extern void build_gamma_table(int gamma); #endif /* SUPPORT_GAMMA */ -extern size_t my_strcpy(char *buf, cptr src, size_t bufsize); -extern size_t my_strcat(char *buf, cptr src, size_t bufsize); -extern char *my_strstr(cptr haystack, cptr needle); -extern char *my_strchr(cptr ptr, char ch); +extern size_t my_strcpy(char *buf, concptr src, size_t bufsize); +extern size_t my_strcat(char *buf, concptr src, size_t bufsize); +extern char *my_strstr(concptr haystack, concptr needle); +extern char *my_strchr(concptr ptr, char ch); extern void str_tolower(char *str); extern int inkey_special(bool numpad_cursor); @@ -1167,7 +1167,7 @@ extern int inkey_special(bool numpad_cursor); extern void cnv_stat(int val, char *out_val); extern s16b modify_stat_value(int value, int amount); extern void prt_time(void); -extern cptr map_name(void); +extern concptr map_name(void); extern WEIGHT weight_limit(void); extern bool buki_motteruka(int i); extern bool is_heavy_shoot(object_type *o_ptr); @@ -1259,16 +1259,16 @@ extern void check_experience(void); extern void complete_quest(QUEST_IDX quest_num); extern void check_quest_completion(monster_type *m_ptr); extern void check_find_art_quest_completion(object_type *o_ptr); -extern cptr extract_note_dies(MONRACE_IDX r_idx); +extern concptr extract_note_dies(MONRACE_IDX r_idx); extern void monster_death(MONSTER_IDX m_idx, bool drop_item); -extern bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note); +extern bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, concptr note); extern void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p); extern void panel_bounds_center(void); extern void resize_map(void); extern void redraw_window(void); extern bool change_panel(POSITION dy, POSITION dx); extern void verify_panel(void); -extern cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode); +extern concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode); extern bool target_able(MONSTER_IDX m_idx); extern bool target_okay(void); extern bool target_set(BIT_FLAGS mode); @@ -1280,7 +1280,7 @@ extern bool get_rep_dir(DIRECTION *dp, bool under); extern void gain_level_reward(int chosen_reward); extern bool tgt_pt(POSITION *x, POSITION *y); extern void do_poly_wounds(void); -extern void change_race(CHARACTER_IDX new_race, cptr effect_msg); +extern void change_race(CHARACTER_IDX new_race, concptr effect_msg); extern HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear); extern ENERGY bow_energy(OBJECT_SUBTYPE_VALUE sval); extern int bow_tmul(OBJECT_SUBTYPE_VALUE sval); @@ -1376,7 +1376,7 @@ extern void user_name(char *buf, int id); #if 0 #ifndef HAS_STRICMP /* util.c */ -extern int stricmp(cptr a, cptr b); +extern int stricmp(concptr a, concptr b); #endif #endif @@ -1401,7 +1401,7 @@ extern void convert_pathname(char *path); #endif #if defined(MACH_O_CARBON) -extern void fsetfileinfo(cptr path, u32b fcreator, u32b ftype); +extern void fsetfileinfo(concptr path, u32b fcreator, u32b ftype); #endif #ifdef WINDOWS @@ -1429,7 +1429,7 @@ extern bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir); /* object1.c */ extern ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode); extern COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_LEN *min_width); -extern bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode); +extern bool get_item_floor(COMMAND_CODE *cp, concptr pmt, concptr str, BIT_FLAGS mode); extern void py_pickup_floor(bool pickup); /* variable.c */ @@ -1468,7 +1468,7 @@ extern errr parse_line_wilderness(char *buf, int ymin, int xmin, int ymax, int x extern bool change_wild_mode(void); /* wizard1.c */ -extern void spoil_random_artifact(cptr fname); +extern void spoil_random_artifact(concptr fname); /* wizard2.c */ extern void strip_name(char *buf, KIND_OBJECT_IDX k_idx); @@ -1479,7 +1479,7 @@ extern void cheat_death(player_type *creature_ptr); /* avatar.c */ extern bool compare_virtue(int type, int num, int tekitou); extern int virtue_number(int type); -extern cptr virtue[MAX_VIRTUE]; +extern concptr virtue[MAX_VIRTUE]; extern void get_virtues(void); extern void chg_virtue(int virtue, int amount); extern void set_virtue(int virtue, int amount); @@ -1487,28 +1487,28 @@ extern void dump_virtues(FILE * OutFile); #ifdef JP /* japanese.c */ -extern void sindarin_to_kana(char *kana, cptr sindarin); -extern void jverb( cptr in , char *out , int flag); +extern void sindarin_to_kana(char *kana, concptr sindarin); +extern void jverb( concptr in , char *out , int flag); extern void sjis2euc(char *str); extern void euc2sjis(char *str); extern byte codeconv(char *str); -extern bool iskanji2(cptr s, int x); +extern bool iskanji2(concptr s, int x); extern void guess_convert_to_system_encoding(char* strbuf, int buflen); #endif #ifdef WORLD_SCORE /* report.c */ extern errr report_score(void); -extern cptr make_screen_dump(void); +extern concptr make_screen_dump(void); #endif /* inet.c */ extern int soc_write(int sd, char *buf, size_t sz); extern int soc_read(int sd, char *buf, size_t sz); extern void set_proxy(char *default_url, int default_port); -extern int connect_server(int timeout, cptr host, int port); +extern int connect_server(int timeout, concptr host, int port); extern int disconnect_server(int sd); -extern cptr soc_err(void); +extern concptr soc_err(void); #ifdef CHUUKEI /* chuukei.c */ @@ -1522,8 +1522,8 @@ extern void prepare_chuukei_hooks(void); #endif extern void prepare_movie_hooks(void); -extern void prepare_browse_movie_aux(cptr filename); -extern void prepare_browse_movie(cptr filename); +extern void prepare_browse_movie_aux(concptr filename); +extern void prepare_browse_movie(concptr filename); extern void browse_movie(void); extern bool browsing_movie; diff --git a/src/files.c b/src/files.c index 26c66a2e9..8a894c08c 100644 --- a/src/files.c +++ b/src/files.c @@ -192,7 +192,7 @@ typedef struct named_num named_num; struct named_num { - cptr name; /* The name of this thing */ + concptr name; /* The name of this thing */ int num; /* A number associated with it */ }; @@ -757,9 +757,9 @@ errr process_pref_file_command(char *buf) * result * */ -cptr process_pref_file_expr(char **sp, char *fp) +concptr process_pref_file_expr(char **sp, char *fp) { - cptr v; + concptr v; char *b; char *s; @@ -785,8 +785,8 @@ cptr process_pref_file_expr(char **sp, char *fp) /* Analyze */ if (*s == b1) { - cptr p; - cptr t; + concptr p; + concptr t; /* Skip b1 */ s++; @@ -1060,7 +1060,7 @@ cptr process_pref_file_expr(char **sp, char *fp) * result * */ -static errr process_pref_file_aux(cptr name, int preftype) +static errr process_pref_file_aux(concptr name, int preftype) { FILE *fp; @@ -1108,7 +1108,7 @@ static errr process_pref_file_aux(cptr name, int preftype) if ((buf[0] == '?') && (buf[1] == ':')) { char f; - cptr v; + concptr v; char *s; /* Start */ @@ -1197,7 +1197,7 @@ static errr process_pref_file_aux(cptr name, int preftype) * allow conditional evaluation and filename inclusion. * */ -errr process_pref_file(cptr name) +errr process_pref_file(concptr name) { char buf[1024]; @@ -1637,14 +1637,14 @@ static struct * @param attr 項目表示の色 * @return なし */ -static void display_player_one_line(int entry, cptr val, TERM_COLOR attr) +static void display_player_one_line(int entry, concptr val, TERM_COLOR attr) { char buf[40]; int row = disp_player_line[entry].row; int col = disp_player_line[entry].col; int len = disp_player_line[entry].len; - cptr head = disp_player_line[entry].header; + concptr head = disp_player_line[entry].header; int head_len = strlen(head); @@ -1917,7 +1917,7 @@ static TERM_COLOR likert_color = TERM_WHITE; * @param y 技能値に対するランク基準比 * @return なし */ -static cptr likert(int x, int y) +static concptr likert(int x, int y) { static char dummy[20] = "", dummy2[20] = ""; memset(dummy, 0, strlen(dummy)); @@ -2019,7 +2019,7 @@ static void display_player_various(void) int xthn, xthb, xfos, xsrh; int xdis, xdev, xsav, xstl; int xdig; - cptr desc; + concptr desc; int muta_att = 0; BIT_FLAGS flgs[TR_FLAG_SIZE]; int shots, shot_frac; @@ -2974,7 +2974,7 @@ typedef struct { * @param mode 表示オプション * @return なし */ -static void display_flag_aux(TERM_LEN row, TERM_LEN col, cptr header, +static void display_flag_aux(TERM_LEN row, TERM_LEN col, concptr header, int flag1, all_player_flags *f, u16b mode) { int i; @@ -4995,7 +4995,7 @@ errr make_character_dump(FILE *fff) * Allow the "full" flag to dump additional info, * and trigger its usage from various places in the code. */ -errr file_character(cptr name) +errr file_character(concptr name) { int fd = -1; FILE *fff = NULL; @@ -5067,7 +5067,7 @@ errr file_character(cptr name) * You can use any single character in place of the "|". * */ -static void show_file_aux_line(cptr str, int cy, cptr shower) +static void show_file_aux_line(concptr str, int cy, concptr shower) { static const char tag_str[] = "[[[["; byte color = TERM_WHITE; @@ -5092,7 +5092,7 @@ static void show_file_aux_line(cptr str, int cy, cptr shower) int showercol = len + 1; int bracketcol = len + 1; int endcol = len; - cptr ptr; + concptr ptr; /* Search for a shower string in the line */ if (shower) @@ -5196,7 +5196,7 @@ static void show_file_aux_line(cptr str, int cy, cptr shower) * Return FALSE on 'q' to exit from a deep, otherwise TRUE. * */ -bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode) +bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode) { int i, n, skey; @@ -5216,10 +5216,10 @@ bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode FILE *fff = NULL; /* Find this string (if any) */ - cptr find = NULL; + concptr find = NULL; /* Jump to this tag */ - cptr tag = NULL; + concptr tag = NULL; /* Hold strings to find/show */ char finder_str[81]; @@ -5227,7 +5227,7 @@ bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode char back_str[81]; /* String to show */ - cptr shower = NULL; + concptr shower = NULL; /* Filename */ char filename[1024]; @@ -5444,7 +5444,7 @@ bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode /* Dump the next 20, or rows, lines of the file */ for (i = 0; i < rows; ) { - cptr str = buf; + concptr str = buf; /* Hack -- track the "first" line */ if (!i) line = next; @@ -5879,11 +5879,11 @@ void process_player_name(bool sf) #endif if (!savefile_base[0] && savefile[0]) { - cptr s; + concptr s; s = savefile; while (1) { - cptr t; + concptr t; t = my_strstr(s, PATH_SEP); if (!t) break; @@ -6211,7 +6211,7 @@ long total_points(void) * @return なし * @details */ -static void center_string(char *buf, cptr str) +static void center_string(char *buf, concptr str) { int i, j; @@ -6321,7 +6321,7 @@ static void print_tomb(void) /* Print the text-tombstone */ if (!done) { - cptr p; + concptr p; char tmp[160]; char buf[1024]; char dummy[80]; @@ -6458,7 +6458,7 @@ static void print_tomb(void) { if (dun_level == 0) { - cptr field_name = p_ptr->town_num ? "街" : "荒野"; + concptr field_name = p_ptr->town_num ? "街" : "荒野"; if (streq(p_ptr->died_from, "途中終了")) { sprintf(tmp, "%sで死んだ", field_name); @@ -6743,7 +6743,7 @@ void close_game(void) char buf[1024]; bool do_send = TRUE; -/* cptr p = "[i:キャラクタの情報, f:ファイル書き出し, t:スコア, x:*鑑定*, ESC:ゲーム終了]"; */ +/* concptr p = "[i:キャラクタの情報, f:ファイル書き出し, t:スコア, x:*鑑定*, ESC:ゲーム終了]"; */ handle_stuff(); /* Flush the messages */ @@ -6907,7 +6907,7 @@ void exit_game_panic(void) * Based on the monster speech patch by Matt Graham, * */ -errr get_rnd_line(cptr file_name, int entry, char *output) +errr get_rnd_line(concptr file_name, int entry, char *output) { FILE *fp; char buf[1024]; @@ -7016,7 +7016,7 @@ errr get_rnd_line(cptr file_name, int entry, char *output) * @return エラーコード * @details */ -errr get_rnd_line_jonly(cptr file_name, int entry, char *output, int count) +errr get_rnd_line_jonly(concptr file_name, int entry, char *output, int count) { int i, j, kanji; errr result = 1; @@ -7038,7 +7038,7 @@ errr get_rnd_line_jonly(cptr file_name, int entry, char *output, int count) * @param name ファイル名 * @details */ -errr process_autopick_file(cptr name) +errr process_autopick_file(concptr name) { char buf[1024]; @@ -7059,7 +7059,7 @@ errr process_autopick_file(cptr name) * @return エラーコード * @details */ -errr process_histpref_file(cptr name) +errr process_histpref_file(concptr name) { char buf[1024]; errr err = 0; diff --git a/src/flavor.c b/src/flavor.c index 90c22188a..9c67a1033 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -86,7 +86,7 @@ void get_table_name_aux(char *out_string) #else #define MAX_SYLLABLES 164 /* Used with scrolls (see below) */ - static cptr syllables[MAX_SYLLABLES] = { + static concptr syllables[MAX_SYLLABLES] = { "a", "ab", "ag", "aks", "ala", "an", "ankh", "app", "arg", "arze", "ash", "aus", "ban", "bar", "bat", "bek", "bie", "bin", "bit", "bjor", "blu", "bot", "bu", @@ -378,7 +378,7 @@ static char *object_desc_chr(char *t, char c) * Print a string "s" into a string "t", as if by strcpy(t, s), * and return a pointer to the terminator. */ -static char *object_desc_str(char *t, cptr s) +static char *object_desc_str(char *t, concptr s) { /* Copy the string */ while (*s) *t++ = *s++; @@ -591,9 +591,9 @@ static char *object_desc_int(char *t, sint v) typedef struct flag_insc_table { #ifdef JP - cptr japanese; + concptr japanese; #endif - cptr english; + concptr english; int flag; int except_flag; } flag_insc_table; @@ -1159,7 +1159,7 @@ static char *get_ability_abbreviation(char *ptr, object_type *o_ptr, bool kanji, */ static void get_inscription(char *buff, object_type *o_ptr) { - cptr insc = quark_str(o_ptr->inscription); + concptr insc = quark_str(o_ptr->inscription); char *ptr = buff; /* Not fully identified */ @@ -1190,7 +1190,7 @@ static void get_inscription(char *buff, object_type *o_ptr) { bool kanji = FALSE; bool all; - cptr start = ptr; + concptr start = ptr; /* check for too long inscription */ if (ptr >= buff + MAX_NLEN) continue; @@ -1308,13 +1308,13 @@ bool object_is_quest_target(object_type *o_ptr) void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode) { /* Extract object kind name */ - cptr kindname = k_name + k_info[o_ptr->k_idx].name; + concptr kindname = k_name + k_info[o_ptr->k_idx].name; /* Extract default "base" string */ - cptr basenm = kindname; + concptr basenm = kindname; /* Assume no "modifier" string */ - cptr modstr = ""; + concptr modstr = ""; int power; int fire_rate; @@ -1326,7 +1326,7 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode) bool show_weapon = FALSE; bool show_armour = FALSE; - cptr s, s0; + concptr s, s0; char *t; char p1 = '(', p2 = ')'; @@ -1409,7 +1409,7 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode) sprintf(tmp_val2, " (%s)",r_name + r_ptr->name); modstr = tmp_val2; #else - cptr t = r_name + r_ptr->name; + concptr t = r_name + r_ptr->name; if (!(r_ptr->flags1 & RF1_UNIQUE)) { @@ -1438,7 +1438,7 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode) #ifdef JP modstr = r_name + r_ptr->name; #else - cptr t = r_name + r_ptr->name; + concptr t = r_name + r_ptr->name; if (!(r_ptr->flags1 & RF1_UNIQUE)) { @@ -2018,7 +2018,7 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode) /* ランダム・アーティファクト */ if (o_ptr->art_name) { - cptr temp = quark_str(o_ptr->art_name); + concptr temp = quark_str(o_ptr->art_name); /* '『' から始まらない伝説のアイテムの名前は最初に付加する */ /* 英語版のセーブファイルから来た 'of XXX' は,「XXXの」と表示する */ @@ -2148,7 +2148,7 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode) } else if (o_ptr->inscription) { - cptr str = quark_str(o_ptr->inscription); + concptr str = quark_str(o_ptr->inscription); while(*str) { @@ -2163,7 +2163,7 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode) if (*str) { /* Find the '#' */ - cptr str_aux = my_strchr(quark_str(o_ptr->inscription), '#'); + concptr str_aux = my_strchr(quark_str(o_ptr->inscription), '#'); /* Add the false name */ t = object_desc_str(t,"『"); @@ -2211,7 +2211,7 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode) if (o_ptr->inscription && my_strchr(quark_str(o_ptr->inscription), '#')) { /* Find the '#' */ - cptr str = my_strchr(quark_str(o_ptr->inscription), '#'); + concptr str = my_strchr(quark_str(o_ptr->inscription), '#'); /* Add the false name */ t = object_desc_chr(t, ' '); diff --git a/src/floor-generate.c b/src/floor-generate.c index fa6146979..7c14f8329 100644 --- a/src/floor-generate.c +++ b/src/floor-generate.c @@ -1244,7 +1244,7 @@ static void quest_gen(void) * @brief ダンジョン時のランダムフロア生成 / Make a real level * @return フロアの生成に成功したらTRUE */ -static bool level_gen(cptr *why) +static bool level_gen(concptr *why) { int level_height, level_width; @@ -1410,7 +1410,7 @@ void generate_cave(void) { bool okay = TRUE; - cptr why = NULL; + concptr why = NULL; /* Clear and empty the cave */ clear_cave(); diff --git a/src/h-type.h b/src/h-type.h index 2e06cd252..718fbbd79 100644 --- a/src/h-type.h +++ b/src/h-type.h @@ -42,7 +42,7 @@ /*** Special 4 letter names for some standard types ***/ typedef void *vptr; /*!< void型ポインタ定義 / A standard pointer (to "void" because ANSI C says so) */ -typedef const char *cptr; /*!< 文字列定数用ポインタ定義 / A simple pointer (to unmodifiable strings) */ +typedef const char *concptr; /*!< 文字列定数用ポインタ定義 / A simple pointer (to unmodifiable strings) */ typedef double real; /*!< doubleをreal型として定義 / Since float's are silly, hard code real numbers as doubles */ @@ -269,7 +269,7 @@ typedef u16b *u16b_ptr; typedef s32b *s32b_ptr; typedef u32b *u32b_ptr; typedef vptr *vptr_ptr; -typedef cptr *cptr_ptr; +typedef concptr *cptr_ptr; diff --git a/src/hissatsu.c b/src/hissatsu.c index c06934758..30d78280e 100644 --- a/src/hissatsu.c +++ b/src/hissatsu.c @@ -45,7 +45,7 @@ static int get_hissatsu_power(SPELL_IDX *sn) char choice; char out_val[160]; SPELL_IDX sentaku[32]; - cptr p = _("必殺剣", "special attack"); + concptr p = _("必殺剣", "special attack"); COMMAND_CODE code; magic_type spell; bool flag, redraw; @@ -379,7 +379,7 @@ void do_cmd_gain_hissatsu(void) int i, j; object_type *o_ptr; - cptr q, s; + concptr q, s; bool gain = FALSE; diff --git a/src/history.h b/src/history.h index 34e551936..9518e4165 100644 --- a/src/history.h +++ b/src/history.h @@ -9,7 +9,7 @@ typedef struct hist_type hist_type; */ struct hist_type { - cptr info; /*!> メッセージ本文 / Textual History */ + concptr info; /*!> メッセージ本文 / Textual History */ byte roll; /*!> 確率の重み / Frequency of this entry */ byte chart; /*!> 生い立ちメッセージの流れを示すチャートID / Chart index */ diff --git a/src/inet.c b/src/inet.c index dadb610d8..3202ef9ad 100644 --- a/src/inet.c +++ b/src/inet.c @@ -26,7 +26,7 @@ #include -static cptr errstr; +static concptr errstr; static char *proxy; static int proxy_port; @@ -278,7 +278,7 @@ static void interrupt_report(int sig) /* サーバにコネクトする関数。 */ -int connect_server(int timeout, cptr host, int port) +int connect_server(int timeout, concptr host, int port) #ifndef MACINTOSH { int sd; @@ -515,7 +515,7 @@ int disconnect_server(int sd) #endif } -cptr soc_err() +concptr soc_err() { return errstr; } diff --git a/src/init1.c b/src/init1.c index 758732ff1..7010093f0 100644 --- a/src/init1.c +++ b/src/init1.c @@ -62,7 +62,7 @@ * モンスターの打撃手段トークンの定義 / * Monster Blow Methods */ -static cptr r_info_blow_method[] = +static concptr r_info_blow_method[] = { "", "HIT", @@ -98,7 +98,7 @@ static cptr r_info_blow_method[] = * モンスターの打撃属性トークンの定義 / * Monster Blow Effects */ -static cptr r_info_blow_effect[] = +static concptr r_info_blow_effect[] = { "", "HURT", @@ -143,7 +143,7 @@ static cptr r_info_blow_effect[] = * 地形属性トークンの定義 / * Feature info flags */ -static cptr f_info_flags[] = +static concptr f_info_flags[] = { "LOS", "PROJECT", @@ -268,7 +268,7 @@ static cptr f_info_flags[] = * モンスター特性トークンの定義1 / * Monster race flags */ -static cptr r_info_flags1[] = +static concptr r_info_flags1[] = { "UNIQUE", "QUESTOR", @@ -308,7 +308,7 @@ static cptr r_info_flags1[] = * モンスター特性トークンの定義2 / * Monster race flags */ -static cptr r_info_flags2[] = +static concptr r_info_flags2[] = { "STUPID", "SMART", @@ -348,7 +348,7 @@ static cptr r_info_flags2[] = * モンスター特性トークンの定義3 / * Monster race flags */ -static cptr r_info_flags3[] = +static concptr r_info_flags3[] = { "ORC", "TROLL", @@ -388,7 +388,7 @@ static cptr r_info_flags3[] = * モンスター特性トークンの定義4 / * Monster race flags */ -static cptr r_info_flags4[] = +static concptr r_info_flags4[] = { "SHRIEK", "XXX1", @@ -428,7 +428,7 @@ static cptr r_info_flags4[] = * モンスター特性トークン(発動型能力1) / * Monster race flags */ -static cptr r_a_ability_flags1[] = +static concptr r_a_ability_flags1[] = { "BA_ACID", "BA_ELEC", @@ -468,7 +468,7 @@ static cptr r_a_ability_flags1[] = * モンスター特性トークン(発動型能力2) / * Monster race flags */ -static cptr r_a_ability_flags2[] = +static concptr r_a_ability_flags2[] = { "HASTE", "HAND_DOOM", @@ -509,7 +509,7 @@ static cptr r_a_ability_flags2[] = * モンスター特性トークン(発動型能力3) / * Monster race flags */ -static cptr r_a_ability_flags3[] = +static concptr r_a_ability_flags3[] = { "XXXA3X00", "XXXA3X01", @@ -551,7 +551,7 @@ static cptr r_a_ability_flags3[] = * モンスター特性トークン(発動型能力4) / * Monster race flags */ -static cptr r_a_ability_flags4[] = +static concptr r_a_ability_flags4[] = { "XXXA4X00", "XXXA4X01", @@ -593,7 +593,7 @@ static cptr r_a_ability_flags4[] = * モンスター特性トークンの定義7 / * Monster race flags */ -static cptr r_info_flags7[] = +static concptr r_info_flags7[] = { "AQUATIC", "CAN_SWIM", @@ -633,7 +633,7 @@ static cptr r_info_flags7[] = * モンスター特性トークンの定義8 / * Monster race flags */ -static cptr r_info_flags8[] = +static concptr r_info_flags8[] = { "WILD_ONLY", "WILD_TOWN", @@ -674,7 +674,7 @@ static cptr r_info_flags8[] = * モンスター特性トークンの定義9 / * Monster race flags */ -static cptr r_info_flags9[] = +static concptr r_info_flags9[] = { "DROP_CORPSE", "DROP_SKELETON", @@ -716,7 +716,7 @@ static cptr r_info_flags9[] = * モンスター特性トークンの定義R(耐性) / * Monster race flags */ -static cptr r_info_flagsr[] = +static concptr r_info_flagsr[] = { "IM_ACID", "IM_ELEC", @@ -757,7 +757,7 @@ static cptr r_info_flagsr[] = * オブジェクト基本特性トークンの定義 / * Object flags */ -static cptr k_info_flags[] = +static concptr k_info_flags[] = { "STR", "INT", @@ -908,7 +908,7 @@ static cptr k_info_flags[] = * オブジェクト生成特性トークンの定義 / * Object flags */ -static cptr k_info_gen_flags[] = +static concptr k_info_gen_flags[] = { "INSTA_ART", "QUESTITEM", @@ -948,7 +948,7 @@ static cptr k_info_gen_flags[] = * ダンジョン特性トークンの定義 / * Dungeon flags */ -static cptr d_info_flags1[] = +static concptr d_info_flags1[] = { "WINNER", "MAZE", @@ -997,7 +997,7 @@ static cptr d_info_flags1[] = * Returns FALSE when there isn't enough space available to store * the text. */ -static bool add_text(u32b *offset, header *head, cptr buf, bool normal_text) +static bool add_text(u32b *offset, header *head, concptr buf, bool normal_text) { /* Hack -- Verify space */ if (head->text_size + strlen(buf) + 8 > FAKE_TEXT_SIZE) @@ -1059,7 +1059,7 @@ static bool add_text(u32b *offset, header *head, cptr buf, bool normal_text) * Returns FALSE when there isn't enough space available to store * the text. */ -static bool add_name(u32b *offset, header *head, cptr buf) +static bool add_name(u32b *offset, header *head, concptr buf) { /* Hack -- Verify space */ if (head->name_size + strlen(buf) + 8 > FAKE_NAME_SIZE) @@ -1094,7 +1094,7 @@ static bool add_name(u32b *offset, header *head, cptr buf) * Returns FALSE when there isn't enough space available to store * the text. */ -static bool add_tag(STR_OFFSET *offset, header *head, cptr buf) +static bool add_tag(STR_OFFSET *offset, header *head, concptr buf) { u32b i; @@ -1547,7 +1547,7 @@ errr parse_m_info(char *buf, header *head) * @param what 参照元の文字列ポインタ * @return エラーコード */ -static errr grab_one_flag(u32b *flags, cptr names[], cptr what) +static errr grab_one_flag(u32b *flags, concptr names[], concptr what) { int i; @@ -1572,7 +1572,7 @@ static errr grab_one_flag(u32b *flags, cptr names[], cptr what) * @param what 参照元の文字列ポインタ * @return エラーコード */ -static errr grab_one_feat_flag(feature_type *f_ptr, cptr what) +static errr grab_one_feat_flag(feature_type *f_ptr, concptr what) { int i; @@ -1601,7 +1601,7 @@ static errr grab_one_feat_flag(feature_type *f_ptr, cptr what) * @param count ステートの保存先ID * @return エラーコード */ -static errr grab_one_feat_action(feature_type *f_ptr, cptr what, int count) +static errr grab_one_feat_action(feature_type *f_ptr, concptr what, int count) { FF_FLAGS_IDX i; @@ -1912,7 +1912,7 @@ errr parse_f_info(char *buf, header *head) * @param str タグ文字列 * @return 地形ID */ -s16b f_tag_to_index(cptr str) +s16b f_tag_to_index(concptr str) { u16b i; @@ -1999,7 +1999,7 @@ void retouch_f_info(header *head) * @param what 参照元の文字列ポインタ * @return エラーコード */ -static errr grab_one_kind_flag(object_kind *k_ptr, cptr what) +static errr grab_one_kind_flag(object_kind *k_ptr, concptr what) { int i; @@ -2028,7 +2028,7 @@ static errr grab_one_kind_flag(object_kind *k_ptr, cptr what) * @param what 参照元の文字列ポインタ * @return 発動能力ID */ -static byte grab_one_activation_flag(cptr what) +static byte grab_one_activation_flag(concptr what) { int i; @@ -2338,7 +2338,7 @@ errr parse_k_info(char *buf, header *head) * @param what 参照元の文字列ポインタ * @return エラーがあった場合1、エラーがない場合0を返す */ -static errr grab_one_artifact_flag(artifact_type *a_ptr, cptr what) +static errr grab_one_artifact_flag(artifact_type *a_ptr, concptr what) { int i; @@ -2566,7 +2566,7 @@ errr parse_a_info(char *buf, header *head) * @param what 参照元の文字列ポインタ * @return エラーがあった場合1、エラーがない場合0を返す */ -static bool grab_one_ego_item_flag(ego_item_type *e_ptr, cptr what) +static bool grab_one_ego_item_flag(ego_item_type *e_ptr, concptr what) { int i; @@ -2780,7 +2780,7 @@ errr parse_e_info(char *buf, header *head) * @param what 参照元の文字列ポインタ * @return エラーコード */ -static errr grab_one_basic_flag(monster_race *r_ptr, cptr what) +static errr grab_one_basic_flag(monster_race *r_ptr, concptr what) { if (grab_one_flag(&r_ptr->flags1, r_info_flags1, what) == 0) return 0; @@ -2817,7 +2817,7 @@ static errr grab_one_basic_flag(monster_race *r_ptr, cptr what) * @param what 参照元の文字列ポインタ * @return エラーコード */ -static errr grab_one_spell_flag(monster_race *r_ptr, cptr what) +static errr grab_one_spell_flag(monster_race *r_ptr, concptr what) { if (grab_one_flag(&r_ptr->flags4, r_info_flags4, what) == 0) return 0; @@ -3169,7 +3169,7 @@ errr parse_r_info(char *buf, header *head) * @param what 参照元の文字列ポインタ * @return エラーコード */ -static errr grab_one_dungeon_flag(dungeon_info_type *d_ptr, cptr what) +static errr grab_one_dungeon_flag(dungeon_info_type *d_ptr, concptr what) { if (grab_one_flag(&d_ptr->flags1, d_info_flags1, what) == 0) return 0; @@ -3187,7 +3187,7 @@ static errr grab_one_dungeon_flag(dungeon_info_type *d_ptr, cptr what) * @param what 参照元の文字列ポインタ * @return エラーコード */ -static errr grab_one_basic_monster_flag(dungeon_info_type *d_ptr, cptr what) +static errr grab_one_basic_monster_flag(dungeon_info_type *d_ptr, concptr what) { if (grab_one_flag(&d_ptr->mflags1, r_info_flags1, what) == 0) return 0; @@ -3223,7 +3223,7 @@ static errr grab_one_basic_monster_flag(dungeon_info_type *d_ptr, cptr what) * @param what 参照元の文字列ポインタ * @return エラーコード */ -static errr grab_one_spell_monster_flag(dungeon_info_type *d_ptr, cptr what) +static errr grab_one_spell_monster_flag(dungeon_info_type *d_ptr, concptr what) { if (grab_one_flag(&d_ptr->mflags4, r_info_flags4, what) == 0) return 0; @@ -4416,7 +4416,7 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in static char tmp[8]; -static cptr variant = "ZANGBAND"; +static concptr variant = "ZANGBAND"; /*! @@ -4426,9 +4426,9 @@ static cptr variant = "ZANGBAND"; * @param fp * @return エラーコード */ -static cptr process_dungeon_file_expr(char **sp, char *fp) +static concptr process_dungeon_file_expr(char **sp, char *fp) { - cptr v; + concptr v; char *b; char *s; @@ -4453,8 +4453,8 @@ static cptr process_dungeon_file_expr(char **sp, char *fp) /* Analyze */ if (*s == b1) { - cptr p; - cptr t; + concptr p; + concptr t; /* Skip b1 */ s++; @@ -4744,7 +4744,7 @@ static cptr process_dungeon_file_expr(char **sp, char *fp) * @param xmax 詳細不明 * @return エラーコード */ -errr process_dungeon_file(cptr name, int ymin, int xmin, int ymax, int xmax) +errr process_dungeon_file(concptr name, int ymin, int xmin, int ymax, int xmax) { FILE *fp; char buf[1024]; @@ -4785,7 +4785,7 @@ errr process_dungeon_file(cptr name, int ymin, int xmin, int ymax, int xmax) if ((buf[0] == '?') && (buf[1] == ':')) { char f; - cptr v; + concptr v; char *s; /* Start */ @@ -4811,7 +4811,7 @@ errr process_dungeon_file(cptr name, int ymin, int xmin, int ymax, int xmax) /* Errors */ if (err) { - cptr oops; + concptr oops; /* Error string */ oops = (((err > 0) && (err < PARSE_ERROR_MAX)) ? err_str[err] : "unknown"); @@ -4834,10 +4834,10 @@ void write_r_info_txt(void) int i, j, z, fc, bc; int dlen; - cptr flags[32 * 10]; + concptr flags[32 * 10]; u32b f_ptr[10]; - cptr *n_ptr[10]; + concptr *n_ptr[10]; monster_race *r_ptr; @@ -4845,7 +4845,7 @@ void write_r_info_txt(void) FILE *fff = fopen("output.txt", "wt"); - cptr desc; + concptr desc; BIT_FLAGS mode = -1; diff --git a/src/init2.c b/src/init2.c index 7669de951..5155d6762 100644 --- a/src/init2.c +++ b/src/init2.c @@ -181,7 +181,7 @@ void init_file_paths(char *path) /* Allow "fat binary" usage with NeXT */ if (TRUE) { - cptr next = NULL; + concptr next = NULL; # if defined(m68k) next = "m68k"; @@ -230,7 +230,7 @@ int error_line; /*!< データ読み込み/初期化時に汎用的にエラー /*! * エラーメッセージの名称定義 / Standard error message text */ -cptr err_str[PARSE_ERROR_MAX] = +concptr err_str[PARSE_ERROR_MAX] = { NULL, #ifdef JP @@ -285,7 +285,7 @@ header m_head; /*!< プレイヤー職業魔法情報のヘッダ構造体 */ * @param template_file ファイル名 * @return テキストの方が新しいか、rawファイルがなく更新の必要がある場合-1、更新の必要がない場合0。 */ -static errr check_modification_date(int fd, cptr template_file) +static errr check_modification_date(int fd, concptr template_file) { char buf[1024]; @@ -437,7 +437,7 @@ static void init_header(header *head, IDX num, int len) * Note that we let each entry have a unique "name" and "text" string, * even if the string happens to be empty (everyone has a unique '\0'). */ -static errr init_info(cptr filename, header *head, +static errr init_info(concptr filename, header *head, void **info, char **name, char **text, char **tag) { int fd; @@ -520,7 +520,7 @@ static errr init_info(cptr filename, header *head, /* Errors */ if (err) { - cptr oops; + concptr oops; #ifdef JP /* Error string */ @@ -582,7 +582,7 @@ static errr init_info(cptr filename, header *head, if (fd >= 0) { /* Dump it */ - fd_write(fd, (cptr)(head), head->head_size); + fd_write(fd, (concptr)(head), head->head_size); /* Dump the "*_info" array */ fd_write(fd, head->info_ptr, head->info_size); @@ -1597,7 +1597,7 @@ static bool feat_tag_is_not_found = FALSE; * Initialize quest array * @return 地形ID */ -s16b f_tag_to_index_in_init(cptr str) +s16b f_tag_to_index_in_init(concptr str) { FEAT_IDX feat = f_tag_to_index(str); @@ -1801,8 +1801,8 @@ static errr init_other(void) /*** Prepare the various "bizarre" arrays ***/ /* Macro variables */ - C_MAKE(macro__pat, MACRO_MAX, cptr); - C_MAKE(macro__act, MACRO_MAX, cptr); + C_MAKE(macro__pat, MACRO_MAX, concptr); + C_MAKE(macro__act, MACRO_MAX, concptr); C_MAKE(macro__cmd, MACRO_MAX, bool); /* Macro action buffer */ @@ -2169,7 +2169,7 @@ static errr init_alloc(void) * Hack -- take notes on line 23 * @return なし */ -static void note(cptr str) +static void note(concptr str) { Term_erase(0, 23, 255); Term_putstr(20, 23, -1, TERM_WHITE, str); @@ -2189,7 +2189,7 @@ static void note(cptr str) * functions are "supposed" to work under any conditions. * */ -static void init_angband_aux(cptr why) +static void init_angband_aux(concptr why) { /* Why */ plog(why); @@ -2505,7 +2505,7 @@ static void put_title(void) * @brief サムチェック情報を出力 / Get check sum in string form * @return サムチェック情報の文字列 */ -cptr get_check_sum(void) +concptr get_check_sum(void) { return format("%02x%02x%02x%02x%02x%02x%02x%02x%02x", f_head.v_extra, diff --git a/src/japanese.c b/src/japanese.c index 9613ba217..4e0c0b1a2 100644 --- a/src/japanese.c +++ b/src/japanese.c @@ -12,8 +12,8 @@ typedef struct convert_key convert_key; struct convert_key { - cptr key1; - cptr key2; + concptr key1; + concptr key2; }; static const convert_key s2j_table[] = { @@ -63,7 +63,7 @@ static const convert_key s2j_table[] = { * @return なし * @details */ -void sindarin_to_kana(char *kana, cptr sindarin) +void sindarin_to_kana(char *kana, concptr sindarin) { char buf[256]; int idx; @@ -74,8 +74,8 @@ void sindarin_to_kana(char *kana, cptr sindarin) for (idx = 0; s2j_table[idx].key1 != NULL; idx++) { - cptr pat1 = s2j_table[idx].key1; - cptr pat2 = s2j_table[idx].key2; + concptr pat1 = s2j_table[idx].key1; + concptr pat2 = s2j_table[idx].key2; int len = strlen(pat1); char *src = kana; char *dest = buf; @@ -161,7 +161,7 @@ static const struct jverb_table_t { * @return なし * @details */ -void jverb(cptr in, char *out, int flag) +void jverb(concptr in, char *out, int flag) { const struct jverb_table_t * p; int in_len = strlen(in); @@ -370,7 +370,7 @@ byte codeconv(char *str) * @param x 判定する位置(バイト) * @return 漢字の1バイト目ならばTRUE */ -bool iskanji2(cptr s, int x) +bool iskanji2(concptr s, int x) { int i; @@ -388,7 +388,7 @@ bool iskanji2(cptr s, int x) * @param str 判定する文字列へのポインタ * @return 文字列の文字コードがASCIIならTRUE、そうでなければFALSE */ -static bool is_ascii_str(cptr str) +static bool is_ascii_str(concptr str) { for (;*str; str++) { if (!(0x00 < *str && *str <= 0x7f)) @@ -402,7 +402,7 @@ static bool is_ascii_str(cptr str) * @param str 判定する文字列へのポインタ * @return 文字列の文字コードがUTF-8ならTRUE、そうでなければFALSE */ -static bool is_utf8_str(cptr str) +static bool is_utf8_str(concptr str) { const unsigned char* p; for (p = (const unsigned char*)str; *p; p++) { diff --git a/src/load.c b/src/load.c index 8f0357597..63d55c0ff 100644 --- a/src/load.c +++ b/src/load.c @@ -144,7 +144,7 @@ static bool z_older_than(byte x, byte y, byte z) * @details * Avoid the top two lines, to avoid interference with "msg_print()". */ -static void note(cptr msg) +static void note(concptr msg) { static TERM_LEN y = 2; diff --git a/src/maid-x11.c b/src/maid-x11.c index 1c6d6d22f..39d06e651 100644 --- a/src/maid-x11.c +++ b/src/maid-x11.c @@ -86,7 +86,7 @@ static unsigned long create_pixel(Display *dpy, byte red, byte green, byte blue) if (!gamma_table_ready) { - cptr str = getenv("ANGBAND_X11_GAMMA"); + concptr str = getenv("ANGBAND_X11_GAMMA"); if (str != NULL) gamma_val = atoi(str); gamma_table_ready = TRUE; diff --git a/src/main-cap.c b/src/main-cap.c index 34b4cfb03..a25025585 100644 --- a/src/main-cap.c +++ b/src/main-cap.c @@ -873,7 +873,7 @@ static errr Term_wipe_cap(int x, int y, int n) /* * Place some text on the screen using an attribute */ -static errr Term_text_cap(int x, int y, int n, byte a, cptr s) +static errr Term_text_cap(int x, int y, int n, byte a, concptr s) { int i; diff --git a/src/main-dos.c b/src/main-dos.c index 954743a1f..cf21a9a2c 100644 --- a/src/main-dos.c +++ b/src/main-dos.c @@ -300,7 +300,7 @@ static void Term_init_dos(term *t); static void Term_nuke_dos(term *t); static void term_data_link(term_data *td); static void dos_dump_screen(void); -static void dos_quit_hook(cptr str); +static void dos_quit_hook(concptr str); static bool init_windows(void); errr init_dos(void); #ifdef USE_SOUND @@ -1310,7 +1310,7 @@ static void term_data_link(term_data *td) /* * Shut down visual system, then fall back into standard "quit()" */ -static void dos_quit_hook(cptr str) +static void dos_quit_hook(concptr str) { int i; diff --git a/src/main-gcu.c b/src/main-gcu.c index 7cab8ddee..541c624ba 100644 --- a/src/main-gcu.c +++ b/src/main-gcu.c @@ -284,7 +284,7 @@ static term_data data[MAX_TERM_DATA]; #ifdef USE_SOUND -static cptr ANGBAND_DIR_XTRA_SOUND; +static concptr ANGBAND_DIR_XTRA_SOUND; /* * Flag set once "sound" has been initialized @@ -294,7 +294,7 @@ static bool can_use_sound = FALSE; /* * An array of sound file names */ -static cptr sound_file[SOUND_MAX]; +static concptr sound_file[SOUND_MAX]; #endif /* USE_SOUND */ @@ -636,7 +636,7 @@ static errr Term_xtra_gcu_alive(int v) /* * Check for existance of a file */ -static bool check_file(cptr s) +static bool check_file(concptr s) { FILE *fff; @@ -1064,7 +1064,7 @@ static errr Term_wipe_gcu(int x, int y, int n) * think hard about how map_info() in cave.c should handle the color * of something that we here draw in reverse. It's not so simple, alas. */ -static void Term_acs_text_gcu(int x, int y, int n, byte a, cptr s) +static void Term_acs_text_gcu(int x, int y, int n, byte a, concptr s) { term_data *td = (term_data *)(Term->data); int i; @@ -1089,7 +1089,7 @@ static void Term_acs_text_gcu(int x, int y, int n, byte a, cptr s) /* * Place some text on the screen using an attribute */ -static errr Term_text_gcu(int x, int y, int n, byte a, cptr s) +static errr Term_text_gcu(int x, int y, int n, byte a, concptr s) { term_data *td = (term_data *)(Term->data); @@ -1176,7 +1176,7 @@ static errr term_data_init(term_data *td, int rows, int cols, int y, int x) } -static void hook_quit(cptr str) +static void hook_quit(concptr str) { /* Unused */ (void)str; diff --git a/src/main-mac.c b/src/main-mac.c index 231d21708..d19c59a6c 100644 --- a/src/main-mac.c +++ b/src/main-mac.c @@ -710,7 +710,7 @@ void convert_pathname(char* path) * Although there is no easy way to emulate fstat in the old interface, * we still can do stat-like things, because Mac OS is an OS. */ -static int get_modification_time(cptr path, u32b *mod_time) +static int get_modification_time(concptr path, u32b *mod_time) { CInfoPBRec pb; Str255 pathname; @@ -745,7 +745,7 @@ static int get_modification_time(cptr path, u32b *mod_time) * A (non-Mach-O) Mac OS version of check_modification_time, for those * compilers without good enough POSIX-compatibility libraries XXX XXX */ -errr check_modification_date(int fd, cptr template_file) +errr check_modification_date(int fd, concptr template_file) { #pragma unused(fd) u32b txt_stat, raw_stat; @@ -863,7 +863,7 @@ static OSErr spec_to_path(const FSSpec *spec, char *buf, size_t size) * Set creator and filetype of a file specified by POSIX-style pathname. * Returns 0 on success, -1 in case of errors. */ -void fsetfileinfo(cptr pathname, OSType fcreator, OSType ftype) +void fsetfileinfo(concptr pathname, OSType fcreator, OSType ftype) { OSErr err; FSSpec spec; @@ -997,7 +997,7 @@ static void activate(WindowPtr w) /* * Display a warning message */ -static void mac_warning(cptr warning) +static void mac_warning(concptr warning) { Str255 text; int len, i; @@ -3677,7 +3677,7 @@ static void init_windows(void) { int n; - cptr s; + concptr s; /* Obtain */ td = &data[i]; @@ -6882,7 +6882,7 @@ static vptr hook_rpanic(huge size) /* * Hook to tell the user something important */ -static void hook_plog(cptr str) +static void hook_plog(concptr str) { /* Warning message */ mac_warning(str); @@ -6891,7 +6891,7 @@ static void hook_plog(cptr str) /* * Hook to tell the user something, and then quit */ -static void hook_quit(cptr str) +static void hook_quit(concptr str) { /* Warning if needed */ if (str) mac_warning(str); @@ -6913,7 +6913,7 @@ static void hook_quit(cptr str) /* * Hook to tell the user something, and then crash */ -static void hook_core(cptr str) +static void hook_core(concptr str) { /* XXX Use the debugger */ /* DebugStr(str); */ diff --git a/src/main-win.c b/src/main-win.c index 63fc8b9f2..555e331c7 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -310,7 +310,7 @@ #else /* WIN32 */ #define FA_LABEL 0x08 /* Volume label */ #define FA_DIREC 0x10 /* Directory */ -unsigned _cdecl _dos_getfileattr(cptr , unsigned *); +unsigned _cdecl _dos_getfileattr(concptr , unsigned *); #endif /* WIN32 */ /* @@ -391,7 +391,7 @@ typedef struct _term_data term_data; struct _term_data { term t; - cptr s; + concptr s; HWND w; DWORD dwStyle; DWORD dwExStyle; @@ -413,8 +413,8 @@ struct _term_data bool xtra_hack; bool visible; bool bizarre; - cptr font_want; - cptr font_file; + concptr font_want; + concptr font_file; HFONT font_id; int font_wid; //!< フォント横幅 int font_hgt; //!< フォント縦幅 @@ -531,7 +531,7 @@ static bool can_use_sound = FALSE; /* * An array of sound file names */ -static cptr sound_file[SOUND_MAX][SAMPLE_MAX]; +static concptr sound_file[SOUND_MAX][SAMPLE_MAX]; #endif /* USE_SOUND */ @@ -540,10 +540,10 @@ static cptr sound_file[SOUND_MAX][SAMPLE_MAX]; #ifdef USE_MUSIC #define SAMPLE_MUSIC_MAX 16 -static cptr music_file[MUSIC_BASIC_MAX][SAMPLE_MUSIC_MAX]; -static cptr dungeon_music_file[1000][SAMPLE_MUSIC_MAX]; -static cptr town_music_file[1000][SAMPLE_MUSIC_MAX]; -static cptr quest_music_file[1000][SAMPLE_MUSIC_MAX]; +static concptr music_file[MUSIC_BASIC_MAX][SAMPLE_MUSIC_MAX]; +static concptr dungeon_music_file[1000][SAMPLE_MUSIC_MAX]; +static concptr town_music_file[1000][SAMPLE_MUSIC_MAX]; +static concptr quest_music_file[1000][SAMPLE_MUSIC_MAX]; static bool can_use_music = FALSE; static MCI_OPEN_PARMS mop; @@ -558,30 +558,30 @@ int current_music_id = 0; /* * Full path to ANGBAND.INI */ -static cptr ini_file = NULL; +static concptr ini_file = NULL; /* * Name of application */ -static cptr AppName = "ANGBAND"; +static concptr AppName = "ANGBAND"; /* * Name of sub-window type */ -static cptr AngList = "AngList"; +static concptr AngList = "AngList"; /* * Directory names */ -static cptr ANGBAND_DIR_XTRA_GRAF; -static cptr ANGBAND_DIR_XTRA_SOUND; -static cptr ANGBAND_DIR_XTRA_MUSIC; -static cptr ANGBAND_DIR_XTRA_HELP; +static concptr ANGBAND_DIR_XTRA_GRAF; +static concptr ANGBAND_DIR_XTRA_SOUND; +static concptr ANGBAND_DIR_XTRA_MUSIC; +static concptr ANGBAND_DIR_XTRA_HELP; #if 0 /* #ifndef JP */ -static cptr ANGBAND_DIR_XTRA_FONT; +static concptr ANGBAND_DIR_XTRA_FONT; #endif #ifdef USE_MUSIC -static cptr ANGBAND_DIR_XTRA_MUSIC; +static concptr ANGBAND_DIR_XTRA_MUSIC; #endif @@ -824,9 +824,9 @@ static void DrawBG(HDC hdc, RECT *r) /* * Hack -- given a pathname, point at the filename */ -static cptr extract_file_name(cptr s) +static concptr extract_file_name(concptr s) { - cptr p; + concptr p; /* Start at the end */ p = s + strlen(s) - 1; @@ -888,7 +888,7 @@ static char *analyze_font(char *path, int *wp, int *hp) /* * Check for existance of a file */ -static bool check_file(cptr s) +static bool check_file(concptr s) { char path[1024]; @@ -937,7 +937,7 @@ static bool check_file(cptr s) /* * Check for existance of a directory */ -static bool check_dir(cptr s) +static bool check_dir(concptr s) { int i; @@ -994,7 +994,7 @@ static bool check_dir(cptr s) /* * Validate a file */ -static void validate_file(cptr s) +static void validate_file(concptr s) { /* Verify or fail */ if (!check_file(s)) @@ -1007,7 +1007,7 @@ static void validate_file(cptr s) /* * Validate a directory */ -static void validate_dir(cptr s, bool vital) +static void validate_dir(concptr s, bool vital) { /* Verify or fail */ if (!check_dir(s)) @@ -1663,7 +1663,7 @@ static bool init_graphics(void) /* Initialize once */ char buf[1024]; BYTE wid, hgt, twid, thgt, ox, oy; - cptr name; + concptr name; if (arg_graphics == GRAPHICS_ADAM_BOLT) { @@ -1846,7 +1846,7 @@ static void term_window_resize(term_data *td) * * Note that the "font name" must be capitalized!!! */ -static errr term_force_font(term_data *td, cptr path) +static errr term_force_font(term_data *td, concptr path) { int wid, hgt; @@ -2796,7 +2796,7 @@ static errr Term_wipe_win(int x, int y, int n) * what color it should be using to draw with, but perhaps simply changing * it every time is not too inefficient. */ -static errr Term_text_win(int x, int y, int n, TERM_COLOR a, cptr s) +static errr Term_text_win(int x, int y, int n, TERM_COLOR a, concptr s) { term_data *td = (term_data*)(Term->data); RECT rc; @@ -2989,7 +2989,7 @@ static errr Term_text_win(int x, int y, int n, TERM_COLOR a, cptr s) * * If "graphics" is not available, we simply "wipe" the given grids. */ -static errr Term_pict_win(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, cptr cp, const TERM_COLOR *tap, cptr tcp) +static errr Term_pict_win(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, concptr cp, const TERM_COLOR *tap, concptr tcp) { term_data *td = (term_data*)(Term->data); @@ -5280,7 +5280,7 @@ LRESULT FAR PASCAL AngbandSaverProc(HWND hWnd, UINT uMsg, /* * Display warning message (see "z-util.c") */ -static void hack_plog(cptr str) +static void hack_plog(concptr str) { /* Give a warning */ if (str) @@ -5300,7 +5300,7 @@ static void hack_plog(cptr str) /* * Display error message and quit (see "z-util.c") */ -static void hack_quit(cptr str) +static void hack_quit(concptr str) { /* Give a warning */ if (str) @@ -5333,7 +5333,7 @@ static void hack_quit(cptr str) /* * Display warning message (see "z-util.c") */ -static void hook_plog(cptr str) +static void hook_plog(concptr str) { /* Warning */ if (str) @@ -5353,7 +5353,7 @@ static void hook_plog(cptr str) /* * Display error message and quit (see "z-util.c") */ -static void hook_quit(cptr str) +static void hook_quit(concptr str) { int i; diff --git a/src/main-x11.c b/src/main-x11.c index e48104271..15d8db31c 100644 --- a/src/main-x11.c +++ b/src/main-x11.c @@ -346,7 +346,7 @@ struct infofnt XFontStruct *info; #endif - cptr name; + concptr name; s16b wid; s16b twid; @@ -487,7 +487,7 @@ static infofnt *Infofnt = (infofnt*)(NULL); * * Return -1 if no Display given, and none can be opened. */ -static errr Metadpy_init_2(Display *dpy, cptr name) +static errr Metadpy_init_2(Display *dpy, concptr name) { metadpy *m = Metadpy; @@ -621,7 +621,7 @@ static errr Metadpy_do_beep(void) /* * Set the name (in the title bar) of Infowin */ -static errr Infowin_set_name(cptr name) +static errr Infowin_set_name(concptr name) { Status st; XTextProperty tp; @@ -639,7 +639,7 @@ static errr Infowin_set_name(cptr name) /* * Set the icon name of Infowin */ -static errr Infowin_set_icon_name(cptr name) +static errr Infowin_set_icon_name(concptr name) { Status st; XTextProperty tp; @@ -951,7 +951,7 @@ static errr Infowin_fill(void) * Pairs of values, first is texttual name, second is the string * holding the decimal value that the operation corresponds to. */ -static cptr opcode_pairs[] = +static concptr opcode_pairs[] = { "cpy", "3", "xor", "6", @@ -987,7 +987,7 @@ static cptr opcode_pairs[] = * 0-15: if 'str' is a valid Operation * -1: if 'str' could not be parsed */ -static int Infoclr_Opcode(cptr str) +static int Infoclr_Opcode(concptr str) { register int i; @@ -1022,7 +1022,7 @@ static int Infoclr_Opcode(cptr str) * Valid forms for 'name': * 'fg', 'bg', 'zg', '' and '#' */ -static Pixell Infoclr_Pixell(cptr name) +static Pixell Infoclr_Pixell(concptr name) { XColor scrn; @@ -1409,9 +1409,9 @@ static errr Infofnt_init_real(XFontStruct *info) * name: The name of the requested Font */ #ifdef USE_JP_FONTSTRUCT -static void Infofnt_init_data(cptr name, cptr kname) +static void Infofnt_init_data(concptr name, concptr kname) #else -static void Infofnt_init_data(cptr name) +static void Infofnt_init_data(concptr name) #endif { @@ -1602,7 +1602,7 @@ XDrawMultiString(display,d,gc, x, y, string, len, afont, /* * Standard Text */ -static errr Infofnt_text_std(int x, int y, cptr str, int len) +static errr Infofnt_text_std(int x, int y, concptr str, int len) { int i; @@ -1697,7 +1697,7 @@ static errr Infofnt_text_std(int x, int y, cptr str, int len) /* * Painting where text would be */ -static errr Infofnt_text_non(int x, int y, cptr str, int len) +static errr Infofnt_text_non(int x, int y, concptr str, int len) { int w, h; @@ -2830,12 +2830,12 @@ static errr CheckEvent(bool wait) /* * An array of sound file names */ -static cptr sound_file[SOUND_MAX]; +static concptr sound_file[SOUND_MAX]; /* * Check for existance of a file */ -static bool check_file(cptr s) +static bool check_file(concptr s) { FILE *fff; @@ -3096,7 +3096,7 @@ static errr Term_wipe_x11(int x, int y, int n) /* * Draw some textual characters. */ -static errr Term_text_x11(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr s) +static errr Term_text_x11(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s) { /* Draw the text */ Infoclr_set(clr[a]); @@ -3319,11 +3319,11 @@ static errr term_data_init(term_data *td, int i) { term *t = &td->t; - cptr name = angband_term_name[i]; + concptr name = angband_term_name[i]; - cptr font; + concptr font; #ifdef USE_JP_FONTSTRUCT - cptr kfont; + concptr kfont; #endif @@ -3340,7 +3340,7 @@ static errr term_data_init(term_data *td, int i) char buf[80]; - cptr str; + concptr str; int val; @@ -3667,7 +3667,7 @@ errr init_x11(int argc, char *argv[]) { int i; - cptr dpy_name = ""; + concptr dpy_name = ""; int num_term = 3; diff --git a/src/main-xaw.c b/src/main-xaw.c index 169574e72..c97236c17 100644 --- a/src/main-xaw.c +++ b/src/main-xaw.c @@ -1130,7 +1130,7 @@ static errr Term_curs_xaw(int x, int y) /* * Draw a number of characters */ -static errr Term_text_xaw(int x, int y, int n, byte a, cptr s) +static errr Term_text_xaw(int x, int y, int n, byte a, concptr s) { term_data *td = (term_data*)(Term->data); diff --git a/src/main.c b/src/main.c index d741c807a..573871699 100644 --- a/src/main.c +++ b/src/main.c @@ -25,7 +25,7 @@ * * Close down, then fall back into "quit()". */ -static void quit_hook(cptr s) +static void quit_hook(concptr s) { int j; @@ -99,7 +99,7 @@ static void init_stuff(void) { char path[1024]; - cptr tail; + concptr tail; /* Get the environment variable */ tail = getenv("ANGBAND_PATH"); @@ -128,9 +128,9 @@ static void init_stuff(void) * The "" can be any legal path for the given system, and should * not end in any special path separator (i.e. "/tmp" or "~/.ang-info"). */ -static void change_path(cptr info) +static void change_path(concptr info) { - cptr s; + concptr s; /* Find equal sign */ s = my_strchr(info, '='); @@ -254,7 +254,7 @@ int main(int argc, char *argv[]) bool done = FALSE; bool new_game = FALSE; int show_score = 0; - cptr mstr = NULL; + concptr mstr = NULL; bool args = TRUE; /* Save the "program name" XXX XXX XXX */ diff --git a/src/mane.c b/src/mane.c index 6db37e0db..96fcc3eb5 100644 --- a/src/mane.c +++ b/src/mane.c @@ -25,10 +25,10 @@ static int damage; static void mane_info(char *p, int power, HIT_POINT dam) { PLAYER_LEVEL plev = p_ptr->lev; - cptr s_dam = _("損傷:", "dam "); - cptr s_dur = _("期間:", "dur "); - cptr s_range = _("範囲:", "range "); - cptr s_heal = _("回復:", "heal "); + concptr s_dam = _("損傷:", "dam "); + concptr s_dur = _("期間:", "dur "); + concptr s_range = _("範囲:", "range "); + concptr s_heal = _("回復:", "heal "); strcpy(p, ""); @@ -97,7 +97,7 @@ static int get_mane_power(int *sn, bool baigaesi) char choice; char out_val[160]; char comment[80]; - cptr p = _("能力", "power"); + concptr p = _("能力", "power"); monster_power spell; bool flag, redraw; diff --git a/src/melee1.c b/src/melee1.c index f7be80544..e4cacd56a 100644 --- a/src/melee1.c +++ b/src/melee1.c @@ -183,7 +183,7 @@ static int check_hit(int power, DEPTH level, int stun) } /*! モンスターの侮辱行為メッセージテーブル / Hack -- possible "insult" messages */ -static cptr desc_insult[] = +static concptr desc_insult[] = { #ifdef JP "があなたを侮辱した！", @@ -212,7 +212,7 @@ static cptr desc_insult[] = }; /*! マゴットのぼやきメッセージテーブル / Hack -- possible "insult" messages */ -static cptr desc_moan[] = +static concptr desc_moan[] = { #ifdef JP "は何かを悲しんでいるようだ。", @@ -240,7 +240,7 @@ static cptr desc_moan[] = * @return なし */ static void touch_zap_player_aux(monster_type *m_ptr, bool immune, int flags_offset, int r_flags_offset, u32b aura_flag, - HIT_POINT(*dam_func)(HIT_POINT dam, cptr kb_str, int monspell, bool aura), cptr message) + HIT_POINT(*dam_func)(HIT_POINT dam, concptr kb_str, int monspell, bool aura), concptr message) { monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -299,7 +299,7 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath) int dice_num, dice_side; - cptr atk_desc; + concptr atk_desc; switch (attack) { @@ -1570,7 +1570,7 @@ bool make_attack_normal(MONSTER_IDX m_idx) HIT_POINT power = 0; HIT_POINT damage = 0; - cptr act = NULL; + concptr act = NULL; /* Extract the attack infomation */ int effect = r_ptr->blow[ap_cnt].effect; diff --git a/src/mind.c b/src/mind.c index f13ca2638..fe87e89f5 100644 --- a/src/mind.c +++ b/src/mind.c @@ -288,7 +288,7 @@ mind_power const mind_powers[5] = }; /*! 特殊能力の解説文字列 */ -static cptr const mind_tips[5][MAX_MIND_POWERS] = +static concptr const mind_tips[5][MAX_MIND_POWERS] = { #ifdef JP { @@ -536,13 +536,13 @@ static cptr const mind_tips[5][MAX_MIND_POWERS] = void mindcraft_info(char *p, int use_mind, int power) { #ifdef JP - cptr s_dam = "損傷:"; - cptr s_dur = "期間:"; - cptr s_range = "範囲:"; + concptr s_dam = "損傷:"; + concptr s_dur = "期間:"; + concptr s_range = "範囲:"; #else - cptr s_dam = "dam "; - cptr s_dur = "dur "; - cptr s_range = "range "; + concptr s_dam = "dam "; + concptr s_dur = "dur "; + concptr s_range = "range "; #endif PLAYER_LEVEL plev = p_ptr->lev; @@ -687,7 +687,7 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse) char choice; char out_val[160]; char comment[80]; - cptr p; + concptr p; COMMAND_CODE code; mind_type spell; const mind_power *mind_ptr; @@ -1781,7 +1781,7 @@ void do_cmd_mind(void) mind_type spell; bool cast; int use_mind, mana_cost; - cptr p; + concptr p; bool on_mirror = FALSE; /* not if confused */ diff --git a/src/monster-process.c b/src/monster-process.c index 7713d7b14..c0c616aa4 100644 --- a/src/monster-process.c +++ b/src/monster-process.c @@ -193,7 +193,7 @@ static bool get_enemy_dir(MONSTER_IDX m_idx, int *mm) * @param who 打撃を行ったモンスターの参照ID * @return なし */ -void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, cptr note, IDX who) +void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, IDX who) { monster_type *m_ptr = &m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -1477,7 +1477,7 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx) HIT_POINT power = 0; HIT_POINT damage = 0; - cptr act = NULL; + concptr act = NULL; /* Extract the attack infomation */ int effect = r_ptr->blow[ap_cnt].effect; @@ -2407,7 +2407,7 @@ void process_monster(MONSTER_IDX m_idx) { GAME_TEXT m_name[MAX_NLEN]; char monmessage[1024]; - cptr filename; + concptr filename; /* Acquire the monster name/poss */ if (m_ptr->ml) diff --git a/src/monster1.c b/src/monster1.c index d56330e97..467bbc0a6 100644 --- a/src/monster1.c +++ b/src/monster1.c @@ -18,14 +18,14 @@ /* * Pronoun arrays, by gender. */ -static cptr wd_he[3] = +static concptr wd_he[3] = #ifdef JP { "それ", "彼", "彼女" }; #else { "it", "he", "she" }; #endif -static cptr wd_his[3] = +static concptr wd_his[3] = #ifdef JP { "それの", "彼の", "彼女の" }; #else @@ -117,14 +117,14 @@ static bool know_damage(MONRACE_IDX r_idx, int i) /* * Prepare hook for c_roff(). It will be changed for spoiler generation in wizard1.c. */ -void (*hook_c_roff)(TERM_COLOR attr, cptr str) = c_roff; +void (*hook_c_roff)(TERM_COLOR attr, concptr str) = c_roff; /*! * @brief モンスターの思い出メッセージをあらかじめ指定された関数ポインタに基づき出力する * @param str 出力文字列 * @return なし */ -static void hooked_roff(cptr str) +static void hooked_roff(concptr str) { /* Spawn */ hook_c_roff(TERM_WHITE, str); @@ -210,7 +210,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode) monster_race *r_ptr = &r_info[r_idx]; bool old = FALSE; int m, n, r; - cptr p, q; + concptr p, q; #ifdef JP char jverb_buf[64]; @@ -239,7 +239,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode) int vn = 0; byte color[96]; - cptr vp[96]; + concptr vp[96]; char tmp_msg[96][96]; bool know_everything = FALSE; @@ -450,7 +450,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode) /* Descriptions */ { - cptr tmp = r_text + r_ptr->text; + concptr tmp = r_text + r_ptr->text; if (tmp[0]) { @@ -1590,7 +1590,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode) (r_ptr->r_ignore == MAX_UCHAR) || (r_ptr->sleep == 0 && r_ptr->r_tkills >= 10) || know_everything) { - cptr act; + concptr act; if (r_ptr->sleep > 200) { @@ -2111,7 +2111,7 @@ void display_roff(MONRACE_IDX r_idx) * @param roff_func 出力処理を行う関数ポインタ * @return なし */ -void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, cptr str)) +void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, concptr str)) { hook_c_roff = roff_func; diff --git a/src/monster2.c b/src/monster2.c index 3b496436d..db89286e7 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -23,7 +23,7 @@ * @var horror_desc * @brief ELDRITCH HORROR効果時のモンスターの形容メッセージ（通常時） */ -cptr horror_desc[MAX_SAN_HORROR] = +concptr horror_desc[MAX_SAN_HORROR] = { #ifdef JP "忌まわしい", @@ -81,7 +81,7 @@ cptr horror_desc[MAX_SAN_HORROR] = * @var funny_desc * @brief ELDRITCH HORROR効果時のモンスターの形容メッセージ(幻覚状態時) */ -cptr funny_desc[MAX_SAN_FUNNY] = +concptr funny_desc[MAX_SAN_FUNNY] = { #ifdef JP "間抜けな", @@ -145,7 +145,7 @@ cptr funny_desc[MAX_SAN_FUNNY] = * @var funny_comments * @brief ELDRITCH HORROR効果時の幻覚時間延長を示す錯乱表現 */ -cptr funny_comments[MAX_SAN_COMMENT] = +concptr funny_comments[MAX_SAN_COMMENT] = { #ifdef JP /* nuke me */ @@ -1456,10 +1456,10 @@ MONRACE_IDX get_mon_num(DEPTH level) */ void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode) { - cptr res; + concptr res; monster_race *r_ptr; - cptr name; + concptr name; char buf[128]; GAME_TEXT silly_name[1024]; bool seen, pron; @@ -1983,7 +1983,7 @@ void sanity_blast(monster_type *m_ptr, bool necro) { monster_race *r_ptr; GAME_TEXT m_name[MAX_NLEN]; - cptr desc; + concptr desc; get_mon_num_prep(get_nightmare, NULL); @@ -2937,7 +2937,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I cave_type *c_ptr = &cave[y][x]; monster_type *m_ptr; monster_race *r_ptr = &r_info[r_idx]; - cptr name = (r_name + r_ptr->name); + concptr name = (r_name + r_ptr->name); int cmi; @@ -3248,7 +3248,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I { if (r_ptr->flags1 & RF1_UNIQUE) { - cptr color; + concptr color; object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; diff --git a/src/mspells3.c b/src/mspells3.c index 2337a737d..e66a5ca01 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -24,7 +24,7 @@ * @param tmp 返すメッセージを格納する配列 * @return なし */ -void set_bluemage_damage(int SPELL_NUM, PLAYER_LEVEL plev, cptr msg, char* tmp) +void set_bluemage_damage(int SPELL_NUM, PLAYER_LEVEL plev, concptr msg, char* tmp) { int base_damage = monspell_bluemage_damage(SPELL_NUM, plev, BASE_DAM); int dice_num = monspell_bluemage_damage(SPELL_NUM, plev, DICE_NUM); @@ -47,15 +47,15 @@ static void learned_info(char *p, int power) PLAYER_LEVEL plev = pseudo_plev(); #ifdef JP - cptr s_dam = " 損傷:%s"; - cptr s_dur = "期間:"; - cptr s_range = "範囲:"; - cptr s_heal = " 回復:%s"; + concptr s_dam = " 損傷:%s"; + concptr s_dur = "期間:"; + concptr s_range = "範囲:"; + concptr s_heal = " 回復:%s"; #else - cptr s_dam = " dam %s"; - cptr s_dur = "dur "; - cptr s_range = "range "; - cptr s_heal = " heal %s"; + concptr s_dam = " dam %s"; + concptr s_dur = "dur "; + concptr s_range = "range "; + concptr s_heal = " heal %s"; #endif strcpy(p, ""); @@ -216,7 +216,7 @@ static bool get_learned_power(SPELL_IDX *sn) char out_val[160]; char comment[80]; BIT_FLAGS f4 = 0L, f5 = 0L, f6 = 0L; - cptr p = _("魔法", "magic"); + concptr p = _("魔法", "magic"); COMMAND_CODE code; monster_power spell; bool flag, redraw; diff --git a/src/mspells4.c b/src/mspells4.c index 5baf6ad34..eb4b174f1 100644 --- a/src/mspells4.c +++ b/src/mspells4.c @@ -118,7 +118,7 @@ void monster_wakeup(MONSTER_IDX t_idx) * @param msg_flag_aux メッセージを分岐するためのフラグ * @param TARGET_TYPE プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER */ -static void monspell_message_base(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cptr msg2, cptr msg3, cptr msg4, bool msg_flag_aux, int TARGET_TYPE) +static void monspell_message_base(MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr msg1, concptr msg2, concptr msg3, concptr msg4, bool msg_flag_aux, int TARGET_TYPE) { bool known = monster_near_player(m_idx, t_idx); bool see_either = see_monster(m_idx) || see_monster(t_idx); @@ -163,7 +163,7 @@ static void monspell_message_base(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg * @param msg3 プレイヤーが盲目でなく、モンスター対象とする場合のメッセージ * @param TARGET_TYPE プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER */ -void monspell_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cptr msg2, cptr msg3, int TARGET_TYPE) +void monspell_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr msg1, concptr msg2, concptr msg3, int TARGET_TYPE) { monspell_message_base(m_idx, t_idx, msg1, msg1, msg2, msg3, p_ptr->blind > 0, TARGET_TYPE); } @@ -176,7 +176,7 @@ void monspell_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cptr msg2 * @param msg2 モンスター対象とする場合のメッセージ * @param TARGET_TYPE プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER */ -void simple_monspell_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cptr msg2, int TARGET_TYPE) +void simple_monspell_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr msg1, concptr msg2, int TARGET_TYPE) { monspell_message_base(m_idx, t_idx, msg1, msg2, msg1, msg2, p_ptr->blind > 0, TARGET_TYPE); } @@ -304,7 +304,7 @@ HIT_POINT spell_RF4_SHOOT(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX HIT_POINT spell_RF4_BREATH(int GF_TYPE, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) { HIT_POINT dam, ms_type, drs_type = 0; - cptr type_s; + concptr type_s; bool smart_learn_aux = TRUE; monster_type *m_ptr = &m_list[m_idx]; bool known = monster_near_player(m_idx, t_idx); @@ -948,7 +948,7 @@ HIT_POINT spell_RF5_BRAIN_SMASH(POSITION y, POSITION x, MONSTER_IDX m_idx, MONST * @param TARGET_TYPE プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER * @return ダメージ量を返す。 */ -void spell_RF5_CAUSE(int GF_TYPE, HIT_POINT dam, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cptr msg2, cptr msg3, int MS_TYPE, int TARGET_TYPE) +void spell_RF5_CAUSE(int GF_TYPE, HIT_POINT dam, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr msg1, concptr msg2, concptr msg3, int MS_TYPE, int TARGET_TYPE) { GAME_TEXT m_name[MAX_NLEN], t_name[MAX_NLEN]; monster_name(m_idx, m_name); @@ -987,7 +987,7 @@ void spell_RF5_CAUSE(int GF_TYPE, HIT_POINT dam, POSITION y, POSITION x, MONSTER */ HIT_POINT spell_RF5_CAUSE_1(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) { - cptr msg1, msg2, msg3; + concptr msg1, msg2, msg3; HIT_POINT dam; dam = monspell_damage((MS_CAUSE_1), m_idx, DAM_ROLL); @@ -1010,7 +1010,7 @@ HIT_POINT spell_RF5_CAUSE_1(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I */ HIT_POINT spell_RF5_CAUSE_2(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) { - cptr msg1, msg2, msg3; + concptr msg1, msg2, msg3; HIT_POINT dam; dam = monspell_damage((MS_CAUSE_2), m_idx, DAM_ROLL); @@ -1033,7 +1033,7 @@ HIT_POINT spell_RF5_CAUSE_2(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I */ HIT_POINT spell_RF5_CAUSE_3(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) { - cptr msg1, msg2, msg3; + concptr msg1, msg2, msg3; HIT_POINT dam; dam = monspell_damage((MS_CAUSE_3), m_idx, DAM_ROLL); @@ -1056,7 +1056,7 @@ HIT_POINT spell_RF5_CAUSE_3(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I */ HIT_POINT spell_RF5_CAUSE_4(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) { - cptr msg1, msg2, msg3; + concptr msg1, msg2, msg3; HIT_POINT dam; dam = monspell_damage((MS_CAUSE_4), m_idx, DAM_ROLL); @@ -1393,7 +1393,7 @@ HIT_POINT spell_RF5_MISSILE(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I * @param saving_throw 抵抗に成功したか判別するフラグ * @param TARGET_TYPE プレイヤーを対象とする場合MONSTER_TO_PLAYER、モンスターを対象とする場合MONSTER_TO_MONSTER */ -void spell_badstatus_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cptr msg2, cptr msg3, cptr msg4, bool resist, bool saving_throw, int TARGET_TYPE) +void spell_badstatus_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr msg1, concptr msg2, concptr msg3, concptr msg4, bool resist, bool saving_throw, int TARGET_TYPE) { bool see_either = see_monster(m_idx) || see_monster(t_idx); bool see_t = see_monster(t_idx); @@ -1532,7 +1532,7 @@ void spell_RF5_BLIND(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) } else if (TARGET_TYPE == MONSTER_TO_MONSTER) { - cptr msg1; + concptr msg1; GAME_TEXT t_name[MAX_NLEN]; monster_name(t_idx, t_name); @@ -1645,7 +1645,7 @@ void spell_RF5_SLOW(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) } else if (TARGET_TYPE == MONSTER_TO_MONSTER) { - cptr msg1; + concptr msg1; GAME_TEXT t_name[MAX_NLEN]; monster_name(t_idx, t_name); diff --git a/src/mutation.c b/src/mutation.c index 7fae59313..2e66d2241 100644 --- a/src/mutation.c +++ b/src/mutation.c @@ -22,7 +22,7 @@ bool gain_random_mutation(int choose_mut) { int attempts_left = 20; - cptr muta_desc = ""; + concptr muta_desc = ""; bool muta_chosen = FALSE; BIT_FLAGS muta_which = 0; BIT_FLAGS *muta_class = NULL; @@ -860,7 +860,7 @@ bool gain_random_mutation(int choose_mut) bool lose_mutation(int choose_mut) { int attempts_left = 20; - cptr muta_desc = ""; + concptr muta_desc = ""; bool muta_chosen = FALSE; BIT_FLAGS muta_which = 0; BIT_FLAGS *muta_class = NULL; diff --git a/src/object1.c b/src/object1.c index dad05dd4d..3189a6e55 100644 --- a/src/object1.c +++ b/src/object1.c @@ -339,9 +339,9 @@ void object_flags_known(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]) /*! * @brief オブジェクトの発動効果名称を返す（サブルーチン/ブレス） * @param o_ptr 名称を取得する元のオブジェクト構造体参照ポインタ - * @return cptr 発動名称を返す文字列ポインタ + * @return concptr 発動名称を返す文字列ポインタ */ -static cptr item_activation_dragon_breath(object_type *o_ptr) +static concptr item_activation_dragon_breath(object_type *o_ptr) { static char desc[256]; BIT_FLAGS flgs[TR_FLAG_SIZE]; /* for resistance flags */ @@ -368,12 +368,12 @@ static cptr item_activation_dragon_breath(object_type *o_ptr) /*! * @brief オブジェクトの発動効果名称を返す（サブルーチン/汎用） * @param o_ptr 名称を取得する元のオブジェクト構造体参照ポインタ - * @return cptr 発動名称を返す文字列ポインタ + * @return concptr 発動名称を返す文字列ポインタ */ -static cptr item_activation_aux(object_type *o_ptr) +static concptr item_activation_aux(object_type *o_ptr) { static char activation_detail[256]; - cptr desc; + concptr desc; char timeout[32]; int constant, dice; const activation_type* const act_ptr = find_activation_info(o_ptr); @@ -469,9 +469,9 @@ static cptr item_activation_aux(object_type *o_ptr) * @brief オブジェクトの発動効果名称を返す（メインルーチン） / * Determine the "Activation" (if any) for an artifact Return a string, or NULL for "no activation" * @param o_ptr 名称を取得する元のオブジェクト構造体参照ポインタ - * @return cptr 発動名称を返す文字列ポインタ + * @return concptr 発動名称を返す文字列ポインタ */ -cptr item_activation(object_type *o_ptr) +concptr item_activation(object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; object_flags(o_ptr, flgs); @@ -514,7 +514,7 @@ bool screen_object(object_type *o_ptr, BIT_FLAGS mode) BIT_FLAGS flgs[TR_FLAG_SIZE]; char temp[70 * 20]; - cptr info[128]; + concptr info[128]; GAME_TEXT o_name[MAX_NLEN]; int wid, hgt; POSITION rad; @@ -1460,9 +1460,9 @@ s16b wield_slot(object_type *o_ptr) * @param i 部位表現を求めるプレイヤーの所持/装備オブジェクトID * @return 部位表現の文字列ポインタ */ -cptr mention_use(int i) +concptr mention_use(int i) { - cptr p; + concptr p; /* Examine the location */ switch (i) @@ -1505,9 +1505,9 @@ cptr mention_use(int i) * @details * Currently, only used for items in the equipment, not inventory. */ -cptr describe_use(int i) +concptr describe_use(int i) { - cptr p; + concptr p; switch (i) { @@ -1817,7 +1817,7 @@ static bool get_tag(COMMAND_CODE *cp, char tag, BIT_FLAGS mode) { COMMAND_CODE i; COMMAND_CODE start, end; - cptr s; + concptr s; /* Extract index from mode */ switch (mode) @@ -1942,7 +1942,7 @@ static bool get_tag(COMMAND_CODE *cp, char tag, BIT_FLAGS mode) static bool get_tag_floor(COMMAND_CODE *cp, char tag, FLOOR_IDX floor_list[], ITEM_NUMBER floor_num) { COMMAND_CODE i; - cptr s; + concptr s; /**** Find a tag in the form of {@x#} (allow alphabet tag) ***/ @@ -2028,7 +2028,7 @@ static bool get_tag_floor(COMMAND_CODE *cp, char tag, FLOOR_IDX floor_list[], IT */ static void prepare_label_string(char *label, BIT_FLAGS mode) { - cptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + concptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; int offset = (mode == USE_EQUIP) ? INVEN_RARM : 0; int i; @@ -2066,7 +2066,7 @@ static void prepare_label_string(char *label, BIT_FLAGS mode) */ static void prepare_label_string_floor(char *label, FLOOR_IDX floor_list[], ITEM_NUMBER floor_num) { - cptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + concptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; int i; /* Prepare normal labels */ @@ -2488,7 +2488,7 @@ void toggle_inven_equip(void) * @return 確認がYesならTRUEを返す。 * @details The item can be negative to mean "item on floor". */ -static bool verify(cptr prompt, INVENTORY_IDX item) +static bool verify(concptr prompt, INVENTORY_IDX item) { GAME_TEXT o_name[MAX_NLEN]; char out_val[MAX_NLEN+20]; @@ -2525,7 +2525,7 @@ static bool verify(cptr prompt, INVENTORY_IDX item) */ static bool get_item_allow(INVENTORY_IDX item) { - cptr s; + concptr s; object_type *o_ptr; if (!command_cmd) return TRUE; /* command_cmd is no longer effective */ @@ -2664,7 +2664,7 @@ bool can_get_item(void) * We always erase the prompt when we are done, leaving a blank line,\n * or a warning message, if appropriate, if no items are available.\n */ -bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode) +bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode) { OBJECT_IDX this_o_idx, next_o_idx = 0; @@ -3439,7 +3439,7 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* * Choose an item and get auto-picker entry from it. */ -object_type *choose_object(OBJECT_IDX *idx, cptr q, cptr s, BIT_FLAGS option) +object_type *choose_object(OBJECT_IDX *idx, concptr q, concptr s, BIT_FLAGS option) { OBJECT_IDX item; if (!get_item(&item, q, s, option)) return NULL; @@ -3650,7 +3650,7 @@ COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_LEN *min_w * @param mode オプションフラグ * @return プレイヤーによりアイテムが選択されたならTRUEを返す。/ */ -bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) +bool get_item_floor(COMMAND_CODE *cp, concptr pmt, concptr str, BIT_FLAGS mode) { char n1 = ' ', n2 = ' ', which = ' '; @@ -4795,7 +4795,7 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) static bool py_pickup_floor_aux(void) { OBJECT_IDX this_o_idx; - cptr q, s; + concptr q, s; OBJECT_IDX item; /* Restrict the choices */ diff --git a/src/object2.c b/src/object2.c index 326515e4c..d1a604a8d 100644 --- a/src/object2.c +++ b/src/object2.c @@ -18,7 +18,7 @@ static void one_sustain(object_type *o_ptr); -static cptr const kaji_tips[5] = +static concptr const kaji_tips[5] = { #ifdef JP "現在持っているエッセンスの一覧を表示する。", @@ -6106,7 +6106,7 @@ INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt) object_type *o_ptr; - cptr act; + concptr act; GAME_TEXT o_name[MAX_NLEN]; @@ -7000,7 +7000,7 @@ bool process_warning(POSITION xx, POSITION yy) */ typedef struct { int add; /* TR flag number or special essence id */ - cptr add_name; /* Name of this ability */ + concptr add_name; /* Name of this ability */ ESSENCE_IDX type; /* Menu number */ int essence; /* Index for carrying essences */ int value; /* Needed value to add this ability */ @@ -7239,7 +7239,7 @@ static essence_type essence_info[] = * エッセンス名テーブル / Essense names for Weapon smith */ #ifdef JP -cptr essence_name[] = +concptr essence_name[] = { "腕力", "知能", @@ -7342,7 +7342,7 @@ cptr essence_name[] = #else -cptr essence_name[] = +concptr essence_name[] = { "strength", "intelligen.", @@ -7486,7 +7486,7 @@ static void drain_essence(void) TIME_EFFECT old_timeout; BIT_FLAGS old_flgs[TR_FLAG_SIZE], new_flgs[TR_FLAG_SIZE]; object_type *o_ptr; - cptr q, s; + concptr q, s; POSITION iy, ix; byte_hack marked; ITEM_NUMBER number; @@ -7712,7 +7712,7 @@ static COMMAND_CODE choose_essence(void) COMMAND_CODE menu_line = (use_menu ? 1 : 0); #ifdef JP - cptr menu_name[] = { + concptr menu_name[] = { "武器属性", "耐性", "能力", @@ -7722,7 +7722,7 @@ static COMMAND_CODE choose_essence(void) "その他" }; #else - cptr menu_name[] = { + concptr menu_name[] = { "Brand weapon", "Resistance", "Ability", @@ -7822,7 +7822,7 @@ static void add_essence(ESSENCE_IDX mode) COMMAND_CODE i; bool flag,redraw; char choice; - cptr q, s; + concptr q, s; object_type *o_ptr; int ask = TRUE; char out_val[160]; @@ -8306,7 +8306,7 @@ static void add_essence(ESSENCE_IDX mode) static void erase_essence(void) { OBJECT_IDX item; - cptr q, s; + concptr q, s; object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; BIT_FLAGS flgs[TR_FLAG_SIZE]; diff --git a/src/player-damage.c b/src/player-damage.c index dafdad065..993f16cfe 100644 --- a/src/player-damage.c +++ b/src/player-damage.c @@ -394,7 +394,7 @@ static bool minus_ac(void) * @param aura オーラよるダメージが原因ならばTRUE * @return 修正HPダメージ量 */ -HIT_POINT acid_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) +HIT_POINT acid_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura) { HIT_POINT get_damage; int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3; @@ -443,7 +443,7 @@ HIT_POINT acid_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) * @param aura オーラよるダメージが原因ならばTRUE * @return 修正HPダメージ量 */ -HIT_POINT elec_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) +HIT_POINT elec_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura) { HIT_POINT get_damage; int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3; @@ -491,7 +491,7 @@ HIT_POINT elec_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) * @param aura オーラよるダメージが原因ならばTRUE * @return 修正HPダメージ量 */ -HIT_POINT fire_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) +HIT_POINT fire_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura) { HIT_POINT get_damage; int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3; @@ -539,7 +539,7 @@ HIT_POINT fire_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) * @param aura オーラよるダメージが原因ならばTRUE * @return 修正HPダメージ量 */ -HIT_POINT cold_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) +HIT_POINT cold_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura) { HIT_POINT get_damage; int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3; diff --git a/src/player-damage.h b/src/player-damage.h index a7df122b8..a045f3359 100644 --- a/src/player-damage.h +++ b/src/player-damage.h @@ -8,7 +8,7 @@ extern int set_elec_destroy(object_type *o_ptr); extern int set_fire_destroy(object_type *o_ptr); extern int set_cold_destroy(object_type *o_ptr); extern int inven_damage(inven_func typ, int perc); -extern HIT_POINT acid_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura); -extern HIT_POINT elec_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura); -extern HIT_POINT fire_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura); -extern HIT_POINT cold_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura); +extern HIT_POINT acid_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura); +extern HIT_POINT elec_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura); +extern HIT_POINT fire_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura); +extern HIT_POINT cold_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura); diff --git a/src/player-status.c b/src/player-status.c index 3d7f389eb..40e6de616 100644 --- a/src/player-status.c +++ b/src/player-status.c @@ -4,7 +4,7 @@ /* * Return alignment title */ -cptr your_alignment(void) +concptr your_alignment(void) { if (p_ptr->align > 150) return _("大善", "Lawful"); else if (p_ptr->align > 50) return _("中善", "Good"); diff --git a/src/player-status.h b/src/player-status.h index 070a28a7c..b348397f6 100644 --- a/src/player-status.h +++ b/src/player-status.h @@ -1,4 +1,4 @@ -extern cptr your_alignment(void); +extern concptr your_alignment(void); extern int weapon_exp_level(int weapon_exp); extern int riding_exp_level(int riding_exp); extern int spell_exp_level(int spell_exp); diff --git a/src/racial.c b/src/racial.c index 90e67c60a..b0fada9a6 100644 --- a/src/racial.c +++ b/src/racial.c @@ -129,7 +129,7 @@ static bool do_cmd_archer(void) else if (ext == 2) { OBJECT_IDX item; - cptr q, s; + concptr q, s; s16b slot; item_tester_hook = item_tester_hook_convertible; @@ -175,7 +175,7 @@ static bool do_cmd_archer(void) else if (ext == 3) { OBJECT_IDX item; - cptr q, s; + concptr q, s; s16b slot; item_tester_hook = item_tester_hook_convertible; @@ -230,7 +230,7 @@ bool gain_magic(void) OBJECT_IDX item; PARAMETER_VALUE pval; int ext = 0; - cptr q, s; + concptr q, s; object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; @@ -1273,7 +1273,7 @@ static bool cmd_racial_power_aux(s32b command) case RACE_DRACONIAN: { int Type = (one_in_(3) ? GF_COLD : GF_FIRE); - cptr Type_desc = ((Type == GF_COLD) ? _("冷気", "cold") : _("炎", "fire")); + concptr Type_desc = ((Type == GF_COLD) ? _("冷気", "cold") : _("炎", "fire")); if (!get_aim_dir(&dir)) return FALSE; diff --git a/src/realm-arcane.c b/src/realm-arcane.c index 4d6e33337..186104f4b 100644 --- a/src/realm-arcane.c +++ b/src/realm-arcane.c @@ -7,7 +7,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_arcane_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_arcane_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-arcane.h b/src/realm-arcane.h index 4e9fa524d..5307bc33d 100644 --- a/src/realm-arcane.h +++ b/src/realm-arcane.h @@ -1 +1 @@ -extern cptr do_arcane_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_arcane_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-chaos.c b/src/realm-chaos.c index a29cbe08a..7aedbfa7e 100644 --- a/src/realm-chaos.c +++ b/src/realm-chaos.c @@ -8,7 +8,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_chaos_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_chaos_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-chaos.h b/src/realm-chaos.h index 9b6c5b5e9..458d4701b 100644 --- a/src/realm-chaos.h +++ b/src/realm-chaos.h @@ -1 +1 @@ -extern cptr do_chaos_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_chaos_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-craft.c b/src/realm-craft.c index 3de819129..a7946dd52 100644 --- a/src/realm-craft.c +++ b/src/realm-craft.c @@ -10,7 +10,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-craft.h b/src/realm-craft.h index 617e74312..7ea6dff75 100644 --- a/src/realm-craft.h +++ b/src/realm-craft.h @@ -1 +1 @@ -cptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode); +concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-crusade.c b/src/realm-crusade.c index a533adddd..a95a67133 100644 --- a/src/realm-crusade.c +++ b/src/realm-crusade.c @@ -10,7 +10,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_crusade_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_crusade_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-crusade.h b/src/realm-crusade.h index 24cd0d426..ab8f9fbae 100644 --- a/src/realm-crusade.h +++ b/src/realm-crusade.h @@ -1 +1 @@ -extern cptr do_crusade_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_crusade_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-daemon.c b/src/realm-daemon.c index 74a270095..d9a3c5534 100644 --- a/src/realm-daemon.c +++ b/src/realm-daemon.c @@ -9,7 +9,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_daemon_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_daemon_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-daemon.h b/src/realm-daemon.h index 4ec72ba90..2dcdb1cf3 100644 --- a/src/realm-daemon.h +++ b/src/realm-daemon.h @@ -1,2 +1,2 @@ -extern cptr do_daemon_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_daemon_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-death.c b/src/realm-death.c index 26b35f0f0..55e618bc3 100644 --- a/src/realm-death.c +++ b/src/realm-death.c @@ -9,7 +9,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_death_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_death_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-death.h b/src/realm-death.h index e839f1c39..9a2a0a974 100644 --- a/src/realm-death.h +++ b/src/realm-death.h @@ -1 +1 @@ -extern cptr do_death_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_death_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-hex.c b/src/realm-hex.c index cb4813f9a..b6032e830 100644 --- a/src/realm-hex.c +++ b/src/realm-hex.c @@ -322,7 +322,7 @@ bool multiply_barrier(MONSTER_IDX m_idx) * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST / SPELL_CONT / SPELL_STOP) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST / SPELL_CONT / SPELL_STOP 時はNULL文字列を返す。 */ -cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; @@ -408,7 +408,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode) if (cast) { OBJECT_IDX item; - cptr q, s; + concptr q, s; GAME_TEXT o_name[MAX_NLEN]; object_type *o_ptr; u32b f[TR_FLAG_SIZE]; @@ -704,7 +704,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode) if (cast) { OBJECT_IDX item; - cptr q, s; + concptr q, s; GAME_TEXT o_name[MAX_NLEN]; object_type *o_ptr; u32b f[TR_FLAG_SIZE]; @@ -912,7 +912,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode) if (cast) { OBJECT_IDX item; - cptr s, q; + concptr s, q; u32b f[TR_FLAG_SIZE]; object_type *o_ptr; diff --git a/src/realm-hex.h b/src/realm-hex.h index 5c769bb4b..a3f7d1be2 100644 --- a/src/realm-hex.h +++ b/src/realm-hex.h @@ -1 +1 @@ -extern cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c index e73aa6aa1..9abe68774 100644 --- a/src/realm-hissatsu.c +++ b/src/realm-hissatsu.c @@ -9,7 +9,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-hissatsu.h b/src/realm-hissatsu.h index 06b5e7a57..c197e9bda 100644 --- a/src/realm-hissatsu.h +++ b/src/realm-hissatsu.h @@ -1 +1 @@ -extern cptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-life.c b/src/realm-life.c index 645085206..c866ac7f2 100644 --- a/src/realm-life.c +++ b/src/realm-life.c @@ -7,7 +7,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_life_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_life_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-life.h b/src/realm-life.h index 5e70452e8..c76b6d91a 100644 --- a/src/realm-life.h +++ b/src/realm-life.h @@ -1 +1 @@ -extern cptr do_life_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_life_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-nature.c b/src/realm-nature.c index e5848057a..365429353 100644 --- a/src/realm-nature.c +++ b/src/realm-nature.c @@ -8,7 +8,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-nature.h b/src/realm-nature.h index 330ef6ca9..031b44763 100644 --- a/src/realm-nature.h +++ b/src/realm-nature.h @@ -1 +1 @@ -extern cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-song.c b/src/realm-song.c index 3ff0c3f2b..b9f8826e2 100644 --- a/src/realm-song.c +++ b/src/realm-song.c @@ -64,7 +64,7 @@ void stop_singing(void) * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST / SPELL_FAIL / SPELL_CONT / SPELL_STOP) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST / SPELL_FAIL / SPELL_CONT / SPELL_STOP 時はNULL文字列を返す。 */ -cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-song.h b/src/realm-song.h index 90b4b8dc4..c92e1dbec 100644 --- a/src/realm-song.h +++ b/src/realm-song.h @@ -1 +1 @@ -extern cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c index 35e276f9b..92f639346 100644 --- a/src/realm-sorcery.c +++ b/src/realm-sorcery.c @@ -8,7 +8,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-sorcery.h b/src/realm-sorcery.h index 82985bf28..1853a13f4 100644 --- a/src/realm-sorcery.h +++ b/src/realm-sorcery.h @@ -1 +1 @@ -extern cptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_sorcery_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/realm-trump.c b/src/realm-trump.c index 135c8658b..f9c02914b 100644 --- a/src/realm-trump.c +++ b/src/realm-trump.c @@ -8,7 +8,7 @@ * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST) * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。 */ -cptr do_trump_spell(SPELL_IDX spell, BIT_FLAGS mode) +concptr do_trump_spell(SPELL_IDX spell, BIT_FLAGS mode) { bool name = (mode == SPELL_NAME) ? TRUE : FALSE; bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; diff --git a/src/realm-trump.h b/src/realm-trump.h index 47118375a..af1b6e25d 100644 --- a/src/realm-trump.h +++ b/src/realm-trump.h @@ -1 +1 @@ -extern cptr do_trump_spell(SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_trump_spell(SPELL_IDX spell, BIT_FLAGS mode); diff --git a/src/report.c b/src/report.c index 792f48af6..733e9ba20 100644 --- a/src/report.c +++ b/src/report.c @@ -100,7 +100,7 @@ static void buf_delete(BUF *b) * @param size 追加サイズ * @return 追加後のバッファ容量 */ -static int buf_append(BUF *buf, cptr data, size_t size) +static int buf_append(BUF *buf, concptr data, size_t size) { while (buf->size + size > buf->max_size) { @@ -126,7 +126,7 @@ static int buf_append(BUF *buf, cptr data, size_t size) * @param fmt 文字列フォーマット * @return 追加後のバッファ容量 */ -static int buf_sprintf(BUF *buf, cptr fmt, ...) +static int buf_sprintf(BUF *buf, concptr fmt, ...) { int ret; char tmpbuf[8192]; @@ -194,7 +194,7 @@ static int buf_write(BUF *buf, int fd) return buf->size; } -static int buf_search(BUF *buf, cptr str) +static int buf_search(BUF *buf, concptr str) { char *ret; @@ -228,11 +228,11 @@ static BUF * buf_subbuf(BUF *buf, int pos1, size_t sz) * @param buf 伝送内容バッファ * @return なし */ -static bool http_post(int sd, cptr url, BUF *buf) +static bool http_post(int sd, concptr url, BUF *buf) { BUF *output; char response_buf[1024] = ""; - cptr HTTP_RESPONSE_CODE_OK = "HTTP/1.1 200 OK"; + concptr HTTP_RESPONSE_CODE_OK = "HTTP/1.1 200 OK"; output = buf_new(); buf_sprintf(output, "POST %s HTTP/1.0\r\n", url); @@ -309,21 +309,21 @@ static errr make_dump(BUF* dumpbuf) * @brief スクリーンダンプを作成する/ Make screen dump to buffer * @return 作成したスクリーンダンプの参照ポインタ */ -cptr make_screen_dump(void) +concptr make_screen_dump(void) { BUF *screen_buf; int y, x, i; - cptr ret; + concptr ret; TERM_COLOR a = 0, old_a = 0; SYMBOL_CODE c = ' '; - static cptr html_head[] = { + static concptr html_head[] = { "\n\n", "
",
 		0,
 	};
-	static cptr html_foot[] = {
+	static concptr html_foot[] = {
 		"
\n", "\n\n", 0, @@ -365,7 +365,7 @@ cptr make_screen_dump(void) for (x = 0; x < wid - 1; x++) { int rv, gv, bv; - cptr cc = NULL; + concptr cc = NULL; /* Get the attr/char */ (void)(Term_what(x, y, &a, &c)); diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c index 4b61cc16b..f1ff05dbf 100644 --- a/src/rooms-pitnest.c +++ b/src/rooms-pitnest.c @@ -16,7 +16,7 @@ typedef struct vault_aux_type vault_aux_type; /*! pit/nest型情報の構造体定義 */ struct vault_aux_type { - cptr name; + concptr name; bool(*hook_func)(MONRACE_IDX r_idx); void(*prep_func)(void); DEPTH level; @@ -110,7 +110,7 @@ static int pick_vault_type(vault_aux_type *l_ptr, BIT_FLAGS16 allow_flag_mask) * Hack -- Get the string describing subtype of pit/nest * Determined in prepare function (some pit/nest only) */ -static cptr pit_subtype_string(int type, bool nest) +static concptr pit_subtype_string(int type, bool nest) { static char inner_buf[256] = ""; diff --git a/src/rooms-vault.c b/src/rooms-vault.c index 133ac9442..7965b8e6a 100644 --- a/src/rooms-vault.c +++ b/src/rooms-vault.c @@ -303,11 +303,11 @@ static void coord_trans(POSITION *x, POSITION *y, POSITION xoffset, POSITION yof * @param transno 変換ID * @return なし */ -static void build_vault(POSITION yval, POSITION xval, POSITION ymax, POSITION xmax, cptr data, +static void build_vault(POSITION yval, POSITION xval, POSITION ymax, POSITION xmax, concptr data, POSITION xoffset, POSITION yoffset, int transno) { POSITION dx, dy, x, y, i, j; - cptr t; + concptr t; cave_type *c_ptr; /* Place dungeon features and objects */ diff --git a/src/save.c b/src/save.c index 1be5a3a91..704e51f3e 100644 --- a/src/save.c +++ b/src/save.c @@ -102,7 +102,7 @@ static void wr_s32b(s32b v) * @param str 書き込む文字列 * @return なし */ -static void wr_string(cptr str) +static void wr_string(concptr str) { while (*str) { @@ -1765,7 +1765,7 @@ bool load_player(void) struct stat statbuf; #endif - cptr what = "generic"; + concptr what = "generic"; /* Paranoia */ diff --git a/src/scores.c b/src/scores.c index 182ffa646..e8d61dc96 100644 --- a/src/scores.c +++ b/src/scores.c @@ -204,7 +204,7 @@ void display_scores_aux(int from, int to, int note, high_score *score) { int pr, pc, pa, clev, mlev, cdun, mdun; - cptr user, gold, when, aged; + concptr user, gold, when, aged; /* Hack -- indicate death in yellow */ diff --git a/src/selfinfo.c b/src/selfinfo.c index b5a12e175..b06fd5391 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -50,7 +50,7 @@ void self_knowledge(void) char Dummy[80]; char buf[2][80]; - cptr info[220]; + concptr info[220]; PLAYER_LEVEL plev = p_ptr->lev; @@ -1639,7 +1639,7 @@ static int report_magics_aux(int dur) } } -static cptr report_magic_durations[] = +static concptr report_magic_durations[] = { #ifdef JP "ごく短い間", @@ -1671,7 +1671,7 @@ void report_magics(void) { int i = 0, j, k; char Dummy[80]; - cptr info[128]; + concptr info[128]; int info2[128]; diff --git a/src/snipe.c b/src/snipe.c index 1d24e3863..a6d4d57e9 100644 --- a/src/snipe.c +++ b/src/snipe.c @@ -18,11 +18,11 @@ struct snipe_power { int min_lev; int mana_cost; - cptr name; + concptr name; }; /*! スナイパー技能の解説メッセージ */ -static cptr const snipe_tips[MAX_SNIPE_POWERS] = +static concptr const snipe_tips[MAX_SNIPE_POWERS] = { #ifdef JP "精神を集中する。射撃の威力、精度が上がり、高度な射撃術が使用できるようになる。", @@ -219,7 +219,7 @@ static int get_snipe_power(COMMAND_CODE *sn, bool only_browse) int ask; char choice; char out_val[160]; - cptr p = _("射撃術", "power"); + concptr p = _("射撃術", "power"); snipe_power spell; bool flag, redraw; diff --git a/src/spells-summon.c b/src/spells-summon.c index 550a51fac..9a9fb9340 100644 --- a/src/spells-summon.c +++ b/src/spells-summon.c @@ -113,7 +113,7 @@ bool cast_summon_greater_demon(void) { PLAYER_LEVEL plev = p_ptr->lev; OBJECT_IDX item; - cptr q, s; + concptr q, s; int summon_lev; object_type *o_ptr; diff --git a/src/spells1.c b/src/spells1.c index ed348e015..f23d6b4be 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -250,7 +250,7 @@ static TERM_COLOR spell_color(int type) SYMBOL_CODE c; /* Lookup the default colors for this type */ - cptr s = quark_str(gf_color[type]); + concptr s = quark_str(gf_color[type]); if (!s) return (TERM_WHITE); @@ -725,7 +725,7 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P if (have_flag(f_ptr->flags, FF_TREE)) { - cptr message; + concptr message; switch (typ) { case GF_POIS: @@ -1284,7 +1284,7 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P bool ignore = FALSE; bool do_kill = FALSE; - cptr note_kill = NULL; + concptr note_kill = NULL; #ifndef JP /* Get the "plural"-ness */ @@ -1691,10 +1691,10 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P PARAMETER_VALUE photo = 0; /* Assume no note */ - cptr note = NULL; + concptr note = NULL; /* Assume a default death */ - cptr note_dies = extract_note_dies(real_r_idx(m_ptr)); + concptr note_dies = extract_note_dies(real_r_idx(m_ptr)); POSITION ty = m_ptr->fy; POSITION tx = m_ptr->fx; @@ -2565,8 +2565,8 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P else if (dam > 0) { int b = damroll(5, dam) / 4; - cptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana"); - cptr msg = _("あなたは%sの苦痛を%sに変換した！", + concptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana"); + concptr msg = _("あなたは%sの苦痛を%sに変換した！", (seen ? "You convert %s's pain into %s!" : "You convert %ss pain into %s!")); msg_format(msg, m_name, str); @@ -5089,7 +5089,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P * We return "TRUE" if any "obvious" effects were observed. XXX XXX Actually, * we just assume that the effects were obvious, for historical reasons. */ -static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, int monspell) +static bool project_p(MONSTER_IDX who, concptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, int monspell) { int k = 0; DEPTH rlev = 0; @@ -5113,7 +5113,7 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO char killer[80]; /* Hack -- messages */ - cptr act = NULL; + concptr act = NULL; int get_damage = 0; diff --git a/src/spells2.c b/src/spells2.c index fc789ac2a..1e4a09a88 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -612,7 +612,7 @@ bool detect_monsters_mind(POSITION range) * @param Match 対応シンボルの混じったモンスター文字列(複数指定化) * @return 効力があった場合TRUEを返す */ -bool detect_monsters_string(POSITION range, cptr Match) +bool detect_monsters_string(POSITION range, concptr Match) { MONSTER_IDX i; POSITION y, x; @@ -671,7 +671,7 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag) MONSTER_IDX i; POSITION y, x; bool flag = FALSE; - cptr desc_monsters = _("変なモンスター", "weird monsters"); + concptr desc_monsters = _("変なモンスター", "weird monsters"); if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3; @@ -990,7 +990,7 @@ void aggravate_monsters(MONSTER_IDX who) * @param spell_name 抹殺効果を起こした魔法の名前 * @return 効力があった場合TRUEを返す */ -bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, cptr spell_name) +bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, concptr spell_name) { int msec = delay_factor * delay_factor * delay_factor; monster_type *m_ptr = &m_list[m_idx]; @@ -1214,7 +1214,7 @@ bool probing(void) bool_hack cu, cv; bool probe = FALSE; char buf[256]; - cptr align; + concptr align; cu = Term->scr->cu; cv = Term->scr->cv; @@ -1804,7 +1804,7 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx) if (damage) { - cptr killer; + concptr killer; if (m_idx) { @@ -4985,7 +4985,7 @@ bool psychometry(void) object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; byte feel; - cptr q, s; + concptr q, s; bool okay = FALSE; q = _("どのアイテムを調べますか？", "Meditate on which item? "); diff --git a/src/spells3.c b/src/spells3.c index 5708c21ea..cad01ec0f 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -742,7 +742,7 @@ void teleport_level(MONSTER_IDX m_idx) * @param x コンソールX座標 * @return 選択されたダンジョンID */ -DUNGEON_IDX choose_dungeon(cptr note, POSITION y, POSITION x) +DUNGEON_IDX choose_dungeon(concptr note, POSITION y, POSITION x) { DUNGEON_IDX select_dungeon; DUNGEON_IDX i; @@ -1220,7 +1220,7 @@ void brand_weapon(int brand_type) { OBJECT_IDX item; object_type *o_ptr; - cptr q, s; + concptr q, s; /* Assume enchant weapon */ @@ -1241,7 +1241,7 @@ void brand_weapon(int brand_type) !((o_ptr->tval == TV_POLEARM) && (o_ptr->sval == SV_DEATH_SCYTHE)) && !((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_DIAMOND_EDGE))) { - cptr act = NULL; + concptr act = NULL; /* Let's get the name before it is changed... */ GAME_TEXT o_name[MAX_NLEN]; @@ -1917,7 +1917,7 @@ bool alchemy(void) GAME_TEXT o_name[MAX_NLEN]; char out_val[MAX_NLEN+40]; - cptr q, s; + concptr q, s; /* Hack -- force destruction */ if (command_arg > 0) force = TRUE; @@ -2157,7 +2157,7 @@ bool enchant_spell(HIT_PROB num_hit, HIT_POINT num_dam, ARMOUR_CLASS num_ac) bool okay = FALSE; object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; - cptr q, s; + concptr q, s; /* Assume enchant weapon */ item_tester_hook = object_allow_enchant_weapon; @@ -2210,7 +2210,7 @@ bool artifact_scroll(void) bool okay = FALSE; object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; - cptr q, s; + concptr q, s; /* Enchant weapon/armour */ item_tester_hook = item_tester_hook_nameless_weapon_armour; @@ -2368,7 +2368,7 @@ bool ident_spell(bool only_equip) OBJECT_IDX item; object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; - cptr q, s; + concptr q, s; bool old_known; if (only_equip) @@ -2435,7 +2435,7 @@ bool mundane_spell(bool only_equip) { OBJECT_IDX item; object_type *o_ptr; - cptr q, s; + concptr q, s; if (only_equip) item_tester_hook = object_is_weapon_armour_ammo; @@ -2484,7 +2484,7 @@ bool identify_fully(bool only_equip) OBJECT_IDX item; object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; - cptr q, s; + concptr q, s; bool old_known; if (only_equip) @@ -2576,7 +2576,7 @@ bool recharge(int power) bool fail = FALSE; byte fail_type = 1; - cptr q, s; + concptr q, s; GAME_TEXT o_name[MAX_NLEN]; /* Only accept legal items */ @@ -2848,7 +2848,7 @@ bool bless_weapon(void) object_type *o_ptr; BIT_FLAGS flgs[TR_FLAG_SIZE]; GAME_TEXT o_name[MAX_NLEN]; - cptr q, s; + concptr q, s; /* Bless only weapons */ item_tester_hook = object_is_weapon; @@ -2997,7 +2997,7 @@ bool pulish_shield(void) object_type *o_ptr; BIT_FLAGS flgs[TR_FLAG_SIZE]; GAME_TEXT o_name[MAX_NLEN]; - cptr q, s; + concptr q, s; /* Assume enchant weapon */ item_tester_tval = TV_SHIELD; @@ -3707,7 +3707,7 @@ void print_spells(SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y SPELL_IDX spell; int exp_level, increment = 64; const magic_type *s_ptr; - cptr comment; + concptr comment; char info[80]; char out_val[160]; byte line_attr; @@ -3870,7 +3870,7 @@ bool rustproof(void) OBJECT_IDX item; object_type *o_ptr; GAME_TEXT o_name[MAX_NLEN]; - cptr q, s; + concptr q, s; /* Select a piece of armour */ item_tester_hook = object_is_armour; @@ -4340,7 +4340,7 @@ bool eat_magic(int power) bool fail = FALSE; byte fail_type = 1; - cptr q, s; + concptr q, s; GAME_TEXT o_name[MAX_NLEN]; item_tester_hook = item_tester_hook_recharge; diff --git a/src/store.c b/src/store.c index 2114f7b97..c88cd8c42 100644 --- a/src/store.c +++ b/src/store.c @@ -30,7 +30,7 @@ static s16b inner_town_num = 0; #define MAX_COMMENT_1 6 -static cptr comment_1[MAX_COMMENT_1] = +static concptr comment_1[MAX_COMMENT_1] = { #ifdef JP "オーケーだ。", @@ -52,7 +52,7 @@ static cptr comment_1[MAX_COMMENT_1] = #ifdef JP /*! ブラックマーケット追加メッセージ（承諾） */ -static cptr comment_1_B[MAX_COMMENT_1] = { +static concptr comment_1_B[MAX_COMMENT_1] = { "まあ、それでいいや。", "今日はそれで勘弁してやる。", "分かったよ。", @@ -63,7 +63,7 @@ static cptr comment_1_B[MAX_COMMENT_1] = { #endif #define MAX_COMMENT_2A 2 -static cptr comment_2a[MAX_COMMENT_2A] = +static concptr comment_2a[MAX_COMMENT_2A] = { #ifdef JP "私の忍耐力を試しているのかい？ $%s が最後だ。", @@ -77,7 +77,7 @@ static cptr comment_2a[MAX_COMMENT_2A] = #define MAX_COMMENT_2B 12 -static cptr comment_2b[MAX_COMMENT_2B] = +static concptr comment_2b[MAX_COMMENT_2B] = { #ifdef JP " $%s ぐらいは出さなきゃダメだよ。", @@ -111,7 +111,7 @@ static cptr comment_2b[MAX_COMMENT_2B] = #ifdef JP /*! ブラックマーケット用追加メッセージ（売るとき） */ -static cptr comment_2b_B[MAX_COMMENT_2B] = { +static concptr comment_2b_B[MAX_COMMENT_2B] = { "いくら俺様がお人好しとはいえ $%s が限界だね。嫌なら帰りな。", "金がないのかい、あんた？まずは家に帰って $%s 揃えてきな。", "物の価値が分からん奴だな。これは $%s が普通なんだよ。", @@ -128,7 +128,7 @@ static cptr comment_2b_B[MAX_COMMENT_2B] = { #endif #define MAX_COMMENT_3A 2 -static cptr comment_3a[MAX_COMMENT_3A] = +static concptr comment_3a[MAX_COMMENT_3A] = { #ifdef JP "私の忍耐力を試しているのかい？ $%s が最後だ。", @@ -143,7 +143,7 @@ static cptr comment_3a[MAX_COMMENT_3A] = #define MAX_COMMENT_3B 12 -static cptr comment_3b[MAX_COMMENT_3B] = +static concptr comment_3b[MAX_COMMENT_3B] = { #ifdef JP "本音を言うと $%s でいいんだろ？", @@ -177,7 +177,7 @@ static cptr comment_3b[MAX_COMMENT_3B] = #ifdef JP /*! ブラックマーケット用追加メッセージ（買い取り） */ -static cptr comment_3b_B[MAX_COMMENT_3B] = { +static concptr comment_3b_B[MAX_COMMENT_3B] = { " $%s ってところだね。そのどうしようもないガラクタは。", "この俺が $%s って言っているんだから、その通りにした方が身のためだぞ。", "俺の優しさに甘えるのもいい加減にしておけ。 $%s だ。", @@ -194,7 +194,7 @@ static cptr comment_3b_B[MAX_COMMENT_3B] = { #endif #define MAX_COMMENT_4A 4 -static cptr comment_4a[MAX_COMMENT_4A] = +static concptr comment_4a[MAX_COMMENT_4A] = { #ifdef JP "もうたくさんだ！何度も私をわずらわせないでくれ！", @@ -212,7 +212,7 @@ static cptr comment_4a[MAX_COMMENT_4A] = #ifdef JP /*! ブラックマーケット用追加メッセージ（怒りの頂点） */ -static cptr comment_4a_B[MAX_COMMENT_4A] = { +static concptr comment_4a_B[MAX_COMMENT_4A] = { "なめやがって！温厚な俺様でも限界があるってことを知れ！", "俺をここまで怒らせて...命があるだけでもありがたいと思え！", "ふざけてるのか！冷やかしなら相手を見てからにしろ！", @@ -221,7 +221,7 @@ static cptr comment_4a_B[MAX_COMMENT_4A] = { #endif #define MAX_COMMENT_4B 4 -static cptr comment_4b[MAX_COMMENT_4B] = +static concptr comment_4b[MAX_COMMENT_4B] = { #ifdef JP "店から出て行け！", @@ -239,7 +239,7 @@ static cptr comment_4b[MAX_COMMENT_4B] = #ifdef JP /*! ブラックマーケット用追加メッセージ（追い出し） */ -static cptr comment_4b_B[MAX_COMMENT_4B] = { +static concptr comment_4b_B[MAX_COMMENT_4B] = { "二度とうちに来るんじゃねえ！！", "とっとと、どっかへ失せろ！！", "今すぐ消え失せろ！！", @@ -248,7 +248,7 @@ static cptr comment_4b_B[MAX_COMMENT_4B] = { #endif #define MAX_COMMENT_5 8 -static cptr comment_5[MAX_COMMENT_5] = +static concptr comment_5[MAX_COMMENT_5] = { #ifdef JP "考え直してくれ。", @@ -274,7 +274,7 @@ static cptr comment_5[MAX_COMMENT_5] = #ifdef JP /*! ブラックマーケット用追加メッセージ（怒り） */ -static cptr comment_5_B[MAX_COMMENT_5] = { +static concptr comment_5_B[MAX_COMMENT_5] = { "時間の無駄だな、これは。", "厄介なお客様だな！", "話して分かる相手じゃなさそうだ。", @@ -287,7 +287,7 @@ static cptr comment_5_B[MAX_COMMENT_5] = { #endif #define MAX_COMMENT_6 4 -static cptr comment_6[MAX_COMMENT_6] = +static concptr comment_6[MAX_COMMENT_6] = { #ifdef JP "どうやら聞き間違えたらしい。", @@ -479,7 +479,7 @@ static void say_comment_6(void) #define MAX_COMMENT_7A 4 -static cptr comment_7a[MAX_COMMENT_7A] = +static concptr comment_7a[MAX_COMMENT_7A] = { #ifdef JP "うわああぁぁ！", @@ -497,7 +497,7 @@ static cptr comment_7a[MAX_COMMENT_7A] = #define MAX_COMMENT_7B 4 -static cptr comment_7b[MAX_COMMENT_7B] = +static concptr comment_7b[MAX_COMMENT_7B] = { #ifdef JP "くそう！", @@ -515,7 +515,7 @@ static cptr comment_7b[MAX_COMMENT_7B] = #define MAX_COMMENT_7C 4 -static cptr comment_7c[MAX_COMMENT_7C] = +static concptr comment_7c[MAX_COMMENT_7C] = { #ifdef JP "すばらしい！", @@ -533,7 +533,7 @@ static cptr comment_7c[MAX_COMMENT_7C] = #define MAX_COMMENT_7D 4 -static cptr comment_7d[MAX_COMMENT_7D] = +static concptr comment_7d[MAX_COMMENT_7D] = { #ifdef JP "やっほぅ！", @@ -2490,9 +2490,9 @@ static void display_store(void) /* Normal stores */ else { - cptr store_name = (f_name + f_info[cur_store_feat].name); - cptr owner_name = (ot_ptr->owner_name); - cptr race_name = race_info[ot_ptr->owner_race].title; + concptr store_name = (f_name + f_info[cur_store_feat].name); + concptr owner_name = (ot_ptr->owner_name); + concptr race_name = race_info[ot_ptr->owner_race].title; /* Put the owner name and race */ sprintf(buf, "%s (%s)", owner_name, race_name); @@ -2534,7 +2534,7 @@ static void display_store(void) * @param j 選択範囲の最大値 * @return 実際に選択したらTRUE、キャンセルしたらFALSE */ -static int get_stock(COMMAND_CODE *com_val, cptr pmt, int i, int j) +static int get_stock(COMMAND_CODE *com_val, concptr pmt, int i, int j) { char command; char out_val[160]; @@ -2691,11 +2691,11 @@ static s32b last_inc = 0L; * @param final 最終確定価格ならばTRUE * @return プレイヤーを締め出す場合TRUEを返す */ -static int get_haggle(cptr pmt, s32b *poffer, PRICE price, int final) +static int get_haggle(concptr pmt, s32b *poffer, PRICE price, int final) { s32b i; - cptr p; + concptr p; char buf[128]; char out_val[160]; @@ -2850,7 +2850,7 @@ static int get_haggle(cptr pmt, s32b *poffer, PRICE price, int final) * @return プレイヤーの価格に対して不服ならばTRUEを返す / * Return TRUE if offer is NOT okay */ -static bool receive_offer(cptr pmt, s32b *poffer, +static bool receive_offer(concptr pmt, s32b *poffer, s32b last_offer, int factor, PRICE price, int final) { @@ -2895,9 +2895,9 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price) bool cancel = FALSE; #ifdef JP - cptr pmt = "提示価格"; + concptr pmt = "提示価格"; #else - cptr pmt = "Asking"; + concptr pmt = "Asking"; #endif @@ -3109,9 +3109,9 @@ static bool sell_haggle(object_type *o_ptr, s32b *price) int annoyed = 0, final = FALSE; bool cancel = FALSE; #ifdef JP - cptr pmt = "提示金額"; + concptr pmt = "提示金額"; #else - cptr pmt = "Offer"; + concptr pmt = "Offer"; #endif char out_val[160]; @@ -3731,7 +3731,7 @@ static void store_sell(void) object_type *o_ptr; - cptr q, s; + concptr q, s; GAME_TEXT o_name[MAX_NLEN]; diff --git a/src/tables.c b/src/tables.c index cbb707d1b..bde47c424 100644 --- a/src/tables.c +++ b/src/tables.c @@ -96,7 +96,7 @@ const char listsym[] = * スクリーン表示色キャラクタ / * Encode the screen colors */ -const cptr color_char = "dwsorgbuDWvyRGBU"; +const concptr color_char = "dwsorgbuDWvyRGBU"; /*! @@ -3543,7 +3543,7 @@ const s32b realm_choices2[MAX_CLASS] = /*! * 領域魔法名称 */ -const cptr realm_names[] = +const concptr realm_names[] = { "魔法なし", "生命", @@ -3569,9 +3569,9 @@ const cptr realm_names[] = #endif #ifdef JP -const cptr E_realm_names[] +const concptr E_realm_names[] #else -const cptr realm_names[] +const concptr realm_names[] #endif = { "none", @@ -3685,7 +3685,7 @@ const int chest_traps[64] = * */ #ifdef JP -const cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] = +const concptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] = { /* Warrior */ { @@ -4087,7 +4087,7 @@ const cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] = }; #else -const cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] = +const concptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] = { /* Warrior */ { @@ -4691,7 +4691,7 @@ const monster_power monster_powers[MAX_MONSPELLS] = /*! * @brief モンスター魔法名テーブル */ -const cptr monster_powers_short[MAX_MONSPELLS] = { +const concptr monster_powers_short[MAX_MONSPELLS] = { #ifdef JP "叫ぶ", "何か", "魔力消去", "ロケット", "射撃", "何か", "何か", "何か", @@ -4733,7 +4733,7 @@ const cptr monster_powers_short[MAX_MONSPELLS] = { /*! * @brief 色名称テーブル / Hack -- the "basic" color names (see "TERM_xxx") */ -const cptr color_names[16] = +const concptr color_names[16] = { #ifdef JP "黒", @@ -4777,7 +4777,7 @@ const cptr color_names[16] = /*! * @brief 能力値テーブル / Abbreviations of healthy stats */ -const cptr stat_names[6] = +const concptr stat_names[6] = { #ifdef JP "腕力 :", "知能 :", "賢さ :", "器用 :", "耐久 :", "魅力 :" @@ -4790,7 +4790,7 @@ const cptr stat_names[6] = /*! * @brief 能力値テーブル(能力低下時) / Abbreviations of damaged stats */ -const cptr stat_names_reduced[6] = +const concptr stat_names_reduced[6] = { #ifdef JP "腕力x:", "知能x:", "賢さx:", "器用x:", "耐久x:", "魅力x:" @@ -4819,7 +4819,7 @@ const cptr stat_names_reduced[6] = * of the main screen into any interested windows. * */ -const cptr window_flag_desc[32] = +const concptr window_flag_desc[32] = { #ifdef JP "持ち物/装備一覧", @@ -4926,7 +4926,7 @@ const cptr window_flag_desc[32] = /*! * @brief カオスパトロン名テーブル */ -const cptr chaos_patrons[MAX_PATRON] = +const concptr chaos_patrons[MAX_PATRON] = { "スローター", "マベロード", @@ -4949,7 +4949,7 @@ const cptr chaos_patrons[MAX_PATRON] = "カイン" }; #else -const cptr chaos_patrons[MAX_PATRON] = +const concptr chaos_patrons[MAX_PATRON] = { "Slortar", "Mabelode", @@ -5243,7 +5243,7 @@ const int monk_ave_damage[PY_MAX_LEVEL+1][3] = * @brief アイテムの価値記述テーブル / * Table of game-generated inscriptions (indexed by the defines in defines.h). -- RG */ -const cptr game_inscriptions[] = +const concptr game_inscriptions[] = { NULL, /* FEEL_NONE */ #ifdef JP @@ -5309,7 +5309,7 @@ const kamae kata_shurui[MAX_KATA] = /*! * @brief 技能値到達表記テーブル */ -const cptr exp_level_str[5]= +const concptr exp_level_str[5]= #ifdef JP {"[初心者]", "[入門者]", "[熟練者]", "[エキスパート]", "[達人]"}; #else @@ -5320,7 +5320,7 @@ const cptr exp_level_str[5]= * @brief 幻覚時の打撃記述テーブル / Weird melee attack types when hallucinating */ #ifdef JP -const cptr silly_attacks[MAX_SILLY_ATTACK] = +const concptr silly_attacks[MAX_SILLY_ATTACK] = { "に小便をかけられた。", "があなたの回りを3回回ってワンと言った。", @@ -5368,7 +5368,7 @@ const cptr silly_attacks[MAX_SILLY_ATTACK] = /*! * @brief 幻覚時の打撃記述テーブル(フォーマットつき) / Weird melee attack types when hallucinating (%s for strfmt()) */ -const cptr silly_attacks2[MAX_SILLY_ATTACK] = +const concptr silly_attacks2[MAX_SILLY_ATTACK] = { "%sに小便をかけた。", "%sの回りを3回回ってワンと言った。", @@ -5413,7 +5413,7 @@ const cptr silly_attacks2[MAX_SILLY_ATTACK] = "言った。「変愚蛮怒、絶賛公開中！」", }; #else -const cptr silly_attacks[MAX_SILLY_ATTACK] = +const concptr silly_attacks[MAX_SILLY_ATTACK] = { "smothers", "hugs", @@ -5457,7 +5457,7 @@ const cptr silly_attacks[MAX_SILLY_ATTACK] = * @brief シンボル解説テーブル / * The table of "symbol info" -- each entry is a string of the form "X:desc" where "X" is the trigger, and "desc" is the "info". */ -const cptr ident_info[] = +const concptr ident_info[] = { #ifdef JP " :暗闇", @@ -6123,7 +6123,7 @@ const activation_type activation_info[] = /*! * @brief ランダムアーティファクトのバイアス名称テーブル */ -const cptr artifact_bias_name[MAX_BIAS] = +const concptr artifact_bias_name[MAX_BIAS] = { "なし", "電撃", @@ -6147,7 +6147,7 @@ const cptr artifact_bias_name[MAX_BIAS] = "レンジャー", }; #else -const cptr artifact_bias_name[MAX_BIAS] = +const concptr artifact_bias_name[MAX_BIAS] = { "None", "Elec", diff --git a/src/trap.c b/src/trap.c index 17d4a2283..13e189c72 100644 --- a/src/trap.c +++ b/src/trap.c @@ -166,8 +166,8 @@ static int check_hit(int power) static void hit_trap_pit(int trap_feat_type) { HIT_POINT dam; - cptr trap_name = ""; - cptr spike_name = ""; + concptr trap_name = ""; + concptr spike_name = ""; switch (trap_feat_type) { @@ -277,7 +277,7 @@ static void hit_trap_slow(void) * @param turn 状態異常の追加ターン量 * @return なし */ -static void hit_trap_set_abnormal_status(cptr trap_message, bool resist, bool(*set_status)(IDX), IDX turn_aux) +static void hit_trap_set_abnormal_status(concptr trap_message, bool resist, bool(*set_status)(IDX), IDX turn_aux) { msg_print(trap_message); if (!resist) @@ -301,7 +301,7 @@ void hit_trap(bool break_trap) cave_type *c_ptr = &cave[y][x]; feature_type *f_ptr = &f_info[c_ptr->feat]; int trap_feat_type = have_flag(f_ptr->flags, FF_TRAP) ? f_ptr->subtype : NOT_TRAP; - cptr name = _("トラップ", "a trap"); + concptr name = _("トラップ", "a trap"); disturb(FALSE, TRUE); diff --git a/src/types.h b/src/types.h index 9d9ff06e1..c94e9c866 100644 --- a/src/types.h +++ b/src/types.h @@ -681,8 +681,8 @@ struct option_type byte o_set; byte o_bit; - cptr o_text; - cptr o_desc; + concptr o_text; + concptr o_desc; }; @@ -723,7 +723,7 @@ typedef struct owner_type owner_type; struct owner_type { - cptr owner_name; /* Name */ + concptr owner_name; /* Name */ PRICE max_cost; /* Purse limit */ byte max_inflate; /* Inflation (max) */ byte min_inflate; /* Inflation (min) */ @@ -814,11 +814,11 @@ typedef struct player_sex player_sex; struct player_sex { - cptr title; /* Type of sex */ - cptr winner; /* Name of winner */ + concptr title; /* Type of sex */ + concptr winner; /* Name of winner */ #ifdef JP - cptr E_title; /* 英語性別 */ - cptr E_winner; /* 英語性別 */ + concptr E_title; /* 英語性別 */ + concptr E_winner; /* 英語性別 */ #endif }; @@ -831,10 +831,10 @@ typedef struct player_race player_race; struct player_race { - cptr title; /* Type of race */ + concptr title; /* Type of race */ #ifdef JP - cptr E_title; /* 英語種族 */ + concptr E_title; /* 英語種族 */ #endif s16b r_adj[6]; /* Racial stat bonuses */ @@ -878,10 +878,10 @@ typedef struct player_class player_class; struct player_class { - cptr title; /* Type of class */ + concptr title; /* Type of class */ #ifdef JP - cptr E_title; /* 英語職業 */ + concptr E_title; /* 英語職業 */ #endif s16b c_adj[6]; /* Class stat modifier */ @@ -913,10 +913,10 @@ struct player_class typedef struct player_seikaku player_seikaku; struct player_seikaku { - cptr title; /* Type of seikaku */ + concptr title; /* Type of seikaku */ #ifdef JP - cptr E_title; /* 英語性格 */ + concptr E_title; /* 英語性格 */ #endif s16b a_adj[6]; /* seikaku stat bonuses */ @@ -1115,7 +1115,7 @@ struct player_type HIT_POINT player_hp[PY_MAX_LEVEL]; char died_from[80]; /* What killed the player */ - cptr last_message; /* Last message on death or retirement */ + concptr last_message; /* Last message on death or retirement */ char history[4][60]; /* Textual "history" for the Player */ u16b total_winner; /* Total winner */ @@ -1414,7 +1414,7 @@ typedef struct martial_arts martial_arts; struct martial_arts { - cptr desc; /* A verbose attack description */ + concptr desc; /* A verbose attack description */ int min_level; /* Minimum level to use */ int chance; /* Chance of 'success' */ int dd; /* Damage dice */ @@ -1426,9 +1426,9 @@ typedef struct kamae kamae; struct kamae { - cptr desc; /* A verbose kamae description */ + concptr desc; /* A verbose kamae description */ int min_level; /* Minimum level to use */ - cptr info; + concptr info; }; /* Mindcrafters */ @@ -1438,7 +1438,7 @@ struct mind_type int min_lev; int mana_cost; int fail; - cptr name; + concptr name; }; typedef struct mind_power mind_power; @@ -1458,7 +1458,7 @@ struct monster_power int manedam; int manefail; int use_stat; - cptr name; + concptr name; }; @@ -1537,7 +1537,7 @@ struct dun_type { DEPTH min_level; /* Minimum level in the dungeon */ DEPTH max_level; /* Maximum dungeon level allowed */ - cptr name; /* The name of the dungeon */ + concptr name; /* The name of the dungeon */ }; /* @@ -1664,8 +1664,8 @@ struct dungeon_info_type { * @brief 自動拾い/破壊設定データの構造体 / A structure type for entry of auto-picker/destroyer */ typedef struct { - cptr name; /*!< 自動拾い/破壊定義の名称一致基準 / Items which have 'name' as part of its name match */ - cptr insc; /*!< 対象となったアイテムに自動で刻む内容 / Items will be auto-inscribed as 'insc' */ + concptr name; /*!< 自動拾い/破壊定義の名称一致基準 / Items which have 'name' as part of its name match */ + concptr insc; /*!< 対象となったアイテムに自動で刻む内容 / Items will be auto-inscribed as 'insc' */ BIT_FLAGS flag[2]; /*!< キーワードに関する汎用的な条件フラグ / Misc. keyword to be matched */ byte action; /*!< 対象のアイテムを拾う/破壊/放置するかの指定フラグ / Auto-pickup or Destroy or Leave items */ byte dice; /*!< 武器のダイス値基準値 / Weapons which have more than 'dice' dice match */ @@ -1742,7 +1742,7 @@ typedef struct { #endif typedef struct { - cptr flag; + concptr flag; byte index; byte level; s32b value; @@ -1750,11 +1750,11 @@ typedef struct { int constant; DICE_NUMBER dice; } timeout; - cptr desc; + concptr desc; } activation_type; typedef struct { int flag; int type; - cptr name; + concptr name; } dragonbreath_type; diff --git a/src/util.c b/src/util.c index 92c28881f..70209423c 100644 --- a/src/util.c +++ b/src/util.c @@ -27,9 +27,9 @@ static char inkey_macro_trigger_string[1024]; * * Compare the two strings "a" and "b" ala "strcmp()" ignoring case. */ -int stricmp(cptr a, cptr b) +int stricmp(concptr a, concptr b) { - cptr s1, s2; + concptr s1, s2; char z1, z2; /* Scan the strings */ @@ -98,7 +98,7 @@ int usleep(huge usecs) */ #ifdef SET_UID extern struct passwd *getpwuid(uid_t uid); -extern struct passwd *getpwnam(cptr name); +extern struct passwd *getpwnam(concptr name); #endif @@ -186,9 +186,9 @@ void user_name(char *buf, int id) * Replace "~user/" by the home directory of the user named "user" * Replace "~/" by the home directory of the current user */ -errr path_parse(char *buf, int max, cptr file) +errr path_parse(char *buf, int max, concptr file) { - cptr u, s; + concptr u, s; struct passwd *pw; char user[128]; @@ -252,7 +252,7 @@ errr path_parse(char *buf, int max, cptr file) * This requires no special processing on simple machines, * except for verifying the size of the filename. */ -errr path_parse(char *buf, int max, cptr file) +errr path_parse(char *buf, int max, concptr file) { /* Accept the filename */ (void)strnfmt(buf, max, "%s", file); @@ -279,7 +279,7 @@ errr path_parse(char *buf, int max, cptr file) */ static errr path_temp(char *buf, int max) { - cptr s; + concptr s; /* Temp file */ s = tmpnam(NULL); @@ -312,7 +312,7 @@ static errr path_temp(char *buf, int max) * Note that this function yields a path which must be "parsed" * using the "parse" function above. */ -errr path_build(char *buf, int max, cptr path, cptr file) +errr path_build(char *buf, int max, concptr path, concptr file) { /* Special file */ if (file[0] == '~') @@ -350,7 +350,7 @@ errr path_build(char *buf, int max, cptr path, cptr file) /* * Hack -- replacement for "fopen()" */ -FILE *my_fopen(cptr file, cptr mode) +FILE *my_fopen(concptr file, concptr mode) { char buf[1024]; @@ -530,7 +530,7 @@ errr my_fgets(FILE *fff, char *buf, huge n) * Dump a string, plus a newline, to a file * Process internal weirdness? */ -errr my_fputs(FILE *fff, cptr buf, huge n) +errr my_fputs(FILE *fff, concptr buf, huge n) { /* XXX XXX */ n = n ? n : 0; @@ -579,7 +579,7 @@ write(F,(char*)(B),S) /* * Hack -- attempt to delete a file */ -errr fd_kill(cptr file) +errr fd_kill(concptr file) { char buf[1024]; @@ -596,7 +596,7 @@ errr fd_kill(cptr file) /* * Hack -- attempt to move a file */ -errr fd_move(cptr file, cptr what) +errr fd_move(concptr file, concptr what) { char buf[1024]; char aux[1024]; @@ -617,7 +617,7 @@ errr fd_move(cptr file, cptr what) /* * Hack -- attempt to copy a file */ -errr fd_copy(cptr file, cptr what) +errr fd_copy(concptr file, concptr what) { char buf[1024]; char aux[1024]; @@ -668,7 +668,7 @@ errr fd_copy(cptr file, cptr what) * This function should fail if the file already exists * Note that we assume that the file should be "binary" */ -int fd_make(cptr file, BIT_FLAGS mode) +int fd_make(concptr file, BIT_FLAGS mode) { char buf[1024]; @@ -698,7 +698,7 @@ int fd_make(cptr file, BIT_FLAGS mode) * * Note that we assume that the file should be "binary" */ -int fd_open(cptr file, int flags) +int fd_open(concptr file, int flags) { char buf[1024]; @@ -852,7 +852,7 @@ errr fd_read(int fd, char *buf, huge n) /* * Hack -- Attempt to write data to a file descriptor */ -errr fd_write(int fd, cptr buf, huge n) +errr fd_write(int fd, concptr buf, huge n) { /* Verify the fd */ if (fd < 0) return (-1); @@ -996,9 +996,9 @@ static int dehex(char c) } -static int my_stricmp(cptr a, cptr b) +static int my_stricmp(concptr a, concptr b) { - cptr s1, s2; + concptr s1, s2; char z1, z2; /* Scan the strings */ @@ -1012,9 +1012,9 @@ static int my_stricmp(cptr a, cptr b) } } -static int my_strnicmp(cptr a, cptr b, int n) +static int my_strnicmp(concptr a, concptr b, int n) { - cptr s1, s2; + concptr s1, s2; char z1, z2; /* Scan the strings */ @@ -1030,15 +1030,15 @@ static int my_strnicmp(cptr a, cptr b, int n) } -static void trigger_text_to_ascii(char **bufptr, cptr *strptr) +static void trigger_text_to_ascii(char **bufptr, concptr *strptr) { char *s = *bufptr; - cptr str = *strptr; + concptr str = *strptr; bool mod_status[MAX_MACRO_MOD]; int i, len = 0; int shiftstatus = 0; - cptr key_code; + concptr key_code; if (macro_template == NULL) return; @@ -1127,7 +1127,7 @@ static void trigger_text_to_ascii(char **bufptr, cptr *strptr) * parsing "\xFF" into a (signed) char. Whoever thought of making * the "sign" of a "char" undefined is a complete moron. Oh well. */ -void text_to_ascii(char *buf, cptr str) +void text_to_ascii(char *buf, concptr str) { char *s = buf; @@ -1256,13 +1256,13 @@ void text_to_ascii(char *buf, cptr str) } -static bool trigger_ascii_to_text(char **bufptr, cptr *strptr) +static bool trigger_ascii_to_text(char **bufptr, concptr *strptr) { char *s = *bufptr; - cptr str = *strptr; + concptr str = *strptr; char key_code[100]; int i; - cptr tmp; + concptr tmp; if (macro_template == NULL) return FALSE; @@ -1321,7 +1321,7 @@ static bool trigger_ascii_to_text(char **bufptr, cptr *strptr) /* * Hack -- convert a string into a printable form */ -void ascii_to_text(char *buf, cptr str) +void ascii_to_text(char *buf, concptr str) { char *s = buf; @@ -1431,7 +1431,7 @@ static bool macro__use[256]; /* * Find the macro (if any) which exactly matches the given pattern */ -sint macro_find_exact(cptr pat) +sint macro_find_exact(concptr pat) { int i; @@ -1459,7 +1459,7 @@ sint macro_find_exact(cptr pat) /* * Find the first macro (if any) which contains the given pattern */ -static sint macro_find_check(cptr pat) +static sint macro_find_check(concptr pat) { int i; @@ -1487,7 +1487,7 @@ static sint macro_find_check(cptr pat) /* * Find the first macro (if any) which contains the given pattern and more */ -static sint macro_find_maybe(cptr pat) +static sint macro_find_maybe(concptr pat) { int i; @@ -1518,7 +1518,7 @@ static sint macro_find_maybe(cptr pat) /* * Find the longest macro (if any) which starts with the given pattern */ -static sint macro_find_ready(cptr pat) +static sint macro_find_ready(concptr pat) { int i, t, n = -1, s = -1; @@ -1562,7 +1562,7 @@ static sint macro_find_ready(cptr pat) * with some kind of "powerful keymap" ability, but this might make it hard * to change the "roguelike" option from inside the game. */ -errr macro_add(cptr pat, cptr act) +errr macro_add(concptr pat, concptr act) { int n; @@ -1788,7 +1788,7 @@ static char inkey_aux(void) char ch; - cptr pat, act; + concptr pat, act; char *buf = inkey_macro_trigger_string; @@ -1965,7 +1965,7 @@ static void forget_macro_action(void) * trigger any macros, and cannot be bypassed by the Borg. It is used * in Angband to handle "keymaps". */ -static cptr inkey_next = NULL; +static concptr inkey_next = NULL; #ifdef ALLOW_BORG @@ -2284,7 +2284,7 @@ char inkey(void) void quark_init(void) { /* Quark variables */ - C_MAKE(quark__str, QUARK_MAX, cptr); + C_MAKE(quark__str, QUARK_MAX, concptr); /* Prepare first quark, which is used when quark_add() is failed */ quark__str[1] = string_make(""); @@ -2297,7 +2297,7 @@ void quark_init(void) /* * Add a new "quark" to the set of quarks. */ -u16b quark_add(cptr str) +u16b quark_add(concptr str) { u16b i; @@ -2325,9 +2325,9 @@ u16b quark_add(cptr str) /* * This function looks up a quark */ -cptr quark_str(STR_OFFSET i) +concptr quark_str(STR_OFFSET i) { - cptr q; + concptr q; /* Return NULL for an invalid index */ if ((i < 1) || (i >= quark__num)) return NULL; @@ -2393,11 +2393,11 @@ s32b message_num(void) * @params age メッセージの世代 * @return メッセージの文字列ポインタ */ -cptr message_str(int age) +concptr message_str(int age) { s32b x; s32b o; - cptr s; + concptr s; /* Forgotten messages have no text */ if ((age < 0) || (age >= message_num())) return (""); @@ -2421,14 +2421,14 @@ cptr message_str(int age) * @params str 保存したいメッセージ * @return なし */ -void message_add(cptr str) +void message_add(concptr str) { u32b i, n; int k, x, m; char u[4096]; char splitted1[81]; - cptr splitted2; + concptr splitted2; /*** Step 1 -- Analyze the message ***/ @@ -2444,7 +2444,7 @@ void message_add(cptr str) /* extra step -- split the message if n>80.(added by Mogami) */ if (n > 80) { #ifdef JP - cptr t = str; + concptr t = str; for (n = 0; n < 80; n++, t++) { @@ -2482,7 +2482,7 @@ void message_add(cptr str) char buf[1024]; char *t; - cptr old; + concptr old; /* Back up and wrap if needed */ if (i-- == 0) i = MESSAGE_MAX - 1; @@ -2546,7 +2546,7 @@ void message_add(cptr str) for (i = message__next; k; k--) { int q; - cptr old; + concptr old; /* Back up and wrap if needed */ if (i-- == 0) i = MESSAGE_MAX - 1; @@ -2776,7 +2776,7 @@ void msg_erase(void) * Note that "msg_print(NULL)" will clear the top line * even if no messages are pending. This is probably a hack. */ -void msg_print(cptr msg) +void msg_print(concptr msg) { static int p = 0; int n; @@ -2926,14 +2926,14 @@ void msg_print(cptr msg) if (fresh_message) Term_fresh(); } -void msg_print_wizard(int cheat_type, cptr msg) +void msg_print_wizard(int cheat_type, concptr msg) { if (!cheat_room && cheat_type == CHEAT_DUNGEON) return; if (!cheat_peek && cheat_type == CHEAT_OBJECT) return; if (!cheat_hear && cheat_type == CHEAT_MONSTER) return; if (!cheat_xtra && cheat_type == CHEAT_MISC) return; - cptr cheat_mes[] = {"ITEM", "MONS", "DUNG", "MISC"}; + concptr cheat_mes[] = {"ITEM", "MONS", "DUNG", "MISC"}; char buf[1024]; sprintf(buf, "WIZ-%s:%s", cheat_mes[cheat_type], msg); msg_print(buf); @@ -2990,7 +2990,7 @@ void screen_load(void) /* * Display a formatted message, using "vstrnfmt()" and "msg_print()". */ -void msg_format(cptr fmt, ...) +void msg_format(concptr fmt, ...) { va_list vp; @@ -3012,7 +3012,7 @@ void msg_format(cptr fmt, ...) /* * Display a formatted message, using "vstrnfmt()" and "msg_print()". */ -void msg_format_wizard(int cheat_type, cptr fmt, ...) +void msg_format_wizard(int cheat_type, concptr fmt, ...) { if(!cheat_room && cheat_type == CHEAT_DUNGEON) return; if(!cheat_peek && cheat_type == CHEAT_OBJECT) return; @@ -3043,7 +3043,7 @@ void msg_format_wizard(int cheat_type, cptr fmt, ...) * At the given location, using the given attribute, if allowed, * add the given string. Do not clear the line. */ -void c_put_str(TERM_COLOR attr, cptr str, TERM_LEN row, TERM_LEN col) +void c_put_str(TERM_COLOR attr, concptr str, TERM_LEN row, TERM_LEN col) { /* Position cursor, Dump the attr/text */ Term_putstr(col, row, -1, attr, str); @@ -3052,7 +3052,7 @@ void c_put_str(TERM_COLOR attr, cptr str, TERM_LEN row, TERM_LEN col) /* * As above, but in "white" */ -void put_str(cptr str, TERM_LEN row, TERM_LEN col) +void put_str(concptr str, TERM_LEN row, TERM_LEN col) { /* Spawn */ Term_putstr(col, row, -1, TERM_WHITE, str); @@ -3064,7 +3064,7 @@ void put_str(cptr str, TERM_LEN row, TERM_LEN col) * Display a string on the screen using an attribute, and clear * to the end of the line. */ -void c_prt(TERM_COLOR attr, cptr str, TERM_LEN row, TERM_LEN col) +void c_prt(TERM_COLOR attr, concptr str, TERM_LEN row, TERM_LEN col) { /* Clear line, position cursor */ Term_erase(col, row, 255); @@ -3076,7 +3076,7 @@ void c_prt(TERM_COLOR attr, cptr str, TERM_LEN row, TERM_LEN col) /* * As above, but in "white" */ -void prt(cptr str, TERM_LEN row, TERM_LEN col) +void prt(concptr str, TERM_LEN row, TERM_LEN col) { /* Spawn */ c_prt(TERM_WHITE, str, row, col); @@ -3099,13 +3099,13 @@ void prt(cptr str, TERM_LEN row, TERM_LEN col) * This function will correctly handle any width up to the maximum legal * value of 256, though it works best for a standard 80 character width. */ -void c_roff(byte a, cptr str) +void c_roff(byte a, concptr str) { int x, y; int w, h; - cptr s; + concptr s; /* Obtain the size */ (void)Term_get_size(&w, &h); @@ -3260,7 +3260,7 @@ void c_roff(byte a, cptr str) /* * As above, but in "white" */ -void roff(cptr str) +void roff(concptr str) { /* Spawn */ c_roff(TERM_WHITE, str); @@ -3567,7 +3567,7 @@ bool askfor(char *buf, int len) * * We clear the input, and return FALSE, on "ESCAPE". */ -bool get_string(cptr prompt, char *buf, int len) +bool get_string(concptr prompt, char *buf, int len) { bool res; @@ -3593,7 +3593,7 @@ bool get_string(cptr prompt, char *buf, int len) * * Note that "[y/n]" is appended to the prompt. */ -bool get_check(cptr prompt) +bool get_check(concptr prompt) { return get_check_strict(prompt, 0); } @@ -3606,7 +3606,7 @@ bool get_check(cptr prompt) * mode & CHECK_NO_HISTORY : no message_add * mode & CHECK_DEFAULT_Y : accept any key as y, except n and Esc. */ -bool get_check_strict(cptr prompt, BIT_FLAGS mode) +bool get_check_strict(concptr prompt, BIT_FLAGS mode) { int i; char buf[80]; @@ -3719,7 +3719,7 @@ bool get_check_strict(cptr prompt, BIT_FLAGS mode) * * Returns TRUE unless the character is "Escape" */ -bool get_com(cptr prompt, char *command, bool z_escape) +bool get_com(concptr prompt, char *command, bool z_escape) { /* Paranoia */ msg_print(NULL); @@ -3750,7 +3750,7 @@ bool get_com(cptr prompt, char *command, bool z_escape) * * Hack -- allow "command_arg" to specify a quantity */ -QUANTITY get_quantity(cptr prompt, QUANTITY max) +QUANTITY get_quantity(concptr prompt, QUANTITY max) { bool res, result; QUANTITY amt; @@ -3865,7 +3865,7 @@ static char request_command_buffer[256]; typedef struct { - cptr name; + concptr name; byte cmd; bool fin; } menu_naiyou; @@ -4140,7 +4140,7 @@ menu_naiyou menu_info[10][10] = typedef struct { - cptr name; + concptr name; byte window; byte number; byte jouken; @@ -4205,7 +4205,7 @@ static char inkey_from_menu(void) { int i; char sub_cmd; - cptr menu_name; + concptr menu_name; if (!menu) old_num = num; put_str("+----------------------------------------------------+", basey, basex); put_str("| |", basey+1, basex); @@ -4349,7 +4349,7 @@ void request_command(int shopping) s16b cmd; int mode; - cptr act; + concptr act; #ifdef JP int caretcmd = 0; @@ -4582,7 +4582,7 @@ void request_command(int shopping) #ifdef JP for (i = 0; i < 256; i++) { - cptr s; + concptr s; if ((s = keymap_act[mode][i]) != NULL) { if (*s == command_cmd && *(s+1) == 0) @@ -4599,7 +4599,7 @@ void request_command(int shopping) /* Hack -- Scan equipment */ for (i = INVEN_RARM; i < INVEN_TOTAL; i++) { - cptr s; + concptr s; object_type *o_ptr = &inventory[i]; @@ -4681,7 +4681,7 @@ bool is_a_vowel(int ch) * XXX Could be made more efficient, especially in the * case where "insert" is smaller than "target". */ -static bool insert_str(char *buf, cptr target, cptr insert) +static bool insert_str(char *buf, concptr target, concptr insert) { int i, len; int b_len, t_len, i_len; @@ -4749,7 +4749,7 @@ int get_keymap_dir(char ch) else { BIT_FLAGS mode; - cptr act, s; + concptr act, s; /* Roguelike */ if (rogue_like_commands) @@ -5094,10 +5094,10 @@ void build_gamma_table(int gamma) * * NB: The keys added here will be interpreted by any macros or keymaps. */ -errr type_string(cptr str, uint len) +errr type_string(concptr str, uint len) { errr err = 0; - cptr s; + concptr s; term *old = Term; @@ -5129,7 +5129,7 @@ errr type_string(cptr str, uint len) -void roff_to_buf(cptr str, int maxlen, char *tbuf, size_t bufsize) +void roff_to_buf(concptr str, int maxlen, char *tbuf, size_t bufsize) { int read_pt = 0; int write_pt = 0; @@ -5235,12 +5235,12 @@ void roff_to_buf(cptr str, int maxlen, char *tbuf, size_t bufsize) * * This function should be equivalent to the strlcpy() function in BSD. */ -size_t my_strcpy(char *buf, cptr src, size_t bufsize) +size_t my_strcpy(char *buf, concptr src, size_t bufsize) { #ifdef JP char *d = buf; - cptr s = src; + concptr s = src; size_t len = 0; if (bufsize > 0) { @@ -5303,7 +5303,7 @@ size_t my_strcpy(char *buf, cptr src, size_t bufsize) * * This function should be equivalent to the strlcat() function in BSD. */ -size_t my_strcat(char *buf, cptr src, size_t bufsize) +size_t my_strcat(char *buf, concptr src, size_t bufsize) { size_t dlen = strlen(buf); @@ -5326,7 +5326,7 @@ size_t my_strcat(char *buf, cptr src, size_t bufsize) * * my_strstr() can handle Kanji strings correctly. */ -char *my_strstr(cptr haystack, cptr needle) +char *my_strstr(concptr haystack, concptr needle) { int i; int l1 = strlen(haystack); @@ -5354,7 +5354,7 @@ char *my_strstr(cptr haystack, cptr needle) * * my_strchr() can handle Kanji strings correctly. */ -char *my_strchr(cptr ptr, char ch) +char *my_strchr(concptr ptr, char ch) { for ( ; *ptr != '\0'; ptr++) { @@ -5399,7 +5399,7 @@ void str_tolower(char *str) int inkey_special(bool numpad_cursor) { static const struct { - cptr keyname; + concptr keyname; int keyflag; } modifier_key_list[] = { {"shift-", SKEY_MOD_SHIFT}, @@ -5409,7 +5409,7 @@ int inkey_special(bool numpad_cursor) static const struct { bool numpad; - cptr keyname; + concptr keyname; int keycode; } special_key_list[] = { {FALSE, "Down]", SKEY_DOWN}, @@ -5440,7 +5440,7 @@ int inkey_special(bool numpad_cursor) }; static const struct { - cptr keyname; + concptr keyname; int keycode; } gcu_special_key_list[] = { {"A", SKEY_UP}, @@ -5455,7 +5455,7 @@ int inkey_special(bool numpad_cursor) }; char buf[1024]; - cptr str = buf; + concptr str = buf; char key; int skey = 0; int modifier = 0; diff --git a/src/variable.c b/src/variable.c index a8208d85e..1a16ec145 100644 --- a/src/variable.c +++ b/src/variable.c @@ -16,7 +16,7 @@ * コピーライト情報 / * Hack -- Link a copyright message into the executable */ -const cptr copyright[5] = +const concptr copyright[5] = { "Copyright (c) 1989 James E. Wilson, Robert A. Keoneke", "", @@ -27,11 +27,11 @@ const cptr copyright[5] = int max_macrotrigger = 0; /*!< 現在登録中のマクロ(トリガー)の数 */ -cptr macro_template = NULL; /*!< Angband設定ファイルのT: タグ情報から読み込んだ長いTコードを処理するために利用する文字列ポインタ */ -cptr macro_modifier_chr; /*!< &x# で指定されるマクロトリガーに関する情報を記録する文字列ポインタ */ -cptr macro_modifier_name[MAX_MACRO_MOD]; /*!< マクロ上で取り扱う特殊キーを文字列上で表現するためのフォーマットを記録した文字列ポインタ配列 */ -cptr macro_trigger_name[MAX_MACRO_TRIG]; /*!< マクロのトリガーコード */ -cptr macro_trigger_keycode[2][MAX_MACRO_TRIG]; /*!< マクロの内容 */ +concptr macro_template = NULL; /*!< Angband設定ファイルのT: タグ情報から読み込んだ長いTコードを処理するために利用する文字列ポインタ */ +concptr macro_modifier_chr; /*!< &x# で指定されるマクロトリガーに関する情報を記録する文字列ポインタ */ +concptr macro_modifier_name[MAX_MACRO_MOD]; /*!< マクロ上で取り扱う特殊キーを文字列上で表現するためのフォーマットを記録した文字列ポインタ配列 */ +concptr macro_trigger_name[MAX_MACRO_TRIG]; /*!< マクロのトリガーコード */ +concptr macro_trigger_keycode[2][MAX_MACRO_TRIG]; /*!< マクロの内容 */ int level_up = 0; /*!< レベルアップの際に遅延してcalc_mana()関数上で上昇量を表示するかどうかの判定フラグ */ @@ -249,12 +249,12 @@ s16b macro__num; /* * Array of macro patterns [MACRO_MAX] */ -cptr *macro__pat; +concptr *macro__pat; /* * Array of macro actions [MACRO_MAX] */ -cptr *macro__act; +concptr *macro__act; /* * Array of macro types [MACRO_MAX] @@ -275,7 +275,7 @@ STR_OFFSET quark__num; /* * The pointers to the quarks [QUARK_MAX] */ -cptr *quark__str; +concptr *quark__str; /* @@ -361,7 +361,7 @@ byte angband_color_table[256][4] = /* * Standard sound names */ -const cptr angband_sound_name[SOUND_MAX] = +const concptr angband_sound_name[SOUND_MAX] = { "dummy", "hit", @@ -435,7 +435,7 @@ const cptr angband_sound_name[SOUND_MAX] = /* * Standard music names */ -const cptr angband_music_basic_name[MUSIC_BASIC_MAX] = +const concptr angband_music_basic_name[MUSIC_BASIC_MAX] = { "default", "gameover", @@ -563,7 +563,7 @@ char tval_to_char[128]; /* * Keymaps for each "mode" associated with each keypress. */ -cptr keymap_act[KEYMAP_MODES][256]; +concptr keymap_act[KEYMAP_MODES][256]; @@ -659,29 +659,29 @@ char *d_name; char *d_text; -cptr ANGBAND_SYS = "xxx"; //!< Hack -- The special Angband "System Suffix" This variable is used to choose an appropriate "pref-xxx" file +concptr ANGBAND_SYS = "xxx"; //!< Hack -- The special Angband "System Suffix" This variable is used to choose an appropriate "pref-xxx" file #ifdef JP -cptr ANGBAND_KEYBOARD = "JAPAN"; //!< Hack -- The special Angband "Keyboard Suffix" This variable is used to choose an appropriate macro-trigger definition +concptr ANGBAND_KEYBOARD = "JAPAN"; //!< Hack -- The special Angband "Keyboard Suffix" This variable is used to choose an appropriate macro-trigger definition #else -cptr ANGBAND_KEYBOARD = "0"; +concptr ANGBAND_KEYBOARD = "0"; #endif -cptr ANGBAND_GRAF = "ascii"; //!< Hack -- The special Angband "Graphics Suffix" This variable is used to choose an appropriate "graf-xxx" file -cptr ANGBAND_DIR; //!< Path name: The main "lib" directory This variable is not actually used anywhere in the code -cptr ANGBAND_DIR_APEX; //!< High score files (binary) These files may be portable between platforms -cptr ANGBAND_DIR_BONE; //!< Bone files for player ghosts (ascii) These files are portable between platforms -cptr ANGBAND_DIR_DATA; //!< Binary image files for the "*_info" arrays (binary) These files are not portable between platforms -cptr ANGBAND_DIR_EDIT; //!< Textual template files for the "*_info" arrays (ascii) These files are portable between platforms -cptr ANGBAND_DIR_SCRIPT; //!< Script files These files are portable between platforms. -cptr ANGBAND_DIR_FILE; //!< Various extra files (ascii) These files may be portable between platforms -cptr ANGBAND_DIR_HELP; //!< Help files (normal) for the online help (ascii) These files are portable between platforms -cptr ANGBAND_DIR_INFO; //!< Help files (spoilers) for the online help (ascii) These files are portable between platforms -cptr ANGBAND_DIR_PREF; //!< Default user "preference" files (ascii) These files are rarely portable between platforms -cptr ANGBAND_DIR_SAVE; //!< Savefiles for current characters (binary) -cptr ANGBAND_DIR_USER; //!< User "preference" files (ascii) These files are rarely portable between platforms -cptr ANGBAND_DIR_XTRA; //!< Various extra files (binary) These files are rarely portable between platforms +concptr ANGBAND_GRAF = "ascii"; //!< Hack -- The special Angband "Graphics Suffix" This variable is used to choose an appropriate "graf-xxx" file +concptr ANGBAND_DIR; //!< Path name: The main "lib" directory This variable is not actually used anywhere in the code +concptr ANGBAND_DIR_APEX; //!< High score files (binary) These files may be portable between platforms +concptr ANGBAND_DIR_BONE; //!< Bone files for player ghosts (ascii) These files are portable between platforms +concptr ANGBAND_DIR_DATA; //!< Binary image files for the "*_info" arrays (binary) These files are not portable between platforms +concptr ANGBAND_DIR_EDIT; //!< Textual template files for the "*_info" arrays (ascii) These files are portable between platforms +concptr ANGBAND_DIR_SCRIPT; //!< Script files These files are portable between platforms. +concptr ANGBAND_DIR_FILE; //!< Various extra files (ascii) These files may be portable between platforms +concptr ANGBAND_DIR_HELP; //!< Help files (normal) for the online help (ascii) These files are portable between platforms +concptr ANGBAND_DIR_INFO; //!< Help files (spoilers) for the online help (ascii) These files are portable between platforms +concptr ANGBAND_DIR_PREF; //!< Default user "preference" files (ascii) These files are rarely portable between platforms +concptr ANGBAND_DIR_SAVE; //!< Savefiles for current characters (binary) +concptr ANGBAND_DIR_USER; //!< User "preference" files (ascii) These files are rarely portable between platforms +concptr ANGBAND_DIR_XTRA; //!< Various extra files (binary) These files are rarely portable between platforms /* @@ -867,7 +867,7 @@ bool mon_fight; bool ambush_flag; bool generate_encounter; -cptr screen_dump = NULL; +concptr screen_dump = NULL; /*** Terrain feature variables ***/ diff --git a/src/wild.c b/src/wild.c index acae5cc0f..90f82c9d5 100644 --- a/src/wild.c +++ b/src/wild.c @@ -965,10 +965,10 @@ errr init_wilderness(void) * @param fmt 地勢内の地形数を参照するための独自フォーマット * @return なし */ -static void init_terrain_table(int terrain, s16b feat_global, cptr fmt, ...) +static void init_terrain_table(int terrain, s16b feat_global, concptr fmt, ...) { va_list vp; - cptr p; + concptr p; int cur = 0; char check = 'a'; FEAT_IDX feat; @@ -1158,9 +1158,9 @@ bool change_wild_mode(void) if (have_pet) { #ifdef JP - cptr msg = "ペットを置いて広域マップに入りますか？"; + concptr msg = "ペットを置いて広域マップに入りますか？"; #else - cptr msg = "Do you leave your pets behind? "; + concptr msg = "Do you leave your pets behind? "; #endif if (!get_check_strict(msg, CHECK_OKAY_CANCEL)) diff --git a/src/wizard1.c b/src/wizard1.c index 198c8e92d..65ff8e36b 100644 --- a/src/wizard1.c +++ b/src/wizard1.c @@ -30,7 +30,7 @@ static FILE *fff = NULL; * @param r_ptr モンスター種族の構造体ポインタ * @return シンボル職の記述名 */ -static cptr attr_to_text(monster_race *r_ptr) +static concptr attr_to_text(monster_race *r_ptr) { #ifdef JP000 if (r_ptr->flags1 & RF1_ATTR_CLEAR) return "透明な"; @@ -96,7 +96,7 @@ static cptr attr_to_text(monster_race *r_ptr) typedef struct { OBJECT_TYPE_VALUE tval; - cptr name; + concptr name; } grouper; @@ -286,7 +286,7 @@ static void kind_info(char *buf, char *dam, char *wgt, char *chance, DEPTH *lev, * @param fname ファイル名 * @return なし */ -static void spoil_obj_desc(cptr fname) +static void spoil_obj_desc(concptr fname) { int i, k, s, t, n = 0, group_start = 0; @@ -518,7 +518,7 @@ typedef struct flag_desc flag_desc; struct flag_desc { const int flag; - cptr const desc; + concptr const desc; }; @@ -859,7 +859,7 @@ typedef struct * * This list includes extra attacks, for simplicity. */ - cptr pval_affects[N_ELEMENTS(stat_flags_desc) - 1 + + concptr pval_affects[N_ELEMENTS(stat_flags_desc) - 1 + N_ELEMENTS(pval_flags1_desc) + 1]; } pval_info_type; @@ -882,22 +882,22 @@ typedef struct pval_info_type pval_info; /* A list of an object's slaying preferences */ - cptr slays[N_ELEMENTS(slay_flags_desc) + 1]; + concptr slays[N_ELEMENTS(slay_flags_desc) + 1]; /* A list if an object's elemental brands */ - cptr brands[N_ELEMENTS(brand_flags_desc) + 1]; + concptr brands[N_ELEMENTS(brand_flags_desc) + 1]; /* A list of immunities granted by an object */ - cptr immunities[N_ELEMENTS(immune_flags_desc) + 1]; + concptr immunities[N_ELEMENTS(immune_flags_desc) + 1]; /* A list of resistances granted by an object */ - cptr resistances[N_ELEMENTS(resist_flags_desc) + 1]; + concptr resistances[N_ELEMENTS(resist_flags_desc) + 1]; /* A list of stats sustained by an object */ - cptr sustains[N_ELEMENTS(sustain_flags_desc) - 1 + 1]; + concptr sustains[N_ELEMENTS(sustain_flags_desc) - 1 + 1]; /* A list of various magical qualities an object may have */ - cptr misc_magic[N_ELEMENTS(misc_flags2_desc) + N_ELEMENTS(misc_flags3_desc) + concptr misc_magic[N_ELEMENTS(misc_flags2_desc) + N_ELEMENTS(misc_flags3_desc) + 1 /* Permanent Light */ + 1 /* TY curse */ + 1 /* type of curse */ @@ -907,7 +907,7 @@ typedef struct char addition[80]; /* A string describing an artifact's activation */ - cptr activation; + concptr activation; /* "Level 20, Rarity 30, 3.0 lbs, 20000 Gold" */ char misc_desc[80]; @@ -945,7 +945,7 @@ static void spoiler_blanklines(int n) * @param str 出力したい文字列 * @return なし */ -static void spoiler_underline(cptr str) +static void spoiler_underline(concptr str) { fprintf(fff, "%s\n", str); spoiler_out_n_chars(strlen(str), '-'); @@ -973,9 +973,9 @@ static void spoiler_underline(cptr str) * The possibly updated description pointer is returned. * */ -static cptr *spoiler_flag_aux(const BIT_FLAGS art_flags[TR_FLAG_SIZE], +static concptr *spoiler_flag_aux(const BIT_FLAGS art_flags[TR_FLAG_SIZE], const flag_desc *flag_ptr, - cptr *desc_ptr, const int n_elmnts) + concptr *desc_ptr, const int n_elmnts) { int i; @@ -1017,7 +1017,7 @@ static void analyze_pval(object_type *o_ptr, pval_info_type *pi_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; - cptr *affects_list; + concptr *affects_list; /* If pval == 0, there is nothing to do. */ if (!o_ptr->pval) @@ -1067,7 +1067,7 @@ static void analyze_pval(object_type *o_ptr, pval_info_type *pi_ptr) * @param slay_list 種族スレイ構造体の参照ポインタ * @return なし */ -static void analyze_slay(object_type *o_ptr, cptr *slay_list) +static void analyze_slay(object_type *o_ptr, concptr *slay_list) { BIT_FLAGS flgs[TR_FLAG_SIZE]; @@ -1088,7 +1088,7 @@ static void analyze_slay(object_type *o_ptr, cptr *slay_list) * @param brand_list 属性ブランド構造体の参照ポインタ * @return なし */ -static void analyze_brand(object_type *o_ptr, cptr *brand_list) +static void analyze_brand(object_type *o_ptr, concptr *brand_list) { BIT_FLAGS flgs[TR_FLAG_SIZE]; @@ -1109,7 +1109,7 @@ static void analyze_brand(object_type *o_ptr, cptr *brand_list) * @param resist_list 通常耐性構造体の参照ポインタ * @return なし */ -static void analyze_resist(object_type *o_ptr, cptr *resist_list) +static void analyze_resist(object_type *o_ptr, concptr *resist_list) { BIT_FLAGS flgs[TR_FLAG_SIZE]; @@ -1130,7 +1130,7 @@ static void analyze_resist(object_type *o_ptr, cptr *resist_list) * @param immune_list 免疫構造体の参照ポインタ * @return なし */ -static void analyze_immune(object_type *o_ptr, cptr *immune_list) +static void analyze_immune(object_type *o_ptr, concptr *immune_list) { BIT_FLAGS flgs[TR_FLAG_SIZE]; @@ -1151,7 +1151,7 @@ static void analyze_immune(object_type *o_ptr, cptr *immune_list) * @param sustain_list 維持特性構造体の参照ポインタ * @return なし */ -static void analyze_sustains(object_type *o_ptr, cptr *sustain_list) +static void analyze_sustains(object_type *o_ptr, concptr *sustain_list) { BIT_FLAGS flgs[TR_FLAG_SIZE]; @@ -1188,7 +1188,7 @@ static void analyze_sustains(object_type *o_ptr, cptr *sustain_list) * @param misc_list その他の特性構造体の参照ポインタ * @return なし */ -static void analyze_misc_magic(object_type *o_ptr, cptr *misc_list) +static void analyze_misc_magic(object_type *o_ptr, concptr *misc_list) { BIT_FLAGS flgs[TR_FLAG_SIZE]; POSITION rad; @@ -1401,7 +1401,7 @@ static void print_header(void) * @param separator フラグ表示の区切り記号 * @return なし */ -static void spoiler_outlist(cptr header, cptr *list, char separator) +static void spoiler_outlist(concptr header, concptr *list, char separator) { int line_len, buf_len; char line[MAX_LINE_LEN+1], buf[80]; @@ -1585,7 +1585,7 @@ static bool make_fake_artifact(object_type *o_ptr, IDX name1) * @param fname 生成ファイル名 * @return なし */ -static void spoil_artifact(cptr fname) +static void spoil_artifact(concptr fname) { int i; IDX j; @@ -1662,7 +1662,7 @@ static void spoil_artifact(cptr fname) * @param fname 生成ファイル名 * @return なし */ -static void spoil_mon_desc(cptr fname) +static void spoil_mon_desc(concptr fname) { int i, n = 0; @@ -1730,7 +1730,7 @@ static void spoil_mon_desc(cptr fname) { monster_race *r_ptr = &r_info[who[i]]; - cptr name = (r_name + r_ptr->name); + concptr name = (r_name + r_ptr->name); if (r_ptr->flags7 & (RF7_KAGE)) continue; /* Get the "name" */ @@ -1827,9 +1827,9 @@ static void spoil_mon_desc(cptr fname) * @param str 文字列参照ポインタ * @return なし */ -static void spoil_out(cptr str) +static void spoil_out(concptr str) { - cptr r; + concptr r; /* Line buffer */ static char roff_buf[256]; @@ -1913,9 +1913,9 @@ static void spoil_out(cptr str) #ifdef JP bool k_flag_local; bool iskanji_flag_local = FALSE; - cptr tail = str + (k_flag ? 2 : 1); + concptr tail = str + (k_flag ? 2 : 1); #else - cptr tail = str + 1; + concptr tail = str + 1; #endif for (; *tail; tail++) @@ -1995,7 +1995,7 @@ static void spoil_out(cptr str) * @param str 文字列参照ポインタ * @return なし */ -static void roff_func(TERM_COLOR attr, cptr str) +static void roff_func(TERM_COLOR attr, concptr str) { /* Unused */ (void)attr; @@ -2010,7 +2010,7 @@ static void roff_func(TERM_COLOR attr, cptr str) * @param fname ファイル名 * @return なし */ -static void spoil_mon_info(cptr fname) +static void spoil_mon_info(concptr fname) { char buf[1024]; int i, l, n = 0; @@ -2288,7 +2288,7 @@ static void ang_sort_swap_evol_tree(vptr u, vptr v, int a, int b) * @param fname 出力ファイル名 * @return なし */ -static void spoil_mon_evol(cptr fname) +static void spoil_mon_evol(concptr fname) { char buf[1024]; monster_race *r_ptr; @@ -2596,7 +2596,7 @@ static void spoil_random_artifact_aux(object_type *o_ptr, int i) * @param fname 出力ファイル名 * @return なし */ -void spoil_random_artifact(cptr fname) +void spoil_random_artifact(concptr fname) { int i,j; diff --git a/src/wizard2.c b/src/wizard2.c index bc8c3781a..17c8a2d40 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -231,7 +231,7 @@ static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_LE u32b rarity[K_MAX_DEPTH]; u32b total[K_MAX_DEPTH]; s32b display[22]; - cptr r = "+---Rate---+"; + concptr r = "+---Rate---+"; object_kind *k_ptr; @@ -627,7 +627,7 @@ static void wiz_display_item(object_type *o_ptr) typedef struct tval_desc { int tval; /*!< 大項目のID */ - cptr desc; /*!< 大項目名 */ + concptr desc; /*!< 大項目名 */ } tval_desc; /*! @@ -702,7 +702,7 @@ void strip_name(char *buf, KIND_OBJECT_IDX k_idx) object_kind *k_ptr = &k_info[k_idx]; - cptr str = (k_name + k_ptr->name); + concptr str = (k_name + k_ptr->name); /* Skip past leading characters */ @@ -738,7 +738,7 @@ static KIND_OBJECT_IDX wiz_create_itemtype(void) TERM_LEN col, row; OBJECT_TYPE_VALUE tval; - cptr tval_desc; + concptr tval_desc; char ch; KIND_OBJECT_IDX choice[80]; @@ -831,7 +831,7 @@ static KIND_OBJECT_IDX wiz_create_itemtype(void) */ static void wiz_tweak_item(object_type *o_ptr) { - cptr p; + concptr p; char tmp_val[80]; /* Hack -- leave artifacts alone */ @@ -1011,16 +1011,16 @@ static void wiz_statistics(object_type *o_ptr) u32b test_roll = 1000000; char ch; - cptr quality; + concptr quality; BIT_FLAGS mode; object_type forge; object_type *q_ptr; - cptr q = "Rolls: %ld Correct: %ld Matches: %ld Better: %ld Worse: %ld Other: %ld"; + concptr q = "Rolls: %ld Correct: %ld Matches: %ld Better: %ld Worse: %ld Other: %ld"; - cptr p = "Enter number of items to roll: "; + concptr p = "Enter number of items to roll: "; char tmp_val[80]; @@ -1031,7 +1031,7 @@ static void wiz_statistics(object_type *o_ptr) /* Interact */ while (TRUE) { - cptr pmt = "Roll for [n]ormal, [g]ood, or [e]xcellent treasure? "; + concptr pmt = "Roll for [n]ormal, [g]ood, or [e]xcellent treasure? "; /* Display item */ wiz_display_item(o_ptr); @@ -1246,7 +1246,7 @@ static void do_cmd_wiz_play(void) object_type *o_ptr; char ch; bool changed; - cptr q, s; + concptr q, s; q = "Play with which object? "; s = "You have nothing to play with."; diff --git a/src/xtra1.c b/src/xtra1.c index c41e0ef44..c66ee7aad 100644 --- a/src/xtra1.c +++ b/src/xtra1.c @@ -110,7 +110,7 @@ s16b modify_stat_value(int value, int amount) * @param col 描画行 * @return なし */ -static void prt_field(cptr info, TERM_LEN row, TERM_LEN col) +static void prt_field(concptr info, TERM_LEN row, TERM_LEN col) { /* Dump 13 spaces to clear */ c_put_str(TERM_WHITE, " ", row, col); @@ -144,7 +144,7 @@ void prt_time(void) * @brief 現在のマップ名を返す / * @return マップ名の文字列参照ポインタ */ -cptr map_name(void) +concptr map_name(void) { if (p_ptr->inside_quest && is_fixed_quest_idx(p_ptr->inside_quest) && (quest[p_ptr->inside_quest].flags & QUEST_FLAG_PRESET)) @@ -167,7 +167,7 @@ cptr map_name(void) */ static void prt_dungeon(void) { - cptr dungeon_name; + concptr dungeon_name; TERM_LEN col; /* Dump 13 spaces to clear */ @@ -296,8 +296,8 @@ static void prt_stat(int stat) static struct { TERM_COLOR attr; - cptr sstr; - cptr lstr; + concptr sstr; + concptr lstr; } bar[] #ifdef JP = { @@ -681,7 +681,7 @@ static void prt_status(void) { if (IS_FLG(i)) { - cptr str; + concptr str; if (space == 2) str = bar[i].lstr; else str = bar[i].sstr; @@ -700,7 +700,7 @@ static void prt_status(void) */ static void prt_title(void) { - cptr p = ""; + concptr p = ""; GAME_TEXT str[14]; if (p_ptr->wizard) @@ -1702,8 +1702,8 @@ void print_monster_list(TERM_LEN x, TERM_LEN y, TERM_LEN max_lines){ /* MONRACE_IDX r_idx = m_ptr->ap_r_idx; monster_race* r_ptr = &r_info[r_idx]; - cptr name = (r_name + r_ptr->name); - cptr ename = (r_name + r_ptr->name); + concptr name = (r_name + r_ptr->name); + concptr ename = (r_name + r_ptr->name); //ミミック類や「それ」等は、一覧に出てはいけない if(r_ptr->flags1&RF1_CHAR_CLEAR)continue; if((r_ptr->flags1&RF1_NEVER_MOVE)&&(r_ptr->flags2&RF2_CHAR_MULTI))continue; @@ -2089,7 +2089,7 @@ static void calc_spells(void) int bonus = 0; - cptr p; + concptr p; /* Hack -- must be literate */ if (!mp_ptr->spell_book) return; @@ -4075,7 +4075,7 @@ void calc_bonuses(void) if (object_is_cursed(o_ptr)) p_ptr->cursed |= TRC_TELEPORT; else { - cptr insc = quark_str(o_ptr->inscription); + concptr insc = quark_str(o_ptr->inscription); if (o_ptr->inscription && my_strchr(insc, '.')) { diff --git a/src/xtra2.c b/src/xtra2.c index 2b46503fb..497229407 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -505,7 +505,7 @@ void check_find_art_quest_completion(object_type *o_ptr) * @param r_ptr 撃破されたモンスターの種族情報を持つ構造体の参照ポインタ * @return 撃破されたモンスターの述語 */ -cptr extract_note_dies(MONRACE_IDX r_idx) +concptr extract_note_dies(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; /* Some monsters get "destroyed" */ @@ -1316,7 +1316,7 @@ static void get_exp_from_mon(HIT_POINT dam, monster_type *m_ptr) * to induce changes in the monster recall code. * */ -bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note) +bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, concptr note) { monster_type *m_ptr = &m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -2006,14 +2006,14 @@ void verify_panel(void) /* * Monster health description */ -cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode) +concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode) { monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx]; bool living; int perc; - cptr desc; - cptr attitude; - cptr clone; + concptr desc; + concptr attitude; + concptr clone; /* Determine if the monster is "living" */ living = monster_living(m_ptr->ap_r_idx); @@ -2565,11 +2565,11 @@ bool show_gold_on_floor = FALSE; * * This function must handle blindness/hallucination. */ -static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info) +static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, concptr info) { cave_type *c_ptr = &cave[y][x]; OBJECT_IDX this_o_idx, next_o_idx = 0; - cptr s1 = "", s2 = "", s3 = "", x_info = ""; + concptr s1 = "", s2 = "", s3 = "", x_info = ""; bool boring = TRUE; FEAT_IDX feat; feature_type *f_ptr; @@ -2609,7 +2609,7 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info) /* Hack -- hallucination */ if (p_ptr->image) { - cptr name = _("何か奇妙な物", "something strange"); + concptr name = _("何か奇妙な物", "something strange"); /* Display a message */ #ifdef JP @@ -2943,7 +2943,7 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info) /* Terrain feature if needed */ if (boring || have_flag(f_ptr->flags, FF_REMEMBER)) { - cptr name; + concptr name; /* Hack -- special handling for quest entrances */ if (have_flag(f_ptr->flags, FF_QUEST_ENTER)) @@ -3585,7 +3585,7 @@ bool get_aim_dir(DIRECTION *dp) { DIRECTION dir; char command; - cptr p; + concptr p; COMMAND_CODE code; (*dp) = 0; @@ -3707,7 +3707,7 @@ bool get_aim_dir(DIRECTION *dp) bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed) { DIRECTION dir; - cptr prompt; + concptr prompt; COMMAND_CODE code; (*dp) = 0; @@ -3852,7 +3852,7 @@ bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed) bool get_rep_dir(DIRECTION *dp, bool under) { DIRECTION dir; - cptr prompt; + concptr prompt; COMMAND_CODE code; (*dp) = 0; @@ -3987,7 +3987,7 @@ void gain_level_reward(int chosen_reward) OBJECT_TYPE_VALUE dummy = 0; OBJECT_SUBTYPE_VALUE dummy2 = 0; int type, effect; - cptr reward = NULL; + concptr reward = NULL; GAME_TEXT o_name[MAX_NLEN]; int count = 0; @@ -4805,7 +4805,7 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr) bool get_hack_dir(DIRECTION *dp) { DIRECTION dir; - cptr p; + concptr p; char command; (*dp) = 0; @@ -5029,7 +5029,7 @@ IDX rumor_num(char *zz, IDX max_idx) return (IDX)atoi(zz); } -cptr rumor_bind_name(char *base, cptr fullname) +concptr rumor_bind_name(char *base, concptr fullname) { char *s, *v; @@ -5067,8 +5067,8 @@ void display_rumor(bool ex) if (strncmp(Rumor, "R:", 2) == 0) { char *zz[4]; - cptr rumor_msg = NULL; - cptr rumor_eff_format = NULL; + concptr rumor_msg = NULL; + concptr rumor_eff_format = NULL; char fullname[1024] = ""; if (tokenize(Rumor + 2, 3, zz, TOKENIZE_CHECKQUOTE) == 3) diff --git a/src/z-form.c b/src/z-form.c index b2629baf6..ce2b3dea2 100644 --- a/src/z-form.c +++ b/src/z-form.c @@ -99,7 +99,7 @@ * Append the character "c". * Do not use the "+" or "0" flags. * - * Format("%s", cptr s) + * Format("%s", concptr s) * Append the string "s". * Do not use the "+" or "0" flags. * Note that a "NULL" value of "s" is converted to the empty string. @@ -151,12 +151,12 @@ /* * The "type" of the "user defined print routine" pointer */ -typedef uint (*vstrnfmt_aux_func)(char *buf, uint max, cptr fmt, vptr arg); +typedef uint (*vstrnfmt_aux_func)(char *buf, uint max, concptr fmt, vptr arg); /* * The "default" user defined print routine. Ignore the "fmt" string. */ -static uint vstrnfmt_aux_dflt(char *buf, uint max, cptr fmt, vptr arg) +static uint vstrnfmt_aux_dflt(char *buf, uint max, concptr fmt, vptr arg) { uint len; char tmp[32]; @@ -231,9 +231,9 @@ static vstrnfmt_aux_func vstrnfmt_aux = vstrnfmt_aux_dflt; * the given buffer to a length of zero, and return a "length" of zero. * The contents of "buf", except for "buf[0]", may then be undefined. */ -uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) +uint vstrnfmt(char *buf, uint max, concptr fmt, va_list vp) { - cptr s; + concptr s; /* The argument is "long" */ bool do_long; @@ -547,11 +547,11 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) /* String */ case 's': { - cptr arg; + concptr arg; char arg2[1024]; /* Access next argument */ - arg = va_arg(vp, cptr); + arg = va_arg(vp, concptr); /* Hack -- convert NULL to EMPTY */ if (!arg) arg = ""; @@ -638,7 +638,7 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) * Do a vstrnfmt (see above) into a (growable) static buffer. * This buffer is usable for very short term formatting of results. */ -char *vformat(cptr fmt, va_list vp) +char *vformat(concptr fmt, va_list vp) { static char *format_buf = NULL; static huge format_len = 0; @@ -679,7 +679,7 @@ char *vformat(cptr fmt, va_list vp) /* * Do a vstrnfmt (see above) into a buffer of a given size. */ -uint strnfmt(char *buf, uint max, cptr fmt, ...) +uint strnfmt(char *buf, uint max, concptr fmt, ...) { uint len; @@ -703,7 +703,7 @@ uint strnfmt(char *buf, uint max, cptr fmt, ...) * 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, cptr fmt, ...) +uint strfmt(char *buf, concptr fmt, ...) { uint len; @@ -731,7 +731,7 @@ uint strfmt(char *buf, cptr fmt, ...) * Note that the buffer is (technically) writable, but only up to * the length of the string contained inside it. */ -char *format(cptr fmt, ...) +char *format(concptr fmt, ...) { char *res; va_list vp; @@ -755,7 +755,7 @@ char *format(cptr fmt, ...) /* * Vararg interface to plog() */ -void plog_fmt(cptr fmt, ...) +void plog_fmt(concptr fmt, ...) { char *res; va_list vp; @@ -778,7 +778,7 @@ void plog_fmt(cptr fmt, ...) /* * Vararg interface to quit() */ -void quit_fmt(cptr fmt, ...) +void quit_fmt(concptr fmt, ...) { char *res; va_list vp; @@ -801,7 +801,7 @@ void quit_fmt(cptr fmt, ...) /* * Vararg interface to core() */ -void core_fmt(cptr fmt, ...) +void core_fmt(concptr fmt, ...) { char *res; va_list vp; diff --git a/src/z-form.h b/src/z-form.h index c22a25fb3..5fc818cb1 100644 --- a/src/z-form.h +++ b/src/z-form.h @@ -28,28 +28,28 @@ /**** Available Functions ****/ /* Format arguments into given bounded-length buffer */ -extern uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp); +extern uint vstrnfmt(char *buf, uint max, concptr fmt, va_list vp); /* Simple interface to "vstrnfmt()" */ -extern uint strnfmt(char *buf, uint max, cptr fmt, ...); +extern uint strnfmt(char *buf, uint max, concptr fmt, ...); /* Simple interface to "vstrnfmt()", assuming infinite length */ -extern uint strfmt(char *buf, cptr fmt, ...); +extern uint strfmt(char *buf, concptr fmt, ...); /* Format arguments into a static resizing buffer */ -extern char *vformat(cptr fmt, va_list vp); +extern char *vformat(concptr fmt, va_list vp); /* Simple interface to "vformat()" */ -extern char *format(cptr fmt, ...); +extern char *format(concptr fmt, ...); /* Vararg interface to "plog()", using "format()" */ -extern void plog_fmt(cptr fmt, ...); +extern void plog_fmt(concptr fmt, ...); /* Vararg interface to "quit()", using "format()" */ -extern void quit_fmt(cptr fmt, ...); +extern void quit_fmt(concptr fmt, ...); /* Vararg interface to "core()", using "format()" */ -extern void core_fmt(cptr fmt, ...); +extern void core_fmt(concptr fmt, ...); #endif diff --git a/src/z-term.c b/src/z-term.c index f8c8c5000..76a167ee3 100644 --- a/src/z-term.c +++ b/src/z-term.c @@ -471,7 +471,7 @@ static errr Term_wipe_hack(TERM_LEN x, TERM_LEN y, int n) /* * Hack -- fake hook for "Term_text()" (see above) */ -static errr Term_text_hack(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr cp) +static errr Term_text_hack(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr cp) { /* Unused */ (void)x; @@ -486,7 +486,7 @@ static errr Term_text_hack(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr cp) /* * Hack -- fake hook for "Term_pict()" (see above) */ -static errr Term_pict_hack(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, cptr cp, const TERM_COLOR *tap, cptr tcp) +static errr Term_pict_hack(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, concptr cp, const TERM_COLOR *tap, concptr tcp) { /* Unused */ (void)x; @@ -707,7 +707,7 @@ void Term_queue_line(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR *a, char *c, TERM * a valid location, so the first "n" characters of "s" can all be added * starting at (x,y) without causing any illegal operations. */ -void Term_queue_chars(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr s) +void Term_queue_chars(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s) { TERM_LEN x1 = -1, x2 = -1; @@ -1944,7 +1944,7 @@ errr Term_add_bigch(TERM_COLOR a, char c) * positive value, future calls to either function will * return negative ones. */ -errr Term_addstr(int n, TERM_COLOR a, cptr s) +errr Term_addstr(int n, TERM_COLOR a, concptr s) { int k; TERM_LEN w = Term->wid; @@ -1997,7 +1997,7 @@ errr Term_putch(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c) /* * Move to a location and, using an attr, add a string */ -errr Term_putstr(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr s) +errr Term_putstr(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s) { errr res; @@ -2015,7 +2015,7 @@ errr Term_putstr(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr s) /* * Move to a location and, using an attr, add a string vertically */ -errr Term_putstr_v(TERM_LEN x, TERM_LEN y, int n, byte a, cptr s) +errr Term_putstr_v(TERM_LEN x, TERM_LEN y, int n, byte a, concptr s) { errr res; int i; diff --git a/src/z-term.h b/src/z-term.h index 04702e863..b8d8d82be 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -94,9 +94,9 @@ struct term errr (*curs_hook)(TERM_LEN x, TERM_LEN y); //!< カーソル描画実装部 / Hook for placing the cursor errr (*bigcurs_hook)(TERM_LEN x, TERM_LEN y); //!< 大型タイル時カーソル描画実装部 / Hook for placing the cursor on bigtile mode errr (*wipe_hook)(TERM_LEN x, TERM_LEN y, int n); //!< 指定座標テキスト消去実装部 / Hook for drawing some blank spaces - errr (*text_hook)(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr s); //!< テキスト描画実装部 / Hook for drawing a string of chars using an attr + errr (*text_hook)(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s); //!< テキスト描画実装部 / Hook for drawing a string of chars using an attr void (*resize_hook)(void); //!< 画面リサイズ実装部 - errr (*pict_hook)(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR *ap, cptr cp, const TERM_COLOR *tap, cptr tcp); //!< タイル描画実装部 / Hook for drawing a sequence of special attr / char pairs + errr (*pict_hook)(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR *ap, concptr cp, const TERM_COLOR *tap, concptr tcp); //!< タイル描画実装部 / Hook for drawing a sequence of special attr / char pairs }; @@ -159,7 +159,7 @@ extern void Term_queue_bigchar(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TER extern void Term_queue_line(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR *a, char *c, TERM_COLOR *ta, char *tc); -extern void Term_queue_chars(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr s); +extern void Term_queue_chars(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s); extern errr Term_fresh(void); extern errr Term_set_cursor(int v); @@ -167,11 +167,11 @@ extern errr Term_gotoxy(TERM_LEN x, TERM_LEN y); extern errr Term_draw(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c); extern errr Term_addch(TERM_COLOR a, char c); extern errr Term_add_bigch(TERM_COLOR a, char c); -extern errr Term_addstr(int n, TERM_COLOR a, cptr s); +extern errr Term_addstr(int n, TERM_COLOR a, concptr s); extern errr Term_putch(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c); -extern errr Term_putstr(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr s); +extern errr Term_putstr(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s); #ifdef JP -extern errr Term_putstr_v(TERM_LEN x, TERM_LEN y, int n, byte a, cptr s); +extern errr Term_putstr_v(TERM_LEN x, TERM_LEN y, int n, byte a, concptr s); #endif extern errr Term_erase(TERM_LEN x, TERM_LEN y, int n); extern errr Term_clear(void); diff --git a/src/z-util.c b/src/z-util.c index d81f6f96f..a89c55a28 100644 --- a/src/z-util.c +++ b/src/z-util.c @@ -16,13 +16,13 @@ /* * Convenient storage of the program name */ -cptr argv0 = NULL; +concptr argv0 = NULL; /* * Determine if string "t" is equal to string "t" */ -bool streq(cptr a, cptr b) +bool streq(concptr a, concptr b) { return (!strcmp(a, b)); } @@ -31,7 +31,7 @@ bool streq(cptr a, cptr b) /* * Determine if string "t" is a suffix of string "s" */ -bool suffix(cptr s, cptr t) +bool suffix(concptr s, concptr t) { int tlen = strlen(t); int slen = strlen(s); @@ -47,7 +47,7 @@ bool suffix(cptr s, cptr t) /* * Determine if string "t" is a prefix of string "s" */ -bool prefix(cptr s, cptr t) +bool prefix(concptr s, concptr t) { /* Scan "t" */ while (*t) @@ -65,13 +65,13 @@ bool prefix(cptr s, cptr t) /* * Redefinable "plog" action */ -void (*plog_aux)(cptr) = NULL; +void (*plog_aux)(concptr) = NULL; /* * Print (or log) a "warning" message (ala "perror()") * Note the use of the (optional) "plog_aux" hook. */ -void plog(cptr str) +void plog(concptr str) { /* Use the "alternative" function if possible */ if (plog_aux) (*plog_aux)(str); @@ -85,7 +85,7 @@ void plog(cptr str) /* * Redefinable "quit" action */ -void (*quit_aux)(cptr) = NULL; +void (*quit_aux)(concptr) = NULL; /* * Exit (ala "exit()"). If 'str' is NULL, do "exit(0)". @@ -93,7 +93,7 @@ void (*quit_aux)(cptr) = NULL; * Otherwise, plog() 'str' and exit with an error code of -1. * But always use 'quit_aux', if set, before anything else. */ -void quit(cptr str) +void quit(concptr str) { /* Attempt to use the aux function */ if (quit_aux) (*quit_aux)(str); @@ -116,13 +116,13 @@ void quit(cptr str) /* * Redefinable "core" action */ -void (*core_aux)(cptr) = NULL; +void (*core_aux)(concptr) = NULL; /* * Dump a core file, after printing a warning message * As with "quit()", try to use the "core_aux()" hook first. */ -void core(cptr str) +void core(concptr str) { char *crash = NULL; diff --git a/src/z-util.h b/src/z-util.h index fab0aa476..cba4163b1 100644 --- a/src/z-util.h +++ b/src/z-util.h @@ -23,32 +23,32 @@ /**** Available variables ****/ -/* A cptr to the name of the program */ -extern cptr argv0; +/* A concptr to the name of the program */ +extern concptr argv0; /* Aux functions */ -extern void (*plog_aux)(cptr); -extern void (*quit_aux)(cptr); -extern void (*core_aux)(cptr); +extern void (*plog_aux)(concptr); +extern void (*quit_aux)(concptr); +extern void (*core_aux)(concptr); /**** Available Functions ****/ /* Test equality, prefix, suffix */ -extern bool streq(cptr s, cptr t); -extern bool prefix(cptr s, cptr t); -extern bool suffix(cptr s, cptr t); +extern bool streq(concptr s, concptr t); +extern bool prefix(concptr s, concptr t); +extern bool suffix(concptr s, concptr t); /* Print an error message */ -extern void plog(cptr str); +extern void plog(concptr str); /* Exit, with optional message */ -extern void quit(cptr str); +extern void quit(concptr str); /* Dump core, with optional message */ -extern void core(cptr str); +extern void core(concptr str); /* 64-bit integer operations */ diff --git a/src/z-virt.c b/src/z-virt.c index 400d25adf..72303a92b 100644 --- a/src/z-virt.c +++ b/src/z-virt.c @@ -136,10 +136,10 @@ vptr ralloc(huge len) /* * Allocate a constant string, containing the same thing as 'str' */ -cptr string_make(cptr str) +concptr string_make(concptr str) { huge len = 0; - cptr t = str; + concptr t = str; char *s, *res; /* Simple sillyness */ @@ -163,7 +163,7 @@ cptr string_make(cptr str) * Un-allocate a string allocated above. * Depends on no changes being made to the string. */ -errr string_free(cptr str) +errr string_free(concptr str) { huge len = 0; diff --git a/src/z-virt.h b/src/z-virt.h index 2931f230e..206473516 100644 --- a/src/z-virt.h +++ b/src/z-virt.h @@ -161,10 +161,10 @@ extern vptr rpanic(huge len); extern vptr ralloc(huge len); /* Create a "dynamic string" */ -extern cptr string_make(cptr str); +extern concptr string_make(concptr str); /* Free a string allocated with "string_make()" */ -extern errr string_free(cptr str); +extern errr string_free(concptr str); -- 2.11.0