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 7f82d90..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
  */
@@ -280,11 +263,10 @@ static bool http_post(int sd, concptr url, BUF *buf)
 
 /*!
  * @brief キャラクタダンプを作って BUFに保存
- * @param creature_ptr プレーヤーへの参照ポインタ
  * @param dumpbuf 伝送内容バッファ
  * @return エラーコード
  */
-static errr make_dump(player_type *creature_ptr, BUF* dumpbuf)
+static errr make_dump(BUF* dumpbuf)
 {
        char            buf[1024];
        FILE *fff;
@@ -304,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 */
@@ -325,7 +307,7 @@ static errr make_dump(player_type *creature_ptr, BUF* dumpbuf)
  * @brief スクリーンダンプを作成する/ Make screen dump to buffer
  * @return 作成したスクリーンダンプの参照ポインタ
  */
-concptr make_screen_dump(player_type *creature_ptr)
+concptr make_screen_dump(void)
 {
        BUF *screen_buf;
        int y, x, i;
@@ -363,7 +345,7 @@ concptr make_screen_dump(player_type *creature_ptr)
                use_graphics = FALSE;
                reset_visuals();
 
-               creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
+               p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
                handle_stuff();
        }
 
@@ -439,7 +421,7 @@ concptr make_screen_dump(player_type *creature_ptr)
                use_graphics = TRUE;
                reset_visuals();
 
-               creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
+               p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
                handle_stuff();
        }
 
@@ -448,10 +430,9 @@ concptr make_screen_dump(player_type *creature_ptr)
 
 /*!
  * @brief スコア転送処理のメインルーチン
- * @param creature_ptr プレーヤーへの参照ポインタ
  * @return エラーコード
  */
-errr report_score(player_type *creature_ptr)
+errr report_score(void)
 {
 #ifdef MACINTOSH
        OSStatus err;
@@ -476,7 +457,7 @@ errr report_score(player_type *creature_ptr)
        sprintf(seikakutmp, "%s ", ap_ptr->title);
 #endif
 
-       buf_sprintf(score, "name: %s\n", creature_ptr->name);
+       buf_sprintf(score, "name: %s\n", p_ptr->name);
 #ifdef JP
        buf_sprintf(score, "version: 変愚蛮怒 %d.%d.%d\n",
                    FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
@@ -484,23 +465,23 @@ 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(creature_ptr));
-       buf_sprintf(score, "level: %d\n", creature_ptr->lev);
-       buf_sprintf(score, "depth: %d\n", creature_ptr->current_floor_ptr->dun_level);
-       buf_sprintf(score, "maxlv: %d\n", creature_ptr->max_plv);
+       buf_sprintf(score, "score: %d\n", total_points());
+       buf_sprintf(score, "level: %d\n", p_ptr->lev);
+       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", creature_ptr->au);
+       buf_sprintf(score, "au: %d\n", p_ptr->au);
        buf_sprintf(score, "turns: %d\n", turn_real(current_world_ptr->game_turn));
-       buf_sprintf(score, "sex: %d\n", creature_ptr->psex);
+       buf_sprintf(score, "sex: %d\n", p_ptr->psex);
        buf_sprintf(score, "race: %s\n", rp_ptr->title);
        buf_sprintf(score, "class: %s\n", cp_ptr->title);
        buf_sprintf(score, "seikaku: %s\n", seikakutmp);
-       buf_sprintf(score, "realm1: %s\n", realm_names[creature_ptr->realm1]);
-       buf_sprintf(score, "realm2: %s\n", realm_names[creature_ptr->realm2]);
-       buf_sprintf(score, "killer: %s\n", creature_ptr->died_from);
+       buf_sprintf(score, "realm1: %s\n", realm_names[p_ptr->realm1]);
+       buf_sprintf(score, "realm2: %s\n", realm_names[p_ptr->realm2]);
+       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)
        {