From: Hourier Date: Thu, 16 Jul 2020 09:37:27 +0000 (+0900) Subject: [Refactor] #40567 Renamed Term_*() to term_*() X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4437a5b4efe973981d03d9af8ca23d4093fd221d;p=hengband%2Fhengband.git [Refactor] #40567 Renamed Term_*() to term_*() --- diff --git a/src/action/travel-execution.c b/src/action/travel-execution.c index 9918fcd14..6117029a6 100644 --- a/src/action/travel-execution.c +++ b/src/action/travel-execution.c @@ -103,7 +103,7 @@ void travel_step(player_type *creature_ptr) } else if (travel.run > 0) travel.run--; - Term_xtra(TERM_XTRA_DELAY, delay_factor); + term_xtra(TERM_XTRA_DELAY, delay_factor); } /*! diff --git a/src/autopick/autopick-command-menu.c b/src/autopick/autopick-command-menu.c index 37d8e59e2..658656d64 100644 --- a/src/autopick/autopick-command-menu.c +++ b/src/autopick/autopick-command-menu.c @@ -31,7 +31,7 @@ static void redraw_edit_command_menu(bool *redraw, int level, int start, char *l int col0 = 5 + level * 7; int row0 = 1 + level * 3; int row1 = row0 + 1; - Term_putstr(col0, row0, -1, TERM_WHITE, linestr); + term_putstr(col0, row0, -1, TERM_WHITE, linestr); *menu_key = 0; for (int i = start; menu_data[i].level >= level; i++) @@ -57,12 +57,12 @@ static void redraw_edit_command_menu(bool *redraw, int level, int start, char *l str = format("| %c) %-*s %2s | ", *menu_key + 'a', max_len, menu_data[i].name, com_key_str); - Term_putstr(col0, row1++, -1, TERM_WHITE, str); + term_putstr(col0, row1++, -1, TERM_WHITE, str); (*menu_key)++; } - Term_putstr(col0, row1, -1, TERM_WHITE, linestr); + term_putstr(col0, row1, -1, TERM_WHITE, linestr); *redraw = FALSE; } diff --git a/src/autopick/autopick-drawer.c b/src/autopick/autopick-drawer.c index 4d1801480..616e97601 100644 --- a/src/autopick/autopick-drawer.c +++ b/src/autopick/autopick-drawer.c @@ -56,7 +56,7 @@ void draw_text_editor(player_type *player_ptr, text_body_type *tb) { int by1 = 0, by2 = 0; - Term_get_size(&tb->wid, &tb->hgt); + term_get_size(&tb->wid, &tb->hgt); /* * Top line (-1), description line (-3), separator (-1) @@ -99,7 +99,7 @@ void draw_text_editor(player_type *player_ptr, text_body_type *tb) if (tb->dirty_flags & DIRTY_SCREEN) { tb->dirty_flags |= (DIRTY_ALL | DIRTY_MODE); - Term_clear(); + term_clear(); } if (tb->dirty_flags & DIRTY_MODE) @@ -110,7 +110,7 @@ void draw_text_editor(player_type *player_ptr, text_body_type *tb) for (; j < sepa_length; j++) buf[j] = '-'; buf[j] = '\0'; - Term_putstr(0, tb->hgt + 1, sepa_length, TERM_WHITE, buf); + term_putstr(0, tb->hgt + 1, sepa_length, TERM_WHITE, buf); } process_dirty_expression(player_ptr, tb); @@ -153,7 +153,7 @@ void draw_text_editor(player_type *player_ptr, text_body_type *tb) #endif } - Term_erase(0, i + 1, tb->wid); + term_erase(0, i + 1, tb->wid); if (tb->states[y] & LSTAT_AUTOREGISTER) { color = TERM_L_RED; @@ -166,11 +166,11 @@ void draw_text_editor(player_type *player_ptr, text_body_type *tb) if (!tb->mark || (y < by1 || by2 < y)) { - Term_putstr(leftcol, i + 1, tb->wid - 1, color, msg); + term_putstr(leftcol, i + 1, tb->wid - 1, color, msg); } else if (by1 != by2) { - Term_putstr(leftcol, i + 1, tb->wid - 1, TERM_YELLOW, msg); + term_putstr(leftcol, i + 1, tb->wid - 1, TERM_YELLOW, msg); } else { @@ -181,16 +181,16 @@ void draw_text_editor(player_type *player_ptr, text_body_type *tb) if (bx2 > len) bx2 = len; - Term_gotoxy(leftcol, i + 1); - if (x0 < bx1) Term_addstr(bx1 - x0, color, msg); - if (x0 < bx2) Term_addstr(bx2 - bx1, TERM_YELLOW, msg + (bx1 - x0)); - Term_addstr(-1, color, msg + (bx2 - x0)); + term_gotoxy(leftcol, i + 1); + if (x0 < bx1) term_addstr(bx1 - x0, color, msg); + if (x0 < bx2) term_addstr(bx2 - bx1, TERM_YELLOW, msg + (bx1 - x0)); + term_addstr(-1, color, msg + (bx2 - x0)); } } for (; i < tb->hgt; i++) { - Term_erase(0, i + 1, tb->wid); + term_erase(0, i + 1, tb->wid); } bool is_dirty_diary = (tb->dirty_flags & (DIRTY_ALL | DIRTY_NOT_FOUND | DIRTY_NO_SEARCH)) != 0; @@ -201,7 +201,7 @@ void draw_text_editor(player_type *player_ptr, text_body_type *tb) concptr str1 = NULL, str2 = NULL; for (int j = 0; j < DESCRIPT_HGT; j++) { - Term_erase(0, tb->hgt + 2 + j, tb->wid); + term_erase(0, tb->hgt + 2 + j, tb->wid); } if (tb->dirty_flags & DIRTY_NOT_FOUND) diff --git a/src/autopick/autopick-editor-command.c b/src/autopick/autopick-editor-command.c index 3d41c83ec..57a5383c2 100644 --- a/src/autopick/autopick-editor-command.c +++ b/src/autopick/autopick-editor-command.c @@ -594,8 +594,8 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int case EC_INSERT_MACRO: { draw_text_editor(player_ptr, tb); - Term_erase(0, tb->cy - tb->upper + 1, tb->wid); - Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, _("P:<トリガーキー>: ", "P:: ")); + term_erase(0, tb->cy - tb->upper + 1, tb->wid); + term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, _("P:<トリガーキー>: ", "P:: ")); if (!insert_macro_line(tb)) break; tb->cx = 2; @@ -606,8 +606,8 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int case EC_INSERT_KEYMAP: { draw_text_editor(player_ptr, tb); - Term_erase(0, tb->cy - tb->upper + 1, tb->wid); - Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, + term_erase(0, tb->cy - tb->upper + 1, tb->wid); + term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, format(_("C:%d:<コマンドキー>: ", "C:%d:: "), (rogue_like_commands ? KEYMAP_MODE_ROGUE : KEYMAP_MODE_ORIG))); if (!insert_keymap_line(tb)) break; diff --git a/src/autopick/autopick-finder.c b/src/autopick/autopick-finder.c index 3a6378cff..49a222868 100644 --- a/src/autopick/autopick-finder.c +++ b/src/autopick/autopick-finder.c @@ -110,9 +110,9 @@ byte get_string_for_search(player_type *player_ptr, object_type **o_handle, conc int pos = 0; while (TRUE) { bool back = FALSE; - Term_erase(col, 0, 255); - Term_putstr(col, 0, -1, color, buf); - Term_gotoxy(col + pos, 0); + term_erase(col, 0, 255); + term_putstr(col, 0, -1, color, buf); + term_gotoxy(col + pos, 0); int skey = inkey_special(TRUE); switch (skey) { diff --git a/src/birth/birth-wizard.c b/src/birth/birth-wizard.c index a907776b7..2983dca09 100644 --- a/src/birth/birth-wizard.c +++ b/src/birth/birth-wizard.c @@ -47,7 +47,7 @@ static void display_initial_birth_message(player_type *creature_ptr) { - Term_clear(); + term_clear(); put_str(_("名前 :", "Name :"), 1, 26); put_str(_("性別 :", "Sex :"), 3, 1); put_str(_("種族 :", "Race :"), 4, 1); @@ -352,7 +352,7 @@ static bool display_auto_roller_count(player_type *creature_ptr, const int col) birth_put_stats(creature_ptr); put_str(format("%10ld", auto_round), 10, col + 20); - Term_fresh(); + term_fresh(); inkey_scan = TRUE; if (inkey()) { get_ahw(creature_ptr); @@ -387,21 +387,21 @@ static bool display_auto_roller_result(player_type *creature_ptr, bool prev, cha creature_ptr->chp = creature_ptr->mhp; creature_ptr->csp = creature_ptr->msp; display_player(creature_ptr, mode); - Term_gotoxy(2, 23); + term_gotoxy(2, 23); const char b1 = '['; - Term_addch(TERM_WHITE, b1); - Term_addstr(-1, TERM_WHITE, _("'r' 次の数値", "'r'eroll")); + term_addch(TERM_WHITE, b1); + term_addstr(-1, TERM_WHITE, _("'r' 次の数値", "'r'eroll")); if (prev) - Term_addstr(-1, TERM_WHITE, _(", 'p' 前の数値", "'p'previous")); + term_addstr(-1, TERM_WHITE, _(", 'p' 前の数値", "'p'previous")); if (mode) - Term_addstr(-1, TERM_WHITE, _(", 'h' その他の情報", ", 'h' Misc.")); + term_addstr(-1, TERM_WHITE, _(", 'h' その他の情報", ", 'h' Misc.")); else - Term_addstr(-1, TERM_WHITE, _(", 'h' 生い立ちを表示", ", 'h'istory")); + term_addstr(-1, TERM_WHITE, _(", 'h' 生い立ちを表示", ", 'h'istory")); - Term_addstr(-1, TERM_WHITE, _(", Enter この数値に決定", ", or Enter to accept")); + term_addstr(-1, TERM_WHITE, _(", Enter この数値に決定", ", or Enter to accept")); const char b2 = ']'; - Term_addch(TERM_WHITE, b2); + term_addch(TERM_WHITE, b2); *c = inkey(); if (*c == 'Q') birth_quit(); @@ -437,7 +437,7 @@ static bool display_auto_roller(player_type *creature_ptr, chara_limit_type char while (TRUE) { int col = 42; if (autoroller || autochara) { - Term_clear(); + term_clear(); put_str(_("回数 :", "Round:"), 10, col + 13); put_str(_("(ESCで停止)", "(Hit ESC to stop)"), 12, col + 13); } else { diff --git a/src/birth/history-editor.c b/src/birth/history-editor.c index bc3d18150..875795746 100644 --- a/src/birth/history-editor.c +++ b/src/birth/history-editor.c @@ -51,7 +51,7 @@ void edit_history(player_type *creature_ptr, void (*process_autopick_file_comman #endif c_put_str(TERM_L_BLUE, format("%c", creature_ptr->history[y][x]), y + 12, x + 10); - Term_gotoxy(x + 10, y + 12); + term_gotoxy(x + 10, y + 12); int skey = inkey_special(TRUE); if (!(skey & SKEY_MASK)) c = (char)skey; @@ -100,8 +100,8 @@ void edit_history(player_type *creature_ptr, void (*process_autopick_file_comman x--; #endif } else if (c == '\r' || c == '\n') { - Term_erase(0, 11, 255); - Term_erase(0, 17, 255); + term_erase(0, 11, 255); + term_erase(0, 17, 255); put_str(_("(キャラクターの生い立ち - 編集済み)", "(Character Background - Edited)"), 11, 20); break; } else if (c == ESCAPE) { diff --git a/src/birth/quick-start.c b/src/birth/quick-start.c index fe8647fb0..76d1e1f2f 100644 --- a/src/birth/quick-start.c +++ b/src/birth/quick-start.c @@ -27,7 +27,7 @@ bool ask_quick_start(player_type *creature_ptr) if (!previous_char.quick_ok) return FALSE; - Term_clear(); + term_clear(); put_str(_("クイック・スタートを使うと以前と全く同じキャラクターで始められます。", "Do you want to use the quick start function(same character as your last one)."), 11, 2); diff --git a/src/cmd-action/cmd-move.c b/src/cmd-action/cmd-move.c index 7bbb98c53..a90af126b 100644 --- a/src/cmd-action/cmd-move.c +++ b/src/cmd-action/cmd-move.c @@ -423,5 +423,5 @@ void do_cmd_rest(player_type *creature_ptr) update_creature(creature_ptr); creature_ptr->redraw |= (PR_STATE); update_output(creature_ptr); - Term_fresh(); + term_fresh(); } diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c index 947138f82..faa013d76 100644 --- a/src/cmd-action/cmd-pet.c +++ b/src/cmd-action/cmd-pet.c @@ -165,7 +165,7 @@ void do_cmd_pet_dismiss(player_type *creature_ptr) Term->scr->cu = cu; Term->scr->cv = cv; - Term_fresh(); + term_fresh(); C_KILL(who, current_world_ptr->max_m_idx, MONSTER_IDX); diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c index 5f7a068be..7ee14f531 100644 --- a/src/cmd-action/cmd-spell.c +++ b/src/cmd-action/cmd-spell.c @@ -643,10 +643,10 @@ void do_cmd_browse(player_type *caster_ptr) } /* Clear lines, position cursor (really should use strlen here) */ - Term_erase(14, 14, 255); - Term_erase(14, 13, 255); - Term_erase(14, 12, 255); - Term_erase(14, 11, 255); + term_erase(14, 14, 255); + term_erase(14, 13, 255); + term_erase(14, 12, 255); + term_erase(14, 11, 255); shape_buffer(exe_spell(caster_ptr, use_realm, spell, SPELL_DESC), 62, temp, sizeof(temp)); diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c index 735825dda..2f3918675 100644 --- a/src/cmd-building/cmd-building.c +++ b/src/cmd-building/cmd-building.c @@ -409,7 +409,7 @@ void do_cmd_building(player_type *player_ptr) if (reinit_wilderness) player_ptr->leaving = TRUE; current_world_ptr->character_icky--; - Term_clear(); + term_clear(); player_ptr->update |= (PU_VIEW | PU_MONSTERS | PU_BONUS | PU_LITE | PU_MON_LITE); player_ptr->redraw |= (PR_BASIC | PR_EXTRA | PR_EQUIPPY | PR_MAP); diff --git a/src/cmd-io/cmd-autopick.c b/src/cmd-io/cmd-autopick.c index 445164ff7..1febc932a 100644 --- a/src/cmd-io/cmd-autopick.c +++ b/src/cmd-io/cmd-autopick.c @@ -155,7 +155,7 @@ void do_cmd_edit_autopick(player_type *player_ptr) prt(format("(%d,%d)-(%d,%d)", tb->mx, tb->my, tb->cx, tb->cy), 0, 60); } - Term_gotoxy(tb->cx - tb->left, tb->cy - tb->upper + 1); + term_gotoxy(tb->cx - tb->left, tb->cy - tb->upper + 1); tb->dirty_flags = 0; tb->dirty_line = -1; tb->old_cy = tb->cy; diff --git a/src/cmd-io/cmd-diary.c b/src/cmd-io/cmd-diary.c index 18864586f..e54190c4b 100644 --- a/src/cmd-io/cmd-diary.c +++ b/src/cmd-io/cmd-diary.c @@ -122,7 +122,7 @@ void do_cmd_diary(player_type *creature_ptr) int i; while (TRUE) { - Term_clear(); + term_clear(); prt(_("[ 記録の設定 ]", "[ Play Record ]"), 2, 0); prt(_("(1) 記録を見る", "(1) Display your record"), 4, 5); prt(_("(2) 文章を記録する", "(2) Add record"), 5, 5); diff --git a/src/cmd-io/cmd-dump.c b/src/cmd-io/cmd-dump.c index 3303a4cff..a7d57bb8e 100644 --- a/src/cmd-io/cmd-dump.c +++ b/src/cmd-io/cmd-dump.c @@ -67,7 +67,7 @@ void do_cmd_colors(player_type *creature_ptr, void(*process_autopick_file_comman screen_save(); while (TRUE) { - Term_clear(); + term_clear(); prt(_("[ カラーの設定 ]", "Interact with Colors"), 2, 0); prt(_("(1) ユーザー設定ファイルのロード", "(1) Load a user pref file"), 4, 5); prt(_("(2) カラーの設定をファイルに書き出す", "(2) Dump colors"), 5, 5); @@ -84,8 +84,8 @@ void do_cmd_colors(player_type *creature_ptr, void(*process_autopick_file_comman if (!askfor(tmp, 70)) continue; (void)process_pref_file(creature_ptr, tmp, process_autopick_file_command); - Term_xtra(TERM_XTRA_REACT, 0); - Term_redraw(); + term_xtra(TERM_XTRA_REACT, 0); + term_redraw(); } else if (i == '2') { @@ -129,20 +129,20 @@ void do_cmd_colors(player_type *creature_ptr, void(*process_autopick_file_comman clear_from(10); for (byte j = 0; j < 16; j++) { - Term_putstr(j * 4, 20, -1, a, "###"); - Term_putstr(j * 4, 22, -1, j, format("%3d", j)); + term_putstr(j * 4, 20, -1, a, "###"); + term_putstr(j * 4, 22, -1, j, format("%3d", j)); } name = ((a < 16) ? color_names[a] : _("未定義", "undefined")); - Term_putstr(5, 10, -1, TERM_WHITE, + term_putstr(5, 10, -1, TERM_WHITE, format(_("カラー = %d, 名前 = %s", "Color = %d, Name = %s"), a, name)); - Term_putstr(5, 12, -1, TERM_WHITE, + term_putstr(5, 12, -1, TERM_WHITE, format("K = 0x%02x / R,G,B = 0x%02x,0x%02x,0x%02x", angband_color_table[a][0], angband_color_table[a][1], angband_color_table[a][2], angband_color_table[a][3])); - Term_putstr(0, 14, -1, TERM_WHITE, + term_putstr(0, 14, -1, TERM_WHITE, _("コマンド (n/N/k/K/r/R/g/G/b/B): ", "Command (n/N/k/K/r/R/g/G/b/B): ")); i = inkey(); if (i == ESCAPE) break; @@ -158,8 +158,8 @@ void do_cmd_colors(player_type *creature_ptr, void(*process_autopick_file_comman if (i == 'b') angband_color_table[a][3] = (byte)(angband_color_table[a][3] + 1); if (i == 'B') angband_color_table[a][3] = (byte)(angband_color_table[a][3] - 1); - Term_xtra(TERM_XTRA_REACT, 0); - Term_redraw(); + term_xtra(TERM_XTRA_REACT, 0); + term_redraw(); } } else diff --git a/src/cmd-io/cmd-gameoption.c b/src/cmd-io/cmd-gameoption.c index 8257baef9..59cc9b1fe 100644 --- a/src/cmd-io/cmd-gameoption.c +++ b/src/cmd-io/cmd-gameoption.c @@ -91,7 +91,7 @@ static void do_cmd_options_autosave(player_type *player_ptr, concptr info) char ch; int i, k = 0, n = 2; char buf[80]; - Term_clear(); + term_clear(); while (TRUE) { sprintf(buf, _("%s ( リターンで次へ, y/n でセット, F で頻度を入力, ESC で決定 ) ", "%s (RET to advance, y/n to set, 'F' for frequency, ESC to accept) "), info); @@ -154,7 +154,7 @@ static void do_cmd_options_autosave(player_type *player_ptr, concptr info) case '?': { (void)show_file(player_ptr, TRUE, _("joption.txt#Autosave", "option.txt#Autosave"), NULL, 0, 0); - Term_clear(); + term_clear(); break; } @@ -184,7 +184,7 @@ static void do_cmd_options_win(player_type *player_ptr) old_flag[j] = window_flag[j]; } - Term_clear(); + term_clear(); while (go) { prt(_("ウィンドウ・フラグ (<方向>で移動, tでチェンジ, y/n でセット, ESC)", "Window Flags (, t, y, n, ESC) "), 0, 0); for (j = 0; j < 8; j++) { @@ -193,7 +193,7 @@ static void do_cmd_options_win(player_type *player_ptr) if (j == x) a = TERM_L_BLUE; - Term_putstr(35 + j * 5 - strlen(s) / 2, 2 + j % 2, -1, a, s); + term_putstr(35 + j * 5 - strlen(s) / 2, 2 + j % 2, -1, a, s); } for (i = 0; i < 16; i++) { @@ -205,7 +205,7 @@ static void do_cmd_options_win(player_type *player_ptr) if (!str) str = _("(未使用)", "(Unused option)"); - Term_putstr(0, i + 5, -1, a, str); + term_putstr(0, i + 5, -1, a, str); for (j = 0; j < 8; j++) { char c = '.'; a = TERM_WHITE; @@ -215,11 +215,11 @@ static void do_cmd_options_win(player_type *player_ptr) if (window_flag[j] & (1L << i)) c = 'X'; - Term_putch(35 + j * 5, i + 5, a, c); + term_putch(35 + j * 5, i + 5, a, c); } } - Term_gotoxy(35 + x * 5, y + 5); + term_gotoxy(35 + x * 5, y + 5); ch = inkey(); switch (ch) { case ESCAPE: { @@ -252,7 +252,7 @@ static void do_cmd_options_win(player_type *player_ptr) } case '?': { (void)show_file(player_ptr, TRUE, _("joption.txt#Window", "option.txt#Window"), NULL, 0, 0); - Term_clear(); + term_clear(); break; } default: { @@ -273,10 +273,10 @@ static void do_cmd_options_win(player_type *player_ptr) if (window_flag[j] == old_flag[j]) continue; - Term_activate(angband_term[j]); - Term_clear(); - Term_fresh(); - Term_activate(old); + term_activate(angband_term[j]); + term_clear(); + term_fresh(); + term_activate(old); } } @@ -291,7 +291,7 @@ static void do_cmd_options_cheat(player_type *player_ptr, concptr info) char ch; int i, k = 0, n = MAX_CHEAT_OPTIONS; char buf[80]; - Term_clear(); + term_clear(); while (TRUE) { DIRECTION dir; sprintf(buf, _("%s ( リターンで次へ, y/n でセット, ESC で決定 )", "%s (RET to advance, y/n to set, ESC to accept) "), info); @@ -357,7 +357,7 @@ static void do_cmd_options_cheat(player_type *player_ptr, concptr info) case '?': { strnfmt(buf, sizeof(buf), _("joption.txt#%s", "option.txt#%s"), cheat_info[k].o_text); (void)show_file(player_ptr, TRUE, buf, NULL, 0, 0); - Term_clear(); + term_clear(); break; } default: { @@ -408,14 +408,14 @@ void do_cmd_options(player_type *player_ptr) if (!current_world_ptr->noscore && !allow_debug_opts) n--; - Term_clear(); + term_clear(); prt(_("[ オプションの設定 ]", "Game options"), 1, 0); while (TRUE) { for (i = 0; i < n; i++) { byte a = TERM_WHITE; if (i == y) a = TERM_L_BLUE; - Term_putstr(5, option_fields[i].row, -1, a, format("(%c) %s", toupper(option_fields[i].key), option_fields[i].name)); + term_putstr(5, option_fields[i].row, -1, a, format("(%c) %s", toupper(option_fields[i].key), option_fields[i].name)); } prt(_("<方向>で移動, Enterで決定, ESCでキャンセル, ?でヘルプ: ", "Move to , Select to Enter, Cancel to ESC, ? to help: "), 21, 0); @@ -533,7 +533,7 @@ void do_cmd_options(player_type *player_ptr) break; else if (k == '?') { (void)show_file(player_ptr, TRUE, _("joption.txt#BaseDelay", "option.txt#BaseDelay"), NULL, 0, 0); - Term_clear(); + term_clear(); } else if (isdigit(k)) delay_factor = D2I(k); else @@ -554,7 +554,7 @@ void do_cmd_options(player_type *player_ptr) break; else if (k == '?') { (void)show_file(player_ptr, TRUE, _("joption.txt#Hitpoint", "option.txt#Hitpoint"), NULL, 0, 0); - Term_clear(); + term_clear(); } else if (isdigit(k)) hitpoint_warn = D2I(k); else @@ -575,7 +575,7 @@ void do_cmd_options(player_type *player_ptr) break; else if (k == '?') { (void)show_file(player_ptr, TRUE, _("joption.txt#Manapoint", "option.txt#Manapoint"), NULL, 0, 0); - Term_clear(); + term_clear(); } else if (isdigit(k)) mana_warn = D2I(k); else @@ -586,7 +586,7 @@ void do_cmd_options(player_type *player_ptr) } case '?': (void)show_file(player_ptr, TRUE, _("joption.txt", "option.txt"), NULL, 0, 0); - Term_clear(); + term_clear(); break; default: { bell(); @@ -624,7 +624,7 @@ void do_cmd_options_aux(player_type *player_ptr, int page, concptr info) opt[n++] = i; } - Term_clear(); + term_clear(); while (TRUE) { DIRECTION dir; sprintf(buf, _("%s (リターン:次, %sESC:終了, ?:ヘルプ) ", "%s (RET:next, %s, ?:help) "), info, @@ -701,7 +701,7 @@ void do_cmd_options_aux(player_type *player_ptr, int page, concptr info) case '?': { strnfmt(buf, sizeof(buf), _("joption.txt#%s", "option.txt#%s"), option_info[opt[k]].o_text); (void)show_file(player_ptr, TRUE, buf, NULL, 0, 0); - Term_clear(); + term_clear(); break; } default: { diff --git a/src/cmd-io/cmd-knowledge.c b/src/cmd-io/cmd-knowledge.c index 8162d1a25..63300223f 100644 --- a/src/cmd-io/cmd-knowledge.c +++ b/src/cmd-io/cmd-knowledge.c @@ -27,7 +27,7 @@ void do_cmd_knowledge(player_type *creature_ptr) bool need_redraw = FALSE; screen_save(); while (TRUE) { - Term_clear(); + term_clear(); prt(format(_("%d/2 ページ", "page %d/2"), (p + 1)), 2, 65); prt(_("現在の知識を確認する", "Display current knowledge"), 3, 0); if (p == 0) { diff --git a/src/cmd-io/cmd-lore.c b/src/cmd-io/cmd-lore.c index c459bd2cf..ba5b8aa79 100644 --- a/src/cmd-io/cmd-lore.c +++ b/src/cmd-io/cmd-lore.c @@ -174,7 +174,7 @@ void do_cmd_query_symbol(player_type *creature_ptr) } roff_top(r_idx); - Term_addstr(-1, TERM_WHITE, _(" ['r'思い出, ESC]", " [(r)ecall, ESC]")); + term_addstr(-1, TERM_WHITE, _(" ['r'思い出, ESC]", " [(r)ecall, ESC]")); query = inkey(); if (recall) { screen_load(); diff --git a/src/cmd-io/cmd-macro.c b/src/cmd-io/cmd-macro.c index c2917e441..f573ea660 100644 --- a/src/cmd-io/cmd-macro.c +++ b/src/cmd-io/cmd-macro.c @@ -72,7 +72,7 @@ static void do_cmd_macro_aux(char *buf) flush(); char tmp[1024]; ascii_to_text(tmp, buf); - Term_addstr(-1, TERM_WHITE, tmp); + term_addstr(-1, TERM_WHITE, tmp); } @@ -94,7 +94,7 @@ static void do_cmd_macro_aux_keymap(char *buf) buf[0] = inkey(); buf[1] = '\0'; ascii_to_text(tmp, buf); - Term_addstr(-1, TERM_WHITE, tmp); + term_addstr(-1, TERM_WHITE, tmp); flush(); } @@ -165,7 +165,7 @@ void do_cmd_macros(player_type *creature_ptr, void(*process_autopick_file_comman screen_save(); while (TRUE) { - Term_clear(); + term_clear(); prt(_("[ マクロの設定 ]", "Interact with Macros"), 2, 0); prt(_("マクロ行動が(もしあれば)下に表示されます:", "Current action (if any) shown below:"), 20, 0); ascii_to_text(buf, macro__buf); diff --git a/src/cmd-io/cmd-process-screen.c b/src/cmd-io/cmd-process-screen.c index 9ae2c87c3..3d9de31f0 100644 --- a/src/cmd-io/cmd-process-screen.c +++ b/src/cmd-io/cmd-process-screen.c @@ -71,7 +71,7 @@ static void screen_dump_one_line(int wid, int y, FILE *fff) for (TERM_LEN x = 0; x < wid - 1; x++) { concptr cc = NULL; - (void)(Term_what(x, y, &a, &c)); + (void)(term_what(x, y, &a, &c)); switch (c) { case '&': cc = "&"; break; @@ -187,7 +187,7 @@ static void write_html_footer(FILE *tmpfff, FILE *fff, char buf[], size_t buf_si void do_cmd_save_screen_html_aux(char *filename, int message) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); FILE *fff; fff = angband_fopen(filename, "w"); if (!check_screen_html_can_open(fff, filename, message)) return; @@ -302,7 +302,7 @@ static bool do_cmd_save_screen_text(int wid, int hgt) TERM_LEN x; for (x = 0; x < wid - 1; x++) { - (void)(Term_what(x, y, &a, &c)); + (void)(term_what(x, y, &a, &c)); buf[x] = c; } @@ -316,7 +316,7 @@ static bool do_cmd_save_screen_text(int wid, int hgt) TERM_LEN x; for (x = 0; x < wid - 1; x++) { - (void)(Term_what(x, y, &a, &c)); + (void)(term_what(x, y, &a, &c)); buf[x] = hack[a & 0x0F]; } @@ -364,7 +364,7 @@ void do_cmd_save_screen(player_type *creature_ptr, void(*process_autopick_file_c if (!ask_html_dump(&html_dump)) return; int wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); bool old_use_graphics = update_use_graphics(creature_ptr, process_autopick_file_command); @@ -409,7 +409,7 @@ static bool draw_white_characters(char buf[], FILE *fff, int wid, int hgt) { if (buf[x] == '\n' || buf[x] == '\0') break; - Term_draw(x, y, TERM_WHITE, buf[x]); + term_draw(x, y, TERM_WHITE, buf[x]); } } @@ -441,13 +441,13 @@ static void draw_colored_characters(char buf[], FILE *fff, int wid, int hgt, boo { if (buf[x] == '\n' || buf[x] == '\0') break; - (void)(Term_what(x, y, &a, &c)); + (void)(term_what(x, y, &a, &c)); for (int i = 0; i < 16; i++) { if (hack[i] == buf[x]) a = (byte)i; } - Term_draw(x, y, a, c); + term_draw(x, y, a, c); } } } @@ -463,7 +463,7 @@ void do_cmd_load_screen(void) FILE *fff; char buf[1024]; TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "dump.txt"); fff = angband_fopen(buf, "r"); if (!fff) @@ -474,7 +474,7 @@ void do_cmd_load_screen(void) } screen_save(); - Term_clear(); + term_clear(); bool okay = draw_white_characters(buf, fff, wid, hgt); draw_colored_characters(buf, fff, wid, hgt, okay); diff --git a/src/cmd-io/cmd-save.c b/src/cmd-io/cmd-save.c index 8675a5d12..155c82fcf 100644 --- a/src/cmd-io/cmd-save.c +++ b/src/cmd-io/cmd-save.c @@ -28,7 +28,7 @@ void do_cmd_save_game(player_type *creature_ptr, int is_autosave) msg_print(NULL); handle_stuff(creature_ptr); prt(_("ゲームをセーブしています...", "Saving game..."), 0, 0); - Term_fresh(); + term_fresh(); (void)strcpy(creature_ptr->died_from, _("(セーブ)", "(saved)")); signals_ignore_tstp(); if (save_player(creature_ptr)) @@ -37,7 +37,7 @@ void do_cmd_save_game(player_type *creature_ptr, int is_autosave) prt(_("ゲームをセーブしています... 失敗！", "Saving game... failed!"), 0, 0); signals_handle_tstp(); - Term_fresh(); + term_fresh(); (void)strcpy(creature_ptr->died_from, _("(元気に生きている)", "(alive and well)")); current_world_ptr->is_loading_now = FALSE; update_creature(creature_ptr); diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c index 5d54bc3e1..458f71656 100644 --- a/src/cmd-item/cmd-item.c +++ b/src/cmd-item/cmd-item.c @@ -118,7 +118,7 @@ void do_cmd_inven(player_type *creature_ptr) if (command_new == ESCAPE) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); command_new = 0; command_gap = wid - 30; } else { @@ -154,7 +154,7 @@ void do_cmd_equip(player_type *creature_ptr) if (command_new == ESCAPE) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); command_new = 0; command_gap = wid - 30; } diff --git a/src/cmd-item/cmd-magiceat.c b/src/cmd-item/cmd-magiceat.c index 900bc8259..26207f138 100644 --- a/src/cmd-item/cmd-magiceat.c +++ b/src/cmd-item/cmd-magiceat.c @@ -487,10 +487,10 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o char temp[70 * 20]; /* Clear lines, position cursor (really should use strlen here) */ - Term_erase(7, 23, 255); - Term_erase(7, 22, 255); - Term_erase(7, 21, 255); - Term_erase(7, 20, 255); + term_erase(7, 23, 255); + term_erase(7, 22, 255); + term_erase(7, 21, 255); + term_erase(7, 20, 255); shape_buffer(k_text + k_info[lookup_kind(tval, i)].text, 62, temp, sizeof(temp)); for (j = 0, line = 21; temp[j]; j += 1 + strlen(&temp[j])) diff --git a/src/cmd-item/cmd-smith.c b/src/cmd-item/cmd-smith.c index aaf61df3f..f105e6237 100644 --- a/src/cmd-item/cmd-smith.c +++ b/src/cmd-item/cmd-smith.c @@ -1154,12 +1154,12 @@ void do_cmd_kaji(player_type *creature_ptr, bool only_browse) int line, j; /* Clear lines, position cursor (really should use strlen here) */ - Term_erase(14, 21, 255); - Term_erase(14, 20, 255); - Term_erase(14, 19, 255); - Term_erase(14, 18, 255); - Term_erase(14, 17, 255); - Term_erase(14, 16, 255); + term_erase(14, 21, 255); + term_erase(14, 20, 255); + term_erase(14, 19, 255); + term_erase(14, 18, 255); + term_erase(14, 17, 255); + term_erase(14, 16, 255); shape_buffer(kaji_tips[mode - 1], 62, temp, sizeof(temp)); for (j = 0, line = 17; temp[j]; j += (1 + strlen(&temp[j]))) { diff --git a/src/cmd-item/cmd-throw.c b/src/cmd-item/cmd-throw.c index 50e225be1..676f6167f 100644 --- a/src/cmd-item/cmd-throw.c +++ b/src/cmd-item/cmd-throw.c @@ -238,12 +238,12 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID TERM_COLOR a = object_attr(q_ptr); print_rel(creature_ptr, c, a, ny[cur_dis], nx[cur_dis]); move_cursor_relative(ny[cur_dis], nx[cur_dis]); - Term_fresh(); - Term_xtra(TERM_XTRA_DELAY, msec); + term_fresh(); + term_xtra(TERM_XTRA_DELAY, msec); lite_spot(creature_ptr, ny[cur_dis], nx[cur_dis]); - Term_fresh(); + term_fresh(); } else { - Term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, msec); } prev_y = y; @@ -369,12 +369,12 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID byte a = object_attr(q_ptr); print_rel(creature_ptr, c, a, ny[i], nx[i]); move_cursor_relative(ny[i], nx[i]); - Term_fresh(); - Term_xtra(TERM_XTRA_DELAY, msec); + term_fresh(); + term_xtra(TERM_XTRA_DELAY, msec); lite_spot(creature_ptr, ny[i], nx[i]); - Term_fresh(); + term_fresh(); } else { - Term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, msec); } } diff --git a/src/cmd-visual/cmd-draw.c b/src/cmd-visual/cmd-draw.c index 249a8624c..6f3a2dc36 100644 --- a/src/cmd-visual/cmd-draw.c +++ b/src/cmd-visual/cmd-draw.c @@ -37,7 +37,7 @@ */ void do_cmd_redraw(player_type *creature_ptr) { - Term_xtra(TERM_XTRA_REACT, 0); + term_xtra(TERM_XTRA_REACT, 0); creature_ptr->update |= (PU_COMBINE | PU_REORDER); creature_ptr->update |= (PU_TORCH); @@ -60,10 +60,10 @@ void do_cmd_redraw(player_type *creature_ptr) { if (!angband_term[j]) continue; - Term_activate(angband_term[j]); - Term_redraw(); - Term_fresh(); - Term_activate(old); + term_activate(angband_term[j]); + term_redraw(); + term_fresh(); + term_activate(old); } } @@ -88,7 +88,7 @@ void do_cmd_player_status(player_type *creature_ptr) display_player(creature_ptr, mode); } - Term_putstr(2, 23, -1, TERM_WHITE, + term_putstr(2, 23, -1, TERM_WHITE, _("['c'で名前変更, 'f'でファイルへ書出, 'h'でモード変更, ESCで終了]", "['c' to change name, 'f' to file, 'h' to change mode, or ESC]")); char c = inkey(); if (c == ESCAPE) break; @@ -166,14 +166,14 @@ void do_cmd_messages(int num_now) char back_str[81]; concptr shower = NULL; int wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); int num_lines = hgt - 4; strcpy(finder_str, ""); strcpy(shower_str, ""); int n = message_num(); int i = 0; screen_save(); - Term_clear(); + term_clear(); while (TRUE) { int j; @@ -188,13 +188,13 @@ void do_cmd_messages(int num_now) while ((str = angband_strstr(str, shower)) != NULL) { int len = strlen(shower); - Term_putstr(str - msg, num_lines + 1 - j, len, TERM_YELLOW, shower); + term_putstr(str - msg, num_lines + 1 - j, len, TERM_YELLOW, shower); str += len; } } for (; j < num_lines; j++) - Term_erase(0, num_lines + 1 - j, 255); + term_erase(0, num_lines + 1 - j, 255); prt(format(_("以前のメッセージ %d-%d 全部で(%d)", "Message Recall (%d-%d of %d)"), i, i + j - 1, n), 0, 0); diff --git a/src/cmd-visual/cmd-map.c b/src/cmd-visual/cmd-map.c index 7719ea4ad..f38620af4 100644 --- a/src/cmd-visual/cmd-map.c +++ b/src/cmd-visual/cmd-map.c @@ -15,8 +15,8 @@ void do_cmd_view_map(player_type *player_ptr) { screen_save(); prt(_("お待ち下さい...", "Please wait..."), 0, 0); - Term_fresh(); - Term_clear(); + term_fresh(); + term_clear(); display_autopick = 0; int cy, cx; @@ -32,7 +32,7 @@ void do_cmd_view_map(player_type *player_ptr) display_autopick = ITEM_DISPLAY; while (TRUE) { int wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); int row_message = hgt - 1; put_str(_("何かキーを押してください('M':拾う 'N':放置 'D':M+N 'K':壊すアイテムを表示)", " Hit M, N(for ~), K(for !), or D(same as M+N) to display auto-picker items."), @@ -51,7 +51,7 @@ void do_cmd_view_map(player_type *player_ptr) else break; - Term_fresh(); + term_fresh(); if (~display_autopick & flag) display_autopick |= flag; else diff --git a/src/cmd-visual/cmd-visuals.c b/src/cmd-visual/cmd-visuals.c index ef3932089..26241ec70 100644 --- a/src/cmd-visual/cmd-visuals.c +++ b/src/cmd-visual/cmd-visuals.c @@ -86,7 +86,7 @@ void do_cmd_visuals(player_type *creature_ptr, void (*process_autopick_file_comm screen_save(); while (TRUE) { - Term_clear(); + term_clear(); print_visuals_menu(NULL); int i = inkey(); if (i == ESCAPE) @@ -209,14 +209,14 @@ void do_cmd_visuals(player_type *creature_ptr, void (*process_autopick_file_comm TERM_COLOR ca = r_ptr->x_attr; byte cc = r_ptr->x_char; - Term_putstr(5, 17, -1, TERM_WHITE, format(_("モンスター = %d, 名前 = %-40.40s", "Monster = %d, Name = %-40.40s"), r, (r_name + r_ptr->name))); - Term_putstr(10, 19, -1, TERM_WHITE, format(_("初期値 色 / 文字 = %3u / %3u", "Default attr/char = %3u / %3u"), da, dc)); - Term_putstr(40, 19, -1, TERM_WHITE, empty_symbol); - Term_queue_bigchar(43, 19, da, dc, 0, 0); - Term_putstr(10, 20, -1, TERM_WHITE, format(_("現在値 色 / 文字 = %3u / %3u", "Current attr/char = %3u / %3u"), ca, cc)); - Term_putstr(40, 20, -1, TERM_WHITE, empty_symbol); - Term_queue_bigchar(43, 20, ca, cc, 0, 0); - Term_putstr(0, 22, -1, TERM_WHITE, _("コマンド (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ")); + term_putstr(5, 17, -1, TERM_WHITE, format(_("モンスター = %d, 名前 = %-40.40s", "Monster = %d, Name = %-40.40s"), r, (r_name + r_ptr->name))); + term_putstr(10, 19, -1, TERM_WHITE, format(_("初期値 色 / 文字 = %3u / %3u", "Default attr/char = %3u / %3u"), da, dc)); + term_putstr(40, 19, -1, TERM_WHITE, empty_symbol); + term_queue_bigchar(43, 19, da, dc, 0, 0); + term_putstr(10, 20, -1, TERM_WHITE, format(_("現在値 色 / 文字 = %3u / %3u", "Current attr/char = %3u / %3u"), ca, cc)); + term_putstr(40, 20, -1, TERM_WHITE, empty_symbol); + term_queue_bigchar(43, 20, ca, cc, 0, 0); + term_putstr(0, 22, -1, TERM_WHITE, _("コマンド (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ")); i = inkey(); if (i == ESCAPE) break; @@ -254,7 +254,7 @@ void do_cmd_visuals(player_type *creature_ptr, void (*process_autopick_file_comm break; case 'v': do_cmd_knowledge_monsters(creature_ptr, &need_redraw, TRUE, r); - Term_clear(); + term_clear(); print_visuals_menu(choice_msg); break; } @@ -276,16 +276,16 @@ void do_cmd_visuals(player_type *creature_ptr, void (*process_autopick_file_comm TERM_COLOR ca = k_ptr->x_attr; SYMBOL_CODE cc = k_ptr->x_char; - Term_putstr(5, 17, -1, TERM_WHITE, + term_putstr(5, 17, -1, TERM_WHITE, format( _("アイテム = %d, 名前 = %-40.40s", "Object = %d, Name = %-40.40s"), k, k_name + (!k_ptr->flavor ? k_ptr->name : k_ptr->flavor_name))); - Term_putstr(10, 19, -1, TERM_WHITE, format(_("初期値 色 / 文字 = %3d / %3d", "Default attr/char = %3d / %3d"), da, dc)); - Term_putstr(40, 19, -1, TERM_WHITE, empty_symbol); - Term_queue_bigchar(43, 19, da, dc, 0, 0); - Term_putstr(10, 20, -1, TERM_WHITE, format(_("現在値 色 / 文字 = %3d / %3d", "Current attr/char = %3d / %3d"), ca, cc)); - Term_putstr(40, 20, -1, TERM_WHITE, empty_symbol); - Term_queue_bigchar(43, 20, ca, cc, 0, 0); - Term_putstr(0, 22, -1, TERM_WHITE, _("コマンド (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ")); + term_putstr(10, 19, -1, TERM_WHITE, format(_("初期値 色 / 文字 = %3d / %3d", "Default attr/char = %3d / %3d"), da, dc)); + term_putstr(40, 19, -1, TERM_WHITE, empty_symbol); + term_queue_bigchar(43, 19, da, dc, 0, 0); + term_putstr(10, 20, -1, TERM_WHITE, format(_("現在値 色 / 文字 = %3d / %3d", "Current attr/char = %3d / %3d"), ca, cc)); + term_putstr(40, 20, -1, TERM_WHITE, empty_symbol); + term_queue_bigchar(43, 20, ca, cc, 0, 0); + term_putstr(0, 22, -1, TERM_WHITE, _("コマンド (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/v/V/^V): ")); i = inkey(); if (i == ESCAPE) @@ -324,7 +324,7 @@ void do_cmd_visuals(player_type *creature_ptr, void (*process_autopick_file_comm break; case 'v': do_cmd_knowledge_objects(creature_ptr, &need_redraw, TRUE, k); - Term_clear(); + term_clear(); print_visuals_menu(choice_msg); break; } @@ -348,16 +348,16 @@ void do_cmd_visuals(player_type *creature_ptr, void (*process_autopick_file_comm byte cc = f_ptr->x_char[lighting_level]; prt("", 17, 5); - Term_putstr(5, 17, -1, TERM_WHITE, + term_putstr(5, 17, -1, TERM_WHITE, format(_("地形 = %d, 名前 = %s, 明度 = %s", "Terrain = %d, Name = %s, Lighting = %s"), f, (f_name + f_ptr->name), lighting_level_str[lighting_level])); - Term_putstr(10, 19, -1, TERM_WHITE, format(_("初期値 色 / 文字 = %3d / %3d", "Default attr/char = %3d / %3d"), da, dc)); - Term_putstr(40, 19, -1, TERM_WHITE, empty_symbol); - Term_queue_bigchar(43, 19, da, dc, 0, 0); - Term_putstr(10, 20, -1, TERM_WHITE, format(_("現在値 色 / 文字 = %3d / %3d", "Current attr/char = %3d / %3d"), ca, cc)); - Term_putstr(40, 20, -1, TERM_WHITE, empty_symbol); - Term_queue_bigchar(43, 20, ca, cc, 0, 0); - Term_putstr(0, 22, -1, TERM_WHITE, + term_putstr(10, 19, -1, TERM_WHITE, format(_("初期値 色 / 文字 = %3d / %3d", "Default attr/char = %3d / %3d"), da, dc)); + term_putstr(40, 19, -1, TERM_WHITE, empty_symbol); + term_queue_bigchar(43, 19, da, dc, 0, 0); + term_putstr(10, 20, -1, TERM_WHITE, format(_("現在値 色 / 文字 = %3d / %3d", "Current attr/char = %3d / %3d"), ca, cc)); + term_putstr(40, 20, -1, TERM_WHITE, empty_symbol); + term_queue_bigchar(43, 20, ca, cc, 0, 0); + term_putstr(0, 22, -1, TERM_WHITE, _("コマンド (n/N/^N/a/A/^A/c/C/^C/l/L/^L/d/D/^D/v/V/^V): ", "Command (n/N/^N/a/A/^A/c/C/^C/l/L/^L/d/D/^D/v/V/^V): ")); i = inkey(); @@ -404,7 +404,7 @@ void do_cmd_visuals(player_type *creature_ptr, void (*process_autopick_file_comm break; case 'v': do_cmd_knowledge_features(&need_redraw, TRUE, f, &lighting_level); - Term_clear(); + term_clear(); print_visuals_menu(choice_msg); break; } diff --git a/src/combat/shoot.c b/src/combat/shoot.c index af4a62520..65d45180e 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -545,16 +545,16 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, /* Draw, Hilite, Fresh, Pause, Erase */ print_rel(shooter_ptr, c, a, ny, nx); move_cursor_relative(ny, nx); - Term_fresh(); - Term_xtra(TERM_XTRA_DELAY, msec); + term_fresh(); + term_xtra(TERM_XTRA_DELAY, msec); lite_spot(shooter_ptr, ny, nx); - Term_fresh(); + term_fresh(); } /* The player cannot see the missile */ else { /* Pause anyway, for consistancy */ - Term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, msec); } /* Sniper */ @@ -768,8 +768,8 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, lite_spot(shooter_ptr, ny, nx); lite_spot(shooter_ptr, oy, ox); - Term_fresh(); - Term_xtra(TERM_XTRA_DELAY, msec); + term_fresh(); + term_xtra(TERM_XTRA_DELAY, msec); x = nx; y = ny; diff --git a/src/core/asking-player.c b/src/core/asking-player.c index ab3cfaa92..4d285ca92 100644 --- a/src/core/asking-player.c +++ b/src/core/asking-player.c @@ -40,7 +40,7 @@ bool askfor_aux(char *buf, int len, bool numpad_cursor) byte color = TERM_YELLOW; int y, x; - Term_locate(&x, &y); + term_locate(&x, &y); if (len < 1) len = 1; if ((x < 0) || (x >= 80)) @@ -52,10 +52,10 @@ bool askfor_aux(char *buf, int len, bool numpad_cursor) int pos = 0; while (TRUE) { - Term_erase(x, y, len); - Term_putstr(x, y, -1, color, buf); + term_erase(x, y, len); + term_putstr(x, y, -1, color, buf); - Term_gotoxy(x + pos, y); + term_gotoxy(x + pos, y); int skey = inkey_special(numpad_cursor); switch (skey) { diff --git a/src/core/game-closer.c b/src/core/game-closer.c index 2098ec371..1c372978d 100644 --- a/src/core/game-closer.c +++ b/src/core/game-closer.c @@ -96,7 +96,7 @@ void close_game(player_type *player_ptr) print_tomb(player_ptr); flush(); show_death_info(player_ptr, update_playtime, display_player); - Term_clear(); + term_clear(); if (check_score(player_ptr)) { send_world_score_on_closing(player_ptr, do_send); if (!player_ptr->wait_report_score) diff --git a/src/core/game-play.c b/src/core/game-play.c index be18fbc9e..0d56cf4fe 100644 --- a/src/core/game-play.c +++ b/src/core/game-play.c @@ -114,7 +114,7 @@ void play_game(player_type *player_ptr, bool new_game) player_ptr->hack_mutation = FALSE; current_world_ptr->character_icky = TRUE; - Term_activate(angband_term[0]); + term_activate(angband_term[0]); angband_term[0]->resize_hook = resize_map; for (MONSTER_IDX i = 1; i < 8; i++) { if (angband_term[i]) { @@ -122,7 +122,7 @@ void play_game(player_type *player_ptr, bool new_game) } } - (void)Term_set_cursor(0); + (void)term_set_cursor(0); if (!load_player(player_ptr)) { quit(_("セーブファイルが壊れています", "broken savefile")); } @@ -243,7 +243,7 @@ void play_game(player_type *player_ptr, bool new_game) set_floor_and_wall(player_ptr->dungeon_idx); flavor_init(); prt(_("お待ち下さい...", "Please wait..."), 0, 0); - Term_fresh(); + term_fresh(); if (arg_wizard) { if (enter_wizard_mode(player_ptr)) { @@ -298,7 +298,7 @@ void play_game(player_type *player_ptr, bool new_game) player_outfit(player_ptr); } - Term_xtra(TERM_XTRA_REACT, 0); + term_xtra(TERM_XTRA_REACT, 0); player_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER); player_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT); diff --git a/src/core/player-processor.c b/src/core/player-processor.c index b9733f2bd..d34a50157 100644 --- a/src/core/player-processor.c +++ b/src/core/player-processor.c @@ -48,7 +48,7 @@ bool can_save = FALSE; static void process_fishing(player_type *creature_ptr) { - Term_xtra(TERM_XTRA_DELAY, 10); + term_xtra(TERM_XTRA_DELAY, 10); if (one_in_(1000)) { MONRACE_IDX r_idx; bool success = FALSE; @@ -237,7 +237,7 @@ void process_player(player_type *creature_ptr) handle_stuff(creature_ptr); move_cursor_relative(creature_ptr->y, creature_ptr->x); if (fresh_before) - Term_fresh(); + term_fresh(); pack_overflow(creature_ptr); if (!command_new) diff --git a/src/core/scores.c b/src/core/scores.c index b9855fea7..65d156baf 100644 --- a/src/core/scores.c +++ b/src/core/scores.c @@ -178,7 +178,7 @@ void display_scores_aux(int from, int to, int note, high_score *score) TERM_LEN wid, hgt, per_screen; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); per_screen = (hgt - 4) / 4; /* Paranoia -- it may not have opened */ @@ -210,7 +210,7 @@ void display_scores_aux(int from, int to, int note, high_score *score) /* Show per_screen per page, until "done" */ for (k = from, place = k+1; k < i; k += per_screen) { - Term_clear(); + term_clear(); /* Title */ put_str(_(" 変愚蛮怒: 勇者の殿堂", " Hengband Hall of Fame"), 0, 0); @@ -415,7 +415,7 @@ void display_scores(int from, int to) /* Paranoia -- No score file */ if (highscore_fd < 0) quit(_("スコア・ファイルが使用できません。", "Score file unavailable.")); - Term_clear(); + term_clear(); /* Display the scores */ display_scores_aux(from, to, -1, NULL); @@ -457,7 +457,7 @@ bool send_world_score(player_type *current_player_ptr, bool do_send, void(*updat errr err; prt("", 0, 0); prt(_("送信中．．", "Sending..."), 0, 0); - Term_fresh(); + term_fresh(); screen_save(); err = report_score(current_player_ptr, update_playtime, display_player); screen_load(); @@ -845,13 +845,13 @@ void kingly(player_type *winner_ptr) /* Restore the level */ winner_ptr->lev = winner_ptr->max_plv; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); cy = hgt / 2; cx = wid / 2; /* Hack -- Instant Gold */ winner_ptr->au += 10000000L; - Term_clear(); + term_clear(); /* Display a crown */ put_str("#", cy - 11, cx - 1); @@ -901,7 +901,7 @@ void kingly(player_type *winner_ptr) */ bool check_score(player_type *current_player_ptr) { - Term_clear(); + term_clear(); /* No score file */ if (highscore_fd < 0) diff --git a/src/core/show-file.c b/src/core/show-file.c index aeec0e9bc..b5dc10a07 100644 --- a/src/core/show-file.c +++ b/src/core/show-file.c @@ -39,7 +39,7 @@ static void show_file_aux_line(concptr str, int cy, concptr shower) } int cx = 0; - Term_gotoxy(cx, cy); + term_gotoxy(cx, cy); static const char tag_str[] = "[[[["; byte color = TERM_WHITE; @@ -62,14 +62,14 @@ static void show_file_aux_line(concptr str, int cy, concptr shower) if (bracketcol < endcol) endcol = bracketcol; if (showercol < endcol) endcol = showercol; - Term_addstr(endcol, color, &str[i]); + term_addstr(endcol, color, &str[i]); cx += endcol; i += endcol; if (shower && endcol == showercol) { int showerlen = strlen(shower); - Term_addstr(showerlen, TERM_YELLOW, &str[i]); + term_addstr(showerlen, TERM_YELLOW, &str[i]); cx += showerlen; i += showerlen; continue; @@ -90,7 +90,7 @@ static void show_file_aux_line(concptr str, int cy, concptr shower) if (color == 255 || str[i + 1] == '\0') { color = TERM_WHITE; - Term_addstr(-1, TERM_WHITE, tag_str); + term_addstr(-1, TERM_WHITE, tag_str); cx += sizeof(tag_str) - 1; continue; } @@ -100,7 +100,7 @@ static void show_file_aux_line(concptr str, int cy, concptr shower) i++; } - Term_erase(cx, cy, 255); + term_erase(cx, cy, 255); } @@ -125,7 +125,7 @@ static void show_file_aux_line(concptr str, int cy, concptr shower) bool show_file(player_type *creature_ptr, bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode) { int wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); char finder_str[81]; strcpy(finder_str, ""); @@ -246,7 +246,7 @@ bool show_file(player_type *creature_ptr, bool show_version, concptr name, concp if (line == -1) line = ((size - 1) / rows)*rows; - Term_clear(); + term_clear(); concptr find = NULL; while (TRUE) @@ -295,7 +295,7 @@ bool show_file(player_type *creature_ptr, bool show_version, concptr name, concp while (row_count < rows) { - Term_erase(0, row_count + 2, 255); + term_erase(0, row_count + 2, 255); row_count++; } diff --git a/src/core/window-redrawer.c b/src/core/window-redrawer.c index 2bc37071e..135bd71d2 100644 --- a/src/core/window-redrawer.c +++ b/src/core/window-redrawer.c @@ -38,7 +38,7 @@ void redraw_window(void) p_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT); handle_stuff(p_ptr); - Term_redraw(); + term_redraw(); } /*! @@ -76,7 +76,7 @@ void redraw_stuff(player_type *creature_ptr) if (creature_ptr->redraw & (PR_WIPE)) { creature_ptr->redraw &= ~(PR_WIPE); msg_print(NULL); - Term_clear(); + term_clear(); } if (creature_ptr->redraw & (PR_MAP)) { diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c index f9bf1327b..7ec54d941 100644 --- a/src/dungeon/dungeon-processor.c +++ b/src/dungeon/dungeon-processor.c @@ -99,7 +99,7 @@ void process_dungeon(player_type *player_ptr, bool load_game) player_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS); player_ptr->update |= (PU_COMBINE | PU_REORDER); handle_stuff(player_ptr); - Term_fresh(); + term_fresh(); if (quest_num && (is_fixed_quest_idx(quest_num) && !((quest_num == QUEST_OBERON) || (quest_num == QUEST_SERPENT) || !(quest[quest_num].flags & QUEST_FLAG_PRESET)))) @@ -167,7 +167,7 @@ void process_dungeon(player_type *player_ptr, bool load_game) move_cursor_relative(player_ptr->y, player_ptr->x); if (fresh_after) - Term_fresh(); + term_fresh(); if (!player_ptr->playing || player_ptr->is_dead) break; @@ -177,7 +177,7 @@ void process_dungeon(player_type *player_ptr, bool load_game) move_cursor_relative(player_ptr->y, player_ptr->x); if (fresh_after) - Term_fresh(); + term_fresh(); if (!player_ptr->playing || player_ptr->is_dead) break; @@ -187,7 +187,7 @@ void process_dungeon(player_type *player_ptr, bool load_game) move_cursor_relative(player_ptr->y, player_ptr->x); if (fresh_after) - Term_fresh(); + term_fresh(); if (!player_ptr->playing || player_ptr->is_dead) break; diff --git a/src/floor/object-scanner.c b/src/floor/object-scanner.c index dbbf2fe47..7b8e68453 100644 --- a/src/floor/object-scanner.c +++ b/src/floor/object-scanner.c @@ -107,7 +107,7 @@ COMMAND_CODE show_floor_items(player_type *owner_ptr, int target_item, POSITION TERM_LEN wid, hgt; char floor_label[52 + 1]; bool dont_need_to_show_weights = TRUE; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); int len = MAX((*min_width), 20); floor_num = scan_floor_items(owner_ptr, floor_list, y, x, 0x03, item_tester_tval); floor_type *floor_ptr = owner_ptr->current_floor_ptr; diff --git a/src/grid/grid.c b/src/grid/grid.c index 182fd2d59..43b8444a7 100644 --- a/src/grid/grid.c +++ b/src/grid/grid.c @@ -481,7 +481,7 @@ void print_rel(player_type *subject_ptr, SYMBOL_CODE c, TERM_COLOR a, POSITION y } /* Draw the char using the attr */ - Term_queue_bigchar(panel_col_of(x), y - panel_row_prt, a, c, 0, 0); + term_queue_bigchar(panel_col_of(x), y - panel_row_prt, a, c, 0, 0); } } @@ -638,7 +638,7 @@ void lite_spot(player_type *player_ptr, POSITION y, POSITION x) } /* Hack -- Queue it */ - Term_queue_bigchar(panel_col_of(x), y - panel_row_prt, a, c, ta, tc); + term_queue_bigchar(panel_col_of(x), y - panel_row_prt, a, c, ta, tc); /* Update sub-windows */ player_ptr->window |= (PW_OVERHEAD | PW_DUNGEON); diff --git a/src/io-dump/dump-util.c b/src/io-dump/dump-util.c index 0cd2d588c..2c24fe5d2 100644 --- a/src/io-dump/dump-util.c +++ b/src/io-dump/dump-util.c @@ -171,7 +171,7 @@ void display_group_list(int col, int row, int wid, int per_page, IDX grp_idx[], { int grp = grp_idx[grp_top + i]; TERM_COLOR attr = (grp_top + i == grp_cur) ? TERM_L_BLUE : TERM_WHITE; - Term_erase(col, row + i, wid); + term_erase(col, row + i, wid); c_put_str(attr, group_text[grp], row + i, col); } } @@ -184,7 +184,7 @@ void display_visual_list(int col, int row, int height, int width, TERM_COLOR att { for (int i = 0; i < height; i++) { - Term_erase(col, row + i, width); + term_erase(col, row + i, width); } if (use_bigtile) width /= 2; @@ -207,7 +207,7 @@ void display_visual_list(int col, int row, int height, int width, TERM_COLOR att SYMBOL_CODE c = (SYMBOL_CODE)ic; if (c & 0x80) a |= 0x80; - Term_queue_bigchar(x, y, a, c, 0, 0); + term_queue_bigchar(x, y, a, c, 0, 0); } } } @@ -225,7 +225,7 @@ void place_visual_list_cursor(TERM_LEN col, TERM_LEN row, TERM_COLOR a, byte c, TERM_LEN y = row + i; if (use_bigtile) x += j; - Term_gotoxy(x, y); + term_gotoxy(x, y); } @@ -251,7 +251,7 @@ void browser_cursor(char ch, int *column, IDX *grp_cur, int grp_cnt, IDX *list_c { int browser_rows; int wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); browser_rows = hgt - 8; if (!col) { diff --git a/src/io-dump/player-status-dump.c b/src/io-dump/player-status-dump.c index 2c8be8a6d..fac504b67 100644 --- a/src/io-dump/player-status-dump.c +++ b/src/io-dump/player-status-dump.c @@ -24,7 +24,7 @@ static void dump_player_status_with_screen_num( TERM_LEN x; for (x = 0; x < 79; x++) { - (void)(Term_what(x, y, &a, &c)); + (void)(term_what(x, y, &a, &c)); if (!change_color) { buf[x] = c; diff --git a/src/io/chuukei.c b/src/io/chuukei.c index e3d1ba1e6..cf3931272 100644 --- a/src/io/chuukei.c +++ b/src/io/chuukei.c @@ -743,7 +743,7 @@ static void update_term_size(int x, int y, int len) { int ox, oy; int nx, ny; - Term_get_size(&ox, &oy); + term_get_size(&ox, &oy); nx = ox; ny = oy; @@ -755,7 +755,7 @@ static void update_term_size(int x, int y, int len) ny = y + 1; if (nx != ox || ny != oy) - Term_resize(nx, ny); + term_resize(nx, ny); } static bool flush_ringbuf_client(void) @@ -833,7 +833,7 @@ static bool flush_ringbuf_client(void) case 'x': if (x == TERM_XTRA_CLEAR) - Term_clear(); + term_clear(); (void)((*angband_term[0]->xtra_hook)(x, 0)); break; @@ -866,9 +866,9 @@ void browse_chuukei() FD_ZERO(&fdset); FD_SET(sd, &fdset); - Term_clear(); - Term_fresh(); - Term_xtra(TERM_XTRA_REACT, 0); + term_clear(); + term_fresh(); + term_xtra(TERM_XTRA_REACT, 0); while (TRUE) { fd_set tmp_fdset; @@ -883,7 +883,7 @@ void browse_chuukei() /* ソケットにデータが来ているかどうか調べる */ select(sd + 1, &tmp_fdset, (fd_set *)NULL, (fd_set *)NULL, &tmp_tv); if (FD_ISSET(sd, &tmp_fdset) == 0) { - Term_xtra(TERM_XTRA_FLUSH, 0); + term_xtra(TERM_XTRA_FLUSH, 0); continue; } @@ -917,14 +917,14 @@ void prepare_browse_movie(concptr filename) void browse_movie(void) { - Term_clear(); - Term_fresh(); - Term_xtra(TERM_XTRA_REACT, 0); + term_clear(); + term_fresh(); + term_xtra(TERM_XTRA_REACT, 0); while (read_movie_file() == 0) { while (fresh_queue.next != fresh_queue.tail) { if (!flush_ringbuf_client()) { - Term_xtra(TERM_XTRA_FLUSH, 0); + term_xtra(TERM_XTRA_FLUSH, 0); /* ソケットにデータが来ているかどうか調べる */ #ifdef WINDOWS diff --git a/src/io/cursor.c b/src/io/cursor.c index b28c44d9d..dd188d782 100644 --- a/src/io/cursor.c +++ b/src/io/cursor.c @@ -23,7 +23,7 @@ void move_cursor_relative(int row, int col) { row -= panel_row_prt; - Term_gotoxy(panel_col_of(col), row); + term_gotoxy(panel_col_of(col), row); } /* @@ -77,7 +77,7 @@ void print_path(player_type *player_ptr, POSITION y, POSITION x) } c = '*'; - Term_queue_bigchar(panel_col_of(nx), ny - panel_row_prt, a, c, ta, tc); + term_queue_bigchar(panel_col_of(nx), ny - panel_row_prt, a, c, ta, tc); } if ((g_ptr->info & CAVE_MARK) && !cave_have_flag_grid(g_ptr, FF_PROJECT)) diff --git a/src/io/input-key-acceptor.c b/src/io/input-key-acceptor.c index ab4ab13ae..ca81b565f 100644 --- a/src/io/input-key-acceptor.c +++ b/src/io/input-key-acceptor.c @@ -49,7 +49,7 @@ static void forget_macro_action(void) while (TRUE) { char ch; - if (Term_inkey(&ch, FALSE, TRUE)) + if (term_inkey(&ch, FALSE, TRUE)) break; if (ch == 0) break; @@ -65,7 +65,7 @@ static void forget_macro_action(void) * * This function does almost all of the "macro" processing. * - * We use the "Term_key_push()" function to handle "failed" macros, as well + * We use the "term_key_push()" function to handle "failed" macros, as well * as "extra" keys read in while choosing the proper macro, and also to hold * the action for the macro, plus a special "ascii 30" character indicating * that any macro action in progress is complete. Embedded macros are thus @@ -86,11 +86,11 @@ static char inkey_aux(void) num_more = 0; if (parse_macro) { - if (Term_inkey(&ch, FALSE, TRUE)) { + if (term_inkey(&ch, FALSE, TRUE)) { parse_macro = FALSE; } } else { - (void)(Term_inkey(&ch, TRUE, TRUE)); + (void)(term_inkey(&ch, TRUE, TRUE)); } if (ch == 30) @@ -115,7 +115,7 @@ static char inkey_aux(void) if (k < 0) break; - if (0 == Term_inkey(&ch, FALSE, TRUE)) { + if (0 == term_inkey(&ch, FALSE, TRUE)) { buf[p++] = ch; buf[p] = '\0'; w = 0; @@ -124,37 +124,37 @@ static char inkey_aux(void) if (w >= 10) break; - Term_xtra(TERM_XTRA_DELAY, w); + term_xtra(TERM_XTRA_DELAY, w); } } k = macro_find_ready(buf); if (k < 0) { while (p > 0) { - if (Term_key_push(buf[--p])) + if (term_key_push(buf[--p])) return 0; } - (void)Term_inkey(&ch, TRUE, TRUE); + (void)term_inkey(&ch, TRUE, TRUE); return (ch); } concptr pat = macro__pat[k]; n = strlen(pat); while (p > n) { - if (Term_key_push(buf[--p])) + if (term_key_push(buf[--p])) return 0; } parse_macro = TRUE; - if (Term_key_push(30)) + if (term_key_push(30)) return 0; concptr act = macro__act[k]; n = strlen(act); while (n > 0) { - if (Term_key_push(act[--n])) + if (term_key_push(act[--n])) return 0; } @@ -182,28 +182,28 @@ char inkey(void) if (inkey_xtra) { parse_macro = FALSE; parse_under = FALSE; - Term_flush(); + term_flush(); } int v; - (void)Term_get_cursor(&v); + (void)term_get_cursor(&v); /* Show the cursor if waiting, except sometimes in "command" mode */ if (!inkey_scan && (!inkey_flag || hilite_player || current_world_ptr->character_icky)) { - (void)Term_set_cursor(1); + (void)term_set_cursor(1); } - Term_activate(angband_term[0]); + term_activate(angband_term[0]); char kk; while (!ch) { - if (!inkey_base && inkey_scan && (0 != Term_inkey(&kk, FALSE, FALSE))) { + if (!inkey_base && inkey_scan && (0 != term_inkey(&kk, FALSE, FALSE))) { break; } - if (!done && (0 != Term_inkey(&kk, FALSE, FALSE))) { - Term_activate(old); - Term_fresh(); - Term_activate(angband_term[0]); + if (!done && (0 != term_inkey(&kk, FALSE, FALSE))) { + term_activate(old); + term_fresh(); + term_activate(angband_term[0]); current_world_ptr->character_saved = FALSE; signal_count = 0; @@ -213,7 +213,7 @@ char inkey(void) if (inkey_base) { int w = 0; if (!inkey_scan) { - if (0 == Term_inkey(&ch, TRUE, TRUE)) { + if (0 == term_inkey(&ch, TRUE, TRUE)) { break; } @@ -221,14 +221,14 @@ char inkey(void) } while (TRUE) { - if (0 == Term_inkey(&ch, FALSE, TRUE)) { + if (0 == term_inkey(&ch, FALSE, TRUE)) { break; } else { w += 10; if (w >= 100) break; - Term_xtra(TERM_XTRA_DELAY, w); + term_xtra(TERM_XTRA_DELAY, w); } } @@ -256,8 +256,8 @@ char inkey(void) } } - Term_activate(old); - Term_set_cursor(v); + term_activate(old); + term_set_cursor(v); inkey_base = inkey_xtra = inkey_flag = inkey_scan = FALSE; return (ch); } diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c index 2fa749327..fd00c0c62 100644 --- a/src/io/input-key-processor.c +++ b/src/io/input-key-processor.c @@ -509,7 +509,7 @@ void process_command(player_type *creature_ptr) break; } case '!': { - (void)Term_user(0); + (void)term_user(0); break; } case '"': { diff --git a/src/io/report.c b/src/io/report.c index ce5e12427..ea7d469cb 100644 --- a/src/io/report.c +++ b/src/io/report.c @@ -269,7 +269,7 @@ concptr make_screen_dump(player_type *creature_ptr, void(*process_autopick_file_ }; int wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); /* Alloc buffer */ BUF *screen_buf; @@ -307,7 +307,7 @@ concptr make_screen_dump(player_type *creature_ptr, void(*process_autopick_file_ int rv, gv, bv; concptr cc = NULL; /* Get the attr/char */ - (void)(Term_what(x, y, &a, &c)); + (void)(term_what(x, y, &a, &c)); switch (c) { @@ -438,7 +438,7 @@ errr report_score(player_type *creature_ptr, void(*update_playtime)(void), displ } #endif - Term_clear(); + term_clear(); int sd; while (TRUE) @@ -449,7 +449,7 @@ errr report_score(player_type *creature_ptr, void(*update_playtime)(void), displ #else prt("connecting...", 0, 0); #endif - Term_fresh(); + term_fresh(); /* プロキシを設定する */ set_proxy(HTTP_PROXY, HTTP_PROXY_PORT); @@ -487,7 +487,7 @@ errr report_score(player_type *creature_ptr, void(*update_playtime)(void), displ #else prt("Sending the score...", 0, 0); #endif - Term_fresh(); + term_fresh(); if (!http_post(sd, SCORE_PATH, score)) { disconnect_server(sd); diff --git a/src/io/screen-util.c b/src/io/screen-util.c index 738a115cd..847e50b85 100644 --- a/src/io/screen-util.c +++ b/src/io/screen-util.c @@ -61,12 +61,12 @@ void resize_map() p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY); handle_stuff(p_ptr); - Term_redraw(); + term_redraw(); if (can_save) move_cursor_relative(p_ptr->y, p_ptr->x); - Term_fresh(); + term_fresh(); } /*! @@ -78,7 +78,7 @@ void resize_map() */ void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p) { - Term_get_size(wid_p, hgt_p); + term_get_size(wid_p, hgt_p); *hgt_p -= ROW_MAP + 2; *wid_p -= COL_MAP + 2; if (use_bigtile) diff --git a/src/io/signal-handlers.c b/src/io/signal-handlers.c index 401355165..da05a8923 100644 --- a/src/io/signal-handlers.c +++ b/src/io/signal-handlers.c @@ -32,12 +32,12 @@ static void handle_signal_suspend(int sig) { (void)signal(sig, SIG_IGN); #ifdef SIGSTOP - Term_fresh(); - Term_xtra(TERM_XTRA_ALIVE, 0); + term_fresh(); + term_xtra(TERM_XTRA_ALIVE, 0); (void)kill(0, SIGSTOP); - Term_xtra(TERM_XTRA_ALIVE, 1); - Term_redraw(); - Term_fresh(); + term_xtra(TERM_XTRA_ALIVE, 1); + term_redraw(); + term_fresh(); #endif (void)signal(sig, handle_signal_suspend); } @@ -84,12 +84,12 @@ static void handle_signal_simple(int sig) close_game(p_ptr); quit(_("強制終了", "interrupt")); } else if (signal_count >= 4) { - Term_xtra(TERM_XTRA_NOISE, 0); - Term_erase(0, 0, 255); - Term_putstr(0, 0, -1, TERM_WHITE, _("熟慮の上の自殺！", "Contemplating suicide!")); - Term_fresh(); + term_xtra(TERM_XTRA_NOISE, 0); + term_erase(0, 0, 255); + term_putstr(0, 0, -1, TERM_WHITE, _("熟慮の上の自殺！", "Contemplating suicide!")); + term_fresh(); } else if (signal_count >= 2) { - Term_xtra(TERM_XTRA_NOISE, 0); + term_xtra(TERM_XTRA_NOISE, 0); } (void)signal(sig, handle_signal_simple); @@ -116,7 +116,7 @@ static void handle_signal_simple(int sig) static void handle_signal_abort(int sig) { int wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); (void)signal(sig, SIG_IGN); if (!current_world_ptr->character_generated || current_world_ptr->character_saved) @@ -126,13 +126,13 @@ static void handle_signal_abort(int sig) forget_view(p_ptr->current_floor_ptr); clear_mon_lite(p_ptr->current_floor_ptr); - Term_erase(0, hgt - 1, 255); - Term_putstr(0, hgt - 1, -1, TERM_RED, _("恐ろしいソフトのバグが飛びかかってきた！", "A gruesome software bug LEAPS out at you!")); + term_erase(0, hgt - 1, 255); + term_putstr(0, hgt - 1, -1, TERM_RED, _("恐ろしいソフトのバグが飛びかかってきた！", "A gruesome software bug LEAPS out at you!")); - Term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ...", "Panic save...")); + term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ...", "Panic save...")); exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム異常終了----", "-- Tried Panic Save and Aborted Game --")); - Term_fresh(); + term_fresh(); p_ptr->panic_save = 1; (void)strcpy(p_ptr->died_from, _("(緊急セーブ)", "(panic save)")); @@ -140,12 +140,12 @@ static void handle_signal_abort(int sig) signals_ignore_tstp(); if (save_player(p_ptr)) { - Term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ成功！", "Panic save succeeded!")); + term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ成功！", "Panic save succeeded!")); } else { - Term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ失敗！", "Panic save failed!")); + term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ失敗！", "Panic save failed!")); } - Term_fresh(); + term_fresh(); quit(_("ソフトのバグ", "software bug")); } diff --git a/src/io/targeting.c b/src/io/targeting.c index 2dc1feed3..411475e04 100644 --- a/src/io/targeting.c +++ b/src/io/targeting.c @@ -634,7 +634,7 @@ static char target_set_aux(player_type *subject_ptr, POSITION y, POSITION x, BIT screen_roff(subject_ptr, m_ptr->ap_r_idx, 0); /* Hack -- Complete the prompt (again) */ - Term_addstr(-1, TERM_WHITE, format(_(" [r思 %s%s]", " [r,%s%s]"), x_info, info)); + term_addstr(-1, TERM_WHITE, format(_(" [r思 %s%s]", " [r,%s%s]"), x_info, info)); query = inkey(); diff --git a/src/knowledge/knowledge-features.c b/src/knowledge/knowledge-features.c index fe25d84ff..d6ef63085 100644 --- a/src/knowledge/knowledge-features.c +++ b/src/knowledge/knowledge-features.c @@ -73,23 +73,23 @@ static void display_feature_list(int col, int row, int per_page, FEAT_IDX *feat_ c_prt(attr, format("%d", f_idx), row_i, f_idx_col); } - Term_queue_bigchar(lit_col[F_LIT_STANDARD], row_i, f_ptr->x_attr[F_LIT_STANDARD], f_ptr->x_char[F_LIT_STANDARD], 0, 0); - Term_putch(lit_col[F_LIT_NS_BEGIN], row_i, TERM_SLATE, '('); + term_queue_bigchar(lit_col[F_LIT_STANDARD], row_i, f_ptr->x_attr[F_LIT_STANDARD], f_ptr->x_char[F_LIT_STANDARD], 0, 0); + term_putch(lit_col[F_LIT_NS_BEGIN], row_i, TERM_SLATE, '('); for (int j = F_LIT_NS_BEGIN + 1; j < F_LIT_MAX; j++) { - Term_putch(lit_col[j], row_i, TERM_SLATE, '/'); + term_putch(lit_col[j], row_i, TERM_SLATE, '/'); } - Term_putch(lit_col[F_LIT_MAX - 1] + (use_bigtile ? 3 : 2), row_i, TERM_SLATE, ')'); + term_putch(lit_col[F_LIT_MAX - 1] + (use_bigtile ? 3 : 2), row_i, TERM_SLATE, ')'); for (int j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++) { - Term_queue_bigchar(lit_col[j] + 1, row_i, f_ptr->x_attr[j], f_ptr->x_char[j], 0, 0); + term_queue_bigchar(lit_col[j] + 1, row_i, f_ptr->x_attr[j], f_ptr->x_char[j], 0, 0); } } for (; i < per_page; i++) { - Term_erase(col, row + i, 255); + term_erase(col, row + i, 255); } } @@ -105,7 +105,7 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f (void)C_WIPE(char_old, F_LIT_MAX, SYMBOL_CODE); TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); FEAT_IDX *feat_idx; C_MAKE(feat_idx, max_f_idx, FEAT_IDX); @@ -190,14 +190,14 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f for (FEAT_IDX i = 0; i < 78; i++) { - Term_putch(i, 5, TERM_WHITE, '='); + term_putch(i, 5, TERM_WHITE, '='); } if (direct_f_idx < 0) { for (FEAT_IDX i = 0; i < browser_rows; i++) { - Term_putch(max + 1, 6 + i, TERM_WHITE, '|'); + term_putch(max + 1, 6 + i, TERM_WHITE, '|'); } } @@ -248,11 +248,11 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f } else if (!column) { - Term_gotoxy(0, 6 + (grp_cur - grp_top)); + term_gotoxy(0, 6 + (grp_cur - grp_top)); } else { - Term_gotoxy(max + 3, 6 + (feat_cur - feat_top)); + term_gotoxy(max + 3, 6 + (feat_cur - feat_top)); } ch = inkey(); diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c index 418a32b97..94f47a703 100644 --- a/src/knowledge/knowledge-items.c +++ b/src/knowledge/knowledge-items.c @@ -215,11 +215,11 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[] a = flavor_k_ptr->x_attr; c = flavor_k_ptr->x_char; - Term_queue_bigchar(use_bigtile ? 76 : 77, row + i, a, c, 0, 0); + term_queue_bigchar(use_bigtile ? 76 : 77, row + i, a, c, 0, 0); } for (; i < per_page; i++) { - Term_erase(col, row + i, 255); + term_erase(col, row + i, 255); } } @@ -260,7 +260,7 @@ void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redraw, bool byte mode; TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); int browser_rows = hgt - 8; C_MAKE(object_idx, max_k_idx, KIND_OBJECT_IDX); @@ -334,12 +334,12 @@ void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redraw, bool #endif for (IDX i = 0; i < 78; i++) { - Term_putch(i, 5, TERM_WHITE, '='); + term_putch(i, 5, TERM_WHITE, '='); } if (direct_k_idx < 0) { for (IDX i = 0; i < browser_rows; i++) { - Term_putch(max + 1, 6 + i, TERM_WHITE, '|'); + term_putch(max + 1, 6 + i, TERM_WHITE, '|'); } } @@ -403,9 +403,9 @@ void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redraw, bool if (visual_list) { place_visual_list_cursor(max + 3, 7, flavor_k_ptr->x_attr, flavor_k_ptr->x_char, attr_top, char_left); } else if (!column) { - Term_gotoxy(0, 6 + (grp_cur - grp_top)); + term_gotoxy(0, 6 + (grp_cur - grp_top)); } else { - Term_gotoxy(max + 3, 6 + (object_cur - object_top)); + term_gotoxy(max + 3, 6 + (object_cur - object_top)); } char ch = inkey(); diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c index 8a4c6c365..0ced683dd 100644 --- a/src/knowledge/knowledge-monsters.c +++ b/src/knowledge/knowledge-monsters.c @@ -289,8 +289,8 @@ static void display_monster_list(int col, int row, int per_page, s16b mon_idx[], c_prt(attr, format("%d", r_idx), row + i, 62); } - Term_erase(69, row + i, 255); - Term_queue_bigchar(use_bigtile ? 69 : 70, row + i, r_ptr->x_attr, r_ptr->x_char, 0, 0); + term_erase(69, row + i, 255); + term_queue_bigchar(use_bigtile ? 69 : 70, row + i, r_ptr->x_attr, r_ptr->x_char, 0, 0); if (!visual_only) { if (!(r_ptr->flags1 & RF1_UNIQUE)) @@ -303,7 +303,7 @@ static void display_monster_list(int col, int row, int per_page, s16b mon_idx[], for (; i < per_page; i++) { - Term_erase(col, row + i, 255); + term_erase(col, row + i, 255); } } @@ -320,7 +320,7 @@ static void display_monster_list(int col, int row, int per_page, s16b mon_idx[], void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redraw, bool visual_only, IDX direct_r_idx) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); IDX *mon_idx; C_MAKE(mon_idx, max_r_idx, MONRACE_IDX); @@ -384,14 +384,14 @@ void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redraw, boo for (IDX i = 0; i < 78; i++) { - Term_putch(i, 5, TERM_WHITE, '='); + term_putch(i, 5, TERM_WHITE, '='); } if (direct_r_idx < 0) { for (IDX i = 0; i < browser_rows; i++) { - Term_putch(max + 1, 6 + i, TERM_WHITE, '|'); + term_putch(max + 1, 6 + i, TERM_WHITE, '|'); } } @@ -448,11 +448,11 @@ void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redraw, boo } else if (!column) { - Term_gotoxy(0, 6 + (grp_cur - grp_top)); + term_gotoxy(0, 6 + (grp_cur - grp_top)); } else { - Term_gotoxy(max + 3, 6 + (mon_cur - mon_top)); + term_gotoxy(max + 3, 6 + (mon_cur - mon_top)); } char ch = inkey(); diff --git a/src/main-win.c b/src/main-win.c index df3984c99..1e6e2187d 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -1300,9 +1300,9 @@ static void term_data_redraw(player_type *player_ptr, term_data *td) return; } - Term_activate(&td->t); - Term_redraw(); - Term_activate(term_screen); + term_activate(&td->t); + term_redraw(); + term_activate(term_screen); } void term_inversed_area(HWND hWnd, int x, int y, int w, int h) @@ -1389,10 +1389,10 @@ static errr term_xtra_win_react(player_type *player_ptr) term *old = Term; term_data *td = &data[i]; if ((td->cols != td->t.wid) || (td->rows != td->t.hgt)) { - Term_activate(&td->t); - Term_resize(td->cols, td->rows); - Term_redraw(); - Term_activate(old); + term_activate(&td->t); + term_resize(td->cols, td->rows); + term_redraw(); + term_activate(old); } } @@ -1953,11 +1953,11 @@ static void windows_map(player_type *player_ptr) } term_curs_win(player_ptr->x - min_x, player_ptr->y - min_y); - Term_inkey(&c, TRUE, TRUE); - Term_flush(); + term_inkey(&c, TRUE, TRUE); + term_flush(); td->map_active = FALSE; term_xtra_win_clear(); - Term_redraw(); + term_redraw(); } /* @@ -2266,7 +2266,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) plog(_("プレイ中は新しいゲームを始めることができません！", "You can't start a new game while you're still playing!")); } else { game_in_progress = TRUE; - Term_flush(); + term_flush(); play_game(player_ptr, TRUE); quit(NULL); } @@ -2292,7 +2292,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) if (GetOpenFileName(&ofn)) { validate_file(savefile); game_in_progress = TRUE; - Term_flush(); + term_flush(); play_game(player_ptr, FALSE); quit(NULL); } @@ -2327,7 +2327,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) forget_view(player_ptr->current_floor_ptr); clear_mon_lite(player_ptr->current_floor_ptr); - Term_key_push(SPECIAL_KEY_QUIT); + term_key_push(SPECIAL_KEY_QUIT); break; } @@ -2342,12 +2342,12 @@ static void process_menus(player_type *player_ptr, WORD wCmd) msg_print("Score file unavailable."); } else { screen_save(); - Term_clear(); + term_clear(); display_scores_aux(0, MAX_HISCORES, -1, NULL); (void)fd_close(highscore_fd); highscore_fd = -1; screen_load(); - Term_fresh(); + term_fresh(); } break; @@ -2543,7 +2543,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) if (arg_graphics != GRAPHICS_NONE) { arg_graphics = GRAPHICS_NONE; term_xtra_win_react(player_ptr); - Term_key_push(KTRL('R')); + term_key_push(KTRL('R')); } break; @@ -2557,7 +2557,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) if (arg_graphics != GRAPHICS_ORIGINAL) { arg_graphics = GRAPHICS_ORIGINAL; term_xtra_win_react(player_ptr); - Term_key_push(KTRL('R')); + term_key_push(KTRL('R')); } break; @@ -2571,7 +2571,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) if (arg_graphics != GRAPHICS_ADAM_BOLT) { arg_graphics = GRAPHICS_ADAM_BOLT; term_xtra_win_react(player_ptr); - Term_key_push(KTRL('R')); + term_key_push(KTRL('R')); } break; @@ -2585,7 +2585,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) if (arg_graphics != GRAPHICS_HENGBAND) { arg_graphics = GRAPHICS_HENGBAND; term_xtra_win_react(player_ptr); - Term_key_push(KTRL('R')); + term_key_push(KTRL('R')); } break; @@ -2598,8 +2598,8 @@ static void process_menus(player_type *player_ptr, WORD wCmd) } arg_bigtile = !arg_bigtile; - Term_activate(&td->t); - Term_resize(td->cols, td->rows); + term_activate(&td->t); + term_resize(td->cols, td->rows); InvalidateRect(td->w, NULL, TRUE); break; } @@ -2611,7 +2611,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) arg_music = !arg_music; term_xtra_win_react(player_ptr); - Term_key_push(KTRL('R')); + term_key_push(KTRL('R')); break; } case IDM_OPTIONS_SOUND: { @@ -2622,7 +2622,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) arg_sound = !arg_sound; term_xtra_win_react(player_ptr); - Term_key_push(KTRL('R')); + term_key_push(KTRL('R')); break; } case IDM_OPTIONS_BG: { @@ -2634,7 +2634,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) use_bg = !use_bg; init_bg(); term_xtra_win_react(player_ptr); - Term_key_push(KTRL('R')); + term_key_push(KTRL('R')); break; } case IDM_OPTIONS_OPEN_BG: { @@ -2660,7 +2660,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) } term_xtra_win_react(player_ptr); - Term_key_push(KTRL('R')); + term_key_push(KTRL('R')); break; } case IDM_DUMP_SCREEN_HTML: { @@ -2741,16 +2741,16 @@ static bool process_keydown(WPARAM wParam, LPARAM lParam) bool ext_key = (lParam & 0x1000000L) ? TRUE : FALSE; bool numpad = FALSE; - Term_keypress(31); + term_keypress(31); if (mc) - Term_keypress('C'); + term_keypress('C'); if (ms) - Term_keypress('S'); + term_keypress('S'); if (ma) - Term_keypress('A'); + term_keypress('A'); int i = LOBYTE(HIWORD(lParam)); - Term_keypress('x'); + term_keypress('x'); switch (wParam) { case VK_DIVIDE: term_no_press = TRUE; @@ -2788,11 +2788,11 @@ static bool process_keydown(WPARAM wParam, LPARAM lParam) } if (numpad) - Term_keypress('K'); + term_keypress('K'); - Term_keypress(hexsym[i / 16]); - Term_keypress(hexsym[i % 16]); - Term_keypress(13); + term_keypress(hexsym[i / 16]); + term_keypress(hexsym[i % 16]); + term_keypress(13); return 1; } @@ -2863,7 +2863,7 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam if (term_no_press) term_no_press = FALSE; else - Term_keypress(wParam); + term_keypress(wParam); return 0; } case WM_LBUTTONDOWN: { @@ -2938,7 +2938,7 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam EmptyClipboard(); SetClipboardData(CF_TEXT, hGlobal); CloseClipboard(); - Term_redraw(); + term_redraw(); return 0; } case WM_MOUSEMOVE: { @@ -2989,7 +2989,7 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam forget_lite(p_ptr->current_floor_ptr); forget_view(p_ptr->current_floor_ptr); clear_mon_lite(p_ptr->current_floor_ptr); - Term_key_push(SPECIAL_KEY_QUIT); + term_key_push(SPECIAL_KEY_QUIT); return 0; } case WM_QUERYENDSESSION: { @@ -3048,8 +3048,8 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam normsize.y = td->rows; } - Term_activate(&td->t); - Term_resize(td->cols, td->rows); + term_activate(&td->t); + term_resize(td->cols, td->rows); InvalidateRect(td->w, NULL, TRUE); } @@ -3165,9 +3165,9 @@ LRESULT PASCAL AngbandListProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara term *old_term = Term; td->cols = cols; td->rows = rows; - Term_activate(&td->t); - Term_resize(td->cols, td->rows); - Term_activate(old_term); + term_activate(&td->t); + term_resize(td->cols, td->rows); + term_activate(old_term); InvalidateRect(td->w, NULL, TRUE); p_ptr->window = 0xFFFFFFFF; handle_stuff(p_ptr); @@ -3194,7 +3194,7 @@ LRESULT PASCAL AngbandListProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara if (term_no_press) term_no_press = FALSE; else - Term_keypress(wParam); + term_keypress(wParam); return 0; } case WM_PALETTECHANGED: { @@ -3557,7 +3557,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC } signals_init(); - Term_activate(term_screen); + term_activate(term_screen); init_angband(p_ptr, process_autopick_file_command); initialized = TRUE; #ifdef CHUUKEI @@ -3608,7 +3608,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC #endif prt(_("[ファイル] メニューの [新規] または [開く] を選択してください。", "[Choose 'New' or 'Open' from the 'File' menu]"), 23, _(8, 17)); - Term_fresh(); + term_fresh(); while (GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); diff --git a/src/main/init.c b/src/main/init.c index 136dcc8e4..b7cecdd57 100644 --- a/src/main/init.c +++ b/src/main/init.c @@ -1190,9 +1190,9 @@ static errr init_alloc(void) */ static void init_note(concptr str) { - Term_erase(0, 23, 255); - Term_putstr(20, 23, -1, TERM_WHITE, str); - Term_fresh(); + term_erase(0, 23, 255); + term_putstr(20, 23, -1, TERM_WHITE, str); + term_fresh(); } @@ -1257,7 +1257,7 @@ static void init_angband_aux(concptr why) * be available when this function is called is the "z-term.c" * package, and that may not be fully initialized until the * end of this function, when the default "user pref files" - * are loaded and "Term_xtra(TERM_XTRA_REACT,0)" is called. + * are loaded and "term_xtra(TERM_XTRA_REACT,0)" is called. * Note that this function attempts to verify the "news" file, * and the game aborts (cleanly) on failure, since without the * "news" file, it is likely that the "lib" folder has not been @@ -1309,7 +1309,7 @@ void init_angband(player_type *player_ptr, void(*process_autopick_file_command)( (void)fd_close(fd); /*** Display the "news" file ***/ - Term_clear(); + term_clear(); path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, _("news_j.txt", "news.txt")); /* Open the News file */ @@ -1324,13 +1324,13 @@ void init_angband(player_type *player_ptr, void(*process_autopick_file_command)( while (0 == angband_fgets(fp, buf, sizeof(buf))) { /* Display and advance */ - Term_putstr(0, i++, -1, TERM_WHITE, buf); + term_putstr(0, i++, -1, TERM_WHITE, buf); } angband_fclose(fp); } - Term_flush(); + term_flush(); /*** Verify (or create) the "high score" file ***/ path_build(buf, sizeof(buf), ANGBAND_DIR_APEX, "scores.raw"); diff --git a/src/main/sound-of-music.c b/src/main/sound-of-music.c index 8d456a8cd..be075ea88 100644 --- a/src/main/sound-of-music.c +++ b/src/main/sound-of-music.c @@ -10,9 +10,9 @@ */ void bell(void) { - Term_fresh(); + term_fresh(); if (ring_bell) - Term_xtra(TERM_XTRA_NOISE, 0); + term_xtra(TERM_XTRA_NOISE, 0); flush(); } @@ -26,7 +26,7 @@ void sound(int val) if (!use_sound) return; - Term_xtra(TERM_XTRA_SOUND, val); + term_xtra(TERM_XTRA_SOUND, val); } /* @@ -37,7 +37,7 @@ errr play_music(int type, int val) if (!use_music) return 1; - return Term_xtra(type, val); + return term_xtra(type, val); } /* diff --git a/src/market/building-monster.c b/src/market/building-monster.c index 11b419c47..d5811e75a 100644 --- a/src/market/building-monster.c +++ b/src/market/building-monster.c @@ -162,7 +162,7 @@ bool research_mon(player_type *player_ptr) while (notpicked) { r_idx = who[i]; roff_top(r_idx); - Term_addstr(-1, TERM_WHITE, _(" ['r'思い出, ' 'で続行, ESC]", " [(r)ecall, ESC, space to continue]")); + term_addstr(-1, TERM_WHITE, _(" ['r'思い出, ' 'で続行, ESC]", " [(r)ecall, ESC, space to continue]")); while (TRUE) { if (recall) { lore_do_probe(player_ptr, r_idx); diff --git a/src/market/building-service.c b/src/market/building-service.c index ea32c991c..9f4f380b1 100644 --- a/src/market/building-service.c +++ b/src/market/building-service.c @@ -80,7 +80,7 @@ void display_buikding_service(player_type *player_ptr, building_type *bldg) byte action_color; char tmp_str[80]; - Term_clear(); + term_clear(); sprintf(tmp_str, "%s (%s) %35s", bldg->owner_name, bldg->owner_race, bldg->name); prt(tmp_str, 2, 1); diff --git a/src/mind/mind-mirror-master.c b/src/mind/mind-mirror-master.c index 85194b87a..8bfb9e5fd 100644 --- a/src/mind/mind-mirror-master.c +++ b/src/mind/mind-mirror-master.c @@ -155,8 +155,8 @@ bool binding_field(player_type *caster_ptr, HIT_POINT dam) u16b p = bolt_pict(y, x, y, x, GF_MANA); print_rel(caster_ptr, PICT_C(p), PICT_A(p), y, x); move_cursor_relative(y, x); - Term_fresh(); - Term_xtra(TERM_XTRA_DELAY, msec); + term_fresh(); + term_xtra(TERM_XTRA_DELAY, msec); } } } diff --git a/src/mind/mind-sniper.c b/src/mind/mind-sniper.c index bc43d8fae..20ae0670c 100644 --- a/src/mind/mind-sniper.c +++ b/src/mind/mind-sniper.c @@ -200,7 +200,7 @@ void display_snipe_list(player_type *sniper_ptr) sprintf(psi_desc, " %c) %-30s%2d %4d", I2A(i), spell.name, spell.min_lev, spell.mana_cost); - Term_putstr(x, y + i + 1, -1, TERM_WHITE, psi_desc); + term_putstr(x, y + i + 1, -1, TERM_WHITE, psi_desc); } return; } @@ -305,7 +305,7 @@ static int get_snipe_power(player_type *sniper_ptr, COMMAND_CODE *sn, bool only_ /* Dump the spells */ for (i = 0; i < MAX_SNIPE_POWERS; i++) { - Term_erase(x, y + i + 1, 255); + term_erase(x, y + i + 1, 255); /* Access the spell */ spell = snipe_powers[i]; @@ -583,11 +583,11 @@ void do_cmd_snipe_browse(player_type *sniper_ptr) } /* Clear lines, position cursor (really should use strlen here) */ - Term_erase(12, 22, 255); - Term_erase(12, 21, 255); - Term_erase(12, 20, 255); - Term_erase(12, 19, 255); - Term_erase(12, 18, 255); + term_erase(12, 22, 255); + term_erase(12, 21, 255); + term_erase(12, 20, 255); + term_erase(12, 19, 255); + term_erase(12, 18, 255); shape_buffer(snipe_tips[n], 62, temp, sizeof(temp)); for(j = 0, line = 19; temp[j]; j += (1 + strlen(&temp[j]))) diff --git a/src/mind/mind.c b/src/mind/mind.c index fe10f20dc..289c1bbc2 100644 --- a/src/mind/mind.c +++ b/src/mind/mind.c @@ -2070,12 +2070,12 @@ void do_cmd_mind_browse(player_type *caster_ptr) } /* Clear lines, position cursor (really should use strlen here) */ - Term_erase(12, 21, 255); - Term_erase(12, 20, 255); - Term_erase(12, 19, 255); - Term_erase(12, 18, 255); - Term_erase(12, 17, 255); - Term_erase(12, 16, 255); + term_erase(12, 21, 255); + term_erase(12, 20, 255); + term_erase(12, 19, 255); + term_erase(12, 18, 255); + term_erase(12, 17, 255); + term_erase(12, 16, 255); shape_buffer(mind_tips[use_mind][n], 62, temp, sizeof(temp)); for(j=0, line = 17;temp[j];j+=(1+strlen(&temp[j]))) diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c index d978b438f..4e35e5fd4 100644 --- a/src/monster/monster-status.c +++ b/src/monster/monster-status.c @@ -906,7 +906,7 @@ bool set_monster_timewalk(player_type *target_ptr, int num, MONSTER_IDX who, boo reset_target(m_ptr); handle_stuff(target_ptr); - if (vs_player) Term_xtra(TERM_XTRA_DELAY, 500); + if (vs_player) term_xtra(TERM_XTRA_DELAY, 500); } target_ptr->redraw |= (PR_MAP); diff --git a/src/perception/identification.c b/src/perception/identification.c index 01571ea03..889df87bc 100644 --- a/src/perception/identification.c +++ b/src/perception/identification.c @@ -687,7 +687,7 @@ bool screen_object(player_type *player_ptr, object_type *o_ptr, BIT_FLAGS mode) screen_save(); int wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); if (!(mode & SCROBJ_FAKE_OBJECT)) describe_flavor(player_ptr, o_name, o_ptr, 0); @@ -703,7 +703,7 @@ bool screen_object(player_type *player_ptr, object_type *o_ptr, BIT_FLAGS mode) monster_race *r_ptr = &r_info[o_ptr->pval]; int namelen = strlen(r_name + r_ptr->name); prt(format("%s: '", r_name + r_ptr->name), 1, 15); - Term_queue_bigchar(18 + namelen, 1, r_ptr->x_attr, r_ptr->x_char, 0, 0); + term_queue_bigchar(18 + namelen, 1, r_ptr->x_attr, r_ptr->x_char, 0, 0); prt("'", 1, (use_bigtile ? 20 : 19) + namelen); } else { prt(_(" アイテムの能力:", " Item Attributes:"), 1, 15); diff --git a/src/player/player-damage.c b/src/player/player-damage.c index 323605ec9..bcb641afb 100644 --- a/src/player/player-damage.c +++ b/src/player/player-damage.c @@ -564,11 +564,11 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp concptr str; char *str2; - Term_clear(); + term_clear(); /* 桜散る */ for (i = 0; i < 40; i++) - Term_putstr(randint0(w / 2) * 2, randint0(h), 2, TERM_VIOLET, "υ"); + term_putstr(randint0(w / 2) * 2, randint0(h), 2, TERM_VIOLET, "υ"); str = death_message; if (strncmp(str, "「", 2) == 0) @@ -587,7 +587,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp len = str2 - str; if (len != 0) { - Term_putstr_v(w * 3 / 4 - 2 - msg_pos_x[i] * 2, msg_pos_y[i], len, TERM_WHITE, str); + term_putstr_v(w * 3 / 4 - 2 - msg_pos_x[i] * 2, msg_pos_y[i], len, TERM_WHITE, str); if (str2 == NULL) break; i++; @@ -598,7 +598,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp } /* Hide cursor */ - Term_putstr(w - 1, h - 1, 1, TERM_WHITE, " "); + term_putstr(w - 1, h - 1, 1, TERM_WHITE, " "); flush(); #ifdef WORLD_SCORE diff --git a/src/player/process-death.c b/src/player/process-death.c index ec60cb3a6..06e298d37 100644 --- a/src/player/process-death.c +++ b/src/player/process-death.c @@ -213,7 +213,7 @@ static void show_tomb_detail(player_type *dead_ptr, char *buf) */ void print_tomb(player_type *dead_ptr) { - Term_clear(); + term_clear(); char buf[1024]; read_dead_file(buf, sizeof(buf)); concptr p = (current_world_ptr->total_winner || (dead_ptr->lev > PY_MAX_LEVEL)) ? _("偉大なる者", "Magnificant") @@ -293,7 +293,7 @@ static void home_aware(player_type *creature_ptr) static bool show_dead_player_items(player_type *creature_ptr) { if (creature_ptr->equip_cnt) { - Term_clear(); + term_clear(); (void)show_equipment(creature_ptr, 0, USE_FULL, 0); prt(_("装備していたアイテム: -続く-", "You are using: -more-"), 0, 0); if (inkey() == ESCAPE) @@ -301,7 +301,7 @@ static bool show_dead_player_items(player_type *creature_ptr) } if (creature_ptr->inven_cnt) { - Term_clear(); + term_clear(); (void)show_inventory(creature_ptr, 0, USE_FULL, 0); prt(_("持っていたアイテム: -続く-", "You are carrying: -more-"), 0, 0); @@ -326,7 +326,7 @@ static void show_dead_home_items(player_type *creature_ptr) continue; for (int i = 0, k = 0; i < store_ptr->stock_num; k++) { - Term_clear(); + term_clear(); for (int j = 0; (j < 12) && (i < store_ptr->stock_num); j++, i++) { GAME_TEXT o_name[MAX_NLEN]; char tmp_val[80]; diff --git a/src/player/process-name.c b/src/player/process-name.c index 5043af16e..1928dc3f4 100644 --- a/src/player/process-name.c +++ b/src/player/process-name.c @@ -163,7 +163,7 @@ void get_name(player_type *creature_ptr) #endif strcat(tmp, creature_ptr->name); - Term_erase(34, 1, 255); + term_erase(34, 1, 255); c_put_str(TERM_L_BLUE, tmp, 1, 34); clear_from(22); } diff --git a/src/savedata/load-util.c b/src/savedata/load-util.c index d9aba5955..fd7853106 100644 --- a/src/savedata/load-util.c +++ b/src/savedata/load-util.c @@ -32,7 +32,7 @@ void load_note(concptr msg) if (++y >= 24) y = 2; - Term_fresh(); + term_fresh(); } /*! diff --git a/src/savedata/save.c b/src/savedata/save.c index 1b7717c91..87b20d8e7 100644 --- a/src/savedata/save.c +++ b/src/savedata/save.c @@ -1681,7 +1681,7 @@ bool load_player(player_type *player_ptr) current_world_ptr->z_patch = vvv[2]; current_world_ptr->sf_extra = vvv[3]; - Term_clear(); + term_clear(); /* Attempt to load */ err = rd_savefile(player_ptr); diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c index a4a753b5f..59ee1be7b 100644 --- a/src/spell-kind/spells-genocide.c +++ b/src/spell-kind/spells-genocide.c @@ -99,10 +99,10 @@ bool genocide_aux(player_type *caster_ptr, MONSTER_IDX m_idx, int power, bool pl caster_ptr->redraw |= (PR_HP); caster_ptr->window |= (PW_PLAYER); handle_stuff(caster_ptr); - Term_fresh(); + term_fresh(); int msec = delay_factor * delay_factor * delay_factor; - Term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, msec); return !resist; } diff --git a/src/spell-kind/spells-sight.c b/src/spell-kind/spells-sight.c index b1f3d2d86..c5b7c8c95 100644 --- a/src/spell-kind/spells-sight.c +++ b/src/spell-kind/spells-sight.c @@ -376,7 +376,7 @@ bool probing(player_type *caster_ptr) handle_stuff(caster_ptr); move_cursor_relative(m_ptr->fy, m_ptr->fx); inkey(); - Term_erase(0, 0, 255); + term_erase(0, 0, 255); if (lore_do_probe(caster_ptr, m_ptr->r_idx)) { strcpy(buf, (r_name + r_ptr->name)); #ifdef JP @@ -393,7 +393,7 @@ bool probing(player_type *caster_ptr) Term->scr->cu = cu; Term->scr->cv = cv; - Term_fresh(); + term_fresh(); if (probe) { chg_virtue(caster_ptr, V_KNOWLEDGE, 1); diff --git a/src/spell-realm/spells-hex.c b/src/spell-realm/spells-hex.c index bdb1a7a9d..adf2333ed 100644 --- a/src/spell-realm/spells-hex.c +++ b/src/spell-realm/spells-hex.c @@ -73,11 +73,11 @@ bool stop_hex_spell(player_type *caster_ptr) while (!flag) { int n = 0; - Term_erase(x, y, 255); + term_erase(x, y, 255); prt(_(" 名前", " Name"), y, x + 5); for (spell = 0; spell < 32; spell++) { if (hex_spelling(caster_ptr, spell)) { - Term_erase(x, y + n + 1, 255); + term_erase(x, y + n + 1, 255); put_str(format("%c) %s", I2A(n), exe_spell(caster_ptr, REALM_HEX, spell, SPELL_NAME)), y + n + 1, x + 2); sp[n++] = spell; } diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c index f53c8b236..64ead9ecd 100644 --- a/src/spell/process-effect.c +++ b/src/spell/process-effect.c @@ -200,10 +200,10 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y, SYMBOL_CODE c = PICT_C(p); print_rel(caster_ptr, c, a, y, x); move_cursor_relative(y, x); - Term_fresh(); - Term_xtra(TERM_XTRA_DELAY, msec); + term_fresh(); + term_xtra(TERM_XTRA_DELAY, msec); lite_spot(caster_ptr, y, x); - Term_fresh(); + term_fresh(); if (flag & (PROJECT_BEAM)) { p = bolt_pict(y, x, y, x, typ); a = PICT_A(p); @@ -213,7 +213,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y, visual = TRUE; } else if (visual) { - Term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, msec); } } @@ -295,10 +295,10 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y, c = PICT_C(p); print_rel(caster_ptr, c, a, y, x); move_cursor_relative(y, x); - Term_fresh(); - Term_xtra(TERM_XTRA_DELAY, msec); + term_fresh(); + term_xtra(TERM_XTRA_DELAY, msec); lite_spot(caster_ptr, y, x); - Term_fresh(); + term_fresh(); if (flag & (PROJECT_BEAM)) { p = bolt_pict(y, x, y, x, typ); a = PICT_A(p); @@ -308,7 +308,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y, visual = TRUE; } else if (visual) { - Term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, msec); } } @@ -400,10 +400,10 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y, c = PICT_C(p); print_rel(caster_ptr, c, a, y, x); move_cursor_relative(y, x); - Term_fresh(); - Term_xtra(TERM_XTRA_DELAY, msec); + term_fresh(); + term_xtra(TERM_XTRA_DELAY, msec); lite_spot(caster_ptr, y, x); - Term_fresh(); + term_fresh(); if (flag & (PROJECT_BEAM)) { p = bolt_pict(y, x, y, x, typ); a = PICT_A(p); @@ -413,7 +413,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y, visual = TRUE; } else if (visual) { - Term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, msec); } } } @@ -509,9 +509,9 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y, } move_cursor_relative(by, bx); - Term_fresh(); + term_fresh(); if (visual || drawn) { - Term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, msec); } } @@ -525,7 +525,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y, } move_cursor_relative(by, bx); - Term_fresh(); + term_fresh(); } } diff --git a/src/store/store.c b/src/store/store.c index 444d3f3cb..1ab8541d6 100644 --- a/src/store/store.c +++ b/src/store/store.c @@ -485,7 +485,7 @@ static void display_entry(player_type *player_ptr, int pos) TERM_COLOR a = object_attr(o_ptr); SYMBOL_CODE c = object_char(o_ptr); - Term_queue_bigchar(cur_col, i + 6, a, c, 0, 0); + term_queue_bigchar(cur_col, i + 6, a, c, 0, 0); if (use_bigtile) cur_col++; @@ -610,7 +610,7 @@ static void store_prt_gold(player_type *player_ptr) */ static void display_store(player_type *player_ptr) { - Term_clear(); + term_clear(); if (cur_store_num == STORE_HOME) { put_str(_("我が家", "Your Home"), 3, 31); put_str(_("アイテムの一覧", "Item Description"), 5, 4); @@ -1800,7 +1800,7 @@ static void store_process_command(player_type *client_ptr) break; } case '!': { - (void)Term_user(0); + (void)term_user(0); break; } case '"': { @@ -1902,7 +1902,7 @@ void do_cmd_store(player_type *player_ptr) if (player_ptr->wild_mode) return; TERM_LEN w, h; - Term_get_size(&w, &h); + term_get_size(&w, &h); xtra_stock = MIN(14 + 26, ((h > 24) ? (h - 24) : 0)); store_bottom = MIN_STOCK + xtra_stock; @@ -2046,7 +2046,7 @@ void do_cmd_store(player_type *player_ptr) get_com_no_macros = FALSE; msg_erase(); - Term_clear(); + term_clear(); player_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE); player_ptr->update |= (PU_MONSTERS); diff --git a/src/term/screen-processor.c b/src/term/screen-processor.c index 475f7b9fd..fb2f38ee2 100644 --- a/src/term/screen-processor.c +++ b/src/term/screen-processor.c @@ -12,7 +12,7 @@ static int screen_depth = 0; /* * Move the cursor */ -void move_cursor(int row, int col) { Term_gotoxy(col, row); } +void move_cursor(int row, int col) { term_gotoxy(col, row); } /* * Flush all input chars. Actually, remember the flush, @@ -32,7 +32,7 @@ void screen_save() { msg_print(NULL); if (screen_depth++ == 0) - Term_save(); + term_save(); current_world_ptr->character_icky++; } @@ -46,7 +46,7 @@ void screen_load() { msg_print(NULL); if (--screen_depth == 0) - Term_load(); + term_load(); current_world_ptr->character_icky--; } @@ -57,12 +57,12 @@ void screen_load() * 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, concptr str, TERM_LEN row, TERM_LEN col) { Term_putstr(col, row, -1, attr, str); } +void c_put_str(TERM_COLOR attr, concptr str, TERM_LEN row, TERM_LEN col) { term_putstr(col, row, -1, attr, str); } /* * As above, but in "white" */ -void put_str(concptr str, TERM_LEN row, TERM_LEN col) { Term_putstr(col, row, -1, TERM_WHITE, str); } +void put_str(concptr str, TERM_LEN row, TERM_LEN col) { term_putstr(col, row, -1, TERM_WHITE, str); } /* * Display a string on the screen using an attribute, and clear @@ -70,8 +70,8 @@ void put_str(concptr str, TERM_LEN row, TERM_LEN col) { Term_putstr(col, row, -1 */ void c_prt(TERM_COLOR attr, concptr str, TERM_LEN row, TERM_LEN col) { - Term_erase(col, row, 255); - Term_addstr(-1, attr, str); + term_erase(col, row, 255); + term_addstr(-1, attr, str); } /* @@ -100,10 +100,10 @@ void prt(concptr str, TERM_LEN row, TERM_LEN col) void c_roff(TERM_COLOR a, concptr str) { int w, h; - (void)Term_get_size(&w, &h); + (void)term_get_size(&w, &h); int x, y; - (void)Term_locate(&x, &y); + (void)term_locate(&x, &y); if (y == h - 1 && x > w - 3) return; @@ -119,7 +119,7 @@ void c_roff(TERM_COLOR a, concptr str) if (y == h) break; - Term_erase(x, y, 255); + term_erase(x, y, 255); break; } @@ -147,7 +147,7 @@ void c_roff(TERM_COLOR a, concptr str) #endif { for (i = w - 2; i >= 0; i--) { - Term_what(i, y, &av[i], &cv[i]); + term_what(i, y, &av[i], &cv[i]); if (cv[i] == ' ') break; @@ -163,9 +163,9 @@ void c_roff(TERM_COLOR a, concptr str) /* 現在が全角文字のとき */ /* 文頭が「。」「、」等になるときは、その１つ前の語で改行 */ if (strncmp(s, "。", 2) == 0 || strncmp(s, "、", 2) == 0) { - Term_what(x, y, &av[x], &cv[x]); - Term_what(x - 1, y, &av[x - 1], &cv[x - 1]); - Term_what(x - 2, y, &av[x - 2], &cv[x - 2]); + term_what(x, y, &av[x], &cv[x]); + term_what(x - 1, y, &av[x - 1], &cv[x - 1]); + term_what(x - 2, y, &av[x - 2], &cv[x - 2]); n = x - 2; cv[x] = '\0'; } @@ -175,28 +175,28 @@ void c_roff(TERM_COLOR a, concptr str) if (n == 0) n = w; - Term_erase(n, y, 255); + term_erase(n, y, 255); x = 0; y++; if (y == h) break; - Term_erase(x, y, 255); + term_erase(x, y, 255); for (i = n; i < w - 1; i++) { #ifdef JP if (cv[i] == '\0') break; #endif - Term_addch(av[i], cv[i]); + term_addch(av[i], cv[i]); if (++x > w) x = w; } } #ifdef JP - Term_addch((byte)(a | 0x10), ch); + term_addch((byte)(a | 0x10), ch); #else - Term_addch(a, ch); + term_addch(a, ch); #endif #ifdef JP @@ -204,7 +204,7 @@ void c_roff(TERM_COLOR a, concptr str) s++; x++; ch = *s; - Term_addch((byte)(a | 0x20), ch); + term_addch((byte)(a | 0x20), ch); } #endif @@ -228,6 +228,6 @@ void roff(concptr str) void clear_from(int row) { for (int y = row; y < Term->hgt; y++) { - Term_erase(0, y, 255); + term_erase(0, y, 255); } } diff --git a/src/term/z-term.c b/src/term/z-term.c index 049571598..b70e779f7 100644 --- a/src/term/z-term.c +++ b/src/term/z-term.c @@ -131,7 +131,7 @@ static errr term_win_copy(term_win *s, term_win *f, TERM_LEN w, TERM_LEN h) /* * Execute the "Term->user_hook" hook, if available (see above). */ -errr Term_user(int n) +errr term_user(int n) { /* Verify the hook */ if (!Term->user_hook) @@ -144,7 +144,7 @@ errr Term_user(int n) /* * Execute the "Term->xtra_hook" hook, if available (see above). */ -errr Term_xtra(int n, int v) +errr term_xtra(int n, int v) { /* Verify the hook */ if (!Term->xtra_hook) @@ -157,9 +157,9 @@ errr Term_xtra(int n, int v) /*** Fake hooks ***/ /* - * Fake hook for "Term_curs()" (see above) + * Fake hook for "term_curs()" (see above) */ -static errr Term_curs_hack(TERM_LEN x, TERM_LEN y) +static errr term_curs_hack(TERM_LEN x, TERM_LEN y) { /* Unused */ (void)x; @@ -169,14 +169,14 @@ static errr Term_curs_hack(TERM_LEN x, TERM_LEN y) } /* - * Fake hook for "Term_bigcurs()" (see above) + * Fake hook for "term_bigcurs()" (see above) */ -static errr Term_bigcurs_hack(TERM_LEN x, TERM_LEN y) { return (*Term->curs_hook)(x, y); } +static errr term_bigcurs_hack(TERM_LEN x, TERM_LEN y) { return (*Term->curs_hook)(x, y); } /* - * Fake hook for "Term_wipe()" (see above) + * Fake hook for "term_wipe()" (see above) */ -static errr Term_wipe_hack(TERM_LEN x, TERM_LEN y, int n) +static errr term_wipe_hack(TERM_LEN x, TERM_LEN y, int n) { /* Unused */ (void)x; @@ -187,9 +187,9 @@ static errr Term_wipe_hack(TERM_LEN x, TERM_LEN y, int n) } /* - * Fake hook for "Term_text()" (see above) + * Fake hook for "term_text()" (see above) */ -static errr Term_text_hack(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr cp) +static errr term_text_hack(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr cp) { /* Unused */ (void)x; @@ -202,9 +202,9 @@ static errr Term_text_hack(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr } /* - * Fake hook for "Term_pict()" (see above) + * Fake hook for "term_pict()" (see above) */ -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) +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; @@ -224,7 +224,7 @@ static errr Term_pict_hack(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, * Mentally draw an attr/char at a given location * Assumes given location and values are valid. */ -void Term_queue_char(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta, char tc) +void term_queue_char(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta, char tc) { term_win *scrn = Term->scr; @@ -267,12 +267,12 @@ void Term_queue_char(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta } /* - * Bigtile version of Term_queue_char(). - * If use_bigtile is FALSE, simply call Term_queue_char(). + * Bigtile version of term_queue_char(). + * If use_bigtile is FALSE, simply call term_queue_char(). * Otherwise, mentally draw a pair of attr/char at a given location. * Assumes given location and values are valid. */ -void Term_queue_bigchar(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta, char tc) +void term_queue_bigchar(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta, char tc) { #ifdef JP @@ -295,7 +295,7 @@ void Term_queue_bigchar(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR /* If non bigtile mode, call orginal function */ if (!use_bigtile) { - Term_queue_char(x, y, a, c, ta, tc); + term_queue_char(x, y, a, c, ta, tc); return; } @@ -336,8 +336,8 @@ void Term_queue_bigchar(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR } /* Display pair of attr/char */ - Term_queue_char(x, y, a, c, ta, tc); - Term_queue_char(x + 1, y, a2, c2, 0, 0); + term_queue_char(x, y, a, c, ta, tc); + term_queue_char(x + 1, y, a2, c2, 0, 0); } /* @@ -346,7 +346,7 @@ void Term_queue_bigchar(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR * This function is designed to be fast, with no consistancy checking. * It is used to update the map in the game. */ -void Term_queue_line(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR *a, char *c, TERM_COLOR *ta, char *tc) +void term_queue_line(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR *a, char *c, TERM_COLOR *ta, char *tc) { term_win *scrn = Term->scr; @@ -416,7 +416,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, concptr s) +void term_queue_chars(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s) { TERM_LEN x1 = -1, x2 = -1; @@ -513,7 +513,7 @@ void Term_queue_chars(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s) { int w, h; - Term_get_size(&w, &h); + term_get_size(&w, &h); if (x != w && !(scr_aa[x] & AF_TILE1) && (scr_aa[x] & AF_KANJI2)) { scr_cc[x] = ' '; scr_aa[x] &= AF_KANJIC; @@ -542,10 +542,10 @@ void Term_queue_chars(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s) /*** Refresh routines ***/ /* - * Flush a row of the current window (see "Term_fresh") - * Display text using "Term_pict()" + * Flush a row of the current window (see "term_fresh") + * Display text using "term_pict()" */ -static void Term_fresh_row_pict(TERM_LEN y, TERM_LEN x1, TERM_LEN x2) +static void term_fresh_row_pict(TERM_LEN y, TERM_LEN x1, TERM_LEN x2) { TERM_COLOR *old_aa = Term->old->a[y]; char *old_cc = Term->old->c[y]; @@ -661,12 +661,12 @@ static void Term_fresh_row_pict(TERM_LEN y, TERM_LEN x1, TERM_LEN x2) } /* - * Flush a row of the current window (see "Term_fresh") + * Flush a row of the current window (see "term_fresh") * - * Display text using "Term_text()" and "Term_wipe()", - * but use "Term_pict()" for high-bit attr/char pairs + * Display text using "term_text()" and "term_wipe()", + * but use "term_pict()" for high-bit attr/char pairs */ -static void Term_fresh_row_both(TERM_LEN y, int x1, int x2) +static void term_fresh_row_both(TERM_LEN y, int x1, int x2) { TERM_COLOR *old_aa = Term->old->a[y]; char *old_cc = Term->old->c[y]; @@ -863,11 +863,11 @@ static void Term_fresh_row_both(TERM_LEN y, int x1, int x2) } /* - * Flush a row of the current window (see "Term_fresh") + * Flush a row of the current window (see "term_fresh") * - * Display text using "Term_text()" and "Term_wipe()" + * Display text using "term_text()" and "term_wipe()" */ -static void Term_fresh_row_text(TERM_LEN y, TERM_LEN x1, TERM_LEN x2) +static void term_fresh_row_text(TERM_LEN y, TERM_LEN x1, TERM_LEN x2) { TERM_COLOR *old_aa = Term->old->a[y]; char *old_cc = Term->old->c[y]; @@ -1024,7 +1024,7 @@ static void Term_fresh_row_text(TERM_LEN y, TERM_LEN x1, TERM_LEN x2) /* * @brief Actually perform all requested changes to the window */ -errr Term_fresh(void) +errr term_fresh(void) { int w = Term->wid; int h = Term->hgt; @@ -1055,7 +1055,7 @@ errr Term_fresh(void) char nc = Term->char_blank; /* Physically erase the entire window */ - Term_xtra(TERM_XTRA_CLEAR, 0); + term_xtra(TERM_XTRA_CLEAR, 0); /* clear all "cursor" data */ old->cv = old->cu = old->cx = old->cy = 0; @@ -1114,11 +1114,11 @@ errr Term_fresh(void) if (tx + 1 < Term->wid && !(old_aa[tx] & AF_TILE1) && iskanji(old_cc[tx])) csize = 2; #endif - /* Use "Term_pict()" always */ + /* Use "term_pict()" always */ if (Term->always_pict) (void)((*Term->pict_hook)(tx, ty, csize, &old_aa[tx], &old_cc[tx], &ota, &otc)); - /* Use "Term_pict()" sometimes */ + /* Use "term_pict()" sometimes */ else if (Term->higher_pict && (old_aa[tx] & AF_TILE1) && (old_cc[tx] & 0x80)) (void)((*Term->pict_hook)(tx, ty, 1, &old_aa[tx], &old_cc[tx], &ota, &otc)); @@ -1144,7 +1144,7 @@ errr Term_fresh(void) /* Cursor will be invisible */ if (scr->cu || !scr->cv) { /* Make the cursor invisible */ - Term_xtra(TERM_XTRA_SHAPE, 0); + term_xtra(TERM_XTRA_SHAPE, 0); } } @@ -1169,22 +1169,22 @@ errr Term_fresh(void) /* Flush each "modified" row */ if (x1 <= x2) { - /* Always use "Term_pict()" */ + /* Always use "term_pict()" */ if (Term->always_pict) { /* Flush the row */ - Term_fresh_row_pict(y, x1, x2); + term_fresh_row_pict(y, x1, x2); } - /* Sometimes use "Term_pict()" */ + /* Sometimes use "term_pict()" */ else if (Term->higher_pict) { /* Flush the row */ - Term_fresh_row_both(y, x1, x2); + term_fresh_row_both(y, x1, x2); } - /* Never use "Term_pict()" */ + /* Never use "term_pict()" */ else { /* Flush the row */ - Term_fresh_row_text(y, x1, x2); + term_fresh_row_text(y, x1, x2); } /* This row is all done */ @@ -1193,7 +1193,7 @@ errr Term_fresh(void) /* Flush that row (if allowed) */ if (!Term->never_frosh) - Term_xtra(TERM_XTRA_FROSH, y); + term_xtra(TERM_XTRA_FROSH, y); } } @@ -1231,7 +1231,7 @@ errr Term_fresh(void) (void)((*Term->curs_hook)(w - 1, scr->cy)); /* Make the cursor invisible */ - /* Term_xtra(TERM_XTRA_SHAPE, 0); */ + /* term_xtra(TERM_XTRA_SHAPE, 0); */ } /* The cursor is invisible, hide it */ @@ -1240,7 +1240,7 @@ errr Term_fresh(void) (void)((*Term->curs_hook)(scr->cx, scr->cy)); /* Make the cursor invisible */ - /* Term_xtra(TERM_XTRA_SHAPE, 0); */ + /* term_xtra(TERM_XTRA_SHAPE, 0); */ } /* The cursor is visible, display it correctly */ @@ -1249,7 +1249,7 @@ errr Term_fresh(void) (void)((*Term->curs_hook)(scr->cx, scr->cy)); /* Make the cursor visible */ - Term_xtra(TERM_XTRA_SHAPE, 1); + term_xtra(TERM_XTRA_SHAPE, 1); } } @@ -1260,7 +1260,7 @@ errr Term_fresh(void) old->cy = scr->cy; /* Actually flush the output */ - Term_xtra(TERM_XTRA_FRESH, 0); + term_xtra(TERM_XTRA_FRESH, 0); return 0; } @@ -1269,7 +1269,7 @@ errr Term_fresh(void) /* * Set the cursor visibility */ -errr Term_set_cursor(int v) +errr term_set_cursor(int v) { /* Already done */ if (Term->scr->cv == v) @@ -1285,7 +1285,7 @@ errr Term_set_cursor(int v) * * Note -- "illegal" requests do not move the cursor. */ -errr Term_gotoxy(TERM_LEN x, TERM_LEN y) +errr term_gotoxy(TERM_LEN x, TERM_LEN y) { int w = Term->wid; int h = Term->hgt; @@ -1308,9 +1308,9 @@ errr Term_gotoxy(TERM_LEN x, TERM_LEN y) /* * At a given location, place an attr/char * Do not change the cursor position - * No visual changes until "Term_fresh()". + * No visual changes until "term_fresh()". */ -errr Term_draw(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c) +errr term_draw(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c) { int w = Term->wid; int h = Term->hgt; @@ -1325,7 +1325,7 @@ errr Term_draw(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c) return (-2); /* Queue it for later */ - Term_queue_char(x, y, a, c, 0, 0); + term_queue_char(x, y, a, c, 0, 0); return 0; } @@ -1345,7 +1345,7 @@ errr Term_draw(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c) * positive value, future calls to either function will * return negative ones. */ -errr Term_addch(TERM_COLOR a, char c) +errr term_addch(TERM_COLOR a, char c) { TERM_LEN w = Term->wid; @@ -1358,7 +1358,7 @@ errr Term_addch(TERM_COLOR a, char c) return (-2); /* Queue the given character for display */ - Term_queue_char(Term->scr->cx, Term->scr->cy, a, c, 0, 0); + term_queue_char(Term->scr->cx, Term->scr->cy, a, c, 0, 0); /* Advance the cursor */ Term->scr->cx++; @@ -1375,17 +1375,17 @@ errr Term_addch(TERM_COLOR a, char c) } /* - * Bigtile version of Term_addch(). + * Bigtile version of term_addch(). * - * If use_bigtile is FALSE, simply call Term_addch() . + * If use_bigtile is FALSE, simply call term_addch() . * * Otherwise, queue a pair of attr/char for display at the current * cursor location, and advance the cursor to the right by two. */ -errr Term_add_bigch(TERM_COLOR a, char c) +errr term_add_bigch(TERM_COLOR a, char c) { if (!use_bigtile) - return Term_addch(a, c); + return term_addch(a, c); /* Handle "unusable" cursor */ if (Term->scr->cu) @@ -1396,7 +1396,7 @@ errr Term_add_bigch(TERM_COLOR a, char c) return (-2); /* Queue the given character for display */ - Term_queue_bigchar(Term->scr->cx, Term->scr->cy, a, c, 0, 0); + term_queue_bigchar(Term->scr->cx, Term->scr->cy, a, c, 0, 0); /* Advance the cursor */ Term->scr->cx += 2; @@ -1431,7 +1431,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, concptr s) +errr term_addstr(int n, TERM_COLOR a, concptr s) { int k; TERM_LEN w = Term->wid; @@ -1453,7 +1453,7 @@ errr Term_addstr(int n, TERM_COLOR a, concptr s) res = n = w - Term->scr->cx; /* Queue the first "n" characters for display */ - Term_queue_chars(Term->scr->cx, Term->scr->cy, n, a, s); + term_queue_chars(Term->scr->cx, Term->scr->cy, n, a, s); /* Advance the cursor */ Term->scr->cx += (byte)n; @@ -1468,16 +1468,16 @@ errr Term_addstr(int n, TERM_COLOR a, concptr s) /* * Move to a location and, using an attr, add a char */ -errr Term_putch(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c) +errr term_putch(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c) { errr res; /* Move first */ - if ((res = Term_gotoxy(x, y)) != 0) + if ((res = term_gotoxy(x, y)) != 0) return (res); /* Then add the char */ - if ((res = Term_addch(a, c)) != 0) + if ((res = term_addch(a, c)) != 0) return (res); return 0; @@ -1486,16 +1486,16 @@ 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, concptr s) +errr term_putstr(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr s) { errr res; /* Move first */ - if ((res = Term_gotoxy(x, y)) != 0) + if ((res = term_gotoxy(x, y)) != 0) return (res); /* Then add the string */ - if ((res = Term_addstr(n, a, s)) != 0) + if ((res = term_addstr(n, a, s)) != 0) return (res); return 0; @@ -1505,25 +1505,25 @@ errr Term_putstr(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr 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, concptr s) +errr term_putstr_v(TERM_LEN x, TERM_LEN y, int n, byte a, concptr s) { errr res; int y0 = y; for (int i = 0; i < n && s[i] != 0; i++) { /* Move first */ - if ((res = Term_gotoxy(x, y0)) != 0) + if ((res = term_gotoxy(x, y0)) != 0) return (res); if (iskanji(s[i])) { - if ((res = Term_addstr(2, a, &s[i])) != 0) + if ((res = term_addstr(2, a, &s[i])) != 0) return (res); i++; y0++; if (s[i] == 0) break; } else { - if ((res = Term_addstr(1, a, &s[i])) != 0) + if ((res = term_addstr(1, a, &s[i])) != 0) return (res); y0++; } @@ -1536,7 +1536,7 @@ errr Term_putstr_v(TERM_LEN x, TERM_LEN y, int n, byte a, concptr s) /* * Place cursor at (x,y), and clear the next "n" chars */ -errr Term_erase(TERM_LEN x, TERM_LEN y, int n) +errr term_erase(TERM_LEN x, TERM_LEN y, int n) { TERM_LEN w = Term->wid; /* int h = Term->hgt; */ @@ -1554,7 +1554,7 @@ errr Term_erase(TERM_LEN x, TERM_LEN y, int n) char *scr_tcc; /* Place cursor */ - if (Term_gotoxy(x, y)) + if (term_gotoxy(x, y)) return -1; /* Force legal size */ @@ -1640,7 +1640,7 @@ errr Term_erase(TERM_LEN x, TERM_LEN y, int n) * * Note the use of the special "total_erase" code */ -errr Term_clear(void) +errr term_clear(void) { TERM_LEN w = Term->wid; TERM_LEN h = Term->hgt; @@ -1688,18 +1688,18 @@ errr Term_clear(void) /* * Redraw (and refresh) the whole window. */ -errr Term_redraw(void) +errr term_redraw(void) { /* Force "total erase" */ Term->total_erase = TRUE; - Term_fresh(); + term_fresh(); return 0; } /* * Redraw part of a window. */ -errr Term_redraw_section(TERM_LEN x1, TERM_LEN y1, TERM_LEN x2, TERM_LEN y2) +static errr term_redraw_section(TERM_LEN x1, TERM_LEN y1, TERM_LEN x2, TERM_LEN y2) { char *g_ptr; @@ -1757,7 +1757,7 @@ errr Term_redraw_section(TERM_LEN x1, TERM_LEN y1, TERM_LEN x2, TERM_LEN y2) #endif } - Term_fresh(); + term_fresh(); return 0; } @@ -1766,7 +1766,7 @@ errr Term_redraw_section(TERM_LEN x1, TERM_LEN y1, TERM_LEN x2, TERM_LEN y2) /* * Extract the cursor visibility */ -errr Term_get_cursor(int *v) +errr term_get_cursor(int *v) { /* Extract visibility */ (*v) = Term->scr->cv; @@ -1776,7 +1776,7 @@ errr Term_get_cursor(int *v) /* * Extract the current window size */ -errr Term_get_size(TERM_LEN *w, TERM_LEN *h) +errr term_get_size(TERM_LEN *w, TERM_LEN *h) { /* Access the cursor */ (*w) = Term->wid; @@ -1787,7 +1787,7 @@ errr Term_get_size(TERM_LEN *w, TERM_LEN *h) /* * Extract the current cursor location */ -errr Term_locate(TERM_LEN *x, TERM_LEN *y) +errr term_locate(TERM_LEN *x, TERM_LEN *y) { /* Access the cursor */ (*x) = Term->scr->cx; @@ -1803,9 +1803,9 @@ errr Term_locate(TERM_LEN *x, TERM_LEN *y) /* * At a given location, determine the "current" attr and char * Note that this refers to what will be on the window after the - * next call to "Term_fresh()". It may or may not already be there. + * next call to "term_fresh()". It may or may not already be there. */ -errr Term_what(TERM_LEN x, TERM_LEN y, TERM_COLOR *a, char *c) +errr term_what(TERM_LEN x, TERM_LEN y, TERM_COLOR *a, char *c) { TERM_LEN w = Term->wid; TERM_LEN h = Term->hgt; @@ -1826,10 +1826,10 @@ errr Term_what(TERM_LEN x, TERM_LEN y, TERM_COLOR *a, char *c) /* * Flush and forget the input */ -errr Term_flush(void) +errr term_flush(void) { /* Flush all events */ - Term_xtra(TERM_XTRA_FLUSH, 0); + term_xtra(TERM_XTRA_FLUSH, 0); /* Forget all keypresses */ Term->key_head = Term->key_tail = 0; @@ -1839,7 +1839,7 @@ errr Term_flush(void) /* * Add a keypress to the "queue" */ -errr Term_keypress(int k) +errr term_keypress(int k) { /* Refuse to enqueue non-keys */ if (!k) @@ -1861,7 +1861,7 @@ errr Term_keypress(int k) /* * Add a keypress to the FRONT of the "queue" */ -errr Term_key_push(int k) +errr term_key_push(int k) { /* Refuse to enqueue non-keys */ if (!k) @@ -1890,7 +1890,7 @@ errr Term_key_push(int k) * * Remove the keypress if "take" is true. */ -errr Term_inkey(char *ch, bool wait, bool take) +errr term_inkey(char *ch, bool wait, bool take) { /* Assume no key */ (*ch) = '\0'; @@ -1902,7 +1902,7 @@ errr Term_inkey(char *ch, bool wait, bool take) /* get bored */ if (!Term->never_bored) { /* Process random events */ - Term_xtra(TERM_XTRA_BORED, 0); + term_xtra(TERM_XTRA_BORED, 0); } /* Wait */ @@ -1910,7 +1910,7 @@ errr Term_inkey(char *ch, bool wait, bool take) /* Process pending events while necessary */ while (Term->key_head == Term->key_tail) { /* Process events (wait for one) */ - Term_xtra(TERM_XTRA_EVENT, TRUE); + term_xtra(TERM_XTRA_EVENT, TRUE); } } @@ -1919,7 +1919,7 @@ errr Term_inkey(char *ch, bool wait, bool take) /* Process pending events if necessary */ if (Term->key_head == Term->key_tail) { /* Process events (do not wait) */ - Term_xtra(TERM_XTRA_EVENT, FALSE); + term_xtra(TERM_XTRA_EVENT, FALSE); } } @@ -1942,9 +1942,9 @@ errr Term_inkey(char *ch, bool wait, bool take) /* * Save the "requested" screen into the "memorized" screen * - * Every "Term_save()" should match exactly one "Term_load()" + * Every "term_save()" should match exactly one "term_load()" */ -errr Term_save(void) +errr term_save(void) { TERM_LEN w = Term->wid; TERM_LEN h = Term->hgt; @@ -1966,9 +1966,9 @@ errr Term_save(void) /* * Restore the "requested" contents (see above). * - * Every "Term_save()" should match exactly one "Term_load()" + * Every "term_save()" should match exactly one "term_load()" */ -errr Term_load(void) +errr term_load(void) { TERM_LEN w = Term->wid; TERM_LEN h = Term->hgt; @@ -2001,7 +2001,7 @@ errr Term_load(void) /* * Exchange the "requested" screen with the "tmp" screen */ -errr Term_exchange(void) +static errr term_exchange(void) { TERM_LEN w = Term->wid; TERM_LEN h = Term->hgt; @@ -2038,7 +2038,7 @@ errr Term_exchange(void) /* * React to a new physical window size. */ -errr Term_resize(TERM_LEN w, TERM_LEN h) +errr term_resize(TERM_LEN w, TERM_LEN h) { TERM_LEN wid, hgt; @@ -2220,9 +2220,9 @@ errr Term_resize(TERM_LEN w, TERM_LEN h) * It is the only function that should "modify" the value of "Term". * * To "create" a valid "term", one should do "term_init(t)", then - * set the various flags and hooks, and then do "Term_activate(t)". + * set the various flags and hooks, and then do "term_activate(t)". */ -errr Term_activate(term *t) +errr term_activate(term *t) { /* already done */ if (Term == t) @@ -2230,7 +2230,7 @@ errr Term_activate(term *t) /* Deactivate the old Term */ if (Term) - Term_xtra(TERM_XTRA_LEVEL, 0); + term_xtra(TERM_XTRA_LEVEL, 0); /* Call the special "init" hook */ if (t && !t->active_flag) { @@ -2250,7 +2250,7 @@ errr Term_activate(term *t) /* Activate the new Term */ if (Term) - Term_xtra(TERM_XTRA_LEVEL, 1); + term_xtra(TERM_XTRA_LEVEL, 1); return 0; } @@ -2374,10 +2374,10 @@ errr term_init(term *t, TERM_LEN w, TERM_LEN h, int k) t->char_blank = ' '; /* Prepare "fake" hooks to prevent core dumps */ - t->curs_hook = Term_curs_hack; - t->bigcurs_hook = Term_bigcurs_hack; - t->wipe_hook = Term_wipe_hack; - t->text_hook = Term_text_hack; - t->pict_hook = Term_pict_hack; + t->curs_hook = term_curs_hack; + t->bigcurs_hook = term_bigcurs_hack; + t->wipe_hook = term_wipe_hack; + t->text_hook = term_text_hack; + t->pict_hook = term_pict_hack; return 0; } diff --git a/src/term/z-term.h b/src/term/z-term.h index b3cd84e36..42b1a3e70 100644 --- a/src/term/z-term.h +++ b/src/term/z-term.h @@ -14,12 +14,10 @@ #include "system/angband.h" #include "system/h-basic.h" -typedef struct term_win term_win; /*! * @brief A term_win is a "window" for a Term */ - struct term_win -{ +typedef struct term_win { bool cu, cv; //!< Cursor Useless / Visible codes TERM_LEN cx, cy; //!< Cursor Location (see "Useless") @@ -34,16 +32,12 @@ typedef struct term_win term_win; TERM_COLOR *vta; //!< Note that the row of attr at(0, y) is a[y] char *vtc; //!< Note that the row of chars at(0, y) is c[y] -}; - - +} term_win; /*! * @brief term実装構造体 / An actual "term" structure */ -typedef struct term term; -struct term -{ +typedef struct term { vptr user; //!< Extra "user" info (used by application) vptr data; //!< Extra "data" info (used by implementation) @@ -98,21 +92,14 @@ struct term 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, const TERM_COLOR *ap, concptr cp, const TERM_COLOR *tap, concptr tcp); //!< タイル描画実装部 / Hook for drawing a sequence of special attr / char pairs -}; - - - - - - +} term; /**** Available Constants ****/ - /* - * Definitions for the "actions" of "Term_xtra()" + * Definitions for the "actions" of "term_xtra()" * - * These values may be used as the first parameter of "Term_xtra()", + * These values may be used as the first parameter of "term_xtra()", * with the second parameter depending on the "action" itself. Many * of the actions shown below are optional on at least one platform. * @@ -146,62 +133,52 @@ struct term #define TERM_XTRA_MUSIC_MUTE 18 /**** Available Variables ****/ - extern term *Term; - /**** Available Functions ****/ +extern errr term_user(int n); +extern errr term_xtra(int n, int v); -extern errr Term_user(int n); -extern errr Term_xtra(int n, int v); +extern void term_queue_char(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta, char tc); +extern void term_queue_bigchar(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta, char tc); -extern void Term_queue_char(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta, char tc); -extern void Term_queue_bigchar(TERM_LEN x, TERM_LEN y, TERM_COLOR a, char c, TERM_COLOR ta, char tc); +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_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, concptr 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); -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, 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, concptr s); +extern errr term_fresh(void); +extern errr term_set_cursor(int v); +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, 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, concptr s); #ifdef JP -extern errr Term_putstr_v(TERM_LEN x, TERM_LEN y, int n, byte a, concptr 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); -extern errr Term_redraw(void); -extern errr Term_redraw_section(TERM_LEN x1, TERM_LEN y1, TERM_LEN x2, TERM_LEN y2); - -extern errr Term_get_cursor(int *v); -extern errr Term_get_size(TERM_LEN *w, TERM_LEN *h); -extern errr Term_locate(TERM_LEN *x, TERM_LEN *y); -extern errr Term_what(TERM_LEN x, TERM_LEN y, TERM_COLOR *a, char *c); +extern errr term_erase(TERM_LEN x, TERM_LEN y, int n); +extern errr term_clear(void); +extern errr term_redraw(void); -extern errr Term_flush(void); -extern errr Term_keypress(int k); -extern errr Term_key_push(int k); -extern errr Term_inkey(char *ch, bool wait, bool take); +extern errr term_get_cursor(int *v); +extern errr term_get_size(TERM_LEN *w, TERM_LEN *h); +extern errr term_locate(TERM_LEN *x, TERM_LEN *y); +extern errr term_what(TERM_LEN x, TERM_LEN y, TERM_COLOR *a, char *c); -extern errr Term_save(void); -extern errr Term_load(void); +extern errr term_flush(void); +extern errr term_keypress(int k); +extern errr term_key_push(int k); +extern errr term_inkey(char *ch, bool wait, bool take); -extern errr Term_exchange(void); +extern errr term_save(void); +extern errr term_load(void); -extern errr Term_resize(TERM_LEN w, TERM_LEN h); +extern errr term_resize(TERM_LEN w, TERM_LEN h); -extern errr Term_activate(term *t); +extern errr term_activate(term *t); extern errr term_nuke(term *t); extern errr term_init(term *t, TERM_LEN w, TERM_LEN h, int k); - - #endif - - diff --git a/src/view/display-inventory.c b/src/view/display-inventory.c index 6945af225..0fc14a9fa 100644 --- a/src/view/display-inventory.c +++ b/src/view/display-inventory.c @@ -37,7 +37,7 @@ COMMAND_CODE show_inventory(player_type *owner_ptr, int target_item, BIT_FLAGS m int col = command_gap; TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); int len = wid - col - 1; for (i = 0; i < INVEN_PACK; i++) { o_ptr = &owner_ptr->inventory_list[i]; @@ -99,7 +99,7 @@ COMMAND_CODE show_inventory(player_type *owner_ptr, int target_item, BIT_FLAGS m if (show_item_graph) { TERM_COLOR a = object_attr(o_ptr); SYMBOL_CODE c = object_char(o_ptr); - Term_queue_bigchar(cur_col, j + 1, a, c, 0, 0); + term_queue_bigchar(cur_col, j + 1, a, c, 0, 0); if (use_bigtile) cur_col++; @@ -138,7 +138,7 @@ void display_inventory(player_type *owner_ptr, tval_type tval) if (!owner_ptr || !owner_ptr->inventory_list) return; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); for (i = 0; i < INVEN_PACK; i++) { o_ptr = &owner_ptr->inventory_list[i]; if (!o_ptr->k_idx) @@ -154,7 +154,7 @@ void display_inventory(player_type *owner_ptr, tval_type tval) tmp_val[1] = ')'; } - Term_putstr(0, i, 3, TERM_WHITE, tmp_val); + term_putstr(0, i, 3, TERM_WHITE, tmp_val); describe_flavor(owner_ptr, o_name, o_ptr, 0); n = strlen(o_name); attr = tval_to_attr[o_ptr->tval % 128]; @@ -162,8 +162,8 @@ void display_inventory(player_type *owner_ptr, tval_type tval) attr = TERM_L_DARK; } - Term_putstr(3, i, n, attr, o_name); - Term_erase(3 + n, i, 255); + term_putstr(3, i, n, attr, o_name); + term_erase(3 + n, i, 255); if (show_weights) { int wgt = o_ptr->weight * o_ptr->number; @@ -173,5 +173,5 @@ void display_inventory(player_type *owner_ptr, tval_type tval) } for (i = z; i < hgt; i++) - Term_erase(0, i, 255); + term_erase(0, i, 255); } diff --git a/src/view/display-lore.c b/src/view/display-lore.c index 53703b83b..2bfaa4545 100644 --- a/src/view/display-lore.c +++ b/src/view/display-lore.c @@ -46,34 +46,34 @@ void roff_top(MONRACE_IDX r_idx) TERM_COLOR a1 = r_ptr->d_attr; TERM_COLOR a2 = r_ptr->x_attr; - Term_erase(0, 0, 255); - Term_gotoxy(0, 0); + term_erase(0, 0, 255); + term_gotoxy(0, 0); #ifdef JP #else if (!(r_ptr->flags1 & RF1_UNIQUE)) { - Term_addstr(-1, TERM_WHITE, "The "); + term_addstr(-1, TERM_WHITE, "The "); } #endif - Term_addstr(-1, TERM_WHITE, (r_name + r_ptr->name)); + term_addstr(-1, TERM_WHITE, (r_name + r_ptr->name)); - Term_addstr(-1, TERM_WHITE, " ('"); - Term_add_bigch(a1, c1); - Term_addstr(-1, TERM_WHITE, "')"); + term_addstr(-1, TERM_WHITE, " ('"); + term_add_bigch(a1, c1); + term_addstr(-1, TERM_WHITE, "')"); - Term_addstr(-1, TERM_WHITE, "/('"); - Term_add_bigch(a2, c2); - Term_addstr(-1, TERM_WHITE, "'):"); + term_addstr(-1, TERM_WHITE, "/('"); + term_add_bigch(a2, c2); + term_addstr(-1, TERM_WHITE, "'):"); if (!current_world_ptr->wizard) return; char buf[16]; sprintf(buf, "%d", r_idx); - Term_addstr(-1, TERM_WHITE, " ("); - Term_addstr(-1, TERM_L_BLUE, buf); - Term_addch(TERM_WHITE, ')'); + term_addstr(-1, TERM_WHITE, " ("); + term_addstr(-1, TERM_L_BLUE, buf); + term_addch(TERM_WHITE, ')'); } /*! @@ -86,7 +86,7 @@ void roff_top(MONRACE_IDX r_idx) void screen_roff(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS mode) { msg_erase(); - Term_erase(0, 1, 255); + term_erase(0, 1, 255); hook_c_roff = c_roff; process_monster_lore(player_ptr, r_idx, mode); roff_top(r_idx); @@ -101,10 +101,10 @@ void screen_roff(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS mode) void display_roff(player_type *player_ptr) { for (int y = 0; y < Term->hgt; y++) { - Term_erase(0, y, 255); + term_erase(0, y, 255); } - Term_gotoxy(0, 1); + term_gotoxy(0, 1); hook_c_roff = c_roff; MONRACE_IDX r_idx = player_ptr->monster_race_idx; process_monster_lore(player_ptr, r_idx, 0); diff --git a/src/view/display-messages.c b/src/view/display-messages.c index c0b1f9a8c..8a8a95019 100644 --- a/src/view/display-messages.c +++ b/src/view/display-messages.c @@ -277,7 +277,7 @@ static void msg_flush(player_type *player_ptr, int x) player_ptr->now_damaged = FALSE; if (!player_ptr->playing || !nagasu) { - Term_putstr(x, 0, -1, a, _("-続く-", "-more-")); + term_putstr(x, 0, -1, a, _("-続く-", "-more-")); while (TRUE) { int cmd = inkey(); if (cmd == ESCAPE) { @@ -300,7 +300,7 @@ static void msg_flush(player_type *player_ptr, int x) } } - Term_erase(0, 0, 255); + term_erase(0, 0, 255); } void msg_erase(void) { msg_print(NULL); } @@ -317,7 +317,7 @@ void msg_erase(void) { msg_print(NULL); } * * These messages are memorized for later reference (see above). * - * We could do "Term_fresh()" to provide "flicker" if needed. + * We could do "term_fresh()" to provide "flicker" if needed. * * The global "msg_flag" variable can be cleared to tell us to * "erase" any "pending" messages still on the screen. @@ -341,7 +341,7 @@ void msg_print(concptr msg) return; if (!msg_flag) { - Term_erase(0, 0, 255); + term_erase(0, 0, 255); p = 0; } @@ -401,7 +401,7 @@ void msg_print(concptr msg) char oops = t[split]; t[split] = '\0'; - Term_putstr(0, 0, split, TERM_WHITE, t); + term_putstr(0, 0, split, TERM_WHITE, t); msg_flush(p_ptr, split + 1); t[split] = oops; t[--split] = ' '; @@ -409,7 +409,7 @@ void msg_print(concptr msg) n -= split; } - Term_putstr(p, 0, n, TERM_WHITE, t); + term_putstr(p, 0, n, TERM_WHITE, t); p_ptr->window |= (PW_MESSAGE); update_output(p_ptr); @@ -421,7 +421,7 @@ void msg_print(concptr msg) #endif if (fresh_message) - Term_fresh(); + term_fresh(); } /* diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c index 74ed00f67..bd4c403ce 100644 --- a/src/view/display-player-stat-info.c +++ b/src/view/display-player-stat-info.c @@ -223,7 +223,7 @@ static void display_equipments_compensation(player_type *creature_ptr, BIT_FLAGS c = 's'; } - Term_putch(*col, row + stat + 1, a, c); + term_putch(*col, row + stat + 1, a, c); } (*col)++; @@ -340,7 +340,7 @@ static void display_mutation_compensation(player_type *creature_ptr, BIT_FLAGS * c = 's'; } - Term_putch(col, row + stat + 1, a, c); + term_putch(col, row + stat + 1, a, c); } } diff --git a/src/view/display-player.c b/src/view/display-player.c index 048f94ed9..c7275bda9 100644 --- a/src/view/display-player.c +++ b/src/view/display-player.c @@ -369,6 +369,6 @@ void display_player_equippy(player_type *creature_ptr, TERM_LEN y, TERM_LEN x, B a = TERM_DARK; } - Term_putch(x + i - INVEN_RARM, y, a, c); + term_putch(x + i - INVEN_RARM, y, a, c); } } diff --git a/src/view/display-util.c b/src/view/display-util.c index a5708d8e9..51f723b74 100644 --- a/src/view/display-util.c +++ b/src/view/display-util.c @@ -123,18 +123,18 @@ void display_player_one_line(int entry, concptr val, TERM_COLOR attr) int row = disp_player_line[entry].row; int col = disp_player_line[entry].col; int len = disp_player_line[entry].len; - Term_putstr(col, row, -1, TERM_WHITE, head); + term_putstr(col, row, -1, TERM_WHITE, head); if (!val) return; if (len <= 0) { - Term_putstr(col + head_len, row, -1, attr, val); + term_putstr(col + head_len, row, -1, attr, val); return; } int val_len = len - head_len; char buf[40]; sprintf(buf, "%*.*s", val_len, val_len, val); - Term_putstr(col + head_len, row, -1, attr, buf); + term_putstr(col + head_len, row, -1, attr, buf); } diff --git a/src/view/object-describer.c b/src/view/object-describer.c index 8f86708c8..e40b27b4f 100644 --- a/src/view/object-describer.c +++ b/src/view/object-describer.c @@ -83,7 +83,7 @@ void display_koff(player_type *owner_ptr, KIND_OBJECT_IDX k_idx) REALM_IDX use_realm; GAME_TEXT o_name[MAX_NLEN]; for (int y = 0; y < Term->hgt; y++) { - Term_erase(0, y, 255); + term_erase(0, y, 255); } if (!k_idx) @@ -93,7 +93,7 @@ void display_koff(player_type *owner_ptr, KIND_OBJECT_IDX k_idx) object_prep(owner_ptr, q_ptr, k_idx); describe_flavor(owner_ptr, o_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY | OD_STORE)); - Term_putstr(0, 0, -1, TERM_WHITE, o_name); + term_putstr(0, 0, -1, TERM_WHITE, o_name); sval = q_ptr->sval; use_realm = tval2realm(q_ptr->tval); diff --git a/src/window/display-sub-window-spells.c b/src/window/display-sub-window-spells.c index bd77a787d..07dd8558f 100644 --- a/src/window/display-sub-window-spells.c +++ b/src/window/display-sub-window-spells.c @@ -118,7 +118,7 @@ static void display_spell_list(player_type *caster_ptr) mindcraft_info(caster_ptr, comment, use_mind, i); sprintf(psi_desc, " %c) %-30s%2d %4d %3d%%%s", I2A(i), spell.name, spell.min_lev, spell.mana_cost, chance, comment); - Term_putstr(x, y + i + 1, -1, a, psi_desc); + term_putstr(x, y + i + 1, -1, a, psi_desc); } return; @@ -157,7 +157,7 @@ static void display_spell_list(player_type *caster_ptr) sprintf(out_val, "%c/%c) %-20.20s", I2A(n / 8), I2A(n % 8), name); m[j] = y + n; - Term_putstr(x, m[j], -1, a, out_val); + term_putstr(x, m[j], -1, a, out_val); n++; } } @@ -179,9 +179,9 @@ void fix_spell(player_type *player_ptr) if (!(window_flag[j] & (PW_SPELL))) continue; - Term_activate(angband_term[j]); + term_activate(angband_term[j]); display_spell_list(player_ptr); - Term_fresh(); - Term_activate(old); + term_fresh(); + term_activate(old); } } diff --git a/src/window/display-sub-windows.c b/src/window/display-sub-windows.c index 043855a65..e8558ee9c 100644 --- a/src/window/display-sub-windows.c +++ b/src/window/display-sub-windows.c @@ -47,10 +47,10 @@ void fix_inventory(player_type *player_ptr, tval_type item_tester_tval) if (!(window_flag[j] & (PW_INVEN))) continue; - Term_activate(angband_term[j]); + term_activate(angband_term[j]); display_inventory(player_ptr, item_tester_tval); - Term_fresh(); - Term_activate(old); + term_fresh(); + term_activate(old); } } @@ -76,7 +76,7 @@ static void print_monster_line(TERM_LEN x, TERM_LEN y, monster_type *m_ptr, int MONRACE_IDX r_idx = m_ptr->ap_r_idx; monster_race *r_ptr = &r_info[r_idx]; - Term_gotoxy(x, y); + term_gotoxy(x, y); if (!r_ptr) return; if (r_ptr->flags1 & RF1_UNIQUE) { @@ -88,14 +88,14 @@ static void print_monster_line(TERM_LEN x, TERM_LEN y, monster_type *m_ptr, int } } - Term_addstr(-1, TERM_WHITE, is_bounty ? " W" : " U"); + term_addstr(-1, TERM_WHITE, is_bounty ? " W" : " U"); } else { sprintf(buf, "%3d", n_same); - Term_addstr(-1, TERM_WHITE, buf); + term_addstr(-1, TERM_WHITE, buf); } - Term_addstr(-1, TERM_WHITE, " "); - Term_add_bigch(r_ptr->x_attr, r_ptr->x_char); + term_addstr(-1, TERM_WHITE, " "); + term_add_bigch(r_ptr->x_attr, r_ptr->x_char); if (r_ptr->r_tkills && !(m_ptr->mflag2 & MFLAG2_KAGE)) { sprintf(buf, " %2d", (int)r_ptr->level); @@ -103,10 +103,10 @@ static void print_monster_line(TERM_LEN x, TERM_LEN y, monster_type *m_ptr, int strcpy(buf, " ??"); } - Term_addstr(-1, TERM_WHITE, buf); + term_addstr(-1, TERM_WHITE, buf); sprintf(buf, " %s ", r_name + r_ptr->name); - Term_addstr(-1, TERM_WHITE, buf); + term_addstr(-1, TERM_WHITE, buf); } /*! @@ -155,8 +155,8 @@ void print_monster_list(floor_type *floor_ptr, TERM_LEN x, TERM_LEN y, TERM_LEN } if (line - y - 1 == max_lines && i != tmp_pos.n) { - Term_gotoxy(x, line); - Term_addstr(-1, TERM_WHITE, "-- and more --"); + term_gotoxy(x, line); + term_addstr(-1, TERM_WHITE, "-- and more --"); } else { if (last_mons) print_monster_line(x, line++, last_mons, n_same); @@ -177,14 +177,14 @@ void fix_monster_list(player_type *player_ptr) if (!(window_flag[j] & (PW_MONSTER_LIST))) continue; - Term_activate(angband_term[j]); + term_activate(angband_term[j]); int w, h; - Term_get_size(&w, &h); - Term_clear(); + term_get_size(&w, &h); + term_clear(); target_set_prepare_look(player_ptr); print_monster_list(player_ptr->current_floor_ptr, 0, 0, h); - Term_fresh(); - Term_activate(old); + term_fresh(); + term_activate(old); } } @@ -199,7 +199,7 @@ static void display_equipment(player_type *owner_ptr, tval_type tval) return; TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); TERM_COLOR attr = TERM_WHITE; char tmp_val[80]; @@ -213,7 +213,7 @@ static void display_equipment(player_type *owner_ptr, tval_type tval) tmp_val[1] = ')'; } - Term_putstr(0, i - INVEN_RARM, 3, TERM_WHITE, tmp_val); + term_putstr(0, i - INVEN_RARM, 3, TERM_WHITE, tmp_val); if ((((i == INVEN_RARM) && owner_ptr->hidarite) || ((i == INVEN_LARM) && owner_ptr->migite)) && owner_ptr->ryoute) { strcpy(o_name, _("(武器を両手持ち)", "(wielding with two-hands)")); attr = TERM_WHITE; @@ -226,8 +226,8 @@ static void display_equipment(player_type *owner_ptr, tval_type tval) if (o_ptr->timeout) attr = TERM_L_DARK; - Term_putstr(3, i - INVEN_RARM, n, attr, o_name); - Term_erase(3 + n, i - INVEN_RARM, 255); + term_putstr(3, i - INVEN_RARM, n, attr, o_name); + term_erase(3 + n, i - INVEN_RARM, 255); if (show_weights) { int wgt = o_ptr->weight * o_ptr->number; sprintf(tmp_val, _("%3d.%1d kg", "%3d.%1d lb"), _(lbtokg1(wgt), wgt / 10), _(lbtokg2(wgt), wgt % 10)); @@ -235,13 +235,13 @@ static void display_equipment(player_type *owner_ptr, tval_type tval) } if (show_labels) { - Term_putstr(wid - 20, i - INVEN_RARM, -1, TERM_WHITE, " <-- "); + term_putstr(wid - 20, i - INVEN_RARM, -1, TERM_WHITE, " <-- "); prt(mention_use(owner_ptr, i), i - INVEN_RARM, wid - 15); } } for (int i = INVEN_TOTAL - INVEN_RARM; i < hgt; i++) - Term_erase(0, i, 255); + term_erase(0, i, 255); } /*! @@ -259,10 +259,10 @@ void fix_equip(player_type *player_ptr, tval_type item_tester_tval) if (!(window_flag[j] & (PW_EQUIP))) continue; - Term_activate(angband_term[j]); + term_activate(angband_term[j]); display_equipment(player_ptr, item_tester_tval); - Term_fresh(); - Term_activate(old); + term_fresh(); + term_activate(old); } } @@ -282,11 +282,11 @@ void fix_player(player_type *player_ptr) if (!(window_flag[j] & (PW_PLAYER))) continue; - Term_activate(angband_term[j]); + term_activate(angband_term[j]); update_playtime(); display_player(player_ptr, 0); - Term_fresh(); - Term_activate(old); + term_fresh(); + term_activate(old); } } @@ -306,18 +306,18 @@ void fix_message(void) if (!(window_flag[j] & (PW_MESSAGE))) continue; - Term_activate(angband_term[j]); + term_activate(angband_term[j]); TERM_LEN w, h; - Term_get_size(&w, &h); + term_get_size(&w, &h); for (int i = 0; i < h; i++) { - Term_putstr(0, (h - 1) - i, -1, (byte)((i < now_message) ? TERM_WHITE : TERM_SLATE), message_str((s16b)i)); + term_putstr(0, (h - 1) - i, -1, (byte)((i < now_message) ? TERM_WHITE : TERM_SLATE), message_str((s16b)i)); TERM_LEN x, y; - Term_locate(&x, &y); - Term_erase(x, y, 255); + term_locate(&x, &y); + term_erase(x, y, 255); } - Term_fresh(); - Term_activate(old); + term_fresh(); + term_activate(old); } } @@ -341,15 +341,15 @@ void fix_overhead(player_type *player_ptr) if (!(window_flag[j] & (PW_OVERHEAD))) continue; - Term_activate(angband_term[j]); - Term_get_size(&wid, &hgt); + term_activate(angband_term[j]); + term_get_size(&wid, &hgt); if (wid > COL_MAP + 2 && hgt > ROW_MAP + 2) { int cy, cx; display_map(player_ptr, &cy, &cx); - Term_fresh(); + term_fresh(); } - Term_activate(old); + term_activate(old); } } @@ -366,7 +366,7 @@ static void display_dungeon(player_type *player_ptr) feature_type *f_ptr = &f_info[feat_none]; a = f_ptr->x_attr[F_LIT_STANDARD]; c = f_ptr->x_char[F_LIT_STANDARD]; - Term_queue_char(x - player_ptr->x + Term->wid / 2 - 1, y - player_ptr->y + Term->hgt / 2 - 1, a, c, ta, tc); + term_queue_char(x - player_ptr->x + Term->wid / 2 - 1, y - player_ptr->y + Term->hgt / 2 - 1, a, c, ta, tc); continue; } @@ -381,7 +381,7 @@ static void display_dungeon(player_type *player_ptr) a = TERM_L_DARK; } - Term_queue_char(x - player_ptr->x + Term->wid / 2 - 1, y - player_ptr->y + Term->hgt / 2 - 1, a, c, ta, tc); + term_queue_char(x - player_ptr->x + Term->wid / 2 - 1, y - player_ptr->y + Term->hgt / 2 - 1, a, c, ta, tc); } } } @@ -402,10 +402,10 @@ void fix_dungeon(player_type *player_ptr) if (!(window_flag[j] & (PW_DUNGEON))) continue; - Term_activate(angband_term[j]); + term_activate(angband_term[j]); display_dungeon(player_ptr); - Term_fresh(); - Term_activate(old); + term_fresh(); + term_activate(old); } } @@ -425,12 +425,12 @@ void fix_monster(player_type *player_ptr) if (!(window_flag[j] & (PW_MONSTER))) continue; - Term_activate(angband_term[j]); + term_activate(angband_term[j]); if (player_ptr->monster_race_idx) display_roff(player_ptr); - Term_fresh(); - Term_activate(old); + term_fresh(); + term_activate(old); } } @@ -450,12 +450,12 @@ void fix_object(player_type *player_ptr) if (!(window_flag[j] & (PW_OBJECT))) continue; - Term_activate(angband_term[j]); + term_activate(angband_term[j]); if (player_ptr->object_kind_idx) display_koff(player_ptr, player_ptr->object_kind_idx); - Term_fresh(); - Term_activate(old); + term_fresh(); + term_activate(old); } } diff --git a/src/window/main-window-equipments.c b/src/window/main-window-equipments.c index 47ff4baa1..292f1d3b0 100644 --- a/src/window/main-window-equipments.c +++ b/src/window/main-window-equipments.c @@ -35,7 +35,7 @@ COMMAND_CODE show_equipment(player_type *owner_ptr, int target_item, BIT_FLAGS m TERM_LEN wid, hgt; char equip_label[52 + 1]; int col = command_gap; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); int len = wid - col - 1; for (k = 0, i = INVEN_RARM; i < INVEN_TOTAL; i++) { o_ptr = &owner_ptr->inventory_list[i]; @@ -95,7 +95,7 @@ COMMAND_CODE show_equipment(player_type *owner_ptr, int target_item, BIT_FLAGS m if (show_item_graph) { TERM_COLOR a = object_attr(o_ptr); SYMBOL_CODE c = object_char(o_ptr); - Term_queue_bigchar(cur_col, j + 1, a, c, 0, 0); + term_queue_bigchar(cur_col, j + 1, a, c, 0, 0); if (use_bigtile) cur_col++; diff --git a/src/window/main-window-left-frame.c b/src/window/main-window-left-frame.c index ffc01b146..fead52a3b 100644 --- a/src/window/main-window-left-frame.c +++ b/src/window/main-window-left-frame.c @@ -183,7 +183,7 @@ void print_depth(player_type *creature_ptr) TERM_COLOR attr = TERM_WHITE; TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); TERM_LEN col_depth = wid + COL_DEPTH; TERM_LEN row_depth = hgt + ROW_DEPTH; @@ -316,59 +316,59 @@ void health_redraw(player_type *creature_ptr, bool riding) row = ROW_INFO - 2; col = COL_INFO + 2; - Term_putstr(col - 2, row, 12, TERM_WHITE, " / "); - Term_putstr(col - 2, row + 1, 12, TERM_WHITE, " / "); - Term_putstr(col - 2, row + 2, 12, TERM_WHITE, " / "); - Term_putstr(col - 2, row + 3, 12, TERM_WHITE, " / "); + term_putstr(col - 2, row, 12, TERM_WHITE, " / "); + term_putstr(col - 2, row + 1, 12, TERM_WHITE, " / "); + term_putstr(col - 2, row + 2, 12, TERM_WHITE, " / "); + term_putstr(col - 2, row + 3, 12, TERM_WHITE, " / "); if (creature_ptr->current_floor_ptr->m_list[1].r_idx) { - Term_putstr(col - 2, row, 2, r_info[creature_ptr->current_floor_ptr->m_list[1].r_idx].x_attr, + term_putstr(col - 2, row, 2, r_info[creature_ptr->current_floor_ptr->m_list[1].r_idx].x_attr, format("%c", r_info[creature_ptr->current_floor_ptr->m_list[1].r_idx].x_char)); - Term_putstr(col - 1, row, 5, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[1].hp)); - Term_putstr(col + 5, row, 6, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[1].max_maxhp)); + term_putstr(col - 1, row, 5, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[1].hp)); + term_putstr(col + 5, row, 6, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[1].max_maxhp)); } if (creature_ptr->current_floor_ptr->m_list[2].r_idx) { - Term_putstr(col - 2, row + 1, 2, r_info[creature_ptr->current_floor_ptr->m_list[2].r_idx].x_attr, + term_putstr(col - 2, row + 1, 2, r_info[creature_ptr->current_floor_ptr->m_list[2].r_idx].x_attr, format("%c", r_info[creature_ptr->current_floor_ptr->m_list[2].r_idx].x_char)); - Term_putstr(col - 1, row + 1, 5, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[2].hp)); - Term_putstr(col + 5, row + 1, 6, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[2].max_maxhp)); + term_putstr(col - 1, row + 1, 5, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[2].hp)); + term_putstr(col + 5, row + 1, 6, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[2].max_maxhp)); } if (creature_ptr->current_floor_ptr->m_list[3].r_idx) { - Term_putstr(col - 2, row + 2, 2, r_info[creature_ptr->current_floor_ptr->m_list[3].r_idx].x_attr, + term_putstr(col - 2, row + 2, 2, r_info[creature_ptr->current_floor_ptr->m_list[3].r_idx].x_attr, format("%c", r_info[creature_ptr->current_floor_ptr->m_list[3].r_idx].x_char)); - Term_putstr(col - 1, row + 2, 5, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[3].hp)); - Term_putstr(col + 5, row + 2, 6, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[3].max_maxhp)); + term_putstr(col - 1, row + 2, 5, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[3].hp)); + term_putstr(col + 5, row + 2, 6, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[3].max_maxhp)); } if (creature_ptr->current_floor_ptr->m_list[4].r_idx) { - Term_putstr(col - 2, row + 3, 2, r_info[creature_ptr->current_floor_ptr->m_list[4].r_idx].x_attr, + term_putstr(col - 2, row + 3, 2, r_info[creature_ptr->current_floor_ptr->m_list[4].r_idx].x_attr, format("%c", r_info[creature_ptr->current_floor_ptr->m_list[4].r_idx].x_char)); - Term_putstr(col - 1, row + 3, 5, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[4].hp)); - Term_putstr(col + 5, row + 3, 6, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[4].max_maxhp)); + term_putstr(col - 1, row + 3, 5, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[4].hp)); + term_putstr(col + 5, row + 3, 6, TERM_WHITE, format("%5d", creature_ptr->current_floor_ptr->m_list[4].max_maxhp)); } return; } if (!health_who) { - Term_erase(col, row, 12); + term_erase(col, row, 12); return; } if (!m_ptr->ml) { - Term_putstr(col, row, 12, TERM_WHITE, "[----------]"); + term_putstr(col, row, 12, TERM_WHITE, "[----------]"); return; } if (creature_ptr->image) { - Term_putstr(col, row, 12, TERM_WHITE, "[----------]"); + term_putstr(col, row, 12, TERM_WHITE, "[----------]"); return; } if (m_ptr->hp < 0) { - Term_putstr(col, row, 12, TERM_WHITE, "[----------]"); + term_putstr(col, row, 12, TERM_WHITE, "[----------]"); return; } @@ -391,6 +391,6 @@ void health_redraw(player_type *creature_ptr, bool riding) else if (pct >= 10) attr = TERM_L_RED; - Term_putstr(col, row, 12, TERM_WHITE, "[----------]"); - Term_putstr(col + 1, row, len, attr, "**********"); + term_putstr(col, row, 12, TERM_WHITE, "[----------]"); + term_putstr(col + 1, row, len, attr, "**********"); } diff --git a/src/window/main-window-stat-poster.c b/src/window/main-window-stat-poster.c index 3fd310586..7cded1031 100644 --- a/src/window/main-window-stat-poster.c +++ b/src/window/main-window-stat-poster.c @@ -277,7 +277,7 @@ void print_state(player_type *player_ptr) void print_speed(player_type *player_ptr) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); TERM_LEN col_speed = wid + COL_SPEED; TERM_LEN row_speed = hgt + ROW_SPEED; @@ -337,7 +337,7 @@ void print_speed(player_type *player_ptr) void print_study(player_type *player_ptr) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); TERM_LEN col_study = wid + COL_STUDY; TERM_LEN row_study = hgt + ROW_STUDY; @@ -356,7 +356,7 @@ void print_study(player_type *player_ptr) void print_imitation(player_type *player_ptr) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); TERM_LEN col_study = wid + COL_STUDY; TERM_LEN row_study = hgt + ROW_STUDY; @@ -383,11 +383,11 @@ void print_imitation(player_type *player_ptr) void print_status(player_type *creature_ptr) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); TERM_LEN row_statbar = hgt + ROW_STATBAR; TERM_LEN max_col_statbar = wid + MAX_COL_STATBAR; - Term_erase(0, row_statbar, max_col_statbar); + term_erase(0, row_statbar, max_col_statbar); BIT_FLAGS bar_flags[3]; bar_flags[0] = bar_flags[1] = bar_flags[2] = 0L; diff --git a/src/window/main-window-util.c b/src/window/main-window-util.c index 611b1a97f..ed0e03421 100644 --- a/src/window/main-window-util.c +++ b/src/window/main-window-util.c @@ -63,15 +63,15 @@ void print_field(concptr info, TERM_LEN row, TERM_LEN col) void print_map(player_type *player_ptr) { TERM_LEN wid, hgt; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); wid -= COL_MAP + 2; hgt -= ROW_MAP + 2; int v; - (void)Term_get_cursor(&v); + (void)term_get_cursor(&v); - (void)Term_set_cursor(0); + (void)term_set_cursor(0); floor_type *floor_ptr = player_ptr->current_floor_ptr; POSITION xmin = (0 < panel_col_min) ? panel_col_min : 0; @@ -80,11 +80,11 @@ void print_map(player_type *player_ptr) POSITION ymax = (floor_ptr->height - 1 > panel_row_max) ? panel_row_max : floor_ptr->height - 1; for (POSITION y = 1; y <= ymin - panel_row_prt; y++) { - Term_erase(COL_MAP, y, wid); + term_erase(COL_MAP, y, wid); } for (POSITION y = ymax - panel_row_prt; y <= hgt; y++) { - Term_erase(COL_MAP, y, wid); + term_erase(COL_MAP, y, wid); } for (POSITION y = ymin; y <= ymax; y++) { @@ -103,12 +103,12 @@ void print_map(player_type *player_ptr) a = TERM_L_DARK; } - Term_queue_bigchar(panel_col_of(x), y - panel_row_prt, a, c, ta, tc); + term_queue_bigchar(panel_col_of(x), y - panel_row_prt, a, c, ta, tc); } } lite_spot(player_ptr, player_ptr->y, player_ptr->x); - (void)Term_set_cursor(v); + (void)term_set_cursor(v); } static void display_shortened_item_name(player_type *player_ptr, object_type *o_ptr, int y) @@ -169,7 +169,7 @@ static void display_shortened_item_name(player_type *player_ptr, object_type *o_ } *c = '\0'; - Term_putstr(0, y, 12, attr, buf); + term_putstr(0, y, 12, attr, buf); } /* @@ -197,7 +197,7 @@ void display_map(player_type *player_ptr, int *cy, int *cx) TERM_LEN hgt, wid, yrat, xrat; int **match_autopick_yx; object_type ***object_autopick_yx; - Term_get_size(&wid, &hgt); + term_get_size(&wid, &hgt); hgt -= 2; wid -= 14; if (use_bigtile) @@ -304,7 +304,7 @@ void display_map(player_type *player_ptr, int *cy, int *cx) mc[y][0] = mc[y][x] = '|'; for (y = 0; y < hgt + 2; ++y) { - Term_gotoxy(COL_MAP, y); + term_gotoxy(COL_MAP, y); for (x = 0; x < wid + 2; ++x) { ta = ma[y][x]; tc = mc[y][x]; @@ -317,7 +317,7 @@ void display_map(player_type *player_ptr, int *cy, int *cx) ta = TERM_L_DARK; } - Term_add_bigch(ta, tc); + term_add_bigch(ta, tc); } } @@ -330,7 +330,7 @@ void display_map(player_type *player_ptr, int *cy, int *cx) } } - Term_putstr(0, y, 12, 0, " "); + term_putstr(0, y, 12, 0, " "); if (match_autopick != -1) display_shortened_item_name(player_ptr, autopick_obj, y); } diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c index 3a78ba4d8..8074bea93 100644 --- a/src/wizard/wizard-special-process.c +++ b/src/wizard/wizard-special-process.c @@ -124,9 +124,9 @@ static void prt_binary(BIT_FLAGS flags, int row, int col) u32b bitmask; for (int i = bitmask = 1; i <= 32; i++, bitmask *= 2) { if (flags & bitmask) { - Term_putch(col++, row, TERM_BLUE, '*'); + term_putch(col++, row, TERM_BLUE, '*'); } else { - Term_putch(col++, row, TERM_WHITE, '-'); + term_putch(col++, row, TERM_WHITE, '-'); } } } @@ -185,7 +185,7 @@ static void prt_alloc(tval_type tval, OBJECT_SUBTYPE_VALUE sval, TERM_LEN row, T } for (int i = 0; i < 22; i++) { - Term_putch(col, row + i + 1, TERM_WHITE, '|'); + term_putch(col, row + i + 1, TERM_WHITE, '|'); prt(format("%2dF", (i * 5)), row + i + 1, col); if ((i * K_MAX_DEPTH / 22 <= home) && (home < (i + 1) * K_MAX_DEPTH / 22)) c_prt(TERM_RED, format("%3d.%04d%%", display[i] / 1000, display[i] % 1000), row + i + 1, col + 3); @@ -396,7 +396,7 @@ static KIND_OBJECT_IDX wiz_create_itemtype(void) KIND_OBJECT_IDX choice[80]; char buf[160]; - Term_clear(); + term_clear(); for (num = 0; (num < 80) && tvals[num].tval; num++) { row = 2 + (num % 20); col = 20 * (num / 20); @@ -418,7 +418,7 @@ static KIND_OBJECT_IDX wiz_create_itemtype(void) tval_type tval = tvals[num].tval; concptr tval_desc = tvals[num].desc; - Term_clear(); + term_clear(); for (num = 0, i = 1; (num < 80) && (i < max_k_idx); i++) { object_kind *k_ptr = &k_info[i]; if (k_ptr->tval != tval) @@ -656,7 +656,7 @@ static void wiz_statistics(player_type *caster_ptr, object_type *o_ptr) } prt(format(q, i, correct, matches, better, worse, other), 0, 0); - Term_fresh(); + term_fresh(); } q_ptr = &forge; diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c index 9736eec4c..11a10b097 100644 --- a/src/wizard/wizard-spoiler.c +++ b/src/wizard/wizard-spoiler.c @@ -1303,7 +1303,7 @@ void do_cmd_spoilers(player_type *player_ptr) { screen_save(); while (TRUE) { - Term_clear(); + term_clear(); prt("Create a spoiler file.", 2, 0); prt("(1) Brief Object Info (obj-desc.txt)", 5, 5); prt("(2) Brief Artifact Info (artifact.txt)", 6, 5);