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

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

diff --git a/src/report.c b/src/report.c
index 6e58fc5..ad5d1da 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -7,21 +7,6 @@
 
 #define _GNU_SOURCE /*!< 未使用*/
 #include "angband.h"
-#include "util.h"
-#include "core.h"
-#include "inet.h"
-#include "dungeon.h"
-
-#include "floor.h"
-#include "player-status.h"
-#include "player-class.h"
-#include "player-race.h"
-#include "player-personality.h"
-#include "files.h"
-#include "world.h"
-#include "realm.h"
-#include "term.h"
-#include "view-mainwindow.h"
 
 #ifdef WORLD_SCORE
 
@@ -46,8 +31,6 @@
 #include <signal.h>
 #endif
 
-concptr screen_dump = NULL;
-
 /*
  * internet resource value
  */
@@ -283,7 +266,7 @@ static bool http_post(int sd, concptr url, BUF *buf)
  * @param dumpbuf 伝送内容バッファ
  * @return エラーコード
  */
-static errr make_dump(player_type *creature_ptr, BUF* dumpbuf)
+static errr make_dump(BUF* dumpbuf)
 {
        char            buf[1024];
        FILE *fff;
@@ -303,7 +286,7 @@ static errr make_dump(player_type *creature_ptr, BUF* dumpbuf)
        }
 
        /* 一旦一時ファイルを作る。通常のダンプ出力と共通化するため。 */
-       (void)make_character_dump(creature_ptr, fff);
+       (void)make_character_dump(fff);
        my_fclose(fff);
 
        /* Open for read */
@@ -449,7 +432,7 @@ concptr make_screen_dump(void)
  * @brief スコア転送処理のメインルーチン
  * @return エラーコード
  */
-errr report_score(player_type *creature_ptr)
+errr report_score(void)
 {
 #ifdef MACINTOSH
        OSStatus err;
@@ -482,9 +465,9 @@ errr report_score(player_type *creature_ptr)
        buf_sprintf(score, "version: Hengband %d.%d.%d\n",
                    FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
 #endif
-       buf_sprintf(score, "score: %d\n", calc_score(p_ptr));
+       buf_sprintf(score, "score: %d\n", total_points());
        buf_sprintf(score, "level: %d\n", p_ptr->lev);
-       buf_sprintf(score, "depth: %d\n", p_ptr->current_floor_ptr->dun_level);
+       buf_sprintf(score, "depth: %d\n", current_floor_ptr->dun_level);
        buf_sprintf(score, "maxlv: %d\n", p_ptr->max_plv);
        buf_sprintf(score, "maxdp: %d\n", max_dlv[DUNGEON_ANGBAND]);
        buf_sprintf(score, "au: %d\n", p_ptr->au);
@@ -498,7 +481,7 @@ errr report_score(player_type *creature_ptr)
        buf_sprintf(score, "killer: %s\n", p_ptr->died_from);
        buf_sprintf(score, "-----charcter dump-----\n");
 
-       make_dump(creature_ptr, score);
+       make_dump(score);
 
        if (screen_dump)
        {