• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision0307f1807132cfc491dd7b1e185aba76fc0d3441 (tree)
Time2019-02-09 18:53:32
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 構造体 dungeon_info_type を他の慣例に従い dungeon_type に改名。 / Rename dungeon_info_type to dungeon_type according to custom.

Change Summary

Incremental Difference

--- a/src/externs.h
+++ b/src/externs.h
@@ -311,7 +311,7 @@ extern char *e_text;
311311 extern monster_race *r_info;
312312 extern char *r_name;
313313 extern char *r_text;
314-extern dungeon_info_type *d_info;
314+extern dungeon_type *d_info;
315315 extern char *d_name;
316316 extern char *d_text;
317317 extern concptr ANGBAND_SYS;
--- a/src/init1.c
+++ b/src/init1.c
@@ -3172,7 +3172,7 @@ errr parse_r_info(char *buf, header *head)
31723172 * @param what 参照元の文字列ポインタ
31733173 * @return エラーコード
31743174 */
3175-static errr grab_one_dungeon_flag(dungeon_info_type *d_ptr, concptr what)
3175+static errr grab_one_dungeon_flag(dungeon_type *d_ptr, concptr what)
31763176 {
31773177 if (grab_one_flag(&d_ptr->flags1, d_info_flags1, what) == 0)
31783178 return 0;
@@ -3190,7 +3190,7 @@ static errr grab_one_dungeon_flag(dungeon_info_type *d_ptr, concptr what)
31903190 * @param what 参照元の文字列ポインタ
31913191 * @return エラーコード
31923192 */
3193-static errr grab_one_basic_monster_flag(dungeon_info_type *d_ptr, concptr what)
3193+static errr grab_one_basic_monster_flag(dungeon_type *d_ptr, concptr what)
31943194 {
31953195 if (grab_one_flag(&d_ptr->mflags1, r_info_flags1, what) == 0)
31963196 return 0;
@@ -3226,7 +3226,7 @@ static errr grab_one_basic_monster_flag(dungeon_info_type *d_ptr, concptr what)
32263226 * @param what 参照元の文字列ポインタ
32273227 * @return エラーコード
32283228 */
3229-static errr grab_one_spell_monster_flag(dungeon_info_type *d_ptr, concptr what)
3229+static errr grab_one_spell_monster_flag(dungeon_type *d_ptr, concptr what)
32303230 {
32313231 if (grab_one_flag(&d_ptr->mflags4, r_info_flags4, what) == 0)
32323232 return 0;
@@ -3256,7 +3256,7 @@ errr parse_d_info(char *buf, header *head)
32563256 char *s, *t;
32573257
32583258 /* Current entry */
3259- static dungeon_info_type *d_ptr = NULL;
3259+ static dungeon_type *d_ptr = NULL;
32603260
32613261 /* Process 'N' for "New/Number/Name" */
32623262 if (buf[0] == 'N')
--- a/src/init2.c
+++ b/src/init2.c
@@ -775,7 +775,7 @@ static errr init_r_info(void)
775775 static errr init_d_info(void)
776776 {
777777 /* Init the header */
778- init_header(&d_head, max_d_idx, sizeof(dungeon_info_type));
778+ init_header(&d_head, max_d_idx, sizeof(dungeon_type));
779779
780780 #ifdef ALLOW_TEMPLATES
781781
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -967,7 +967,7 @@ static int chameleon_change_m_idx = 0;
967967 */
968968 static bool restrict_monster_to_dungeon(MONRACE_IDX r_idx)
969969 {
970- dungeon_info_type *d_ptr = &d_info[p_ptr->dungeon_idx];
970+ dungeon_type *d_ptr = &d_info[p_ptr->dungeon_idx];
971971 monster_race *r_ptr = &r_info[r_idx];
972972 byte a;
973973
--- a/src/monsterrace-hook.c
+++ b/src/monsterrace-hook.c
@@ -118,7 +118,7 @@ bool mon_hook_dungeon(MONRACE_IDX r_idx)
118118 return TRUE;
119119 else
120120 {
121- dungeon_info_type *d_ptr = &d_info[p_ptr->dungeon_idx];
121+ dungeon_type *d_ptr = &d_info[p_ptr->dungeon_idx];
122122 if ((d_ptr->mflags8 & RF8_WILD_MOUNTAIN) &&
123123 (r_ptr->flags8 & RF8_WILD_MOUNTAIN)) return TRUE;
124124 return FALSE;
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -98,7 +98,7 @@ void display_rumor(bool ex)
9898 else if (strcmp(zz[0], "DUNGEON") == 0)
9999 {
100100 DUNGEON_IDX d_idx;
101- dungeon_info_type *d_ptr;
101+ dungeon_type *d_ptr;
102102
103103 while (1)
104104 {
--- a/src/types.h
+++ b/src/types.h
@@ -1742,8 +1742,8 @@ feat_prob;
17421742
17431743
17441744 /* A structure for the != dungeon types */
1745-typedef struct dungeon_info_type dungeon_info_type;
1746-struct dungeon_info_type {
1745+typedef struct dungeon_type dungeon_type;
1746+struct dungeon_type {
17471747
17481748 STR_OFFSET name; /* Name */
17491749 STR_OFFSET text; /* Description */
--- a/src/variable.c
+++ b/src/variable.c
@@ -653,7 +653,7 @@ char *r_text;
653653 /*
654654 * The dungeon arrays
655655 */
656-dungeon_info_type *d_info;
656+dungeon_type *d_info;
657657 char *d_name;
658658 char *d_text;
659659
--- a/src/wild.c
+++ b/src/wild.c
@@ -48,7 +48,7 @@ static void set_floor_and_wall_aux(s16b feat_type[100], feat_prob prob[DUNGEON_F
4848 void set_floor_and_wall(DUNGEON_IDX type)
4949 {
5050 DUNGEON_IDX cur_type = 255;
51- dungeon_info_type *d_ptr;
51+ dungeon_type *d_ptr;
5252
5353 /* Already filled */
5454 if (cur_type == type) return;
Show on old repository browser