OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

hengband: Commit

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


Commit MetaInfo

Révisionbcb6c4163e1861ce638110ab868218551f3e4ee7 (tree)
l'heure2017-09-24 21:39:46
AuteurDeskull <desull@user...>
CommiterDeskull

Message de Log

#37287 #37353 (2.2.0.89) DEPTHをs32bに再定義、型の置換を継続中。 / Redefine DEPTH to s32b, ongoing type replacement.

Change Summary

Modification

--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2556,8 +2556,8 @@ bool activate_random_artifact(object_type *o_ptr)
25562556
25572557 case ACT_CAST_BA_STAR:
25582558 {
2559- int num = damroll(5, 3);
2560- int y = 0, x = 0;
2559+ HIT_POINT num = damroll(5, 3);
2560+ POSITION y = 0, x = 0;
25612561 int attempts;
25622562 msg_format(_("%sが稲妻で覆われた...","The %s is surrounded by lightning..."), name);
25632563 for (k = 0; k < num; k++)
@@ -3849,7 +3849,7 @@ bool create_named_art(int a_idx, int y, int x)
38493849 {
38503850 object_type forge;
38513851 object_type *q_ptr;
3852- int i;
3852+ IDX i;
38533853
38543854 artifact_type *a_ptr = &a_info[a_idx];
38553855
--- a/src/externs.h
+++ b/src/externs.h
@@ -159,13 +159,13 @@ extern s16b command_new;
159159 extern bool msg_flag;
160160 extern s16b running;
161161 extern s16b resting;
162-extern s16b cur_hgt;
163-extern s16b cur_wid;
164-extern s16b dun_level;
162+extern POSITION cur_hgt;
163+extern POSITION cur_wid;
164+extern DEPTH dun_level;
165165 extern s16b num_repro;
166-extern s16b object_level;
167-extern s16b monster_level;
168-extern s16b base_level;
166+extern DEPTH object_level;
167+extern DEPTH monster_level;
168+extern DEPTH base_level;
169169 extern s32b turn;
170170 extern s32b turn_limit;
171171 extern s32b dungeon_turn;
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -132,7 +132,7 @@ typedef s32b PRICE; /*!< ゲーム中の金額価値の型定義 */
132132
133133 typedef u32b STR_OFFSET; /*!< テキストオフセットの型定義 */
134134
135-typedef byte DEPTH; /*!< ゲーム中の階層レベルの型定義 */
135+typedef s32b DEPTH; /*!< ゲーム中の階層レベルの型定義 */
136136 typedef byte RARITY; /*!< ゲーム中の希少度の型定義 */
137137
138138
--- a/src/load.c
+++ b/src/load.c
@@ -2491,14 +2491,16 @@ static errr rd_dungeon_old(void)
24912491 /*** Basic info ***/
24922492
24932493 /* Header info */
2494- rd_s16b(&dun_level);
2494+ rd_s16b(&tmp16s);
2495+ dun_level = (DEPTH)tmp16s;
24952496 if (z_older_than(10, 3, 8)) dungeon_type = DUNGEON_ANGBAND;
24962497 else rd_byte(&dungeon_type);
24972498
24982499 /* Set the base level for old versions */
24992500 base_level = dun_level;
25002501
2501- rd_s16b(&base_level);
2502+ rd_s16b(&tmp16s);
2503+ base_level = (DEPTH)tmp16s;
25022504
25032505 rd_s16b(&num_repro);
25042506 rd_s16b(&tmp16s);
@@ -2506,8 +2508,10 @@ static errr rd_dungeon_old(void)
25062508 rd_s16b(&tmp16s);
25072509 p_ptr->x = (int)tmp16s;
25082510 if (z_older_than(10, 3, 13) && !dun_level && !p_ptr->inside_arena) {p_ptr->y = 33;p_ptr->x = 131;}
2509- rd_s16b(&cur_hgt);
2510- rd_s16b(&cur_wid);
2511+ rd_s16b(&tmp16s);
2512+ cur_hgt = (POSITION)tmp16s;
2513+ rd_s16b(&tmp16s);
2514+ cur_wid = (POSITION)tmp16s;
25112515 rd_s16b(&tmp16s); /* max_panel_rows */
25122516 rd_s16b(&tmp16s); /* max_panel_cols */
25132517
@@ -2918,7 +2922,8 @@ static errr rd_saved_floor(saved_floor_type *sf_ptr)
29182922 {
29192923 /*** Not a saved floor ***/
29202924
2921- rd_s16b(&dun_level);
2925+ rd_s16b(&tmp16s);
2926+ dun_level = (DEPTH)tmp16s;
29222927 base_level = dun_level;
29232928 }
29242929 else
@@ -2948,7 +2953,8 @@ static errr rd_saved_floor(saved_floor_type *sf_ptr)
29482953 if (tmp16s != sf_ptr->lower_floor_id) return 171;
29492954 }
29502955
2951- rd_s16b(&base_level);
2956+ rd_s16b(&tmp16s);
2957+ base_level = (DEPTH)tmp16s;
29522958 rd_s16b(&num_repro);
29532959
29542960 rd_u16b(&tmp16u);
@@ -2957,8 +2963,10 @@ static errr rd_saved_floor(saved_floor_type *sf_ptr)
29572963 rd_u16b(&tmp16u);
29582964 p_ptr->x = (int)tmp16u;
29592965
2960- rd_s16b(&cur_hgt);
2961- rd_s16b(&cur_wid);
2966+ rd_s16b(&tmp16s);
2967+ cur_hgt = (POSITION)tmp16s;
2968+ rd_s16b(&tmp16s);
2969+ cur_wid = (POSITION)tmp16s;
29622970
29632971 rd_byte(&p_ptr->feeling);
29642972
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -761,7 +761,7 @@ static byte special_key_list[] =
761761
762762 /* Function prototype */
763763
764-static bool is_already_running();
764+static bool is_already_running(void);
765765
766766
767767 /* bg */
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -2103,7 +2103,7 @@ static bool check_hp_for_feat_destruction(feature_type *f_ptr, monster_type *m_p
21032103 *\n
21042104 * A "direction" of "5" means "pick a random direction".\n
21052105 */
2106-static void process_monster(int m_idx)
2106+static void process_monster(IDX m_idx)
21072107 {
21082108 monster_type *m_ptr = &m_list[m_idx];
21092109 monster_race *r_ptr = &r_info[m_ptr->r_idx];
--- a/src/save.c
+++ b/src/save.c
@@ -933,7 +933,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
933933 {
934934 /*** Not a saved floor ***/
935935
936- wr_s16b(dun_level);
936+ wr_s16b((s16b)dun_level);
937937 }
938938 else
939939 {
@@ -948,12 +948,12 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
948948 wr_s16b(sf_ptr->lower_floor_id);
949949 }
950950
951- wr_u16b(base_level);
951+ wr_u16b((u16b)base_level);
952952 wr_u16b(num_repro);
953953 wr_u16b((u16b)p_ptr->y);
954954 wr_u16b((u16b)p_ptr->x);
955- wr_u16b(cur_hgt);
956- wr_u16b(cur_wid);
955+ wr_u16b((u16b)cur_hgt);
956+ wr_u16b((u16b)cur_wid);
957957 wr_byte(p_ptr->feeling);
958958
959959
--- a/src/variable.c
+++ b/src/variable.c
@@ -112,13 +112,13 @@ bool msg_flag; /* Used in msg_print() for "buffering" */
112112 s16b running; /* Current counter for running, if any */
113113 s16b resting; /* Current counter for resting, if any */
114114
115-s16b cur_hgt; /* Current dungeon height */
116-s16b cur_wid; /* Current dungeon width */
117-s16b dun_level; /* Current dungeon level */
115+POSITION cur_hgt; /* Current dungeon height */
116+POSITION cur_wid; /* Current dungeon width */
117+DEPTH dun_level; /* Current dungeon level */
118118 s16b num_repro; /* Current reproducer count */
119-s16b object_level; /* Current object creation level */
120-s16b monster_level; /* Current monster creation level */
121-s16b base_level; /* Base dungeon level */
119+DEPTH object_level; /* Current object creation level */
120+DEPTH monster_level; /* Current monster creation level */
121+DEPTH base_level; /* Base dungeon level */
122122
123123 s32b turn; /*!< 画面表示上のゲーム時間基準となるターン / Current game turn */
124124 s32b turn_limit; /*!< turnの最大値 / Limit of game turn */
Afficher sur ancien navigateur de dépôt.