Merge branch 'master' of git.osdn.net:/gitroot/hengband/hengband

[hengband/hengband.git] / src / birth / birth-wizard.c

diff --git a/src/birth/birth-wizard.c b/src/birth/birth-wizard.c
index f3d85fe..17ae7c8 100644 (file)
--- a/src/birth/birth-wizard.c
+++ b/src/birth/birth-wizard.c
@@ -15,18 +15,24 @@
 #include "cmd-io/cmd-gameoption.h"
 #include "cmd-io/cmd-help.h"
 #include "core/asking-player.h"
+#include "core/player-update-types.h"
 #include "game-option/birth-options.h"
 #include "io/input-key-acceptor.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/patron.h"
+#include "player/player-class.h"
+#include "player/player-race.h"
 #include "player/player-sex.h"
 #include "player/process-name.h"
+#include "player/player-status-table.h"
 #include "system/game-option-types.h"
+#include "term/screen-processor.h"
 #include "term/term-color-types.h"
+#include "util/buffer-shaper.h"
+#include "util/int-char-converter.h"
 #include "view/display-birth.h" // 暫定。後で消す予定。
-#include "view/display-main-window.h" // 暫定。後で消す.
 #include "view/display-player.h" // 暫定。後で消す.
 #include "world/world.h"
 
@@ -42,13 +48,13 @@
 
 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);
     put_str(_("職業        :", "Class       :"), 5, 1);
     c_put_str(TERM_L_BLUE, creature_ptr->name, 1, 34);
-    put_str(_("キャラクターを作成します。('S'やり直す, 'Q'終了, '?'ヘルプ)", "Make your charactor. ('S' Restart, 'Q' Quit, '?' Help)"), 8, 10);
+    put_str(_("キャラクターを作成します。('S'やり直す, 'Q'終了, '?'ヘルプ)", "Make your character. ('S' Restart, 'Q' Quit, '?' Help)"), 8, 10);
     put_str(_("注意：《性別》の違いはゲーム上ほとんど影響を及ぼしません。", "Note: Your 'sex' does not have any significant gameplay effects."), 23, 5);
 }
 
@@ -158,7 +164,7 @@ static bool let_player_select_race(player_type *creature_ptr)
             return FALSE;
 
         clear_from(10);
-        roff_to_buf(race_explanations[creature_ptr->prace], 74, temp, sizeof(temp));
+        shape_buffer(race_explanations[creature_ptr->prace], 74, temp, sizeof(temp));
         concptr t = temp;
         for (int i = 0; i < 10; i++) {
             if (t[0] == 0)
@@ -188,7 +194,7 @@ static bool let_player_select_class(player_type *creature_ptr)
             return FALSE;
 
         clear_from(10);
-        roff_to_buf(class_explanations[creature_ptr->pclass], 74, temp, sizeof(temp));
+        shape_buffer(class_explanations[creature_ptr->pclass], 74, temp, sizeof(temp));
         concptr t = temp;
         for (int i = 0; i < 9; i++) {
             if (t[0] == 0)
@@ -217,7 +223,7 @@ static bool let_player_select_personality(player_type *creature_ptr)
             return FALSE;
 
         clear_from(10);
-        roff_to_buf(personality_explanations[creature_ptr->pseikaku], 74, temp, sizeof(temp));
+        shape_buffer(personality_explanations[creature_ptr->pseikaku], 74, temp, sizeof(temp));
         concptr t = temp;
         for (int i = 0; i < A_MAX; i++) {
             if (t[0] == 0)
@@ -347,7 +353,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);
@@ -381,22 +387,22 @@ static bool display_auto_roller_result(player_type *creature_ptr, bool prev, cha
         update_creature(creature_ptr);
         creature_ptr->chp = creature_ptr->mhp;
         creature_ptr->csp = creature_ptr->msp;
-        display_player(creature_ptr, mode, map_name);
-        Term_gotoxy(2, 23);
+        display_player(creature_ptr, mode);
+        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();
@@ -432,7 +438,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 {