[Refactor] #38862 Changed header inclusion for uid-checker.h

[hengband/hengband.git] / src / scores.c

diff --git a/src/scores.c b/src/scores.c
index e44e4b8..94e655e 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -11,21 +11,24 @@
  */
 
 #include "angband.h"
-#include "term.h"
+#include "io/signal-handlers.h"
+#include "gameterm.h"
 #include "util.h"
 #include "core.h"
 
 #include "dungeon.h"
-#include "player-race.h"
+#include "player/race-info-table.h"
 #include "player-status.h"
 #include "player-class.h"
 #include "player-personality.h"
 #include "player-sex.h"
+#include "io/uid-checker.h"
 #include "files.h"
 #include "scores.h"
 #include "floor.h"
 #include "world.h"
-#include "cmd-dump.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
 #include "report.h"
 #include "japanese.h"
 
@@ -427,7 +430,7 @@ void display_scores(int from, int to)
  * @param do_send 実際に転送ア処置を行うか否か
  * @return 転送が成功したらTRUEを返す
  */
-bool send_world_score(player_type *current_player_ptr, bool do_send)
+bool send_world_score(player_type *current_player_ptr, bool do_send, void(*update_playtime)(void), display_player_pf display_player, map_name_pf map_name)
 {
 #ifdef WORLD_SCORE
        if (send_score && do_send)
@@ -447,7 +450,7 @@ bool send_world_score(player_type *current_player_ptr, bool do_send)
                prt(_("送信中．．", "Sending..."), 0, 0);
                Term_fresh();
                screen_save();
-               err = report_score(current_player_ptr);
+               err = report_score(current_player_ptr, update_playtime, display_player, map_name);
                screen_load();
                if (err) return FALSE;
 
@@ -490,15 +493,9 @@ errr top_twenty(player_type *current_player_ptr)
        the_score.turns[9] = '\0';
 
        time_t ct = time((time_t*)0);
-#ifdef HIGHSCORE_DATE_HACK
-       /* Save the date in a hacked up form (9 chars) */
-       (void)sprintf(the_score.day, "%-.6s %-.2s", ctime(&ct) + 4, ctime(&ct) + 22);
-#else
-       /* Save the date in standard form (8 chars) */
-/*     (void)strftime(the_score.day, 9, "%m/%d/%y", localtime(&ct)); */
+
        /* Save the date in standard encoded form (9 chars) */
        strftime(the_score.day, 10, "@%Y%m%d", localtime(&ct));
-#endif
 
        /* Save the player name (15 chars) */
        sprintf(the_score.who, "%-.15s", current_player_ptr->name);
@@ -905,7 +902,6 @@ bool check_score(player_type *current_player_ptr)
                return FALSE;
        }
 
-#ifndef SCORE_WIZARDS
        /* Wizard-mode pre-empts scoring */
        if (current_world_ptr->noscore & 0x000F)
        {
@@ -913,19 +909,7 @@ bool check_score(player_type *current_player_ptr)
                msg_print(NULL);
                return FALSE;
        }
-#endif
 
-#ifndef SCORE_BORGS
-       /* Borg-mode pre-empts scoring */
-       if (current_world_ptr->noscore & 0x00F0)
-       {
-               msg_print(_("ボーグ・モードではスコアが記録されません。", "Score not registered for borgs."));
-               msg_print(NULL);
-               return FALSE;
-       }
-#endif
-
-#ifndef SCORE_CHEATERS
        /* Cheaters are not scored */
        if (current_world_ptr->noscore & 0xFF00)
        {
@@ -933,7 +917,6 @@ bool check_score(player_type *current_player_ptr)
                msg_print(NULL);
                return FALSE;
        }
-#endif
 
        /* Interupted */
        if (!current_world_ptr->total_winner && streq(current_player_ptr->died_from, _("強制終了", "Interrupting")))