Merge branch 'Release-3.0.0Alpha' into release/3.0.0Alpha

[hengband/hengband.git] / src / knowledge / knowledge-self.c

diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c
index 2ae8d0c..4545f4d 100644 (file)
--- a/src/knowledge/knowledge-self.c
+++ b/src/knowledge/knowledge-self.c
@@ -7,13 +7,18 @@
 #include "knowledge-self.h"
 #include "birth/birth-explanations-table.h"
 #include "core/show-file.h"
+#include "flavor/flavor-describer.h"
 #include "floor/floor-town.h"
 #include "info-reader/fixed-map-parser.h"
 #include "io-dump/dump-util.h"
-#include "object/object-flavor.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
+#include "player/player-class.h"
+#include "player/race-info-table.h"
+#include "player/player-status-table.h"
 #include "store/store-util.h"
+#include "system/object-type-definition.h"
 #include "util/angband-files.h"
+#include "util/buffer-shaper.h"
 #include "util/int-char-converter.h"
 #include "world/world.h"
 
@@ -46,7 +51,7 @@ static void dump_yourself(player_type *creature_ptr, FILE *fff)
         return;
 
     char temp[80 * 10];
-    roff_to_buf(race_explanations[creature_ptr->prace], 78, temp, sizeof(temp));
+    shape_buffer(race_explanations[creature_ptr->prace], 78, temp, sizeof(temp));
     fprintf(fff, "\n\n");
     fprintf(fff, _("種族: %s\n", "Race: %s\n"), race_info[creature_ptr->prace].title);
     concptr t = temp;
@@ -58,7 +63,7 @@ static void dump_yourself(player_type *creature_ptr, FILE *fff)
         t += strlen(t) + 1;
     }
 
-    roff_to_buf(class_explanations[creature_ptr->pclass], 78, temp, sizeof(temp));
+    shape_buffer(class_explanations[creature_ptr->pclass], 78, temp, sizeof(temp));
     fprintf(fff, "\n");
     fprintf(fff, _("職業: %s\n", "Class: %s\n"), class_info[creature_ptr->pclass].title);
 
@@ -70,7 +75,7 @@ static void dump_yourself(player_type *creature_ptr, FILE *fff)
         t += strlen(t) + 1;
     }
 
-    roff_to_buf(personality_explanations[creature_ptr->pseikaku], 78, temp, sizeof(temp));
+    shape_buffer(personality_explanations[creature_ptr->pseikaku], 78, temp, sizeof(temp));
     fprintf(fff, "\n");
     fprintf(fff, _("性格: %s\n", "Pesonality: %s\n"), personality_info[creature_ptr->pseikaku].title);
 
@@ -84,7 +89,7 @@ static void dump_yourself(player_type *creature_ptr, FILE *fff)
 
     fprintf(fff, "\n");
     if (creature_ptr->realm1) {
-        roff_to_buf(realm_explanations[technic2magic(creature_ptr->realm1) - 1], 78, temp, sizeof(temp));
+        shape_buffer(realm_explanations[technic2magic(creature_ptr->realm1) - 1], 78, temp, sizeof(temp));
         fprintf(fff, _("魔法: %s\n", "Realm: %s\n"), realm_names[creature_ptr->realm1]);
 
         t = temp;
@@ -99,7 +104,7 @@ static void dump_yourself(player_type *creature_ptr, FILE *fff)
 
     fprintf(fff, "\n");
     if (creature_ptr->realm2) {
-        roff_to_buf(realm_explanations[technic2magic(creature_ptr->realm2) - 1], 78, temp, sizeof(temp));
+        shape_buffer(realm_explanations[technic2magic(creature_ptr->realm2) - 1], 78, temp, sizeof(temp));
         fprintf(fff, _("魔法: %s\n", "Realm: %s\n"), realm_names[creature_ptr->realm2]);
 
         t = temp;
@@ -174,7 +179,7 @@ void do_cmd_knowledge_home(player_type *player_ptr)
 #ifdef JP
             if ((i % 12) == 0)
                 fprintf(fff, "\n ( %d ページ )\n", x++);
-            object_desc(player_ptr, o_name, &store_ptr->stock[i], 0);
+            describe_flavor(player_ptr, o_name, &store_ptr->stock[i], 0);
             if (strlen(o_name) <= 80 - 3) {
                 fprintf(fff, "%c%s %s\n", I2A(i % 12), paren, o_name);
             } else {
@@ -192,7 +197,7 @@ void do_cmd_knowledge_home(player_type *player_ptr)
                 fprintf(fff, "   %.77s\n", o_name + n);
             }
 #else
-            object_desc(player_ptr, o_name, &store_ptr->stock[i], 0);
+            describe_flavor(player_ptr, o_name, &store_ptr->stock[i], 0);
             fprintf(fff, "%c%s %s\n", I2A(i % 12), paren, o_name);
 #endif
         }