[Refactor] #38997 get_check_strict() にplayer_type* 引数を追加した / Added player_type* argum...

[hengband/hengband.git] / src / io / report.c

diff --git a/src/io/report.c b/src/io/report.c
index 19ace79..e79672a 100644 (file)
--- a/src/io/report.c
+++ b/src/io/report.c
@@ -5,18 +5,18 @@
  * @author Hengband Team
  */
 
-#include "system/angband.h"
 #include "io/report.h"
-#include "core/turn-compensator.h"
-#include "system/angband-version.h"
 #include "core/stuff-handler.h"
-#include "inet.h"
+#include "core/turn-compensator.h"
+#include "core/visuals-reseter.h"
 #include "dungeon/dungeon.h"
-
+#include "floor/floor.h"
+#include "io-dump/character-dump.h"
+#include "io/inet.h"
 #include "player/player-personality.h"
-#include "io/character-dump.h"
-#include "world/world.h"
+#include "system/angband-version.h"
 #include "term/gameterm.h"
+#include "world/world.h"
 
 #ifdef WORLD_SCORE
 
@@ -150,28 +150,7 @@ static int buf_sprintf(BUF *buf, concptr fmt, ...)
 
        if (ret < 0) return -1;
 
-#if ('\r' == 0x0a && '\n' == 0x0d)
-       {
-               /*
-                * Originally '\r'= CR (= 0x0d) and '\n'= LF (= 0x0a)
-                * But for MPW (Macintosh Programers Workbench), these
-                * are reversed so that '\r'=LF and '\n'=CR unless the
-                * -noMapCR option is not defined.
-                *
-                * We need to swap back these here since the score
-                * dump text should be written using LF as the end of
-                * line.
-                */
-               char *ptr;
-               for (ptr = tmpbuf; *ptr; ptr++)
-               {
-                       if (0x0d == *ptr) *ptr = 0x0a;
-               }
-       }
-#endif
-
        ret = buf_append(buf, tmpbuf, strlen(tmpbuf));
-
        return ret;
 }
 
@@ -478,9 +457,9 @@ errr report_score(player_type *creature_ptr, void(*update_playtime)(void), displ
                        (void)inkey();
 
 #ifdef JP
-                       if (!get_check_strict("もう一度接続を試みますか? ", CHECK_NO_HISTORY))
+                       if (!get_check_strict(creature_ptr, "もう一度接続を試みますか? ", CHECK_NO_HISTORY))
 #else
-                       if (!get_check_strict("Try again? ", CHECK_NO_HISTORY))
+                       if (!get_check_strict(creature_ptr, "Try again? ", CHECK_NO_HISTORY))
 #endif
                        {
 #ifdef WINDOWS
@@ -510,9 +489,9 @@ errr report_score(player_type *creature_ptr, void(*update_playtime)(void), displ
                        (void)inkey();
 
 #ifdef JP
-                       if (!get_check_strict("もう一度接続を試みますか? ", CHECK_NO_HISTORY))
+                       if (!get_check_strict(creature_ptr, "もう一度接続を試みますか? ", CHECK_NO_HISTORY))
 #else
-                       if (!get_check_strict("Try again? ", CHECK_NO_HISTORY))
+                       if (!get_check_strict(creature_ptr, "Try again? ", CHECK_NO_HISTORY))
 #endif
                        {
 #ifdef WINDOWS