| Revision | 090f683efa2aa6c1c97085284ee1f25b4dcb9126 (tree) |
|---|---|
| Time | 2019-04-21 00:03:24 |
| Author | deskull <deskull@user...> |
| Commiter | deskull |
[Refactor] #37353 scores.h を作成して宣言を externs.h から分離。
Hengband_vcs2017/Hengband/Hengband.vcxproj (diff) Hengband_vcs2017/Hengband/Hengband.vcxproj.filters (diff) src/Makefile.am (diff)
src/bldg.c (diff) src/dungeon.c (diff)
src/externs.h (diff) src/main-win.c (diff) src/scores.c (diff) src/scores.h (diff) src/types.h (diff)| @@ -348,6 +348,7 @@ | ||
| 348 | 348 | <ClInclude Include="..\..\src\rooms-vault.h" /> |
| 349 | 349 | <ClInclude Include="..\..\src\rooms.h" /> |
| 350 | 350 | <ClInclude Include="..\..\src\rumor.h" /> |
| 351 | + <ClInclude Include="..\..\src\scores.h" /> | |
| 351 | 352 | <ClInclude Include="..\..\src\selfinfo.h" /> |
| 352 | 353 | <ClInclude Include="..\..\src\shoot.h" /> |
| 353 | 354 | <ClInclude Include="..\..\src\snipe.h" /> |
| @@ -585,6 +585,7 @@ | ||
| 585 | 585 | <ClInclude Include="..\..\src\mind.h"> |
| 586 | 586 | <Filter>spells</Filter> |
| 587 | 587 | </ClInclude> |
| 588 | + <ClInclude Include="..\..\src\scores.h" /> | |
| 588 | 589 | </ItemGroup> |
| 589 | 590 | <ItemGroup> |
| 590 | 591 | <ResourceCompile Include="..\..\src\angband.rc" /> |
| @@ -29,12 +29,12 @@ hengband_SOURCES = \ | ||
| 29 | 29 | geometry.c geometry.h \ |
| 30 | 30 | \ |
| 31 | 31 | gameoption.c gameoption.h gamevalue.h \ |
| 32 | - generate.h grid.c grid.h h-basic.h h-config.h h-define.h \ | |
| 32 | + grid.c grid.h h-basic.h h-config.h h-define.h \ | |
| 33 | 33 | history.h history.c \ |
| 34 | 34 | h-system.h h-type.h inet.c init.c init.h japanese.c load.c \ |
| 35 | 35 | dungeon-file.c dungeon-file.h \ |
| 36 | 36 | main.c main-x11.c main-gcu.c \ |
| 37 | - melee.h melee1.c mind.c \ | |
| 37 | + melee.h melee1.c mind.c mind.h \ | |
| 38 | 38 | \ |
| 39 | 39 | monster.h \ |
| 40 | 40 | monsterrace-hook.c monsterrace-hook.h monster-process.c \ |
| @@ -68,7 +68,7 @@ hengband_SOURCES = \ | ||
| 68 | 68 | report.c rooms.c rooms-city.c rooms-city.h rooms-fractal.c rooms-fractal.h \ |
| 69 | 69 | rooms.h rooms-normal.c rooms-normal.h rooms-pitnest.c rooms-pitnest.h \ |
| 70 | 70 | rooms-special.c rooms-special.h rooms-trap.c rooms-trap.h rooms-vault.c \ |
| 71 | - rooms-vault.h save.c scores.c selfinfo.c selfinfo.h \ | |
| 71 | + rooms-vault.h save.c scores.c scores.h selfinfo.c selfinfo.h \ | |
| 72 | 72 | shoot.c shoot.h snipe.c snipe.h \ |
| 73 | 73 | \ |
| 74 | 74 | rumor.h rumor.c \ |
| @@ -40,6 +40,7 @@ | ||
| 40 | 40 | |
| 41 | 41 | #include "files.h" |
| 42 | 42 | #include "player-effects.h" |
| 43 | +#include "scores.h" | |
| 43 | 44 | |
| 44 | 45 | /*! |
| 45 | 46 | * @brief 闘技場のモンスターID及び報酬アイテムテーブル |
| @@ -59,6 +59,7 @@ | ||
| 59 | 59 | #include "dungeon-file.h" |
| 60 | 60 | #include "files.h" |
| 61 | 61 | #include "player-effects.h" |
| 62 | +#include "scores.h" | |
| 62 | 63 | |
| 63 | 64 | static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/ |
| 64 | 65 | static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/ |
| @@ -894,17 +894,6 @@ extern bool tgt_pt(POSITION *x, POSITION *y); | ||
| 894 | 894 | extern void do_poly_wounds(void); |
| 895 | 895 | extern void change_race(CHARACTER_IDX new_race, concptr effect_msg); |
| 896 | 896 | |
| 897 | -/* scores.c */ | |
| 898 | -extern void display_scores_aux(int from, int to, int note, high_score *score); | |
| 899 | -extern void display_scores(int from, int to); | |
| 900 | -extern void kingly(void); | |
| 901 | -extern bool send_world_score(bool do_send); | |
| 902 | -extern errr top_twenty(void); | |
| 903 | -extern errr predict_score(void); | |
| 904 | -extern void race_legends(void); | |
| 905 | -extern void race_score(int race_num); | |
| 906 | -extern void show_highclass(void); | |
| 907 | - | |
| 908 | 897 | /* mspells1.c */ |
| 909 | 898 | extern bool clean_shot(POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_friend); |
| 910 | 899 | extern bool summon_possible(POSITION y1, POSITION x1); |
| @@ -102,6 +102,7 @@ | ||
| 102 | 102 | #include "floor-events.h" |
| 103 | 103 | #include "init.h" |
| 104 | 104 | #include "files.h" |
| 105 | +#include "scores.h" | |
| 105 | 106 | |
| 106 | 107 | #ifdef WINDOWS |
| 107 | 108 | #include <windows.h> |
| @@ -13,6 +13,7 @@ | ||
| 13 | 13 | #include "angband.h" |
| 14 | 14 | #include "player-status.h" |
| 15 | 15 | #include "files.h" |
| 16 | +#include "scores.h" | |
| 16 | 17 | |
| 17 | 18 | /*! |
| 18 | 19 | * @brief i番目のスコア情報にバッファ位置をシークする / Seek score 'i' in the highscore file |
| @@ -0,0 +1,48 @@ | ||
| 1 | +#pragma once | |
| 2 | + | |
| 3 | +/* | |
| 4 | + * Semi-Portable High Score List Entry (128 bytes) -- BEN | |
| 5 | + * | |
| 6 | + * All fields listed below are null terminated ascii strings. | |
| 7 | + * | |
| 8 | + * In addition, the "number" fields are right justified, and | |
| 9 | + * space padded, to the full available length (minus the "null"). | |
| 10 | + * | |
| 11 | + * Note that "string comparisons" are thus valid on "pts". | |
| 12 | + */ | |
| 13 | + | |
| 14 | +typedef struct high_score high_score; | |
| 15 | + | |
| 16 | +struct high_score | |
| 17 | +{ | |
| 18 | + GAME_TEXT what[8]; /* Version info (string) */ | |
| 19 | + GAME_TEXT pts[10]; /* Total Score (number) */ | |
| 20 | + GAME_TEXT gold[10]; /* Total Gold (number) */ | |
| 21 | + GAME_TEXT turns[10]; /* Turns Taken (number) */ | |
| 22 | + GAME_TEXT day[10]; /* Time stamp (string) */ | |
| 23 | + GAME_TEXT who[16]; /* Player Name (string) */ | |
| 24 | + GAME_TEXT uid[8]; /* Player UID (number) */ | |
| 25 | + GAME_TEXT sex[2]; /* Player Sex (string) */ | |
| 26 | + GAME_TEXT p_r[3]; /* Player Race (number) */ | |
| 27 | + GAME_TEXT p_c[3]; /* Player Class (number) */ | |
| 28 | + GAME_TEXT p_a[3]; /* Player Seikaku (number) */ | |
| 29 | + | |
| 30 | + GAME_TEXT cur_lev[4]; /* Current Player Level (number) */ | |
| 31 | + GAME_TEXT cur_dun[4]; /* Current Dungeon Level (number) */ | |
| 32 | + GAME_TEXT max_lev[4]; /* Max Player Level (number) */ | |
| 33 | + GAME_TEXT max_dun[4]; /* Max Dungeon Level (number) */ | |
| 34 | + | |
| 35 | + GAME_TEXT how[40]; /* Method of death (string) */ | |
| 36 | +}; | |
| 37 | + | |
| 38 | +/* scores.c */ | |
| 39 | +extern void display_scores_aux(int from, int to, int note, high_score *score); | |
| 40 | +extern void display_scores(int from, int to); | |
| 41 | +extern void kingly(void); | |
| 42 | +extern bool send_world_score(bool do_send); | |
| 43 | +extern errr top_twenty(void); | |
| 44 | +extern errr predict_score(void); | |
| 45 | +extern void race_legends(void); | |
| 46 | +extern void race_score(int race_num); | |
| 47 | +extern void show_highclass(void); | |
| 48 | + |
| @@ -2041,42 +2041,6 @@ typedef bool (*monsterrace_hook_type)(MONRACE_IDX r_idx); | ||
| 2041 | 2041 | typedef int (*inven_func)(object_type *); |
| 2042 | 2042 | |
| 2043 | 2043 | |
| 2044 | -/* | |
| 2045 | - * Semi-Portable High Score List Entry (128 bytes) -- BEN | |
| 2046 | - * | |
| 2047 | - * All fields listed below are null terminated ascii strings. | |
| 2048 | - * | |
| 2049 | - * In addition, the "number" fields are right justified, and | |
| 2050 | - * space padded, to the full available length (minus the "null"). | |
| 2051 | - * | |
| 2052 | - * Note that "string comparisons" are thus valid on "pts". | |
| 2053 | - */ | |
| 2054 | - | |
| 2055 | -typedef struct high_score high_score; | |
| 2056 | - | |
| 2057 | -struct high_score | |
| 2058 | -{ | |
| 2059 | - GAME_TEXT what[8]; /* Version info (string) */ | |
| 2060 | - GAME_TEXT pts[10]; /* Total Score (number) */ | |
| 2061 | - GAME_TEXT gold[10]; /* Total Gold (number) */ | |
| 2062 | - GAME_TEXT turns[10]; /* Turns Taken (number) */ | |
| 2063 | - GAME_TEXT day[10]; /* Time stamp (string) */ | |
| 2064 | - GAME_TEXT who[16]; /* Player Name (string) */ | |
| 2065 | - GAME_TEXT uid[8]; /* Player UID (number) */ | |
| 2066 | - GAME_TEXT sex[2]; /* Player Sex (string) */ | |
| 2067 | - GAME_TEXT p_r[3]; /* Player Race (number) */ | |
| 2068 | - GAME_TEXT p_c[3]; /* Player Class (number) */ | |
| 2069 | - GAME_TEXT p_a[3]; /* Player Seikaku (number) */ | |
| 2070 | - | |
| 2071 | - GAME_TEXT cur_lev[4]; /* Current Player Level (number) */ | |
| 2072 | - GAME_TEXT cur_dun[4]; /* Current Dungeon Level (number) */ | |
| 2073 | - GAME_TEXT max_lev[4]; /* Max Player Level (number) */ | |
| 2074 | - GAME_TEXT max_dun[4]; /* Max Dungeon Level (number) */ | |
| 2075 | - | |
| 2076 | - GAME_TEXT how[40]; /* Method of death (string) */ | |
| 2077 | -}; | |
| 2078 | - | |
| 2079 | - | |
| 2080 | 2044 | typedef struct |
| 2081 | 2045 | { |
| 2082 | 2046 | FEAT_IDX feat; /* Feature tile */ |
Fork